[Emacs-diffs] Changes to emacs/lisp/ChangeLog,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        07/10/19 15:59:14

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.11978
retrieving revision 1.11979
diff -u -b -r1.11978 -r1.11979
--- ChangeLog   19 Oct 2007 10:54:36 -0000      1.11978
+++ ChangeLog   19 Oct 2007 15:59:13 -0000      1.11979
@@ -1,3 +1,12 @@
+2007-10-19  Stefan Monnier  <address@hidden>
+
+       * smerge-mode.el: Add word-granularity refinement.
+       (smerge-refine-forward-function, smerge-refine-ignore-whitespace)
+       (smerge-refine-weight-hack): New vars.
+       (smerge-refine-forward): New fun.
+       (smerge-refine-chopup-region, smerge-refine-highlight-change): Use them.
+       (smerge-refine-subst): Use them as well.  Preserve point.
+
 2007-10-19  Juanma Barranquero  <address@hidden>
 
        * follow.el (follow-unload-function): New function.