mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-08-19 15:19:12 +00:00
Code Releases Activity

org-agenda.el: Fix bug about restoring existing window conf

Browse source 
* org-agenda.el (org-prepare-agenda-window): Use
`org-pre-agenda-window-conf' if already set.
(org-agenda-Quit): Set `org-pre-agenda-window-conf' to nil
when quitting.
(org-agenda-quit): Ditto.

Thanks to Moritz Ulrich for reporting a bug about this.
This commit is contained in:
Bastien Guerry 2012-08-24 15:54:58 +02:00
parent dd31878ee7
commit d44b56e81e
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lisp/org-agenda.el
View file

@ -3334,7 +3334,8 @@ generating a new one."
;; buffer via elisp link
(unless (equal (current-buffer) abuf)
(org-pop-to-buffer-same-window abuf))
(setq org-pre-agenda-window-conf wconf)))
(setq org-pre-agenda-window-conf
(or org-pre-agenda-window-conf wconf))))
(defun org-prepare-agenda (&optional name)
(if (org-agenda-use-sticky-p)
@ -6470,7 +6471,8 @@ If ERROR is non-nil, throw an error, otherwise just return nil."
(and org-agenda-restore-windows-after-quit
(not (eq org-agenda-window-setup 'other-frame))
org-pre-agenda-window-conf
(set-window-configuration org-pre-agenda-window-conf))))
(set-window-configuration org-pre-agenda-window-conf)
(setq org-pre-agenda-window-conf nil))))
(defun org-agenda-quit ()
"Exit agenda by killing agenda buffer or burying it when
@ -6492,7 +6494,8 @@ If ERROR is non-nil, throw an error, otherwise just return nil."
(and org-agenda-restore-windows-after-quit
(not (eq org-agenda-window-setup 'other-frame))
org-pre-agenda-window-conf
(set-window-configuration org-pre-agenda-window-conf))))
(set-window-configuration org-pre-agenda-window-conf)
(setq org-pre-agenda-window-conf nil))))
(org-agenda-Quit))))
(defun org-agenda-exit ()