Version 118.txr-118

* RELNOTES: Updated.

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

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

* txr.vim, tl.vim: Regenerated.

6 files changed, 237 insertions, 156 deletions

diff --git a/RELNOTES b/RELNOTES
index e4e50d37..13246dd4 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,76 @@
+                                    TXR 118
+                                   2015-10-01
+
+
+  Features
+
+  - Interactive listener:
+    - Parentheses matching jump (Ctrl-]) now finds the closest parenthesis,
+      bracket or brace if the cursor isn't on one already.
+    - Tab completion recognizes .( and (( context in front of symbol
+      being completed, and doesn't restrict to function names.
+    - Parenthesis-matching "jump" is now performed on backspace also,
+      if cursor lands on or next to a parenthesis.
+    - Ctrl-A and Ctrl-E (or Home and End) keys have now have a useful behavior
+      in multi-line mode, allowing a jump to the start/end of the current line
+      as well as start/end of the edit buffer.
+
+  - Optimizations in regular expressions:
+    - In particular, prefix matches involving the complement operator now
+      indicate termination rather than wastefully consuming the remainder of
+      the string.
+    - Algebraic reductions performed on regexes. In some cases, these
+      reduce an expression which contains exotic operators such that it
+      can be compiled to NFA.
+
+  - Structures:
+    - Structures can now have static slots: slots shared among all instances
+      of the same type (but not other types, not even derived types).
+    - Static slots are now the preferred the basis for implementing functions
+      and methods.
+    - The defstruct syntax has a richer syntax which lets static slots
+      be expressed, as well as methods.
+    - Construction and finalization code can be specified in defstruct.
+    - Many new functions related to structures.
+
+  - Optimization in lazy strings: forcing lazy strings is more efficient.
+
+  - String input streams do not force lazy strings now.
+
+  - The "matches nothing" regular expression represented in the
+    abstract syntax by the object t now handled by regex printer,
+    and rendered as [].
+
+  Bugs:
+
+  - Fixed a silly delete-previous-word behavior in multi-line mode:
+    not treating the line-break as a whitespace character that separates words.
+
+  - Fixed various problems in screen update and cursor positioning behavior in
+    interactive listener, affecting multi-line mode.
+
+  - Fixed two bugs in the ifa/conda macros.
+
+  - The return and return-from operators do not abort TXR when a label is not
+    found, but properly throw an exception.
+
+  - Garbage collection: if GC is triggered in response to a malloc
+    delta, a full GC is now performed. This prevents runaway memory
+    allocation behavior in code which manipulates large arrays, strings
+    or integers.
+
+  - Fixed strangely compounded error message issued in the situation that
+    unbound variables occur in the TXR pattern language.
+
+  - Various "internal error" situations in the regex module now throw
+    exceptions. Consequently, TXR will not die if a bad abstract syntax
+    tree is passed to the regex compiler.
+
+  - Regex printer was throwing an exception when printing a character
+    class containing \w, \s or \d.
+
+
+
                                     TXR 117
                                    2015-09-23
 
diff --git a/configure b/configure
index fae0308e..7652b270 100755
--- a/configure
+++ b/configure
@@ -433,7 +433,7 @@ fi
 #
 
 
-txr_ver=117
+txr_ver=118
 
 #
 # The all important banner.
diff --git a/share/txr/stdlib/ver.tl b/share/txr/stdlib/ver.tl
index 96be4826..709f82a6 100644
--- a/share/txr/stdlib/ver.tl
+++ b/share/txr/stdlib/ver.tl
@@ -1,2 +1,2 @@
-(defvarl lib-version 117)
+(defvarl lib-version 118)
 (defvarl *lib-version* lib-version)
diff --git a/tl.vim b/tl.vim
index 7faa08d0..6081e1e6 100644
--- a/tl.vim
+++ b/tl.vim
@@ -34,39 +34,41 @@ syn keyword txl_keyword contained :atime :auto :blksize :blocks
 syn keyword txl_keyword contained :cdigit :chars :continue :counter
 syn keyword txl_keyword contained :cspace :ctime :cword-char :decline
 syn keyword txl_keyword contained :dev :digit :downcase :env
-syn keyword txl_keyword contained :equal-based :fd :filter :finish
-syn keyword txl_keyword contained :from-current :from-end :from-start :from_html
-syn keyword txl_keyword contained :frompercent :fromurl :fun :gap
-syn keyword txl_keyword contained :gid :greedy :hextoint :ino
+syn keyword txl_keyword contained :equal-based :fd :filter :fini
+syn keyword txl_keyword contained :finish :from-current :from-end :from-start
+syn keyword txl_keyword contained :from_html :frompercent :fromurl :fun
+syn keyword txl_keyword contained :function :gap :gid :greedy
+syn keyword txl_keyword contained :hextoint :init :ino :instance
 syn keyword txl_keyword contained :into :lfilt :lines :list
-syn keyword txl_keyword contained :longest :maxgap :maxtimes :mingap
-syn keyword txl_keyword contained :mintimes :mode :mtime :name
-syn keyword txl_keyword contained :named :next-spec :nlink :nothrow
-syn keyword txl_keyword contained :prio :rdev :real-time :repeat-spec
-syn keyword txl_keyword contained :resolve :rfilt :shortest :size
-syn keyword txl_keyword contained :space :string :symacro :times
-syn keyword txl_keyword contained :to_html :tofloat :toint :tonumber
-syn keyword txl_keyword contained :topercent :tourl :uid :upcase
-syn keyword txl_keyword contained :var :vars :weak-keys :weak-vals
-syn keyword txl_keyword contained :whole :word-char < <=
-syn keyword txl_keyword contained = > >= abort
-syn keyword txl_keyword contained abs abs-path-p acons acons-new
-syn keyword txl_keyword contained aconsql-new acos ado alist-nremove
-syn keyword txl_keyword contained alist-remove all and andf
-syn keyword txl_keyword contained ap apf append append*
-syn keyword txl_keyword contained append-each append-each* apply aret
-syn keyword txl_keyword contained ash asin assoc assql
-syn keyword txl_keyword contained atan atan2 atom bignump
-syn keyword txl_keyword contained bindable bit block 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 :longest :maxgap :maxtimes :method
+syn keyword txl_keyword contained :mingap :mintimes :mode :mtime
+syn keyword txl_keyword contained :name :named :next-spec :nlink
+syn keyword txl_keyword contained :nothrow :prio :rdev :real-time
+syn keyword txl_keyword contained :repeat-spec :resolve :rfilt :shortest
+syn keyword txl_keyword contained :size :space :static :string
+syn keyword txl_keyword contained :symacro :times :to_html :tofloat
+syn keyword txl_keyword contained :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-super-fun call-super-method 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
@@ -236,55 +238,57 @@ syn keyword txl_keyword contained sig-sys sig-term sig-trap sig-tstp
 syn keyword txl_keyword contained sig-ttin sig-ttou sig-urg sig-usr1
 syn keyword txl_keyword contained sig-usr2 sig-vtalrm sig-winch sig-xcpu
 syn keyword txl_keyword contained sig-xfsz sign-extend sin sixth
-syn keyword txl_keyword contained size-vec slot slotset some
-syn keyword txl_keyword contained sort sort-group source-loc source-loc-str
-syn keyword txl_keyword contained span-str special-operator-p special-var-p splice
-syn keyword txl_keyword contained split split-str split-str-set sqrt
-syn keyword txl_keyword contained sssucc ssucc stat stdlib
+syn keyword txl_keyword contained size-vec slot slot-p slotset
+syn keyword txl_keyword contained some sort sort-group source-loc
+syn keyword txl_keyword contained source-loc-str span-str special-operator-p special-var-p
+syn keyword txl_keyword contained splice split split-str split-str-set
+syn keyword txl_keyword contained sqrt sssucc ssucc stat
+syn keyword txl_keyword contained static-slot static-slot-p static-slot-set stdlib
 syn keyword txl_keyword contained str< str<= str= str>
 syn keyword txl_keyword contained str>= stream-get-prop stream-set-prop streamp
 syn keyword txl_keyword contained string-extend string-lt stringp struct-type
 syn keyword txl_keyword contained struct-type-p structp sub sub-list
 syn keyword txl_keyword contained sub-str sub-vec subtypep succ
-syn keyword txl_keyword contained super swap symacrolet symbol-function
-syn keyword txl_keyword contained symbol-name symbol-package symbol-value symbolp
-syn keyword txl_keyword contained symlink sys:*lisp1* sys:do-path-test sys:dwim-del
-syn keyword txl_keyword contained sys:dwim-set sys:eval-err sys:expand sys:expr
-syn keyword txl_keyword contained sys:fbind sys:gc sys:gc-set-delta sys:get-fb
-syn keyword txl_keyword contained sys:get-vb sys:l1-setq sys:l1-val sys:lbind
-syn keyword txl_keyword contained sys:lisp1-setq sys:lisp1-value sys:load sys:mark-special
-syn keyword txl_keyword contained sys:path-access sys:path-examine sys:path-test sys:path-test-mode
-syn keyword txl_keyword contained sys:pl-expand sys:placelet-1 sys:qquote sys:quasi
-syn keyword txl_keyword contained sys:quasilist sys:rplaca sys:rplacd sys:setq
-syn keyword txl_keyword contained sys:setqf sys:splice sys:struct-lit sys:sym-clobber-expander
-syn keyword txl_keyword contained sys:sym-delete-expander sys:sym-update-expander sys:top-fb sys:top-vb
-syn keyword txl_keyword contained sys:trigger-load sys:unquote sys:var sys:with-saved-vars
-syn keyword txl_keyword contained syslog system-package t 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 typep
-syn keyword txl_keyword contained unget-byte unget-char uniq unique
-syn keyword txl_keyword contained unless unquote unsetenv until
-syn keyword txl_keyword contained until* unwind-protect upcase-str update
-syn keyword txl_keyword contained url-decode url-encode user-package usleep
-syn keyword txl_keyword contained vec vec-push vec-set-length vecref
-syn keyword txl_keyword contained vector vector-list vectorp w-continued
-syn keyword txl_keyword contained w-coredump w-exitstatus w-ifcontinued w-ifexited
-syn keyword txl_keyword contained w-ifsignaled w-ifstopped w-nohang w-stopsig
-syn keyword txl_keyword contained w-termsig w-untraced wait weave
-syn keyword txl_keyword contained when whenlet where while
-syn keyword txl_keyword contained while* whilet width width-check
-syn keyword txl_keyword contained with-clobber-expander with-delete-expander with-gensyms with-resources
-syn keyword txl_keyword contained with-update-expander wrap wrap* zap
-syn keyword txl_keyword contained zerop zip
+syn keyword txl_keyword contained super super-method swap symacrolet
+syn keyword txl_keyword contained symbol-function symbol-name symbol-package symbol-value
+syn keyword txl_keyword contained symbolp symlink sys:*lisp1* sys:bad-slot-syntax
+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:make-struct-type sys:mark-special 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:qquote sys:quasi sys:quasilist
+syn keyword txl_keyword contained sys:reg-expand-nongreedy sys:reg-optimize sys:rplaca sys:rplacd
+syn keyword txl_keyword contained sys:setq sys:setqf sys:splice sys:struct-lit
+syn keyword txl_keyword contained sys:sym-clobber-expander sys:sym-delete-expander sys:sym-update-expander sys:top-fb
+syn keyword txl_keyword contained sys:top-vb sys:trigger-load sys:unquote sys:var
+syn keyword txl_keyword contained sys:with-saved-vars syslog system-package t
+syn keyword txl_keyword contained tan tb tc tenth
+syn keyword txl_keyword contained test-set-indent-mode tf third throw
+syn keyword txl_keyword contained throwf time time-fields-local time-fields-utc
+syn keyword txl_keyword contained time-string-local time-string-utc time-struct-local time-struct-utc
+syn keyword txl_keyword contained time-usec tofloat toint tok-str
+syn keyword txl_keyword contained tok-where tostring tostringp tprint
+syn keyword txl_keyword contained transpose tree-bind tree-case tree-find
+syn keyword txl_keyword contained trie-add trie-compress trie-lookup-begin trie-lookup-feed-char
+syn keyword txl_keyword contained trie-value-at trim-str true trunc
+syn keyword txl_keyword contained trunc-rem tuples txr-case txr-case-impl
+syn keyword txl_keyword contained txr-if txr-version txr-when typeof
+syn keyword txl_keyword contained typep unget-byte unget-char uniq
+syn keyword txl_keyword contained unique unless unquote unsetenv
+syn keyword txl_keyword contained until until* unwind-protect upcase-str
+syn keyword txl_keyword contained update url-decode url-encode user-package
+syn keyword txl_keyword contained usleep 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 width-check with-clobber-expander with-delete-expander with-gensyms
+syn keyword txl_keyword contained with-resources with-update-expander wrap wrap*
+syn keyword txl_keyword contained 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 92c2f3ca..24c108d8 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-23 "Utility Commands" "TXR Data Processing Language" "Kaz Kylheku"
+.TH TXR 1 2015-10-01 "Utility Commands" "TXR Data Processing Language" "Kaz Kylheku"
 .SH* NAME
-\*(TX \- text processing language (version 117)
+\*(TX \- text processing language (version 118)
 .SH* SYNOPSIS
 .cblk
 .meti txr >> [ options ] < query-file < data-files ..
diff --git a/txr.vim b/txr.vim
index f0db5f06..40ff1ee7 100644
--- a/txr.vim
+++ b/txr.vim
@@ -34,39 +34,41 @@ syn keyword txl_keyword contained :atime :auto :blksize :blocks
 syn keyword txl_keyword contained :cdigit :chars :continue :counter
 syn keyword txl_keyword contained :cspace :ctime :cword-char :decline
 syn keyword txl_keyword contained :dev :digit :downcase :env
-syn keyword txl_keyword contained :equal-based :fd :filter :finish
-syn keyword txl_keyword contained :from-current :from-end :from-start :from_html
-syn keyword txl_keyword contained :frompercent :fromurl :fun :gap
-syn keyword txl_keyword contained :gid :greedy :hextoint :ino
+syn keyword txl_keyword contained :equal-based :fd :filter :fini
+syn keyword txl_keyword contained :finish :from-current :from-end :from-start
+syn keyword txl_keyword contained :from_html :frompercent :fromurl :fun
+syn keyword txl_keyword contained :function :gap :gid :greedy
+syn keyword txl_keyword contained :hextoint :init :ino :instance
 syn keyword txl_keyword contained :into :lfilt :lines :list
-syn keyword txl_keyword contained :longest :maxgap :maxtimes :mingap
-syn keyword txl_keyword contained :mintimes :mode :mtime :name
-syn keyword txl_keyword contained :named :next-spec :nlink :nothrow
-syn keyword txl_keyword contained :prio :rdev :real-time :repeat-spec
-syn keyword txl_keyword contained :resolve :rfilt :shortest :size
-syn keyword txl_keyword contained :space :string :symacro :times
-syn keyword txl_keyword contained :to_html :tofloat :toint :tonumber
-syn keyword txl_keyword contained :topercent :tourl :uid :upcase
-syn keyword txl_keyword contained :var :vars :weak-keys :weak-vals
-syn keyword txl_keyword contained :whole :word-char < <=
-syn keyword txl_keyword contained = > >= abort
-syn keyword txl_keyword contained abs abs-path-p acons acons-new
-syn keyword txl_keyword contained aconsql-new acos ado alist-nremove
-syn keyword txl_keyword contained alist-remove all and andf
-syn keyword txl_keyword contained ap apf append append*
-syn keyword txl_keyword contained append-each append-each* apply aret
-syn keyword txl_keyword contained ash asin assoc assql
-syn keyword txl_keyword contained atan atan2 atom bignump
-syn keyword txl_keyword contained bindable bit block 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 :longest :maxgap :maxtimes :method
+syn keyword txl_keyword contained :mingap :mintimes :mode :mtime
+syn keyword txl_keyword contained :name :named :next-spec :nlink
+syn keyword txl_keyword contained :nothrow :prio :rdev :real-time
+syn keyword txl_keyword contained :repeat-spec :resolve :rfilt :shortest
+syn keyword txl_keyword contained :size :space :static :string
+syn keyword txl_keyword contained :symacro :times :to_html :tofloat
+syn keyword txl_keyword contained :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-super-fun call-super-method 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
@@ -236,55 +238,57 @@ syn keyword txl_keyword contained sig-sys sig-term sig-trap sig-tstp
 syn keyword txl_keyword contained sig-ttin sig-ttou sig-urg sig-usr1
 syn keyword txl_keyword contained sig-usr2 sig-vtalrm sig-winch sig-xcpu
 syn keyword txl_keyword contained sig-xfsz sign-extend sin sixth
-syn keyword txl_keyword contained size-vec slot slotset some
-syn keyword txl_keyword contained sort sort-group source-loc source-loc-str
-syn keyword txl_keyword contained span-str special-operator-p special-var-p splice
-syn keyword txl_keyword contained split split-str split-str-set sqrt
-syn keyword txl_keyword contained sssucc ssucc stat stdlib
+syn keyword txl_keyword contained size-vec slot slot-p slotset
+syn keyword txl_keyword contained some sort sort-group source-loc
+syn keyword txl_keyword contained source-loc-str span-str special-operator-p special-var-p
+syn keyword txl_keyword contained splice split split-str split-str-set
+syn keyword txl_keyword contained sqrt sssucc ssucc stat
+syn keyword txl_keyword contained static-slot static-slot-p static-slot-set stdlib
 syn keyword txl_keyword contained str< str<= str= str>
 syn keyword txl_keyword contained str>= stream-get-prop stream-set-prop streamp
 syn keyword txl_keyword contained string-extend string-lt stringp struct-type
 syn keyword txl_keyword contained struct-type-p structp sub sub-list
 syn keyword txl_keyword contained sub-str sub-vec subtypep succ
-syn keyword txl_keyword contained super swap symacrolet symbol-function
-syn keyword txl_keyword contained symbol-name symbol-package symbol-value symbolp
-syn keyword txl_keyword contained symlink sys:*lisp1* sys:do-path-test sys:dwim-del
-syn keyword txl_keyword contained sys:dwim-set sys:eval-err sys:expand sys:expr
-syn keyword txl_keyword contained sys:fbind sys:gc sys:gc-set-delta sys:get-fb
-syn keyword txl_keyword contained sys:get-vb sys:l1-setq sys:l1-val sys:lbind
-syn keyword txl_keyword contained sys:lisp1-setq sys:lisp1-value sys:load sys:mark-special
-syn keyword txl_keyword contained sys:path-access sys:path-examine sys:path-test sys:path-test-mode
-syn keyword txl_keyword contained sys:pl-expand sys:placelet-1 sys:qquote sys:quasi
-syn keyword txl_keyword contained sys:quasilist sys:rplaca sys:rplacd sys:setq
-syn keyword txl_keyword contained sys:setqf sys:splice sys:struct-lit sys:sym-clobber-expander
-syn keyword txl_keyword contained sys:sym-delete-expander sys:sym-update-expander sys:top-fb sys:top-vb
-syn keyword txl_keyword contained sys:trigger-load sys:unquote sys:var sys:with-saved-vars
-syn keyword txl_keyword contained syslog system-package t 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 typep
-syn keyword txl_keyword contained unget-byte unget-char uniq unique
-syn keyword txl_keyword contained unless unquote unsetenv until
-syn keyword txl_keyword contained until* unwind-protect upcase-str update
-syn keyword txl_keyword contained url-decode url-encode user-package usleep
-syn keyword txl_keyword contained vec vec-push vec-set-length vecref
-syn keyword txl_keyword contained vector vector-list vectorp w-continued
-syn keyword txl_keyword contained w-coredump w-exitstatus w-ifcontinued w-ifexited
-syn keyword txl_keyword contained w-ifsignaled w-ifstopped w-nohang w-stopsig
-syn keyword txl_keyword contained w-termsig w-untraced wait weave
-syn keyword txl_keyword contained when whenlet where while
-syn keyword txl_keyword contained while* whilet width width-check
-syn keyword txl_keyword contained with-clobber-expander with-delete-expander with-gensyms with-resources
-syn keyword txl_keyword contained with-update-expander wrap wrap* zap
-syn keyword txl_keyword contained zerop zip
+syn keyword txl_keyword contained super super-method swap symacrolet
+syn keyword txl_keyword contained symbol-function symbol-name symbol-package symbol-value
+syn keyword txl_keyword contained symbolp symlink sys:*lisp1* sys:bad-slot-syntax
+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:make-struct-type sys:mark-special 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:qquote sys:quasi sys:quasilist
+syn keyword txl_keyword contained sys:reg-expand-nongreedy sys:reg-optimize sys:rplaca sys:rplacd
+syn keyword txl_keyword contained sys:setq sys:setqf sys:splice sys:struct-lit
+syn keyword txl_keyword contained sys:sym-clobber-expander sys:sym-delete-expander sys:sym-update-expander sys:top-fb
+syn keyword txl_keyword contained sys:top-vb sys:trigger-load sys:unquote sys:var
+syn keyword txl_keyword contained sys:with-saved-vars syslog system-package t
+syn keyword txl_keyword contained tan tb tc tenth
+syn keyword txl_keyword contained test-set-indent-mode tf third throw
+syn keyword txl_keyword contained throwf time time-fields-local time-fields-utc
+syn keyword txl_keyword contained time-string-local time-string-utc time-struct-local time-struct-utc
+syn keyword txl_keyword contained time-usec tofloat toint tok-str
+syn keyword txl_keyword contained tok-where tostring tostringp tprint
+syn keyword txl_keyword contained transpose tree-bind tree-case tree-find
+syn keyword txl_keyword contained trie-add trie-compress trie-lookup-begin trie-lookup-feed-char
+syn keyword txl_keyword contained trie-value-at trim-str true trunc
+syn keyword txl_keyword contained trunc-rem tuples txr-case txr-case-impl
+syn keyword txl_keyword contained txr-if txr-version txr-when typeof
+syn keyword txl_keyword contained typep unget-byte unget-char uniq
+syn keyword txl_keyword contained unique unless unquote unsetenv
+syn keyword txl_keyword contained until until* unwind-protect upcase-str
+syn keyword txl_keyword contained update url-decode url-encode user-package
+syn keyword txl_keyword contained usleep 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 width-check with-clobber-expander with-delete-expander with-gensyms
+syn keyword txl_keyword contained with-resources with-update-expander wrap wrap*
+syn keyword txl_keyword contained zap zerop zip
 
 syn keyword txr_keyword contained accept all and assert
 syn keyword txr_keyword contained bind block cases cat