Merge branch 'master' of orgmode.org:org-mode

2011-02-12 19:39:20 +01:00 · 2011-02-12 19:39:20 +01:00 · 8fd354cf0e
parent d95e468744 934e6b0510
commit 8fd354cf0e
1 changed files with 1 additions and 1 deletions
--- a/lisp/ob.el
+++ b/lisp/ob.el
@ -864,7 +864,7 @@ may be specified in the properties of the current outline entry."
 	     (lambda (header-arg)
 	       (and (setq val
 			  (or (org-entry-get (point) header-arg t)
-			      (cdr (assoc header-arg org-file-properties))))
+			      (org-entry-get (point) (concat ":" header-arg) t)))
 		    (cons (intern (concat ":" header-arg))
 			  (org-babel-read val))))
 	     (mapcar