]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1754305) | patch
(smerge-refine-exchange-point): Error cleanly outside refinement
authorStefan Monnier <monnier@iro.umontreal.ca>
Sat, 15 Feb 2025 05:39:54 +0000 (00:39 -0500)
committerEshel Yaron <me@eshelyaron.com>
Sat, 15 Feb 2025 19:31:46 +0000 (20:31 +0100)
commite196ba650594e5ca877c17fd959138dc52b6a879
treea17693597bda9c0b0098b9a14be7f7e3d2105cfetree | snapshot
parent1754305a28ad9a49ab9372daeb862fa98f8d1596commit | diff
(smerge-refine-exchange-point): Error cleanly outside refinement

* lisp/vc/smerge-mode.el (smerge-refine-regions): Cover each region
with an overlay.
(smerge-refine-exchange-point): Use it to detect more reliably that
we're not inside a refined region.

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