[Emacs-diffs] Changes to emacs/lisp/vc.el,v

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/09/25 01:46:06

Index: vc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc.el,v
retrieving revision 1.703
retrieving revision 1.704
diff -u -b -r1.703 -r1.704
--- vc.el       25 Sep 2008 01:44:23 -0000      1.703
+++ vc.el       25 Sep 2008 01:46:06 -0000      1.704
@@ -1286,18 +1286,18 @@
   (run-hooks 'vc-checkout-hook))
 
 (defun vc-mark-resolved (backend files)
-  (with-vc-properties
+  (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))))
+       "this file"))))
 
 (defun vc-steal-lock (file rev owner)
   "Steal the lock on FILE."