Add handler to desktop-buffer-mode-handlers.

(dired-restore-desktop-buffer): Remove autoload cookie.
(dired-mode): Add autoload cookie.

diff --git a/lisp/dired.el b/lisp/dired.el
index 745a25551629bf85528dbfc68d73fa3f20bd9fd7..7c628d30da3618646ab68ed25e92a108a4210fcd 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1469,6 +1469,8 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST."
 ;; Dired mode is suitable only for specially formatted data.
 (put 'dired-mode 'mode-class 'special)
 
+;; Autoload cookie needed by desktop.el
+;;;###autoload
 (defun dired-mode (&optional dirname switches)
   "\
 Mode for \"editing\" directory listings.
@@ -3270,7 +3272,6 @@ Ask means pop up a menu for the user to select one of copy, move or link."
          (function (lambda (f) (desktop-file-name (car f) desktop-dirname)))
          dired-subdir-alist)))))
 
-;;;###autoload
 (defun dired-restore-desktop-buffer (desktop-buffer-file-name
                                      desktop-buffer-name
                                      desktop-buffer-misc)
@@ -3291,6 +3292,9 @@ Ask means pop up a menu for the user to select one of copy, move or link."
       (when desktop-missing-file-warning (sit-for 1))
       nil)))
 
+(add-to-list 'desktop-buffer-mode-handlers
+             '(dired-mode . dired-restore-desktop-buffer))
+
 \f
 (if (eq system-type 'vax-vms)
     (load "dired-vms"))