Version 108.txr-108

7 files changed, 403 insertions, 286 deletions

diff --git a/ChangeLog b/ChangeLog
index b7efad5a..aebe31ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2015-06-13  Kaz Kylheku  <kaz@kylheku.com>
 
+	Version 108.
+
+	* RELNOTES: Updated.
+
+	* configure, txr.1: Bumped version and date.
+
+	* share/txr/stdlib/ver.txr: Likewise.
+
+	* tl.vim, txr.vim: Regenerated.
+
+2015-06-13  Kaz Kylheku  <kaz@kylheku.com>
+
 	* txr.1: Documented Lisp loading.
 
 2015-06-13  Kaz Kylheku  <kaz@kylheku.com>
diff --git a/RELNOTES b/RELNOTES
index 02a3cbb0..bad7f5f7 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,84 @@
+                                    TXR 108
+                                   2015-06-13
+
+
+  Features
+
+  - POSIX poll function exposed.
+
+  - Entirely new macro-based framework for syntactic places (forms denoting
+    locations that can be assigned): better featured, extensible than
+    previous hard-coded hacks.
+
+  - New macro: define-modify-macro.
+
+  - New pset operator: assign to places in parallel.
+
+  - rplaca and rplacd handle vectors and strings.
+
+  - replacement sequence in replace function can now be a vector.
+
+  - symbol-value retrieves bindings of symbol macros.
+
+  - boundp returns true for symbol macros.
+
+  - New functions: makeunbound and fmakunbound.
+
+  - New concept: deletable places: locations that can not only be accessed, but
+    which can be deleted. Existing del operator which contained special case
+    hacks is now powerful, general macro that can delete any deletable place.
+
+  - New defparm operator to accompany defvar.
+
+  - symbol-function, symbol-value and fun forms are assignable places.
+
+  - Debug instrumentation code made light weight, leading to big improvement
+    in the execution speed of TXR Lisp.
+
+  - New functions catenated-stream-p and catenated-stream-push.
+
+  Bugs
+
+  - Fixed exception being thrown when trying to print (lambda . atom).
+
+  - Dangling unquotes and splices now receive source location info.
+
+  - Fixed memory corruption caused by disabling garbage collection
+    for too long.
+
+  - Better syntax checking in flet, labels, lambda, defun, quote.
+
+  - Addressed clash between flip operator and flip function by renaming
+    latter to flipargs.
+
+  - Fixed regression in Verison 106 causing apply calls not to diagnose
+    the too many arguments case, and allow a stack overrun.
+
+  - chr-str-set checks for literal strings, which cannot be modified.
+
+  - Fixed runaway recursion in keep-if* and remove-if*.
+
+  - Fixed mismanagement of dyn_env variable leading to spurious
+    retention of memory in TXR builds configured without debugger support.
+    (Bug exposed by the lighter weight debug support.)
+
+  - Critical bugfix in handling of hashes having both weak keys and values,
+    leading to memory corruption.
+
+  - New function: load for loading TXR Lisp files. TXR Lisp programming can
+    now take place using multiple files containing code that doesn't have
+    to be wrapped with @(do ...).
+
+  - @(load) and @(include) directives can also load TXR Lisp now.
+
+  - TXR files which have a .txr suffix can be invoked without the suffix now;
+    this is automatically resolved.
+
+  - New --lisp command line option makes TXR source files which have no
+    filename suffix be treated as TXR Lisp code rather than TXR Pattern Language.
+
+
+
                                     TXR 107
                                    2015-04-26
 
diff --git a/configure b/configure
index aeb7c820..3b3cd414 100755
--- a/configure
+++ b/configure
@@ -415,7 +415,7 @@ fi
 #
 
 
-txr_ver=107
+txr_ver=108
 
 #
 # The all important banner.
diff --git a/share/txr/stdlib/ver.txr b/share/txr/stdlib/ver.txr
index 436bdaa8..18a987e7 100644
--- a/share/txr/stdlib/ver.txr
+++ b/share/txr/stdlib/ver.txr
@@ -1 +1 @@
-@(do (defvar *lib-version* 107))
+@(do (defvar *lib-version* 108))
diff --git a/tl.vim b/tl.vim
index ef47ec95..e0daebac 100644
--- a/tl.vim
+++ b/tl.vim
@@ -22,23 +22,25 @@ setlocal iskeyword=a-z,A-Z,48-57,!,$,&,*,+,-,<,=,>,?,\\,_,~,/
 
 syn keyword txl_keyword contained * *args* *e* *flo-dig*
 syn keyword txl_keyword contained *flo-epsilon* *flo-max* *flo-min* *full-args*
-syn keyword txl_keyword contained *gensym-counter* *keyword-package* *pi* *random-state*
-syn keyword txl_keyword contained *self-path* *stddebug* *stderr* *stdin*
-syn keyword txl_keyword contained *stdlog* *stdnull* *stdout* *txr-version*
-syn keyword txl_keyword contained *unhandled-hook* *user-package* + -
-syn keyword txl_keyword contained / /= < <=
-syn keyword txl_keyword contained = > >= abort
-syn keyword txl_keyword contained abs abs-path-p acons acons-new
-syn keyword txl_keyword contained aconsql-new acos ado alist-nremove
-syn keyword txl_keyword contained alist-remove all and andf
-syn keyword txl_keyword contained ap apf append append*
-syn keyword txl_keyword contained append-each append-each* apply aret
-syn keyword txl_keyword contained ash asin assoc assql
-syn keyword txl_keyword contained atan atan2 atom bignump
-syn keyword txl_keyword contained bit block boundp break-str
-syn keyword txl_keyword contained call callf car caseq
-syn keyword txl_keyword contained caseql casequal cat-str cat-streams
-syn keyword txl_keyword contained cat-vec catch cdr ceil
+syn keyword txl_keyword contained *gensym-counter* *keyword-package* *pi* *place-clobber-expander*
+syn keyword txl_keyword contained *place-delete-expander* *place-update-expander* *random-state* *self-path*
+syn keyword txl_keyword contained *stddebug* *stderr* *stdin* *stdlog*
+syn keyword txl_keyword contained *stdnull* *stdout* *txr-version* *unhandled-hook*
+syn keyword txl_keyword contained *user-package* + - /
+syn keyword txl_keyword contained /= < <= =
+syn keyword txl_keyword contained > >= abort abs
+syn keyword txl_keyword contained abs-path-p acons acons-new aconsql-new
+syn keyword txl_keyword contained acos ado alist-nremove alist-remove
+syn keyword txl_keyword contained all and andf ap
+syn keyword txl_keyword contained apf append append* append-each
+syn keyword txl_keyword contained append-each* apply aret ash
+syn keyword txl_keyword contained asin assoc assql atan
+syn keyword txl_keyword contained atan2 atom bignump bit
+syn keyword txl_keyword contained block boundp break-str call
+syn keyword txl_keyword contained call-clobber-expander call-delete-expander call-update-expander callf
+syn keyword txl_keyword contained car caseq caseql casequal
+syn keyword txl_keyword contained cat-str cat-streams cat-vec catch
+syn keyword txl_keyword contained catenated-stream-p catenated-stream-push cdr ceil
 syn keyword txl_keyword contained chain chand chdir chmod
 syn keyword txl_keyword contained chr-isalnum chr-isalpha chr-isascii chr-isblank
 syn keyword txl_keyword contained chr-iscntrl chr-isdigit chr-isgraph chr-islower
