diff options
| author | Sébastien Delafond <sdelafond@gmail.com> | 2014-07-13 13:35:29 +0200 |
|---|---|---|
| committer | Sébastien Delafond <sdelafond@gmail.com> | 2014-07-13 13:35:29 +0200 |
| commit | 40ce6b75e6245659a3a14622356e32e7dd1125dd (patch) | |
| tree | 7d0051414493a78c84a3dfbec6143883c2ba8341 /lisp/ob-exp.el | |
| parent | e32a45ed36d6000db4b39171149072d11b77af72 (diff) | |
Imported Upstream version 8.2.1
Diffstat (limited to 'lisp/ob-exp.el')
| -rw-r--r-- | lisp/ob-exp.el | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/lisp/ob-exp.el b/lisp/ob-exp.el index 1aa9c92..c8479e3 100644 --- a/lisp/ob-exp.el +++ b/lisp/ob-exp.el @@ -122,11 +122,11 @@ Assume point is at the beginning of block's starting line." (org-babel-exp-in-export-file lang (setf (nth 2 info) (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) - raw-params)))) + (apply #'org-babel-merge-params + org-babel-default-header-args + (if (boundp lang-headers) (eval lang-headers) nil) + (append (org-babel-params-from-properties lang) + (list raw-params)))))) (setf hash (org-babel-sha1-hash info))) (org-babel-exp-do-export info 'block hash))))) @@ -206,17 +206,20 @@ this template." (results (org-babel-exp-do-export (list "emacs-lisp" "results" - (org-babel-merge-params - org-babel-default-header-args - org-babel-default-lob-header-args - (org-babel-params-from-properties) - (org-babel-parse-header-arguments - (org-no-properties - (concat ":var results=" - (mapconcat 'identity - (butlast lob-info) - " "))))) - "" nil (car (last lob-info))) + (apply #'org-babel-merge-params + org-babel-default-header-args + org-babel-default-lob-header-args + (append + (org-babel-params-from-properties) + (list + (org-babel-parse-header-arguments + (org-no-properties + (concat + ":var results=" + (mapconcat 'identity + (butlast lob-info 2) + " "))))))) + "" (nth 3 lob-info) (nth 2 lob-info)) 'lob)) (rep (org-fill-template org-babel-exp-call-line-template @@ -387,7 +390,8 @@ inhibit insertion of results into the buffer." (org-babel-expand-noweb-references info (org-babel-exp-get-export-buffer)) (nth 1 info))) - (info (copy-sequence info))) + (info (copy-sequence info)) + (org-babel-current-src-block-location (point-marker))) ;; skip code blocks which we can't evaluate (when (fboundp (intern (concat "org-babel-execute:" lang))) (org-babel-eval-wipe-error-buffer) |