Version 120.txr-120

* RELNOTES: Updated.

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

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

* txr.vim, tl.vim: Regenerated.

6 files changed, 430 insertions, 374 deletions

diff --git a/RELNOTES b/RELNOTES
index c3a45aaa..6426fc52 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,51 @@
+                                    TXR 120
+                                   2015-10-18
+
+
+  Features
+
+  - Structs:
+    - Finalizers (specified by :fini) are now registered early in the
+      object initialization (at a given inheritance level). This allows
+      finalizers to clean up abandoned initializations.
+    - If initialization of a struct is abandoned, the finalizers are invoked
+      immediately, as part of unwinding.
+    - New defmeth macro for defining methods outside of a defstruct.
+    - New static-slot-ensure function for adding a new static slot to
+      a struct (and its inheritance descendants).
+    - static-slot and static-slot-set can take struct type name in place of
+      struct type.
+  - New functions hash-begin and hash-next, for iterating hash table,
+    and with-hash-iter macro.
+  - Listener:
+    - TXR now launches listener if no arguments are given.
+  - Exceptions:
+    - New way of handling exceptions without unwinding: handler-bind and
+      handle operators.
+    - Introspection over exception frames: get-frames and find-frame
+      functions can inquire about frames, and invoke-catch can transfer
+      control to a chosen catch frame.
+  - New ~b conversion specifier in format function for printing integers
+    in binary.
+  - The typecase macro has been added, similar to Common Lisp's.
+  - Some functions have been renamed for consistency, but remain available
+    under old names: list-vector -> list-vec, vector-list -> vec->list,
+    chr-num -> chr-int, num-chr -> int-chr.
+  - The sh function isn't implemented using the C library function
+    system any more.
+
+  Bugs
+
+  - Fixed use of nonexistent functions in error handling cases
+    of defstruct macro.
+  - Fixed bug in the overflow check in the chk_grow_vec function,
+    used by string-extend, the get-line function of many stream types,
+    and string output streams.
+  - Fixed unterminated format argument list issue affecting interactive
+    listener. (Reproduced on Mac OS/X).
+
+
+
                                     TXR 119
                                    2015-10-10
 
diff --git a/configure b/configure
index 7be0b6cf..09054bdf 100755
--- a/configure
+++ b/configure
@@ -433,7 +433,7 @@ fi
 #
 
 
-txr_ver=119
+txr_ver=120
 
 #
 # The all important banner.
diff --git a/share/txr/stdlib/ver.tl b/share/txr/stdlib/ver.tl
index fb73f29b..ec1d2307 100644
--- a/share/txr/stdlib/ver.tl
+++ b/share/txr/stdlib/ver.tl
@@ -1,2 +1,2 @@
-(defvarl lib-version 119)
+(defvarl lib-version 120)
 (defvarl *lib-version* lib-version)
diff --git a/tl.vim b/tl.vim
index 70828b60..fdf344c6 100644
--- a/tl.vim
+++ b/tl.vim
@@ -80,47 +80,48 @@ syn keyword txl_keyword contained cddaar cddadar cddaddr cddadr
 syn keyword txl_keyword contained cddar cdddaar cdddadr cdddar
 syn keyword txl_keyword contained cddddar cdddddr cddddr cdddr
 syn keyword txl_keyword contained cddr cdr ceil chain
