2 files changed, 37 insertions, 16 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f9868fd85ff..6ec845adcf3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,14 @@
 2005-06-10  Miles Bader  <miles@gnu.org>
 
+        * pcvs-info.el (cvs-header, cvs-filename, cvs-unknown)
+        (cvs-handled, cvs-need-action, cvs-marked, cvs-msg):
+        Remove "-face" suffix from face names.
+        (cvs-header-face, cvs-filename-face, cvs-unknown-face)
+        (cvs-handled-face, cvs-need-action-face, cvs-marked-face)
+        (cvs-msg-face): New backward-compatibility aliases for renamed faces.
+        (cvs-fi-up-to-date-face, cvs-fi-unknown-face, cvs-fileinfo-pp): 
+        Use renamed pcvs faces.
+
         * info.el (info-title-1, info-title-2, info-title-3)
         (info-title-4): Remove "-face" suffix from and downcase face names.
         (Info-title-1-face, Info-title-2-face, Info-title-3-face)
diff --git a/lisp/pcvs-info.el b/lisp/pcvs-info.el
index cf367072838..d56fa19fd32 100644
--- a/lisp/pcvs-info.el
+++ b/lisp/pcvs-info.el
@@ -61,7 +61,7 @@ to confuse some users sometimes."
 ;;;; Faces for fontification
 ;;;;
 
-(defface cvs-header-face
+(defface cvs-header
   '((((class color) (background dark))
      (:foreground "lightyellow" :weight bold))
     (((class color) (background light))
@@ -69,8 +69,10 @@ to confuse some users sometimes."
     (t (:weight bold)))
   "PCL-CVS face used to highlight directory changes."
   :group 'pcl-cvs)
+;; backward-compatibility alias
+(put 'cvs-header-face 'face-alias 'cvs-header)
 
-(defface cvs-filename-face
+(defface cvs-filename
   '((((class color) (background dark))
      (:foreground "lightblue"))
     (((class color) (background light))
@@ -78,8 +80,10 @@ to confuse some users sometimes."
     (t ()))
   "PCL-CVS face used to highlight file names."
   :group 'pcl-cvs)
+;; backward-compatibility alias
+(put 'cvs-filename-face 'face-alias 'cvs-filename)
 
-(defface cvs-unknown-face
+(defface cvs-unknown
   '((((class color) (background dark))
      (:foreground "red"))
     (((class color) (background light))
@@ -87,8 +91,10 @@ to confuse some users sometimes."
     (t (:slant italic)))
   "PCL-CVS face used to highlight unknown file status."
   :group 'pcl-cvs)
+;; backward-compatibility alias
+(put 'cvs-unknown-face 'face-alias 'cvs-unknown)
 
-(defface cvs-handled-face
+(defface cvs-handled
   '((((class color) (background dark))
      (:foreground "pink"))
     (((class color) (background light))
@@ -96,8 +102,10 @@ to confuse some users sometimes."
     (t ()))
   "PCL-CVS face used to highlight handled file status."
   :group 'pcl-cvs)
+;; backward-compatibility alias
+(put 'cvs-handled-face 'face-alias 'cvs-handled)
 
-(defface cvs-need-action-face
+(defface cvs-need-action
   '((((class color) (background dark))
      (:foreground "orange"))
     (((class color) (background light))
@@ -105,8 +113,10 @@ to confuse some users sometimes."
     (t (:slant italic)))
   "PCL-CVS face used to highlight status of files needing action."
   :group 'pcl-cvs)
+;; backward-compatibility alias
+(put 'cvs-need-action-face 'face-alias 'cvs-need-action)
 
-(defface cvs-marked-face
+(defface cvs-marked
   '((((min-colors 88) (class color) (background dark))
      (:foreground "green1" :weight bold))
     (((class color) (background dark))
@@ -116,14 +126,18 @@ to confuse some users sometimes."
     (t (:weight bold)))
   "PCL-CVS face used to highlight marked file indicator."
   :group 'pcl-cvs)
+;; backward-compatibility alias
+(put 'cvs-marked-face 'face-alias 'cvs-marked)
 
-(defface cvs-msg-face
+(defface cvs-msg
   '((t (:slant italic)))
   "PCL-CVS face used to highlight CVS messages."
   :group 'pcl-cvs)
+;; backward-compatibility alias
+(put 'cvs-msg-face 'face-alias 'cvs-msg)
 
-(defvar cvs-fi-up-to-date-face 'cvs-handled-face)
-(defvar cvs-fi-unknown-face 'cvs-unknown-face)
+(defvar cvs-fi-up-to-date-face 'cvs-handled)
+(defvar cvs-fi-unknown-face 'cvs-unknown)
 (defvar cvs-fi-conflict-face 'font-lock-warning-face)
 
 ;; There is normally no need to alter the following variable, but if
@@ -332,19 +346,17 @@ For use by the cookie package."
      (case type
        (DIRCHANGE (concat "In directory "
                           (cvs-add-face (cvs-fileinfo->full-name fileinfo)
-                                        'cvs-header-face t
-                                        'cvs-goal-column t)
+                                        'cvs-header t 'cvs-goal-column t)
                           ":"))
        (MESSAGE
         (cvs-add-face (format "Message: %s" (cvs-fileinfo->full-log fileinfo))
-                      'cvs-msg-face))
+                      'cvs-msg))
        (t
         (let* ((status (if (cvs-fileinfo->marked fileinfo)
-                           (cvs-add-face "*" 'cvs-marked-face)
+                           (cvs-add-face "*" 'cvs-marked)
                          " "))
                (file (cvs-add-face (cvs-fileinfo->pp-name fileinfo)
-                                   'cvs-filename-face t
-                                   'cvs-goal-column t))
+                                   'cvs-filename t 'cvs-goal-column t))
                (base (or (cvs-fileinfo->base-rev fileinfo) ""))
                (head (cvs-fileinfo->head-rev fileinfo))
                (type
@@ -357,7 +369,7 @@ For use by the cookie package."
                                                 (downcase (symbol-name type))
                                                 "-face"))))
                               (or (and (boundp sym) (symbol-value sym))
-                                  'cvs-need-action-face))))
+                                  'cvs-need-action))))
                   (cvs-add-face str face cvs-status-map)))
                (side (or
                       ;; maybe a subtype