From: Konstantin Kharlamov <Hi-Angel@yandex.ru>
Date: Mon, 18 Feb 2019 14:15:08 +0000 (-0500)
Subject: * lisp/vc/smerge-mode.el (smerge-vc-next-conflict): New command
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~19^2~3975
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2eecaa28972320a1b8886ac8cde353c2a2f4aa44;p=emacs.git

* lisp/vc/smerge-mode.el (smerge-vc-next-conflict): New command

Copyright-paperwork-exempt: yes
---

diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index 569797e18dd..ffca78ba8a3 100644
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -1432,6 +1432,20 @@ If no conflict maker is found, turn off `smerge-mode'."
         (smerge-next))
     (error (smerge-auto-leave))))
 
+(require 'vc)
+
+(defun smerge-vc-next-conflict ()
+  "Tries to go to next conflict in current file, otherwise tries
+to open next conflicted file version-control-system wise"
+  (interactive)
+  (let ((buffer (current-buffer)))
+    (when (not (smerge-goto-next-conflict))
+      (vc-find-conflicted-file)
+      (if (eq buffer (current-buffer))
+          (message "No conflicts found")
+        (goto-char 0)
+        (smerge-goto-next-conflict)))))
+
 (provide 'smerge-mode)
 
 ;;; smerge-mode.el ends here