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

Whitespace and indentation cleanup.

This commit is contained in:
Bastien Guerry 2011-02-12 18:53:07 +01:00
parent 7dd425cc5d
commit f0c9e8d672
1 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lisp/org.el
View File

@ -13683,22 +13683,21 @@ However, if LITERAL-NIL is set, return the string value \"nil\" instead."
(move-marker org-entry-property-inherited-from nil) (move-marker org-entry-property-inherited-from nil)
(let (tmp) (let (tmp)
(unless (org-before-first-heading-p) (unless (org-before-first-heading-p)
(save-excursion (save-excursion
(save-restriction (save-restriction
(widen) (widen)
(catch 'ex (catch 'ex
(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))
(org-back-to-heading t) (org-back-to-heading t)
(move-marker org-entry-property-inherited-from (point)) (move-marker org-entry-property-inherited-from (point))
(throw 'ex tmp)) (throw 'ex tmp))
(or (org-up-heading-safe) (throw 'ex nil))))) (or (org-up-heading-safe) (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)) (cdr (assoc property org-global-properties-fixed))))
(cdr (assoc property org-global-properties-fixed)))) (if literal-nil tmp (org-not-nil tmp))))
(if literal-nil tmp (org-not-nil tmp))))
(defvar org-property-changed-functions nil (defvar org-property-changed-functions nil
"Hook called when the value of a property has changed. "Hook called when the value of a property has changed.