Version 111.txr-111

7 files changed, 311 insertions, 210 deletions

diff --git a/ChangeLog b/ChangeLog
index b07d3f72..5b23ad2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2015-08-08  Kaz Kylheku  <kaz@kylheku.com>
+
+	Version 111.
+
+	* RELNOTES: Updated.
+
+	* configure, txr.1: Bumped version and date.
+
+	* share/txr/stdlib/ver.tl: Likewise.
+
+	* tl.vim, txr.vim: Regenerated.
+
 2015-08-07  Kaz Kylheku  <kaz@kylheku.com>
 
 	C++ upkeep: conversions, clashes, warnings.
diff --git a/RELNOTES b/RELNOTES
index 621112ca..8f938f7b 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,70 @@
+                                    TXR 111
+                                   2015-08-08
+
+
+  Features
+
+  - Nested structural objects (list structure, vectors, hashes) are now printed
+    with line breaks and indentation.
+
+  - Introducing global lexical variables, introduced with defvar
+    and defparml. Global lexicals are not marked special, and so local
+    bindings of the same symbols are ordinary lexicals and not dynamic.
+
+  - Numerous variables in the library are now global lexical rather than special.
+
+  - pi and e are now provided as %pi% and %e%, global lexical.
+    The *pi* and *e* specials are retained, and obsolescent.
+
+  - New hash-revget function for reverse lookup through hash tables.
+
+  - New function func-get-name for obtaining name from function.
+
+  - New ~! format directive for controlling hanging indentation.
+
+  - format conversions now support ^ character for centering within
+    a field.
+
+  - Output streams now support indentation. This is used by the object
+    printer and by the ~! format directive, and also exposed by
+    a group of new functions like set-indent-mode.
+
+  - TXR Lisp documentation sections re-arranged for better organization,
+    and other improvements in documentation.
+
+  - Improvements in matching error exceptions to source code location,
+    and some other diagnostic improvements.
+
+  - New wrapper functions for Unix lstat and fstat for inquiring about the
+    properties of symbolic links, and open files.
+
+  - New Unix wrappers for uid/gid functions: getuid, setuid, etc.
+
+  - New functions for conveniently testing for file existence, type, ownership
+    and permission, and relative age.
+
+  - Debugger won't step into auto-loaded library code now, unless
+    requested with new --debug-autoload command line option.
+
+  Bugs
+
+  - Fixed parsing bug in txr-case macro: throwing error on correct syntax.
+
+  - Discovered that an object initialization pattern believed to be
+    correct is flawed in the face of generational GC. Fixed instances
+    in hashing and regex module.
+
+  - Documented special variable *args-full* is now actually implemented.
+    It was implemented as *full-args*, which is retained, but obsolescent.
+
+  - Operations on an output string stream which overflow throw
+    exception instead of returning nil.
+
+  - Fixed incorrect handling of negative field widths in format,
+    when specified dynamically via *.
+
+
+
                                     TXR 110
                                    2015-07-25
 
diff --git a/configure b/configure
index 56d6b59d..4c0b9ffa 100755
--- a/configure
+++ b/configure
@@ -427,7 +427,7 @@ fi
 #
 
 
-txr_ver=110
+txr_ver=111
 
 #
 # The all important banner.
diff --git a/share/txr/stdlib/ver.tl b/share/txr/stdlib/ver.tl
index a721092f..9a314bee 100644
--- a/share/txr/stdlib/ver.tl
+++ b/share/txr/stdlib/ver.tl
@@ -1,2 +1,2 @@
-(defvarl lib-version 110)
+(defvarl lib-version 111)
 (defvarl *lib-version* lib-version)
diff --git a/tl.vim b/tl.vim
index d48cd574..19a56395 100644
--- a/tl.vim
+++ b/tl.vim
@@ -20,9 +20,10 @@ syn spell toplevel
 
 setlocal iskeyword=a-z,A-Z,48-57,!,$,&,*,+,-,<,=,>,?,\\,_,~,/
 
