aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2007-10-19 15:59:13 +0000
committerStefan Monnier2007-10-19 15:59:13 +0000
commitcd62539fc7ce9529619880b309276ca9d6c6ce13 (patch)
tree4590d0dc29f5a13ee1cabfecf97de3eadda95e07 /src
parentfc7793831bdef46fef2cb400f2839fd846987110 (diff)
downloademacs-cd62539fc7ce9529619880b309276ca9d6c6ce13.tar.gz
emacs-cd62539fc7ce9529619880b309276ca9d6c6ce13.zip
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.
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions