* genvim.txr: Change how the hard-coded symbols (end, and, or) are

* added, and also add the missing rep to these.

* txr.vim: Regenerated.

3 files changed, 17 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index c30044b3..30052034 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-11-22  Kaz Kylheku  <kaz@kylheku.com>
+
+	* genvim.txr: Change how the hard-coded symbols (end, and, or) are
+	* added, and also add the missing rep to these.
+
+	* txr.vim: Regenerated.
+
 2013-11-21  Kaz Kylheku  <kaz@kylheku.com>
 
 	Version 70
diff --git a/genvim.txr b/genvim.txr
index 98d496d5..78df98cf 100644
--- a/genvim.txr
+++ b/genvim.txr
@@ -33,6 +33,7 @@ void eval_init(void)
      (let* ((hash (hash :equal-based)))
        (mapcar (op sethash hash @1 @1) list)
        [sort (hash-values hash) string-lt])))
+@(do (set [txr-sym 0..0] '("rep" "end" "and" "or")))
 @(set (txr-sym txl-sym) (@(sortuniq txr-sym) @(sortuniq txl-sym)))
 @(output)
 " VIM Syntax file for txr
@@ -56,7 +57,6 @@ syn spell toplevel
 
 setlocal iskeyword=a-z,A-Z,48-57,!,$,&,*,+,-,<,=,>,?,\\,_,~,^
 @(rep) @{txr-sym}@(mod 0 4)@\nsyn keyword txr_keyword contained @{txr-sym}@(end)
-syn keyword txr_keyword contained end and or
 @(rep) @{txl-sym}@(mod 0 4)@\nsyn keyword txl_keyword contained @{txl-sym}@(end)
 
 syn match txr_error "@@[\t ]*[*]\?[\t ]*."
diff --git a/txr.vim b/txr.vim
index 4a05d8bc..3f3068d5 100644
--- a/txr.vim
+++ b/txr.vim
@@ -19,18 +19,18 @@ syn spell toplevel
 
 setlocal iskeyword=a-z,A-Z,48-57,!,$,&,*,+,-,<,=,>,?,\\,_,~,^
 
-syn keyword txr_keyword contained accept all bind block
-syn keyword txr_keyword contained cases cat choose close
-syn keyword txr_keyword contained coll collect defex deffilter
-syn keyword txr_keyword contained define do eof eol
-syn keyword txr_keyword contained fail filter flatten forget
-syn keyword txr_keyword contained freeform fuzz gather load
-syn keyword txr_keyword contained local maybe merge next
-syn keyword txr_keyword contained none output rebind repeat
+syn keyword txr_keyword contained accept all and bind
+syn keyword txr_keyword contained block cases cat choose
+syn keyword txr_keyword contained close coll collect defex
+syn keyword txr_keyword contained deffilter define do end
+syn keyword txr_keyword contained eof eol fail filter
+syn keyword txr_keyword contained flatten forget freeform fuzz
+syn keyword txr_keyword contained gather load local maybe
+syn keyword txr_keyword contained merge next none or
+syn keyword txr_keyword contained output rebind rep repeat
 syn keyword txr_keyword contained require set skip some
 syn keyword txr_keyword contained text throw trailer try
 syn keyword txr_keyword contained var
-syn keyword txr_keyword contained end and or
 
 syn keyword txl_keyword contained * *keyword-package* *random-state* *self-path*
 syn keyword txl_keyword contained *stddebug* *stderr* *stdin* *stdout*