Merge branch 'maint'

This commit is contained in:
David Maus 2012-02-25 11:13:58 +01:00
commit 2adf4b059b

View file

@ -7304,11 +7304,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)