tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2014-03-18 14:50:42 +01:00
parent 5d8cc35e4a 42ee862d33
commit cdb16718c0
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lisp/org.el
View File

@ -15432,7 +15432,13 @@ when a \"nil\" value can supersede a non-nil value higher up the hierarchy."
(cdr (assoc property (org-entry-properties nil 'special property)))
(org-with-wide-buffer
(let ((range (org-get-property-block)))
(when (and range (not (eq (car range) (cdr range))))
(when (and range (not (eq (car range) (cdr range)))
(save-excursion
(goto-char (car range))
(re-search-forward
(concat (org-re-property property) "\\|"
(org-re-property (concat property "+")))
(cdr range) t)))
(let* ((props
(list (or (assoc property org-file-properties)
(assoc property org-global-properties)