From f0c1adabcb756404ddaeac75c94f72c87a055a5f Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 25 Jan 2001 15:37:21 +0000 Subject: [PATCH] (smerge-font-lock-keywords): Relax submatch 1. --- lisp/ChangeLog | 2 ++ lisp/smerge-mode.el | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 15fdc31cc10..1f699da7ade 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2001-01-25 Stefan Monnier + * smerge-mode.el (smerge-font-lock-keywords): Relax submatch 1. + * emacs-lisp/easy-mmode.el (define-minor-mode): Docstring fix. 2001-01-25 Dave Love 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 ;; 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. -- 2.39.5