1.0.25.44: INTERRUPT-THREAD and timer improvements

[sbcl.git] / contrib / sb-simple-streams / impl.lisp

diff --git a/contrib/sb-simple-streams/impl.lisp b/contrib/sb-simple-streams/impl.lisp
index 1c7582e..d3e3293 100644 (file)
--- a/contrib/sb-simple-streams/impl.lisp
+++ b/contrib/sb-simple-streams/impl.lisp
@@ -273,7 +273,7 @@
                                                   eof-error-p
                                                   stream t)))
                  ((or (eq char stream)
-                      (not (sb-impl::whitespacep char)))
+                      (not (sb-impl::whitespace[2]p char)))
                   (unless (eq char stream)
                     (funcall-stm-handler j-unread-char encap t))
                   (if (eq char stream) eof-value char))))
@@ -293,12 +293,11 @@
         (funcall-stm-handler j-listen (sm melded-stream stream))
         (or (< (sm buffpos stream) (sm buffer-ptr stream))
             ;; Attempt buffer refill
-            (let ((lcrs (sm last-char-read-size stream)))
-              (when (and (not (any-stream-instance-flags stream :dual :string))
-                         (>= (sm mode stream) 0))
-                ;; single-channel stream dirty -> write data before reading
-                (flush-buffer stream nil))
-              (>= (refill-buffer stream nil) width))))))
+            (when (and (not (any-stream-instance-flags stream :dual :string))
+                       (>= (sm mode stream) 0))
+              ;; single-channel stream dirty -> write data before reading
+              (flush-buffer stream nil))
+            (>= (refill-buffer stream nil) width)))))
 
 (defun %clear-input (stream buffer-only)
   (declare (type simple-stream stream))
@@ -750,7 +749,6 @@
 (defun read-char-no-hang (&optional (stream *standard-input*) (eof-error-p t)
                                     eof-value recursive-p)
   "Returns the next character from the Stream if one is availible, or nil."
-  (declare (ignore recursive-p))
   (let ((stream (sb-impl::in-synonym-of stream)))
     (etypecase stream
       (simple-stream
@@ -805,7 +803,7 @@
              ((eq peek-type t)
               (do ((char (sb-gray:stream-read-char stream)
                          (sb-gray:stream-read-char stream)))
-                  ((or (eq char :eof) (not (sb-impl::whitespacep char)))
+                  ((or (eq char :eof) (not (sb-impl::whitespace[2]p char)))
                    (cond ((eq char :eof)
                           (sb-impl::eof-or-lose stream eof-error-p eof-value))
                          (t