(global-font-lock-mode, font-lock-auto-fontify): Delete defvars.

(cvs-highlight): Delete.
(cvs-add-face): Use `font-lock-face'.  Always add properties.

1 files changed, 10 insertions, 21 deletions

diff --git a/lisp/pcvs-info.el b/lisp/pcvs-info.el
index 1b1ea95f97..b1cb660319 100644
--- a/lisp/pcvs-info.el
+++ b/lisp/pcvs-info.el
@@ -4,7 +4,7 @@
 
 ;; Author: Stefan Monnier <[email protected]>
 ;; Keywords: pcl-cvs
-;; Revision: $Id: pcvs-info.el,v 1.8 2001/12/31 20:28:40 rms Exp $
+;; Revision: $Id: pcvs-info.el,v 1.9 2002/04/03 16:56:36 kai Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -47,15 +47,6 @@ If t, their full path name will be displayed, else only the filename."
   :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
@@ -319,17 +310,15 @@ FI-OR-TYPE can either be a symbol (a fileinfo-type) or a fileinfo."
 	 (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))
+  (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)