[Emacs-diffs] Changes to emacs/lisp/pcvs-info.el

[Miles Bader]

Index: emacs/lisp/pcvs-info.el
diff -c emacs/lisp/pcvs-info.el:1.22 emacs/lisp/pcvs-info.el:1.23
*** emacs/lisp/pcvs-info.el:1.22        Tue Apr 26 20:35:42 2005
--- emacs/lisp/pcvs-info.el     Fri Jun 10 09:06:16 2005
***************
*** 61,67 ****
  ;;;; Faces for fontification
  ;;;;
  
! (defface cvs-header-face
    '((((class color) (background dark))
       (:foreground "lightyellow" :weight bold))
      (((class color) (background light))
--- 61,67 ----
  ;;;; Faces for fontification
  ;;;;
  
! (defface cvs-header
    '((((class color) (background dark))
       (:foreground "lightyellow" :weight bold))
      (((class color) (background light))
***************
*** 69,76 ****
      (t (:weight bold)))
    "PCL-CVS face used to highlight directory changes."
    :group 'pcl-cvs)
  
! (defface cvs-filename-face
    '((((class color) (background dark))
       (:foreground "lightblue"))
      (((class color) (background light))
--- 69,78 ----
      (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
    '((((class color) (background dark))
       (:foreground "lightblue"))
      (((class color) (background light))
***************
*** 78,85 ****
      (t ()))
    "PCL-CVS face used to highlight file names."
    :group 'pcl-cvs)
  
! (defface cvs-unknown-face
    '((((class color) (background dark))
       (:foreground "red"))
      (((class color) (background light))
--- 80,89 ----
      (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
    '((((class color) (background dark))
       (:foreground "red"))
      (((class color) (background light))
***************
*** 87,94 ****
      (t (:slant italic)))
    "PCL-CVS face used to highlight unknown file status."
    :group 'pcl-cvs)
  
! (defface cvs-handled-face
    '((((class color) (background dark))
       (:foreground "pink"))
      (((class color) (background light))
--- 91,100 ----
      (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
    '((((class color) (background dark))
       (:foreground "pink"))
      (((class color) (background light))
***************
*** 96,103 ****
      (t ()))
    "PCL-CVS face used to highlight handled file status."
    :group 'pcl-cvs)
  
! (defface cvs-need-action-face
    '((((class color) (background dark))
       (:foreground "orange"))
      (((class color) (background light))
--- 102,111 ----
      (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
    '((((class color) (background dark))
       (:foreground "orange"))
      (((class color) (background light))
***************
*** 105,112 ****
      (t (:slant italic)))
    "PCL-CVS face used to highlight status of files needing action."
    :group 'pcl-cvs)
  
! (defface cvs-marked-face
    '((((min-colors 88) (class color) (background dark))
       (:foreground "green1" :weight bold))
      (((class color) (background dark))
--- 113,122 ----
      (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
    '((((min-colors 88) (class color) (background dark))
       (:foreground "green1" :weight bold))
      (((class color) (background dark))
***************
*** 116,129 ****
      (t (:weight bold)))
    "PCL-CVS face used to highlight marked file indicator."
    :group 'pcl-cvs)
  
! (defface cvs-msg-face
    '((t (:slant italic)))
    "PCL-CVS face used to highlight CVS messages."
    :group 'pcl-cvs)
  
! (defvar cvs-fi-up-to-date-face 'cvs-handled-face)
! (defvar cvs-fi-unknown-face 'cvs-unknown-face)
  (defvar cvs-fi-conflict-face 'font-lock-warning-face)
  
  ;; There is normally no need to alter the following variable, but if
--- 126,143 ----
      (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
    '((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)
! (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,350 ****
       (case type
         (DIRCHANGE (concat "In directory "
                          (cvs-add-face (cvs-fileinfo->full-name fileinfo)
!                                       'cvs-header-face t
!                                       'cvs-goal-column t)
                          ":"))
         (MESSAGE
        (cvs-add-face (format "Message: %s" (cvs-fileinfo->full-log fileinfo))
!                     'cvs-msg-face))
         (t
        (let* ((status (if (cvs-fileinfo->marked fileinfo)
!                          (cvs-add-face "*" 'cvs-marked-face)
                         " "))
               (file (cvs-add-face (cvs-fileinfo->pp-name fileinfo)
!                                  'cvs-filename-face t
!                                  'cvs-goal-column t))
               (base (or (cvs-fileinfo->base-rev fileinfo) ""))
               (head (cvs-fileinfo->head-rev fileinfo))
               (type
--- 346,362 ----
       (case type
         (DIRCHANGE (concat "In directory "
                          (cvs-add-face (cvs-fileinfo->full-name fileinfo)
!                                       'cvs-header t 'cvs-goal-column t)
                          ":"))
         (MESSAGE
        (cvs-add-face (format "Message: %s" (cvs-fileinfo->full-log fileinfo))
!                     'cvs-msg))
         (t
        (let* ((status (if (cvs-fileinfo->marked fileinfo)
!                          (cvs-add-face "*" 'cvs-marked)
                         " "))
               (file (cvs-add-face (cvs-fileinfo->pp-name fileinfo)
!                                  'cvs-filename t 'cvs-goal-column t))
               (base (or (cvs-fileinfo->base-rev fileinfo) ""))
               (head (cvs-fileinfo->head-rev fileinfo))
               (type
***************
*** 357,363 ****
                                                (downcase (symbol-name type))
                                                "-face"))))
                              (or (and (boundp sym) (symbol-value sym))
!                                 'cvs-need-action-face))))
                  (cvs-add-face str face cvs-status-map)))
               (side (or
                      ;; maybe a subtype
--- 369,375 ----
                                                (downcase (symbol-name type))
                                                "-face"))))
                              (or (and (boundp sym) (symbol-value sym))
!                                 'cvs-need-action))))
                  (cvs-add-face str face cvs-status-map)))
               (side (or
                      ;; maybe a subtype