Add word-granularity refinement.
authorStefan Monnier <monnier@iro.umontreal.ca>
Fri, 19 Oct 2007 15:59:13 +0000 (15:59 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Fri, 19 Oct 2007 15:59:13 +0000 (15:59 +0000)
commitcd62539fc7ce9529619880b309276ca9d6c6ce13
tree4590d0dc29f5a13ee1cabfecf97de3eadda95e07
parentfc7793831bdef46fef2cb400f2839fd846987110
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.
lisp/ChangeLog
lisp/smerge-mode.el