From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#14430: [PATCH] Desktop restore runs mark activation hooks when it shouldn't Date: Sun, 09 Mar 2014 22:19:20 -0400 Message-ID: References: <1369102003.84562.YahooMailClassic@web141101.mail.bf1.yahoo.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1394418014 5948 80.91.229.3 (10 Mar 2014 02:20:14 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 10 Mar 2014 02:20:14 +0000 (UTC) Cc: 14430-done@debbugs.gnu.org To: Kelly Dean Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Mar 10 03:20:22 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 1WMppE-0002rk-L5 for geb-bug-gnu-emacs@m.gmane.org; Mon, 10 Mar 2014 03:20:20 +0100 Original-Received: from localhost ([::1]:46415 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WMppE-0006Hq-6J for geb-bug-gnu-emacs@m.gmane.org; Sun, 09 Mar 2014 22:20:20 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56968) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WMpp4-00062t-IR for bug-gnu-emacs@gnu.org; Sun, 09 Mar 2014 22:20:18 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WMpox-00042M-8z for bug-gnu-emacs@gnu.org; Sun, 09 Mar 2014 22:20:10 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:57363) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WMpox-00041w-5Z for bug-gnu-emacs@gnu.org; Sun, 09 Mar 2014 22:20:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1WMpow-0008PZ-T2 for bug-gnu-emacs@gnu.org; Sun, 09 Mar 2014 22:20:02 -0400 Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Mon, 10 Mar 2014 02:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 14430 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Mail-Followup-To: 14430@debbugs.gnu.org, monnier@iro.umontreal.ca, kellydeanch@yahoo.com Original-Received: via spool by 14430-done@debbugs.gnu.org id=D14430.139441796432266 (code D ref 14430); Mon, 10 Mar 2014 02:20:02 +0000 Original-Received: (at 14430-done) by debbugs.gnu.org; 10 Mar 2014 02:19:24 +0000 Original-Received: from localhost ([127.0.0.1]:58543 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WMpoK-0008OL-FY for submit@debbugs.gnu.org; Sun, 09 Mar 2014 22:19:24 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:34924) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WMpoH-0008OD-PD for 14430-done@debbugs.gnu.org; Sun, 09 Mar 2014 22:19:22 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av8EABK/CFFMCppy/2dsb2JhbABEuzWDWRdzgh4BAQQBViMFCws0EhQYDSSIHgbBLZEKA6R6gV6DEw X-IPAS-Result: Av8EABK/CFFMCppy/2dsb2JhbABEuzWDWRdzgh4BAQQBViMFCws0EhQYDSSIHgbBLZEKA6R6gV6DEw X-IronPort-AV: E=Sophos;i="4.84,565,1355115600"; d="scan'208";a="50954349" Original-Received: from 76-10-154-114.dsl.teksavvy.com (HELO ceviche.home) ([76.10.154.114]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 09 Mar 2014 22:19:21 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id 4F429660A5; Sun, 9 Mar 2014 22:19:20 -0400 (EDT) In-Reply-To: <1369102003.84562.YahooMailClassic@web141101.mail.bf1.yahoo.com> (Kelly Dean's message of "Mon, 20 May 2013 19:06:43 -0700 (PDT)") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) 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:86699 Archived-At: > (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. I installed a patch which makes desktop not run (de)activate-mark hooks. > 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 Instead, I simply use move-marker on mark-marker. Stefan === modified file 'lisp/desktop.el' --- lisp/desktop.el 2014-02-22 02:10:49 +0000 +++ lisp/desktop.el 2014-03-10 02:17:20 +0000 @@ -1382,18 +1382,19 @@ (when desktop-buffer-mark (if (consp desktop-buffer-mark) (progn - (set-mark (car desktop-buffer-mark)) + (move-marker (mark-marker) (car desktop-buffer-mark)) + ;; FIXME: Should we call (de)activate-mark instead? (setq mark-active (car (cdr desktop-buffer-mark)))) - (set-mark desktop-buffer-mark))) + (move-marker (mark-marker) desktop-buffer-mark))) ;; Never override file system if the file really is read-only marked. (when desktop-buffer-read-only (setq buffer-read-only desktop-buffer-read-only)) (dolist (this desktop-buffer-locals) (if (consp this) - ;; an entry of this form `(symbol . value)' + ;; An entry of this form `(symbol . value)'. (progn (make-local-variable (car this)) (set (car this) (cdr this))) - ;; an entry of the form `symbol' + ;; An entry of the form `symbol'. (make-local-variable this) (makunbound this))))))))