-syn keyword txl_keyword contained chand chdir chmod chr-isalnum
-syn keyword txl_keyword contained chr-isalpha chr-isascii chr-isblank chr-iscntrl
-syn keyword txl_keyword contained chr-isdigit chr-isgraph chr-islower chr-isprint
-syn keyword txl_keyword contained chr-ispunct chr-isspace chr-isunisp chr-isupper
-syn keyword txl_keyword contained chr-isxdigit chr-num chr-str chr-str-set
-syn keyword txl_keyword contained chr-tolower chr-toupper chrp clamp
-syn keyword txl_keyword contained clear-error clear-struct close-stream closelog
-syn keyword txl_keyword contained cmp-str collect-each collect-each* comb
-syn keyword txl_keyword contained compl-span-str cond conda cons
-syn keyword txl_keyword contained conses conses* consp constantp
-syn keyword txl_keyword contained copy copy-alist copy-cons copy-hash
-syn keyword txl_keyword contained copy-list copy-str copy-struct copy-vec
-syn keyword txl_keyword contained cos count-if countq countql
-syn keyword txl_keyword contained countqual cum-norm-dist daemon dec
-syn keyword txl_keyword contained defex define-modify-macro define-place-macro defmacro
-syn keyword txl_keyword contained defparm defparml defplace defstruct
-syn keyword txl_keyword contained defsymacro defun defvar defvarl
-syn keyword txl_keyword contained del delay delete-package display-width
-syn keyword txl_keyword contained do dohash dotimes downcase-str
-syn keyword txl_keyword contained drop drop-until drop-while dup
-syn keyword txl_keyword contained dupfd dwim each each*
-syn keyword txl_keyword contained eighth empty endgrent endpwent
-syn keyword txl_keyword contained ensure-dir env env-fbind env-hash
-syn keyword txl_keyword contained env-vbind eq eql equal
-syn keyword txl_keyword contained errno error eval evenp
-syn keyword txl_keyword contained exception-subtype-p exec exit exit*
-syn keyword txl_keyword contained exp expand-right expt exptmod
-syn keyword txl_keyword contained false fboundp fifth fileno
-syn keyword txl_keyword contained filter-equal filter-string-tree finalize find
-syn keyword txl_keyword contained find-if find-max find-min find-package
-syn keyword txl_keyword contained find-struct-type first fixnump flatcar
-syn keyword txl_keyword contained flatcar* flatten flatten* flet
-syn keyword txl_keyword contained flip flipargs flo-dig flo-epsilon
-syn keyword txl_keyword contained flo-int flo-max flo-min flo-str
-syn keyword txl_keyword contained floatp floor flush-stream fmakunbound
-syn keyword txl_keyword contained for for* force fork
-syn keyword txl_keyword contained format fourth fstat fun
-syn keyword txl_keyword contained func-get-env func-get-form func-get-name func-set-env
-syn keyword txl_keyword contained functionp gcd gen generate
-syn keyword txl_keyword contained gensym gequal get-byte get-char
-syn keyword txl_keyword contained get-clobber-expander get-delete-expander get-error get-error-str
+syn keyword txl_keyword contained chand chdir chmod chr-int
+syn keyword txl_keyword contained chr-isalnum chr-isalpha chr-isascii chr-isblank
+syn keyword txl_keyword contained chr-iscntrl chr-isdigit chr-isgraph chr-islower
+syn keyword txl_keyword contained chr-isprint chr-ispunct chr-isspace chr-isunisp
+syn keyword txl_keyword contained chr-isupper chr-isxdigit chr-num chr-str
+syn keyword txl_keyword contained chr-str-set chr-tolower chr-toupper chrp
+syn keyword txl_keyword contained clamp clear-error clear-struct close-stream
+syn keyword txl_keyword contained closelog cmp-str collect-each collect-each*
+syn keyword txl_keyword contained comb compl-span-str cond conda
+syn keyword txl_keyword contained cons conses conses* consp
+syn keyword txl_keyword contained constantp copy copy-alist copy-cons
+syn keyword txl_keyword contained copy-hash copy-list copy-str copy-struct
+syn keyword txl_keyword contained copy-vec cos count-if countq
+syn keyword txl_keyword contained countql countqual cum-norm-dist daemon
+syn keyword txl_keyword contained dec defex define-modify-macro define-place-macro
+syn keyword txl_keyword contained defmacro defmeth defparm defparml
+syn keyword txl_keyword contained defplace defstruct defsymacro defun
+syn keyword txl_keyword contained defvar defvarl del delay
+syn keyword txl_keyword contained delete-package display-width do dohash
+syn keyword txl_keyword contained dotimes downcase-str drop drop-until
+syn keyword txl_keyword contained drop-while dup dupfd dwim
+syn keyword txl_keyword contained each each* eighth empty
+syn keyword txl_keyword contained endgrent endpwent ensure-dir env
+syn keyword txl_keyword contained env-fbind env-hash env-vbind eq
+syn keyword txl_keyword contained eql equal errno error
+syn keyword txl_keyword contained eval evenp exception-subtype-p exec
+syn keyword txl_keyword contained exit exit* exp expand-right
+syn keyword txl_keyword contained expt exptmod false fboundp
+syn keyword txl_keyword contained fifth fileno filter-equal filter-string-tree
+syn keyword txl_keyword contained finalize find find-frame find-if
+syn keyword txl_keyword contained find-max find-min find-package find-struct-type
+syn keyword txl_keyword contained first fixnump flatcar flatcar*
+syn keyword txl_keyword contained flatten flatten* flet flip
+syn keyword txl_keyword contained flipargs flo-dig flo-epsilon flo-int
+syn keyword txl_keyword contained flo-max flo-min flo-str floatp
+syn keyword txl_keyword contained floor flush-stream fmakunbound for
+syn keyword txl_keyword contained for* force fork format
+syn keyword txl_keyword contained fourth fstat fun func-get-env
+syn keyword txl_keyword contained func-get-form func-get-name func-set-env functionp
+syn keyword txl_keyword contained gcd gen generate gensym
+syn keyword txl_keyword contained gequal get-byte get-char get-clobber-expander
+syn keyword txl_keyword contained get-delete-expander get-error get-error-str get-frames
 syn keyword txl_keyword contained get-hash-userdata get-indent get-indent-mode get-line
 syn keyword txl_keyword contained get-lines get-list-from-stream get-sig-handler get-string
 syn keyword txl_keyword contained get-string-from-stream get-update-expander getegid getenv
@@ -132,121 +133,123 @@ syn keyword txl_keyword contained glob glob-altdirfunc glob-brace glob-err
 syn keyword txl_keyword contained glob-mark glob-nocheck glob-noescape glob-nomagic
 syn keyword txl_keyword contained glob-nosort glob-onlydir glob-period glob-tilde
 syn keyword txl_keyword contained glob-tilde-check greater group-by gun
-syn keyword txl_keyword contained hash hash-alist hash-construct hash-count
-syn keyword txl_keyword contained hash-diff hash-eql hash-equal hash-from-pairs
-syn keyword txl_keyword contained hash-isec hash-keys hash-list hash-pairs
+syn keyword txl_keyword contained handle handler-bind hash hash-alist
+syn keyword txl_keyword contained hash-begin hash-construct hash-count hash-diff
+syn keyword txl_keyword contained hash-eql hash-equal hash-from-pairs hash-isec
+syn keyword txl_keyword contained hash-keys hash-list hash-next hash-pairs
 syn keyword txl_keyword contained hash-proper-subset hash-revget hash-subset hash-uni
 syn keyword txl_keyword contained hash-update hash-update-1 hash-values hashp
 syn keyword txl_keyword contained have html-decode html-encode iapply
 syn keyword txl_keyword contained identity ido if ifa
 syn keyword txl_keyword contained iff iffi iflet ignerr
 syn keyword txl_keyword contained in inc inc-indent indent-code
