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

[Stefan Monnier]

Index: emacs/lisp/desktop.el
diff -u emacs/lisp/desktop.el:1.47 emacs/lisp/desktop.el:1.48
--- emacs/lisp/desktop.el:1.47  Tue Oct 23 09:52:45 2001
+++ emacs/lisp/desktop.el       Fri Nov 16 09:32:38 2001
@@ -698,10 +698,9 @@
       (cond ((equal '(t) mim)   (auto-fill-mode 1))    ; backwards compatible
            ((equal '(nil) mim) (auto-fill-mode 0))
            (t (mapcar #'(lambda (minor-mode)
-                          (unless (or (eq minor-mode t) (eq minor-mode nil))
-                            (if (and minor-mode (fboundp minor-mode))
-                                (funcall minor-mode 1))))
-                          mim)))
+                          (when (functionp minor-mode)
+                            (funcall minor-mode 1)))
+                      mim)))
       (goto-char pt)
       (if (consp mk)
          (progn