tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'maint'

This commit is contained in:
Marco Wahl 2015-12-12 19:57:22 +01:00
parent 8594aed1d6 700b8e70f6
commit 5ca98b9213
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/org-agenda.el
View File

@ -7244,8 +7244,7 @@ agenda."
(defun org-agenda--quit (&optional bury)
(if org-agenda-columns-active
(org-columns-quit)
(let ((buf (current-buffer))
(wconf org-agenda-pre-window-conf)
(let ((wconf org-agenda-pre-window-conf)
(org-agenda-last-indirect-window
(and (eq org-indirect-buffer-display 'other-window)
org-agenda-last-indirect-buffer
@ -7267,8 +7266,8 @@ agenda."
(not (one-window-p))
(delete-window))))
(if bury
(bury-buffer buf)
(kill-buffer buf)
(bury-buffer)
(kill-buffer)
(setq org-agenda-archives-mode nil
org-agenda-buffer nil)))))