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#14430: [PATCH] Desktop restore runs mark activation hooks when it shouldn't Date: Mon, 20 May 2013 19:06:43 -0700 (PDT) Message-ID: <1369102003.84562.YahooMailClassic@web141101.mail.bf1.yahoo.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="844607989-1329277900-1369102003=:84562" X-Trace: ger.gmane.org 1369102060 1017 80.91.229.3 (21 May 2013 02:07:40 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 21 May 2013 02:07:40 +0000 (UTC) To: 14430@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue May 21 04:07:37 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 1UebzD-0003M8-IZ for geb-bug-gnu-emacs@m.gmane.org; Tue, 21 May 2013 04:07:35 +0200 Original-Received: from localhost ([::1]:35844 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UebzC-0007gb-TF for geb-bug-gnu-emacs@m.gmane.org; Mon, 20 May 2013 22:07:34 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:34324) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uebz7-0007gT-AH for bug-gnu-emacs@gnu.org; Mon, 20 May 2013 22:07:31 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uebz4-0007v4-S7 for bug-gnu-emacs@gnu.org; Mon, 20 May 2013 22:07:29 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:37100) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uebz4-0007v0-Ol for bug-gnu-emacs@gnu.org; Mon, 20 May 2013 22:07:26 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1Uebze-0002uS-HN for bug-gnu-emacs@gnu.org; Mon, 20 May 2013 22:08:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Kelly Dean Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 21 May 2013 02:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 14430 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.136910206211135 (code B ref -1); Tue, 21 May 2013 02:08:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 21 May 2013 02:07:42 +0000 Original-Received: from localhost ([127.0.0.1]:53690 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1UebzG-0002tQ-Og for submit@debbugs.gnu.org; Mon, 20 May 2013 22:07:39 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:51066) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1UebzE-0002t9-AY for submit@debbugs.gnu.org; Mon, 20 May 2013 22:07:37 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UebyW-0007nr-5i for submit@debbugs.gnu.org; Mon, 20 May 2013 22:06:54 -0400 Original-Received: from lists.gnu.org ([208.118.235.17]:45416) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UebyW-0007nk-2J for submit@debbugs.gnu.org; Mon, 20 May 2013 22:06:52 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:34183) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UebyT-0007et-CU for bug-gnu-emacs@gnu.org; Mon, 20 May 2013 22:06:51 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UebyQ-0007n6-DL for bug-gnu-emacs@gnu.org; Mon, 20 May 2013 22:06:49 -0400 Original-Received: from nm5-vm0.bullet.mail.bf1.yahoo.com ([98.139.213.150]:28625) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1UebyQ-0007mv-8z for bug-gnu-emacs@gnu.org; Mon, 20 May 2013 22:06:46 -0400 Original-Received: from [98.139.214.32] by nm5.bullet.mail.bf1.yahoo.com with NNFMP; 21 May 2013 02:06:44 -0000 Original-Received: from [98.139.212.213] by tm15.bullet.mail.bf1.yahoo.com with NNFMP; 21 May 2013 02:06:44 -0000 Original-Received: from [127.0.0.1] by omp1022.mail.bf1.yahoo.com with NNFMP; 21 May 2013 02:06:44 -0000 X-Yahoo-Newman-Property: ymail-3 X-Yahoo-Newman-Id: 132549.76127.bm@omp1022.mail.bf1.yahoo.com Original-Received: (qmail 90552 invoked by uid 60001); 21 May 2013 02:06:44 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s1024; t=1369102003; bh=aTKSsRMvl9H2ZWZJrBVwQU2vOrlbnv9opUYmnI1aSHU=; h=X-YMail-OSG:Received:X-Rocket-MIMEInfo:X-Mailer:Message-ID:Date:From:Subject:To:MIME-Version:Content-Type; b=3AJGWge5lOPDoGy1TXFyY03+GyA0b6DT+BGJBPP1325YlenfztgY9GGocTfujbe3k+pWFAvJiRucZefnQ2LzD5mrVDcL7kRelOIStBgK3xAAbV3W/sEfjRjMVYhZvQ0QhMAbQARuXkxAp7T5IKJmRXV2+JstO+2nhRzD9P/wyE8= DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.com; h=X-YMail-OSG:Received:X-Rocket-MIMEInfo:X-Mailer:Message-ID:Date:From:Subject:To:MIME-Version:Content-Type; b=xDogvfyOlESvyy7UuTaMmkvBa+ZmVX8zfXDHUUY0zF0PcG7ytupK9ieWeYYKh5BhltP0I50aTVaEZ9WiQ6dY55YeZpvBU47mCRdR4ZB4P7pdrOcmu8yYcEd7py1oEUhpJW6IgFKh7g8Jjr97xofaZ9caV0Sy+U+FU/YRsCp8l1E=; X-YMail-OSG: lXX6Om4VM1nlNgNbwN2saxthOhdp3Pkjmlbxmkyz8FgB6AK 43hgCKIYO.QNR3oJL3LZLzinnZmzoCUMpqZl1WFPbBf8uDMp68VD6XtU4lba stw_wqqNbxrTTxEvi9AhGgA3yBvV2EvQYvWYYAwmHnDXL5vxoHPjhXpfhlXG 3uKbbmGok2F1BAZ4TWycoVLmk46Hd1fSdRUYlWL6gU822yecwIHxaeIvsShT _AHBaTEGTzAJ67cM.AnHShNXxjYpQtZ7nFR8bK_cVzVYL1Maiu_juomTuXbs 3q0OdRoLH5_DMluyIIK7SGNkm_d1SP8ZEvIALDIKnK3J4RzpxUCNSjNOTtGJ NKgxKlTIZQdXyHjPduc0aIIHpGu40J_yGf22vmjllV._cLZ1ow_e8vU2yfUX NnkAHcboVzABAMxQiW7ayELEgvdPUDjQINBShUe6EeZA6GNjV85RUsA-- Original-Received: from [204.8.156.142] by web141101.mail.bf1.yahoo.com via HTTP; Mon, 20 May 2013 19:06:43 PDT X-Rocket-MIMEInfo: 002.001, RGVsZXRlIHlvdXIgLmVtYWNzLmRlc2t0b3AsIGFuZCBwdXQgaW4gaW5pdC5lbDoKCihkZXNrdG9wLXNhdmUtbW9kZSAxKQooYWRkLWhvb2sgJ2RlYWN0aXZhdGUtbWFyay1ob29rIChsYW1iZGEgKCkgKHNldHEgY3Vyc29yLXR5cGUgdCkpKQooYWRkLWhvb2sgJ2FjdGl2YXRlLW1hcmstaG9vayAobGFtYmRhICgpIChzZXRxIGN1cnNvci10eXBlICdiYXIpKSkKClN0YXJ0IEVtYWNzIDI0LjMsIG9wZW4gYSBmaWxlLCBwcmVzcyBDLVNQQyBDLWcsIHRoZW4gZXhpdCBFbWFjcyBhbmQgc2F2ZSB0aGUgZGVza3RvcCwBMAEBAQE- X-Mailer: YahooMailClassic/15.1.8 YahooMailWebService/0.8.142.542 X-detected-operating-system: by eggs.gnu.org: FreeBSD 8.x X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.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:74429 Archived-At: --844607989-1329277900-1369102003=:84562 Content-Type: text/plain; charset=us-ascii Delete your .emacs.desktop, and put in init.el: (desktop-save-mode 1) (add-hook 'deactivate-mark-hook (lambda () (setq cursor-type t))) (add-hook 'activate-mark-hook (lambda () (setq cursor-type 'bar))) Start Emacs 24.3, open a file, press C-SPC C-g, then exit Emacs and save the desktop, then restart Emacs. Notice that the cursor type is now a bar, not a block. It should be a block. The attached patch fixes it. It could be fixed without patching set-mark, by conditionally calling deactivate-mark in desktop-create-buffer after calling set-mark, but that's a hack; the mark shouldn't be activated in the first place. Besides that, I need a dont-activate option for set-mark in some of my other code, so this bug gives me an excuse to add it. The attached patch relies on the fix for bug 13027, which was reportedly applied last November, but didn't make it into 24.3, so either apply that to 24.3, or use the current development version, but I haven't tried the latter. --844607989-1329277900-1369102003=:84562 Content-Type: text/x-diff; name="restoremarkbug.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="restoremarkbug.patch" LS0tIGVtYWNzLTI0LjMvbGlzcC9zaW1wbGUuZWwKKysrIGVtYWNzLTI0LjMv bGlzcC9zaW1wbGUuZWwKQEAgLTQwMTgsMTIgKzQwMTgsMTQgQEAKICAgICAo dW5sZXNzIHRyYW5zaWVudC1tYXJrLW1vZGUKICAgICAgIChzZXRxIHRyYW5z aWVudC1tYXJrLW1vZGUgJ2xhbWJkYSkpKSkKIAotKGRlZnVuIHNldC1tYXJr IChwb3MpCisoZGVmdW4gc2V0LW1hcmsgKHBvcyAmb3B0aW9uYWwgZG9udC1h Y3RpdmF0ZSkKICAgIlNldCB0aGlzIGJ1ZmZlcidzIG1hcmsgdG8gUE9TLiAg RG9uJ3QgdXNlIHRoaXMgZnVuY3Rpb24hCiBUaGF0IGlzIHRvIHNheSwgZG9u J3QgdXNlIHRoaXMgZnVuY3Rpb24gdW5sZXNzIHlvdSB3YW50CiB0aGUgdXNl ciB0byBzZWUgdGhhdCB0aGUgbWFyayBoYXMgbW92ZWQsIGFuZCB5b3Ugd2Fu dCB0aGUgcHJldmlvdXMKIG1hcmsgcG9zaXRpb24gdG8gYmUgbG9zdC4KIAor QWN0aXZhdGUgdGhlIG1hcmsgdW5sZXNzIG9wdGlvbmFsIERPTlQtQUNUSVZB VEUgaXMgbm9uLW5pbC4KKwogTm9ybWFsbHksIHdoZW4gYSBuZXcgbWFyayBp cyBzZXQsIHRoZSBvbGQgb25lIHNob3VsZCBnbyBvbiB0aGUgc3RhY2suCiBU aGlzIGlzIHdoeSBtb3N0IGFwcGxpY2F0aW9ucyBzaG91bGQgdXNlIGBwdXNo LW1hcmsnLCBub3QgYHNldC1tYXJrJy4KIApAQCAtNDAzNyw5ICs0MDM5LDgg QEAKIAogICAoaWYgcG9zCiAgICAgICAocHJvZ24KLQkoc2V0cSBtYXJrLWFj dGl2ZSB0KQotCShydW4taG9va3MgJ2FjdGl2YXRlLW1hcmstaG9vaykKLQko c2V0LW1hcmtlciAobWFyay1tYXJrZXIpIHBvcyAoY3VycmVudC1idWZmZXIp KSkKKwkoc2V0LW1hcmtlciAobWFyay1tYXJrZXIpIHBvcyAoY3VycmVudC1i dWZmZXIpKQorCSh1bmxlc3MgZG9udC1hY3RpdmF0ZSAoYWN0aXZhdGUtbWFy aykpKQogICAgIDs7IE5vcm1hbGx5IHdlIG5ldmVyIGNsZWFyIG1hcmstYWN0 aXZlIGV4Y2VwdCBpbiBUcmFuc2llbnQgTWFyayBtb2RlLgogICAgIDs7IEJ1 dCB3aGVuIHdlIGFjdHVhbGx5IGNsZWFyIG91dCB0aGUgbWFyayB2YWx1ZSB0 b28sIHdlIG11c3QKICAgICA7OyBjbGVhciBtYXJrLWFjdGl2ZSBpbiBhbnkg bW9kZS4KLS0tIGVtYWNzLTI0LjMvbGlzcC9kZXNrdG9wLmVsCisrKyBlbWFj cy0yNC4zL2xpc3AvZGVza3RvcC5lbApAQCAtMTIxOCwxMCArMTIxOCw5IEBA CiAJICAgICAgIChlcnJvciAobWVzc2FnZSAiJXMiIChlcnJvci1tZXNzYWdl LXN0cmluZyBlcnIpKSAxKSkpKQogCSAgKHdoZW4gZGVza3RvcC1idWZmZXIt bWFyawogCSAgICAoaWYgKGNvbnNwIGRlc2t0b3AtYnVmZmVyLW1hcmspCi0J CShwcm9nbgotCQkgIChzZXQtbWFyayAoY2FyIGRlc2t0b3AtYnVmZmVyLW1h cmspKQotCQkgIChzZXRxIG1hcmstYWN0aXZlIChjYXIgKGNkciBkZXNrdG9w LWJ1ZmZlci1tYXJrKSkpKQotCSAgICAgIChzZXQtbWFyayBkZXNrdG9wLWJ1 ZmZlci1tYXJrKSkpCisJCShzZXQtbWFyayAoY2FyIGRlc2t0b3AtYnVmZmVy LW1hcmspCisJCQkgIChub3QgKGNhciAoY2RyIGRlc2t0b3AtYnVmZmVyLW1h cmspKSkpCisJICAgICAgKHNldC1tYXJrIGRlc2t0b3AtYnVmZmVyLW1hcmsg dCkpKQogCSAgOzsgTmV2ZXIgb3ZlcnJpZGUgZmlsZSBzeXN0ZW0gaWYgdGhl IGZpbGUgcmVhbGx5IGlzIHJlYWQtb25seSBtYXJrZWQuCiAJICAod2hlbiBk ZXNrdG9wLWJ1ZmZlci1yZWFkLW9ubHkgKHNldHEgYnVmZmVyLXJlYWQtb25s eSBkZXNrdG9wLWJ1ZmZlci1yZWFkLW9ubHkpKQogCSAgKHdoaWxlIGRlc2t0 b3AtYnVmZmVyLWxvY2Fscwo= --844607989-1329277900-1369102003=:84562--