summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2020-01-03 11:07:28 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2020-01-03 11:07:28 +0100
commit2fbbc233686b5de9a02160ee9157b50be1596dea (patch)
tree239e5e611adfe7db33222dd8a09b4c37cee25fa0
parent93c11da002bad20b1e288fe815020bcb8b9ea4d2 (diff)
downloadorg-mode-2fbbc233686b5de9a02160ee9157b50be1596dea.tar.gz
Fix build
* lisp/org-compat.el (org-file-properties): Prevent error at build time about creating an alias for a local variable. * lisp/org.el (org-keyword-properties): Slight change to docstring.
-rw-r--r--lisp/org-compat.el3
-rw-r--r--lisp/org.el9
2 files changed, 6 insertions, 6 deletions
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 596dd30..60df315 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -561,8 +561,7 @@ use of this function is for the stuck project list."
(define-obsolete-function-alias 'org-property-global-value
'org-property-global-or-keyword-value "Org 9.3")
-(define-obsolete-variable-alias 'org-file-properties
- 'org-keyword-properties "Org 9.3")
+(make-obsolete-variable 'org-file-properties 'org-keyword-properties "Org 9.3")
(define-obsolete-variable-alias 'org-angle-link-re
'org-link-angle-re "Org 9.3")
diff --git a/lisp/org.el b/lisp/org.el
index dfa22cb..755fc12 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -3199,13 +3199,14 @@ or by adding lines like
(string :tag "Value"))))
(defvar-local org-keyword-properties nil
- "List of property/value pairs that can be inherited by any entry.
+ "List of property/value pairs inherited by any entry.
+
Valid for the current buffer. This variable is populated from
-#+PROPERTY lines.
+PROPERTY keywords.
Note that properties are defined also in property drawers.
-Properties defined there will take precedence over properties
-defined as keywords.")
+Properties defined there take precedence over properties defined
+as keywords.")
(defgroup org-agenda nil
"Options concerning agenda views in Org mode."