Mercurial > emacs

changeset 98337:34fed5300274

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix last fix.
author Chong Yidong <cyd@stupidchicken.com>
date Thu, 25 Sep 2008 01:46:06 +0000
parents 26ff192a882a
children b41e5dc22535
files lisp/vc.el
diffstat 1 files changed, 11 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/vc.el	Thu Sep 25 01:44:23 2008 +0000
+++ b/lisp/vc.el	Thu Sep 25 01:46:06 2008 +0000
@@ -1286,18 +1286,18 @@
   (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."