summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2018-01-06 10:19:37 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2018-01-06 10:19:37 +0100
commit6b06a6238b45da39316814defa38447f0ef57d6b (patch)
tree06b5bad7360b892bf5eef323f51cf5eccd6961fd
parent8a2914f458b7b4e615e0dbfb43b0194bd9a6b35d (diff)
parent5dfab7957de8f2f1f4725ac916215c6cb1e2f7b6 (diff)
downloadorg-mode-6b06a6238b45da39316814defa38447f0ef57d6b.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-agenda.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index a9ebb79..c67f6e0 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -2092,7 +2092,10 @@ evaluate to a string."
(defvar org-agenda-follow-mode nil)
(defvar org-agenda-entry-text-mode nil)
(defvar org-agenda-clockreport-mode nil)
-(defvar org-agenda-show-log nil)
+(defvar org-agenda-show-log nil
+ "When non-nil, show the log in the agenda.
+Do not set this directly; instead use
+`org-agenda-start-with-log-mode', which see.")
(defvar org-agenda-redo-command nil)
(defvar org-agenda-query-string nil)
(defvar org-agenda-mode-hook nil