| commit | 184d74ce002ecb7399cb2b47fc671bfb2feb9855 | |
| author | Stefan Monnier <monnier@iro.umontreal.ca> | |
| Wed, 17 May 2017 19:44:36 +0000 (17 15:44 -0400) | ||
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | |
| Wed, 17 May 2017 19:44:36 +0000 (17 15:44 -0400) | ||
| tree | 7ef28d79d63332c3440c0e2ee43c73d6b437f535 | treesnapshot (tar.gz zip) |
| parent | 709259dcc501ef991991a35a6ffb2aef02a62c60 | commitdiff |
* lisp/vc/smerge-mode.el (smerge-refine-regions): Work in multi-bufs
Rename from smerge-refine-subst. Allow the `beg's to be markers.
Add autoload cookie.
(smerge--refine-forward): Rename from smerge-refine-forward.
(smerge--refine-chopup-region): Rename from smerge-refine-chopup-region.
Assume that its `beg` arg is a marker.
(smerge--refine-highlight-change): Rename from
smerge-refine-highlight-change. Remove `buf` arg.
(smerge-refine-subst): Redefine as an obsolete alias.
Rename from smerge-refine-subst. Allow the `beg's to be markers.
Add autoload cookie.
(smerge--refine-forward): Rename from smerge-refine-forward.
(smerge--refine-chopup-region): Rename from smerge-refine-chopup-region.
Assume that its `beg` arg is a marker.
(smerge--refine-highlight-change): Rename from
smerge-refine-highlight-change. Remove `buf` arg.
(smerge-refine-subst): Redefine as an obsolete alias.
| etc/NEWS | diffblobblamehistory | |
| lisp/vc/smerge-mode.el | diffblobblamehistory |