Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-425

Remove "-face" suffix from gnus faces

2005-06-16  Miles Bader  <miles@gnu.org>

   * lisp/gnus/spam.el (spam): Remove "-face" suffix from face name.
   (spam-face): New backward-compatibility alias for renamed face.
   (spam-face, spam-initialize): Use renamed spam face.

   * lisp/gnus/message.el (message-header-to, message-header-cc)
   (message-header-subject, message-header-newsgroups)
   (message-header-other, message-header-name)
   (message-header-xheader, message-separator, message-cited-text)
   (message-mml): Remove "-face" suffix from face names.
   (message-header-to-face, message-header-cc-face)
   (message-header-subject-face, message-header-newsgroups-face)
   (message-header-other-face, message-header-name-face)
   (message-header-xheader-face, message-separator-face)
   (message-cited-text-face, message-mml-face):
   New backward-compatibility aliases for renamed faces.
   (message-font-lock-keywords): Use renamed message faces.

   * lisp/gnus/sieve-mode.el (sieve-control-commands, sieve-action-commands)
   (sieve-test-commands, sieve-tagged-arguments):
   Remove "-face" suffix from face names.
   (sieve-control-commands-face, sieve-action-commands-face)
   (sieve-test-commands-face, sieve-tagged-arguments-face):
   New backward-compatibility aliases for renamed faces.
   (sieve-control-commands-face, sieve-action-commands-face)
   (sieve-test-commands-face, sieve-tagged-arguments-face):
   Use renamed sieve faces.

   * lisp/gnus/gnus.el (gnus-group-news-1, gnus-group-news-1-empty)
   (gnus-group-news-2, gnus-group-news-2-empty, gnus-group-news-3)
   (gnus-group-news-3-empty, gnus-group-news-4)
   (gnus-group-news-4-empty, gnus-group-news-5)
   (gnus-group-news-5-empty, gnus-group-news-6)
   (gnus-group-news-6-empty, gnus-group-news-low)
   (gnus-group-news-low-empty, gnus-group-mail-1)
   (gnus-group-mail-1-empty, gnus-group-mail-2)
   (gnus-group-mail-2-empty, gnus-group-mail-3)
   (gnus-group-mail-3-empty, gnus-group-mail-low)
   (gnus-group-mail-low-empty, gnus-summary-selected)
   (gnus-summary-cancelled, gnus-summary-high-ticked)
   (gnus-summary-low-ticked, gnus-summary-normal-ticked)
   (gnus-summary-high-ancient, gnus-summary-low-ancient)
   (gnus-summary-normal-ancient, gnus-summary-high-undownloaded)
   (gnus-summary-low-undownloaded)
   (gnus-summary-normal-undownloaded, gnus-summary-high-unread)
   (gnus-summary-low-unread, gnus-summary-normal-unread)
   (gnus-summary-high-read, gnus-summary-low-read)
   (gnus-summary-normal-read, gnus-splash):
   Remove "-face" suffix from face names.
   (gnus-group-news-1-face, gnus-group-news-1-empty-face)
   (gnus-group-news-2-face, gnus-group-news-2-empty-face)
   (gnus-group-news-3-face, gnus-group-news-3-empty-face)
   (gnus-group-news-4-face, gnus-group-news-4-empty-face)
   (gnus-group-news-5-face, gnus-group-news-5-empty-face)
   (gnus-group-news-6-face, gnus-group-news-6-empty-face)
   (gnus-group-news-low-face, gnus-group-news-low-empty-face)
   (gnus-group-mail-1-face, gnus-group-mail-1-empty-face)
   (gnus-group-mail-2-face, gnus-group-mail-2-empty-face)
   (gnus-group-mail-3-face, gnus-group-mail-3-empty-face)
   (gnus-group-mail-low-face, gnus-group-mail-low-empty-face)
   (gnus-summary-selected-face, gnus-summary-cancelled-face)
   (gnus-summary-high-ticked-face, gnus-summary-low-ticked-face)
   (gnus-summary-normal-ticked-face)
   (gnus-summary-high-ancient-face, gnus-summary-low-ancient-face)
   (gnus-summary-normal-ancient-face)
   (gnus-summary-high-undownloaded-face)
   (gnus-summary-low-undownloaded-face)
   (gnus-summary-normal-undownloaded-face)
   (gnus-summary-high-unread-face, gnus-summary-low-unread-face)
   (gnus-summary-normal-unread-face, gnus-summary-high-read-face)
   (gnus-summary-low-read-face, gnus-summary-normal-read-face)
   (gnus-splash-face):
   New backward-compatibility aliases for renamed faces.
   (gnus-group-startup-message): Use renamed gnus faces.

   * lisp/gnus/gnus-srvr.el (gnus-server-agent, gnus-server-opened)
   (gnus-server-closed, gnus-server-denied, gnus-server-offline)
   (gnus-server-agent): Remove "-face" suffix from face names.
   (gnus-server-agent-face, gnus-server-opened-face)
   (gnus-server-closed-face, gnus-server-denied-face)
   (gnus-server-offline-face):
   New backward-compatibility aliases for renamed faces.
   (gnus-server-agent-face, gnus-server-opened-face)
   (gnus-server-closed-face, gnus-server-denied-face)
   (gnus-server-offline-face): Use renamed gnus faces.

   * lisp/gnus/gnus-picon.el (gnus-picon-xbm, gnus-picon):
   Remove "-face" suffix from face names.
   (gnus-picon-xbm-face, gnus-picon-face):
   New backward-compatibility aliases for renamed faces.

   * lisp/gnus/gnus-cite.el (gnus-cite-attribution, gnus-cite-1, gnus-cite-2)
   (gnus-cite-3, gnus-cite-4, gnus-cite-5, gnus-cite-6)
   (gnus-cite-7, gnus-cite-8, gnus-cite-9, gnus-cite-10)
   (gnus-cite-11): Remove "-face" suffix from face names.
   (gnus-cite-attribution-face, gnus-cite-face-1, gnus-cite-face-2)
   (gnus-cite-face-3, gnus-cite-face-4, gnus-cite-face-5)
   (gnus-cite-face-6, gnus-cite-face-7, gnus-cite-face-8)
   (gnus-cite-face-9, gnus-cite-face-10, gnus-cite-face-11):
   New backward-compatibility aliases for renamed faces.
   (gnus-cite-attribution-face, gnus-cite-face-list)
   (gnus-article-boring-faces): Use renamed gnus faces.

   * lisp/gnus/gnus-art.el (gnus-signature, gnus-header-from)
   (gnus-header-subject, gnus-header-newsgroups, gnus-header-name)
   (gnus-header-content): Remove "-face" suffix from face names.
   (gnus-signature-face, gnus-header-from-face)
   (gnus-header-subject-face, gnus-header-newsgroups-face)
   (gnus-header-name-face, gnus-header-content-face):
   New backward-compatibility aliases for renamed faces.
   (gnus-signature-face, gnus-header-face-alist): Use renamed gnus faces.

   * lisp/gnus/gnus-sum.el (gnus-summary-selected-face)
   (gnus-summary-highlight): Use renamed gnus faces.
   * lisp/gnus/gnus-group.el (gnus-group-highlight): Likewise.

