summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2014-03-06 07:05:38 -0800
committerKaz Kylheku <kaz@kylheku.com>2014-03-06 07:05:38 -0800
commitbd49a5f0328a2a4091af212961d4d6581d159f67 (patch)
tree35d4f78b8c1b3350e3fc9f782b9e4849d51294e3
parent2176bfdd1be53c65b8d6645c31f49f756e2dd3b1 (diff)
downloadtxr-bd49a5f0328a2a4091af212961d4d6581d159f67.tar.gz
txr-bd49a5f0328a2a4091af212961d4d6581d159f67.tar.bz2
txr-bd49a5f0328a2a4091af212961d4d6581d159f67.zip
* match.c (match_files): Fix it again. The data (nil)
can occur from an interactive/real-time stream.
-rw-r--r--ChangeLog5
-rw-r--r--match.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5eb3b356..647efb68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2014-03-06 Kaz Kylheku <kaz@kylheku.com>
+ * match.c (match_files): Fix it again. The data (nil)
+ can occur from an interactive/real-time stream.
+
+2014-03-06 Kaz Kylheku <kaz@kylheku.com>
+
g++ regressions.
* eval.c (env_k): Duplicate global variable definition removed.
diff --git a/match.c b/match.c
index bd2666e4..8cb61f95 100644
--- a/match.c
+++ b/match.c
@@ -3770,7 +3770,7 @@ repeat_spec_same_data:
debug_return (nil);
c.bindings = new_bindings;
- } else if (nilp(c.data)) {
+ } else if (consp(c.data) || nilp(c.data)) {
debuglf(specline, lit("spec ran out of data"), nao);
debug_return (nil);
} else {