2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6453947e..01604d76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2014-10-17  Kaz Kylheku  <kaz@kylheku.com>
 
+	* match.c (v_eof): Bugfix: we are at EOF not only when
+	the remaining data is nil but when it is (nil). This
+	happens for interactive streams.
+
+2014-10-17  Kaz Kylheku  <kaz@kylheku.com>
+
 	* match.c (dest_bind): Remove the restriction of not allowing
 	@(expr ...) and @var on the left side of a bind. This
 	is useful, and necessary for @(line @(lisp expr)) to work:
diff --git a/match.c b/match.c
index 9e699646..fdb37fdd 100644
--- a/match.c
+++ b/match.c
@@ -3540,7 +3540,7 @@ static val v_filter(match_files_ctx *c)
 
 static val v_eof(match_files_ctx *c)
 {
-  if (c->data) {
+  if (c->data && car(c->data)) {
     debuglf(c->spec, lit("eof failed to match at ~a"), c->data_lineno, nao);
     return nil;
   }