Version 137.txr-137

* RELNOTES: Updated.

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

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

* txr.vim, tl.vim: Regenerated.

6 files changed, 334 insertions, 304 deletions

diff --git a/RELNOTES b/RELNOTES
index 09bc675b..5717f05b 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,25 @@
+                                    TXR 137
+                                   2016-03-30
+
+
+  Features
+
+  - Heads up: @(if) directive changes semantics.
+    - no longer a syntactic sugar for @(cases)/@(require).
+  - Rightmost-match variants added for various search
+    functions: rfind, rpos, rmember and numerous others.
+  - New macro lset for assigning consecutive elements of
+    a sequence to multiple places.
+
+  Bugs
+
+  - Fix in lazy string implementation:
+    - printing lazy string was not observing the string's limit
+    - see limit-count param in lazy-str function.
+  - Fix in error location reporting across macro expansions.
+
+
+
                                     TXR 136
                                    2016-03-20
 
diff --git a/configure b/configure
index ddfc2f63..3acbb5b4 100755
--- a/configure
+++ b/configure
@@ -443,7 +443,7 @@ fi
 #
 
 
-txr_ver=136
+txr_ver=137
 
 #
 # The all important banner.
diff --git a/share/txr/stdlib/ver.tl b/share/txr/stdlib/ver.tl
index adaf29d4..07e67f84 100644
--- a/share/txr/stdlib/ver.tl
+++ b/share/txr/stdlib/ver.tl
@@ -1,2 +1,2 @@
-(defvarl lib-version 136)
+(defvarl lib-version 137)
 (defvarl *lib-version* lib-version)
diff --git a/tl.vim b/tl.vim
index 9546ca0a..527ab96e 100644
--- a/tl.vim
+++ b/tl.vim
@@ -177,156 +177,160 @@ syn keyword txl_keyword contained log-ndelay log-notice log-nowait log-odelay
 syn keyword txl_keyword contained log-perror log-pid log-user log-warning
 syn keyword txl_keyword contained log10 log2 logand logior
 syn keyword txl_keyword contained lognot logtest logtrunc logxor
