Version 156.txr-156

* RELNOTES: Updated.

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

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

* txr.vim, tl.vim: Regenerated.

6 files changed, 565 insertions, 502 deletions

diff --git a/RELNOTES b/RELNOTES
index 445cc116..08df48bd 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,46 @@
+                                    TXR 156
+                                   2016-11-05
+
+
+  Features
+
+  - time-parse function defaults to epoch time.
+  - new accessors nthlast and butlastn.
+  - sub function is now an accessor.
+  - last and butlast functions are accessors, and get optional index argument.
+  - Awk macro:
+    - now supports pipe/file redirection.
+  - Function tracing support: trace, untrace macros, *trace-output* stream.
+  - symbol-function accessor can refer to methods via (meth ...) syntax.
+  - restrictions in dwim places relaxed:
+    in (set [x y] z), x doesn't necessarily have to be a place.
+  - OOP:
+    - new lambda-set method can treat [obj ...] expressions as places when obj
+      is a struct.
+    - new slots function for getting complete list of slots of a struct type.
+  - New neq, neql and nequal functions for negated equality tests: for all
+    those times you hate writing (not (equal a b)).
+  - New command-line argument processing library.
+  - Improved printing of error location, and tracing locations across place
+    expansions.
+
+  Bugs
+
+  - quasiquote now works properly over struct literals.
+  - wrong return value of nthcdr place fixed.
+  - fixed circular printer blocking unwinding.
+  - tok-str semantics adjusted once again to eliminate
+    spurious empty tokens in some situations.
+  - fixed broken tok-where (regression).
+  - fixed potential incorrect evaluation order in dwim places.
+  - fixed bugs in circular printing that traverses hash tables and objects with
+    print methods
+  - *stdout* now flushed when processing unhandled exceptions, so that
+    diagnostics sent to *stderr* appear properly ordered w.r.t. prior
+    *stdout* output.
+
+
+
                                     TXR 155
                                    2016-10-21
 
diff --git a/configure b/configure
index 0e2e831b..3ae63d08 100755
--- a/configure
+++ b/configure
@@ -445,7 +445,7 @@ fi
 #
 
 
-txr_ver=155
+txr_ver=156
 
 #
 # The all important banner.
diff --git a/share/txr/stdlib/ver.tl b/share/txr/stdlib/ver.tl
index ac7b1e1f..8090d184 100644
--- a/share/txr/stdlib/ver.tl
+++ b/share/txr/stdlib/ver.tl
@@ -1,2 +1,2 @@
-(defvarl lib-version 155)
+(defvarl lib-version 156)
 (defvarl *lib-version* lib-version)
diff --git a/tl.vim b/tl.vim
index f5e54a62..90b0bd9d 100644
--- a/tl.vim
+++ b/tl.vim
@@ -29,30 +29,34 @@ syn keyword tl_keyword contained *place-delete-expander* *place-macro* *place-up
 syn keyword tl_keyword contained *print-circle* *print-flo-digits* *print-flo-format* *print-flo-precision*
 syn keyword tl_keyword contained *random-state* *random-warmup* *self-path* *stddebug*
 syn keyword tl_keyword contained *stderr* *stdin* *stdlog* *stdnull*
-syn keyword tl_keyword contained *stdout* *system-package* *txr-version* *unhandled-hook*
-syn keyword tl_keyword contained *user-package* + - /
-syn keyword tl_keyword contained /= : :addr :append
-syn keyword tl_keyword contained :args :atime :auto :awk-file
-syn keyword tl_keyword contained :awk-rec :begin :begin-file :blksize
-syn keyword tl_keyword contained :blocks :byte-oriented :cdigit :chars
-syn keyword tl_keyword contained :continue :counter :cspace :ctime
-syn keyword tl_keyword contained :cword-char :decline :dev :digit
-syn keyword tl_keyword contained :downcase :end :end-file :env
-syn keyword tl_keyword contained :equal-based :fd :filter :fini
-syn keyword tl_keyword contained :finish :form :from-current :from-end
-syn keyword tl_keyword contained :from-start :from_html :frombase64 :fromhtml
-syn keyword tl_keyword contained :frompercent :fromurl :fun :function
-syn keyword tl_keyword contained :gap :gid :greedy :hextoint
-syn keyword tl_keyword contained :init :ino :inputs :instance
+syn keyword tl_keyword contained *stdout* *system-package* *trace-output* *txr-version*
+syn keyword tl_keyword contained *unhandled-hook* *user-package* + -
+syn keyword tl_keyword contained / /= : :abandoned
+syn keyword tl_keyword contained :addr :apf :append :args
+syn keyword tl_keyword contained :atime :auto :awk-file :awk-rec
+syn keyword tl_keyword contained :begin :begin-file :blksize :blocks
+syn keyword tl_keyword contained :bool :byte-oriented :cdigit :chars
+syn keyword tl_keyword contained :cint :close :continue :counter
+syn keyword tl_keyword contained :cspace :ctime :cword-char :dec
+syn keyword tl_keyword contained :decline :dev :digit :downcase
+syn keyword tl_keyword contained :end :end-file :env :equal-based
+syn keyword tl_keyword contained :explicit-no :fd :filter :fini
+syn keyword tl_keyword contained :finish :float :form :from-current
+syn keyword tl_keyword contained :from-end :from-start :from_html :frombase64
+syn keyword tl_keyword contained :fromhtml :frompercent :fromurl :fun
+syn keyword tl_keyword contained :function :gap :gid :greedy
+syn keyword tl_keyword contained :hex :hextoint :inf :init
+syn keyword tl_keyword contained :ino :inp :inputs :instance
 syn keyword tl_keyword contained :into :let :lfilt :lines
 syn keyword tl_keyword contained :list :longest :mandatory :maxgap
 syn keyword tl_keyword contained :maxtimes :method :mingap :mintimes
 syn keyword tl_keyword contained :mode :mtime :name :named
-syn keyword tl_keyword contained :next-spec :nlink :nothrow :output
-syn keyword tl_keyword contained :postinit :prio :rdev :real-time
-syn keyword tl_keyword contained :reflect :repeat-spec :resolve :rfilt
-syn keyword tl_keyword contained :set :set-file :shortest :size
-syn keyword tl_keyword contained :space :static :string :symacro
+syn keyword tl_keyword contained :next-spec :nlink :nothrow :oct
+syn keyword tl_keyword contained :outf :outp :output :postinit
+syn keyword tl_keyword contained :prio :rdev :real-time :reflect
+syn keyword tl_keyword contained :repeat-spec :resolve :rfilt :set
+syn keyword tl_keyword contained :set-file :shortest :size :space
+syn keyword tl_keyword contained :static :str :string :symacro
 syn keyword tl_keyword contained :times :tlist :to_html :tobase64
 syn keyword tl_keyword contained :tofloat :tohtml :tohtml* :toint
 syn keyword tl_keyword contained :tonumber :topercent :tourl :uid
@@ -74,167 +78,169 @@ syn keyword tl_keyword contained awk base64-decode base64-encode bignump
 syn keyword tl_keyword contained bindable bit block block*
 syn keyword tl_keyword contained boundp break-str brkint bs0
 syn keyword tl_keyword contained bs1 bsdly build build-list
