|author||Bastien Guerry <email@example.com>||2013-01-01 16:11:12 (GMT)|
|committer||Bastien Guerry <firstname.lastname@example.org>||2013-01-01 16:11:12 (GMT)|
Merge branch 'maint'
1 files changed, 9 insertions, 9 deletions
diff --git a/lisp/org-list.el b/lisp/org-list.el
index 761c5ff..a85f769 100644
@@ -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."
(const :tag "Never" nil)