From: Eli Zaretskii Date: Sat, 11 Nov 2017 09:53:42 +0000 (+0200) Subject: Fix desktop auto-save timer when linum-mode is used X-Git-Tag: emacs-26.0.91~333 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=72f813fb5692a4b8ef0c57808941f0e97a588d7c;p=emacs.git 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 . (Bug#28945) --- diff --git a/lisp/desktop.el b/lisp/desktop.el index 2e53b15af38..c3c9da53b06 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))))