[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el,v
From: |
Dan Nicolaescu |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el,v |
Date: |
Mon, 14 Jan 2008 07:38:08 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Dan Nicolaescu <dann> 08/01/14 07:38:06
Index: smerge-mode.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/smerge-mode.el,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- smerge-mode.el 8 Jan 2008 20:44:57 -0000 1.59
+++ smerge-mode.el 14 Jan 2008 07:38:04 -0000 1.60
@@ -1021,6 +1021,14 @@
(unless smerge-mode
(smerge-remove-props (point-min) (point-max))))
+;;;###autoload
+(defun smerge-auto ()
+ "Turn on `smerge-mode' and move point to first conflict marker.
+If no conflict maker is found, turn off `smerge-mode'."
+ (smerge-mode 1)
+ (condition-case nil
+ (smerge-next)
+ (error (smerge-auto-leave))))
(provide 'smerge-mode)