diff options
| author | Reiner Steib <Reiner.Steib@gmx.de> | 2008-05-11 20:26:00 +0000 |
|---|---|---|
| committer | Reiner Steib <Reiner.Steib@gmx.de> | 2008-05-11 20:26:00 +0000 |
| commit | e462b5b8a3d6933e9c260a53ddac74521f827225 (patch) | |
| tree | 79ce6856b31dd48f69a87aff89a7353718455135 /lisp/smerge-mode.el | |
| parent | fe93fcfebf131497778228696fdf5e5037e14e05 (diff) | |
| download | emacs-e462b5b8a3d6933e9c260a53ddac74521f827225.tar.gz | |
(smerge-start-session): Revert unintended change in 2008-05-10T13:06:33Z!Reiner.Steib@gmx.de.
Diffstat (limited to 'lisp/smerge-mode.el')
| -rw-r--r-- | lisp/smerge-mode.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index 7efe1e6ff08..7175ec2c40d 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -1228,7 +1228,8 @@ with a \\[universal-argument] prefix, makes up a 3-way conflict." 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) |