-syn keyword txl_keyword contained indent-data indent-off inhash int-flo
-syn keyword txl_keyword contained int-str integerp intern interp-fun-p
-syn keyword txl_keyword contained interpose ip ipf isqrt
-syn keyword txl_keyword contained itimer-prov itimer-real itimer-virtual juxt
-syn keyword txl_keyword contained keep-if keep-if* keyword-package keywordp
-syn keyword txl_keyword contained kill labels lambda last
-syn keyword txl_keyword contained lazy-str lazy-str-force lazy-str-force-upto lazy-str-get-trailing-list
-syn keyword txl_keyword contained lazy-stream-cons lazy-stringp lcm lcons
-syn keyword txl_keyword contained lcons-fun lconsp ldiff length
-syn keyword txl_keyword contained length-list length-str length-str-< length-str-<=
-syn keyword txl_keyword contained length-str-> length-str->= length-vec lequal
-syn keyword txl_keyword contained less let let* lexical-fun-p
-syn keyword txl_keyword contained lexical-lisp1-binding lexical-var-p lib-version link
-syn keyword txl_keyword contained lisp-parse list list* list-str
-syn keyword txl_keyword contained list-vector listp load log
-syn keyword txl_keyword contained log-alert log-auth log-authpriv log-cons
-syn keyword txl_keyword contained log-crit log-daemon log-debug log-emerg
-syn keyword txl_keyword contained log-err log-info log-ndelay log-notice
-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-like make-package
-syn keyword txl_keyword contained make-random-state make-similar-hash make-string-byte-input-stream make-string-input-stream
-syn keyword txl_keyword contained make-string-output-stream make-strlist-output-stream make-struct make-struct-type
-syn keyword txl_keyword contained make-sym make-time make-time-utc make-trie
-syn keyword txl_keyword contained makedev makunbound mapcar mapcar*
-syn keyword txl_keyword contained mapdo mapf maphash mappend
-syn keyword txl_keyword contained mappend* mask match-fun match-regex
-syn keyword txl_keyword contained match-regex-right match-regst match-regst-right match-str
-syn keyword txl_keyword contained match-str-tree max member member-if
-syn keyword txl_keyword contained memq memql memqual merge
-syn keyword txl_keyword contained meth method min minor
-syn keyword txl_keyword contained minusp mkdir mknod mkstring
-syn keyword txl_keyword contained mlet 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 nreverse nthcdr
-syn keyword txl_keyword contained null nullify num-chr num-str
-syn keyword txl_keyword contained numberp oand 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 rcomb read
-syn keyword txl_keyword contained readlink real-time-stream-p reduce-left reduce-right
-syn keyword txl_keyword contained ref refset regex-compile regex-parse
-syn keyword txl_keyword contained regexp register-exception-subtypes regsub rehome-sym
-syn keyword txl_keyword contained remhash remove-if remove-if* remove-path
-syn keyword txl_keyword contained remq remq* remql remql*
-syn keyword txl_keyword contained remqual remqual* rename-path repeat
-syn keyword txl_keyword contained replace replace-list replace-str replace-struct
-syn keyword txl_keyword contained replace-vec reset-struct rest ret
-syn keyword txl_keyword contained retf return return-from 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-p static-slot-set
+syn keyword txl_keyword contained indent-data indent-off inhash int-chr
+syn keyword txl_keyword contained int-flo int-str integerp intern
+syn keyword txl_keyword contained interp-fun-p interpose invoke-catch ip
+syn keyword txl_keyword contained ipf isqrt itimer-prov itimer-real
+syn keyword txl_keyword contained itimer-virtual juxt keep-if keep-if*
+syn keyword txl_keyword contained keyword-package keywordp kill labels
+syn keyword txl_keyword contained lambda last lazy-str lazy-str-force
+syn keyword txl_keyword contained lazy-str-force-upto lazy-str-get-trailing-list lazy-stream-cons lazy-stringp
+syn keyword txl_keyword contained lcm lcons lcons-fun lconsp
+syn keyword txl_keyword contained ldiff length length-list length-str
+syn keyword txl_keyword contained length-str-< length-str-<= length-str-> length-str->=
+syn keyword txl_keyword contained length-vec lequal less let
+syn keyword txl_keyword contained let* lexical-fun-p lexical-lisp1-binding lexical-var-p
+syn keyword txl_keyword contained lib-version link lisp-parse list
+syn keyword txl_keyword contained list* list-str list-vec list-vector
+syn keyword txl_keyword contained listp load log log-alert
+syn keyword txl_keyword contained log-auth log-authpriv log-cons log-crit
+syn keyword txl_keyword contained log-daemon log-debug log-emerg log-err
+syn keyword txl_keyword contained log-info log-ndelay log-notice log-nowait
+syn keyword txl_keyword contained log-odelay log-perror log-pid log-user
+syn keyword txl_keyword contained log-warning log10 log2 logand
+syn keyword txl_keyword contained logior lognot logtest logtrunc
+syn keyword txl_keyword contained logxor lstat mac-param-bind macro-form-p
+syn keyword txl_keyword contained macro-time macroexpand macroexpand-1 macrolet
+syn keyword txl_keyword contained major make-catenated-stream make-env make-hash
+syn keyword txl_keyword contained make-lazy-cons make-like make-package make-random-state
+syn keyword txl_keyword contained make-similar-hash make-string-byte-input-stream make-string-input-stream make-string-output-stream
+syn keyword txl_keyword contained make-strlist-output-stream make-struct make-struct-type make-sym
+syn keyword txl_keyword contained make-time make-time-utc make-trie makedev
+syn keyword txl_keyword contained makunbound mapcar mapcar* mapdo
+syn keyword txl_keyword contained mapf maphash mappend mappend*
+syn keyword txl_keyword contained mask match-fun match-regex match-regex-right
+syn keyword txl_keyword contained match-regst match-regst-right match-str match-str-tree
+syn keyword txl_keyword contained max 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 mod multi multi-sort n-choose-k
+syn keyword txl_keyword contained n-perm-k nconc new nil
+syn keyword txl_keyword contained nilf ninth none not
+syn keyword txl_keyword contained notf nreverse nthcdr null
+syn keyword txl_keyword contained nullify num-chr num-str numberp
+syn keyword txl_keyword contained oand 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 rcomb read readlink
+syn keyword txl_keyword contained real-time-stream-p reduce-left reduce-right ref
+syn keyword txl_keyword contained refset regex-compile regex-parse regexp
+syn keyword txl_keyword contained register-exception-subtypes regsub rehome-sym remhash
+syn keyword txl_keyword contained remove-if remove-if* remove-path remq
+syn keyword txl_keyword contained remq* remql remql* remqual
+syn keyword txl_keyword contained remqual* rename-path repeat replace
+syn keyword txl_keyword contained replace-list replace-str replace-struct replace-vec
+syn keyword txl_keyword contained reset-struct rest ret retf
+syn keyword txl_keyword contained return return-from 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
@@ -258,40 +261,41 @@ syn keyword txl_keyword contained symbol-value symbolp symlink sys:*lisp1*
 syn keyword txl_keyword contained sys:bad-slot-syntax sys:do-path-test sys:dwim-del sys:dwim-set
 syn keyword txl_keyword contained sys:eval-err sys:expand sys:expr sys:fbind
 syn keyword txl_keyword contained sys:gc sys:gc-set-delta sys:get-fb sys:get-vb
