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

Remove "-face" suffix from show-paren faces

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

   * lisp/paren.el (show-paren-match, show-paren-mismatch):
   Remove "-face" suffix from face names.
   (show-paren-match-face, show-paren-mismatch-face):
   New backward-compatibility aliases for renamed faces.
   (show-paren-function): Use renamed show-paren faces.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a76b24efebfbeb2f398b5b92b6abebac06febc1f..53b40436f91db4efdcdaa5eff7e72b9ac1409ded 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2005-06-10  Miles Bader  <miles@gnu.org>
 
+       * paren.el (show-paren-match, show-paren-mismatch): 
+       Remove "-face" suffix from face names.
+       (show-paren-match-face, show-paren-mismatch-face): 
+       New backward-compatibility aliases for renamed faces.
+       (show-paren-function): Use renamed show-paren faces.
+
        * ruler-mode.el (ruler-mode-default, ruler-mode-pad)
        (ruler-mode-margins, ruler-mode-fringes)
        (ruler-mode-column-number, ruler-mode-fill-column)

diff --git a/lisp/paren.el b/lisp/paren.el
index fe2beae4eddd0c8bc28026f6cd2f831550eef1a7..7c6abe087b97ef2392cf27d96c013418f1d20250 100644 (file)
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -71,7 +71,7 @@ otherwise)."
   :group 'paren-showing
   :version "20.3")
 
-(defface show-paren-match-face
+(defface show-paren-match
   '((((class color) (background light))
      :background "turquoise")          ; looks OK on tty (becomes cyan)
     (((class color) (background dark))
@@ -83,13 +83,17 @@ otherwise)."
   "Show Paren mode face used for a matching paren."
   :group 'faces
   :group 'paren-showing)
+;; backward-compatibility alias
+(put 'show-paren-match-face 'face-alias 'show-paren-match)
 
-(defface show-paren-mismatch-face
+(defface show-paren-mismatch
   '((((class color)) (:foreground "white" :background "purple"))
     (t (:inverse-video t)))
   "Show Paren mode face used for a mismatching paren."
   :group 'faces
   :group 'paren-showing)
+;; backward-compatibility alias
+(put 'show-paren-mismatch-face 'face-alias 'show-paren-mismatch)
 
 (defvar show-paren-highlight-openparen t
   "*Non-nil turns on openparen highlighting when matching forward.")
@@ -193,8 +197,8 @@ in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time."
              (progn
                (if show-paren-ring-bell-on-mismatch
                    (beep))
-               (setq face 'show-paren-mismatch-face))
-           (setq face 'show-paren-match-face))
+               (setq face 'show-paren-mismatch))
+           (setq face 'show-paren-match))
          ;;
          ;; If matching backwards, highlight the closeparen
          ;; before point as well as its matching open.