From ac09e8e1213631e2843af7e81cffa749edc5f074 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 21 Jan 2020 15:58:17 -0500 Subject: [PATCH] * lisp/vc/smerge-mode.el (smerge-match-conflict): Fix bug#38456 This situation is not an internal error, but a perfectly normal occurrence, so a `cl-assert` is not right --- lisp/vc/smerge-mode.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el index d4984bbd38b..85868b91ecc 100644 --- a/lisp/vc/smerge-mode.el +++ b/lisp/vc/smerge-mode.el @@ -797,7 +797,10 @@ An error is raised if not inside a conflict." (filename (or (match-string 1) "")) (_ (re-search-forward smerge-end-re)) - (_ (cl-assert (< orig-point (match-end 0)))) + (_ (when (< (match-end 0) orig-point) + ;; Point is not within the conflict we found, + ;; so this conflict is not ours. + (signal 'search-failed (list smerge-begin-re)))) (lower-end (match-beginning 0)) (end (match-end 0)) -- 2.39.2