summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2013-12-02 07:15:19 -0800
committerKaz Kylheku <kaz@kylheku.com>2013-12-02 07:15:19 -0800
commitfb9aba2ed5f2cb69da4737f1f65949da81af6b94 (patch)
tree68709acc7b83b7dbac84f3795d62c507d532ba19
parent20aea3056274d54e32247061cbe3f0ebb71e9992 (diff)
downloadtxr-fb9aba2ed5f2cb69da4737f1f65949da81af6b94.tar.gz
txr-fb9aba2ed5f2cb69da4737f1f65949da81af6b94.tar.bz2
txr-fb9aba2ed5f2cb69da4737f1f65949da81af6b94.zip
* genvim.txr: Missing catch and finally keywords added.
* txr.vim: Regenerated.
-rw-r--r--ChangeLog6
-rw-r--r--genvim.txr2
-rw-r--r--txr.vim22
3 files changed, 18 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 85ffdb77..ca50a21c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2013-12-02 Kaz Kylheku <kaz@kylheku.com>
+ * genvim.txr: Missing catch and finally keywords added.
+
+ * txr.vim: Regenerated.
+
+2013-12-02 Kaz Kylheku <kaz@kylheku.com>
+
debug_check calls are the culprit triggering lookahead
in lazy lists. Changing the semantics of the data argument
so that it can just be the list.
diff --git a/genvim.txr b/genvim.txr
index 38f5d624..cf644e5e 100644
--- a/genvim.txr
+++ b/genvim.txr
@@ -33,7 +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")))
+@(do (set [txr-sym 0..0] '("rep" "end" "and" "or" "catch" "finally")))
@(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 4d5e281a..4771aa38 100644
--- a/txr.vim
+++ b/txr.vim
@@ -20,17 +20,17 @@ syn spell toplevel
setlocal iskeyword=a-z,A-Z,48-57,!,$,&,*,+,-,<,=,>,?,\\,_,~,^
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 block cases cat catch
+syn keyword txr_keyword contained choose close coll collect
+syn keyword txr_keyword contained defex deffilter define do
+syn keyword txr_keyword contained end eof eol fail
+syn keyword txr_keyword contained filter finally 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 or output rebind
+syn keyword txr_keyword contained rep repeat require set
+syn keyword txr_keyword contained skip some text throw
+syn keyword txr_keyword contained trailer try var
syn keyword txl_keyword contained * *keyword-package* *random-state* *self-path*
syn keyword txl_keyword contained *stddebug* *stderr* *stdin* *stdout*