summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2016-05-04 21:17:50 -0700
committerKaz Kylheku <kaz@kylheku.com>2016-05-04 21:17:50 -0700
commite66e1ad43be464b0d42c1700b51a28605881dd33 (patch)
tree1b342690b7b9ba378cb1c2c3f1774cfdfdabcf8b
parent2a7f0136df10e5a6d10988b6040267e771ee5df6 (diff)
downloadtxr-e66e1ad43be464b0d42c1700b51a28605881dd33.tar.gz
txr-e66e1ad43be464b0d42c1700b51a28605881dd33.tar.bz2
txr-e66e1ad43be464b0d42c1700b51a28605881dd33.zip
Fix Vim syntax highlighting bugs.
* genvim.txr (txr_splicevar): This match must be contained. (txr_metanum): Must be contained in TXR, need not be contained in TXR Lisp. * txr.vim, tl.vim: Regenerated.
-rw-r--r--genvim.txr4
-rw-r--r--tl.vim2
-rw-r--r--txr.vim4
3 files changed, 5 insertions, 5 deletions
diff --git a/genvim.txr b/genvim.txr
index 39d89fbd..c47b5f89 100644
--- a/genvim.txr
+++ b/genvim.txr
@@ -102,8 +102,8 @@ syn match txr_hashbang "^#!.*"
@ (output :continue out)
syn match txr_nested_error "[^\t ]\+" contained
syn match txr_variable "@at[*]\?[ \t]*[@alpha][@alnum]*"
-syn match txr_splicevar "@@[ \t,*@@]*[@alpha][@alnum]*"
-syn match txr_metanum "@@\+[0-9]\+"
+syn match txr_splicevar "@@[ \t,*@@]*[@alpha][@alnum]*" contained
+syn match txr_metanum "@@\+[0-9]\+"@(if txr-p " contained")
syn match txr_badesc "\\." contained
syn match txr_escat "\\@@" contained
syn match txr_stresc "\\[@chesc"`']" contained
diff --git a/tl.vim b/tl.vim
index 7d645c3e..5e189a13 100644
--- a/tl.vim
+++ b/tl.vim
@@ -340,7 +340,7 @@ syn keyword txl_keyword contained wrap wrap* yield yield-from
syn keyword txl_keyword contained zap zerop zip
syn match txr_nested_error "[^\t ]\+" contained
syn match txr_variable "\(@[ \t]*\)[*]\?[ \t]*[A-Za-z_][A-Za-z_0-9]*"
-syn match txr_splicevar "@[ \t,*@]*[A-Za-z_][A-Za-z_0-9]*"
+syn match txr_splicevar "@[ \t,*@]*[A-Za-z_][A-Za-z_0-9]*" contained
syn match txr_metanum "@\+[0-9]\+"
syn match txr_badesc "\\." contained
syn match txr_escat "\\@" contained
diff --git a/txr.vim b/txr.vim
index 00d2ac86..bd842879 100644
--- a/txr.vim
+++ b/txr.vim
@@ -367,8 +367,8 @@ syn match txr_regdir "\(@[ \t]*\)/\(\\/\|[^/]\|\\\n\)*/"
syn match txr_hashbang "^#!.*"
syn match txr_nested_error "[^\t ]\+" contained
syn match txr_variable "\(@[ \t]*\)[*]\?[ \t]*[A-Za-z_][A-Za-z_0-9]*"
-syn match txr_splicevar "@[ \t,*@]*[A-Za-z_][A-Za-z_0-9]*"
-syn match txr_metanum "@\+[0-9]\+"
+syn match txr_splicevar "@[ \t,*@]*[A-Za-z_][A-Za-z_0-9]*" contained
+syn match txr_metanum "@\+[0-9]\+" contained
syn match txr_badesc "\\." contained
syn match txr_escat "\\@" contained
syn match txr_stresc "\\[abtnvfre\\ \n"`']" contained