diff options
| author | Stefan Monnier | 2004-04-15 20:46:54 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2004-04-15 20:46:54 +0000 |
| commit | 2a3d70d45ddd62ab9be588303f0ea4a087fdbdc3 (patch) | |
| tree | 8a5b32b5a7d3ea407d5ad77c936aa96f3cd04306 | |
| parent | 9f0c286d22c49f88af21e00532e2fd232f748c99 (diff) | |
| download | emacs-2a3d70d45ddd62ab9be588303f0ea4a087fdbdc3.tar.gz emacs-2a3d70d45ddd62ab9be588303f0ea4a087fdbdc3.zip | |
(smerge-match-conflict): Fix last change.
| -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 80547821343..8194a7d8e21 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el | |||
| @@ -479,7 +479,7 @@ An error is raised if not inside a conflict." | |||
| 479 | (cond | 479 | (cond |
| 480 | ((save-excursion | 480 | ((save-excursion |
| 481 | (goto-char mine-start) | 481 | (goto-char mine-start) |
| 482 | (re-search-forward smerge-begin-re nil end)) | 482 | (re-search-forward smerge-begin-re end t)) |
| 483 | ;; There's a nested conflict and we're after the the beginning | 483 | ;; There's a nested conflict and we're after the the beginning |
| 484 | ;; of the outer one but before the beginning of the inner one. | 484 | ;; of the outer one but before the beginning of the inner one. |
| 485 | (error "There is a nested conflict")) | 485 | (error "There is a nested conflict")) |