diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2000-11-12 16:52:53 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2000-11-12 16:52:53 +0000 |
| commit | 539211583477e45d265740af64b14f4c8410131c (patch) | |
| tree | a541083b4bb6027f49e0584fd35ce2a7e31ca4cf /lisp/pcvs-info.el | |
| parent | aace6150c02e039d1b93d8a4a253c5df097c07f2 (diff) | |
| download | emacs-539211583477e45d265740af64b14f4c8410131c.tar.gz | |
(cvs-fi-conflict-face): New var.
Diffstat (limited to 'lisp/pcvs-info.el')
| -rw-r--r-- | lisp/pcvs-info.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/pcvs-info.el b/lisp/pcvs-info.el index 623e24a7ba5..a1e09a70e0d 100644 --- a/lisp/pcvs-info.el +++ b/lisp/pcvs-info.el @@ -5,7 +5,7 @@ ;; Author: Stefan Monnier <monnier@cs.yale.edu> ;; Keywords: pcl-cvs ;; Version: $Name: $ -;; Revision: $Id: pcvs-info.el,v 1.2 2000/03/22 02:56:52 monnier Exp $ +;; Revision: $Id: pcvs-info.el,v 1.3 2000/06/12 04:37:50 monnier Exp $ ;; This file is part of GNU Emacs. @@ -130,6 +130,7 @@ to confuse some users sometimes." (defvar cvs-fi-up-to-date-face 'cvs-handled-face) (defvar cvs-fi-unknown-face 'cvs-unknown-face) +(defvar cvs-fi-conflict-face 'font-lock-warning-face) ;; There is normally no need to alter the following variable, but if ;; your site has installed CVS in a non-standard way you might have |