[slime-cvs] CVS slime

[CVS User trittweiler]

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

Modified Files:
	swank.lisp ChangeLog 
Log Message:
	* swank.lisp (make-repl-input-stream): Make sure to redirect
	output from slime requests to the REPL buffer for
	communication-style=NIL.


--- /project/slime/cvsroot/slime/swank.lisp	2009/07/02 14:14:26	1.654
+++ /project/slime/cvsroot/slime/swank.lisp	2009/07/06 11:22:47	1.655
@@ -1358,15 +1358,19 @@
                 (if (open-stream-p stdin) 
                     :stdin-open :stdin-closed))
      (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))
+               ;; A Slime request from Emacs is pending; make sure to
+               ;; redirect IO to the REPL buffer.
+               (with-io-redirection (connection)
+                 (handle-requests connection t)))
               ((member stdin ready)
+               ;; User typed something into the  *inferior-lisp* buffer,
+               ;; so do not redirect.
                (return (read-non-blocking stdin)))
               (t (assert (null ready)))))))))
 
--- /project/slime/cvsroot/slime/ChangeLog	2009/07/02 17:00:21	1.1806
+++ /project/slime/cvsroot/slime/ChangeLog	2009/07/06 11:22:47	1.1807
@@ -1,3 +1,9 @@
+2009-07-06  Tobias C. Rittweiler  <tcr at freebits.de>
+
+	* swank.lisp (make-repl-input-stream): Make sure to redirect
+	output from slime requests to the REPL buffer for
+	communication-style=NIL.
+
 2009-07-02  Stas Boukarev  <stassats at gmail.com>
 
 	* slime.el (slime-beginning-of-symbol): Limit searching to 2000
@@ -148,7 +154,7 @@
 	* swank-ecl.lisp: Support new environment changes in recent ECL/CVS
 	patch largely from ECL maintainer.
 
-2009-06-1  Tobias C. Rittweiler  <tcr at freebits.de>
+2009-06-11  Tobias C. Rittweiler  <tcr at freebits.de>
 
 	* slime.el ([test] font-lock-magic): Moved to fontifying-fu contrib.