aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/desktop.el12
1 files changed, 7 insertions, 5 deletions
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 52cdbaf849d..2e53b15af38 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -216,8 +216,9 @@ determine where the desktop is saved."
216 :version "22.1") 216 :version "22.1")
217 217
218(defcustom desktop-auto-save-timeout auto-save-timeout 218(defcustom desktop-auto-save-timeout auto-save-timeout
219 "Number of seconds idle time before auto-save of the desktop. 219 "Number of seconds of idle time before auto-saving the desktop.
220The idle timer activates auto-saving only when window configuration changes. 220The desktop will be auto-saved when this amount of idle time have
221passed after some change in the window configuration.
221This applies to an existing desktop file when `desktop-save-mode' is enabled. 222This applies to an existing desktop file when `desktop-save-mode' is enabled.
222Zero or nil means disable auto-saving due to idleness." 223Zero or nil means disable auto-saving due to idleness."
223 :type '(choice (const :tag "Off" nil) 224 :type '(choice (const :tag "Off" nil)
@@ -1362,10 +1363,11 @@ Called by the timer created in `desktop-auto-save-set-timer'."
1362 (desktop-save desktop-dirname nil t))) 1363 (desktop-save desktop-dirname nil t)))
1363 1364
1364(defun desktop-auto-save-set-timer () 1365(defun desktop-auto-save-set-timer ()
1365 "Set the auto-save timer. 1366 "Set the desktop auto-save timer.
1366Cancel any previous timer. When `desktop-auto-save-timeout' is a positive 1367Cancel any previous timer. When `desktop-auto-save-timeout' is a positive
1367integer, start a new idle timer to call `desktop-auto-save' repeatedly 1368integer, start a new idle timer to call `desktop-auto-save' after that many
1368after that many seconds of idle time." 1369seconds of idle time.
1370This function is called from `window-configuration-change-hook'."
1369 (desktop-auto-save-cancel-timer) 1371 (desktop-auto-save-cancel-timer)
1370 (when (and (integerp desktop-auto-save-timeout) 1372 (when (and (integerp desktop-auto-save-timeout)
1371 (> desktop-auto-save-timeout 0)) 1373 (> desktop-auto-save-timeout 0))