summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Schulte <eric.schulte@gmx.com>2012-01-20 11:44:12 -0700
committerEric Schulte <eric.schulte@gmx.com>2012-01-20 11:44:12 -0700
commit97e8e03eea0f4f69377df37548a0e51d0cb5ecec (patch)
treea1894eb309931add3570ed887934f908ec57abb4
parent5a0bf5e7d18449ccf0e49b015bc0de48ace7074c (diff)
downloadorg-mode-97e8e03eea0f4f69377df37548a0e51d0cb5ecec.tar.gz
Ensure params are incorporated *before* checking if evaluation is legal
* lisp/ob.el (org-babel-execute-src-block): Ensure params are incorporated *before* checking if evaluation is legal.
-rw-r--r--lisp/ob.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ob.el b/lisp/ob.el
index 66e82e0..64230d6 100644
--- a/lisp/ob.el
+++ b/lisp/ob.el
@@ -476,7 +476,10 @@ the header arguments specified at the front of the source code
block."
(interactive)
(let ((info (or info (org-babel-get-src-block-info))))
- (when (org-babel-confirm-evaluate info)
+ (when (org-babel-confirm-evaluate
+ (let ((i info))
+ (setf (nth 2 i) (org-babel-merge-params (nth 2 info) params))
+ i))
(let* ((lang (nth 0 info))
(params (if params
(org-babel-process-params