diff options
| author | Oleh Krehel <ohwoeowho@gmail.com> | 2014-04-14 12:28:02 +0200 |
|---|---|---|
| committer | Oleh Krehel <ohwoeowho@gmail.com> | 2014-04-14 12:28:02 +0200 |
| commit | 3a9bbb0ec36beb86d8edbf4745d698ea8baa336b (patch) | |
| tree | a3b04f4596bb99e614ab49c03e0f343ce11c1d3b | |
| parent | d5484ae3f50eac06abd381733d48fa7475331bdc (diff) | |
| download | org-mode-3a9bbb0ec36beb86d8edbf4745d698ea8baa336b.tar.gz | |
ob-clojure.el: fix behavior for :results pp
* lisp/ob-clojure.el (org-babel-expand-body:clojure): Simplify the
pretty printing.
(org-babel-execute:clojure): Check for "pp" in the parameters.
http://permalink.gmane.org/gmane.emacs.orgmode/84876
| -rw-r--r-- | lisp/ob-clojure.el | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/lisp/ob-clojure.el b/lisp/ob-clojure.el index 5ca44fb..a3e6cbe 100644 --- a/lisp/ob-clojure.el +++ b/lisp/ob-clojure.el @@ -84,16 +84,10 @@ vars "\n ") "]\n" body ")") body)))) - (cond ((or (member "code" result-params) (member "pp" result-params)) - (format (concat "(let [org-mode-print-catcher (java.io.StringWriter.)] " - "(clojure.pprint/with-pprint-dispatch clojure.pprint/%s-dispatch " - "(clojure.pprint/pprint (do %s) org-mode-print-catcher) " - "(str org-mode-print-catcher)))") - (if (member "code" result-params) "code" "simple") body)) - ;; if (:results output), collect printed output - ;; ((member "output" result-params) - ;; (format "(clojure.core/with-out-str %s)" body)) - (t body)))) + (if (or (member "code" result-params) + (member "pp" result-params)) + (format "(clojure.pprint/pprint (do %s))" body) + body))) (defun org-babel-execute:clojure (body params) "Execute a block of Clojure code with Babel." @@ -106,7 +100,8 @@ (setq result (plist-get (nrepl-send-string-sync expanded) - (if (member "output" result-params) + (if (or (member "output" result-params) + (member "pp" result-params)) :stdout :value))))) (nrepl |