Version 61txr-61

* txr.c (version): Bumped.

* txr.1: Bumped version and set date.

* configure (txr_ver): Bumped.

* eval.c (op_modplace): Fix warning about uninitialized variable.
No bug.

* filter.c: gcc compilation regresion: missing <stdio.h> breaks inclusion
of "stream.h" header. Strangely, didn't show up when configured for
compiling with g++ on Ubuntu.

* match.c (match_filter): Fixed ununsed variable warning.

* txr.vim: Bunch of missing keywords added.

* dep.mk: Regenerated.

9 files changed, 38 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index b7851e54..80d42b26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,28 @@
 2012-03-15  Kaz Kylheku  <kaz@kylheku.com>
 
+	Version 61
+
+	* txr.c (version): Bumped.
+
+	* txr.1: Bumped version and set date.
+
+	* configure (txr_ver): Bumped.
+
+	* eval.c (op_modplace): Fix warning about uninitialized variable.
+	No bug.
+
+	* filter.c: gcc compilation regresion: missing <stdio.h> breaks inclusion
+	of "stream.h" header. Strangely, didn't show up when configured for
+	compiling with g++ on Ubuntu.
+
+	* match.c (match_filter): Fixed ununsed variable warning.
+
+	* txr.vim: Bunch of missing keywords added.
+
+	* dep.mk: Regenerated.
+
+2012-03-15  Kaz Kylheku  <kaz@kylheku.com>
+
 	* tests/010/block.expected: New file.
 
 	* tests/010/block.txr: New file.
diff --git a/configure b/configure
index 331f7ab1..042a736a 100755
--- a/configure
+++ b/configure
@@ -357,7 +357,7 @@ fi
 #
 
 
-txr_ver=60
+txr_ver=61
 
 #
 # The all important banner.
diff --git a/dep.mk b/dep.mk
index 9db784a9..d8a3cfd0 100644
--- a/dep.mk
+++ b/dep.mk
@@ -2,17 +2,17 @@
 ./lex.yy.o: config.h $(top_srcdir)/./lib.h y.tab.h $(top_srcdir)/./gc.h $(top_srcdir)/./stream.h $(top_srcdir)/./utf8.h $(top_srcdir)/./unwind.h $(top_srcdir)/./hash.h $(top_srcdir)/./parser.h
 ./y.tab.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./unwind.h $(top_srcdir)/./regex.h $(top_srcdir)/./utf8.h $(top_srcdir)/./match.h $(top_srcdir)/./hash.h $(top_srcdir)/./eval.h $(top_srcdir)/./parser.h
 ./match.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./gc.h $(top_srcdir)/./unwind.h $(top_srcdir)/./regex.h $(top_srcdir)/./stream.h $(top_srcdir)/./parser.h $(top_srcdir)/./txr.h $(top_srcdir)/./utf8.h $(top_srcdir)/./filter.h $(top_srcdir)/./hash.h $(top_srcdir)/./debug.h $(top_srcdir)/./eval.h $(top_srcdir)/./match.h
-./lib.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./gc.h $(top_srcdir)/./arith.h $(top_srcdir)/./rand.h $(top_srcdir)/./hash.h $(top_srcdir)/./unwind.h $(top_srcdir)/./stream.h $(top_srcdir)/./utf8.h $(top_srcdir)/./filter.h $(top_srcdir)/./eval.h
+./lib.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./gc.h $(top_srcdir)/./arith.h $(top_srcdir)/./rand.h $(top_srcdir)/./hash.h $(top_srcdir)/./unwind.h $(top_srcdir)/./stream.h $(top_srcdir)/./utf8.h $(top_srcdir)/./filter.h $(top_srcdir)/./eval.h $(top_srcdir)/./regex.h
 ./regex.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./unwind.h $(top_srcdir)/./regex.h $(top_srcdir)/./txr.h
 ./gc.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./stream.h $(top_srcdir)/./hash.h $(top_srcdir)/./txr.h $(top_srcdir)/./eval.h $(top_srcdir)/./gc.h
 ./unwind.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./gc.h $(top_srcdir)/./stream.h $(top_srcdir)/./txr.h $(top_srcdir)/./unwind.h
 ./stream.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./gc.h $(top_srcdir)/./unwind.h $(top_srcdir)/./stream.h $(top_srcdir)/./utf8.h
 ./arith.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./unwind.h $(top_srcdir)/./gc.h $(top_srcdir)/./arith.h
-./hash.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./gc.h $(top_srcdir)/./unwind.h $(top_srcdir)/./hash.h
+./hash.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./gc.h $(top_srcdir)/./unwind.h $(top_srcdir)/./stream.h $(top_srcdir)/./hash.h
 ./utf8.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./unwind.h $(top_srcdir)/./utf8.h
