[Orgmode] [PATCH] Conditionally delete windows in agenda quit

[Peter Jones]

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.

Patch also available from:

 git://pmade.com/org-mode
 branch: pjones-agenda-quit

>From 94a5f5f9487a2ccdd4d38d1b989720a89d1d10b6 Mon Sep 17 00:00:00 2001
From: Peter Jones <address@hidden>
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/org-agenda.el |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 3fb7baf..dbfa5f6 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)
-- 
1.6.0

-- 
Peter Jones, http://pmade.com
pmade inc.  Louisville, CO US