summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Schulte <schulte.eric@gmail.com>2011-05-31 09:54:23 -0600
committerEric Schulte <schulte.eric@gmail.com>2011-05-31 09:55:10 -0600
commitfa31c082d307b1403274e557aa4a2c430cf85468 (patch)
tree2690720766b37adf373273da76e8bc083ed048bc
parent5d1674f330b19da9142eb32784f99978b7988f2c (diff)
downloadorg-mode-fa31c082d307b1403274e557aa4a2c430cf85468.tar.gz
ob-lisp: moved `progn' wrapper out of `org-babel-expand-body:lisp'
Thanks to Mark Cox for suggesting this patch * lisp/ob-lisp.el (org-babel-expand-body:lisp): No longer wraps biddies in `progn'. (org-babel-execute:lisp): Wraps bodies in `progn' as they are passed to swank.
-rw-r--r--lisp/ob-lisp.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/ob-lisp.el b/lisp/ob-lisp.el
index a810d86..a875d55 100644
--- a/lisp/ob-lisp.el
+++ b/lisp/ob-lisp.el
@@ -54,7 +54,7 @@
(format "(%S (quote %S))" (car var) (cdr var)))
vars "\n ")
")\n" body ")")
- (format "(progn %s)" body)))))
+ body))))
(if (or (member "code" result-params)
(member "pp" result-params))
(format "(pprint %s)" body)
@@ -73,7 +73,8 @@
(read (org-bable-lisp-vector-to-list (cadr result)))
(error (cadr result)))))
(slime-eval `(swank:eval-and-grab-output
- ,(buffer-substring-no-properties (point-min) (point-max)))
+ ,(format "(progn %s)" (buffer-substring-no-properties
+ (point-min) (point-max))))
(cdr (assoc :package params)))))
(org-babel-pick-name (cdr (assoc :colname-names params))
(cdr (assoc :colnames params)))