[slime-cvs] CVS slime

[CVS User heller]

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

Modified Files:
	ChangeLog swank.lisp 
Log Message:
* swank.lisp (init-global-stream-redirection): Continue even if
streams are already redirected.  Useful for restarting Swank with
M-x slime when a REPL is already present.  Will most likeley
mess up the input stream in multi threaded setups, tho.

--- /project/slime/cvsroot/slime/ChangeLog	2009/08/15 16:01:17	1.1838
+++ /project/slime/cvsroot/slime/ChangeLog	2009/08/16 20:00:09	1.1839
@@ -1,3 +1,10 @@
+2009-08-16  StanisBaw Halik <sthalik at test123.ltd.pl>
+
+	* swank.lisp (init-global-stream-redirection): Continue even if
+	streams are already redirected.  Useful for restarting Swank with
+	M-x slime when a REPL is already present.  Will most likeley
+	mess up the input stream in multi threaded setups, tho.
+
 2009-08-15  Helmut Eller  <heller at common-lisp.net>
 
 	XEmacs fixes.
--- /project/slime/cvsroot/slime/swank.lisp	2009/08/10 19:30:22	1.657
+++ /project/slime/cvsroot/slime/swank.lisp	2009/08/16 20:00:09	1.658
@@ -1489,11 +1489,13 @@
 
 (defun init-global-stream-redirection ()
   (when *globally-redirect-io*
-    (assert (not *saved-global-streams*) () "Streams already redirected.")
-    (mapc #'setup-stream-indirection
-          (append *standard-output-streams*
-                  *standard-input-streams*
-                  *standard-io-streams*))))
+    (cond (*saved-global-streams*
+           (warn "Streams already redirected."))
+          (t
+           (mapc #'setup-stream-indirection
+                 (append *standard-output-streams*
+                         *standard-input-streams*
+                         *standard-io-streams*))))))
 
 (add-hook *after-init-hook* 'init-global-stream-redirection)