Version 127.txr-127

* RELNOTES: Updated.

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

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

* txr.vim, tl.vim: Regenerated.

6 files changed, 330 insertions, 284 deletions

diff --git a/RELNOTES b/RELNOTES
index 72f5c289..dc0f367b 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,47 @@
+                                    TXR 127
+                                   2015-12-10
+
+
+  Features
+
+  - OOP:
+    - defun can define methods now, using a compound naming syntax,
+      as alternative to defmeth.
+    - func-get-name function works on methods and produces compound name.
+    - defmeth returns compound name, and so does defun when defining a method.
+    - improved semantics in static-slot-ensure
+  - Large file support: TXR now uses 64 bit file offsets in functions like
+    seek-stream and truncate on Linux platforms where this is
+    a compile-time switch.
+  - regex-range now returns a range object.
+  - Macros:
+    - Improvements in macro expansion tracing for unhandled
+      exceptions, or those caught in the REPL.
+    - New macro-ancestor function for programmatically retrieving
+      the form from which a given form was derived by macro expansion.
+    - New mboundp and mmakunbound functions for inquiring
+      about and removing a global operator macro binding.
+    - Global operator macros can now coexist with functions of the
+      same name.
+  - Doc:
+    - HTML man page now has a collapsible table of contents, thanks
+      to Javascript embedded in the document.
+    - Sections have been reorganized.
+    - Smattering of corrections.
+
+  Bugs
+
+  - Fixed new struct types failing to inherit static slots that
+    were added to ancestor types using implicit or explicit use of
+    ensure-static-slot (such as methods defined outside of defstruct).
+  - Fixes to the anaphoric ifa macro: the condition can be a dwim form, and
+    with special handling.
+  - Fixed incorrectly implemented less comparison for range objects.
+  - Fixed crash in get-line when invoked on a closed file stream.
+  - Fixed ftruncate not being detected and used on Solaris.
+
+
+
                                     TXR 126
                                    2015-11-29
 
diff --git a/configure b/configure
index 54851c45..49a7b6b2 100755
--- a/configure
+++ b/configure
@@ -435,7 +435,7 @@ fi
 #
 
 
-txr_ver=126
+txr_ver=127
 
 #
 # The all important banner.
diff --git a/share/txr/stdlib/ver.tl b/share/txr/stdlib/ver.tl
index 8cb92a64..9698ae05 100644
--- a/share/txr/stdlib/ver.tl
+++ b/share/txr/stdlib/ver.tl
@@ -1,2 +1,2 @@
-(defvarl lib-version 126)
+(defvarl lib-version 127)
 (defvarl *lib-version* lib-version)
diff --git a/tl.vim b/tl.vim
index f7ab0469..483612b9 100644
--- a/tl.vim
+++ b/tl.vim
@@ -170,145 +170,146 @@ syn keyword txl_keyword contained log-nowait log-odelay log-perror log-pid
 syn keyword txl_keyword contained log-user log-warning log10 log2
 syn keyword txl_keyword contained logand logior lognot logtest
 syn keyword txl_keyword contained logtrunc logxor lstat mac-param-bind
