From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 21 Jan 2020 20:58:17 +0000 (-0500)
Subject: * lisp/vc/smerge-mode.el (smerge-match-conflict): Fix bug#38456
X-Git-Tag: emacs-27.0.90~116
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ac09e8e1213631e2843af7e81cffa749edc5f074;p=emacs.git

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

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