-syn keyword txl_keyword contained sys:l1-setq sys:l1-val sys:lbind sys:lisp1-setq
-syn keyword txl_keyword contained sys:lisp1-value sys:load sys:make-struct-type sys:mark-special
-syn keyword txl_keyword contained sys: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: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:trigger-load
-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 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 tuples txr-case
-syn keyword txl_keyword contained txr-case-impl txr-if txr-version txr-when
-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 usleep
-syn keyword txl_keyword contained vec vec-push vec-set-length vecref
-syn keyword txl_keyword contained vector vector-list vectorp w-continued
-syn keyword txl_keyword contained w-coredump w-exitstatus w-ifcontinued w-ifexited
-syn keyword txl_keyword contained w-ifsignaled w-ifstopped w-nohang w-stopsig
-syn keyword txl_keyword contained w-termsig w-untraced wait weave
-syn keyword txl_keyword contained when whenlet where while
-syn keyword txl_keyword contained while* whilet width width-check
-syn keyword txl_keyword contained with-clobber-expander with-delete-expander with-gensyms with-in-string-byte-stream
+syn keyword txl_keyword contained sys:handle-bad-syntax sys:l1-setq sys:l1-val sys:lbind
+syn keyword txl_keyword contained sys:lisp1-setq sys:lisp1-value sys:load sys:make-struct-type
+syn keyword txl_keyword contained sys:mark-special sys:path-access sys:path-examine sys:path-test
+syn keyword txl_keyword contained sys:path-test-mode sys:pl-expand sys:placelet-1 sys:prune-nil-inits
+syn keyword txl_keyword contained sys:qquote sys:quasi sys:quasilist sys:reg-expand-nongreedy
+syn keyword txl_keyword contained sys:reg-optimize sys: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:trigger-load sys:unquote sys:var sys:with-saved-vars
+syn keyword txl_keyword contained syslog system-package t take
+syn keyword txl_keyword contained take-until take-while tan tb
+syn keyword txl_keyword contained tc tenth test-set-indent-mode tf
+syn keyword txl_keyword contained third throw throwf time
+syn keyword txl_keyword contained time-fields-local time-fields-utc time-string-local time-string-utc
+syn keyword txl_keyword contained time-struct-local time-struct-utc time-usec 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 tuples
+syn keyword txl_keyword contained txr-case txr-case-impl txr-if txr-version
+syn keyword txl_keyword contained txr-when typecase typeof typep
+syn keyword txl_keyword contained umeth umethod unget-byte unget-char
+syn keyword txl_keyword contained uniq unique unless unquote
+syn keyword txl_keyword contained unsetenv until until* unwind-protect
+syn keyword txl_keyword contained upcase-str update url-decode url-encode
+syn keyword txl_keyword contained user-package usleep 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 with-clobber-expander
+syn keyword txl_keyword contained with-delete-expander with-gensyms with-hash-iter with-in-string-byte-stream
 syn keyword txl_keyword contained with-in-string-stream with-objects with-out-string-stream with-out-strlist-stream
 syn keyword txl_keyword contained with-resources with-stream with-update-expander wrap
 syn keyword txl_keyword contained wrap* zap zerop zip
@@ -385,4 +389,4 @@ hi def link txr_nested_error Error
 
 let b:current_syntax = "lisp"
 
