0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-30 16:33:43 +00:00

Merge branch 'maint'

This commit is contained in:
Kyle Meyer 2016-04-23 17:40:16 -04:00
commit dfafc869a3

View file

@ -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 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 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 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' `org-yank-folded-subtrees'
When set, the subtree(s) will be folded after insertion, but only By default, this variable is non-nil, which results in subtree(s)
if doing so would now swallow text after the yanked text. being folded after insertion, but only if doing so would now
swallow text after the yanked text.
`org-yank-adjusted-subtrees' `org-yank-adjusted-subtrees'
When set, the subtree will be promoted or demoted in order to When non-nil (the default value is nil), the subtree will be
fit into the local outline tree structure, which means that the promoted or demoted in order to fit into the local outline tree
level will be adjusted so that it becomes the smaller one of the structure, which means that the level will be adjusted so that it
two *visible* surrounding headings. becomes the smaller one of the two *visible* surrounding headings.
Any prefix to this command will cause `yank' to be called directly with Any prefix to this command will cause `yank' to be called directly with
no special treatment. In particular, a simple \\[universal-argument] prefix \ no special treatment. In particular, a simple \\[universal-argument] prefix \