[Emacs-diffs] emacs-26 72f813f: Fix desktop auto-save timer when linum-mode is used

[Eli Zaretskii]

branch: emacs-26
commit 72f813fb5692a4b8ef0c57808941f0e97a588d7c
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Fix desktop auto-save timer when linum-mode is used
    
    * lisp/desktop.el (desktop-read): Use toplevel value of
    window-configuration-change-hook when deciding whether desktop
    auto-saving is enabled.  Suggested by Peter Neidhardt
    <address@hidden>.  (Bug#28945)
---
 lisp/desktop.el | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lisp/desktop.el b/lisp/desktop.el
index 2e53b15..c3c9da5 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -1240,7 +1240,13 @@ Using it may cause conflicts.  Use it anyway? " 
owner)))))
            ;; disabled when loading the desktop fails with errors,
            ;; thus not overwriting the desktop with broken contents.
            (setq desktop-autosave-was-enabled
-                 (memq 'desktop-auto-save-set-timer 
window-configuration-change-hook))
+                 (memq 'desktop-auto-save-set-timer
+                        ;; Use the toplevel value of the hook, in case some
+                        ;; feature makes window-configuration-change-hook
+                        ;; buffer-local, and puts there stuff which
+                        ;; doesn't include our timer.
+                        (default-toplevel-value
+                          'window-configuration-change-hook)))
            (desktop-auto-save-disable)
            ;; Evaluate desktop buffer and remember when it was modified.
            (setq desktop-file-modtime (nth 5 (file-attributes 
(desktop-full-file-name))))