Let *1 be set properly when pretty-printing, fixes clojure-emacsgh-468

cemerick · Feb 5, 2014 · 0c5d18d · 0c5d18d
1 parent edfefda
commit 0c5d18d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/cider-interaction.el b/cider-interaction.el
@@ -994,7 +994,7 @@ Print its value into the current buffer."
   (interactive)
   (let ((form (cider-last-sexp))
         (result-buffer (cider-popup-buffer cider-result-buffer nil)))
-    (cider-tooling-eval (format "(clojure.pprint/pprint %s)" form)
+    (cider-tooling-eval (format "(let [x %s] (clojure.pprint/pprint x) x)" form)
                         (cider-popup-eval-out-handler result-buffer)
                         (cider-current-ns))))
 
@@ -1003,7 +1003,7 @@ Print its value into the current buffer."
   (interactive)
   (let ((form (cider-defun-at-point))
         (result-buffer (cider-popup-buffer cider-result-buffer nil)))
-    (cider-tooling-eval (format "(clojure.pprint/pprint %s)" form)
+    (cider-tooling-eval (format "(let [x %s] (clojure.pprint/pprint x) x)" form)
                         (cider-popup-eval-out-handler result-buffer)
                         (cider-current-ns))))
 

diff --git a/cider-repl.el b/cider-repl.el
@@ -512,7 +512,8 @@ the symbol."
   "Make a nREPL evaluation handler for the REPL BUFFER."
   (nrepl-make-response-handler buffer
                                (lambda (buffer value)
-                                 (cider-repl-emit-result buffer value t))
+                                 (when (not cider-repl-use-pretty-printing)
+				   (cider-repl-emit-result buffer value t)))
                                (lambda (buffer out)
                                  (cider-repl-emit-output buffer out))
                                (lambda (buffer err)
@@ -551,7 +552,7 @@ If NEWLINE is true then add a newline at the end of the input."
   (let* ((input (cider-repl--current-input))
          (form (if (and (not (string-match "\\`[ \t\r\n]*\\'" input))
                         cider-repl-use-pretty-printing)
-                   (format "(clojure.pprint/pprint %s)" input)
+                   (format "(let [x %s] (clojure.pprint/pprint x) x)" input)
                  input)))
     (goto-char (point-max))
     (cider-repl--mark-input-start)