Version 217.txr-217

* RELNOTES: Updated.

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

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

* txr.vim, tl.vim: Regenerated.

* protsym.c: Likewise.

7 files changed, 586 insertions, 489 deletions

diff --git a/RELNOTES b/RELNOTES
index f1635ff2..ac411538 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,34 @@
+                                    TXR 217
+                                   2019-06-10
+
+  Features:
+
+  - Integrated POSIX fcntl function, supporting
+    F_SETFD, F_SETFL and F_SETLK.
+  - errno constants are now provided.
+  - POSIX close function added.
+  - Windows installer associates .txr, .tl and .tlo suffixes with the
+    txr executable.
+  - fixnum range now includes the most negative two's
+    complement value that fits into its representation,
+    rather than excluding it.
+  - place macros: slight adjustment to expansion strategy.
+
+  Bugs:
+
+  - Fixed failure to handle most-negative integer value in situations
+    when a Lisp integer is converted to a fixed C integer.
+    - Fixes a regression in the minimal Windows program example, in which
+      (defvarl CW_USEDEFAULT #x-80000000) appears.
+  - path-private-to-me-p function was considering superuser as
+    just another user
+    - properly locked down root-owned file was not considered private.
+    - same with path-strictly-private-to-me
+  - list length: off-by-one error for huge lazy lists that overflow
+    a pointer-wide counter.
+
+
+
                                     TXR 216
                                    2019-05-20
 
diff --git a/configure b/configure
index 18a24207..95c8ce82 100755
--- a/configure
+++ b/configure
@@ -464,7 +464,7 @@ fi
 #
 
 
-txr_ver=216
+txr_ver=217
 
 #
 # The all important banner.
diff --git a/protsym.c b/protsym.c
index 29a0632e..ba4c4afd 100644
--- a/protsym.c
+++ b/protsym.c
@@ -147,6 +147,10 @@ extern val zerop_s, zeroplus_s, zone_s;
 #if HAVE_DLOPEN
 extern val dlhandle_s, dlsym_s;
 #endif
+#if HAVE_FCNTL
+extern val flock_s, len_s, pid_s, start_s, type_s;
+extern val whence_s;
+#endif
 #if HAVE_GRGID
 extern val group_s, mem_s;
 #endif
@@ -287,6 +291,10 @@ val *protected_sym[] = {
 #if HAVE_DLOPEN
   &dlhandle_s, &dlsym_s,
 #endif
+#if HAVE_FCNTL
+  &flock_s, &len_s, &pid_s, &start_s, &type_s,
+  &whence_s,
+#endif
 #if HAVE_GRGID
   &group_s, &mem_s,
 #endif
diff --git a/share/txr/stdlib/ver.tl b/share/txr/stdlib/ver.tl
index 1d087f26..96a307b9 100644
--- a/share/txr/stdlib/ver.tl
+++ b/share/txr/stdlib/ver.tl
@@ -1,2 +1,2 @@
-(defvarl lib-version 216)
+(defvarl lib-version 217)
 (defvarl *lib-version* lib-version)
diff --git a/tl.vim b/tl.vim
index ae985850..4af5159d 100644
--- a/tl.vim
+++ b/tl.vim
@@ -135,54 +135,78 @@ syn keyword tl_keyword contained chr-isunisp chr-isupper chr-isxdigit chr-num
 syn keyword tl_keyword contained chr-str chr-str-set chr-tolower chr-toupper
 syn keyword tl_keyword contained chr-xdigit chrp clamp clear-dirty
 syn keyword tl_keyword contained clear-error clear-struct clearhash clocal
-syn keyword tl_keyword contained clock-t clockid-t close-stream closelog
-syn keyword tl_keyword contained closure cmp-str cmspar collect-each
-syn keyword tl_keyword contained collect-each* comb command-get command-get-buf
-syn keyword tl_keyword contained command-get-lines command-get-string command-put command-put-buf
-syn keyword tl_keyword contained command-put-lines command-put-string compile compile-defr-warning
-syn keyword tl_keyword contained compile-error compile-file compile-only compile-toplevel
-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 copy copy-alist
-syn keyword tl_keyword contained copy-buf copy-carray copy-cons copy-fun
-syn keyword tl_keyword contained copy-hash copy-list copy-str copy-struct
-syn keyword tl_keyword contained copy-vec cos count-if count-until-match
-syn keyword tl_keyword contained countq countql countqual cptr
-syn keyword tl_keyword contained cptr-cast cptr-free cptr-int cptr-null
-syn keyword tl_keyword contained cptr-obj cptr-size-hint cptr-type cptr-zap
-syn keyword tl_keyword contained cptrp cr0 cr1 cr2
-syn keyword tl_keyword contained cr3 crdly cread crtscts
-syn keyword tl_keyword contained crypt cs5 cs6 cs7
-syn keyword tl_keyword contained cs8 csize cstopb cum-norm-dist
-syn keyword tl_keyword contained daemon dec defer-warning defex
-syn keyword tl_keyword contained deffi deffi-cb deffi-cb-unsafe deffi-sym
-syn keyword tl_keyword contained deffi-type deffi-var define-accessor define-modify-macro
-syn keyword tl_keyword contained define-param-expander define-place-macro defmacro defmeth
-syn keyword tl_keyword contained defpackage defparm defparml defplace
-syn keyword tl_keyword contained defset defstruct defsymacro defun
-syn keyword tl_keyword contained defvar defvarl del delay
-syn keyword tl_keyword contained delete-package dev-t diff digits
-syn keyword tl_keyword contained digpow dir-name disassemble display-width
-syn keyword tl_keyword contained divides dlclose dlopen dlsym
-syn keyword tl_keyword contained dlsym-checked dlvsym dlvsym-checked do
-syn keyword tl_keyword contained dohash doloop doloop* dotimes
-syn keyword tl_keyword contained double downcase-str drop drop-until
-syn keyword tl_keyword contained drop-while dump-compiled-objects dump-deferred-warnings dump-to-tlo
-syn keyword tl_keyword contained dup dupfd dwim each
-syn keyword tl_keyword contained each* echo echoctl echoe
-syn keyword tl_keyword contained echok echoke echonl echoprt
-syn keyword tl_keyword contained eighth elemsize elemtype empty
-syn keyword tl_keyword contained endgrent endp endpwent ends-with
-syn keyword tl_keyword contained ensure-dir enum enumed env
-syn keyword tl_keyword contained env-fbind env-fbindings env-hash env-next
-syn keyword tl_keyword contained env-vbind env-vbindings eq eql
-syn keyword tl_keyword contained equal equot errno error
-syn keyword tl_keyword contained eval eval-only evenp exception-subtype-map
-syn keyword tl_keyword contained exception-subtype-p exec exit exit*
-syn keyword tl_keyword contained exp expand expand* expand-left
-syn keyword tl_keyword contained expand-right expand-with-free-refs expt exptmod
-syn keyword tl_keyword contained extproc f$ f^ f^$
-syn keyword tl_keyword contained false fboundp ff0 ff1
+syn keyword tl_keyword contained clock-t clockid-t close close-stream
+syn keyword tl_keyword contained closelog closure cmp-str cmspar
+syn keyword tl_keyword contained collect-each collect-each* comb command-get
+syn keyword tl_keyword contained command-get-buf command-get-lines command-get-string command-put
+syn keyword tl_keyword contained command-put-buf command-put-lines command-put-string compile
+syn keyword tl_keyword contained compile-defr-warning compile-error compile-file compile-only
+syn keyword tl_keyword contained compile-toplevel compile-warning compl-span-str cond
+syn keyword tl_keyword contained conda condlet cons conses
+syn keyword tl_keyword contained conses* consp constantp copy
+syn keyword tl_keyword contained copy-alist copy-buf copy-carray copy-cons
+syn keyword tl_keyword contained copy-fun copy-hash copy-list copy-str
+syn keyword tl_keyword contained copy-struct copy-vec cos count-if
+syn keyword tl_keyword contained count-until-match countq countql countqual
+syn keyword tl_keyword contained cptr cptr-cast cptr-free cptr-int
+syn keyword tl_keyword contained cptr-null cptr-obj cptr-size-hint cptr-type
+syn keyword tl_keyword contained cptr-zap cptrp cr0 cr1
+syn keyword tl_keyword contained cr2 cr3 crdly cread
+syn keyword tl_keyword contained crtscts crypt cs5 cs6
+syn keyword tl_keyword contained cs7 cs8 csize cstopb
+syn keyword tl_keyword contained cum-norm-dist daemon dec defer-warning
+syn keyword tl_keyword contained defex deffi deffi-cb deffi-cb-unsafe
+syn keyword tl_keyword contained deffi-sym deffi-type deffi-var define-accessor
+syn keyword tl_keyword contained define-modify-macro define-param-expander define-place-macro defmacro
+syn keyword tl_keyword contained defmeth defpackage defparm defparml
+syn keyword tl_keyword contained defplace defset defstruct defsymacro
+syn keyword tl_keyword contained defun defvar defvarl del
+syn keyword tl_keyword contained delay delete-package dev-t diff
+syn keyword tl_keyword contained digits digpow dir-name disassemble
+syn keyword tl_keyword contained display-width divides dlclose dlopen
+syn keyword tl_keyword contained dlsym dlsym-checked dlvsym dlvsym-checked
+syn keyword tl_keyword contained do dohash doloop doloop*
+syn keyword tl_keyword contained dotimes double downcase-str drop
+syn keyword tl_keyword contained drop-until drop-while dump-compiled-objects dump-deferred-warnings
+syn keyword tl_keyword contained dump-to-tlo dup dupfd dwim
+syn keyword tl_keyword contained e2big eacces each each*
+syn keyword tl_keyword contained eaddrinuse eaddrnotavail eafnosupport eagain
+syn keyword tl_keyword contained ealready ebadf ebadmsg ebusy
+syn keyword tl_keyword contained ecanceled echild echo echoctl
+syn keyword tl_keyword contained echoe echok echoke echonl
+syn keyword tl_keyword contained echoprt econnaborted econnrefused econnreset
+syn keyword tl_keyword contained edeadlk edestaddrreq edom edquot
+syn keyword tl_keyword contained eexist efault efbig ehostunreach
+syn keyword tl_keyword contained eidrm eighth eilseq einprogress
+syn keyword tl_keyword contained eintr einval eio eisconn
+syn keyword tl_keyword contained eisdir elemsize elemtype eloop
+syn keyword tl_keyword contained emfile emlink empty emsgsize
+syn keyword tl_keyword contained emultihop enametoolong endgrent endp
+syn keyword tl_keyword contained endpwent ends-with enetdown enetreset
+syn keyword tl_keyword contained enetunreach enfile enobufs enodata
+syn keyword tl_keyword contained enodev enoent enoexec enolck
+syn keyword tl_keyword contained enolink enomem enomsg enoprotoopt
+syn keyword tl_keyword contained enospc enosr enostr enosys
+syn keyword tl_keyword contained enotconn enotdir enotempty enotrecoverable
+syn keyword tl_keyword contained enotsock enotsup enotty ensure-dir
+syn keyword tl_keyword contained enum enumed env env-fbind
+syn keyword tl_keyword contained env-fbindings env-hash env-next env-vbind
+syn keyword tl_keyword contained env-vbindings enxio eopnotsupp eoverflow
+syn keyword tl_keyword contained eownerdead eperm epipe eproto
+syn keyword tl_keyword contained eprotonosupport eprototype eq eql
+syn keyword tl_keyword contained equal equot erange erofs
+syn keyword tl_keyword contained errno error espipe esrch
+syn keyword tl_keyword contained estale etime etimedout etxtbsy
+syn keyword tl_keyword contained eval eval-only evenp ewouldblock
+syn keyword tl_keyword contained exception-subtype-map exception-subtype-p exdev exec
+syn keyword tl_keyword contained exit exit* exp expand
+syn keyword tl_keyword contained expand* expand-left expand-right expand-with-free-refs
+syn keyword tl_keyword contained expt exptmod extproc f$
+syn keyword tl_keyword contained f-dupfd f-dupfd-cloexec f-getfd f-getfl
+syn keyword tl_keyword contained f-getlk f-rdlck f-setfd f-setfl
+syn keyword tl_keyword contained f-setlk f-setlkw f-unlck f-wrlck
+syn keyword tl_keyword contained f^ f^$ false fboundp
+syn keyword tl_keyword contained fcntl fd-cloexec ff0 ff1
 syn keyword tl_keyword contained ffdly ffi ffi-alignof ffi-arraysize
 syn keyword tl_keyword contained ffi-call ffi-elemsize ffi-elemtype ffi-get
 syn keyword tl_keyword contained ffi-in ffi-make-call-desc ffi-make-closure ffi-offsetof
@@ -310,77 +334,82 @@ syn keyword tl_keyword contained nl1 nldly nlink-t noflsh
 syn keyword tl_keyword contained none not notf nreconc
 syn keyword tl_keyword contained nreverse nth nthcdr nthlast
 syn keyword tl_keyword contained null nullify num-carray num-chr
-syn keyword tl_keyword contained num-str numberp nzerop oand
-syn keyword tl_keyword contained obtain obtain* obtain*-block obtain-block
-syn keyword tl_keyword contained ocrnl oddp ofdel off-t
-syn keyword tl_keyword contained offsetof ofill olcuc onlcr
-syn keyword tl_keyword contained onlret onocr op open-command
-syn keyword tl_keyword contained open-directory open-file open-fileno open-files
-syn keyword tl_keyword contained open-files* open-pipe open-process open-socket
-syn keyword tl_keyword contained open-socket-pair open-tail openlog opip
-syn keyword tl_keyword contained opost opt opthelp or
-syn keyword tl_keyword contained orf package-alist package-fallback-list package-foreign-symbols
-syn keyword tl_keyword contained package-local-symbols package-name package-symbols packagep
-syn keyword tl_keyword contained pad parenb parmrk parodd
-syn keyword tl_keyword contained partition partition* partition-by path-blkdev-p
-syn keyword tl_keyword contained path-cat path-chrdev-p path-dir-p path-executable-to-me-p
-syn keyword tl_keyword contained path-exists-p path-file-p path-mine-p path-my-group-p
-syn keyword tl_keyword contained path-newer path-older path-pipe-p path-private-to-me-p
-syn keyword tl_keyword contained path-read-writable-to-me-p path-readable-to-me-p path-same-object path-sep-chars
-syn keyword tl_keyword contained path-setgid-p path-setuid-p path-sock-p path-sticky-p
-syn keyword tl_keyword contained path-strictly-private-to-me-p path-symlink-p path-writable-to-me-p pdec
-syn keyword tl_keyword contained pendin perm pid-t pinc
-syn keyword tl_keyword contained pipe place-form-p placelet placelet*
-syn keyword tl_keyword contained plist-to-alist plusp poll poll-err
-syn keyword tl_keyword contained poll-in poll-nval poll-out poll-pri
-syn keyword tl_keyword contained poll-rdband poll-rdhup poll-wrband poly
-syn keyword tl_keyword contained pop pos pos-if pos-max
-syn keyword tl_keyword contained pos-min posq posql posqual
-syn keyword tl_keyword contained pppred ppred pprinl pprint
-syn keyword tl_keyword contained pprof pred prinl print
-syn keyword tl_keyword contained prod prof prog prog*
-syn keyword tl_keyword contained prog1 progn promisep prop
-syn keyword tl_keyword contained proper-list-p proper-listp pset ptr
-syn keyword tl_keyword contained ptr-in ptr-in-d ptr-out ptr-out-d
-syn keyword tl_keyword contained ptr-out-s ptrdiff-t pub:txr-sym pure-rel-path-p
-syn keyword tl_keyword contained purge-deferred-warning push pushhash pushnew
-syn keyword tl_keyword contained put-buf put-byte put-carray put-char
-syn keyword tl_keyword contained put-line put-lines put-obj put-string
-syn keyword tl_keyword contained put-strings pwd qquote qref
-syn keyword tl_keyword contained quote r$ r^ r^$
-syn keyword tl_keyword contained raise rand random random-fixnum
-syn keyword tl_keyword contained random-float random-state-get-vec random-state-p range
-syn keyword tl_keyword contained range* range-regex rangep rassoc
-syn keyword tl_keyword contained rassql rcomb rcons read
-syn keyword tl_keyword contained read-until-match readlink real-time-stream-p realpath
-syn keyword tl_keyword contained record-adapter reduce-left reduce-right ref
-syn keyword tl_keyword contained refset regex-compile regex-from-trie regex-parse
-syn keyword tl_keyword contained regex-prefix-match regex-source regexp register-exception-subtypes
-syn keyword tl_keyword contained register-tentative-def regsub rehome-sym relate
-syn keyword tl_keyword contained release-deferred-warnings remhash remove-if remove-if*
-syn keyword tl_keyword contained remove-path remq remq* remql
-syn keyword tl_keyword contained remql* remqual remqual* rename-path
-syn keyword tl_keyword contained repeat replace replace-list replace-str
-syn keyword tl_keyword contained replace-struct replace-vec reset-struct rest
-syn keyword tl_keyword contained ret retf return return*
-syn keyword tl_keyword contained return-from revappend reverse rfind
-syn keyword tl_keyword contained rfind-if rlcp rlcp-tree rlet
-syn keyword tl_keyword contained rlist rlist* rmember rmember-if
-syn keyword tl_keyword contained rmemq rmemql rmemqual rmismatch
-syn keyword tl_keyword contained rotate round round-rem rperm
-syn keyword tl_keyword contained rplaca rplacd rpoly rpos
-syn keyword tl_keyword contained rpos-if rposq rposql rposqual
-syn keyword tl_keyword contained rr rra rsearch rslot
-syn keyword tl_keyword contained rtld-deepbind rtld-global rtld-lazy rtld-local
-syn keyword tl_keyword contained rtld-nodelete rtld-noload rtld-now run
-syn keyword tl_keyword contained s-ifblk s-ifchr s-ifdir s-ififo
-syn keyword tl_keyword contained s-iflnk s-ifmt s-ifreg s-ifsock
-syn keyword tl_keyword contained s-irgrp s-iroth s-irusr s-irwxg
-syn keyword tl_keyword contained s-irwxo s-irwxu s-isgid s-isuid
-syn keyword tl_keyword contained s-isvtx s-iwgrp s-iwoth s-iwusr
-syn keyword tl_keyword contained s-ixgrp s-ixoth s-ixusr save-exe
-syn keyword tl_keyword contained sbit scan-until-match search search-regex
-syn keyword tl_keyword contained search-regst search-str search-str-tree second
+syn keyword tl_keyword contained num-str numberp nzerop o-accmode
+syn keyword tl_keyword contained o-append o-async o-cloexec o-creat
+syn keyword tl_keyword contained o-direct o-directory o-noatime o-noctty
+syn keyword tl_keyword contained o-nofollow o-nonblock o-path o-rdonly
+syn keyword tl_keyword contained o-rdwr o-sync o-trunc o-wronly
+syn keyword tl_keyword contained oand obtain obtain* obtain*-block
+syn keyword tl_keyword contained obtain-block ocrnl oddp ofdel
+syn keyword tl_keyword contained off-t offsetof ofill olcuc
+syn keyword tl_keyword contained onlcr onlret onocr op
+syn keyword tl_keyword contained open-command open-directory open-file open-fileno
+syn keyword tl_keyword contained open-files open-files* open-pipe open-process
+syn keyword tl_keyword contained open-socket open-socket-pair open-tail openlog
+syn keyword tl_keyword contained opip opost opt opthelp
+syn keyword tl_keyword contained or orf package-alist package-fallback-list
+syn keyword tl_keyword contained package-foreign-symbols package-local-symbols package-name package-symbols
+syn keyword tl_keyword contained packagep pad parenb parmrk
+syn keyword tl_keyword contained parodd partition partition* partition-by
+syn keyword tl_keyword contained path-blkdev-p path-cat path-chrdev-p path-dir-p
+syn keyword tl_keyword contained path-executable-to-me-p path-exists-p path-file-p path-mine-p
+syn keyword tl_keyword contained path-my-group-p path-newer path-older path-pipe-p
+syn keyword tl_keyword contained path-private-to-me-p path-read-writable-to-me-p path-readable-to-me-p path-same-object
+syn keyword tl_keyword contained path-sep-chars path-setgid-p path-setuid-p path-sock-p
+syn keyword tl_keyword contained path-sticky-p path-strictly-private-to-me-p path-symlink-p path-writable-to-me-p
+syn keyword tl_keyword contained pdec pendin perm pid-t
+syn keyword tl_keyword contained pinc pipe place-form-p placelet
+syn keyword tl_keyword contained placelet* plist-to-alist plusp poll
+syn keyword tl_keyword contained poll-err poll-in poll-nval poll-out
+syn keyword tl_keyword contained poll-pri poll-rdband poll-rdhup poll-wrband
+syn keyword tl_keyword contained poly pop pos pos-if
+syn keyword tl_keyword contained pos-max pos-min posq posql
+syn keyword tl_keyword contained posqual pppred ppred pprinl
+syn keyword tl_keyword contained pprint pprof pred prinl
+syn keyword tl_keyword contained print prod prof prog
+syn keyword tl_keyword contained prog* prog1 progn promisep
+syn keyword tl_keyword contained prop proper-list-p proper-listp pset
+syn keyword tl_keyword contained ptr ptr-in ptr-in-d ptr-out
+syn keyword tl_keyword contained ptr-out-d ptr-out-s ptrdiff-t pub:txr-sym
+syn keyword tl_keyword contained pure-rel-path-p purge-deferred-warning push pushhash
+syn keyword tl_keyword contained pushnew put-buf put-byte put-carray
+syn keyword tl_keyword contained put-char put-line put-lines put-obj
+syn keyword tl_keyword contained put-string put-strings pwd qquote
+syn keyword tl_keyword contained qref quote r$ r^
+syn keyword tl_keyword contained r^$ raise rand random
+syn keyword tl_keyword contained random-fixnum random-float random-state-get-vec random-state-p
+syn keyword tl_keyword contained range range* range-regex rangep
+syn keyword tl_keyword contained rassoc rassql rcomb rcons
+syn keyword tl_keyword contained read read-until-match readlink real-time-stream-p
+syn keyword tl_keyword contained realpath record-adapter reduce-left reduce-right
+syn keyword tl_keyword contained ref refset regex-compile regex-from-trie
+syn keyword tl_keyword contained regex-parse regex-prefix-match regex-source regexp
+syn keyword tl_keyword contained register-exception-subtypes register-tentative-def regsub rehome-sym
+syn keyword tl_keyword contained relate release-deferred-warnings remhash remove-if
+syn keyword tl_keyword contained remove-if* remove-path remq remq*
+syn keyword tl_keyword contained remql remql* remqual remqual*
+syn keyword tl_keyword contained rename-path repeat replace replace-list
+syn keyword tl_keyword contained replace-str replace-struct replace-vec reset-struct
+syn keyword tl_keyword contained rest ret retf return
+syn keyword tl_keyword contained return* return-from revappend reverse
+syn keyword tl_keyword contained rfind rfind-if rlcp rlcp-tree
+syn keyword tl_keyword contained rlet rlist rlist* rmember
+syn keyword tl_keyword contained rmember-if rmemq rmemql rmemqual
+syn keyword tl_keyword contained rmismatch rotate round round-rem
+syn keyword tl_keyword contained rperm rplaca rplacd rpoly
+syn keyword tl_keyword contained rpos rpos-if rposq rposql
+syn keyword tl_keyword contained rposqual rr rra rsearch
+syn keyword tl_keyword contained rslot rtld-deepbind rtld-global rtld-lazy
+syn keyword tl_keyword contained rtld-local rtld-nodelete rtld-noload rtld-now
+syn keyword tl_keyword contained run s-ifblk s-ifchr s-ifdir
+syn keyword tl_keyword contained s-ififo s-iflnk s-ifmt s-ifreg
+syn keyword tl_keyword contained s-ifsock s-irgrp s-iroth s-irusr
+syn keyword tl_keyword contained s-irwxg s-irwxo s-irwxu s-isgid
+syn keyword tl_keyword contained s-isuid s-isvtx s-iwgrp s-iwoth
+syn keyword tl_keyword contained s-iwusr s-ixgrp s-ixoth s-ixusr
+syn keyword tl_keyword contained save-exe sbit scan-until-match search
+syn keyword tl_keyword contained search-regex search-regst search-str search-str-tree
+syn keyword tl_keyword contained second seek-cur seek-end seek-set
 syn keyword tl_keyword contained seek-stream select self-load-path self-path
 syn keyword tl_keyword contained seq-begin seq-next seq-reset seqp
 syn keyword tl_keyword contained set set-diff set-hash-userdata set-indent
@@ -429,129 +458,129 @@ syn keyword tl_keyword contained sys:%bin-ops% sys:%block-using-funs% sys:%call-
 syn keyword tl_keyword contained sys:%file-suff-rx% sys:%gcall-op% sys:%imm-width% sys:%lev-bits%
 syn keyword tl_keyword contained sys:%lev-size% 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% sys:%oc-list-builder% sys:%package-manip%
-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:*op-ctx* sys:*pl-env* sys:*trace-hash*
-syn keyword tl_keyword contained sys:*trace-level* sys:abscond* sys:abscond-from sys:analyze-argtypes
-syn keyword tl_keyword contained sys:analyze-params sys:apply sys:asm-error sys:assumed-fun
-syn keyword tl_keyword contained sys:awk%--rng sys:awk%--rng+ sys:awk%--rng- sys:awk%-rng+
-syn keyword tl_keyword contained sys:awk%rng+ sys:awk-code-move-check sys:awk-error sys:awk-expander
-syn keyword tl_keyword contained sys:awk-fun-let sys:awk-fun-shadowing-env sys:awk-mac-let sys:awk-redir
-syn keyword tl_keyword contained sys:awk-test 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:b> sys:bad-slot-syntax sys:bind-mac-check
-syn keyword tl_keyword contained sys:bind-mac-error sys:bits sys:bits-to-obj sys:build-key-list
-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:compare-swap sys:compat
-syn keyword tl_keyword contained sys:compile-in-toplevel 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:deffi-cb-expander sys:define-method sys:defopcode sys:defopcode-derived
-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-path-test sys:dvbind sys:dwim-del
-syn keyword tl_keyword contained sys:dwim-set 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-struct-lit sys:make-struct-type sys:mark-special
-syn keyword tl_keyword contained sys:maybe-mov sys:misleading-ref-check sys:name-str sys:new-expander
-syn keyword tl_keyword contained sys:new-type sys:obtain-impl sys:op-alpha-rename sys:op-expand
-syn keyword tl_keyword contained sys:op-meta-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 sys:path-test-mode sys:pl-expand
-syn keyword tl_keyword contained sys:placelet-1 sys:print-backtrace sys:propagate-ancestor 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:reg-expand-nongreedy sys:reg-optimize sys:register-opcode sys:register-simple-accessor
-syn keyword tl_keyword contained sys:repl sys:rplaca sys:rplacd sys:rslotset
-syn keyword tl_keyword contained sys:rt-defmacro sys:rt-defsymacro sys:rt-defun sys:rt-defvarl
-syn keyword tl_keyword contained sys:rt-load-for sys:rt-pprof sys:set-hash-rec-limit sys:set-hash-str-limit
-syn keyword tl_keyword contained sys:set-macro-ancestor sys:setq sys:setqf sys:shut-rd
-syn keyword tl_keyword contained sys:shut-rdwr sys:shut-wr sys:slot-types sys:small-op-p
-syn keyword tl_keyword contained sys:small-op-to-sym sys:splice sys:static-slot-types sys:str-inaddr-net-impl
-syn keyword tl_keyword contained sys:struct-lit sys:switch sys:sym-clobber-expander sys:sym-delete-expander
-syn keyword tl_keyword contained sys:sym-update-expander sys:system-symbol-p sys:test-clear sys:test-dec
-syn keyword tl_keyword contained sys:test-inc sys:test-set 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:trfm
-syn keyword tl_keyword contained sys:try-load sys:txr-case-impl sys:unquote sys:untrace
-syn keyword tl_keyword contained sys:upenv sys:uw-block sys:uw-captured-block sys:uw-catch
-syn keyword tl_keyword contained sys:uw-cont-copy sys:uw-eval sys:uw-expand sys:uw-fcall
-syn keyword tl_keyword contained sys:uw-guard sys:uw-handle sys:uw-menv sys:var
-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:with-dyn-lib-check sys:with-lev-idx
-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 take take-until take-while
-syn keyword tl_keyword contained tan tb tc tcdrain
-syn keyword tl_keyword contained tcflow tcflush tcgetattr tciflush
-syn keyword tl_keyword contained tcioff tcioflush tcion tcoflush
-syn keyword tl_keyword contained tcooff tcoon tcsadrain tcsaflush
-syn keyword tl_keyword contained tcsanow tcsendbreak tcsetattr tentative-def-exists
-syn keyword tl_keyword contained tenth test-clear-dirty test-dirty test-neq-set-indent-mode
-syn keyword tl_keyword contained test-set-indent-mode tf third throw
-syn keyword tl_keyword contained throwf time time-fields-local time-fields-utc
-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 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-bind
-syn keyword tl_keyword contained tree-case tree-find 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-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-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 unum-carray unuse-package unuse-sym unwind-protect
-syn keyword tl_keyword contained upcase-str upd update uref
-syn keyword tl_keyword contained url-decode url-encode use use-package
-syn keyword tl_keyword contained use-sym user-package ushort usl
-syn keyword tl_keyword contained usleep uslot 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 zero-fill
-syn keyword tl_keyword contained zerop zip znew
+syn keyword tl_keyword contained sys:%oc-hash% sys:%oc-list-builder% sys:%package-manip% sys:%sm-lev-bits%
+syn keyword tl_keyword contained sys:%sm-lev-size% sys:%test-funs% sys:%test-funs-neg% sys:%test-funs-ops%
+syn keyword tl_keyword contained sys:%test-funs-pos% sys:%test-inv% sys:%test-opcode% sys:%tlo-ver%
+syn keyword tl_keyword contained sys:*dedup* sys:*emit* sys:*eval* sys:*load-recursive*
+syn keyword tl_keyword contained sys:*op-ctx* sys:*pl-env* 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-key-list 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:compare-swap sys:compat sys:compile-in-toplevel
+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:defopcode sys:defopcode-derived sys:defset-expander
+syn keyword tl_keyword contained sys:defset-expander-simple sys:disassemble-cdf sys:dlib-expr sys:do-conv
+syn keyword tl_keyword contained sys:do-path-test sys:dvbind sys:dwim-del sys:dwim-set
+syn keyword tl_keyword contained sys:each-op sys:enc-small-op sys:ensure-op-arg sys:env-to-let
+syn keyword tl_keyword contained sys:eval-err 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-handle sys:expand-params sys:expand-quasi
+syn keyword tl_keyword contained sys:expand-quasi-args sys:expand-quasi-mods sys:expand-sym-ref sys:expr
+syn keyword tl_keyword contained sys:extract-keys sys:extract-keys-p sys:fbind sys:fmt-flex
+syn keyword tl_keyword contained sys:fmt-join sys:fmt-simple sys:for-op sys:gc
+syn keyword tl_keyword contained sys:gc-set-delta sys:get-buf-common sys:get-fun-getter-setter sys:get-mb
+syn keyword tl_keyword contained sys:get-parser sys:get-place-macro sys:get-vb sys:getopts-error
+syn keyword tl_keyword contained sys:handle-bad-syntax sys:hlet-expand sys:if-to-cond sys:in6addr-condensed-text
+syn keyword tl_keyword contained sys:is-label sys:l1-setq sys:l1-val sys:lambda-apply-transform
+syn keyword tl_keyword contained sys:lambda-short-apply-list sys:lambda-too-few-args sys:lambda-too-many-args sys:lbind
+syn keyword tl_keyword contained sys:lisp1-setq sys:lisp1-value sys:list-builder-flets sys:list-from-vm-desc
+syn keyword tl_keyword contained sys:load-time-lit sys:loc sys:mac-env-flatten sys:make-anon-package
+syn keyword tl_keyword contained sys:make-struct-lit sys:make-struct-type sys:mark-special sys:maybe-mov
+syn keyword tl_keyword contained sys:misleading-ref-check sys:name-str sys:new-expander sys:new-type
+syn keyword tl_keyword contained sys:obtain-impl sys:op-alpha-rename sys:op-expand sys:op-meta-p
+syn keyword tl_keyword contained sys:open-compile-streams sys:operand-to-exp sys:operand-to-sym sys:opip-expand
+syn keyword tl_keyword contained sys:opt-dash sys:opt-err sys:parse-compound-operand 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 sys:path-test-mode sys:pl-expand sys:placelet-1
+syn keyword tl_keyword contained sys:print-backtrace sys:propagate-ancestor sys:prune-missing-inits sys:qquote
+syn keyword tl_keyword contained sys:quasi sys:quasilist sys:r-s-let-expander 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:rplaca sys:rplacd sys:rslotset sys:rt-defmacro
+syn keyword tl_keyword contained sys:rt-defsymacro sys:rt-defun sys:rt-defvarl sys:rt-load-for
+syn keyword tl_keyword contained sys:rt-pprof sys:set-hash-rec-limit sys:set-hash-str-limit sys:set-macro-ancestor
+syn keyword tl_keyword contained sys:setq sys:setqf sys:shut-rd sys:shut-rdwr
+syn keyword tl_keyword contained sys:shut-wr 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:switch sys:sym-clobber-expander sys:sym-delete-expander sys:sym-update-expander
+syn keyword tl_keyword contained sys:system-symbol-p sys:test-clear sys:test-dec sys:test-inc
+syn keyword tl_keyword contained sys:test-set sys:top-fb sys:top-mb sys:top-vb
+syn keyword tl_keyword contained sys:tr* sys:trace sys:trace-canonicalize-name sys:trace-enter
+syn keyword tl_keyword contained sys:trace-leave sys:trace-redefine-check sys:trfm 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:vm-closure-desc
+syn keyword tl_keyword contained sys:vm-closure-entry sys:vm-desc-bytecode sys:vm-desc-datavec sys:vm-desc-nlevels
+syn keyword tl_keyword contained sys:vm-desc-nregs sys:vm-desc-symvec sys:vm-execute-toplevel sys:vm-make-desc
+syn keyword tl_keyword contained sys:wdwrap sys:with-dyn-lib-check sys:with-lev-idx syslog
+syn keyword tl_keyword contained system-package t tab0 tab1
+syn keyword tl_keyword contained tab2 tab3 tabdly tagbody
+syn keyword tl_keyword contained take take-until take-while tan
+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-dirty test-dirty test-neq-set-indent-mode 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-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 to tofloat tofloatz toint
+syn keyword tl_keyword contained tointz tok tok-str tok-where
+syn keyword tl_keyword contained tostop tostring tostringp tprint
+syn keyword tl_keyword contained trace transpose tree-bind tree-case
+syn keyword tl_keyword contained tree-find trie-add trie-compress trie-lookup-begin
+syn keyword tl_keyword contained trie-lookup-feed-char trie-value-at 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-path
+syn keyword tl_keyword contained txr-version txr-when typecase typedef
+syn keyword tl_keyword contained typeof typep ubit uchar
+syn keyword tl_keyword contained uid-t uint 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 unum-carray
+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 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 zero-fill zerop
+syn keyword tl_keyword contained 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 f1467f60..6d409c02 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 2019-05-20 "Utility Commands" "TXR Programming Language" "Kaz Kylheku"
+.TH TXR 1 2019-06-10 "Utility Commands" "TXR Programming Language" "Kaz Kylheku"
 .SH* NAME
-\*(TX \- Programming Language (Version 216)
+\*(TX \- Programming Language (Version 217)
 
 .SH* SYNOPSIS
 .mono
@@ -65463,7 +65463,7 @@ that version.
 
 Version 199 produces version 3 files and loads version 2 or 3.
 
-Versions 200 through 216 produce version 4 files and load version 2, 3 or 4.
+Versions 200 through 217 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 172a1b19..ad6db780 100644
--- a/txr.vim
+++ b/txr.vim
@@ -135,54 +135,78 @@ syn keyword tl_keyword contained chr-isunisp chr-isupper chr-isxdigit chr-num
 syn keyword tl_keyword contained chr-str chr-str-set chr-tolower chr-toupper
 syn keyword tl_keyword contained chr-xdigit chrp clamp clear-dirty
 syn keyword tl_keyword contained clear-error clear-struct clearhash clocal
-syn keyword tl_keyword contained clock-t clockid-t close-stream closelog
-syn keyword tl_keyword contained closure cmp-str cmspar collect-each
-syn keyword tl_keyword contained collect-each* comb command-get command-get-buf
-syn keyword tl_keyword contained command-get-lines command-get-string command-put command-put-buf
-syn keyword tl_keyword contained command-put-lines command-put-string compile compile-defr-warning
-syn keyword tl_keyword contained compile-error compile-file compile-only compile-toplevel
-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 copy copy-alist
-syn keyword tl_keyword contained copy-buf copy-carray copy-cons copy-fun
-syn keyword tl_keyword contained copy-hash copy-list copy-str copy-struct
-syn keyword tl_keyword contained copy-vec cos count-if count-until-match
-syn keyword tl_keyword contained countq countql countqual cptr
-syn keyword tl_keyword contained cptr-cast cptr-free cptr-int cptr-null
-syn keyword tl_keyword contained cptr-obj cptr-size-hint cptr-type cptr-zap
-syn keyword tl_keyword contained cptrp cr0 cr1 cr2
-syn keyword tl_keyword contained cr3 crdly cread crtscts
-syn keyword tl_keyword contained crypt cs5 cs6 cs7
-syn keyword tl_keyword contained cs8 csize cstopb cum-norm-dist
-syn keyword tl_keyword contained daemon dec defer-warning defex
-syn keyword tl_keyword contained deffi deffi-cb deffi-cb-unsafe deffi-sym
-syn keyword tl_keyword contained deffi-type deffi-var define-accessor define-modify-macro
-syn keyword tl_keyword contained define-param-expander define-place-macro defmacro defmeth
-syn keyword tl_keyword contained defpackage defparm defparml defplace
-syn keyword tl_keyword contained defset defstruct defsymacro defun
-syn keyword tl_keyword contained defvar defvarl del delay
-syn keyword tl_keyword contained delete-package dev-t diff digits
-syn keyword tl_keyword contained digpow dir-name disassemble display-width
-syn keyword tl_keyword contained divides dlclose dlopen dlsym
-syn keyword tl_keyword contained dlsym-checked dlvsym dlvsym-checked do
-syn keyword tl_keyword contained dohash doloop doloop* dotimes
-syn keyword tl_keyword contained double downcase-str drop drop-until
-syn keyword tl_keyword contained drop-while dump-compiled-objects dump-deferred-warnings dump-to-tlo
-syn keyword tl_keyword contained dup dupfd dwim each
-syn keyword tl_keyword contained each* echo echoctl echoe
-syn keyword tl_keyword contained echok echoke echonl echoprt
-syn keyword tl_keyword contained eighth elemsize elemtype empty
-syn keyword tl_keyword contained endgrent endp endpwent ends-with
-syn keyword tl_keyword contained ensure-dir enum enumed env
-syn keyword tl_keyword contained env-fbind env-fbindings env-hash env-next
-syn keyword tl_keyword contained env-vbind env-vbindings eq eql
-syn keyword tl_keyword contained equal equot errno error
-syn keyword tl_keyword contained eval eval-only evenp exception-subtype-map
-syn keyword tl_keyword contained exception-subtype-p exec exit exit*
-syn keyword tl_keyword contained exp expand expand* expand-left
-syn keyword tl_keyword contained expand-right expand-with-free-refs expt exptmod
-syn keyword tl_keyword contained extproc f$ f^ f^$
-syn keyword tl_keyword contained false fboundp ff0 ff1
+syn keyword tl_keyword contained clock-t clockid-t close close-stream
+syn keyword tl_keyword contained closelog closure cmp-str cmspar
+syn keyword tl_keyword contained collect-each collect-each* comb command-get
+syn keyword tl_keyword contained command-get-buf command-get-lines command-get-string command-put
+syn keyword tl_keyword contained command-put-buf command-put-lines command-put-string compile
+syn keyword tl_keyword contained compile-defr-warning compile-error compile-file compile-only
+syn keyword tl_keyword contained compile-toplevel compile-warning compl-span-str cond
+syn keyword tl_keyword contained conda condlet cons conses
+syn keyword tl_keyword contained conses* consp constantp copy
+syn keyword tl_keyword contained copy-alist copy-buf copy-carray copy-cons
+syn keyword tl_keyword contained copy-fun copy-hash copy-list copy-str
+syn keyword tl_keyword contained copy-struct copy-vec cos count-if
+syn keyword tl_keyword contained count-until-match countq countql countqual
+syn keyword tl_keyword contained cptr cptr-cast cptr-free cptr-int
+syn keyword tl_keyword contained cptr-null cptr-obj cptr-size-hint cptr-type
+syn keyword tl_keyword contained cptr-zap cptrp cr0 cr1
+syn keyword tl_keyword contained cr2 cr3 crdly cread
+syn keyword tl_keyword contained crtscts crypt cs5 cs6
+syn keyword tl_keyword contained cs7 cs8 csize cstopb
+syn keyword tl_keyword contained cum-norm-dist daemon dec defer-warning
+syn keyword tl_keyword contained defex deffi deffi-cb deffi-cb-unsafe
+syn keyword tl_keyword contained deffi-sym deffi-type deffi-var define-accessor
+syn keyword tl_keyword contained define-modify-macro define-param-expander define-place-macro defmacro
+syn keyword tl_keyword contained defmeth defpackage defparm defparml
+syn keyword tl_keyword contained defplace defset defstruct defsymacro
+syn keyword tl_keyword contained defun defvar defvarl del
+syn keyword tl_keyword contained delay delete-package dev-t diff
+syn keyword tl_keyword contained digits digpow dir-name disassemble
+syn keyword tl_keyword contained display-width divides dlclose dlopen
+syn keyword tl_keyword contained dlsym dlsym-checked dlvsym dlvsym-checked
+syn keyword tl_keyword contained do dohash doloop doloop*
+syn keyword tl_keyword contained dotimes double downcase-str drop
+syn keyword tl_keyword contained drop-until drop-while dump-compiled-objects dump-deferred-warnings
+syn keyword tl_keyword contained dump-to-tlo dup dupfd dwim
+syn keyword tl_keyword contained e2big eacces each each*
+syn keyword tl_keyword contained eaddrinuse eaddrnotavail eafnosupport eagain
+syn keyword tl_keyword contained ealready ebadf ebadmsg ebusy
+syn keyword tl_keyword contained ecanceled echild echo echoctl
+syn keyword tl_keyword contained echoe echok echoke echonl
+syn keyword tl_keyword contained echoprt econnaborted econnrefused econnreset
+syn keyword tl_keyword contained edeadlk edestaddrreq edom edquot
+syn keyword tl_keyword contained eexist efault efbig ehostunreach
+syn keyword tl_keyword contained eidrm eighth eilseq einprogress
+syn keyword tl_keyword contained eintr einval eio eisconn
+syn keyword tl_keyword contained eisdir elemsize elemtype eloop
+syn keyword tl_keyword contained emfile emlink empty emsgsize
+syn keyword tl_keyword contained emultihop enametoolong endgrent endp
+syn keyword tl_keyword contained endpwent ends-with enetdown enetreset
+syn keyword tl_keyword contained enetunreach enfile enobufs enodata
+syn keyword tl_keyword contained enodev enoent enoexec enolck
+syn keyword tl_keyword contained enolink enomem enomsg enoprotoopt
+syn keyword tl_keyword contained enospc enosr enostr enosys
+syn keyword tl_keyword contained enotconn enotdir enotempty enotrecoverable
+syn keyword tl_keyword contained enotsock enotsup enotty ensure-dir
+syn keyword tl_keyword contained enum enumed env env-fbind
+syn keyword tl_keyword contained env-fbindings env-hash env-next env-vbind
+syn keyword tl_keyword contained env-vbindings enxio eopnotsupp eoverflow
+syn keyword tl_keyword contained eownerdead eperm epipe eproto
+syn keyword tl_keyword contained eprotonosupport eprototype eq eql
+syn keyword tl_keyword contained equal equot erange erofs
+syn keyword tl_keyword contained errno error espipe esrch
+syn keyword tl_keyword contained estale etime etimedout etxtbsy
+syn keyword tl_keyword contained eval eval-only evenp ewouldblock
+syn keyword tl_keyword contained exception-subtype-map exception-subtype-p exdev exec
+syn keyword tl_keyword contained exit exit* exp expand
+syn keyword tl_keyword contained expand* expand-left expand-right expand-with-free-refs
+syn keyword tl_keyword contained expt exptmod extproc f$
+syn keyword tl_keyword contained f-dupfd f-dupfd-cloexec f-getfd f-getfl
+syn keyword tl_keyword contained f-getlk f-rdlck f-setfd f-setfl
+syn keyword tl_keyword contained f-setlk f-setlkw f-unlck f-wrlck
+syn keyword tl_keyword contained f^ f^$ false fboundp
+syn keyword tl_keyword contained fcntl fd-cloexec ff0 ff1
 syn keyword tl_keyword contained ffdly ffi ffi-alignof ffi-arraysize
 syn keyword tl_keyword contained ffi-call ffi-elemsize ffi-elemtype ffi-get
 syn keyword tl_keyword contained ffi-in ffi-make-call-desc ffi-make-closure ffi-offsetof
@@ -310,77 +334,82 @@ syn keyword tl_keyword contained nl1 nldly nlink-t noflsh
 syn keyword tl_keyword contained none not notf nreconc
 syn keyword tl_keyword contained nreverse nth nthcdr nthlast
 syn keyword tl_keyword contained null nullify num-carray num-chr
-syn keyword tl_keyword contained num-str numberp nzerop oand
-syn keyword tl_keyword contained obtain obtain* obtain*-block obtain-block
-syn keyword tl_keyword contained ocrnl oddp ofdel off-t
-syn keyword tl_keyword contained offsetof ofill olcuc onlcr
-syn keyword tl_keyword contained onlret onocr op open-command
-syn keyword tl_keyword contained open-directory open-file open-fileno open-files
-syn keyword tl_keyword contained open-files* open-pipe open-process open-socket
-syn keyword tl_keyword contained open-socket-pair open-tail openlog opip
-syn keyword tl_keyword contained opost opt opthelp or
-syn keyword tl_keyword contained orf package-alist package-fallback-list package-foreign-symbols
-syn keyword tl_keyword contained package-local-symbols package-name package-symbols packagep
-syn keyword tl_keyword contained pad parenb parmrk parodd
-syn keyword tl_keyword contained partition partition* partition-by path-blkdev-p
-syn keyword tl_keyword contained path-cat path-chrdev-p path-dir-p path-executable-to-me-p
-syn keyword tl_keyword contained path-exists-p path-file-p path-mine-p path-my-group-p
-syn keyword tl_keyword contained path-newer path-older path-pipe-p path-private-to-me-p
-syn keyword tl_keyword contained path-read-writable-to-me-p path-readable-to-me-p path-same-object path-sep-chars
-syn keyword tl_keyword contained path-setgid-p path-setuid-p path-sock-p path-sticky-p
-syn keyword tl_keyword contained path-strictly-private-to-me-p path-symlink-p path-writable-to-me-p pdec
-syn keyword tl_keyword contained pendin perm pid-t pinc
-syn keyword tl_keyword contained pipe place-form-p placelet placelet*
-syn keyword tl_keyword contained plist-to-alist plusp poll poll-err
-syn keyword tl_keyword contained poll-in poll-nval poll-out poll-pri
-syn keyword tl_keyword contained poll-rdband poll-rdhup poll-wrband poly
-syn keyword tl_keyword contained pop pos pos-if pos-max
-syn keyword tl_keyword contained pos-min posq posql posqual
-syn keyword tl_keyword contained pppred ppred pprinl pprint
-syn keyword tl_keyword contained pprof pred prinl print
-syn keyword tl_keyword contained prod prof prog prog*
-syn keyword tl_keyword contained prog1 progn promisep prop
-syn keyword tl_keyword contained proper-list-p proper-listp pset ptr
-syn keyword tl_keyword contained ptr-in ptr-in-d ptr-out ptr-out-d
-syn keyword tl_keyword contained ptr-out-s ptrdiff-t pub:txr-sym pure-rel-path-p
-syn keyword tl_keyword contained purge-deferred-warning push pushhash pushnew
-syn keyword tl_keyword contained put-buf put-byte put-carray put-char
-syn keyword tl_keyword contained put-line put-lines put-obj put-string
-syn keyword tl_keyword contained put-strings pwd qquote qref
-syn keyword tl_keyword contained quote r$ r^ r^$
-syn keyword tl_keyword contained raise rand random random-fixnum
-syn keyword tl_keyword contained random-float random-state-get-vec random-state-p range
-syn keyword tl_keyword contained range* range-regex rangep rassoc
-syn keyword tl_keyword contained rassql rcomb rcons read
-syn keyword tl_keyword contained read-until-match readlink real-time-stream-p realpath
-syn keyword tl_keyword contained record-adapter reduce-left reduce-right ref
-syn keyword tl_keyword contained refset regex-compile regex-from-trie regex-parse
-syn keyword tl_keyword contained regex-prefix-match regex-source regexp register-exception-subtypes
-syn keyword tl_keyword contained register-tentative-def regsub rehome-sym relate
-syn keyword tl_keyword contained release-deferred-warnings remhash remove-if remove-if*
-syn keyword tl_keyword contained remove-path remq remq* remql
-syn keyword tl_keyword contained remql* remqual remqual* rename-path
-syn keyword tl_keyword contained repeat replace replace-list replace-str
-syn keyword tl_keyword contained replace-struct replace-vec reset-struct rest
-syn keyword tl_keyword contained ret retf return return*
-syn keyword tl_keyword contained return-from revappend reverse rfind
-syn keyword tl_keyword contained rfind-if rlcp rlcp-tree rlet
-syn keyword tl_keyword contained rlist rlist* rmember rmember-if
-syn keyword tl_keyword contained rmemq rmemql rmemqual rmismatch
-syn keyword tl_keyword contained rotate round round-rem rperm
-syn keyword tl_keyword contained rplaca rplacd rpoly rpos
-syn keyword tl_keyword contained rpos-if rposq rposql rposqual
-syn keyword tl_keyword contained rr rra rsearch rslot
-syn keyword tl_keyword contained rtld-deepbind rtld-global rtld-lazy rtld-local
-syn keyword tl_keyword contained rtld-nodelete rtld-noload rtld-now run
-syn keyword tl_keyword contained s-ifblk s-ifchr s-ifdir s-ififo
-syn keyword tl_keyword contained s-iflnk s-ifmt s-ifreg s-ifsock
-syn keyword tl_keyword contained s-irgrp s-iroth s-irusr s-irwxg
-syn keyword tl_keyword contained s-irwxo s-irwxu s-isgid s-isuid
-syn keyword tl_keyword contained s-isvtx s-iwgrp s-iwoth s-iwusr
-syn keyword tl_keyword contained s-ixgrp s-ixoth s-ixusr save-exe
-syn keyword tl_keyword contained sbit scan-until-match search search-regex
-syn keyword tl_keyword contained search-regst search-str search-str-tree second
+syn keyword tl_keyword contained num-str numberp nzerop o-accmode
+syn keyword tl_keyword contained o-append o-async o-cloexec o-creat
+syn keyword tl_keyword contained o-direct o-directory o-noatime o-noctty
+syn keyword tl_keyword contained o-nofollow o-nonblock o-path o-rdonly
+syn keyword tl_keyword contained o-rdwr o-sync o-trunc o-wronly
+syn keyword tl_keyword contained oand obtain obtain* obtain*-block
+syn keyword tl_keyword contained obtain-block ocrnl oddp ofdel
+syn keyword tl_keyword contained off-t offsetof ofill olcuc
+syn keyword tl_keyword contained onlcr onlret onocr op
+syn keyword tl_keyword contained open-command open-directory open-file open-fileno
+syn keyword tl_keyword contained open-files open-files* open-pipe open-process
+syn keyword tl_keyword contained open-socket open-socket-pair open-tail openlog
+syn keyword tl_keyword contained opip opost opt opthelp
+syn keyword tl_keyword contained or orf package-alist package-fallback-list
+syn keyword tl_keyword contained package-foreign-symbols package-local-symbols package-name package-symbols
+syn keyword tl_keyword contained packagep pad parenb parmrk
+syn keyword tl_keyword contained parodd partition partition* partition-by
+syn keyword tl_keyword contained path-blkdev-p path-cat path-chrdev-p path-dir-p
+syn keyword tl_keyword contained path-executable-to-me-p path-exists-p path-file-p path-mine-p
+syn keyword tl_keyword contained path-my-group-p path-newer path-older path-pipe-p
+syn keyword tl_keyword contained path-private-to-me-p path-read-writable-to-me-p path-readable-to-me-p path-same-object
+syn keyword tl_keyword contained path-sep-chars path-setgid-p path-setuid-p path-sock-p
+syn keyword tl_keyword contained path-sticky-p path-strictly-private-to-me-p path-symlink-p path-writable-to-me-p
+syn keyword tl_keyword contained pdec pendin perm pid-t
+syn keyword tl_keyword contained pinc pipe place-form-p placelet
+syn keyword tl_keyword contained placelet* plist-to-alist plusp poll
+syn keyword tl_keyword contained poll-err poll-in poll-nval poll-out
+syn keyword tl_keyword contained poll-pri poll-rdband poll-rdhup poll-wrband
+syn keyword tl_keyword contained poly pop pos pos-if
+syn keyword tl_keyword contained pos-max pos-min posq posql
+syn keyword tl_keyword contained posqual pppred ppred pprinl
+syn keyword tl_keyword contained pprint pprof pred prinl
+syn keyword tl_keyword contained print prod prof prog
+syn keyword tl_keyword contained prog* prog1 progn promisep
+syn keyword tl_keyword contained prop proper-list-p proper-listp pset
+syn keyword tl_keyword contained ptr ptr-in ptr-in-d ptr-out
+syn keyword tl_keyword contained ptr-out-d ptr-out-s ptrdiff-t pub:txr-sym
+syn keyword tl_keyword contained pure-rel-path-p purge-deferred-warning push pushhash
+syn keyword tl_keyword contained pushnew put-buf put-byte put-carray
+syn keyword tl_keyword contained put-char put-line put-lines put-obj
+syn keyword tl_keyword contained put-string put-strings pwd qquote
+syn keyword tl_keyword contained qref quote r$ r^
+syn keyword tl_keyword contained r^$ raise rand random
+syn keyword tl_keyword contained random-fixnum random-float random-state-get-vec random-state-p
+syn keyword tl_keyword contained range range* range-regex rangep
+syn keyword tl_keyword contained rassoc rassql rcomb rcons
+syn keyword tl_keyword contained read read-until-match readlink real-time-stream-p
+syn keyword tl_keyword contained realpath record-adapter reduce-left reduce-right
+syn keyword tl_keyword contained ref refset regex-compile regex-from-trie
+syn keyword tl_keyword contained regex-parse regex-prefix-match regex-source regexp
+syn keyword tl_keyword contained register-exception-subtypes register-tentative-def regsub rehome-sym
+syn keyword tl_keyword contained relate release-deferred-warnings remhash remove-if
+syn keyword tl_keyword contained remove-if* remove-path remq remq*
+syn keyword tl_keyword contained remql remql* remqual remqual*
+syn keyword tl_keyword contained rename-path repeat replace replace-list
+syn keyword tl_keyword contained replace-str replace-struct replace-vec reset-struct
+syn keyword tl_keyword contained rest ret retf return
+syn keyword tl_keyword contained return* return-from revappend reverse
+syn keyword tl_keyword contained rfind rfind-if rlcp rlcp-tree
+syn keyword tl_keyword contained rlet rlist rlist* rmember
+syn keyword tl_keyword contained rmember-if rmemq rmemql rmemqual
+syn keyword tl_keyword contained rmismatch rotate round round-rem
+syn keyword tl_keyword contained rperm rplaca rplacd rpoly
+syn keyword tl_keyword contained rpos rpos-if rposq rposql
+syn keyword tl_keyword contained rposqual rr rra rsearch
+syn keyword tl_keyword contained rslot rtld-deepbind rtld-global rtld-lazy
+syn keyword tl_keyword contained rtld-local rtld-nodelete rtld-noload rtld-now
+syn keyword tl_keyword contained run s-ifblk s-ifchr s-ifdir
+syn keyword tl_keyword contained s-ififo s-iflnk s-ifmt s-ifreg
+syn keyword tl_keyword contained s-ifsock s-irgrp s-iroth s-irusr
+syn keyword tl_keyword contained s-irwxg s-irwxo s-irwxu s-isgid
+syn keyword tl_keyword contained s-isuid s-isvtx s-iwgrp s-iwoth
+syn keyword tl_keyword contained s-iwusr s-ixgrp s-ixoth s-ixusr
+syn keyword tl_keyword contained save-exe sbit scan-until-match search
+syn keyword tl_keyword contained search-regex search-regst search-str search-str-tree
+syn keyword tl_keyword contained second seek-cur seek-end seek-set
 syn keyword tl_keyword contained seek-stream select self-load-path self-path
 syn keyword tl_keyword contained seq-begin seq-next seq-reset seqp
 syn keyword tl_keyword contained set set-diff set-hash-userdata set-indent
@@ -429,129 +458,129 @@ syn keyword tl_keyword contained sys:%bin-ops% sys:%block-using-funs% sys:%call-
 syn keyword tl_keyword contained sys:%file-suff-rx% sys:%gcall-op% sys:%imm-width% sys:%lev-bits%
 syn keyword tl_keyword contained sys:%lev-size% 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% sys:%oc-list-builder% sys:%package-manip%
-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:*op-ctx* sys:*pl-env* sys:*trace-hash*
-syn keyword tl_keyword contained sys:*trace-level* sys:abscond* sys:abscond-from sys:analyze-argtypes
-syn keyword tl_keyword contained sys:analyze-params sys:apply sys:asm-error sys:assumed-fun
-syn keyword tl_keyword contained sys:awk%--rng sys:awk%--rng+ sys:awk%--rng- sys:awk%-rng+
-syn keyword tl_keyword contained sys:awk%rng+ sys:awk-code-move-check sys:awk-error sys:awk-expander
-syn keyword tl_keyword contained sys:awk-fun-let sys:awk-fun-shadowing-env sys:awk-mac-let sys:awk-redir
-syn keyword tl_keyword contained sys:awk-test 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:b> sys:bad-slot-syntax sys:bind-mac-check
-syn keyword tl_keyword contained sys:bind-mac-error sys:bits sys:bits-to-obj sys:build-key-list
-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:compare-swap sys:compat
-syn keyword tl_keyword contained sys:compile-in-toplevel 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:deffi-cb-expander sys:define-method sys:defopcode sys:defopcode-derived
-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-path-test sys:dvbind sys:dwim-del
-syn keyword tl_keyword contained sys:dwim-set 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-struct-lit sys:make-struct-type sys:mark-special
-syn keyword tl_keyword contained sys:maybe-mov sys:misleading-ref-check sys:name-str sys:new-expander
-syn keyword tl_keyword contained sys:new-type sys:obtain-impl sys:op-alpha-rename sys:op-expand
-syn keyword tl_keyword contained sys:op-meta-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 sys:path-test-mode sys:pl-expand
-syn keyword tl_keyword contained sys:placelet-1 sys:print-backtrace sys:propagate-ancestor 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:reg-expand-nongreedy sys:reg-optimize sys:register-opcode sys:register-simple-accessor
-syn keyword tl_keyword contained sys:repl sys:rplaca sys:rplacd sys:rslotset
-syn keyword tl_keyword contained sys:rt-defmacro sys:rt-defsymacro sys:rt-defun sys:rt-defvarl
-syn keyword tl_keyword contained sys:rt-load-for sys:rt-pprof sys:set-hash-rec-limit sys:set-hash-str-limit
-syn keyword tl_keyword contained sys:set-macro-ancestor sys:setq sys:setqf sys:shut-rd
-syn keyword tl_keyword contained sys:shut-rdwr sys:shut-wr sys:slot-types sys:small-op-p
-syn keyword tl_keyword contained sys:small-op-to-sym sys:splice sys:static-slot-types sys:str-inaddr-net-impl
-syn keyword tl_keyword contained sys:struct-lit sys:switch sys:sym-clobber-expander sys:sym-delete-expander
-syn keyword tl_keyword contained sys:sym-update-expander sys:system-symbol-p sys:test-clear sys:test-dec
-syn keyword tl_keyword contained sys:test-inc sys:test-set 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:trfm
-syn keyword tl_keyword contained sys:try-load sys:txr-case-impl sys:unquote sys:untrace
-syn keyword tl_keyword contained sys:upenv sys:uw-block sys:uw-captured-block sys:uw-catch
-syn keyword tl_keyword contained sys:uw-cont-copy sys:uw-eval sys:uw-expand sys:uw-fcall
-syn keyword tl_keyword contained sys:uw-guard sys:uw-handle sys:uw-menv sys:var
-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:with-dyn-lib-check sys:with-lev-idx
-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 take take-until take-while
-syn keyword tl_keyword contained tan tb tc tcdrain
-syn keyword tl_keyword contained tcflow tcflush tcgetattr tciflush
-syn keyword tl_keyword contained tcioff tcioflush tcion tcoflush
-syn keyword tl_keyword contained tcooff tcoon tcsadrain tcsaflush
-syn keyword tl_keyword contained tcsanow tcsendbreak tcsetattr tentative-def-exists
-syn keyword tl_keyword contained tenth test-clear-dirty test-dirty test-neq-set-indent-mode
-syn keyword tl_keyword contained test-set-indent-mode tf third throw
-syn keyword tl_keyword contained throwf time time-fields-local time-fields-utc
-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 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-bind
-syn keyword tl_keyword contained tree-case tree-find 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-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-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 unum-carray unuse-package unuse-sym unwind-protect
-syn keyword tl_keyword contained upcase-str upd update uref
-syn keyword tl_keyword contained url-decode url-encode use use-package
-syn keyword tl_keyword contained use-sym user-package ushort usl
-syn keyword tl_keyword contained usleep uslot 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 zero-fill
-syn keyword tl_keyword contained zerop zip znew
+syn keyword tl_keyword contained sys:%oc-hash% sys:%oc-list-builder% sys:%package-manip% sys:%sm-lev-bits%
+syn keyword tl_keyword contained sys:%sm-lev-size% sys:%test-funs% sys:%test-funs-neg% sys:%test-funs-ops%
+syn keyword tl_keyword contained sys:%test-funs-pos% sys:%test-inv% sys:%test-opcode% sys:%tlo-ver%
+syn keyword tl_keyword contained sys:*dedup* sys:*emit* sys:*eval* sys:*load-recursive*
+syn keyword tl_keyword contained sys:*op-ctx* sys:*pl-env* 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-key-list 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:compare-swap sys:compat sys:compile-in-toplevel
+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:defopcode sys:defopcode-derived sys:defset-expander
+syn keyword tl_keyword contained sys:defset-expander-simple sys:disassemble-cdf sys:dlib-expr sys:do-conv
+syn keyword tl_keyword contained sys:do-path-test sys:dvbind sys:dwim-del sys:dwim-set
+syn keyword tl_keyword contained sys:each-op sys:enc-small-op sys:ensure-op-arg sys:env-to-let
+syn keyword tl_keyword contained sys:eval-err 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-handle sys:expand-params sys:expand-quasi
+syn keyword tl_keyword contained sys:expand-quasi-args sys:expand-quasi-mods sys:expand-sym-ref sys:expr
+syn keyword tl_keyword contained sys:extract-keys sys:extract-keys-p sys:fbind sys:fmt-flex
+syn keyword tl_keyword contained sys:fmt-join sys:fmt-simple sys:for-op sys:gc
+syn keyword tl_keyword contained sys:gc-set-delta sys:get-buf-common sys:get-fun-getter-setter sys:get-mb
+syn keyword tl_keyword contained sys:get-parser sys:get-place-macro sys:get-vb sys:getopts-error
+syn keyword tl_keyword contained sys:handle-bad-syntax sys:hlet-expand sys:if-to-cond sys:in6addr-condensed-text
+syn keyword tl_keyword contained sys:is-label sys:l1-setq sys:l1-val sys:lambda-apply-transform
+syn keyword tl_keyword contained sys:lambda-short-apply-list sys:lambda-too-few-args sys:lambda-too-many-args sys:lbind
+syn keyword tl_keyword contained sys:lisp1-setq sys:lisp1-value sys:list-builder-flets sys:list-from-vm-desc
+syn keyword tl_keyword contained sys:load-time-lit sys:loc sys:mac-env-flatten sys:make-anon-package
+syn keyword tl_keyword contained sys:make-struct-lit sys:make-struct-type sys:mark-special sys:maybe-mov
+syn keyword tl_keyword contained sys:misleading-ref-check sys:name-str sys:new-expander sys:new-type
+syn keyword tl_keyword contained sys:obtain-impl sys:op-alpha-rename sys:op-expand sys:op-meta-p
+syn keyword tl_keyword contained sys:open-compile-streams sys:operand-to-exp sys:operand-to-sym sys:opip-expand
+syn keyword tl_keyword contained sys:opt-dash sys:opt-err sys:parse-compound-operand 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 sys:path-test-mode sys:pl-expand sys:placelet-1
+syn keyword tl_keyword contained sys:print-backtrace sys:propagate-ancestor sys:prune-missing-inits sys:qquote
+syn keyword tl_keyword contained sys:quasi sys:quasilist sys:r-s-let-expander 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:rplaca sys:rplacd sys:rslotset sys:rt-defmacro
+syn keyword tl_keyword contained sys:rt-defsymacro sys:rt-defun sys:rt-defvarl sys:rt-load-for
+syn keyword tl_keyword contained sys:rt-pprof sys:set-hash-rec-limit sys:set-hash-str-limit sys:set-macro-ancestor
+syn keyword tl_keyword contained sys:setq sys:setqf sys:shut-rd sys:shut-rdwr
+syn keyword tl_keyword contained sys:shut-wr 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:switch sys:sym-clobber-expander sys:sym-delete-expander sys:sym-update-expander
+syn keyword tl_keyword contained sys:system-symbol-p sys:test-clear sys:test-dec sys:test-inc
+syn keyword tl_keyword contained sys:test-set sys:top-fb sys:top-mb sys:top-vb
+syn keyword tl_keyword contained sys:tr* sys:trace sys:trace-canonicalize-name sys:trace-enter
+syn keyword tl_keyword contained sys:trace-leave sys:trace-redefine-check sys:trfm 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:vm-closure-desc
+syn keyword tl_keyword contained sys:vm-closure-entry sys:vm-desc-bytecode sys:vm-desc-datavec sys:vm-desc-nlevels
+syn keyword tl_keyword contained sys:vm-desc-nregs sys:vm-desc-symvec sys:vm-execute-toplevel sys:vm-make-desc
+syn keyword tl_keyword contained sys:wdwrap sys:with-dyn-lib-check sys:with-lev-idx syslog
+syn keyword tl_keyword contained system-package t tab0 tab1
+syn keyword tl_keyword contained tab2 tab3 tabdly tagbody
+syn keyword tl_keyword contained take take-until take-while tan
+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-dirty test-dirty test-neq-set-indent-mode 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-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 to tofloat tofloatz toint
+syn keyword tl_keyword contained tointz tok tok-str tok-where
+syn keyword tl_keyword contained tostop tostring tostringp tprint
+syn keyword tl_keyword contained trace transpose tree-bind tree-case
+syn keyword tl_keyword contained tree-find trie-add trie-compress trie-lookup-begin
+syn keyword tl_keyword contained trie-lookup-feed-char trie-value-at 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-path
+syn keyword tl_keyword contained txr-version txr-when typecase typedef
+syn keyword tl_keyword contained typeof typep ubit uchar
+syn keyword tl_keyword contained uid-t uint 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 unum-carray
+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 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 zero-fill zerop
+syn keyword tl_keyword contained zip znew
 
 syn keyword txr_keyword contained accept all and assert
 syn keyword txr_keyword contained bind block call cases