Version 162.txr-162

* RELNOTES: Updated.

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

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

* txr.vim, tl.vim: Regenerated.

6 files changed, 190 insertions, 144 deletions

diff --git a/RELNOTES b/RELNOTES
index 984333d2..1569eb8d 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,45 @@
+                                    TXR 162
+                                   2016-12-07
+
+
+  Features
+
+  - Awk:
+    - Awk prn macro is now a function: can be used as a functional argument
+
+  - Regex:
+    - New functions fr^$, fr^, fr$ and frr.
+
+
+  Bugs
+
+  - Awk:
+    - fixed assignment to field list f not yielding the new value as a result,
+      returning another object instead.
+    - input processing loop containing no cond-action clauses was being elided,
+      even if it contained :begin, :end, :beginfile or :endfile clauses which
+      must be executed.
+    - awk macro implicitly obtaining its input sources from the command line
+      wasn't consuming the command line, causing problems when macro is used
+      from the command line.
+  - Syntax, input:
+    - Fixed robustness issue in handling of out-of-range hex/octal character
+      escapes.
+      - This fixes a crash that could be triggered in the regex module by
+        a regex containing out-of-range character escapes in a character class.
+    - Stray debug printf removed from lexical analyzer.
+      - Occurred only when diagnosing certain invalid floating-point syntax.
+    - Fixed syntax error being reported when last item in a Lisp source
+      file or :read paste in the REPL is an object erased with #; notation.
+  - Syntax, output:
+    - Fixed ^(a . ,b) being printed as ^(a sys:unquote b).
+    - Fixed ^(,* a) and ^(, *a) both printing as ^(,*a).
+  - Exceptions:
+    - fixed handle macro's deviation from documented syntax.
+      - subject to compat option.
+
+
+
                                     TXR 161
                                    2016-11-28
 
diff --git a/configure b/configure
index 8cf490ab..a6dfe16e 100755
--- a/configure
+++ b/configure
@@ -454,7 +454,7 @@ fi
 #
 
 
-txr_ver=161
+txr_ver=162
 
 #
 # The all important banner.
diff --git a/share/txr/stdlib/ver.tl b/share/txr/stdlib/ver.tl
index 07c45b82..f1090aa2 100644
--- a/share/txr/stdlib/ver.tl
+++ b/share/txr/stdlib/ver.tl
@@ -1,2 +1,2 @@
-(defvarl lib-version 161)
+(defvarl lib-version 162)
 (defvarl *lib-version* lib-version)
diff --git a/tl.vim b/tl.vim
index 1b66f75f..8f861076 100644
--- a/tl.vim
+++ b/tl.vim
@@ -154,7 +154,8 @@ syn keyword tl_keyword contained floatp floor flush-stream flusho
 syn keyword tl_keyword contained fmakunbound fmt fnm-casefold fnm-leading-dir
 syn keyword tl_keyword contained fnm-noescape fnm-pathname fnm-period fnmatch
 syn keyword tl_keyword contained for for* force fork
-syn keyword tl_keyword contained format fourth from fstat
+syn keyword tl_keyword contained format fourth fr$ fr^
+syn keyword tl_keyword contained fr^$ from frr fstat
 syn keyword tl_keyword contained ftw ftw-actionretval ftw-chdir ftw-continue
 syn keyword tl_keyword contained ftw-d ftw-depth ftw-dnr ftw-dp
 syn keyword tl_keyword contained ftw-f ftw-mount ftw-ns ftw-phys
@@ -338,74 +339,75 @@ syn keyword tl_keyword contained symacrolet symbol-function symbol-macro symbol-
 syn keyword tl_keyword contained symbol-package symbol-value symbolp symlink
 syn keyword tl_keyword contained sys:*lisp1* sys:*pl-env* sys:*trace-hash* sys:*trace-level*
 syn keyword tl_keyword contained sys:abscond* sys:abscond-from sys:apply sys:awk-expander
