Version 125.txr-125

* RELNOTES: Updated.

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

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

* txr.vim, tl.vim: Regenerated.

6 files changed, 436 insertions, 382 deletions

diff --git a/RELNOTES b/RELNOTES
index e6ce501d..8ffc68f3 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,51 @@
+                                    TXR 125
+                                   2015-11-20
+
+
+  Features
+
+  - OOP improvements:
+    - New uslot function and usl macro for functional indirection
+      on struct slots.
+    - New functors feature: define a lambda method for struct types
+      which lets structs be invokd as function.
+    - Lazy structs feature:
+      - New lnew macro (and make-lazy-struct function) for lazily
+        instantiating a new structure.
+      - Self-referential, and mutually referential structures can
+        be instantiated in one step using the existing mlet and
+        lnew.
+    - New Equality Substitution feature:
+      - An equal method defined on a struct type allows objects to
+        to be compared with equal or less, and to be hashed with hash-equal
+        (and thus :equal-based hash tables).
+      - The method simply returns an object which is used in place of
+        the struct for the purpose of the comparison or hash.
+  - TXR Extraction Language:
+    - @(rep) now available as shorthand for @(coll :vars nil)
+    - In @(next source), source can be a Lisp expression without leading @.
+    - :to_html and :from_html filters now called :tohml and :fromhtml;
+      old names will continue to work.
+    - :tohtml filter now also translates ' (ASCII 39 apostrophe) to '.
+    - New :tohtml* filter, leaves quotes alone.
+  - New butlast function.
+  - New html-encode* function.
+  - The last function is generic now, applying to strings and vectors.
+  - New TXR_COMPAT environment variable, alternative to -C option.
+
+  Bugs
+
+  - Fixed missing autoload registration for meth, umeth and defmeth symbols.
+  - Fixed spurious retention issues in various library functions like
+    mapdo, preventing them from processing lazy lists in constant memory.
+  - Fixed type hole in the equal function, which treated two COBJ objects of
+    different types using a comparison function which assumes they are both
+    of the same type.
+  - Fixed buggy less function, which was comparing and ranking objects that
+    should not be comparable according to the documentation.
+
+
+
                                     TXR 124
                                    2015-11-14
 
diff --git a/configure b/configure
index 6306b21b..682b69ac 100755
--- a/configure
+++ b/configure
@@ -434,7 +434,7 @@ fi
 #
 
 
-txr_ver=124
+txr_ver=125
 
 #
 # The all important banner.
diff --git a/share/txr/stdlib/ver.tl b/share/txr/stdlib/ver.tl
index 28df8955..01357eaa 100644
--- a/share/txr/stdlib/ver.tl
+++ b/share/txr/stdlib/ver.tl
@@ -1,2 +1,2 @@
-(defvarl lib-version 124)
+(defvarl lib-version 125)
 (defvarl *lib-version* lib-version)
diff --git a/tl.vim b/tl.vim
index ecdc1101..409f77e5 100644
--- a/tl.vim
+++ b/tl.vim
@@ -37,30 +37,31 @@ syn keyword txl_keyword contained :cword-char :decline :dev :digit
 syn keyword txl_keyword contained :downcase :env :equal-based :fd
 syn keyword txl_keyword contained :filter :fini :finish :form
 syn keyword txl_keyword contained :from-current :from-end :from-start :from_html
-syn keyword txl_keyword contained :frompercent :fromurl :fun :function
-syn keyword txl_keyword contained :gap :gid :greedy :hextoint
-syn keyword txl_keyword contained :init :ino :instance :into
-syn keyword txl_keyword contained :lfilt :lines :list :longest
-syn keyword txl_keyword contained :maxgap :maxtimes :method :mingap
-syn keyword txl_keyword contained :mintimes :mode :mtime :name
-syn keyword txl_keyword contained :named :next-spec :nlink :nothrow
-syn keyword txl_keyword contained :prio :rdev :real-time :repeat-spec
-syn keyword txl_keyword contained :resolve :rfilt :shortest :size
-syn keyword txl_keyword contained :space :static :string :symacro
-syn keyword txl_keyword contained :times :to_html :tofloat :toint
-syn keyword txl_keyword contained :tonumber :topercent :tourl :uid
-syn keyword txl_keyword contained :upcase :var :vars :weak-keys
-syn keyword txl_keyword contained :weak-vals :whole :word-char <
-syn keyword txl_keyword contained <= = > >=
-syn keyword txl_keyword contained abort abs abs-path-p acons
-syn keyword txl_keyword contained acons-new aconsql-new acos ado
-syn keyword txl_keyword contained alist-nremove alist-remove all and
-syn keyword txl_keyword contained andf ap apf append
-syn keyword txl_keyword contained append* append-each append-each* apply
-syn keyword txl_keyword contained aret ash asin assoc
-syn keyword txl_keyword contained assql atan atan2 atom
-syn keyword txl_keyword contained bignump bindable bit block
-syn keyword txl_keyword contained block* boundp break-str caaaaar
+syn keyword txl_keyword contained :fromhtml :frompercent :fromurl :fun
+syn keyword txl_keyword contained :function :gap :gid :greedy
+syn keyword txl_keyword contained :hextoint :init :ino :instance
+syn keyword txl_keyword contained :into :lfilt :lines :list
+syn keyword txl_keyword contained :longest :maxgap :maxtimes :method
+syn keyword txl_keyword contained :mingap :mintimes :mode :mtime
+syn keyword txl_keyword contained :name :named :next-spec :nlink
+syn keyword txl_keyword contained :nothrow :prio :rdev :real-time
+syn keyword txl_keyword contained :repeat-spec :resolve :rfilt :shortest
+syn keyword txl_keyword contained :size :space :static :string
+syn keyword txl_keyword contained :symacro :times :to_html :tofloat
+syn keyword txl_keyword contained :tohtml :tohtml* :toint :tonumber
+syn keyword txl_keyword contained :topercent :tourl :uid :upcase
+syn keyword txl_keyword contained :var :vars :weak-keys :weak-vals
+syn keyword txl_keyword contained :whole :word-char < <=
+syn keyword txl_keyword contained = > >= abort
+syn keyword txl_keyword contained abs abs-path-p acons acons-new
+syn keyword txl_keyword contained aconsql-new acos ado alist-nremove
+syn keyword txl_keyword contained alist-remove all and andf
+syn keyword txl_keyword contained ap apf append append*
+syn keyword txl_keyword contained append-each append-each* apply aret
+syn keyword txl_keyword contained ash asin assoc assql
+syn keyword txl_keyword contained atan atan2 atom bignump
+syn keyword txl_keyword contained bindable bit block block*
+syn keyword txl_keyword contained boundp break-str butlast caaaaar
 syn keyword txl_keyword contained caaaadr caaaar caaadar caaaddr
 syn keyword txl_keyword contained caaadr caaar caadaar caadadr
 syn keyword txl_keyword contained caadar caaddar caadddr caaddr
@@ -141,170 +142,172 @@ syn keyword txl_keyword contained hash-equal hash-from-pairs hash-isec hash-keys
 syn keyword txl_keyword contained hash-list hash-next hash-pairs hash-proper-subset
 syn keyword txl_keyword contained hash-revget hash-subset hash-uni hash-update
 syn keyword txl_keyword contained hash-update-1 hash-values hashp have
