diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2017-11-11 11:53:42 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2017-11-11 11:53:42 +0200 |
| commit | 72f813fb5692a4b8ef0c57808941f0e97a588d7c (patch) | |
| tree | 9e4cbc18b3d227823e5ddb350614ba2503881c45 /lisp/desktop.el | |
| parent | 44340b475f942cd65788ef9a4e75190a3646c444 (diff) | |
| download | emacs-72f813fb5692a4b8ef0c57808941f0e97a588d7c.tar.gz | |
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
<pe.neidhardt@googlemail.com>. (Bug#28945)
Diffstat (limited to 'lisp/desktop.el')
| -rw-r--r-- | lisp/desktop.el | 8 |
1 files changed, 7 insertions, 1 deletions
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)))) |