* lisp/vc/vc-dir.el (vc-dir-mode): Don't autoload it for everyone.

* lisp/desktop.el (vc-dir-mode): Just autoload it here.

3 files changed, 8 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fd42c57c5c9..5adfea1d07a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-02  Glenn Morris  <rgm@gnu.org>
+
+        * vc/vc-dir.el (vc-dir-mode): Don't autoload it for everyone.
+        * desktop.el (vc-dir-mode): Just autoload it here.
+
 2013-05-02  Alan Mackenzie  <acm@muc.de>
 
         Eliminate variable c-standard-font-lock-fontify-region-function.
diff --git a/lisp/desktop.el b/lisp/desktop.el
index e9a839c4cf7..8e66a9b81a3 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -1374,6 +1374,9 @@ If there are no buffers left to create, kill the timer."
       (desktop-auto-save-set-timer)
       (setq inhibit-startup-screen t))))
 
+;; So we can restore vc-dir buffers.
+(autoload 'vc-dir-mode "vc-dir" nil t)
+
 (provide 'desktop)
 
 ;;; desktop.el ends here
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el
index d10e3934680..1fdd2018946 100644
--- a/lisp/vc/vc-dir.el
+++ b/lisp/vc/vc-dir.el
@@ -930,8 +930,6 @@ If it is a file, return the corresponding cons for the file itself."
 
 (defvar use-vc-backend)  ;; dynamically bound
 
-;; Autoload cookie needed by desktop.el.
-;;;###autoload
 (define-derived-mode vc-dir-mode special-mode "VC dir"
   "Major mode for VC directory buffers.
 Marking/Unmarking key bindings and actions: