ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

org.el (org-entry-get): Speed up by let-binding some variables only if needed 

* org.el (org-entry-get): Speed up by let-binding some
variables only if needed.  Also fix a bug: consider an empty
drawer as no drawer.

Thanks to William Léchelle for reporting this.
This commit is contained in:
Bastien Guerry 2013-01-07 18:18:27 +01:00
parent c8bfd50223
commit 0de96daa95
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lisp/org.el
View File

@ -14485,26 +14485,27 @@ when a \"nil\" value can supersede a non-nil value higher up the hierarchy."
;; We need a special property. Use `org-entry-properties' to
;; retrieve it, but specify the wanted property
(cdr (assoc property (org-entry-properties nil 'special property)))
(let* ((range (org-get-property-block))
(props (list (or (assoc property org-file-properties)
(assoc property org-global-properties)
(assoc property org-global-properties-fixed))))
(ap (lambda (key)
(when (re-search-forward
(org-re-property key) (cdr range) t)
(setq props
(org-update-property-plist
key
(if (match-end 1)
(org-match-string-no-properties 1) "")
props)))))
val)
(when (and range (goto-char (car range)))
(funcall ap property)
(goto-char (car range))
(while (funcall ap (concat property "+")))
(setq val (cdr (assoc property props)))
(when val (if literal-nil val (org-not-nil val)))))))))
(let ((range (org-get-property-block)))
(when (and range (not (eq (car range) (cdr range))))
(let* ((props (list (or (assoc property org-file-properties)
(assoc property org-global-properties)
(assoc property org-global-properties-fixed))))
(ap (lambda (key)
(when (re-search-forward
(org-re-property key) (cdr range) t)
(setq props
(org-update-property-plist
key
(if (match-end 1)
(org-match-string-no-properties 1) "")
props)))))
val)
(goto-char (car range))
(funcall ap property)
(goto-char (car range))
(while (funcall ap (concat property "+")))
(setq val (cdr (assoc property props)))
(when val (if literal-nil val (org-not-nil val))))))))))
(defun org-property-or-variable-value (var &optional inherit)
"Check if there is a property fixing the value of VAR.