@@ -52,28 +54,30 @@ syn keyword txl_keyword contained consp constantp copy copy-alist
 syn keyword txl_keyword contained copy-cons copy-hash copy-list copy-str
 syn keyword txl_keyword contained copy-vec cos count-if countq
 syn keyword txl_keyword contained countql countqual cum-norm-dist daemon
-syn keyword txl_keyword contained dec defmacro defsymacro defun
-syn keyword txl_keyword contained defvar del delay delete-package
-syn keyword txl_keyword contained do dohash dotimes downcase-str
-syn keyword txl_keyword contained dup dupfd dwim each
-syn keyword txl_keyword contained each* empty ensure-dir env
-syn keyword txl_keyword contained env-fbind env-hash env-vbind eq
-syn keyword txl_keyword contained eql equal errno error
-syn keyword txl_keyword contained eval evenp exec exit
-syn keyword txl_keyword contained exit* exp expt exptmod
-syn keyword txl_keyword contained false fbind fboundp fifth
-syn keyword txl_keyword contained fileno filter-equal filter-string-tree finalize
-syn keyword txl_keyword contained find find-if find-max find-min
-syn keyword txl_keyword contained find-package first fixnump flatten
-syn keyword txl_keyword contained flatten* flet flip flo-int
+syn keyword txl_keyword contained dec define-modify-macro defmacro defparm
+syn keyword txl_keyword contained defplace defsymacro defun defvar
+syn keyword txl_keyword contained del delay delete-package do
+syn keyword txl_keyword contained dohash dotimes downcase-str dup
+syn keyword txl_keyword contained dupfd dwim each each*
+syn keyword txl_keyword contained empty ensure-dir env env-fbind
+syn keyword txl_keyword contained env-hash env-vbind eq eql
+syn keyword txl_keyword contained equal errno error eval
+syn keyword txl_keyword contained evenp exec exit exit*
+syn keyword txl_keyword contained exp expt exptmod false
+syn keyword txl_keyword contained fbind fboundp fifth fileno
+syn keyword txl_keyword contained filter-equal filter-string-tree finalize find
+syn keyword txl_keyword contained find-if find-max find-min find-package
+syn keyword txl_keyword contained first fixnump flatten flatten*
+syn keyword txl_keyword contained flet flip flipargs flo-int
 syn keyword txl_keyword contained flo-str floatp floor flush-stream
-syn keyword txl_keyword contained for for* force fork
-syn keyword txl_keyword contained format fourth fun func-get-env
-syn keyword txl_keyword contained func-get-form func-set-env functionp gcd
-syn keyword txl_keyword contained gen generate gensym gequal
-syn keyword txl_keyword contained get-byte get-char get-error get-error-str
-syn keyword txl_keyword contained get-hash-userdata get-line get-lines get-list-from-stream
-syn keyword txl_keyword contained get-sig-handler get-string get-string-from-stream getenv
+syn keyword txl_keyword contained fmakunbound for for* force
+syn keyword txl_keyword contained fork format fourth fun
+syn keyword txl_keyword contained func-get-env func-get-form func-set-env functionp
+syn keyword txl_keyword contained gcd gen generate gensym
+syn keyword txl_keyword contained gequal get-byte get-char get-clobber-expander
+syn keyword txl_keyword contained get-delete-expander get-error get-error-str get-hash-userdata
+syn keyword txl_keyword contained get-line get-lines get-list-from-stream get-sig-handler
+syn keyword txl_keyword contained get-string get-string-from-stream get-update-expander getenv
 syn keyword txl_keyword contained gethash getitimer getpid getppid
 syn keyword txl_keyword contained giterate glob glob-altdirfunc glob-brace
 syn keyword txl_keyword contained glob-err glob-mark glob-nocheck glob-noescape
@@ -99,109 +103,117 @@ syn keyword txl_keyword contained length-str-< length-str-<= length-str-> length
 syn keyword txl_keyword contained length-vec lequal less let
 syn keyword txl_keyword contained let* lexical-fun-p lexical-lisp1-binding lexical-var-p
 syn keyword txl_keyword contained link lisp-parse list list*