-syn keyword txl_keyword contained lstat mac-param-bind macro-ancestor macro-form-p
-syn keyword txl_keyword contained macro-time macroexpand macroexpand-1 macrolet
-syn keyword txl_keyword contained major make-catenated-stream make-env make-hash
-syn keyword txl_keyword contained make-lazy-cons make-lazy-struct make-like make-package
-syn keyword txl_keyword contained make-random-state make-similar-hash make-string-byte-input-stream make-string-input-stream
-syn keyword txl_keyword contained make-string-output-stream make-strlist-output-stream make-struct make-struct-type
-syn keyword txl_keyword contained make-sym make-time make-time-utc make-trie
-syn keyword txl_keyword contained makedev makunbound mapcar mapcar*
-syn keyword txl_keyword contained mapdo mapf maphash mappend
-syn keyword txl_keyword contained mappend* mask match-fun match-regex
-syn keyword txl_keyword contained match-regex-right match-regst match-regst-right match-str
-syn keyword txl_keyword contained match-str-tree max mboundp member
-syn keyword txl_keyword contained member-if memq memql memqual
-syn keyword txl_keyword contained merge meth method min
-syn keyword txl_keyword contained minor minusp mkdir mknod
-syn keyword txl_keyword contained mkstring mlet mmakunbound mod
-syn keyword txl_keyword contained multi multi-sort n-choose-k n-perm-k
-syn keyword txl_keyword contained nconc new nexpand-left nil
-syn keyword txl_keyword contained nilf ninth none not
-syn keyword txl_keyword contained notf nreconc nreverse nthcdr
-syn keyword txl_keyword contained null nullify num-chr num-str
-syn keyword txl_keyword contained numberp oand obtain obtain-block
-syn keyword txl_keyword contained oddp op open-command open-directory
-syn keyword txl_keyword contained open-file open-fileno open-files open-files*
-syn keyword txl_keyword contained open-pipe open-process open-socket open-tail
-syn keyword txl_keyword contained openlog opip or orf
-syn keyword txl_keyword contained package-alist package-name package-symbols packagep
-syn keyword txl_keyword contained pad partition partition* partition-by
-syn keyword txl_keyword contained path-blkdev-p path-chrdev-p path-dir-p path-executable-to-me-p
-syn keyword txl_keyword contained path-exists-p path-file-p path-mine-p path-my-group-p
-syn keyword txl_keyword contained path-newer path-older path-pipe-p path-private-to-me-p
-syn keyword txl_keyword contained path-same-object path-setgid-p path-setuid-p path-sock-p
-syn keyword txl_keyword contained path-sticky-p path-symlink-p path-writable-to-me-p perm
-syn keyword txl_keyword contained pipe place-form-p placelet placelet*
-syn keyword txl_keyword contained plusp poll poll-err poll-in
-syn keyword txl_keyword contained poll-nval poll-out poll-pri poll-rdband
-syn keyword txl_keyword contained poll-wrband pop pos pos-if
-syn keyword txl_keyword contained pos-max pos-min posq posql
-syn keyword txl_keyword contained posqual pppred ppred pprinl
-syn keyword txl_keyword contained pprint pprof pred prinl
-syn keyword txl_keyword contained print prof prog1 progn
-syn keyword txl_keyword contained promisep prop proper-listp pset
-syn keyword txl_keyword contained push pushhash pushnew put-byte
-syn keyword txl_keyword contained put-char put-line put-lines put-string
-syn keyword txl_keyword contained put-strings pwd qquote qref
-syn keyword txl_keyword contained quote raise rand random
-syn keyword txl_keyword contained random-fixnum random-state-get-vec random-state-p range
-syn keyword txl_keyword contained range* range-regex rangep rcomb
-syn keyword txl_keyword contained rcons read read-until-match readlink
-syn keyword txl_keyword contained real-time-stream-p record-adapter reduce-left reduce-right
-syn keyword txl_keyword contained ref refset regex-compile regex-parse
-syn keyword txl_keyword contained regexp register-exception-subtypes regsub rehome-sym
-syn keyword txl_keyword contained remhash remove-if remove-if* remove-path
-syn keyword txl_keyword contained remq remq* remql remql*
-syn keyword txl_keyword contained remqual remqual* rename-path repeat
-syn keyword txl_keyword contained replace replace-list replace-str replace-struct
-syn keyword txl_keyword contained replace-vec reset-struct rest ret
-syn keyword txl_keyword contained retf return return* return-from
-syn keyword txl_keyword contained revappend reverse rlcp rlet
+syn keyword txl_keyword contained lset lstat mac-param-bind macro-ancestor
+syn keyword txl_keyword contained macro-form-p macro-time macroexpand macroexpand-1
+syn keyword txl_keyword contained macrolet major make-catenated-stream make-env
+syn keyword txl_keyword contained make-hash make-lazy-cons make-lazy-struct make-like
+syn keyword txl_keyword contained make-package make-random-state make-similar-hash make-string-byte-input-stream
+syn keyword txl_keyword contained make-string-input-stream make-string-output-stream make-strlist-output-stream make-struct
+syn keyword txl_keyword contained make-struct-type make-sym make-time make-time-utc
+syn keyword txl_keyword contained make-trie makedev makunbound mapcar
+syn keyword txl_keyword contained mapcar* mapdo mapf maphash
+syn keyword txl_keyword contained mappend mappend* mask match-fun
+syn keyword txl_keyword contained match-regex match-regex-right match-regst match-regst-right
+syn keyword txl_keyword contained match-str match-str-tree max mboundp
+syn keyword txl_keyword contained member member-if memq memql
+syn keyword txl_keyword contained memqual merge meth method
+syn keyword txl_keyword contained min minor minusp mkdir
+syn keyword txl_keyword contained mknod mkstring mlet mmakunbound
+syn keyword txl_keyword contained mod multi multi-sort n-choose-k
+syn keyword txl_keyword contained n-perm-k nconc new nexpand-left
+syn keyword txl_keyword contained nil nilf ninth none
+syn keyword txl_keyword contained not notf nreconc nreverse
+syn keyword txl_keyword contained nthcdr null nullify num-chr
+syn keyword txl_keyword contained num-str numberp oand obtain
+syn keyword txl_keyword contained obtain-block oddp op open-command
+syn keyword txl_keyword contained open-directory open-file open-fileno open-files
+syn keyword txl_keyword contained open-files* open-pipe open-process open-socket
+syn keyword txl_keyword contained open-tail openlog opip or
+syn keyword txl_keyword contained orf package-alist package-name package-symbols
+syn keyword txl_keyword contained packagep pad partition partition*
+syn keyword txl_keyword contained partition-by path-blkdev-p path-chrdev-p path-dir-p
+syn keyword txl_keyword contained path-executable-to-me-p path-exists-p path-file-p path-mine-p
+syn keyword txl_keyword contained path-my-group-p path-newer path-older path-pipe-p
+syn keyword txl_keyword contained path-private-to-me-p path-same-object path-setgid-p path-setuid-p
+syn keyword txl_keyword contained path-sock-p path-sticky-p path-symlink-p path-writable-to-me-p
+syn keyword txl_keyword contained perm pipe place-form-p placelet
+syn keyword txl_keyword contained placelet* plusp poll poll-err
+syn keyword txl_keyword contained poll-in poll-nval poll-out poll-pri
+syn keyword txl_keyword contained poll-rdband poll-wrband pop pos
+syn keyword txl_keyword contained pos-if pos-max pos-min posq
+syn keyword txl_keyword contained posql posqual pppred ppred
+syn keyword txl_keyword contained pprinl pprint pprof pred
+syn keyword txl_keyword contained prinl print prof prog1
+syn keyword txl_keyword contained progn promisep prop proper-listp
+syn keyword txl_keyword contained pset push pushhash pushnew
+syn keyword txl_keyword contained put-byte put-char put-line put-lines
+syn keyword txl_keyword contained put-string put-strings pwd qquote
+syn keyword txl_keyword contained qref quote raise rand
+syn keyword txl_keyword contained random random-fixnum random-state-get-vec random-state-p
+syn keyword txl_keyword contained range range* range-regex rangep
+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 rfind
+syn keyword txl_keyword contained rfind-if rlcp rlet rmember
+syn keyword txl_keyword contained rmember-if rmemq rmemql rmemqual
 syn keyword txl_keyword contained rotate rperm rplaca rplacd
-syn keyword txl_keyword contained run s-ifblk s-ifchr s-ifdir
-syn keyword txl_keyword contained s-ififo s-iflnk s-ifmt s-ifreg
-syn keyword txl_keyword contained s-ifsock s-irgrp s-iroth s-irusr
-syn keyword txl_keyword contained s-irwxg s-irwxo s-irwxu s-isgid
-syn keyword txl_keyword contained s-isuid s-isvtx s-iwgrp s-iwoth
-syn keyword txl_keyword contained s-iwusr s-ixgrp s-ixoth s-ixusr
-syn keyword txl_keyword contained search search-regex search-regst search-str
-syn keyword txl_keyword contained search-str-tree second seek-stream select
-syn keyword txl_keyword contained self-path seqp set set-diff
-syn keyword txl_keyword contained set-hash-userdata set-indent set-indent-mode set-sig-handler
-syn keyword txl_keyword contained setegid setenv seteuid setgid
-syn keyword txl_keyword contained setgrent sethash setitimer setlogmask
-syn keyword txl_keyword contained setpwent setuid seventh sh
-syn keyword txl_keyword contained shift shuffle shut-rd shut-rdwr
-syn keyword txl_keyword contained shut-wr 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 sock-accept sock-bind
-syn keyword txl_keyword contained sock-cloexec sock-connect sock-dgram sock-family
-syn keyword txl_keyword contained sock-listen sock-nonblock sock-peer sock-recv-timeout
-syn keyword txl_keyword contained sock-send-timeout sock-shutdown sock-stream sock-type
-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* split-str
-syn keyword txl_keyword contained split-str-set sqrt sssucc ssucc
-syn keyword txl_keyword contained stat static-slot static-slot-ensure static-slot-p
-syn keyword txl_keyword contained static-slot-set stdlib str-in6addr str-in6addr-net
-syn keyword txl_keyword contained str-inaddr str-inaddr-net str< str<=
-syn keyword txl_keyword contained str= str> str>= stream-get-prop
-syn keyword txl_keyword contained stream-set-prop streamp string-extend string-lt
-syn keyword txl_keyword contained stringp struct-type struct-type-p structp
-syn keyword txl_keyword contained sub sub-list sub-str sub-vec
-syn keyword txl_keyword contained subtypep succ super super-method
-syn keyword txl_keyword contained suspend swap symacrolet symbol-function
-syn keyword txl_keyword contained symbol-macro symbol-name symbol-package symbol-value
-syn keyword txl_keyword contained symbolp symlink sys:*lisp1* sys:abscond*
-syn keyword txl_keyword contained sys:abscond-from sys:bad-slot-syntax sys:capture-cont sys:cp-origin
-syn keyword txl_keyword contained sys:defmeth sys:do-path-test sys:dwim-del sys:dwim-set
-syn keyword txl_keyword contained sys:eval-err sys:expand sys:expr sys:fbind
-syn keyword txl_keyword contained sys:gc sys:gc-set-delta sys:get-fb sys:get-mb
-syn keyword txl_keyword contained sys:get-vb sys:handle-bad-syntax sys:if-to-cond sys:in6addr-condensed-text
-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:str-inaddr-net-impl sys:struct-lit sys:sym-clobber-expander sys:sym-delete-expander
-syn keyword txl_keyword contained sys:sym-update-expander sys:top-fb sys:top-mb sys:top-vb
-syn keyword txl_keyword contained sys:unquote sys:var sys:with-saved-vars syslog
-syn keyword txl_keyword contained system-package t take take-until
-syn keyword txl_keyword contained take-while tan tb tc
-syn keyword txl_keyword contained tenth test-set-indent-mode tf third
-syn keyword txl_keyword contained throw throwf time time-fields-local
-syn keyword txl_keyword contained time-fields-utc time-string-local time-string-utc time-struct-local
-syn keyword txl_keyword contained time-struct-utc time-usec to tofloat
-syn keyword txl_keyword contained toint tok-str tok-where tostring
-syn keyword txl_keyword contained tostringp tprint transpose tree-bind
-syn keyword txl_keyword contained tree-case tree-find trie-add trie-compress
-syn keyword txl_keyword contained trie-lookup-begin trie-lookup-feed-char trie-value-at trim-str
-syn keyword txl_keyword contained true trunc trunc-rem truncate-stream
-syn keyword txl_keyword contained tuples txr-case txr-case-impl txr-if
-syn keyword txl_keyword contained txr-sym txr-version txr-when typecase
-syn keyword txl_keyword contained typeof typep umask 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 use
-syn keyword txl_keyword contained user-package usl usleep uslot
-syn keyword txl_keyword contained vec vec-list vec-push vec-set-length
-syn keyword txl_keyword contained vecref vector vector-list vectorp
-syn keyword txl_keyword contained w-continued w-coredump w-exitstatus w-ifcontinued
-syn keyword txl_keyword contained w-ifexited w-ifsignaled w-ifstopped w-nohang
-syn keyword txl_keyword contained w-stopsig w-termsig w-untraced wait
-syn keyword txl_keyword contained weave when whenlet where
-syn keyword txl_keyword contained while while* whilet width
-syn keyword txl_keyword contained width-check window-map window-mappend with-clobber-expander
-syn keyword txl_keyword contained with-delete-expander with-gensyms with-hash-iter with-in-string-byte-stream
-syn keyword txl_keyword contained with-in-string-stream with-objects with-out-string-stream with-out-strlist-stream
-syn keyword txl_keyword contained with-resources with-slots 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 rpos rpos-if rposq rposql
+syn keyword txl_keyword contained rposqual rsearch run s-ifblk
+syn keyword txl_keyword contained s-ifchr s-ifdir s-ififo s-iflnk
+syn keyword txl_keyword contained s-ifmt s-ifreg s-ifsock s-irgrp
+syn keyword txl_keyword contained s-iroth s-irusr s-irwxg s-irwxo
+syn keyword txl_keyword contained s-irwxu s-isgid s-isuid s-isvtx
+syn keyword txl_keyword contained s-iwgrp s-iwoth s-iwusr s-ixgrp
+syn keyword txl_keyword contained s-ixoth s-ixusr search search-regex
+syn keyword txl_keyword contained search-regst search-str search-str-tree second
+syn keyword txl_keyword contained seek-stream select self-path seqp
+syn keyword txl_keyword contained set set-diff set-hash-userdata set-indent
+syn keyword txl_keyword contained set-indent-mode set-sig-handler setegid setenv
+syn keyword txl_keyword contained seteuid setgid setgrent sethash
+syn keyword txl_keyword contained setitimer setlogmask setpwent setuid
+syn keyword txl_keyword contained seventh sh shift shuffle
+syn keyword txl_keyword contained shut-rd shut-rdwr shut-wr 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 sock-accept sock-bind sock-cloexec sock-connect
+syn keyword txl_keyword contained sock-dgram sock-family sock-listen sock-nonblock
+syn keyword txl_keyword contained sock-peer sock-recv-timeout sock-send-timeout sock-shutdown
+syn keyword txl_keyword contained sock-stream sock-type 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* split-str split-str-set sqrt
+syn keyword txl_keyword contained sssucc ssucc stat static-slot
+syn keyword txl_keyword contained static-slot-ensure static-slot-p static-slot-set stdlib
+syn keyword txl_keyword contained str-in6addr str-in6addr-net str-inaddr str-inaddr-net
+syn keyword txl_keyword contained str< str<= str= str>
+syn keyword txl_keyword contained str>= stream-get-prop stream-set-prop streamp
+syn keyword txl_keyword contained string-extend string-lt stringp struct-type
+syn keyword txl_keyword contained struct-type-p structp sub sub-list
+syn keyword txl_keyword contained sub-str sub-vec subtypep succ
+syn keyword txl_keyword contained super super-method suspend swap
+syn keyword txl_keyword contained symacrolet symbol-function symbol-macro symbol-name
+syn keyword txl_keyword contained symbol-package symbol-value symbolp symlink
+syn keyword txl_keyword contained sys:*lisp1* sys:abscond* sys:abscond-from sys:bad-slot-syntax
+syn keyword txl_keyword contained sys:capture-cont sys:cp-origin sys:defmeth sys:do-path-test
+syn keyword txl_keyword contained sys:dwim-del sys:dwim-set sys:eval-err sys:expand
+syn keyword txl_keyword contained sys:expr sys:fbind sys:gc sys:gc-set-delta
+syn keyword txl_keyword contained sys:get-fb sys:get-mb sys:get-vb sys:handle-bad-syntax
+syn keyword txl_keyword contained sys:if-to-cond sys:in6addr-condensed-text 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:str-inaddr-net-impl sys:struct-lit
+syn keyword txl_keyword contained sys:sym-clobber-expander sys:sym-delete-expander sys:sym-update-expander sys:top-fb
+syn keyword txl_keyword contained sys:top-mb sys:top-vb sys:unquote sys:var
+syn keyword txl_keyword contained sys:with-saved-vars syslog system-package t
+syn keyword txl_keyword contained take take-until take-while tan
+syn keyword txl_keyword contained tb tc tenth test-set-indent-mode
+syn keyword txl_keyword contained tf third throw throwf
+syn keyword txl_keyword contained time time-fields-local time-fields-utc time-string-local
+syn keyword txl_keyword contained time-string-utc time-struct-local time-struct-utc time-usec
+syn keyword txl_keyword contained to tofloat toint tok-str
+syn keyword txl_keyword contained tok-where tostring tostringp tprint
+syn keyword txl_keyword contained transpose tree-bind tree-case tree-find
+syn keyword txl_keyword contained trie-add trie-compress trie-lookup-begin trie-lookup-feed-char
+syn keyword txl_keyword contained trie-value-at trim-str true trunc
+syn keyword txl_keyword contained trunc-rem truncate-stream tuples txr-case
+syn keyword txl_keyword contained txr-case-impl txr-if txr-sym txr-version
+syn keyword txl_keyword contained txr-when typecase typeof typep
+syn keyword txl_keyword contained umask 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 use user-package usl
+syn keyword txl_keyword contained usleep uslot vec vec-list
+syn keyword txl_keyword contained vec-push vec-set-length vecref vector
+syn keyword txl_keyword contained vector-list vectorp w-continued w-coredump
+syn keyword txl_keyword contained w-exitstatus w-ifcontinued w-ifexited w-ifsignaled
+syn keyword txl_keyword contained w-ifstopped w-nohang w-stopsig w-termsig
+syn keyword txl_keyword contained w-untraced wait weave when
+syn keyword txl_keyword contained whenlet where while while*
+syn keyword txl_keyword contained whilet width width-check window-map
+syn keyword txl_keyword contained window-mappend with-clobber-expander with-delete-expander with-gensyms
+syn keyword txl_keyword contained with-hash-iter with-in-string-byte-stream with-in-string-stream with-objects
+syn keyword txl_keyword contained with-out-string-stream with-out-strlist-stream with-resources with-slots
+syn keyword txl_keyword contained with-stream with-update-expander wrap wrap*
+syn keyword txl_keyword contained yield yield-from zap zerop
+syn keyword txl_keyword contained 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]*"
@@ -417,4 +421,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-slots,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,lset,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 2720d6c1..f61a1216 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 2016-03-20 "Utility Commands" "TXR Data Processing Language" "Kaz Kylheku"
+.TH TXR 1 2016-03-30 "Utility Commands" "TXR Data Processing Language" "Kaz Kylheku"
 .SH* NAME
