From: Chong Yidong <cyd@stupidchicken.com>
Date: Thu, 25 Sep 2008 01:44:23 +0000 (+0000)
Subject: (vc-mark-resolved): Move message here from vc-default-mark-resolved.
X-Git-Tag: emacs-pretest-23.0.90~2773
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f41d99b0b46a9732c77208dfe0a18f03b3b044c0;p=emacs.git

(vc-mark-resolved): Move message here from vc-default-mark-resolved.
(vc-default-mark-resolved): Change to an alias for ignore.
---

diff --git a/lisp/vc.el b/lisp/vc.el
index fa2d45e1a3a..b4dd9eaf6ef 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -1289,6 +1289,13 @@ After check-out, runs the normal hook `vc-checkout-hook'."
   (with-vc-properties
    files
    (vc-call-backend backend 'mark-resolved files)
+   (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))))
 
@@ -2452,20 +2459,12 @@ to provide the `find-revision' operation instead."
       (message "Checking out %s...done" file))))
 
 (defalias 'vc-default-revision-completion-table 'ignore)
+(defalias 'vc-default-mark-resolved 'ignore)
 
 (defun vc-default-dir-status-files (backend dir files default-state update-function)
   (funcall update-function
            (mapcar (lambda (file) (list file default-state)) files)))
 
-(defun vc-default-mark-resolved (backend files)
-  (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")))
-
 (defun vc-check-headers ()
   "Check if the current file has any headers in it."
   (interactive)