-syn keyword txl_keyword contained list-str list-vector listp log
-syn keyword txl_keyword contained log-alert log-auth log-authpriv log-cons
-syn keyword txl_keyword contained log-crit log-daemon log-debug log-emerg
-syn keyword txl_keyword contained log-err log-info log-ndelay log-notice
-syn keyword txl_keyword contained log-nowait log-odelay log-perror log-pid
-syn keyword txl_keyword contained log-user log-warning log10 log2
-syn keyword txl_keyword contained logand logior lognot logtest
-syn keyword txl_keyword contained logtrunc logxor macro-form-p macro-time
-syn keyword txl_keyword contained macroexpand macroexpand-1 macrolet major
-syn keyword txl_keyword contained make-catenated-stream make-env make-hash make-lazy-cons
-syn keyword txl_keyword contained make-like make-package make-random-state make-similar-hash
-syn keyword txl_keyword contained make-string-byte-input-stream make-string-input-stream make-string-output-stream make-strlist-output-stream
-syn keyword txl_keyword contained make-sym make-time make-time-utc make-trie
-syn keyword txl_keyword contained makedev mapcar mapcar* mapdo
-syn keyword txl_keyword contained mapf maphash mappend mappend*
-syn keyword txl_keyword contained mask match-fun match-regex match-regex-right
-syn keyword txl_keyword contained match-regst match-regst-right match-str match-str-tree
-syn keyword txl_keyword contained max member member-if memq
-syn keyword txl_keyword contained memql memqual merge min
-syn keyword txl_keyword contained minor minusp mkdir mknod
-syn keyword txl_keyword contained mkstring mlet mod multi
-syn keyword txl_keyword contained multi-sort n-choose-k n-perm-k nconc
-syn keyword txl_keyword contained nilf none not notf
-syn keyword txl_keyword contained nreverse null nullify num-chr
-syn keyword txl_keyword contained num-str numberp oand oddp
-syn keyword txl_keyword contained op open-command open-directory open-file
-syn keyword txl_keyword contained open-fileno open-files open-files* open-pipe
-syn keyword txl_keyword contained open-process open-tail openlog opip
-syn keyword txl_keyword contained or orf packagep pad
-syn keyword txl_keyword contained partition partition* partition-by perm
-syn keyword txl_keyword contained pipe plusp pop pos
-syn keyword txl_keyword contained pos-if pos-max pos-min posq
-syn keyword txl_keyword contained posql posqual pppred ppred
-syn keyword txl_keyword contained pprinl pprint pprof pred
-syn keyword txl_keyword contained prinl print prof prog1
-syn keyword txl_keyword contained progn prop proper-listp push
-syn keyword txl_keyword contained pushhash put-byte put-char put-line
-syn keyword txl_keyword contained put-lines put-string put-strings pwd
-syn keyword txl_keyword contained qquote quasi quasilist quote
-syn keyword txl_keyword contained rand random random-fixnum random-state-p
-syn keyword txl_keyword contained range range* range-regex rcomb
-syn keyword txl_keyword contained read readlink real-time-stream-p reduce-left
-syn keyword txl_keyword contained reduce-right ref refset regex-compile
-syn keyword txl_keyword contained regex-parse regexp regsub rehome-sym
-syn keyword txl_keyword contained remhash remove-if remove-if* remove-path
-syn keyword txl_keyword contained remq remq* remql remql*
-syn keyword txl_keyword contained remqual remqual* rename-path repeat
-syn keyword txl_keyword contained replace replace-list replace-str replace-vec
-syn keyword txl_keyword contained rest ret retf return
-syn keyword txl_keyword contained return-from reverse rlcp rperm
-syn keyword txl_keyword contained rplaca rplacd run s-ifblk
-syn keyword txl_keyword contained s-ifchr s-ifdir s-ififo s-iflnk
-syn keyword txl_keyword contained s-ifmt s-ifreg s-ifsock s-irgrp
-syn keyword txl_keyword contained s-iroth s-irusr s-irwxg s-irwxo
-syn keyword txl_keyword contained s-irwxu s-isgid s-isuid s-isvtx
-syn keyword txl_keyword contained s-iwgrp s-iwoth s-iwusr s-ixgrp
-syn keyword txl_keyword contained s-ixoth s-ixusr search search-regex
-syn keyword txl_keyword contained search-regst search-str search-str-tree second
-syn keyword txl_keyword contained seek-stream select seqp set
-syn keyword txl_keyword contained set-diff set-hash-userdata set-sig-handler setenv
-syn keyword txl_keyword contained sethash setitimer setlogmask sh
-syn keyword txl_keyword contained sig-abrt sig-alrm sig-bus sig-check
-syn keyword txl_keyword contained sig-chld sig-cont sig-fpe sig-hup
-syn keyword txl_keyword contained sig-ill sig-int sig-io sig-iot
-syn keyword txl_keyword contained sig-kill sig-lost sig-pipe sig-poll
-syn keyword txl_keyword contained sig-prof sig-pwr sig-quit sig-segv
-syn keyword txl_keyword contained sig-stkflt sig-stop sig-sys sig-term
-syn keyword txl_keyword contained sig-trap sig-tstp sig-ttin sig-ttou
-syn keyword txl_keyword contained sig-urg sig-usr1 sig-usr2 sig-vtalrm
-syn keyword txl_keyword contained sig-winch sig-xcpu sig-xfsz sign-extend
-syn keyword txl_keyword contained sin sixth size-vec some
-syn keyword txl_keyword contained sort sort-group source-loc source-loc-str
-syn keyword txl_keyword contained span-str splice split-str split-str-set
-syn keyword txl_keyword contained sqrt sssucc ssucc stat
-syn keyword txl_keyword contained stdlib str< str<= str=
-syn keyword txl_keyword contained str> str>= stream-get-prop stream-set-prop
-syn keyword txl_keyword contained streamp string-extend string-lt stringp
-syn keyword txl_keyword contained sub sub-list sub-str sub-vec
-syn keyword txl_keyword contained succ symacrolet symbol-function symbol-name
-syn keyword txl_keyword contained symbol-package symbol-value symbolp symlink
-syn keyword txl_keyword contained sys-qquote sys-splice sys-unquote syslog
-syn keyword txl_keyword contained tan tb tc tf
-syn keyword txl_keyword contained third throw throwf time
-syn keyword txl_keyword contained time-fields-local time-fields-utc time-string-local time-string-utc
-syn keyword txl_keyword contained time-usec tofloat toint tok-str
-syn keyword txl_keyword contained tok-where tostring tostringp tprint
-syn keyword txl_keyword contained transpose tree-bind tree-case tree-find
-syn keyword txl_keyword contained trie-add trie-compress trie-lookup-begin trie-lookup-feed-char
-syn keyword txl_keyword contained trie-value-at trim-str true trunc
-syn keyword txl_keyword contained trunc-rem tuples txr-case txr-if
-syn keyword txl_keyword contained txr-when typeof unget-byte unget-char
-syn keyword txl_keyword contained uniq unique unless unquote
-syn keyword txl_keyword contained unsetenv until until* upcase-str
-syn keyword txl_keyword contained update url-decode url-encode usleep
-syn keyword txl_keyword contained uw-protect vec vec-push vec-set-length
-syn keyword txl_keyword contained vecref vector vector-list vectorp
-syn keyword txl_keyword contained w-continued w-coredump w-exitstatus w-ifcontinued
-syn keyword txl_keyword contained w-ifexited w-ifsignaled w-ifstopped w-nohang
-syn keyword txl_keyword contained w-stopsig w-termsig w-untraced wait
-syn keyword txl_keyword contained weave when whenlet where
-syn keyword txl_keyword contained while while* whilet width
-syn keyword txl_keyword contained with-saved-vars wrap wrap* zap
-syn keyword txl_keyword contained zerop zip
+syn keyword txl_keyword contained list-str list-vector listp load
+syn keyword txl_keyword contained log log-alert log-auth log-authpriv
+syn keyword txl_keyword contained log-cons log-crit log-daemon log-debug
+syn keyword txl_keyword contained log-emerg log-err log-info log-ndelay
+syn keyword txl_keyword contained log-notice log-nowait log-odelay log-perror
+syn keyword txl_keyword contained log-pid log-user log-warning log10
+syn keyword txl_keyword contained log2 logand logior lognot
+syn keyword txl_keyword contained logtest logtrunc logxor macro-form-p
+syn keyword txl_keyword contained macro-time macroexpand macroexpand-1 macrolet
+syn keyword txl_keyword contained major make-catenated-stream make-env make-hash
+syn keyword txl_keyword contained make-lazy-cons make-like make-package make-random-state
+syn keyword txl_keyword contained make-similar-hash make-string-byte-input-stream make-string-input-stream make-string-output-stream
+syn keyword txl_keyword contained make-strlist-output-stream make-sym make-time make-time-utc
+syn keyword txl_keyword contained make-trie makedev makunbound mapcar
+syn keyword txl_keyword contained mapcar* mapdo mapf maphash
+syn keyword txl_keyword contained mappend mappend* mask match-fun
+syn keyword txl_keyword contained match-regex match-regex-right match-regst match-regst-right
+syn keyword txl_keyword contained match-str match-str-tree max member
+syn keyword txl_keyword contained member-if memq memql memqual
+syn keyword txl_keyword contained merge min minor minusp
+syn keyword txl_keyword contained mkdir mknod mkstring mlet
+syn keyword txl_keyword contained mod multi multi-sort n-choose-k
+syn keyword txl_keyword contained n-perm-k nconc nilf none
+syn keyword txl_keyword contained not notf nreverse null
+syn keyword txl_keyword contained nullify num-chr num-str numberp
+syn keyword txl_keyword contained oand oddp op open-command
+syn keyword txl_keyword contained open-directory open-file open-fileno open-files
+syn keyword txl_keyword contained open-files* open-pipe open-process open-tail
+syn keyword txl_keyword contained openlog opip or orf
+syn keyword txl_keyword contained packagep pad partition partition*
+syn keyword txl_keyword contained partition-by perm pipe plusp
+syn keyword txl_keyword contained poll poll-err poll-in poll-nval
+syn keyword txl_keyword contained poll-out poll-pri poll-rdband poll-rdhup
+syn keyword txl_keyword contained poll-wrband pop pos pos-if
+syn keyword txl_keyword contained pos-max pos-min posq posql
+syn keyword txl_keyword contained posqual pppred ppred pprinl
+syn keyword txl_keyword contained pprint pprof pred prinl
+syn keyword txl_keyword contained print prof prog1 progn
+syn keyword txl_keyword contained prop proper-listp pset push
+syn keyword txl_keyword contained pushhash pushnew put-byte put-char
+syn keyword txl_keyword contained put-line put-lines put-string put-strings
+syn keyword txl_keyword contained pwd qquote quasi quasilist
+syn keyword txl_keyword contained quote rand random random-fixnum
+syn keyword txl_keyword contained random-state-p range range* range-regex
+syn keyword txl_keyword contained rcomb read readlink real-time-stream-p
+syn keyword txl_keyword contained reduce-left reduce-right ref refset
+syn keyword txl_keyword contained regex-compile regex-parse regexp regsub
+syn keyword txl_keyword contained rehome-sym remhash remove-if remove-if*
+syn keyword txl_keyword contained remove-path remq remq* remql
+syn keyword txl_keyword contained remql* remqual remqual* rename-path
+syn keyword txl_keyword contained repeat replace replace-list replace-str
+syn keyword txl_keyword contained replace-vec rest ret retf
+syn keyword txl_keyword contained return return-from reverse rlcp
+syn keyword txl_keyword contained rlet rotate rperm rplaca
+syn keyword txl_keyword contained rplacd run s-ifblk s-ifchr
+syn keyword txl_keyword contained s-ifdir s-ififo s-iflnk s-ifmt
+syn keyword txl_keyword contained s-ifreg s-ifsock s-irgrp s-iroth
+syn keyword txl_keyword contained s-irusr s-irwxg s-irwxo s-irwxu
+syn keyword txl_keyword contained s-isgid s-isuid s-isvtx s-iwgrp
+syn keyword txl_keyword contained s-iwoth s-iwusr s-ixgrp s-ixoth
+syn keyword txl_keyword contained s-ixusr search search-regex search-regst
+syn keyword txl_keyword contained search-str search-str-tree second seek-stream
+syn keyword txl_keyword contained select seqp set set-diff
+syn keyword txl_keyword contained set-hash-userdata set-sig-handler setenv sethash
+syn keyword txl_keyword contained setitimer setlogmask setq sh
+syn keyword txl_keyword contained shift sig-abrt sig-alrm sig-bus
+syn keyword txl_keyword contained sig-check sig-chld sig-cont sig-fpe
+syn keyword txl_keyword contained sig-hup sig-ill sig-int sig-io
+syn keyword txl_keyword contained sig-iot sig-kill sig-lost sig-pipe
+syn keyword txl_keyword contained sig-poll sig-prof sig-pwr sig-quit
+syn keyword txl_keyword contained sig-segv sig-stkflt sig-stop sig-sys
+syn keyword txl_keyword contained sig-term sig-trap sig-tstp sig-ttin
+syn keyword txl_keyword contained sig-ttou sig-urg sig-usr1 sig-usr2
+syn keyword txl_keyword contained sig-vtalrm sig-winch sig-xcpu sig-xfsz
+syn keyword txl_keyword contained sign-extend sin sixth size-vec
+syn keyword txl_keyword contained some sort sort-group source-loc
+syn keyword txl_keyword contained source-loc-str span-str splice split-str
+syn keyword txl_keyword contained split-str-set sqrt sssucc ssucc
+syn keyword txl_keyword contained stat stdlib str< str<=
+syn keyword txl_keyword contained str= str> str>= stream-get-prop
+syn keyword txl_keyword contained stream-set-prop streamp string-extend string-lt
+syn keyword txl_keyword contained stringp sub sub-list sub-str
+syn keyword txl_keyword contained sub-vec succ swap symacrolet
+syn keyword txl_keyword contained symbol-function symbol-name symbol-package symbol-value
+syn keyword txl_keyword contained symbolp symlink sys-qquote sys-splice
+syn keyword txl_keyword contained sys-unquote sys:*lisp1* sys:eval-err sys:get-fb
+syn keyword txl_keyword contained sys:get-vb sys:l1-setq sys:l1-val sys:sym-clobber-expander
+syn keyword txl_keyword contained sys:sym-delete-expander sys:sym-update-expander syslog tan
+syn keyword txl_keyword contained tb tc tf third
+syn keyword txl_keyword contained throw throwf time time-fields-local
+syn keyword txl_keyword contained time-fields-utc time-string-local time-string-utc time-usec
+syn keyword txl_keyword contained tofloat toint tok-str tok-where
+syn keyword txl_keyword contained tostring tostringp tprint transpose
+syn keyword txl_keyword contained tree-bind tree-case tree-find trie-add
+syn keyword txl_keyword contained trie-compress trie-lookup-begin trie-lookup-feed-char trie-value-at
+syn keyword txl_keyword contained trim-str true trunc trunc-rem
+syn keyword txl_keyword contained tuples txr-case txr-if txr-when
+syn keyword txl_keyword contained typeof unget-byte unget-char uniq
+syn keyword txl_keyword contained unique unless unquote unsetenv
+syn keyword txl_keyword contained until until* upcase-str update
+syn keyword txl_keyword contained url-decode url-encode usleep uw-protect
+syn keyword txl_keyword contained vec vec-push vec-set-length vecref
+syn keyword txl_keyword contained vector vector-list vectorp w-continued
+syn keyword txl_keyword contained w-coredump w-exitstatus w-ifcontinued w-ifexited
+syn keyword txl_keyword contained w-ifsignaled w-ifstopped w-nohang w-stopsig
+syn keyword txl_keyword contained w-termsig w-untraced wait weave
+syn keyword txl_keyword contained when whenlet where while
+syn keyword txl_keyword contained while* whilet width with-clobber-expander
+syn keyword txl_keyword contained with-delete-expander with-gensyms with-saved-vars with-update-expander
+syn keyword txl_keyword contained wrap wrap* zap zerop
+syn keyword txl_keyword contained zip
 syn match txr_metanum "@[0-9]\+"
 syn match txr_nested_error "[^\t `]\+" contained
 
