diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2018-01-07 01:34:59 +0100 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2018-01-07 01:34:59 +0100 |
commit | 9bc6e644e9d2f341275b01d5858cd91f2cd8d0ee (patch) | |
tree | 97d0471c19ad51653eb35a315638b605e2f41adf | |
parent | 6b06a6238b45da39316814defa38447f0ef57d6b (diff) | |
parent | b306aa224549a06338491c1ee8384053cfba9b0c (diff) | |
download | org-mode-9bc6e644e9d2f341275b01d5858cd91f2cd8d0ee.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org-agenda.el | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index c67f6e0..bf406f1 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -2145,6 +2145,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 @@ -2173,6 +2174,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.") @@ -3752,6 +3754,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)))) @@ -7315,7 +7321,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)) |