-syn keyword tl_keyword contained sys:awk-let sys:awk-redir sys:awk-test sys:bad-slot-syntax
-syn keyword tl_keyword contained sys:capture-cont sys:circref sys:conv sys:conv-expand
-syn keyword tl_keyword contained sys:conv-let sys:cp-origin sys:defmeth sys:do-conv
-syn keyword tl_keyword contained sys:do-path-test sys:dwim-del sys:dwim-set sys:eval-err
-syn keyword tl_keyword contained sys:expand sys:expr sys:fbind sys:gc
-syn keyword tl_keyword contained sys:gc-set-delta sys:get-fun-getter-setter sys:get-mb sys:get-vb
-syn keyword tl_keyword contained sys:handle-bad-syntax sys:if-to-cond sys:in6addr-condensed-text sys:l1-setq
-syn keyword tl_keyword contained sys:l1-val sys:lbind sys:lisp1-setq sys:lisp1-value
-syn keyword tl_keyword contained sys:list-builder-macrolets sys:make-struct-lit sys:make-struct-type sys:mark-special
-syn keyword tl_keyword contained sys:name-str sys:obtain-impl sys:opt-dash sys:opt-err
-syn keyword tl_keyword contained sys:path-access sys:path-examine sys:path-test sys:path-test-mode
-syn keyword tl_keyword contained sys:pl-expand sys:placelet-1 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-simple-accessor sys:rplaca sys:rplacd
-syn keyword tl_keyword contained sys:rslotset sys:set-hash-rec-limit sys:set-hash-str-limit sys:set-macro-ancestor
-syn keyword tl_keyword contained sys:setq sys:setqf sys:splice 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:top-fb sys:top-mb sys:top-vb
-syn keyword tl_keyword contained sys:trace sys:trace-enter sys:trace-leave sys:unquote
-syn keyword tl_keyword contained sys:untrace sys:var sys:wdwrap sys:with-saved-vars
-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 tenth
-syn keyword tl_keyword contained test-clear test-clear-dirty test-dec test-dirty
-syn keyword tl_keyword contained test-inc test-set test-set-indent-mode tf
-syn keyword tl_keyword contained third throw throwf time
-syn keyword tl_keyword contained time-fields-local time-fields-utc time-parse time-string-local
-syn keyword tl_keyword contained time-string-utc time-struct-local time-struct-utc time-usec
-syn keyword tl_keyword contained to tofloat tofloatz toint
-syn keyword tl_keyword contained tointz tok-str tok-where tostop
-syn keyword tl_keyword contained tostring tostringp tprint trace
-syn keyword tl_keyword contained transpose tree-bind tree-case tree-find
-syn keyword tl_keyword contained trie-add trie-compress trie-lookup-begin trie-lookup-feed-char
-syn keyword tl_keyword contained trie-value-at trim-str true trunc
-syn keyword tl_keyword contained trunc-rem truncate-stream tuples txr-case
-syn keyword tl_keyword contained txr-case-impl txr-if txr-path txr-sym
-syn keyword tl_keyword contained txr-version txr-when typecase typeof
-syn keyword tl_keyword contained typep umask umeth umethod
-syn keyword tl_keyword contained uname unget-byte unget-char unintern
-syn keyword tl_keyword contained uniq unique unless unquote
-syn keyword tl_keyword contained unsetenv until until* untrace
-syn keyword tl_keyword contained unuse-package unuse-sym unwind-protect upcase-str
-syn keyword tl_keyword contained upd update url-decode url-encode
-syn keyword tl_keyword contained use use-package use-sym user-package
-syn keyword tl_keyword contained usl usleep uslot vdiscard
-syn keyword tl_keyword contained vec 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 vmin
-syn keyword tl_keyword contained vquit vreprint vstart vstop
-syn keyword tl_keyword contained vsusp vswtc vt0 vt1
-syn keyword tl_keyword contained vtdly vtime vwerase w-continued
-syn keyword tl_keyword contained w-coredump w-exitstatus w-ifcontinued w-ifexited
-syn keyword tl_keyword contained w-ifsignaled w-ifstopped w-nohang w-stopsig
-syn keyword tl_keyword contained w-termsig w-untraced wait weave
-syn keyword tl_keyword contained when whenlet where while
-syn keyword tl_keyword contained while* whilet width width-check
-syn keyword tl_keyword contained window-map window-mappend with-clobber-expander with-delete-expander
-syn keyword tl_keyword contained with-gensyms with-hash-iter with-in-string-byte-stream with-in-string-stream
-syn keyword tl_keyword contained with-objects 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* xcase yield yield-from
-syn keyword tl_keyword contained zap zerop zip
+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:bad-slot-syntax sys:capture-cont sys:circref
+syn keyword tl_keyword contained sys:compat sys:conv sys:conv-expand sys:conv-let
+syn keyword tl_keyword contained sys:cp-origin sys:defmeth sys:do-conv sys:do-path-test
+syn keyword tl_keyword contained sys:dwim-del sys:dwim-set sys:eval-err sys:expand
+syn keyword tl_keyword contained sys:expr sys:fbind sys:gc sys:gc-set-delta
+syn keyword tl_keyword contained sys:get-fun-getter-setter sys:get-mb sys:get-vb sys:handle-bad-syntax
+syn keyword tl_keyword contained sys:if-to-cond sys:in6addr-condensed-text sys:l1-setq sys:l1-val
+syn keyword tl_keyword contained sys:lbind sys:lisp1-setq sys:lisp1-value sys:list-builder-macrolets
+syn keyword tl_keyword contained sys:make-struct-lit sys:make-struct-type sys:mark-special sys:name-str
+syn keyword tl_keyword contained sys:obtain-impl sys:opt-dash sys:opt-err 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:prune-missing-inits sys:qquote sys:quasi
+syn keyword tl_keyword contained sys:quasilist sys:r-s-let-expander sys:reg-expand-nongreedy sys:reg-optimize
+syn keyword tl_keyword contained sys:register-simple-accessor sys:rplaca sys:rplacd sys:rslotset
+syn keyword tl_keyword contained sys:set-hash-rec-limit sys:set-hash-str-limit sys:set-macro-ancestor sys:setq
+syn keyword tl_keyword contained sys:setqf sys:splice 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:top-fb sys:top-mb sys:top-vb sys:trace
+syn keyword tl_keyword contained sys:trace-enter sys:trace-leave sys:unquote sys:untrace
+syn keyword tl_keyword contained sys:var sys:wdwrap sys:with-saved-vars 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 tenth test-clear
+syn keyword tl_keyword contained test-clear-dirty test-dec test-dirty test-inc
+syn keyword tl_keyword contained test-set test-set-indent-mode tf third
+syn keyword tl_keyword contained throw throwf time time-fields-local
+syn keyword tl_keyword contained time-fields-utc time-parse time-string-local time-string-utc
+syn keyword tl_keyword contained time-struct-local time-struct-utc time-usec to
+syn keyword tl_keyword contained tofloat tofloatz toint tointz
+syn keyword tl_keyword contained tok-str tok-where tostop tostring
+syn keyword tl_keyword contained tostringp tprint trace transpose
+syn keyword tl_keyword contained tree-bind tree-case tree-find trie-add
+syn keyword tl_keyword contained trie-compress trie-lookup-begin trie-lookup-feed-char trie-value-at
+syn keyword tl_keyword contained trim-str true trunc trunc-rem
+syn keyword tl_keyword contained truncate-stream tuples txr-case txr-case-impl
+syn keyword tl_keyword contained txr-if txr-path txr-sym txr-version
+syn keyword tl_keyword contained txr-when typecase typeof typep
+syn keyword tl_keyword contained umask umeth umethod uname
+syn keyword tl_keyword contained unget-byte unget-char unintern 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 url-decode url-encode use
+syn keyword tl_keyword contained use-package use-sym user-package usl
+syn keyword tl_keyword contained usleep uslot vdiscard vec
+syn keyword tl_keyword contained vec-list vec-push 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 vmin 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 weave when
+syn keyword tl_keyword contained whenlet where while while*
+syn keyword tl_keyword contained whilet width width-check window-map
+syn keyword tl_keyword contained window-mappend with-clobber-expander with-delete-expander with-gensyms
+syn keyword tl_keyword contained with-hash-iter with-in-string-byte-stream with-in-string-stream with-objects
+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 xcase yield yield-from zap
+syn keyword tl_keyword contained zerop zip
 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
