From: Richard M. Stallman <rms@gnu.org>
Date: Fri, 9 Sep 2005 01:16:05 +0000 (+0000)
Subject: (smerge-resolve): Pass args to smerge-remove-props.
X-Git-Tag: emacs-pretest-22.0.90~7218
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f57b45cfeeef35336bdba313bb3fd08ef69bbaf8;p=emacs.git

(smerge-resolve): Pass args to smerge-remove-props.
---

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))