diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2020-01-21 15:58:17 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2020-01-21 15:58:17 -0500 |
| commit | ac09e8e1213631e2843af7e81cffa749edc5f074 (patch) | |
| tree | 6b414e8f6fe58953b11a35795cd70c112a18e64f /lisp/vc/smerge-mode.el | |
| parent | 7e37e61f4b9729ac54d80715de9dcc928e0aaf26 (diff) | |
| download | emacs-ac09e8e1213631e2843af7e81cffa749edc5f074.tar.gz emacs-ac09e8e1213631e2843af7e81cffa749edc5f074.tar.bz2 emacs-ac09e8e1213631e2843af7e81cffa749edc5f074.zip | |
* 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
Diffstat (limited to 'lisp/vc/smerge-mode.el')
| -rw-r--r-- | lisp/vc/smerge-mode.el | 5 |
1 files changed, 4 insertions, 1 deletions
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)) |