[slime-cvs] CVS slime

trittweiler trittweiler at common-lisp.net
Sat Jul 5 13:37:25 UTC 2008


Update of /project/slime/cvsroot/slime
In directory clnet:/tmp/cvs-serv1935

Modified Files:
	swank.lisp 
Log Message:

	* swank.lisp: Revert Melis' change from 2008-07-04; Global IO
	redirection seems currently to be broken, and while it's not due
	to that commit (it seems that it's been broken since longer), I
	want to be on a safe bet.


--- /project/slime/cvsroot/slime/swank.lisp	2008/07/05 11:48:11	1.545
+++ /project/slime/cvsroot/slime/swank.lisp	2008/07/05 13:37:25	1.546
@@ -1291,30 +1291,18 @@
 (defun call-with-redirected-io (connection function)
   "Call FUNCTION with I/O streams redirected via CONNECTION."
   (declare (type function function))
-  (if *globally-redirect-io*
-      ;; Rebind the standard streams which isn't strictly necessary,
-      ;; but makes it easier to interpret (SETQ *STANDARD-OUTPUT* ...)
-      ;; and such in a repl transcript.
-      (let* ((*standard-output* *standard-output*)
-             (*error-output* *error-output*)
-             (*trace-output* *trace-output*)
-             (*debug-io* *debug-io*)
-             (*query-io* *query-io*)
-             (*standard-input* *standard-input*)
-             (*terminal-io* *terminal-io*))
-        (funcall function))
-      (let* ((io  (connection.user-io connection))
-             (in  (connection.user-input connection))
-             (out (connection.user-output connection))
-             (trace (or (connection.trace-output connection) out))
-             (*standard-output* out)
-             (*error-output* out)
-             (*trace-output* trace)
-             (*debug-io* io)
-             (*query-io* io)
-             (*standard-input* in)
-             (*terminal-io* io))
-        (funcall function))))
+  (let* ((io  (connection.user-io connection))
+         (in  (connection.user-input connection))
+         (out (connection.user-output connection))
+         (trace (or (connection.trace-output connection) out))
+         (*standard-output* out)
+         (*error-output* out)
+         (*trace-output* trace)
+         (*debug-io* io)
+         (*query-io* io)
+         (*standard-input* in)
+         (*terminal-io* io))
+    (funcall function)))
 
 (defun call-with-thread-description (description thunk)
   (let* ((thread (current-thread))




More information about the slime-cvs mailing list