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

2011-02-12 16:53:21 +01:00 · 2011-02-12 16:53:21 +01:00 · 2df6f65e23
parent 8ec508b128 775d962788
commit 2df6f65e23
1 changed files with 2 additions and 1 deletions
--- a/lisp/ob.el
+++ b/lisp/ob.el
@ -893,7 +893,8 @@ may be specified in the current buffer."
 		    (org-babel-merge-params
 		     org-babel-current-buffer-properties
 		     (org-babel-parse-header-arguments
-		      (org-match-string-no-properties 2))))))))))
+		      (org-match-string-no-properties 2)))))
+	    org-babel-current-buffer-properties)))))

 (defvar org-src-preserve-indentation)
 (defun org-babel-parse-src-block-match ()