From 2a3d70d45ddd62ab9be588303f0ea4a087fdbdc3 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 15 Apr 2004 20:46:54 +0000 Subject: [PATCH] (smerge-match-conflict): Fix last change. --- lisp/smerge-mode.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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." (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")) -- 2.39.5