-syn keyword txl_keyword contained * *args* *e* *flo-dig*
-syn keyword txl_keyword contained *flo-epsilon* *flo-max* *flo-min* *full-args*
-syn keyword txl_keyword contained *gensym-counter* *keyword-package* *pi* *place-clobber-expander*
+syn keyword txl_keyword contained %e% %pi% * *args*
+syn keyword txl_keyword contained *args-full* *e* *flo-dig* *flo-epsilon*
+syn keyword txl_keyword contained *flo-max* *flo-min* *full-args* *gensym-counter*
+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*
@@ -71,64 +72,70 @@ syn keyword txl_keyword contained copy-hash copy-list copy-str 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 defplace defsymacro defun defvar
-syn keyword txl_keyword contained del delay delete-package 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 ensure-dir env
-syn keyword txl_keyword contained env-fbind env-hash env-vbind eq
-syn keyword txl_keyword contained eql equal errno error
-syn keyword txl_keyword contained eval evenp exec exit
-syn keyword txl_keyword contained exit* exp expt exptmod
-syn keyword txl_keyword contained false fbind 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 first fixnump flatten
-syn keyword txl_keyword contained flatten* flet flip flipargs
-syn keyword txl_keyword contained flo-int flo-str floatp floor
-syn keyword txl_keyword contained flush-stream fmakunbound for for*
-syn keyword txl_keyword contained force fork format fourth
-syn keyword txl_keyword contained fun func-get-env func-get-form func-set-env
-syn keyword txl_keyword contained functionp gcd gen generate
-syn keyword txl_keyword contained gensym gequal get-byte get-char
-syn keyword txl_keyword contained get-clobber-expander get-delete-expander get-error get-error-str
-syn keyword txl_keyword contained get-hash-userdata get-line get-lines get-list-from-stream
-syn keyword txl_keyword contained get-sig-handler get-string get-string-from-stream get-update-expander
-syn keyword txl_keyword contained getenv gethash getitimer getpid
-syn keyword txl_keyword contained getppid giterate glob glob-altdirfunc
+syn keyword txl_keyword contained defparml defplace defsymacro defun
+syn keyword txl_keyword contained defvar defvarl del delay
+syn keyword txl_keyword contained delete-package 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 ensure-dir env env-fbind env-hash
+syn keyword txl_keyword contained env-vbind eq eql equal
+syn keyword txl_keyword contained errno error eval evenp
+syn keyword txl_keyword contained exec exit exit* exp
+syn keyword txl_keyword contained expr expt exptmod false
+syn keyword txl_keyword contained fbind fboundp fifth fileno
+syn keyword txl_keyword contained filter-equal filter-string-tree finalize find
+syn keyword txl_keyword contained find-if find-max find-min find-package
+syn keyword txl_keyword contained first fixnump flatten flatten*
+syn keyword txl_keyword contained flet flip flipargs flo-dig
+syn keyword txl_keyword contained flo-epsilon flo-int flo-max flo-min
+syn keyword txl_keyword contained flo-str floatp floor flush-stream
+syn keyword txl_keyword contained fmakunbound for for* force
+syn keyword txl_keyword contained fork format fourth fstat
+syn keyword txl_keyword contained fun func-get-env func-get-form func-get-name
+syn keyword txl_keyword contained func-set-env functionp gcd gen
+syn keyword txl_keyword contained generate gensym gequal get-byte
+syn keyword txl_keyword contained get-char get-clobber-expander get-delete-expander get-error
+syn keyword txl_keyword contained get-error-str get-hash-userdata get-indent get-indent-mode
+syn keyword txl_keyword contained get-line get-lines get-list-from-stream get-sig-handler
+syn keyword txl_keyword contained get-string get-string-from-stream get-update-expander getegid
+syn keyword txl_keyword contained getenv geteuid getgid getgroups
+syn keyword txl_keyword contained gethash getitimer getpid getppid
+syn keyword txl_keyword contained getuid giterate glob glob-altdirfunc
 syn keyword txl_keyword contained glob-brace glob-err glob-mark glob-nocheck
 syn keyword txl_keyword contained glob-noescape glob-nomagic glob-nosort glob-onlydir
 syn keyword txl_keyword contained glob-period glob-tilde glob-tilde-check greater
 syn keyword txl_keyword contained group-by gun hash hash-alist
 syn keyword txl_keyword contained hash-construct hash-count hash-diff hash-eql
 syn keyword txl_keyword contained hash-equal hash-from-pairs hash-isec hash-keys
