Mercurial > emacs
changeset 94865:f413ee341af0
(smerge-start-session): Revert unintended change in revision 1.69.
| author | Reiner Steib <Reiner.Steib@gmx.de> |
|---|---|
| date | Sun, 11 May 2008 20:26:00 +0000 |
| parents | e2fb0c9c7a42 |
| children | b416c510e592 |
| files | lisp/smerge-mode.el |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/smerge-mode.el Sun May 11 20:25:15 2008 +0000 +++ b/lisp/smerge-mode.el Sun May 11 20:26:00 2008 +0000 @@ -1228,7 +1228,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)