-syn keyword txl_keyword contained html-decode html-encode iapply identity
-syn keyword txl_keyword contained ido if ifa iff
-syn keyword txl_keyword contained iffi iflet ignerr in
-syn keyword txl_keyword contained inc inc-indent indent-code indent-data
-syn keyword txl_keyword contained indent-off inhash int-chr int-flo
-syn keyword txl_keyword contained int-str integerp intern interp-fun-p
-syn keyword txl_keyword contained interpose invoke-catch ip ipf
-syn keyword txl_keyword contained iread 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 nreconc nreverse nthcdr
-syn keyword txl_keyword contained null nullify num-chr num-str
-syn keyword txl_keyword contained numberp oand obtain obtain-block
-syn keyword txl_keyword contained oddp op open-command open-directory
-syn keyword txl_keyword contained open-file open-fileno open-files open-files*
-syn keyword txl_keyword contained open-pipe open-process open-tail openlog
-syn keyword txl_keyword contained opip or orf package-alist
-syn keyword txl_keyword contained package-name package-symbols packagep pad
-syn keyword txl_keyword contained partition partition* partition-by path-blkdev-p
-syn keyword txl_keyword contained path-chrdev-p path-dir-p path-executable-to-me-p path-exists-p
-syn keyword txl_keyword contained path-file-p path-mine-p path-my-group-p path-newer
-syn keyword txl_keyword contained path-older path-pipe-p path-private-to-me-p path-same-object
-syn keyword txl_keyword contained path-setgid-p path-setuid-p path-sock-p path-sticky-p
-syn keyword txl_keyword contained path-symlink-p path-writable-to-me-p perm pipe
-syn keyword txl_keyword contained place-form-p placelet placelet* plusp
-syn keyword txl_keyword contained poll poll-err poll-in poll-nval
-syn keyword txl_keyword contained poll-out poll-pri poll-rdband poll-wrband
-syn keyword txl_keyword contained pop pos pos-if pos-max
-syn keyword txl_keyword contained pos-min posq posql posqual
-syn keyword txl_keyword contained pppred ppred pprinl pprint
-syn keyword txl_keyword contained pprof pred prinl print
-syn keyword txl_keyword contained prof prog1 progn promisep
-syn keyword txl_keyword contained prop proper-listp pset push
-syn keyword txl_keyword contained pushhash pushnew put-byte put-char
-syn keyword txl_keyword contained put-line put-lines put-string put-strings
-syn keyword txl_keyword contained pwd qquote qref quote
-syn keyword txl_keyword contained raise rand random random-fixnum
-syn keyword txl_keyword contained random-state-p range range* range-regex
-syn keyword txl_keyword contained rangep rcomb rcons 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* return-from
-syn keyword txl_keyword contained revappend reverse rlcp rlet
-syn keyword txl_keyword contained rotate rperm rplaca rplacd
-syn keyword txl_keyword contained run s-ifblk s-ifchr s-ifdir
-syn keyword txl_keyword contained s-ififo s-iflnk s-ifmt s-ifreg
-syn keyword txl_keyword contained s-ifsock s-irgrp s-iroth s-irusr
-syn keyword txl_keyword contained s-irwxg s-irwxo s-irwxu s-isgid
-syn keyword txl_keyword contained s-isuid s-isvtx s-iwgrp s-iwoth
-syn keyword txl_keyword contained s-iwusr s-ixgrp s-ixoth s-ixusr
-syn keyword txl_keyword contained search search-regex search-regst search-str
-syn keyword txl_keyword contained search-str-tree second seek-stream select
-syn keyword txl_keyword contained self-path seqp set set-diff
-syn keyword txl_keyword contained set-hash-userdata set-indent set-indent-mode set-sig-handler
-syn keyword txl_keyword contained setegid setenv seteuid setgid
-syn keyword txl_keyword contained setgrent sethash setitimer setlogmask
-syn keyword txl_keyword contained setpwent setuid seventh sh
-syn keyword txl_keyword contained shift shuffle sig-abrt sig-alrm
-syn keyword txl_keyword contained sig-bus sig-check sig-chld sig-cont
-syn keyword txl_keyword contained sig-fpe sig-hup sig-ill sig-int
-syn keyword txl_keyword contained sig-io sig-iot sig-kill sig-pipe
-syn keyword txl_keyword contained sig-poll sig-prof sig-pwr sig-quit
-syn keyword txl_keyword contained sig-segv sig-stkflt sig-stop sig-sys
-syn keyword txl_keyword contained sig-term sig-trap sig-tstp sig-ttin
-syn keyword txl_keyword contained sig-ttou sig-urg sig-usr1 sig-usr2
-syn keyword txl_keyword contained sig-vtalrm sig-winch sig-xcpu sig-xfsz
-syn keyword txl_keyword contained sign-extend sin sixth size-vec
-syn keyword txl_keyword contained slot slotp slotset some
-syn keyword txl_keyword contained sort sort-group source-loc source-loc-str
-syn keyword txl_keyword contained span-str special-operator-p special-var-p splice
-syn keyword txl_keyword contained split split-str split-str-set sqrt
-syn keyword txl_keyword contained sssucc ssucc stat static-slot
-syn keyword txl_keyword contained static-slot-ensure static-slot-p static-slot-set stdlib
-syn keyword txl_keyword contained str< str<= str= str>
-syn keyword txl_keyword contained str>= stream-get-prop stream-set-prop streamp
-syn keyword txl_keyword contained string-extend string-lt stringp struct-type
-syn keyword txl_keyword contained struct-type-p structp sub sub-list
-syn keyword txl_keyword contained sub-str sub-vec subtypep succ
-syn keyword txl_keyword contained super super-method suspend swap
-syn keyword txl_keyword contained symacrolet symbol-function symbol-name symbol-package
-syn keyword txl_keyword contained symbol-value symbolp symlink sys:*lisp1*
-syn keyword txl_keyword contained sys:abscond* sys:abscond-from sys:bad-slot-syntax sys:capture-cont
-syn keyword txl_keyword contained sys:do-path-test sys:dwim-del sys:dwim-set sys:eval-err
-syn keyword txl_keyword contained sys:expand sys:expr sys:fbind sys:gc
-syn keyword txl_keyword contained sys:gc-set-delta sys:get-fb sys:get-vb sys:handle-bad-syntax
-syn keyword txl_keyword contained sys:l1-setq sys:l1-val sys:lbind sys:lisp1-setq
-syn keyword txl_keyword contained sys:lisp1-value sys:load sys:make-struct-type sys:mark-special
-syn keyword txl_keyword contained sys:obtain-impl sys:path-access sys:path-examine sys:path-test
-syn keyword txl_keyword contained sys:path-test-mode sys:pl-expand sys:placelet-1 sys:prune-nil-inits
-syn keyword txl_keyword contained sys:qquote sys:quasi sys:quasilist sys:reg-expand-nongreedy
-syn keyword txl_keyword contained sys:reg-optimize sys:rplaca sys:rplacd sys:setq
-syn keyword txl_keyword contained sys:setqf sys:splice sys:struct-lit sys:sym-clobber-expander
-syn keyword txl_keyword contained sys:sym-delete-expander sys:sym-update-expander sys:top-fb sys:top-vb
-syn keyword txl_keyword contained sys:unquote sys:var sys:with-saved-vars syslog
-syn keyword txl_keyword contained system-package t take take-until
-syn keyword txl_keyword contained take-while tan tb tc
-syn keyword txl_keyword contained tenth test-set-indent-mode tf third
-syn keyword txl_keyword contained throw throwf time time-fields-local
-syn keyword txl_keyword contained time-fields-utc time-string-local time-string-utc time-struct-local
-syn keyword txl_keyword contained time-struct-utc time-usec to tofloat
-syn keyword txl_keyword contained toint tok-str tok-where tostring
-syn keyword txl_keyword contained tostringp tprint transpose tree-bind
-syn keyword txl_keyword contained tree-case tree-find trie-add trie-compress
-syn keyword txl_keyword contained trie-lookup-begin trie-lookup-feed-char trie-value-at trim-str
-syn keyword txl_keyword contained true trunc trunc-rem truncate-stream
-syn keyword txl_keyword contained tuples txr-case txr-case-impl txr-if
-syn keyword txl_keyword contained txr-sym txr-version txr-when typecase
-syn keyword txl_keyword contained typeof typep umeth umethod
-syn keyword txl_keyword contained unget-byte unget-char uniq unique
-syn keyword txl_keyword contained unless unquote unsetenv until
-syn keyword txl_keyword contained until* unwind-protect upcase-str update
-syn keyword txl_keyword contained url-decode url-encode user-package usleep
-syn keyword txl_keyword contained vec vec-list vec-push vec-set-length
-syn keyword txl_keyword contained vecref vector vector-list vectorp
-syn keyword txl_keyword contained w-continued w-coredump w-exitstatus w-ifcontinued
-syn keyword txl_keyword contained w-ifexited w-ifsignaled w-ifstopped w-nohang
-syn keyword txl_keyword contained w-stopsig w-termsig w-untraced wait
-syn keyword txl_keyword contained weave when whenlet where
-syn keyword txl_keyword contained while while* whilet width
-syn keyword txl_keyword contained width-check with-clobber-expander with-delete-expander with-gensyms
-syn keyword txl_keyword contained with-hash-iter with-in-string-byte-stream with-in-string-stream with-objects
-syn keyword txl_keyword contained with-out-string-stream with-out-strlist-stream with-resources with-stream
-syn keyword txl_keyword contained with-update-expander wrap wrap* yield
-syn keyword txl_keyword contained yield-from zap zerop zip
+syn keyword txl_keyword contained html-decode html-encode 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-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 iread isqrt itimer-prov
+syn keyword txl_keyword contained itimer-real itimer-virtual juxt keep-if
+syn keyword txl_keyword contained keep-if* keyword-package keywordp kill
+syn keyword txl_keyword contained labels lambda last lazy-str
+syn keyword txl_keyword contained lazy-str-force lazy-str-force-upto lazy-str-get-trailing-list lazy-stream-cons
+syn keyword txl_keyword contained lazy-stringp lcm lcons lcons-fun
+syn keyword txl_keyword contained lconsp ldiff length length-list
+syn keyword txl_keyword contained length-str length-str-< length-str-<= length-str->
+syn keyword txl_keyword contained length-str->= length-vec lequal less
+syn keyword txl_keyword contained let let* lexical-fun-p lexical-lisp1-binding
+syn keyword txl_keyword contained lexical-var-p lib-version link lisp-parse
+syn keyword txl_keyword contained list list* list-str list-vec
+syn keyword txl_keyword contained list-vector listp lnew load
+syn keyword txl_keyword contained log log-alert log-auth log-authpriv
+syn keyword txl_keyword contained log-cons log-crit log-daemon log-debug
+syn keyword txl_keyword contained log-emerg log-err log-info log-ndelay
+syn keyword txl_keyword contained log-notice log-nowait log-odelay log-perror
+syn keyword txl_keyword contained log-pid log-user log-warning log10
+syn keyword txl_keyword contained log2 logand logior lognot
+syn keyword txl_keyword contained logtest logtrunc logxor lstat
+syn keyword txl_keyword contained mac-param-bind macro-form-p macro-time macroexpand
+syn keyword txl_keyword contained macroexpand-1 macrolet major make-catenated-stream
+syn keyword txl_keyword contained make-env make-hash make-lazy-cons make-lazy-struct
+syn keyword txl_keyword contained make-like make-package make-random-state make-similar-hash
+syn keyword txl_keyword contained make-string-byte-input-stream make-string-input-stream make-string-output-stream make-strlist-output-stream
+syn keyword txl_keyword contained make-struct make-struct-type make-sym make-time
+syn keyword txl_keyword contained make-time-utc make-trie makedev makunbound
+syn keyword txl_keyword contained mapcar mapcar* mapdo mapf
+syn keyword txl_keyword contained maphash mappend mappend* mask
+syn keyword txl_keyword contained match-fun match-regex match-regex-right match-regst
+syn keyword txl_keyword contained match-regst-right match-str match-str-tree max
+syn keyword txl_keyword contained member member-if memq memql
+syn keyword txl_keyword contained memqual merge meth method
+syn keyword txl_keyword contained min minor minusp mkdir
+syn keyword txl_keyword contained mknod mkstring mlet mod
+syn keyword txl_keyword contained multi multi-sort n-choose-k n-perm-k
+syn keyword txl_keyword contained nconc new nil nilf
+syn keyword txl_keyword contained ninth none not notf
+syn keyword txl_keyword contained nreconc nreverse nthcdr null
+syn keyword txl_keyword contained nullify num-chr num-str numberp
+syn keyword txl_keyword contained oand obtain obtain-block oddp
+syn keyword txl_keyword contained op open-command open-directory open-file
+syn keyword txl_keyword contained open-fileno open-files open-files* open-pipe
+syn keyword txl_keyword contained open-process open-tail openlog opip
+syn keyword txl_keyword contained or orf package-alist package-name
+syn keyword txl_keyword contained package-symbols packagep pad partition
+syn keyword txl_keyword contained partition* partition-by path-blkdev-p path-chrdev-p
+syn keyword txl_keyword contained path-dir-p path-executable-to-me-p path-exists-p path-file-p
+syn keyword txl_keyword contained path-mine-p path-my-group-p path-newer path-older
+syn keyword txl_keyword contained path-pipe-p path-private-to-me-p path-same-object path-setgid-p
+syn keyword txl_keyword contained path-setuid-p path-sock-p path-sticky-p path-symlink-p
+syn keyword txl_keyword contained path-writable-to-me-p perm pipe place-form-p
+syn keyword txl_keyword contained placelet placelet* plusp poll
+syn keyword txl_keyword contained poll-err poll-in poll-nval poll-out
+syn keyword txl_keyword contained poll-pri poll-rdband poll-wrband pop
+syn keyword txl_keyword contained pos pos-if pos-max pos-min
+syn keyword txl_keyword contained posq posql posqual pppred
+syn keyword txl_keyword contained ppred pprinl pprint pprof
+syn keyword txl_keyword contained pred prinl print prof
+syn keyword txl_keyword contained prog1 progn promisep prop
+syn keyword txl_keyword contained proper-listp pset push pushhash
+syn keyword txl_keyword contained pushnew put-byte put-char put-line
+syn keyword txl_keyword contained put-lines put-string put-strings pwd
+syn keyword txl_keyword contained qquote qref quote raise
+syn keyword txl_keyword contained rand random random-fixnum random-state-p
+syn keyword txl_keyword contained range range* range-regex rangep
+syn keyword txl_keyword contained rcomb rcons read readlink
+syn keyword txl_keyword contained real-time-stream-p reduce-left reduce-right ref
+syn keyword txl_keyword contained refset regex-compile regex-parse regexp
+syn keyword txl_keyword contained register-exception-subtypes regsub rehome-sym remhash
+syn keyword txl_keyword contained remove-if remove-if* remove-path remq
+syn keyword txl_keyword contained remq* remql remql* remqual
+syn keyword txl_keyword contained remqual* rename-path repeat replace
+syn keyword txl_keyword contained replace-list replace-str replace-struct replace-vec
+syn keyword txl_keyword contained reset-struct rest ret retf
+syn keyword txl_keyword contained return return* return-from revappend
+syn keyword txl_keyword contained reverse rlcp rlet rotate
+syn keyword txl_keyword contained rperm rplaca rplacd run
+syn keyword txl_keyword contained s-ifblk s-ifchr s-ifdir s-ififo
+syn keyword txl_keyword contained s-iflnk s-ifmt s-ifreg s-ifsock
+syn keyword txl_keyword contained s-irgrp s-iroth s-irusr s-irwxg
+syn keyword txl_keyword contained s-irwxo s-irwxu s-isgid s-isuid
+syn keyword txl_keyword contained s-isvtx s-iwgrp s-iwoth s-iwusr
+syn keyword txl_keyword contained s-ixgrp s-ixoth s-ixusr search
+syn keyword txl_keyword contained search-regex search-regst search-str search-str-tree
+syn keyword txl_keyword contained second seek-stream select self-path
+syn keyword txl_keyword contained seqp set set-diff set-hash-userdata
+syn keyword txl_keyword contained set-indent set-indent-mode set-sig-handler setegid
+syn keyword txl_keyword contained setenv seteuid setgid setgrent
+syn keyword txl_keyword contained sethash setitimer setlogmask setpwent
+syn keyword txl_keyword contained setuid seventh sh shift
+syn keyword txl_keyword contained shuffle sig-abrt sig-alrm sig-bus
+syn keyword txl_keyword contained sig-check sig-chld sig-cont sig-fpe
+syn keyword txl_keyword contained sig-hup sig-ill sig-int sig-io
+syn keyword txl_keyword contained sig-iot sig-kill sig-pipe sig-poll
+syn keyword txl_keyword contained sig-prof sig-pwr sig-quit sig-segv
+syn keyword txl_keyword contained sig-stkflt sig-stop sig-sys sig-term
+syn keyword txl_keyword contained sig-trap sig-tstp sig-ttin sig-ttou
+syn keyword txl_keyword contained sig-urg sig-usr1 sig-usr2 sig-vtalrm
+syn keyword txl_keyword contained sig-winch sig-xcpu sig-xfsz sign-extend
+syn keyword txl_keyword contained sin sixth size-vec slot
+syn keyword txl_keyword contained slotp slotset some sort
+syn keyword txl_keyword contained sort-group source-loc source-loc-str span-str
+syn keyword txl_keyword contained special-operator-p special-var-p splice split
+syn keyword txl_keyword contained split-str split-str-set sqrt sssucc
+syn keyword txl_keyword contained ssucc stat static-slot static-slot-ensure
+syn keyword txl_keyword contained static-slot-p static-slot-set stdlib str<
+syn keyword txl_keyword contained str<= str= str> str>=
+syn keyword txl_keyword contained stream-get-prop stream-set-prop streamp string-extend
+syn keyword txl_keyword contained string-lt stringp struct-type struct-type-p
+syn keyword txl_keyword contained structp sub sub-list sub-str
+syn keyword txl_keyword contained sub-vec subtypep succ super
+syn keyword txl_keyword contained super-method suspend swap symacrolet
+syn keyword txl_keyword contained symbol-function symbol-name symbol-package symbol-value
+syn keyword txl_keyword contained symbolp symlink sys:*lisp1* sys:abscond*
+syn keyword txl_keyword contained sys:abscond-from sys:bad-slot-syntax sys:capture-cont sys:do-path-test
+syn keyword txl_keyword contained sys:dwim-del sys:dwim-set sys:eval-err sys:expand
+syn keyword txl_keyword contained sys:expr sys:fbind sys:gc sys:gc-set-delta
+syn keyword txl_keyword contained sys:get-fb sys:get-vb sys:handle-bad-syntax sys:l1-setq
+syn keyword txl_keyword contained sys:l1-val sys:lbind sys:lisp1-setq sys:lisp1-value
+syn keyword txl_keyword contained sys:load sys:make-struct-type sys:mark-special sys:obtain-impl
+syn keyword txl_keyword contained sys:path-access sys:path-examine sys:path-test sys:path-test-mode
+syn keyword txl_keyword contained sys:pl-expand sys:placelet-1 sys:prune-nil-inits sys:qquote
+syn keyword txl_keyword contained sys:quasi sys:quasilist sys:reg-expand-nongreedy sys:reg-optimize
+syn keyword txl_keyword contained sys:rplaca sys:rplacd sys:setq sys:setqf
+syn keyword txl_keyword contained sys:splice sys:struct-lit sys:sym-clobber-expander sys:sym-delete-expander
+syn keyword txl_keyword contained sys:sym-update-expander sys:top-fb sys:top-vb sys:unquote
+syn keyword txl_keyword contained sys:var sys:with-saved-vars syslog system-package
+syn keyword txl_keyword contained t take take-until take-while
+syn keyword txl_keyword contained tan tb tc tenth
+syn keyword txl_keyword contained test-set-indent-mode tf third throw
+syn keyword txl_keyword contained throwf time time-fields-local time-fields-utc
+syn keyword txl_keyword contained time-string-local time-string-utc time-struct-local time-struct-utc
+syn keyword txl_keyword contained time-usec to tofloat toint
+syn keyword txl_keyword contained tok-str tok-where tostring tostringp
+syn keyword txl_keyword contained tprint transpose tree-bind tree-case
+syn keyword txl_keyword contained tree-find trie-add trie-compress trie-lookup-begin
+syn keyword txl_keyword contained trie-lookup-feed-char trie-value-at trim-str true
+syn keyword txl_keyword contained trunc trunc-rem truncate-stream tuples
+syn keyword txl_keyword contained txr-case txr-case-impl txr-if txr-sym
+syn keyword txl_keyword contained txr-version txr-when typecase typeof
+syn keyword txl_keyword contained typep umeth umethod unget-byte
+syn keyword txl_keyword contained unget-char uniq unique unless
+syn keyword txl_keyword contained unquote unsetenv until until*
+syn keyword txl_keyword contained unwind-protect upcase-str update url-decode
+syn keyword txl_keyword contained url-encode user-package usl usleep
+syn keyword txl_keyword contained uslot vec vec-list vec-push
+syn keyword txl_keyword contained vec-set-length vecref vector vector-list
+syn keyword txl_keyword contained vectorp w-continued w-coredump w-exitstatus
+syn keyword txl_keyword contained w-ifcontinued w-ifexited w-ifsignaled w-ifstopped
+syn keyword txl_keyword contained w-nohang w-stopsig w-termsig w-untraced
+syn keyword txl_keyword contained wait weave when whenlet
+syn keyword txl_keyword contained where while while* whilet
+syn keyword txl_keyword contained width width-check with-clobber-expander with-delete-expander
+syn keyword txl_keyword contained with-gensyms with-hash-iter with-in-string-byte-stream with-in-string-stream
+syn keyword txl_keyword contained with-objects with-out-string-stream with-out-strlist-stream with-resources
+syn keyword txl_keyword contained with-stream with-update-expander wrap wrap*
+syn keyword txl_keyword contained yield yield-from zap zerop
+syn keyword txl_keyword contained zip
 syn match txr_nested_error "[^\t ]\+" contained
 syn match txr_variable "\(@[ \t]*\)[*]\?[ \t]*[A-Za-z_][A-Za-z_0-9]*"
 syn match txr_splicevar "@[ \t,*@]*[A-Za-z_][A-Za-z_0-9]*"