@@ -506,4 +508,4 @@ hi def link txr_ign_bkt Comment
 
 let b:current_syntax = "lisp"
 
-set lispwords=ado,alet,ap,append-each,append-each*,aret,awk,block,block*,build,caseq,caseq*,caseql,caseql*,casequal,casequal*,catch,collect-each,collect-each*,compare-swap,cond,conda,condlet,dec,defex,define-accessor,define-modify-macro,define-place-macro,defmacro,defmeth,defpackage,defparm,defparml,defplace,defstruct,defsymacro,defun,defvar,defvarl,del,delay,do,dohash,dotimes,each,each*,flet,flip,for,for*,fun,gen,go,gun,handle,handler-bind,ido,if,ifa,iflet,ignerr,ignwarn,in-package,ip,labels,lambda,lcons,let,let*,lset,mac-param-bind,macro-time,macrolet,mlet,obtain,obtain*,obtain*-block,obtain-block,op,pdec,pinc,placelet,placelet*,pop,pprof,prof,prog1,progn,push,pushnew,ret,return,return-from,rlet,rslot,slet,splice,suspend,symacrolet,sys:abscond-from,sys:awk-let,sys:awk-redir,sys:conv,sys:expr,sys:fbind,sys:l1-val,sys:lbind,sys:lisp1-value,sys:path-examine,sys:path-test,sys:placelet-1,sys:splice,sys:struct-lit,sys:switch,sys:unquote,sys:var,sys:with-saved-vars,tagbody,tb,tc,test-clear,test-dec,test-inc,test-set,trace,tree-bind,tree-case,txr-case,txr-case-impl,txr-if,txr-when,typecase,unless,unquote,until,until*,untrace,unwind-protect,upd,when,whenlet,while,while*,whilet,with-clobber-expander,with-delete-expander,with-gensyms,with-hash-iter,with-in-string-byte-stream,with-in-string-stream,with-objects,with-out-string-stream,with-out-strlist-stream,with-resources,with-slots,with-stream,with-update-expander,yield,yield-from,zap,:method,:function,:init,:postinit,:fini
+set lispwords=ado,alet,ap,append-each,append-each*,aret,awk,block,block*,build,caseq,caseq*,caseql,caseql*,casequal,casequal*,catch,collect-each,collect-each*,compare-swap,cond,conda,condlet,dec,defex,define-accessor,define-modify-macro,define-place-macro,defmacro,defmeth,defpackage,defparm,defparml,defplace,defstruct,defsymacro,defun,defvar,defvarl,del,delay,do,dohash,dotimes,each,each*,flet,flip,for,for*,fun,gen,go,gun,handle,handler-bind,ido,if,ifa,iflet,ignerr,ignwarn,in-package,ip,labels,lambda,lcons,let,let*,lset,mac-param-bind,macro-time,macrolet,mlet,obtain,obtain*,obtain*-block,obtain-block,op,pdec,pinc,placelet,placelet*,pop,pprof,prof,prog1,progn,push,pushnew,ret,return,return-from,rlet,rslot,slet,splice,suspend,symacrolet,sys:abscond-from,sys:awk-fun-let,sys:awk-mac-let,sys:awk-redir,sys:conv,sys:expr,sys:fbind,sys:l1-val,sys:lbind,sys:lisp1-value,sys:path-examine,sys:path-test,sys:placelet-1,sys:splice,sys:struct-lit,sys:switch,sys:unquote,sys:var,sys:with-saved-vars,tagbody,tb,tc,test-clear,test-dec,test-inc,test-set,trace,tree-bind,tree-case,txr-case,txr-case-impl,txr-if,txr-when,typecase,unless,unquote,until,until*,untrace,unwind-protect,upd,when,whenlet,while,while*,whilet,with-clobber-expander,with-delete-expander,with-gensyms,with-hash-iter,with-in-string-byte-stream,with-in-string-stream,with-objects,with-out-string-stream,with-out-strlist-stream,with-resources,with-slots,with-stream,with-update-expander,yield,yield-from,zap,:method,:function,:init,:postinit,:fini
diff --git a/txr.1 b/txr.1
index 710622ed..40eb7ffa 100644
--- a/txr.1
+++ b/txr.1
@@ -340,9 +340,9 @@
 .ds TX \f[B]TXR\f[]
 .ds TL \f[B]TXR Lisp\f[]
 .\" Start of man page:
