summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-02-14 09:40:04 (GMT)
committer Bastien Guerry <bzg@altern.org>2013-02-14 09:40:04 (GMT)
commit6aa8829a1a7d5c96cdd6eebc6a78a639a523adc7 (patch)
tree5bd52eef7a82aec3101ca0438962cbd39a1ea8da
parent04c6ad77744c419c348217e2a99df9a81c432ba1 (diff)
parent981c6db3d76e5500347300844bc1c7e9f640b10f (diff)
downloadorg-mode-6aa8829a1a7d5c96cdd6eebc6a78a639a523adc7.zip
org-mode-6aa8829a1a7d5c96cdd6eebc6a78a639a523adc7.tar.gz
Merge branch 'maint'
-rw-r--r--doc/org.texi5
-rw-r--r--lisp/org.el6
2 files changed, 10 insertions, 1 deletions
diff --git a/doc/org.texi b/doc/org.texi
index fa23948..c5ca3eb 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -1288,6 +1288,7 @@ Copy the @i{visible} text in the region into the kill ring.
@end table
@vindex org-startup-folded
+@vindex org-agenda-inhibit-startup
@cindex @code{overview}, STARTUP keyword
@cindex @code{content}, STARTUP keyword
@cindex @code{showall}, STARTUP keyword
@@ -1306,6 +1307,10 @@ buffer:
#+STARTUP: showeverything
@end example
+The startup visibility options are ignored when the file is open for the
+first time during the agenda generation: if you want the agenda to honor
+the startup visibility, set @code{org-agenda-inhibit-startup} to nil.
+
@cindex property, VISIBILITY
@noindent
Furthermore, any entries with a @samp{VISIBILITY} property (@pxref{Properties
diff --git a/lisp/org.el b/lisp/org.el
index ea8e2a3..9cd499a 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -586,7 +586,11 @@ the following lines anywhere in the buffer:
#+STARTUP: fold (or `overview', this is equivalent)
#+STARTUP: nofold (or `showall', this is equivalent)
#+STARTUP: content
- #+STARTUP: showeverything"
+ #+STARTUP: showeverything
+
+By default, this option is ignored when Org opens agenda files
+for the first time. If you want the agenda to honor the startup
+option, set `org-agenda-inhibit-startup' to nil."
:group 'org-startup
:type '(choice
(const :tag "nofold: show all" nil)