mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-01 08:17:38 +00:00
Code Issues Releases Activity

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

Browse Source 
Copyright-paperwork-exempt: yes
This commit is contained in:
Konstantin Kharlamov 2019-02-18 09:15:08 -05:00 committed by Stefan Monnier
parent b05702d7eb
commit 2eecaa2897
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lisp/vc/smerge-mode.el
View File

@ -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