diff options
| author | Stefan Monnier | 2026-03-09 10:34:05 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2026-03-09 10:34:05 -0400 |
| commit | 0487d68ab9992be4fa70cfd908909001f71e66af (patch) | |
| tree | 8c93da3b94717d184f88277e277de949ecb2fb9c /lisp/vc/smerge-mode.el | |
| parent | 798dceb467d4ead092979822f24090c8378f8320 (diff) | |
| download | emacs-scratch/error-API.tar.gz emacs-scratch/error-API.zip | |
Diffstat (limited to 'lisp/vc/smerge-mode.el')
| -rw-r--r-- | lisp/vc/smerge-mode.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el index c0f6fd426c1..3744ec501ec 100644 --- a/lisp/vc/smerge-mode.el +++ b/lisp/vc/smerge-mode.el | |||
| @@ -1444,7 +1444,7 @@ region, or with a numeric prefix. By default it uses a numeric prefix of 1." | |||
| 1444 | ;; conflicts instead! | 1444 | ;; conflicts instead! |
| 1445 | (condition-case err | 1445 | (condition-case err |
| 1446 | (smerge-match-conflict) | 1446 | (smerge-match-conflict) |
| 1447 | (error (if (not (markerp otherpos)) (signal (car err) (cdr err)) | 1447 | (error (if (not (markerp otherpos)) (signal err) |
| 1448 | (goto-char (prog1 otherpos (setq otherpos (point-marker)))) | 1448 | (goto-char (prog1 otherpos (setq otherpos (point-marker)))) |
| 1449 | (smerge-match-conflict)))) | 1449 | (smerge-match-conflict)))) |
| 1450 | (let ((beg (match-beginning 0)) | 1450 | (let ((beg (match-beginning 0)) |