Mercurial > emacs
changeset 33431:5ca411467bf3
(cvs-fi-conflict-face): New var.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Sun, 12 Nov 2000 16:52:53 +0000 |
| parents | d2648645aa9b |
| children | 7f6ffdaecedc |
| files | lisp/pcvs-info.el |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/pcvs-info.el Sun Nov 12 16:48:45 2000 +0000 +++ b/lisp/pcvs-info.el Sun Nov 12 16:52:53 2000 +0000 @@ -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 @@ (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