From: Achim Gratz Date: Sat, 18 May 2013 10:05:20 +0000 (+0200) Subject: Babel: complete fix for priority order of header arguments from e79e8943de X-Git-Tag: release_8.1~205 X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/3768cec39168bf930de84ecfbd1cb0ec27c5fbc2 Babel: complete fix for priority order of header arguments from e79e8943de * lisp/ob-core.el (org-babel-parse-inline-src-block-match), lisp/ob-exp.el (org-babel-exp-src-block): Give header arguments from properties priority over default header arguments. The previous commit e79e8943de did fix this only in ob-core.el (org-babel-parse-src-block-match). It was already correct in ob-lob.el (org-babel-lob-execute). --- diff --git a/lisp/ob-core.el b/lisp/ob-core.el index 06d2520fa..8d26c4e80 100644 --- a/lisp/ob-core.el +++ b/lisp/ob-core.el @@ -1344,8 +1344,8 @@ may be specified in the properties of the current outline entry." (org-unescape-code-in-string (org-no-properties (match-string 5))) (org-babel-merge-params org-babel-default-inline-header-args - (org-babel-params-from-properties lang) (if (boundp lang-headers) (eval lang-headers) nil) + (org-babel-params-from-properties lang) (org-babel-parse-header-arguments (org-no-properties (or (match-string 4) ""))))))) diff --git a/lisp/ob-exp.el b/lisp/ob-exp.el index d9fb294b2..ef8264d42 100644 --- a/lisp/ob-exp.el +++ b/lisp/ob-exp.el @@ -124,8 +124,8 @@ Assume point is at the beginning of block's starting line." (org-babel-process-params (org-babel-merge-params org-babel-default-header-args - (org-babel-params-from-properties lang) (if (boundp lang-headers) (eval lang-headers) nil) + (org-babel-params-from-properties lang) raw-params)))) (setf hash (org-babel-sha1-hash info))) (org-babel-exp-do-export info 'block hash)))))