Version 291.txr-291

* RELNOTES: Updated.

* configure (txr_ver): Bumped version.

* stdlib/ver.tl (lib-version): Bumped.

* txr.1: Bumped version and date.

* txr.vim, tl.vim: Regenerated.

6 files changed, 235 insertions, 211 deletions

diff --git a/RELNOTES b/RELNOTES
index 34deeac0..8045633a 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,27 @@
+                                    TXR 291
+                                   2023-08-06
+
+
+  Features
+
+  - opip macro:
+    - now supports binding variables which are visible
+      to the rest of the chain.
+
+
+  Bugs
+
+  - symbol-function accessor: not supporting functions whose names are not
+    symbols, like (meth ...)
+    - Regression introduced in TXR 290.
+  - compiler: invalid constant folding of load-time values.
+    - Recent regression.
+  - Pattern Language: in output-side @(repeat), inability to specify :vars
+    together with :counter.
+    - Regression dating back to March 2016.
+
+
+
                                     TXR 290
                                    2023-07-29
 
diff --git a/configure b/configure
index 9430f4cc..823fad0a 100755
--- a/configure
+++ b/configure
@@ -631,7 +631,7 @@ chmod a+x reconfigure
 #
 
 
-txr_ver=290
+txr_ver=291
 
 #
 # The all important banner.
diff --git a/stdlib/ver.tl b/stdlib/ver.tl
index e3071899..f1a337f7 100644
--- a/stdlib/ver.tl
+++ b/stdlib/ver.tl
@@ -1,2 +1,2 @@
-(defvarl lib-version 290)
+(defvarl lib-version 291)
 (defvarl *lib-version* lib-version)
diff --git a/tl.vim b/tl.vim
index c7ff6755..ab297a55 100644
--- a/tl.vim
+++ b/tl.vim
@@ -636,109 +636,109 @@ syn keyword tl_keyword contained sys:meth-lambda sys:misleading-ref-check sys:na
 syn keyword tl_keyword contained sys:new-type sys:no-dvbind-eval sys:non-triv-pat-p 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:open-url
