Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 85442:18feae785ad7 | 85443:13cb05eb9f29 |
|---|---|
| 1 2007-10-19 Stefan Monnier <monnier@iro.umontreal.ca> | |
| 2 | |
| 3 * smerge-mode.el: Add word-granularity refinement. | |
| 4 (smerge-refine-forward-function, smerge-refine-ignore-whitespace) | |
| 5 (smerge-refine-weight-hack): New vars. | |
| 6 (smerge-refine-forward): New fun. | |
| 7 (smerge-refine-chopup-region, smerge-refine-highlight-change): Use them. | |
| 8 (smerge-refine-subst): Use them as well. Preserve point. | |
| 9 | |
| 1 2007-10-19 Juanma Barranquero <lekktu@gmail.com> | 10 2007-10-19 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 11 |
| 3 * follow.el (follow-unload-function): New function. | 12 * follow.el (follow-unload-function): New function. |
| 4 | 13 |
| 5 * loadhist.el (unload-function-features-list): | 14 * loadhist.el (unload-function-features-list): |