From: Karl Heuer <kwzh@gnu.org>
Date: Wed, 11 Nov 1998 19:31:24 +0000 (+0000)
Subject: (desktop-save, desktop-create-buffer): Undo 10-22 change.
X-Git-Tag: emacs-20.4~1250
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=201006c436af5bd45bcb0520e31717b5da9b1eba;p=emacs.git

(desktop-save, desktop-create-buffer): Undo 10-22 change.
---

diff --git a/lisp/desktop.el b/lisp/desktop.el
index 15c1c3d4c1d..6b893dc5aa3 100644
--- 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
@@ -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