Mercurial > emacs
changeset 65379:66ed969ca7cc
(smerge-resolve): Pass args to smerge-remove-props.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Fri, 09 Sep 2005 01:16:05 +0000 |
| parents | f9dc4686f0a5 |
| children | 71481859776b |
| files | lisp/smerge-mode.el |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/smerge-mode.el Fri Sep 09 01:15:25 2005 +0000 +++ b/lisp/smerge-mode.el Fri Sep 09 01:16:05 2005 +0000 @@ -372,7 +372,7 @@ 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))