Mercurial > emacs

diff lisp/smerge-mode.el @ 87743:c2a952d12e21

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* smerge-mode.el (smerge-auto): New function. * vc-svn.el (vc-svn-find-file-hook): * vc-arch.el (vc-arch-find-file-hook): * pcvs.el (cvs-revert-if-needed): * vc.el (vc-maybe-resolve-conflicts): Use it instead of vc-mode. (top-level): Add a Todo list.
author Dan Nicolaescu <dann@ics.uci.edu>
date Mon, 14 Jan 2008 07:38:05 +0000
parents 107ccd98fa12
children 90318261ac4d
line wrap: on
line diff
--- a/lisp/smerge-mode.el	Sun Jan 13 22:10:51 2008 +0000
+++ b/lisp/smerge-mode.el	Mon Jan 14 07:38:05 2008 +0000
@@ -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)