Add handler to desktop-buffer-mode-handlers.

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

diff --git a/lisp/info.el b/lisp/info.el
index 2d03190b6067e8719a355adbf27e86db858a51bc..462c27678558ad0e3ca69700d2033b88a5c1739d 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -3255,6 +3255,8 @@ With a zero prefix arg, put the name inside a function call to `info'."
 
 (defvar tool-bar-map)
 
+;; Autoload cookie needed by desktop.el
+;;;###autoload
 (defun Info-mode ()
   "Info mode provides commands for browsing through the Info documentation tree.
 Documentation in Info is divided into \"nodes\", each of which discusses
@@ -4179,7 +4181,6 @@ BUFFER is the buffer speedbar is requesting buttons for."
   (if (not (member Info-current-file '("apropos" "history" "toc")))
       (list Info-current-file Info-current-node)))
 
-;;;###autoload
 (defun Info-restore-desktop-buffer (desktop-buffer-file-name
                                     desktop-buffer-name
                                     desktop-buffer-misc)
@@ -4193,6 +4194,9 @@ BUFFER is the buffer speedbar is requesting buttons for."
     (Info-find-node first second)
     (current-buffer))))
 
+(add-to-list 'desktop-buffer-mode-handlers
+             '(Info-mode . Info-restore-desktop-buffer))
+
 (provide 'info)
 
 ;; arch-tag: f2480fe2-2139-40c1-a49b-6314991164ac