@@ -395,4 +398,4 @@ hi def link txr_nested_error Error
 
 let b:current_syntax = "lisp"
 
-set lispwords=ado,ap,append-each,append-each*,aret,block,block*,caseq,caseql,casequal,catch,collect-each,collect-each*,cond,conda,dec,defex,define-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,obtain,obtain-block,op,placelet,placelet*,pop,pprof,prof,prog1,progn,push,pushnew,ret,return,return-from,rlet,splice,suspend,symacrolet,sys:abscond-from,sys:expr,sys:fbind,sys:l1-val,sys:lbind,sys:lisp1-value,sys:path-examine,sys:path-test,sys:placelet-1,sys:splice,sys:struct-lit,sys:unquote,sys:var,sys:with-saved-vars,tb,tc,tree-bind,tree-case,txr-case,txr-case-impl,txr-if,txr-when,typecase,umeth,unless,unquote,until,until*,unwind-protect,when,whenlet,while,while*,whilet,with-clobber-expander,with-delete-expander,with-gensyms,with-hash-iter,with-in-string-byte-stream,with-in-string-stream,with-objects,with-out-string-stream,with-out-strlist-stream,with-resources,with-stream,with-update-expander,yield,yield-from,zap,:method,:function,:init,:fini
+set lispwords=ado,ap,append-each,append-each*,aret,block,block*,caseq,caseql,casequal,catch,collect-each,collect-each*,cond,conda,dec,defex,define-modify-macro,define-place-macro,defmacro,defmeth,defparm,defparml,defplace,defstruct,defsymacro,defun,defvar,defvarl,del,delay,do,dohash,dotimes,each,each*,flet,flip,for,for*,fun,gen,gun,handle,handler-bind,ido,if,ifa,iflet,ignerr,ip,labels,lambda,lcons,let,let*,lnew,load,mac-param-bind,macro-time,macrolet,meth,mlet,new,obtain,obtain-block,op,placelet,placelet*,pop,pprof,prof,prog1,progn,push,pushnew,ret,return,return-from,rlet,splice,suspend,symacrolet,sys:abscond-from,sys:expr,sys:fbind,sys:l1-val,sys:lbind,sys:lisp1-value,sys:path-examine,sys:path-test,sys:placelet-1,sys:splice,sys:struct-lit,sys:unquote,sys:var,sys:with-saved-vars,tb,tc,tree-bind,tree-case,txr-case,txr-case-impl,txr-if,txr-when,typecase,umeth,unless,unquote,until,until*,unwind-protect,usl,when,whenlet,while,while*,whilet,with-clobber-expander,with-delete-expander,with-gensyms,with-hash-iter,with-in-string-byte-stream,with-in-string-stream,with-objects,with-out-string-stream,with-out-strlist-stream,with-resources,with-stream,with-update-expander,yield,yield-from,zap,:method,:function,:init,:fini
diff --git a/txr.1 b/txr.1
index 4bb31634..8200178a 100644
--- a/txr.1
+++ b/txr.1
@@ -344,9 +344,9 @@
 .ds TX \f[B]TXR\f[]
 .ds TL \f[B]TXR Lisp\f[]
 .\" Start of man page:
