Mercurial > emacs
changeset 45841:8fa323feac82
(global-font-lock-mode, font-lock-auto-fontify): Delete defvars.
(cvs-highlight): Delete.
(cvs-add-face): Use `font-lock-face'. Always add properties.
| author | Colin Walters <walters@gnu.org> |
|---|---|
| date | Sat, 15 Jun 2002 19:04:57 +0000 |
| parents | 6de944301f8a |
| children | 288c321d3282 |
| files | lisp/pcvs-info.el |
| diffstat | 1 files changed, 10 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/pcvs-info.el Sat Jun 15 19:04:41 2002 +0000 +++ b/lisp/pcvs-info.el Sat Jun 15 19:04:57 2002 +0000 @@ -4,7 +4,7 @@ ;; Author: Stefan Monnier <monnier@cs.yale.edu> ;; 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 @@ :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 @@ (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)