[Emacs-diffs] Changes to emacs/lisp/dired.el

[Lars Hansen]

Index: emacs/lisp/dired.el
diff -c emacs/lisp/dired.el:1.322 emacs/lisp/dired.el:1.323
*** emacs/lisp/dired.el:1.322   Sat Aug  6 22:13:42 2005
--- emacs/lisp/dired.el Wed Aug 10 19:39:16 2005
***************
*** 1469,1474 ****
--- 1469,1476 ----
  ;; 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,3276 ****
           (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)
--- 3272,3277 ----
***************
*** 3290,3295 ****
--- 3291,3299 ----
        (message "Desktop: Directory %s no longer exists." dir)
        (when desktop-missing-file-warning (sit-for 1))
        nil)))
+ 
+ (add-to-list 'desktop-buffer-mode-handlers
+              '(dired-mode . dired-restore-desktop-buffer))
  
  
  (if (eq system-type 'vax-vms)