diff options
| author | Richard M. Stallman | 2005-09-09 01:16:05 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2005-09-09 01:16:05 +0000 |
| commit | f57b45cfeeef35336bdba313bb3fd08ef69bbaf8 (patch) | |
| tree | 07010be05333e31343567cbc8fbe40b1696f537e | |
| parent | 59442c805028487fa2d289680d67051e14191524 (diff) | |
| download | emacs-f57b45cfeeef35336bdba313bb3fd08ef69bbaf8.tar.gz emacs-f57b45cfeeef35336bdba313bb3fd08ef69bbaf8.zip | |
(smerge-resolve): Pass args to smerge-remove-props.
| -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 | |||
| 372 | some major modes. Uses `smerge-resolve-function' to do the actual work." | 372 | some major modes. Uses `smerge-resolve-function' to do the actual work." |
| 373 | (interactive) | 373 | (interactive) |
| 374 | (smerge-match-conflict) | 374 | (smerge-match-conflict) |
| 375 | (smerge-remove-props) | 375 | (smerge-remove-props (match-beginning 0) (match-end 0)) |
| 376 | (cond | 376 | (cond |
| 377 | ;; Trivial diff3 -A non-conflicts. | 377 | ;; Trivial diff3 -A non-conflicts. |
| 378 | ((and (eq (match-end 1) (match-end 3)) | 378 | ((and (eq (match-end 1) (match-end 3)) |