Commit f0c1adab authored by Stefan Monnier's avatar Stefan Monnier
Browse files

(smerge-font-lock-keywords): Relax submatch 1.

parent a2ed9670
2001-01-25 Stefan Monnier <monnier@cs.yale.edu>
 
* 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 <fx@gnu.org>
......
......@@ -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.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment