2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 086be220..9abf2bd2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2011-10-21  Kaz Kylheku  <kaz@kylheku.com>
 
+	* match.c (v_collect): Regression bugfix. Make it work like the comment
+	says: until/last clause has visibility to uncollated bindings from
+	collect.
+
+2011-10-21  Kaz Kylheku  <kaz@kylheku.com>
+
 	Implementing @(set) directive for assigning to variables
 	destructively.
 
diff --git a/match.c b/match.c
index 1d415ac5..894f6d73 100644
--- a/match.c
+++ b/match.c
@@ -1919,7 +1919,7 @@ static val v_collect(match_files_ctx c, match_files_ctx *cout)
       {
         cons_bind (sym, ul_spec, until_last_spec);
         cons_bind (until_last_bindings, success,
-                   match_files(mf_spec(c, ul_spec)));
+                   match_files(mf_spec_bindings(c, ul_spec, new_bindings)));
 
         if (success) {
           debuglf(spec_linenum, lit("until/last matched ~a:~a"),