浏览代码

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.
Nicolas Goaziou 5 年之前
父节点
当前提交
2fbbc23368
共有 2 个文件被更改,包括 6 次插入6 次删除
  1. 1 2
      lisp/org-compat.el
  2. 5 4
      lisp/org.el

+ 1 - 2
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")

+ 5 - 4
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."