From f7974cb688850bf3f41ee2f7329fc3d5e8c41c97 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Sat, 17 May 2014 10:08:27 +0900 Subject: [PATCH] Don't use the removed second argument of make-face * riece-highlight.el (riece-modeline-current-face): Define not using the removed second argument of make-face. * riece-history.el (riece-modeline-history-face): Likewise. * riece-unread.el (riece-modeline-unread-face): Likewise. --- lisp/riece-highlight.el | 9 +++++++-- lisp/riece-history.el | 9 +++++++-- lisp/riece-unread.el | 9 +++++++-- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/lisp/riece-highlight.el b/lisp/riece-highlight.el index 2c47a56..0a5a87d 100644 --- a/lisp/riece-highlight.el +++ b/lisp/riece-highlight.el @@ -194,8 +194,13 @@ :group 'riece-highlight) (unless (riece-facep 'riece-modeline-current-face) - (make-face 'riece-modeline-current-face - "Face used for displaying the current channel in modeline.") + ;; In Emacs, set-face-doc-string is an alias to + ;; set-face-documentation, but we use the former since it is + ;; available in both Emacs and XEmacs. + (make-face 'riece-modeline-current-face) + (set-face-doc-string + 'riece-modeline-current-face + "Face used for displaying the current channel in modeline.") (if (featurep 'xemacs) (set-face-parent 'riece-modeline-current-face 'modeline)) (set-face-foreground 'riece-modeline-current-face diff --git a/lisp/riece-history.el b/lisp/riece-history.el index 3f26a57..6ee4ab1 100644 --- a/lisp/riece-history.el +++ b/lisp/riece-history.el @@ -65,8 +65,13 @@ (defvar riece-channel-list-history-face 'riece-channel-list-history-face) (unless (riece-facep 'riece-modeline-history-face) - (make-face 'riece-modeline-history-face - "Face used for displaying history channels in modeline.") + ;; In Emacs, set-face-doc-string is an alias to + ;; set-face-documentation, but we use the former since it is + ;; available in both Emacs and XEmacs. + (make-face 'riece-modeline-history-face) + (set-face-doc-string + 'riece-modeline-history-face + "Face used for displaying history channels in modeline.") (if (featurep 'xemacs) (set-face-parent 'riece-modeline-history-face 'modeline)) (set-face-foreground 'riece-modeline-history-face diff --git a/lisp/riece-unread.el b/lisp/riece-unread.el index 3b1f84d..18e7d3c 100644 --- a/lisp/riece-unread.el +++ b/lisp/riece-unread.el @@ -60,8 +60,13 @@ (defvar riece-channel-list-unread-face 'riece-channel-list-unread-face) (unless (riece-facep 'riece-modeline-unread-face) - (make-face 'riece-modeline-unread-face - "Face used for displaying unread channels in modeline.") + ;; In Emacs, set-face-doc-string is an alias to + ;; set-face-documentation, but we use the former since it is + ;; available in both Emacs and XEmacs. + (make-face 'riece-modeline-unread-face) + (set-face-doc-string + 'riece-modeline-unread-face + "Face used for displaying unread channels in modeline.") (if (featurep 'xemacs) (set-face-parent 'riece-modeline-unread-face 'modeline)) (set-face-foreground 'riece-modeline-unread-face -- 2.25.1