diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2001-01-25 15:37:21 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2001-01-25 15:37:21 +0000 |
| commit | f0c1adabcb756404ddaeac75c94f72c87a055a5f (patch) | |
| tree | d84bc106a43e07ecaba49eb09279b250db214ebe /lisp/smerge-mode.el | |
| parent | a2ed96700bf6b23edd41c8d5b7fdb69af48b5c0c (diff) | |
| download | emacs-f0c1adabcb756404ddaeac75c94f72c87a055a5f.tar.gz | |
(smerge-font-lock-keywords): Relax submatch 1.
Diffstat (limited to 'lisp/smerge-mode.el')
| -rw-r--r-- | lisp/smerge-mode.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index cc49d3fb043..96132f35932 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -4,7 +4,7 @@ ;; Author: Stefan Monnier <monnier@cs.yale.edu> ;; Keywords: merge diff3 cvs conflict -;; Revision: $Id: smerge-mode.el,v 1.9 2000/12/22 23:16:22 monnier Exp $ +;; Revision: $Id: smerge-mode.el,v 1.10 2000/12/23 20:54:14 monnier Exp $ ;; This file is part of GNU Emacs. @@ -160,7 +160,7 @@ Used in `smerge-diff-base-mine' and related functions." (defconst smerge-font-lock-keywords '((smerge-find-conflict - (1 smerge-mine-face prepend) + (1 smerge-mine-face prepend t) (2 smerge-base-face prepend t) (3 smerge-other-face prepend t) ;; FIXME: `keep' doesn't work right with syntactic fontification. |