From 28e4e2b434e3574f01b69c585dcccaecde6c940f Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Wed, 16 Jan 2008 06:22:59 +0000 Subject: [PATCH] * 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. --- lisp/ChangeLog | 9 +++++++++ lisp/pcvs.el | 2 +- lisp/smerge-mode.el | 2 +- lisp/vc-arch.el | 2 +- lisp/vc-svn.el | 2 +- lisp/vc.el | 2 +- 6 files changed, 14 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2ee346b33a2..8ae0d57023d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2008-01-16 Dan Nicolaescu + + * 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 * calendar/icalendar.el (icalendar-version): Increase to 0.16. diff --git a/lisp/pcvs.el b/lisp/pcvs.el index 401962872a2..462597a277b 100644 --- a/lisp/pcvs.el +++ b/lisp/pcvs.el @@ -2311,7 +2311,7 @@ this file, or a list of arguments to send to the program." ;; 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 --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index e7352c4479e..f2a7a9caf9e 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -1050,7 +1050,7 @@ with a \\[universal-argument] prefix, makes up a 3-way conflict." (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 --git a/lisp/vc-arch.el b/lisp/vc-arch.el index 97c99dd8193..284fe032a25 100644 --- a/lisp/vc-arch.el +++ b/lisp/vc-arch.el @@ -360,7 +360,7 @@ Return non-nil if FILE is unchanged." (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 --git a/lisp/vc-svn.el b/lisp/vc-svn.el index 16e10edc202..e463e138490 100644 --- a/lisp/vc-svn.el +++ b/lisp/vc-svn.el @@ -551,7 +551,7 @@ and that it passes `vc-svn-global-switches' to it before FLAGS." (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 --git a/lisp/vc.el b/lisp/vc.el index cc2627bb792..ac83365613b 100644 --- a/lisp/vc.el +++ b/lisp/vc.el @@ -2245,7 +2245,7 @@ See Info node `Merging'." (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 -- 2.11.4.GIT