From 8b38105040b581545d9ec7b28247dec04b299561 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 27 Feb 2009 17:17:12 -0700 Subject: [PATCH] Conditionally delete windows in agenda quit Before this patch, org-agenda-quit would delete the agenda window if the frame had more than one window. This patch changes that behavior slightly so that if org-agenda-window-setup is 'current-window, the agenda window won't be deleted. --- lisp/ChangeLog | 3 +++ lisp/org-agenda.el | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d463ba319..111aabe69 100755 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2009-03-01 Carsten Dominik + * org-agenda.el (org-agenda-quit): Delete window only when the + frame-setup was not `current-window'. + * org.el (org-tag-persistent-alist): New option. (org-startup-options): Add keyword `noptag'. (org-fast-todo-selection): Handle :newline correctly. diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 3fb7baf17..dbfa5f66b 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -4455,7 +4455,9 @@ If ERROR is non-nil, throw an error, otherwise just return nil." (if org-agenda-columns-active (org-columns-quit) (let ((buf (current-buffer))) - (if (not (one-window-p)) (delete-window)) + (and (not (eq org-agenda-window-setup 'current-window)) + (not (one-window-p)) + (delete-window)) (kill-buffer buf) (org-agenda-reset-markers) (org-columns-remove-overlays)