-.TH TXR 1 2015-11-14 "Utility Commands" "TXR Data Processing Language" "Kaz Kylheku"
+.TH TXR 1 2015-11-20 "Utility Commands" "TXR Data Processing Language" "Kaz Kylheku"
 .SH* NAME
-\*(TX \- text processing language (version 124)
+\*(TX \- text processing language (version 125)
 .SH* SYNOPSIS
 .cblk
 .meti txr >> [ options ] < query-file < data-files ..
diff --git a/txr.vim b/txr.vim
index 34da104d..1f667933 100644
--- a/txr.vim
+++ b/txr.vim
@@ -37,30 +37,31 @@ syn keyword txl_keyword contained :cword-char :decline :dev :digit
 syn keyword txl_keyword contained :downcase :env :equal-based :fd
 syn keyword txl_keyword contained :filter :fini :finish :form
 syn keyword txl_keyword contained :from-current :from-end :from-start :from_html
-syn keyword txl_keyword contained :frompercent :fromurl :fun :function
-syn keyword txl_keyword contained :gap :gid :greedy :hextoint
-syn keyword txl_keyword contained :init :ino :instance :into
-syn keyword txl_keyword contained :lfilt :lines :list :longest
-syn keyword txl_keyword contained :maxgap :maxtimes :method :mingap
-syn keyword txl_keyword contained :mintimes :mode :mtime :name
-syn keyword txl_keyword contained :named :next-spec :nlink :nothrow
-syn keyword txl_keyword contained :prio :rdev :real-time :repeat-spec
-syn keyword txl_keyword contained :resolve :rfilt :shortest :size
-syn keyword txl_keyword contained :space :static :string :symacro
-syn keyword txl_keyword contained :times :to_html :tofloat :toint
-syn keyword txl_keyword contained :tonumber :topercent :tourl :uid
-syn keyword txl_keyword contained :upcase :var :vars :weak-keys
-syn keyword txl_keyword contained :weak-vals :whole :word-char <
-syn keyword txl_keyword contained <= = > >=
-syn keyword txl_keyword contained abort abs abs-path-p acons
-syn keyword txl_keyword contained acons-new aconsql-new acos ado
-syn keyword txl_keyword contained alist-nremove alist-remove all and
-syn keyword txl_keyword contained andf ap apf append
-syn keyword txl_keyword contained append* append-each append-each* apply
-syn keyword txl_keyword contained aret ash asin assoc
-syn keyword txl_keyword contained assql atan atan2 atom
-syn keyword txl_keyword contained bignump bindable bit block
-syn keyword txl_keyword contained block* boundp break-str caaaaar
+syn keyword txl_keyword contained :fromhtml :frompercent :fromurl :fun
+syn keyword txl_keyword contained :function :gap :gid :greedy
+syn keyword txl_keyword contained :hextoint :init :ino :instance
+syn keyword txl_keyword contained :into :lfilt :lines :list
+syn keyword txl_keyword contained :longest :maxgap :maxtimes :method
+syn keyword txl_keyword contained :mingap :mintimes :mode :mtime
+syn keyword txl_keyword contained :name :named :next-spec :nlink
+syn keyword txl_keyword contained :nothrow :prio :rdev :real-time
+syn keyword txl_keyword contained :repeat-spec :resolve :rfilt :shortest
+syn keyword txl_keyword contained :size :space :static :string
+syn keyword txl_keyword contained :symacro :times :to_html :tofloat
+syn keyword txl_keyword contained :tohtml :tohtml* :toint :tonumber
+syn keyword txl_keyword contained :topercent :tourl :uid :upcase
+syn keyword txl_keyword contained :var :vars :weak-keys :weak-vals
+syn keyword txl_keyword contained :whole :word-char < <=
+syn keyword txl_keyword contained = > >= abort
+syn keyword txl_keyword contained abs abs-path-p acons acons-new
+syn keyword txl_keyword contained aconsql-new acos ado alist-nremove
+syn keyword txl_keyword contained alist-remove all and andf
+syn keyword txl_keyword contained ap apf append append*
+syn keyword txl_keyword contained append-each append-each* apply aret
+syn keyword txl_keyword contained ash asin assoc assql
+syn keyword txl_keyword contained atan atan2 atom bignump
+syn keyword txl_keyword contained bindable bit block block*
+syn keyword txl_keyword contained boundp break-str butlast caaaaar
 syn keyword txl_keyword contained caaaadr caaaar caaadar caaaddr
 syn keyword txl_keyword contained caaadr caaar caadaar caadadr
 syn keyword txl_keyword contained caadar caaddar caadddr caaddr
@@ -141,170 +142,172 @@ syn keyword txl_keyword contained hash-equal hash-from-pairs hash-isec hash-keys
 syn keyword txl_keyword contained hash-list hash-next hash-pairs hash-proper-subset
 syn keyword txl_keyword contained hash-revget hash-subset hash-uni hash-update
 syn keyword txl_keyword contained hash-update-1 hash-values hashp have
-syn keyword txl_keyword contained html-decode html-encode iapply identity
-syn keyword txl_keyword contained ido if ifa iff
-syn keyword txl_keyword contained iffi iflet ignerr in
-syn keyword txl_keyword contained inc inc-indent indent-code indent-data
-syn keyword txl_keyword contained indent-off inhash int-chr int-flo
-syn keyword txl_keyword contained int-str integerp intern interp-fun-p
-syn keyword txl_keyword contained interpose invoke-catch ip ipf
-syn keyword txl_keyword contained iread 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 nreconc nreverse nthcdr
-syn keyword txl_keyword contained null nullify num-chr num-str
-syn keyword txl_keyword contained numberp oand obtain obtain-block
-syn keyword txl_keyword contained oddp op open-command open-directory
-syn keyword txl_keyword contained open-file open-fileno open-files open-files*
-syn keyword txl_keyword contained open-pipe open-process open-tail openlog
-syn keyword txl_keyword contained opip or orf package-alist
-syn keyword txl_keyword contained package-name package-symbols packagep pad
-syn keyword txl_keyword contained partition partition* partition-by path-blkdev-p
-syn keyword txl_keyword contained path-chrdev-p path-dir-p path-executable-to-me-p path-exists-p
-syn keyword txl_keyword contained path-file-p path-mine-p path-my-group-p path-newer
-syn keyword txl_keyword contained path-older path-pipe-p path-private-to-me-p path-same-object
-syn keyword txl_keyword contained path-setgid-p path-setuid-p path-sock-p path-sticky-p
-syn keyword txl_keyword contained path-symlink-p path-writable-to-me-p perm pipe
-syn keyword txl_keyword contained place-form-p placelet placelet* plusp
-syn keyword txl_keyword contained poll poll-err poll-in poll-nval
-syn keyword txl_keyword contained poll-out poll-pri poll-rdband poll-wrband
-syn keyword txl_keyword contained pop pos pos-if pos-max
-syn keyword txl_keyword contained pos-min posq posql posqual
-syn keyword txl_keyword contained pppred ppred pprinl pprint
-syn keyword txl_keyword contained pprof pred prinl print
-syn keyword txl_keyword contained prof prog1 progn promisep
-syn keyword txl_keyword contained prop proper-listp pset push
-syn keyword txl_keyword contained pushhash pushnew put-byte put-char
-syn keyword txl_keyword contained put-line put-lines put-string put-strings
-syn keyword txl_keyword contained pwd qquote qref quote
-syn keyword txl_keyword contained raise rand random random-fixnum
-syn keyword txl_keyword contained random-state-p range range* range-regex
-syn keyword txl_keyword contained rangep rcomb rcons 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* return-from
-syn keyword txl_keyword contained revappend reverse rlcp rlet
-syn keyword txl_keyword contained rotate rperm rplaca rplacd
-syn keyword txl_keyword contained run s-ifblk s-ifchr s-ifdir
-syn keyword txl_keyword contained s-ififo s-iflnk s-ifmt s-ifreg
-syn keyword txl_keyword contained s-ifsock s-irgrp s-iroth s-irusr
-syn keyword txl_keyword contained s-irwxg s-irwxo s-irwxu s-isgid
-syn keyword txl_keyword contained s-isuid s-isvtx s-iwgrp s-iwoth
-syn keyword txl_keyword contained s-iwusr s-ixgrp s-ixoth s-ixusr
-syn keyword txl_keyword contained search search-regex search-regst search-str
-syn keyword txl_keyword contained search-str-tree second seek-stream select
-syn keyword txl_keyword contained self-path seqp set set-diff
-syn keyword txl_keyword contained set-hash-userdata set-indent set-indent-mode set-sig-handler
-syn keyword txl_keyword contained setegid setenv seteuid setgid
-syn keyword txl_keyword contained setgrent sethash setitimer setlogmask
-syn keyword txl_keyword contained setpwent setuid seventh sh
-syn keyword txl_keyword contained shift shuffle sig-abrt sig-alrm
-syn keyword txl_keyword contained sig-bus sig-check sig-chld sig-cont
-syn keyword txl_keyword contained sig-fpe sig-hup sig-ill sig-int
-syn keyword txl_keyword contained sig-io sig-iot sig-kill sig-pipe
-syn keyword txl_keyword contained sig-poll sig-prof sig-pwr sig-quit
-syn keyword txl_keyword contained sig-segv sig-stkflt sig-stop sig-sys
-syn keyword txl_keyword contained sig-term sig-trap sig-tstp sig-ttin
-syn keyword txl_keyword contained sig-ttou sig-urg sig-usr1 sig-usr2
-syn keyword txl_keyword contained sig-vtalrm sig-winch sig-xcpu sig-xfsz
-syn keyword txl_keyword contained sign-extend sin sixth size-vec
-syn keyword txl_keyword contained slot slotp slotset some
-syn keyword txl_keyword contained sort sort-group source-loc source-loc-str
-syn keyword txl_keyword contained span-str special-operator-p special-var-p splice
-syn keyword txl_keyword contained split split-str split-str-set sqrt
-syn keyword txl_keyword contained sssucc ssucc stat static-slot
-syn keyword txl_keyword contained static-slot-ensure static-slot-p static-slot-set stdlib
-syn keyword txl_keyword contained str< str<= str= str>
-syn keyword txl_keyword contained str>= stream-get-prop stream-set-prop streamp
-syn keyword txl_keyword contained string-extend string-lt stringp struct-type
-syn keyword txl_keyword contained struct-type-p structp sub sub-list
-syn keyword txl_keyword contained sub-str sub-vec subtypep succ
-syn keyword txl_keyword contained super super-method suspend swap
-syn keyword txl_keyword contained symacrolet symbol-function symbol-name symbol-package
-syn keyword txl_keyword contained symbol-value symbolp symlink sys:*lisp1*
-syn keyword txl_keyword contained sys:abscond* sys:abscond-from sys:bad-slot-syntax sys:capture-cont
-syn keyword txl_keyword contained sys:do-path-test sys:dwim-del sys:dwim-set sys:eval-err
-syn keyword txl_keyword contained sys:expand sys:expr sys:fbind sys:gc
-syn keyword txl_keyword contained sys:gc-set-delta sys:get-fb sys:get-vb sys:handle-bad-syntax
-syn keyword txl_keyword contained sys:l1-setq sys:l1-val sys:lbind sys:lisp1-setq
-syn keyword txl_keyword contained sys:lisp1-value sys:load sys:make-struct-type sys:mark-special
-syn keyword txl_keyword contained sys:obtain-impl sys:path-access sys:path-examine sys:path-test
-syn keyword txl_keyword contained sys:path-test-mode sys:pl-expand sys:placelet-1 sys:prune-nil-inits
-syn keyword txl_keyword contained sys:qquote sys:quasi sys:quasilist sys:reg-expand-nongreedy
-syn keyword txl_keyword contained sys:reg-optimize sys:rplaca sys:rplacd sys:setq
-syn keyword txl_keyword contained sys:setqf sys:splice sys:struct-lit sys:sym-clobber-expander
-syn keyword txl_keyword contained sys:sym-delete-expander sys:sym-update-expander sys:top-fb sys:top-vb
-syn keyword txl_keyword contained sys:unquote sys:var sys:with-saved-vars syslog
-syn keyword txl_keyword contained system-package t take take-until
-syn keyword txl_keyword contained take-while tan tb tc
-syn keyword txl_keyword contained tenth test-set-indent-mode tf third
-syn keyword txl_keyword contained throw throwf time time-fields-local
-syn keyword txl_keyword contained time-fields-utc time-string-local time-string-utc time-struct-local
-syn keyword txl_keyword contained time-struct-utc time-usec to tofloat
-syn keyword txl_keyword contained toint tok-str tok-where tostring
-syn keyword txl_keyword contained tostringp tprint transpose tree-bind
-syn keyword txl_keyword contained tree-case tree-find trie-add trie-compress
-syn keyword txl_keyword contained trie-lookup-begin trie-lookup-feed-char trie-value-at trim-str
-syn keyword txl_keyword contained true trunc trunc-rem truncate-stream
-syn keyword txl_keyword contained tuples txr-case txr-case-impl txr-if
-syn keyword txl_keyword contained txr-sym txr-version txr-when typecase
-syn keyword txl_keyword contained typeof typep umeth umethod
-syn keyword txl_keyword contained unget-byte unget-char uniq unique
-syn keyword txl_keyword contained unless unquote unsetenv until
-syn keyword txl_keyword contained until* unwind-protect upcase-str update
-syn keyword txl_keyword contained url-decode url-encode user-package usleep
-syn keyword txl_keyword contained vec vec-list vec-push vec-set-length
-syn keyword txl_keyword contained vecref vector vector-list vectorp
-syn keyword txl_keyword contained w-continued w-coredump w-exitstatus w-ifcontinued
-syn keyword txl_keyword contained w-ifexited w-ifsignaled w-ifstopped w-nohang
-syn keyword txl_keyword contained w-stopsig w-termsig w-untraced wait
-syn keyword txl_keyword contained weave when whenlet where
-syn keyword txl_keyword contained while while* whilet width
-syn keyword txl_keyword contained width-check with-clobber-expander with-delete-expander with-gensyms
-syn keyword txl_keyword contained with-hash-iter with-in-string-byte-stream with-in-string-stream with-objects
-syn keyword txl_keyword contained with-out-string-stream with-out-strlist-stream with-resources with-stream
-syn keyword txl_keyword contained with-update-expander wrap wrap* yield
-syn keyword txl_keyword contained yield-from zap zerop zip
+syn keyword txl_keyword contained html-decode html-encode 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-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 iread isqrt itimer-prov
+syn keyword txl_keyword contained itimer-real itimer-virtual juxt keep-if
+syn keyword txl_keyword contained keep-if* keyword-package keywordp kill
+syn keyword txl_keyword contained labels lambda last lazy-str
+syn keyword txl_keyword contained lazy-str-force lazy-str-force-upto lazy-str-get-trailing-list lazy-stream-cons
+syn keyword txl_keyword contained lazy-stringp lcm lcons lcons-fun
+syn keyword txl_keyword contained lconsp ldiff length length-list
+syn keyword txl_keyword contained length-str length-str-< length-str-<= length-str->
+syn keyword txl_keyword contained length-str->= length-vec lequal less
+syn keyword txl_keyword contained let let* lexical-fun-p lexical-lisp1-binding
+syn keyword txl_keyword contained lexical-var-p lib-version link lisp-parse
+syn keyword txl_keyword contained list list* list-str list-vec
+syn keyword txl_keyword contained list-vector listp lnew load
+syn keyword txl_keyword contained log log-alert log-auth log-authpriv
+syn keyword txl_keyword contained log-cons log-crit log-daemon log-debug
+syn keyword txl_keyword contained log-emerg log-err log-info log-ndelay
+syn keyword txl_keyword contained log-notice log-nowait log-odelay log-perror
+syn keyword txl_keyword contained log-pid log-user log-warning log10
+syn keyword txl_keyword contained log2 logand logior lognot
+syn keyword txl_keyword contained logtest logtrunc logxor lstat
+syn keyword txl_keyword contained mac-param-bind macro-form-p macro-time macroexpand
+syn keyword txl_keyword contained macroexpand-1 macrolet major make-catenated-stream
+syn keyword txl_keyword contained make-env make-hash make-lazy-cons make-lazy-struct
+syn keyword txl_keyword contained make-like make-package make-random-state make-similar-hash
+syn keyword txl_keyword contained make-string-byte-input-stream make-string-input-stream make-string-output-stream make-strlist-output-stream
+syn keyword txl_keyword contained make-struct make-struct-type make-sym make-time
+syn keyword txl_keyword contained make-time-utc make-trie makedev makunbound
+syn keyword txl_keyword contained mapcar mapcar* mapdo mapf
+syn keyword txl_keyword contained maphash mappend mappend* mask
+syn keyword txl_keyword contained match-fun match-regex match-regex-right match-regst
+syn keyword txl_keyword contained match-regst-right match-str match-str-tree max
+syn keyword txl_keyword contained member member-if memq memql
+syn keyword txl_keyword contained memqual merge meth method
+syn keyword txl_keyword contained min minor minusp mkdir
+syn keyword txl_keyword contained mknod mkstring mlet mod
+syn keyword txl_keyword contained multi multi-sort n-choose-k n-perm-k
+syn keyword txl_keyword contained nconc new nil nilf
+syn keyword txl_keyword contained ninth none not notf
+syn keyword txl_keyword contained nreconc nreverse nthcdr null
+syn keyword txl_keyword contained nullify num-chr num-str numberp
+syn keyword txl_keyword contained oand obtain obtain-block oddp
+syn keyword txl_keyword contained op open-command open-directory open-file
+syn keyword txl_keyword contained open-fileno open-files open-files* open-pipe
+syn keyword txl_keyword contained open-process open-tail openlog opip
+syn keyword txl_keyword contained or orf package-alist package-name
+syn keyword txl_keyword contained package-symbols packagep pad partition
+syn keyword txl_keyword contained partition* partition-by path-blkdev-p path-chrdev-p
+syn keyword txl_keyword contained path-dir-p path-executable-to-me-p path-exists-p path-file-p
+syn keyword txl_keyword contained path-mine-p path-my-group-p path-newer path-older
+syn keyword txl_keyword contained path-pipe-p path-private-to-me-p path-same-object path-setgid-p
+syn keyword txl_keyword contained path-setuid-p path-sock-p path-sticky-p path-symlink-p
+syn keyword txl_keyword contained path-writable-to-me-p perm pipe place-form-p
+syn keyword txl_keyword contained placelet placelet* plusp poll
+syn keyword txl_keyword contained poll-err poll-in poll-nval poll-out
+syn keyword txl_keyword contained poll-pri poll-rdband poll-wrband pop
+syn keyword txl_keyword contained pos pos-if pos-max pos-min
+syn keyword txl_keyword contained posq posql posqual pppred
+syn keyword txl_keyword contained ppred pprinl pprint pprof
+syn keyword txl_keyword contained pred prinl print prof
+syn keyword txl_keyword contained prog1 progn promisep prop
+syn keyword txl_keyword contained proper-listp pset push pushhash
+syn keyword txl_keyword contained pushnew put-byte put-char put-line
+syn keyword txl_keyword contained put-lines put-string put-strings pwd
+syn keyword txl_keyword contained qquote qref quote raise
+syn keyword txl_keyword contained rand random random-fixnum random-state-p
+syn keyword txl_keyword contained range range* range-regex rangep
+syn keyword txl_keyword contained rcomb rcons read readlink
+syn keyword txl_keyword contained real-time-stream-p reduce-left reduce-right ref
+syn keyword txl_keyword contained refset regex-compile regex-parse regexp
+syn keyword txl_keyword contained register-exception-subtypes regsub rehome-sym remhash
+syn keyword txl_keyword contained remove-if remove-if* remove-path remq
+syn keyword txl_keyword contained remq* remql remql* remqual
+syn keyword txl_keyword contained remqual* rename-path repeat replace
+syn keyword txl_keyword contained replace-list replace-str replace-struct replace-vec
+syn keyword txl_keyword contained reset-struct rest ret retf
+syn keyword txl_keyword contained return return* return-from revappend
+syn keyword txl_keyword contained reverse rlcp rlet rotate
+syn keyword txl_keyword contained rperm rplaca rplacd run
+syn keyword txl_keyword contained s-ifblk s-ifchr s-ifdir s-ififo
+syn keyword txl_keyword contained s-iflnk s-ifmt s-ifreg s-ifsock
+syn keyword txl_keyword contained s-irgrp s-iroth s-irusr s-irwxg
+syn keyword txl_keyword contained s-irwxo s-irwxu s-isgid s-isuid
+syn keyword txl_keyword contained s-isvtx s-iwgrp s-iwoth s-iwusr
+syn keyword txl_keyword contained s-ixgrp s-ixoth s-ixusr search
+syn keyword txl_keyword contained search-regex search-regst search-str search-str-tree
+syn keyword txl_keyword contained second seek-stream select self-path
+syn keyword txl_keyword contained seqp set set-diff set-hash-userdata
+syn keyword txl_keyword contained set-indent set-indent-mode set-sig-handler setegid
+syn keyword txl_keyword contained setenv seteuid setgid setgrent
+syn keyword txl_keyword contained sethash setitimer setlogmask setpwent
+syn keyword txl_keyword contained setuid seventh sh shift
+syn keyword txl_keyword contained shuffle sig-abrt sig-alrm sig-bus
+syn keyword txl_keyword contained sig-check sig-chld sig-cont sig-fpe
+syn keyword txl_keyword contained sig-hup sig-ill sig-int sig-io
+syn keyword txl_keyword contained sig-iot sig-kill sig-pipe sig-poll
+syn keyword txl_keyword contained sig-prof sig-pwr sig-quit sig-segv
+syn keyword txl_keyword contained sig-stkflt sig-stop sig-sys sig-term
+syn keyword txl_keyword contained sig-trap sig-tstp sig-ttin sig-ttou
+syn keyword txl_keyword contained sig-urg sig-usr1 sig-usr2 sig-vtalrm
+syn keyword txl_keyword contained sig-winch sig-xcpu sig-xfsz sign-extend
+syn keyword txl_keyword contained sin sixth size-vec slot
+syn keyword txl_keyword contained slotp slotset some sort
+syn keyword txl_keyword contained sort-group source-loc source-loc-str span-str
+syn keyword txl_keyword contained special-operator-p special-var-p splice split
+syn keyword txl_keyword contained split-str split-str-set sqrt sssucc
+syn keyword txl_keyword contained ssucc stat static-slot static-slot-ensure
+syn keyword txl_keyword contained static-slot-p static-slot-set stdlib str<
+syn keyword txl_keyword contained str<= str= str> str>=
+syn keyword txl_keyword contained stream-get-prop stream-set-prop streamp string-extend
+syn keyword txl_keyword contained string-lt stringp struct-type struct-type-p
+syn keyword txl_keyword contained structp sub sub-list sub-str
+syn keyword txl_keyword contained sub-vec subtypep succ super
+syn keyword txl_keyword contained super-method suspend swap symacrolet
+syn keyword txl_keyword contained symbol-function symbol-name symbol-package symbol-value
+syn keyword txl_keyword contained symbolp symlink sys:*lisp1* sys:abscond*
+syn keyword txl_keyword contained sys:abscond-from sys:bad-slot-syntax sys:capture-cont sys:do-path-test
+syn keyword txl_keyword contained sys:dwim-del sys:dwim-set sys:eval-err sys:expand
+syn keyword txl_keyword contained sys:expr sys:fbind sys:gc sys:gc-set-delta
+syn keyword txl_keyword contained sys:get-fb sys:get-vb sys:handle-bad-syntax sys:l1-setq
+syn keyword txl_keyword contained sys:l1-val sys:lbind sys:lisp1-setq sys:lisp1-value
+syn keyword txl_keyword contained sys:load sys:make-struct-type sys:mark-special sys:obtain-impl
+syn keyword txl_keyword contained sys:path-access sys:path-examine sys:path-test sys:path-test-mode
+syn keyword txl_keyword contained sys:pl-expand sys:placelet-1 sys:prune-nil-inits sys:qquote
+syn keyword txl_keyword contained sys:quasi sys:quasilist sys:reg-expand-nongreedy sys:reg-optimize
+syn keyword txl_keyword contained sys:rplaca sys:rplacd sys:setq sys:setqf
+syn keyword txl_keyword contained sys:splice sys:struct-lit sys:sym-clobber-expander sys:sym-delete-expander
+syn keyword txl_keyword contained sys:sym-update-expander sys:top-fb sys:top-vb sys:unquote
+syn keyword txl_keyword contained sys:var sys:with-saved-vars syslog system-package
+syn keyword txl_keyword contained t take take-until take-while
+syn keyword txl_keyword contained tan tb tc tenth
+syn keyword txl_keyword contained test-set-indent-mode tf third throw
+syn keyword txl_keyword contained throwf time time-fields-local time-fields-utc
+syn keyword txl_keyword contained time-string-local time-string-utc time-struct-local time-struct-utc
+syn keyword txl_keyword contained time-usec to tofloat toint
+syn keyword txl_keyword contained tok-str tok-where tostring tostringp
+syn keyword txl_keyword contained tprint transpose tree-bind tree-case
+syn keyword txl_keyword contained tree-find trie-add trie-compress trie-lookup-begin
+syn keyword txl_keyword contained trie-lookup-feed-char trie-value-at trim-str true
+syn keyword txl_keyword contained trunc trunc-rem truncate-stream tuples
+syn keyword txl_keyword contained txr-case txr-case-impl txr-if txr-sym
+syn keyword txl_keyword contained txr-version txr-when typecase typeof
+syn keyword txl_keyword contained typep umeth umethod unget-byte
+syn keyword txl_keyword contained unget-char uniq unique unless
+syn keyword txl_keyword contained unquote unsetenv until until*
+syn keyword txl_keyword contained unwind-protect upcase-str update url-decode
+syn keyword txl_keyword contained url-encode user-package usl usleep
+syn keyword txl_keyword contained uslot vec vec-list vec-push
+syn keyword txl_keyword contained vec-set-length vecref vector vector-list
+syn keyword txl_keyword contained vectorp w-continued w-coredump w-exitstatus
+syn keyword txl_keyword contained w-ifcontinued w-ifexited w-ifsignaled w-ifstopped
+syn keyword txl_keyword contained w-nohang w-stopsig w-termsig w-untraced
+syn keyword txl_keyword contained wait weave when whenlet
+syn keyword txl_keyword contained where while while* whilet
+syn keyword txl_keyword contained width width-check with-clobber-expander with-delete-expander
+syn keyword txl_keyword contained with-gensyms with-hash-iter with-in-string-byte-stream with-in-string-stream
+syn keyword txl_keyword contained with-objects with-out-string-stream with-out-strlist-stream with-resources
+syn keyword txl_keyword contained with-stream with-update-expander wrap wrap*
+syn keyword txl_keyword contained yield yield-from zap zerop
+syn keyword txl_keyword contained zip
 
 syn keyword txr_keyword contained accept all and assert
 syn keyword txr_keyword contained bind block cases cat
@@ -421,4 +424,4 @@ hi def link txr_nested_error Error
 
 let b:current_syntax = "lisp"
 
-set lispwords=ado,ap,append-each,append-each*,aret,block,block*,caseq,caseql,casequal,catch,collect-each,collect-each*,cond,conda,dec,defex,define-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,obtain,obtain-block,op,placelet,placelet*,pop,pprof,prof,prog1,progn,push,pushnew,ret,return,return-from,rlet,splice,suspend,symacrolet,sys:abscond-from,sys:expr,sys:fbind,sys:l1-val,sys:lbind,sys:lisp1-value,sys:path-examine,sys:path-test,sys:placelet-1,sys:splice,sys:struct-lit,sys:unquote,sys:var,sys:with-saved-vars,tb,tc,tree-bind,tree-case,txr-case,txr-case-impl,txr-if,txr-when,typecase,umeth,unless,unquote,until,until*,unwind-protect,when,whenlet,while,while*,whilet,with-clobber-expander,with-delete-expander,with-gensyms,with-hash-iter,with-in-string-byte-stream,with-in-string-stream,with-objects,with-out-string-stream,with-out-strlist-stream,with-resources,with-stream,with-update-expander,yield,yield-from,zap,:method,:function,:init,:fini
+set lispwords=ado,ap,append-each,append-each*,aret,block,block*,caseq,caseql,casequal,catch,collect-each,collect-each*,cond,conda,dec,defex,define-modify-macro,define-place-macro,defmacro,defmeth,defparm,defparml,defplace,defstruct,defsymacro,defun,defvar,defvarl,del,delay,do,dohash,dotimes,each,each*,flet,flip,for,for*,fun,gen,gun,handle,handler-bind,ido,if,ifa,iflet,ignerr,ip,labels,lambda,lcons,let,let*,lnew,load,mac-param-bind,macro-time,macrolet,meth,mlet,new,obtain,obtain-block,op,placelet,placelet*,pop,pprof,prof,prog1,progn,push,pushnew,ret,return,return-from,rlet,splice,suspend,symacrolet,sys:abscond-from,sys:expr,sys:fbind,sys:l1-val,sys:lbind,sys:lisp1-value,sys:path-examine,sys:path-test,sys:placelet-1,sys:splice,sys:struct-lit,sys:unquote,sys:var,sys:with-saved-vars,tb,tc,tree-bind,tree-case,txr-case,txr-case-impl,txr-if,txr-when,typecase,umeth,unless,unquote,until,until*,unwind-protect,usl,when,whenlet,while,while*,whilet,with-clobber-expander,with-delete-expander,with-gensyms,with-hash-iter,with-in-string-byte-stream,with-in-string-stream,with-objects,with-out-string-stream,with-out-strlist-stream,with-resources,with-stream,with-update-expander,yield,yield-from,zap,:method,:function,:init,:fini