[slime-cvs] CVS update: slime/swank.lisp

[Matthias Koeppe]

Update of /project/slime/cvsroot/slime
In directory common-lisp.net:/tmp/cvs-serv26126

Modified Files:
	swank.lisp 
Log Message:
(encode-message): Don't use the pretty printer for printing the
message length.

(listener-eval): Store the whole values-list with add-repl-result.

Date: Thu Aug  4 21:23:14 2005
Author: mkoeppe

Index: slime/swank.lisp
diff -u slime/swank.lisp:1.314 slime/swank.lisp:1.315
--- slime/swank.lisp:1.314	Thu Aug  4 21:16:14 2005
+++ slime/swank.lisp	Thu Aug  4 21:23:13 2005
@@ -975,7 +975,8 @@
   (let* ((string (prin1-to-string-for-emacs message))
          (length (1+ (length string))))
     (log-event "WRITE: ~A~%" string)
-    (format stream "~6,'0x" length)
+    (let ((*print-pretty* nil))
+      (format stream "~6,'0x" length))
     (write-string string stream)
     (terpri stream)
     (force-output stream)))
@@ -1852,13 +1853,13 @@
 	  (setq *** **  ** *  * (car values)
 		/// //  // /  / values)
           (when *record-repl-results*
-            (add-repl-result *current-id* *)))
+            (add-repl-result *current-id* values)))
 	(setq +++ ++  ++ +  + last-form)
 	(if (eq *slime-repl-suppress-output* t)
 	    ""
 	    (cond ((null values) "; No value")
 		  (t
-		   (format nil "~{~S~^~%~}" values))))))))
+                   (mapcar #'prin1-to-string values))))))))
 
 (defun add-repl-result (id val)
   (push (cons id val) *repl-results*)