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

Remove "-face" suffix from sh-script faces

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

   * lisp/progmodes/sh-script.el (sh-heredoc): Remove "-face" suffix from
   face name.
   (sh-heredoc-face): New backward-compatibility alias for renamed face.
   (sh-heredoc-face): Use renamed sh-heredoc face.

2 files changed, 9 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a510cb88590..b4cebfd0565 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2005-06-14  Miles Bader  <miles@gnu.org>
 
+        * progmodes/sh-script.el (sh-heredoc): Remove "-face" suffix from
+        face name.
+        (sh-heredoc-face): New backward-compatibility alias for renamed face.
+        (sh-heredoc-face): Use renamed sh-heredoc face.
+
         * progmodes/idlw-help.el (idlwave-help-link):
         Remove "-face" suffix from face name.
         (idlwave-help-link-face):
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 604ff8c1e78..23d8374818e 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -792,7 +792,7 @@ See `sh-feature'.")
 
 ;; Font-Lock support
 
-(defface sh-heredoc-face
+(defface sh-heredoc
   '((((min-colors 88) (class color)
       (background dark))
      (:foreground "yellow1" :weight bold))
@@ -806,7 +806,9 @@ See `sh-feature'.")
      (:weight bold)))
   "Face to show a here-document"
   :group 'sh-indentation)
-(defvar sh-heredoc-face 'sh-heredoc-face)
+;; backward-compatibility alias
+(put 'sh-heredoc-face 'face-alias 'sh-heredoc)
+(defvar sh-heredoc-face 'sh-heredoc)
 
 (defface sh-escaped-newline '((t :inherit font-lock-string-face))
   "Face used for (non-escaped) backslash at end of a line in Shell-script mode."