From 04526ae0de2134e2a9029ece246ff85c0e689add Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 28 Aug 2012 18:29:18 +0200 Subject: [PATCH] org-agenda.el: Fix name of `org-agenda-pre-window-conf' * org-agenda.el (org-agenda-pre-window-conf): Rename from `org-pre-agenda-window-conf'. (org-agenda-local-vars, org-agenda-prepare-window) (org-agenda-Quit, org-agenda-quit): Use the new name. --- lisp/org-agenda.el | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index a4b2dad1b..60c0b8e15 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -1905,7 +1905,7 @@ When nil, `q' will kill the single agenda buffer." org-agenda-info org-agenda-tag-filter-overlays org-agenda-cat-filter-overlays - org-pre-agenda-window-conf + org-agenda-pre-window-conf org-agenda-columns-active org-agenda-tag-filter org-agenda-category-filter @@ -3302,7 +3302,7 @@ removed from the entry content. Currently only `planning' is allowed here." (defvar org-agenda-multi nil) ; dynamically scoped (defvar org-agenda-buffer-name "*Org Agenda*") -(defvar org-pre-agenda-window-conf nil) +(defvar org-agenda-pre-window-conf nil) (defvar org-agenda-columns-active nil) (defvar org-agenda-name nil) (defvar org-agenda-tag-filter nil) @@ -3372,8 +3372,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 - (or org-pre-agenda-window-conf wconf)))) + (setq org-agenda-pre-window-conf + (or org-agenda-pre-window-conf wconf)))) (defun org-agenda-prepare (&optional name) (if (org-agenda-use-sticky-p) @@ -6535,9 +6535,9 @@ If ERROR is non-nil, throw an error, otherwise just return nil." ;; Maybe restore the pre-agenda window configuration. (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) - (setq org-pre-agenda-window-conf nil)))) + org-agenda-pre-window-conf + (set-window-configuration org-agenda-pre-window-conf) + (setq org-agenda-pre-window-conf nil)))) (defun org-agenda-quit () "Exit agenda by killing agenda buffer or burying it when @@ -6558,9 +6558,9 @@ If ERROR is non-nil, throw an error, otherwise just return nil." ;; Maybe restore the pre-agenda window configuration. (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) - (setq org-pre-agenda-window-conf nil)))) + org-agenda-pre-window-conf + (set-window-configuration org-agenda-pre-window-conf) + (setq org-agenda-pre-window-conf nil)))) (org-agenda-Quit)))) (defun org-agenda-exit ()