]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c1e6c2c) | patch
(smerge-refine-exchange-point): New command
authorStefan Monnier <monnier@iro.umontreal.ca>
Sat, 15 Feb 2025 04:28:52 +0000 (23:28 -0500)
committerEshel Yaron <me@eshelyaron.com>
Sat, 15 Feb 2025 19:31:43 +0000 (20:31 +0100)
commit1754305a28ad9a49ab9372daeb862fa98f8d1596
treef48e3b233824377f7c94dff6a4416418f6c6b942tree | snapshot
parentc1e6c2cec4afa68deca2c46715eed92b278fa3cacommit | diff
(smerge-refine-exchange-point): New command

* lisp/vc/smerge-mode.el (smerge--refine-highlight-change):
Allow empty region and always create an overlay.  Also, remember any
adjustment we applied the overlay's boundaries.
(smerge-refine-regions): Always create two overlays per hunk and "connect"
them via `smerge--refine-other`.
(smerge-refine-exchange-point): New command.

(cherry picked from commit 18ebbba6c422617a16cc36082a8ba871b5bfce2c)
lisp/vc/smerge-mode.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.