From 2cfbab2c750da1b54a801367360e7aa33c045ae0 Mon Sep 17 00:00:00 2001 From: fpi Date: Sat, 14 Apr 2018 18:06:13 +0200 Subject: Better tests when control or circuit body empty --- ob-spice.org | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'ob-spice.org') diff --git a/ob-spice.org b/ob-spice.org index 30c47b9..f9b3586 100644 --- a/ob-spice.org +++ b/ob-spice.org @@ -450,11 +450,11 @@ This function is called by `org-babel-execute-src-block'." (assq-delete-all :epilogue (copy-alist params)))) ;; todo: replace vars. :-( → set vars break when doing something like $file.txt (control-body (org-babel-spice-trim-body (substring body break-index))) - (full-control-body (if control-body - (org-babel-expand-body:generic - control-body - (assq-delete-all :prologue (copy-alist params)) - (org-babel-variable-assignments:spice params)))) + (full-control-body (if (not (string= control-body "")) + (org-babel-expand-body:generic + control-body + (assq-delete-all :prologue (copy-alist params)) + (org-babel-variable-assignments:spice params)) "")) (circuit-file (if circuit-body (org-babel-temp-file "spice-body-" ".cir"))) (result)) @@ -493,7 +493,7 @@ If RESULT-TYPE equals `output' return all outputs, if it equals `value' return only value of last statement. FILE can refer to a spice input file that is sourced before BODY execution is started." (let ((eoe-string (format "echo \"%s\"" org-babel-spice-eoe-indicator)) - (eval-body (concat "source " file "\n" body))) + (eval-body (if file (concat "source " file "\n" body) ""))) (pcase result-type (`output ;; Force session to be ready -- cgit v1.2.3