mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-03 20:24:29 +00:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Stefan Monnier 2001-01-25 15:37:21 +00:00
parent a2ed96700b
commit f0c1adabcb
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/ChangeLog
View File

@ -1,5 +1,7 @@
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
lisp/smerge-mode.el
View File

@ -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.