summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2016-04-23 17:40:16 -0400
committerKyle Meyer <kyle@kyleam.com>2016-04-23 17:40:16 -0400
commitdfafc869a3e877cd51b759feeae77d2c9d6499cb (patch)
tree35399ba719e4bb9b02e82cfe1f74bbdd627001a0
parent7e320e2f1b294030ae5cc4ee1aedb522db042259 (diff)
parentae73c75fa68520d42f26141152c6ad5d010e2fea (diff)
downloadorg-mode-dfafc869a3e877cd51b759feeae77d2c9d6499cb.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org.el15
1 files changed, 8 insertions, 7 deletions
diff --git a/lisp/org.el b/lisp/org.el
index fb3b452..adb1967 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -24010,17 +24010,18 @@ This command will look at the current kill and check if is a single
subtree, or a series of subtrees[1]. If it passes the test, and if the
cursor is at the beginning of a line or after the stars of a currently
empty headline, then the yank is handled specially. How exactly depends
-on the value of the following variables, both set by default.
+on the value of the following variables.
`org-yank-folded-subtrees'
- When set, the subtree(s) will be folded after insertion, but only
- if doing so would now swallow text after the yanked text.
+ By default, this variable is non-nil, which results in subtree(s)
+ being folded after insertion, but only if doing so would now
+ swallow text after the yanked text.
`org-yank-adjusted-subtrees'
- When set, the subtree will be promoted or demoted in order to
- fit into the local outline tree structure, which means that the
- level will be adjusted so that it becomes the smaller one of the
- two *visible* surrounding headings.
+ When non-nil (the default value is nil), the subtree will be
+ promoted or demoted in order to fit into the local outline tree
+ structure, which means that the level will be adjusted so that it
+ becomes the smaller one of the two *visible* surrounding headings.
Any prefix to this command will cause `yank' to be called directly with
no special treatment. In particular, a simple \\[universal-argument] prefix \