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

Remove "-face" suffix from show-tabs faces

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

   * lisp/generic-x.el (show-tabs-tab, show-tabs-space):
   Remove "-face" suffix from face names.
   (show-tabs-tab-face, show-tabs-space-face):
   New backward-compatibility aliases for renamed faces.
   (show-tabs-generic-mode-font-lock-defaults-1)
   (show-tabs-generic-mode-font-lock-defaults-2):
   Use renamed show-tabs faces.

2 files changed, 18 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f6053212898..5b142fc4677 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,13 @@
 2005-06-10  Miles Bader  <miles@gnu.org>
 
+        * generic-x.el (show-tabs-tab, show-tabs-space):
+        Remove "-face" suffix from face names.
+        (show-tabs-tab-face, show-tabs-space-face):
+        New backward-compatibility aliases for renamed faces.
+        (show-tabs-generic-mode-font-lock-defaults-1)
+        (show-tabs-generic-mode-font-lock-defaults-2):
+        Use renamed show-tabs faces.
+
         * smerge-mode.el (smerge-mine, smerge-other, smerge-base)
         (smerge-markers): Remove "-face" suffix from face names.
         (smerge-mine-face, smerge-other-face, smerge-base-face)
diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index 9ba06d42397..fcf5b6c0e1d 100644
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -1733,17 +1733,17 @@ like an INI file.  You can add this hook to `find-file-hook'."
 
 (defconst show-tabs-generic-mode-font-lock-defaults-1
   '(;; trailing spaces must come before...
-    ("[ \t]+$" . 'show-tabs-space-face)
+    ("[ \t]+$" . 'show-tabs-space)
     ;; ...embedded tabs
-    ("[^\n\t]\\(\t+\\)" (1 'show-tabs-tab-face))))
+    ("[^\n\t]\\(\t+\\)" (1 'show-tabs-tab))))
 
 (defconst show-tabs-generic-mode-font-lock-defaults-2
   '(;; trailing spaces must come before...
-    ("[ \t]+$" . 'show-tabs-space-face)
+    ("[ \t]+$" . 'show-tabs-space)
     ;; ...tabs
-    ("\t+" . 'show-tabs-tab-face))))
+    ("\t+" . 'show-tabs-tab))))
 
-(defface show-tabs-tab-face
+(defface show-tabs-tab
   '((((class grayscale) (background light)) (:background "DimGray"   :weight bold))
     (((class grayscale) (background dark))  (:background "LightGray" :weight bold))
     (((class color)     (min-colors 88))    (:background "red1"))
@@ -1751,8 +1751,10 @@ like an INI file.  You can add this hook to `find-file-hook'."
     (t (:weight bold)))
   "Font Lock mode face used to highlight TABs."
   :group 'generic-x)
+;; backward-compatibility alias
+(put 'show-tabs-tab-face 'face-alias 'show-tabs-tab)
 
-(defface show-tabs-space-face
+(defface show-tabs-space
   '((((class grayscale) (background light)) (:background "DimGray"   :weight bold))
     (((class grayscale) (background dark))  (:background "LightGray" :weight bold))
     (((class color)     (min-colors 88))    (:background "yellow1"))
@@ -1760,6 +1762,8 @@ like an INI file.  You can add this hook to `find-file-hook'."
     (t (:weight bold)))
   "Font Lock mode face used to highlight spaces."
   :group 'generic-x)
+;; backward-compatibility alias
+(put 'show-tabs-space-face 'face-alias 'show-tabs-space)
 
 (define-generic-mode show-tabs-generic-mode
   nil ;; no comment char