From e66e1ad43be464b0d42c1700b51a28605881dd33 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Wed, 4 May 2016 21:17:50 -0700 Subject: 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. --- genvim.txr | 4 ++-- tl.vim | 2 +- txr.vim | 4 ++-- 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 -- cgit v1.2.3