summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2019-02-09 18:53:28 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2019-02-09 18:53:28 +0100
commit9b3ca51fa4129bcc98f33a22d8e46f39674e082e (patch)
tree4976bb07c598d20de39fedd270c6d9cf018ab332
parent56eacb4a68999bbc1e7672b731f60a84a934171e (diff)
parentb929c3e5e4462c8b7ff72e719bcf2c2715a4b19a (diff)
downloadorg-mode-9b3ca51fa4129bcc98f33a22d8e46f39674e082e.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/org.el b/lisp/org.el
index 82fee46..e225874 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -14617,7 +14617,7 @@ Assume point is at the beginning of the headline."
When argument POS is non-nil, retrieve tags for headline at POS.
-According to `org-use-tags-inheritance', tags may be inherited
+According to `org-use-tag-inheritance', tags may be inherited
from parent headlines, and from the whole document, through
`org-file-tags'. In this case, the returned list of tags
contains tags in this order: file tags, tags inherited from