vim
diff --git a/‎runtime/syntax/generator/vim.vim.base
Copy file name to clipboard
+11-5Lines changed: 11 additions & 5 deletions b/‎runtime/syntax/generator/vim.vim.base
Copy file name to clipboard
+11-5Lines changed: 11 additions & 5 deletions
diff --git a/‎runtime/syntax/testdir/dumps/vim9_ex_commands_00.dump
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎runtime/syntax/testdir/dumps/vim9_ex_commands_00.dump
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎runtime/syntax/testdir/dumps/vim9_ex_commands_01.dump
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions b/‎runtime/syntax/testdir/dumps/vim9_ex_commands_01.dump
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions
diff --git a/‎runtime/syntax/testdir/dumps/vim9_ex_commands_02.dump
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions b/‎runtime/syntax/testdir/dumps/vim9_ex_commands_02.dump
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions
diff --git a/‎runtime/syntax/testdir/dumps/vim9_ex_commands_03.dump
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions b/‎runtime/syntax/testdir/dumps/vim9_ex_commands_03.dump
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions
diff --git a/‎runtime/syntax/testdir/dumps/vim9_ex_commands_04.dump
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions b/‎runtime/syntax/testdir/dumps/vim9_ex_commands_04.dump
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions
diff --git a/‎runtime/syntax/testdir/dumps/vim9_ex_commands_05.dump
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions b/‎runtime/syntax/testdir/dumps/vim9_ex_commands_05.dump
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions
diff --git a/‎runtime/syntax/testdir/dumps/vim9_ex_commands_06.dump
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions b/‎runtime/syntax/testdir/dumps/vim9_ex_commands_06.dump
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions
diff --git a/‎runtime/syntax/testdir/dumps/vim9_ex_commands_07.dump
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions b/‎runtime/syntax/testdir/dumps/vim9_ex_commands_07.dump
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions
diff --git a/‎runtime/syntax/testdir/dumps/vim9_ex_commands_08.dump
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions b/‎runtime/syntax/testdir/dumps/vim9_ex_commands_08.dump
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions
@@ -2,7 +2,7 @@
 " Language:	   Vim script
 " Maintainer:	   Hirohito Higashi <h.east.727 ATMARK gmail.com>
 "	   Doug Kearns <dougkearns@gmail.com>
-" Last Change:	   2025 Jul 10
+" Last Change:	   2025 Jul 11
 " Former Maintainer: Charles E. Campbell
 
 " DO NOT CHANGE DIRECTLY.
@@ -235,7 +235,7 @@ syn cluster vim9CmdList	contains=vim9Abstract,vim9Class,vim9Const,vim9Enum,vim9E
 syn match vimCmdSep	"\\\@1<!|"	skipwhite nextgroup=@vimCmdList,vimSubst1,@vimFunc
 syn match vimCmdSep	":\+"	skipwhite nextgroup=@vimCmdList,vimSubst1
 syn match vimCount	contained	"\d\+"
-syn match vimIsCommand	"\<\%(\h\w*\|[23]mat\%[ch]\)\>"	 nextgroup=vimBang contains=vimCommand
+syn match vimIsCommand	"\<\h\w*\>"	nextgroup=vimBang contains=vimCommand
 syn match vimBang	      contained	"!"
 syn match vimWhitespace contained	"\s\+"
 
@@ -1439,12 +1439,18 @@ endif
 
 " Match: {{{2
 " =====
-syn match	vimMatch		"\<[23]\=mat\%[ch]\>" skipwhite nextgroup=vimMatchGroup,vimMatchNone
-syn match	vimMatchGroup	contained	"[[:alnum:]._-]\+"    skipwhite nextgroup=vimMatchPattern
+syn match	vimMatch		"\<\%([1-3]\s*\)\=mat\%[ch]\>"	skipwhite nextgroup=vimMatchGroup,vimMatchNone contains=vimCount
+syn match	vimMatchGroup	contained	"[[:alnum:]._-]\+"	skipwhite nextgroup=vimMatchPattern
 syn case ignore
 syn keyword	vimMatchNone	contained	none
 syn case match
