Mercurial > emacs
diff lisp/ChangeLog @ 85443:13cb05eb9f29
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.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 19 Oct 2007 15:59:13 +0000 |
| parents | 18feae785ad7 |
| children | a3364ed63fcd |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Oct 19 10:54:36 2007 +0000 +++ b/lisp/ChangeLog Fri Oct 19 15:59:13 2007 +0000 @@ -1,3 +1,12 @@ +2007-10-19 Stefan Monnier <monnier@iro.umontreal.ca> + + * 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 <lekktu@gmail.com> * follow.el (follow-unload-function): New function.