-set lispwords=ado,ap,append-each,append-each*,aret,block,caseq,caseql,casequal,catch,collect-each,collect-each*,cond,conda,dec,defex,define-modify-macro,define-place-macro,defmacro,defparm,defparml,defplace,defstruct,defsymacro,defun,defvar,defvarl,del,delay,do,dohash,dotimes,each,each*,flet,flip,for,for*,fun,gen,gun,ido,if,ifa,iflet,ignerr,ip,labels,lambda,lcons,let,let*,load,mac-param-bind,macro-time,macrolet,meth,mlet,new,op,placelet,placelet*,pop,pprof,prof,prog1,progn,push,pushnew,ret,return,return-from,rlet,splice,symacrolet,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,umeth,unless,unquote,until,until*,unwind-protect,when,whenlet,while,while*,whilet,with-clobber-expander,with-delete-expander,with-gensyms,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,zap,:method,:function,:init,:fini
+set lispwords=ado,ap,append-each,append-each*,aret,block,caseq,caseql,casequal,catch,collect-each,collect-each*,cond,conda,dec,defex,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,meth,mlet,new,op,placelet,placelet*,pop,pprof,prof,prog1,progn,push,pushnew,ret,return,return-from,rlet,splice,symacrolet,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,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,zap,:method,:function,:init,:fini
diff --git a/txr.1 b/txr.1
index cebc9f46..3accb4ac 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-10-10 "Utility Commands" "TXR Data Processing Language" "Kaz Kylheku"
+.TH TXR 1 2015-10-18 "Utility Commands" "TXR Data Processing Language" "Kaz Kylheku"
 .SH* NAME