-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 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 mod multi
-syn keyword txl_keyword contained multi-sort n-choose-k n-perm-k nconc
-syn keyword txl_keyword contained new nil nilf ninth
-syn keyword txl_keyword contained none not notf nreconc
-syn keyword txl_keyword contained nreverse nthcdr null nullify
-syn keyword txl_keyword contained num-chr num-str numberp oand
-syn keyword txl_keyword contained obtain obtain-block oddp op
-syn keyword txl_keyword contained open-command open-directory open-file open-fileno
-syn keyword txl_keyword contained open-files open-files* open-pipe open-process
-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-p range
-syn keyword txl_keyword contained range* range-regex rangep rcomb
-syn keyword txl_keyword contained rcons read readlink real-time-stream-p
-syn keyword txl_keyword contained reduce-left reduce-right ref refset
-syn keyword txl_keyword contained regex-compile regex-parse regexp register-exception-subtypes
-syn keyword txl_keyword contained regsub rehome-sym remhash remove-if
-syn keyword txl_keyword contained remove-if* remove-path remq remq*
-syn keyword txl_keyword contained remql remql* remqual remqual*
-syn keyword txl_keyword contained rename-path repeat replace replace-list
-syn keyword txl_keyword contained replace-str replace-struct replace-vec reset-struct
-syn keyword txl_keyword contained rest ret retf return
-syn keyword txl_keyword contained return* return-from revappend reverse
-syn keyword txl_keyword contained rlcp rlet rotate rperm
-syn keyword txl_keyword contained rplaca rplacd 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 sig-abrt sig-alrm sig-bus sig-check
-syn keyword txl_keyword contained sig-chld sig-cont sig-fpe sig-hup
-syn keyword txl_keyword contained sig-ill sig-int sig-io sig-iot
-syn keyword txl_keyword contained sig-kill sig-pipe sig-poll sig-prof
-syn keyword txl_keyword contained sig-pwr sig-quit sig-segv sig-stkflt
-syn keyword txl_keyword contained sig-stop sig-sys sig-term sig-trap
-syn keyword txl_keyword contained sig-tstp sig-ttin sig-ttou sig-urg
-syn keyword txl_keyword contained sig-usr1 sig-usr2 sig-vtalrm sig-winch
-syn keyword txl_keyword contained sig-xcpu sig-xfsz sign-extend sin
-syn keyword txl_keyword contained sixth size-vec slot slotp
-syn keyword txl_keyword contained slotset some sort sort-group
-syn keyword txl_keyword contained source-loc source-loc-str span-str special-operator-p
-syn keyword txl_keyword contained special-var-p splice 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< 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-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: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-vb sys:handle-bad-syntax sys:l1-setq
-syn keyword txl_keyword contained sys:l1-val sys:lbind sys:lisp1-setq sys:lisp1-value
-syn keyword txl_keyword contained sys:load sys:make-struct-type sys:mark-special sys:obtain-impl
-syn keyword txl_keyword contained sys:path-access sys:path-examine sys:path-test sys:path-test-mode
-syn keyword txl_keyword contained sys:pl-expand sys:placelet-1 sys:prune-nil-inits sys:qquote
-syn keyword txl_keyword contained sys:quasi sys:quasilist sys:reg-expand-nongreedy sys:reg-optimize
-syn keyword txl_keyword contained sys:register-simple-accessor sys:rplaca sys:rplacd 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-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 umeth umethod
-syn keyword txl_keyword contained unget-byte unget-char uniq unique
-syn keyword txl_keyword contained unless unquote unsetenv until
-syn keyword txl_keyword contained until* unwind-protect upcase-str update
-syn keyword txl_keyword contained url-decode url-encode 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-stream
-syn keyword txl_keyword contained with-update-expander wrap wrap* yield
-syn keyword txl_keyword contained yield-from zap zerop zip
+syn keyword txl_keyword contained macro-ancestor macro-form-p macro-time macroexpand
+syn keyword txl_keyword contained macroexpand-1 macrolet major make-catenated-stream
+syn keyword txl_keyword contained make-env make-hash make-lazy-cons make-lazy-struct
+syn keyword txl_keyword contained make-like make-package make-random-state make-similar-hash
+syn keyword txl_keyword contained make-string-byte-input-stream make-string-input-stream make-string-output-stream make-strlist-output-stream
+syn keyword txl_keyword contained make-struct make-struct-type make-sym make-time
+syn keyword txl_keyword contained make-time-utc make-trie makedev makunbound
+syn keyword txl_keyword contained mapcar mapcar* mapdo mapf
+syn keyword txl_keyword contained maphash mappend mappend* mask
+syn keyword txl_keyword contained match-fun match-regex match-regex-right match-regst
+syn keyword txl_keyword contained match-regst-right match-str match-str-tree max
+syn keyword txl_keyword contained mboundp member member-if memq
+syn keyword txl_keyword contained memql memqual merge meth
+syn keyword txl_keyword contained method min minor minusp
+syn keyword txl_keyword contained mkdir mknod mkstring mlet
+syn keyword txl_keyword contained mmakunbound mod multi multi-sort
+syn keyword txl_keyword contained n-choose-k n-perm-k nconc new
+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-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-p range range*
+syn keyword txl_keyword contained range-regex rangep rcomb rcons
+syn keyword txl_keyword contained read readlink real-time-stream-p 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-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: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-vb sys:handle-bad-syntax 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:setq sys:setqf
+syn keyword txl_keyword contained sys:splice 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-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 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]*"
@@ -399,4 +400,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,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*,lnew,load,mac-param-bind,macro-time,macrolet,meth,mlet,new,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,umeth,unless,unquote,until,until*,unwind-protect,usl,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,:fini
+set lispwords=ado,ap,append-each,append-each*,aret,block,block*,caseq,caseql,casequal,catch,collect-each,collect-each*,cond,conda,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,:fini
diff --git a/txr.1 b/txr.1
index 4d7a28a9..dd40eb9b 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-11-29 "Utility Commands" "TXR Data Processing Language" "Kaz Kylheku"
+.TH TXR 1 2015-12-10 "Utility Commands" "TXR Data Processing Language" "Kaz Kylheku"
 .SH* NAME
