[slime-cvs] CVS slime

[CVS User heller]

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

Modified Files:
	ChangeLog swank-sbcl.lisp 
Log Message:
Fix SBCL backend for Windows.

* swank-sbcl.lisp (fd-stream-input-buffer-empty-p): Restore it.

--- /project/slime/cvsroot/slime/ChangeLog	2012/03/06 20:55:07	1.2298
+++ /project/slime/cvsroot/slime/ChangeLog	2012/03/06 21:42:10	1.2299
@@ -1,5 +1,11 @@
 2012-03-06  Helmut Eller  <heller at common-lisp.net>
 
+	Fix SBCL backend for Windows.
+
+	* swank-sbcl.lisp (fd-stream-input-buffer-empty-p): Restore it.
+
+2012-03-06  Helmut Eller  <heller at common-lisp.net>
+
 	* swank.lisp (swank-require): Ensure that provide as called.
 
 2012-02-12  Stas Boukarev  <stassats at gmail.com>
--- /project/slime/cvsroot/slime/swank-sbcl.lisp	2012/01/06 09:02:43	1.301
+++ /project/slime/cvsroot/slime/swank-sbcl.lisp	2012/03/06 21:42:10	1.302
@@ -195,12 +195,15 @@
         (return nil))
       (sleep 0.1))))
 
+(defun fd-stream-input-buffer-empty-p (stream)
+  (let ((buffer (sb-impl::fd-stream-ibuf stream)))
+    (or (not buffer)
+        (= (sb-impl::buffer-head buffer)
+           (sb-impl::buffer-tail buffer)))))
+
 #-win32
 (defun input-ready-p (stream)
-  (or (let ((buffer (sb-impl::fd-stream-ibuf stream)))
-        (when buffer
-          (< (sb-impl::buffer-head buffer)
-             (sb-impl::buffer-tail buffer))))
+  (or (not (fd-stream-input-buffer-empty-p stream))
       #+#.(swank-backend:with-symbol 'fd-stream-fd-type 'sb-impl)
       (eq :regular (sb-impl::fd-stream-fd-type stream))
       (not (sb-impl::sysread-may-block-p stream))))