Version 236.txr-236

* RELNOTES: Updated.

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

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

* txr.vim, tl.vim: Regenerated.

6 files changed, 332 insertions, 287 deletions

diff --git a/RELNOTES b/RELNOTES
index 2d6d3f3d..e232b8e1 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,48 @@
+                                    TXR 236
+                                   2020-04-18
+
+
+  Features
+
+  - open-file:
+    - new "n" mode for non-blocking open.
+    - now allows async signal delivery during open so blocking open can be
+      interrupted.
+  - New touch function, analogous to Unix utility.
+  - Unicode:
+    - map of characters that need two spaces on the terminal has been updated
+    - now includes emoji in the U+1Fxxxx plane.
+  - Listener:
+    - Tab completion over Unicode identifiers works now.
+  - Path testing functions now also accept integer file descriptor.
+  - configure:
+    - shell identification and re-execution logic in configure script
+    - now avoids re-execution if the original shell seems good.
+
+  Bugs
+
+  - ignwarn: fixed neglect to handle warning exceptions
+    with multiple arguments.
+  - autoloading: definitions now trigger autoload, not only references.
+    Otherwise if user code redefines some system entity that as not yet been
+    loaded, a subsequent attempt to use that entity will trigger autoload,
+    clobbering the user's definition.
+  - open-socket-pair: fix broken function.
+  - sockets: add missing shut-rd, shut-wr and shut-rw variables that are
+    already documented.
+  - unwind/signals: fixed signal mask restoring regression that first
+    appeared in TXR 230.
+  - txr-parse: release deferred warnings if erroring.
+  - open-file: when "m" flag is in effect and POSIX open is used,
+    use 0666 mode, not 0777, else the file will be created with
+    execute permissios if the umask doesn't remove them.
+  - regex: fix crash caused by duplicate regex character range.
+  - vim: work around bug in Vim that causes it to treat "contains"
+    (the name of a TXR Lisp function) as a reserved keyword in the syntax
+    highlighting definition.
+
+
+
                                     TXR 235
                                    2020-04-12
 
diff --git a/configure b/configure
index 180a3966..ef5f75ec 100755
--- a/configure
+++ b/configure
@@ -535,7 +535,7 @@ fi
 #
 
 
-txr_ver=235
+txr_ver=236
 
 #
 # The all important banner.
diff --git a/share/txr/stdlib/ver.tl b/share/txr/stdlib/ver.tl
index dd7b0913..b255ca75 100644
--- a/share/txr/stdlib/ver.tl
+++ b/share/txr/stdlib/ver.tl
@@ -1,2 +1,2 @@
-(defvarl lib-version 235)
+(defvarl lib-version 236)
 (defvarl *lib-version* lib-version)
diff --git a/tl.vim b/tl.vim
index 03943e0c..4491e89d 100644
--- a/tl.vim
+++ b/tl.vim
@@ -151,7 +151,7 @@ syn keyword tl_keyword contained compare-swap compile compile-defr-warning compi
 syn keyword tl_keyword contained compile-file compile-only compile-toplevel compile-update-file
 syn keyword tl_keyword contained compile-warning compl-span-str cond conda
 syn keyword tl_keyword contained condlet cons conses conses*
-syn keyword tl_keyword contained consp constantp contains copy
+syn keyword tl_keyword contained consp constantp contain[s] copy
 syn keyword tl_keyword contained copy-alist copy-buf copy-carray copy-cons
 syn keyword tl_keyword contained copy-file copy-files copy-fun copy-hash
 syn keyword tl_keyword contained copy-list copy-path-rec copy-search-tree copy-str
@@ -440,100 +440,100 @@ syn keyword tl_keyword contained setgroups sethash setitimer setlogmask
 syn keyword tl_keyword contained setpwent setresgid setresuid setuid
 syn keyword tl_keyword contained seventh sh sha256 sha256-begin
 syn keyword tl_keyword contained sha256-end sha256-hash sha256-stream shift