-\*(TX \- text processing language (version 126)
+\*(TX \- text processing language (version 127)
 
 .SH* SYNOPSIS
 .cblk
diff --git a/txr.vim b/txr.vim
index c2a91661..c1c93929 100644
--- a/txr.vim
+++ b/txr.vim
@@ -170,145 +170,146 @@ syn keyword txl_keyword contained log-nowait log-odelay log-perror log-pid
 syn keyword txl_keyword contained log-user log-warning log10 log2
 syn keyword txl_keyword contained logand logior lognot logtest
 syn keyword txl_keyword contained logtrunc logxor lstat mac-param-bind
-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 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 mod multi
-syn keyword txl_keyword contained multi-sort n-choose-k n-perm-k nconc
-syn keyword txl_keyword contained new nil nilf ninth
-syn keyword txl_keyword contained none not notf nreconc
-syn keyword txl_keyword contained nreverse nthcdr null nullify
-syn keyword txl_keyword contained num-chr num-str numberp oand
-syn keyword txl_keyword contained obtain obtain-block oddp op
-syn keyword txl_keyword contained open-command open-directory open-file open-fileno
-syn keyword txl_keyword contained open-files open-files* open-pipe open-process
-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-p range
-syn keyword txl_keyword contained range* range-regex rangep rcomb
-syn keyword txl_keyword contained rcons read readlink real-time-stream-p
-syn keyword txl_keyword contained reduce-left reduce-right ref refset
-syn keyword txl_keyword contained regex-compile regex-parse regexp register-exception-subtypes
-syn keyword txl_keyword contained regsub rehome-sym remhash remove-if
-syn keyword txl_keyword contained remove-if* remove-path remq remq*
-syn keyword txl_keyword contained remql remql* remqual remqual*
-syn keyword txl_keyword contained rename-path repeat replace replace-list
-syn keyword txl_keyword contained replace-str replace-struct replace-vec reset-struct
-syn keyword txl_keyword contained rest ret retf return
-syn keyword txl_keyword contained return* return-from revappend reverse
-syn keyword txl_keyword contained rlcp rlet rotate rperm
-syn keyword txl_keyword contained rplaca rplacd 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 sig-abrt sig-alrm sig-bus sig-check
-syn keyword txl_keyword contained sig-chld sig-cont sig-fpe sig-hup
-syn keyword txl_keyword contained sig-ill sig-int sig-io sig-iot
-syn keyword txl_keyword contained sig-kill sig-pipe sig-poll sig-prof
-syn keyword txl_keyword contained sig-pwr sig-quit sig-segv sig-stkflt
-syn keyword txl_keyword contained sig-stop sig-sys sig-term sig-trap
-syn keyword txl_keyword contained sig-tstp sig-ttin sig-ttou sig-urg
-syn keyword txl_keyword contained sig-usr1 sig-usr2 sig-vtalrm sig-winch
-syn keyword txl_keyword contained sig-xcpu sig-xfsz sign-extend sin
-syn keyword txl_keyword contained sixth size-vec slot slotp
-syn keyword txl_keyword contained slotset some sort sort-group
-syn keyword txl_keyword contained source-loc source-loc-str span-str special-operator-p
-syn keyword txl_keyword contained special-var-p splice 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< 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-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: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-vb sys:handle-bad-syntax sys:l1-setq
-syn keyword txl_keyword contained sys:l1-val sys:lbind sys:lisp1-setq sys:lisp1-value
-syn keyword txl_keyword contained sys:load sys:make-struct-type sys:mark-special sys:obtain-impl
-syn keyword txl_keyword contained sys:path-access sys:path-examine sys:path-test sys:path-test-mode
-syn keyword txl_keyword contained sys:pl-expand sys:placelet-1 sys:prune-nil-inits sys:qquote
-syn keyword txl_keyword contained sys:quasi sys:quasilist sys:reg-expand-nongreedy sys:reg-optimize
-syn keyword txl_keyword contained sys:register-simple-accessor sys:rplaca sys:rplacd 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-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 umeth umethod
-syn keyword txl_keyword contained unget-byte unget-char uniq unique
-syn keyword txl_keyword contained unless unquote unsetenv until
-syn keyword txl_keyword contained until* unwind-protect upcase-str update
-syn keyword txl_keyword contained url-decode url-encode 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-stream
-syn keyword txl_keyword contained with-update-expander wrap wrap* yield
-syn keyword txl_keyword contained yield-from zap zerop zip
+syn keyword txl_keyword contained macro-ancestor macro-form-p macro-time macroexpand
+syn keyword txl_keyword contained macroexpand-1 macrolet major make-catenated-stream
+syn keyword txl_keyword contained make-env make-hash make-lazy-cons make-lazy-struct
+syn keyword txl_keyword contained make-like make-package make-random-state make-similar-hash
+syn keyword txl_keyword contained make-string-byte-input-stream make-string-input-stream make-string-output-stream make-strlist-output-stream
+syn keyword txl_keyword contained make-struct make-struct-type make-sym make-time
+syn keyword txl_keyword contained make-time-utc make-trie makedev makunbound
+syn keyword txl_keyword contained mapcar mapcar* mapdo mapf
+syn keyword txl_keyword contained maphash mappend mappend* mask
+syn keyword txl_keyword contained match-fun match-regex match-regex-right match-regst
+syn keyword txl_keyword contained match-regst-right match-str match-str-tree max
+syn keyword txl_keyword contained mboundp member member-if memq
+syn keyword txl_keyword contained memql memqual merge meth
+syn keyword txl_keyword contained method min minor minusp
+syn keyword txl_keyword contained mkdir mknod mkstring mlet
+syn keyword txl_keyword contained mmakunbound mod multi multi-sort
+syn keyword txl_keyword contained n-choose-k n-perm-k nconc new
+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-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-p range range*
+syn keyword txl_keyword contained range-regex rangep rcomb rcons
+syn keyword txl_keyword contained read readlink real-time-stream-p 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-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: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-vb sys:handle-bad-syntax 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:setq sys:setqf
+syn keyword txl_keyword contained sys:splice 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-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 txr_keyword contained accept all and assert
 syn keyword txr_keyword contained bind block cases cat
@@ -425,4 +426,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,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*,lnew,load,mac-param-bind,macro-time,macrolet,meth,mlet,new,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,umeth,unless,unquote,until,until*,unwind-protect,usl,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,:fini
+set lispwords=ado,ap,append-each,append-each*,aret,block,block*,caseq,caseql,casequal,catch,collect-each,collect-each*,cond,conda,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,:fini