瀏覽代碼

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.
Eric Schulte 13 年之前
父節點
當前提交
fa31c082d3
共有 1 個文件被更改,包括 3 次插入2 次删除
  1. 3 2
      lisp/ob-lisp.el

+ 3 - 2
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)))