* genvim.txr, txr.vim: Updated.

2 files changed, 96 insertions, 93 deletions

diff --git a/genvim.txr b/genvim.txr
index dde5a044..4a0425c9 100644
--- a/genvim.txr
+++ b/genvim.txr
@@ -36,7 +36,7 @@ void eval_init(void)
 @(do (set [txr-sym 0..0] '("rep" "end" "and" "or"
                            "catch" "finally"
                            "until" "last")))
-@(do (set [txl-sym 0..0] '("do" "op")))@# Doo...wop! :)
+@(do (set [txl-sym 0..0] '("do" "op" "macro-time" "macrolet")))
 @(set (txr-sym txl-sym) (@(sortuniq txr-sym) @(sortuniq txl-sym)))
 @(output)
 " VIM Syntax file for txr
diff --git a/txr.vim b/txr.vim
index d95c8248..194b7e72 100644
--- a/txr.vim
+++ b/txr.vim
@@ -33,34 +33,35 @@ syn keyword txr_keyword contained set skip some text
 syn keyword txr_keyword contained throw trailer try until
 syn keyword txr_keyword contained var
 
-syn keyword txl_keyword contained * *gensym-counter* *keyword-package* *random-state*
-syn keyword txl_keyword contained *self-path* *stddebug* *stderr* *stdin*
-syn keyword txl_keyword contained *stdlog* *stdnull* *stdout* *system-package*
-syn keyword txl_keyword contained *user-package* + - /
-syn keyword txl_keyword contained /= < <= =
-syn keyword txl_keyword contained > >= abs acons
-syn keyword txl_keyword contained acons-new aconsql-new acos alist-nremove
-syn keyword txl_keyword contained alist-remove all and andf
-syn keyword txl_keyword contained append append* append-each append-each*
-syn keyword txl_keyword contained apply ash asin assoc
-syn keyword txl_keyword contained assql atan atan2 atom
-syn keyword txl_keyword contained bignump block boundp break-str
-syn keyword txl_keyword contained call car cat-str cat-vec
-syn keyword txl_keyword contained catch cdr ceil chain
-syn keyword txl_keyword contained chr-isalnum chr-isalpha chr-isascii chr-iscntrl
-syn keyword txl_keyword contained chr-isdigit chr-isgraph chr-islower chr-isprint
-syn keyword txl_keyword contained chr-ispunct chr-isspace 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 close-stream closelog
-syn keyword txl_keyword contained collect-each collect-each* comb compl-span-str
-syn keyword txl_keyword contained cond cons conses conses*
-syn keyword txl_keyword contained consp copy-alist copy-cons copy-hash
-syn keyword txl_keyword contained copy-list copy-str copy-vec cos
-syn keyword txl_keyword contained count-if countq countql countqual
-syn keyword txl_keyword contained cum-norm-dist daemon dec defmacro
-syn keyword txl_keyword contained defun defvar del delete-package
-syn keyword txl_keyword contained do dohash downcase-str dwim
-syn keyword txl_keyword contained each each* eq eql
+syn keyword txl_keyword contained * *args* *full-args* *gensym-counter*
+syn keyword txl_keyword contained *keyword-package* *random-state* *self-path* *stddebug*
+syn keyword txl_keyword contained *stderr* *stdin* *stdlog* *stdnull*
+syn keyword txl_keyword contained *stdout* *system-package* *user-package* +
+syn keyword txl_keyword contained - / /= <
+syn keyword txl_keyword contained <= = > >=
+syn keyword txl_keyword contained abs acons acons-new aconsql-new
+syn keyword txl_keyword contained acos alist-nremove alist-remove all
+syn keyword txl_keyword contained and andf append append*
+syn keyword txl_keyword contained append-each append-each* apply ash
+syn keyword txl_keyword contained asin assoc assql atan
+syn keyword txl_keyword contained atan2 atom bignump block
+syn keyword txl_keyword contained boundp break-str call car
+syn keyword txl_keyword contained cat-str cat-vec catch cdr
+syn keyword txl_keyword contained ceil chain 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
+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 close-stream closelog collect-each collect-each*
+syn keyword txl_keyword contained comb compl-span-str cond cons
+syn keyword txl_keyword contained conses conses* consp copy-alist
+syn keyword txl_keyword contained copy-cons copy-hash copy-list copy-str
+syn keyword txl_keyword contained copy-vec cos count-if countq
+syn keyword txl_keyword contained countql countqual cum-norm-dist daemon
+syn keyword txl_keyword contained dec defmacro defun defvar
+syn keyword txl_keyword contained del delete-package do dohash
+syn keyword txl_keyword contained downcase-str dwim each each*
+syn keyword txl_keyword contained env env-hash eq eql
 syn keyword txl_keyword contained equal errno error eval
 syn keyword txl_keyword contained evenp exit exp expand
 syn keyword txl_keyword contained expt exptmod fboundp fifth
@@ -92,70 +93,72 @@ 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 logand logior lognot
-syn keyword txl_keyword contained logtest logtrunc logxor make-catenated-stream
-syn keyword txl_keyword contained make-hash make-lazy-cons 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-sym make-time make-time-utc
-syn keyword txl_keyword contained mapcar mapcar* maphash mappend
-syn keyword txl_keyword contained mappend* mask match-fun match-regex
-syn keyword txl_keyword contained match-regex-right match-str match-str-tree max
-syn keyword txl_keyword contained memq memql memqual merge
-syn keyword txl_keyword contained min mkstring mod multi-sort
-syn keyword txl_keyword contained n-choose-k n-perm-k none not
-syn keyword txl_keyword contained nreverse null num-chr num-str
-syn keyword txl_keyword contained numberp oddp op open-command
-syn keyword txl_keyword contained open-directory open-file open-pipe open-process
-syn keyword txl_keyword contained open-tail openlog or orf
-syn keyword txl_keyword contained packagep perm pop pos
-syn keyword txl_keyword contained pos-if posq posql posqual
-syn keyword txl_keyword contained pprint print prog1 progn
-syn keyword txl_keyword contained prop proper-listp push pushhash
-syn keyword txl_keyword contained put-byte put-char put-line put-string
-syn keyword txl_keyword contained qquote quasi quote rand
-syn keyword txl_keyword contained random random-fixnum random-state-p range
-syn keyword txl_keyword contained range* rcomb read real-time-stream-p
-syn keyword txl_keyword contained reduce-left reduce-right ref refset
-syn keyword txl_keyword contained regex-compile regex-parse regexp regsub
-syn keyword txl_keyword contained rehome-sym remhash remove-if remove-if*
-syn keyword txl_keyword contained remove-path remq remq* remql
-syn keyword txl_keyword contained remql* remqual remqual* rename-path
-syn keyword txl_keyword contained repeat replace replace-list replace-str
-syn keyword txl_keyword contained replace-vec rest return return-from
-syn keyword txl_keyword contained reverse rlcp rperm rplaca
-syn keyword txl_keyword contained rplacd 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-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-regex
-syn keyword txl_keyword contained search-str search-str-tree second seek-stream
-syn keyword txl_keyword contained set set-diff set-hash-userdata set-sig-handler
-syn keyword txl_keyword contained sethash setlogmask 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 sin sixth size-vec
-syn keyword txl_keyword contained some sort source-loc source-loc-str
-syn keyword txl_keyword contained span-str splice split-str split-str-set
-syn keyword txl_keyword contained sqrt stat stream-get-prop stream-set-prop
-syn keyword txl_keyword contained streamp string-cmp string-extend string-lt
-syn keyword txl_keyword contained stringp sub sub-list sub-str
-syn keyword txl_keyword contained sub-vec symbol-function symbol-name symbol-package
-syn keyword txl_keyword contained symbol-value symbolp syslog tan
-syn keyword txl_keyword contained third throw throwf time
-syn keyword txl_keyword contained time-fields-local time-fields-utc time-string-local time-string-utc
-syn keyword txl_keyword contained time-usec tok-str tostring tostringp
-syn keyword txl_keyword contained tree-bind tree-case tree-find trim-str
-syn keyword txl_keyword contained trunc typeof unget-byte unget-char
-syn keyword txl_keyword contained unquote upcase-str update url-decode
-syn keyword txl_keyword contained url-encode usleep uw-protect vec
-syn keyword txl_keyword contained vec-push vec-set-length vecref vector
-syn keyword txl_keyword contained vector-list vectorp zerop
+syn keyword txl_keyword contained logtest logtrunc logxor macro-form-p
+syn keyword txl_keyword contained macro-time macroexpand macroexpand-1 macrolet
+syn keyword txl_keyword contained make-catenated-stream make-hash make-lazy-cons 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-sym make-time
+syn keyword txl_keyword contained make-time-utc mapcar mapcar* maphash
+syn keyword txl_keyword contained mappend mappend* mask match-fun
+syn keyword txl_keyword contained match-regex match-regex-right match-str match-str-tree
+syn keyword txl_keyword contained max memq memql memqual
+syn keyword txl_keyword contained merge min mkstring mod
+syn keyword txl_keyword contained multi-sort n-choose-k n-perm-k none
+syn keyword txl_keyword contained not nreverse null num-chr
+syn keyword txl_keyword contained num-str numberp oddp op
+syn keyword txl_keyword contained open-command open-directory open-file open-pipe
+syn keyword txl_keyword contained open-process open-tail openlog or
+syn keyword txl_keyword contained orf packagep perm pop
+syn keyword txl_keyword contained pos pos-if posq posql
+syn keyword txl_keyword contained posqual pprinl pprint prinl
+syn keyword txl_keyword contained print prog1 progn prop
+syn keyword txl_keyword contained proper-listp push pushhash put-byte
+syn keyword txl_keyword contained put-char put-line put-string qquote
+syn keyword txl_keyword contained quasi quote rand random
+syn keyword txl_keyword contained random-fixnum random-state-p range range*
+syn keyword txl_keyword contained rcomb read 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 return return-from reverse
+syn keyword txl_keyword contained rlcp rperm rplaca rplacd
+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-irgrp
+syn keyword txl_keyword contained s-iroth s-irusr s-irwxg s-irwxo
+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-regex search-str
+syn keyword txl_keyword contained search-str-tree second seek-stream set
+syn keyword txl_keyword contained set-diff set-hash-userdata set-sig-handler sethash
+syn keyword txl_keyword contained setlogmask 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 sin sixth size-vec some
+syn keyword txl_keyword contained sort source-loc source-loc-str span-str
+syn keyword txl_keyword contained splice split-str split-str-set sqrt
+syn keyword txl_keyword contained stat stream-get-prop stream-set-prop streamp
+syn keyword txl_keyword contained string-cmp string-extend string-lt stringp
+syn keyword txl_keyword contained sub sub-list sub-str sub-vec
+syn keyword txl_keyword contained symbol-function symbol-name symbol-package symbol-value
+syn keyword txl_keyword contained symbolp syslog tan 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 tok-str tostring tostringp tree-bind
+syn keyword txl_keyword contained tree-case tree-find trim-str trunc
+syn keyword txl_keyword contained typeof unget-byte unget-char unquote
+syn keyword txl_keyword contained upcase-str update url-decode url-encode
+syn keyword txl_keyword contained usleep uw-protect vec vec-push
+syn keyword txl_keyword contained vec-set-length vecref vector vector-list
+syn keyword txl_keyword contained vectorp with-saved-vars zerop
 
 syn match txr_error "@[\t ]*[*]\?[\t ]*."
 syn match txr_nested_error "[^\t `]\+" contained