[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 9d10137 2/3: Allow smerge-keep-current to work fo
From: |
Tom Tromey |
Subject: |
[Emacs-diffs] emacs-26 9d10137 2/3: Allow smerge-keep-current to work for empty hunks |
Date: |
Sun, 17 Sep 2017 00:31:38 -0400 (EDT) |
branch: emacs-26
commit 9d101376b42e51007e7f83b646e172c52251ae1e
Author: Tom Tromey <address@hidden>
Commit: Tom Tromey <address@hidden>
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.
---
lisp/vc/smerge-mode.el | 2 +-
test/lisp/vc/smerge-mode-tests.el | 34 ++++++++++++++++++++++++++++++++++
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index 112a9bc..91be89b 100644
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -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))
diff --git a/test/lisp/vc/smerge-mode-tests.el
b/test/lisp/vc/smerge-mode-tests.el
new file mode 100644
index 0000000..204a4b9
--- /dev/null
+++ b/test/lisp/vc/smerge-mode-tests.el
@@ -0,0 +1,34 @@
+;; Copyright (C) 2017 Free Software Foundation, Inc
+
+;; Maintainer: address@hidden
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(require 'smerge-mode)
+
+(ert-deftest smerge-mode-test-empty-hunk ()
+ "Regression test for bug #25555"
+ (with-temp-buffer
+ (insert "<<<<<<< one\n")
+ (save-excursion
+ (insert "=======\nLLL\n>>>>>>> end\n"))
+ (smerge-mode)
+ (smerge-keep-current)
+ (should (equal (buffer-substring (point-min) (point-max)) ""))))
+
+(provide 'smerge-mode-tests)