summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Dunn <dunni@gnu.org>2018-01-06 17:29:11 -0500
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2018-01-07 01:34:13 +0100
commitb306aa224549a06338491c1ee8384053cfba9b0c (patch)
tree3fb93f0f186c40e1965fe02857a32dc9e8e18932
parent5dfab7957de8f2f1f4725ac916215c6cb1e2f7b6 (diff)
downloadorg-mode-b306aa224549a06338491c1ee8384053cfba9b0c.tar.gz
org-agenda: Fix lprops when recreating sticky agendas
* lisp/org-agenda.el (org-agenda-lprops): New variable. (org-agenda-local-vars): Add it. (org-agenda-prepare): Set lprops from symbol property. (org-agenda-redo): Get lprops from variable, not property.
-rw-r--r--lisp/org-agenda.el8
1 files changed, 7 insertions, 1 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index bf29ec3..0c71e3d 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -2128,6 +2128,7 @@ When nil, `q' will kill the single agenda buffer."
(defvar org-agenda-this-buffer-is-sticky nil)
(defvar org-agenda-last-indirect-buffer nil
"Last buffer loaded by `org-agenda-tree-to-indirect-buffer'.")
+(defvar org-agenda-lprops nil)
(defconst org-agenda-local-vars
'(org-agenda-this-buffer-name
@@ -2156,6 +2157,7 @@ When nil, `q' will kill the single agenda buffer."
org-agenda-filtered-by-category
org-agenda-filter-form
org-agenda-cycle-counter
+ org-agenda-lprops
org-agenda-last-prefix-arg)
"Variables that must be local in agenda buffers to allow multiple buffers.")
@@ -3735,6 +3737,10 @@ FILTER-ALIST is an alist of filters we need to apply when
(org-uniquify org-done-keywords-for-agenda))
(setq org-agenda-last-prefix-arg current-prefix-arg)
(setq org-agenda-this-buffer-name org-agenda-buffer-name)
+ ;; Don't set these until we know we're in the agenda buffer,
+ ;; and we know they're valid.
+ (setq org-agenda-lprops (or org-agenda-lprops
+ (get 'org-agenda-redo-command 'org-lprops)))
(and name (not org-agenda-name)
(setq-local org-agenda-name name)))
(setq buffer-read-only nil))))
@@ -7299,7 +7305,7 @@ in the agenda."
(cols org-agenda-columns-active)
(line (org-current-line))
(window-line (- line (org-current-line (window-start))))
- (lprops (get 'org-agenda-redo-command 'org-lprops))
+ (lprops org-agenda-lprops)
(redo-cmd (get-text-property p 'org-redo-cmd))
(last-args (get-text-property p 'org-last-args))
(org-agenda-overriding-cmd (get-text-property p 'org-series-cmd))