Version 130.txr-130

* RELNOTES: Updated.

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

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

* txr.vim, tl.vim: Regenerated.

6 files changed, 372 insertions, 324 deletions

diff --git a/RELNOTES b/RELNOTES
index 07eca132..d4b415ff 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,47 @@
+                                    TXR 130
+                                   2016-01-05
+
+
+  Features:
+
+  - Interactive listener:
+    - New Ctrl-X Enter command: submit line, but stay in history
+      and advance forward by one line.
+  - I/O:
+    - New record-adapter function creates a "stream adapter" virtual
+      stream object based on an existing stream.
+      - The adapter changes the semantics of get-line to support
+        delimiting of records via a regular expression (which is stored
+        in the adapter), rather than the newline character.
+      - With this, TXR can now process streams delimited in alternative
+        was as if they were line-oriented.
+    - New read-until-match function: extract characters from a stream,
+      accumulated into a string, until a match for a regex occurs in
+      that stream, and discard the match.
+  - OOP:
+    - In defstruct, function slots now initialized before other static
+      slots regardless of order of specifiers.
+  - Library:
+    - New chr-digit and chr-xdigit functions: like chr-isdigit and
+      chr-isxdigit, but returning the digit value instead of the
+      t symbol.
+
+  Bugs:
+
+  - Interactive listener:
+    - Fixed recent regression in Tab completion: missing completion on special
+      operators and macros.
+    - Fixed Ctrl-X commands not recognized in a history search.
+  - OOP:
+    - Access to static slots of a lazy struct was triggering
+      instantiation; this is fixed.
+  - Library:
+    - Recent change in chr-isdigit and chr-isxdigit return value
+      semantics has been reverted, due to potentially breaking code
+      which relies on (eql (chr-isdigit #\0) (chr-isdigit #\1)).
+
+
+
                                     TXR 129
                                    2015-12-30
 
diff --git a/configure b/configure
index 6b9e3c15..2154e829 100755
--- a/configure
+++ b/configure
@@ -442,7 +442,7 @@ fi
 #
 
 
-txr_ver=129
+txr_ver=130
 
 #
 # The all important banner.
diff --git a/share/txr/stdlib/ver.tl b/share/txr/stdlib/ver.tl
index 1d2354d9..2aeb09fe 100644
--- a/share/txr/stdlib/ver.tl
+++ b/share/txr/stdlib/ver.tl
@@ -1,2 +1,2 @@
-(defvarl lib-version 129)
+(defvarl lib-version 130)
 (defvarl *lib-version* lib-version)
diff --git a/tl.vim b/tl.vim
index 2566a6d3..28966baa 100644
--- a/tl.vim
+++ b/tl.vim
@@ -25,70 +25,71 @@ syn keyword txl_keyword contained *args-full* *e* *flo-dig* *flo-epsilon*
 syn keyword txl_keyword contained *flo-max* *flo-min* *full-args* *gensym-counter*
 syn keyword txl_keyword contained *keyword-package* *lib-version* *listener-hist-len* *listener-multi-line-p*
 syn keyword txl_keyword contained *pi* *place-clobber-expander* *place-delete-expander* *place-macro*
-syn keyword txl_keyword contained *place-update-expander* *print-base* *print-flo-precision* *random-state*
-syn keyword txl_keyword contained *self-path* *stddebug* *stderr* *stdin*
-syn keyword txl_keyword contained *stdlog* *stdnull* *stdout* *system-package*
-syn keyword txl_keyword contained *txr-version* *unhandled-hook* *user-package* +
-syn keyword txl_keyword contained - / /= :
-syn keyword txl_keyword contained :append :args :atime :auto
-syn keyword txl_keyword contained :blksize :blocks :cdigit :chars
-syn keyword txl_keyword contained :continue :counter :cspace :ctime
-syn keyword txl_keyword contained :cword-char :decline :dev :digit
-syn keyword txl_keyword contained :downcase :env :equal-based :fd
-syn keyword txl_keyword contained :filter :fini :finish :form
-syn keyword txl_keyword contained :from-current :from-end :from-start :from_html
-syn keyword txl_keyword contained :fromhtml :frompercent :fromurl :fun
-syn keyword txl_keyword contained :function :gap :gid :greedy
-syn keyword txl_keyword contained :hextoint :init :ino :instance
-syn keyword txl_keyword contained :into :lfilt :lines :list
-syn keyword txl_keyword contained :longest :maxgap :maxtimes :method
-syn keyword txl_keyword contained :mingap :mintimes :mode :mtime
-syn keyword txl_keyword contained :name :named :next-spec :nlink
-syn keyword txl_keyword contained :nothrow :postinit :prio :rdev
-syn keyword txl_keyword contained :real-time :reflect :repeat-spec :resolve
-syn keyword txl_keyword contained :rfilt :shortest :size :space
-syn keyword txl_keyword contained :static :string :symacro :times
-syn keyword txl_keyword contained :to_html :tofloat :tohtml :tohtml*
-syn keyword txl_keyword contained :toint :tonumber :topercent :tourl
-syn keyword txl_keyword contained :uid :upcase :var :vars
-syn keyword txl_keyword contained :weak-keys :weak-vals :whole :word-char
-syn keyword txl_keyword contained :wrap < <= =
-syn keyword txl_keyword contained > >= abort abs
-syn keyword txl_keyword contained abs-path-p acons acons-new aconsql-new
-syn keyword txl_keyword contained acos ado alist-nremove alist-remove
-syn keyword txl_keyword contained all and andf ap
-syn keyword txl_keyword contained apf append append* append-each
-syn keyword txl_keyword contained append-each* apply aret ash
-syn keyword txl_keyword contained asin assoc assql atan
-syn keyword txl_keyword contained atan2 atom bignump bindable
-syn keyword txl_keyword contained bit block block* boundp
-syn keyword txl_keyword contained break-str butlast caaaaar caaaadr
-syn keyword txl_keyword contained caaaar caaadar caaaddr caaadr
-syn keyword txl_keyword contained caaar caadaar caadadr caadar
-syn keyword txl_keyword contained caaddar caadddr caaddr caadr
-syn keyword txl_keyword contained caar cadaaar cadaadr cadaar
-syn keyword txl_keyword contained cadadar cadaddr cadadr cadar
-syn keyword txl_keyword contained caddaar caddadr caddar cadddar
-syn keyword txl_keyword contained caddddr cadddr caddr cadr
-syn keyword txl_keyword contained call call-clobber-expander call-delete-expander call-finalizers
-syn keyword txl_keyword contained call-super-fun call-super-method call-update-expander callf
-syn keyword txl_keyword contained car caseq caseql casequal
-syn keyword txl_keyword contained cat-str cat-streams cat-vec catch
-syn keyword txl_keyword contained catenated-stream-p catenated-stream-push cdaaaar cdaaadr
-syn keyword txl_keyword contained cdaaar cdaadar cdaaddr cdaadr
-syn keyword txl_keyword contained cdaar cdadaar cdadadr cdadar
-syn keyword txl_keyword contained cdaddar cdadddr cdaddr cdadr
-syn keyword txl_keyword contained cdar cddaaar cddaadr cddaar
-syn keyword txl_keyword contained cddadar cddaddr cddadr cddar
-syn keyword txl_keyword contained cdddaar cdddadr cdddar cddddar
-syn keyword txl_keyword contained cdddddr cddddr cdddr cddr
-syn keyword txl_keyword contained cdr ceil chain chand
-syn keyword txl_keyword contained chdir chmod chr-int chr-isalnum
-syn keyword txl_keyword contained chr-isalpha chr-isascii chr-isblank chr-iscntrl
-syn keyword txl_keyword contained chr-isdigit chr-isgraph chr-islower chr-isprint
-syn keyword txl_keyword contained chr-ispunct chr-isspace chr-isunisp chr-isupper
-syn keyword txl_keyword contained chr-isxdigit chr-num chr-str chr-str-set
-syn keyword txl_keyword contained chr-tolower chr-toupper chrp clamp
+syn keyword txl_keyword contained *place-update-expander* *print-base* *print-flo-digits* *print-flo-format*
+syn keyword txl_keyword contained *print-flo-precision* *random-state* *self-path* *stddebug*
+syn keyword txl_keyword contained *stderr* *stdin* *stdlog* *stdnull*
+syn keyword txl_keyword contained *stdout* *system-package* *txr-version* *unhandled-hook*
+syn keyword txl_keyword contained *user-package* + - /
+syn keyword txl_keyword contained /= : :append :args
+syn keyword txl_keyword contained :atime :auto :blksize :blocks
+syn keyword txl_keyword contained :cdigit :chars :continue :counter
+syn keyword txl_keyword contained :cspace :ctime :cword-char :decline
+syn keyword txl_keyword contained :dev :digit :downcase :env
+syn keyword txl_keyword contained :equal-based :fd :filter :fini
+syn keyword txl_keyword contained :finish :form :from-current :from-end
+syn keyword txl_keyword contained :from-start :from_html :fromhtml :frompercent
+syn keyword txl_keyword contained :fromurl :fun :function :gap
+syn keyword txl_keyword contained :gid :greedy :hextoint :init
+syn keyword txl_keyword contained :ino :instance :into :lfilt
+syn keyword txl_keyword contained :lines :list :longest :maxgap
+syn keyword txl_keyword contained :maxtimes :method :mingap :mintimes
+syn keyword txl_keyword contained :mode :mtime :name :named
+syn keyword txl_keyword contained :next-spec :nlink :nothrow :postinit
+syn keyword txl_keyword contained :prio :rdev :real-time :reflect
+syn keyword txl_keyword contained :repeat-spec :resolve :rfilt :shortest
+syn keyword txl_keyword contained :size :space :static :string
+syn keyword txl_keyword contained :symacro :times :to_html :tofloat
+syn keyword txl_keyword contained :tohtml :tohtml* :toint :tonumber
+syn keyword txl_keyword contained :topercent :tourl :uid :upcase
+syn keyword txl_keyword contained :var :vars :weak-keys :weak-vals
+syn keyword txl_keyword contained :whole :word-char :wrap <
+syn keyword txl_keyword contained <= = > >=
+syn keyword txl_keyword contained abort abs abs-path-p acons
+syn keyword txl_keyword contained acons-new aconsql-new acos ado
+syn keyword txl_keyword contained alist-nremove alist-remove all and
+syn keyword txl_keyword contained andf ap apf append
+syn keyword txl_keyword contained append* append-each append-each* apply
+syn keyword txl_keyword contained aret ash asin assoc
+syn keyword txl_keyword contained assql atan atan2 atom
+syn keyword txl_keyword contained bignump bindable bit block
+syn keyword txl_keyword contained block* boundp break-str butlast
+syn keyword txl_keyword contained caaaaar caaaadr caaaar caaadar
+syn keyword txl_keyword contained caaaddr caaadr caaar caadaar
+syn keyword txl_keyword contained caadadr caadar caaddar caadddr
+syn keyword txl_keyword contained caaddr caadr caar cadaaar
+syn keyword txl_keyword contained cadaadr cadaar cadadar cadaddr
+syn keyword txl_keyword contained cadadr cadar caddaar caddadr
+syn keyword txl_keyword contained caddar cadddar caddddr cadddr
+syn keyword txl_keyword contained caddr cadr call call-clobber-expander
+syn keyword txl_keyword contained call-delete-expander call-finalizers call-super-fun call-super-method
+syn keyword txl_keyword contained call-update-expander callf car caseq
+syn keyword txl_keyword contained caseql casequal cat-str cat-streams
+syn keyword txl_keyword contained cat-vec catch catenated-stream-p catenated-stream-push
+syn keyword txl_keyword contained cdaaaar cdaaadr cdaaar cdaadar
+syn keyword txl_keyword contained cdaaddr cdaadr cdaar cdadaar
+syn keyword txl_keyword contained cdadadr cdadar cdaddar cdadddr
+syn keyword txl_keyword contained cdaddr cdadr cdar cddaaar
+syn keyword txl_keyword contained cddaadr cddaar cddadar cddaddr
+syn keyword txl_keyword contained cddadr cddar cdddaar cdddadr
+syn keyword txl_keyword contained cdddar cddddar cdddddr cddddr
+syn keyword txl_keyword contained cdddr cddr cdr ceil
+syn keyword txl_keyword contained chain chand chdir chmod
+syn keyword txl_keyword contained chr-digit chr-int chr-isalnum chr-isalpha
+syn keyword txl_keyword contained chr-isascii chr-isblank chr-iscntrl chr-isdigit
+syn keyword txl_keyword contained chr-isgraph chr-islower chr-isprint chr-ispunct
+syn keyword txl_keyword contained chr-isspace chr-isunisp chr-isupper chr-isxdigit
+syn keyword txl_keyword contained chr-num chr-str chr-str-set chr-tolower
+syn keyword txl_keyword contained chr-toupper chr-xdigit chrp clamp
 syn keyword txl_keyword contained clear-error clear-struct close-stream closelog
 syn keyword txl_keyword contained cmp-str collect-each collect-each* comb
 syn keyword txl_keyword contained compl-span-str cond conda condlet
@@ -217,101 +218,102 @@ syn keyword txl_keyword contained put-lines put-string put-strings pwd
 syn keyword txl_keyword contained qquote qref quote raise
 syn keyword txl_keyword contained rand random random-fixnum random-state-p
 syn keyword txl_keyword contained range range* range-regex rangep
-syn keyword txl_keyword contained rcomb rcons read readlink
-syn keyword txl_keyword contained real-time-stream-p reduce-left reduce-right ref
-syn keyword txl_keyword contained refset regex-compile regex-parse regexp
-syn keyword txl_keyword contained register-exception-subtypes regsub rehome-sym remhash
-syn keyword txl_keyword contained remove-if remove-if* remove-path remq
-syn keyword txl_keyword contained remq* remql remql* remqual
-syn keyword txl_keyword contained remqual* rename-path repeat replace
-syn keyword txl_keyword contained replace-list replace-str replace-struct replace-vec
-syn keyword txl_keyword contained reset-struct rest ret retf
-syn keyword txl_keyword contained return return* return-from revappend
-syn keyword txl_keyword contained reverse rlcp rlet rotate
-syn keyword txl_keyword contained rperm rplaca rplacd run
-syn keyword txl_keyword contained s-ifblk s-ifchr s-ifdir s-ififo
-syn keyword txl_keyword contained s-iflnk s-ifmt s-ifreg s-ifsock
-syn keyword txl_keyword contained s-irgrp s-iroth s-irusr s-irwxg
-syn keyword txl_keyword contained s-irwxo s-irwxu s-isgid s-isuid
-syn keyword txl_keyword contained s-isvtx s-iwgrp s-iwoth s-iwusr
-syn keyword txl_keyword contained s-ixgrp s-ixoth s-ixusr search
-syn keyword txl_keyword contained search-regex search-regst search-str search-str-tree
-syn keyword txl_keyword contained second seek-stream select self-path
-syn keyword txl_keyword contained seqp set set-diff set-hash-userdata
-syn keyword txl_keyword contained set-indent set-indent-mode set-sig-handler setegid
-syn keyword txl_keyword contained setenv seteuid setgid setgrent
-syn keyword txl_keyword contained sethash setitimer setlogmask setpwent
-syn keyword txl_keyword contained setuid seventh sh shift
-syn keyword txl_keyword contained shuffle sig-abrt sig-alrm sig-bus
-syn keyword txl_keyword contained sig-check sig-chld sig-cont sig-fpe
-syn keyword txl_keyword contained sig-hup sig-ill sig-int sig-io
-syn keyword txl_keyword contained sig-iot sig-kill sig-pipe sig-poll
-syn keyword txl_keyword contained sig-prof sig-pwr sig-quit sig-segv
-syn keyword txl_keyword contained sig-stkflt sig-stop sig-sys sig-term
-syn keyword txl_keyword contained sig-trap sig-tstp sig-ttin sig-ttou
-syn keyword txl_keyword contained sig-urg sig-usr1 sig-usr2 sig-vtalrm
-syn keyword txl_keyword contained sig-winch sig-xcpu sig-xfsz sign-extend
-syn keyword txl_keyword contained sin sixth size-vec slot
-syn keyword txl_keyword contained slotp slotset some sort
-syn keyword txl_keyword contained sort-group source-loc source-loc-str span-str
-syn keyword txl_keyword contained special-operator-p special-var-p splice split
-syn keyword txl_keyword contained split-str split-str-set sqrt sssucc
-syn keyword txl_keyword contained ssucc stat static-slot static-slot-ensure
-syn keyword txl_keyword contained static-slot-p static-slot-set stdlib str<
-syn keyword txl_keyword contained str<= str= str> str>=
-syn keyword txl_keyword contained stream-get-prop stream-set-prop streamp string-extend
-syn keyword txl_keyword contained string-lt stringp struct-type struct-type-p
-syn keyword txl_keyword contained structp sub sub-list sub-str
-syn keyword txl_keyword contained sub-vec subtypep succ super
-syn keyword txl_keyword contained super-method suspend swap symacrolet
-syn keyword txl_keyword contained symbol-function symbol-macro symbol-name symbol-package
-syn keyword txl_keyword contained symbol-value symbolp symlink sys:*lisp1*
-syn keyword txl_keyword contained sys:abscond* sys:abscond-from sys:bad-slot-syntax sys:capture-cont
-syn keyword txl_keyword contained sys:cp-origin sys:defmeth sys:do-path-test sys:dwim-del
-syn keyword txl_keyword contained sys:dwim-set sys:eval-err sys:expand sys:expr
-syn keyword txl_keyword contained sys:fbind sys:gc sys:gc-set-delta sys:get-fb
-syn keyword txl_keyword contained sys:get-mb sys:get-vb sys:handle-bad-syntax sys:if-to-cond
-syn keyword txl_keyword contained sys:l1-setq sys:l1-val sys:lbind sys:lisp1-setq
-syn keyword txl_keyword contained sys:lisp1-value sys:load sys:make-struct-type sys:mark-special
-syn keyword txl_keyword contained sys:obtain-impl sys:path-access sys:path-examine sys:path-test
-syn keyword txl_keyword contained sys:path-test-mode sys:pl-expand sys:placelet-1 sys:prune-nil-inits
-syn keyword txl_keyword contained sys:qquote sys:quasi sys:quasilist sys:reg-expand-nongreedy
-syn keyword txl_keyword contained sys:reg-optimize sys:register-simple-accessor sys:rplaca sys:rplacd
-syn keyword txl_keyword contained sys:set-macro-ancestor sys:setq sys:setqf sys:splice
-syn keyword txl_keyword contained sys:struct-lit sys:sym-clobber-expander sys:sym-delete-expander sys:sym-update-expander
-syn keyword txl_keyword contained sys:top-fb sys:top-mb sys:top-vb sys:unquote
-syn keyword txl_keyword contained sys:var sys:with-saved-vars syslog system-package
-syn keyword txl_keyword contained t take take-until take-while
-syn keyword txl_keyword contained tan tb tc tenth
-syn keyword txl_keyword contained test-set-indent-mode tf third throw
-syn keyword txl_keyword contained throwf time time-fields-local time-fields-utc
-syn keyword txl_keyword contained time-string-local time-string-utc time-struct-local time-struct-utc
-syn keyword txl_keyword contained time-usec to tofloat toint
-syn keyword txl_keyword contained tok-str tok-where tostring tostringp
-syn keyword txl_keyword contained tprint transpose tree-bind tree-case
-syn keyword txl_keyword contained tree-find trie-add trie-compress trie-lookup-begin
-syn keyword txl_keyword contained trie-lookup-feed-char trie-value-at trim-str true
-syn keyword txl_keyword contained trunc trunc-rem truncate-stream tuples
-syn keyword txl_keyword contained txr-case txr-case-impl txr-if txr-sym
-syn keyword txl_keyword contained txr-version txr-when typecase typeof
-syn keyword txl_keyword contained typep umeth umethod unget-byte
-syn keyword txl_keyword contained unget-char uniq unique unless
-syn keyword txl_keyword contained unquote unsetenv until until*
-syn keyword txl_keyword contained unwind-protect upcase-str update url-decode
-syn keyword txl_keyword contained url-encode user-package usl usleep
-syn keyword txl_keyword contained uslot vec vec-list vec-push
-syn keyword txl_keyword contained vec-set-length vecref vector vector-list
-syn keyword txl_keyword contained vectorp w-continued w-coredump w-exitstatus
-syn keyword txl_keyword contained w-ifcontinued w-ifexited w-ifsignaled w-ifstopped
-syn keyword txl_keyword contained w-nohang w-stopsig w-termsig w-untraced
-syn keyword txl_keyword contained wait weave when whenlet
-syn keyword txl_keyword contained where while while* whilet
-syn keyword txl_keyword contained width width-check window-map window-mappend
-syn keyword txl_keyword contained with-clobber-expander with-delete-expander with-gensyms with-hash-iter
-syn keyword txl_keyword contained with-in-string-byte-stream with-in-string-stream with-objects with-out-string-stream
-syn keyword txl_keyword contained with-out-strlist-stream with-resources with-stream with-update-expander
-syn keyword txl_keyword contained wrap wrap* yield yield-from
-syn keyword txl_keyword contained zap zerop zip
+syn keyword txl_keyword contained rcomb rcons read read-until-match
+syn keyword txl_keyword contained readlink real-time-stream-p record-adapter reduce-left
+syn keyword txl_keyword contained reduce-right ref refset regex-compile
+syn keyword txl_keyword contained regex-parse regexp register-exception-subtypes regsub
+syn keyword txl_keyword contained rehome-sym remhash remove-if remove-if*
+syn keyword txl_keyword contained remove-path remq remq* remql
+syn keyword txl_keyword contained remql* remqual remqual* rename-path
+syn keyword txl_keyword contained repeat replace replace-list replace-str
+syn keyword txl_keyword contained replace-struct replace-vec reset-struct rest
+syn keyword txl_keyword contained ret retf return return*
+syn keyword txl_keyword contained return-from revappend reverse rlcp
+syn keyword txl_keyword contained rlet rotate rperm rplaca
+syn keyword txl_keyword contained rplacd run s-ifblk s-ifchr
+syn keyword txl_keyword contained s-ifdir s-ififo s-iflnk s-ifmt
+syn keyword txl_keyword contained s-ifreg s-ifsock s-irgrp s-iroth
+syn keyword txl_keyword contained s-irusr s-irwxg s-irwxo s-irwxu
+syn keyword txl_keyword contained s-isgid s-isuid s-isvtx s-iwgrp
+syn keyword txl_keyword contained s-iwoth s-iwusr s-ixgrp s-ixoth
+syn keyword txl_keyword contained s-ixusr search search-regex search-regst
+syn keyword txl_keyword contained search-str search-str-tree second seek-stream
+syn keyword txl_keyword contained select self-path seqp set
+syn keyword txl_keyword contained set-diff set-hash-userdata set-indent set-indent-mode
+syn keyword txl_keyword contained set-sig-handler setegid setenv seteuid
+syn keyword txl_keyword contained setgid setgrent sethash setitimer
+syn keyword txl_keyword contained setlogmask setpwent setuid seventh
+syn keyword txl_keyword contained sh shift shuffle sig-abrt
+syn keyword txl_keyword contained sig-alrm sig-bus sig-check sig-chld
+syn keyword txl_keyword contained sig-cont sig-fpe sig-hup sig-ill
+syn keyword txl_keyword contained sig-int sig-io sig-iot sig-kill
+syn keyword txl_keyword contained sig-pipe sig-poll sig-prof sig-pwr
+syn keyword txl_keyword contained sig-quit sig-segv sig-stkflt sig-stop
+syn keyword txl_keyword contained sig-sys sig-term sig-trap sig-tstp
+syn keyword txl_keyword contained sig-ttin sig-ttou sig-urg sig-usr1
+syn keyword txl_keyword contained sig-usr2 sig-vtalrm sig-winch sig-xcpu
+syn keyword txl_keyword contained sig-xfsz sign-extend sin sixth
+syn keyword txl_keyword contained size-vec slot slotp slotset
+syn keyword txl_keyword contained some sort sort-group source-loc
+syn keyword txl_keyword contained source-loc-str span-str special-operator-p special-var-p
+syn keyword txl_keyword contained splice split split-str split-str-set
+syn keyword txl_keyword contained sqrt sssucc ssucc stat
+syn keyword txl_keyword contained static-slot static-slot-ensure static-slot-p static-slot-set
+syn keyword txl_keyword contained stdlib str< str<= str=
+syn keyword txl_keyword contained str> str>= stream-get-prop stream-set-prop
+syn keyword txl_keyword contained streamp string-extend string-lt stringp
+syn keyword txl_keyword contained struct-type struct-type-p structp sub
+syn keyword txl_keyword contained sub-list sub-str sub-vec subtypep
+syn keyword txl_keyword contained succ super super-method suspend
+syn keyword txl_keyword contained swap symacrolet symbol-function symbol-macro
+syn keyword txl_keyword contained symbol-name symbol-package symbol-value symbolp
+syn keyword txl_keyword contained symlink sys:*lisp1* sys:abscond* sys:abscond-from
+syn keyword txl_keyword contained sys:bad-slot-syntax sys:capture-cont sys:cp-origin sys:defmeth
+syn keyword txl_keyword contained sys:do-path-test sys:dwim-del sys:dwim-set sys:eval-err
+syn keyword txl_keyword contained sys:expand sys:expr sys:fbind sys:gc
+syn keyword txl_keyword contained sys:gc-set-delta sys:get-fb sys:get-mb sys:get-vb
+syn keyword txl_keyword contained sys:handle-bad-syntax sys:if-to-cond sys:l1-setq sys:l1-val
+syn keyword txl_keyword contained sys:lbind sys:lisp1-setq sys:lisp1-value sys:load
+syn keyword txl_keyword contained sys:make-struct-type sys:mark-special sys:obtain-impl sys:path-access
+syn keyword txl_keyword contained sys:path-examine sys:path-test sys:path-test-mode sys:pl-expand
+syn keyword txl_keyword contained sys:placelet-1 sys:prune-nil-inits sys:qquote sys:quasi
+syn keyword txl_keyword contained sys:quasilist sys:reg-expand-nongreedy sys:reg-optimize sys:register-simple-accessor
+syn keyword txl_keyword contained sys:rplaca sys:rplacd sys:set-macro-ancestor sys:setq
+syn keyword txl_keyword contained sys:setqf sys:splice sys:struct-lit sys:sym-clobber-expander
+syn keyword txl_keyword contained sys:sym-delete-expander sys:sym-update-expander sys:top-fb sys:top-mb
+syn keyword txl_keyword contained sys:top-vb sys:unquote sys:var sys:with-saved-vars
+syn keyword txl_keyword contained syslog system-package t take
+syn keyword txl_keyword contained take-until take-while tan tb
+syn keyword txl_keyword contained tc tenth test-set-indent-mode tf
+syn keyword txl_keyword contained third throw throwf time
+syn keyword txl_keyword contained time-fields-local time-fields-utc time-string-local time-string-utc
+syn keyword txl_keyword contained time-struct-local time-struct-utc time-usec to
+syn keyword txl_keyword contained tofloat toint tok-str tok-where
+syn keyword txl_keyword contained tostring tostringp tprint transpose
+syn keyword txl_keyword contained tree-bind tree-case tree-find trie-add
+syn keyword txl_keyword contained trie-compress trie-lookup-begin trie-lookup-feed-char trie-value-at
+syn keyword txl_keyword contained trim-str true trunc trunc-rem
+syn keyword txl_keyword contained truncate-stream tuples txr-case txr-case-impl
+syn keyword txl_keyword contained txr-if txr-sym txr-version txr-when
+syn keyword txl_keyword contained typecase typeof typep umeth
+syn keyword txl_keyword contained umethod unget-byte unget-char uniq
+syn keyword txl_keyword contained unique unless unquote unsetenv
+syn keyword txl_keyword contained until until* unwind-protect upcase-str
+syn keyword txl_keyword contained update url-decode url-encode user-package
+syn keyword txl_keyword contained usl usleep uslot vec
+syn keyword txl_keyword contained vec-list vec-push vec-set-length vecref
+syn keyword txl_keyword contained vector vector-list vectorp w-continued
+syn keyword txl_keyword contained w-coredump w-exitstatus w-ifcontinued w-ifexited
+syn keyword txl_keyword contained w-ifsignaled w-ifstopped w-nohang w-stopsig
+syn keyword txl_keyword contained w-termsig w-untraced wait weave
+syn keyword txl_keyword contained when whenlet where while
+syn keyword txl_keyword contained while* whilet width width-check
+syn keyword txl_keyword contained window-map window-mappend with-clobber-expander with-delete-expander
+syn keyword txl_keyword contained with-gensyms with-hash-iter with-in-string-byte-stream with-in-string-stream
+syn keyword txl_keyword contained with-objects with-out-string-stream with-out-strlist-stream with-resources
+syn keyword txl_keyword contained with-slots with-stream with-update-expander wrap
+syn keyword txl_keyword contained wrap* yield yield-from zap
+syn keyword txl_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]*"
@@ -402,4 +404,4 @@ hi def link txr_nested_error Error
 
 let b:current_syntax = "lisp"
 
-set lispwords=ado,ap,append-each,append-each*,aret,block,block*,caseq,caseql,casequal,catch,collect-each,collect-each*,cond,conda,condlet,dec,defex,define-accessor,define-modify-macro,define-place-macro,defmacro,defmeth,defparm,defparml,defplace,defstruct,defsymacro,defun,defvar,defvarl,del,delay,do,dohash,dotimes,each,each*,flet,flip,for,for*,fun,gen,gun,handle,handler-bind,ido,if,ifa,iflet,ignerr,ip,labels,lambda,lcons,let,let*,load,mac-param-bind,macro-time,macrolet,mlet,obtain,obtain-block,op,placelet,placelet*,pop,pprof,prof,prog1,progn,push,pushnew,ret,return,return-from,rlet,splice,suspend,symacrolet,sys:abscond-from,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:unquote,sys:var,sys:with-saved-vars,tb,tc,tree-bind,tree-case,txr-case,txr-case-impl,txr-if,txr-when,typecase,unless,unquote,until,until*,unwind-protect,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-stream,with-update-expander,yield,yield-from,zap,:method,:function,:init,:postinit,:fini
+set lispwords=ado,ap,append-each,append-each*,aret,block,block*,caseq,caseql,casequal,catch,collect-each,collect-each*,cond,conda,condlet,dec,defex,define-accessor,define-modify-macro,define-place-macro,defmacro,defmeth,defparm,defparml,defplace,defstruct,defsymacro,defun,defvar,defvarl,del,delay,do,dohash,dotimes,each,each*,flet,flip,for,for*,fun,gen,gun,handle,handler-bind,ido,if,ifa,iflet,ignerr,ip,labels,lambda,lcons,let,let*,load,mac-param-bind,macro-time,macrolet,mlet,obtain,obtain-block,op,placelet,placelet*,pop,pprof,prof,prog1,progn,push,pushnew,ret,return,return-from,rlet,splice,suspend,symacrolet,sys:abscond-from,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:unquote,sys:var,sys:with-saved-vars,tb,tc,tree-bind,tree-case,txr-case,txr-case-impl,txr-if,txr-when,typecase,unless,unquote,until,until*,unwind-protect,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 8a33aba6..af9b5ca8 100644
--- a/txr.1
+++ b/txr.1
@@ -344,9 +344,9 @@
 .ds TX \f[B]TXR\f[]
 .ds TL \f[B]TXR Lisp\f[]
 .\" Start of man page:
-.TH TXR 1 2015-12-30 "Utility Commands" "TXR Data Processing Language" "Kaz Kylheku"
+.TH TXR 1 2016-01-05 "Utility Commands" "TXR Data Processing Language" "Kaz Kylheku"
 .SH* NAME
-\*(TX \- text processing language (version 129)
+\*(TX \- text processing language (version 130)
 
 .SH* SYNOPSIS
 .cblk
diff --git a/txr.vim b/txr.vim
index 832f9a38..c146874a 100644
--- a/txr.vim
+++ b/txr.vim
@@ -25,70 +25,71 @@ syn keyword txl_keyword contained *args-full* *e* *flo-dig* *flo-epsilon*
 syn keyword txl_keyword contained *flo-max* *flo-min* *full-args* *gensym-counter*
 syn keyword txl_keyword contained *keyword-package* *lib-version* *listener-hist-len* *listener-multi-line-p*
 syn keyword txl_keyword contained *pi* *place-clobber-expander* *place-delete-expander* *place-macro*
-syn keyword txl_keyword contained *place-update-expander* *print-base* *print-flo-precision* *random-state*
-syn keyword txl_keyword contained *self-path* *stddebug* *stderr* *stdin*
-syn keyword txl_keyword contained *stdlog* *stdnull* *stdout* *system-package*
-syn keyword txl_keyword contained *txr-version* *unhandled-hook* *user-package* +
-syn keyword txl_keyword contained - / /= :
-syn keyword txl_keyword contained :append :args :atime :auto
-syn keyword txl_keyword contained :blksize :blocks :cdigit :chars
-syn keyword txl_keyword contained :continue :counter :cspace :ctime
-syn keyword txl_keyword contained :cword-char :decline :dev :digit
-syn keyword txl_keyword contained :downcase :env :equal-based :fd
-syn keyword txl_keyword contained :filter :fini :finish :form
-syn keyword txl_keyword contained :from-current :from-end :from-start :from_html
-syn keyword txl_keyword contained :fromhtml :frompercent :fromurl :fun
-syn keyword txl_keyword contained :function :gap :gid :greedy
-syn keyword txl_keyword contained :hextoint :init :ino :instance
-syn keyword txl_keyword contained :into :lfilt :lines :list
-syn keyword txl_keyword contained :longest :maxgap :maxtimes :method
-syn keyword txl_keyword contained :mingap :mintimes :mode :mtime
-syn keyword txl_keyword contained :name :named :next-spec :nlink
-syn keyword txl_keyword contained :nothrow :postinit :prio :rdev
-syn keyword txl_keyword contained :real-time :reflect :repeat-spec :resolve
-syn keyword txl_keyword contained :rfilt :shortest :size :space
-syn keyword txl_keyword contained :static :string :symacro :times
-syn keyword txl_keyword contained :to_html :tofloat :tohtml :tohtml*
-syn keyword txl_keyword contained :toint :tonumber :topercent :tourl
-syn keyword txl_keyword contained :uid :upcase :var :vars
-syn keyword txl_keyword contained :weak-keys :weak-vals :whole :word-char
-syn keyword txl_keyword contained :wrap < <= =
-syn keyword txl_keyword contained > >= abort abs
-syn keyword txl_keyword contained abs-path-p acons acons-new aconsql-new
-syn keyword txl_keyword contained acos ado alist-nremove alist-remove
-syn keyword txl_keyword contained all and andf ap
-syn keyword txl_keyword contained apf append append* append-each
-syn keyword txl_keyword contained append-each* apply aret ash
-syn keyword txl_keyword contained asin assoc assql atan
-syn keyword txl_keyword contained atan2 atom bignump bindable
-syn keyword txl_keyword contained bit block block* boundp
-syn keyword txl_keyword contained break-str butlast caaaaar caaaadr
-syn keyword txl_keyword contained caaaar caaadar caaaddr caaadr
-syn keyword txl_keyword contained caaar caadaar caadadr caadar
-syn keyword txl_keyword contained caaddar caadddr caaddr caadr
-syn keyword txl_keyword contained caar cadaaar cadaadr cadaar
-syn keyword txl_keyword contained cadadar cadaddr cadadr cadar
-syn keyword txl_keyword contained caddaar caddadr caddar cadddar
-syn keyword txl_keyword contained caddddr cadddr caddr cadr
-syn keyword txl_keyword contained call call-clobber-expander call-delete-expander call-finalizers
-syn keyword txl_keyword contained call-super-fun call-super-method call-update-expander callf
-syn keyword txl_keyword contained car caseq caseql casequal
-syn keyword txl_keyword contained cat-str cat-streams cat-vec catch
-syn keyword txl_keyword contained catenated-stream-p catenated-stream-push cdaaaar cdaaadr
-syn keyword txl_keyword contained cdaaar cdaadar cdaaddr cdaadr
-syn keyword txl_keyword contained cdaar cdadaar cdadadr cdadar
-syn keyword txl_keyword contained cdaddar cdadddr cdaddr cdadr
-syn keyword txl_keyword contained cdar cddaaar cddaadr cddaar
-syn keyword txl_keyword contained cddadar cddaddr cddadr cddar
-syn keyword txl_keyword contained cdddaar cdddadr cdddar cddddar
-syn keyword txl_keyword contained cdddddr cddddr cdddr cddr
-syn keyword txl_keyword contained cdr ceil chain chand
-syn keyword txl_keyword contained chdir chmod chr-int chr-isalnum
-syn keyword txl_keyword contained chr-isalpha chr-isascii chr-isblank chr-iscntrl
-syn keyword txl_keyword contained chr-isdigit chr-isgraph chr-islower chr-isprint
-syn keyword txl_keyword contained chr-ispunct chr-isspace chr-isunisp chr-isupper
-syn keyword txl_keyword contained chr-isxdigit chr-num chr-str chr-str-set
-syn keyword txl_keyword contained chr-tolower chr-toupper chrp clamp
+syn keyword txl_keyword contained *place-update-expander* *print-base* *print-flo-digits* *print-flo-format*
+syn keyword txl_keyword contained *print-flo-precision* *random-state* *self-path* *stddebug*
+syn keyword txl_keyword contained *stderr* *stdin* *stdlog* *stdnull*
+syn keyword txl_keyword contained *stdout* *system-package* *txr-version* *unhandled-hook*
+syn keyword txl_keyword contained *user-package* + - /
+syn keyword txl_keyword contained /= : :append :args
+syn keyword txl_keyword contained :atime :auto :blksize :blocks
+syn keyword txl_keyword contained :cdigit :chars :continue :counter
+syn keyword txl_keyword contained :cspace :ctime :cword-char :decline
+syn keyword txl_keyword contained :dev :digit :downcase :env
+syn keyword txl_keyword contained :equal-based :fd :filter :fini
+syn keyword txl_keyword contained :finish :form :from-current :from-end
+syn keyword txl_keyword contained :from-start :from_html :fromhtml :frompercent
+syn keyword txl_keyword contained :fromurl :fun :function :gap
+syn keyword txl_keyword contained :gid :greedy :hextoint :init
+syn keyword txl_keyword contained :ino :instance :into :lfilt
+syn keyword txl_keyword contained :lines :list :longest :maxgap
+syn keyword txl_keyword contained :maxtimes :method :mingap :mintimes
+syn keyword txl_keyword contained :mode :mtime :name :named
+syn keyword txl_keyword contained :next-spec :nlink :nothrow :postinit
+syn keyword txl_keyword contained :prio :rdev :real-time :reflect
+syn keyword txl_keyword contained :repeat-spec :resolve :rfilt :shortest
+syn keyword txl_keyword contained :size :space :static :string
+syn keyword txl_keyword contained :symacro :times :to_html :tofloat
+syn keyword txl_keyword contained :tohtml :tohtml* :toint :tonumber
+syn keyword txl_keyword contained :topercent :tourl :uid :upcase
+syn keyword txl_keyword contained :var :vars :weak-keys :weak-vals
+syn keyword txl_keyword contained :whole :word-char :wrap <
+syn keyword txl_keyword contained <= = > >=
+syn keyword txl_keyword contained abort abs abs-path-p acons
+syn keyword txl_keyword contained acons-new aconsql-new acos ado
+syn keyword txl_keyword contained alist-nremove alist-remove all and
+syn keyword txl_keyword contained andf ap apf append
+syn keyword txl_keyword contained append* append-each append-each* apply
+syn keyword txl_keyword contained aret ash asin assoc
+syn keyword txl_keyword contained assql atan atan2 atom
+syn keyword txl_keyword contained bignump bindable bit block
+syn keyword txl_keyword contained block* boundp break-str butlast
+syn keyword txl_keyword contained caaaaar caaaadr caaaar caaadar
+syn keyword txl_keyword contained caaaddr caaadr caaar caadaar
+syn keyword txl_keyword contained caadadr caadar caaddar caadddr
+syn keyword txl_keyword contained caaddr caadr caar cadaaar
+syn keyword txl_keyword contained cadaadr cadaar cadadar cadaddr
+syn keyword txl_keyword contained cadadr cadar caddaar caddadr
+syn keyword txl_keyword contained caddar cadddar caddddr cadddr
+syn keyword txl_keyword contained caddr cadr call call-clobber-expander
+syn keyword txl_keyword contained call-delete-expander call-finalizers call-super-fun call-super-method
+syn keyword txl_keyword contained call-update-expander callf car caseq
+syn keyword txl_keyword contained caseql casequal cat-str cat-streams
+syn keyword txl_keyword contained cat-vec catch catenated-stream-p catenated-stream-push
+syn keyword txl_keyword contained cdaaaar cdaaadr cdaaar cdaadar
+syn keyword txl_keyword contained cdaaddr cdaadr cdaar cdadaar
+syn keyword txl_keyword contained cdadadr cdadar cdaddar cdadddr
+syn keyword txl_keyword contained cdaddr cdadr cdar cddaaar
+syn keyword txl_keyword contained cddaadr cddaar cddadar cddaddr
+syn keyword txl_keyword contained cddadr cddar cdddaar cdddadr
+syn keyword txl_keyword contained cdddar cddddar cdddddr cddddr
+syn keyword txl_keyword contained cdddr cddr cdr ceil
+syn keyword txl_keyword contained chain chand chdir chmod
+syn keyword txl_keyword contained chr-digit chr-int chr-isalnum chr-isalpha
+syn keyword txl_keyword contained chr-isascii chr-isblank chr-iscntrl chr-isdigit
+syn keyword txl_keyword contained chr-isgraph chr-islower chr-isprint chr-ispunct
+syn keyword txl_keyword contained chr-isspace chr-isunisp chr-isupper chr-isxdigit
+syn keyword txl_keyword contained chr-num chr-str chr-str-set chr-tolower
+syn keyword txl_keyword contained chr-toupper chr-xdigit chrp clamp
 syn keyword txl_keyword contained clear-error clear-struct close-stream closelog
 syn keyword txl_keyword contained cmp-str collect-each collect-each* comb
 syn keyword txl_keyword contained compl-span-str cond conda condlet
@@ -217,101 +218,102 @@ syn keyword txl_keyword contained put-lines put-string put-strings pwd
 syn keyword txl_keyword contained qquote qref quote raise
 syn keyword txl_keyword contained rand random random-fixnum random-state-p
 syn keyword txl_keyword contained range range* range-regex rangep
-syn keyword txl_keyword contained rcomb rcons read readlink
-syn keyword txl_keyword contained real-time-stream-p reduce-left reduce-right ref
-syn keyword txl_keyword contained refset regex-compile regex-parse regexp
-syn keyword txl_keyword contained register-exception-subtypes regsub rehome-sym remhash
-syn keyword txl_keyword contained remove-if remove-if* remove-path remq
-syn keyword txl_keyword contained remq* remql remql* remqual
-syn keyword txl_keyword contained remqual* rename-path repeat replace
-syn keyword txl_keyword contained replace-list replace-str replace-struct replace-vec
-syn keyword txl_keyword contained reset-struct rest ret retf
-syn keyword txl_keyword contained return return* return-from revappend
-syn keyword txl_keyword contained reverse rlcp rlet rotate
-syn keyword txl_keyword contained rperm rplaca rplacd run
-syn keyword txl_keyword contained s-ifblk s-ifchr s-ifdir s-ififo
-syn keyword txl_keyword contained s-iflnk s-ifmt s-ifreg s-ifsock
-syn keyword txl_keyword contained s-irgrp s-iroth s-irusr s-irwxg
-syn keyword txl_keyword contained s-irwxo s-irwxu s-isgid s-isuid
-syn keyword txl_keyword contained s-isvtx s-iwgrp s-iwoth s-iwusr
-syn keyword txl_keyword contained s-ixgrp s-ixoth s-ixusr search
-syn keyword txl_keyword contained search-regex search-regst search-str search-str-tree
-syn keyword txl_keyword contained second seek-stream select self-path
-syn keyword txl_keyword contained seqp set set-diff set-hash-userdata
-syn keyword txl_keyword contained set-indent set-indent-mode set-sig-handler setegid
-syn keyword txl_keyword contained setenv seteuid setgid setgrent
-syn keyword txl_keyword contained sethash setitimer setlogmask setpwent
-syn keyword txl_keyword contained setuid seventh sh shift
-syn keyword txl_keyword contained shuffle sig-abrt sig-alrm sig-bus
-syn keyword txl_keyword contained sig-check sig-chld sig-cont sig-fpe
-syn keyword txl_keyword contained sig-hup sig-ill sig-int sig-io
-syn keyword txl_keyword contained sig-iot sig-kill sig-pipe sig-poll
-syn keyword txl_keyword contained sig-prof sig-pwr sig-quit sig-segv
-syn keyword txl_keyword contained sig-stkflt sig-stop sig-sys sig-term
-syn keyword txl_keyword contained sig-trap sig-tstp sig-ttin sig-ttou
-syn keyword txl_keyword contained sig-urg sig-usr1 sig-usr2 sig-vtalrm
-syn keyword txl_keyword contained sig-winch sig-xcpu sig-xfsz sign-extend
-syn keyword txl_keyword contained sin sixth size-vec slot
-syn keyword txl_keyword contained slotp slotset some sort
-syn keyword txl_keyword contained sort-group source-loc source-loc-str span-str
-syn keyword txl_keyword contained special-operator-p special-var-p splice split
-syn keyword txl_keyword contained split-str split-str-set sqrt sssucc
-syn keyword txl_keyword contained ssucc stat static-slot static-slot-ensure
-syn keyword txl_keyword contained static-slot-p static-slot-set stdlib str<
-syn keyword txl_keyword contained str<= str= str> str>=
-syn keyword txl_keyword contained stream-get-prop stream-set-prop streamp string-extend
-syn keyword txl_keyword contained string-lt stringp struct-type struct-type-p
-syn keyword txl_keyword contained structp sub sub-list sub-str
-syn keyword txl_keyword contained sub-vec subtypep succ super
-syn keyword txl_keyword contained super-method suspend swap symacrolet
-syn keyword txl_keyword contained symbol-function symbol-macro symbol-name symbol-package
-syn keyword txl_keyword contained symbol-value symbolp symlink sys:*lisp1*
-syn keyword txl_keyword contained sys:abscond* sys:abscond-from sys:bad-slot-syntax sys:capture-cont
-syn keyword txl_keyword contained sys:cp-origin sys:defmeth sys:do-path-test sys:dwim-del
-syn keyword txl_keyword contained sys:dwim-set sys:eval-err sys:expand sys:expr
-syn keyword txl_keyword contained sys:fbind sys:gc sys:gc-set-delta sys:get-fb
-syn keyword txl_keyword contained sys:get-mb sys:get-vb sys:handle-bad-syntax sys:if-to-cond
-syn keyword txl_keyword contained sys:l1-setq sys:l1-val sys:lbind sys:lisp1-setq
-syn keyword txl_keyword contained sys:lisp1-value sys:load sys:make-struct-type sys:mark-special
-syn keyword txl_keyword contained sys:obtain-impl sys:path-access sys:path-examine sys:path-test
-syn keyword txl_keyword contained sys:path-test-mode sys:pl-expand sys:placelet-1 sys:prune-nil-inits
-syn keyword txl_keyword contained sys:qquote sys:quasi sys:quasilist sys:reg-expand-nongreedy
-syn keyword txl_keyword contained sys:reg-optimize sys:register-simple-accessor sys:rplaca sys:rplacd
-syn keyword txl_keyword contained sys:set-macro-ancestor sys:setq sys:setqf sys:splice
-syn keyword txl_keyword contained sys:struct-lit sys:sym-clobber-expander sys:sym-delete-expander sys:sym-update-expander
-syn keyword txl_keyword contained sys:top-fb sys:top-mb sys:top-vb sys:unquote
-syn keyword txl_keyword contained sys:var sys:with-saved-vars syslog system-package
-syn keyword txl_keyword contained t take take-until take-while
-syn keyword txl_keyword contained tan tb tc tenth
-syn keyword txl_keyword contained test-set-indent-mode tf third throw
-syn keyword txl_keyword contained throwf time time-fields-local time-fields-utc
-syn keyword txl_keyword contained time-string-local time-string-utc time-struct-local time-struct-utc
-syn keyword txl_keyword contained time-usec to tofloat toint
-syn keyword txl_keyword contained tok-str tok-where tostring tostringp
-syn keyword txl_keyword contained tprint transpose tree-bind tree-case
-syn keyword txl_keyword contained tree-find trie-add trie-compress trie-lookup-begin
-syn keyword txl_keyword contained trie-lookup-feed-char trie-value-at trim-str true
-syn keyword txl_keyword contained trunc trunc-rem truncate-stream tuples
-syn keyword txl_keyword contained txr-case txr-case-impl txr-if txr-sym
-syn keyword txl_keyword contained txr-version txr-when typecase typeof
-syn keyword txl_keyword contained typep umeth umethod unget-byte
-syn keyword txl_keyword contained unget-char uniq unique unless
-syn keyword txl_keyword contained unquote unsetenv until until*
-syn keyword txl_keyword contained unwind-protect upcase-str update url-decode
-syn keyword txl_keyword contained url-encode user-package usl usleep
-syn keyword txl_keyword contained uslot vec vec-list vec-push
-syn keyword txl_keyword contained vec-set-length vecref vector vector-list
-syn keyword txl_keyword contained vectorp w-continued w-coredump w-exitstatus
-syn keyword txl_keyword contained w-ifcontinued w-ifexited w-ifsignaled w-ifstopped
-syn keyword txl_keyword contained w-nohang w-stopsig w-termsig w-untraced
-syn keyword txl_keyword contained wait weave when whenlet
-syn keyword txl_keyword contained where while while* whilet
-syn keyword txl_keyword contained width width-check window-map window-mappend
-syn keyword txl_keyword contained with-clobber-expander with-delete-expander with-gensyms with-hash-iter
-syn keyword txl_keyword contained with-in-string-byte-stream with-in-string-stream with-objects with-out-string-stream
-syn keyword txl_keyword contained with-out-strlist-stream with-resources with-stream with-update-expander
-syn keyword txl_keyword contained wrap wrap* yield yield-from
-syn keyword txl_keyword contained zap zerop zip
+syn keyword txl_keyword contained rcomb rcons read read-until-match
+syn keyword txl_keyword contained readlink real-time-stream-p record-adapter reduce-left
+syn keyword txl_keyword contained reduce-right ref refset regex-compile
+syn keyword txl_keyword contained regex-parse regexp register-exception-subtypes regsub
+syn keyword txl_keyword contained rehome-sym remhash remove-if remove-if*
+syn keyword txl_keyword contained remove-path remq remq* remql
+syn keyword txl_keyword contained remql* remqual remqual* rename-path
+syn keyword txl_keyword contained repeat replace replace-list replace-str
+syn keyword txl_keyword contained replace-struct replace-vec reset-struct rest
+syn keyword txl_keyword contained ret retf return return*
+syn keyword txl_keyword contained return-from revappend reverse rlcp
+syn keyword txl_keyword contained rlet rotate rperm rplaca
+syn keyword txl_keyword contained rplacd run s-ifblk s-ifchr
+syn keyword txl_keyword contained s-ifdir s-ififo s-iflnk s-ifmt
+syn keyword txl_keyword contained s-ifreg s-ifsock s-irgrp s-iroth
+syn keyword txl_keyword contained s-irusr s-irwxg s-irwxo s-irwxu
+syn keyword txl_keyword contained s-isgid s-isuid s-isvtx s-iwgrp
+syn keyword txl_keyword contained s-iwoth s-iwusr s-ixgrp s-ixoth
+syn keyword txl_keyword contained s-ixusr search search-regex search-regst
+syn keyword txl_keyword contained search-str search-str-tree second seek-stream
+syn keyword txl_keyword contained select self-path seqp set
+syn keyword txl_keyword contained set-diff set-hash-userdata set-indent set-indent-mode
+syn keyword txl_keyword contained set-sig-handler setegid setenv seteuid
+syn keyword txl_keyword contained setgid setgrent sethash setitimer
+syn keyword txl_keyword contained setlogmask setpwent setuid seventh
+syn keyword txl_keyword contained sh shift shuffle sig-abrt
+syn keyword txl_keyword contained sig-alrm sig-bus sig-check sig-chld
+syn keyword txl_keyword contained sig-cont sig-fpe sig-hup sig-ill
+syn keyword txl_keyword contained sig-int sig-io sig-iot sig-kill
+syn keyword txl_keyword contained sig-pipe sig-poll sig-prof sig-pwr
+syn keyword txl_keyword contained sig-quit sig-segv sig-stkflt sig-stop
+syn keyword txl_keyword contained sig-sys sig-term sig-trap sig-tstp
+syn keyword txl_keyword contained sig-ttin sig-ttou sig-urg sig-usr1
+syn keyword txl_keyword contained sig-usr2 sig-vtalrm sig-winch sig-xcpu
+syn keyword txl_keyword contained sig-xfsz sign-extend sin sixth
+syn keyword txl_keyword contained size-vec slot slotp slotset
+syn keyword txl_keyword contained some sort sort-group source-loc
+syn keyword txl_keyword contained source-loc-str span-str special-operator-p special-var-p
+syn keyword txl_keyword contained splice split split-str split-str-set
+syn keyword txl_keyword contained sqrt sssucc ssucc stat
+syn keyword txl_keyword contained static-slot static-slot-ensure static-slot-p static-slot-set
+syn keyword txl_keyword contained stdlib str< str<= str=
+syn keyword txl_keyword contained str> str>= stream-get-prop stream-set-prop
+syn keyword txl_keyword contained streamp string-extend string-lt stringp
+syn keyword txl_keyword contained struct-type struct-type-p structp sub
+syn keyword txl_keyword contained sub-list sub-str sub-vec subtypep
+syn keyword txl_keyword contained succ super super-method suspend
+syn keyword txl_keyword contained swap symacrolet symbol-function symbol-macro
+syn keyword txl_keyword contained symbol-name symbol-package symbol-value symbolp
+syn keyword txl_keyword contained symlink sys:*lisp1* sys:abscond* sys:abscond-from
+syn keyword txl_keyword contained sys:bad-slot-syntax sys:capture-cont sys:cp-origin sys:defmeth
+syn keyword txl_keyword contained sys:do-path-test sys:dwim-del sys:dwim-set sys:eval-err
+syn keyword txl_keyword contained sys:expand sys:expr sys:fbind sys:gc
+syn keyword txl_keyword contained sys:gc-set-delta sys:get-fb sys:get-mb sys:get-vb
+syn keyword txl_keyword contained sys:handle-bad-syntax sys:if-to-cond sys:l1-setq sys:l1-val
+syn keyword txl_keyword contained sys:lbind sys:lisp1-setq sys:lisp1-value sys:load
+syn keyword txl_keyword contained sys:make-struct-type sys:mark-special sys:obtain-impl sys:path-access
+syn keyword txl_keyword contained sys:path-examine sys:path-test sys:path-test-mode sys:pl-expand
+syn keyword txl_keyword contained sys:placelet-1 sys:prune-nil-inits sys:qquote sys:quasi
+syn keyword txl_keyword contained sys:quasilist sys:reg-expand-nongreedy sys:reg-optimize sys:register-simple-accessor
+syn keyword txl_keyword contained sys:rplaca sys:rplacd sys:set-macro-ancestor sys:setq
+syn keyword txl_keyword contained sys:setqf sys:splice sys:struct-lit sys:sym-clobber-expander
+syn keyword txl_keyword contained sys:sym-delete-expander sys:sym-update-expander sys:top-fb sys:top-mb
+syn keyword txl_keyword contained sys:top-vb sys:unquote sys:var sys:with-saved-vars
+syn keyword txl_keyword contained syslog system-package t take
+syn keyword txl_keyword contained take-until take-while tan tb
+syn keyword txl_keyword contained tc tenth test-set-indent-mode tf
+syn keyword txl_keyword contained third throw throwf time
+syn keyword txl_keyword contained time-fields-local time-fields-utc time-string-local time-string-utc
+syn keyword txl_keyword contained time-struct-local time-struct-utc time-usec to
+syn keyword txl_keyword contained tofloat toint tok-str tok-where
+syn keyword txl_keyword contained tostring tostringp tprint transpose
+syn keyword txl_keyword contained tree-bind tree-case tree-find trie-add
+syn keyword txl_keyword contained trie-compress trie-lookup-begin trie-lookup-feed-char trie-value-at
+syn keyword txl_keyword contained trim-str true trunc trunc-rem
+syn keyword txl_keyword contained truncate-stream tuples txr-case txr-case-impl
+syn keyword txl_keyword contained txr-if txr-sym txr-version txr-when
+syn keyword txl_keyword contained typecase typeof typep umeth
+syn keyword txl_keyword contained umethod unget-byte unget-char uniq
+syn keyword txl_keyword contained unique unless unquote unsetenv
+syn keyword txl_keyword contained until until* unwind-protect upcase-str
+syn keyword txl_keyword contained update url-decode url-encode user-package
+syn keyword txl_keyword contained usl usleep uslot vec
+syn keyword txl_keyword contained vec-list vec-push vec-set-length vecref
+syn keyword txl_keyword contained vector vector-list vectorp w-continued
+syn keyword txl_keyword contained w-coredump w-exitstatus w-ifcontinued w-ifexited
+syn keyword txl_keyword contained w-ifsignaled w-ifstopped w-nohang w-stopsig
+syn keyword txl_keyword contained w-termsig w-untraced wait weave
+syn keyword txl_keyword contained when whenlet where while
+syn keyword txl_keyword contained while* whilet width width-check
+syn keyword txl_keyword contained window-map window-mappend with-clobber-expander with-delete-expander
+syn keyword txl_keyword contained with-gensyms with-hash-iter with-in-string-byte-stream with-in-string-stream
+syn keyword txl_keyword contained with-objects with-out-string-stream with-out-strlist-stream with-resources
+syn keyword txl_keyword contained with-slots with-stream with-update-expander wrap
+syn keyword txl_keyword contained wrap* yield yield-from zap
+syn keyword txl_keyword contained zerop zip
 
 syn keyword txr_keyword contained accept all and assert
 syn keyword txr_keyword contained bind block cases cat
@@ -429,4 +431,4 @@ hi def link txr_nested_error Error
 
 let b:current_syntax = "lisp"
 
-set lispwords=ado,ap,append-each,append-each*,aret,block,block*,caseq,caseql,casequal,catch,collect-each,collect-each*,cond,conda,condlet,dec,defex,define-accessor,define-modify-macro,define-place-macro,defmacro,defmeth,defparm,defparml,defplace,defstruct,defsymacro,defun,defvar,defvarl,del,delay,do,dohash,dotimes,each,each*,flet,flip,for,for*,fun,gen,gun,handle,handler-bind,ido,if,ifa,iflet,ignerr,ip,labels,lambda,lcons,let,let*,load,mac-param-bind,macro-time,macrolet,mlet,obtain,obtain-block,op,placelet,placelet*,pop,pprof,prof,prog1,progn,push,pushnew,ret,return,return-from,rlet,splice,suspend,symacrolet,sys:abscond-from,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:unquote,sys:var,sys:with-saved-vars,tb,tc,tree-bind,tree-case,txr-case,txr-case-impl,txr-if,txr-when,typecase,unless,unquote,until,until*,unwind-protect,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-stream,with-update-expander,yield,yield-from,zap,:method,:function,:init,:postinit,:fini
+set lispwords=ado,ap,append-each,append-each*,aret,block,block*,caseq,caseql,casequal,catch,collect-each,collect-each*,cond,conda,condlet,dec,defex,define-accessor,define-modify-macro,define-place-macro,defmacro,defmeth,defparm,defparml,defplace,defstruct,defsymacro,defun,defvar,defvarl,del,delay,do,dohash,dotimes,each,each*,flet,flip,for,for*,fun,gen,gun,handle,handler-bind,ido,if,ifa,iflet,ignerr,ip,labels,lambda,lcons,let,let*,load,mac-param-bind,macro-time,macrolet,mlet,obtain,obtain-block,op,placelet,placelet*,pop,pprof,prof,prog1,progn,push,pushnew,ret,return,return-from,rlet,splice,suspend,symacrolet,sys:abscond-from,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:unquote,sys:var,sys:with-saved-vars,tb,tc,tree-bind,tree-case,txr-case,txr-case-impl,txr-if,txr-when,typecase,unless,unquote,until,until*,unwind-protect,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