[nongnu] elpa/org-contrib e11f0399b6: lisp/org-collector.el: Proper read of org inactive ts in props

[ELPA Syncer]

branch: elpa/org-contrib
commit e11f0399b629524d3f6d62bf9788fdfe2fec2556
Author: Pedro <pedro@cas.cat>
Commit: Bastien Guerry <bzg@gnu.org>

    lisp/org-collector.el: Proper read of org inactive ts in props
    
    * lisp/org-collector.el (org-propview-collect): Inhibit lisp
    evaluation when properties with inactive timestamps value are
    processed using lisp functions in the :cols argument.
---
 lisp/org-collector.el | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lisp/org-collector.el b/lisp/org-collector.el
index ce3a9373e7..76ba7fb115 100644
--- a/lisp/org-collector.el
+++ b/lisp/org-collector.el
@@ -187,7 +187,8 @@ variables and values specified in props"
         (header-props
          (mapcar (lambda (props)
                    (mapcar (lambda (pair)
-                             (let ((inhibit-lisp-eval (string= (car pair) 
"ITEM")))
+                             (let ((inhibit-lisp-eval (or (string= (car pair) 
"ITEM")
+                                                          (string-match-p 
org-ts-regexp-inactive (cdr pair)))))
                                (cons (car pair) (org-babel-read (cdr pair) 
inhibit-lisp-eval))))
                            props))
                  header-props)))
@@ -202,9 +203,9 @@ variables and values specified in props"
       'hline) ;; ------------------------------------------------
      (mapcar ;; calculate the value of the column for each header
       (lambda (props) (mapcar (lambda (col)
-                          (let ((result (org-propview-eval-w-props props col)))
-                            (if result result org-propview-default-value)))
-                        cols))
+                               (let ((result (org-propview-eval-w-props props 
col)))
+                                 (if result result 
org-propview-default-value)))
+                             cols))
       (if conds
          ;; eliminate the headers which don't satisfy the property
          (delq nil