2 files changed, 14 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 71ccda0f487..c9e4d6ff8de 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2005-06-14  Miles Bader  <miles@gnu.org>
 
+        * progmodes/flymake.el (flymake-errline, flymake-warnline): 
+        Remove "-face" suffix from face names.
+        (flymake-errline-face, flymake-warnline-face):
+        New backward-compatibility aliases for renamed faces.
+        (flymake-highlight-line): Use renamed flymake faces.
+
         * progmodes/ebrowse.el (ebrowse-tree-mark, ebrowse-root-class)
         (ebrowse-file-name, ebrowse-default, ebrowse-member-attribute)
         (ebrowse-member-class, ebrowse-progress):
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 7b1ba8d033f..c47f2e34cd2 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -839,19 +839,23 @@ Return t if it has at least one flymake overlay, nil if no overlay."
       (setq ov (cdr ov)))
     has-flymake-overlays))
 
-(defface flymake-errline-face
+(defface flymake-errline
   ;;+   '((((class color)) (:foreground "OrangeRed" :bold t :underline t))
   ;;+   '((((class color)) (:underline "OrangeRed"))
   '((((class color)) (:background "LightPink"))
     (t (:bold t)))
   "Face used for marking error lines."
   :group 'flymake)
+;; backward-compatibility alias
+(put 'flymake-errline-face 'face-alias 'flymake-errline)
 
-(defface flymake-warnline-face
+(defface flymake-warnline
   '((((class color)) (:background "LightBlue2"))
     (t (:bold t)))
   "Face used for marking warning lines."
   :group 'flymake)
+;; backward-compatibility alias
+(put 'flymake-warnline-face 'face-alias 'flymake-warnline)
 
 (defun flymake-highlight-line (line-no line-err-info-list)
   "Highlight line LINE-NO in current buffer.
@@ -886,8 +890,8 @@ Perhaps use text from LINE-ERR-INFO-ILST to enhance highlighting."
       (setq end (point)))
 
     (if (> (flymake-get-line-err-count line-err-info-list "e") 0)
-        (setq face 'flymake-errline-face)
-      (setq face 'flymake-warnline-face))
+        (setq face 'flymake-errline)
+      (setq face 'flymake-warnline))
 
     (flymake-make-overlay beg end tooltip-text face nil)))