diff options
| -rw-r--r-- | lisp/vc/smerge-mode.el | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el index 85868b91ecc..d0a83fd7c49 100644 --- a/lisp/vc/smerge-mode.el +++ b/lisp/vc/smerge-mode.el | |||
| @@ -1429,15 +1429,16 @@ with a \\[universal-argument] prefix, makes up a 3-way conflict." | |||
| 1429 | (smerge-remove-props (point-min) (point-max)))) | 1429 | (smerge-remove-props (point-min) (point-max)))) |
| 1430 | 1430 | ||
| 1431 | ;;;###autoload | 1431 | ;;;###autoload |
| 1432 | (defun smerge-start-session () | 1432 | (defun smerge-start-session (&optional interactively) |
| 1433 | "Turn on `smerge-mode' and move point to first conflict marker. | 1433 | "Turn on `smerge-mode' and move point to first conflict marker. |
| 1434 | If no conflict maker is found, turn off `smerge-mode'." | 1434 | If no conflict maker is found, turn off `smerge-mode'." |
| 1435 | (interactive) | 1435 | (interactive "p") |
| 1436 | (smerge-mode 1) | 1436 | (when (or (null smerge-mode) interactively) |
| 1437 | (condition-case nil | 1437 | (smerge-mode 1) |
| 1438 | (unless (looking-at smerge-begin-re) | 1438 | (condition-case nil |
| 1439 | (smerge-next)) | 1439 | (unless (looking-at smerge-begin-re) |
| 1440 | (error (smerge-auto-leave)))) | 1440 | (smerge-next)) |
| 1441 | (error (smerge-auto-leave))))) | ||
| 1441 | 1442 | ||
| 1442 | (defcustom smerge-change-buffer-confirm t | 1443 | (defcustom smerge-change-buffer-confirm t |
| 1443 | "If non-nil, request confirmation before moving to another buffer." | 1444 | "If non-nil, request confirmation before moving to another buffer." |