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

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2014-03-17 21:22:20 +01:00
parent 2202826e5e 3074d081e7
commit 6e0e76308c
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/org.el
View File

@ -15558,7 +15558,6 @@ However, if LITERAL-NIL is set, return the string value \"nil\" instead."
(save-restriction (save-restriction
(widen) (widen)
(catch 'ex (catch 'ex
(let (org-file-properties org-global-properties org-global-properties-fixed)
(while t (while t
(when (setq tmp (org-entry-get nil property nil 'literal-nil)) (when (setq tmp (org-entry-get nil property nil 'literal-nil))
(or (ignore-errors (org-back-to-heading t)) (or (ignore-errors (org-back-to-heading t))
@ -15566,7 +15565,7 @@ However, if LITERAL-NIL is set, return the string value \"nil\" instead."
(move-marker org-entry-property-inherited-from (point)) (move-marker org-entry-property-inherited-from (point))
(throw 'ex tmp)) (throw 'ex tmp))
(or (ignore-errors (org-up-heading-safe)) (or (ignore-errors (org-up-heading-safe))
(throw 'ex nil))))))) (throw 'ex nil))))))
(setq tmp (or tmp (setq tmp (or tmp
(cdr (assoc property org-file-properties)) (cdr (assoc property org-file-properties))
(cdr (assoc property org-global-properties)) (cdr (assoc property org-global-properties))