summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--txr.vim8
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 8bb66845..580c6c52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2011-11-06 Kaz Kylheku <kaz@kylheku.com>
+ * txr.vim: Make sure whitespace is recognized after @.
+
+2011-11-06 Kaz Kylheku <kaz@kylheku.com>
+
Task #11581 & bugfix.
* match.c (noval_s): New symbol variable.
diff --git a/txr.vim b/txr.vim
index f101a0ae..a8310de4 100644
--- a/txr.vim
+++ b/txr.vim
@@ -25,8 +25,8 @@ syn keyword txr_keyword contained define try catch finally throw
syn keyword txr_keyword contained defex throw deffilter filter eof eol
syn match txr_at "@[ \t]*@"
-syn match txr_comment "@#.*"
-syn match txr_contin "@\\$"
+syn match txr_comment "@[ \t]*#.*"
+syn match txr_contin "@[ \t]*\\$"
syn match txr_hashbang "^#!.*"
syn match txr_char "@[ \t]*\\."
syn match txr_char "@[ \t]*\\x[0-9A-Fa-f]\+"
@@ -42,13 +42,13 @@ syn region txr_directive matchgroup=Delimiter start="@[ \t]*(" matchgroup=Delimi
syn region txr_list contained matchgroup=Delimiter start="(" matchgroup=Delimiter end=")" contains=txr_string,txr_regex,txr_ident,txr_num,txr_variable,txr_meta,txr_list,txr_quasilit,txr_chr
-syn region txr_meta contained matchgroup=Delimiter start="@(" matchgroup=Delimiter end=")" contains=txr_string,txr_regex,txr_ident,txr_num,txr_variable,txr_quasilit,txr_chr
+syn region txr_meta contained matchgroup=Delimiter start="@[ \t]*(" matchgroup=Delimiter end=")" contains=txr_string,txr_regex,txr_ident,txr_num,txr_variable,txr_quasilit,txr_chr
syn region txr_string contained oneline start=+"+ skip=+\\\\\|\\"+ end=+"+
syn region txr_quasilit contained oneline start=+`+ skip=+\\\\\|\\`+ end=+`+ contains=txr_directive,txr_variable,txr_bracevar
syn region txr_chr contained oneline start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=txr_directive,txr_variable,txr_bracevar
syn region txr_regex contained oneline start=+/+ skip=+\\\\\|\\/+ end=+/+
-syn region txr_regdir oneline start=+@/+ skip=+\\\\\|\\/+ end=+/+
+syn region txr_regdir oneline start=+@[ \t]*/+ skip=+\\\\\|\\/+ end=+/+
hi def link txr_comment Comment
hi def link txr_hashbang Comment