[slime-cvs] CVS slime/contrib

[CVS User heller]

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

Modified Files:
	ChangeLog swank-repl.lisp 
Log Message:
Don't call init-global-stream-redirection in *after-init-hook*.
*after-init-hook* may be called before the contrib was loaded.

* swank-repl.lisp (maybe-redirect-global-io): Call
init-global-stream-redirection here instead.

--- /project/slime/cvsroot/slime/contrib/ChangeLog	2011/12/08 13:54:19	1.525
+++ /project/slime/cvsroot/slime/contrib/ChangeLog	2011/12/10 12:33:57	1.526
@@ -1,3 +1,11 @@
+2011-12-10  Helmut Eller  <heller at common-lisp.net>
+
+	Don't call init-global-stream-redirection in *after-init-hook*.
+	*after-init-hook* may be called before the contrib was loaded.
+
+	* swank-repl.lisp (maybe-redirect-global-io): Call
+	init-global-stream-redirection here instead.
+
 2011-12-08  Nikodemus Siivola  <nikodemus at random-state.net>
 
 	* slime-cl-indent.el (lisp-indent-maximum-backtracking)
--- /project/slime/cvsroot/slime/contrib/swank-repl.lisp	2011/12/10 12:33:52	1.3
+++ /project/slime/cvsroot/slime/contrib/swank-repl.lisp	2011/12/10 12:33:57	1.4
@@ -291,8 +291,6 @@
                          *standard-input-streams*
                          *standard-io-streams*))))))
 
-(add-hook *after-init-hook* 'init-global-stream-redirection)
-
 (defun globally-redirect-io-to-connection (connection)
   "Set the standard I/O streams to redirect to CONNECTION.
 Assigns *CURRENT-<STREAM>* for all standard streams."
@@ -334,6 +332,8 @@
   "Consider globally redirecting to CONNECTION."
   (when (and *globally-redirect-io* (null *global-stdio-connection*)
              (connection.user-io connection))
+    (unless *saved-global-streams*
+      (init-global-stream-redirection))
     (setq *global-stdio-connection* connection)
     (globally-redirect-io-to-connection connection)))