[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 2eecaa2 1/2: * lisp/vc/smerge-mode.el (smerge-vc-ne
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] master 2eecaa2 1/2: * lisp/vc/smerge-mode.el (smerge-vc-next-conflict): New command |
Date: |
Mon, 18 Feb 2019 09:44:08 -0500 (EST) |
branch: master
commit 2eecaa28972320a1b8886ac8cde353c2a2f4aa44
Author: Konstantin Kharlamov <address@hidden>
Commit: Stefan Monnier <address@hidden>
* lisp/vc/smerge-mode.el (smerge-vc-next-conflict): New command
Copyright-paperwork-exempt: yes
---
lisp/vc/smerge-mode.el | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index 569797e..ffca78b 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