-syn keyword tl_keyword contained sys:operand-to-exp sys:operand-to-sym sys:opip-expand sys:opt-controlled-diag
-syn keyword tl_keyword contained sys:opt-dash sys:opt-err sys:orig-form sys:os-symbol
-syn keyword tl_keyword contained sys:param-check sys:parse-compound-operand sys:parse-lambda-match-clause sys:parse-operand
-syn keyword tl_keyword contained sys:pat-len sys:path-access sys:path-examine sys:path-simplify
-syn keyword tl_keyword contained sys:path-split sys:path-test-mode sys:path-test-type sys:path-volume
-syn keyword tl_keyword contained sys:pic-join-opt sys:placelet-1 sys:print-backtrace sys:propagate-ancestor
-syn keyword tl_keyword contained sys:propagate-perms sys:prune-missing-inits sys:qquote sys:quasi
-syn keyword tl_keyword contained sys:quasilist sys:r-s-let-expander sys:reduce-constant sys:reduce-lisp
-syn keyword tl_keyword contained sys:reduce-or sys:reg-expand-nongreedy sys:register-opcode sys:register-simple-accessor
-syn keyword tl_keyword contained sys:repl sys:rewrite sys:rewrite-case sys:rplaca
-syn keyword tl_keyword contained sys:rplacd sys:rslotset sys:rt-assert-fail sys:rt-defmacro
-syn keyword tl_keyword contained sys:rt-defsymacro sys:rt-defun sys:rt-defv sys:rt-defvarl
-syn keyword tl_keyword contained sys:rt-load-for sys:rt-pprof sys:rt-progv sys:safe-abs-path
-syn keyword tl_keyword contained sys:safe-const-eval sys:safe-const-reduce sys:safe-constantp sys:set-hash-traversal-limit
-syn keyword tl_keyword contained sys:set-macro-ancestor sys:set-symbol-value sys:setq sys:setqf
-syn keyword tl_keyword contained sys:simplify-or sys:slot-types sys:small-op-p sys:small-op-to-sym
-syn keyword tl_keyword contained sys:splice sys:static-slot-types sys:str-inaddr-net-impl sys:struct-lit
-syn keyword tl_keyword contained sys:subst-preserve sys:switch sys:sym-clobber-expander sys:sym-delete-expander
-syn keyword tl_keyword contained sys:sym-update-expander sys:system-symbol-p sys:top-fb sys:top-mb
-syn keyword tl_keyword contained sys:top-vb sys:tr* sys:trace sys:trace-canonicalize-name
-syn keyword tl_keyword contained sys:trace-enter sys:trace-leave sys:trace-redefine-check sys:transform-qquote
-syn keyword tl_keyword contained sys:translate-hash-bang sys:tree-construct sys:trfm sys:true-const-p
-syn keyword tl_keyword contained sys:txr-case-impl sys:typecase-expander 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:var-pat-p sys:vars-check sys:vm-closure-desc sys:vm-closure-entry
-syn keyword tl_keyword contained sys:vm-desc-bytecode sys:vm-desc-datavec sys:vm-desc-nlevels sys:vm-desc-nregs
-syn keyword tl_keyword contained sys:vm-desc-symvec sys:vm-execute-toplevel sys:vm-make-desc sys:wdwrap
-syn keyword tl_keyword contained sys:when-exprs-match sys:when-opt sys:with-disabled-debugging sys:with-dyn-lib-check
-syn keyword tl_keyword contained syslog system-package t tab0
-syn keyword tl_keyword contained tab1 tab2 tab3 tabdly
-syn keyword tl_keyword contained tagbody tailp take take-until
-syn keyword tl_keyword contained take-while tan tanh tb
-syn keyword tl_keyword contained tc tcdrain tcflow tcflush
-syn keyword tl_keyword contained tcgetattr tciflush tcioff tcioflush
-syn keyword tl_keyword contained tcion tcoflush tcooff tcoon
-syn keyword tl_keyword contained tcp-nodelay tcsadrain tcsaflush tcsanow
-syn keyword tl_keyword contained tcsendbreak tcsetattr tentative-def-exists tenth
-syn keyword tl_keyword contained test-clear test-clear-dirty test-dec test-dirty
-syn keyword tl_keyword contained test-inc test-neq-set-indent-mode test-set test-set-indent-mode
-syn keyword tl_keyword contained tf tgamma third throw
-syn keyword tl_keyword contained throwf time time-fields-local time-fields-utc
-syn keyword tl_keyword contained time-nsec time-parse time-parse-local time-parse-utc
-syn keyword tl_keyword contained time-str-local time-str-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 tmpfile tnode tnodep to
-syn keyword tl_keyword contained tofloat tofloatz toint tointz
-syn keyword tl_keyword contained tojson tok tok-str tok-where
-syn keyword tl_keyword contained tokn tostop tostring tostringp
-syn keyword tl_keyword contained touch tprint trace transpose
-syn keyword tl_keyword contained tree tree-begin tree-bind tree-case
-syn keyword tl_keyword contained tree-clear tree-count tree-del-min tree-del-min-node
-syn keyword tl_keyword contained tree-delete tree-delete-node tree-delete-specific-node tree-find
-syn keyword tl_keyword contained tree-insert tree-insert-node tree-lookup tree-lookup-node
-syn keyword tl_keyword contained tree-min tree-min-node tree-next tree-peek
-syn keyword tl_keyword contained tree-reset tree-root treep trie-add
-syn keyword tl_keyword contained trie-compress trie-lookup-begin trie-lookup-feed-char trie-value-at
-syn keyword tl_keyword contained trim-left trim-long-suffix trim-path-seps trim-right
-syn keyword tl_keyword contained trim-short-suffix trim-str true trunc
-syn keyword tl_keyword contained trunc-rem truncate-stream tuples tuples*
-syn keyword tl_keyword contained txr-case txr-exe-path txr-if txr-parse
-syn keyword tl_keyword contained txr-path txr-version txr-when typecase
-syn keyword tl_keyword contained typedef typeof typep ubit
-syn keyword tl_keyword contained uchar uid-t uint uint-buf
-syn keyword tl_keyword contained uint-carray uint-ptr-t uint16 uint32
-syn keyword tl_keyword contained uint64 uint8 uintmax-t ulong
-syn keyword tl_keyword contained ulonglong umask umeth umethod
-syn keyword tl_keyword contained uname unget-byte unget-char uni
-syn keyword tl_keyword contained unintern union union-get union-in
-syn keyword tl_keyword contained union-members union-out union-put uniq
-syn keyword tl_keyword contained unique unless unquote unsetenv
-syn keyword tl_keyword contained until until* untrace unuse-package
-syn keyword tl_keyword contained unuse-sym unwind-protect upcase-str upd
-syn keyword tl_keyword contained update uref url-decode url-encode
-syn keyword tl_keyword contained use use-package use-sym user-package
-syn keyword tl_keyword contained ushort usl usleep uslot
-syn keyword tl_keyword contained utimes val vdiscard vec
-syn keyword tl_keyword contained vec-carray vec-list vec-push vec-seq
-syn keyword tl_keyword contained vec-set-length vecref vector vector-list
-syn keyword tl_keyword contained vectorp veof veol veol2
-syn keyword tl_keyword contained verase vintr vkill vlnext
-syn keyword tl_keyword contained vm-fun-p vmin void vquit
-syn keyword tl_keyword contained vreprint vstart vstop vsusp
-syn keyword tl_keyword contained vswtc vt0 vt1 vtdly
-syn keyword tl_keyword contained vtime vwerase w-continued w-coredump
-syn keyword tl_keyword contained w-exitstatus w-ifcontinued w-ifexited w-ifsignaled
-syn keyword tl_keyword contained w-ifstopped w-nohang w-stopsig w-termsig
-syn keyword tl_keyword contained w-untraced wait wchar weave
-syn keyword tl_keyword contained when when-match whena whenlet
-syn keyword tl_keyword contained where while while* while-match
-syn keyword tl_keyword contained while-match-case while-true-match-case 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-compile-opts
-syn keyword tl_keyword contained with-delete-expander with-dyn-lib with-gensyms with-hash-iter
-syn keyword tl_keyword contained with-in-buf-stream with-in-string-byte-stream with-in-string-stream with-objects
-syn keyword tl_keyword contained with-out-buf-stream with-out-string-stream with-out-strlist-stream with-resources
-syn keyword tl_keyword contained with-slots with-stream with-update-expander wrap
-syn keyword tl_keyword contained wrap* wstr wstr-d wstr-s
-syn keyword tl_keyword contained xcase y0 y1 yield
-syn keyword tl_keyword contained yield-from yn zap zarray
-syn keyword tl_keyword contained zchar zero-fill zerop zip
-syn keyword tl_keyword contained znew
+syn keyword tl_keyword contained sys:operand-to-exp sys:operand-to-sym sys:opip-expand sys:opip-let-p
+syn keyword tl_keyword contained sys:opip-single-let-p sys:opt-controlled-diag sys:opt-dash sys:opt-err
+syn keyword tl_keyword contained sys:orig-form sys:os-symbol sys:param-check sys:parse-compound-operand
+syn keyword tl_keyword contained sys:parse-lambda-match-clause sys:parse-operand sys:pat-len sys:path-access
+syn keyword tl_keyword contained sys:path-examine sys:path-simplify sys:path-split sys:path-test-mode
+syn keyword tl_keyword contained sys:path-test-type sys:path-volume sys:pic-join-opt sys:placelet-1
+syn keyword tl_keyword contained sys:print-backtrace sys:propagate-ancestor sys:propagate-perms sys:prune-missing-inits
+syn keyword tl_keyword contained sys:qquote sys:quasi sys:quasilist sys:r-s-let-expander
+syn keyword tl_keyword contained sys:reduce-constant sys:reduce-lisp sys:reduce-or sys:reg-expand-nongreedy
+syn keyword tl_keyword contained sys:register-opcode sys:register-simple-accessor sys:repl sys:rewrite
+syn keyword tl_keyword contained sys:rewrite-case sys:rplaca sys:rplacd sys:rslotset
+syn keyword tl_keyword contained sys:rt-assert-fail sys:rt-defmacro sys:rt-defsymacro sys:rt-defun
+syn keyword tl_keyword contained sys:rt-defv sys:rt-defvarl sys:rt-load-for sys:rt-pprof
+syn keyword tl_keyword contained sys:rt-progv sys:safe-abs-path sys:safe-const-eval sys:safe-const-reduce
+syn keyword tl_keyword contained sys:safe-constantp sys:set-hash-traversal-limit sys:set-macro-ancestor sys:set-symbol-value
+syn keyword tl_keyword contained sys:setq sys:setqf sys:simplify-or 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:subst-preserve sys:switch
+syn keyword tl_keyword contained sys:sym-clobber-expander sys:sym-delete-expander sys:sym-update-expander sys:system-symbol-p
+syn keyword tl_keyword contained sys:top-fb sys:top-mb sys:top-vb sys:tr*
+syn keyword tl_keyword contained sys:trace sys:trace-canonicalize-name sys:trace-enter sys:trace-leave
+syn keyword tl_keyword contained sys:trace-redefine-check sys:transform-qquote sys:translate-hash-bang sys:tree-construct
+syn keyword tl_keyword contained sys:trfm sys:true-const-p sys:txr-case-impl sys:typecase-expander
+syn keyword tl_keyword contained sys:unquote sys:untrace sys:upenv sys:uw-block
+syn keyword tl_keyword contained sys:uw-captured-block sys:uw-catch sys:uw-cont-copy sys:uw-eval
+syn keyword tl_keyword contained sys:uw-expand sys:uw-fcall sys:uw-guard sys:uw-handle
+syn keyword tl_keyword contained sys:uw-menv sys:var sys:var-pat-p sys:vars-check
+syn keyword tl_keyword contained sys:vm-closure-desc sys:vm-closure-entry sys:vm-desc-bytecode sys:vm-desc-datavec
+syn keyword tl_keyword contained sys:vm-desc-nlevels sys:vm-desc-nregs sys:vm-desc-symvec sys:vm-execute-toplevel
+syn keyword tl_keyword contained sys:vm-make-desc sys:wdwrap sys:when-exprs-match sys:when-opt
+syn keyword tl_keyword contained sys:with-disabled-debugging sys:with-dyn-lib-check syslog system-package
+syn keyword tl_keyword contained t tab0 tab1 tab2
+syn keyword tl_keyword contained tab3 tabdly tagbody tailp
+syn keyword tl_keyword contained take take-until take-while tan
+syn keyword tl_keyword contained tanh 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 tcp-nodelay tcsadrain
+syn keyword tl_keyword contained tcsaflush tcsanow tcsendbreak tcsetattr
+syn keyword tl_keyword contained tentative-def-exists tenth test-clear test-clear-dirty
+syn keyword tl_keyword contained test-dec test-dirty test-inc test-neq-set-indent-mode
+syn keyword tl_keyword contained test-set test-set-indent-mode tf tgamma
+syn keyword tl_keyword contained third throw throwf time
+syn keyword tl_keyword contained time-fields-local time-fields-utc time-nsec time-parse
+syn keyword tl_keyword contained time-parse-local time-parse-utc time-str-local time-str-utc
+syn keyword tl_keyword contained time-string-local time-string-utc time-struct-local time-struct-utc
+syn keyword tl_keyword contained time-t time-usec tmpfile tnode
+syn keyword tl_keyword contained tnodep to tofloat tofloatz
+syn keyword tl_keyword contained toint tointz tojson tok
+syn keyword tl_keyword contained tok-str tok-where tokn tostop
+syn keyword tl_keyword contained tostring tostringp touch tprint
+syn keyword tl_keyword contained trace transpose tree tree-begin
+syn keyword tl_keyword contained tree-bind tree-case tree-clear tree-count
+syn keyword tl_keyword contained tree-del-min tree-del-min-node tree-delete tree-delete-node
+syn keyword tl_keyword contained tree-delete-specific-node tree-find tree-insert tree-insert-node
+syn keyword tl_keyword contained tree-lookup tree-lookup-node tree-min tree-min-node
+syn keyword tl_keyword contained tree-next tree-peek tree-reset tree-root
+syn keyword tl_keyword contained treep trie-add trie-compress trie-lookup-begin
+syn keyword tl_keyword contained trie-lookup-feed-char trie-value-at trim-left trim-long-suffix
+syn keyword tl_keyword contained trim-path-seps trim-right trim-short-suffix trim-str
+syn keyword tl_keyword contained true trunc trunc-rem truncate-stream
+syn keyword tl_keyword contained tuples 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 uintmax-t ulong ulonglong umask
+syn keyword tl_keyword contained umeth umethod uname unget-byte
+syn keyword tl_keyword contained unget-char uni unintern union
+syn keyword tl_keyword contained union-get union-in union-members union-out
+syn keyword tl_keyword contained union-put uniq unique unless
+syn keyword tl_keyword contained unquote unsetenv until until*
+syn keyword tl_keyword contained untrace 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 utimes val
+syn keyword tl_keyword contained vdiscard vec vec-carray vec-list
+syn keyword tl_keyword contained vec-push vec-seq vec-set-length vecref
+syn keyword tl_keyword contained vector vector-list vectorp veof
+syn keyword tl_keyword contained veol veol2 verase vintr
+syn keyword tl_keyword contained vkill vlnext vm-fun-p vmin
+syn keyword tl_keyword contained void vquit vreprint vstart
+syn keyword tl_keyword contained vstop vsusp vswtc vt0
+syn keyword tl_keyword contained vt1 vtdly vtime vwerase
+syn keyword tl_keyword contained w-continued w-coredump w-exitstatus w-ifcontinued
+syn keyword tl_keyword contained w-ifexited w-ifsignaled w-ifstopped w-nohang
+syn keyword tl_keyword contained w-stopsig w-termsig w-untraced wait
+syn keyword tl_keyword contained wchar weave when when-match
+syn keyword tl_keyword contained whena whenlet where while
+syn keyword tl_keyword contained while* while-match while-match-case while-true-match-case
+syn keyword tl_keyword contained whilet width width-check window-map
+syn keyword tl_keyword contained window-mapdo window-mappend wint-t with-clobber-expander
+syn keyword tl_keyword contained with-compilation-unit with-compile-opts 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 wstr-s xcase y0
+syn keyword tl_keyword contained y1 yield yield-from yn
+syn keyword tl_keyword contained zap zarray zchar zero-fill
+syn keyword tl_keyword contained zerop zip znew
 syn match txr_nested_error "[^\t ]\+" contained
 syn match txr_variable "[*]\?[ \t]*[A-Za-z_][A-Za-z_0-9]*" contained
 syn match txr_splicevar "[ \t,*@]*[A-Za-z_][A-Za-z_0-9]*" contained
