diff options
| author | Tom Tromey | 2017-09-09 17:20:43 -0600 |
|---|---|---|
| committer | Tom Tromey | 2017-09-16 21:55:05 -0600 |
| commit | 9d101376b42e51007e7f83b646e172c52251ae1e (patch) | |
| tree | ac684590a5f53ccb8a36b5de634503f36b072d19 /lisp | |
| parent | 13aba24adde7e46382daa1e4f0aad194e5232b83 (diff) | |
| download | emacs-9d101376b42e51007e7f83b646e172c52251ae1e.tar.gz emacs-9d101376b42e51007e7f83b646e172c52251ae1e.zip | |
Allow smerge-keep-current to work for empty hunks
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.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/vc/smerge-mode.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el index 112a9bc5247..91be89b5dc1 100644 --- a/lisp/vc/smerge-mode.el +++ b/lisp/vc/smerge-mode.el | |||
| @@ -725,7 +725,7 @@ this keeps \"UUU\"." | |||
| 725 | (let ((i 3)) | 725 | (let ((i 3)) |
| 726 | (while (or (not (match-end i)) | 726 | (while (or (not (match-end i)) |
| 727 | (< (point) (match-beginning i)) | 727 | (< (point) (match-beginning i)) |
| 728 | (>= (point) (match-end i))) | 728 | (> (point) (match-end i))) |
| 729 | (cl-decf i)) | 729 | (cl-decf i)) |
| 730 | i)) | 730 | i)) |
| 731 | 731 | ||