Version 115.txr-115

* RELNOTES: Updated.

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

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

* txr.vim, tl.vim: Regenerated.

6 files changed, 504 insertions, 366 deletions

diff --git a/RELNOTES b/RELNOTES
index cb806cdc..0414566d 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,93 @@
+                                    TXR 115
+                                   2015-09-11
+
+
+  Features:
+
+  * Sixth anniversary edition!
+
+  * New REPL on Unix platforms: an interactive listener with line editing,
+    history recall, completion and exception/interrupt trapping.
+    This is started with "txr -i".
+
+  * Improvements in error reporting.
+
+  * New function, raise, for raising a signal, eliminating
+    the (kill (getpid) sig) workaround.
+
+  * New functions subtypep and typep for testing subtype relationships
+    between types, and between an object and a type.
+
+  * New abstract types usable in conjunction with subtypep and typep.
+    For instance, integer and number are types. A fixnum is a subtype
+    of integer, which is a subtype of number. Type hiearchy documented in
+    detail.
+
+  * The printed representation of function objects is much more
+    informative than before.
+
+  * The variable *args* is now not only bound when evaluating Lisp
+    expressions from the command line (with -e and related options)
+    but it is also modifiable.  Command line expressions can rewrite the
+    remaining arguments by updating *args* and these arguments
+    instantly take effect.
+
+  * Some section restructuring in the documentation.
+
+  * New functions for working with package objects: package-alist,
+    package-name, package-symbols.
+
+  Bugs:
+
+  - Fixed serious problem in implementation of signal handling:
+    the function to manipulate the signal mask in a cached way
+    wasn't actually calling into the OS to set the real signal mask.
+
+  - Fixed another serious problem in signal handling: a Lisp function
+    throwing an exception out of a signal handler would cause an
+    imbalance in an internal signal reentry counter, causing later
+    signal handling to stop working properly.
+
+  - Fixed an assertion occurring in the Flex-generated scanner if the parsing
+    of a stream is aborted by an exception, and then the parser is called
+    again.
+
+  - Fixed regression dating back to TXR 105: the TXR pattern language
+    failing to use a "real-time" stream for standard input, when it
+    is a TTY, thus breaking the specials upport for pattern matching
+    into interactive input.
+
+  - Removed an accidentally committed debug print, producing output
+    in situations when a function is called with the wrong number of arguments.
+
+  - Fixed (eval 'sym) reporting the unbound variable sym against the wrong
+    source code location.
+
+  - Fixed random state objects being of type *random-state* rather than
+    of random-state. The earmuffed symbol was never intended.
+
+  - The accessors fun, symbol-function and symbol-value were completely
+    broken for use as syntactic places.
+
+  - Fixed multiple evaluation of the slot argument when slot used as
+    syntactic place accessor: (inc (slot x y)) now evaluates y only once,
+    just like x.
+
+  - Fixed another gaping bug in the finalization hook mechanism: objects
+    being promoted into the tenured generation had their finalizers
+    called while still remaining reachable.
+
+  - Fixed the self-path variable not being bound when evaluating Lisp code from
+    a .tl file or command line arguments like -e.
+
+  - Fixed *args* not being bound when evaluating Lisp expressions from
+    the command line with -e and related options.
+
+  - Fixed missing :tointeger filter. It was actually registered under the
+    misspelled keyword symbol :toinger, and never existed as :tointeger.
+    It has actually been renamed to :toint.
+
+
                                     TXR 114
                                    2015-09-03
 
diff --git a/configure b/configure
index fa72e0e0..f2e18b4f 100755
--- a/configure
+++ b/configure
@@ -432,7 +432,7 @@ fi
 #
 
 
-txr_ver=114
+txr_ver=115
 
 #
 # The all important banner.
diff --git a/share/txr/stdlib/ver.tl b/share/txr/stdlib/ver.tl
index db67c418..949464f8 100644
--- a/share/txr/stdlib/ver.tl
+++ b/share/txr/stdlib/ver.tl
@@ -1,2 +1,2 @@
-(defvarl lib-version 114)
+(defvarl lib-version 115)
 (defvarl *lib-version* lib-version)
diff --git a/tl.vim b/tl.vim
index 73769f19..d143d409 100644
--- a/tl.vim
+++ b/tl.vim
@@ -18,7 +18,7 @@
 syn case match
 syn spell toplevel
 
-setlocal iskeyword=a-z,A-Z,48-57,!,$,&,*,+,-,<,=,>,?,\\,_,~,/
+setlocal iskeyword=a-z,A-Z,48-57,!,$,&,*,+,-,:,<,=,>,?,\\,_,~,/
 
 syn keyword txl_keyword contained %e% %pi% * *args*
 syn keyword txl_keyword contained *args-full* *e* *flo-dig* *flo-epsilon*
@@ -26,64 +26,83 @@ syn keyword txl_keyword contained *flo-max* *flo-min* *full-args* *gensym-counte
 syn keyword txl_keyword contained *keyword-package* *lib-version* *pi* *place-clobber-expander*
 syn keyword txl_keyword contained *place-delete-expander* *place-macro* *place-update-expander* *random-state*
 syn keyword txl_keyword contained *self-path* *stddebug* *stderr* *stdin*
-syn keyword txl_keyword contained *stdlog* *stdnull* *stdout* *txr-version*
-syn keyword txl_keyword contained *unhandled-hook* *user-package* + -
-syn keyword txl_keyword contained / /= < <=
-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 boundp
-syn keyword txl_keyword contained break-str caaaaar caaaadr caaaar
-syn keyword txl_keyword contained caaadar caaaddr caaadr caaar
-syn keyword txl_keyword contained caadaar caadadr caadar caaddar
-syn keyword txl_keyword contained caadddr caaddr caadr caar
-syn keyword txl_keyword contained cadaaar cadaadr cadaar cadadar
-syn keyword txl_keyword contained cadaddr cadadr cadar caddaar
-syn keyword txl_keyword contained caddadr caddar cadddar caddddr
-syn keyword txl_keyword contained cadddr caddr cadr call
-syn keyword txl_keyword contained call-clobber-expander call-delete-expander call-update-expander callf
-syn keyword txl_keyword contained car caseq caseql casequal
-syn keyword txl_keyword contained cat-str cat-streams cat-vec catch
-syn keyword txl_keyword contained catenated-stream-p catenated-stream-push cdaaaar cdaaadr
-syn keyword txl_keyword contained cdaaar cdaadar cdaaddr cdaadr
-syn keyword txl_keyword contained cdaar cdadaar cdadadr cdadar
-syn keyword txl_keyword contained cdaddar cdadddr cdaddr cdadr
-syn keyword txl_keyword contained cdar cddaaar cddaadr cddaar
-syn keyword txl_keyword contained cddadar cddaddr cddadr cddar
-syn keyword txl_keyword contained cdddaar cdddadr cdddar cddddar
-syn keyword txl_keyword contained cdddddr cddddr cdddr cddr
-syn keyword txl_keyword contained cdr ceil chain chand
-syn keyword txl_keyword contained chdir chmod chr-isalnum chr-isalpha
-syn keyword txl_keyword contained chr-isascii chr-isblank chr-iscntrl chr-isdigit
-syn keyword txl_keyword contained chr-isgraph chr-islower chr-isprint chr-ispunct
-syn keyword txl_keyword contained chr-isspace chr-isunisp chr-isupper chr-isxdigit
-syn keyword txl_keyword contained chr-num chr-str chr-str-set chr-tolower
-syn keyword txl_keyword contained chr-toupper chrp clamp clear-error
-syn keyword txl_keyword contained close-stream closelog cmp-str collect-each
-syn keyword txl_keyword contained collect-each* comb compl-span-str cond
-syn keyword txl_keyword contained conda cons conses conses*
-syn keyword txl_keyword contained consp constantp copy copy-alist
-syn keyword txl_keyword contained copy-cons copy-hash copy-list copy-str
-syn keyword txl_keyword contained copy-struct copy-vec cos count-if
-syn keyword txl_keyword contained countq countql countqual cum-norm-dist
-syn keyword txl_keyword contained daemon dec define-modify-macro define-place-macro
-syn keyword txl_keyword contained defmacro defparm defparml defplace
-syn keyword txl_keyword contained defstruct defsymacro defun defvar
-syn keyword txl_keyword contained defvarl del delay delete-package
-syn keyword txl_keyword contained display-width do dohash dotimes
-syn keyword txl_keyword contained downcase-str dup dupfd dwim
-syn keyword txl_keyword contained each each* eighth empty
-syn keyword txl_keyword contained endpwent ensure-dir env env-fbind
-syn keyword txl_keyword contained env-hash env-vbind eq eql
-syn keyword txl_keyword contained equal errno error eval
-syn keyword txl_keyword contained evenp exec exit exit*
-syn keyword txl_keyword contained exp expr expt exptmod
-syn keyword txl_keyword contained false fbind fboundp fifth
+syn keyword txl_keyword contained *stdlog* *stdnull* *stdout* *system-package*
+syn keyword txl_keyword contained *txr-version* *unhandled-hook* *user-package* +
+syn keyword txl_keyword contained - / /= :
+syn keyword txl_keyword contained :append :args :atime :auto
+syn keyword txl_keyword contained :blksize :blocks :cdigit :chars
+syn keyword txl_keyword contained :continue :counter :cspace :ctime
+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 :finish :from-current :from-end
+syn keyword txl_keyword contained :from-start :from_html :frompercent :fromurl
+syn keyword txl_keyword contained :fun :gap :gid :greedy
+syn keyword txl_keyword contained :hextoint :ino :into :lfilt
+syn keyword txl_keyword contained :lines :list :longest :maxgap
+syn keyword txl_keyword contained :maxtimes :mingap :mintimes :mode
+syn keyword txl_keyword contained :mtime :name :named :next-spec
+syn keyword txl_keyword contained :nlink :nothrow :prio :rdev
+syn keyword txl_keyword contained :real-time :repeat-spec :resolve :rfilt
+syn keyword txl_keyword contained :shortest :size :space :string
+syn keyword txl_keyword contained :symacro :times :to_html :tofloat
+syn keyword txl_keyword contained :toint :tonumber :topercent :tourl
+syn keyword txl_keyword contained :uid :upcase :var :vars
+syn keyword txl_keyword contained :weak-keys :weak-vals :whole :word-char
+syn keyword txl_keyword contained < <= = >
+syn keyword txl_keyword contained >= abort abs abs-path-p
+syn keyword txl_keyword contained acons acons-new aconsql-new acos
+syn keyword txl_keyword contained ado alist-nremove alist-remove all
+syn keyword txl_keyword contained and andf ap apf
+syn keyword txl_keyword contained append append* append-each append-each*
+syn keyword txl_keyword contained apply aret ash asin
+syn keyword txl_keyword contained assoc assql atan atan2
+syn keyword txl_keyword contained atom bignump bindable bit
+syn keyword txl_keyword contained block boundp break-str 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
+syn keyword txl_keyword contained caadr caar cadaaar cadaadr
+syn keyword txl_keyword contained cadaar cadadar cadaddr cadadr
+syn keyword txl_keyword contained cadar caddaar caddadr caddar
+syn keyword txl_keyword contained cadddar caddddr cadddr caddr
+syn keyword txl_keyword contained cadr call call-clobber-expander call-delete-expander
+syn keyword txl_keyword contained call-update-expander callf car caseq
+syn keyword txl_keyword contained caseql casequal cat-str cat-streams
+syn keyword txl_keyword contained cat-vec catch catenated-stream-p catenated-stream-push
+syn keyword txl_keyword contained cdaaaar cdaaadr cdaaar cdaadar
+syn keyword txl_keyword contained cdaaddr cdaadr cdaar cdadaar
+syn keyword txl_keyword contained cdadadr cdadar cdaddar cdadddr
+syn keyword txl_keyword contained cdaddr cdadr cdar cddaaar
+syn keyword txl_keyword contained cddaadr cddaar cddadar cddaddr
+syn keyword txl_keyword contained cddadr cddar cdddaar cdddadr
+syn keyword txl_keyword contained cdddar cddddar cdddddr cddddr
+syn keyword txl_keyword contained cdddr cddr cdr ceil
+syn keyword txl_keyword contained chain chand chdir chmod
+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 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 define-modify-macro define-place-macro defmacro defparm
+syn keyword txl_keyword contained defparml defplace defstruct defsymacro
+syn keyword txl_keyword contained defun defvar defvarl del
+syn keyword txl_keyword contained delay delete-package display-width do
+syn keyword txl_keyword contained dohash dotimes downcase-str dup
+syn keyword txl_keyword contained dupfd dwim each each*
+syn keyword txl_keyword contained eighth empty endpwent ensure-dir
+syn keyword txl_keyword contained env env-fbind env-hash env-vbind
+syn keyword txl_keyword contained eq eql equal errno
+syn keyword txl_keyword contained error eval evenp exec
+syn keyword txl_keyword contained exit exit* exp expt
+syn keyword txl_keyword contained exptmod false fboundp fifth
 syn keyword txl_keyword contained fileno filter-equal filter-string-tree finalize
 syn keyword txl_keyword contained find find-if find-max find-min
 syn keyword txl_keyword contained find-package find-struct-type first fixnump
@@ -123,37 +142,37 @@ 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 lbind 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 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-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
@@ -161,103 +180,108 @@ 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 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-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-rdhup 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 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 quasi quasilist quote 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 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-vec rest
-syn keyword txl_keyword contained ret retf return return-from
-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 sethash
-syn keyword txl_keyword contained setitimer setlogmask setpwent setq
+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-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 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 rcomb
+syn keyword txl_keyword contained read readlink real-time-stream-p reduce-left
+syn keyword txl_keyword contained reduce-right ref refset regex-compile
+syn keyword txl_keyword contained regex-parse regexp 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-vec
+syn keyword txl_keyword contained rest ret retf return
+syn keyword txl_keyword contained return-from 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 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-lost 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 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 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 succ super swap
+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 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 stdlib str< str<=
+syn keyword txl_keyword contained str= str> str>= stream-get-prop
+syn keyword txl_keyword contained stream-set-prop streamp string-extend string-lt
+syn keyword txl_keyword contained stringp struct-type struct-type-p structp
+syn keyword txl_keyword contained sub sub-list sub-str sub-vec
+syn keyword txl_keyword contained subtypep succ super swap
 syn keyword txl_keyword contained symacrolet symbol-function symbol-name symbol-package
-syn keyword txl_keyword contained symbol-value symbolp symlink sys-lisp1-value
-syn keyword txl_keyword contained sys-mark-special sys-qquote sys-splice sys-unquote
-syn keyword txl_keyword contained sys:*lisp1* sys:do-path-test sys:eval-err sys:get-fb
-syn keyword txl_keyword contained sys:get-vb sys:l1-setq sys:l1-val sys:path-access
-syn keyword txl_keyword contained sys:path-examine sys:path-test sys:path-test-mode sys:pl-expand
-syn keyword txl_keyword contained sys:placelet-1 sys:struct-lit sys:sym-clobber-expander sys:sym-delete-expander
-syn keyword txl_keyword contained sys:sym-update-expander sys:trigger-load syslog tan
-syn keyword txl_keyword contained tb tc tenth test-set-indent-mode
-syn keyword txl_keyword contained tf third throw throwf
-syn keyword txl_keyword contained time time-fields-local time-fields-utc time-string-local
-syn keyword txl_keyword contained time-string-utc time-struct-local time-struct-utc time-usec
-syn keyword txl_keyword contained tofloat toint tok-str tok-where
-syn keyword txl_keyword contained tostring tostringp tprint transpose
-syn keyword txl_keyword contained tree-bind tree-case tree-find trie-add
-syn keyword txl_keyword contained trie-compress trie-lookup-begin trie-lookup-feed-char trie-value-at
-syn keyword txl_keyword contained trim-str true trunc trunc-rem
-syn keyword txl_keyword contained tuples txr-case txr-case-impl txr-if
-syn keyword txl_keyword contained txr-version txr-when typeof 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 symbol-value symbolp symlink sys:*lisp1*
+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: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:mark-special sys:path-access sys:path-examine
+syn keyword txl_keyword contained sys:path-test sys:path-test-mode sys:pl-expand sys:placelet-1
+syn keyword txl_keyword contained sys:qquote sys:quasi sys:quasilist sys:rplaca
+syn keyword txl_keyword contained sys:rplacd sys:setq sys:setqf sys:splice
+syn keyword txl_keyword contained sys:struct-lit sys:sym-clobber-expander sys:sym-delete-expander sys:sym-update-expander
+syn keyword txl_keyword contained sys:top-fb sys:top-vb sys:trigger-load sys:unquote
+syn keyword txl_keyword contained sys:var sys:with-saved-vars syslog system-package
+syn keyword txl_keyword contained t 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 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 uw-protect var
-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-resources
-syn keyword txl_keyword contained with-saved-vars with-update-expander wrap wrap*
-syn keyword txl_keyword contained zap zerop zip
+syn keyword txl_keyword contained user-package usleep vec 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-resources with-update-expander wrap
+syn keyword txl_keyword contained wrap* zap zerop zip
 syn match txr_nested_error "[^\t ]\+" contained
 syn match txr_variable "\(@[ \t]*\)[*]\?[ \t]*[A-Za-z_][A-Za-z_0-9]*"
 syn match txr_splicevar "@[ \t,*@]*[A-Za-z_][A-Za-z_0-9]*"
diff --git a/txr.1 b/txr.1
index 984c68e7..3166973f 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-09-03 "Utility Commands" "TXR Data Processing Language" "Kaz Kylheku"
+.TH TXR 1 2015-09-11 "Utility Commands" "TXR Data Processing Language" "Kaz Kylheku"
 .SH* NAME
-\*(TX \- text processing language (version 114)
+\*(TX \- text processing language (version 115)
 .SH* SYNOPSIS
 .cblk
 .meti txr >> [ options ] < query-file < data-files ..
diff --git a/txr.vim b/txr.vim
index eff00258..914f705e 100644
--- a/txr.vim
+++ b/txr.vim
@@ -18,7 +18,7 @@
 syn case match
 syn spell toplevel
 
-setlocal iskeyword=a-z,A-Z,48-57,!,$,&,*,+,-,<,=,>,?,\\,_,~,/
+setlocal iskeyword=a-z,A-Z,48-57,!,$,&,*,+,-,:,<,=,>,?,\\,_,~,/
 
 syn keyword txl_keyword contained %e% %pi% * *args*
 syn keyword txl_keyword contained *args-full* *e* *flo-dig* *flo-epsilon*
@@ -26,64 +26,83 @@ syn keyword txl_keyword contained *flo-max* *flo-min* *full-args* *gensym-counte
 syn keyword txl_keyword contained *keyword-package* *lib-version* *pi* *place-clobber-expander*
 syn keyword txl_keyword contained *place-delete-expander* *place-macro* *place-update-expander* *random-state*
 syn keyword txl_keyword contained *self-path* *stddebug* *stderr* *stdin*
-syn keyword txl_keyword contained *stdlog* *stdnull* *stdout* *txr-version*
-syn keyword txl_keyword contained *unhandled-hook* *user-package* + -
-syn keyword txl_keyword contained / /= < <=
-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 boundp
-syn keyword txl_keyword contained break-str caaaaar caaaadr caaaar
-syn keyword txl_keyword contained caaadar caaaddr caaadr caaar
-syn keyword txl_keyword contained caadaar caadadr caadar caaddar
-syn keyword txl_keyword contained caadddr caaddr caadr caar
-syn keyword txl_keyword contained cadaaar cadaadr cadaar cadadar
-syn keyword txl_keyword contained cadaddr cadadr cadar caddaar
-syn keyword txl_keyword contained caddadr caddar cadddar caddddr
-syn keyword txl_keyword contained cadddr caddr cadr call
-syn keyword txl_keyword contained call-clobber-expander call-delete-expander call-update-expander callf
-syn keyword txl_keyword contained car caseq caseql casequal
-syn keyword txl_keyword contained cat-str cat-streams cat-vec catch
-syn keyword txl_keyword contained catenated-stream-p catenated-stream-push cdaaaar cdaaadr
-syn keyword txl_keyword contained cdaaar cdaadar cdaaddr cdaadr
-syn keyword txl_keyword contained cdaar cdadaar cdadadr cdadar
-syn keyword txl_keyword contained cdaddar cdadddr cdaddr cdadr
-syn keyword txl_keyword contained cdar cddaaar cddaadr cddaar
-syn keyword txl_keyword contained cddadar cddaddr cddadr cddar
-syn keyword txl_keyword contained cdddaar cdddadr cdddar cddddar
-syn keyword txl_keyword contained cdddddr cddddr cdddr cddr
-syn keyword txl_keyword contained cdr ceil chain chand
-syn keyword txl_keyword contained chdir chmod chr-isalnum chr-isalpha
-syn keyword txl_keyword contained chr-isascii chr-isblank chr-iscntrl chr-isdigit
-syn keyword txl_keyword contained chr-isgraph chr-islower chr-isprint chr-ispunct
-syn keyword txl_keyword contained chr-isspace chr-isunisp chr-isupper chr-isxdigit
-syn keyword txl_keyword contained chr-num chr-str chr-str-set chr-tolower
-syn keyword txl_keyword contained chr-toupper chrp clamp clear-error
-syn keyword txl_keyword contained close-stream closelog cmp-str collect-each
-syn keyword txl_keyword contained collect-each* comb compl-span-str cond
-syn keyword txl_keyword contained conda cons conses conses*
-syn keyword txl_keyword contained consp constantp copy copy-alist
-syn keyword txl_keyword contained copy-cons copy-hash copy-list copy-str
-syn keyword txl_keyword contained copy-struct copy-vec cos count-if
-syn keyword txl_keyword contained countq countql countqual cum-norm-dist
-syn keyword txl_keyword contained daemon dec define-modify-macro define-place-macro
-syn keyword txl_keyword contained defmacro defparm defparml defplace
-syn keyword txl_keyword contained defstruct defsymacro defun defvar
-syn keyword txl_keyword contained defvarl del delay delete-package
-syn keyword txl_keyword contained display-width do dohash dotimes
-syn keyword txl_keyword contained downcase-str dup dupfd dwim
-syn keyword txl_keyword contained each each* eighth empty
-syn keyword txl_keyword contained endpwent ensure-dir env env-fbind
-syn keyword txl_keyword contained env-hash env-vbind eq eql
-syn keyword txl_keyword contained equal errno error eval
-syn keyword txl_keyword contained evenp exec exit exit*
-syn keyword txl_keyword contained exp expr expt exptmod
-syn keyword txl_keyword contained false fbind fboundp fifth
+syn keyword txl_keyword contained *stdlog* *stdnull* *stdout* *system-package*
+syn keyword txl_keyword contained *txr-version* *unhandled-hook* *user-package* +
+syn keyword txl_keyword contained - / /= :
+syn keyword txl_keyword contained :append :args :atime :auto
+syn keyword txl_keyword contained :blksize :blocks :cdigit :chars
+syn keyword txl_keyword contained :continue :counter :cspace :ctime
+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 :finish :from-current :from-end
+syn keyword txl_keyword contained :from-start :from_html :frompercent :fromurl
+syn keyword txl_keyword contained :fun :gap :gid :greedy
+syn keyword txl_keyword contained :hextoint :ino :into :lfilt
+syn keyword txl_keyword contained :lines :list :longest :maxgap
+syn keyword txl_keyword contained :maxtimes :mingap :mintimes :mode
+syn keyword txl_keyword contained :mtime :name :named :next-spec
+syn keyword txl_keyword contained :nlink :nothrow :prio :rdev
+syn keyword txl_keyword contained :real-time :repeat-spec :resolve :rfilt
+syn keyword txl_keyword contained :shortest :size :space :string
+syn keyword txl_keyword contained :symacro :times :to_html :tofloat
+syn keyword txl_keyword contained :toint :tonumber :topercent :tourl
+syn keyword txl_keyword contained :uid :upcase :var :vars
+syn keyword txl_keyword contained :weak-keys :weak-vals :whole :word-char
+syn keyword txl_keyword contained < <= = >
+syn keyword txl_keyword contained >= abort abs abs-path-p
+syn keyword txl_keyword contained acons acons-new aconsql-new acos
+syn keyword txl_keyword contained ado alist-nremove alist-remove all
+syn keyword txl_keyword contained and andf ap apf
+syn keyword txl_keyword contained append append* append-each append-each*
+syn keyword txl_keyword contained apply aret ash asin
+syn keyword txl_keyword contained assoc assql atan atan2
+syn keyword txl_keyword contained atom bignump bindable bit
+syn keyword txl_keyword contained block boundp break-str 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
+syn keyword txl_keyword contained caadr caar cadaaar cadaadr
+syn keyword txl_keyword contained cadaar cadadar cadaddr cadadr
+syn keyword txl_keyword contained cadar caddaar caddadr caddar
+syn keyword txl_keyword contained cadddar caddddr cadddr caddr
+syn keyword txl_keyword contained cadr call call-clobber-expander call-delete-expander
+syn keyword txl_keyword contained call-update-expander callf car caseq
+syn keyword txl_keyword contained caseql casequal cat-str cat-streams
+syn keyword txl_keyword contained cat-vec catch catenated-stream-p catenated-stream-push
+syn keyword txl_keyword contained cdaaaar cdaaadr cdaaar cdaadar
+syn keyword txl_keyword contained cdaaddr cdaadr cdaar cdadaar
+syn keyword txl_keyword contained cdadadr cdadar cdaddar cdadddr
+syn keyword txl_keyword contained cdaddr cdadr cdar cddaaar
+syn keyword txl_keyword contained cddaadr cddaar cddadar cddaddr
+syn keyword txl_keyword contained cddadr cddar cdddaar cdddadr
+syn keyword txl_keyword contained cdddar cddddar cdddddr cddddr
+syn keyword txl_keyword contained cdddr cddr cdr ceil
+syn keyword txl_keyword contained chain chand chdir chmod
+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 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 define-modify-macro define-place-macro defmacro defparm
+syn keyword txl_keyword contained defparml defplace defstruct defsymacro
+syn keyword txl_keyword contained defun defvar defvarl del
+syn keyword txl_keyword contained delay delete-package display-width do
+syn keyword txl_keyword contained dohash dotimes downcase-str dup
+syn keyword txl_keyword contained dupfd dwim each each*
+syn keyword txl_keyword contained eighth empty endpwent ensure-dir
+syn keyword txl_keyword contained env env-fbind env-hash env-vbind
+syn keyword txl_keyword contained eq eql equal errno
+syn keyword txl_keyword contained error eval evenp exec
+syn keyword txl_keyword contained exit exit* exp expt
+syn keyword txl_keyword contained exptmod false fboundp fifth
 syn keyword txl_keyword contained fileno filter-equal filter-string-tree finalize
 syn keyword txl_keyword contained find find-if find-max find-min
 syn keyword txl_keyword contained find-package find-struct-type first fixnump
@@ -123,37 +142,37 @@ 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 lbind 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 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-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
@@ -161,103 +180,108 @@ 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 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-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-rdhup 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 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 quasi quasilist quote 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 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-vec rest
-syn keyword txl_keyword contained ret retf return return-from
-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 sethash
-syn keyword txl_keyword contained setitimer setlogmask setpwent setq
+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-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 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 rcomb
+syn keyword txl_keyword contained read readlink real-time-stream-p reduce-left
+syn keyword txl_keyword contained reduce-right ref refset regex-compile
+syn keyword txl_keyword contained regex-parse regexp 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-vec
+syn keyword txl_keyword contained rest ret retf return
+syn keyword txl_keyword contained return-from 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 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-lost 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 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 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 succ super swap
+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 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 stdlib str< str<=
+syn keyword txl_keyword contained str= str> str>= stream-get-prop
+syn keyword txl_keyword contained stream-set-prop streamp string-extend string-lt
+syn keyword txl_keyword contained stringp struct-type struct-type-p structp
+syn keyword txl_keyword contained sub sub-list sub-str sub-vec
+syn keyword txl_keyword contained subtypep succ super swap
 syn keyword txl_keyword contained symacrolet symbol-function symbol-name symbol-package
-syn keyword txl_keyword contained symbol-value symbolp symlink sys-lisp1-value
-syn keyword txl_keyword contained sys-mark-special sys-qquote sys-splice sys-unquote
-syn keyword txl_keyword contained sys:*lisp1* sys:do-path-test sys:eval-err sys:get-fb
-syn keyword txl_keyword contained sys:get-vb sys:l1-setq sys:l1-val sys:path-access
-syn keyword txl_keyword contained sys:path-examine sys:path-test sys:path-test-mode sys:pl-expand
-syn keyword txl_keyword contained sys:placelet-1 sys:struct-lit sys:sym-clobber-expander sys:sym-delete-expander
-syn keyword txl_keyword contained sys:sym-update-expander sys:trigger-load syslog tan
-syn keyword txl_keyword contained tb tc tenth test-set-indent-mode
-syn keyword txl_keyword contained tf third throw throwf
-syn keyword txl_keyword contained time time-fields-local time-fields-utc time-string-local
-syn keyword txl_keyword contained time-string-utc time-struct-local time-struct-utc time-usec
-syn keyword txl_keyword contained tofloat toint tok-str tok-where
-syn keyword txl_keyword contained tostring tostringp tprint transpose
-syn keyword txl_keyword contained tree-bind tree-case tree-find trie-add
-syn keyword txl_keyword contained trie-compress trie-lookup-begin trie-lookup-feed-char trie-value-at
-syn keyword txl_keyword contained trim-str true trunc trunc-rem
-syn keyword txl_keyword contained tuples txr-case txr-case-impl txr-if
-syn keyword txl_keyword contained txr-version txr-when typeof 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 symbol-value symbolp symlink sys:*lisp1*
+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: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:mark-special sys:path-access sys:path-examine
+syn keyword txl_keyword contained sys:path-test sys:path-test-mode sys:pl-expand sys:placelet-1
+syn keyword txl_keyword contained sys:qquote sys:quasi sys:quasilist sys:rplaca
+syn keyword txl_keyword contained sys:rplacd sys:setq sys:setqf sys:splice
+syn keyword txl_keyword contained sys:struct-lit sys:sym-clobber-expander sys:sym-delete-expander sys:sym-update-expander
+syn keyword txl_keyword contained sys:top-fb sys:top-vb sys:trigger-load sys:unquote
+syn keyword txl_keyword contained sys:var sys:with-saved-vars syslog system-package
+syn keyword txl_keyword contained t 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 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 uw-protect var
-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-resources
-syn keyword txl_keyword contained with-saved-vars with-update-expander wrap wrap*
-syn keyword txl_keyword contained zap zerop zip
+syn keyword txl_keyword contained user-package usleep vec 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-resources with-update-expander wrap
+syn keyword txl_keyword contained wrap* zap zerop zip
 
 syn keyword txr_keyword contained accept all and assert
 syn keyword txr_keyword contained bind block cases cat