summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2012-08-28 18:29:18 +0200
committerBastien Guerry <bzg@altern.org>2012-08-28 18:29:18 +0200
commit04526ae0de2134e2a9029ece246ff85c0e689add (patch)
tree477435248b41863475e04415a2a754a31ab893ff
parent5848ac36c88eeedf1abf7c43aa88b984942d801c (diff)
downloadorg-mode-04526ae0de2134e2a9029ece246ff85c0e689add.tar.gz
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.
-rw-r--r--lisp/org-agenda.el20
1 files changed, 10 insertions, 10 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index a4b2dad..60c0b8e 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 ()