|
@@ -15999,7 +15999,7 @@ strings."
|
|
;; Return value.
|
|
;; Return value.
|
|
props)))))
|
|
props)))))
|
|
|
|
|
|
-(defun org-property--local-values (property literal-nil)
|
|
|
|
|
|
+(defun org--property-local-values (property literal-nil)
|
|
"Return value for PROPERTY in current entry.
|
|
"Return value for PROPERTY in current entry.
|
|
Value is a list whose car is the base value for PROPERTY and cdr
|
|
Value is a list whose car is the base value for PROPERTY and cdr
|
|
a list of accumulated values. Return nil if neither is found in
|
|
a list of accumulated values. Return nil if neither is found in
|
|
@@ -16062,7 +16062,7 @@ value higher up the hierarchy."
|
|
(or (not (eq inherit 'selective)) (org-property-inherit-p property)))
|
|
(or (not (eq inherit 'selective)) (org-property-inherit-p property)))
|
|
(org-entry-get-with-inheritance property literal-nil))
|
|
(org-entry-get-with-inheritance property literal-nil))
|
|
(t
|
|
(t
|
|
- (let* ((local (org-property--local-values property literal-nil))
|
|
|
|
|
|
+ (let* ((local (org--property-local-values property literal-nil))
|
|
(value (and local (mapconcat #'identity (delq nil local) " "))))
|
|
(value (and local (mapconcat #'identity (delq nil local) " "))))
|
|
(if literal-nil value (org-not-nil value)))))))
|
|
(if literal-nil value (org-not-nil value)))))))
|
|
|
|
|
|
@@ -16174,7 +16174,7 @@ However, if LITERAL-NIL is set, return the string value \"nil\" instead."
|
|
(let (value)
|
|
(let (value)
|
|
(catch 'exit
|
|
(catch 'exit
|
|
(while t
|
|
(while t
|
|
- (let ((v (org-property--local-values property literal-nil)))
|
|
|
|
|
|
+ (let ((v (org--property-local-values property literal-nil)))
|
|
(when v
|
|
(when v
|
|
(setq value
|
|
(setq value
|
|
(concat (mapconcat #'identity (delq nil v) " ")
|
|
(concat (mapconcat #'identity (delq nil v) " ")
|