[slime-cvs] CVS slime

[CVS User heller]

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

Modified Files:
	ChangeLog swank-sbcl.lisp 
Log Message:
* swank-sbcl.lisp (stream-force-output): Undo last few changes.

--- /project/slime/cvsroot/slime/ChangeLog	2012/05/11 18:08:44	1.2339
+++ /project/slime/cvsroot/slime/ChangeLog	2012/05/12 06:34:47	1.2340
@@ -1,3 +1,7 @@
+2012-05-12  Helmut Eller  <heller at common-lisp.net>
+
+	* swank-sbcl.lisp (stream-force-output): Undo last few changes.
+
 2012-05-11  Helmut Eller  <heller at common-lisp.net>
 
 	* swank-sbcl.lisp (stream-force-output): Use with-world-lock
--- /project/slime/cvsroot/slime/swank-sbcl.lisp	2012/05/11 18:08:45	1.321
+++ /project/slime/cvsroot/slime/swank-sbcl.lisp	2012/05/12 06:34:47	1.322
@@ -1627,12 +1627,7 @@
 
   (defun condition-timed-wait (waitqueue mutex timeout)
     (macrolet ((foo ()
-                 (cond ((> (length (sb-introspect:function-lambda-list
-                                    #'sb-thread:condition-wait))
-                           2)
-                        '(sb-thread:condition-wait waitqueue mutex
-                          :timeout timeout))
-                       ((member :sb-lutex *features*) ; Darwin
+                 (cond ((member :sb-lutex *features*) ; Darwin
                         '(sb-thread:condition-wait waitqueue mutex))
                        (t
                         '(handler-case
@@ -1693,8 +1688,11 @@
   (defclass slime-output-stream (fundamental-character-output-stream)
     ())
   (defmethod stream-force-output :around ((stream slime-output-stream))
-    (sb-kernel:with-world-lock ()
-      (call-next-method)))
+    (handler-case
+        (sb-sys:with-deadline (:seconds 0.1)
+          (call-next-method))
+      (sb-sys:deadline-timeout ()
+        nil)))
   )
 
 (defimplementation quit-lisp ()