From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#15331: Idle timer for desktop Date: Tue, 10 Sep 2013 23:57:31 +0300 Organization: JURTA Message-ID: <87hadsgzpj.fsf@mail.jurta.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1378847187 28333 80.91.229.3 (10 Sep 2013 21:06:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 10 Sep 2013 21:06:27 +0000 (UTC) To: 15331@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Sep 10 23:06:29 2013 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1VJV8g-0000FG-MM for geb-bug-gnu-emacs@m.gmane.org; Tue, 10 Sep 2013 23:06:22 +0200 Original-Received: from localhost ([::1]:59982 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJV8f-0004y7-Un for geb-bug-gnu-emacs@m.gmane.org; Tue, 10 Sep 2013 17:06:21 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55535) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJV8U-0004wI-HH for bug-gnu-emacs@gnu.org; Tue, 10 Sep 2013 17:06:18 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VJV8M-0004Ki-3R for bug-gnu-emacs@gnu.org; Tue, 10 Sep 2013 17:06:10 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:45113) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJV8L-0004Kd-W8 for bug-gnu-emacs@gnu.org; Tue, 10 Sep 2013 17:06:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1VJV8L-0006S7-O2 for bug-gnu-emacs@gnu.org; Tue, 10 Sep 2013 17:06:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 10 Sep 2013 21:06:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 15331 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.137884713024744 (code B ref -1); Tue, 10 Sep 2013 21:06:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 10 Sep 2013 21:05:30 +0000 Original-Received: from localhost ([127.0.0.1]:53403 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1VJV7p-0006R2-Lx for submit@debbugs.gnu.org; Tue, 10 Sep 2013 17:05:30 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:53679) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1VJV7m-0006Qj-Di for submit@debbugs.gnu.org; Tue, 10 Sep 2013 17:05:26 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VJV7Y-0004CP-VQ for submit@debbugs.gnu.org; Tue, 10 Sep 2013 17:05:21 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:59802) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJV7Y-0004CF-RX for submit@debbugs.gnu.org; Tue, 10 Sep 2013 17:05:12 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55351) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJV7S-0004qp-2T for bug-gnu-emacs@gnu.org; Tue, 10 Sep 2013 17:05:12 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VJV7M-0003vf-2U for bug-gnu-emacs@gnu.org; Tue, 10 Sep 2013 17:05:06 -0400 Original-Received: from ps18281.dreamhost.com ([69.163.218.105]:36775 helo=ps18281.dreamhostps.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJV7L-0003vZ-Qa for bug-gnu-emacs@gnu.org; Tue, 10 Sep 2013 17:04:59 -0400 Original-Received: from localhost.jurta.org (ps18281.dreamhostps.com [69.163.218.105]) by ps18281.dreamhostps.com (Postfix) with ESMTP id 5C4D7258B9E935 for ; Tue, 10 Sep 2013 14:04:58 -0700 (PDT) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (x86_64-pc-linux-gnu) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:78195 Archived-At: Tags: patch It's very distracting when periodic desktop saves interrupt the active editing for approximately 2 seconds to save the desktop. This is because `desktop-auto-save-timeout' ignores idleness when better to save the desktop in convenient time without distraction. This means that another idle timer is necessary in addition to the idleness-ignoring timer. As were discussed some time ago on emacs-devel both timers are needed. This patch implements proper interaction between these two timers. === modified file 'lisp/desktop.el' --- lisp/desktop.el 2013-07-01 03:29:46 +0000 +++ lisp/desktop.el 2013-09-10 20:50:10 +0000 @@ -191,7 +191,14 @@ (defcustom desktop-save 'ask-if-new (defcustom desktop-auto-save-timeout nil "Number of seconds between auto-saves of the desktop. -Zero or nil means disable timer-based auto-saving." +Zero or nil means disable timer-based auto-saving. +If `desktop-auto-save-idle-timeout' is non-nil then the desktop is +not saved immediately after the timeout of `desktop-auto-save-timeout', +but another idle timer is set that saves the desktop after the number +of idle seconds defined by `desktop-auto-save-idle-timeout'. +Thus the total timeout between desktop auto-saves is the sum +of seconds of `desktop-auto-save-timeout' plus idle seconds +of `desktop-auto-save-idle-timeout'." :type '(choice (const :tag "Off" nil) (integer :tag "Seconds")) :set (lambda (symbol value) @@ -202,6 +209,24 @@ (defcustom desktop-auto-save-timeout nil :group 'desktop :version "24.4") +(defcustom desktop-auto-save-idle-timeout nil + "Number of idle seconds between auto-saves of the desktop. +Zero or nil means disable timer-based idle auto-saving. +If `desktop-auto-save-timeout' is non-nil then an idle timer +is set after the timeout defined by `desktop-auto-save-timeout'. +Thus the total timeout between desktop auto-saves is the sum +of seconds of `desktop-auto-save-timeout' plus idle seconds +of `desktop-auto-save-idle-timeout'." + :type '(choice (const :tag "Off" nil) + (integer :tag "Idle Seconds")) + :set (lambda (symbol value) + (set-default symbol value) + (condition-case nil + (desktop-auto-save-set-timer) + (error nil))) + :group 'desktop + :version "24.4") + (defcustom desktop-load-locked-desktop 'ask "Specifies whether the desktop should be loaded if locked. Possible values are: @@ -1219,8 +1244,10 @@ (defun desktop-auto-save () "Save the desktop periodically. Called by the timer created in `desktop-auto-save-set-timer'." (when (and desktop-save-mode - (integerp desktop-auto-save-timeout) - (> desktop-auto-save-timeout 0) + (or (and (integerp desktop-auto-save-timeout) + (> desktop-auto-save-timeout 0)) + (and (integerp desktop-auto-save-idle-timeout) + (> desktop-auto-save-idle-timeout 0))) ;; Avoid desktop saving during lazy loading. (not desktop-lazy-timer) ;; Save only to own desktop file. @@ -1230,17 +1257,46 @@ (defun desktop-auto-save () (desktop-auto-save-set-timer)) (defun desktop-auto-save-set-timer () - "Reset the auto-save timer. + "Set the auto-save timer. Cancel any previous timer. When `desktop-auto-save-timeout' is a positive -integer, start a new timer to call `desktop-auto-save' in that many seconds." +integer, start a new timer to call `desktop-auto-save' in that many seconds. +When `desktop-auto-save-idle-timeout' is a positive integer, +then start a new timer to call `desktop-auto-save-set-idle-timer'." + (when desktop-auto-save-timer + (cancel-timer desktop-auto-save-timer) + (setq desktop-auto-save-timer nil)) + (if (and (integerp desktop-auto-save-timeout) + (> desktop-auto-save-timeout 0)) + (if (and (integerp desktop-auto-save-idle-timeout) + (> desktop-auto-save-idle-timeout 0)) + (setq desktop-auto-save-timer + (run-with-timer desktop-auto-save-timeout nil + 'desktop-auto-save-set-idle-timer)) + (setq desktop-auto-save-timer + (run-with-timer desktop-auto-save-timeout nil + 'desktop-auto-save))) + (if (and (integerp desktop-auto-save-idle-timeout) + (> desktop-auto-save-idle-timeout 0)) + (desktop-auto-save-set-idle-timer)))) + +(defun desktop-auto-save-set-idle-timer () + "Set the auto-save idle timer. +Cancel any previous timer. When `desktop-auto-save-idle-timeout' is a positive +integer, start a new idle timer to call `desktop-auto-save' in that number +of idle seconds." (when desktop-auto-save-timer (cancel-timer desktop-auto-save-timer) (setq desktop-auto-save-timer nil)) - (when (and (integerp desktop-auto-save-timeout) - (> desktop-auto-save-timeout 0)) + (when (and (integerp desktop-auto-save-idle-timeout) + (> desktop-auto-save-idle-timeout 0)) (setq desktop-auto-save-timer - (run-with-timer desktop-auto-save-timeout nil - 'desktop-auto-save)))) + (run-with-idle-timer + ;; Compute an idle time desktop-auto-save-idle-timeout + ;; more than the current value. + (time-add (or (current-idle-time) '(0 0 0 0)) + (seconds-to-time desktop-auto-save-idle-timeout)) + nil + 'desktop-auto-save)))) ;; ---------------------------------------------------------------------------- ;;;###autoload