# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 977527187 0
# Node ID 54228e607df53507b5cf4b4cf12d0f84f0a8e7fd
# Parent  f05ec8dfc452214323623c42c80ce798642a2982
*** empty log message ***

diff -r f05ec8dfc452 -r 54228e607df5 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Dec 22 23:16:22 2000 +0000
+++ b/lisp/ChangeLog	Fri Dec 22 23:19:47 2000 +0000
@@ -3,6 +3,7 @@
 	* smerge-mode.el (smerge-basic-map): Use `=' rather than `d'.
 	Use minibuffer menu prompt for the `=' prefix.
 	(smerge-command-prefix): Change default to C-^.
+	(smerge-mode): Don't assume font-lock doesn't move point.
 
 	* skeleton.el (skeleton-internal-1): Make sure the first line of
 	the region is also re-indented.