Version 252txr-252

* RELNOTES: Updated.

* configure, txr.1: Bumped version and date.

* share/txr/stdlib/ver.tl: Bumped.

* txr.vim, tl.vim: Regenerated.

* protsym.c: Likewise.

7 files changed, 401 insertions, 322 deletions

diff --git a/RELNOTES b/RELNOTES
index 0fd5a116..090aa2cf 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,76 @@
+                                    TXR 252
+                                   2021-02-28
+
+
+  Features:
+
+  - compiler:
+    - new optimizations introduced:
+      - elimination of frames for non-captured lexical variables
+      - elimination of blocks in self-recursive functions
+      - more compact frame size for closures
+      - strength reduction of equal (helps pattern matching)
+      - list construction optimization:
+        - e.g. (cons 1 (cons 2 3)) -> (list* 1 2 3) and more
+      - other algebraic reductions.
+      - aggressive constant-folding of over 300 library functions.
+      - new control-flow and data-flow analysis:
+        - removal of dead registers
+        - elimination of inefficiently used temporary registers
+        - comprehensive dead code removal
+
+  - structural pattern matching
+    - internal code cleanup, improvements and improved
+      diagnostics for hash patterns.
+
+  - syntax:
+    - obj.[fun ...] syntax changes meaning; it is now
+      method dispatch.
+      - obj.[method ...] is to [fun ...] as
+        obj.(method ...) is to (fun ....)
+    - improved diagnosis of invalid dotted forms.
+
+  - library:
+    - list-builder methods now return the object, allowing
+      chaining like (new list-builder).(add 3).(get)
+
+  - vm:
+    - backwards compatibility jump: TXR 251 generates version 6
+      object files (.tlo) and will not read older ones.
+    - Some obsolescent instructions have been removed from the
+      instruction set.
+
+  - TXR Pattern Language:
+    - function calls, including indirect calls via @(call ...)
+      are now considered non-matching directives, thus not
+      calling for the input source to be opened.
+
+  Bugs:
+
+  - math:
+    - fixed out-of-bounds memory access in or and xor
+      functions when the arguments are bignums.
+  - build:
+    - bug fixed: not dealing with spaces in configuration arguments when
+      generating ./reconfigure script
+  - printer:
+    - obscure bug in printing lambda expressions fixed,
+      triggering function lookup and expansion at print time.
+  - compiler:
+    - fixed internal error in compiler when compiling
+      certain cases sys:switch forms generated in certain cases
+      of caseq/caseql.
+    - assignment to a function binding being internally marked as
+      an a free variable reference by the compiler, rather than
+      a free function reference.
+    - incorrect compilation unwind-protect form when the
+      protected form is trivial, like a literal constant.
+  - TXR Pattern Language:
+    - fixed broken implementation of @(call ...), in several independent
+      aspects.
+
+
+
                                     TXR 251
                                    2021-02-08
 
diff --git a/configure b/configure
index 4e53f0ab..1fbce3b5 100755
--- a/configure
+++ b/configure
@@ -569,7 +569,7 @@ chmod a+x reconfigure
 #
 
 
-txr_ver=251
+txr_ver=252
 
 #
 # The all important banner.
diff --git a/protsym.c b/protsym.c
index 87f3a156..976bb7b4 100644
--- a/protsym.c
+++ b/protsym.c
@@ -128,27 +128,27 @@ extern val stddebug_s, stderr_s, stdin_s, stdio_stream_s, stdnull_s;
 extern val stdout_s, str_d_s, str_s, stream_s, string_k;
 extern val string_s, struct_lit_s, struct_s, struct_type_s, switch_s;
 extern val sym_s, symacro_k, symacrolet_s, syntax_error_s, sys_abscond_from_s;
-extern val sys_apply_s, sys_catch_s, sys_l1_setq_s, sys_l1_val_s, sys_lisp1_setq_s;
-extern val sys_lisp1_value_s, sys_mark_special_s, sys_qquote_s, sys_splice_s, sys_unquote_s;
-extern val system_error_s, system_package_s, tan_s, tanh_s, text_s;
-extern val throw_s, time_local_s, time_parse_s, time_s, time_string_s;
-extern val time_utc_s, timeout_error_s, times_k, tlist_k, tnode_s;
-extern val tobase64_k, tobase64url_k, tofloat_k, tohtml_k, tohtml_star_k;
-extern val toint_k, tonumber_k, topercent_k, tourl_k, trailer_s;
-extern val tree_bind_s, tree_case_s, tree_construct_s, tree_fun_whitelist_s, tree_iter_s;
-extern val tree_lit_s, tree_s, trunc1_s, trunc_s, truncate_s;
-extern val try_s, type_error_s, ubit_s, uchar_s, uid_k;
-extern val uid_s, uint16_s, uint32_s, uint64_s, uint8_s;
-extern val uint_s, ulong_s, unbound_s, unget_byte_s, unget_char_s;
-extern val union_s, unique_s, unquote_s, until_s, until_star_s;
-extern val upcase_k, uref_s, user_package_s, userdata_k, ushort_s;
-extern val usr_var_s, uw_protect_s, val_s, var_k, var_s;
-extern val vars_k, vec_list_s, vec_s, vecref_s, vector_lit_s;
-extern val vm_closure_s, vm_desc_s, void_s, warning_s, wchar_s;
-extern val weak_keys_k, weak_vals_k, when_s, while_s, while_star_s;
-extern val whole_k, width_s, wild_s, word_char_k, wrap_k;
-extern val wstr_d_s, wstr_s, year_s, zap_s, zarray_s;
-extern val zchar_s, zerop_s, zeroplus_s, zone_s;
+extern val sys_apply_s, sys_blk_s, sys_catch_s, sys_l1_setq_s, sys_l1_val_s;
+extern val sys_lisp1_setq_s, sys_lisp1_value_s, sys_mark_special_s, sys_qquote_s, sys_splice_s;
+extern val sys_unquote_s, system_error_s, system_package_s, tan_s, tanh_s;
+extern val text_s, throw_s, time_local_s, time_parse_s, time_s;
+extern val time_string_s, time_utc_s, timeout_error_s, times_k, tlist_k;
+extern val tnode_s, tobase64_k, tobase64url_k, tofloat_k, tohtml_k;
+extern val tohtml_star_k, toint_k, tonumber_k, topercent_k, tourl_k;
+extern val trailer_s, tree_bind_s, tree_case_s, tree_construct_s, tree_fun_whitelist_s;
+extern val tree_iter_s, tree_lit_s, tree_s, trunc1_s, trunc_s;
+extern val truncate_s, try_s, type_error_s, ubit_s, uchar_s;
+extern val uid_k, uid_s, uint16_s, uint32_s, uint64_s;
+extern val uint8_s, uint_s, ulong_s, unbound_s, unget_byte_s;
+extern val unget_char_s, union_s, unique_s, unquote_s, until_s;
+extern val until_star_s, upcase_k, uref_s, user_package_s, userdata_k;
+extern val ushort_s, usr_var_s, uw_protect_s, val_s, var_k;
+extern val var_s, vars_k, vec_list_s, vec_s, vecref_s;
+extern val vector_lit_s, vm_closure_s, vm_desc_s, void_s, warning_s;
+extern val wchar_s, weak_keys_k, weak_vals_k, when_s, while_s;
+extern val while_star_s, whole_k, width_s, wild_s, word_char_k;
+extern val wrap_k, wstr_d_s, wstr_s, year_s, zap_s;
+extern val zarray_s, zchar_s, zerop_s, zeroplus_s, zone_s;
 
 #if HAVE_DLOPEN
 extern val dlhandle_s, dlsym_s;
