Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2012-09-22 10:55:11 +02:00
commit 5d62f26fbc
1 changed files with 5 additions and 7 deletions

View File

@ -900,13 +900,11 @@ This can also be set in on a per-file basis with
(defcustom org-cycle-global-at-bob nil
"Cycle globally if cursor is at beginning of buffer and not at a headline.
This makes it possible to do global cycling without having to use S-TAB or
\\[universal-argument] TAB. For this special case to work, the first line \
of the buffer
must not be a headline - it may be empty or some other text. When used in
this way, `org-cycle-hook' is disables temporarily, to make sure the
cursor stays at the beginning of the buffer.
When this option is nil, don't do anything special at the beginning
of the buffer."
\\[universal-argument] TAB. For this special case to work, the first line
of the buffer must not be a headline -- it may be empty or some other text.
When used in this way, `org-cycle-hook' is disabled temporarily to make
sure the cursor stays at the beginning of the buffer. When this option is
nil, don't do anything special at the beginning of the buffer."
:group 'org-cycle
:type 'boolean)