diff options
author | Achim Gratz <Stromeko@Stromeko.DE> | 2013-05-18 12:05:20 +0200 |
---|---|---|
committer | Achim Gratz <Stromeko@Stromeko.DE> | 2013-05-19 21:06:53 +0200 |
commit | 3768cec39168bf930de84ecfbd1cb0ec27c5fbc2 (patch) | |
tree | eabaff61a74781297ff65310ec006c3d58c58e3e | |
parent | a5872b9ecac9573913146590c6c464b5a3588af4 (diff) | |
download | org-mode-3768cec39168bf930de84ecfbd1cb0ec27c5fbc2.tar.gz |
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).
-rw-r--r-- | lisp/ob-core.el | 2 | ||||
-rw-r--r-- | lisp/ob-exp.el | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ob-core.el b/lisp/ob-core.el index 06d2520..8d26c4e 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 d9fb294..ef8264d 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))))) |