-syn region	vimMatchPattern	contained	matchgroup=Delimiter start="\z([!#$%&'()*+,-./:;<=>?@[\]^_`{}~]\)" skip="\\\\\|\\\z1" end="\z1" contains=@vimSubstList oneline
+syn region	vimMatchPattern	contained
+      \ matchgroup=Delimiter
+      \ start="\z([!#$%&'()*+,-./:;<=>?@[\]^_`{}~]\)"
+      \ skip="\\\\\|\\\z1"
+      \ end="\z1"
+      \ contains=@vimSubstList
+      \ oneline
 
 " Normal: {{{2
 " ======
 
@@ -14,7 +14,7 @@
 |:| |h+0#af5f00255&|e|l|p| +0#0000000&@68
 @1|:+0#af5f00255&| +0#0000000&|h+0#00e0e07&|e|l|p| +0#0000000&|#+0#0000e05&| |F+0#0000001#ffff4012|I|X|M|E| +0#0000000#ffffff0@59
 @75
-|:|2+0#af5f00255&|m|a|t|c|h| +0#0000000&@67
-|:|3+0#af5f00255&|m|a|t|c|h| +0#0000000&@67
 |:|a+0#af5f00255&|b@1|r|e|v|i|a|t|e| +0#0000000&@63
+|:|a+0#af5f00255&|b|c|l|e|a|r| +0#0000000&@66
+|:|a+0#af5f00255&|b|o|v|e|l|e|f|t| +0#0000000&@64
 @57|1|,|1| @10|T|o|p| 
@@ -1,11 +1,9 @@
 |:+0&#ffffff0| |h+0#af5f00255&|e|l|p| +0#0000000&@68
 @1|:+0#af5f00255&| +0#0000000&|h+0#00e0e07&|e|l|p| +0#0000000&|#+0#0000e05&| |F+0#0000001#ffff4012|I|X|M|E| +0#0000000#ffffff0@59
 @75
-|:|2+0#af5f00255&|m|a|t|c|h| +0#0000000&@67
-|:|3+0#af5f00255&|m|a|t|c|h| +0#0000000&@67
->:|a+0#af5f00255&|b@1|r|e|v|i|a|t|e| +0#0000000&@63
+|:|a+0#af5f00255&|b@1|r|e|v|i|a|t|e| +0#0000000&@63
 |:|a+0#af5f00255&|b|c|l|e|a|r| +0#0000000&@66
-|:|a+0#af5f00255&|b|o|v|e|l|e|f|t| +0#0000000&@64
+>:|a+0#af5f00255&|b|o|v|e|l|e|f|t| +0#0000000&@64
 |:|a+0#af5f00255&|b|s|t|r|a|c|t| +0#0000000&@65
 |:|a+0#af5f00255&|l@1| +0#0000000&@70
 |:|a+0#af5f00255&|m|e|n|u| +0#0000000&@68
@@ -17,4 +15,6 @@
 |:|a+0#af5f00255&|r|g|e|d|i|t| +0#0000000&@66
 |:|a+0#af5f00255&|r|g@1|l|o|b|a|l| +0#0000000&@64
 |:|a+0#af5f00255&|r|g|l|o|c|a|l| +0#0000000&@65
+|:|a+0#af5f00255&|r|g|s| +0#0000000&@69
+|:|a+0#af5f00255&|r|g|u|m|e|n|t| +0#0000000&@65
 @57|1|9|,|1| @10|1|%| 
@@ -1,11 +1,9 @@
-|:+0&#ffffff0|a+0#af5f00255&|r|g|l|o|c|a|l| +0#0000000&@65
-|:|a+0#af5f00255&|r|g|s| +0#0000000&@69
-|:|a+0#af5f00255&|r|g|u|m|e|n|t| +0#0000000&@65
+|:+0&#ffffff0|a+0#af5f00255&|r|g|u|m|e|n|t| +0#0000000&@65
 |:|a+0#af5f00255&|s|c|i@1| +0#0000000&@68
 |:|a+0#af5f00255&|u|g|r|o|u|p| +0#0000000&|F|o@1| @62
