diff options
author | Eric Schulte <eric.schulte@gmx.com> | 2012-01-13 13:09:34 -0700 |
---|---|---|
committer | Eric Schulte <eric.schulte@gmx.com> | 2012-01-13 13:09:34 -0700 |
commit | b93ed753ff64bea5fa8c44e1d0fc45bc89ab1344 (patch) | |
tree | be49f77830c28a65b7e228f11655b5cf71da5ecf | |
parent | 117ee610e5d4ba51fba275302ddd12cc9f554117 (diff) | |
parent | a370bae5d9810d4af2ec94e82df9fa9c6630c9ec (diff) | |
download | org-mode-b93ed753ff64bea5fa8c44e1d0fc45bc89ab1344.tar.gz |
Merge branch 'origin-maint'
-rw-r--r-- | lisp/ob-clojure.el | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/ob-clojure.el b/lisp/ob-clojure.el index 1c0c37c..69d3db8 100644 --- a/lisp/ob-clojure.el +++ b/lisp/ob-clojure.el @@ -31,7 +31,6 @@ ;;; - clojure (at least 1.2.0) ;;; - clojure-mode ;;; - slime -;;; - swank-clojure ;;; By far, the best way to install these components is by following ;;; the directions as set out by Phil Hagelberg (Technomancy) on the @@ -75,7 +74,7 @@ (defun org-babel-execute:clojure (body params) "Execute a block of Clojure code with Babel." - (require 'slime) (require 'swank-clojure) + (require 'slime) (with-temp-buffer (insert (org-babel-expand-body:clojure body params)) ((lambda (result) @@ -86,7 +85,7 @@ (condition-case nil (org-babel-script-escape result) (error result))))) (slime-eval - `(swank:interactive-eval-region + `(swank:eval-and-grab-output ,(buffer-substring-no-properties (point-min) (point-max))) (cdr (assoc :package params)))))) |