Mercurial > emacs

changeset 35564:b546ef3b2284

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(smerge-font-lock-keywords): Relax submatch 1.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Thu, 25 Jan 2001 15:36:32 +0000
parents a61786eb7fe1
children 9a56f039a37a
files lisp/smerge-mode.el
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/smerge-mode.el	Thu Jan 25 15:31:14 2001 +0000
+++ b/lisp/smerge-mode.el	Thu Jan 25 15:36:32 2001 +0000
@@ -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 @@
 
 (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.