summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-01-01 16:11:12 (GMT)
committer Bastien Guerry <bzg@altern.org>2013-01-01 16:11:12 (GMT)
commitb6615d01793d690e60cae3c487db295e6c2843ac (patch)
treecef7690404ca9bd1731d75e7d9a8c444842aea2a
parent4aaf1a4df2c7a5e7c398c29fed121b049cccf78b (diff)
parentf1067fb47ca7d3057c2cad058185c62bf696f294 (diff)
downloadorg-mode-b6615d01793d690e60cae3c487db295e6c2843ac.zip
org-mode-b6615d01793d690e60cae3c487db295e6c2843ac.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-list.el18
1 files changed, 9 insertions, 9 deletions
diff --git a/lisp/org-list.el b/lisp/org-list.el
index 761c5ff..a85f769 100644
--- a/lisp/org-list.el
+++ b/lisp/org-list.el
@@ -144,15 +144,15 @@ item. When the cursor is on an outline heading, plain lists are
treated as text. This is the most stable way of handling this,
which is why it is the default.
-When this is the symbol `integrate', then during cycling, plain
-list items will *temporarily* be interpreted as outline headlines
-with a level given by 1000+i where i is the indentation of the
-bullet. This setting can lead to strange effects when switching
-visibility to `children', because the first \"child\" in a
-subtree decides what children should be listed. If that first
-\"child\" is a plain list item with an implied large level
-number, all true children and grand children of the outline
-heading will be exposed in a children' view."
+When this is the symbol `integrate', then integrate plain list
+items when cycling, as if they were children of outline headings.
+
+This setting can lead to strange effects when switching visibility
+to `children', because the first \"child\" in a subtree decides
+what children should be listed. If that first \"child\" is a
+plain list item with an implied large level number, all true
+children and grand children of the outline heading will be
+exposed in a children' view."
:group 'org-plain-lists
:type '(choice
(const :tag "Never" nil)