diff --git a/txr.1 b/txr.1
index 596ca2cd..39d28ff3 100644
--- a/txr.1
+++ b/txr.1
@@ -352,9 +352,9 @@
 .ds TX \f[B]TXR\f[]
 .ds TL \f[B]TXR Lisp\f[]
 .\" Start of man page:
-.TH TXR 1 2015-04-26 "Utility Commands" "TXR Data Processing Language" "Kaz Kylheku"
+.TH TXR 1 2015-06-13 "Utility Commands" "TXR Data Processing Language" "Kaz Kylheku"
 .SH* NAME
-\*(TX \- text processing language (version 107)
+\*(TX \- text processing language (version 108)
 .SH* SYNOPSIS
 .cblk
 .meti txr >> [ options ] < query-file < data-files ..
diff --git a/txr.vim b/txr.vim
index deeee999..b177a2bf 100644
--- a/txr.vim
+++ b/txr.vim
@@ -22,23 +22,25 @@ setlocal iskeyword=a-z,A-Z,48-57,!,$,&,*,+,-,<,=,>,?,\\,_,~,/
 
 syn keyword txl_keyword contained * *args* *e* *flo-dig*
 syn keyword txl_keyword contained *flo-epsilon* *flo-max* *flo-min* *full-args*
-syn keyword txl_keyword contained *gensym-counter* *keyword-package* *pi* *random-state*
-syn keyword txl_keyword contained *self-path* *stddebug* *stderr* *stdin*
-syn keyword txl_keyword contained *stdlog* *stdnull* *stdout* *txr-version*
-syn keyword txl_keyword contained *unhandled-hook* *user-package* + -
-syn keyword txl_keyword contained / /= < <=
-syn keyword txl_keyword contained = > >= abort
-syn keyword txl_keyword contained abs abs-path-p acons acons-new
-syn keyword txl_keyword contained aconsql-new acos ado alist-nremove
-syn keyword txl_keyword contained alist-remove all and andf
-syn keyword txl_keyword contained ap apf append append*
-syn keyword txl_keyword contained append-each append-each* apply aret
-syn keyword txl_keyword contained ash asin assoc assql
-syn keyword txl_keyword contained atan atan2 atom bignump
-syn keyword txl_keyword contained bit block boundp break-str
-syn keyword txl_keyword contained call callf car caseq
-syn keyword txl_keyword contained caseql casequal cat-str cat-streams
-syn keyword txl_keyword contained cat-vec catch cdr ceil
+syn keyword txl_keyword contained *gensym-counter* *keyword-package* *pi* *place-clobber-expander*
+syn keyword txl_keyword contained *place-delete-expander* *place-update-expander* *random-state* *self-path*
+syn keyword txl_keyword contained *stddebug* *stderr* *stdin* *stdlog*
+syn keyword txl_keyword contained *stdnull* *stdout* *txr-version* *unhandled-hook*
+syn keyword txl_keyword contained *user-package* + - /
+syn keyword txl_keyword contained /= < <= =
+syn keyword txl_keyword contained > >= abort abs
+syn keyword txl_keyword contained abs-path-p acons acons-new aconsql-new
+syn keyword txl_keyword contained acos ado alist-nremove alist-remove
+syn keyword txl_keyword contained all and andf ap
+syn keyword txl_keyword contained apf append append* append-each
+syn keyword txl_keyword contained append-each* apply aret ash
+syn keyword txl_keyword contained asin assoc assql atan
+syn keyword txl_keyword contained atan2 atom bignump bit
+syn keyword txl_keyword contained block boundp break-str call
+syn keyword txl_keyword contained call-clobber-expander call-delete-expander call-update-expander callf
+syn keyword txl_keyword contained car caseq caseql casequal
+syn keyword txl_keyword contained cat-str cat-streams cat-vec catch
+syn keyword txl_keyword contained catenated-stream-p catenated-stream-push cdr ceil
 syn keyword txl_keyword contained chain chand chdir chmod
 syn keyword txl_keyword contained chr-isalnum chr-isalpha chr-isascii chr-isblank
 syn keyword txl_keyword contained chr-iscntrl chr-isdigit chr-isgraph chr-islower
@@ -52,28 +54,30 @@ syn keyword txl_keyword contained consp constantp copy copy-alist
 syn keyword txl_keyword contained copy-cons copy-hash copy-list copy-str
 syn keyword txl_keyword contained copy-vec cos count-if countq
 syn keyword txl_keyword contained countql countqual cum-norm-dist daemon
-syn keyword txl_keyword contained dec defmacro defsymacro defun
-syn keyword txl_keyword contained defvar del delay delete-package
-syn keyword txl_keyword contained do dohash dotimes downcase-str
-syn keyword txl_keyword contained dup dupfd dwim each
-syn keyword txl_keyword contained each* empty ensure-dir env
-syn keyword txl_keyword contained env-fbind env-hash env-vbind eq
-syn keyword txl_keyword contained eql equal errno error
-syn keyword txl_keyword contained eval evenp exec exit
-syn keyword txl_keyword contained exit* exp expt exptmod
-syn keyword txl_keyword contained false fbind fboundp fifth
-syn keyword txl_keyword contained fileno filter-equal filter-string-tree finalize
-syn keyword txl_keyword contained find find-if find-max find-min
-syn keyword txl_keyword contained find-package first fixnump flatten
-syn keyword txl_keyword contained flatten* flet flip flo-int
+syn keyword txl_keyword contained dec define-modify-macro defmacro defparm
+syn keyword txl_keyword contained defplace defsymacro defun defvar
+syn keyword txl_keyword contained del delay delete-package do
+syn keyword txl_keyword contained dohash dotimes downcase-str dup
+syn keyword txl_keyword contained dupfd dwim each each*
+syn keyword txl_keyword contained empty ensure-dir env env-fbind
+syn keyword txl_keyword contained env-hash env-vbind eq eql
+syn keyword txl_keyword contained equal errno error eval
+syn keyword txl_keyword contained evenp exec exit exit*
+syn keyword txl_keyword contained exp expt exptmod false
+syn keyword txl_keyword contained fbind fboundp fifth fileno
+syn keyword txl_keyword contained filter-equal filter-string-tree finalize find
+syn keyword txl_keyword contained find-if find-max find-min find-package
+syn keyword txl_keyword contained first fixnump flatten flatten*
+syn keyword txl_keyword contained flet flip flipargs flo-int
 syn keyword txl_keyword contained flo-str floatp floor flush-stream
-syn keyword txl_keyword contained for for* force fork
-syn keyword txl_keyword contained format fourth fun func-get-env
-syn keyword txl_keyword contained func-get-form func-set-env functionp gcd
-syn keyword txl_keyword contained gen generate gensym gequal
-syn keyword txl_keyword contained get-byte get-char get-error get-error-str
-syn keyword txl_keyword contained get-hash-userdata get-line get-lines get-list-from-stream
-syn keyword txl_keyword contained get-sig-handler get-string get-string-from-stream getenv
+syn keyword txl_keyword contained fmakunbound for for* force
+syn keyword txl_keyword contained fork format fourth fun
+syn keyword txl_keyword contained func-get-env func-get-form func-set-env functionp
+syn keyword txl_keyword contained gcd gen generate gensym
+syn keyword txl_keyword contained gequal get-byte get-char get-clobber-expander
+syn keyword txl_keyword contained get-delete-expander get-error get-error-str get-hash-userdata
+syn keyword txl_keyword contained get-line get-lines get-list-from-stream get-sig-handler
+syn keyword txl_keyword contained get-string get-string-from-stream get-update-expander getenv
 syn keyword txl_keyword contained gethash getitimer getpid getppid
 syn keyword txl_keyword contained giterate glob glob-altdirfunc glob-brace
 syn keyword txl_keyword contained glob-err glob-mark glob-nocheck glob-noescape
@@ -99,109 +103,117 @@ syn keyword txl_keyword contained length-str-< length-str-<= length-str-> length
 syn keyword txl_keyword contained length-vec lequal less let
 syn keyword txl_keyword contained let* lexical-fun-p lexical-lisp1-binding lexical-var-p
 syn keyword txl_keyword contained link lisp-parse list list*
-syn keyword txl_keyword contained list-str list-vector listp log
-syn keyword txl_keyword contained log-alert log-auth log-authpriv log-cons
-syn keyword txl_keyword contained log-crit log-daemon log-debug log-emerg
-syn keyword txl_keyword contained log-err log-info log-ndelay log-notice
-syn keyword txl_keyword contained log-nowait log-odelay log-perror log-pid
-syn keyword txl_keyword contained log-user log-warning log10 log2
-syn keyword txl_keyword contained logand logior lognot logtest
-syn keyword txl_keyword contained logtrunc logxor macro-form-p macro-time
-syn keyword txl_keyword contained macroexpand macroexpand-1 macrolet major
-syn keyword txl_keyword contained make-catenated-stream make-env make-hash make-lazy-cons
-syn keyword txl_keyword contained make-like make-package make-random-state make-similar-hash
-syn keyword txl_keyword contained make-string-byte-input-stream make-string-input-stream make-string-output-stream make-strlist-output-stream
-syn keyword txl_keyword contained make-sym make-time make-time-utc make-trie
-syn keyword txl_keyword contained makedev mapcar mapcar* mapdo
-syn keyword txl_keyword contained mapf maphash mappend mappend*
-syn keyword txl_keyword contained mask match-fun match-regex match-regex-right
-syn keyword txl_keyword contained match-regst match-regst-right match-str match-str-tree
-syn keyword txl_keyword contained max member member-if memq
-syn keyword txl_keyword contained memql memqual merge min
-syn keyword txl_keyword contained minor minusp mkdir mknod
-syn keyword txl_keyword contained mkstring mlet mod multi
-syn keyword txl_keyword contained multi-sort n-choose-k n-perm-k nconc
-syn keyword txl_keyword contained nilf none not notf
-syn keyword txl_keyword contained nreverse null nullify num-chr
-syn keyword txl_keyword contained num-str numberp oand oddp
-syn keyword txl_keyword contained op open-command open-directory open-file
-syn keyword txl_keyword contained open-fileno open-files open-files* open-pipe
-syn keyword txl_keyword contained open-process open-tail openlog opip
-syn keyword txl_keyword contained or orf packagep pad
-syn keyword txl_keyword contained partition partition* partition-by perm
-syn keyword txl_keyword contained pipe plusp pop pos
-syn keyword txl_keyword contained pos-if pos-max pos-min posq
-syn keyword txl_keyword contained posql posqual pppred ppred
-syn keyword txl_keyword contained pprinl pprint pprof pred
-syn keyword txl_keyword contained prinl print prof prog1
-syn keyword txl_keyword contained progn prop proper-listp push
-syn keyword txl_keyword contained pushhash put-byte put-char put-line
-syn keyword txl_keyword contained put-lines put-string put-strings pwd
-syn keyword txl_keyword contained qquote quasi quasilist quote
-syn keyword txl_keyword contained rand random random-fixnum random-state-p
-syn keyword txl_keyword contained range range* range-regex rcomb
-syn keyword txl_keyword contained read readlink real-time-stream-p reduce-left
-syn keyword txl_keyword contained reduce-right ref refset regex-compile
-syn keyword txl_keyword contained regex-parse regexp regsub rehome-sym
-syn keyword txl_keyword contained remhash remove-if remove-if* remove-path
-syn keyword txl_keyword contained remq remq* remql remql*
-syn keyword txl_keyword contained remqual remqual* rename-path repeat
-syn keyword txl_keyword contained replace replace-list replace-str replace-vec
-syn keyword txl_keyword contained rest ret retf return
-syn keyword txl_keyword contained return-from reverse rlcp rperm
-syn keyword txl_keyword contained rplaca rplacd run s-ifblk
-syn keyword txl_keyword contained s-ifchr s-ifdir s-ififo s-iflnk
-syn keyword txl_keyword contained s-ifmt s-ifreg s-ifsock s-irgrp
-syn keyword txl_keyword contained s-iroth s-irusr s-irwxg s-irwxo
-syn keyword txl_keyword contained s-irwxu s-isgid s-isuid s-isvtx
-syn keyword txl_keyword contained s-iwgrp s-iwoth s-iwusr s-ixgrp
-syn keyword txl_keyword contained s-ixoth s-ixusr search search-regex
-syn keyword txl_keyword contained search-regst search-str search-str-tree second
-syn keyword txl_keyword contained seek-stream select seqp set
-syn keyword txl_keyword contained set-diff set-hash-userdata set-sig-handler setenv
-syn keyword txl_keyword contained sethash setitimer setlogmask sh
-syn keyword txl_keyword contained sig-abrt sig-alrm sig-bus sig-check
-syn keyword txl_keyword contained sig-chld sig-cont sig-fpe sig-hup
-syn keyword txl_keyword contained sig-ill sig-int sig-io sig-iot
-syn keyword txl_keyword contained sig-kill sig-lost sig-pipe sig-poll
-syn keyword txl_keyword contained sig-prof sig-pwr sig-quit sig-segv
-syn keyword txl_keyword contained sig-stkflt sig-stop sig-sys sig-term
-syn keyword txl_keyword contained sig-trap sig-tstp sig-ttin sig-ttou
-syn keyword txl_keyword contained sig-urg sig-usr1 sig-usr2 sig-vtalrm
-syn keyword txl_keyword contained sig-winch sig-xcpu sig-xfsz sign-extend
-syn keyword txl_keyword contained sin sixth size-vec some
-syn keyword txl_keyword contained sort sort-group source-loc source-loc-str
-syn keyword txl_keyword contained span-str splice split-str split-str-set
-syn keyword txl_keyword contained sqrt sssucc ssucc stat
-syn keyword txl_keyword contained stdlib str< str<= str=
-syn keyword txl_keyword contained str> str>= stream-get-prop stream-set-prop
-syn keyword txl_keyword contained streamp string-extend string-lt stringp
-syn keyword txl_keyword contained sub sub-list sub-str sub-vec
-syn keyword txl_keyword contained succ symacrolet symbol-function symbol-name
-syn keyword txl_keyword contained symbol-package symbol-value symbolp symlink
-syn keyword txl_keyword contained sys-qquote sys-splice sys-unquote syslog
-syn keyword txl_keyword contained tan tb tc tf
-syn keyword txl_keyword contained third throw throwf time
-syn keyword txl_keyword contained time-fields-local time-fields-utc time-string-local time-string-utc
-syn keyword txl_keyword contained time-usec tofloat toint tok-str
-syn keyword txl_keyword contained tok-where tostring tostringp tprint
-syn keyword txl_keyword contained transpose tree-bind tree-case tree-find
-syn keyword txl_keyword contained trie-add trie-compress trie-lookup-begin trie-lookup-feed-char
-syn keyword txl_keyword contained trie-value-at trim-str true trunc
-syn keyword txl_keyword contained trunc-rem tuples txr-case txr-if
-syn keyword txl_keyword contained txr-when typeof unget-byte unget-char
-syn keyword txl_keyword contained uniq unique unless unquote
-syn keyword txl_keyword contained unsetenv until until* upcase-str
-syn keyword txl_keyword contained update url-decode url-encode usleep
-syn keyword txl_keyword contained uw-protect vec vec-push vec-set-length
-syn keyword txl_keyword contained vecref vector vector-list vectorp
-syn keyword txl_keyword contained w-continued w-coredump w-exitstatus w-ifcontinued
-syn keyword txl_keyword contained w-ifexited w-ifsignaled w-ifstopped w-nohang
-syn keyword txl_keyword contained w-stopsig w-termsig w-untraced wait
-syn keyword txl_keyword contained weave when whenlet where
-syn keyword txl_keyword contained while while* whilet width
-syn keyword txl_keyword contained with-saved-vars wrap wrap* zap
-syn keyword txl_keyword contained zerop zip
+syn keyword txl_keyword contained list-str list-vector listp load
+syn keyword txl_keyword contained log log-alert log-auth log-authpriv
+syn keyword txl_keyword contained log-cons log-crit log-daemon log-debug
+syn keyword txl_keyword contained log-emerg log-err log-info log-ndelay
+syn keyword txl_keyword contained log-notice log-nowait log-odelay log-perror
+syn keyword txl_keyword contained log-pid log-user log-warning log10
+syn keyword txl_keyword contained log2 logand logior lognot
+syn keyword txl_keyword contained logtest logtrunc logxor macro-form-p
+syn keyword txl_keyword contained macro-time macroexpand macroexpand-1 macrolet
+syn keyword txl_keyword contained major make-catenated-stream make-env make-hash
+syn keyword txl_keyword contained make-lazy-cons make-like make-package make-random-state
+syn keyword txl_keyword contained make-similar-hash make-string-byte-input-stream make-string-input-stream make-string-output-stream
+syn keyword txl_keyword contained make-strlist-output-stream make-sym make-time make-time-utc
+syn keyword txl_keyword contained make-trie makedev makunbound mapcar
+syn keyword txl_keyword contained mapcar* mapdo mapf maphash
+syn keyword txl_keyword contained mappend mappend* mask match-fun
+syn keyword txl_keyword contained match-regex match-regex-right match-regst match-regst-right
+syn keyword txl_keyword contained match-str match-str-tree max member
+syn keyword txl_keyword contained member-if memq memql memqual
+syn keyword txl_keyword contained merge min minor minusp
+syn keyword txl_keyword contained mkdir mknod mkstring mlet
+syn keyword txl_keyword contained mod multi multi-sort n-choose-k
+syn keyword txl_keyword contained n-perm-k nconc nilf none
+syn keyword txl_keyword contained not notf nreverse null
+syn keyword txl_keyword contained nullify num-chr num-str numberp
+syn keyword txl_keyword contained oand oddp op open-command
+syn keyword txl_keyword contained open-directory open-file open-fileno open-files
+syn keyword txl_keyword contained open-files* open-pipe open-process open-tail
+syn keyword txl_keyword contained openlog opip or orf
+syn keyword txl_keyword contained packagep pad partition partition*
+syn keyword txl_keyword contained partition-by perm pipe plusp
+syn keyword txl_keyword contained poll poll-err poll-in poll-nval
+syn keyword txl_keyword contained poll-out poll-pri poll-rdband poll-rdhup
+syn keyword txl_keyword contained poll-wrband pop pos pos-if
+syn keyword txl_keyword contained pos-max pos-min posq posql
+syn keyword txl_keyword contained posqual pppred ppred pprinl
+syn keyword txl_keyword contained pprint pprof pred prinl
+syn keyword txl_keyword contained print prof prog1 progn
+syn keyword txl_keyword contained prop proper-listp pset push
+syn keyword txl_keyword contained pushhash pushnew put-byte put-char
+syn keyword txl_keyword contained put-line put-lines put-string put-strings
+syn keyword txl_keyword contained pwd qquote quasi quasilist
+syn keyword txl_keyword contained quote rand random random-fixnum
+syn keyword txl_keyword contained random-state-p range range* range-regex
+syn keyword txl_keyword contained rcomb read readlink real-time-stream-p
+syn keyword txl_keyword contained reduce-left reduce-right ref refset
+syn keyword txl_keyword contained regex-compile regex-parse regexp regsub
+syn keyword txl_keyword contained rehome-sym remhash remove-if remove-if*
+syn keyword txl_keyword contained remove-path remq remq* remql
+syn keyword txl_keyword contained remql* remqual remqual* rename-path
+syn keyword txl_keyword contained repeat replace replace-list replace-str
+syn keyword txl_keyword contained replace-vec rest ret retf
+syn keyword txl_keyword contained return return-from reverse rlcp
+syn keyword txl_keyword contained rlet rotate rperm rplaca
+syn keyword txl_keyword contained rplacd run s-ifblk s-ifchr
+syn keyword txl_keyword contained s-ifdir s-ififo s-iflnk s-ifmt
+syn keyword txl_keyword contained s-ifreg s-ifsock s-irgrp s-iroth
+syn keyword txl_keyword contained s-irusr s-irwxg s-irwxo s-irwxu
+syn keyword txl_keyword contained s-isgid s-isuid s-isvtx s-iwgrp
+syn keyword txl_keyword contained s-iwoth s-iwusr s-ixgrp s-ixoth
+syn keyword txl_keyword contained s-ixusr search search-regex search-regst
+syn keyword txl_keyword contained search-str search-str-tree second seek-stream
+syn keyword txl_keyword contained select seqp set set-diff
+syn keyword txl_keyword contained set-hash-userdata set-sig-handler setenv sethash
+syn keyword txl_keyword contained setitimer setlogmask setq sh
+syn keyword txl_keyword contained shift sig-abrt sig-alrm sig-bus
+syn keyword txl_keyword contained sig-check sig-chld sig-cont sig-fpe
+syn keyword txl_keyword contained sig-hup sig-ill sig-int sig-io
+syn keyword txl_keyword contained sig-iot sig-kill sig-lost sig-pipe
+syn keyword txl_keyword contained sig-poll sig-prof sig-pwr sig-quit
+syn keyword txl_keyword contained sig-segv sig-stkflt sig-stop sig-sys
+syn keyword txl_keyword contained sig-term sig-trap sig-tstp sig-ttin
+syn keyword txl_keyword contained sig-ttou sig-urg sig-usr1 sig-usr2
+syn keyword txl_keyword contained sig-vtalrm sig-winch sig-xcpu sig-xfsz
+syn keyword txl_keyword contained sign-extend sin sixth size-vec
+syn keyword txl_keyword contained some sort sort-group source-loc
+syn keyword txl_keyword contained source-loc-str span-str splice split-str
+syn keyword txl_keyword contained split-str-set sqrt sssucc ssucc
+syn keyword txl_keyword contained stat stdlib str< str<=
+syn keyword txl_keyword contained str= str> str>= stream-get-prop
+syn keyword txl_keyword contained stream-set-prop streamp string-extend string-lt
+syn keyword txl_keyword contained stringp sub sub-list sub-str
+syn keyword txl_keyword contained sub-vec succ swap symacrolet
+syn keyword txl_keyword contained symbol-function symbol-name symbol-package symbol-value
+syn keyword txl_keyword contained symbolp symlink sys-qquote sys-splice
+syn keyword txl_keyword contained sys-unquote sys:*lisp1* sys:eval-err sys:get-fb
+syn keyword txl_keyword contained sys:get-vb sys:l1-setq sys:l1-val sys:sym-clobber-expander
+syn keyword txl_keyword contained sys:sym-delete-expander sys:sym-update-expander syslog tan
+syn keyword txl_keyword contained tb tc tf third
+syn keyword txl_keyword contained throw throwf time time-fields-local
+syn keyword txl_keyword contained time-fields-utc time-string-local time-string-utc time-usec
+syn keyword txl_keyword contained tofloat toint tok-str tok-where
+syn keyword txl_keyword contained tostring tostringp tprint transpose
+syn keyword txl_keyword contained tree-bind tree-case tree-find trie-add
+syn keyword txl_keyword contained trie-compress trie-lookup-begin trie-lookup-feed-char trie-value-at
+syn keyword txl_keyword contained trim-str true trunc trunc-rem
+syn keyword txl_keyword contained tuples txr-case txr-if txr-when
+syn keyword txl_keyword contained typeof unget-byte unget-char uniq
+syn keyword txl_keyword contained unique unless unquote unsetenv
+syn keyword txl_keyword contained until until* upcase-str update
+syn keyword txl_keyword contained url-decode url-encode usleep uw-protect
+syn keyword txl_keyword contained vec vec-push vec-set-length vecref
+syn keyword txl_keyword contained vector vector-list vectorp w-continued
+syn keyword txl_keyword contained w-coredump w-exitstatus w-ifcontinued w-ifexited
+syn keyword txl_keyword contained w-ifsignaled w-ifstopped w-nohang w-stopsig
+syn keyword txl_keyword contained w-termsig w-untraced wait weave
+syn keyword txl_keyword contained when whenlet where while
+syn keyword txl_keyword contained while* whilet width with-clobber-expander
+syn keyword txl_keyword contained with-delete-expander with-gensyms with-saved-vars with-update-expander
+syn keyword txl_keyword contained wrap wrap* zap zerop
+syn keyword txl_keyword contained zip
 
 syn keyword txr_keyword contained accept all and assert
 syn keyword txr_keyword contained bind block cases cat