* match.c (h_var): Fix regression introduced in 2014-08-11

commit. The incompleteness of that change broke the case of an unbound
variable followed by a bound variable. The value of the
second variable was still being wrapped in the old complicated
representation before being pushed to the front of the spec.

* txr.1: Replace bogus text which says that variables are not
bound to regexes, and so regex matches from variable substitutions
do not arise. This works fine after this change.

1 files changed, 3 insertions, 4 deletions

diff --git a/match.c b/match.c
index ce21d66a..df25c6eb 100644
--- a/match.c
+++ b/match.c
@@ -632,10 +632,9 @@ static val h_var(match_line_ctx *c)
       } else if (!pair) {
         sem_error(elem, lit("consecutive unbound variables"), nao);
       } else {
-      /* Re-generate a new spec with an edited version of
-         the element we just processed, and repeat. */
-        val new_elem = list(var_s, sym, cdr(pair), modifier, nao);
-        c->specline = cons(elem, cons(new_elem, rest(c->specline)));
+      /* Re-generate a new spec in which the next variable
+         is replaced by its value, and repeat. */
+        c->specline = cons(elem, cons(cdr(pair), rest(c->specline)));
         return repeat_spec_k;
       }
     } else if (op == text_s) {