-syn keyword txl_keyword contained hash-list hash-pairs hash-proper-subset hash-subset
-syn keyword txl_keyword contained hash-uni hash-update hash-update-1 hash-values
-syn keyword txl_keyword contained hashp have html-decode html-encode
-syn keyword txl_keyword contained iapply identity ido if
-syn keyword txl_keyword contained ifa iff iffi iflet
-syn keyword txl_keyword contained ignerr in inc inhash
-syn keyword txl_keyword contained int-flo int-str integerp intern
-syn keyword txl_keyword contained interp-fun-p interpose ip ipf
-syn keyword txl_keyword contained isqrt itimer-prov itimer-real itimer-virtual
-syn keyword txl_keyword contained juxt keep-if keep-if* keywordp
-syn keyword txl_keyword contained kill labels lambda last
-syn keyword txl_keyword contained lazy-str lazy-str-force lazy-str-force-upto lazy-str-get-trailing-list
-syn keyword txl_keyword contained lazy-stream-cons lazy-stringp lbind lcm
-syn keyword txl_keyword contained lcons lcons-fun lconsp ldiff
-syn keyword txl_keyword contained length length-list length-str length-str-<
-syn keyword txl_keyword contained length-str-<= length-str-> length-str->= length-vec
-syn keyword txl_keyword contained lequal less let let*
-syn keyword txl_keyword contained lexical-fun-p lexical-lisp1-binding lexical-var-p 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 mac-param-bind macro-form-p
+syn keyword txl_keyword contained hash-list hash-pairs hash-proper-subset hash-revget
+syn keyword txl_keyword contained hash-subset hash-uni hash-update hash-update-1
+syn keyword txl_keyword contained hash-values hashp have html-decode
+syn keyword txl_keyword contained html-encode iapply identity ido
+syn keyword txl_keyword contained if ifa iff iffi
+syn keyword txl_keyword contained iflet ignerr in inc
+syn keyword txl_keyword contained inc-indent indent-code indent-data indent-off
+syn keyword txl_keyword contained inhash int-flo int-str integerp
+syn keyword txl_keyword contained intern interp-fun-p interpose ip
+syn keyword txl_keyword contained ipf isqrt itimer-prov itimer-real
+syn keyword txl_keyword contained itimer-virtual juxt keep-if keep-if*
+syn keyword txl_keyword contained keyword-package keywordp kill labels
+syn keyword txl_keyword contained lambda last lazy-str lazy-str-force
+syn keyword txl_keyword contained lazy-str-force-upto lazy-str-get-trailing-list lazy-stream-cons lazy-stringp
+syn keyword txl_keyword contained lbind 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
@@ -184,57 +191,61 @@ syn keyword txl_keyword contained s-irwxu s-isgid s-isuid s-isvtx
 syn keyword txl_keyword contained s-iwgrp s-iwoth s-iwusr s-ixgrp
 syn keyword txl_keyword contained s-ixoth s-ixusr search search-regex
 syn keyword txl_keyword contained search-regst search-str search-str-tree second
