[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el,v

[Reiner Steib]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Reiner Steib <rsteib>   08/05/11 20:26:01

Index: smerge-mode.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/smerge-mode.el,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- smerge-mode.el      11 May 2008 19:00:41 -0000      1.70
+++ smerge-mode.el      11 May 2008 20:26:00 -0000      1.71
@@ -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)