1 files changed, 16 insertions, 8 deletions

diff --git a/lisp/gnus/sieve-mode.el b/lisp/gnus/sieve-mode.el
index c4d019da6df..02bb33a3810 100644
--- a/lisp/gnus/sieve-mode.el
+++ b/lisp/gnus/sieve-mode.el
@@ -65,10 +65,10 @@
 
 ;; Font-lock
 
-(defvar sieve-control-commands-face 'sieve-control-commands-face
+(defvar sieve-control-commands-face 'sieve-control-commands
   "Face name used for Sieve Control Commands.")
 
-(defface sieve-control-commands-face
+(defface sieve-control-commands
   '((((type tty) (class color)) (:foreground "blue" :weight light))
     (((class grayscale) (background light)) (:foreground "LightGray" :bold t))
     (((class grayscale) (background dark)) (:foreground "DimGray" :bold t))
@@ -77,22 +77,26 @@
     (t (:bold t)))
   "Face used for Sieve Control Commands."
   :group 'sieve)
+;; backward-compatibility alias
+(put 'sieve-control-commands-face 'face-alias 'sieve-control-commands)
 
-(defvar sieve-action-commands-face 'sieve-action-commands-face
+(defvar sieve-action-commands-face 'sieve-action-commands
   "Face name used for Sieve Action Commands.")
 
-(defface sieve-action-commands-face
+(defface sieve-action-commands
   '((((type tty) (class color)) (:foreground "blue" :weight bold))
     (((class color) (background light)) (:foreground "Blue"))
     (((class color) (background dark)) (:foreground "LightSkyBlue"))
     (t (:inverse-video t :bold t)))
   "Face used for Sieve Action Commands."
   :group 'sieve)
+;; backward-compatibility alias
+(put 'sieve-action-commands-face 'face-alias 'sieve-action-commands)
 
-(defvar sieve-test-commands-face 'sieve-test-commands-face
+(defvar sieve-test-commands-face 'sieve-test-commands
   "Face name used for Sieve Test Commands.")
 
-(defface sieve-test-commands-face
+(defface sieve-test-commands
   '((((type tty) (class color)) (:foreground "magenta"))
     (((class grayscale) (background light))
      (:foreground "LightGray" :bold t :underline t))
@@ -103,11 +107,13 @@
     (t (:bold t :underline t)))
   "Face used for Sieve Test Commands."
   :group 'sieve)
+;; backward-compatibility alias
+(put 'sieve-test-commands-face 'face-alias 'sieve-test-commands)
 
-(defvar sieve-tagged-arguments-face 'sieve-tagged-arguments-face
+(defvar sieve-tagged-arguments-face 'sieve-tagged-arguments
   "Face name used for Sieve Tagged Arguments.")
 
-(defface sieve-tagged-arguments-face
+(defface sieve-tagged-arguments
   '((((type tty) (class color)) (:foreground "cyan" :weight bold))
     (((class grayscale) (background light)) (:foreground "LightGray" :bold t))
     (((class grayscale) (background dark)) (:foreground "DimGray" :bold t))
@@ -116,6 +122,8 @@
     (t (:bold t)))
   "Face used for Sieve Tagged Arguments."
   :group 'sieve)
+;; backward-compatibility alias
+(put 'sieve-tagged-arguments-face 'face-alias 'sieve-tagged-arguments)
 
 
 (defconst sieve-font-lock-keywords