[Emacs-diffs] emacs-24 r117215: * lisp/desktop.el: Activate auto-saving on window configuration changes.

[Juri Linkov]

------------------------------------------------------------
revno: 117215
revision-id: address@hidden
parent: address@hidden
committer: Juri Linkov <address@hidden>
branch nick: emacs-24
timestamp: Sat 2014-06-07 02:38:40 +0300
message:
  * lisp/desktop.el: Activate auto-saving on window configuration changes.
  (desktop-save-mode, desktop-auto-save-timeout): Add/remove
  `desktop-auto-save-set-timer' to/from `window-configuration-change-hook'.
  (desktop-auto-save-set-timer): Change REPEAT arg of
  `run-with-idle-timer' from t to nil.
  http://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00147.html
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/desktop.el                desktop.el-20091113204419-o5vbwnq5f7feedwu-591

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-06-06 16:29:55 +0000
+++ b/lisp/ChangeLog    2014-06-06 23:38:40 +0000
@@ -1,3 +1,12 @@
+2014-06-06  Juri Linkov  <address@hidden>
+
+       * desktop.el: Activate auto-saving on window configuration changes.
+       (desktop-save-mode, desktop-auto-save-timeout): Add/remove
+       `desktop-auto-save-set-timer' to/from 
`window-configuration-change-hook'.
+       (desktop-auto-save-set-timer): Change REPEAT arg of
+       `run-with-idle-timer' from t to nil.
+       http://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00147.html
+
 2014-06-06  Santiago Payà i Miralta  <address@hidden>
 
        * vc/vc-hg.el (vc-hg-working-revision): Use "hg parent" and

=== modified file 'lisp/desktop.el'
--- a/lisp/desktop.el   2014-04-27 08:22:11 +0000
+++ b/lisp/desktop.el   2014-06-06 23:38:40 +0000
@@ -174,7 +174,10 @@
   :global t
   :group 'desktop
   (if desktop-save-mode
-      (desktop-auto-save-set-timer)
+      (when (and (integerp desktop-auto-save-timeout)
+                (> desktop-auto-save-timeout 0))
+       (add-hook 'window-configuration-change-hook 
'desktop-auto-save-set-timer))
+    (remove-hook 'window-configuration-change-hook 
'desktop-auto-save-set-timer)
     (desktop-auto-save-cancel-timer)))
 
 (defun desktop-save-mode-off ()
@@ -207,13 +210,18 @@
 
 (defcustom desktop-auto-save-timeout auto-save-timeout
   "Number of seconds idle time before auto-save of the desktop.
+The idle timer activates auto-saving only when window configuration changes.
 This applies to an existing desktop file when `desktop-save-mode' is enabled.
 Zero or nil means disable auto-saving due to idleness."
   :type '(choice (const :tag "Off" nil)
                  (integer :tag "Seconds"))
   :set (lambda (symbol value)
          (set-default symbol value)
-         (ignore-errors (desktop-auto-save-set-timer)))
+         (ignore-errors
+          (if (and (integerp value) (> value 0))
+              (add-hook 'window-configuration-change-hook 
'desktop-auto-save-set-timer)
+            (remove-hook 'window-configuration-change-hook 
'desktop-auto-save-set-timer)
+            (desktop-auto-save-cancel-timer))))
   :group 'desktop
   :version "24.4")
 
@@ -1244,7 +1252,7 @@
   (when (and (integerp desktop-auto-save-timeout)
             (> desktop-auto-save-timeout 0))
     (setq desktop-auto-save-timer
-         (run-with-idle-timer desktop-auto-save-timeout t
+         (run-with-idle-timer desktop-auto-save-timeout nil
                               'desktop-auto-save))))
 
 (defun desktop-auto-save-cancel-timer ()