-syn keyword tl_keyword contained butlast caaaaar caaaadr caaaar
-syn keyword tl_keyword contained caaadar caaaddr caaadr caaar
-syn keyword tl_keyword contained caadaar caadadr caadar caaddar
-syn keyword tl_keyword contained caadddr caaddr caadr caar
-syn keyword tl_keyword contained cadaaar cadaadr cadaar cadadar
-syn keyword tl_keyword contained cadaddr cadadr cadar caddaar
-syn keyword tl_keyword contained caddadr caddar cadddar caddddr
-syn keyword tl_keyword contained cadddr caddr cadr call
-syn keyword tl_keyword contained call-clobber-expander call-delete-expander call-finalizers call-super-fun
-syn keyword tl_keyword contained call-super-method call-update-expander callf car
-syn keyword tl_keyword contained caseq caseql casequal cat-str
-syn keyword tl_keyword contained cat-streams cat-vec catch catenated-stream-p
-syn keyword tl_keyword contained catenated-stream-push cbaud cbaudex cdaaaar
-syn keyword tl_keyword contained cdaaadr cdaaar cdaadar cdaaddr
-syn keyword tl_keyword contained cdaadr cdaar cdadaar cdadadr
-syn keyword tl_keyword contained cdadar cdaddar cdadddr cdaddr
-syn keyword tl_keyword contained cdadr cdar cddaaar cddaadr
-syn keyword tl_keyword contained cddaar cddadar cddaddr cddadr
-syn keyword tl_keyword contained cddar cdddaar cdddadr cdddar
-syn keyword tl_keyword contained cddddar cdddddr cddddr cdddr
-syn keyword tl_keyword contained cddr cdr ceil chain
-syn keyword tl_keyword contained chand chdir chmod chr-digit
-syn keyword tl_keyword contained chr-int chr-isalnum chr-isalpha chr-isascii
-syn keyword tl_keyword contained chr-isblank chr-iscntrl chr-isdigit chr-isgraph
-syn keyword tl_keyword contained chr-islower chr-isprint chr-ispunct chr-isspace
-syn keyword tl_keyword contained chr-isunisp chr-isupper chr-isxdigit chr-num
-syn keyword tl_keyword contained chr-str chr-str-set chr-tolower chr-toupper
-syn keyword tl_keyword contained chr-xdigit chrp clamp clear-error
-syn keyword tl_keyword contained clear-struct clocal close-stream closelog
-syn keyword tl_keyword contained cmp-str cmspar collect-each collect-each*
-syn keyword tl_keyword contained comb compare-swap compl-span-str cond
-syn keyword tl_keyword contained conda condlet cons conses
-syn keyword tl_keyword contained conses* consp constantp copy
-syn keyword tl_keyword contained copy-alist copy-cons copy-hash copy-list
-syn keyword tl_keyword contained copy-str copy-struct copy-vec cos
-syn keyword tl_keyword contained count-if countq countql countqual
-syn keyword tl_keyword contained cr0 cr1 cr2 cr3
-syn keyword tl_keyword contained crdly cread crtscts crypt
-syn keyword tl_keyword contained cs5 cs6 cs7 cs8
-syn keyword tl_keyword contained csize cstopb cum-norm-dist daemon
-syn keyword tl_keyword contained dec defex define-accessor define-modify-macro
-syn keyword tl_keyword contained define-place-macro defmacro defmeth defparm
-syn keyword tl_keyword contained defparml defplace defstruct defsymacro
-syn keyword tl_keyword contained defun defvar defvarl del
-syn keyword tl_keyword contained delay delete-package display-width do
-syn keyword tl_keyword contained dohash dotimes downcase-str drop
-syn keyword tl_keyword contained drop-until drop-while dup dupfd
-syn keyword tl_keyword contained dwim each each* echo
-syn keyword tl_keyword contained echoctl echoe echok echoke
-syn keyword tl_keyword contained echonl echoprt eighth empty
-syn keyword tl_keyword contained endgrent endpwent ensure-dir env
-syn keyword tl_keyword contained env-fbind env-hash env-vbind eq
-syn keyword tl_keyword contained eql equal errno error
-syn keyword tl_keyword contained eval evenp exception-subtype-p exec
-syn keyword tl_keyword contained exit exit* exp expand-left
-syn keyword tl_keyword contained expand-right expt exptmod extproc
-syn keyword tl_keyword contained f$ f^ f^$ false
-syn keyword tl_keyword contained fboundp ff0 ff1 ffdly
-syn keyword tl_keyword contained fifth fileno filter-equal filter-string-tree
-syn keyword tl_keyword contained finalize find find-frame find-if
-syn keyword tl_keyword contained find-max find-min find-package find-struct-type
-syn keyword tl_keyword contained first fixnum-max fixnum-min fixnump
-syn keyword tl_keyword contained flatcar flatcar* flatten flatten*
-syn keyword tl_keyword contained flet flip flipargs flo-dig
-syn keyword tl_keyword contained flo-epsilon flo-int flo-max flo-max-dig
-syn keyword tl_keyword contained flo-min flo-str floatp floor
-syn keyword tl_keyword contained flush-stream flusho fmakunbound fmt
-syn keyword tl_keyword contained fnm-casefold fnm-leading-dir fnm-noescape fnm-pathname
-syn keyword tl_keyword contained fnm-period fnmatch for for*
-syn keyword tl_keyword contained force fork format fourth
-syn keyword tl_keyword contained from fstat ftw ftw-actionretval
-syn keyword tl_keyword contained ftw-chdir ftw-continue ftw-d ftw-depth
-syn keyword tl_keyword contained ftw-dnr ftw-dp ftw-f ftw-mount
-syn keyword tl_keyword contained ftw-ns ftw-phys ftw-skip-siblings ftw-skip-subtree
-syn keyword tl_keyword contained ftw-sl ftw-sln ftw-stop fun
-syn keyword tl_keyword contained func-get-env func-get-form func-get-name func-set-env
-syn keyword tl_keyword contained functionp gcd gen generate
-syn keyword tl_keyword contained gensym gequal get-byte get-char
-syn keyword tl_keyword contained get-clobber-expander get-delete-expander get-error get-error-str
-syn keyword tl_keyword contained get-frames get-hash-userdata get-indent get-indent-mode
-syn keyword tl_keyword contained get-line get-lines get-list-from-stream get-sig-handler
-syn keyword tl_keyword contained get-string get-string-from-stream get-update-expander getaddrinfo
-syn keyword tl_keyword contained getegid getenv geteuid getgid
-syn keyword tl_keyword contained getgrent getgrgid getgrnam getgroups
-syn keyword tl_keyword contained gethash getitimer getpid getppid
-syn keyword tl_keyword contained getpwent getpwnam getpwuid getresgid
-syn keyword tl_keyword contained getresuid getuid ginterate giterate
-syn keyword tl_keyword contained glob glob-altdirfunc glob-brace glob-err
-syn keyword tl_keyword contained glob-mark glob-nocheck glob-noescape glob-nomagic
-syn keyword tl_keyword contained glob-nosort glob-onlydir glob-period glob-tilde
-syn keyword tl_keyword contained glob-tilde-check greater group-by group-reduce
-syn keyword tl_keyword contained gun handle handler-bind hash
-syn keyword tl_keyword contained hash-alist hash-begin hash-construct hash-count
-syn keyword tl_keyword contained hash-diff hash-eql hash-equal hash-from-pairs
-syn keyword tl_keyword contained hash-isec hash-keys hash-list hash-next
-syn keyword tl_keyword contained hash-pairs hash-proper-subset hash-revget hash-subset
-syn keyword tl_keyword contained hash-uni hash-update hash-update-1 hash-userdata
-syn keyword tl_keyword contained hash-values hashp have html-decode
-syn keyword tl_keyword contained html-encode html-encode* hupcl iapply
-syn keyword tl_keyword contained icanon icrnl identity ido
-syn keyword tl_keyword contained iexten if ifa iff
-syn keyword tl_keyword contained iffi iflet ignbrk igncr
-syn keyword tl_keyword contained ignerr ignpar imaxbel in
-syn keyword tl_keyword contained in6addr-any in6addr-loopback inaddr-any inaddr-loopback
-syn keyword tl_keyword contained inc inc-indent indent-code indent-data
-syn keyword tl_keyword contained indent-off inhash inlcr inpck
-syn keyword tl_keyword contained int-chr int-flo int-str integerp
-syn keyword tl_keyword contained intern interp-fun-p interpose invoke-catch
-syn keyword tl_keyword contained ip ipf iread isig
-syn keyword tl_keyword contained isqrt istrip itimer-prov itimer-real
-syn keyword tl_keyword contained itimer-virtual iuclc iutf8 ixany
-syn keyword tl_keyword contained ixoff ixon juxt keep-if
-syn keyword tl_keyword contained keep-if* keepq keepql keepqual
-syn keyword tl_keyword contained keyword-package keywordp kill labels
-syn keyword tl_keyword contained lambda last lazy-str lazy-str-force
-syn keyword tl_keyword contained lazy-str-force-upto lazy-str-get-trailing-list lazy-stream-cons lazy-stringp
-syn keyword tl_keyword contained lcm lcons lcons-fun lconsp
-syn keyword tl_keyword contained ldiff length length-list length-str
-syn keyword tl_keyword contained length-str-< length-str-<= length-str-> length-str->=
-syn keyword tl_keyword contained length-vec lequal less let
-syn keyword tl_keyword contained let* lexical-fun-p lexical-lisp1-binding lexical-var-p
-syn keyword tl_keyword contained lib-version link lisp-parse list
-syn keyword tl_keyword contained list* list-str list-vec list-vector
-syn keyword tl_keyword contained listp lnew load log
-syn keyword tl_keyword contained log-alert log-auth log-authpriv log-cons
-syn keyword tl_keyword contained log-crit log-daemon log-debug log-emerg
-syn keyword tl_keyword contained log-err log-info log-ndelay log-notice
-syn keyword tl_keyword contained log-nowait log-odelay log-perror log-pid
-syn keyword tl_keyword contained log-user log-warning log10 log2
-syn keyword tl_keyword contained logand logior lognot logtest
-syn keyword tl_keyword contained logtrunc logxor lset lstat
-syn keyword tl_keyword contained m$ m^ m^$ mac-param-bind
-syn keyword tl_keyword contained macro-ancestor macro-form-p macro-time macroexpand
-syn keyword tl_keyword contained macroexpand-1 macrolet major make-catenated-stream
-syn keyword tl_keyword contained make-env make-hash make-lazy-cons make-lazy-struct
-syn keyword tl_keyword contained make-like make-package make-random-state make-similar-hash
-syn keyword tl_keyword contained make-string-byte-input-stream make-string-input-stream make-string-output-stream make-strlist-input-stream
-syn keyword tl_keyword contained make-strlist-output-stream make-struct make-struct-type make-sym
-syn keyword tl_keyword contained make-time make-time-utc make-trie makedev
-syn keyword tl_keyword contained makunbound mapcar mapcar* mapdo
-syn keyword tl_keyword contained mapf maphash mappend mappend*
-syn keyword tl_keyword contained mask match-fun match-regex match-regex-right
-syn keyword tl_keyword contained match-regst match-regst-right match-str match-str-tree
-syn keyword tl_keyword contained max mboundp member member-if
-syn keyword tl_keyword contained memq memql memqual merge
-syn keyword tl_keyword contained meth method min minor
-syn keyword tl_keyword contained minusp mkdir mknod mkstring
-syn keyword tl_keyword contained mlet mmakunbound mod multi
-syn keyword tl_keyword contained multi-sort n-choose-k n-perm-k nconc
-syn keyword tl_keyword contained new nexpand-left nil nilf
-syn keyword tl_keyword contained ninth nl0 nl1 nldly
-syn keyword tl_keyword contained noflsh none not notf
-syn keyword tl_keyword contained nreconc nreverse nthcdr null
-syn keyword tl_keyword contained nullify num-chr num-str numberp
-syn keyword tl_keyword contained oand obtain obtain* obtain*-block
-syn keyword tl_keyword contained obtain-block ocrnl oddp ofdel
-syn keyword tl_keyword contained ofill olcuc onlcr onlret
-syn keyword tl_keyword contained onocr op open-command open-directory
-syn keyword tl_keyword contained open-file open-fileno open-files open-files*
-syn keyword tl_keyword contained open-pipe open-process open-socket open-socket-pair
-syn keyword tl_keyword contained open-tail openlog opip opost
+syn keyword tl_keyword contained butlast butlastn caaaaar caaaadr
+syn keyword tl_keyword contained caaaar caaadar caaaddr caaadr
+syn keyword tl_keyword contained caaar caadaar caadadr caadar
+syn keyword tl_keyword contained caaddar caadddr caaddr caadr
+syn keyword tl_keyword contained caar cadaaar cadaadr cadaar
+syn keyword tl_keyword contained cadadar cadaddr cadadr cadar
+syn keyword tl_keyword contained caddaar caddadr caddar cadddar
+syn keyword tl_keyword contained caddddr cadddr caddr cadr
+syn keyword tl_keyword contained call call-clobber-expander call-delete-expander call-finalizers
+syn keyword tl_keyword contained call-super-fun call-super-method call-update-expander callf
+syn keyword tl_keyword contained car caseq caseql casequal
+syn keyword tl_keyword contained cat-str cat-streams cat-vec catch
+syn keyword tl_keyword contained catenated-stream-p catenated-stream-push cbaud cbaudex
+syn keyword tl_keyword contained cdaaaar cdaaadr cdaaar cdaadar
+syn keyword tl_keyword contained cdaaddr cdaadr cdaar cdadaar
+syn keyword tl_keyword contained cdadadr cdadar cdaddar cdadddr
+syn keyword tl_keyword contained cdaddr cdadr cdar cddaaar
+syn keyword tl_keyword contained cddaadr cddaar cddadar cddaddr
+syn keyword tl_keyword contained cddadr cddar cdddaar cdddadr
+syn keyword tl_keyword contained cdddar cddddar cdddddr cddddr
+syn keyword tl_keyword contained cdddr cddr cdr ceil
+syn keyword tl_keyword contained chain chand chdir chmod
+syn keyword tl_keyword contained chr-digit chr-int chr-isalnum chr-isalpha
+syn keyword tl_keyword contained chr-isascii chr-isblank chr-iscntrl chr-isdigit
+syn keyword tl_keyword contained chr-isgraph chr-islower chr-isprint chr-ispunct
+syn keyword tl_keyword contained chr-isspace chr-isunisp chr-isupper chr-isxdigit
+syn keyword tl_keyword contained chr-num chr-str chr-str-set chr-tolower
+syn keyword tl_keyword contained chr-toupper chr-xdigit chrp clamp
+syn keyword tl_keyword contained clear-error clear-struct clocal close-stream
+syn keyword tl_keyword contained closelog cmp-str cmspar collect-each
+syn keyword tl_keyword contained collect-each* comb compare-swap compl-span-str
+syn keyword tl_keyword contained cond conda condlet cons
+syn keyword tl_keyword contained conses conses* consp constantp
+syn keyword tl_keyword contained copy copy-alist copy-cons copy-hash
+syn keyword tl_keyword contained copy-list copy-str copy-struct copy-vec
+syn keyword tl_keyword contained cos count-if countq countql
+syn keyword tl_keyword contained countqual cr0 cr1 cr2
+syn keyword tl_keyword contained cr3 crdly cread crtscts
+syn keyword tl_keyword contained crypt cs5 cs6 cs7
+syn keyword tl_keyword contained cs8 csize cstopb cum-norm-dist
+syn keyword tl_keyword contained daemon dec defex define-accessor
+syn keyword tl_keyword contained define-modify-macro define-place-macro defmacro defmeth
+syn keyword tl_keyword contained defparm defparml defplace defstruct
+syn keyword tl_keyword contained defsymacro defun defvar defvarl
+syn keyword tl_keyword contained del delay delete-package display-width
+syn keyword tl_keyword contained do dohash dotimes downcase-str
+syn keyword tl_keyword contained drop drop-until drop-while dup
+syn keyword tl_keyword contained dupfd dwim each each*
+syn keyword tl_keyword contained echo echoctl echoe echok
+syn keyword tl_keyword contained echoke echonl echoprt eighth
+syn keyword tl_keyword contained empty endgrent endpwent ensure-dir
+syn keyword tl_keyword contained env env-fbind env-hash env-vbind
+syn keyword tl_keyword contained eq eql equal errno
+syn keyword tl_keyword contained error eval evenp exception-subtype-p
+syn keyword tl_keyword contained exec exit exit* exp
+syn keyword tl_keyword contained expand-left expand-right expt exptmod
+syn keyword tl_keyword contained extproc f$ f^ f^$
+syn keyword tl_keyword contained false fboundp ff0 ff1
+syn keyword tl_keyword contained ffdly fifth fileno filter-equal
+syn keyword tl_keyword contained filter-string-tree finalize find find-frame
+syn keyword tl_keyword contained find-if find-max find-min find-package
+syn keyword tl_keyword contained find-struct-type first fixnum-max fixnum-min
+syn keyword tl_keyword contained fixnump flatcar flatcar* flatten
+syn keyword tl_keyword contained flatten* flet flip flipargs
+syn keyword tl_keyword contained flo-dig flo-epsilon flo-int flo-max
+syn keyword tl_keyword contained flo-max-dig flo-min flo-str floatp
+syn keyword tl_keyword contained floor flush-stream flusho fmakunbound
+syn keyword tl_keyword contained fmt fnm-casefold fnm-leading-dir fnm-noescape
+syn keyword tl_keyword contained fnm-pathname fnm-period fnmatch for
+syn keyword tl_keyword contained for* force fork format
+syn keyword tl_keyword contained fourth from fstat ftw
+syn keyword tl_keyword contained ftw-actionretval ftw-chdir ftw-continue ftw-d
+syn keyword tl_keyword contained ftw-depth ftw-dnr ftw-dp ftw-f
+syn keyword tl_keyword contained ftw-mount ftw-ns ftw-phys ftw-skip-siblings
+syn keyword tl_keyword contained ftw-skip-subtree ftw-sl ftw-sln ftw-stop
+syn keyword tl_keyword contained fun func-get-env func-get-form func-get-name
+syn keyword tl_keyword contained func-set-env functionp gcd gen
+syn keyword tl_keyword contained generate gensym gequal get-byte
+syn keyword tl_keyword contained get-char get-clobber-expander get-delete-expander get-error
+syn keyword tl_keyword contained get-error-str get-frames get-hash-userdata get-indent
+syn keyword tl_keyword contained get-indent-mode get-line get-lines get-list-from-stream
+syn keyword tl_keyword contained get-sig-handler get-string get-string-from-stream get-update-expander
+syn keyword tl_keyword contained getaddrinfo getegid getenv geteuid
+syn keyword tl_keyword contained getgid getgrent getgrgid getgrnam
+syn keyword tl_keyword contained getgroups gethash getitimer getopts
+syn keyword tl_keyword contained getpid getppid getpwent getpwnam
+syn keyword tl_keyword contained getpwuid getresgid getresuid getuid
+syn keyword tl_keyword contained ginterate giterate glob glob-altdirfunc
+syn keyword tl_keyword contained glob-brace glob-err glob-mark glob-nocheck
+syn keyword tl_keyword contained glob-noescape glob-nomagic glob-nosort glob-onlydir
+syn keyword tl_keyword contained glob-period glob-tilde glob-tilde-check greater
+syn keyword tl_keyword contained group-by group-reduce gun handle
+syn keyword tl_keyword contained handler-bind hash hash-alist hash-begin
+syn keyword tl_keyword contained hash-construct hash-count hash-diff hash-eql
+syn keyword tl_keyword contained hash-equal hash-from-pairs hash-isec hash-keys
+syn keyword tl_keyword contained hash-list hash-next hash-pairs hash-proper-subset
+syn keyword tl_keyword contained hash-revget hash-subset hash-uni hash-update
+syn keyword tl_keyword contained hash-update-1 hash-userdata hash-values hashp
+syn keyword tl_keyword contained have html-decode html-encode html-encode*
+syn keyword tl_keyword contained hupcl iapply icanon icrnl
+syn keyword tl_keyword contained identity ido iexten if
+syn keyword tl_keyword contained ifa iff iffi iflet
+syn keyword tl_keyword contained ignbrk igncr ignerr ignpar
+syn keyword tl_keyword contained imaxbel in in6addr-any in6addr-loopback
+syn keyword tl_keyword contained inaddr-any inaddr-loopback inc inc-indent
+syn keyword tl_keyword contained indent-code indent-data indent-off inhash
+syn keyword tl_keyword contained inlcr inpck int-chr int-flo
+syn keyword tl_keyword contained int-str integerp intern interp-fun-p
+syn keyword tl_keyword contained interpose invoke-catch ip ipf
+syn keyword tl_keyword contained iread isig isqrt istrip
+syn keyword tl_keyword contained itimer-prov itimer-real itimer-virtual iuclc
+syn keyword tl_keyword contained iutf8 ixany ixoff ixon
+syn keyword tl_keyword contained juxt keep-if keep-if* keepq
+syn keyword tl_keyword contained keepql keepqual keyword-package keywordp
+syn keyword tl_keyword contained kill labels lambda last
+syn keyword tl_keyword contained lazy-str lazy-str-force lazy-str-force-upto lazy-str-get-trailing-list
+syn keyword tl_keyword contained lazy-stream-cons lazy-stringp lcm lcons
+syn keyword tl_keyword contained lcons-fun lconsp ldiff length
+syn keyword tl_keyword contained length-list length-str length-str-< length-str-<=
+syn keyword tl_keyword contained length-str-> length-str->= length-vec lequal
+syn keyword tl_keyword contained less let let* lexical-fun-p
+syn keyword tl_keyword contained lexical-lisp1-binding lexical-var-p lib-version link
+syn keyword tl_keyword contained lisp-parse list list* list-str
+syn keyword tl_keyword contained list-vec list-vector listp lnew
+syn keyword tl_keyword contained load log log-alert log-auth
+syn keyword tl_keyword contained log-authpriv log-cons log-crit log-daemon
+syn keyword tl_keyword contained log-debug log-emerg log-err log-info
+syn keyword tl_keyword contained log-ndelay log-notice log-nowait log-odelay
+syn keyword tl_keyword contained log-perror log-pid log-user log-warning
+syn keyword tl_keyword contained log10 log2 logand logior
+syn keyword tl_keyword contained lognot logtest logtrunc logxor
+syn keyword tl_keyword contained lset lstat m$ m^
+syn keyword tl_keyword contained m^$ mac-param-bind macro-ancestor macro-form-p
+syn keyword tl_keyword contained macro-time macroexpand macroexpand-1 macrolet
+syn keyword tl_keyword contained major make-catenated-stream make-env make-hash
+syn keyword tl_keyword contained make-lazy-cons make-lazy-struct make-like make-package
+syn keyword tl_keyword contained make-random-state make-similar-hash make-string-byte-input-stream make-string-input-stream
+syn keyword tl_keyword contained make-string-output-stream make-strlist-input-stream make-strlist-output-stream make-struct
+syn keyword tl_keyword contained make-struct-type make-sym make-time make-time-utc
+syn keyword tl_keyword contained make-trie makedev makunbound mapcar
+syn keyword tl_keyword contained mapcar* mapdo mapf maphash
+syn keyword tl_keyword contained mappend mappend* mask match-fun
+syn keyword tl_keyword contained match-regex match-regex-right match-regst match-regst-right
+syn keyword tl_keyword contained match-str match-str-tree max mboundp
+syn keyword tl_keyword contained member member-if memq memql
+syn keyword tl_keyword contained memqual merge meth method
+syn keyword tl_keyword contained min minor minusp mkdir
+syn keyword tl_keyword contained mknod mkstring mlet mmakunbound
+syn keyword tl_keyword contained mod multi multi-sort n-choose-k
+syn keyword tl_keyword contained n-perm-k nconc neq neql
+syn keyword tl_keyword contained nequal new nexpand-left nil
+syn keyword tl_keyword contained nilf ninth nl0 nl1
+syn keyword tl_keyword contained nldly noflsh none not
+syn keyword tl_keyword contained notf nreconc nreverse nthcdr
+syn keyword tl_keyword contained nthlast null nullify num-chr
+syn keyword tl_keyword contained num-str numberp oand obtain
+syn keyword tl_keyword contained obtain* obtain*-block obtain-block ocrnl
+syn keyword tl_keyword contained oddp ofdel ofill olcuc
+syn keyword tl_keyword contained onlcr onlret onocr op
+syn keyword tl_keyword contained open-command open-directory open-file open-fileno
+syn keyword tl_keyword contained open-files open-files* open-pipe open-process
+syn keyword tl_keyword contained open-socket open-socket-pair open-tail openlog
+syn keyword tl_keyword contained opip opost opt opthelp
 syn keyword tl_keyword contained or orf package-alist package-name
 syn keyword tl_keyword contained package-symbols packagep pad parenb
 syn keyword tl_keyword contained parmrk parodd partition partition*
