changeset 35565:9a56f039a37a

*** empty log message ***
author Stefan Monnier <monnier@iro.umontreal.ca>
date Thu, 25 Jan 2001 15:37:21 +0000
parents b546ef3b2284
children 5b94bf04d78b
files lisp/ChangeLog
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Thu Jan 25 15:36:32 2001 +0000
+++ b/lisp/ChangeLog	Thu Jan 25 15:37:21 2001 +0000
@@ -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>