[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r116302: * lisp/desktop.el (desktop-save-mode): Call
From: |
Juri Linkov |
Subject: |
[Emacs-diffs] trunk r116302: * lisp/desktop.el (desktop-save-mode): Call `desktop-auto-save-set-timer' |
Date: |
Fri, 07 Feb 2014 07:44:46 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 116302
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16630
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Fri 2014-02-07 09:44:29 +0200
message:
* lisp/desktop.el (desktop-save-mode): Call `desktop-auto-save-set-timer'
when enabling, and `desktop-auto-save-cancel-timer' when disabling.
(desktop-auto-save-cancel-timer): New function with some code from
`desktop-auto-save-set-timer'.
(after-init-hook): Don't call `desktop-auto-save-set-timer'.
Instead of setting `desktop-save-mode' to nil, call
`desktop-save-mode' with arg 0.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/desktop.el desktop.el-20091113204419-o5vbwnq5f7feedwu-591
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-02-07 07:18:02 +0000
+++ b/lisp/ChangeLog 2014-02-07 07:44:29 +0000
@@ -1,3 +1,13 @@
+2014-02-07 Juri Linkov <address@hidden>
+
+ * desktop.el (desktop-save-mode): Call `desktop-auto-save-set-timer'
+ when enabling, and `desktop-auto-save-cancel-timer' when disabling.
+ (desktop-auto-save-cancel-timer): New function with some code from
+ `desktop-auto-save-set-timer'.
+ (after-init-hook): Don't call `desktop-auto-save-set-timer'.
+ Instead of setting `desktop-save-mode' to nil, call
+ `desktop-save-mode' with arg 0. (Bug#16630)
+
2014-02-07 Glenn Morris <address@hidden>
* hi-lock.el (hi-lock-auto-select-face, hi-lock-line-face-buffer)
=== modified file 'lisp/desktop.el'
--- a/lisp/desktop.el 2014-02-03 07:35:44 +0000
+++ b/lisp/desktop.el 2014-02-07 07:44:29 +0000
@@ -162,7 +162,10 @@
one session to another. See variable `desktop-save' and function
`desktop-read' for details."
:global t
- :group 'desktop)
+ :group 'desktop
+ (if desktop-save-mode
+ (desktop-auto-save-set-timer)
+ (desktop-auto-save-cancel-timer)))
(defun desktop-save-mode-off ()
"Disable `desktop-save-mode'. Provided for use in hooks."
@@ -1216,15 +1219,18 @@
Cancel any previous timer. When `desktop-auto-save-timeout' is a positive
integer, start a new idle timer to call `desktop-auto-save' repeatedly
after that many seconds of idle time."
- (when desktop-auto-save-timer
- (cancel-timer desktop-auto-save-timer)
- (setq desktop-auto-save-timer nil))
+ (desktop-auto-save-cancel-timer)
(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
'desktop-auto-save))))
+(defun desktop-auto-save-cancel-timer ()
+ (when desktop-auto-save-timer
+ (cancel-timer desktop-auto-save-timer)
+ (setq desktop-auto-save-timer nil)))
+
;; ----------------------------------------------------------------------------
;;;###autoload
(defun desktop-revert ()
@@ -1465,10 +1471,9 @@
(let ((key "--no-desktop"))
(when (member key command-line-args)
(setq command-line-args (delete key command-line-args))
- (setq desktop-save-mode nil)))
+ (desktop-save-mode 0)))
(when desktop-save-mode
(desktop-read)
- (desktop-auto-save-set-timer)
(setq inhibit-startup-screen t))))
;; So we can restore vc-dir buffers.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r116302: * lisp/desktop.el (desktop-save-mode): Call `desktop-auto-save-set-timer',
Juri Linkov <=