diff options
| author | Miles Bader <miles@gnu.org> | 2005-09-11 22:21:01 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2005-09-11 22:21:01 +0000 |
| commit | ff8d296438e69b8cf701d95b6ccd271c416c46fd (patch) | |
| tree | 44b388101b40592656ad4c5033aabe2a1ae4b462 /lisp/smerge-mode.el | |
| parent | 389cb481135145b80a679beec8cdc8fed75682c5 (diff) | |
| parent | a8f6d239d2d541ec874a22000e0542c20fd55a67 (diff) | |
| download | emacs-ff8d296438e69b8cf701d95b6ccd271c416c46fd.tar.gz emacs-ff8d296438e69b8cf701d95b6ccd271c416c46fd.tar.bz2 emacs-ff8d296438e69b8cf701d95b6ccd271c416c46fd.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-81
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 532-541)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 112-115)
- Update from CVS
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)) |