[slime-cvs] CVS slime

[CVS User heller]

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

Modified Files:
	ChangeLog swank.lisp 
Log Message:
* swank.lisp (simple-serve-requests, make-repl-input-stream):
Move the call to WITH-CONNECTION to the input stream to pick up
stream redirections.

--- /project/slime/cvsroot/slime/ChangeLog	2009/01/03 21:13:00	1.1626
+++ /project/slime/cvsroot/slime/ChangeLog	2009/01/03 21:13:09	1.1627
@@ -1,5 +1,11 @@
 2009-01-03  Helmut Eller  <heller at common-lisp.net>
 
+	* swank.lisp (simple-serve-requests, make-repl-input-stream):
+	Move the call to WITH-CONNECTION to the input stream to pick up
+	stream redirections.
+
+2009-01-03  Helmut Eller  <heller at common-lisp.net>
+
 	* swank-clisp.lisp (wait-for-input): Disable it for win32.
 
 2009-01-02  Helmut Eller  <heller at common-lisp.net>
--- /project/slime/cvsroot/slime/swank.lisp	2009/01/02 21:57:54	1.623
+++ /project/slime/cvsroot/slime/swank.lisp	2009/01/03 21:13:09	1.624
@@ -1283,8 +1283,7 @@
             (let* ((stdin (real-input-stream *standard-input*))
                    (*standard-input* (make-repl-input-stream connection 
                                                              stdin)))
-	      (with-connection (connection)
-		(simple-repl))))))
+              (simple-repl)))))
     (close-connection connection nil (safe-backtrace))))
 
 (defun simple-repl ()
@@ -1306,16 +1305,17 @@
   (make-input-stream
    (lambda ()
      (loop
-      (let* ((socket (connection.socket-io connection))
-             (inputs (list socket stdin))
-             (ready (wait-for-input inputs)))
-        (cond ((eq ready :interrupt)
-               (check-slime-interrupts))
-              ((member socket ready)
-               (handle-requests connection t))
-              ((member stdin ready)
-               (return (read-non-blocking stdin)))
-              (t (assert (null ready)))))))))
+      (with-connection (connection)
+        (let* ((socket (connection.socket-io connection))
+               (inputs (list socket stdin))
+               (ready (wait-for-input inputs)))
+          (cond ((eq ready :interrupt)
+                 (check-slime-interrupts))
+                ((member socket ready)
+                 (handle-requests connection t))
+                ((member stdin ready)
+                 (return (read-non-blocking stdin)))
+                (t (assert (null ready))))))))))
 
 (defun read-non-blocking (stream)
   (with-output-to-string (str)