From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sun, 17 Apr 2022 18:21:40 +0000 (+0200)
Subject: Make desktop.el use local-minor-modes when saving
X-Git-Tag: emacs-29.0.90~1931^2~449
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c5253aa01eef0f080fdfa53e4b0ada20a6782e53;p=emacs.git

Make desktop.el use local-minor-modes when saving

* lisp/desktop.el (desktop-buffer-info): Use a more reliable way
to get minor modes (bug#29972).
---

diff --git a/lisp/desktop.el b/lisp/desktop.el
index 7e3d66bdf1f..cd581e028ba 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -847,15 +847,16 @@ buffer, which is (in order):
     ,(buffer-name)
     ,major-mode
     ;; minor modes
-    ,(let (ret)
-       (dolist (minor-mode (mapcar #'car minor-mode-alist) ret)
-         (and (boundp minor-mode)
-              (symbol-value minor-mode)
-              (let* ((special (assq minor-mode desktop-minor-mode-table))
-                     (value (cond (special (cadr special))
-                                  ((get minor-mode :minor-mode-function))
-                                  ((functionp minor-mode) minor-mode))))
-                (when value (cl-pushnew value ret))))))
+    ,(seq-filter
+      (lambda (minor-mode)
+        ;; Just two sanity checks.
+        (and (boundp minor-mode)
+             (symbol-value minor-mode)
+             (let ((special
+                    (assq minor-mode desktop-minor-mode-table)))
+               (or (not special)
+                   (cadr special)))))
+      local-minor-modes)
     ;; point and mark, and read-only status
     ,(point)
     ,(list (mark t) mark-active)