X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fstream.lisp;h=a90e96fd0d463da8e0799ae45f2b8362e7b778be;hb=98a76d4426660876dec6649b1e228d2e5b47f579;hp=c96d81d78cdd1837f7c34f26c436d0eeadf85067;hpb=562dd7fc01e2756b57439cb4ddfbc52e575728fb;p=sbcl.git

diff --git a/src/code/stream.lisp b/src/code/stream.lisp
index c96d81d..a90e96f 100644
--- a/src/code/stream.lisp
+++ b/src/code/stream.lisp
@@ -904,7 +904,7 @@
 		  (let* ((stream (car current))
 			 (result (,fun stream nil nil)))
 		    (when result (return result)))
-		  (setf (concatenated-stream-current stream) current)))))
+		  (pop (concatenated-stream-current stream))))))
   (in-fun concatenated-in read-char)
   (in-fun concatenated-bin read-byte))
 
@@ -1672,37 +1672,6 @@
 	(funcall (ansi-stream-sout target) target str 0 len)
 	(stream-write-string target str 0 len))))
 
-;;;; stream commands
-
-(defstruct (stream-command (:constructor make-stream-command
-					 (name &optional args))
-			   (:copier nil))
-  (name nil :type symbol)
-  (args nil :type list))
-(def!method print-object ((obj stream-command) str)
-  (print-unreadable-object (obj str :type t :identity t)
-    (prin1 (stream-command-name obj) str)))
-
-;;; Take a stream and wait for text or a command to appear on it. If
-;;; text appears before a command, return NIL, otherwise return a
-;;; command.
-;;;
-;;; We can't simply call the stream's misc method because NIL is an
-;;; ambiguous return value: does it mean text arrived, or does it mean
-;;; the stream's misc method had no :GET-COMMAND implementation? We
-;;; can't return NIL until there is text input. We don't need to loop
-;;; because any stream implementing :GET-COMMAND would wait until it
-;;; had some input. If the LISTEN fails, then we have some stream we
-;;; must wait on.
-(defun get-stream-command (stream)
-  (let ((cmdp (funcall (ansi-stream-misc stream) stream :get-command)))
-    (cond (cmdp)
-	  ((listen stream)
-	   nil)
-	  (t
-	   ;; This waits for input and returns NIL when it arrives.
-	   (unread-char (read-char stream) stream)))))
-
 ;;;; READ-SEQUENCE
 
 (defun read-sequence (seq stream &key (start 0) end)