summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-01-22 13:25:56 (GMT)
committer Bastien Guerry <bzg@altern.org>2013-01-22 13:25:56 (GMT)
commit443559a16f207df3955eacf5ad709a6abd12d808 (patch)
treeff049a6f08b4a5c75aa13f11f3b203ae15eeffc9
parent74c7e02bcf3844624ebe91dc061b9dbedd8eb72f (diff)
parent5b20c9a30e4714e72fe253914712001528f662b6 (diff)
downloadorg-mode-443559a16f207df3955eacf5ad709a6abd12d808.zip
org-mode-443559a16f207df3955eacf5ad709a6abd12d808.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-agenda.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index f48ff6f..8b9ae81 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -6989,7 +6989,10 @@ When `org-agenda-sticky' is non-nil, only bury the agenda."
(interactive)
(if (and (eq org-indirect-buffer-display 'other-window)
org-last-indirect-buffer)
- (delete-window (get-buffer-window org-last-indirect-buffer)))
+ (let ((org-last-indirect-window
+ (get-buffer-window org-last-indirect-buffer)))
+ (if org-last-indirect-window
+ (delete-window org-last-indirect-window))))
(if org-agenda-columns-active
(org-columns-quit)
(if org-agenda-sticky