From 96df41611e15a3ad68e382e64f0c6378441b4656 Mon Sep 17 00:00:00 2001 From: Jonathan Kamens Date: Sat, 5 Jan 2002 22:13:56 -0800 Subject: [PATCH] Fix a parenthesization error in the code for repairing some vc.el functions. [git-p4: depot-paths = "//guest/Ben_Key/vc-p4/,//guest/jonathan_kamens/vc-p4/,//guest/magnus_henoch/vc-p4/": change = 1216] --- vc-p4.el | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/vc-p4.el b/vc-p4.el index a9c4d01..9f1cc49 100644 --- a/vc-p4.el +++ b/vc-p4.el @@ -112,18 +112,18 @@ ;; return version of starting point (vc-branch-part branch))))))) -(if (not (fboundp 'vc-default-resolve-select-yours)) - (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") - (if (fboundp 'smerge-mode) (smerge-mode 1)) - (if (y-or-n-p "Conflicts detected. Resolve them now? ") - (if (and (fboundp 'smerge-ediff) - (not (vc-find-backend-function (vc-backend file) - 'resolve-select-yours))) - (smerge-ediff) - (vc-resolve-conflicts name-A name-B)) - (message "File contains conflict markers")))) +(if (fboundp 'vc-default-resolve-select-yours) t + (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") + (if (fboundp 'smerge-mode) (smerge-mode 1)) + (if (y-or-n-p "Conflicts detected. Resolve them now? ") + (if (and (fboundp 'smerge-ediff) + (not (vc-find-backend-function (vc-backend file) + 'resolve-select-yours))) + (smerge-ediff) + (vc-resolve-conflicts name-A name-B)) + (message "File contains conflict markers")))) (defun vc-default-resolve-select-yours (backend) (goto-char (point-min))