mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Allow smerge-keep-current to work for empty hunks

Browse source 
Bug#25555
* lisp/vc/smerge-mode.el (smerge-get-current): Allow point to be at
match-end.
* test/lisp/vc/smerge-mode-tests.el: New file.
This commit is contained in:
Tom Tromey 2017-09-09 17:20:43 -06:00
parent 13aba24add
commit 9d101376b4
2 changed files with 35 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lisp/vc/smerge-mode.el
View file

@ -725,7 +725,7 @@ this keeps \"UUU\"."
(let ((i 3))
(while (or (not (match-end i))
(< (point) (match-beginning i))
(>= (point) (match-end i)))
(> (point) (match-end i)))
(cl-decf i))
i))