diff options
| author | Stefan Monnier | 2017-05-17 15:44:36 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2017-05-17 15:44:36 -0400 |
| commit | 184d74ce002ecb7399cb2b47fc671bfb2feb9855 (patch) | |
| tree | 7ef28d79d63332c3440c0e2ee43c73d6b437f535 /src | |
| parent | 709259dcc501ef991991a35a6ffb2aef02a62c60 (diff) | |
| download | emacs-184d74ce002ecb7399cb2b47fc671bfb2feb9855.tar.gz emacs-184d74ce002ecb7399cb2b47fc671bfb2feb9855.zip | |
* 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.
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions