From f57b45cfeeef35336bdba313bb3fd08ef69bbaf8 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Fri, 9 Sep 2005 01:16:05 +0000 Subject: [PATCH] (smerge-resolve): Pass args to smerge-remove-props. --- 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 4b677edc36a..31c7c4f2f12 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -372,7 +372,7 @@ This relies on mode-specific knowledge and thus only works in some major modes. Uses `smerge-resolve-function' to do the actual work." (interactive) (smerge-match-conflict) - (smerge-remove-props) + (smerge-remove-props (match-beginning 0) (match-end 0)) (cond ;; Trivial diff3 -A non-conflicts. ((and (eq (match-end 1) (match-end 3)) -- 2.39.5