# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1200464579 0
# Node ID 8f1628da223f3816a5354b8574bb82244bcd4f60
# Parent  01f00263925470ffeb676174452100f5c6c999c3
* smerge-mode.el (smerge-start-session): Rename from smerge-auto.
* pcvs.el (cvs-revert-if-needed):
* vc.el (vc-maybe-resolve-conflicts): Rename callers.

* vc-svn.el (vc-svn-find-file-hook):
* vc-arch.el (vc-arch-find-file-hook): Undo previous change.

diff -r 01f002639254 -r 8f1628da223f lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Jan 16 05:11:33 2008 +0000
+++ b/lisp/ChangeLog	Wed Jan 16 06:22:59 2008 +0000
@@ -1,3 +1,12 @@
+2008-01-16  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* smerge-mode.el (smerge-start-session): Rename from smerge-auto.
+	* pcvs.el (cvs-revert-if-needed):
+	* vc.el (vc-maybe-resolve-conflicts): Rename callers.
+
+	* vc-svn.el (vc-svn-find-file-hook):
+	* vc-arch.el (vc-arch-find-file-hook): Undo previous change.
+
 2008-01-16  Ulf Jasper  <ulf.jasper@web.de>
 
 	* calendar/icalendar.el (icalendar-version): Increase to 0.16.
diff -r 01f002639254 -r 8f1628da223f lisp/pcvs.el
--- a/lisp/pcvs.el	Wed Jan 16 05:11:33 2008 +0000
+++ b/lisp/pcvs.el	Wed Jan 16 06:22:59 2008 +0000
@@ -2311,7 +2311,7 @@
 	    ;; do want to reset the mode for VC, so we do it explicitly.
 	    (vc-find-file-hook)
 	    (when (eq (cvs-fileinfo->type fileinfo) 'CONFLICT)
-	      (smerge-auto))))))))
+	      (smerge-start-session))))))))
 
 
 (defun cvs-change-cvsroot (newroot)
diff -r 01f002639254 -r 8f1628da223f lisp/smerge-mode.el
--- a/lisp/smerge-mode.el	Wed Jan 16 05:11:33 2008 +0000
+++ b/lisp/smerge-mode.el	Wed Jan 16 06:22:59 2008 +0000
@@ -1050,7 +1050,7 @@
     (smerge-remove-props (point-min) (point-max))))
 
 ;;;###autoload
-(defun smerge-auto ()
+(defun smerge-start-session ()
   "Turn on `smerge-mode' and move point to first conflict marker.
 If no conflict maker is found, turn off `smerge-mode'."
   (smerge-mode 1)
diff -r 01f002639254 -r 8f1628da223f lisp/vc-arch.el
--- a/lisp/vc-arch.el	Wed Jan 16 05:11:33 2008 +0000
+++ b/lisp/vc-arch.el	Wed Jan 16 06:22:59 2008 +0000
@@ -360,7 +360,7 @@
 	    (if (not (re-search-forward "^<<<<<<< " nil t))
 		;; The .rej file is obsolete.
 		(condition-case nil (delete-file rej) (error nil))
-	      (smerge-auto)
+	      (smerge-mode 1)
 	      (add-hook 'after-save-hook
 			'vc-arch-delete-rej-if-obsolete nil t)
 	      (message "There are unresolved conflicts in this file")))
diff -r 01f002639254 -r 8f1628da223f lisp/vc-svn.el
--- a/lisp/vc-svn.el	Wed Jan 16 05:11:33 2008 +0000
+++ b/lisp/vc-svn.el	Wed Jan 16 06:22:59 2008 +0000
@@ -551,7 +551,7 @@
           (re-search-forward "^<<<<<<< " nil t))
         ;; There are conflict markers.
         (progn
-          (smerge-auto)
+          (smerge-start-session)
           (add-hook 'after-save-hook 'vc-svn-resolve-when-done nil t))
       ;; There are no conflict markers.  This is problematic: maybe it means
       ;; the conflict has been resolved and we should immediately call "svn
diff -r 01f002639254 -r 8f1628da223f lisp/vc.el
--- a/lisp/vc.el	Wed Jan 16 05:11:33 2008 +0000
+++ b/lisp/vc.el	Wed Jan 16 06:22:59 2008 +0000
@@ -2245,7 +2245,7 @@
 (defun vc-maybe-resolve-conflicts (file status &optional name-A name-B)
   (vc-resynch-buffer file t (not (buffer-modified-p)))
   (if (zerop status) (message "Merge successful")
-    (smerge-auto)
+    (smerge-mode 1)
     (message "File contains conflicts.")))
 
 ;;;###autoload