-syn keyword txl_keyword contained seek-stream select seqp set
-syn keyword txl_keyword contained set-diff set-hash-userdata set-sig-handler setenv
-syn keyword txl_keyword contained sethash setitimer setlogmask setq
-syn keyword txl_keyword contained seventh sh shift sig-abrt
-syn keyword txl_keyword contained sig-alrm sig-bus sig-check sig-chld
-syn keyword txl_keyword contained sig-cont sig-fpe sig-hup sig-ill
-syn keyword txl_keyword contained sig-int sig-io sig-iot sig-kill
-syn keyword txl_keyword contained sig-lost sig-pipe sig-poll sig-prof
-syn keyword txl_keyword contained sig-pwr sig-quit sig-segv sig-stkflt
-syn keyword txl_keyword contained sig-stop sig-sys sig-term sig-trap
-syn keyword txl_keyword contained sig-tstp sig-ttin sig-ttou sig-urg
-syn keyword txl_keyword contained sig-usr1 sig-usr2 sig-vtalrm sig-winch
-syn keyword txl_keyword contained sig-xcpu sig-xfsz sign-extend sin
-syn keyword txl_keyword contained sixth size-vec some sort
-syn keyword txl_keyword contained sort-group source-loc source-loc-str span-str
-syn keyword txl_keyword contained splice split split-str split-str-set
-syn keyword txl_keyword contained sqrt sssucc ssucc stat
-syn keyword txl_keyword contained stdlib str< str<= str=
-syn keyword txl_keyword contained str> str>= stream-get-prop stream-set-prop
-syn keyword txl_keyword contained streamp string-extend string-lt stringp
-syn keyword txl_keyword contained sub sub-list sub-str sub-vec
-syn keyword txl_keyword contained succ swap symacrolet symbol-function
-syn keyword txl_keyword contained symbol-name symbol-package symbol-value symbolp
-syn keyword txl_keyword contained symlink sys-lisp1-value sys-qquote sys-splice
-syn keyword txl_keyword contained sys-unquote sys:*lisp1* sys:eval-err sys:get-fb
-syn keyword txl_keyword contained sys:get-vb sys:l1-setq sys:l1-val sys:pl-expand
-syn keyword txl_keyword contained sys:placelet-1 sys:sym-clobber-expander sys:sym-delete-expander sys:sym-update-expander
-syn keyword txl_keyword contained sys:trigger-load syslog tan tb
-syn keyword txl_keyword contained tc tenth 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-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 seek-stream select self-path seqp
+syn keyword txl_keyword contained set set-diff set-hash-userdata set-indent
+syn keyword txl_keyword contained set-indent-mode set-sig-handler setegid setenv
+syn keyword txl_keyword contained seteuid setgid sethash setitimer
+syn keyword txl_keyword contained setlogmask setq setuid seventh
+syn keyword txl_keyword contained sh shift 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-lost
+syn keyword txl_keyword contained sig-pipe sig-poll sig-prof sig-pwr
+syn keyword txl_keyword contained sig-quit sig-segv sig-stkflt sig-stop
+syn keyword txl_keyword contained sig-sys sig-term sig-trap sig-tstp
+syn keyword txl_keyword contained sig-ttin sig-ttou sig-urg sig-usr1
+syn keyword txl_keyword contained sig-usr2 sig-vtalrm sig-winch sig-xcpu
+syn keyword txl_keyword contained sig-xfsz sign-extend sin sixth
+syn keyword txl_keyword contained size-vec 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 sub sub-list sub-str
+syn keyword txl_keyword contained sub-vec succ swap symacrolet
+syn keyword txl_keyword contained symbol-function symbol-name symbol-package symbol-value
+syn keyword txl_keyword contained symbolp symlink sys-lisp1-value sys-mark-special
+syn keyword txl_keyword contained sys-qquote sys-splice sys-unquote sys:*lisp1*
+syn keyword txl_keyword contained sys:eval-err sys:get-fb sys:get-vb sys:l1-setq
+syn keyword txl_keyword contained sys:l1-val sys:pl-expand sys:placelet-1 sys:sym-clobber-expander
+syn keyword txl_keyword contained sys:sym-delete-expander sys:sym-update-expander sys:trigger-load syslog
+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-usec tofloat
+syn keyword txl_keyword contained toint tok-str tok-where tostring
+syn keyword txl_keyword contained tostringp tprint transpose tree-bind
+syn keyword txl_keyword contained tree-case tree-find trie-add trie-compress
+syn keyword txl_keyword contained trie-lookup-begin trie-lookup-feed-char trie-value-at trim-str
+syn keyword txl_keyword contained true trunc trunc-rem tuples
+syn keyword txl_keyword contained txr-case txr-case-impl txr-if txr-version
 syn keyword txl_keyword contained txr-when typeof unget-byte unget-char
 syn keyword txl_keyword contained uniq unique unless unquote
 syn keyword txl_keyword contained unsetenv until until* upcase-str
