* txr.vim: Updated using genvim.txr.

2 files changed, 6 insertions, 91 deletions

diff --git a/ChangeLog b/ChangeLog
index 2cd69e9a..d01f177c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
 	* genvim.txr: New file.
 
+	* txr.vim: Updated using genvim.txr.
+
 2013-10-23  Kaz Kylheku  <kaz@kylheku.com>
 
 	* configure: Change to header block comment generated in config.h
diff --git a/txr.vim b/txr.vim
index 60d84637..3deda1e1 100644
--- a/txr.vim
+++ b/txr.vim
@@ -11,103 +11,16 @@
 "
 " If you want syntax highlighting to be on automatically (for any language)
 " you need to add ":syntax on" in your .vimrc also. But you knew that already!
+"
+" This file is generated by the genvim.txr script in the TXR source tree.
 
 syn case match
 syn spell toplevel
 
 setlocal iskeyword=a-z,A-Z,48-57,!,$,&,*,+,-,<,=,>,?,\\,_,~,^
 
-syn keyword txr_keyword contained skip fuzz trailer freeform block accept fail
-syn keyword txr_keyword contained next some all none and or
-syn keyword txr_keyword contained maybe cases choose gather collect coll until last end
-syn keyword txr_keyword contained flatten lazy-flatten forget local merge bind set cat output
-syn keyword txr_keyword contained repeat rep first last single empty mod modlast
-syn keyword txr_keyword contained define try catch finally throw
-syn keyword txr_keyword contained defex throw deffilter filter eof eol do
-syn keyword txr_keyword contained load require
-
-syn keyword txl_keyword contained progn prog1 let syn let* lambda call fun 
-syn keyword txl_keyword contained cond if and or dwim op catch
-syn keyword txl_keyword contained defvar defun inc dec set push pop flip del
-syn keyword txl_keyword contained for for* dohash unwind-protect block
-syn keyword txl_keyword contained return return-from gen delay
-syn keyword txl_keyword contained each each* collect-each collect-each*
-
-syn keyword txl_keyword contained cons make-lazy-cons lcons-fun car cdr
-syn keyword txl_keyword contained rplaca rplacd first rest append append* list
-syn keyword txl_keyword contained identity typeof atom null not consp listp
-syn keyword txl_keyword contained proper-listp length-list mapcar mappend apply
-syn keyword txl_keyword contained mapcar* mappend* sub-list replace-list
-syn keyword txl_keyword contained reduce-left reduce-right
-syn keyword txl_keyword contained second third fourth fifth sixth copy-list nreverse
-syn keyword txl_keyword contained reverse ldiff flatten lazy-flatten
-syn keyword txl_keyword contained memq memql memqual tree-find some
-syn keyword txl_keyword contained remq remql remqual
-syn keyword txl_keyword contained all none eq eql equal + - * / abs trunc mod
-syn keyword txl_keyword contained expt exptmod sqrt isqrt gcd 
-syn keyword txl_keyword contained floor ceil sin cos tan asin acos atan log exp
-syn keyword txl_keyword contained fixnump bignump integerp floatp
-syn keyword txl_keyword contained numberp zerop evenp oddp >
-syn keyword txl_keyword contained zerop evenp oddp > < >= <= = /= max min
-syn keyword txl_keyword contained logand logior logxor lognot logtrunc logtest ash
-syn keyword txl_keyword contained search-regex match-regex regsub regexp regex-compile
-syn keyword txl_keyword contained make-hash make-similar-hash copy-hash hash hash-construct
-syn keyword txl_keyword contained gethash sethash pushhash remhash
-syn keyword txl_keyword contained hash-count get-hash-userdata set-hash-userdata hashp maphash 
-syn keyword txl_keyword contained hash-eql hash-equal 
-syn keyword txl_keyword contained hash-keys hash-values hash-pairs hash-alist
-syn keyword txl_keyword contained hash-uni hash-diff hash-isec
-syn keyword txl_keyword contained eval chain andf orf iff iffi
-syn keyword txl_keyword contained *stdout* *stdin* *stddebug*
-syn keyword txl_keyword contained *stderr* format print pprint tostring tostringp
-syn keyword txl_keyword contained make-string-input-stream
-syn keyword txl_keyword contained make-string-byte-input-stream make-string-output-stream
-syn keyword txl_keyword contained get-string-from-stream make-strlist-output-stream
-syn keyword txl_keyword contained get-list-from-stream close-stream
-syn keyword txl_keyword contained get-line get-char get-byte put-string put-line put-byte
-syn keyword txl_keyword contained put-char flush-stream open-directory open-file
-syn keyword txl_keyword contained *user-package* *keyword-package* *system-package*
-syn keyword txl_keyword contained open-pipe open-command open-process
-syn keyword txl_keyword contained make-sym gensym *gensym-counter* make-package find-package delete-package
-syn keyword txl_keyword contained intern symbolp symbol-name symbol-package keywordp rehome-sym packagep
-syn keyword txl_keyword contained mkstring copy-str upcase-str downcase-str string-extend
-syn keyword txl_keyword contained stringp lazy-stringp length-str search-str search-str-tree
-syn keyword txl_keyword contained match-str match-str-tree
-syn keyword txl_keyword contained sub-str cat-str split-str replace-str
-syn keyword txl_keyword contained split-str-set list-str trim-str tok-str string-cmp
-syn keyword txl_keyword contained string-lt int-str flo-str num-str int-flo flo-int
-syn keyword txl_keyword contained chrp chr-isalnum chr-isalpha
-syn keyword txl_keyword contained chr-isascii chr-iscntrl chr-isdigit chr-isgraph
-syn keyword txl_keyword contained chr-islower chr-isprint chr-ispunct chr-isspace chr-isupper
-syn keyword txl_keyword contained chr-isxdigit chr-toupper chr-tolower chr-str
-syn keyword txl_keyword contained num-chr chr-num
-syn keyword txl_keyword contained chr-str-set span-str compl-span-str break-str
-
-syn keyword txl_keyword contained lazy-stream-cons lazy-str lazy-stringp lazy-str-force-upto lazy-str-force lazy-str-get-trailing-list
-syn keyword txl_keyword contained length-str-> length-str->= length-str-< length-str-<=
-
-syn keyword txl_keyword contained vector vec-set-length vecref
-syn keyword txl_keyword contained vec-push length-vec size-vec vector-list
-syn keyword txl_keyword contained list-vector copy-vec sub-vec cat-vec
-syn keyword txl_keyword contained replace-vec assoc assql acons acons-new
-syn keyword txl_keyword contained aconsql-new alist-remove alist-nremove copy-cons
-syn keyword txl_keyword contained copy-alist prop merge sort find set-diff length
-syn keyword txl_keyword contained sub ref replace refset multi-sort
-
-syn keyword txl_keyword contained symbol-function func-get-form func-get-env
-syn keyword txl_keyword contained functionp interp-fun-p *random-state*
-syn keyword txl_keyword contained make-random-state random-state-p
-syn keyword txl_keyword contained random-fixnum random rand
-
-syn keyword txl_keyword contained range range* generate repeat force
-syn keyword txl_keyword contained throw throwf error match-fun url-encode url-decode
-syn keyword txl_keyword contained time time-usec time-string-local time-string-utc
-syn keyword txl_keyword contained source-loc source-loc-str
-
-syn keyword txl_keyword contained s-ifmt s-iflnk s-ifreg s-ifblk s-ifdir s-ifchr
-syn keyword txl_keyword contained s-ififo s-isuid s-isgid s-isvtx s-irwxu
-syn keyword txl_keyword contained s-irusr s-iwusr s-ixusr s-irwxg s-irgrp
-syn keyword txl_keyword contained s-iwgrp s-ixgrp s-irwxo s-iroth s-iwoth s-ixoth
+syn keyword txr_keyword contained accept all bind block cases cat choose close coll collect defex deffilter define do eof eol fail filter flatten forget freeform fuzz gather load local maybe merge next none output rebind repeat require set skip some text throw trailer try var
+syn keyword txl_keyword contained * *keyword-package* *random-state* *self-path* *stddebug* *stderr* *stdin* *stdout* *system-package* *user-package* + - / /= < <= = > >= abs acons acons-new aconsql-new acos alist-nremove alist-remove all and andf append append* apply ash asin assoc assql atan atom bignump block break-str call car cat-str cat-vec catch cdr ceil chain chr-isalnum chr-isalpha chr-isascii chr-iscntrl chr-isdigit chr-isgraph chr-islower chr-isprint chr-ispunct chr-isspace chr-isupper chr-isxdigit chr-num chr-str chr-str-set chr-tolower chr-toupper chrp close-stream collect_each collect_each_star compl-span-str cond cons consp copy-alist copy-cons copy-hash copy-list copy-str copy-vec cos dec defun defvar del delete-package dohash downcase-str dwim each each_star eq eql equal error eval evenp exp expt exptmod fifth find find-if find-package first fixnump flatten flatten* flip flo-int flo-str floatp floor flush-stream for for_star force format fourth fun func-get-env func-get-form functionp gcd generate gensym get-byte get-char get-hash-userdata get-line get-list-from-stream get-string-from-stream gethash hash hash-alist hash-construct hash-count hash-diff hash-eql hash-equal hash-isec hash-keys hash-pairs hash-uni hash-values hashp identity if iff iffi inc int-flo int-str integerp intern interp-fun-p isqrt keep-if keep-if* keywordp lambda lazy-str lazy-str-force lazy-str-force-upto lazy-str-get-trailing-list lazy-stream-cons lazy-stringp lcons-fun ldiff length length-list length-str length-str-< length-str-<= length-str-> length-str->= length-vec let let_star list list-str list-vector listp log logand logior lognot logtest logtrunc logxor make-hash make-lazy-cons make-package make-random-state make-similar-hash make-string-byte-input-stream make-string-input-stream make-string-output-stream make-strlist-output-stream make-sym mapcar mapcar* maphash mappend mappend* match-fun match-regex match-str match-str-tree max memq memql memqual merge min mkstring mod multi-sort none not nreverse null num-chr num-str numberp oddp open-command open-directory open-file open-pipe open-process or orf packagep pop pprint print prog1 progn prop proper-listp push pushhash put-byte put-char put-line put-string qquote quasi quote rand random random-fixnum random-state-p range range* reduce-left reduce-right ref refset regex-compile regexp regsub rehome-sym remhash remove-if remove-if* remq remq* remql remql* remqual remqual* repeat replace replace-list replace-str replace-vec rest return return_from reverse rplaca rplacd s-ifblk s-ifchr s-ifdir s-ififo s-iflnk s-ifmt s-ifreg s-irgrp s-iroth s-irusr s-irwxg s-irwxo s-irwxu s-isgid s-isuid s-isvtx s-iwgrp s-iwoth s-iwusr s-ixgrp s-ixoth s-ixusr search-regex search-str search-str-tree second set set-diff set-hash-userdata sethash sin sixth size-vec some sort source-loc source-loc-str span-str splice split-str split-str-set sqrt stat string-cmp string-extend string-lt stringp sub sub-list sub-str sub-vec symbol-function symbol-name symbol-package symbolp tan third throw throwf time time-string-local time-string-utc time-usec tok-str tostring tostringp tree-find trim-str trunc typeof unquote upcase-str url-decode url-encode uw_protect vec-push vec-set-length vecref vector vector_list vectorp zerop
 
 syn match txr_error "@[\t ]*[*]\?[\t ]*."
 syn match txr_nested_error "[^\t `]\+" contained