From 89949e69a3860fcb687c0f4ca0ccfd29283a5b74 Mon Sep 17 00:00:00 2001 From: David Maus Date: Sat, 25 Feb 2012 11:11:48 +0100 Subject: [PATCH] org-agenda: Fix handling of indirect buffer and window * org-agenda.el (org-agenda-tree-to-indirect-buffer): Fix handling of indirect buffer and window. Check if the window of last indirect buffer is still live and properly handle the case of `org-last-indirect-buffer' being nil. Changes suggested by Dave Abrahams in . --- lisp/org-agenda.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 8179b9344..d46f2efa8 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -7280,11 +7280,11 @@ use the dedicated frame)." (if (and current-prefix-arg (listp current-prefix-arg)) (org-agenda-do-tree-to-indirect-buffer) (let ((agenda-window (selected-window)) - (indirect-window (get-buffer-window org-last-indirect-buffer))) + (indirect-window (and org-last-indirect-buffer (get-buffer-window org-last-indirect-buffer)))) (save-window-excursion (org-agenda-do-tree-to-indirect-buffer)) (unwind-protect (progn - (unless indirect-window + (unless (and indirect-window (window-live-p indirect-window)) (setq indirect-window (split-window agenda-window))) (select-window indirect-window) (switch-to-buffer org-last-indirect-buffer :norecord) -- 2.11.4.GIT