From 3074d081e7d7d6551c04ab239cc6a90ebcbfa9fa Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Mon, 17 Mar 2014 21:22:04 +0100 Subject: [PATCH] Revert "Properties: Fix property-getting with inheritance" This reverts commit 475f2f5388074c5153b3f35e41696419faa52b54. --- lisp/org.el | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 10669ebf6..d52d5a26b 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -15455,15 +15455,14 @@ However, if LITERAL-NIL is set, return the string value \"nil\" instead." (save-restriction (widen) (catch 'ex - (let (org-file-properties org-global-properties org-global-properties-fixed) - (while t - (when (setq tmp (org-entry-get nil property nil 'literal-nil)) - (or (ignore-errors (org-back-to-heading t)) - (goto-char (point-min))) - (move-marker org-entry-property-inherited-from (point)) - (throw 'ex tmp)) - (or (ignore-errors (org-up-heading-safe)) - (throw 'ex nil))))))) + (while t + (when (setq tmp (org-entry-get nil property nil 'literal-nil)) + (or (ignore-errors (org-back-to-heading t)) + (goto-char (point-min))) + (move-marker org-entry-property-inherited-from (point)) + (throw 'ex tmp)) + (or (ignore-errors (org-up-heading-safe)) + (throw 'ex nil)))))) (setq tmp (or tmp (cdr (assoc property org-file-properties)) (cdr (assoc property org-global-properties))