->:|a+0#af5f00255&|u|g|r|o|u|p| +0#0000000&|E|N|D| @62
+|:|a+0#af5f00255&|u|g|r|o|u|p| +0#0000000&|E|N|D| @62
 |:|a+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66
-|:|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@66
+>:|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@66
 |:|b+0#af5f00255&|a|d@1| +0#0000000&@69
 |:|b+0#af5f00255&|a|l@1| +0#0000000&@69
 |:|b+0#af5f00255&|a|l|t| +0#0000000&@69
@@ -17,4 +15,6 @@
 |:|b+0#af5f00255&|l|a|s|t| +0#0000000&@68
 |:|b+0#af5f00255&|m|o|d|i|f|i|e|d| +0#0000000&@64
 |:|b+0#af5f00255&|n|e|x|t| +0#0000000&@68
+|:|b+0#af5f00255&|N|e|x|t| +0#0000000&@68
+|:|b+0#af5f00255&|o|t|r|i|g|h|t| +0#0000000&@65
 @57|3|7|,|1| @10|2|%| 
@@ -1,11 +1,9 @@
-|:+0&#ffffff0|b+0#af5f00255&|n|e|x|t| +0#0000000&@68
-|:|b+0#af5f00255&|N|e|x|t| +0#0000000&@68
-|:|b+0#af5f00255&|o|t|r|i|g|h|t| +0#0000000&@65
+|:+0&#ffffff0|b+0#af5f00255&|o|t|r|i|g|h|t| +0#0000000&@65
 |:|b+0#af5f00255&|p|r|e|v|i|o|u|s| +0#0000000&@64
 |:|b+0#af5f00255&|r|e|a|k| +0#0000000&@68
->:|b+0#af5f00255&|r|e|a|k|a|d@1| +0#0000000&@65
+|:|b+0#af5f00255&|r|e|a|k|a|d@1| +0#0000000&@65
 |:|b+0#af5f00255&|r|e|a|k|d|e|l| +0#0000000&@65
-|:|b+0#af5f00255&|r|e|a|k|l|i|s|t| +0#0000000&@64
+>:|b+0#af5f00255&|r|e|a|k|l|i|s|t| +0#0000000&@64
 |:|b+0#af5f00255&|r|e|w|i|n|d| +0#0000000&@66
 |:|b+0#af5f00255&|r|o|w|s|e| +0#0000000&@67
 |:|b+0#af5f00255&|u|f|d|o| +0#0000000&@68
@@ -17,4 +15,6 @@
 |:|c+0#af5f00255&|a|b|c|l|e|a|r| +0#0000000&@65
 |:|c+0#af5f00255&|a|b|o|v|e| +0#0000000&@67
 |:|c+0#af5f00255&|a|d@1|b|u|f@1|e|r| +0#0000000&@63
+|:|c+0#af5f00255&|a|d@1|e|x|p|r| +0#0000000&@65
+|:|c+0#af5f00255&|a|d@1|f|i|l|e| +0#0000000&@65
 @57|5@1|,|1| @10|4|%| 
@@ -1,11 +1,9 @@
-|:+0&#ffffff0|c+0#af5f00255&|a|d@1|b|u|f@1|e|r| +0#0000000&@63
-|:|c+0#af5f00255&|a|d@1|e|x|p|r| +0#0000000&@65
-|:|c+0#af5f00255&|a|d@1|f|i|l|e| +0#0000000&@65
+|:+0&#ffffff0|c+0#af5f00255&|a|d@1|f|i|l|e| +0#0000000&@65
 |:|c+0#af5f00255&|a|f|t|e|r| +0#0000000&@67
 |:|c+0#af5f00255&|a|l@1| +0#0000000&@69
->:|c+0#af5f00255&|a|t|c|h| +0#0000000&@68
+|:|c+0#af5f00255&|a|t|c|h| +0#0000000&@68
 |:|c+0#af5f00255&|b|e|f|o|r|e| +0#0000000&@66
