summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2018-02-24 22:38:27 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2018-02-24 22:38:27 +0100
commit1b259f95aaf8ec3e1cec4e4383e8e6364150c356 (patch)
tree664247879e80a3ae1b2a23b6a55ee583c19537d7
parent6e10c268de8d4372d53f1681e48a7df21ed2c051 (diff)
parentfffd300efdfa21211c99955b3f9bbc7a1d23e5f8 (diff)
downloadorg-mode-1b259f95aaf8ec3e1cec4e4383e8e6364150c356.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-agenda.el8
-rw-r--r--lisp/org.el1
2 files changed, 2 insertions, 7 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 81c37f6..b9c19a5 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -2146,7 +2146,6 @@ 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
@@ -2175,7 +2174,6 @@ 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.")
@@ -3755,10 +3753,6 @@ 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))))
@@ -7322,7 +7316,7 @@ in the agenda."
(cols org-agenda-columns-active)
(line (org-current-line))
(window-line (- line (org-current-line (window-start))))
- (lprops org-agenda-lprops)
+ (lprops (get 'org-agenda-redo-command 'org-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))
diff --git a/lisp/org.el b/lisp/org.el
index 7f0f11f..de73025 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -7,6 +7,7 @@
;; Maintainer: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: https://orgmode.org
+;; Version: 9.1.7
;;
;; This file is part of GNU Emacs.
;;