From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Lundin Subject: [PATCH] Fix bug that erases org buffer when calling agenda via org-agenda-open-link. Date: Thu, 16 Sep 2010 01:29:20 -0400 Message-ID: <87wrqm2r4f.fsf@archdesk.localdomain> References: <87d3se9v6m.fsf@archdesk.localdomain> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from [140.186.70.92] (port=60994 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ow72B-0001LS-1D for emacs-orgmode@gnu.org; Thu, 16 Sep 2010 01:29:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Ow729-0005Kp-R0 for emacs-orgmode@gnu.org; Thu, 16 Sep 2010 01:29:22 -0400 Received: from out2.smtp.messagingengine.com ([66.111.4.26]:56885) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Ow729-0005Kk-Ov for emacs-orgmode@gnu.org; Thu, 16 Sep 2010 01:29:21 -0400 Received: from archdesk.localdomain (67-197-63-212.rh2.dyn.cm.comporium.net [67.197.63.212]) by mail.messagingengine.com (Postfix) with ESMTPSA id C8FA15E3B58 for ; Thu, 16 Sep 2010 01:29:20 -0400 (EDT) In-Reply-To: <87d3se9v6m.fsf@archdesk.localdomain> (Matt Lundin's message of "Thu, 16 Sep 2010 00:15:49 -0400") List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Org Mode [My apologies, but I'm afraid my first attempt at this patch mistook a necessary second check for redundancy. Here is an improved version.] * lisp/org-agenda.el (org-prepare-agenda): If the agenda is called from within the agenda via an elisp link, such as [[elisp:(org-agenda-list)]], org-prepare-agenda erases the buffer of the file containing the link, since that buffer is current during org-prepare agenda (due to a with-current-buffer in org-agenda-open-link). An additional test now ensures that the agenda buffer is in fact current when the buffer is erased and local variables for the agenda are set. --- lisp/org-agenda.el | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 9f94fa6..7458076 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -2829,7 +2829,11 @@ the global options and expect it to be applied to the entire view.") (switch-to-buffer-other-frame abuf)) ((equal org-agenda-window-setup 'reorganize-frame) (delete-other-windows) - (org-switch-to-buffer-other-window abuf)))) + (org-switch-to-buffer-other-window abuf))) + ;; additional test in case agenda is invoked from within agenda + ;; buffer via elisp link + (unless (equal (current-buffer) abuf) + (switch-to-buffer abuf))) (setq buffer-read-only nil) (let ((inhibit-read-only t)) (erase-buffer)) (org-agenda-mode) -- 1.7.2.3