Mercurial > emacs
changeset 94626:5eb3ee73ed4e
(smerge-start-session): Don't call smerge-next if
looking at conflict marker.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Mon, 05 May 2008 06:16:20 +0000 |
| parents | be875b5d451e |
| children | 9cc7bc51e055 |
| files | lisp/ChangeLog lisp/smerge-mode.el |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon May 05 06:12:33 2008 +0000 +++ b/lisp/ChangeLog Mon May 05 06:16:20 2008 +0000 @@ -1,3 +1,8 @@ +2008-05-05 Tom Tromey <tromey@redhat.com> + + * smerge-mode.el (smerge-start-session): Don't call smerge-next if + looking at conflict marker. + 2008-05-05 Stefan Monnier <monnier@iro.umontreal.ca> * vc-dispatcher.el (vc-dir-mark-buffer-changed): Fix typo
--- a/lisp/smerge-mode.el Mon May 05 06:12:33 2008 +0000 +++ b/lisp/smerge-mode.el Mon May 05 06:16:20 2008 +0000 @@ -1227,7 +1227,8 @@ If no conflict maker is found, turn off `smerge-mode'." (smerge-mode 1) (condition-case nil - (smerge-next) + (unless (looking-at smerge-begin-re) + (smerge-next)) (error (smerge-auto-leave)))) (provide 'smerge-mode)