-syn keyword txl_keyword contained update url-decode url-encode usleep
-syn keyword txl_keyword contained uw-protect vec 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 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 update url-decode url-encode user-package
+syn keyword txl_keyword contained usleep uw-protect var vec
+syn keyword txl_keyword contained vec-push vec-set-length vecref vector
+syn keyword txl_keyword contained vector-list vectorp w-continued w-coredump
+syn keyword txl_keyword contained w-exitstatus w-ifcontinued w-ifexited w-ifsignaled
+syn keyword txl_keyword contained w-ifstopped w-nohang w-stopsig w-termsig
+syn keyword txl_keyword contained w-untraced wait weave when
+syn keyword txl_keyword contained whenlet where while while*
+syn keyword txl_keyword contained whilet width width-check with-clobber-expander
+syn keyword txl_keyword contained with-delete-expander with-gensyms with-resources with-saved-vars
+syn keyword txl_keyword contained with-update-expander wrap wrap* zap
+syn keyword txl_keyword contained 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 bf5a553f..a2c1ee32 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-07-25 "Utility Commands" "TXR Data Processing Language" "Kaz Kylheku"
+.TH TXR 1 2015-08-08 "Utility Commands" "TXR Data Processing Language" "Kaz Kylheku"
 .SH* NAME
-\*(TX \- text processing language (version 110)
+\*(TX \- text processing language (version 111)
 .SH* SYNOPSIS
 .cblk
 .meti txr >> [ options ] < query-file < data-files ..
diff --git a/txr.vim b/txr.vim
index 0ab9438a..deaa2866 100644
--- a/txr.vim
+++ b/txr.vim
@@ -20,9 +20,10 @@ syn spell toplevel
 
 setlocal iskeyword=a-z,A-Z,48-57,!,$,&,*,+,-,<,=,>,?,\\,_,~,/
 
-syn keyword txl_keyword contained * *args* *e* *flo-dig*
-syn keyword txl_keyword contained *flo-epsilon* *flo-max* *flo-min* *full-args*
-syn keyword txl_keyword contained *gensym-counter* *keyword-package* *pi* *place-clobber-expander*
+syn keyword txl_keyword contained %e% %pi% * *args*
+syn keyword txl_keyword contained *args-full* *e* *flo-dig* *flo-epsilon*
+syn keyword txl_keyword contained *flo-max* *flo-min* *full-args* *gensym-counter*
+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*
@@ -71,64 +72,70 @@ syn keyword txl_keyword contained copy-hash copy-list copy-str 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 defplace defsymacro defun defvar
-syn keyword txl_keyword contained del delay delete-package 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 ensure-dir env
-syn keyword txl_keyword contained env-fbind env-hash env-vbind eq
-syn keyword txl_keyword contained eql equal errno error
-syn keyword txl_keyword contained eval evenp exec exit
-syn keyword txl_keyword contained exit* exp expt exptmod
-syn keyword txl_keyword contained false fbind 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 first fixnump flatten
-syn keyword txl_keyword contained flatten* flet flip flipargs
-syn keyword txl_keyword contained flo-int flo-str floatp floor
-syn keyword txl_keyword contained flush-stream fmakunbound for for*
-syn keyword txl_keyword contained force fork format fourth
-syn keyword txl_keyword contained fun func-get-env func-get-form func-set-env
-syn keyword txl_keyword contained functionp gcd gen generate
-syn keyword txl_keyword contained gensym gequal get-byte get-char
-syn keyword txl_keyword contained get-clobber-expander get-delete-expander get-error get-error-str
-syn keyword txl_keyword contained get-hash-userdata get-line get-lines get-list-from-stream
-syn keyword txl_keyword contained get-sig-handler get-string get-string-from-stream get-update-expander
-syn keyword txl_keyword contained getenv gethash getitimer getpid
-syn keyword txl_keyword contained getppid giterate glob glob-altdirfunc
+syn keyword txl_keyword contained defparml defplace defsymacro defun
+syn keyword txl_keyword contained defvar defvarl del delay
+syn keyword txl_keyword contained delete-package 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 ensure-dir env env-fbind env-hash
+syn keyword txl_keyword contained env-vbind eq eql equal
+syn keyword txl_keyword contained errno error eval evenp
+syn keyword txl_keyword contained exec exit exit* exp
+syn keyword txl_keyword contained expr expt exptmod false
+syn keyword txl_keyword contained fbind fboundp fifth fileno
+syn keyword txl_keyword contained filter-equal filter-string-tree finalize find
+syn keyword txl_keyword contained find-if find-max find-min find-package
+syn keyword txl_keyword contained first fixnump flatten flatten*
+syn keyword txl_keyword contained flet flip flipargs flo-dig
+syn keyword txl_keyword contained flo-epsilon flo-int flo-max flo-min
+syn keyword txl_keyword contained flo-str floatp floor flush-stream
+syn keyword txl_keyword contained fmakunbound for for* force
+syn keyword txl_keyword contained fork format fourth fstat
+syn keyword txl_keyword contained fun func-get-env func-get-form func-get-name
+syn keyword txl_keyword contained func-set-env functionp gcd gen
+syn keyword txl_keyword contained generate gensym gequal get-byte
+syn keyword txl_keyword contained get-char get-clobber-expander get-delete-expander get-error
+syn keyword txl_keyword contained get-error-str get-hash-userdata get-indent get-indent-mode
+syn keyword txl_keyword contained get-line get-lines get-list-from-stream get-sig-handler
+syn keyword txl_keyword contained get-string get-string-from-stream get-update-expander getegid
+syn keyword txl_keyword contained getenv geteuid getgid getgroups
+syn keyword txl_keyword contained gethash getitimer getpid getppid
+syn keyword txl_keyword contained getuid giterate glob glob-altdirfunc
 syn keyword txl_keyword contained glob-brace glob-err glob-mark glob-nocheck
 syn keyword txl_keyword contained glob-noescape glob-nomagic glob-nosort glob-onlydir
 syn keyword txl_keyword contained glob-period glob-tilde glob-tilde-check greater
 syn keyword txl_keyword contained group-by gun hash hash-alist
 syn keyword txl_keyword contained hash-construct hash-count hash-diff hash-eql
 syn keyword txl_keyword contained hash-equal hash-from-pairs hash-isec hash-keys
-syn keyword txl_keyword contained hash-list hash-pairs hash-proper-subset hash-subset
-syn keyword txl_keyword contained hash-uni hash-update hash-update-1 hash-values
-syn keyword txl_keyword contained hashp have html-decode html-encode
-syn keyword txl_keyword contained iapply identity ido if
-syn keyword txl_keyword contained ifa iff iffi iflet
-syn keyword txl_keyword contained ignerr in inc inhash
-syn keyword txl_keyword contained int-flo int-str integerp intern
-syn keyword txl_keyword contained interp-fun-p interpose ip ipf
-syn keyword txl_keyword contained isqrt itimer-prov itimer-real itimer-virtual
-syn keyword txl_keyword contained juxt keep-if keep-if* keywordp
-syn keyword txl_keyword contained kill labels lambda last
-syn keyword txl_keyword contained lazy-str lazy-str-force lazy-str-force-upto lazy-str-get-trailing-list
-syn keyword txl_keyword contained lazy-stream-cons lazy-stringp lbind lcm
-syn keyword txl_keyword contained lcons lcons-fun lconsp ldiff
-syn keyword txl_keyword contained length length-list length-str length-str-<
-syn keyword txl_keyword contained length-str-<= length-str-> length-str->= length-vec
-syn keyword txl_keyword contained lequal less let let*
-syn keyword txl_keyword contained lexical-fun-p lexical-lisp1-binding lexical-var-p 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 mac-param-bind macro-form-p
+syn keyword txl_keyword contained hash-list hash-pairs hash-proper-subset hash-revget
+syn keyword txl_keyword contained hash-subset hash-uni hash-update hash-update-1
+syn keyword txl_keyword contained hash-values hashp have html-decode
+syn keyword txl_keyword contained html-encode iapply identity ido
+syn keyword txl_keyword contained if ifa iff iffi
+syn keyword txl_keyword contained iflet ignerr in inc
+syn keyword txl_keyword contained inc-indent indent-code indent-data indent-off
+syn keyword txl_keyword contained inhash int-flo int-str integerp
+syn keyword txl_keyword contained intern interp-fun-p interpose ip
+syn keyword txl_keyword contained ipf isqrt itimer-prov itimer-real
+syn keyword txl_keyword contained itimer-virtual juxt keep-if keep-if*
+syn keyword txl_keyword contained keyword-package keywordp kill labels
+syn keyword txl_keyword contained lambda last lazy-str lazy-str-force
+syn keyword txl_keyword contained lazy-str-force-upto lazy-str-get-trailing-list lazy-stream-cons lazy-stringp
+syn keyword txl_keyword contained lbind 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
@@ -184,57 +191,61 @@ syn keyword txl_keyword contained s-irwxu s-isgid s-isuid s-isvtx
 syn keyword txl_keyword contained s-iwgrp s-iwoth s-iwusr s-ixgrp
 syn keyword txl_keyword contained s-ixoth s-ixusr search search-regex
 syn keyword txl_keyword contained search-regst search-str search-str-tree second
-syn keyword txl_keyword contained seek-stream select seqp set
-syn keyword txl_keyword contained set-diff set-hash-userdata set-sig-handler setenv
-syn keyword txl_keyword contained sethash setitimer setlogmask setq
-syn keyword txl_keyword contained seventh sh shift sig-abrt
-syn keyword txl_keyword contained sig-alrm sig-bus sig-check sig-chld
-syn keyword txl_keyword contained sig-cont sig-fpe sig-hup sig-ill
-syn keyword txl_keyword contained sig-int sig-io sig-iot sig-kill
-syn keyword txl_keyword contained sig-lost sig-pipe sig-poll sig-prof
-syn keyword txl_keyword contained sig-pwr sig-quit sig-segv sig-stkflt
-syn keyword txl_keyword contained sig-stop sig-sys sig-term sig-trap
-syn keyword txl_keyword contained sig-tstp sig-ttin sig-ttou sig-urg
-syn keyword txl_keyword contained sig-usr1 sig-usr2 sig-vtalrm sig-winch
-syn keyword txl_keyword contained sig-xcpu sig-xfsz sign-extend sin
-syn keyword txl_keyword contained sixth size-vec some sort
-syn keyword txl_keyword contained sort-group source-loc source-loc-str span-str
-syn keyword txl_keyword contained splice split split-str split-str-set
-syn keyword txl_keyword contained sqrt sssucc ssucc stat
-syn keyword txl_keyword contained stdlib str< str<= str=
-syn keyword txl_keyword contained str> str>= stream-get-prop stream-set-prop
-syn keyword txl_keyword contained streamp string-extend string-lt stringp
-syn keyword txl_keyword contained sub sub-list sub-str sub-vec
-syn keyword txl_keyword contained succ swap symacrolet symbol-function
-syn keyword txl_keyword contained symbol-name symbol-package symbol-value symbolp
-syn keyword txl_keyword contained symlink sys-lisp1-value sys-qquote sys-splice
-syn keyword txl_keyword contained sys-unquote sys:*lisp1* sys:eval-err sys:get-fb
-syn keyword txl_keyword contained sys:get-vb sys:l1-setq sys:l1-val sys:pl-expand
-syn keyword txl_keyword contained sys:placelet-1 sys:sym-clobber-expander sys:sym-delete-expander sys:sym-update-expander
-syn keyword txl_keyword contained sys:trigger-load syslog tan tb
-syn keyword txl_keyword contained tc tenth 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-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 seek-stream select self-path seqp
+syn keyword txl_keyword contained set set-diff set-hash-userdata set-indent
+syn keyword txl_keyword contained set-indent-mode set-sig-handler setegid setenv
+syn keyword txl_keyword contained seteuid setgid sethash setitimer
+syn keyword txl_keyword contained setlogmask setq setuid seventh
+syn keyword txl_keyword contained sh shift 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-lost
+syn keyword txl_keyword contained sig-pipe sig-poll sig-prof sig-pwr
+syn keyword txl_keyword contained sig-quit sig-segv sig-stkflt sig-stop
+syn keyword txl_keyword contained sig-sys sig-term sig-trap sig-tstp
+syn keyword txl_keyword contained sig-ttin sig-ttou sig-urg sig-usr1
+syn keyword txl_keyword contained sig-usr2 sig-vtalrm sig-winch sig-xcpu
+syn keyword txl_keyword contained sig-xfsz sign-extend sin sixth
+syn keyword txl_keyword contained size-vec 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 sub sub-list sub-str
+syn keyword txl_keyword contained sub-vec succ swap symacrolet
+syn keyword txl_keyword contained symbol-function symbol-name symbol-package symbol-value
+syn keyword txl_keyword contained symbolp symlink sys-lisp1-value sys-mark-special
+syn keyword txl_keyword contained sys-qquote sys-splice sys-unquote sys:*lisp1*
+syn keyword txl_keyword contained sys:eval-err sys:get-fb sys:get-vb sys:l1-setq
+syn keyword txl_keyword contained sys:l1-val sys:pl-expand sys:placelet-1 sys:sym-clobber-expander
+syn keyword txl_keyword contained sys:sym-delete-expander sys:sym-update-expander sys:trigger-load syslog
+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-usec tofloat
+syn keyword txl_keyword contained toint tok-str tok-where tostring
+syn keyword txl_keyword contained tostringp tprint transpose tree-bind
+syn keyword txl_keyword contained tree-case tree-find trie-add trie-compress
+syn keyword txl_keyword contained trie-lookup-begin trie-lookup-feed-char trie-value-at trim-str
+syn keyword txl_keyword contained true trunc trunc-rem tuples
+syn keyword txl_keyword contained txr-case txr-case-impl txr-if txr-version
 syn keyword txl_keyword contained txr-when typeof unget-byte unget-char
 syn keyword txl_keyword contained uniq unique unless unquote
 syn keyword txl_keyword contained unsetenv until until* upcase-str
-syn keyword txl_keyword contained update url-decode url-encode usleep
-syn keyword txl_keyword contained uw-protect vec 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 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 update url-decode url-encode user-package
+syn keyword txl_keyword contained usleep uw-protect var vec
+syn keyword txl_keyword contained vec-push vec-set-length vecref vector
+syn keyword txl_keyword contained vector-list vectorp w-continued w-coredump
+syn keyword txl_keyword contained w-exitstatus w-ifcontinued w-ifexited w-ifsignaled
+syn keyword txl_keyword contained w-ifstopped w-nohang w-stopsig w-termsig
+syn keyword txl_keyword contained w-untraced wait weave when
+syn keyword txl_keyword contained whenlet where while while*
+syn keyword txl_keyword contained whilet width width-check with-clobber-expander
+syn keyword txl_keyword contained with-delete-expander with-gensyms with-resources with-saved-vars
+syn keyword txl_keyword contained with-update-expander wrap wrap* zap
+syn keyword txl_keyword contained zerop zip
 
 syn keyword txr_keyword contained accept all and assert
 syn keyword txr_keyword contained bind block cases cat