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: desktop should auto-save on idle time Date: Tue, 17 Sep 2013 00:18:52 +0300 Organization: JURTA Message-ID: <87ioy0sbwt.fsf@mail.jurta.org> References: <878uz3p907.fsf@gnu.org> <87bo3z5ehf.fsf@mail.jurta.org> <87d2odu593.fsf@mail.jurta.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1379367443 19908 80.91.229.3 (16 Sep 2013 21:37:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 16 Sep 2013 21:37:23 +0000 (UTC) Cc: Sam Steingold , 15331@debbugs.gnu.org To: Juanma Barranquero Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Sep 16 23:37:24 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 1VLgTv-00056m-TQ for geb-bug-gnu-emacs@m.gmane.org; Mon, 16 Sep 2013 23:37:20 +0200 Original-Received: from localhost ([::1]:37159 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VLgTv-0006MA-6n for geb-bug-gnu-emacs@m.gmane.org; Mon, 16 Sep 2013 17:37:19 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38106) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VLgTk-0006Kz-S6 for bug-gnu-emacs@gnu.org; Mon, 16 Sep 2013 17:37:15 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VLgTe-0007dQ-La for bug-gnu-emacs@gnu.org; Mon, 16 Sep 2013 17:37:08 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:33656) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VLgTe-0007dI-I9 for bug-gnu-emacs@gnu.org; Mon, 16 Sep 2013 17:37:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1VLgTe-0003sA-31 for bug-gnu-emacs@gnu.org; Mon, 16 Sep 2013 17:37:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 16 Sep 2013 21:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 15331 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 15331-submit@debbugs.gnu.org id=B15331.137936741614868 (code B ref 15331); Mon, 16 Sep 2013 21:37:02 +0000 Original-Received: (at 15331) by debbugs.gnu.org; 16 Sep 2013 21:36:56 +0000 Original-Received: from localhost ([127.0.0.1]:41947 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1VLgTY-0003re-5G for submit@debbugs.gnu.org; Mon, 16 Sep 2013 17:36:56 -0400 Original-Received: from ps18281.dreamhost.com ([69.163.218.105]:39521 helo=ps18281.dreamhostps.com) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1VLgTV-0003rO-L0 for 15331@debbugs.gnu.org; Mon, 16 Sep 2013 17:36:54 -0400 Original-Received: from localhost.jurta.org (ps18281.dreamhostps.com [69.163.218.105]) by ps18281.dreamhostps.com (Postfix) with ESMTP id 2D4DC258B9E937; Mon, 16 Sep 2013 14:36:51 -0700 (PDT) In-Reply-To: <87d2odu593.fsf@mail.jurta.org> (Juri Linkov's message of "Thu, 12 Sep 2013 23:58:16 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (x86_64-pc-linux-gnu) 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:78470 Archived-At: Another problem is that `desktop-saved-frameset' added to the desktop now prevents auto-saving from detecting whether the contents of the desktop file changed. It now auto-saves the desktop always because `desktop-saved-frameset' now contains a timestamp. This patch skips these lines with a timestamp, so the remaining content of the desktop can be checked for changes. === modified file 'lisp/desktop.el' --- lisp/desktop.el 2013-09-15 16:25:02 +0000 +++ lisp/desktop.el 2013-09-16 21:18:39 +0000 @@ -1012,10 +1012,16 @@ (defun desktop-save (dirname &optional r (insert ")\n\n")))) (setq default-directory desktop-dirname) - ;; If auto-saving, avoid writing if nothing has changed since the last write. - ;; Don't check 300 characters of the header that contains the timestamp. + ;; When auto-saving, avoid writing if nothing has changed + ;; since the last write. Don't check 10 lines of the header + ;; with constantly-changing timestamp and also don't check + ;; the first non-header line with desktop-saved-frameset + ;; that also contains a timestamp. (let ((checksum (and auto-save (md5 (current-buffer) - (+ (point-min) 300) (point-max) + (save-excursion + (goto-char (point-min)) + (line-beginning-position 11)) + (point-max) 'emacs-mule)))) (unless (and auto-save (equal checksum desktop-file-checksum)) (let ((coding-system-for-write 'emacs-mule))