(recover-file): Recover buffer-file-coding-system.

[bpt/emacs.git] / lisp / desktop.el

diff --git a/lisp/desktop.el b/lisp/desktop.el
index 3951f8e..6b893dc 100644 (file)
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -432,13 +432,8 @@ MODE is the major mode."
                               (buffer-file-name)
                               (buffer-name)
                               major-mode
-                              (let (ret)
-                                (mapcar #'(lambda (minor-mode)
-                                            (and (symbol-value minor-mode)
-                                                 (setq ret (cons minor-mode
-                                                                 ret))))
-                                        (mapcar #'car minor-mode-alist))
-                                ret)
+                              (list    ; list explaining minor modes
+                               (not (null auto-fill-function)))
                               (point)
                               (list (mark t) mark-active)
                               buffer-read-only
@@ -574,7 +569,7 @@ to provide correct modes for autoloaded files."
       (if (file-directory-p (file-name-directory (car desktop-buffer-misc)))
          (progn
             (dired (car desktop-buffer-misc))
-           (mapcar 'dired-insert-subdir (cdr desktop-buffer-misc))
+           (mapcar 'dired-maybe-insert-subdir (cdr desktop-buffer-misc))
            (current-buffer))
        (message "Directory %s no longer exists." (car desktop-buffer-misc))
        (sit-for 1)
@@ -606,9 +601,7 @@ to provide correct modes for autoloaded files."
       (set-buffer result)
       (if (not (equal (buffer-name) desktop-buffer-name))
          (rename-buffer desktop-buffer-name))
-      (cond ((equal '(t) mim)   (auto-fill-mode 1))    ; backwards compatible
-           ((equal '(nil) mim) (auto-fill-mode 0))
-           (t (mapcar #'(lambda (minor-mode) (funcall minor-mode 1)) mim)))
+      (auto-fill-mode (if (nth 0 mim) 1 0))
       (goto-char pt)
       (if (consp mk)
          (progn