-\*(TX \- text processing language (version 119)
+\*(TX \- text processing language (version 120)
 .SH* SYNOPSIS
 .cblk
 .meti txr >> [ options ] < query-file < data-files ..
diff --git a/txr.vim b/txr.vim
index 884bef37..78a72938 100644
--- a/txr.vim
+++ b/txr.vim
@@ -80,47 +80,48 @@ syn keyword txl_keyword contained cddaar cddadar cddaddr cddadr
 syn keyword txl_keyword contained cddar cdddaar cdddadr cdddar
 syn keyword txl_keyword contained cddddar cdddddr cddddr cdddr
 syn keyword txl_keyword contained cddr cdr ceil chain
-syn keyword txl_keyword contained chand chdir chmod chr-isalnum
-syn keyword txl_keyword contained chr-isalpha chr-isascii chr-isblank chr-iscntrl
-syn keyword txl_keyword contained chr-isdigit chr-isgraph chr-islower chr-isprint
-syn keyword txl_keyword contained chr-ispunct chr-isspace chr-isunisp chr-isupper
-syn keyword txl_keyword contained chr-isxdigit chr-num chr-str chr-str-set
-syn keyword txl_keyword contained chr-tolower chr-toupper chrp clamp
-syn keyword txl_keyword contained clear-error clear-struct close-stream closelog
-syn keyword txl_keyword contained cmp-str collect-each collect-each* comb
-syn keyword txl_keyword contained compl-span-str cond conda cons
-syn keyword txl_keyword contained conses conses* consp constantp
-syn keyword txl_keyword contained copy copy-alist copy-cons copy-hash
-syn keyword txl_keyword contained copy-list copy-str copy-struct copy-vec
-syn keyword txl_keyword contained cos count-if countq countql
-syn keyword txl_keyword contained countqual cum-norm-dist daemon dec
-syn keyword txl_keyword contained defex define-modify-macro define-place-macro defmacro
-syn keyword txl_keyword contained defparm defparml defplace defstruct
-syn keyword txl_keyword contained defsymacro defun defvar defvarl
-syn keyword txl_keyword contained del delay delete-package display-width
-syn keyword txl_keyword contained do dohash dotimes downcase-str
-syn keyword txl_keyword contained drop drop-until drop-while dup
-syn keyword txl_keyword contained dupfd dwim each each*
-syn keyword txl_keyword contained eighth empty endgrent endpwent
-syn keyword txl_keyword contained ensure-dir env env-fbind env-hash
-syn keyword txl_keyword contained env-vbind eq eql equal
-syn keyword txl_keyword contained errno error eval evenp
-syn keyword txl_keyword contained exception-subtype-p exec exit exit*
-syn keyword txl_keyword contained exp expand-right expt exptmod
-syn keyword txl_keyword contained false fboundp fifth fileno
-syn keyword txl_keyword contained filter-equal filter-string-tree finalize find
-syn keyword txl_keyword contained find-if find-max find-min find-package
-syn keyword txl_keyword contained find-struct-type first fixnump flatcar
-syn keyword txl_keyword contained flatcar* flatten flatten* flet
-syn keyword txl_keyword contained flip flipargs flo-dig flo-epsilon
-syn keyword txl_keyword contained flo-int flo-max flo-min flo-str
-syn keyword txl_keyword contained floatp floor flush-stream fmakunbound
-syn keyword txl_keyword contained for for* force fork
-syn keyword txl_keyword contained format fourth fstat fun
-syn keyword txl_keyword contained func-get-env func-get-form func-get-name func-set-env
-syn keyword txl_keyword contained functionp gcd gen generate
-syn keyword txl_keyword contained gensym gequal get-byte get-char
-syn keyword txl_keyword contained get-clobber-expander get-delete-expander get-error get-error-str
+syn keyword txl_keyword contained chand chdir chmod chr-int
+syn keyword txl_keyword contained chr-isalnum chr-isalpha chr-isascii chr-isblank
+syn keyword txl_keyword contained chr-iscntrl chr-isdigit chr-isgraph chr-islower
+syn keyword txl_keyword contained chr-isprint chr-ispunct chr-isspace chr-isunisp
+syn keyword txl_keyword contained chr-isupper chr-isxdigit chr-num chr-str
+syn keyword txl_keyword contained chr-str-set chr-tolower chr-toupper chrp
+syn keyword txl_keyword contained clamp clear-error clear-struct close-stream
+syn keyword txl_keyword contained closelog cmp-str collect-each collect-each*
+syn keyword txl_keyword contained comb compl-span-str cond conda
+syn keyword txl_keyword contained cons conses conses* consp
+syn keyword txl_keyword contained constantp copy copy-alist copy-cons
+syn keyword txl_keyword contained copy-hash copy-list copy-str copy-struct
+syn keyword txl_keyword contained copy-vec cos count-if countq
+syn keyword txl_keyword contained countql countqual cum-norm-dist daemon
+syn keyword txl_keyword contained dec defex define-modify-macro define-place-macro
+syn keyword txl_keyword contained defmacro defmeth defparm defparml
+syn keyword txl_keyword contained defplace defstruct defsymacro defun
+syn keyword txl_keyword contained defvar defvarl del delay
+syn keyword txl_keyword contained delete-package display-width do dohash
+syn keyword txl_keyword contained dotimes downcase-str drop drop-until
+syn keyword txl_keyword contained drop-while dup dupfd dwim
+syn keyword txl_keyword contained each each* eighth empty
+syn keyword txl_keyword contained endgrent endpwent ensure-dir env
+syn keyword txl_keyword contained env-fbind env-hash env-vbind eq
+syn keyword txl_keyword contained eql equal errno error
+syn keyword txl_keyword contained eval evenp exception-subtype-p exec
+syn keyword txl_keyword contained exit exit* exp expand-right
+syn keyword txl_keyword contained expt exptmod false fboundp
+syn keyword txl_keyword contained fifth fileno filter-equal filter-string-tree
+syn keyword txl_keyword contained finalize find find-frame find-if
+syn keyword txl_keyword contained find-max find-min find-package find-struct-type
+syn keyword txl_keyword contained first fixnump flatcar flatcar*
+syn keyword txl_keyword contained flatten flatten* flet flip
+syn keyword txl_keyword contained flipargs flo-dig flo-epsilon flo-int
+syn keyword txl_keyword contained flo-max flo-min flo-str floatp
+syn keyword txl_keyword contained floor flush-stream fmakunbound for
+syn keyword txl_keyword contained for* force fork format
+syn keyword txl_keyword contained fourth fstat fun func-get-env
+syn keyword txl_keyword contained func-get-form func-get-name func-set-env functionp
+syn keyword txl_keyword contained gcd gen generate gensym
+syn keyword txl_keyword contained gequal get-byte get-char get-clobber-expander
+syn keyword txl_keyword contained get-delete-expander get-error get-error-str get-frames
 syn keyword txl_keyword contained get-hash-userdata get-indent get-indent-mode get-line
 syn keyword txl_keyword contained get-lines get-list-from-stream get-sig-handler get-string
 syn keyword txl_keyword contained get-string-from-stream get-update-expander getegid getenv
@@ -132,121 +133,123 @@ syn keyword txl_keyword contained glob glob-altdirfunc glob-brace glob-err
 syn keyword txl_keyword contained glob-mark glob-nocheck glob-noescape glob-nomagic
 syn keyword txl_keyword contained glob-nosort glob-onlydir glob-period glob-tilde
 syn keyword txl_keyword contained glob-tilde-check greater group-by gun
-syn keyword txl_keyword contained hash hash-alist hash-construct hash-count
-syn keyword txl_keyword contained hash-diff hash-eql hash-equal hash-from-pairs
-syn keyword txl_keyword contained hash-isec hash-keys hash-list hash-pairs
+syn keyword txl_keyword contained handle handler-bind hash hash-alist
+syn keyword txl_keyword contained hash-begin hash-construct hash-count hash-diff
+syn keyword txl_keyword contained hash-eql hash-equal hash-from-pairs hash-isec
+syn keyword txl_keyword contained hash-keys hash-list hash-next hash-pairs
 syn keyword txl_keyword contained hash-proper-subset hash-revget hash-subset hash-uni
 syn keyword txl_keyword contained hash-update hash-update-1 hash-values hashp
 syn keyword txl_keyword contained have html-decode html-encode iapply
 syn keyword txl_keyword contained identity ido if ifa
 syn keyword txl_keyword contained iff iffi iflet ignerr
 syn keyword txl_keyword contained in inc inc-indent indent-code
-syn keyword txl_keyword contained indent-data indent-off inhash int-flo
-syn keyword txl_keyword contained int-str integerp intern interp-fun-p
-syn keyword txl_keyword contained interpose ip ipf isqrt
-syn keyword txl_keyword contained itimer-prov itimer-real itimer-virtual juxt
-syn keyword txl_keyword contained keep-if keep-if* keyword-package keywordp
-syn keyword txl_keyword contained kill labels lambda last
-syn keyword txl_keyword contained lazy-str lazy-str-force lazy-str-force-upto lazy-str-get-trailing-list
-syn keyword txl_keyword contained lazy-stream-cons lazy-stringp lcm lcons
-syn keyword txl_keyword contained lcons-fun lconsp ldiff length
-syn keyword txl_keyword contained length-list length-str length-str-< length-str-<=
-syn keyword txl_keyword contained length-str-> length-str->= length-vec lequal
-syn keyword txl_keyword contained less let let* lexical-fun-p
-syn keyword txl_keyword contained lexical-lisp1-binding lexical-var-p lib-version link
-syn keyword txl_keyword contained lisp-parse list list* list-str
-syn keyword txl_keyword contained list-vector listp load log
-syn keyword txl_keyword contained log-alert log-auth log-authpriv log-cons
-syn keyword txl_keyword contained log-crit log-daemon log-debug log-emerg
-syn keyword txl_keyword contained log-err log-info log-ndelay log-notice
-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-like make-package
-syn keyword txl_keyword contained make-random-state make-similar-hash make-string-byte-input-stream make-string-input-stream
-syn keyword txl_keyword contained make-string-output-stream make-strlist-output-stream make-struct make-struct-type
-syn keyword txl_keyword contained make-sym make-time make-time-utc make-trie
-syn keyword txl_keyword contained makedev makunbound mapcar mapcar*
-syn keyword txl_keyword contained mapdo mapf maphash mappend
-syn keyword txl_keyword contained mappend* mask match-fun match-regex
-syn keyword txl_keyword contained match-regex-right match-regst match-regst-right match-str
-syn keyword txl_keyword contained match-str-tree max member member-if
-syn keyword txl_keyword contained memq memql memqual merge
-syn keyword txl_keyword contained meth method min minor
-syn keyword txl_keyword contained minusp mkdir mknod mkstring
-syn keyword txl_keyword contained mlet 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 nreverse nthcdr
-syn keyword txl_keyword contained null nullify num-chr num-str
-syn keyword txl_keyword contained numberp oand 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 rcomb read
-syn keyword txl_keyword contained readlink real-time-stream-p reduce-left reduce-right
-syn keyword txl_keyword contained ref refset regex-compile regex-parse
-syn keyword txl_keyword contained regexp register-exception-subtypes regsub rehome-sym
-syn keyword txl_keyword contained remhash remove-if remove-if* remove-path
-syn keyword txl_keyword contained remq remq* remql remql*
-syn keyword txl_keyword contained remqual remqual* rename-path repeat
-syn keyword txl_keyword contained replace replace-list replace-str replace-struct
-syn keyword txl_keyword contained replace-vec reset-struct rest ret
-syn keyword txl_keyword contained retf return return-from 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-p static-slot-set
+syn keyword txl_keyword contained indent-data indent-off inhash int-chr
+syn keyword txl_keyword contained int-flo int-str integerp intern
+syn keyword txl_keyword contained interp-fun-p interpose invoke-catch ip
+syn keyword txl_keyword contained ipf isqrt itimer-prov itimer-real
+syn keyword txl_keyword contained itimer-virtual juxt keep-if keep-if*
+syn keyword txl_keyword contained keyword-package keywordp kill labels
+syn keyword txl_keyword contained lambda last lazy-str lazy-str-force
+syn keyword txl_keyword contained lazy-str-force-upto lazy-str-get-trailing-list lazy-stream-cons lazy-stringp
+syn keyword txl_keyword contained lcm lcons lcons-fun lconsp
+syn keyword txl_keyword contained ldiff length length-list length-str
+syn keyword txl_keyword contained length-str-< length-str-<= length-str-> length-str->=
+syn keyword txl_keyword contained length-vec lequal less let
+syn keyword txl_keyword contained let* lexical-fun-p lexical-lisp1-binding lexical-var-p
+syn keyword txl_keyword contained lib-version link lisp-parse list
+syn keyword txl_keyword contained list* list-str list-vec list-vector
+syn keyword txl_keyword contained listp load log log-alert
+syn keyword txl_keyword contained log-auth log-authpriv log-cons log-crit
+syn keyword txl_keyword contained log-daemon log-debug log-emerg log-err
+syn keyword txl_keyword contained log-info log-ndelay log-notice log-nowait
+syn keyword txl_keyword contained log-odelay log-perror log-pid log-user
+syn keyword txl_keyword contained log-warning log10 log2 logand
+syn keyword txl_keyword contained logior lognot logtest logtrunc
+syn keyword txl_keyword contained logxor lstat mac-param-bind macro-form-p
+syn keyword txl_keyword contained macro-time macroexpand macroexpand-1 macrolet
+syn keyword txl_keyword contained major make-catenated-stream make-env make-hash
+syn keyword txl_keyword contained make-lazy-cons make-like make-package make-random-state
+syn keyword txl_keyword contained make-similar-hash make-string-byte-input-stream make-string-input-stream make-string-output-stream
+syn keyword txl_keyword contained make-strlist-output-stream make-struct make-struct-type make-sym
+syn keyword txl_keyword contained make-time make-time-utc make-trie makedev
+syn keyword txl_keyword contained makunbound mapcar mapcar* mapdo
+syn keyword txl_keyword contained mapf maphash mappend mappend*
+syn keyword txl_keyword contained mask match-fun match-regex match-regex-right
+syn keyword txl_keyword contained match-regst match-regst-right match-str match-str-tree
+syn keyword txl_keyword contained max 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 mod multi multi-sort n-choose-k
+syn keyword txl_keyword contained n-perm-k nconc new nil
+syn keyword txl_keyword contained nilf ninth none not
+syn keyword txl_keyword contained notf nreverse nthcdr null
+syn keyword txl_keyword contained nullify num-chr num-str numberp
+syn keyword txl_keyword contained oand 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 rcomb read readlink
+syn keyword txl_keyword contained real-time-stream-p reduce-left reduce-right ref
+syn keyword txl_keyword contained refset regex-compile regex-parse regexp
+syn keyword txl_keyword contained register-exception-subtypes regsub rehome-sym remhash
+syn keyword txl_keyword contained remove-if remove-if* remove-path remq
+syn keyword txl_keyword contained remq* remql remql* remqual
+syn keyword txl_keyword contained remqual* rename-path repeat replace
+syn keyword txl_keyword contained replace-list replace-str replace-struct replace-vec
+syn keyword txl_keyword contained reset-struct rest ret retf
+syn keyword txl_keyword contained return return-from 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
@@ -258,40 +261,41 @@ syn keyword txl_keyword contained symbol-value symbolp symlink sys:*lisp1*
 syn keyword txl_keyword contained sys:bad-slot-syntax sys:do-path-test sys:dwim-del sys:dwim-set
 syn keyword txl_keyword contained sys:eval-err sys:expand sys:expr sys:fbind
 syn keyword txl_keyword contained sys:gc sys:gc-set-delta sys:get-fb sys:get-vb
-syn keyword txl_keyword contained sys:l1-setq sys:l1-val sys:lbind sys:lisp1-setq
-syn keyword txl_keyword contained sys:lisp1-value sys:load sys:make-struct-type sys:mark-special
-syn keyword txl_keyword contained sys: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: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:trigger-load
-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 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 tuples txr-case
-syn keyword txl_keyword contained txr-case-impl txr-if txr-version txr-when
-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 usleep
-syn keyword txl_keyword contained vec vec-push vec-set-length vecref
-syn keyword txl_keyword contained vector vector-list vectorp w-continued
-syn keyword txl_keyword contained w-coredump w-exitstatus w-ifcontinued w-ifexited
-syn keyword txl_keyword contained w-ifsignaled w-ifstopped w-nohang w-stopsig
-syn keyword txl_keyword contained w-termsig w-untraced wait weave
-syn keyword txl_keyword contained when whenlet where while
-syn keyword txl_keyword contained while* whilet width width-check
-syn keyword txl_keyword contained with-clobber-expander with-delete-expander with-gensyms with-in-string-byte-stream
+syn keyword txl_keyword contained sys:handle-bad-syntax sys:l1-setq sys:l1-val sys:lbind
+syn keyword txl_keyword contained sys:lisp1-setq sys:lisp1-value sys:load sys:make-struct-type
+syn keyword txl_keyword contained sys:mark-special sys:path-access sys:path-examine sys:path-test
+syn keyword txl_keyword contained sys:path-test-mode sys:pl-expand sys:placelet-1 sys:prune-nil-inits
+syn keyword txl_keyword contained sys:qquote sys:quasi sys:quasilist sys:reg-expand-nongreedy
+syn keyword txl_keyword contained sys:reg-optimize sys: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:trigger-load sys:unquote sys:var sys:with-saved-vars
+syn keyword txl_keyword contained syslog system-package t take
+syn keyword txl_keyword contained take-until take-while tan tb
+syn keyword txl_keyword contained tc tenth test-set-indent-mode tf
+syn keyword txl_keyword contained third throw throwf time
+syn keyword txl_keyword contained time-fields-local time-fields-utc time-string-local time-string-utc
+syn keyword txl_keyword contained time-struct-local time-struct-utc time-usec 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 tuples
+syn keyword txl_keyword contained txr-case txr-case-impl txr-if txr-version
+syn keyword txl_keyword contained txr-when typecase typeof typep
+syn keyword txl_keyword contained umeth umethod unget-byte unget-char
+syn keyword txl_keyword contained uniq unique unless unquote
+syn keyword txl_keyword contained unsetenv until until* unwind-protect
+syn keyword txl_keyword contained upcase-str update url-decode url-encode
+syn keyword txl_keyword contained user-package usleep 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 with-clobber-expander
+syn keyword txl_keyword contained with-delete-expander with-gensyms with-hash-iter with-in-string-byte-stream
 syn keyword txl_keyword contained with-in-string-stream with-objects with-out-string-stream with-out-strlist-stream
 syn keyword txl_keyword contained with-resources with-stream with-update-expander wrap
 syn keyword txl_keyword contained wrap* zap zerop zip
@@ -411,4 +415,4 @@ hi def link txr_nested_error Error
 
 let b:current_syntax = "lisp"
 
-set lispwords=ado,ap,append-each,append-each*,aret,block,caseq,caseql,casequal,catch,collect-each,collect-each*,cond,conda,dec,defex,define-modify-macro,define-place-macro,defmacro,defparm,defparml,defplace,defstruct,defsymacro,defun,defvar,defvarl,del,delay,do,dohash,dotimes,each,each*,flet,flip,for,for*,fun,gen,gun,ido,if,ifa,iflet,ignerr,ip,labels,lambda,lcons,let,let*,load,mac-param-bind,macro-time,macrolet,meth,mlet,new,op,placelet,placelet*,pop,pprof,prof,prog1,progn,push,pushnew,ret,return,return-from,rlet,splice,symacrolet,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,umeth,unless,unquote,until,until*,unwind-protect,when,whenlet,while,while*,whilet,with-clobber-expander,with-delete-expander,with-gensyms,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,zap,:method,:function,:init,:fini
+set lispwords=ado,ap,append-each,append-each*,aret,block,caseq,caseql,casequal,catch,collect-each,collect-each*,cond,conda,dec,defex,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,meth,mlet,new,op,placelet,placelet*,pop,pprof,prof,prog1,progn,push,pushnew,ret,return,return-from,rlet,splice,symacrolet,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,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,zap,:method,:function,:init,:fini