diff --git a/txr.1 b/txr.1
index 83231ea4..dfe64a08 100644
--- a/txr.1
+++ b/txr.1
@@ -430,9 +430,9 @@
 .ds TX \f[B]TXR\f[]
 .ds TL \f[B]TXR Lisp\f[]
 .\" Start of man page:
-.TH TXR 1 2023-07-29 "Utility Commands" "TXR Programming Language" "Kaz Kylheku"
+.TH TXR 1 2023-08-06 "Utility Commands" "TXR Programming Language" "Kaz Kylheku"
 .SH* NAME
-\*(TX \- Programming Language (Version 290)
+\*(TX \- Programming Language (Version 291)
 
 .SH* SYNOPSIS
 .mono
@@ -88268,7 +88268,7 @@ versions 2, 3, 4 and 5, regardless of minor version.
 Versions 252 through 259 produce version 6.0 files and load
 only version 6, regardless of minor version.
 
-Versions 260 through 290 produce version 7.0 files and load
+Versions 260 through 291 produce version 7.0 files and load
 versions 6 and 7, regardless of minor version.
 Version 261 introduces JSON
 .code #J
diff --git a/txr.vim b/txr.vim
index d4913004..50351564 100644
--- a/txr.vim
+++ b/txr.vim
@@ -636,109 +636,109 @@ syn keyword tl_keyword contained sys:meth-lambda sys:misleading-ref-check sys:na
 syn keyword tl_keyword contained sys:new-type sys:no-dvbind-eval sys:non-triv-pat-p 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:open-url
-syn keyword tl_keyword contained sys:operand-to-exp sys:operand-to-sym sys:opip-expand sys:opt-controlled-diag
-syn keyword tl_keyword contained sys:opt-dash sys:opt-err sys:orig-form sys:os-symbol
-syn keyword tl_keyword contained sys:param-check sys:parse-compound-operand sys:parse-lambda-match-clause sys:parse-operand
-syn keyword tl_keyword contained sys:pat-len sys:path-access sys:path-examine sys:path-simplify
-syn keyword tl_keyword contained sys:path-split sys:path-test-mode sys:path-test-type sys:path-volume
-syn keyword tl_keyword contained sys:pic-join-opt sys:placelet-1 sys:print-backtrace sys:propagate-ancestor
-syn keyword tl_keyword contained sys:propagate-perms sys:prune-missing-inits sys:qquote sys:quasi
-syn keyword tl_keyword contained sys:quasilist sys:r-s-let-expander sys:reduce-constant sys:reduce-lisp
-syn keyword tl_keyword contained sys:reduce-or sys:reg-expand-nongreedy sys:register-opcode sys:register-simple-accessor
-syn keyword tl_keyword contained sys:repl sys:rewrite sys:rewrite-case sys:rplaca
-syn keyword tl_keyword contained sys:rplacd sys:rslotset sys:rt-assert-fail sys:rt-defmacro
-syn keyword tl_keyword contained sys:rt-defsymacro sys:rt-defun sys:rt-defv sys:rt-defvarl
-syn keyword tl_keyword contained sys:rt-load-for sys:rt-pprof sys:rt-progv sys:safe-abs-path
-syn keyword tl_keyword contained sys:safe-const-eval sys:safe-const-reduce sys:safe-constantp sys:set-hash-traversal-limit
-syn keyword tl_keyword contained sys:set-macro-ancestor sys:set-symbol-value sys:setq sys:setqf
-syn keyword tl_keyword contained sys:simplify-or sys:slot-types sys:small-op-p sys:small-op-to-sym
-syn keyword tl_keyword contained sys:splice sys:static-slot-types sys:str-inaddr-net-impl sys:struct-lit
-syn keyword tl_keyword contained sys:subst-preserve sys:switch sys:sym-clobber-expander sys:sym-delete-expander
-syn keyword tl_keyword contained sys:sym-update-expander sys:system-symbol-p sys:top-fb sys:top-mb
-syn keyword tl_keyword contained sys:top-vb sys:tr* sys:trace sys:trace-canonicalize-name
-syn keyword tl_keyword contained sys:trace-enter sys:trace-leave sys:trace-redefine-check sys:transform-qquote
-syn keyword tl_keyword contained sys:translate-hash-bang sys:tree-construct sys:trfm sys:true-const-p
-syn keyword tl_keyword contained sys:txr-case-impl sys:typecase-expander 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:var-pat-p sys:vars-check sys:vm-closure-desc sys:vm-closure-entry
-syn keyword tl_keyword contained sys:vm-desc-bytecode sys:vm-desc-datavec sys:vm-desc-nlevels sys:vm-desc-nregs
-syn keyword tl_keyword contained sys:vm-desc-symvec sys:vm-execute-toplevel sys:vm-make-desc sys:wdwrap
-syn keyword tl_keyword contained sys:when-exprs-match sys:when-opt sys:with-disabled-debugging sys:with-dyn-lib-check
-syn keyword tl_keyword contained syslog system-package t tab0
-syn keyword tl_keyword contained tab1 tab2 tab3 tabdly
-syn keyword tl_keyword contained tagbody tailp take take-until
-syn keyword tl_keyword contained take-while tan tanh tb
-syn keyword tl_keyword contained tc tcdrain tcflow tcflush
-syn keyword tl_keyword contained tcgetattr tciflush tcioff tcioflush
-syn keyword tl_keyword contained tcion tcoflush tcooff tcoon
-syn keyword tl_keyword contained tcp-nodelay tcsadrain tcsaflush tcsanow
-syn keyword tl_keyword contained tcsendbreak tcsetattr tentative-def-exists tenth
-syn keyword tl_keyword contained test-clear test-clear-dirty test-dec test-dirty
-syn keyword tl_keyword contained test-inc test-neq-set-indent-mode test-set test-set-indent-mode
-syn keyword tl_keyword contained tf tgamma third throw
-syn keyword tl_keyword contained throwf time time-fields-local time-fields-utc
-syn keyword tl_keyword contained time-nsec time-parse time-parse-local time-parse-utc
-syn keyword tl_keyword contained time-str-local time-str-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 tmpfile tnode tnodep to
-syn keyword tl_keyword contained tofloat tofloatz toint tointz
-syn keyword tl_keyword contained tojson tok tok-str tok-where
-syn keyword tl_keyword contained tokn tostop tostring tostringp
-syn keyword tl_keyword contained touch tprint trace transpose
-syn keyword tl_keyword contained tree tree-begin tree-bind tree-case
-syn keyword tl_keyword contained tree-clear tree-count tree-del-min tree-del-min-node
-syn keyword tl_keyword contained tree-delete tree-delete-node tree-delete-specific-node tree-find
-syn keyword tl_keyword contained tree-insert tree-insert-node tree-lookup tree-lookup-node
-syn keyword tl_keyword contained tree-min tree-min-node tree-next tree-peek
-syn keyword tl_keyword contained tree-reset tree-root treep trie-add
-syn keyword tl_keyword contained trie-compress trie-lookup-begin trie-lookup-feed-char trie-value-at
-syn keyword tl_keyword contained trim-left trim-long-suffix trim-path-seps trim-right
-syn keyword tl_keyword contained trim-short-suffix trim-str true trunc
-syn keyword tl_keyword contained trunc-rem truncate-stream tuples tuples*
-syn keyword tl_keyword contained txr-case txr-exe-path txr-if txr-parse
-syn keyword tl_keyword contained txr-path txr-version txr-when typecase
-syn keyword tl_keyword contained typedef typeof typep ubit
-syn keyword tl_keyword contained uchar uid-t uint uint-buf
-syn keyword tl_keyword contained uint-carray uint-ptr-t uint16 uint32
-syn keyword tl_keyword contained uint64 uint8 uintmax-t ulong
-syn keyword tl_keyword contained ulonglong umask umeth umethod
-syn keyword tl_keyword contained uname unget-byte unget-char uni
-syn keyword tl_keyword contained unintern union union-get union-in
-syn keyword tl_keyword contained union-members union-out union-put uniq
-syn keyword tl_keyword contained unique unless unquote unsetenv
-syn keyword tl_keyword contained until until* untrace unuse-package
-syn keyword tl_keyword contained unuse-sym unwind-protect upcase-str upd
-syn keyword tl_keyword contained update uref url-decode url-encode
-syn keyword tl_keyword contained use use-package use-sym user-package
-syn keyword tl_keyword contained ushort usl usleep uslot
-syn keyword tl_keyword contained utimes val vdiscard vec
-syn keyword tl_keyword contained vec-carray vec-list vec-push vec-seq
-syn keyword tl_keyword contained vec-set-length vecref vector vector-list
-syn keyword tl_keyword contained vectorp veof veol veol2
-syn keyword tl_keyword contained verase vintr vkill vlnext
-syn keyword tl_keyword contained vm-fun-p vmin void vquit
-syn keyword tl_keyword contained vreprint vstart vstop vsusp
-syn keyword tl_keyword contained vswtc vt0 vt1 vtdly
-syn keyword tl_keyword contained vtime vwerase w-continued w-coredump
-syn keyword tl_keyword contained w-exitstatus w-ifcontinued w-ifexited w-ifsignaled
-syn keyword tl_keyword contained w-ifstopped w-nohang w-stopsig w-termsig
-syn keyword tl_keyword contained w-untraced wait wchar weave
-syn keyword tl_keyword contained when when-match whena whenlet
-syn keyword tl_keyword contained where while while* while-match
-syn keyword tl_keyword contained while-match-case while-true-match-case 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-compile-opts
-syn keyword tl_keyword contained with-delete-expander with-dyn-lib with-gensyms with-hash-iter
-syn keyword tl_keyword contained with-in-buf-stream with-in-string-byte-stream with-in-string-stream with-objects
-syn keyword tl_keyword contained with-out-buf-stream with-out-string-stream with-out-strlist-stream with-resources
-syn keyword tl_keyword contained with-slots with-stream with-update-expander wrap
-syn keyword tl_keyword contained wrap* wstr wstr-d wstr-s
-syn keyword tl_keyword contained xcase y0 y1 yield
-syn keyword tl_keyword contained yield-from yn zap zarray
-syn keyword tl_keyword contained zchar zero-fill zerop zip
-syn keyword tl_keyword contained znew
+syn keyword tl_keyword contained sys:operand-to-exp sys:operand-to-sym sys:opip-expand sys:opip-let-p
+syn keyword tl_keyword contained sys:opip-single-let-p sys:opt-controlled-diag sys:opt-dash sys:opt-err
+syn keyword tl_keyword contained sys:orig-form sys:os-symbol sys:param-check sys:parse-compound-operand
+syn keyword tl_keyword contained sys:parse-lambda-match-clause sys:parse-operand sys:pat-len sys:path-access
+syn keyword tl_keyword contained sys:path-examine sys:path-simplify sys:path-split sys:path-test-mode
+syn keyword tl_keyword contained sys:path-test-type sys:path-volume sys:pic-join-opt sys:placelet-1
+syn keyword tl_keyword contained sys:print-backtrace sys:propagate-ancestor sys:propagate-perms sys:prune-missing-inits
+syn keyword tl_keyword contained sys:qquote sys:quasi sys:quasilist sys:r-s-let-expander
+syn keyword tl_keyword contained sys:reduce-constant sys:reduce-lisp sys:reduce-or sys:reg-expand-nongreedy
+syn keyword tl_keyword contained sys:register-opcode sys:register-simple-accessor sys:repl sys:rewrite
+syn keyword tl_keyword contained sys:rewrite-case sys:rplaca sys:rplacd sys:rslotset
+syn keyword tl_keyword contained sys:rt-assert-fail sys:rt-defmacro sys:rt-defsymacro sys:rt-defun
+syn keyword tl_keyword contained sys:rt-defv sys:rt-defvarl sys:rt-load-for sys:rt-pprof
+syn keyword tl_keyword contained sys:rt-progv sys:safe-abs-path sys:safe-const-eval sys:safe-const-reduce
+syn keyword tl_keyword contained sys:safe-constantp sys:set-hash-traversal-limit sys:set-macro-ancestor sys:set-symbol-value
+syn keyword tl_keyword contained sys:setq sys:setqf sys:simplify-or 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:subst-preserve sys:switch
+syn keyword tl_keyword contained sys:sym-clobber-expander sys:sym-delete-expander sys:sym-update-expander sys:system-symbol-p
+syn keyword tl_keyword contained sys:top-fb sys:top-mb sys:top-vb sys:tr*
+syn keyword tl_keyword contained sys:trace sys:trace-canonicalize-name sys:trace-enter sys:trace-leave
+syn keyword tl_keyword contained sys:trace-redefine-check sys:transform-qquote sys:translate-hash-bang sys:tree-construct
+syn keyword tl_keyword contained sys:trfm sys:true-const-p sys:txr-case-impl sys:typecase-expander
+syn keyword tl_keyword contained sys:unquote sys:untrace sys:upenv sys:uw-block
+syn keyword tl_keyword contained sys:uw-captured-block sys:uw-catch sys:uw-cont-copy sys:uw-eval
+syn keyword tl_keyword contained sys:uw-expand sys:uw-fcall sys:uw-guard sys:uw-handle
+syn keyword tl_keyword contained sys:uw-menv sys:var sys:var-pat-p sys:vars-check
+syn keyword tl_keyword contained sys:vm-closure-desc sys:vm-closure-entry sys:vm-desc-bytecode sys:vm-desc-datavec
+syn keyword tl_keyword contained sys:vm-desc-nlevels sys:vm-desc-nregs sys:vm-desc-symvec sys:vm-execute-toplevel
+syn keyword tl_keyword contained sys:vm-make-desc sys:wdwrap sys:when-exprs-match sys:when-opt
+syn keyword tl_keyword contained sys:with-disabled-debugging sys:with-dyn-lib-check syslog system-package
+syn keyword tl_keyword contained t tab0 tab1 tab2
+syn keyword tl_keyword contained tab3 tabdly tagbody tailp
+syn keyword tl_keyword contained take take-until take-while tan
+syn keyword tl_keyword contained tanh 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 tcp-nodelay tcsadrain
+syn keyword tl_keyword contained tcsaflush tcsanow tcsendbreak tcsetattr
+syn keyword tl_keyword contained tentative-def-exists tenth test-clear test-clear-dirty
+syn keyword tl_keyword contained test-dec test-dirty test-inc test-neq-set-indent-mode
+syn keyword tl_keyword contained test-set test-set-indent-mode tf tgamma
+syn keyword tl_keyword contained third throw throwf time
+syn keyword tl_keyword contained time-fields-local time-fields-utc time-nsec time-parse
+syn keyword tl_keyword contained time-parse-local time-parse-utc time-str-local time-str-utc
+syn keyword tl_keyword contained time-string-local time-string-utc time-struct-local time-struct-utc
+syn keyword tl_keyword contained time-t time-usec tmpfile tnode
+syn keyword tl_keyword contained tnodep to tofloat tofloatz
+syn keyword tl_keyword contained toint tointz tojson tok
+syn keyword tl_keyword contained tok-str tok-where tokn tostop
+syn keyword tl_keyword contained tostring tostringp touch tprint
+syn keyword tl_keyword contained trace transpose tree tree-begin
+syn keyword tl_keyword contained tree-bind tree-case tree-clear tree-count
+syn keyword tl_keyword contained tree-del-min tree-del-min-node tree-delete tree-delete-node
+syn keyword tl_keyword contained tree-delete-specific-node tree-find tree-insert tree-insert-node
+syn keyword tl_keyword contained tree-lookup tree-lookup-node tree-min tree-min-node
+syn keyword tl_keyword contained tree-next tree-peek tree-reset tree-root
+syn keyword tl_keyword contained treep trie-add trie-compress trie-lookup-begin
+syn keyword tl_keyword contained trie-lookup-feed-char trie-value-at trim-left trim-long-suffix
+syn keyword tl_keyword contained trim-path-seps trim-right trim-short-suffix trim-str
+syn keyword tl_keyword contained true trunc trunc-rem truncate-stream
+syn keyword tl_keyword contained tuples 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 uintmax-t ulong ulonglong umask
+syn keyword tl_keyword contained umeth umethod uname unget-byte
+syn keyword tl_keyword contained unget-char uni unintern union
+syn keyword tl_keyword contained union-get union-in union-members union-out
+syn keyword tl_keyword contained union-put uniq unique unless
+syn keyword tl_keyword contained unquote unsetenv until until*
+syn keyword tl_keyword contained untrace 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 utimes val
+syn keyword tl_keyword contained vdiscard vec vec-carray vec-list
+syn keyword tl_keyword contained vec-push vec-seq vec-set-length vecref
+syn keyword tl_keyword contained vector vector-list vectorp veof
+syn keyword tl_keyword contained veol veol2 verase vintr
+syn keyword tl_keyword contained vkill vlnext vm-fun-p vmin
+syn keyword tl_keyword contained void vquit vreprint vstart
+syn keyword tl_keyword contained vstop vsusp vswtc vt0
+syn keyword tl_keyword contained vt1 vtdly vtime vwerase
+syn keyword tl_keyword contained w-continued w-coredump w-exitstatus w-ifcontinued
+syn keyword tl_keyword contained w-ifexited w-ifsignaled w-ifstopped w-nohang
+syn keyword tl_keyword contained w-stopsig w-termsig w-untraced wait
+syn keyword tl_keyword contained wchar weave when when-match
+syn keyword tl_keyword contained whena whenlet where while
+syn keyword tl_keyword contained while* while-match while-match-case while-true-match-case
+syn keyword tl_keyword contained whilet width width-check window-map
+syn keyword tl_keyword contained window-mapdo window-mappend wint-t with-clobber-expander
+syn keyword tl_keyword contained with-compilation-unit with-compile-opts 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 wstr-s xcase y0
+syn keyword tl_keyword contained y1 yield yield-from yn
+syn keyword tl_keyword contained zap zarray zchar zero-fill
+syn keyword tl_keyword contained zerop zip znew
 
 syn keyword txr_keyword contained accept all and assert
 syn keyword txr_keyword contained bind block call cases