@@ -303,59 +309,62 @@ syn keyword tl_keyword contained sig-tstp sig-ttin sig-ttou sig-urg
 syn keyword tl_keyword contained sig-usr1 sig-usr2 sig-vtalrm sig-winch
 syn keyword tl_keyword contained sig-xcpu sig-xfsz sign-extend sin
 syn keyword tl_keyword contained sixth size-vec slet slot
-syn keyword tl_keyword contained slotp slotset sock-accept sock-bind
-syn keyword tl_keyword contained sock-cloexec sock-connect sock-dgram sock-family
-syn keyword tl_keyword contained sock-listen sock-nonblock sock-peer sock-recv-timeout
-syn keyword tl_keyword contained sock-send-timeout sock-set-peer sock-shutdown sock-stream
-syn keyword tl_keyword contained sock-type some sort sort-group
-syn keyword tl_keyword contained source-loc source-loc-str span-str special-operator-p
-syn keyword tl_keyword contained special-var-p splice split split*
-syn keyword tl_keyword contained split-str split-str-set sqrt sssucc
-syn keyword tl_keyword contained ssucc stat static-slot static-slot-ensure
-syn keyword tl_keyword contained static-slot-p static-slot-set stdlib str-in6addr
-syn keyword tl_keyword contained str-in6addr-net str-inaddr str-inaddr-net str<
-syn keyword tl_keyword contained str<= str= str> str>=
-syn keyword tl_keyword contained stream-get-prop stream-set-prop streamp string-extend
-syn keyword tl_keyword contained string-lt stringp struct-type struct-type-p
-syn keyword tl_keyword contained structp sub sub-list sub-str
-syn keyword tl_keyword contained sub-vec subtypep succ super
-syn keyword tl_keyword contained super-method suspend swap symacrolet
-syn keyword tl_keyword contained symbol-function symbol-macro symbol-name symbol-package
-syn keyword tl_keyword contained symbol-value symbolp symlink sys:*lisp1*
-syn keyword tl_keyword contained sys:*pl-env* sys:abscond* sys:abscond-from sys:apply
-syn keyword tl_keyword contained sys:awk-expander sys:awk-let sys:awk-test sys:bad-slot-syntax
+syn keyword tl_keyword contained slotp slots slotset sock-accept
+syn keyword tl_keyword contained sock-bind sock-cloexec sock-connect sock-dgram
+syn keyword tl_keyword contained sock-family sock-listen sock-nonblock sock-peer
+syn keyword tl_keyword contained sock-recv-timeout sock-send-timeout sock-set-peer sock-shutdown
+syn keyword tl_keyword contained sock-stream sock-type some sort
+syn keyword tl_keyword contained sort-group source-loc source-loc-str span-str
+syn keyword tl_keyword contained special-operator-p special-var-p splice split
+syn keyword tl_keyword contained split* split-str split-str-set sqrt
+syn keyword tl_keyword contained sssucc ssucc stat static-slot
+syn keyword tl_keyword contained static-slot-ensure static-slot-p static-slot-set stdlib
+syn keyword tl_keyword contained str-in6addr str-in6addr-net str-inaddr str-inaddr-net
+syn keyword tl_keyword contained str< str<= str= str>
+syn keyword tl_keyword contained str>= stream-get-prop stream-set-prop streamp
+syn keyword tl_keyword contained string-extend string-lt stringp struct-type
+syn keyword tl_keyword contained struct-type-p structp sub sub-list
+syn keyword tl_keyword contained sub-str sub-vec subtypep succ
+syn keyword tl_keyword contained super super-method suspend swap
+syn keyword tl_keyword contained symacrolet symbol-function symbol-macro symbol-name
+syn keyword tl_keyword contained symbol-package symbol-value symbolp symlink
+syn keyword tl_keyword contained sys:*lisp1* sys:*pl-env* sys:*trace-hash* sys:*trace-level*
+syn keyword tl_keyword contained sys:abscond* sys:abscond-from sys:apply sys:awk-expander
+syn keyword tl_keyword contained sys:awk-let sys:awk-redir sys:awk-test sys:bad-slot-syntax
 syn keyword tl_keyword contained sys:capture-cont sys:circref sys:conv sys:conv-expand
 syn keyword tl_keyword contained sys:conv-let sys:cp-origin sys:defmeth sys:do-conv
 syn keyword tl_keyword contained sys:do-path-test sys:dwim-del sys:dwim-set sys:eval-err
 syn keyword tl_keyword contained sys:expand sys:expr sys:fbind sys:gc