-./filter.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./hash.h $(top_srcdir)/./unwind.h $(top_srcdir)/./match.h $(top_srcdir)/./filter.h $(top_srcdir)/./gc.h
-./eval.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./gc.h $(top_srcdir)/./unwind.h $(top_srcdir)/./regex.h $(top_srcdir)/./stream.h $(top_srcdir)/./parser.h $(top_srcdir)/./hash.h $(top_srcdir)/./debug.h $(top_srcdir)/./match.h $(top_srcdir)/./rand.h $(top_srcdir)/./eval.h
+./filter.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./hash.h $(top_srcdir)/./unwind.h $(top_srcdir)/./match.h $(top_srcdir)/./filter.h $(top_srcdir)/./gc.h $(top_srcdir)/./stream.h
+./eval.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./gc.h $(top_srcdir)/./unwind.h $(top_srcdir)/./regex.h $(top_srcdir)/./stream.h $(top_srcdir)/./parser.h $(top_srcdir)/./hash.h $(top_srcdir)/./debug.h $(top_srcdir)/./match.h $(top_srcdir)/./rand.h $(top_srcdir)/./filter.h $(top_srcdir)/./eval.h
 ./rand.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./unwind.h $(top_srcdir)/./gc.h $(top_srcdir)/./arith.h $(top_srcdir)/./rand.h
 mpi-1.8.6/mpi.o: $(top_srcdir)/mpi-1.8.6/../config.h $(top_srcdir)/mpi-1.8.6/mpi.h $(top_srcdir)/mpi-1.8.6/logtab.h
 mpi-1.8.6/mplogic.o: $(top_srcdir)/mpi-1.8.6/../config.h $(top_srcdir)/mpi-1.8.6/mplogic.h
-./debug.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./debug.h $(top_srcdir)/./gc.h $(top_srcdir)/./unwind.h $(top_srcdir)/./stream.h $(top_srcdir)/./parser.h
+./debug.o: config.h $(top_srcdir)/./lib.h $(top_srcdir)/./debug.h $(top_srcdir)/./gc.h $(top_srcdir)/./unwind.h $(top_srcdir)/./stream.h $(top_srcdir)/./parser.h $(top_srcdir)/./txr.h
diff --git a/eval.c b/eval.c
index 483a412a..b02f25b2 100644
--- a/eval.c
+++ b/eval.c
@@ -916,7 +916,7 @@ static val op_modplace(val form, val env)
   val place = second(form);
   val third_arg_p = rest(rest(form));
   val newform = if3(car(third_arg_p), third(form), nil);
-  val newval;
+  val newval = nil;
   val *loc = 0;
 
   if (op == push_s) {
diff --git a/filter.c b/filter.c
index f66420ba..d14ef436 100644
--- a/filter.c
+++ b/filter.c
@@ -31,6 +31,7 @@
 #include <wchar.h>
 #include <stdarg.h>
 #include <dirent.h>
+#include <stdio.h>
 #include "config.h"
 #include "lib.h"
 #include "hash.h"
diff --git a/match.c b/match.c
index 24d7a3f9..f381dcd4 100644
--- a/match.c
+++ b/match.c
@@ -3626,7 +3626,7 @@ val match_filter(val name, val arg, val other_args)
 val match_fun(val name, val args, val input, val files)
 {
   val spec = cons(cons(cons(name, args), nil), nil);
-  cons_bind (in_spec, in_bindings, uw_get_match_context());
+  val in_bindings = cdr(uw_get_match_context());
   val data = if3(streamp(input),
                  lazy_stream_cons(input),
                  input);
diff --git a/txr.1 b/txr.1
index 0c59ecb7..6b53f3c4 100644
--- a/txr.1
+++ b/txr.1
@@ -21,9 +21,9 @@
 .\"IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 .\"WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 
-.TH "TXR" 1 2012-03-03 "Utility Commands" "Txr Text Processing Language" "Kaz Kylheku"
+.TH "TXR" 1 2012-03-15 "Utility Commands" "Txr Text Processing Language" "Kaz Kylheku"
 .SH NAME
-txr \- text processing language (version 60)
+txr \- text processing language (version 61)
 .SH SYNOPSIS
 .B txr [ options ] query-file { data-file }*
 .sp
diff --git a/txr.c b/txr.c
index 89023268..fa22520d 100644
--- a/txr.c
+++ b/txr.c
@@ -43,7 +43,7 @@
 #include "debug.h"
 #include "txr.h"
 
-const wchli_t *version = wli("60");
+const wchli_t *version = wli("61");
 const wchar_t *progname = L"txr";
 const wchar_t *spec_file = L"stdin";
 
diff --git a/txr.vim b/txr.vim
index 2baf3ae4..dad23da2 100644
--- a/txr.vim
+++ b/txr.vim
@@ -45,7 +45,9 @@ syn keyword txl_keyword contained remq remql remqual
 syn keyword txl_keyword contained all none eq eql equal + - * abs trunc mod 
 syn keyword txl_keyword contained expt exptmod sqrt gcd fixnump bignump 
 syn keyword txl_keyword contained numberp zerop evenp oddp >
-syn keyword txl_keyword contained make-hash hash gethash sethash pushhash remhash
+syn keyword txl_keyword contained zerop evenp oddp > < >= <= max min
+syn keyword txl_keyword contained search-regex match-regex regsub
+syn keyword txl_keyword contained make-hash hash hash-construct gethash sethash pushhash remhash
 syn keyword txl_keyword contained hash-count get-hash-userdata set-hash-userdata hashp maphash 
 syn keyword txl_keyword contained hash-eql hash-equal eval *stdout* *stdin* *stddebug*
 syn keyword txl_keyword contained *stderr* format print pprint tostring tostringp