runtime(vim): fix incorrect highlighting of User autocmds
Commit:
https://github.com/vim/vim/commit/8311e7d6b4cf92cb90ee6abace271834e9af66f2
Author: zeertzjq <[email protected]>
Date: Wed Jun 18 18:02:47 2025 +0200
runtime(vim): fix incorrect highlighting of User autocmds
There is no pattern after the user event name. The user event name is
the pattern.
closes: #17568
Signed-off-by: zeertzjq <[email protected]>
Signed-off-by: Doug Kearns <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/runtime/syntax/generator/vim.vim.base
b/runtime/syntax/generator/vim.vim.base
index dbe2ab6ac..dcd57cde5 100644
--- a/runtime/syntax/generator/vim.vim.base
+++ b/runtime/syntax/generator/vim.vim.base
@@ -2,7 +2,7 @@
" Language: Vim script
" Maintainer: Hirohito Higashi <h.east.727 ATMARK gmail.com>
" Doug Kearns <[email protected]>
-" Last Change: 2025 Jun 11
+" Last Change: 2025 Jun 18
" Former Maintainer: Charles E. Campbell
" DO NOT CHANGE DIRECTLY.
@@ -81,7 +81,7 @@ syn case ignore
" GEN_SYN_VIM: vimAutoEvent, START_STR='syn keyword vimAutoEvent contained',
END_STR='skipwhite nextgroup=vimAutoEventSep,@vimAutocmdPattern'
syn keyword vimAutoEvent contained User skipwhite
nextgroup=vimUserAutoEvent
-syn match vimUserAutoEvent contained "\<\h\w*\>"
skipwhite nextgroup=vimAutoEventSep,@vimAutocmdPattern
+syn match vimUserAutoEvent contained "\<\h\w*\>"
skipwhite nextgroup=vimUserAutoEventSep,vimAutocmdMod,vimAutocmdBlock
" Highlight commonly used Groupnames {{{2
syn keyword vimGroup contained Comment Constant String Character Number
Boolean Float Identifier Function Statement Conditional Repeat Label Operator
Keyword Exception PreProc Include Define Macro PreCondit Type StorageClass
Structure Typedef Special SpecialChar Tag Delimiter SpecialComment Debug
Underlined Ignore Error Todo
@@ -1203,6 +1203,7 @@ syn match vimAutocmdMod contained "++once\>"
skipwhite nextgroup=vimAutocmdMod,v
" higher priority than vimAutocmdGroup, assume no group is so named
syn match vimAutoEventGlob contained "*" skipwhite
nextgroup=@vimAutocmdPattern
syn match vimAutoEventSep contained " \@1<=,"
nextgroup=vimAutoEvent
+syn match vimUserAutoEventSep contained " \@1<=,"
nextgroup=vimUserAutoEvent
syn match vimAutocmd "\<au\%[tocmd]\>" skipwhite
nextgroup=vimAutocmdBang,vimAutocmdGroup,vimAutoEvent,vimAutoEventGlob
diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_00.dump
b/runtime/syntax/testdir/dumps/vim_ex_autocmd_00.dump
index 13dbfc626..b8c3b0ea6 100644
--- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_00.dump
@@ -8,12 +8,12 @@
|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p|
|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t|
|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&|||
|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@9
|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t| |e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@9
|a+0#af5f00255&|u|t|o|c|m|d|
+0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d|,+0#0000000&|B+0#00e0003&|u|f|N|e|w|F|i|l|e|
+0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| |e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@9
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| @5|*+0#e000e06&|.+0#0000000&|t|x|t|
|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&|||
|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@9
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| @11|e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@9
@75
|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p|
|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t|
|++0#e000e06&@1|o|n|c|e| +0#0000000&|e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@2
|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|o|n|c|e|
+0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"|
+0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"|
+0#0000000&@2
|a+0#af5f00255&|u|t|o|c|m|d|
+0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d|,+0#0000000&|B+0#00e0003&|u|f|N|e|w|F|i|l|e|
+0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|o|n|c|e|
+0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"|
+0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"|
+0#0000000&@2
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| @5|*+0#e000e06&|.+0#0000000&|t|x|t|
|++0#e000e06&@1|o|n|c|e| +0#0000000&|e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@2
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| @11|++0#e000e06&@1|o|n|c|e|
+0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"|
+0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"|
+0#0000000&@2
@75
|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p|
|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t|
|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&
|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|n|e|s|t|e|d|
+0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"|
+0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"|
+0#0000000&
diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_01.dump
b/runtime/syntax/testdir/dumps/vim_ex_autocmd_01.dump
index 1f54e2719..61ef015d6 100644
--- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_01.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_01.dump
@@ -1,11 +1,11 @@
|a+0#af5f00255#ffffff0|u|t|o|c|m|d| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|o|n|c|e|
+0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"|
+0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"|
+0#0000000&@2
|a+0#af5f00255&|u|t|o|c|m|d|
+0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d|,+0#0000000&|B+0#00e0003&|u|f|N|e|w|F|i|l|e|
+0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|o|n|c|e|
+0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"|
+0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"|
+0#0000000&@2
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| @5|*+0#e000e06&|.+0#0000000&|t|x|t|
|++0#e000e06&@1|o|n|c|e| +0#0000000&|e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@2
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| @11|++0#e000e06&@1|o|n|c|e|
+0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"|
+0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"|
+0#0000000&@2
@75
|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p|
|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t|
|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&
>a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d|
>+0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|n|e|s|t|e|d|
>+0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"|
>+0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"|
>+0#0000000&
|a+0#af5f00255&|u|t|o|c|m|d|
+0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d|,+0#0000000&|B+0#00e0003&|u|f|N|e|w|F|i|l|e|
+0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|n|e|s|t|e|d|
+0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"|
+0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"|
+0#0000000&
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| @5|*+0#e000e06&|.+0#0000000&|t|x|t|
|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| @11|++0#e000e06&@1|n|e|s|t|e|d|
+0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"|
+0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"|
+0#0000000&
@75
|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p|
|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t|
|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d|
+0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"|
+0#0000000&||| |e+0#af5f00255&|c|h|o
| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@68
@@ -13,7 +13,7 @@
| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@68
|a+0#af5f00255&|u|t|o|c|m|d|
+0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d|,+0#0000000&|B+0#00e0003&|u|f|N|e|w|F|i|l|e|
+0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|o|n|c|e|
+0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o
| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@68
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| @5|*+0#e000e06&|.+0#0000000&|t|x|t|
|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d|
+0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"|
+0#0000000&||| |e+0#af5f00255&|c|h|o
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| @11|++0#e000e06&@1|o|n|c|e|
+0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o
| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@68
@75
|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p|
|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|<+0#e000e06&|b|u|f@1|e|r|>|
+0#0000000&@5|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d|
+0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|@+0#4040ff13&@2
diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_02.dump
b/runtime/syntax/testdir/dumps/vim_ex_autocmd_02.dump
index fa775dc6e..7738837b4 100644
--- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_02.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_02.dump
@@ -16,5 +16,5 @@
|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"|
+0#0000000&@60
|a+0#af5f00255&|u|t|o|c|m|d|
+0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d|,+0#0000000&|B+0#00e0003&|u|f|N|e|w|F|i|l|e|
+0#0000000&|<+0#e000e06&|b|u|f@1|e|r|=|a|b|u|f|>|
+0#0000000&|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d|
+0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1
|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"|
+0#0000000&@60
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| @5|<+0#e000e06&|b|u|f@1|e|r|>|
+0#0000000&@5|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d|
+0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|@+0#4040ff13&@2
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t|,|B|a|r|E|v|e|n|t| @10|++0#e000e06&@1|o|n|c|e|
+0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|@+0#4040ff13&@2
| +0#0000000&@56|3|1|,|1| @9|1|0|%|
diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_03.dump
b/runtime/syntax/testdir/dumps/vim_ex_autocmd_03.dump
index 4966993c7..17bd350ad 100644
--- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_03.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_03.dump
@@ -1,13 +1,9 @@
-|a+0#af5f00255#ffffff0|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| @5|<+0#e000e06&|b|u|f@1|e|r|>|
+0#0000000&@5|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d|
+0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1
+|a+0#af5f00255#ffffff0|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t|,|B|a|r|E|v|e|n|t| @10|++0#e000e06&@1|o|n|c|e|
+0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|F|o@1
|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"|
+0#0000000&@60
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| @5|<+0#e000e06&|b|u|f@1|e|r|=|4|2|>|
+0#0000000&@2|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d|
+0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1
-|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"|
+0#0000000&@60
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| @5|<+0#e000e06&|b|u|f@1|e|r|=|a|b|u|f|>|
+0#0000000&|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d|
+0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1
-|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"|
+0#0000000&@60
-> @74
+@75
|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p|
|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|f|<|b|u|f@1|e|r|>|o@1|
@2|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d|
+0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1
|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"|
+0#0000000&@60
-@75
+> @74
|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| |{+0#e000e06&| +0#0000000&@51
@2|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@62
@2|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@62
@@ -16,5 +12,9 @@
@2|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@62
@2|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@62
|}+0#e000e06&| +0#0000000&@73
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| |*+0#e000e06&|.+0#0000000&|t|x|t| |{+0#e000e06&|
+0#0000000&@45
-@57|4|0|,|0|-|1| @7|1|4|%|
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| |{+0#e000e06&| +0#0000000&@51
+@2|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@62
+@2|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@62
+|}+0#e000e06&| +0#0000000&@73
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p|
|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t|
|{+0#e000e06&| +0#0000000&@42
+@57|4|0|,|0|-|1| @7|1|5|%|
diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_04.dump
b/runtime/syntax/testdir/dumps/vim_ex_autocmd_04.dump
index 50bcd3891..7a82ab288 100644
--- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_04.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_04.dump
@@ -1,13 +1,9 @@
-|a+0#af5f00255#ffffff0|u|t|o|c|m|d| +0#0000000&|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| |*+0#e000e06&|.+0#0000000&|t|x|t| |{+0#e000e06&|
+0#0000000&@45
+|a+0#af5f00255#ffffff0|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p|
|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t|
|{+0#e000e06&| +0#0000000&@42
@2|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@62
@2|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@62
|}+0#e000e06&| +0#0000000&@73
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p|
|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t|
|{+0#e000e06&| +0#0000000&@42
-@2>e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@62
-@2|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@62
-|}+0#e000e06&| +0#0000000&@73
-@75
@75
+> @74
|"+0#0000e05&| |M|u|l|t|i|l|i|n|e| |{|c|m|d|}| |a|r|g| +0#0000000&@53
@75
|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| |e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@42
@@ -17,4 +13,8 @@
|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| |e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| @40
@6|\+0#e000e06&| +0#0000000&|e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&||| @54
@6|\+0#e000e06&| +0#0000000&|e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|B|a|z|"| +0#0000000&@56
-@57|5|6|,|3| @9|2|0|%|
+@75
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @53
+@6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
+@6|\+0#e000e06&| +0#0000000&|e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| @54
+@57|5|8|,|0|-|1| @7|2|1|%|
diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_05.dump
b/runtime/syntax/testdir/dumps/vim_ex_autocmd_05.dump
index 7cf99da4d..ce00fb28d 100644
--- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_05.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_05.dump
@@ -1,13 +1,9 @@
-| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|B|a|z|"| +0#0000000&@56
-@75
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @53
+| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| @54
@6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
-@6|\+0#e000e06&| +0#0000000&|e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| @54
-@6>"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
@6|\+0#e000e06&| +0#0000000&|e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@56
@6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
@6|\+0#e000e06&||+0#0000000&| |e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|B|a|z|"| +0#0000000&@55
-@75
+> @74
|a+0#af5f00255&|u|t|o|c|m|d|
+0#0000000&|B+0#00e0003&|u|f|R|e|a|d|,+0#0000000&|B+0#00e0003&|u|f|N|e|w|F|i|l|e|
+0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @42
@6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
@6|\+0#e000e06&| +0#0000000&|e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| @54
@@ -15,6 +11,10 @@
@6|\+0#e000e06&| +0#0000000&|e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@56
@6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
@6|\+0#e000e06&||+0#0000000&| |e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|B|a|z|"| +0#0000000&@55
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| |*+0#e000e06&|.+0#0000000&|t|x|t| @47
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| @53
+@6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
+@6|\+0#e000e06&| +0#0000000&|e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| @54
+@6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
+@6|\+0#e000e06&| +0#0000000&|e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@56
@6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
-@57|7|4|,|7| @9|2|7|%|
+@57|7|6|,|0|-|1| @7|2|9|%|
diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_06.dump
b/runtime/syntax/testdir/dumps/vim_ex_autocmd_06.dump
index 366d71c84..42eebd163 100644
--- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_06.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_06.dump
@@ -1,13 +1,9 @@
| +0&#ffffff0@5|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
-@6|\+0#e000e06&| +0#0000000&|e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| @54
-@6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
-@6|\+0#e000e06&| +0#0000000&|e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@56
-@6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
-@6>\+0#e000e06&||+0#0000000&| |e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|B|a|z|"| +0#0000000&@55
+@6|\+0#e000e06&||+0#0000000&| |e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|B|a|z|"| +0#0000000&@55
|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p|
|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @44
@6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
@6|\+0#e000e06&| +0#0000000&|e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| @54
-@6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
+@6>"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
@6|\+0#e000e06&| +0#0000000&|e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@56
@6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
@6|\+0#e000e06&||+0#0000000&| |e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|B|a|z|"| +0#0000000&@55
@@ -17,4 +13,8 @@
@75
|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t|,+0#e000e06&|*|.+0#0000000&|v|i|m|,+0#e000e06&|*|.+0#0000000&|c|
@5|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&|||
|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@14
|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>|,|*|.+0#0000000&|v|i|m|,+0#e000e06&|*|.+0#0000000&|c|
@2|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&|||
|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@14
-@57|9|2|,|7| @9|3|5|%|
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t|,+0#e000e06&|<|b|u|f@1|e|r|>|,|*|.+0#0000000&|c|
@2|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&|||
|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@14
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t|,+0#e000e06&|*|.+0#0000000&|v|i|m|,+0#e000e06&|<|b|u|f@1|e|r|>|
+0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"|
+0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"|
+0#0000000&@14
+@75
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|<+0#e000e06&|b|u|f@1|e|r|=|1|>|,|<|b|u|f@1|e|r|=|2|>|,|<|b|u|f@1|e|r|=|3|>|
+0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"|
+0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"|
+0#0000000&@2
+@57|9|4|,|7| @9|3|6|%|
diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_07.dump
b/runtime/syntax/testdir/dumps/vim_ex_autocmd_07.dump
index 34546f1d4..220055b36 100644
--- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_07.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_07.dump
@@ -1,13 +1,9 @@
-|a+0#af5f00255#ffffff0|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>|,|*|.+0#0000000&|v|i|m|,+0#e000e06&|*|.+0#0000000&|c|
@2|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&|||
|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@14
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t|,+0#e000e06&|<|b|u|f@1|e|r|>|,|*|.+0#0000000&|c|
@2|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&|||
|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@14
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t|,+0#e000e06&|*|.+0#0000000&|v|i|m|,+0#e000e06&|<|b|u|f@1|e|r|>|
+0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"|
+0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"|
+0#0000000&@14
+|a+0#af5f00255#ffffff0|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|<+0#e000e06&|b|u|f@1|e|r|=|1|>|,|<|b|u|f@1|e|r|=|2|>|,|<|b|u|f@1|e|r|=|3|>|
+0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"|
+0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"|
+0#0000000&@2
@75
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|<+0#e000e06&|b|u|f@1|e|r|=|1|>|,|<|b|u|f@1|e|r|=|2|>|,|<|b|u|f@1|e|r|=|3|>|
+0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"|
+0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"|
+0#0000000&@2
-> @74
@75
|"+0#0000e05&| +0#0000000&|F+0#0000001#ffff4012|I|X|M|E|:+0#e000e06#ffffff0|
+0#0000e05&|"|B|u|f|R|e|a|d|"| |a|n|d| |"+0#e000002&|*|"| +0#0000e05&|a|r|e|
|v|a|l|i|d| |g|r|o|u|p| |n|a|m|e|s|,| |h|o|w|e|v|e|r|,| |:|h|e|l|p|
|:|a|u|g|r|o|u|p| +0#0000000&@1
|"+0#0000e05&| |e|x|p|l|i|c|i|t|l|y| |d|i|r|e|c|t|s| |t|h|e| |u|s|e|r| |N|O|T|
|t|o| |s|h|a|d|o|w| |e|v|e|n|t| |n|a|m|e|s| |w|i|t|h| |g|r|o|u|p| |n|a|m|e|s|
+0#0000000&@2
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|B|u|f|R|e|a|d| |*+0#af5f00255&|.|t+0#0000000&|x|t|
|++0#af5f00255&@1|o+0#0000000&|n|c|e| |++0#af5f00255&@1|n+0#0000000&|e|s|t|e|d|
|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@18
+>a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|B|u|f|R|e|a|d| |*+0#af5f00255&|.|t+0#0000000&|x|t|
|++0#af5f00255&@1|o+0#0000000&|n|c|e| |++0#af5f00255&@1|n+0#0000000&|e|s|t|e|d|
|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@18
|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|*+0#00e0003&|
+0#0000000&@6|B|u|f|R|e|a|d| |*+0#af5f00255&|.|t+0#0000000&|x|t|
|++0#af5f00255&@1|o+0#0000000&|n|c|e| |++0#af5f00255&@1|n+0#0000000&|e|s|t|e|d|
|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@18
@75
@75
@@ -17,4 +13,8 @@
|r|"| +0#0000000&@72
|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&@6|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|o|n|c|e|
+0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|B|a
|r|"| +0#0000000&@72
-@57|1@1|0|,|0|-|1| @6|4|2|%|
+|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f|o@1|g|r|o|u|p|
|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @6|++0#e000e06&@1|o|n|c|e|
+0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|B|a
+|r|"| +0#0000000&@72
+|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&@9|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| @6|++0#e000e06&@1|o|n|c|e|
+0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|B|a
+|r|"| +0#0000000&@72
+@57|1@1|2|,|1| @8|4|3|%|
diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_08.dump
b/runtime/syntax/testdir/dumps/vim_ex_autocmd_08.dump
index f4bad3ab6..7e936c584 100644
--- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_08.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_08.dump
@@ -1,14 +1,10 @@
-|a+0#af5f00255#ffffff0|u|t|o|c|m|d|!| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&@6|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|o|n|c|e|
+0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|B|a
+|a+0#af5f00255#ffffff0|u|t|o|c|m|d|!| +0#0000000&@9|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| @6|++0#e000e06&@1|o|n|c|e|
+0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|B|a
|r|"| +0#0000000&@72
-|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f|o@1|g|r|o|u|p|
|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t|
|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|o|n|c|e|
+0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o|
+0#0000000&|"+0#e000002&|B|a
-|r|"| +0#0000000&@72
-|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&@9|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| |*+0#e000e06&|.+0#0000000&|t|x|t|
|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d|
+0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"|
+0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a
-|r|"| +0#0000000&@72
-> @74
+@75
|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f|o@1|g|r|o|u|p|
|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@6|*+0#e000e06&|.+0#0000000&|t|x|t| @37
|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&@6|*+0#e000e06&|.+0#0000000&|t|x|t| @37
-|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f|o@1|g|r|o|u|p|
|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t|
|*+0#e000e06&|.+0#0000000&|t|x|t| @37
-|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&@9|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| |*+0#e000e06&|.+0#0000000&|t|x|t| @37
+>a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f|o@1|g|r|o|u|p|
|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @43
+|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&@9|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| @43
@75
|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f|o@1|g|r|o|u|p| |*+0#00e0003&|
+0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @49
|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&@9|*+0#00e0003&|
+0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @49
@@ -17,4 +13,8 @@
|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&@49
|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f|o@1|g|r|o|u|p|
|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @43
|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&@9|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| @43
-@57|1|2|4|,|0|-|1| @6|4|8|%|
+@75
+|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f|o@1|g|r|o|u|p| @57
+|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&@66
+@75
+@57|1|2|5|,|1| @8|5|0|%|
diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_09.dump
b/runtime/syntax/testdir/dumps/vim_ex_autocmd_09.dump
index a2c639575..d7ef69673 100644
--- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_09.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_09.dump
@@ -1,13 +1,9 @@
-|a+0#af5f00255#ffffff0|u|t|o|c|m|d|!| +0#0000000&@9|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| @43
-@75
-|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f|o@1|g|r|o|u|p| @57
-|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&@66
-@75
->"+0#0000e05&| |c|o|m@1|a|n|d| |-|>| |b|a|n|g| |-|>| |g|r|o|u|p|
|"+0#e000002&|!|f|o@1|g|r|o|u|p|!|"| +0#0000000&@35
+| +0&#ffffff0@74
+|"+0#0000e05&| |c|o|m@1|a|n|d| |-|>| |b|a|n|g| |-|>| |g|r|o|u|p|
|"+0#e000002&|!|f|o@1|g|r|o|u|p|!|"| +0#0000000&@35
|a+0#af5f00255&|u|t|o|c|m|d|!|!+0#0000000&|f|o@1|g|r|o|u|p|!| @56
|"+0#0000e05&| |c|o|m@1|a|n|d| |-|>| |b|a|n|g| |-|>| |g|r|o|u|p|
|"+0#e000002&|f|o@1|g|r|o|u|p|"| +0#0000000&@37
|a+0#af5f00255&|u|t|o|c|m|d|!|f+0#0000000&|o@1|g|r|o|u|p| @58
-|"+0#0000e05&| |c|o|m@1|a|n|d| |-|>| |b|a|n|g| |-|>| |e|v|e|n|t| +0#0000000&@48
+>"+0#0000e05&| |c|o|m@1|a|n|d| |-|>| |b|a|n|g| |-|>| |e|v|e|n|t| +0#0000000&@48
|a+0#af5f00255&|u|t|o|c|m|d|!|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@59
|"+0#0000e05&| |c|o|m@1|a|n|d| |-|>| |b|a|n|g| |-|>| |u|s|e|r| |e|v|e|n|t|
+0#0000000&@43
|a+0#af5f00255&|u|t|o|c|m|d|!|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t|
@53
@@ -17,4 +13,8 @@
|"+0#0000e05&| |c|o|m@1|a|n|d| |-|>| |g|r|o|u|p| |"+0#e000002&|*|"|
+0#0000e05&|-|>| |e|v|e|n|t| |g|l|o|b| |-|>| |p|a|t@1|e|r|n| +0#0000000&@27
|a+0#af5f00255&|u|t|o|c|m|d|!|*+0#00e0003&| +0#0000000&|*+0#e000e06&|
+0#0000000&|*+0#af5f00255&|.|t+0#0000000&|x|t| @57
|"+0#0000e05&| |c|o|m@1|a|n|d| |-|>| |g|r|o|u|p|
|"+0#e000002&|B|u|f|R|e|a|d|"| +0#0000e05&|-|>| |e|v|e|n|t|
|"+0#e000002&|B|u|f|R|e|a|d|"| +0#0000e05&|-|>| |p|a|t@1|e|r|n| +0#0000000&@16
-@57|1|4|1|,|1| @8|5@1|%|
+|a+0#af5f00255&|u|t|o|c|m|d|!|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|B|u|f|R|e|a|d| |*+0#af5f00255&|.|t+0#0000000&|x|t| @45
+@75
+@75
+|"+0#0000e05&| |L|i|s|t| +0#0000000&@68
+@57|1|4|3|,|1| @8|5|7|%|
diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_10.dump
b/runtime/syntax/testdir/dumps/vim_ex_autocmd_10.dump
index 9179f30e7..976579645 100644
--- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_10.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_10.dump
@@ -1,15 +1,9 @@
-|"+0#0000e05#ffffff0| |c|o|m@1|a|n|d| |-|>| |g|r|o|u|p|
|"+0#e000002&|B|u|f|R|e|a|d|"| +0#0000e05&|-|>| |e|v|e|n|t|
|"+0#e000002&|B|u|f|R|e|a|d|"| +0#0000e05&|-|>| |p|a|t@1|e|r|n| +0#0000000&@16
-|a+0#af5f00255&|u|t|o|c|m|d|!|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|B|u|f|R|e|a|d| |*+0#af5f00255&|.|t+0#0000000&|x|t| @45
+|"+0#0000e05#ffffff0| |L|i|s|t| +0#0000000&@68
@75
-@75
-|"+0#0000e05&| |L|i|s|t| +0#0000000&@68
-> @74
|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p|
|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@6|*+0#e000e06&|.+0#0000000&|t|x|t| @38
|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&@6|*+0#e000e06&|.+0#0000000&|t|x|t| @38
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| |*+0#e000e06&|.+0#0000000&|t|x|t| @38
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| |*+0#e000e06&|.+0#0000000&|t|x|t| @38
@75
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |*+0#00e0003&|
+0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @50
+>a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |*+0#00e0003&|
+0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @50
|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|*+0#00e0003&|
+0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @50
@75
|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p|
|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@50
@@ -17,4 +11,10 @@
|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| @44
|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| @44
@75
-@57|1|5|9|,|0|-|1| @6|6|2|%|
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| @58
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@67
+@75
+@75
+|"+0#0000e05&| |:|d|o|a|u|t|o|a|l@1| +0#0000000&@62
+@75
+@57|1|6|1|,|1| @8|6|5|%|
diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_11.dump
b/runtime/syntax/testdir/dumps/vim_ex_autocmd_11.dump
index 73ce7402d..a8b594c25 100644
--- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_11.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_11.dump
@@ -1,20 +1,20 @@
| +0&#ffffff0@74
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| @58
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@67
-@75
-@75
->"+0#0000e05&| |:|d|o|a|u|t|o|a|l@1| +0#0000000&@62
-@75
|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&@57
@75
|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @51
|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|f|o@1|g|r|o|u|p|
|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@48
-|d+0#af5f00255&|o|a|u|t|o|a|l@1|
+0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>|
+0#0000000&|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@44
+>d+0#af5f00255&|o|a|u|t|o|a|l@1|
+0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>|
+0#0000000&|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@44
@75
|d+0#af5f00255&|o|a|u|t|o|a|l@1|
+0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f|o@1|g|r|o|u|p|
|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @29
@75
|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| @51
-@75
-|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| |*+0#e000e06&|.+0#0000000&|t|x|t| @45
|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|f|o@1|g|r|o|u|p|
|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @42
-@57|1|7@1|,|1| @8|6|9|%|
+|d+0#af5f00255&|o|a|u|t|o|a|l@1|
+0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| @38
+@75
+|d+0#af5f00255&|o|a|u|t|o|a|l@1|
+0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f|o@1|g|r|o|u|p|
|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @29
+@75
+|d+0#af5f00255&|o|a|u|t|o|a|l@1|
+0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f|o@1|g|r|o|u|p|
|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| |||
|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@16
+|d+0#af5f00255&|o|a|u|t|o|a|l@1|
+0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f|o@1|g|r|o|u|p|
|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t|
|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@19
+@75
+@75
+@57|1|7|9|,|1| @8|7|2|%|
diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_12.dump
b/runtime/syntax/testdir/dumps/vim_ex_autocmd_12.dump
index aac1eeaed..b4513f107 100644
--- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_12.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_12.dump
@@ -1,20 +1,20 @@
-|d+0#af5f00255#ffffff0|o|a|u|t|o|a|l@1| +0#0000000&|f|o@1|g|r|o|u|p|
|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @42
-|d+0#af5f00255&|o|a|u|t|o|a|l@1|
+0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| @38
-@75
-|d+0#af5f00255&|o|a|u|t|o|a|l@1|
+0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f|o@1|g|r|o|u|p|
|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t|
|*+0#e000e06&|.+0#0000000&|t|x|t| @23
-@75
->d+0#af5f00255&|o|a|u|t|o|a|l@1|
+0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f|o@1|g|r|o|u|p|
|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| |||
|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@16
-|d+0#af5f00255&|o|a|u|t|o|a|l@1|
+0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f|o@1|g|r|o|u|p|
|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t|
|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@19
-@75
-@75
+| +0&#ffffff0@74
|"+0#0000e05&| |:|d|o|a|u|t|o|c|m|d| +0#0000000&@62
@75
|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&@57
@75
-|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @51
+>d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @51
|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p|
|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@48
|d+0#af5f00255&|o|a|u|t|o|c|m|d|
+0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>|
+0#0000000&|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@44
@75
|d+0#af5f00255&|o|a|u|t|o|c|m|d|
+0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f|o@1|g|r|o|u|p|
|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @29
@75
-@57|1|9|5|,|1| @8|7@1|%|
+|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| @51
+|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t|,|B|a|r|E|v|e|n|t| @42
+|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p|
|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @42
+|d+0#af5f00255&|o|a|u|t|o|c|m|d|
+0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| @38
+@75
+|d+0#af5f00255&|o|a|u|t|o|c|m|d|
+0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f|o@1|g|r|o|u|p|
|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @29
+@75
+|d+0#af5f00255&|o|a|u|t|o|c|m|d|
+0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f|o@1|g|r|o|u|p|
|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| |||
|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@16
+@57|1|9|7|,|1| @8|8|0|%|
diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_13.dump
b/runtime/syntax/testdir/dumps/vim_ex_autocmd_13.dump
index 52ccbca9b..130476ff4 100644
--- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_13.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_13.dump
@@ -1,20 +1,20 @@
-| +0&#ffffff0@74
-|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| @51
-@75
-|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| |*+0#e000e06&|.+0#0000000&|t|x|t| @45
-|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p|
|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @42
->d+0#af5f00255&|o|a|u|t|o|c|m|d|
+0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|U+0#00e0003&|s|e|r|
+0#0000000&|F|o@1|E|v|e|n|t| @38
-@75
-|d+0#af5f00255&|o|a|u|t|o|c|m|d|
+0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f|o@1|g|r|o|u|p|
|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t|
|*+0#e000e06&|.+0#0000000&|t|x|t| @23
-@75
-|d+0#af5f00255&|o|a|u|t|o|c|m|d|
+0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f|o@1|g|r|o|u|p|
|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| |||
|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@16
+|d+0#af5f00255#ffffff0|o|a|u|t|o|c|m|d|
+0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f|o@1|g|r|o|u|p|
|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| |||
|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@16
|d+0#af5f00255&|o|a|u|t|o|c|m|d|
+0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f|o@1|g|r|o|u|p|
|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| |||
|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@17
@75
@75
|"+0#0000e05&| |p|a|t@1|e|r|n|s| +0#0000000&@64
-@75
+> @74
|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @56
@75
|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|*+0#e000e06&|
+0#0000000&@58
|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|?+0#e000e06&@2|
+0#0000000&@56
-@57|2|1|3|,|1| @8|8|4|%|
+|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[+0#e000e06&|t+0#0000000&|]+0#e000e06&|[|x+0#0000000&|]+0#e000e06&|t+0#0000000&|
@52
+@75
+|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[+0#e000e06&|a+0#0000000&|-+0#e000e06&|z+0#0000000&|]+0#e000e06&|[|a+0#0000000&|-+0#e000e06&|z+0#0000000&|]+0#e000e06&|t+0#0000000&|
@48
+|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[+0#e000e06&@1|:|a|l|p|h|a|:|]|[|:|a|l|p|h|a|:|]@1|t+0#0000000&|
@38
+@75
+|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[+0#e000e06&|t+0#0000000&|x|]+0#e000e06&|\@2|{|2+0#0000000&|\+0#e000e06&|}|t+0#0000000&|
@47
+|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[+0#e000e06&|a+0#0000000&|-+0#e000e06&|z+0#0000000&|]+0#e000e06&|\@2|{|2+0#0000000&|\+0#e000e06&|}|t+0#0000000&|
@46
+|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[+0#e000e06&@1|:|a|l|p|h|a|:|]@1|\@2|{|2+0#0000000&|\+0#e000e06&|}|t+0#0000000&|
@40
+|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[+0#e000e06&|^|[|:|p|u|n|c|t|:|]@1|\@2|{|2+0#0000000&|\+0#e000e06&|}|t+0#0000000&|
@39
+@57|2|1|5|,|0|-|1| @6|8|7|%|
diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_14.dump
b/runtime/syntax/testdir/dumps/vim_ex_autocmd_14.dump
index 3d126cf16..765dccbc5 100644
--- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_14.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_14.dump
@@ -1,20 +1,20 @@
-|a+0#af5f00255#ffffff0|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|?+0#e000e06&@2|
+0#0000000&@56
-|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[+0#e000e06&|t+0#0000000&|]+0#e000e06&|[|x+0#0000000&|]+0#e000e06&|t+0#0000000&|
@52
-@75
-|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[+0#e000e06&|a+0#0000000&|-+0#e000e06&|z+0#0000000&|]+0#e000e06&|[|a+0#0000000&|-+0#e000e06&|z+0#0000000&|]+0#e000e06&|t+0#0000000&|
@48
-|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[+0#e000e06&@1|:|a|l|p|h|a|:|]|[|:|a|l|p|h|a|:|]@1|t+0#0000000&|
@38
-> @74
-|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[+0#e000e06&|t+0#0000000&|x|]+0#e000e06&|\@2|{|2+0#0000000&|\+0#e000e06&|}|t+0#0000000&|
@47
-|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[+0#e000e06&|a+0#0000000&|-+0#e000e06&|z+0#0000000&|]+0#e000e06&|\@2|{|2+0#0000000&|\+0#e000e06&|}|t+0#0000000&|
@46
-|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[+0#e000e06&@1|:|a|l|p|h|a|:|]@1|\@2|{|2+0#0000000&|\+0#e000e06&|}|t+0#0000000&|
@40
-|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[+0#e000e06&|^|[|:|p|u|n|c|t|:|]@1|\@2|{|2+0#0000000&|\+0#e000e06&|}|t+0#0000000&|
@39
+|a+0#af5f00255#ffffff0|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[+0#e000e06&|^|[|:|p|u|n|c|t|:|]@1|\@2|{|2+0#0000000&|\+0#e000e06&|}|t+0#0000000&|
@39
@75
|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[+0#e000e06&|]+0#0000000&|]+0#e000e06&|x+0#0000000&|t|
@54
|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[+0#e000e06&|^|]+0#0000000&|]+0#e000e06&|x+0#0000000&|t|
@53
@75
-|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[+0#e000e06&|t+0#0000000&|\+0#e000e06&|]@1|x+0#0000000&|t|
@52
+>a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[+0#e000e06&|t+0#0000000&|\+0#e000e06&|]@1|x+0#0000000&|t|
@52
|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[+0#e000e06&|^|t+0#0000000&|\+0#e000e06&|]@1|x+0#0000000&|t|
@51
@75
|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[+0#e000e06&|[+0#0000000&|]+0#e000e06&|x+0#0000000&|t|
@54
|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[+0#e000e06&|^|[+0#0000000&|]+0#e000e06&|x+0#0000000&|t|
@53
-@57|2|3|1|,|0|-|1| @6|9|1|%|
+@75
+|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[+0#e000e06&|-+0#0000000&|]+0#e000e06&|x+0#0000000&|t|
@54
+|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[+0#e000e06&|^|-+0#0000000&|]+0#e000e06&|x+0#0000000&|t|
@53
+@75
+|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[+0#e000e06&|-+0#0000000&|t|-|]+0#e000e06&|x+0#0000000&|t|
@52
+|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[+0#e000e06&|^|-+0#0000000&|t|-|]+0#e000e06&|x+0#0000000&|t|
@51
+@75
+|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[+0#e000e06&|\|^|]|x+0#0000000&|t|
@53
+|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[+0#e000e06&|^|^+0#0000000&|]+0#e000e06&|x+0#0000000&|t|
@53
+@57|2|3@1|,|1| @8|9|5|%|
diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_15.dump
b/runtime/syntax/testdir/dumps/vim_ex_autocmd_15.dump
index b76c20b1e..5cebc2c44 100644
--- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_15.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_15.dump
@@ -1,20 +1,20 @@
-|a+0#af5f00255#ffffff0|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[+0#e000e06&|^|[+0#0000000&|]+0#e000e06&|x+0#0000000&|t|
@53
-@75
-|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[+0#e000e06&|-+0#0000000&|]+0#e000e06&|x+0#0000000&|t|
@54
-|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[+0#e000e06&|^|-+0#0000000&|]+0#e000e06&|x+0#0000000&|t|
@53
-@75
->a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[+0#e000e06&|-+0#0000000&|t|-|]+0#e000e06&|x+0#0000000&|t|
@52
-|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[+0#e000e06&|^|-+0#0000000&|t|-|]+0#e000e06&|x+0#0000000&|t|
@51
-@75
-|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[+0#e000e06&|\|^|]|x+0#0000000&|t|
@53
-|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[+0#e000e06&|^|^+0#0000000&|]+0#e000e06&|x+0#0000000&|t|
@53
+|a+0#af5f00255#ffffff0|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[+0#e000e06&|^|^+0#0000000&|]+0#e000e06&|x+0#0000000&|t|
@53
@75
|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t|,+0#e000e06&|*|/+0#0000000&|*+0#e000e06&|.+0#0000000&|v|i|m|
@48
|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|{+0#e000e06&|t+0#0000000&|x|t|,+0#e000e06&|v+0#0000000&|i|m|}+0#e000e06&|
+0#0000000&@50
|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|{+0#e000e06&|t+0#0000000&|{+0#e000e06&|x+0#0000000&|,+0#e000e06&|t+0#0000000&|}+0#e000e06&|,|v+0#0000000&|{+0#e000e06&|i+0#0000000&|,+0#e000e06&|m+0#0000000&|}+0#e000e06&@1|
+0#0000000&@44
-@75
+> @74
|"+0#0000e05&| |l|i|t|e|r|a|l| +0#0000000&@65
|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[|]|x|t| @55
|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[|\+0#e000e06&|]|x+0#0000000&|t|
@54
|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[|^|]|x|t| @54
-@57|2|4|9|,|1| @8|9@1|%|
+|a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d|
+0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|[|^|\+0#e000e06&|]|x+0#0000000&|t|
@53
+@75
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+| +0#0000000&@56|2|5|1|,|0|-|1| @6|B|o|t|
diff --git a/runtime/syntax/testdir/input/vim_ex_autocmd.vim
b/runtime/syntax/testdir/input/vim_ex_autocmd.vim
index 162f9337d..8b5b53e0b 100644
--- a/runtime/syntax/testdir/input/vim_ex_autocmd.vim
+++ b/runtime/syntax/testdir/input/vim_ex_autocmd.vim
@@ -8,22 +8,22 @@
autocmd foogroup BufRead *.txt echo "Foo" | echo "Bar"
autocmd BufRead *.txt echo "Foo" | echo "Bar"
autocmd BufRead,BufNewFile *.txt echo "Foo" | echo "Bar"
-autocmd User FooEvent *.txt echo "Foo" | echo "Bar"
+autocmd User FooEvent echo "Foo" | echo "Bar"
autocmd foogroup BufRead *.txt ++once echo "Foo" | echo "Bar"
autocmd BufRead *.txt ++once echo "Foo" | echo "Bar"
autocmd BufRead,BufNewFile *.txt ++once echo "Foo" | echo "Bar"
-autocmd User FooEvent *.txt ++once echo "Foo" | echo "Bar"
+autocmd User FooEvent ++once echo "Foo" | echo "Bar"
autocmd foogroup BufRead *.txt ++nested echo "Foo" | echo "Bar"
autocmd BufRead *.txt ++nested echo "Foo" | echo "Bar"
autocmd BufRead,BufNewFile *.txt ++nested echo "Foo" | echo "Bar"
-autocmd User FooEvent *.txt ++nested echo "Foo" | echo "Bar"
+autocmd User FooEvent ++nested echo "Foo" | echo "Bar"
autocmd foogroup BufRead *.txt ++once ++nested echo "Foo" | echo
"Bar"
autocmd BufRead *.txt ++once ++nested echo "Foo" | echo
"Bar"
autocmd BufRead,BufNewFile *.txt ++once ++nested echo "Foo" | echo
"Bar"
-autocmd User FooEvent *.txt ++once ++nested echo "Foo" | echo
"Bar"
+autocmd User FooEvent ++once ++nested echo "Foo" | echo
"Bar"
autocmd foogroup BufRead <buffer> ++once ++nested echo "Foo" |
echo "Bar"
autocmd foogroup BufRead <buffer=42> ++once ++nested echo "Foo" |
echo "Bar"
@@ -34,9 +34,7 @@ autocmd BufRead <buffer=abuf> ++once
++nested echo "Foo" | e
autocmd BufRead,BufNewFile <buffer> ++once ++nested echo "Foo" |
echo "Bar"
autocmd BufRead,BufNewFile <buffer=42> ++once ++nested echo "Foo" |
echo "Bar"
autocmd BufRead,BufNewFile <buffer=abuf> ++once ++nested echo "Foo" |
echo "Bar"
-autocmd User FooEvent <buffer> ++once ++nested echo "Foo" |
echo "Bar"
-autocmd User FooEvent <buffer=42> ++once ++nested echo "Foo" |
echo "Bar"
-autocmd User FooEvent <buffer=abuf> ++once ++nested echo "Foo" |
echo "Bar"
+autocmd User FooEvent,BarEvent ++once ++nested echo "Foo" |
echo "Bar"
autocmd foogroup BufRead f<buffer>oo ++once ++nested echo "Foo" |
echo "Bar"
@@ -48,7 +46,7 @@ autocmd BufRead,BufNewFile *.txt {
echo "Foo"
echo "Bar"
}
-autocmd User FooEvent *.txt {
+autocmd User FooEvent {
echo "Foo"
echo "Bar"
}
@@ -83,7 +81,7 @@ autocmd BufRead,BufNewFile *.txt
\ echo "Bar"
"\ comment
\| echo "Baz"
-autocmd User FooEvent *.txt
+autocmd User FooEvent
"\ comment
\ echo "Foo" |
"\ comment
@@ -119,13 +117,13 @@ autocmd * BufRead *.txt ++once ++nested echo "Foo"
autocmd! foogroup BufRead *.txt ++once ++nested echo "Foo" | echo "Bar"
autocmd! BufRead *.txt ++once ++nested echo "Foo" | echo "Bar"
-autocmd! foogroup User FooEvent *.txt ++once ++nested echo "Foo" | echo "Bar"
-autocmd! User FooEvent *.txt ++once ++nested echo "Foo" | echo "Bar"
+autocmd! foogroup User FooEvent ++once ++nested echo "Foo" | echo "Bar"
+autocmd! User FooEvent ++once ++nested echo "Foo" | echo "Bar"
autocmd! foogroup BufRead *.txt
autocmd! BufRead *.txt
-autocmd! foogroup User FooEvent *.txt
-autocmd! User FooEvent *.txt
+autocmd! foogroup User FooEvent
+autocmd! User FooEvent
autocmd! foogroup * *.txt
autocmd! * *.txt
@@ -159,8 +157,6 @@ autocmd!BufRead BufRead *.txt
autocmd foogroup BufRead *.txt
autocmd BufRead *.txt
-autocmd foogroup User FooEvent *.txt
-autocmd User FooEvent *.txt
autocmd foogroup * *.txt
autocmd * *.txt
@@ -185,12 +181,10 @@ doautoall <nomodeline> BufRead
doautoall <nomodeline> foogroup BufRead *.txt
doautoall User FooEvent
-
-doautoall User FooEvent *.txt
doautoall foogroup User FooEvent
doautoall <nomodeline> User FooEvent
-doautoall <nomodeline> foogroup User FooEvent *.txt
+doautoall <nomodeline> foogroup User FooEvent
doautoall <nomodeline> foogroup BufRead *.txt | echo "Foo"
doautoall <nomodeline> foogroup BufRead *.txt " comment
@@ -207,12 +201,11 @@ doautocmd <nomodeline> BufRead
doautocmd <nomodeline> foogroup BufRead *.txt
doautocmd User FooEvent
-
-doautocmd User FooEvent *.txt
+doautocmd User FooEvent,BarEvent
doautocmd foogroup User FooEvent
doautocmd <nomodeline> User FooEvent
-doautocmd <nomodeline> foogroup User FooEvent *.txt
+doautocmd <nomodeline> foogroup User FooEvent
doautocmd <nomodeline> foogroup BufRead *.txt | echo "Foo"
doautocmd <nomodeline> foogroup BufRead *.txt | " comment
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index fe50133c2..10cefd332 100644
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -2,7 +2,7 @@
" Language: Vim script
" Maintainer: Hirohito Higashi <h.east.727 ATMARK gmail.com>
" Doug Kearns <[email protected]>
-" Last Change: 2025 Jun 11
+" Last Change: 2025 Jun 18
" Former Maintainer: Charles E. Campbell
" DO NOT CHANGE DIRECTLY.
@@ -121,7 +121,7 @@ syn keyword vimAutoEvent contained FilterWritePost
FilterWritePre FocusGained Fo
syn keyword vimAutoEvent contained WinScrolled skipwhite
nextgroup=vimAutoEventSep,@vimAutocmdPattern
syn keyword vimAutoEvent contained User skipwhite
nextgroup=vimUserAutoEvent
-syn match vimUserAutoEvent contained "\<\h\w*\>"
skipwhite nextgroup=vimAutoEventSep,@vimAutocmdPattern
+syn match vimUserAutoEvent contained "\<\h\w*\>"
skipwhite nextgroup=vimUserAutoEventSep,vimAutocmdMod,vimAutocmdBlock
" Highlight commonly used Groupnames {{{2
syn keyword vimGroup contained Comment Constant String Character Number
Boolean Float Identifier Function Statement Conditional Repeat Label Operator
Keyword Exception PreProc Include Define Macro PreCondit Type StorageClass
Structure Typedef Special SpecialChar Tag Delimiter SpecialComment Debug
Underlined Ignore Error Todo
@@ -1260,6 +1260,7 @@ syn match vimAutocmdMod contained "++once\>"
skipwhite nextgroup=vimAutocmdMod,v
" higher priority than vimAutocmdGroup, assume no group is so named
syn match vimAutoEventGlob contained "*" skipwhite
nextgroup=@vimAutocmdPattern
syn match vimAutoEventSep contained " \@1<=,"
nextgroup=vimAutoEvent
+syn match vimUserAutoEventSep contained " \@1<=,"
nextgroup=vimUserAutoEvent
syn match vimAutocmd "\<au\%[tocmd]\>" skipwhite
nextgroup=vimAutocmdBang,vimAutocmdGroup,vimAutoEvent,vimAutoEventGlob
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1uRvRM-006I48-Mc%40256bit.org.
