procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/vc/smerge-mode.el (smerge-start-session): Don't re-enable

Browse source 
Don't do anything if smerge-mode is already enabled.
This commit is contained in:
Stefan Monnier 2020-03-18 10:20:13 -04:00
parent f189e5dc10
commit 299744e083
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lisp/vc/smerge-mode.el
View file

@ -1429,15 +1429,16 @@ with a \\[universal-argument] prefix, makes up a 3-way conflict."
(smerge-remove-props (point-min) (point-max))))
;;;###autoload
(defun smerge-start-session ()
(defun smerge-start-session (&optional interactively)
"Turn on `smerge-mode' and move point to first conflict marker.
If no conflict maker is found, turn off `smerge-mode'."
(interactive)
(smerge-mode 1)
(condition-case nil
(unless (looking-at smerge-begin-re)
(smerge-next))
(error (smerge-auto-leave))))
(interactive "p")
(when (or (null smerge-mode) interactively)
(smerge-mode 1)
(condition-case nil
(unless (looking-at smerge-begin-re)
(smerge-next))
(error (smerge-auto-leave)))))
(defcustom smerge-change-buffer-confirm t
"If non-nil, request confirmation before moving to another buffer."