summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2012-02-02 12:05:35 -0800
committerKaz Kylheku <kaz@kylheku.com>2012-02-02 12:05:35 -0800
commitc4dd3aaa204cd70e03d4cec3531c64be9a24f649 (patch)
tree37a1cec9087dea0bbe43e8e5b9fa8881fd6422e4
parent0f6603d5716d285a89a66d88200830c26917e89d (diff)
downloadtxr-c4dd3aaa204cd70e03d4cec3531c64be9a24f649.tar.gz
txr-c4dd3aaa204cd70e03d4cec3531c64be9a24f649.tar.bz2
txr-c4dd3aaa204cd70e03d4cec3531c64be9a24f649.zip
* txr.vim: Move error match before other cases and simplify.
Comment are colorized properly again.
-rw-r--r--ChangeLog5
-rw-r--r--txr.vim3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f9bcb661..b4f24928 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2012-02-02 Kaz Kylheku <kaz@kylheku.com>
+ * txr.vim: Move error match before other cases and simplify.
+ Comment are colorized properly again.
+
+2012-02-02 Kaz Kylheku <kaz@kylheku.com>
+
This test case would have caught the prior regression.
* Makefile (TXR_ARGS): Defined for new test case.
diff --git a/txr.vim b/txr.vim
index 30f950d3..bcb572fb 100644
--- a/txr.vim
+++ b/txr.vim
@@ -85,6 +85,8 @@ syn keyword txl_keyword contained range generate repeat force
syn match txr_hash "#" contained
syn match txr_quote "[,']" contained
+"syn match txr_error "@[\t ]*[*]\?[\t ]*[^\t A-Za-z*{(\\\[/@]"
+syn match txr_error "@[\t ]*[*]\?[\t ]*."
syn match txr_hashbang "^#!.*"
syn match txr_atat "@[ \t]*@"
syn match txr_comment "@[ \t]*[#;].*"
@@ -94,7 +96,6 @@ syn match txr_char "@[ \t]*\\x[0-9a-fa-f]\+"
syn match txr_char "@[ \t]*\\[0-9]\+"
syn match txr_variable "@[ \t]*[*]\?[ \t]*[A-Za-z_][A-Aa-z0-9_]*"
syn match txr_regdir "@[ \t]*/\(\\/\|[^/]\)*/"
-syn match txr_error "@[\t ]*[*]\?[\t ]*[^\t A-Za-z*{(\\\[/@]"
syn match txr_chr "#\\x[A-Fa-f0-9]\+" contained
syn match txr_chr "#\\[^ \t\nA-Za-z0-9_]" contained