merge from trunk

3 files changed, 4 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e4bf56d24d7..cdf601e6259 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -15,6 +15,8 @@
         * progmodes/cperl-mode.el (Info-find-node):
         * vc/ediff.el (Info-goto-node): Update declarations.
 
+        * vc/vc-dispatcher.el (vc-dir-refresh): Declare.
+
         * vc/vc-bzr.el (vc-compilation-mode): Declare.
         (vc-bzr-pull): Require vc-dispatcher.
         * vc/vc-git.el (vc-compilation-mode): Declare.
diff --git a/lisp/play/spook.el b/lisp/play/spook.el
index 08c31d3878b..d2ecd3a62cc 100644
--- a/lisp/play/spook.el
+++ b/lisp/play/spook.el
@@ -69,10 +69,6 @@
                 "Checking authorization..."
                 "Checking authorization...Approved"))
 
-;; Note: the implementation that used to take up most of this file has been
-;; cleaned up, generalized, gratuitously broken by esr, and now resides in
-;; cookie1.el.
-
 (provide 'spook)
 
 ;;; spook.el ends here
diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el
index 7888752553e..62fb72d0fbc 100644
--- a/lisp/vc/vc-dispatcher.el
+++ b/lisp/vc/vc-dispatcher.el
@@ -398,6 +398,8 @@ Display the buffer in some window, but don't select it."
     (set (make-local-variable 'compilation-error-regexp-alist)
          error-regexp-alist)))
 
+(declare-function vc-dir-refresh "vc-dir" ())
+
 (defun vc-set-async-update (process-buffer)
   "Set a `vc-exec-after' action appropriate to the current buffer.
 This action will update the current buffer after the current