[Emacs-diffs] /srv/bzr/emacs/trunk r112440: * lisp/vc/vc-dir.el (vc-dir-mode): Don't autoload it for everyone.

[Glenn Morris]

------------------------------------------------------------
revno: 112440
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2013-05-02 13:47:39 -0400
message:
  * lisp/vc/vc-dir.el (vc-dir-mode): Don't autoload it for everyone.
  * lisp/desktop.el (vc-dir-mode): Just autoload it here.
modified:
  lisp/ChangeLog
  lisp/desktop.el
  lisp/vc/vc-dir.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-05-02 11:18:18 +0000
+++ b/lisp/ChangeLog    2013-05-02 17:47:39 +0000
@@ -1,3 +1,8 @@
+2013-05-02  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        Eliminate variable c-standard-font-lock-fontify-region-function.

=== modified file 'lisp/desktop.el'
--- a/lisp/desktop.el   2013-04-27 20:55:00 +0000
+++ b/lisp/desktop.el   2013-05-02 17:47:39 +0000
@@ -1374,6 +1374,9 @@
       (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

=== modified file 'lisp/vc/vc-dir.el'
--- a/lisp/vc/vc-dir.el 2013-01-02 16:13:04 +0000
+++ b/lisp/vc/vc-dir.el 2013-05-02 17:47:39 +0000
@@ -930,8 +930,6 @@
 
 (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: