Fix READ-CHAR-NO-HANG to account for CHAR-READY? returning #T on EOF.

diff --git a/v7/src/runtime/input.scm b/v7/src/runtime/input.scm
index 560acab08ad69a1eb7d5f547fb74f261bf69250f..3f301651b12a074ec38cdd8a8b6321210f52d664 100644 (file)
--- a/v7/src/runtime/input.scm
+++ b/v7/src/runtime/input.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: input.scm,v 14.37 2007/09/12 23:35:00 cph Exp $
+$Id: input.scm,v 14.38 2007/09/13 13:58:04 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -181,10 +181,10 @@ USA.
 \f
 (define (read-char-no-hang #!optional port)
   (let ((port (optional-input-port port 'READ-CHAR-NO-HANG)))
-    (if (input-port/char-ready? port)
-       (input-port/read-char port)
-       (and (input-port/eof? port)
-            (eof-object)))))
+    (and (input-port/char-ready? port)
+        (if (input-port/eof? port)
+            (eof-object)
+            (input-port/read-char port)))))
 
 (define (read-string delimiters #!optional port)
   (input-port/read-string (optional-input-port port 'READ-STRING) delimiters))