@@ -278,27 +278,27 @@ val *protected_sym[] = {
   &stdout_s, &str_d_s, &str_s, &stream_s, &string_k,
   &string_s, &struct_lit_s, &struct_s, &struct_type_s, &switch_s,
   &sym_s, &symacro_k, &symacrolet_s, &syntax_error_s, &sys_abscond_from_s,
-  &sys_apply_s, &sys_catch_s, &sys_l1_setq_s, &sys_l1_val_s, &sys_lisp1_setq_s,
-  &sys_lisp1_value_s, &sys_mark_special_s, &sys_qquote_s, &sys_splice_s, &sys_unquote_s,
-  &system_error_s, &system_package_s, &tan_s, &tanh_s, &text_s,
-  &throw_s, &time_local_s, &time_parse_s, &time_s, &time_string_s,
-  &time_utc_s, &timeout_error_s, &times_k, &tlist_k, &tnode_s,
-  &tobase64_k, &tobase64url_k, &tofloat_k, &tohtml_k, &tohtml_star_k,
-  &toint_k, &tonumber_k, &topercent_k, &tourl_k, &trailer_s,
-  &tree_bind_s, &tree_case_s, &tree_construct_s, &tree_fun_whitelist_s, &tree_iter_s,
-  &tree_lit_s, &tree_s, &trunc1_s, &trunc_s, &truncate_s,
-  &try_s, &type_error_s, &ubit_s, &uchar_s, &uid_k,
-  &uid_s, &uint16_s, &uint32_s, &uint64_s, &uint8_s,
-  &uint_s, &ulong_s, &unbound_s, &unget_byte_s, &unget_char_s,
-  &union_s, &unique_s, &unquote_s, &until_s, &until_star_s,
-  &upcase_k, &uref_s, &user_package_s, &userdata_k, &ushort_s,
-  &usr_var_s, &uw_protect_s, &val_s, &var_k, &var_s,
-  &vars_k, &vec_list_s, &vec_s, &vecref_s, &vector_lit_s,
-  &vm_closure_s, &vm_desc_s, &void_s, &warning_s, &wchar_s,
-  &weak_keys_k, &weak_vals_k, &when_s, &while_s, &while_star_s,
-  &whole_k, &width_s, &wild_s, &word_char_k, &wrap_k,
-  &wstr_d_s, &wstr_s, &year_s, &zap_s, &zarray_s,
-  &zchar_s, &zerop_s, &zeroplus_s, &zone_s,
+  &sys_apply_s, &sys_blk_s, &sys_catch_s, &sys_l1_setq_s, &sys_l1_val_s,
+  &sys_lisp1_setq_s, &sys_lisp1_value_s, &sys_mark_special_s, &sys_qquote_s, &sys_splice_s,
+  &sys_unquote_s, &system_error_s, &system_package_s, &tan_s, &tanh_s,
+  &text_s, &throw_s, &time_local_s, &time_parse_s, &time_s,
+  &time_string_s, &time_utc_s, &timeout_error_s, &times_k, &tlist_k,
+  &tnode_s, &tobase64_k, &tobase64url_k, &tofloat_k, &tohtml_k,
+  &tohtml_star_k, &toint_k, &tonumber_k, &topercent_k, &tourl_k,
+  &trailer_s, &tree_bind_s, &tree_case_s, &tree_construct_s, &tree_fun_whitelist_s,
+  &tree_iter_s, &tree_lit_s, &tree_s, &trunc1_s, &trunc_s,
+  &truncate_s, &try_s, &type_error_s, &ubit_s, &uchar_s,
+  &uid_k, &uid_s, &uint16_s, &uint32_s, &uint64_s,
+  &uint8_s, &uint_s, &ulong_s, &unbound_s, &unget_byte_s,
+  &unget_char_s, &union_s, &unique_s, &unquote_s, &until_s,
+  &until_star_s, &upcase_k, &uref_s, &user_package_s, &userdata_k,
+  &ushort_s, &usr_var_s, &uw_protect_s, &val_s, &var_k,
+  &var_s, &vars_k, &vec_list_s, &vec_s, &vecref_s,
+  &vector_lit_s, &vm_closure_s, &vm_desc_s, &void_s, &warning_s,
+  &wchar_s, &weak_keys_k, &weak_vals_k, &when_s, &while_s,
+  &while_star_s, &whole_k, &width_s, &wild_s, &word_char_k,
+  &wrap_k, &wstr_d_s, &wstr_s, &year_s, &zap_s,
+  &zarray_s, &zchar_s, &zerop_s, &zeroplus_s, &zone_s,
 
 #if HAVE_DLOPEN
   &dlhandle_s, &dlsym_s,
diff --git a/share/txr/stdlib/ver.tl b/share/txr/stdlib/ver.tl
index a62862c9..b328ca10 100644
--- a/share/txr/stdlib/ver.tl
+++ b/share/txr/stdlib/ver.tl
@@ -1,2 +1,2 @@
-(defvarl lib-version 251)
+(defvarl lib-version 252)
 (defvarl *lib-version* lib-version)
diff --git a/tl.vim b/tl.vim
index 46a1535b..0ac47833 100644
--- a/tl.vim
+++ b/tl.vim
@@ -490,66 +490,68 @@ syn keyword tl_keyword contained swap symacrolet symbol-function symbol-macro
 syn keyword tl_keyword contained symbol-name symbol-package symbol-value symbolp
 syn keyword tl_keyword contained symdiff symlink sys:%backpatch-high16% sys:%backpatch-low16%
 syn keyword tl_keyword contained sys:%big-endian% sys:%bin-op% sys:%bin-ops% sys:%block-using-funs%
-syn keyword tl_keyword contained sys:%call-op% sys:%dbg-command-env% sys:%file-suff-rx% sys:%gcall-op%
-syn keyword tl_keyword contained sys:%lev-bits% sys:%lev-size% sys:%max-lambda-fixed-args% sys:%max-lev%
-syn keyword tl_keyword contained sys:%max-lev-idx% sys:%max-sm-lev% sys:%max-sm-lev-idx% sys:%max-v-lev%
-syn keyword tl_keyword contained sys:%nary-ops% sys:%oc-code% sys:%oc-hash% sys:%oc-list-builder%
-syn keyword tl_keyword contained sys:%package-manip% sys:%quip-rand-state% sys:%quips% sys:%shuffled-quips%
-syn keyword tl_keyword contained sys:%sm-lev-bits% sys:%sm-lev-size% sys:%test-funs% sys:%test-funs-neg%
-syn keyword tl_keyword contained sys:%test-funs-ops% sys:%test-funs-pos% sys:%test-inv% sys:%test-opcode%
-syn keyword tl_keyword contained sys:%tlo-ver% sys:*dedup* sys:*emit* sys:*eval*
-syn keyword tl_keyword contained sys:*load-recursive* sys:*load-time* sys:*match-form* sys:*op-ctx*
-syn keyword tl_keyword contained sys:*pl-env* sys:*pl-form* sys:*trace-hash* sys:*trace-level*
-syn keyword tl_keyword contained sys:abscond* sys:abscond-from sys:analyze-argtypes sys:analyze-params
-syn keyword tl_keyword contained sys:apply sys:asm-error sys:assumed-fun sys:awk%--rng
-syn keyword tl_keyword contained sys:awk%--rng+ sys:awk%--rng- sys:awk%-rng+ sys:awk%rng+
-syn keyword tl_keyword contained sys:awk-code-move-check sys:awk-error sys:awk-expander sys:awk-fun-let
-syn keyword tl_keyword contained sys:awk-fun-shadowing-env sys:awk-mac-let sys:awk-redir sys:awk-test
-syn keyword tl_keyword contained sys:b* sys:b+ sys:b- sys:b/
-syn keyword tl_keyword contained sys:b< sys:b<= sys:b= sys:b=>
-syn keyword tl_keyword contained sys:b> sys:bad-slot-syntax sys:bind-mac-check sys:bind-mac-error
-syn keyword tl_keyword contained sys:bindable-check sys:bits sys:bits-to-obj sys:build-expander
-syn keyword tl_keyword contained sys:build-key-list-expr sys:capture-cont sys:catch sys:check-slot
-syn keyword tl_keyword contained sys:check-struct sys:circref sys:compat sys:compile-and-match
-syn keyword tl_keyword contained sys:compile-as-match sys:compile-atom-match sys:compile-cons-structure sys:compile-exprs-match
-syn keyword tl_keyword contained sys:compile-file-conditionally sys:compile-hash-match sys:compile-loop-match sys:compile-match
-syn keyword tl_keyword contained sys:compile-new-var-match sys:compile-not-match sys:compile-or-match sys:compile-predicate-match
-syn keyword tl_keyword contained sys:compile-range-match sys:compile-require-match sys:compile-struct-match sys:compile-var-match
-syn keyword tl_keyword contained sys:compile-vec-match sys:compile-with-match sys:compiler-emit-warnings sys:conv
-syn keyword tl_keyword contained sys:conv-expand sys:conv-let sys:ctx-form sys:ctx-name
-syn keyword tl_keyword contained sys:dbg-all sys:dbg-backtrace sys:dbg-clear sys:dbg-enable
-syn keyword tl_keyword contained sys:dbg-restore sys:dbg-set sys:dbg-step sys:debugger
-syn keyword tl_keyword contained sys:dedup sys:dedup-labels sys:deffi-cb-expander sys:define-method
-syn keyword tl_keyword contained sys:defset-expander sys:defset-expander-simple sys:dig sys:disassemble-cdf
-syn keyword tl_keyword contained sys:dlib-expr sys:do-conv sys:do-copy-obj sys:do-path-test
-syn keyword tl_keyword contained sys:do-tweak-obj sys:dump-to-tlo sys:dvbind sys:dwim-del
-syn keyword tl_keyword contained sys:dwim-set sys:dyn-size sys:each-op sys:enc-small-op
-syn keyword tl_keyword contained sys:ensure-op-arg sys:env-to-let sys:eval-err sys:expand-and
-syn keyword tl_keyword contained sys:expand-bind-mac-params sys:expand-defmacro sys:expand-defsymacro sys:expand-defun
-syn keyword tl_keyword contained sys:expand-defvarl sys:expand-dohash sys:expand-doloop sys:expand-each
-syn keyword tl_keyword contained sys:expand-each-prod sys:expand-each-prod* sys:expand-handle sys:expand-lambda-match
-syn keyword tl_keyword contained sys:expand-params sys:expand-quasi sys:expand-quasi-args sys:expand-quasi-mods
-syn keyword tl_keyword contained sys:expand-sym-ref sys:expr sys:extract-keys sys:extract-keys-p
-syn keyword tl_keyword contained sys:fbind sys:flatten-or sys:fmt-flex sys:fmt-join
-syn keyword tl_keyword contained sys:fmt-simple sys:for-op sys:gc sys:gc-set-delta
-syn keyword tl_keyword contained sys:get-buf-common sys:get-fun-getter-setter sys:get-mb sys:get-parser
-syn keyword tl_keyword contained sys:get-place-macro sys:get-var-list sys:get-vars sys:get-vb
-syn keyword tl_keyword contained sys:getopts-error sys:handle-bad-syntax sys:hlet-expand sys:if-to-cond
-syn keyword tl_keyword contained sys:in6addr-condensed-text sys:is-label sys:l1-setq sys:l1-val
-syn keyword tl_keyword contained sys:lambda-apply-transform sys:lambda-short-apply-list sys:lambda-too-few-args sys:lambda-too-many-args
-syn keyword tl_keyword contained sys:lbind sys:lisp1-setq sys:lisp1-value sys:list-builder-flets
-syn keyword tl_keyword contained sys:list-from-vm-desc sys:load-time-lit sys:loc sys:mac-env-flatten
-syn keyword tl_keyword contained sys:make-anon-package sys:make-copy-path-opts sys:make-struct-lit sys:make-struct-type
-syn keyword tl_keyword contained sys:mark-special sys:misleading-ref-check sys:name-str sys:new-expander
-syn keyword tl_keyword contained sys:new-type sys:non-triv-pat-p sys:null-reg sys:obtain-impl
-syn keyword tl_keyword contained sys:op-alpha-rename sys:op-ensure-rec sys:op-expand sys:op-meta-p
-syn keyword tl_keyword contained sys:op-rec-p sys:open-compile-streams sys:operand-to-exp sys:operand-to-sym
-syn keyword tl_keyword contained sys:opip-expand sys:opt-dash sys:opt-err sys:parse-compound-operand
-syn keyword tl_keyword contained sys:parse-lambda-match-clause sys:parse-operand sys:parser-eof sys:parser-errors
-syn keyword tl_keyword contained sys:path-access sys:path-examine sys:path-test-mode sys:path-test-type
-syn keyword tl_keyword contained sys:pl-expand sys:placelet-1 sys:print-backtrace sys:propagate-ancestor
-syn keyword tl_keyword contained sys:propagate-perms sys:prune-missing-inits sys:qquote sys:quasi
-syn keyword tl_keyword contained sys:quasilist sys:r-s-let-expander sys:reduce-or sys:reg-expand-nongreedy
+syn keyword tl_keyword contained sys:%call-op% sys:%const-foldable% sys:%const-foldable-funs% sys:%dbg-command-env%
+syn keyword tl_keyword contained sys:%file-suff-rx% sys:%gcall-op% sys:%lev-bits% sys:%lev-size%
+syn keyword tl_keyword contained sys:%max-lambda-fixed-args% sys:%max-lev% sys:%max-lev-idx% sys:%max-sm-lev%
+syn keyword tl_keyword contained sys:%max-sm-lev-idx% sys:%max-v-lev% sys:%nary-ops% sys:%oc-code%
+syn keyword tl_keyword contained sys:%oc-hash% sys:%oc-list-builder% sys:%package-manip% sys:%quip-rand-state%
+syn keyword tl_keyword contained sys:%quips% sys:%shuffled-quips% sys:%sm-lev-bits% sys:%sm-lev-size%
+syn keyword tl_keyword contained sys:%test-funs% sys:%test-funs-neg% sys:%test-funs-ops% sys:%test-funs-pos%
+syn keyword tl_keyword contained sys:%test-inv% sys:%test-opcode% sys:%tlo-ver% sys:*dedup*
+syn keyword tl_keyword contained sys:*emit* sys:*eval* sys:*load-recursive* sys:*load-time*
+syn keyword tl_keyword contained sys:*match-form* sys:*op-ctx* sys:*pl-env* sys:*pl-form*
+syn keyword tl_keyword contained sys:*trace-hash* sys:*trace-level* sys:abscond* sys:abscond-from
+syn keyword tl_keyword contained sys:analyze-argtypes sys:analyze-params sys:apply sys:asm-error
+syn keyword tl_keyword contained sys:assumed-fun sys:awk%--rng sys:awk%--rng+ sys:awk%--rng-
+syn keyword tl_keyword contained sys:awk%-rng+ sys:awk%rng+ sys:awk-code-move-check sys:awk-error
+syn keyword tl_keyword contained sys:awk-expander sys:awk-fun-let sys:awk-fun-shadowing-env sys:awk-mac-let
+syn keyword tl_keyword contained sys:awk-redir sys:awk-test sys:b* sys:b+
+syn keyword tl_keyword contained sys:b- sys:b/ sys:b< sys:b<=
+syn keyword tl_keyword contained sys:b= sys:b=> sys:b> sys:bad-slot-syntax
+syn keyword tl_keyword contained sys:bind-mac-check sys:bind-mac-error sys:bindable-check sys:bits
+syn keyword tl_keyword contained sys:bits-to-obj sys:blk sys:build-expander sys:build-key-list-expr
+syn keyword tl_keyword contained sys:capture-cont sys:catch sys:check-slot sys:check-struct
+syn keyword tl_keyword contained sys:circref sys:compat sys:compile-and-match sys:compile-as-match
+syn keyword tl_keyword contained sys:compile-atom-match sys:compile-cons-structure sys:compile-exprs-match sys:compile-file-conditionally
+syn keyword tl_keyword contained sys:compile-hash-match sys:compile-loop-match sys:compile-match sys:compile-new-var-match
+syn keyword tl_keyword contained sys:compile-not-match sys:compile-or-match sys:compile-predicate-match sys:compile-range-match
+syn keyword tl_keyword contained sys:compile-require-match sys:compile-struct-match sys:compile-var-match sys:compile-vec-match
+syn keyword tl_keyword contained sys:compile-with-match sys:compiler-emit-warnings sys:conv sys:conv-expand
+syn keyword tl_keyword contained sys:conv-let sys:ctx-form sys:ctx-name sys:dbg-all
+syn keyword tl_keyword contained sys:dbg-backtrace sys:dbg-clear sys:dbg-enable sys:dbg-restore
+syn keyword tl_keyword contained sys:dbg-set sys:dbg-step sys:debugger sys:dedup
+syn keyword tl_keyword contained sys:dedup-labels sys:deffi-cb-expander sys:define-method sys:defset-expander
+syn keyword tl_keyword contained sys:defset-expander-simple sys:dig sys:disassemble-cdf sys:dlib-expr
+syn keyword tl_keyword contained sys:do-conv sys:do-copy-obj sys:do-path-test sys:do-tweak-obj
+syn keyword tl_keyword contained sys:dump-to-tlo sys:dvbind sys:dwim-del sys:dwim-set
+syn keyword tl_keyword contained sys:dyn-size sys:each-op sys:enc-small-op sys:ensure-op-arg
+syn keyword tl_keyword contained sys:env-to-let sys:eq-comparable sys:eql-comparable sys:eval-err
+syn keyword tl_keyword contained sys:expand-and sys:expand-bind-mac-params sys:expand-defmacro sys:expand-defsymacro
+syn keyword tl_keyword contained sys:expand-defun sys:expand-defvarl sys:expand-dohash sys:expand-doloop
+syn keyword tl_keyword contained sys:expand-each sys:expand-each-prod sys:expand-each-prod* sys:expand-handle
+syn keyword tl_keyword contained sys:expand-lambda-match sys:expand-params sys:expand-quasi sys:expand-quasi-args
+syn keyword tl_keyword contained sys:expand-quasi-mods sys:expand-sym-ref sys:expr sys:extract-keys
+syn keyword tl_keyword contained sys:extract-keys-p sys:fbind sys:fixed-point sys:flatten-or
+syn keyword tl_keyword contained sys:fmt-flex sys:fmt-join sys:fmt-simple sys:for-op
+syn keyword tl_keyword contained sys:gc sys:gc-set-delta sys:get-buf-common sys:get-fun-getter-setter
+syn keyword tl_keyword contained sys:get-mb sys:get-parser sys:get-place-macro sys:get-var-list
+syn keyword tl_keyword contained sys:get-vars sys:get-vb sys:getopts-error sys:handle-bad-syntax
+syn keyword tl_keyword contained sys:hlet-expand sys:if-to-cond sys:in6addr-condensed-text sys:is-label
+syn keyword tl_keyword contained sys:l1-setq sys:l1-val sys:lambda-apply-transform sys:lambda-short-apply-list
+syn keyword tl_keyword contained sys:lambda-too-few-args sys:lambda-too-many-args sys:lbind sys:lisp1-setq
+syn keyword tl_keyword contained sys:lisp1-value sys:list-builder-flets sys:list-from-vm-desc sys:load-time-lit
+syn keyword tl_keyword contained sys:loc sys:mac-env-flatten sys:make-anon-package sys:make-copy-path-opts
+syn keyword tl_keyword contained sys:make-struct-lit sys:make-struct-type sys:mark-special sys:misleading-ref-check
+syn keyword tl_keyword contained sys:name-str sys:new-expander sys:new-type sys:non-triv-pat-p
+syn keyword tl_keyword contained sys:null-reg sys:obtain-impl sys:op-alpha-rename sys:op-ensure-rec
+syn keyword tl_keyword contained sys:op-expand sys:op-meta-p sys:op-rec-p sys:open-compile-streams
+syn keyword tl_keyword contained sys:operand-to-exp sys:operand-to-sym sys:opip-expand sys:opt-dash
+syn keyword tl_keyword contained sys:opt-err sys:parse-compound-operand sys:parse-lambda-match-clause sys:parse-operand
+syn keyword tl_keyword contained sys:parser-eof sys:parser-errors sys:path-access sys:path-examine
+syn keyword tl_keyword contained sys:path-test-mode sys:path-test-type sys:pl-expand sys:placelet-1
+syn keyword tl_keyword contained sys:print-backtrace sys:propagate-ancestor sys:propagate-perms sys:prune-missing-inits
+syn keyword tl_keyword contained sys:qquote sys:quasi sys:quasilist sys:r-s-let-expander
+syn keyword tl_keyword contained sys:reduce-constant sys:reduce-lisp sys:reduce-or sys:reg-expand-nongreedy
 syn keyword tl_keyword contained sys:reg-optimize sys:register-opcode sys:register-simple-accessor sys:repl
 syn keyword tl_keyword contained sys:rewrite sys:rewrite-case sys:rplaca sys:rplacd
 syn keyword tl_keyword contained sys:rslotset sys:rt-assert-fail sys:rt-defmacro sys:rt-defsymacro
@@ -557,83 +559,84 @@ syn keyword tl_keyword contained sys:rt-defun sys:rt-defvarl sys:rt-load-for sys
 syn keyword tl_keyword contained sys:set-hash-traversal-limit sys:set-macro-ancestor sys:setq sys:setqf
 syn keyword tl_keyword contained sys:simplify-or sys:slot-types sys:small-op-p sys:small-op-to-sym
 syn keyword tl_keyword contained sys:splice sys:static-slot-types sys:str-inaddr-net-impl sys:struct-lit
-syn keyword tl_keyword contained sys:subst sys:switch sys:sym-clobber-expander sys:sym-delete-expander
-syn keyword tl_keyword contained sys:sym-update-expander sys:system-symbol-p sys:top-fb sys:top-mb
-syn keyword tl_keyword contained sys:top-vb sys:tr* sys:trace sys:trace-canonicalize-name
-syn keyword tl_keyword contained sys:trace-enter sys:trace-leave sys:trace-redefine-check sys:tree-construct
-syn keyword tl_keyword contained sys:trfm sys:true-const-p sys:try-load sys:txr-case-impl
-syn keyword tl_keyword contained sys:unquote sys:untrace sys:upenv sys:uw-block
-syn keyword tl_keyword contained sys:uw-captured-block sys:uw-catch sys:uw-cont-copy sys:uw-eval
-syn keyword tl_keyword contained sys:uw-expand sys:uw-fcall sys:uw-guard sys:uw-handle
-syn keyword tl_keyword contained sys:uw-menv sys:var sys:var-pat-p sys:vars-check
-syn keyword tl_keyword contained sys:vm-closure-desc sys:vm-closure-entry sys:vm-desc-bytecode sys:vm-desc-datavec
-syn keyword tl_keyword contained sys:vm-desc-nlevels sys:vm-desc-nregs sys:vm-desc-symvec sys:vm-execute-toplevel
-syn keyword tl_keyword contained sys:vm-make-desc sys:wdwrap sys:when-exprs-match sys:with-dyn-lib-check
-syn keyword tl_keyword contained syslog system-package t tab0
-syn keyword tl_keyword contained tab1 tab2 tab3 tabdly
-syn keyword tl_keyword contained tagbody tailp take take-until
-syn keyword tl_keyword contained take-while tan tanh tb
-syn keyword tl_keyword contained tc tcdrain tcflow tcflush
-syn keyword tl_keyword contained tcgetattr tciflush tcioff tcioflush
-syn keyword tl_keyword contained tcion tcoflush tcooff tcoon
-syn keyword tl_keyword contained tcsadrain tcsaflush tcsanow tcsendbreak
-syn keyword tl_keyword contained tcsetattr tentative-def-exists tenth test-clear
-syn keyword tl_keyword contained test-clear-dirty test-dec test-dirty test-inc
-syn keyword tl_keyword contained test-neq-set-indent-mode test-set test-set-indent-mode tf
-syn keyword tl_keyword contained third throw throwf time
-syn keyword tl_keyword contained time-fields-local time-fields-utc time-nsec time-parse
-syn keyword tl_keyword contained time-parse-local time-parse-utc time-string-local time-string-utc
-syn keyword tl_keyword contained time-struct-local time-struct-utc time-t time-usec
-syn keyword tl_keyword contained tnode to tofloat tofloatz
-syn keyword tl_keyword contained toint tointz tok tok-str
-syn keyword tl_keyword contained tok-where tostop tostring tostringp
-syn keyword tl_keyword contained touch tprint trace transpose
-syn keyword tl_keyword contained tree tree-begin tree-bind tree-case
-syn keyword tl_keyword contained tree-clear tree-delete tree-delete-node tree-find
-syn keyword tl_keyword contained tree-insert tree-insert-node tree-lookup tree-lookup-node
-syn keyword tl_keyword contained tree-next tree-root treep trie-add
-syn keyword tl_keyword contained trie-compress trie-lookup-begin trie-lookup-feed-char trie-value-at
-syn keyword tl_keyword contained trim-left trim-right trim-str true
-syn keyword tl_keyword contained trunc trunc-rem truncate-stream tuples
-syn keyword tl_keyword contained txr-case txr-exe-path txr-if txr-parse
-syn keyword tl_keyword contained txr-path txr-version txr-when typecase
-syn keyword tl_keyword contained typedef typeof typep ubit
-syn keyword tl_keyword contained uchar uid-t uint uint-buf
-syn keyword tl_keyword contained uint-carray uint-ptr-t uint16 uint32
-syn keyword tl_keyword contained uint64 uint8 ulong ulonglong
-syn keyword tl_keyword contained umask umeth umethod uname
-syn keyword tl_keyword contained unget-byte unget-char uni unintern
-syn keyword tl_keyword contained union union-get union-in union-members
-syn keyword tl_keyword contained union-out union-put uniq unique
-syn keyword tl_keyword contained unless unquote unsetenv until
-syn keyword tl_keyword contained until* untrace unuse-package unuse-sym
-syn keyword tl_keyword contained unwind-protect upcase-str upd update
-syn keyword tl_keyword contained uref url-decode url-encode use
-syn keyword tl_keyword contained use-package use-sym user-package ushort
-syn keyword tl_keyword contained usl usleep uslot utimes
-syn keyword tl_keyword contained val vdiscard vec vec-carray
-syn keyword tl_keyword contained vec-list vec-push vec-seq vec-set-length
-syn keyword tl_keyword contained vecref vector vector-list vectorp
-syn keyword tl_keyword contained veof veol veol2 verase
-syn keyword tl_keyword contained vintr vkill vlnext vm-fun-p
-syn keyword tl_keyword contained vmin void vquit vreprint
-syn keyword tl_keyword contained vstart vstop vsusp vswtc
-syn keyword tl_keyword contained vt0 vt1 vtdly vtime
-syn keyword tl_keyword contained vwerase w-continued w-coredump w-exitstatus
-syn keyword tl_keyword contained w-ifcontinued w-ifexited w-ifsignaled w-ifstopped
-syn keyword tl_keyword contained w-nohang w-stopsig w-termsig w-untraced
-syn keyword tl_keyword contained wait wchar weave when
-syn keyword tl_keyword contained when-match whena whenlet where
-syn keyword tl_keyword contained while while* whilet width
-syn keyword tl_keyword contained width-check window-map window-mapdo window-mappend
-syn keyword tl_keyword contained wint-t with-clobber-expander with-compilation-unit with-delete-expander
-syn keyword tl_keyword contained with-dyn-lib with-gensyms with-hash-iter with-in-buf-stream
-syn keyword tl_keyword contained with-in-string-byte-stream with-in-string-stream with-objects with-out-buf-stream
-syn keyword tl_keyword contained with-out-string-stream with-out-strlist-stream with-resources with-slots
-syn keyword tl_keyword contained with-stream with-update-expander wrap wrap*
-syn keyword tl_keyword contained wstr wstr-d xcase yield
-syn keyword tl_keyword contained yield-from zap zarray zchar
-syn keyword tl_keyword contained zero-fill zerop zip znew
+syn keyword tl_keyword contained sys:subst sys:subst-preserve sys:switch sys:sym-clobber-expander
+syn keyword tl_keyword contained sys:sym-delete-expander sys:sym-update-expander sys:system-symbol-p sys:top-fb
+syn keyword tl_keyword contained sys:top-mb sys:top-vb sys:tr* sys:trace
+syn keyword tl_keyword contained sys:trace-canonicalize-name sys:trace-enter sys:trace-leave sys:trace-redefine-check
+syn keyword tl_keyword contained sys:tree-construct sys:trfm sys:true-const-p sys:try-load
+syn keyword tl_keyword contained sys:txr-case-impl sys:unquote sys:untrace sys:upenv
+syn keyword tl_keyword contained sys:uw-block sys:uw-captured-block sys:uw-catch sys:uw-cont-copy
+syn keyword tl_keyword contained sys:uw-eval sys:uw-expand sys:uw-fcall sys:uw-guard
+syn keyword tl_keyword contained sys:uw-handle sys:uw-menv sys:var sys:var-pat-p
+syn keyword tl_keyword contained sys:vars-check sys:vm-closure-desc sys:vm-closure-entry sys:vm-desc-bytecode
+syn keyword tl_keyword contained sys:vm-desc-datavec sys:vm-desc-nlevels sys:vm-desc-nregs sys:vm-desc-symvec
+syn keyword tl_keyword contained sys:vm-execute-toplevel sys:vm-make-desc sys:wdwrap sys:when-exprs-match
+syn keyword tl_keyword contained sys:with-dyn-lib-check syslog system-package t
+syn keyword tl_keyword contained tab0 tab1 tab2 tab3
+syn keyword tl_keyword contained tabdly tagbody tailp take
+syn keyword tl_keyword contained take-until take-while tan tanh
+syn keyword tl_keyword contained tb tc tcdrain tcflow
+syn keyword tl_keyword contained tcflush tcgetattr tciflush tcioff
+syn keyword tl_keyword contained tcioflush tcion tcoflush tcooff
+syn keyword tl_keyword contained tcoon tcsadrain tcsaflush tcsanow
+syn keyword tl_keyword contained tcsendbreak tcsetattr tentative-def-exists tenth
+syn keyword tl_keyword contained test-clear test-clear-dirty test-dec test-dirty
+syn keyword tl_keyword contained test-inc test-neq-set-indent-mode test-set test-set-indent-mode
+syn keyword tl_keyword contained tf third throw throwf
+syn keyword tl_keyword contained time time-fields-local time-fields-utc time-nsec
+syn keyword tl_keyword contained time-parse time-parse-local time-parse-utc time-string-local
+syn keyword tl_keyword contained time-string-utc time-struct-local time-struct-utc time-t
+syn keyword tl_keyword contained time-usec tnode to tofloat
+syn keyword tl_keyword contained tofloatz toint tointz tok
+syn keyword tl_keyword contained tok-str tok-where tostop tostring
+syn keyword tl_keyword contained tostringp touch tprint trace
+syn keyword tl_keyword contained transpose tree tree-begin tree-bind
+syn keyword tl_keyword contained tree-case tree-clear tree-delete tree-delete-node
+syn keyword tl_keyword contained tree-find tree-insert tree-insert-node tree-lookup
+syn keyword tl_keyword contained tree-lookup-node tree-next tree-root treep
+syn keyword tl_keyword contained trie-add trie-compress trie-lookup-begin trie-lookup-feed-char
+syn keyword tl_keyword contained trie-value-at trim-left trim-right trim-str
+syn keyword tl_keyword contained true trunc trunc-rem truncate-stream
+syn keyword tl_keyword contained tuples txr-case txr-exe-path txr-if
+syn keyword tl_keyword contained txr-parse txr-path txr-version txr-when
+syn keyword tl_keyword contained typecase typedef typeof typep
+syn keyword tl_keyword contained ubit uchar uid-t uint
+syn keyword tl_keyword contained uint-buf uint-carray uint-ptr-t uint16
+syn keyword tl_keyword contained uint32 uint64 uint8 ulong
+syn keyword tl_keyword contained ulonglong umask umeth umethod
+syn keyword tl_keyword contained uname unget-byte unget-char uni
+syn keyword tl_keyword contained unintern union union-get union-in
+syn keyword tl_keyword contained union-members union-out union-put uniq
+syn keyword tl_keyword contained unique unless unquote unsetenv
+syn keyword tl_keyword contained until until* untrace unuse-package
+syn keyword tl_keyword contained unuse-sym unwind-protect upcase-str upd
+syn keyword tl_keyword contained update uref url-decode url-encode
+syn keyword tl_keyword contained use use-package use-sym user-package
+syn keyword tl_keyword contained ushort usl usleep uslot
+syn keyword tl_keyword contained utimes val vdiscard vec
+syn keyword tl_keyword contained vec-carray vec-list vec-push vec-seq
+syn keyword tl_keyword contained vec-set-length vecref vector vector-list
+syn keyword tl_keyword contained vectorp veof veol veol2
+syn keyword tl_keyword contained verase vintr vkill vlnext
+syn keyword tl_keyword contained vm-fun-p vmin void vquit
+syn keyword tl_keyword contained vreprint vstart vstop vsusp
+syn keyword tl_keyword contained vswtc vt0 vt1 vtdly
+syn keyword tl_keyword contained vtime vwerase w-continued w-coredump
+syn keyword tl_keyword contained w-exitstatus w-ifcontinued w-ifexited w-ifsignaled
+syn keyword tl_keyword contained w-ifstopped w-nohang w-stopsig w-termsig
+syn keyword tl_keyword contained w-untraced wait wchar weave
+syn keyword tl_keyword contained when when-match whena whenlet
+syn keyword tl_keyword contained where while while* whilet
+syn keyword tl_keyword contained width width-check window-map window-mapdo
+syn keyword tl_keyword contained window-mappend wint-t with-clobber-expander with-compilation-unit
+syn keyword tl_keyword contained with-delete-expander with-dyn-lib with-gensyms with-hash-iter
+syn keyword tl_keyword contained with-in-buf-stream with-in-string-byte-stream with-in-string-stream with-objects
+syn keyword tl_keyword contained with-out-buf-stream with-out-string-stream with-out-strlist-stream with-resources
+syn keyword tl_keyword contained with-slots with-stream with-update-expander wrap
+syn keyword tl_keyword contained wrap* wstr wstr-d xcase
+syn keyword tl_keyword contained yield yield-from zap zarray
+syn keyword tl_keyword contained zchar zero-fill zerop zip
+syn keyword tl_keyword contained znew
 syn match txr_nested_error "[^\t ]\+" contained
 syn match txr_variable "\(@[ \t]*\)[*]\?[ \t]*[A-Za-z_][A-Za-z_0-9]*"
 syn match txr_splicevar "@[ \t,*@]*[A-Za-z_][A-Za-z_0-9]*" contained
@@ -750,5 +753,5 @@ hi def link txr_ign_bkt Comment
 
 let b:current_syntax = "lisp"
 
-set lispwords=ado,alet,align,alignof,ap,append-each,append-each*,append-each-prod,append-each-prod*,aret,array,arraysize,assert,awk,bit,block,block*,bool,buf,buf-d,build,buildn,carray,caseq,caseq*,caseql,caseql*,casequal,casequal*,catch,catch*,catch**,collect-each,collect-each*,collect-each-prod,collect-each-prod*,compare-swap,compile-only,cond,conda,condlet,cptr,dec,defex,deffi,deffi-cb,deffi-cb-unsafe,deffi-sym,deffi-type,deffi-var,define-accessor,define-modify-macro,define-option-struct,define-param-expander,define-place-macro,defmacro,defmeth,defpackage,defparm,defparml,defplace,defset,defstruct,defsymacro,defun,defun-match,defvar,defvarl,del,delay,do,dohash,doloop,doloop*,dotimes,each,each*,each-prod,each-prod*,elemsize,elemtype,enum,enumed,equot,eval-only,ffi,flet,flip,for,for*,fun,gen,go,gun,handle,handle*,handler-bind,hlet,hlet*,ido,if,if-match,ifa,iflet,ignerr,ignwarn,in-package,ip,labels,lambda,lambda-match,lcons,ldo,let,let*,lnew*,load-for,load-time,lop,lset,mac-param-bind,macro-time,macrolet,match-case,mlet,new*,obtain,obtain*,obtain*-block,obtain-block,offsetof,op,pdec,pinc,placelet,placelet*,pop,pprof,prof,prog,prog*,prog1,prog2,progn,ptr,ptr-in,ptr-in-d,ptr-out,ptr-out-d,ptr-out-s,push,pushnew,ret,return,return-from,rlet,rslot,sbit,sizeof,slet,splice,struct,suspend,symacrolet,sys:abscond-from,sys:awk-fun-let,sys:awk-mac-let,sys:awk-redir,sys:catch,sys:conv,sys:dlib-expr,sys:dvbind,sys:each-op,sys:expr,sys:fbind,sys:for-op,sys:l1-val,sys:lbind,sys:lisp1-value,sys:load-time-lit,sys:path-examine,sys:placelet-1,sys:rewrite-case,sys:splice,sys:struct-lit,sys:switch,sys:txr-case-impl,sys:unquote,sys:upenv,sys:var,sys:when-exprs-match,tagbody,tb,tc,test-clear,test-dec,test-inc,test-set,trace,tree-bind,tree-case,txr-case,txr-if,txr-when,typecase,typedef,ubit,union,unless,unquote,until,until*,untrace,unwind-protect,upd,uref,when,when-match,whena,whenlet,while,while*,whilet,with-clobber-expander,with-compilation-unit,with-delete-expander,with-dyn-lib,with-gensyms,with-hash-iter,with-in-buf-stream,with-in-string-byte-stream,with-in-string-stream,with-objects,with-out-buf-stream,with-out-string-stream,with-out-strlist-stream,with-resources,with-slots,with-stream,with-update-expander,yield,yield-from,zap,zarray,znew,:method,:function,:init,:postinit,:fini
+set lispwords=ado,alet,align,alignof,ap,append-each,append-each*,append-each-prod,append-each-prod*,aret,array,arraysize,assert,awk,bit,block,block*,bool,buf,buf-d,build,buildn,carray,caseq,caseq*,caseql,caseql*,casequal,casequal*,catch,catch*,catch**,collect-each,collect-each*,collect-each-prod,collect-each-prod*,compare-swap,compile-only,cond,conda,condlet,cptr,dec,defex,deffi,deffi-cb,deffi-cb-unsafe,deffi-sym,deffi-type,deffi-var,define-accessor,define-modify-macro,define-option-struct,define-param-expander,define-place-macro,defmacro,defmeth,defpackage,defparm,defparml,defplace,defset,defstruct,defsymacro,defun,defun-match,defvar,defvarl,del,delay,do,dohash,doloop,doloop*,dotimes,each,each*,each-prod,each-prod*,elemsize,elemtype,enum,enumed,equot,eval-only,ffi,flet,flip,for,for*,fun,gen,go,gun,handle,handle*,handler-bind,hlet,hlet*,ido,if,if-match,ifa,iflet,ignerr,ignwarn,in-package,ip,labels,lambda,lambda-match,lcons,ldo,let,let*,lnew*,load-for,load-time,lop,lset,mac-param-bind,macro-time,macrolet,match-case,mlet,new*,obtain,obtain*,obtain*-block,obtain-block,offsetof,op,pdec,pinc,placelet,placelet*,pop,pprof,prof,prog,prog*,prog1,prog2,progn,ptr,ptr-in,ptr-in-d,ptr-out,ptr-out-d,ptr-out-s,push,pushnew,ret,return,return-from,rlet,rslot,sbit,sizeof,slet,splice,struct,suspend,symacrolet,sys:abscond-from,sys:awk-fun-let,sys:awk-mac-let,sys:awk-redir,sys:blk,sys:catch,sys:conv,sys:dlib-expr,sys:dvbind,sys:each-op,sys:expr,sys:fbind,sys:fixed-point,sys:for-op,sys:l1-val,sys:lbind,sys:lisp1-value,sys:load-time-lit,sys:path-examine,sys:placelet-1,sys:rewrite-case,sys:splice,sys:struct-lit,sys:switch,sys:txr-case-impl,sys:unquote,sys:upenv,sys:var,sys:when-exprs-match,tagbody,tb,tc,test-clear,test-dec,test-inc,test-set,trace,tree-bind,tree-case,txr-case,txr-if,txr-when,typecase,typedef,ubit,union,unless,unquote,until,until*,untrace,unwind-protect,upd,uref,when,when-match,whena,whenlet,while,while*,whilet,with-clobber-expander,with-compilation-unit,with-delete-expander,with-dyn-lib,with-gensyms,with-hash-iter,with-in-buf-stream,with-in-string-byte-stream,with-in-string-stream,with-objects,with-out-buf-stream,with-out-string-stream,with-out-strlist-stream,with-resources,with-slots,with-stream,with-update-expander,yield,yield-from,zap,zarray,znew,:method,:function,:init,:postinit,:fini
 set comments=:\;\;\;,:\;\;,:\;
diff --git a/txr.1 b/txr.1
index f1703917..2158945a 100644
--- a/txr.1
+++ b/txr.1
@@ -368,9 +368,9 @@
 .ds TX \f[B]TXR\f[]
 .ds TL \f[B]TXR Lisp\f[]
 .\" Start of man page:
-.TH TXR 1 2021-02-08 "Utility Commands" "TXR Programming Language" "Kaz Kylheku"
+.TH TXR 1 2021-02-28 "Utility Commands" "TXR Programming Language" "Kaz Kylheku"
 .SH* NAME
-\*(TX \- Programming Language (Version 251)
+\*(TX \- Programming Language (Version 252)
 
 .SH* SYNOPSIS
 .mono
diff --git a/txr.vim b/txr.vim
index b555fbde..908ecf5b 100644
--- a/txr.vim
+++ b/txr.vim
@@ -490,66 +490,68 @@ syn keyword tl_keyword contained swap symacrolet symbol-function symbol-macro
 syn keyword tl_keyword contained symbol-name symbol-package symbol-value symbolp
 syn keyword tl_keyword contained symdiff symlink sys:%backpatch-high16% sys:%backpatch-low16%
 syn keyword tl_keyword contained sys:%big-endian% sys:%bin-op% sys:%bin-ops% sys:%block-using-funs%
-syn keyword tl_keyword contained sys:%call-op% sys:%dbg-command-env% sys:%file-suff-rx% sys:%gcall-op%
-syn keyword tl_keyword contained sys:%lev-bits% sys:%lev-size% sys:%max-lambda-fixed-args% sys:%max-lev%
-syn keyword tl_keyword contained sys:%max-lev-idx% sys:%max-sm-lev% sys:%max-sm-lev-idx% sys:%max-v-lev%
-syn keyword tl_keyword contained sys:%nary-ops% sys:%oc-code% sys:%oc-hash% sys:%oc-list-builder%
-syn keyword tl_keyword contained sys:%package-manip% sys:%quip-rand-state% sys:%quips% sys:%shuffled-quips%
-syn keyword tl_keyword contained sys:%sm-lev-bits% sys:%sm-lev-size% sys:%test-funs% sys:%test-funs-neg%
-syn keyword tl_keyword contained sys:%test-funs-ops% sys:%test-funs-pos% sys:%test-inv% sys:%test-opcode%
-syn keyword tl_keyword contained sys:%tlo-ver% sys:*dedup* sys:*emit* sys:*eval*
-syn keyword tl_keyword contained sys:*load-recursive* sys:*load-time* sys:*match-form* sys:*op-ctx*
-syn keyword tl_keyword contained sys:*pl-env* sys:*pl-form* sys:*trace-hash* sys:*trace-level*
-syn keyword tl_keyword contained sys:abscond* sys:abscond-from sys:analyze-argtypes sys:analyze-params
-syn keyword tl_keyword contained sys:apply sys:asm-error sys:assumed-fun sys:awk%--rng
-syn keyword tl_keyword contained sys:awk%--rng+ sys:awk%--rng- sys:awk%-rng+ sys:awk%rng+
-syn keyword tl_keyword contained sys:awk-code-move-check sys:awk-error sys:awk-expander sys:awk-fun-let
-syn keyword tl_keyword contained sys:awk-fun-shadowing-env sys:awk-mac-let sys:awk-redir sys:awk-test
-syn keyword tl_keyword contained sys:b* sys:b+ sys:b- sys:b/
-syn keyword tl_keyword contained sys:b< sys:b<= sys:b= sys:b=>
-syn keyword tl_keyword contained sys:b> sys:bad-slot-syntax sys:bind-mac-check sys:bind-mac-error
-syn keyword tl_keyword contained sys:bindable-check sys:bits sys:bits-to-obj sys:build-expander
-syn keyword tl_keyword contained sys:build-key-list-expr sys:capture-cont sys:catch sys:check-slot
-syn keyword tl_keyword contained sys:check-struct sys:circref sys:compat sys:compile-and-match
-syn keyword tl_keyword contained sys:compile-as-match sys:compile-atom-match sys:compile-cons-structure sys:compile-exprs-match
-syn keyword tl_keyword contained sys:compile-file-conditionally sys:compile-hash-match sys:compile-loop-match sys:compile-match
-syn keyword tl_keyword contained sys:compile-new-var-match sys:compile-not-match sys:compile-or-match sys:compile-predicate-match
-syn keyword tl_keyword contained sys:compile-range-match sys:compile-require-match sys:compile-struct-match sys:compile-var-match
-syn keyword tl_keyword contained sys:compile-vec-match sys:compile-with-match sys:compiler-emit-warnings sys:conv
-syn keyword tl_keyword contained sys:conv-expand sys:conv-let sys:ctx-form sys:ctx-name
-syn keyword tl_keyword contained sys:dbg-all sys:dbg-backtrace sys:dbg-clear sys:dbg-enable
-syn keyword tl_keyword contained sys:dbg-restore sys:dbg-set sys:dbg-step sys:debugger
-syn keyword tl_keyword contained sys:dedup sys:dedup-labels sys:deffi-cb-expander sys:define-method
-syn keyword tl_keyword contained sys:defset-expander sys:defset-expander-simple sys:dig sys:disassemble-cdf
-syn keyword tl_keyword contained sys:dlib-expr sys:do-conv sys:do-copy-obj sys:do-path-test
-syn keyword tl_keyword contained sys:do-tweak-obj sys:dump-to-tlo sys:dvbind sys:dwim-del
-syn keyword tl_keyword contained sys:dwim-set sys:dyn-size sys:each-op sys:enc-small-op
-syn keyword tl_keyword contained sys:ensure-op-arg sys:env-to-let sys:eval-err sys:expand-and
-syn keyword tl_keyword contained sys:expand-bind-mac-params sys:expand-defmacro sys:expand-defsymacro sys:expand-defun
-syn keyword tl_keyword contained sys:expand-defvarl sys:expand-dohash sys:expand-doloop sys:expand-each
-syn keyword tl_keyword contained sys:expand-each-prod sys:expand-each-prod* sys:expand-handle sys:expand-lambda-match
-syn keyword tl_keyword contained sys:expand-params sys:expand-quasi sys:expand-quasi-args sys:expand-quasi-mods
-syn keyword tl_keyword contained sys:expand-sym-ref sys:expr sys:extract-keys sys:extract-keys-p
-syn keyword tl_keyword contained sys:fbind sys:flatten-or sys:fmt-flex sys:fmt-join
-syn keyword tl_keyword contained sys:fmt-simple sys:for-op sys:gc sys:gc-set-delta
-syn keyword tl_keyword contained sys:get-buf-common sys:get-fun-getter-setter sys:get-mb sys:get-parser
-syn keyword tl_keyword contained sys:get-place-macro sys:get-var-list sys:get-vars sys:get-vb
-syn keyword tl_keyword contained sys:getopts-error sys:handle-bad-syntax sys:hlet-expand sys:if-to-cond
-syn keyword tl_keyword contained sys:in6addr-condensed-text sys:is-label sys:l1-setq sys:l1-val
-syn keyword tl_keyword contained sys:lambda-apply-transform sys:lambda-short-apply-list sys:lambda-too-few-args sys:lambda-too-many-args
-syn keyword tl_keyword contained sys:lbind sys:lisp1-setq sys:lisp1-value sys:list-builder-flets
-syn keyword tl_keyword contained sys:list-from-vm-desc sys:load-time-lit sys:loc sys:mac-env-flatten
-syn keyword tl_keyword contained sys:make-anon-package sys:make-copy-path-opts sys:make-struct-lit sys:make-struct-type
-syn keyword tl_keyword contained sys:mark-special sys:misleading-ref-check sys:name-str sys:new-expander
-syn keyword tl_keyword contained sys:new-type sys:non-triv-pat-p sys:null-reg sys:obtain-impl
-syn keyword tl_keyword contained sys:op-alpha-rename sys:op-ensure-rec sys:op-expand sys:op-meta-p
-syn keyword tl_keyword contained sys:op-rec-p sys:open-compile-streams sys:operand-to-exp sys:operand-to-sym
-syn keyword tl_keyword contained sys:opip-expand sys:opt-dash sys:opt-err sys:parse-compound-operand
-syn keyword tl_keyword contained sys:parse-lambda-match-clause sys:parse-operand sys:parser-eof sys:parser-errors
-syn keyword tl_keyword contained sys:path-access sys:path-examine sys:path-test-mode sys:path-test-type
-syn keyword tl_keyword contained sys:pl-expand sys:placelet-1 sys:print-backtrace sys:propagate-ancestor
-syn keyword tl_keyword contained sys:propagate-perms sys:prune-missing-inits sys:qquote sys:quasi
-syn keyword tl_keyword contained sys:quasilist sys:r-s-let-expander sys:reduce-or sys:reg-expand-nongreedy
+syn keyword tl_keyword contained sys:%call-op% sys:%const-foldable% sys:%const-foldable-funs% sys:%dbg-command-env%
+syn keyword tl_keyword contained sys:%file-suff-rx% sys:%gcall-op% sys:%lev-bits% sys:%lev-size%
+syn keyword tl_keyword contained sys:%max-lambda-fixed-args% sys:%max-lev% sys:%max-lev-idx% sys:%max-sm-lev%
+syn keyword tl_keyword contained sys:%max-sm-lev-idx% sys:%max-v-lev% sys:%nary-ops% sys:%oc-code%
+syn keyword tl_keyword contained sys:%oc-hash% sys:%oc-list-builder% sys:%package-manip% sys:%quip-rand-state%
+syn keyword tl_keyword contained sys:%quips% sys:%shuffled-quips% sys:%sm-lev-bits% sys:%sm-lev-size%
+syn keyword tl_keyword contained sys:%test-funs% sys:%test-funs-neg% sys:%test-funs-ops% sys:%test-funs-pos%
+syn keyword tl_keyword contained sys:%test-inv% sys:%test-opcode% sys:%tlo-ver% sys:*dedup*
+syn keyword tl_keyword contained sys:*emit* sys:*eval* sys:*load-recursive* sys:*load-time*
+syn keyword tl_keyword contained sys:*match-form* sys:*op-ctx* sys:*pl-env* sys:*pl-form*
+syn keyword tl_keyword contained sys:*trace-hash* sys:*trace-level* sys:abscond* sys:abscond-from
+syn keyword tl_keyword contained sys:analyze-argtypes sys:analyze-params sys:apply sys:asm-error
+syn keyword tl_keyword contained sys:assumed-fun sys:awk%--rng sys:awk%--rng+ sys:awk%--rng-
+syn keyword tl_keyword contained sys:awk%-rng+ sys:awk%rng+ sys:awk-code-move-check sys:awk-error
+syn keyword tl_keyword contained sys:awk-expander sys:awk-fun-let sys:awk-fun-shadowing-env sys:awk-mac-let
+syn keyword tl_keyword contained sys:awk-redir sys:awk-test sys:b* sys:b+
+syn keyword tl_keyword contained sys:b- sys:b/ sys:b< sys:b<=
+syn keyword tl_keyword contained sys:b= sys:b=> sys:b> sys:bad-slot-syntax
+syn keyword tl_keyword contained sys:bind-mac-check sys:bind-mac-error sys:bindable-check sys:bits
+syn keyword tl_keyword contained sys:bits-to-obj sys:blk sys:build-expander sys:build-key-list-expr
+syn keyword tl_keyword contained sys:capture-cont sys:catch sys:check-slot sys:check-struct
+syn keyword tl_keyword contained sys:circref sys:compat sys:compile-and-match sys:compile-as-match
+syn keyword tl_keyword contained sys:compile-atom-match sys:compile-cons-structure sys:compile-exprs-match sys:compile-file-conditionally
+syn keyword tl_keyword contained sys:compile-hash-match sys:compile-loop-match sys:compile-match sys:compile-new-var-match
+syn keyword tl_keyword contained sys:compile-not-match sys:compile-or-match sys:compile-predicate-match sys:compile-range-match
+syn keyword tl_keyword contained sys:compile-require-match sys:compile-struct-match sys:compile-var-match sys:compile-vec-match
+syn keyword tl_keyword contained sys:compile-with-match sys:compiler-emit-warnings sys:conv sys:conv-expand
+syn keyword tl_keyword contained sys:conv-let sys:ctx-form sys:ctx-name sys:dbg-all
+syn keyword tl_keyword contained sys:dbg-backtrace sys:dbg-clear sys:dbg-enable sys:dbg-restore
+syn keyword tl_keyword contained sys:dbg-set sys:dbg-step sys:debugger sys:dedup
+syn keyword tl_keyword contained sys:dedup-labels sys:deffi-cb-expander sys:define-method sys:defset-expander
+syn keyword tl_keyword contained sys:defset-expander-simple sys:dig sys:disassemble-cdf sys:dlib-expr
+syn keyword tl_keyword contained sys:do-conv sys:do-copy-obj sys:do-path-test sys:do-tweak-obj
+syn keyword tl_keyword contained sys:dump-to-tlo sys:dvbind sys:dwim-del sys:dwim-set
+syn keyword tl_keyword contained sys:dyn-size sys:each-op sys:enc-small-op sys:ensure-op-arg
+syn keyword tl_keyword contained sys:env-to-let sys:eq-comparable sys:eql-comparable sys:eval-err
+syn keyword tl_keyword contained sys:expand-and sys:expand-bind-mac-params sys:expand-defmacro sys:expand-defsymacro
+syn keyword tl_keyword contained sys:expand-defun sys:expand-defvarl sys:expand-dohash sys:expand-doloop
+syn keyword tl_keyword contained sys:expand-each sys:expand-each-prod sys:expand-each-prod* sys:expand-handle
+syn keyword tl_keyword contained sys:expand-lambda-match sys:expand-params sys:expand-quasi sys:expand-quasi-args
+syn keyword tl_keyword contained sys:expand-quasi-mods sys:expand-sym-ref sys:expr sys:extract-keys
+syn keyword tl_keyword contained sys:extract-keys-p sys:fbind sys:fixed-point sys:flatten-or
+syn keyword tl_keyword contained sys:fmt-flex sys:fmt-join sys:fmt-simple sys:for-op
+syn keyword tl_keyword contained sys:gc sys:gc-set-delta sys:get-buf-common sys:get-fun-getter-setter
+syn keyword tl_keyword contained sys:get-mb sys:get-parser sys:get-place-macro sys:get-var-list
+syn keyword tl_keyword contained sys:get-vars sys:get-vb sys:getopts-error sys:handle-bad-syntax
+syn keyword tl_keyword contained sys:hlet-expand sys:if-to-cond sys:in6addr-condensed-text sys:is-label
+syn keyword tl_keyword contained sys:l1-setq sys:l1-val sys:lambda-apply-transform sys:lambda-short-apply-list
+syn keyword tl_keyword contained sys:lambda-too-few-args sys:lambda-too-many-args sys:lbind sys:lisp1-setq
+syn keyword tl_keyword contained sys:lisp1-value sys:list-builder-flets sys:list-from-vm-desc sys:load-time-lit
+syn keyword tl_keyword contained sys:loc sys:mac-env-flatten sys:make-anon-package sys:make-copy-path-opts
+syn keyword tl_keyword contained sys:make-struct-lit sys:make-struct-type sys:mark-special sys:misleading-ref-check
+syn keyword tl_keyword contained sys:name-str sys:new-expander sys:new-type sys:non-triv-pat-p
+syn keyword tl_keyword contained sys:null-reg sys:obtain-impl sys:op-alpha-rename sys:op-ensure-rec
+syn keyword tl_keyword contained sys:op-expand sys:op-meta-p sys:op-rec-p sys:open-compile-streams
+syn keyword tl_keyword contained sys:operand-to-exp sys:operand-to-sym sys:opip-expand sys:opt-dash
+syn keyword tl_keyword contained sys:opt-err sys:parse-compound-operand sys:parse-lambda-match-clause sys:parse-operand
+syn keyword tl_keyword contained sys:parser-eof sys:parser-errors sys:path-access sys:path-examine
+syn keyword tl_keyword contained sys:path-test-mode sys:path-test-type sys:pl-expand sys:placelet-1
+syn keyword tl_keyword contained sys:print-backtrace sys:propagate-ancestor sys:propagate-perms sys:prune-missing-inits
+syn keyword tl_keyword contained sys:qquote sys:quasi sys:quasilist sys:r-s-let-expander
+syn keyword tl_keyword contained sys:reduce-constant sys:reduce-lisp sys:reduce-or sys:reg-expand-nongreedy
 syn keyword tl_keyword contained sys:reg-optimize sys:register-opcode sys:register-simple-accessor sys:repl
 syn keyword tl_keyword contained sys:rewrite sys:rewrite-case sys:rplaca sys:rplacd
 syn keyword tl_keyword contained sys:rslotset sys:rt-assert-fail sys:rt-defmacro sys:rt-defsymacro
@@ -557,83 +559,84 @@ syn keyword tl_keyword contained sys:rt-defun sys:rt-defvarl sys:rt-load-for sys
 syn keyword tl_keyword contained sys:set-hash-traversal-limit sys:set-macro-ancestor sys:setq sys:setqf
 syn keyword tl_keyword contained sys:simplify-or sys:slot-types sys:small-op-p sys:small-op-to-sym
 syn keyword tl_keyword contained sys:splice sys:static-slot-types sys:str-inaddr-net-impl sys:struct-lit
-syn keyword tl_keyword contained sys:subst sys:switch sys:sym-clobber-expander sys:sym-delete-expander
-syn keyword tl_keyword contained sys:sym-update-expander sys:system-symbol-p sys:top-fb sys:top-mb
-syn keyword tl_keyword contained sys:top-vb sys:tr* sys:trace sys:trace-canonicalize-name
-syn keyword tl_keyword contained sys:trace-enter sys:trace-leave sys:trace-redefine-check sys:tree-construct
-syn keyword tl_keyword contained sys:trfm sys:true-const-p sys:try-load sys:txr-case-impl
-syn keyword tl_keyword contained sys:unquote sys:untrace sys:upenv sys:uw-block
-syn keyword tl_keyword contained sys:uw-captured-block sys:uw-catch sys:uw-cont-copy sys:uw-eval
-syn keyword tl_keyword contained sys:uw-expand sys:uw-fcall sys:uw-guard sys:uw-handle
-syn keyword tl_keyword contained sys:uw-menv sys:var sys:var-pat-p sys:vars-check
-syn keyword tl_keyword contained sys:vm-closure-desc sys:vm-closure-entry sys:vm-desc-bytecode sys:vm-desc-datavec
-syn keyword tl_keyword contained sys:vm-desc-nlevels sys:vm-desc-nregs sys:vm-desc-symvec sys:vm-execute-toplevel
-syn keyword tl_keyword contained sys:vm-make-desc sys:wdwrap sys:when-exprs-match sys:with-dyn-lib-check
-syn keyword tl_keyword contained syslog system-package t tab0
-syn keyword tl_keyword contained tab1 tab2 tab3 tabdly
-syn keyword tl_keyword contained tagbody tailp take take-until
-syn keyword tl_keyword contained take-while tan tanh tb
-syn keyword tl_keyword contained tc tcdrain tcflow tcflush
-syn keyword tl_keyword contained tcgetattr tciflush tcioff tcioflush
-syn keyword tl_keyword contained tcion tcoflush tcooff tcoon
-syn keyword tl_keyword contained tcsadrain tcsaflush tcsanow tcsendbreak
-syn keyword tl_keyword contained tcsetattr tentative-def-exists tenth test-clear
-syn keyword tl_keyword contained test-clear-dirty test-dec test-dirty test-inc
-syn keyword tl_keyword contained test-neq-set-indent-mode test-set test-set-indent-mode tf
-syn keyword tl_keyword contained third throw throwf time
-syn keyword tl_keyword contained time-fields-local time-fields-utc time-nsec time-parse
-syn keyword tl_keyword contained time-parse-local time-parse-utc time-string-local time-string-utc
-syn keyword tl_keyword contained time-struct-local time-struct-utc time-t time-usec
-syn keyword tl_keyword contained tnode to tofloat tofloatz
-syn keyword tl_keyword contained toint tointz tok tok-str
-syn keyword tl_keyword contained tok-where tostop tostring tostringp
-syn keyword tl_keyword contained touch tprint trace transpose
-syn keyword tl_keyword contained tree tree-begin tree-bind tree-case
-syn keyword tl_keyword contained tree-clear tree-delete tree-delete-node tree-find
-syn keyword tl_keyword contained tree-insert tree-insert-node tree-lookup tree-lookup-node
-syn keyword tl_keyword contained tree-next tree-root treep trie-add
-syn keyword tl_keyword contained trie-compress trie-lookup-begin trie-lookup-feed-char trie-value-at
-syn keyword tl_keyword contained trim-left trim-right trim-str true
-syn keyword tl_keyword contained trunc trunc-rem truncate-stream tuples
-syn keyword tl_keyword contained txr-case txr-exe-path txr-if txr-parse
-syn keyword tl_keyword contained txr-path txr-version txr-when typecase
-syn keyword tl_keyword contained typedef typeof typep ubit
-syn keyword tl_keyword contained uchar uid-t uint uint-buf
-syn keyword tl_keyword contained uint-carray uint-ptr-t uint16 uint32
-syn keyword tl_keyword contained uint64 uint8 ulong ulonglong
-syn keyword tl_keyword contained umask umeth umethod uname
-syn keyword tl_keyword contained unget-byte unget-char uni unintern
-syn keyword tl_keyword contained union union-get union-in union-members
-syn keyword tl_keyword contained union-out union-put uniq unique
-syn keyword tl_keyword contained unless unquote unsetenv until
-syn keyword tl_keyword contained until* untrace unuse-package unuse-sym
-syn keyword tl_keyword contained unwind-protect upcase-str upd update
-syn keyword tl_keyword contained uref url-decode url-encode use
-syn keyword tl_keyword contained use-package use-sym user-package ushort
-syn keyword tl_keyword contained usl usleep uslot utimes
-syn keyword tl_keyword contained val vdiscard vec vec-carray
-syn keyword tl_keyword contained vec-list vec-push vec-seq vec-set-length
-syn keyword tl_keyword contained vecref vector vector-list vectorp
-syn keyword tl_keyword contained veof veol veol2 verase
-syn keyword tl_keyword contained vintr vkill vlnext vm-fun-p
-syn keyword tl_keyword contained vmin void vquit vreprint
-syn keyword tl_keyword contained vstart vstop vsusp vswtc
-syn keyword tl_keyword contained vt0 vt1 vtdly vtime
-syn keyword tl_keyword contained vwerase w-continued w-coredump w-exitstatus
-syn keyword tl_keyword contained w-ifcontinued w-ifexited w-ifsignaled w-ifstopped
-syn keyword tl_keyword contained w-nohang w-stopsig w-termsig w-untraced
-syn keyword tl_keyword contained wait wchar weave when
-syn keyword tl_keyword contained when-match whena whenlet where
-syn keyword tl_keyword contained while while* whilet width
-syn keyword tl_keyword contained width-check window-map window-mapdo window-mappend
-syn keyword tl_keyword contained wint-t with-clobber-expander with-compilation-unit with-delete-expander
-syn keyword tl_keyword contained with-dyn-lib with-gensyms with-hash-iter with-in-buf-stream
-syn keyword tl_keyword contained with-in-string-byte-stream with-in-string-stream with-objects with-out-buf-stream
-syn keyword tl_keyword contained with-out-string-stream with-out-strlist-stream with-resources with-slots
-syn keyword tl_keyword contained with-stream with-update-expander wrap wrap*
-syn keyword tl_keyword contained wstr wstr-d xcase yield
-syn keyword tl_keyword contained yield-from zap zarray zchar
-syn keyword tl_keyword contained zero-fill zerop zip znew
+syn keyword tl_keyword contained sys:subst sys:subst-preserve sys:switch sys:sym-clobber-expander
+syn keyword tl_keyword contained sys:sym-delete-expander sys:sym-update-expander sys:system-symbol-p sys:top-fb
+syn keyword tl_keyword contained sys:top-mb sys:top-vb sys:tr* sys:trace
+syn keyword tl_keyword contained sys:trace-canonicalize-name sys:trace-enter sys:trace-leave sys:trace-redefine-check
+syn keyword tl_keyword contained sys:tree-construct sys:trfm sys:true-const-p sys:try-load
+syn keyword tl_keyword contained sys:txr-case-impl sys:unquote sys:untrace sys:upenv
+syn keyword tl_keyword contained sys:uw-block sys:uw-captured-block sys:uw-catch sys:uw-cont-copy
+syn keyword tl_keyword contained sys:uw-eval sys:uw-expand sys:uw-fcall sys:uw-guard
+syn keyword tl_keyword contained sys:uw-handle sys:uw-menv sys:var sys:var-pat-p
+syn keyword tl_keyword contained sys:vars-check sys:vm-closure-desc sys:vm-closure-entry sys:vm-desc-bytecode
+syn keyword tl_keyword contained sys:vm-desc-datavec sys:vm-desc-nlevels sys:vm-desc-nregs sys:vm-desc-symvec
+syn keyword tl_keyword contained sys:vm-execute-toplevel sys:vm-make-desc sys:wdwrap sys:when-exprs-match
+syn keyword tl_keyword contained sys:with-dyn-lib-check syslog system-package t
+syn keyword tl_keyword contained tab0 tab1 tab2 tab3
+syn keyword tl_keyword contained tabdly tagbody tailp take
+syn keyword tl_keyword contained take-until take-while tan tanh
+syn keyword tl_keyword contained tb tc tcdrain tcflow
+syn keyword tl_keyword contained tcflush tcgetattr tciflush tcioff
+syn keyword tl_keyword contained tcioflush tcion tcoflush tcooff
+syn keyword tl_keyword contained tcoon tcsadrain tcsaflush tcsanow
+syn keyword tl_keyword contained tcsendbreak tcsetattr tentative-def-exists tenth
+syn keyword tl_keyword contained test-clear test-clear-dirty test-dec test-dirty
+syn keyword tl_keyword contained test-inc test-neq-set-indent-mode test-set test-set-indent-mode
+syn keyword tl_keyword contained tf third throw throwf
+syn keyword tl_keyword contained time time-fields-local time-fields-utc time-nsec
+syn keyword tl_keyword contained time-parse time-parse-local time-parse-utc time-string-local
+syn keyword tl_keyword contained time-string-utc time-struct-local time-struct-utc time-t
+syn keyword tl_keyword contained time-usec tnode to tofloat
+syn keyword tl_keyword contained tofloatz toint tointz tok
+syn keyword tl_keyword contained tok-str tok-where tostop tostring
+syn keyword tl_keyword contained tostringp touch tprint trace
+syn keyword tl_keyword contained transpose tree tree-begin tree-bind
+syn keyword tl_keyword contained tree-case tree-clear tree-delete tree-delete-node
+syn keyword tl_keyword contained tree-find tree-insert tree-insert-node tree-lookup
+syn keyword tl_keyword contained tree-lookup-node tree-next tree-root treep
+syn keyword tl_keyword contained trie-add trie-compress trie-lookup-begin trie-lookup-feed-char
+syn keyword tl_keyword contained trie-value-at trim-left trim-right trim-str
+syn keyword tl_keyword contained true trunc trunc-rem truncate-stream
+syn keyword tl_keyword contained tuples txr-case txr-exe-path txr-if
+syn keyword tl_keyword contained txr-parse txr-path txr-version txr-when
+syn keyword tl_keyword contained typecase typedef typeof typep
+syn keyword tl_keyword contained ubit uchar uid-t uint
+syn keyword tl_keyword contained uint-buf uint-carray uint-ptr-t uint16
+syn keyword tl_keyword contained uint32 uint64 uint8 ulong
+syn keyword tl_keyword contained ulonglong umask umeth umethod
+syn keyword tl_keyword contained uname unget-byte unget-char uni
+syn keyword tl_keyword contained unintern union union-get union-in
+syn keyword tl_keyword contained union-members union-out union-put uniq
+syn keyword tl_keyword contained unique unless unquote unsetenv
+syn keyword tl_keyword contained until until* untrace unuse-package
+syn keyword tl_keyword contained unuse-sym unwind-protect upcase-str upd
+syn keyword tl_keyword contained update uref url-decode url-encode
+syn keyword tl_keyword contained use use-package use-sym user-package
+syn keyword tl_keyword contained ushort usl usleep uslot
+syn keyword tl_keyword contained utimes val vdiscard vec
+syn keyword tl_keyword contained vec-carray vec-list vec-push vec-seq
+syn keyword tl_keyword contained vec-set-length vecref vector vector-list
+syn keyword tl_keyword contained vectorp veof veol veol2
+syn keyword tl_keyword contained verase vintr vkill vlnext
+syn keyword tl_keyword contained vm-fun-p vmin void vquit
+syn keyword tl_keyword contained vreprint vstart vstop vsusp
+syn keyword tl_keyword contained vswtc vt0 vt1 vtdly
+syn keyword tl_keyword contained vtime vwerase w-continued w-coredump
+syn keyword tl_keyword contained w-exitstatus w-ifcontinued w-ifexited w-ifsignaled
+syn keyword tl_keyword contained w-ifstopped w-nohang w-stopsig w-termsig
+syn keyword tl_keyword contained w-untraced wait wchar weave
+syn keyword tl_keyword contained when when-match whena whenlet
+syn keyword tl_keyword contained where while while* whilet
+syn keyword tl_keyword contained width width-check window-map window-mapdo
+syn keyword tl_keyword contained window-mappend wint-t with-clobber-expander with-compilation-unit
+syn keyword tl_keyword contained with-delete-expander with-dyn-lib with-gensyms with-hash-iter
+syn keyword tl_keyword contained with-in-buf-stream with-in-string-byte-stream with-in-string-stream with-objects
+syn keyword tl_keyword contained with-out-buf-stream with-out-string-stream with-out-strlist-stream with-resources
+syn keyword tl_keyword contained with-slots with-stream with-update-expander wrap
+syn keyword tl_keyword contained wrap* wstr wstr-d xcase
+syn keyword tl_keyword contained yield yield-from zap zarray
+syn keyword tl_keyword contained zchar zero-fill zerop zip
+syn keyword tl_keyword contained znew
 
 syn keyword txr_keyword contained accept all and assert
 syn keyword txr_keyword contained bind block call cases
@@ -777,5 +780,5 @@ hi def link txr_ign_bkt Comment
 
 let b:current_syntax = "lisp"
 
-set lispwords=ado,alet,align,alignof,ap,append-each,append-each*,append-each-prod,append-each-prod*,aret,array,arraysize,assert,awk,bit,block,block*,bool,buf,buf-d,build,buildn,carray,caseq,caseq*,caseql,caseql*,casequal,casequal*,catch,catch*,catch**,collect-each,collect-each*,collect-each-prod,collect-each-prod*,compare-swap,compile-only,cond,conda,condlet,cptr,dec,defex,deffi,deffi-cb,deffi-cb-unsafe,deffi-sym,deffi-type,deffi-var,define-accessor,define-modify-macro,define-option-struct,define-param-expander,define-place-macro,defmacro,defmeth,defpackage,defparm,defparml,defplace,defset,defstruct,defsymacro,defun,defun-match,defvar,defvarl,del,delay,do,dohash,doloop,doloop*,dotimes,each,each*,each-prod,each-prod*,elemsize,elemtype,enum,enumed,equot,eval-only,ffi,flet,flip,for,for*,fun,gen,go,gun,handle,handle*,handler-bind,hlet,hlet*,ido,if,if-match,ifa,iflet,ignerr,ignwarn,in-package,ip,labels,lambda,lambda-match,lcons,ldo,let,let*,lnew*,load-for,load-time,lop,lset,mac-param-bind,macro-time,macrolet,match-case,mlet,new*,obtain,obtain*,obtain*-block,obtain-block,offsetof,op,pdec,pinc,placelet,placelet*,pop,pprof,prof,prog,prog*,prog1,prog2,progn,ptr,ptr-in,ptr-in-d,ptr-out,ptr-out-d,ptr-out-s,push,pushnew,ret,return,return-from,rlet,rslot,sbit,sizeof,slet,splice,struct,suspend,symacrolet,sys:abscond-from,sys:awk-fun-let,sys:awk-mac-let,sys:awk-redir,sys:catch,sys:conv,sys:dlib-expr,sys:dvbind,sys:each-op,sys:expr,sys:fbind,sys:for-op,sys:l1-val,sys:lbind,sys:lisp1-value,sys:load-time-lit,sys:path-examine,sys:placelet-1,sys:rewrite-case,sys:splice,sys:struct-lit,sys:switch,sys:txr-case-impl,sys:unquote,sys:upenv,sys:var,sys:when-exprs-match,tagbody,tb,tc,test-clear,test-dec,test-inc,test-set,trace,tree-bind,tree-case,txr-case,txr-if,txr-when,typecase,typedef,ubit,union,unless,unquote,until,until*,untrace,unwind-protect,upd,uref,when,when-match,whena,whenlet,while,while*,whilet,with-clobber-expander,with-compilation-unit,with-delete-expander,with-dyn-lib,with-gensyms,with-hash-iter,with-in-buf-stream,with-in-string-byte-stream,with-in-string-stream,with-objects,with-out-buf-stream,with-out-string-stream,with-out-strlist-stream,with-resources,with-slots,with-stream,with-update-expander,yield,yield-from,zap,zarray,znew,:method,:function,:init,:postinit,:fini
+set lispwords=ado,alet,align,alignof,ap,append-each,append-each*,append-each-prod,append-each-prod*,aret,array,arraysize,assert,awk,bit,block,block*,bool,buf,buf-d,build,buildn,carray,caseq,caseq*,caseql,caseql*,casequal,casequal*,catch,catch*,catch**,collect-each,collect-each*,collect-each-prod,collect-each-prod*,compare-swap,compile-only,cond,conda,condlet,cptr,dec,defex,deffi,deffi-cb,deffi-cb-unsafe,deffi-sym,deffi-type,deffi-var,define-accessor,define-modify-macro,define-option-struct,define-param-expander,define-place-macro,defmacro,defmeth,defpackage,defparm,defparml,defplace,defset,defstruct,defsymacro,defun,defun-match,defvar,defvarl,del,delay,do,dohash,doloop,doloop*,dotimes,each,each*,each-prod,each-prod*,elemsize,elemtype,enum,enumed,equot,eval-only,ffi,flet,flip,for,for*,fun,gen,go,gun,handle,handle*,handler-bind,hlet,hlet*,ido,if,if-match,ifa,iflet,ignerr,ignwarn,in-package,ip,labels,lambda,lambda-match,lcons,ldo,let,let*,lnew*,load-for,load-time,lop,lset,mac-param-bind,macro-time,macrolet,match-case,mlet,new*,obtain,obtain*,obtain*-block,obtain-block,offsetof,op,pdec,pinc,placelet,placelet*,pop,pprof,prof,prog,prog*,prog1,prog2,progn,ptr,ptr-in,ptr-in-d,ptr-out,ptr-out-d,ptr-out-s,push,pushnew,ret,return,return-from,rlet,rslot,sbit,sizeof,slet,splice,struct,suspend,symacrolet,sys:abscond-from,sys:awk-fun-let,sys:awk-mac-let,sys:awk-redir,sys:blk,sys:catch,sys:conv,sys:dlib-expr,sys:dvbind,sys:each-op,sys:expr,sys:fbind,sys:fixed-point,sys:for-op,sys:l1-val,sys:lbind,sys:lisp1-value,sys:load-time-lit,sys:path-examine,sys:placelet-1,sys:rewrite-case,sys:splice,sys:struct-lit,sys:switch,sys:txr-case-impl,sys:unquote,sys:upenv,sys:var,sys:when-exprs-match,tagbody,tb,tc,test-clear,test-dec,test-inc,test-set,trace,tree-bind,tree-case,txr-case,txr-if,txr-when,typecase,typedef,ubit,union,unless,unquote,until,until*,untrace,unwind-protect,upd,uref,when,when-match,whena,whenlet,while,while*,whilet,with-clobber-expander,with-compilation-unit,with-delete-expander,with-dyn-lib,with-gensyms,with-hash-iter,with-in-buf-stream,with-in-string-byte-stream,with-in-string-stream,with-objects,with-out-buf-stream,with-out-string-stream,with-out-strlist-stream,with-resources,with-slots,with-stream,with-update-expander,yield,yield-from,zap,zarray,znew,:method,:function,:init,:postinit,:fini
 set comments=:@\;\;\;,:@\;\;,:@\;