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

Remove "-face" suffix from idlwave faces

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

   * lisp/progmodes/idlw-help.el (idlwave-help-link):
   Remove "-face" suffix from face name.
   (idlwave-help-link-face):
   New backward-compatibility alias for renamed face.
   (idlwave-highlight-linked-completions): Use renamed idlwave-help faces.

   * lisp/progmodes/idlw-shell.el (idlwave-shell-bp-face)
   (idlwave-shell-disabled-bp): Remove "-face" suffix from face names.
   (idlwave-shell-bp-face, idlwave-shell-disabled-bp):
   New backward-compatibility aliases for renamed faces.
   (idlwave-shell-disabled-breakpoint-face)
   (idlwave-shell-breakpoint-face): Use renamed idlwave-shell faces.

3 files changed, 42 insertions, 23 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c9e4d6ff8de..a510cb88590 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,18 @@
 2005-06-14  Miles Bader  <miles@gnu.org>
 
+        * progmodes/idlw-help.el (idlwave-help-link):
+        Remove "-face" suffix from face name.
+        (idlwave-help-link-face):
+        New backward-compatibility alias for renamed face.
+        (idlwave-highlight-linked-completions): Use renamed idlwave-help faces.
+
+        * progmodes/idlw-shell.el (idlwave-shell-bp-face)
+        (idlwave-shell-disabled-bp): Remove "-face" suffix from face names.
+        (idlwave-shell-bp-face, idlwave-shell-disabled-bp):
+        New backward-compatibility aliases for renamed faces.
+        (idlwave-shell-disabled-breakpoint-face)
+        (idlwave-shell-breakpoint-face): Use renamed idlwave-shell faces.
+
         * progmodes/flymake.el (flymake-errline, flymake-warnline): 
         Remove "-face" suffix from face names.
         (flymake-errline-face, flymake-warnline-face):
diff --git a/lisp/progmodes/idlw-help.el b/lisp/progmodes/idlw-help.el
index 6c2cb00bbde..ba31e6e0ef8 100644
--- a/lisp/progmodes/idlw-help.el
+++ b/lisp/progmodes/idlw-help.el
@@ -182,12 +182,14 @@ support."
   :group 'idlwave-online-help
   :type 'string)
 
-(defface idlwave-help-link-face
+(defface idlwave-help-link
   '((((min-colors 88) (class color)) (:foreground "Blue1"))
     (((class color)) (:foreground "Blue"))
     (t (:weight bold)))
   "Face for highlighting links into IDLWAVE online help."
   :group 'idlwave-online-help)
+;; backward-compatibility alias
+(put 'idlwave-help-link-face 'face-alias 'idlwave-help-link)
 
 (defvar idlwave-help-activate-links-aggressively nil
   "Obsolete variable.")
@@ -586,12 +588,12 @@ Needs additional info stored in global `idlwave-completion-help-info'."
 (defun idlwave-highlight-linked-completions ()
   "Highlight all completions for which help is available and attach link.
 Those words in `idlwave-completion-help-links' have links.  The
-`idlwave-help-link-face' face is used for this."
+`idlwave-help-link' face is used for this."
   (if idlwave-highlight-help-links-in-completion
       (with-current-buffer (get-buffer "*Completions*")
         (save-excursion
           (let* ((case-fold-search t)
-                 (props (list 'face 'idlwave-help-link-face))
+                 (props (list 'face 'idlwave-help-link))
                  (info idlwave-completion-help-info) ; global passed in
                  (what (nth 0 info))  ; what was completed, or a func
                  (class (nth 3 info)) ; any class
diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el
index 19656238764..04e6a28ee40 100644
--- a/lisp/progmodes/idlw-shell.el
+++ b/lisp/progmodes/idlw-shell.el
@@ -510,40 +510,44 @@ t          Glyph when possible, otherwise face (same effect as 'glyph)."
 (defvar idlwave-shell-use-breakpoint-glyph t
   "Obsolete variable.  See `idlwave-shell-mark-breakpoints.")
 
-(defcustom idlwave-shell-breakpoint-face 'idlwave-shell-bp-face
+(defcustom idlwave-shell-breakpoint-face 'idlwave-shell-bp
   "*The face for breakpoint lines in the source code.
 Allows you to choose the font, color and other properties for
 lines which have a breakpoint.  See also `idlwave-shell-mark-breakpoints'."
   :group 'idlwave-shell-highlighting-and-faces
   :type 'symbol)
 
-(if idlwave-shell-have-new-custom
-    ;; We have the new customize - use it to define a customizable face
-    (defface idlwave-shell-bp-face
-      '((((class color)) (:foreground "Black" :background "Pink"))
-        (t (:underline t)))
-      "Face for highlighting lines with breakpoints."
-      :group 'idlwave-shell-highlighting-and-faces)
-  ;; Just copy the underline face to be on the safe side.
-  (copy-face 'underline 'idlwave-shell-bp-face))
+(if (not idlwave-shell-have-new-custom)
+    ;; Just copy the underline face to be on the safe side.
+    (copy-face 'underline 'idlwave-shell-bp)
+  ;; We have the new customize - use it to define a customizable face
+  (defface idlwave-shell-bp
+    '((((class color)) (:foreground "Black" :background "Pink"))
+      (t (:underline t)))
+    "Face for highlighting lines with breakpoints."
+    :group 'idlwave-shell-highlighting-and-faces)
+  ;; backward-compatibility alias
+  (put 'idlwave-shell-bp-face 'face-alias 'idlwave-shell-bp))
 
 (defcustom idlwave-shell-disabled-breakpoint-face
-  'idlwave-shell-disabled-bp-face
+  'idlwave-shell-disabled-bp
   "*The face for disabled breakpoint lines in the source code.
 Allows you to choose the font, color and other properties for
 lines which have a breakpoint.  See also `idlwave-shell-mark-breakpoints'."
   :group 'idlwave-shell-highlighting-and-faces
   :type 'symbol)
 
-(if idlwave-shell-have-new-custom
-    ;; We have the new customize - use it to define a customizable face
-    (defface idlwave-shell-disabled-bp-face
-      '((((class color)) (:foreground "Black" :background "gray"))
-        (t (:underline t)))
-      "Face for highlighting lines with breakpoints."
-      :group 'idlwave-shell-highlighting-and-faces)
-  ;; Just copy the underline face to be on the safe side.
-  (copy-face 'underline 'idlwave-shell-disabled-bp-face))
+(if (not idlwave-shell-have-new-custom)
+    ;; Just copy the underline face to be on the safe side.
+    (copy-face 'underline 'idlwave-shell-disabled-bp)
+  ;; We have the new customize - use it to define a customizable face
+  (defface idlwave-shell-disabled-bp
+    '((((class color)) (:foreground "Black" :background "gray"))
+      (t (:underline t)))
+    "Face for highlighting lines with breakpoints."
+    :group 'idlwave-shell-highlighting-and-faces)
+  ;; backward-compatibility alias
+  (put 'idlwave-shell-disabled-bp-face 'face-alias 'idlwave-shell-disabled-bp))
 
 
 (defcustom idlwave-shell-expression-face 'secondary-selection