diff options
author | Bastien Guerry <bzg@altern.org> | 2013-01-08 16:19:39 +0100 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2013-01-08 16:19:39 +0100 |
commit | 57f4e17f99a8419b6fd90c8c3d5826fa0696640a (patch) | |
tree | c45eb361778ba518676ce9ef1bd0c5b79339b061 | |
parent | f5e478a401b846318dec9cee2b664a91d0d9a07d (diff) | |
parent | c8c217aa5533e9532cf6d4cd059a8752d971d7c8 (diff) | |
download | org-mode-57f4e17f99a8419b6fd90c8c3d5826fa0696640a.tar.gz |
Merge branch 'maint'
-rw-r--r-- | doc/org.texi | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/doc/org.texi b/doc/org.texi index b97f27c..6625ed8 100644 --- a/doc/org.texi +++ b/doc/org.texi @@ -1472,6 +1472,13 @@ Move subtree up (swap with previous subtree of same level). @orgcmd{M-S-@key{down},org-move-subtree-down} Move subtree down (swap with next subtree of same level). +@orgcmd{M-h,org-mark-element} +Mark the element at point. Hitting repeatedly will mark subsequent elements +of the one just marked. E.g. hitting @key{M-h} on a paragraph will mark it, +hitting @key{M-h} immediately again will mark the next one. +@orgcmd{C-c @@,org-mark-subtree} +Mark the subtree at point. Hitting repeatedly will mark subsequent subtrees +of the same level than the marked subtree. @orgcmd{C-c C-x C-w,org-cut-subtree} Kill subtree, i.e., remove it from buffer but save in kill ring. With a numeric prefix argument N, kill N sequential subtrees. @@ -4685,9 +4692,8 @@ changes in the line.}: @noindent @vindex org-use-tag-inheritance @vindex org-tags-exclude-from-inheritance -To limit tag inheritance to specific tags, or to turn it off entirely, use -the variables @code{org-use-tag-inheritance} and -@code{org-tags-exclude-from-inheritance}. +To limit tag inheritance to specific tags, use @code{org-tags-exclude-from-inheritance}. +To turn it off entirely, use @code{org-use-tag-inheritance}. @vindex org-tags-match-list-sublevels When a headline matches during a tags search while tag inheritance is turned @@ -4698,6 +4704,15 @@ of matches may then become very long. If you only want to see the first tags match in a subtree, configure the variable @code{org-tags-match-list-sublevels} (not recommended). +@vindex org-agenda-use-tag-inheritance +Tag inheritance is relevant when the agenda search tries to match a tag, +either in the @code{tags} or @code{tags-todo} agenda types. In other agenda +types, @code{org-use-tag-inheritance} has no effect. Still, you may want to +have your tags correctly set in the agenda, so that tag filtering works fine, +with inherited tags. Set @code{org-agenda-use-tag-inheritance} to control +this: the default value includes all agenda types, but setting this to nil +can really speed up agenda generation. + @node Setting tags, Tag searches, Tag inheritance, Tags @section Setting tags @cindex setting tags |