-syn keyword tl_keyword contained sys:gc-set-delta sys:get-fb sys:get-mb sys:get-vb
+syn keyword tl_keyword contained sys:gc-set-delta sys:get-fun-getter-setter sys:get-mb sys:get-vb
 syn keyword tl_keyword contained sys:handle-bad-syntax sys:if-to-cond sys:in6addr-condensed-text sys:l1-setq
 syn keyword tl_keyword contained sys:l1-val sys:lbind sys:lisp1-setq sys:lisp1-value
 syn keyword tl_keyword contained sys:list-builder-macrolets sys:make-struct-lit sys:make-struct-type sys:mark-special
-syn keyword tl_keyword contained sys:obtain-impl sys:path-access sys:path-examine sys:path-test
-syn keyword tl_keyword contained sys:path-test-mode sys:pl-expand sys:placelet-1 sys:prune-missing-inits
-syn keyword tl_keyword contained sys:qquote sys:quasi sys:quasilist sys:r-s-let-expander
-syn keyword tl_keyword contained sys:reg-expand-nongreedy sys:reg-optimize sys:register-simple-accessor sys:rplaca
-syn keyword tl_keyword contained sys:rplacd sys:rslotset sys:set-hash-rec-limit sys:set-hash-str-limit
-syn keyword tl_keyword contained sys:set-macro-ancestor sys:setq sys:setqf sys:splice
-syn keyword tl_keyword contained sys:str-inaddr-net-impl sys:struct-lit sys:sym-clobber-expander sys:sym-delete-expander
-syn keyword tl_keyword contained sys:sym-update-expander sys:top-fb sys:top-mb sys:top-vb
-syn keyword tl_keyword contained sys:unquote sys:var sys:with-saved-vars syslog
-syn keyword tl_keyword contained system-package t tab0 tab1
-syn keyword tl_keyword contained tab2 tab3 tabdly take
-syn keyword tl_keyword contained take-until take-while tan tb
-syn keyword tl_keyword contained tc tcdrain tcflow tcflush
-syn keyword tl_keyword contained tcgetattr tciflush tcioff tcioflush
-syn keyword tl_keyword contained tcion tcoflush tcooff tcoon
-syn keyword tl_keyword contained tcsadrain tcsaflush tcsanow tcsendbreak
-syn keyword tl_keyword contained tcsetattr tenth test-clear test-dec
-syn keyword tl_keyword contained test-inc test-set test-set-indent-mode tf
-syn keyword tl_keyword contained third throw throwf time
-syn keyword tl_keyword contained time-fields-local time-fields-utc time-parse time-string-local
-syn keyword tl_keyword contained time-string-utc time-struct-local time-struct-utc time-usec
-syn keyword tl_keyword contained to tofloat tofloatz toint
-syn keyword tl_keyword contained tointz tok-str tok-where tostop
-syn keyword tl_keyword contained tostring tostringp tprint transpose
+syn keyword tl_keyword contained sys:obtain-impl sys:opt-dash sys:opt-err sys:path-access
+syn keyword tl_keyword contained sys:path-examine sys:path-test sys:path-test-mode sys:pl-expand
+syn keyword tl_keyword contained sys:placelet-1 sys:prune-missing-inits sys:qquote sys:quasi
+syn keyword tl_keyword contained sys:quasilist sys:r-s-let-expander sys:reg-expand-nongreedy sys:reg-optimize
+syn keyword tl_keyword contained sys:register-simple-accessor sys:rplaca sys:rplacd sys:rslotset
+syn keyword tl_keyword contained sys:set-hash-rec-limit sys:set-hash-str-limit sys:set-macro-ancestor sys:setq
+syn keyword tl_keyword contained sys:setqf sys:splice sys:str-inaddr-net-impl sys:struct-lit
+syn keyword tl_keyword contained sys:sym-clobber-expander sys:sym-delete-expander sys:sym-update-expander sys:top-fb
+syn keyword tl_keyword contained sys:top-mb sys:top-vb sys:trace sys:trace-enter
+syn keyword tl_keyword contained sys:trace-leave sys:unquote sys:untrace sys:var
+syn keyword tl_keyword contained sys:wdwrap sys:with-saved-vars syslog system-package
+syn keyword tl_keyword contained t tab0 tab1 tab2
+syn keyword tl_keyword contained tab3 tabdly take take-until
+syn keyword tl_keyword contained take-while tan tb tc
+syn keyword tl_keyword contained tcdrain tcflow tcflush tcgetattr
+syn keyword tl_keyword contained tciflush tcioff tcioflush tcion
+syn keyword tl_keyword contained tcoflush tcooff tcoon tcsadrain
+syn keyword tl_keyword contained tcsaflush tcsanow tcsendbreak tcsetattr
+syn keyword tl_keyword contained tenth test-clear test-dec test-inc
+syn keyword tl_keyword contained test-set test-set-indent-mode tf third
+syn keyword tl_keyword contained throw throwf time time-fields-local
+syn keyword tl_keyword contained time-fields-utc time-parse time-string-local time-string-utc
+syn keyword tl_keyword contained time-struct-local time-struct-utc time-usec to
+syn keyword tl_keyword contained tofloat tofloatz toint tointz
+syn keyword tl_keyword contained tok-str tok-where tostop tostring
+syn keyword tl_keyword contained tostringp tprint trace transpose
 syn keyword tl_keyword contained tree-bind tree-case tree-find trie-add
 syn keyword tl_keyword contained trie-compress trie-lookup-begin trie-lookup-feed-char trie-value-at
 syn keyword tl_keyword contained trim-str true trunc trunc-rem
@@ -365,27 +374,28 @@ syn keyword tl_keyword contained txr-when typecase typeof typep
 syn keyword tl_keyword contained umask umeth umethod uname
 syn keyword tl_keyword contained unget-byte unget-char uniq unique
 syn keyword tl_keyword contained unless unquote unsetenv until
-syn keyword tl_keyword contained until* unwind-protect upcase-str upd
-syn keyword tl_keyword contained update url-decode url-encode use
-syn keyword tl_keyword contained user-package usl usleep uslot
-syn keyword tl_keyword contained vdiscard vec vec-list vec-push
-syn keyword tl_keyword contained vec-set-length vecref vector vector-list
-syn keyword tl_keyword contained vectorp veof veol veol2
-syn keyword tl_keyword contained verase vintr vkill vlnext
-syn keyword tl_keyword contained vmin vquit vreprint vstart
-syn keyword tl_keyword contained vstop vsusp vswtc vt0
-syn keyword tl_keyword contained vt1 vtdly vtime vwerase
-syn keyword tl_keyword contained w-continued w-coredump w-exitstatus w-ifcontinued
-syn keyword tl_keyword contained w-ifexited w-ifsignaled w-ifstopped w-nohang
-syn keyword tl_keyword contained w-stopsig w-termsig w-untraced wait
-syn keyword tl_keyword contained weave when whenlet where
-syn keyword tl_keyword contained while while* whilet width
-syn keyword tl_keyword contained width-check window-map window-mappend with-clobber-expander
-syn keyword tl_keyword contained with-delete-expander with-gensyms with-hash-iter with-in-string-byte-stream
-syn keyword tl_keyword contained with-in-string-stream with-objects with-out-string-stream with-out-strlist-stream
-syn keyword tl_keyword contained with-resources with-slots with-stream with-update-expander
-syn keyword tl_keyword contained wrap wrap* xcase yield
-syn keyword tl_keyword contained yield-from zap zerop zip
+syn keyword tl_keyword contained until* untrace unwind-protect upcase-str
+syn keyword tl_keyword contained upd update url-decode url-encode
+syn keyword tl_keyword contained use user-package usl usleep
+syn keyword tl_keyword contained uslot vdiscard vec vec-list
+syn keyword tl_keyword contained vec-push vec-set-length vecref vector
+syn keyword tl_keyword contained vector-list vectorp veof veol
+syn keyword tl_keyword contained veol2 verase vintr vkill
+syn keyword tl_keyword contained vlnext vmin vquit vreprint
+syn keyword tl_keyword contained vstart vstop vsusp vswtc
+syn keyword tl_keyword contained vt0 vt1 vtdly vtime
+syn keyword tl_keyword contained vwerase w-continued w-coredump w-exitstatus
+syn keyword tl_keyword contained w-ifcontinued w-ifexited w-ifsignaled w-ifstopped
+syn keyword tl_keyword contained w-nohang w-stopsig w-termsig w-untraced
+syn keyword tl_keyword contained wait weave when whenlet
+syn keyword tl_keyword contained where while while* whilet
+syn keyword tl_keyword contained width width-check window-map window-mappend
+syn keyword tl_keyword contained with-clobber-expander with-delete-expander with-gensyms with-hash-iter
+syn keyword tl_keyword contained with-in-string-byte-stream with-in-string-stream with-objects with-out-string-stream
+syn keyword tl_keyword contained with-out-strlist-stream with-resources with-slots with-stream
+syn keyword tl_keyword contained with-update-expander wrap wrap* xcase
+syn keyword tl_keyword contained yield yield-from zap zerop
+syn keyword tl_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]*" contained
@@ -476,4 +486,4 @@ hi def link txr_nested_error Error
 
 let b:current_syntax = "lisp"
 
-set lispwords=ado,alet,ap,append-each,append-each*,aret,awk,block,block*,build,caseq,caseql,casequal,catch,collect-each,collect-each*,compare-swap,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*,lset,mac-param-bind,macro-time,macrolet,mlet,obtain,obtain*,obtain*-block,obtain-block,op,pdec,pinc,placelet,placelet*,pop,pprof,prof,prog1,progn,push,pushnew,ret,return,return-from,rlet,rslot,slet,splice,suspend,symacrolet,sys:abscond-from,sys:awk-let,sys:conv,sys:expr,sys:fbind,sys:l1-val,sys:lbind,sys:lisp1-value,sys:path-examine,sys:path-test,sys:placelet-1,sys:splice,sys:struct-lit,sys:unquote,sys:var,sys:with-saved-vars,tb,tc,test-clear,test-dec,test-inc,test-set,tree-bind,tree-case,txr-case,txr-case-impl,txr-if,txr-when,typecase,unless,unquote,until,until*,unwind-protect,upd,when,whenlet,while,while*,whilet,with-clobber-expander,with-delete-expander,with-gensyms,with-hash-iter,with-in-string-byte-stream,with-in-string-stream,with-objects,with-out-string-stream,with-out-strlist-stream,with-resources,with-slots,with-stream,with-update-expander,yield,yield-from,zap,:method,:function,:init,:postinit,:fini
+set lispwords=ado,alet,ap,append-each,append-each*,aret,awk,block,block*,build,caseq,caseql,casequal,catch,collect-each,collect-each*,compare-swap,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*,lset,mac-param-bind,macro-time,macrolet,mlet,obtain,obtain*,obtain*-block,obtain-block,op,pdec,pinc,placelet,placelet*,pop,pprof,prof,prog1,progn,push,pushnew,ret,return,return-from,rlet,rslot,slet,splice,suspend,symacrolet,sys:abscond-from,sys:awk-let,sys:awk-redir,sys:conv,sys:expr,sys:fbind,sys:l1-val,sys:lbind,sys:lisp1-value,sys:path-examine,sys:path-test,sys:placelet-1,sys:splice,sys:struct-lit,sys:unquote,sys:var,sys:with-saved-vars,tb,tc,test-clear,test-dec,test-inc,test-set,trace,tree-bind,tree-case,txr-case,txr-case-impl,txr-if,txr-when,typecase,unless,unquote,until,until*,untrace,unwind-protect,upd,when,whenlet,while,while*,whilet,with-clobber-expander,with-delete-expander,with-gensyms,with-hash-iter,with-in-string-byte-stream,with-in-string-stream,with-objects,with-out-string-stream,with-out-strlist-stream,with-resources,with-slots,with-stream,with-update-expander,yield,yield-from,zap,:method,:function,:init,:postinit,:fini
diff --git a/txr.1 b/txr.1
index bc0ea7d7..eb16015a 100644
--- a/txr.1
+++ b/txr.1
@@ -340,9 +340,9 @@
 .ds TX \f[B]TXR\f[]
 .ds TL \f[B]TXR Lisp\f[]
 .\" Start of man page:
-.TH TXR 1 2016-10-21 "Utility Commands" "TXR Data Processing Language" "Kaz Kylheku"
+.TH TXR 1 2016-11-05 "Utility Commands" "TXR Data Processing Language" "Kaz Kylheku"
 .SH* NAME
-\*(TX \- text processing language (version 155)
+\*(TX \- text processing language (version 156)
 
 .SH* SYNOPSIS
 .cblk
diff --git a/txr.vim b/txr.vim
index 7c421771..07ec83e7 100644
--- a/txr.vim
+++ b/txr.vim
@@ -29,30 +29,34 @@ syn keyword tl_keyword contained *place-delete-expander* *place-macro* *place-up
 syn keyword tl_keyword contained *print-circle* *print-flo-digits* *print-flo-format* *print-flo-precision*
 syn keyword tl_keyword contained *random-state* *random-warmup* *self-path* *stddebug*
 syn keyword tl_keyword contained *stderr* *stdin* *stdlog* *stdnull*
-syn keyword tl_keyword contained *stdout* *system-package* *txr-version* *unhandled-hook*
-syn keyword tl_keyword contained *user-package* + - /
-syn keyword tl_keyword contained /= : :addr :append
-syn keyword tl_keyword contained :args :atime :auto :awk-file
-syn keyword tl_keyword contained :awk-rec :begin :begin-file :blksize
-syn keyword tl_keyword contained :blocks :byte-oriented :cdigit :chars
-syn keyword tl_keyword contained :continue :counter :cspace :ctime
-syn keyword tl_keyword contained :cword-char :decline :dev :digit
-syn keyword tl_keyword contained :downcase :end :end-file :env
-syn keyword tl_keyword contained :equal-based :fd :filter :fini
-syn keyword tl_keyword contained :finish :form :from-current :from-end
-syn keyword tl_keyword contained :from-start :from_html :frombase64 :fromhtml
-syn keyword tl_keyword contained :frompercent :fromurl :fun :function
-syn keyword tl_keyword contained :gap :gid :greedy :hextoint
-syn keyword tl_keyword contained :init :ino :inputs :instance
+syn keyword tl_keyword contained *stdout* *system-package* *trace-output* *txr-version*
+syn keyword tl_keyword contained *unhandled-hook* *user-package* + -
+syn keyword tl_keyword contained / /= : :abandoned
+syn keyword tl_keyword contained :addr :apf :append :args
+syn keyword tl_keyword contained :atime :auto :awk-file :awk-rec
+syn keyword tl_keyword contained :begin :begin-file :blksize :blocks
+syn keyword tl_keyword contained :bool :byte-oriented :cdigit :chars
+syn keyword tl_keyword contained :cint :close :continue :counter
+syn keyword tl_keyword contained :cspace :ctime :cword-char :dec
+syn keyword tl_keyword contained :decline :dev :digit :downcase
+syn keyword tl_keyword contained :end :end-file :env :equal-based
+syn keyword tl_keyword contained :explicit-no :fd :filter :fini
+syn keyword tl_keyword contained :finish :float :form :from-current
+syn keyword tl_keyword contained :from-end :from-start :from_html :frombase64
+syn keyword tl_keyword contained :fromhtml :frompercent :fromurl :fun
+syn keyword tl_keyword contained :function :gap :gid :greedy
+syn keyword tl_keyword contained :hex :hextoint :inf :init
+syn keyword tl_keyword contained :ino :inp :inputs :instance
 syn keyword tl_keyword contained :into :let :lfilt :lines
 syn keyword tl_keyword contained :list :longest :mandatory :maxgap
 syn keyword tl_keyword contained :maxtimes :method :mingap :mintimes
 syn keyword tl_keyword contained :mode :mtime :name :named
-syn keyword tl_keyword contained :next-spec :nlink :nothrow :output
-syn keyword tl_keyword contained :postinit :prio :rdev :real-time
-syn keyword tl_keyword contained :reflect :repeat-spec :resolve :rfilt
-syn keyword tl_keyword contained :set :set-file :shortest :size
-syn keyword tl_keyword contained :space :static :string :symacro
+syn keyword tl_keyword contained :next-spec :nlink :nothrow :oct
+syn keyword tl_keyword contained :outf :outp :output :postinit
+syn keyword tl_keyword contained :prio :rdev :real-time :reflect
+syn keyword tl_keyword contained :repeat-spec :resolve :rfilt :set
+syn keyword tl_keyword contained :set-file :shortest :size :space
+syn keyword tl_keyword contained :static :str :string :symacro
 syn keyword tl_keyword contained :times :tlist :to_html :tobase64
 syn keyword tl_keyword contained :tofloat :tohtml :tohtml* :toint
 syn keyword tl_keyword contained :tonumber :topercent :tourl :uid
@@ -74,167 +78,169 @@ syn keyword tl_keyword contained awk base64-decode base64-encode bignump
 syn keyword tl_keyword contained bindable bit block block*
 syn keyword tl_keyword contained boundp break-str brkint bs0
 syn keyword tl_keyword contained bs1 bsdly build build-list
-syn keyword tl_keyword contained butlast caaaaar caaaadr caaaar
-syn keyword tl_keyword contained caaadar caaaddr caaadr caaar
-syn keyword tl_keyword contained caadaar caadadr caadar caaddar
-syn keyword tl_keyword contained caadddr caaddr caadr caar
-syn keyword tl_keyword contained cadaaar cadaadr cadaar cadadar
-syn keyword tl_keyword contained cadaddr cadadr cadar caddaar
-syn keyword tl_keyword contained caddadr caddar cadddar caddddr
-syn keyword tl_keyword contained cadddr caddr cadr call
-syn keyword tl_keyword contained call-clobber-expander call-delete-expander call-finalizers call-super-fun
-syn keyword tl_keyword contained call-super-method call-update-expander callf car
-syn keyword tl_keyword contained caseq caseql casequal cat-str
-syn keyword tl_keyword contained cat-streams cat-vec catch catenated-stream-p
-syn keyword tl_keyword contained catenated-stream-push cbaud cbaudex cdaaaar
-syn keyword tl_keyword contained cdaaadr cdaaar cdaadar cdaaddr
-syn keyword tl_keyword contained cdaadr cdaar cdadaar cdadadr
-syn keyword tl_keyword contained cdadar cdaddar cdadddr cdaddr
-syn keyword tl_keyword contained cdadr cdar cddaaar cddaadr
-syn keyword tl_keyword contained cddaar cddadar cddaddr cddadr
-syn keyword tl_keyword contained cddar cdddaar cdddadr cdddar
-syn keyword tl_keyword contained cddddar cdddddr cddddr cdddr
-syn keyword tl_keyword contained cddr cdr ceil chain
-syn keyword tl_keyword contained chand chdir chmod chr-digit
-syn keyword tl_keyword contained chr-int chr-isalnum chr-isalpha chr-isascii
-syn keyword tl_keyword contained chr-isblank chr-iscntrl chr-isdigit chr-isgraph
-syn keyword tl_keyword contained chr-islower chr-isprint chr-ispunct chr-isspace
-syn keyword tl_keyword contained chr-isunisp chr-isupper chr-isxdigit chr-num
-syn keyword tl_keyword contained chr-str chr-str-set chr-tolower chr-toupper
-syn keyword tl_keyword contained chr-xdigit chrp clamp clear-error
-syn keyword tl_keyword contained clear-struct clocal close-stream closelog
-syn keyword tl_keyword contained cmp-str cmspar collect-each collect-each*
-syn keyword tl_keyword contained comb compare-swap compl-span-str cond
-syn keyword tl_keyword contained conda condlet cons conses
-syn keyword tl_keyword contained conses* consp constantp copy
-syn keyword tl_keyword contained copy-alist copy-cons copy-hash copy-list
-syn keyword tl_keyword contained copy-str copy-struct copy-vec cos
-syn keyword tl_keyword contained count-if countq countql countqual
-syn keyword tl_keyword contained cr0 cr1 cr2 cr3
-syn keyword tl_keyword contained crdly cread crtscts crypt
-syn keyword tl_keyword contained cs5 cs6 cs7 cs8
-syn keyword tl_keyword contained csize cstopb cum-norm-dist daemon
-syn keyword tl_keyword contained dec defex define-accessor define-modify-macro
-syn keyword tl_keyword contained define-place-macro defmacro defmeth defparm
-syn keyword tl_keyword contained defparml defplace defstruct defsymacro
-syn keyword tl_keyword contained defun defvar defvarl del
-syn keyword tl_keyword contained delay delete-package display-width do
-syn keyword tl_keyword contained dohash dotimes downcase-str drop
-syn keyword tl_keyword contained drop-until drop-while dup dupfd
-syn keyword tl_keyword contained dwim each each* echo
-syn keyword tl_keyword contained echoctl echoe echok echoke
-syn keyword tl_keyword contained echonl echoprt eighth empty
-syn keyword tl_keyword contained endgrent endpwent ensure-dir env
-syn keyword tl_keyword contained env-fbind env-hash env-vbind eq
-syn keyword tl_keyword contained eql equal errno error
-syn keyword tl_keyword contained eval evenp exception-subtype-p exec
-syn keyword tl_keyword contained exit exit* exp expand-left
-syn keyword tl_keyword contained expand-right expt exptmod extproc
-syn keyword tl_keyword contained f$ f^ f^$ false
-syn keyword tl_keyword contained fboundp ff0 ff1 ffdly
-syn keyword tl_keyword contained fifth fileno filter-equal filter-string-tree
-syn keyword tl_keyword contained finalize find find-frame find-if
-syn keyword tl_keyword contained find-max find-min find-package find-struct-type
-syn keyword tl_keyword contained first fixnum-max fixnum-min fixnump
-syn keyword tl_keyword contained flatcar flatcar* flatten flatten*
-syn keyword tl_keyword contained flet flip flipargs flo-dig
-syn keyword tl_keyword contained flo-epsilon flo-int flo-max flo-max-dig
-syn keyword tl_keyword contained flo-min flo-str floatp floor
-syn keyword tl_keyword contained flush-stream flusho fmakunbound fmt
-syn keyword tl_keyword contained fnm-casefold fnm-leading-dir fnm-noescape fnm-pathname
-syn keyword tl_keyword contained fnm-period fnmatch for for*
-syn keyword tl_keyword contained force fork format fourth
-syn keyword tl_keyword contained from fstat ftw ftw-actionretval
-syn keyword tl_keyword contained ftw-chdir ftw-continue ftw-d ftw-depth
-syn keyword tl_keyword contained ftw-dnr ftw-dp ftw-f ftw-mount
-syn keyword tl_keyword contained ftw-ns ftw-phys ftw-skip-siblings ftw-skip-subtree
-syn keyword tl_keyword contained ftw-sl ftw-sln ftw-stop fun
-syn keyword tl_keyword contained func-get-env func-get-form func-get-name func-set-env
-syn keyword tl_keyword contained functionp gcd gen generate
-syn keyword tl_keyword contained gensym gequal get-byte get-char
-syn keyword tl_keyword contained get-clobber-expander get-delete-expander get-error get-error-str
-syn keyword tl_keyword contained get-frames get-hash-userdata get-indent get-indent-mode
-syn keyword tl_keyword contained get-line get-lines get-list-from-stream get-sig-handler
-syn keyword tl_keyword contained get-string get-string-from-stream get-update-expander getaddrinfo
-syn keyword tl_keyword contained getegid getenv geteuid getgid
-syn keyword tl_keyword contained getgrent getgrgid getgrnam getgroups
-syn keyword tl_keyword contained gethash getitimer getpid getppid
-syn keyword tl_keyword contained getpwent getpwnam getpwuid getresgid
-syn keyword tl_keyword contained getresuid getuid ginterate giterate
-syn keyword tl_keyword contained glob glob-altdirfunc glob-brace glob-err
-syn keyword tl_keyword contained glob-mark glob-nocheck glob-noescape glob-nomagic
-syn keyword tl_keyword contained glob-nosort glob-onlydir glob-period glob-tilde
-syn keyword tl_keyword contained glob-tilde-check greater group-by group-reduce
-syn keyword tl_keyword contained gun handle handler-bind hash
-syn keyword tl_keyword contained hash-alist hash-begin hash-construct hash-count
-syn keyword tl_keyword contained hash-diff hash-eql hash-equal hash-from-pairs
-syn keyword tl_keyword contained hash-isec hash-keys hash-list hash-next
-syn keyword tl_keyword contained hash-pairs hash-proper-subset hash-revget hash-subset
-syn keyword tl_keyword contained hash-uni hash-update hash-update-1 hash-userdata
-syn keyword tl_keyword contained hash-values hashp have html-decode
-syn keyword tl_keyword contained html-encode html-encode* hupcl iapply
-syn keyword tl_keyword contained icanon icrnl identity ido
-syn keyword tl_keyword contained iexten if ifa iff
-syn keyword tl_keyword contained iffi iflet ignbrk igncr
-syn keyword tl_keyword contained ignerr ignpar imaxbel in
-syn keyword tl_keyword contained in6addr-any in6addr-loopback inaddr-any inaddr-loopback
-syn keyword tl_keyword contained inc inc-indent indent-code indent-data
-syn keyword tl_keyword contained indent-off inhash inlcr inpck
-syn keyword tl_keyword contained int-chr int-flo int-str integerp
-syn keyword tl_keyword contained intern interp-fun-p interpose invoke-catch
-syn keyword tl_keyword contained ip ipf iread isig
-syn keyword tl_keyword contained isqrt istrip itimer-prov itimer-real
-syn keyword tl_keyword contained itimer-virtual iuclc iutf8 ixany
-syn keyword tl_keyword contained ixoff ixon juxt keep-if
-syn keyword tl_keyword contained keep-if* keepq keepql keepqual
-syn keyword tl_keyword contained keyword-package keywordp kill labels
-syn keyword tl_keyword contained lambda last lazy-str lazy-str-force
-syn keyword tl_keyword contained lazy-str-force-upto lazy-str-get-trailing-list lazy-stream-cons lazy-stringp
-syn keyword tl_keyword contained lcm lcons lcons-fun lconsp
-syn keyword tl_keyword contained ldiff length length-list length-str
-syn keyword tl_keyword contained length-str-< length-str-<= length-str-> length-str->=
-syn keyword tl_keyword contained length-vec lequal less let
-syn keyword tl_keyword contained let* lexical-fun-p lexical-lisp1-binding lexical-var-p
-syn keyword tl_keyword contained lib-version link lisp-parse list
-syn keyword tl_keyword contained list* list-str list-vec list-vector
-syn keyword tl_keyword contained listp lnew load log
-syn keyword tl_keyword contained log-alert log-auth log-authpriv log-cons
-syn keyword tl_keyword contained log-crit log-daemon log-debug log-emerg
-syn keyword tl_keyword contained log-err log-info log-ndelay log-notice
-syn keyword tl_keyword contained log-nowait log-odelay log-perror log-pid
-syn keyword tl_keyword contained log-user log-warning log10 log2
-syn keyword tl_keyword contained logand logior lognot logtest
-syn keyword tl_keyword contained logtrunc logxor lset lstat
-syn keyword tl_keyword contained m$ m^ m^$ mac-param-bind
-syn keyword tl_keyword contained macro-ancestor macro-form-p macro-time macroexpand
-syn keyword tl_keyword contained macroexpand-1 macrolet major make-catenated-stream
-syn keyword tl_keyword contained make-env make-hash make-lazy-cons make-lazy-struct
-syn keyword tl_keyword contained make-like make-package make-random-state make-similar-hash
-syn keyword tl_keyword contained make-string-byte-input-stream make-string-input-stream make-string-output-stream make-strlist-input-stream
-syn keyword tl_keyword contained make-strlist-output-stream make-struct make-struct-type make-sym
-syn keyword tl_keyword contained make-time make-time-utc make-trie makedev
-syn keyword tl_keyword contained makunbound mapcar mapcar* mapdo
-syn keyword tl_keyword contained mapf maphash mappend mappend*
-syn keyword tl_keyword contained mask match-fun match-regex match-regex-right
-syn keyword tl_keyword contained match-regst match-regst-right match-str match-str-tree
-syn keyword tl_keyword contained max mboundp member member-if
-syn keyword tl_keyword contained memq memql memqual merge
-syn keyword tl_keyword contained meth method min minor
-syn keyword tl_keyword contained minusp mkdir mknod mkstring
-syn keyword tl_keyword contained mlet mmakunbound mod multi
-syn keyword tl_keyword contained multi-sort n-choose-k n-perm-k nconc
-syn keyword tl_keyword contained new nexpand-left nil nilf
-syn keyword tl_keyword contained ninth nl0 nl1 nldly
-syn keyword tl_keyword contained noflsh none not notf
-syn keyword tl_keyword contained nreconc nreverse nthcdr null
-syn keyword tl_keyword contained nullify num-chr num-str numberp
-syn keyword tl_keyword contained oand obtain obtain* obtain*-block
-syn keyword tl_keyword contained obtain-block ocrnl oddp ofdel
-syn keyword tl_keyword contained ofill olcuc onlcr onlret
-syn keyword tl_keyword contained onocr op open-command open-directory
-syn keyword tl_keyword contained open-file open-fileno open-files open-files*
-syn keyword tl_keyword contained open-pipe open-process open-socket open-socket-pair
-syn keyword tl_keyword contained open-tail openlog opip opost
+syn keyword tl_keyword contained butlast butlastn caaaaar caaaadr
+syn keyword tl_keyword contained caaaar caaadar caaaddr caaadr
+syn keyword tl_keyword contained caaar caadaar caadadr caadar
+syn keyword tl_keyword contained caaddar caadddr caaddr caadr
+syn keyword tl_keyword contained caar cadaaar cadaadr cadaar
+syn keyword tl_keyword contained cadadar cadaddr cadadr cadar
+syn keyword tl_keyword contained caddaar caddadr caddar cadddar
+syn keyword tl_keyword contained caddddr cadddr caddr cadr
+syn keyword tl_keyword contained call call-clobber-expander call-delete-expander call-finalizers
+syn keyword tl_keyword contained call-super-fun call-super-method call-update-expander callf
+syn keyword tl_keyword contained car caseq caseql casequal
+syn keyword tl_keyword contained cat-str cat-streams cat-vec catch
+syn keyword tl_keyword contained catenated-stream-p catenated-stream-push cbaud cbaudex
+syn keyword tl_keyword contained cdaaaar cdaaadr cdaaar cdaadar
+syn keyword tl_keyword contained cdaaddr cdaadr cdaar cdadaar
+syn keyword tl_keyword contained cdadadr cdadar cdaddar cdadddr
+syn keyword tl_keyword contained cdaddr cdadr cdar cddaaar
+syn keyword tl_keyword contained cddaadr cddaar cddadar cddaddr
+syn keyword tl_keyword contained cddadr cddar cdddaar cdddadr
+syn keyword tl_keyword contained cdddar cddddar cdddddr cddddr
+syn keyword tl_keyword contained cdddr cddr cdr ceil
+syn keyword tl_keyword contained chain chand chdir chmod
+syn keyword tl_keyword contained chr-digit chr-int chr-isalnum chr-isalpha
+syn keyword tl_keyword contained chr-isascii chr-isblank chr-iscntrl chr-isdigit
+syn keyword tl_keyword contained chr-isgraph chr-islower chr-isprint chr-ispunct
+syn keyword tl_keyword contained chr-isspace chr-isunisp chr-isupper chr-isxdigit
+syn keyword tl_keyword contained chr-num chr-str chr-str-set chr-tolower
+syn keyword tl_keyword contained chr-toupper chr-xdigit chrp clamp
+syn keyword tl_keyword contained clear-error clear-struct clocal close-stream
+syn keyword tl_keyword contained closelog cmp-str cmspar collect-each
+syn keyword tl_keyword contained collect-each* comb compare-swap compl-span-str
+syn keyword tl_keyword contained cond conda condlet cons
+syn keyword tl_keyword contained conses conses* consp constantp
+syn keyword tl_keyword contained copy copy-alist copy-cons copy-hash
+syn keyword tl_keyword contained copy-list copy-str copy-struct copy-vec
+syn keyword tl_keyword contained cos count-if countq countql
+syn keyword tl_keyword contained countqual cr0 cr1 cr2
+syn keyword tl_keyword contained cr3 crdly cread crtscts
+syn keyword tl_keyword contained crypt cs5 cs6 cs7
+syn keyword tl_keyword contained cs8 csize cstopb cum-norm-dist
+syn keyword tl_keyword contained daemon dec defex define-accessor
+syn keyword tl_keyword contained define-modify-macro define-place-macro defmacro defmeth
+syn keyword tl_keyword contained defparm defparml defplace defstruct
+syn keyword tl_keyword contained defsymacro defun defvar defvarl
+syn keyword tl_keyword contained del delay delete-package display-width
+syn keyword tl_keyword contained do dohash dotimes downcase-str
+syn keyword tl_keyword contained drop drop-until drop-while dup
+syn keyword tl_keyword contained dupfd dwim each each*
+syn keyword tl_keyword contained echo echoctl echoe echok
+syn keyword tl_keyword contained echoke echonl echoprt eighth
+syn keyword tl_keyword contained empty endgrent endpwent ensure-dir
+syn keyword tl_keyword contained env env-fbind env-hash env-vbind
+syn keyword tl_keyword contained eq eql equal errno
+syn keyword tl_keyword contained error eval evenp exception-subtype-p
+syn keyword tl_keyword contained exec exit exit* exp
+syn keyword tl_keyword contained expand-left expand-right expt exptmod
+syn keyword tl_keyword contained extproc f$ f^ f^$
+syn keyword tl_keyword contained false fboundp ff0 ff1
+syn keyword tl_keyword contained ffdly fifth fileno filter-equal
+syn keyword tl_keyword contained filter-string-tree finalize find find-frame
+syn keyword tl_keyword contained find-if find-max find-min find-package
+syn keyword tl_keyword contained find-struct-type first fixnum-max fixnum-min
+syn keyword tl_keyword contained fixnump flatcar flatcar* flatten
+syn keyword tl_keyword contained flatten* flet flip flipargs
+syn keyword tl_keyword contained flo-dig flo-epsilon flo-int flo-max
+syn keyword tl_keyword contained flo-max-dig flo-min flo-str floatp
+syn keyword tl_keyword contained floor flush-stream flusho fmakunbound
+syn keyword tl_keyword contained fmt fnm-casefold fnm-leading-dir fnm-noescape
+syn keyword tl_keyword contained fnm-pathname fnm-period fnmatch for
+syn keyword tl_keyword contained for* force fork format
+syn keyword tl_keyword contained fourth from fstat ftw
+syn keyword tl_keyword contained ftw-actionretval ftw-chdir ftw-continue ftw-d
+syn keyword tl_keyword contained ftw-depth ftw-dnr ftw-dp ftw-f
+syn keyword tl_keyword contained ftw-mount ftw-ns ftw-phys ftw-skip-siblings
+syn keyword tl_keyword contained ftw-skip-subtree ftw-sl ftw-sln ftw-stop
+syn keyword tl_keyword contained fun func-get-env func-get-form func-get-name
+syn keyword tl_keyword contained func-set-env functionp gcd gen
+syn keyword tl_keyword contained generate gensym gequal get-byte
+syn keyword tl_keyword contained get-char get-clobber-expander get-delete-expander get-error
+syn keyword tl_keyword contained get-error-str get-frames get-hash-userdata get-indent
+syn keyword tl_keyword contained get-indent-mode get-line get-lines get-list-from-stream
+syn keyword tl_keyword contained get-sig-handler get-string get-string-from-stream get-update-expander
+syn keyword tl_keyword contained getaddrinfo getegid getenv geteuid
+syn keyword tl_keyword contained getgid getgrent getgrgid getgrnam
+syn keyword tl_keyword contained getgroups gethash getitimer getopts
+syn keyword tl_keyword contained getpid getppid getpwent getpwnam
+syn keyword tl_keyword contained getpwuid getresgid getresuid getuid
+syn keyword tl_keyword contained ginterate giterate glob glob-altdirfunc
+syn keyword tl_keyword contained glob-brace glob-err glob-mark glob-nocheck
+syn keyword tl_keyword contained glob-noescape glob-nomagic glob-nosort glob-onlydir
+syn keyword tl_keyword contained glob-period glob-tilde glob-tilde-check greater
+syn keyword tl_keyword contained group-by group-reduce gun handle
+syn keyword tl_keyword contained handler-bind hash hash-alist hash-begin
+syn keyword tl_keyword contained hash-construct hash-count hash-diff hash-eql
+syn keyword tl_keyword contained hash-equal hash-from-pairs hash-isec hash-keys
+syn keyword tl_keyword contained hash-list hash-next hash-pairs hash-proper-subset
+syn keyword tl_keyword contained hash-revget hash-subset hash-uni hash-update
+syn keyword tl_keyword contained hash-update-1 hash-userdata hash-values hashp
+syn keyword tl_keyword contained have html-decode html-encode html-encode*
+syn keyword tl_keyword contained hupcl iapply icanon icrnl
+syn keyword tl_keyword contained identity ido iexten if
+syn keyword tl_keyword contained ifa iff iffi iflet
+syn keyword tl_keyword contained ignbrk igncr ignerr ignpar
+syn keyword tl_keyword contained imaxbel in in6addr-any in6addr-loopback
+syn keyword tl_keyword contained inaddr-any inaddr-loopback inc inc-indent
+syn keyword tl_keyword contained indent-code indent-data indent-off inhash
+syn keyword tl_keyword contained inlcr inpck int-chr int-flo
+syn keyword tl_keyword contained int-str integerp intern interp-fun-p
+syn keyword tl_keyword contained interpose invoke-catch ip ipf
+syn keyword tl_keyword contained iread isig isqrt istrip
+syn keyword tl_keyword contained itimer-prov itimer-real itimer-virtual iuclc
+syn keyword tl_keyword contained iutf8 ixany ixoff ixon
+syn keyword tl_keyword contained juxt keep-if keep-if* keepq
+syn keyword tl_keyword contained keepql keepqual keyword-package keywordp
+syn keyword tl_keyword contained kill labels lambda last
+syn keyword tl_keyword contained lazy-str lazy-str-force lazy-str-force-upto lazy-str-get-trailing-list
+syn keyword tl_keyword contained lazy-stream-cons lazy-stringp lcm lcons
+syn keyword tl_keyword contained lcons-fun lconsp ldiff length
+syn keyword tl_keyword contained length-list length-str length-str-< length-str-<=
+syn keyword tl_keyword contained length-str-> length-str->= length-vec lequal
+syn keyword tl_keyword contained less let let* lexical-fun-p
+syn keyword tl_keyword contained lexical-lisp1-binding lexical-var-p lib-version link
+syn keyword tl_keyword contained lisp-parse list list* list-str
+syn keyword tl_keyword contained list-vec list-vector listp lnew
+syn keyword tl_keyword contained load log log-alert log-auth
+syn keyword tl_keyword contained log-authpriv log-cons log-crit log-daemon
+syn keyword tl_keyword contained log-debug log-emerg log-err log-info
+syn keyword tl_keyword contained log-ndelay log-notice log-nowait log-odelay
+syn keyword tl_keyword contained log-perror log-pid log-user log-warning
+syn keyword tl_keyword contained log10 log2 logand logior
+syn keyword tl_keyword contained lognot logtest logtrunc logxor
+syn keyword tl_keyword contained lset lstat m$ m^
+syn keyword tl_keyword contained m^$ mac-param-bind macro-ancestor macro-form-p
+syn keyword tl_keyword contained macro-time macroexpand macroexpand-1 macrolet
+syn keyword tl_keyword contained major make-catenated-stream make-env make-hash
+syn keyword tl_keyword contained make-lazy-cons make-lazy-struct make-like make-package
+syn keyword tl_keyword contained make-random-state make-similar-hash make-string-byte-input-stream make-string-input-stream
+syn keyword tl_keyword contained make-string-output-stream make-strlist-input-stream make-strlist-output-stream make-struct
+syn keyword tl_keyword contained make-struct-type make-sym make-time make-time-utc
+syn keyword tl_keyword contained make-trie makedev makunbound mapcar
+syn keyword tl_keyword contained mapcar* mapdo mapf maphash
+syn keyword tl_keyword contained mappend mappend* mask match-fun
+syn keyword tl_keyword contained match-regex match-regex-right match-regst match-regst-right
+syn keyword tl_keyword contained match-str match-str-tree max mboundp
+syn keyword tl_keyword contained member member-if memq memql
+syn keyword tl_keyword contained memqual merge meth method
+syn keyword tl_keyword contained min minor minusp mkdir
+syn keyword tl_keyword contained mknod mkstring mlet mmakunbound
+syn keyword tl_keyword contained mod multi multi-sort n-choose-k
+syn keyword tl_keyword contained n-perm-k nconc neq neql
+syn keyword tl_keyword contained nequal new nexpand-left nil
+syn keyword tl_keyword contained nilf ninth nl0 nl1
+syn keyword tl_keyword contained nldly noflsh none not
+syn keyword tl_keyword contained notf nreconc nreverse nthcdr
+syn keyword tl_keyword contained nthlast null nullify num-chr
+syn keyword tl_keyword contained num-str numberp oand obtain
+syn keyword tl_keyword contained obtain* obtain*-block obtain-block ocrnl
+syn keyword tl_keyword contained oddp ofdel ofill olcuc
+syn keyword tl_keyword contained onlcr onlret onocr op
+syn keyword tl_keyword contained open-command open-directory open-file open-fileno
+syn keyword tl_keyword contained open-files open-files* open-pipe open-process
+syn keyword tl_keyword contained open-socket open-socket-pair open-tail openlog
+syn keyword tl_keyword contained opip opost opt opthelp
 syn keyword tl_keyword contained or orf package-alist package-name
 syn keyword tl_keyword contained package-symbols packagep pad parenb
 syn keyword tl_keyword contained parmrk parodd partition partition*
@@ -303,59 +309,62 @@ syn keyword tl_keyword contained sig-tstp sig-ttin sig-ttou sig-urg
 syn keyword tl_keyword contained sig-usr1 sig-usr2 sig-vtalrm sig-winch
 syn keyword tl_keyword contained sig-xcpu sig-xfsz sign-extend sin
 syn keyword tl_keyword contained sixth size-vec slet slot
-syn keyword tl_keyword contained slotp slotset sock-accept sock-bind
-syn keyword tl_keyword contained sock-cloexec sock-connect sock-dgram sock-family
-syn keyword tl_keyword contained sock-listen sock-nonblock sock-peer sock-recv-timeout
-syn keyword tl_keyword contained sock-send-timeout sock-set-peer sock-shutdown sock-stream
-syn keyword tl_keyword contained sock-type some sort sort-group
-syn keyword tl_keyword contained source-loc source-loc-str span-str special-operator-p
-syn keyword tl_keyword contained special-var-p splice split split*
-syn keyword tl_keyword contained split-str split-str-set sqrt sssucc
-syn keyword tl_keyword contained ssucc stat static-slot static-slot-ensure
-syn keyword tl_keyword contained static-slot-p static-slot-set stdlib str-in6addr
-syn keyword tl_keyword contained str-in6addr-net str-inaddr str-inaddr-net str<
-syn keyword tl_keyword contained str<= str= str> str>=
-syn keyword tl_keyword contained stream-get-prop stream-set-prop streamp string-extend
-syn keyword tl_keyword contained string-lt stringp struct-type struct-type-p
-syn keyword tl_keyword contained structp sub sub-list sub-str
-syn keyword tl_keyword contained sub-vec subtypep succ super
-syn keyword tl_keyword contained super-method suspend swap symacrolet
-syn keyword tl_keyword contained symbol-function symbol-macro symbol-name symbol-package
-syn keyword tl_keyword contained symbol-value symbolp symlink sys:*lisp1*
-syn keyword tl_keyword contained sys:*pl-env* sys:abscond* sys:abscond-from sys:apply
-syn keyword tl_keyword contained sys:awk-expander sys:awk-let sys:awk-test sys:bad-slot-syntax
+syn keyword tl_keyword contained slotp slots slotset sock-accept
+syn keyword tl_keyword contained sock-bind sock-cloexec sock-connect sock-dgram
+syn keyword tl_keyword contained sock-family sock-listen sock-nonblock sock-peer
+syn keyword tl_keyword contained sock-recv-timeout sock-send-timeout sock-set-peer sock-shutdown
+syn keyword tl_keyword contained sock-stream sock-type some sort
+syn keyword tl_keyword contained sort-group source-loc source-loc-str span-str
+syn keyword tl_keyword contained special-operator-p special-var-p splice split
+syn keyword tl_keyword contained split* split-str split-str-set sqrt
+syn keyword tl_keyword contained sssucc ssucc stat static-slot
+syn keyword tl_keyword contained static-slot-ensure static-slot-p static-slot-set stdlib
+syn keyword tl_keyword contained str-in6addr str-in6addr-net str-inaddr str-inaddr-net
+syn keyword tl_keyword contained str< str<= str= str>
+syn keyword tl_keyword contained str>= stream-get-prop stream-set-prop streamp
+syn keyword tl_keyword contained string-extend string-lt stringp struct-type
+syn keyword tl_keyword contained struct-type-p structp sub sub-list
+syn keyword tl_keyword contained sub-str sub-vec subtypep succ
+syn keyword tl_keyword contained super super-method suspend swap
+syn keyword tl_keyword contained symacrolet symbol-function symbol-macro symbol-name
+syn keyword tl_keyword contained symbol-package symbol-value symbolp symlink
+syn keyword tl_keyword contained sys:*lisp1* sys:*pl-env* sys:*trace-hash* sys:*trace-level*
+syn keyword tl_keyword contained sys:abscond* sys:abscond-from sys:apply sys:awk-expander
+syn keyword tl_keyword contained sys:awk-let sys:awk-redir sys:awk-test sys:bad-slot-syntax
 syn keyword tl_keyword contained sys:capture-cont sys:circref sys:conv sys:conv-expand
 syn keyword tl_keyword contained sys:conv-let sys:cp-origin sys:defmeth sys:do-conv
 syn keyword tl_keyword contained sys:do-path-test sys:dwim-del sys:dwim-set sys:eval-err
 syn keyword tl_keyword contained sys:expand sys:expr sys:fbind sys:gc
-syn keyword tl_keyword contained sys:gc-set-delta sys:get-fb sys:get-mb sys:get-vb
+syn keyword tl_keyword contained sys:gc-set-delta sys:get-fun-getter-setter sys:get-mb sys:get-vb
 syn keyword tl_keyword contained sys:handle-bad-syntax sys:if-to-cond sys:in6addr-condensed-text sys:l1-setq
 syn keyword tl_keyword contained sys:l1-val sys:lbind sys:lisp1-setq sys:lisp1-value
 syn keyword tl_keyword contained sys:list-builder-macrolets sys:make-struct-lit sys:make-struct-type sys:mark-special
-syn keyword tl_keyword contained sys:obtain-impl sys:path-access sys:path-examine sys:path-test
-syn keyword tl_keyword contained sys:path-test-mode sys:pl-expand sys:placelet-1 sys:prune-missing-inits
-syn keyword tl_keyword contained sys:qquote sys:quasi sys:quasilist sys:r-s-let-expander
-syn keyword tl_keyword contained sys:reg-expand-nongreedy sys:reg-optimize sys:register-simple-accessor sys:rplaca
-syn keyword tl_keyword contained sys:rplacd sys:rslotset sys:set-hash-rec-limit sys:set-hash-str-limit
-syn keyword tl_keyword contained sys:set-macro-ancestor sys:setq sys:setqf sys:splice
-syn keyword tl_keyword contained sys:str-inaddr-net-impl sys:struct-lit sys:sym-clobber-expander sys:sym-delete-expander
-syn keyword tl_keyword contained sys:sym-update-expander sys:top-fb sys:top-mb sys:top-vb
-syn keyword tl_keyword contained sys:unquote sys:var sys:with-saved-vars syslog
-syn keyword tl_keyword contained system-package t tab0 tab1
-syn keyword tl_keyword contained tab2 tab3 tabdly take
-syn keyword tl_keyword contained take-until take-while tan tb
-syn keyword tl_keyword contained tc tcdrain tcflow tcflush
-syn keyword tl_keyword contained tcgetattr tciflush tcioff tcioflush
-syn keyword tl_keyword contained tcion tcoflush tcooff tcoon
-syn keyword tl_keyword contained tcsadrain tcsaflush tcsanow tcsendbreak
-syn keyword tl_keyword contained tcsetattr tenth test-clear test-dec
-syn keyword tl_keyword contained test-inc test-set test-set-indent-mode tf
-syn keyword tl_keyword contained third throw throwf time
-syn keyword tl_keyword contained time-fields-local time-fields-utc time-parse time-string-local
-syn keyword tl_keyword contained time-string-utc time-struct-local time-struct-utc time-usec
-syn keyword tl_keyword contained to tofloat tofloatz toint
-syn keyword tl_keyword contained tointz tok-str tok-where tostop
-syn keyword tl_keyword contained tostring tostringp tprint transpose
+syn keyword tl_keyword contained sys:obtain-impl sys:opt-dash sys:opt-err sys:path-access
+syn keyword tl_keyword contained sys:path-examine sys:path-test sys:path-test-mode sys:pl-expand
+syn keyword tl_keyword contained sys:placelet-1 sys:prune-missing-inits sys:qquote sys:quasi
+syn keyword tl_keyword contained sys:quasilist sys:r-s-let-expander sys:reg-expand-nongreedy sys:reg-optimize
+syn keyword tl_keyword contained sys:register-simple-accessor sys:rplaca sys:rplacd sys:rslotset
+syn keyword tl_keyword contained sys:set-hash-rec-limit sys:set-hash-str-limit sys:set-macro-ancestor sys:setq
+syn keyword tl_keyword contained sys:setqf sys:splice sys:str-inaddr-net-impl sys:struct-lit
+syn keyword tl_keyword contained sys:sym-clobber-expander sys:sym-delete-expander sys:sym-update-expander sys:top-fb
+syn keyword tl_keyword contained sys:top-mb sys:top-vb sys:trace sys:trace-enter
+syn keyword tl_keyword contained sys:trace-leave sys:unquote sys:untrace sys:var
+syn keyword tl_keyword contained sys:wdwrap sys:with-saved-vars syslog system-package
+syn keyword tl_keyword contained t tab0 tab1 tab2
+syn keyword tl_keyword contained tab3 tabdly take take-until
+syn keyword tl_keyword contained take-while tan tb tc
+syn keyword tl_keyword contained tcdrain tcflow tcflush tcgetattr
+syn keyword tl_keyword contained tciflush tcioff tcioflush tcion
+syn keyword tl_keyword contained tcoflush tcooff tcoon tcsadrain
+syn keyword tl_keyword contained tcsaflush tcsanow tcsendbreak tcsetattr
+syn keyword tl_keyword contained tenth test-clear test-dec test-inc
+syn keyword tl_keyword contained test-set test-set-indent-mode tf third
+syn keyword tl_keyword contained throw throwf time time-fields-local
+syn keyword tl_keyword contained time-fields-utc time-parse time-string-local time-string-utc
+syn keyword tl_keyword contained time-struct-local time-struct-utc time-usec to
+syn keyword tl_keyword contained tofloat tofloatz toint tointz
+syn keyword tl_keyword contained tok-str tok-where tostop tostring
+syn keyword tl_keyword contained tostringp tprint trace transpose
 syn keyword tl_keyword contained tree-bind tree-case tree-find trie-add
 syn keyword tl_keyword contained trie-compress trie-lookup-begin trie-lookup-feed-char trie-value-at
 syn keyword tl_keyword contained trim-str true trunc trunc-rem
@@ -365,27 +374,28 @@ syn keyword tl_keyword contained txr-when typecase typeof typep
 syn keyword tl_keyword contained umask umeth umethod uname
 syn keyword tl_keyword contained unget-byte unget-char uniq unique
 syn keyword tl_keyword contained unless unquote unsetenv until
-syn keyword tl_keyword contained until* unwind-protect upcase-str upd
-syn keyword tl_keyword contained update url-decode url-encode use
-syn keyword tl_keyword contained user-package usl usleep uslot
-syn keyword tl_keyword contained vdiscard vec vec-list vec-push
-syn keyword tl_keyword contained vec-set-length vecref vector vector-list
-syn keyword tl_keyword contained vectorp veof veol veol2
-syn keyword tl_keyword contained verase vintr vkill vlnext
-syn keyword tl_keyword contained vmin vquit vreprint vstart
-syn keyword tl_keyword contained vstop vsusp vswtc vt0
-syn keyword tl_keyword contained vt1 vtdly vtime vwerase
-syn keyword tl_keyword contained w-continued w-coredump w-exitstatus w-ifcontinued
-syn keyword tl_keyword contained w-ifexited w-ifsignaled w-ifstopped w-nohang
-syn keyword tl_keyword contained w-stopsig w-termsig w-untraced wait
-syn keyword tl_keyword contained weave when whenlet where
-syn keyword tl_keyword contained while while* whilet width
-syn keyword tl_keyword contained width-check window-map window-mappend with-clobber-expander
-syn keyword tl_keyword contained with-delete-expander with-gensyms with-hash-iter with-in-string-byte-stream
-syn keyword tl_keyword contained with-in-string-stream with-objects with-out-string-stream with-out-strlist-stream
-syn keyword tl_keyword contained with-resources with-slots with-stream with-update-expander
-syn keyword tl_keyword contained wrap wrap* xcase yield
-syn keyword tl_keyword contained yield-from zap zerop zip
+syn keyword tl_keyword contained until* untrace unwind-protect upcase-str
+syn keyword tl_keyword contained upd update url-decode url-encode
+syn keyword tl_keyword contained use user-package usl usleep
+syn keyword tl_keyword contained uslot vdiscard vec vec-list
+syn keyword tl_keyword contained vec-push vec-set-length vecref vector
+syn keyword tl_keyword contained vector-list vectorp veof veol
+syn keyword tl_keyword contained veol2 verase vintr vkill
+syn keyword tl_keyword contained vlnext vmin vquit vreprint
+syn keyword tl_keyword contained vstart vstop vsusp vswtc
+syn keyword tl_keyword contained vt0 vt1 vtdly vtime
+syn keyword tl_keyword contained vwerase w-continued w-coredump w-exitstatus
+syn keyword tl_keyword contained w-ifcontinued w-ifexited w-ifsignaled w-ifstopped
+syn keyword tl_keyword contained w-nohang w-stopsig w-termsig w-untraced
+syn keyword tl_keyword contained wait weave when whenlet
+syn keyword tl_keyword contained where while while* whilet
+syn keyword tl_keyword contained width width-check window-map window-mappend
+syn keyword tl_keyword contained with-clobber-expander with-delete-expander with-gensyms with-hash-iter
+syn keyword tl_keyword contained with-in-string-byte-stream with-in-string-stream with-objects with-out-string-stream
+syn keyword tl_keyword contained with-out-strlist-stream with-resources with-slots with-stream
+syn keyword tl_keyword contained with-update-expander wrap wrap* xcase
+syn keyword tl_keyword contained yield yield-from zap zerop
+syn keyword tl_keyword contained zip
 
 syn keyword txr_keyword contained accept all and assert
 syn keyword txr_keyword contained bind block call cases
@@ -504,4 +514,4 @@ hi def link txr_nested_error Error
 
 let b:current_syntax = "lisp"
 
-set lispwords=ado,alet,ap,append-each,append-each*,aret,awk,block,block*,build,caseq,caseql,casequal,catch,collect-each,collect-each*,compare-swap,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*,lset,mac-param-bind,macro-time,macrolet,mlet,obtain,obtain*,obtain*-block,obtain-block,op,pdec,pinc,placelet,placelet*,pop,pprof,prof,prog1,progn,push,pushnew,ret,return,return-from,rlet,rslot,slet,splice,suspend,symacrolet,sys:abscond-from,sys:awk-let,sys:conv,sys:expr,sys:fbind,sys:l1-val,sys:lbind,sys:lisp1-value,sys:path-examine,sys:path-test,sys:placelet-1,sys:splice,sys:struct-lit,sys:unquote,sys:var,sys:with-saved-vars,tb,tc,test-clear,test-dec,test-inc,test-set,tree-bind,tree-case,txr-case,txr-case-impl,txr-if,txr-when,typecase,unless,unquote,until,until*,unwind-protect,upd,when,whenlet,while,while*,whilet,with-clobber-expander,with-delete-expander,with-gensyms,with-hash-iter,with-in-string-byte-stream,with-in-string-stream,with-objects,with-out-string-stream,with-out-strlist-stream,with-resources,with-slots,with-stream,with-update-expander,yield,yield-from,zap,:method,:function,:init,:postinit,:fini
+set lispwords=ado,alet,ap,append-each,append-each*,aret,awk,block,block*,build,caseq,caseql,casequal,catch,collect-each,collect-each*,compare-swap,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*,lset,mac-param-bind,macro-time,macrolet,mlet,obtain,obtain*,obtain*-block,obtain-block,op,pdec,pinc,placelet,placelet*,pop,pprof,prof,prog1,progn,push,pushnew,ret,return,return-from,rlet,rslot,slet,splice,suspend,symacrolet,sys:abscond-from,sys:awk-let,sys:awk-redir,sys:conv,sys:expr,sys:fbind,sys:l1-val,sys:lbind,sys:lisp1-value,sys:path-examine,sys:path-test,sys:placelet-1,sys:splice,sys:struct-lit,sys:unquote,sys:var,sys:with-saved-vars,tb,tc,test-clear,test-dec,test-inc,test-set,trace,tree-bind,tree-case,txr-case,txr-case-impl,txr-if,txr-when,typecase,unless,unquote,until,until*,untrace,unwind-protect,upd,when,whenlet,while,while*,whilet,with-clobber-expander,with-delete-expander,with-gensyms,with-hash-iter,with-in-string-byte-stream,with-in-string-stream,with-objects,with-out-string-stream,with-out-strlist-stream,with-resources,with-slots,with-stream,with-update-expander,yield,yield-from,zap,:method,:function,:init,:postinit,:fini