-|:|c+0#af5f00255&|b|e|l|o|w| +0#0000000&@67
+>:|c+0#af5f00255&|b|e|l|o|w| +0#0000000&@67
 |:|c+0#af5f00255&|b|o|t@1|o|m| +0#0000000&@66
 |:|c+0#af5f00255&|b|u|f@1|e|r| +0#0000000&@66
 |:|c+0#af5f00255&@1| +0#0000000&@71
@@ -17,4 +15,6 @@
 |:|c+0#af5f00255&|f|d|o| +0#0000000&@69
 |:|c+0#af5f00255&|f|i|l|e| +0#0000000&@68
 |:|c+0#af5f00255&|f|i|r|s|t| +0#0000000&@67
+|:|c+0#af5f00255&|g|e|t|b|u|f@1|e|r| +0#0000000&@63
+|:|c+0#af5f00255&|g|e|t|e|x|p|r| +0#0000000&@65
 @57|7|3|,|1| @10|5|%| 
@@ -1,11 +1,9 @@
-|:+0&#ffffff0|c+0#af5f00255&|f|i|r|s|t| +0#0000000&@67
-|:|c+0#af5f00255&|g|e|t|b|u|f@1|e|r| +0#0000000&@63
-|:|c+0#af5f00255&|g|e|t|e|x|p|r| +0#0000000&@65
+|:+0&#ffffff0|c+0#af5f00255&|g|e|t|e|x|p|r| +0#0000000&@65
 |:|c+0#af5f00255&|g|e|t|f|i|l|e| +0#0000000&@65
 |:|c+0#af5f00255&|h|a|n|g|e|s| +0#0000000&@66
->:|c+0#af5f00255&|h|d|i|r| +0#0000000&@68
+|:|c+0#af5f00255&|h|d|i|r| +0#0000000&@68
 |:|c+0#af5f00255&|h|e|c|k|p|a|t|h| +0#0000000&@64
-|:|c+0#af5f00255&|h|e|c|k|t|i|m|e| +0#0000000&@64
+>:|c+0#af5f00255&|h|e|c|k|t|i|m|e| +0#0000000&@64
 |:|c+0#af5f00255&|h|i|s|t|o|r|y| +0#0000000&@65
 |:|c+0#af5f00255&|l|a|s@1| +0#0000000&@68
 |:|c+0#af5f00255&|l|a|s|t| +0#0000000&@68
@@ -17,4 +15,6 @@
 |:|c+0#af5f00255&|m|e|n|u| +0#0000000&@68
 |:|c+0#af5f00255&|n|e|w|e|r| +0#0000000&@67
 |:|c+0#af5f00255&|n|e|x|t| +0#0000000&@68
+|:|c+0#af5f00255&|N|e|x|t| +0#0000000&@68
+|:|c+0#af5f00255&|n|f|i|l|e| +0#0000000&@67
 @57|9|1|,|1| @10|7|%| 
@@ -1,11 +1,9 @@
-|:+0&#ffffff0|c+0#af5f00255&|n|e|x|t| +0#0000000&@68
-|:|c+0#af5f00255&|N|e|x|t| +0#0000000&@68
-|:|c+0#af5f00255&|n|f|i|l|e| +0#0000000&@67
+|:+0&#ffffff0|c+0#af5f00255&|n|f|i|l|e| +0#0000000&@67
 |:|c+0#af5f00255&|N|f|i|l|e| +0#0000000&@67
 |:|c+0#af5f00255&|n|o|r|e|a|b@1|r|e|v| +0#0000000&@62
->:|c+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@65
+|:|c+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@65
 |:|c+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@64
-|:|c+0#af5f00255&|o|l|d|e|r| +0#0000000&@67
+>:|c+0#af5f00255&|o|l|d|e|r| +0#0000000&@67
 |:|c+0#af5f00255&|o|l|o|r|s|c|h|e|m|e| +0#0000000&@62
 |:|c+0#af5f00255&|o|m|c|l|e|a|r| +0#0000000&@65
 |:|c+0#af5f00255&|o|m@1|a|n|d| +0#0000000&@66
@@ -17,4 +15,6 @@
 |:|c+0#af5f00255&|o|p|y| +0#0000000&@69
 |:|c+0#af5f00255&|p|f|i|l|e| +0#0000000&@67
 |:|c+0#af5f00255&|p|r|e|v|i|o|u|s| +0#0000000&@64