-.TH TXR 1 2016-11-28 "Utility Commands" "TXR Data Processing Language" "Kaz Kylheku"
+.TH TXR 1 2016-07-12 "Utility Commands" "TXR Data Processing Language" "Kaz Kylheku"
 .SH* NAME
-\*(TX \- text processing language (version 161)
+\*(TX \- text processing language (version 162)
 
 .SH* SYNOPSIS
 .cblk
diff --git a/txr.vim b/txr.vim
index 611cc51b..6e2713e2 100644
--- a/txr.vim
+++ b/txr.vim
@@ -154,7 +154,8 @@ syn keyword tl_keyword contained floatp floor flush-stream flusho
 syn keyword tl_keyword contained fmakunbound fmt fnm-casefold fnm-leading-dir
 syn keyword tl_keyword contained fnm-noescape fnm-pathname fnm-period fnmatch
 syn keyword tl_keyword contained for for* force fork
-syn keyword tl_keyword contained format fourth from fstat
+syn keyword tl_keyword contained format fourth fr$ fr^
+syn keyword tl_keyword contained fr^$ from frr fstat
 syn keyword tl_keyword contained ftw ftw-actionretval ftw-chdir ftw-continue
 syn keyword tl_keyword contained ftw-d ftw-depth ftw-dnr ftw-dp
 syn keyword tl_keyword contained ftw-f ftw-mount ftw-ns ftw-phys
@@ -338,74 +339,75 @@ syn keyword tl_keyword contained symacrolet symbol-function symbol-macro symbol-
 syn keyword tl_keyword contained symbol-package symbol-value symbolp symlink
 syn keyword tl_keyword contained sys:*lisp1* sys:*pl-env* sys:*trace-hash* sys:*trace-level*
 syn keyword tl_keyword contained sys:abscond* sys:abscond-from sys:apply sys:awk-expander
-syn keyword tl_keyword contained sys:awk-let sys:awk-redir sys:awk-test sys:bad-slot-syntax
-syn keyword tl_keyword contained sys:capture-cont sys:circref sys:conv sys:conv-expand
-syn keyword tl_keyword contained sys:conv-let sys:cp-origin sys:defmeth sys:do-conv
-syn keyword tl_keyword contained sys:do-path-test sys:dwim-del sys:dwim-set sys:eval-err
-syn keyword tl_keyword contained sys:expand sys:expr sys:fbind sys:gc
-syn keyword tl_keyword contained sys:gc-set-delta sys:get-fun-getter-setter sys:get-mb sys:get-vb
-syn keyword tl_keyword contained sys:handle-bad-syntax sys:if-to-cond sys:in6addr-condensed-text sys:l1-setq
-syn keyword tl_keyword contained sys:l1-val sys:lbind sys:lisp1-setq sys:lisp1-value
-syn keyword tl_keyword contained sys:list-builder-macrolets sys:make-struct-lit sys:make-struct-type sys:mark-special
-syn keyword tl_keyword contained sys:name-str sys:obtain-impl sys:opt-dash sys:opt-err
-syn keyword tl_keyword contained sys:path-access sys:path-examine sys:path-test sys:path-test-mode
-syn keyword tl_keyword contained sys:pl-expand sys:placelet-1 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-simple-accessor sys:rplaca sys:rplacd
-syn keyword tl_keyword contained sys:rslotset sys:set-hash-rec-limit sys:set-hash-str-limit sys:set-macro-ancestor
-syn keyword tl_keyword contained sys:setq sys:setqf sys:splice 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:top-fb sys:top-mb sys:top-vb
-syn keyword tl_keyword contained sys:trace sys:trace-enter sys:trace-leave sys:unquote
-syn keyword tl_keyword contained sys:untrace sys:var sys:wdwrap sys:with-saved-vars
-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 tenth
-syn keyword tl_keyword contained test-clear test-clear-dirty test-dec test-dirty
-syn keyword tl_keyword contained test-inc test-set test-set-indent-mode tf
-syn keyword tl_keyword contained third throw throwf time
-syn keyword tl_keyword contained time-fields-local time-fields-utc time-parse time-string-local
-syn keyword tl_keyword contained time-string-utc time-struct-local time-struct-utc time-usec
-syn keyword tl_keyword contained to tofloat tofloatz toint
-syn keyword tl_keyword contained tointz tok-str tok-where tostop
-syn keyword tl_keyword contained tostring tostringp tprint trace
-syn keyword tl_keyword contained transpose tree-bind tree-case tree-find
-syn keyword tl_keyword contained trie-add trie-compress trie-lookup-begin trie-lookup-feed-char
-syn keyword tl_keyword contained trie-value-at trim-str true trunc
-syn keyword tl_keyword contained trunc-rem truncate-stream tuples txr-case
-syn keyword tl_keyword contained txr-case-impl txr-if txr-path txr-sym
-syn keyword tl_keyword contained txr-version txr-when typecase typeof
-syn keyword tl_keyword contained typep umask umeth umethod
-syn keyword tl_keyword contained uname unget-byte unget-char unintern
-syn keyword tl_keyword contained uniq unique unless unquote
-syn keyword tl_keyword contained unsetenv until until* untrace
-syn keyword tl_keyword contained unuse-package unuse-sym unwind-protect upcase-str
-syn keyword tl_keyword contained upd update url-decode url-encode
-syn keyword tl_keyword contained use use-package use-sym user-package
-syn keyword tl_keyword contained usl usleep uslot vdiscard
-syn keyword tl_keyword contained vec 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 vmin
-syn keyword tl_keyword contained vquit vreprint vstart vstop
-syn keyword tl_keyword contained vsusp vswtc vt0 vt1
-syn keyword tl_keyword contained vtdly vtime vwerase w-continued
-syn keyword tl_keyword contained w-coredump w-exitstatus w-ifcontinued w-ifexited
-syn keyword tl_keyword contained w-ifsignaled w-ifstopped w-nohang w-stopsig
-syn keyword tl_keyword contained w-termsig w-untraced wait weave
-syn keyword tl_keyword contained when whenlet where while
-syn keyword tl_keyword contained while* whilet width width-check
-syn keyword tl_keyword contained window-map window-mappend with-clobber-expander with-delete-expander
-syn keyword tl_keyword contained with-gensyms with-hash-iter with-in-string-byte-stream with-in-string-stream
-syn keyword tl_keyword contained with-objects 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* xcase yield yield-from
-syn keyword tl_keyword contained zap zerop zip
+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:bad-slot-syntax sys:capture-cont sys:circref
+syn keyword tl_keyword contained sys:compat sys:conv sys:conv-expand sys:conv-let
+syn keyword tl_keyword contained sys:cp-origin sys:defmeth sys:do-conv sys:do-path-test
+syn keyword tl_keyword contained sys:dwim-del sys:dwim-set sys:eval-err sys:expand
+syn keyword tl_keyword contained sys:expr sys:fbind sys:gc sys:gc-set-delta
+syn keyword tl_keyword contained sys:get-fun-getter-setter sys:get-mb sys:get-vb sys:handle-bad-syntax
+syn keyword tl_keyword contained sys:if-to-cond sys:in6addr-condensed-text sys:l1-setq sys:l1-val
+syn keyword tl_keyword contained sys:lbind sys:lisp1-setq sys:lisp1-value sys:list-builder-macrolets
+syn keyword tl_keyword contained sys:make-struct-lit sys:make-struct-type sys:mark-special sys:name-str
+syn keyword tl_keyword contained sys:obtain-impl sys:opt-dash sys:opt-err 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:prune-missing-inits sys:qquote sys:quasi
+syn keyword tl_keyword contained sys:quasilist sys:r-s-let-expander sys:reg-expand-nongreedy sys:reg-optimize
+syn keyword tl_keyword contained sys:register-simple-accessor sys:rplaca sys:rplacd sys:rslotset
+syn keyword tl_keyword contained sys:set-hash-rec-limit sys:set-hash-str-limit sys:set-macro-ancestor sys:setq
+syn keyword tl_keyword contained sys:setqf sys:splice 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:top-fb sys:top-mb sys:top-vb sys:trace
+syn keyword tl_keyword contained sys:trace-enter sys:trace-leave sys:unquote sys:untrace
+syn keyword tl_keyword contained sys:var sys:wdwrap sys:with-saved-vars 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 tenth test-clear
+syn keyword tl_keyword contained test-clear-dirty test-dec test-dirty test-inc
+syn keyword tl_keyword contained test-set test-set-indent-mode tf third
+syn keyword tl_keyword contained throw throwf time time-fields-local
+syn keyword tl_keyword contained time-fields-utc time-parse time-string-local time-string-utc
+syn keyword tl_keyword contained time-struct-local time-struct-utc time-usec to
+syn keyword tl_keyword contained tofloat tofloatz toint tointz
+syn keyword tl_keyword contained tok-str tok-where tostop tostring
+syn keyword tl_keyword contained tostringp tprint trace transpose
+syn keyword tl_keyword contained tree-bind tree-case tree-find trie-add
+syn keyword tl_keyword contained trie-compress trie-lookup-begin trie-lookup-feed-char trie-value-at
+syn keyword tl_keyword contained trim-str true trunc trunc-rem
+syn keyword tl_keyword contained truncate-stream tuples txr-case txr-case-impl
+syn keyword tl_keyword contained txr-if txr-path txr-sym txr-version
+syn keyword tl_keyword contained txr-when typecase typeof typep
+syn keyword tl_keyword contained umask umeth umethod uname
+syn keyword tl_keyword contained unget-byte unget-char unintern 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 url-decode url-encode use
+syn keyword tl_keyword contained use-package use-sym user-package usl
+syn keyword tl_keyword contained usleep uslot vdiscard vec
+syn keyword tl_keyword contained vec-list vec-push 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 vmin 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 weave when
+syn keyword tl_keyword contained whenlet where while while*
+syn keyword tl_keyword contained whilet width width-check window-map
+syn keyword tl_keyword contained window-mappend with-clobber-expander with-delete-expander with-gensyms
+syn keyword tl_keyword contained with-hash-iter with-in-string-byte-stream with-in-string-stream with-objects
+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 xcase yield yield-from zap
+syn keyword tl_keyword contained zerop zip
 
 syn keyword txr_keyword contained accept all and assert
 syn keyword txr_keyword contained bind block call cases
@@ -534,4 +536,4 @@ hi def link txr_ign_bkt Comment
 
 let b:current_syntax = "lisp"
 
-set lispwords=ado,alet,ap,append-each,append-each*,aret,awk,block,block*,build,caseq,caseq*,caseql,caseql*,casequal,casequal*,catch,collect-each,collect-each*,compare-swap,cond,conda,condlet,dec,defex,define-accessor,define-modify-macro,define-place-macro,defmacro,defmeth,defpackage,defparm,defparml,defplace,defstruct,defsymacro,defun,defvar,defvarl,del,delay,do,dohash,dotimes,each,each*,flet,flip,for,for*,fun,gen,go,gun,handle,handler-bind,ido,if,ifa,iflet,ignerr,ignwarn,in-package,ip,labels,lambda,lcons,let,let*,lset,mac-param-bind,macro-time,macrolet,mlet,obtain,obtain*,obtain*-block,obtain-block,op,pdec,pinc,placelet,placelet*,pop,pprof,prof,prog1,progn,push,pushnew,ret,return,return-from,rlet,rslot,slet,splice,suspend,symacrolet,sys:abscond-from,sys:awk-let,sys:awk-redir,sys:conv,sys:expr,sys:fbind,sys:l1-val,sys:lbind,sys:lisp1-value,sys:path-examine,sys:path-test,sys:placelet-1,sys:splice,sys:struct-lit,sys:switch,sys:unquote,sys:var,sys:with-saved-vars,tagbody,tb,tc,test-clear,test-dec,test-inc,test-set,trace,tree-bind,tree-case,txr-case,txr-case-impl,txr-if,txr-when,typecase,unless,unquote,until,until*,untrace,unwind-protect,upd,when,whenlet,while,while*,whilet,with-clobber-expander,with-delete-expander,with-gensyms,with-hash-iter,with-in-string-byte-stream,with-in-string-stream,with-objects,with-out-string-stream,with-out-strlist-stream,with-resources,with-slots,with-stream,with-update-expander,yield,yield-from,zap,:method,:function,:init,:postinit,:fini
+set lispwords=ado,alet,ap,append-each,append-each*,aret,awk,block,block*,build,caseq,caseq*,caseql,caseql*,casequal,casequal*,catch,collect-each,collect-each*,compare-swap,cond,conda,condlet,dec,defex,define-accessor,define-modify-macro,define-place-macro,defmacro,defmeth,defpackage,defparm,defparml,defplace,defstruct,defsymacro,defun,defvar,defvarl,del,delay,do,dohash,dotimes,each,each*,flet,flip,for,for*,fun,gen,go,gun,handle,handler-bind,ido,if,ifa,iflet,ignerr,ignwarn,in-package,ip,labels,lambda,lcons,let,let*,lset,mac-param-bind,macro-time,macrolet,mlet,obtain,obtain*,obtain*-block,obtain-block,op,pdec,pinc,placelet,placelet*,pop,pprof,prof,prog1,progn,push,pushnew,ret,return,return-from,rlet,rslot,slet,splice,suspend,symacrolet,sys:abscond-from,sys:awk-fun-let,sys:awk-mac-let,sys:awk-redir,sys:conv,sys:expr,sys:fbind,sys:l1-val,sys:lbind,sys:lisp1-value,sys:path-examine,sys:path-test,sys:placelet-1,sys:splice,sys:struct-lit,sys:switch,sys:unquote,sys:var,sys:with-saved-vars,tagbody,tb,tc,test-clear,test-dec,test-inc,test-set,trace,tree-bind,tree-case,txr-case,txr-case-impl,txr-if,txr-when,typecase,unless,unquote,until,until*,untrace,unwind-protect,upd,when,whenlet,while,while*,whilet,with-clobber-expander,with-delete-expander,with-gensyms,with-hash-iter,with-in-string-byte-stream,with-in-string-stream,with-objects,with-out-string-stream,with-out-strlist-stream,with-resources,with-slots,with-stream,with-update-expander,yield,yield-from,zap,:method,:function,:init,:postinit,:fini