[slime-cvs] CVS slime

[CVS User heller]

Update of /project/slime/cvsroot/slime
In directory cl-net:/tmp/cvs-serv2346

Modified Files:
	ChangeLog swank.lisp 
Log Message:
* swank.lisp (pprint-eval): Also return the output produced during
evaluation.

--- /project/slime/cvsroot/slime/ChangeLog	2009/01/16 15:49:39	1.1667
+++ /project/slime/cvsroot/slime/ChangeLog	2009/01/16 15:49:48	1.1668
@@ -6,6 +6,11 @@
 	
 2009-01-16  Helmut Eller  <heller at common-lisp.net>
 
+	* swank.lisp (pprint-eval): Also return the output produced during
+	evaluation.
+
+2009-01-16  Helmut Eller  <heller at common-lisp.net>
+
 	* swank-openmcl.lisp (break-in-sldb): Display the argument.
 
 2009-01-16  Helmut Eller  <heller at common-lisp.net>
--- /project/slime/cvsroot/slime/swank.lisp	2009/01/10 12:25:46	1.632
+++ /project/slime/cvsroot/slime/swank.lisp	2009/01/16 15:49:48	1.633
@@ -2191,8 +2191,13 @@
   
 (defslimefun pprint-eval (string)
   (with-buffer-syntax ()
-    (with-retry-restart (:msg "Retry SLIME evaluation request.")
-      (swank-pprint (multiple-value-list (eval (read-from-string string)))))))
+    (let* ((s (make-string-output-stream))
+           (values 
+            (let ((*standard-output* s)
+                  (*trace-output* s))
+              (multiple-value-list (eval (read-from-string string))))))
+      (cat (get-output-stream-string s)
+           (swank-pprint values)))))
 
 (defslimefun set-package (name)
   "Set *package* to the package named NAME.