+|:|c+0#af5f00255&|q|u|i|t| +0#0000000&@68
+|:|c+0#af5f00255&|r|e|w|i|n|d| +0#0000000&@66
 @57|1|0|9|,|1| @9|8|%| 
@@ -1,11 +1,9 @@
-|:+0&#ffffff0|c+0#af5f00255&|p|r|e|v|i|o|u|s| +0#0000000&@64
-|:|c+0#af5f00255&|q|u|i|t| +0#0000000&@68
-|:|c+0#af5f00255&|r|e|w|i|n|d| +0#0000000&@66
+|:+0&#ffffff0|c+0#af5f00255&|r|e|w|i|n|d| +0#0000000&@66
 |:|c+0#af5f00255&|s|c|o|p|e| +0#0000000&@67
 |:|c+0#af5f00255&|s|t|a|g| +0#0000000&@68
->:|c+0#af5f00255&|u|n|a|b@1|r|e|v| +0#0000000&@64
+|:|c+0#af5f00255&|u|n|a|b@1|r|e|v| +0#0000000&@64
 |:|c+0#af5f00255&|u|n|m|a|p| +0#0000000&@67
-|:|c+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66
+>:|c+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66
 |:|c+0#af5f00255&|w|i|n|d|o|w| +0#0000000&@66
 |:|d+0#af5f00255&|e|b|u|g| +0#0000000&@68
 |:|d+0#af5f00255&|e|b|u|g@1|r|e@1|d|y| +0#0000000&@62
@@ -17,4 +15,6 @@
 |:|d+0#af5f00255&|e|l|e|t|e| +0#0000000&@67
 |:|d+0#af5f00255&|e|l|f|u|n|c|t|i|o|n| +0#0000000&@62
 |:|d+0#af5f00255&|e|l|m|a|r|k|s| +0#0000000&@65
+|:|d+0#af5f00255&|i|f@1|g|e|t| +0#0000000&@66
+|:|d+0#af5f00255&|i|f@1|o|f@1| +0#0000000&@66
 @57|1|2|7|,|1| @8|1|0|%| 
@@ -1,11 +1,9 @@
-|:+0&#ffffff0|d+0#af5f00255&|e|l|m|a|r|k|s| +0#0000000&@65
-|:|d+0#af5f00255&|i|f@1|g|e|t| +0#0000000&@66
-|:|d+0#af5f00255&|i|f@1|o|f@1| +0#0000000&@66
+|:+0&#ffffff0|d+0#af5f00255&|i|f@1|o|f@1| +0#0000000&@66
 |:|d+0#af5f00255&|i|f@1|p|a|t|c|h| +0#0000000&@64
 |:|d+0#af5f00255&|i|f@1|p|u|t| +0#0000000&@66
->:|d+0#af5f00255&|i|f@1|s|p|l|i|t| +0#0000000&@64
+|:|d+0#af5f00255&|i|f@1|s|p|l|i|t| +0#0000000&@64
 |:|d+0#af5f00255&|i|f@1|t|h|i|s| +0#0000000&@65
-|:|d+0#af5f00255&|i|f@1|u|p|d|a|t|e| +0#0000000&@63
+>:|d+0#af5f00255&|i|f@1|u|p|d|a|t|e| +0#0000000&@63
 |:|d+0#af5f00255&|i|g|r|a|p|h|s| +0#0000000&@65
 |:|d+0#af5f00255&|i|s|a|s@1|e|m|b|l|e| +0#0000000&@62
 |:|d+0#af5f00255&|i|s|a|s@1|e|m|b|l|e| +0#0000000&@62
@@ -17,4 +15,6 @@
 |:|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&@64
 |:|d+0#af5f00255&|p| +0#0000000&@71
 |:|d+0#af5f00255&|r|o|p| +0#0000000&@69
+|:|d+0#af5f00255&|s|e|a|r|c|h| +0#0000000&@66
+|:|d+0#af5f00255&|s|p|l|i|t| +0#0000000&@67
 @57|1|4|5|,|1| @8|1@1|%|