diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-01-22 07:55:18 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-01-22 07:55:18 -0800 |
| commit | 5715eb94e90b33ace59dd4c4ccb6e2122bc6db72 (patch) | |
| tree | 1c3aef6f5135b25738cd0d3a98ad807ec698ac1e /lisp/vc/smerge-mode.el | |
| parent | a1bfb926ca484190298045fc9e775002fe872bb5 (diff) | |
| parent | 3b0938c0420de2b845e7e8f8fbbb57ddc61718f2 (diff) | |
| download | emacs-5715eb94e90b33ace59dd4c4ccb6e2122bc6db72.tar.gz emacs-5715eb94e90b33ace59dd4c4ccb6e2122bc6db72.tar.bz2 emacs-5715eb94e90b33ace59dd4c4ccb6e2122bc6db72.zip | |
Merge from origin/emacs-27
3b0938c042 (origin/emacs-27) Render Ido suggestions using an overlay
d5d90dc412 * doc/misc/tramp.texi (Bug Reports): Encourage use of "ema...
ac09e8e121 * lisp/vc/smerge-mode.el (smerge-match-conflict): Fix bug#...
7e37e61f4b Correct statement about ftcr and recommend HarfBuzz
4aec94da37 Avoid leaving artifacts when the system caret is used on w32
5abd8d73b0 Improve display of temporary echo messages
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)) |