diff options
| author | Stefan Monnier <[email protected]> | 2004-04-15 20:46:54 +0000 |
|---|---|---|
| committer | Stefan Monnier <[email protected]> | 2004-04-15 20:46:54 +0000 |
| commit | 2a3d70d45ddd62ab9be588303f0ea4a087fdbdc3 (patch) | |
| tree | 8a5b32b5a7d3ea407d5ad77c936aa96f3cd04306 /lisp/smerge-mode.el | |
| parent | 9f0c286d22c49f88af21e00532e2fd232f748c99 (diff) | |
(smerge-match-conflict): Fix last change.
Diffstat (limited to 'lisp/smerge-mode.el')
| -rw-r--r-- | lisp/smerge-mode.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index 8054782134..8194a7d8e2 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -479,7 +479,7 @@ An error is raised if not inside a conflict." (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")) |