From: Chong Yidong <cyd@stupidchicken.com>
Date: Thu, 25 Sep 2008 01:46:06 +0000 (+0000)
Subject: Fix last fix.
X-Git-Tag: emacs-pretest-23.0.90~2772
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6002d9b956710e58b1decdc098ea7ef8e9042d07;p=emacs.git

Fix last fix.
---

diff --git a/lisp/vc.el b/lisp/vc.el
index b4dd9eaf6ef..64b1e943f82 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -1286,18 +1286,18 @@ After check-out, runs the normal hook `vc-checkout-hook'."
   (run-hooks 'vc-checkout-hook))
 
 (defun vc-mark-resolved (backend files)
-  (with-vc-properties
-   files
-   (vc-call-backend backend 'mark-resolved files)
-   (message
-    (substitute-command-keys
-     "Conflicts have been resolved in %s.  \
+  (prog1 (with-vc-properties
+	  files
+	  (vc-call-backend backend 'mark-resolved files)
+	  ;; FIXME: Is this TRTD?  Might not be.
+	  `((vc-state . edited)))
+    (message
+     (substitute-command-keys
+      "Conflicts have been resolved in %s.  \
 Type \\[vc-next-action] to check in changes.")
-    (if (> (length files) 1)
-	(format "%d files" (length files))
-      "this file"))
-   ;; FIXME: Is this TRTD?  Might not be.
-   `((vc-state . edited))))
+     (if (> (length files) 1)
+	 (format "%d files" (length files))
+       "this file"))))
 
 (defun vc-steal-lock (file rev owner)
   "Steal the lock on FILE."