-syn keyword tl_keyword contained short shuffle sig-abrt sig-alrm
-syn keyword tl_keyword contained sig-atomic-t sig-bus sig-check sig-chld
-syn keyword tl_keyword contained sig-cont sig-fpe sig-hup sig-ill
-syn keyword tl_keyword contained sig-int sig-io sig-iot sig-kill
-syn keyword tl_keyword contained sig-pipe sig-poll sig-prof sig-pwr
-syn keyword tl_keyword contained sig-quit sig-segv sig-stkflt sig-stop
-syn keyword tl_keyword contained sig-sys sig-term sig-trap sig-tstp
-syn keyword tl_keyword contained sig-ttin sig-ttou sig-urg sig-usr1
-syn keyword tl_keyword contained sig-usr2 sig-vtalrm sig-winch sig-xcpu
-syn keyword tl_keyword contained sig-xfsz sign-extend signum sin
-syn keyword tl_keyword contained sinh sixth size-t size-vec
-syn keyword tl_keyword contained sizeof slet slot slotp
-syn keyword tl_keyword contained slots slotset sock-accept sock-bind
-syn keyword tl_keyword contained sock-cloexec sock-connect sock-dgram sock-family
-syn keyword tl_keyword contained sock-listen sock-nonblock sock-peer sock-recv-timeout
-syn keyword tl_keyword contained sock-send-timeout sock-set-peer sock-shutdown sock-stream
-syn keyword tl_keyword contained sock-type some sort sort-group
-syn keyword tl_keyword contained source-loc source-loc-str span-str special-operator-p
-syn keyword tl_keyword contained special-var-p spl splice split
-syn keyword tl_keyword contained split* split-str split-str-set sqrt
-syn keyword tl_keyword contained square ssize-t sssucc ssucc
-syn keyword tl_keyword contained starts-with stat static-slot static-slot-ensure
-syn keyword tl_keyword contained static-slot-home static-slot-p static-slot-set stdlib
-syn keyword tl_keyword contained str str-buf str-d str-in6addr
-syn keyword tl_keyword contained str-in6addr-net str-inaddr str-inaddr-net str<
-syn keyword tl_keyword contained str<= str= str> str>=
-syn keyword tl_keyword contained stream-get-prop stream-set-prop streamp string-extend
-syn keyword tl_keyword contained string-lt stringp struct struct-from-args
-syn keyword tl_keyword contained struct-from-plist struct-get-initfun struct-get-postinitfun struct-set-initfun
-syn keyword tl_keyword contained struct-set-postinitfun struct-type struct-type-name struct-type-p
-syn keyword tl_keyword contained structp sub sub-buf sub-list
-syn keyword tl_keyword contained sub-str sub-vec subtypep succ
-syn keyword tl_keyword contained sum super super-method suspend
-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:%imm-width% sys:%lev-bits% sys:%lev-size% sys:%max-lambda-fixed-args%
-syn keyword tl_keyword contained sys:%max-lev% sys:%max-lev-idx% sys:%max-sm-lev% sys:%max-sm-lev-idx%
-syn keyword tl_keyword contained sys:%max-v-lev% sys:%nary-ops% sys:%oc-code% sys:%oc-hash%
-syn keyword tl_keyword contained sys:%oc-list-builder% sys:%package-manip% 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:*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:bits sys:bits-to-obj sys:build-expander sys:build-key-list-expr
-syn keyword tl_keyword contained sys:call-delete-expander sys:capture-cont sys:catch sys:check-slot
-syn keyword tl_keyword contained sys:check-struct sys:circref sys:compat sys:compile-file-conditionally
-syn keyword tl_keyword contained sys:compiler-emit-warnings sys:conv sys:conv-expand sys:conv-let
-syn keyword tl_keyword contained sys:ctx-form sys:ctx-name sys:dbg-all sys:dbg-backtrace
-syn keyword tl_keyword contained sys:dbg-clear sys:dbg-enable sys:dbg-restore sys:dbg-set
-syn keyword tl_keyword contained sys:dbg-step sys:debugger sys:dedup sys:deffi-cb-expander
-syn keyword tl_keyword contained sys:define-method sys:defset-expander sys:defset-expander-simple 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-bind-mac-params
-syn keyword tl_keyword contained sys:expand-defmacro sys:expand-defsymacro sys:expand-defun sys:expand-defvarl
-syn keyword tl_keyword contained sys:expand-dohash sys:expand-doloop sys:expand-each sys:expand-handle
-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:fmt-flex sys:fmt-join sys:fmt-simple
-syn keyword tl_keyword contained sys:for-op sys:gc sys:gc-set-delta sys:get-buf-common
-syn keyword tl_keyword contained sys:get-fun-getter-setter sys:get-mb sys:get-parser sys:get-place-macro
-syn keyword tl_keyword contained sys:get-vb sys:getopts-error sys:handle-bad-syntax sys:hlet-expand
-syn keyword tl_keyword contained sys:if-to-cond sys:in6addr-condensed-text sys:is-label sys:l1-setq
-syn keyword tl_keyword contained sys:l1-val sys:lambda-apply-transform sys:lambda-short-apply-list sys:lambda-too-few-args
-syn keyword tl_keyword contained sys:lambda-too-many-args sys:lbind sys:lisp1-setq sys:lisp1-value
-syn keyword tl_keyword contained sys:list-builder-flets sys:list-from-vm-desc sys:load-time-lit sys:loc
-syn keyword tl_keyword contained sys:mac-env-flatten sys:make-anon-package sys:make-copy-path-opts sys:make-struct-lit
-syn keyword tl_keyword contained sys:make-struct-type sys:mark-special sys:maybe-mov sys:misleading-ref-check
-syn keyword tl_keyword contained sys:name-str sys:new-expander sys:new-type sys:null-reg
-syn keyword tl_keyword contained sys:obtain-impl sys:op-alpha-rename sys:op-ensure-rec sys:op-expand
-syn keyword tl_keyword contained sys:op-meta-p sys:op-rec-p sys:open-compile-streams sys:operand-to-exp
-syn keyword tl_keyword contained sys:operand-to-sym sys:opip-expand sys:opt-dash sys:opt-err
-syn keyword tl_keyword contained sys:parse-compound-operand 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:reg-expand-nongreedy sys:reg-optimize
-syn keyword tl_keyword contained sys:register-opcode sys:register-simple-accessor sys:repl sys:rplaca
-syn keyword tl_keyword contained sys:rplacd sys:rslotset sys:rt-defmacro sys:rt-defsymacro
-syn keyword tl_keyword contained sys:rt-defun sys:rt-defvarl sys:rt-load-for sys:rt-pprof
-syn keyword tl_keyword contained sys:set-hash-traversal-limit sys:set-macro-ancestor sys:setq sys:setqf
-syn keyword tl_keyword contained sys:shut-rd sys:shut-rdwr sys:shut-wr sys:slot-types
+syn keyword tl_keyword contained short shuffle shut-rd shut-rdwr
+syn keyword tl_keyword contained shut-wr sig-abrt sig-alrm sig-atomic-t
+syn keyword tl_keyword contained sig-bus sig-check sig-chld sig-cont
+syn keyword tl_keyword contained sig-fpe sig-hup sig-ill sig-int
+syn keyword tl_keyword contained sig-io sig-iot sig-kill sig-pipe
+syn keyword tl_keyword contained sig-poll sig-prof sig-pwr sig-quit
+syn keyword tl_keyword contained sig-segv sig-stkflt sig-stop sig-sys
+syn keyword tl_keyword contained sig-term sig-trap sig-tstp sig-ttin
+syn keyword tl_keyword contained sig-ttou sig-urg sig-usr1 sig-usr2
+syn keyword tl_keyword contained sig-vtalrm sig-winch sig-xcpu sig-xfsz
+syn keyword tl_keyword contained sign-extend signum sin sinh
+syn keyword tl_keyword contained sixth size-t size-vec sizeof
+syn keyword tl_keyword contained slet slot slotp slots
+syn keyword tl_keyword contained slotset sock-accept sock-bind sock-cloexec
+syn keyword tl_keyword contained sock-connect sock-dgram sock-family sock-listen
+syn keyword tl_keyword contained sock-nonblock sock-peer sock-recv-timeout sock-send-timeout
+syn keyword tl_keyword contained sock-set-peer sock-shutdown sock-stream sock-type
+syn keyword tl_keyword contained some sort sort-group source-loc
+syn keyword tl_keyword contained source-loc-str span-str special-operator-p special-var-p
+syn keyword tl_keyword contained spl splice split split*
+syn keyword tl_keyword contained split-str split-str-set sqrt square
+syn keyword tl_keyword contained ssize-t sssucc ssucc starts-with
+syn keyword tl_keyword contained stat static-slot static-slot-ensure static-slot-home
+syn keyword tl_keyword contained static-slot-p static-slot-set stdlib str
+syn keyword tl_keyword contained str-buf str-d str-in6addr str-in6addr-net
+syn keyword tl_keyword contained str-inaddr str-inaddr-net str< str<=
+syn keyword tl_keyword contained str= str> str>= stream-get-prop
+syn keyword tl_keyword contained stream-set-prop streamp string-extend string-lt
+syn keyword tl_keyword contained stringp struct struct-from-args struct-from-plist
+syn keyword tl_keyword contained struct-get-initfun struct-get-postinitfun struct-set-initfun struct-set-postinitfun
+syn keyword tl_keyword contained struct-type struct-type-name struct-type-p structp
+syn keyword tl_keyword contained sub sub-buf sub-list sub-str
+syn keyword tl_keyword contained sub-vec subtypep succ sum
+syn keyword tl_keyword contained super super-method suspend swap
+syn keyword tl_keyword contained symacrolet symbol-function symbol-macro symbol-name
+syn keyword tl_keyword contained symbol-package symbol-value symbolp symdiff
+syn keyword tl_keyword contained symlink sys:%backpatch-high16% sys:%backpatch-low16% sys:%big-endian%
+syn keyword tl_keyword contained sys:%bin-op% sys:%bin-ops% sys:%block-using-funs% sys:%call-op%
+syn keyword tl_keyword contained sys:%dbg-command-env% sys:%file-suff-rx% sys:%gcall-op% sys:%imm-width%
+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:%sm-lev-bits% sys:%sm-lev-size% sys:%test-funs%
+syn keyword tl_keyword contained sys:%test-funs-neg% sys:%test-funs-ops% sys:%test-funs-pos% sys:%test-inv%
+syn keyword tl_keyword contained sys:%test-opcode% sys:%tlo-ver% sys:*dedup* sys:*emit*
+syn keyword tl_keyword contained sys:*eval* sys:*load-recursive* sys:*op-ctx* sys:*pl-env*
+syn keyword tl_keyword contained sys:*pl-form* sys:*trace-hash* sys:*trace-level* sys:abscond*
+syn keyword tl_keyword contained sys:abscond-from sys:analyze-argtypes sys:analyze-params sys:apply
+syn keyword tl_keyword contained sys:asm-error sys:assumed-fun sys:awk%--rng sys:awk%--rng+
+syn keyword tl_keyword contained sys:awk%--rng- sys:awk%-rng+ sys:awk%rng+ sys:awk-code-move-check
+syn keyword tl_keyword contained sys:awk-error sys:awk-expander sys:awk-fun-let sys:awk-fun-shadowing-env
+syn keyword tl_keyword contained sys:awk-mac-let sys:awk-redir sys:awk-test 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:b>
+syn keyword tl_keyword contained sys:bad-slot-syntax sys:bind-mac-check sys:bind-mac-error sys:bits
+syn keyword tl_keyword contained sys:bits-to-obj sys:build-expander sys:build-key-list-expr sys:call-delete-expander
+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-file-conditionally sys:compiler-emit-warnings
+syn keyword tl_keyword contained sys:conv sys:conv-expand sys:conv-let sys:ctx-form
+syn keyword tl_keyword contained sys:ctx-name sys:dbg-all sys:dbg-backtrace sys:dbg-clear
+syn keyword tl_keyword contained sys:dbg-enable sys:dbg-restore sys:dbg-set sys:dbg-step
+syn keyword tl_keyword contained sys:debugger sys:dedup sys:deffi-cb-expander sys:define-method
+syn keyword tl_keyword contained sys:defset-expander sys:defset-expander-simple 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:eval-err sys:expand-bind-mac-params sys:expand-defmacro
+syn keyword tl_keyword contained sys:expand-defsymacro sys:expand-defun sys:expand-defvarl sys:expand-dohash
+syn keyword tl_keyword contained sys:expand-doloop sys:expand-each sys:expand-handle sys:expand-params
+syn keyword tl_keyword contained sys:expand-quasi sys:expand-quasi-args sys:expand-quasi-mods sys:expand-sym-ref
+syn keyword tl_keyword contained sys:expr sys:extract-keys sys:extract-keys-p sys:fbind
+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-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:maybe-mov sys:misleading-ref-check sys:name-str
+syn keyword tl_keyword contained sys:new-expander sys:new-type 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-operand sys:parser-eof sys:parser-errors sys:path-access
+syn keyword tl_keyword contained sys:path-examine sys:path-test-mode sys:path-test-type sys:pl-expand
+syn keyword tl_keyword contained sys:placelet-1 sys:print-backtrace sys:propagate-ancestor sys:propagate-perms
+syn keyword tl_keyword contained sys:prune-missing-inits sys:qquote sys:quasi sys:quasilist
+syn keyword tl_keyword contained sys:r-s-let-expander sys:reg-expand-nongreedy sys:reg-optimize sys:register-opcode
+syn keyword tl_keyword contained sys:register-simple-accessor sys:repl sys:rplaca sys:rplacd
+syn keyword tl_keyword contained sys:rslotset sys:rt-defmacro sys:rt-defsymacro sys:rt-defun
+syn keyword tl_keyword contained sys:rt-defvarl sys:rt-load-for sys:rt-pprof sys:set-hash-traversal-limit
+syn keyword tl_keyword contained sys:set-macro-ancestor sys:setq sys:setqf sys:slot-types
 syn keyword tl_keyword contained sys:small-op-p sys:small-op-to-sym sys:splice sys:static-slot-types
 syn keyword tl_keyword contained sys:str-inaddr-net-impl sys:struct-lit 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