-\*(TX \- text processing language (version 136)
+\*(TX \- text processing language (version 137)
 
 .SH* SYNOPSIS
 .cblk
diff --git a/txr.vim b/txr.vim
index eb01db0e..1b92f806 100644
--- a/txr.vim
+++ b/txr.vim
@@ -177,156 +177,160 @@ syn keyword txl_keyword contained log-ndelay log-notice log-nowait log-odelay
 syn keyword txl_keyword contained log-perror log-pid log-user log-warning
 syn keyword txl_keyword contained log10 log2 logand logior
 syn keyword txl_keyword contained lognot logtest logtrunc logxor
-syn keyword txl_keyword contained lstat mac-param-bind macro-ancestor macro-form-p
-syn keyword txl_keyword contained macro-time macroexpand macroexpand-1 macrolet
-syn keyword txl_keyword contained major make-catenated-stream make-env make-hash
-syn keyword txl_keyword contained make-lazy-cons make-lazy-struct make-like make-package
-syn keyword txl_keyword contained make-random-state make-similar-hash make-string-byte-input-stream make-string-input-stream
-syn keyword txl_keyword contained make-string-output-stream make-strlist-output-stream make-struct make-struct-type
-syn keyword txl_keyword contained make-sym make-time make-time-utc make-trie
-syn keyword txl_keyword contained makedev makunbound mapcar mapcar*
-syn keyword txl_keyword contained mapdo mapf maphash mappend
-syn keyword txl_keyword contained mappend* mask match-fun match-regex
-syn keyword txl_keyword contained match-regex-right match-regst match-regst-right match-str
-syn keyword txl_keyword contained match-str-tree max mboundp member
-syn keyword txl_keyword contained member-if memq memql memqual
-syn keyword txl_keyword contained merge meth method min
-syn keyword txl_keyword contained minor minusp mkdir mknod
-syn keyword txl_keyword contained mkstring mlet mmakunbound mod
-syn keyword txl_keyword contained multi multi-sort n-choose-k n-perm-k
-syn keyword txl_keyword contained nconc new nexpand-left nil
-syn keyword txl_keyword contained nilf ninth none not
-syn keyword txl_keyword contained notf nreconc nreverse nthcdr
-syn keyword txl_keyword contained null nullify num-chr num-str
-syn keyword txl_keyword contained numberp oand obtain obtain-block
-syn keyword txl_keyword contained oddp op open-command open-directory
-syn keyword txl_keyword contained open-file open-fileno open-files open-files*
-syn keyword txl_keyword contained open-pipe open-process open-socket open-tail
-syn keyword txl_keyword contained openlog opip or orf
-syn keyword txl_keyword contained package-alist package-name package-symbols packagep
-syn keyword txl_keyword contained pad partition partition* partition-by
-syn keyword txl_keyword contained path-blkdev-p path-chrdev-p path-dir-p path-executable-to-me-p
-syn keyword txl_keyword contained path-exists-p path-file-p path-mine-p path-my-group-p
-syn keyword txl_keyword contained path-newer path-older path-pipe-p path-private-to-me-p
-syn keyword txl_keyword contained path-same-object path-setgid-p path-setuid-p path-sock-p
-syn keyword txl_keyword contained path-sticky-p path-symlink-p path-writable-to-me-p perm
-syn keyword txl_keyword contained pipe place-form-p placelet placelet*
-syn keyword txl_keyword contained plusp poll poll-err poll-in
-syn keyword txl_keyword contained poll-nval poll-out poll-pri poll-rdband
-syn keyword txl_keyword contained poll-wrband pop pos pos-if
-syn keyword txl_keyword contained pos-max pos-min posq posql
-syn keyword txl_keyword contained posqual pppred ppred pprinl
-syn keyword txl_keyword contained pprint pprof pred prinl
-syn keyword txl_keyword contained print prof prog1 progn
-syn keyword txl_keyword contained promisep prop proper-listp pset
-syn keyword txl_keyword contained push pushhash pushnew put-byte
-syn keyword txl_keyword contained put-char put-line put-lines put-string
-syn keyword txl_keyword contained put-strings pwd qquote qref
-syn keyword txl_keyword contained quote raise rand random
-syn keyword txl_keyword contained random-fixnum random-state-get-vec random-state-p range
-syn keyword txl_keyword contained range* range-regex rangep rcomb
-syn keyword txl_keyword contained rcons read read-until-match readlink
-syn keyword txl_keyword contained real-time-stream-p record-adapter reduce-left reduce-right
-syn keyword txl_keyword contained ref refset regex-compile regex-parse
-syn keyword txl_keyword contained regexp register-exception-subtypes regsub rehome-sym
-syn keyword txl_keyword contained remhash remove-if remove-if* remove-path
-syn keyword txl_keyword contained remq remq* remql remql*
-syn keyword txl_keyword contained remqual remqual* rename-path repeat
-syn keyword txl_keyword contained replace replace-list replace-str replace-struct
-syn keyword txl_keyword contained replace-vec reset-struct rest ret
-syn keyword txl_keyword contained retf return return* return-from
-syn keyword txl_keyword contained revappend reverse rlcp rlet
+syn keyword txl_keyword contained lset lstat mac-param-bind macro-ancestor
+syn keyword txl_keyword contained macro-form-p macro-time macroexpand macroexpand-1
+syn keyword txl_keyword contained macrolet major make-catenated-stream make-env
+syn keyword txl_keyword contained make-hash make-lazy-cons make-lazy-struct make-like
+syn keyword txl_keyword contained make-package make-random-state make-similar-hash make-string-byte-input-stream
+syn keyword txl_keyword contained make-string-input-stream make-string-output-stream make-strlist-output-stream make-struct
+syn keyword txl_keyword contained make-struct-type make-sym make-time make-time-utc
+syn keyword txl_keyword contained make-trie makedev makunbound mapcar
+syn keyword txl_keyword contained mapcar* mapdo mapf maphash
+syn keyword txl_keyword contained mappend mappend* mask match-fun
+syn keyword txl_keyword contained match-regex match-regex-right match-regst match-regst-right
+syn keyword txl_keyword contained match-str match-str-tree max mboundp
+syn keyword txl_keyword contained member member-if memq memql
+syn keyword txl_keyword contained memqual merge meth method
+syn keyword txl_keyword contained min minor minusp mkdir
+syn keyword txl_keyword contained mknod mkstring mlet mmakunbound
+syn keyword txl_keyword contained mod multi multi-sort n-choose-k
+syn keyword txl_keyword contained n-perm-k nconc new nexpand-left
+syn keyword txl_keyword contained nil nilf ninth none
+syn keyword txl_keyword contained not notf nreconc nreverse
+syn keyword txl_keyword contained nthcdr null nullify num-chr
+syn keyword txl_keyword contained num-str numberp oand obtain
+syn keyword txl_keyword contained obtain-block oddp op open-command
+syn keyword txl_keyword contained open-directory open-file open-fileno open-files
+syn keyword txl_keyword contained open-files* open-pipe open-process open-socket
+syn keyword txl_keyword contained open-tail openlog opip or
+syn keyword txl_keyword contained orf package-alist package-name package-symbols
+syn keyword txl_keyword contained packagep pad partition partition*
+syn keyword txl_keyword contained partition-by path-blkdev-p path-chrdev-p path-dir-p
+syn keyword txl_keyword contained path-executable-to-me-p path-exists-p path-file-p path-mine-p
+syn keyword txl_keyword contained path-my-group-p path-newer path-older path-pipe-p
+syn keyword txl_keyword contained path-private-to-me-p path-same-object path-setgid-p path-setuid-p
+syn keyword txl_keyword contained path-sock-p path-sticky-p path-symlink-p path-writable-to-me-p
+syn keyword txl_keyword contained perm pipe place-form-p placelet
+syn keyword txl_keyword contained placelet* plusp poll poll-err
+syn keyword txl_keyword contained poll-in poll-nval poll-out poll-pri
+syn keyword txl_keyword contained poll-rdband poll-wrband pop pos
+syn keyword txl_keyword contained pos-if pos-max pos-min posq
+syn keyword txl_keyword contained posql posqual pppred ppred
+syn keyword txl_keyword contained pprinl pprint pprof pred
+syn keyword txl_keyword contained prinl print prof prog1
+syn keyword txl_keyword contained progn promisep prop proper-listp
+syn keyword txl_keyword contained pset push pushhash pushnew
+syn keyword txl_keyword contained put-byte put-char put-line put-lines
+syn keyword txl_keyword contained put-string put-strings pwd qquote
+syn keyword txl_keyword contained qref quote raise rand
+syn keyword txl_keyword contained random random-fixnum random-state-get-vec random-state-p
+syn keyword txl_keyword contained range range* range-regex rangep
+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 rfind
+syn keyword txl_keyword contained rfind-if rlcp rlet rmember
+syn keyword txl_keyword contained rmember-if rmemq rmemql rmemqual
 syn keyword txl_keyword contained rotate rperm rplaca rplacd
-syn keyword txl_keyword contained run s-ifblk s-ifchr s-ifdir
-syn keyword txl_keyword contained s-ififo s-iflnk s-ifmt s-ifreg
-syn keyword txl_keyword contained s-ifsock s-irgrp s-iroth s-irusr
-syn keyword txl_keyword contained s-irwxg s-irwxo s-irwxu s-isgid
-syn keyword txl_keyword contained s-isuid s-isvtx s-iwgrp s-iwoth
-syn keyword txl_keyword contained s-iwusr s-ixgrp s-ixoth s-ixusr
-syn keyword txl_keyword contained search search-regex search-regst search-str
-syn keyword txl_keyword contained search-str-tree second seek-stream select
-syn keyword txl_keyword contained self-path seqp set set-diff
-syn keyword txl_keyword contained set-hash-userdata set-indent set-indent-mode set-sig-handler
-syn keyword txl_keyword contained setegid setenv seteuid setgid
-syn keyword txl_keyword contained setgrent sethash setitimer setlogmask
-syn keyword txl_keyword contained setpwent setuid seventh sh
-syn keyword txl_keyword contained shift shuffle shut-rd shut-rdwr
-syn keyword txl_keyword contained shut-wr 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 sock-accept sock-bind
-syn keyword txl_keyword contained sock-cloexec sock-connect sock-dgram sock-family
-syn keyword txl_keyword contained sock-listen sock-nonblock sock-peer sock-recv-timeout
-syn keyword txl_keyword contained sock-send-timeout sock-shutdown sock-stream sock-type
-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* split-str
-syn keyword txl_keyword contained split-str-set sqrt sssucc ssucc
-syn keyword txl_keyword contained stat static-slot static-slot-ensure static-slot-p
-syn keyword txl_keyword contained static-slot-set stdlib str-in6addr str-in6addr-net
-syn keyword txl_keyword contained str-inaddr str-inaddr-net str< str<=
-syn keyword txl_keyword contained str= str> str>= stream-get-prop
-syn keyword txl_keyword contained stream-set-prop streamp string-extend string-lt
-syn keyword txl_keyword contained stringp struct-type struct-type-p structp
-syn keyword txl_keyword contained sub sub-list sub-str sub-vec
-syn keyword txl_keyword contained subtypep succ super super-method
-syn keyword txl_keyword contained suspend swap symacrolet symbol-function
-syn keyword txl_keyword contained symbol-macro symbol-name symbol-package symbol-value
-syn keyword txl_keyword contained symbolp symlink sys:*lisp1* sys:abscond*
-syn keyword txl_keyword contained sys:abscond-from sys:bad-slot-syntax sys:capture-cont sys:cp-origin
-syn keyword txl_keyword contained sys:defmeth sys:do-path-test sys:dwim-del sys:dwim-set
-syn keyword txl_keyword contained sys:eval-err sys:expand sys:expr sys:fbind
-syn keyword txl_keyword contained sys:gc sys:gc-set-delta sys:get-fb sys:get-mb
-syn keyword txl_keyword contained sys:get-vb sys:handle-bad-syntax sys:if-to-cond sys:in6addr-condensed-text
-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:str-inaddr-net-impl sys:struct-lit sys:sym-clobber-expander sys:sym-delete-expander
-syn keyword txl_keyword contained sys:sym-update-expander sys:top-fb sys:top-mb sys:top-vb
-syn keyword txl_keyword contained sys:unquote sys:var sys:with-saved-vars syslog
-syn keyword txl_keyword contained system-package t take take-until
-syn keyword txl_keyword contained take-while tan tb tc
-syn keyword txl_keyword contained tenth test-set-indent-mode tf third
-syn keyword txl_keyword contained throw throwf time time-fields-local
-syn keyword txl_keyword contained time-fields-utc time-string-local time-string-utc time-struct-local
-syn keyword txl_keyword contained time-struct-utc time-usec to tofloat
-syn keyword txl_keyword contained toint tok-str tok-where tostring
-syn keyword txl_keyword contained tostringp tprint transpose tree-bind
-syn keyword txl_keyword contained tree-case tree-find trie-add trie-compress
-syn keyword txl_keyword contained trie-lookup-begin trie-lookup-feed-char trie-value-at trim-str
-syn keyword txl_keyword contained true trunc trunc-rem truncate-stream
-syn keyword txl_keyword contained tuples txr-case txr-case-impl txr-if
-syn keyword txl_keyword contained txr-sym txr-version txr-when typecase
-syn keyword txl_keyword contained typeof typep umask 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 use
-syn keyword txl_keyword contained user-package usl usleep uslot
-syn keyword txl_keyword contained vec vec-list vec-push vec-set-length
-syn keyword txl_keyword contained vecref vector vector-list vectorp
-syn keyword txl_keyword contained w-continued w-coredump w-exitstatus w-ifcontinued
-syn keyword txl_keyword contained w-ifexited w-ifsignaled w-ifstopped w-nohang
-syn keyword txl_keyword contained w-stopsig w-termsig w-untraced wait
-syn keyword txl_keyword contained weave when whenlet where
-syn keyword txl_keyword contained while while* whilet width
-syn keyword txl_keyword contained width-check window-map window-mappend with-clobber-expander
-syn keyword txl_keyword contained with-delete-expander with-gensyms with-hash-iter with-in-string-byte-stream
-syn keyword txl_keyword contained with-in-string-stream with-objects with-out-string-stream with-out-strlist-stream
-syn keyword txl_keyword contained with-resources with-slots 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 rpos rpos-if rposq rposql
+syn keyword txl_keyword contained rposqual rsearch run s-ifblk
+syn keyword txl_keyword contained s-ifchr s-ifdir s-ififo s-iflnk
+syn keyword txl_keyword contained s-ifmt s-ifreg s-ifsock s-irgrp
+syn keyword txl_keyword contained s-iroth s-irusr s-irwxg s-irwxo
+syn keyword txl_keyword contained s-irwxu s-isgid s-isuid s-isvtx
+syn keyword txl_keyword contained s-iwgrp s-iwoth s-iwusr s-ixgrp
+syn keyword txl_keyword contained s-ixoth s-ixusr search search-regex
+syn keyword txl_keyword contained search-regst search-str search-str-tree second
+syn keyword txl_keyword contained seek-stream select self-path seqp
+syn keyword txl_keyword contained set set-diff set-hash-userdata set-indent
+syn keyword txl_keyword contained set-indent-mode set-sig-handler setegid setenv
+syn keyword txl_keyword contained seteuid setgid setgrent sethash
+syn keyword txl_keyword contained setitimer setlogmask setpwent setuid
+syn keyword txl_keyword contained seventh sh shift shuffle
+syn keyword txl_keyword contained shut-rd shut-rdwr shut-wr 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 sock-accept sock-bind sock-cloexec sock-connect
+syn keyword txl_keyword contained sock-dgram sock-family sock-listen sock-nonblock
+syn keyword txl_keyword contained sock-peer sock-recv-timeout sock-send-timeout sock-shutdown
+syn keyword txl_keyword contained sock-stream sock-type 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* split-str split-str-set sqrt
+syn keyword txl_keyword contained sssucc ssucc stat static-slot
+syn keyword txl_keyword contained static-slot-ensure static-slot-p static-slot-set stdlib
+syn keyword txl_keyword contained str-in6addr str-in6addr-net str-inaddr str-inaddr-net
+syn keyword txl_keyword contained str< str<= str= str>
+syn keyword txl_keyword contained str>= stream-get-prop stream-set-prop streamp
+syn keyword txl_keyword contained string-extend string-lt stringp struct-type
+syn keyword txl_keyword contained struct-type-p structp sub sub-list
+syn keyword txl_keyword contained sub-str sub-vec subtypep succ
+syn keyword txl_keyword contained super super-method suspend swap
+syn keyword txl_keyword contained symacrolet symbol-function symbol-macro symbol-name
+syn keyword txl_keyword contained symbol-package symbol-value symbolp symlink
+syn keyword txl_keyword contained sys:*lisp1* sys:abscond* sys:abscond-from sys:bad-slot-syntax
+syn keyword txl_keyword contained sys:capture-cont sys:cp-origin sys:defmeth sys:do-path-test
+syn keyword txl_keyword contained sys:dwim-del sys:dwim-set sys:eval-err sys:expand
+syn keyword txl_keyword contained sys:expr sys:fbind sys:gc sys:gc-set-delta
+syn keyword txl_keyword contained sys:get-fb sys:get-mb sys:get-vb sys:handle-bad-syntax
+syn keyword txl_keyword contained sys:if-to-cond sys:in6addr-condensed-text 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:str-inaddr-net-impl sys:struct-lit
+syn keyword txl_keyword contained sys:sym-clobber-expander sys:sym-delete-expander sys:sym-update-expander sys:top-fb
+syn keyword txl_keyword contained sys:top-mb sys:top-vb sys:unquote sys:var
+syn keyword txl_keyword contained sys:with-saved-vars syslog system-package t
+syn keyword txl_keyword contained take take-until take-while tan
+syn keyword txl_keyword contained tb tc tenth test-set-indent-mode
+syn keyword txl_keyword contained tf third throw throwf
+syn keyword txl_keyword contained time time-fields-local time-fields-utc time-string-local
+syn keyword txl_keyword contained time-string-utc time-struct-local time-struct-utc time-usec
+syn keyword txl_keyword contained to tofloat toint tok-str
+syn keyword txl_keyword contained tok-where tostring tostringp tprint
+syn keyword txl_keyword contained transpose tree-bind tree-case tree-find
+syn keyword txl_keyword contained trie-add trie-compress trie-lookup-begin trie-lookup-feed-char
+syn keyword txl_keyword contained trie-value-at trim-str true trunc
+syn keyword txl_keyword contained trunc-rem truncate-stream tuples txr-case
+syn keyword txl_keyword contained txr-case-impl txr-if txr-sym txr-version
+syn keyword txl_keyword contained txr-when typecase typeof typep
+syn keyword txl_keyword contained umask 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 use user-package usl
+syn keyword txl_keyword contained usleep uslot vec vec-list
+syn keyword txl_keyword contained vec-push vec-set-length vecref vector
+syn keyword txl_keyword contained vector-list vectorp w-continued w-coredump
+syn keyword txl_keyword contained w-exitstatus w-ifcontinued w-ifexited w-ifsignaled
+syn keyword txl_keyword contained w-ifstopped w-nohang w-stopsig w-termsig
+syn keyword txl_keyword contained w-untraced wait weave when
+syn keyword txl_keyword contained whenlet where while while*
+syn keyword txl_keyword contained whilet width width-check window-map
+syn keyword txl_keyword contained window-mappend with-clobber-expander with-delete-expander with-gensyms
+syn keyword txl_keyword contained with-hash-iter with-in-string-byte-stream with-in-string-stream with-objects
+syn keyword txl_keyword contained with-out-string-stream with-out-strlist-stream with-resources with-slots
+syn keyword txl_keyword contained with-stream with-update-expander wrap wrap*
+syn keyword txl_keyword contained yield yield-from zap zerop
+syn keyword txl_keyword contained zip
 
 syn keyword txr_keyword contained accept all and assert
 syn keyword txr_keyword contained bind block cases cat
@@ -445,4 +449,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-slots,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,lset,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