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

[Stefan Monnier]

Index: emacs/lisp/pcvs-info.el
diff -c emacs/lisp/pcvs-info.el:1.10 emacs/lisp/pcvs-info.el:1.11
*** emacs/lisp/pcvs-info.el:1.10        Sat Jun 15 15:04:57 2002
--- emacs/lisp/pcvs-info.el     Tue Jun 18 17:47:41 2002
***************
*** 4,10 ****
  
  ;; Author: Stefan Monnier <address@hidden>
  ;; Keywords: pcl-cvs
! ;; Revision: $Id: pcvs-info.el,v 1.10 2002/06/15 19:04:57 walters 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.11 2002/06/18 21:47:41 monnier Exp $
  
  ;; This file is part of GNU Emacs.
  
***************
*** 309,324 ****
      (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)
!   (add-text-properties 0 (length str)
!                      (append
!                       (list* 'font-lock-face face
!                              (when keymap
!                                (list* 'mouse-face 'highlight
!                                       (when (keymapp keymap)
!                                         (list 'keymap keymap)))))
!                       properties)
!                      str)
    str)
  
  (defun cvs-fileinfo-pp (fileinfo)
--- 309,322 ----
      (and (not (eq type 'MESSAGE))
         (eq (car (memq func (cdr (assq type cvs-states)))) func))))
  
! (defun cvs-add-face (str face &optional keymap &rest props)
!   (when cvs-highlight
!     (when keymap
!       (when (keymapp keymap)
!       (setq props (list* 'keymap keymap props)))
!       (setq props (list* 'mouse-face 'highlight props)))
!     (setq props (list* 'font-lock-face face props)))
!   (when props (add-text-properties 0 (length str) props str))
    str)
  
  (defun cvs-fileinfo-pp (fileinfo)
***************
*** 331,337 ****
       (case type
         (DIRCHANGE (concat "In directory "
                          (cvs-add-face (cvs-fileinfo->full-path fileinfo)
!                                       'cvs-header-face t)
                          ":"))
         (MESSAGE
        (cvs-add-face (format "Message: %s" (cvs-fileinfo->full-log fileinfo))
--- 329,336 ----
       (case type
         (DIRCHANGE (concat "In directory "
                          (cvs-add-face (cvs-fileinfo->full-path fileinfo)
!                                       'cvs-header-face t
!                                       'cvs-goal-column t)
                          ":"))
         (MESSAGE
        (cvs-add-face (format "Message: %s" (cvs-fileinfo->full-log fileinfo))