Mercurial > emacs
changeset 54904:a23bbf466906
(smerge-match-conflict): Fix last change.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Thu, 15 Apr 2004 20:46:54 +0000 |
| parents | 922f49230ff5 |
| children | da06b9bd886b |
| files | lisp/smerge-mode.el |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/smerge-mode.el Thu Apr 15 20:19:11 2004 +0000 +++ b/lisp/smerge-mode.el Thu Apr 15 20:46:54 2004 +0000 @@ -479,7 +479,7 @@ (cond ((save-excursion (goto-char mine-start) - (re-search-forward smerge-begin-re nil end)) + (re-search-forward smerge-begin-re end t)) ;; There's a nested conflict and we're after the the beginning ;; of the outer one but before the beginning of the inner one. (error "There is a nested conflict"))