@@ -564,52 +564,52 @@ syn keyword tl_keyword contained time-struct-local time-struct-utc time-t time-u
 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 tprint trace transpose tree
-syn keyword tl_keyword contained tree-begin tree-bind tree-case tree-clear
-syn keyword tl_keyword contained tree-delete tree-delete-node tree-find tree-insert
-syn keyword tl_keyword contained tree-insert-node tree-lookup tree-lookup-node tree-next
-syn keyword tl_keyword contained tree-root treep trie-add trie-compress
-syn keyword tl_keyword contained trie-lookup-begin trie-lookup-feed-char trie-value-at 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-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 whena whenlet where while
-syn keyword tl_keyword contained while* whilet width width-check
-syn keyword tl_keyword contained window-map window-mapdo window-mappend wint-t
-syn keyword tl_keyword contained with-clobber-expander with-compilation-unit with-delete-expander with-dyn-lib
-syn keyword tl_keyword contained with-gensyms with-hash-iter with-in-buf-stream with-in-string-byte-stream
-syn keyword tl_keyword contained with-in-string-stream with-objects with-out-buf-stream with-out-string-stream
-syn keyword tl_keyword contained with-out-strlist-stream with-resources with-slots with-stream
-syn keyword tl_keyword contained with-update-expander wrap wrap* wstr
-syn keyword tl_keyword contained wstr-d xcase yield yield-from
-syn keyword tl_keyword contained zap zarray zchar zero-fill
-syn keyword tl_keyword contained zerop zip znew
+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-str true trunc trunc-rem
+syn keyword tl_keyword contained truncate-stream tuples txr-case txr-exe-path
+syn keyword tl_keyword contained txr-if txr-parse txr-path txr-version
+syn keyword tl_keyword contained txr-when typecase typedef typeof
+syn keyword tl_keyword contained typep ubit uchar uid-t
+syn keyword tl_keyword contained uint uint-buf uint-carray uint-ptr-t
+syn keyword tl_keyword contained uint16 uint32 uint64 uint8
+syn keyword tl_keyword contained ulong ulonglong umask umeth
+syn keyword tl_keyword contained umethod uname unget-byte unget-char
+syn keyword tl_keyword contained uni unintern union union-get
+syn keyword tl_keyword contained union-in union-members union-out union-put
+syn keyword tl_keyword contained uniq unique unless unquote
+syn keyword tl_keyword contained unsetenv until until* untrace
+syn keyword tl_keyword contained unuse-package unuse-sym unwind-protect upcase-str
+syn keyword tl_keyword contained upd update uref url-decode
+syn keyword tl_keyword contained url-encode use use-package use-sym
+syn keyword tl_keyword contained user-package ushort usl usleep
+syn keyword tl_keyword contained uslot utimes val vdiscard
+syn keyword tl_keyword contained vec vec-carray vec-list vec-push
+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 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 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
diff --git a/txr.1 b/txr.1
index 242ef120..5309290f 100644
--- a/txr.1
+++ b/txr.1
@@ -350,9 +350,9 @@
 .ds TX \f[B]TXR\f[]
 .ds TL \f[B]TXR Lisp\f[]
 .\" Start of man page:
-.TH TXR 1 2020-04-12 "Utility Commands" "TXR Programming Language" "Kaz Kylheku"
+.TH TXR 1 2020-04-18 "Utility Commands" "TXR Programming Language" "Kaz Kylheku"
 .SH* NAME
-\*(TX \- Programming Language (Version 235)
+\*(TX \- Programming Language (Version 236)
 
 .SH* SYNOPSIS
 .mono
@@ -70478,7 +70478,7 @@ that version.
 
 Version 199 produces version 3 files and loads version 2 or 3.
 
-Versions 200 through 235 produce version 4 files and load version 2, 3 or 4.
+Versions 200 through 236 produce version 4 files and load version 2, 3 or 4.
 
 .SS* Semantic Differences between Compilation and Interpretation
 
diff --git a/txr.vim b/txr.vim
index a08f1421..5b7e09d4 100644
--- a/txr.vim
+++ b/txr.vim
@@ -151,7 +151,7 @@ syn keyword tl_keyword contained compare-swap compile compile-defr-warning compi
 syn keyword tl_keyword contained compile-file compile-only compile-toplevel compile-update-file
 syn keyword tl_keyword contained compile-warning compl-span-str cond conda
 syn keyword tl_keyword contained condlet cons conses conses*
-syn keyword tl_keyword contained consp constantp contains copy
+syn keyword tl_keyword contained consp constantp contain[s] copy
 syn keyword tl_keyword contained copy-alist copy-buf copy-carray copy-cons
 syn keyword tl_keyword contained copy-file copy-files copy-fun copy-hash
 syn keyword tl_keyword contained copy-list copy-path-rec copy-search-tree copy-str
@@ -440,100 +440,100 @@ syn keyword tl_keyword contained setgroups sethash setitimer setlogmask
 syn keyword tl_keyword contained setpwent setresgid setresuid setuid
 syn keyword tl_keyword contained seventh sh sha256 sha256-begin
 syn keyword tl_keyword contained sha256-end sha256-hash sha256-stream shift
-syn keyword tl_keyword contained short shuffle sig-abrt sig-alrm
-syn keyword tl_keyword contained sig-atomic-t sig-bus sig-check sig-chld
-syn keyword tl_keyword contained sig-cont sig-fpe sig-hup sig-ill
-syn keyword tl_keyword contained sig-int sig-io sig-iot sig-kill
-syn keyword tl_keyword contained sig-pipe sig-poll sig-prof sig-pwr
-syn keyword tl_keyword contained sig-quit sig-segv sig-stkflt sig-stop
-syn keyword tl_keyword contained sig-sys sig-term sig-trap sig-tstp
-syn keyword tl_keyword contained sig-ttin sig-ttou sig-urg sig-usr1
-syn keyword tl_keyword contained sig-usr2 sig-vtalrm sig-winch sig-xcpu
-syn keyword tl_keyword contained sig-xfsz sign-extend signum sin
-syn keyword tl_keyword contained sinh sixth size-t size-vec
-syn keyword tl_keyword contained sizeof slet slot slotp
-syn keyword tl_keyword contained slots slotset sock-accept sock-bind
-syn keyword tl_keyword contained sock-cloexec sock-connect sock-dgram sock-family
-syn keyword tl_keyword contained sock-listen sock-nonblock sock-peer sock-recv-timeout
-syn keyword tl_keyword contained sock-send-timeout sock-set-peer sock-shutdown sock-stream
-syn keyword tl_keyword contained sock-type some sort sort-group
-syn keyword tl_keyword contained source-loc source-loc-str span-str special-operator-p
-syn keyword tl_keyword contained special-var-p spl splice split
-syn keyword tl_keyword contained split* split-str split-str-set sqrt
-syn keyword tl_keyword contained square ssize-t sssucc ssucc
-syn keyword tl_keyword contained starts-with stat static-slot static-slot-ensure
-syn keyword tl_keyword contained static-slot-home static-slot-p static-slot-set stdlib
-syn keyword tl_keyword contained str str-buf str-d str-in6addr
-syn keyword tl_keyword contained str-in6addr-net str-inaddr str-inaddr-net str<
-syn keyword tl_keyword contained str<= str= str> str>=
-syn keyword tl_keyword contained stream-get-prop stream-set-prop streamp string-extend
-syn keyword tl_keyword contained string-lt stringp struct struct-from-args
-syn keyword tl_keyword contained struct-from-plist struct-get-initfun struct-get-postinitfun struct-set-initfun
-syn keyword tl_keyword contained struct-set-postinitfun struct-type struct-type-name struct-type-p
-syn keyword tl_keyword contained structp sub sub-buf sub-list
-syn keyword tl_keyword contained sub-str sub-vec subtypep succ
-syn keyword tl_keyword contained sum super super-method suspend
-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:%imm-width% sys:%lev-bits% sys:%lev-size% sys:%max-lambda-fixed-args%
-syn keyword tl_keyword contained sys:%max-lev% sys:%max-lev-idx% sys:%max-sm-lev% sys:%max-sm-lev-idx%
-syn keyword tl_keyword contained sys:%max-v-lev% sys:%nary-ops% sys:%oc-code% sys:%oc-hash%
-syn keyword tl_keyword contained sys:%oc-list-builder% sys:%package-manip% 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:*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:bits sys:bits-to-obj sys:build-expander sys:build-key-list-expr
-syn keyword tl_keyword contained sys:call-delete-expander sys:capture-cont sys:catch sys:check-slot
-syn keyword tl_keyword contained sys:check-struct sys:circref sys:compat sys:compile-file-conditionally
-syn keyword tl_keyword contained sys:compiler-emit-warnings sys:conv sys:conv-expand sys:conv-let
-syn keyword tl_keyword contained sys:ctx-form sys:ctx-name sys:dbg-all sys:dbg-backtrace
-syn keyword tl_keyword contained sys:dbg-clear sys:dbg-enable sys:dbg-restore sys:dbg-set
-syn keyword tl_keyword contained sys:dbg-step sys:debugger sys:dedup sys:deffi-cb-expander
-syn keyword tl_keyword contained sys:define-method sys:defset-expander sys:defset-expander-simple 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-bind-mac-params
-syn keyword tl_keyword contained sys:expand-defmacro sys:expand-defsymacro sys:expand-defun sys:expand-defvarl
-syn keyword tl_keyword contained sys:expand-dohash sys:expand-doloop sys:expand-each sys:expand-handle
-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:fmt-flex sys:fmt-join sys:fmt-simple
-syn keyword tl_keyword contained sys:for-op sys:gc sys:gc-set-delta sys:get-buf-common
-syn keyword tl_keyword contained sys:get-fun-getter-setter sys:get-mb sys:get-parser sys:get-place-macro
-syn keyword tl_keyword contained sys:get-vb sys:getopts-error sys:handle-bad-syntax sys:hlet-expand
-syn keyword tl_keyword contained sys:if-to-cond sys:in6addr-condensed-text sys:is-label sys:l1-setq
-syn keyword tl_keyword contained sys:l1-val sys:lambda-apply-transform sys:lambda-short-apply-list sys:lambda-too-few-args
-syn keyword tl_keyword contained sys:lambda-too-many-args sys:lbind sys:lisp1-setq sys:lisp1-value
-syn keyword tl_keyword contained sys:list-builder-flets sys:list-from-vm-desc sys:load-time-lit sys:loc
-syn keyword tl_keyword contained sys:mac-env-flatten sys:make-anon-package sys:make-copy-path-opts sys:make-struct-lit
-syn keyword tl_keyword contained sys:make-struct-type sys:mark-special sys:maybe-mov sys:misleading-ref-check
-syn keyword tl_keyword contained sys:name-str sys:new-expander sys:new-type sys:null-reg
-syn keyword tl_keyword contained sys:obtain-impl sys:op-alpha-rename sys:op-ensure-rec sys:op-expand
-syn keyword tl_keyword contained sys:op-meta-p sys:op-rec-p sys:open-compile-streams sys:operand-to-exp
-syn keyword tl_keyword contained sys:operand-to-sym sys:opip-expand sys:opt-dash sys:opt-err
-syn keyword tl_keyword contained sys:parse-compound-operand 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:reg-expand-nongreedy sys:reg-optimize
-syn keyword tl_keyword contained sys:register-opcode sys:register-simple-accessor sys:repl sys:rplaca
-syn keyword tl_keyword contained sys:rplacd sys:rslotset sys:rt-defmacro sys:rt-defsymacro
-syn keyword tl_keyword contained sys:rt-defun sys:rt-defvarl sys:rt-load-for sys:rt-pprof
-syn keyword tl_keyword contained sys:set-hash-traversal-limit sys:set-macro-ancestor sys:setq sys:setqf
-syn keyword tl_keyword contained sys:shut-rd sys:shut-rdwr sys:shut-wr sys:slot-types
+syn keyword tl_keyword contained short shuffle shut-rd shut-rdwr
+syn keyword tl_keyword contained shut-wr sig-abrt sig-alrm sig-atomic-t
+syn keyword tl_keyword contained sig-bus sig-check sig-chld sig-cont
+syn keyword tl_keyword contained sig-fpe sig-hup sig-ill sig-int
+syn keyword tl_keyword contained sig-io sig-iot sig-kill sig-pipe
+syn keyword tl_keyword contained sig-poll sig-prof sig-pwr sig-quit
+syn keyword tl_keyword contained sig-segv sig-stkflt sig-stop sig-sys
+syn keyword tl_keyword contained sig-term sig-trap sig-tstp sig-ttin
+syn keyword tl_keyword contained sig-ttou sig-urg sig-usr1 sig-usr2
+syn keyword tl_keyword contained sig-vtalrm sig-winch sig-xcpu sig-xfsz
+syn keyword tl_keyword contained sign-extend signum sin sinh
+syn keyword tl_keyword contained sixth size-t size-vec sizeof
+syn keyword tl_keyword contained slet slot slotp slots
+syn keyword tl_keyword contained slotset sock-accept sock-bind sock-cloexec
+syn keyword tl_keyword contained sock-connect sock-dgram sock-family sock-listen
+syn keyword tl_keyword contained sock-nonblock sock-peer sock-recv-timeout sock-send-timeout
+syn keyword tl_keyword contained sock-set-peer sock-shutdown sock-stream sock-type
+syn keyword tl_keyword contained some sort sort-group source-loc
+syn keyword tl_keyword contained source-loc-str span-str special-operator-p special-var-p
+syn keyword tl_keyword contained spl splice split split*
+syn keyword tl_keyword contained split-str split-str-set sqrt square
+syn keyword tl_keyword contained ssize-t sssucc ssucc starts-with
+syn keyword tl_keyword contained stat static-slot static-slot-ensure static-slot-home
+syn keyword tl_keyword contained static-slot-p static-slot-set stdlib str
+syn keyword tl_keyword contained str-buf str-d str-in6addr str-in6addr-net
+syn keyword tl_keyword contained str-inaddr str-inaddr-net str< str<=
+syn keyword tl_keyword contained str= str> str>= stream-get-prop
+syn keyword tl_keyword contained stream-set-prop streamp string-extend string-lt
+syn keyword tl_keyword contained stringp struct struct-from-args struct-from-plist
+syn keyword tl_keyword contained struct-get-initfun struct-get-postinitfun struct-set-initfun struct-set-postinitfun
+syn keyword tl_keyword contained struct-type struct-type-name struct-type-p structp
+syn keyword tl_keyword contained sub sub-buf sub-list sub-str
+syn keyword tl_keyword contained sub-vec subtypep succ sum
+syn keyword tl_keyword contained super super-method suspend swap
+syn keyword tl_keyword contained symacrolet symbol-function symbol-macro symbol-name
+syn keyword tl_keyword contained symbol-package symbol-value symbolp symdiff
+syn keyword tl_keyword contained symlink sys:%backpatch-high16% sys:%backpatch-low16% sys:%big-endian%
+syn keyword tl_keyword contained sys:%bin-op% sys:%bin-ops% sys:%block-using-funs% sys:%call-op%
+syn keyword tl_keyword contained sys:%dbg-command-env% sys:%file-suff-rx% sys:%gcall-op% sys:%imm-width%
+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:%sm-lev-bits% sys:%sm-lev-size% sys:%test-funs%
+syn keyword tl_keyword contained sys:%test-funs-neg% sys:%test-funs-ops% sys:%test-funs-pos% sys:%test-inv%
+syn keyword tl_keyword contained sys:%test-opcode% sys:%tlo-ver% sys:*dedup* sys:*emit*
+syn keyword tl_keyword contained sys:*eval* sys:*load-recursive* sys:*op-ctx* sys:*pl-env*
+syn keyword tl_keyword contained sys:*pl-form* sys:*trace-hash* sys:*trace-level* sys:abscond*
+syn keyword tl_keyword contained sys:abscond-from sys:analyze-argtypes sys:analyze-params sys:apply
+syn keyword tl_keyword contained sys:asm-error sys:assumed-fun sys:awk%--rng sys:awk%--rng+
+syn keyword tl_keyword contained sys:awk%--rng- sys:awk%-rng+ sys:awk%rng+ sys:awk-code-move-check
+syn keyword tl_keyword contained sys:awk-error sys:awk-expander sys:awk-fun-let sys:awk-fun-shadowing-env
+syn keyword tl_keyword contained sys:awk-mac-let sys:awk-redir sys:awk-test 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:b>
+syn keyword tl_keyword contained sys:bad-slot-syntax sys:bind-mac-check sys:bind-mac-error sys:bits
+syn keyword tl_keyword contained sys:bits-to-obj sys:build-expander sys:build-key-list-expr sys:call-delete-expander
+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-file-conditionally sys:compiler-emit-warnings
+syn keyword tl_keyword contained sys:conv sys:conv-expand sys:conv-let sys:ctx-form
+syn keyword tl_keyword contained sys:ctx-name sys:dbg-all sys:dbg-backtrace sys:dbg-clear
+syn keyword tl_keyword contained sys:dbg-enable sys:dbg-restore sys:dbg-set sys:dbg-step
+syn keyword tl_keyword contained sys:debugger sys:dedup sys:deffi-cb-expander sys:define-method
+syn keyword tl_keyword contained sys:defset-expander sys:defset-expander-simple 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:eval-err sys:expand-bind-mac-params sys:expand-defmacro
+syn keyword tl_keyword contained sys:expand-defsymacro sys:expand-defun sys:expand-defvarl sys:expand-dohash
+syn keyword tl_keyword contained sys:expand-doloop sys:expand-each sys:expand-handle sys:expand-params
+syn keyword tl_keyword contained sys:expand-quasi sys:expand-quasi-args sys:expand-quasi-mods sys:expand-sym-ref
+syn keyword tl_keyword contained sys:expr sys:extract-keys sys:extract-keys-p sys:fbind
+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-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:maybe-mov sys:misleading-ref-check sys:name-str
+syn keyword tl_keyword contained sys:new-expander sys:new-type 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-operand sys:parser-eof sys:parser-errors sys:path-access
+syn keyword tl_keyword contained sys:path-examine sys:path-test-mode sys:path-test-type sys:pl-expand
+syn keyword tl_keyword contained sys:placelet-1 sys:print-backtrace sys:propagate-ancestor sys:propagate-perms
+syn keyword tl_keyword contained sys:prune-missing-inits sys:qquote sys:quasi sys:quasilist
+syn keyword tl_keyword contained sys:r-s-let-expander sys:reg-expand-nongreedy sys:reg-optimize sys:register-opcode
+syn keyword tl_keyword contained sys:register-simple-accessor sys:repl sys:rplaca sys:rplacd
+syn keyword tl_keyword contained sys:rslotset sys:rt-defmacro sys:rt-defsymacro sys:rt-defun
+syn keyword tl_keyword contained sys:rt-defvarl sys:rt-load-for sys:rt-pprof sys:set-hash-traversal-limit
+syn keyword tl_keyword contained sys:set-macro-ancestor sys:setq sys:setqf sys:slot-types
 syn keyword tl_keyword contained sys:small-op-p sys:small-op-to-sym sys:splice sys:static-slot-types
 syn keyword tl_keyword contained sys:str-inaddr-net-impl sys:struct-lit 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
@@ -564,52 +564,52 @@ syn keyword tl_keyword contained time-struct-local time-struct-utc time-t time-u
 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 tprint trace transpose tree
-syn keyword tl_keyword contained tree-begin tree-bind tree-case tree-clear
-syn keyword tl_keyword contained tree-delete tree-delete-node tree-find tree-insert
-syn keyword tl_keyword contained tree-insert-node tree-lookup tree-lookup-node tree-next
-syn keyword tl_keyword contained tree-root treep trie-add trie-compress
-syn keyword tl_keyword contained trie-lookup-begin trie-lookup-feed-char trie-value-at 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-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 whena whenlet where while
-syn keyword tl_keyword contained while* whilet width width-check
-syn keyword tl_keyword contained window-map window-mapdo window-mappend wint-t
-syn keyword tl_keyword contained with-clobber-expander with-compilation-unit with-delete-expander with-dyn-lib
-syn keyword tl_keyword contained with-gensyms with-hash-iter with-in-buf-stream with-in-string-byte-stream
-syn keyword tl_keyword contained with-in-string-stream with-objects with-out-buf-stream with-out-string-stream
-syn keyword tl_keyword contained with-out-strlist-stream with-resources with-slots with-stream
-syn keyword tl_keyword contained with-update-expander wrap wrap* wstr
-syn keyword tl_keyword contained wstr-d xcase yield yield-from
-syn keyword tl_keyword contained zap zarray zchar zero-fill
-syn keyword tl_keyword contained zerop zip znew
+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-str true trunc trunc-rem
+syn keyword tl_keyword contained truncate-stream tuples txr-case txr-exe-path
+syn keyword tl_keyword contained txr-if txr-parse txr-path txr-version
+syn keyword tl_keyword contained txr-when typecase typedef typeof
+syn keyword tl_keyword contained typep ubit uchar uid-t
+syn keyword tl_keyword contained uint uint-buf uint-carray uint-ptr-t
+syn keyword tl_keyword contained uint16 uint32 uint64 uint8
+syn keyword tl_keyword contained ulong ulonglong umask umeth
+syn keyword tl_keyword contained umethod uname unget-byte unget-char
+syn keyword tl_keyword contained uni unintern union union-get
+syn keyword tl_keyword contained union-in union-members union-out union-put
+syn keyword tl_keyword contained uniq unique unless unquote
+syn keyword tl_keyword contained unsetenv until until* untrace
+syn keyword tl_keyword contained unuse-package unuse-sym unwind-protect upcase-str
+syn keyword tl_keyword contained upd update uref url-decode
+syn keyword tl_keyword contained url-encode use use-package use-sym
+syn keyword tl_keyword contained user-package ushort usl usleep
+syn keyword tl_keyword contained uslot utimes val vdiscard
+syn keyword tl_keyword contained vec vec-carray vec-list vec-push
+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 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 txr_keyword contained accept all and assert
 syn keyword txr_keyword contained bind block call cases