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

[Colin Walters]

Index: emacs/lisp/pcvs-info.el
diff -c emacs/lisp/pcvs-info.el:1.9 emacs/lisp/pcvs-info.el:1.10
*** emacs/lisp/pcvs-info.el:1.9 Wed Apr  3 11:56:36 2002
--- emacs/lisp/pcvs-info.el     Sat Jun 15 15:04:57 2002
***************
*** 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.
  
--- 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.
  
***************
*** 47,61 ****
    :group 'pcl-cvs
    :type '(boolean))
  
- (defvar global-font-lock-mode)
- (defvar font-lock-auto-fontify)
- (defcustom cvs-highlight
-   (or (and (boundp 'font-lock-auto-fontify) font-lock-auto-fontify)
-       (and (boundp 'global-font-lock-mode) global-font-lock-mode))
-   "*Whether to use text highlighting (à la font-lock) or not."
-   :group 'pcl-cvs
-   :type '(boolean))
- 
  (defcustom cvs-allow-dir-commit nil
    "*Allow `cvs-mode-commit' on directories.
  If you commit without any marked file and with the cursor positioned
--- 47,52 ----
***************
*** 319,335 ****
         (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)
  
  (defun cvs-fileinfo-pp (fileinfo)
--- 310,324 ----
         (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)