diff options
| author | Richard M. Stallman <rms@gnu.org> | 2005-09-09 01:16:05 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 2005-09-09 01:16:05 +0000 |
| commit | 27cbe30179397abbb0bcc9aaeb76f48c0d4b747f (patch) | |
| tree | 913570a027e18cd4724524736a4cabe4c1e83090 /lisp/smerge-mode.el | |
| parent | 885d2d71331a0233dfc89da2432dadad1d0c0d27 (diff) | |
| download | emacs-27cbe30179397abbb0bcc9aaeb76f48c0d4b747f.tar.gz | |
(smerge-resolve): Pass args to smerge-remove-props.
Diffstat (limited to 'lisp/smerge-mode.el')
| -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 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)) |