From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Kelly Dean Newsgroups: gmane.emacs.bugs Subject: bug#19059: [FIX INCLUDED] desktop-read re-enables desktop autosave when it shouldn't Date: Sat, 15 Nov 2014 06:57:15 +0000 Message-ID: <27009.1747669087$1416038751@news.gmane.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416038751 8988 80.91.229.3 (15 Nov 2014 08:05:51 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 15 Nov 2014 08:05:51 +0000 (UTC) To: 19059@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Nov 15 09:05:44 2014 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 1XpYMZ-0006zq-Sb for geb-bug-gnu-emacs@m.gmane.org; Sat, 15 Nov 2014 09:05:44 +0100 Original-Received: from localhost ([::1]:39410 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpYMZ-0004Av-2R for geb-bug-gnu-emacs@m.gmane.org; Sat, 15 Nov 2014 03:05:43 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40546) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpYM6-0003xO-1C for bug-gnu-emacs@gnu.org; Sat, 15 Nov 2014 03:05:24 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpYLv-0006bi-JJ for bug-gnu-emacs@gnu.org; Sat, 15 Nov 2014 03:05:13 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:35970) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpYLv-0006ba-HO for bug-gnu-emacs@gnu.org; Sat, 15 Nov 2014 03:05:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1XpYLv-0005bD-Bj for bug-gnu-emacs@gnu.org; Sat, 15 Nov 2014 03:05:03 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Kelly Dean Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 15 Nov 2014 08:05:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 19059 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.141603865121319 (code B ref -1); Sat, 15 Nov 2014 08:05:03 +0000 Original-Received: (at submit) by debbugs.gnu.org; 15 Nov 2014 08:04:11 +0000 Original-Received: from localhost ([127.0.0.1]:33179 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpYL4-0005Xh-Sm for submit@debbugs.gnu.org; Sat, 15 Nov 2014 03:04:11 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:59844) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XpXVj-0003Fp-I3 for submit@debbugs.gnu.org; Sat, 15 Nov 2014 02:11:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpXVZ-0001Es-EE for submit@debbugs.gnu.org; Sat, 15 Nov 2014 02:11:07 -0500 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:34466) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpXVZ-0001En-Aq for submit@debbugs.gnu.org; Sat, 15 Nov 2014 02:10:57 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33316) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpXVO-00024w-My for bug-gnu-emacs@gnu.org; Sat, 15 Nov 2014 02:10:56 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpXVE-0001ER-I4 for bug-gnu-emacs@gnu.org; Sat, 15 Nov 2014 02:10:46 -0500 Original-Received: from relay6-d.mail.gandi.net ([2001:4b98:c:538::198]:41703) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpXVE-0001EN-6X for bug-gnu-emacs@gnu.org; Sat, 15 Nov 2014 02:10:36 -0500 Original-Received: from mfilter16-d.gandi.net (mfilter16-d.gandi.net [217.70.178.144]) by relay6-d.mail.gandi.net (Postfix) with ESMTP id 75087FB877 for ; Sat, 15 Nov 2014 08:10:35 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mfilter16-d.gandi.net Original-Received: from relay6-d.mail.gandi.net ([217.70.183.198]) by mfilter16-d.gandi.net (mfilter16-d.gandi.net [10.0.15.180]) (amavisd-new, port 10024) with ESMTP id EuLy7EiilFvD for ; Sat, 15 Nov 2014 08:10:34 +0100 (CET) X-Originating-IP: 73.169.42.166 Original-Received: from localhost (c-73-169-42-166.hsd1.co.comcast.net [73.169.42.166]) (Authenticated sender: kelly@prtime.org) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 08502FB8A7 for ; Sat, 15 Nov 2014 08:10:32 +0100 (CET) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Mailman-Approved-At: Sat, 15 Nov 2014 03:04:08 -0500 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:96050 With emacs 24.4, run emacs -Q, then do (desktop-save-mode 1) Notice that window-configuration-change-hook now (correctly) contains desktop-auto-save-set-timer, since desktop-save-mode defaults to enabling desktop autosave. Now do (desktop-auto-save-disable) Notice that desktop-auto-save-set-timer is (correctly) removed from the hook. Now do (desktop-save "~/.emacs.d") (desktop-read) Notice that desktop-auto-save-set-timer is added back to the hook, which is a bug since you didn't ask for desktop autosave to be re-enabled. This bug wasn't in 24.3, because 24.3 didn't have the desktop autosave feature. The bug is in desktop.el of the 24.4 release, line 1191, which unconditionally calls desktop-auto-save-enable. The fix is to change that to conditionally call desktop-auto-save-enable, if desktop autosave was enabled (indicated by presence of desktop-auto-save-set-timer in the hook) prior to being disabled by the call to desktop-auto-save-disable on line 1138. Patch excluded, per request.