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

[Kai Großjohann]

Index: emacs/lisp/pcvs-info.el
diff -c emacs/lisp/pcvs-info.el:1.8 emacs/lisp/pcvs-info.el:1.9
*** emacs/lisp/pcvs-info.el:1.8 Mon Dec 31 15:28:40 2001
--- emacs/lisp/pcvs-info.el     Wed Apr  3 11:56:36 2002
***************
*** 4,10 ****
  
  ;; Author: Stefan Monnier <address@hidden>
  ;; Keywords: pcl-cvs
! ;; Revision: $Id: pcvs-info.el,v 1.8 2001/12/31 20:28:40 rms Exp $
  
  ;; This file is part of GNU Emacs.
  
--- 4,10 ----
  
  ;; Author: Stefan Monnier <address@hidden>
  ;; Keywords: pcl-cvs
! ;; Revision: $Id: pcvs-info.el,v 1.9 2002/04/03 16:56:36 kai Exp $
  
  ;; This file is part of GNU Emacs.
  
***************
*** 318,331 ****
      (and (not (eq type 'MESSAGE))
         (eq (car (memq func (cdr (assq type cvs-states)))) func))))
  
! (defun cvs-add-face (str face &optional keymap)
!   (when cvs-highlight
      (add-text-properties 0 (length str)
!                        (list* 'face face
!                               (when keymap
!                                 (list* 'mouse-face 'highlight
!                                        (when (keymapp keymap)
!                                          (list 'keymap keymap)))))
                         str))
    str)
  
--- 318,334 ----
      (and (not (eq type 'MESSAGE))
         (eq (car (memq func (cdr (assq type cvs-states)))) func))))
  
! (defun cvs-add-face (str face &optional keymap &rest properties)
!   (when (or cvs-highlight properties)
      (add-text-properties 0 (length str)
!                        (append
!                         (when cvs-highlight
!                           (list* 'face face
!                                  (when keymap
!                                    (list* 'mouse-face 'highlight
!                                           (when (keymapp keymap)
!                                             (list 'keymap keymap))))))
!                         properties)
                         str))
    str)
  
***************
*** 349,355 ****
                           (cvs-add-face "*" 'cvs-marked-face)
                         " "))
               (file (cvs-add-face (cvs-fileinfo->pp-name fileinfo)
!                                  'cvs-filename-face t))
               (base (or (cvs-fileinfo->base-rev fileinfo) ""))
               (head (cvs-fileinfo->head-rev fileinfo))
               (type
--- 352,359 ----
                           (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
***************
*** 371,378 ****
                      (when (and head (not (string= head base))) head)
                      ;; or nothing
                      "")))
!         (format "%-11s %s %-11s %-11s %s"
!                 side status type base file)))))))
  
  
  (defun cvs-fileinfo-update (fi fi-new)
--- 375,382 ----
                      (when (and head (not (string= head base))) head)
                      ;; or nothing
                      "")))
!          (format "%-11s %s %-11s %-11s %s"
!                  side status type base file)))))))
  
  
  (defun cvs-fileinfo-update (fi fi-new)