From: Doug Kearns <dougkearns@gmail.com>
Date: Fri, 1 Aug 2025 13:05:58 +0000 (+1000)
Subject: runtime(vim): Update base syntax, match Neovim builtin functions
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee865249b1edd56e297f12025e11defb6a4bf445;p=thirdparty%2Fvim.git

runtime(vim): Update base syntax, match Neovim builtin functions

Match Neovim functions when has("nvim") is true or g:vimsyn_vim_features
contains "nvim".

Fixes issue #17884.

Signed-off-by: Doug Kearns <dougkearns@gmail.com>
---

diff --git a/runtime/syntax/generator/vim.vim.base b/runtime/syntax/generator/vim.vim.base
index fae5861989..088783e519 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 <dougkearns@gmail.com>
-" Last Change:	   2025 Jul 29
+" Last Change:	   2025 Aug 01
 " Former Maintainer: Charles E. Campbell
 
 " DO NOT CHANGE DIRECTLY.
@@ -109,6 +109,7 @@ syn case match
 
 " Function Names {{{2
 " GEN_SYN_VIM: vimFuncName, START_STR='syn keyword vimFuncName contained', END_STR=''
+
 " Predefined variable names {{{2
 " GEN_SYN_VIM: vimVarName, START_STR='syn keyword vimVimVarName contained', END_STR=''
 
@@ -120,6 +121,8 @@ syn case match
 
 if s:has("nvim")
   syn keyword vimOptionVarName contained channel inccommand mousescroll pumblend redrawdebug scrollback shada shadafile statuscolumn termpastefilter termsync winbar winblend winhighlight
+  syn keyword vimFuncName      contained api_info buffer_exists buffer_name buffer_number chanclose chansend ctxget ctxpop ctxpush ctxset ctxsize dictwatcheradd dictwatcherdel file_readable highlight_exists highlightID jobclose jobpid jobresize jobsend jobstart jobstop jobwait last_buffer_nr menu_get msgpackdump msgpackparse reg_recorded rpcnotify rpcrequest rpcstart rpcstop serverstart serverstop sockconnect stdioopen stdpath termopen test_write_list_log wait
+  syn match   vimFuncName      contained "\<nvim_\w\+\>"
   syn keyword vimVimVarName    contained lua msgpack_types relnum stderr termrequest virtnum
 endif
 
diff --git a/runtime/syntax/testdir/dumps/vim_nvim_variables_00.dump b/runtime/syntax/testdir/dumps/vim_nvim_features_00.dump
similarity index 61%
rename from runtime/syntax/testdir/dumps/vim_nvim_variables_00.dump
rename to runtime/syntax/testdir/dumps/vim_nvim_features_00.dump
index 30e14ff5a1..eb0e402765 100644
--- a/runtime/syntax/testdir/dumps/vim_nvim_variables_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_nvim_features_00.dump
@@ -1,20 +1,20 @@
->"+0#0000e05#ffffff0| |N|e|o|v|i|m| |v|a|r|i|a|b|l|e| |h|i|g|h|l|i|g|h|t|i|n|g| +0#0000000&@44
+>"+0#0000e05#ffffff0| |N|e|o|v|i|m|-|s|p|e|c|i|f|i|c| |h|i|g|h|l|i|g|h|t|i|n|g| +0#0000000&@44
 |"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|v|i|m|_|f|e|a|t|u|r|e|s| |=| |[|"|n|v|i|m|"|]| +0#0000000&@21
 @75
 @75
 |e+0#af5f00255&|c|h|o| +0#0000000&|v+0#00e0e07&|:|l|u|a| +0#0000000&|v+0#00e0e07&|:|m|s|g|p|a|c|k|_|t|y|p|e|s| +0#0000000&|v+0#00e0e07&|:|r|e|l|n|u|m| +0#0000000&|v+0#00e0e07&|:|s|t|d|e|r@1| +0#0000000&|v+0#00e0e07&|:|t|e|r|m|r|e|q|u|e|s|t| +0#0000000&|v+0#00e0e07&|:|v|i|r|t|n|u|m| +0#0000000&@6
 @75
+@75
 |e+0#af5f00255&|c|h|o| +0#0000000&|&+0#00e0e07&|c|h|a|n@1|e|l| +0#0000000&|&+0#00e0e07&|i|n|c@1|o|m@1|a|n|d| +0#0000000&|&+0#00e0e07&|m|o|u|s|e|s|c|r|o|l@1| +0#0000000&|&+0#00e0e07&|p|u|m|b|l|e|n|d| +0#0000000&|&+0#00e0e07&|r|e|d|r|a|w|d|e|b|u|g| +0#0000000&|&+0#00e0e07&|s|c|r|o|l@1|b|a|c|k| +0#0000000&@1
 |e+0#af5f00255&|c|h|o| +0#0000000&|&+0#00e0e07&|s|h|a|d|a| +0#0000000&|&+0#00e0e07&|s|h|a|d|a|f|i|l|e| +0#0000000&|&+0#00e0e07&|s|t|a|t|u|s|c|o|l|u|m|n| +0#0000000&|&+0#00e0e07&|t|e|r|m|p|a|s|t|e|f|i|l|t|e|r| +0#0000000&|&+0#00e0e07&|t|e|r|m|s|y|n|c| +0#0000000&|&+0#00e0e07&|w|i|n|b|a|r| +0#0000000&@3
 |e+0#af5f00255&|c|h|o| +0#0000000&|&+0#00e0e07&|w|i|n|b|l|e|n|d| +0#0000000&|&+0#00e0e07&|w|i|n|h|i|g|h|l|i|g|h|t| +0#0000000&@46
 @75
-|~+0#4040ff13&| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-| +0#0000000&@56|1|,|1| @10|A|l@1| 
+@75
+|c+0#af5f00255&|a|l@1| +0#0000000&|a+0#00e0e07&|p|i|_|i|n|f|o|(+0#e000e06&|)| +0#0000000&@59
+|c+0#af5f00255&|a|l@1| +0#0000000&|b+0#00e0e07&|u|f@1|e|r|_|e|x|i|s|t|s|(+0#e000e06&|)| +0#0000000&@54
+|c+0#af5f00255&|a|l@1| +0#0000000&|b+0#00e0e07&|u|f@1|e|r|_|n|a|m|e|(+0#e000e06&|)| +0#0000000&@56
+|c+0#af5f00255&|a|l@1| +0#0000000&|b+0#00e0e07&|u|f@1|e|r|_|n|u|m|b|e|r|(+0#e000e06&|)| +0#0000000&@54
+|c+0#af5f00255&|a|l@1| +0#0000000&|c+0#00e0e07&|h|a|n|c|l|o|s|e|(+0#e000e06&|)| +0#0000000&@58
+|c+0#af5f00255&|a|l@1| +0#0000000&|c+0#00e0e07&|h|a|n|s|e|n|d|(+0#e000e06&|)| +0#0000000&@59
+|c+0#af5f00255&|a|l@1| +0#0000000&|c+0#00e0e07&|t|x|g|e|t|(+0#e000e06&|)| +0#0000000&@61
+@57|1|,|1| @10|T|o|p| 
diff --git a/runtime/syntax/testdir/dumps/vim_nvim_features_01.dump b/runtime/syntax/testdir/dumps/vim_nvim_features_01.dump
new file mode 100644
index 0000000000..834941044b
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/vim_nvim_features_01.dump
@@ -0,0 +1,20 @@
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|b+0#00e0e07&|u|f@1|e|r|_|e|x|i|s|t|s|(+0#e000e06&|)| +0#0000000&@54
+|c+0#af5f00255&|a|l@1| +0#0000000&|b+0#00e0e07&|u|f@1|e|r|_|n|a|m|e|(+0#e000e06&|)| +0#0000000&@56
+|c+0#af5f00255&|a|l@1| +0#0000000&|b+0#00e0e07&|u|f@1|e|r|_|n|u|m|b|e|r|(+0#e000e06&|)| +0#0000000&@54
+|c+0#af5f00255&|a|l@1| +0#0000000&|c+0#00e0e07&|h|a|n|c|l|o|s|e|(+0#e000e06&|)| +0#0000000&@58
+|c+0#af5f00255&|a|l@1| +0#0000000&|c+0#00e0e07&|h|a|n|s|e|n|d|(+0#e000e06&|)| +0#0000000&@59
+>c+0#af5f00255&|a|l@1| +0#0000000&|c+0#00e0e07&|t|x|g|e|t|(+0#e000e06&|)| +0#0000000&@61
+|c+0#af5f00255&|a|l@1| +0#0000000&|c+0#00e0e07&|t|x|p|o|p|(+0#e000e06&|)| +0#0000000&@61
+|c+0#af5f00255&|a|l@1| +0#0000000&|c+0#00e0e07&|t|x|p|u|s|h|(+0#e000e06&|)| +0#0000000&@60
+|c+0#af5f00255&|a|l@1| +0#0000000&|c+0#00e0e07&|t|x|s|e|t|(+0#e000e06&|)| +0#0000000&@61
+|c+0#af5f00255&|a|l@1| +0#0000000&|c+0#00e0e07&|t|x|s|i|z|e|(+0#e000e06&|)| +0#0000000&@60
+|c+0#af5f00255&|a|l@1| +0#0000000&|d+0#00e0e07&|i|c|t|w|a|t|c|h|e|r|a|d@1|(+0#e000e06&|)| +0#0000000&@53
+|c+0#af5f00255&|a|l@1| +0#0000000&|d+0#00e0e07&|i|c|t|w|a|t|c|h|e|r|d|e|l|(+0#e000e06&|)| +0#0000000&@53
+|c+0#af5f00255&|a|l@1| +0#0000000&|f+0#00e0e07&|i|l|e|_|r|e|a|d|a|b|l|e|(+0#e000e06&|)| +0#0000000&@54
+|c+0#af5f00255&|a|l@1| +0#0000000&|h+0#00e0e07&|i|g|h|l|i|g|h|t|_|e|x|i|s|t|s|(+0#e000e06&|)| +0#0000000&@51
+|c+0#af5f00255&|a|l@1| +0#0000000&|h+0#00e0e07&|i|g|h|l|i|g|h|t|I|D|(+0#e000e06&|)| +0#0000000&@56
+|c+0#af5f00255&|a|l@1| +0#0000000&|j+0#00e0e07&|o|b|c|l|o|s|e|(+0#e000e06&|)| +0#0000000&@59
+|c+0#af5f00255&|a|l@1| +0#0000000&|j+0#00e0e07&|o|b|p|i|d|(+0#e000e06&|)| +0#0000000&@61
+|c+0#af5f00255&|a|l@1| +0#0000000&|j+0#00e0e07&|o|b|r|e|s|i|z|e|(+0#e000e06&|)| +0#0000000&@58
+|c+0#af5f00255&|a|l@1| +0#0000000&|j+0#00e0e07&|o|b|s|e|n|d|(+0#e000e06&|)| +0#0000000&@60
+@57|1|9|,|1| @10|6|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_nvim_features_02.dump b/runtime/syntax/testdir/dumps/vim_nvim_features_02.dump
new file mode 100644
index 0000000000..fe5afce6fd
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/vim_nvim_features_02.dump
@@ -0,0 +1,20 @@
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|j+0#00e0e07&|o|b|s|e|n|d|(+0#e000e06&|)| +0#0000000&@60
+|c+0#af5f00255&|a|l@1| +0#0000000&|j+0#00e0e07&|o|b|s|t|a|r|t|(+0#e000e06&|)| +0#0000000&@59
+|c+0#af5f00255&|a|l@1| +0#0000000&|j+0#00e0e07&|o|b|s|t|o|p|(+0#e000e06&|)| +0#0000000&@60
+|c+0#af5f00255&|a|l@1| +0#0000000&|j+0#00e0e07&|o|b|w|a|i|t|(+0#e000e06&|)| +0#0000000&@60
+|c+0#af5f00255&|a|l@1| +0#0000000&|l+0#00e0e07&|a|s|t|_|b|u|f@1|e|r|_|n|r|(+0#e000e06&|)| +0#0000000&@53
+>c+0#af5f00255&|a|l@1| +0#0000000&|m+0#00e0e07&|e|n|u|_|g|e|t|(+0#e000e06&|)| +0#0000000&@59
+|c+0#af5f00255&|a|l@1| +0#0000000&|m+0#00e0e07&|s|g|p|a|c|k|d|u|m|p|(+0#e000e06&|)| +0#0000000&@56
+|c+0#af5f00255&|a|l@1| +0#0000000&|m+0#00e0e07&|s|g|p|a|c|k|p|a|r|s|e|(+0#e000e06&|)| +0#0000000&@55
+|c+0#af5f00255&|a|l@1| +0#0000000&|r+0#00e0e07&|e|g|_|r|e|c|o|r|d|e|d|(+0#e000e06&|)| +0#0000000&@55
+|c+0#af5f00255&|a|l@1| +0#0000000&|r+0#00e0e07&|p|c|n|o|t|i|f|y|(+0#e000e06&|)| +0#0000000&@58
+|c+0#af5f00255&|a|l@1| +0#0000000&|r+0#00e0e07&|p|c|r|e|q|u|e|s|t|(+0#e000e06&|)| +0#0000000&@57
+|c+0#af5f00255&|a|l@1| +0#0000000&|r+0#00e0e07&|p|c|s|t|a|r|t|(+0#e000e06&|)| +0#0000000&@59
+|c+0#af5f00255&|a|l@1| +0#0000000&|r+0#00e0e07&|p|c|s|t|o|p|(+0#e000e06&|)| +0#0000000&@60
+|c+0#af5f00255&|a|l@1| +0#0000000&|s+0#00e0e07&|e|r|v|e|r|s|t|a|r|t|(+0#e000e06&|)| +0#0000000&@56
+|c+0#af5f00255&|a|l@1| +0#0000000&|s+0#00e0e07&|e|r|v|e|r|s|t|o|p|(+0#e000e06&|)| +0#0000000&@57
+|c+0#af5f00255&|a|l@1| +0#0000000&|s+0#00e0e07&|o|c|k|c|o|n@1|e|c|t|(+0#e000e06&|)| +0#0000000&@56
+|c+0#af5f00255&|a|l@1| +0#0000000&|s+0#00e0e07&|t|d|i|o@1|p|e|n|(+0#e000e06&|)| +0#0000000&@58
+|c+0#af5f00255&|a|l@1| +0#0000000&|s+0#00e0e07&|t|d|p|a|t|h|(+0#e000e06&|)| +0#0000000&@60
+|c+0#af5f00255&|a|l@1| +0#0000000&|t+0#00e0e07&|e|r|m|o|p|e|n|(+0#e000e06&|)| +0#0000000&@59
+@57|3|7|,|1| @9|1|4|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_nvim_features_03.dump b/runtime/syntax/testdir/dumps/vim_nvim_features_03.dump
new file mode 100644
index 0000000000..3b3a4fc657
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/vim_nvim_features_03.dump
@@ -0,0 +1,20 @@
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|t+0#00e0e07&|e|r|m|o|p|e|n|(+0#e000e06&|)| +0#0000000&@59
+|c+0#af5f00255&|a|l@1| +0#0000000&|t+0#00e0e07&|e|s|t|_|w|r|i|t|e|_|l|i|s|t|_|l|o|g|(+0#e000e06&|)| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|w+0#00e0e07&|a|i|t|(+0#e000e06&|)| +0#0000000&@63
+@75
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|a|d@1|_|h|i|g|h|l|i|g|h|t|(+0#e000e06&|)| +0#0000000&@45
+>c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|a|t@1|a|c|h|(+0#e000e06&|)| +0#0000000&@52
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|c|l|e|a|r|_|h|i|g|h|l|i|g|h|t|(+0#e000e06&|)| +0#0000000&@43
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|c|l|e|a|r|_|n|a|m|e|s|p|a|c|e|(+0#e000e06&|)| +0#0000000&@43
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|c|r|e|a|t|e|_|u|s|e|r|_|c|o|m@1|a|n|d|(+0#e000e06&|)| +0#0000000&@39
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_@1|b|u|f|_|d|e|b|u|g|_|e|x|t|m|a|r|k|s|(+0#e000e06&|)| +0#0000000&@43
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|d|e|l|e|t|e|(+0#e000e06&|)| +0#0000000&@52
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|d|e|l|_|e|x|t|m|a|r|k|(+0#e000e06&|)| +0#0000000&@47
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|d|e|l|_|k|e|y|m|a|p|(+0#e000e06&|)| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|d|e|l|_|m|a|r|k|(+0#e000e06&|)| +0#0000000&@50
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|d|e|l|_|u|s|e|r|_|c|o|m@1|a|n|d|(+0#e000e06&|)| +0#0000000&@42
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|d|e|l|_|v|a|r|(+0#e000e06&|)| +0#0000000&@51
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|g|e|t|_|c|h|a|n|g|e|d|t|i|c|k|(+0#e000e06&|)| +0#0000000&@43
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|g|e|t|_|c|o|m@1|a|n|d|s|(+0#e000e06&|)| +0#0000000&@46
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|g|e|t|_|e|x|t|m|a|r|k|_|b|y|_|i|d|(+0#e000e06&|)| +0#0000000&@41
+@57|5@1|,|1| @9|2|3|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_nvim_features_04.dump b/runtime/syntax/testdir/dumps/vim_nvim_features_04.dump
new file mode 100644
index 0000000000..372d91cb72
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/vim_nvim_features_04.dump
@@ -0,0 +1,20 @@
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|g|e|t|_|e|x|t|m|a|r|k|_|b|y|_|i|d|(+0#e000e06&|)| +0#0000000&@41
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|g|e|t|_|e|x|t|m|a|r|k|s|(+0#e000e06&|)| +0#0000000&@46
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|g|e|t|_|k|e|y|m|a|p|(+0#e000e06&|)| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|g|e|t|_|l|i|n|e|s|(+0#e000e06&|)| +0#0000000&@49
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|g|e|t|_|m|a|r|k|(+0#e000e06&|)| +0#0000000&@50
+>c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|g|e|t|_|n|a|m|e|(+0#e000e06&|)| +0#0000000&@50
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|g|e|t|_|n|u|m|b|e|r|(+0#e000e06&|)| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|g|e|t|_|o|f@1|s|e|t|(+0#e000e06&|)| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|g|e|t|_|o|p|t|i|o|n|(+0#e000e06&|)| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|g|e|t|_|t|e|x|t|(+0#e000e06&|)| +0#0000000&@50
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|g|e|t|_|v|a|r|(+0#e000e06&|)| +0#0000000&@51
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|i|s|_|l|o|a|d|e|d|(+0#e000e06&|)| +0#0000000&@49
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|i|s|_|v|a|l|i|d|(+0#e000e06&|)| +0#0000000&@50
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|l|i|n|e|_|c|o|u|n|t|(+0#e000e06&|)| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|s|e|t|_|e|x|t|m|a|r|k|(+0#e000e06&|)| +0#0000000&@47
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|s|e|t|_|k|e|y|m|a|p|(+0#e000e06&|)| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|s|e|t|_|l|i|n|e|s|(+0#e000e06&|)| +0#0000000&@49
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|s|e|t|_|m|a|r|k|(+0#e000e06&|)| +0#0000000&@50
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|s|e|t|_|n|a|m|e|(+0#e000e06&|)| +0#0000000&@50
+@57|7|3|,|1| @9|3|1|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_nvim_features_05.dump b/runtime/syntax/testdir/dumps/vim_nvim_features_05.dump
new file mode 100644
index 0000000000..bdb3d147c0
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/vim_nvim_features_05.dump
@@ -0,0 +1,20 @@
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|s|e|t|_|n|a|m|e|(+0#e000e06&|)| +0#0000000&@50
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|s|e|t|_|o|p|t|i|o|n|(+0#e000e06&|)| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|s|e|t|_|t|e|x|t|(+0#e000e06&|)| +0#0000000&@50
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|s|e|t|_|v|a|r|(+0#e000e06&|)| +0#0000000&@51
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|b|u|f|_|s|e|t|_|v|i|r|t|u|a|l|_|t|e|x|t|(+0#e000e06&|)| +0#0000000&@42
+>c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_@1|b|u|f|_|s|t|a|t|s|(+0#e000e06&|)| +0#0000000&@52
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|c|a|l@1|_|d|i|c|t|_|f|u|n|c|t|i|o|n|(+0#e000e06&|)| +0#0000000&@44
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|c|a|l@1|_|f|u|n|c|t|i|o|n|(+0#e000e06&|)| +0#0000000&@49
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|c|l|e|a|r|_|a|u|t|o|c|m|d|s|(+0#e000e06&|)| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|c|m|d|(+0#e000e06&|)| +0#0000000&@59
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|c|o|m@1|a|n|d|(+0#e000e06&|)| +0#0000000&@55
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|c|o|m@1|a|n|d|_|o|u|t|p|u|t|(+0#e000e06&|)| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_@1|c|o|m|p|l|e|t|e|_|s|e|t|(+0#e000e06&|)| +0#0000000&@49
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|c|r|e|a|t|e|_|a|u|g|r|o|u|p|(+0#e000e06&|)| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|c|r|e|a|t|e|_|a|u|t|o|c|m|d|(+0#e000e06&|)| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|c|r|e|a|t|e|_|b|u|f|(+0#e000e06&|)| +0#0000000&@52
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|c|r|e|a|t|e|_|n|a|m|e|s|p|a|c|e|(+0#e000e06&|)| +0#0000000&@46
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|c|r|e|a|t|e|_|u|s|e|r|_|c|o|m@1|a|n|d|(+0#e000e06&|)| +0#0000000&@43
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|d|e|l|_|a|u|g|r|o|u|p|_|b|y|_|i|d|(+0#e000e06&|)| +0#0000000&@45
+@57|9|1|,|1| @9|4|0|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_nvim_features_06.dump b/runtime/syntax/testdir/dumps/vim_nvim_features_06.dump
new file mode 100644
index 0000000000..713a60e1db
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/vim_nvim_features_06.dump
@@ -0,0 +1,20 @@
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|d|e|l|_|a|u|g|r|o|u|p|_|b|y|_|i|d|(+0#e000e06&|)| +0#0000000&@45
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|d|e|l|_|a|u|g|r|o|u|p|_|b|y|_|n|a|m|e|(+0#e000e06&|)| +0#0000000&@43
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|d|e|l|_|a|u|t|o|c|m|d|(+0#e000e06&|)| +0#0000000&@51
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|d|e|l|_|c|u|r@1|e|n|t|_|l|i|n|e|(+0#e000e06&|)| +0#0000000&@46
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|d|e|l|_|k|e|y|m|a|p|(+0#e000e06&|)| +0#0000000&@52
+>c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|d|e|l|_|m|a|r|k|(+0#e000e06&|)| +0#0000000&@54
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|d|e|l|_|u|s|e|r|_|c|o|m@1|a|n|d|(+0#e000e06&|)| +0#0000000&@46
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|d|e|l|_|v|a|r|(+0#e000e06&|)| +0#0000000&@55
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|e|c|h|o|(+0#e000e06&|)| +0#0000000&@58
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|e|r@1|_|w|r|i|t|e|(+0#e000e06&|)| +0#0000000&@53
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|e|r@1|_|w|r|i|t|e|l|n|(+0#e000e06&|)| +0#0000000&@51
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|e|v|a|l|(+0#e000e06&|)| +0#0000000&@58
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|e|v|a|l|_|s|t|a|t|u|s|l|i|n|e|(+0#e000e06&|)| +0#0000000&@47
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|e|x|e|c|(+0#e000e06&|)| +0#0000000&@58
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|e|x|e|c|2|(+0#e000e06&|)| +0#0000000&@57
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|e|x|e|c|_|a|u|t|o|c|m|d|s|(+0#e000e06&|)| +0#0000000&@49
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|f|e@1|d|k|e|y|s|(+0#e000e06&|)| +0#0000000&@54
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|a|l@1|_|o|p|t|i|o|n|s|_|i|n|f|o|(+0#e000e06&|)| +0#0000000&@42
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|a|u|t|o|c|m|d|s|(+0#e000e06&|)| +0#0000000&@50
+@57|1|0|9|,|1| @8|4|9|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_nvim_features_07.dump b/runtime/syntax/testdir/dumps/vim_nvim_features_07.dump
new file mode 100644
index 0000000000..38ba63c4b1
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/vim_nvim_features_07.dump
@@ -0,0 +1,20 @@
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|a|u|t|o|c|m|d|s|(+0#e000e06&|)| +0#0000000&@50
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|c|h|a|n|_|i|n|f|o|(+0#e000e06&|)| +0#0000000&@49
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|c|o|l|o|r|_|b|y|_|n|a|m|e|(+0#e000e06&|)| +0#0000000&@45
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|c|o|l|o|r|_|m|a|p|(+0#e000e06&|)| +0#0000000&@49
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|c|o|m@1|a|n|d|s|(+0#e000e06&|)| +0#0000000&@50
+>c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|c|o|n|t|e|x|t|(+0#e000e06&|)| +0#0000000&@51
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|c|u|r@1|e|n|t|_|b|u|f|(+0#e000e06&|)| +0#0000000&@47
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|c|u|r@1|e|n|t|_|l|i|n|e|(+0#e000e06&|)| +0#0000000&@46
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|c|u|r@1|e|n|t|_|t|a|b|p|a|g|e|(+0#e000e06&|)| +0#0000000&@43
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|c|u|r@1|e|n|t|_|w|i|n|(+0#e000e06&|)| +0#0000000&@47
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|h|l|(+0#e000e06&|)| +0#0000000&@56
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|h|l|_|b|y|_|i|d|(+0#e000e06&|)| +0#0000000&@50
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|h|l|_|b|y|_|n|a|m|e|(+0#e000e06&|)| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|h|l|_|i|d|_|b|y|_|n|a|m|e|(+0#e000e06&|)| +0#0000000&@45
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|h|l|_|n|s|(+0#e000e06&|)| +0#0000000&@53
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|k|e|y|m|a|p|(+0#e000e06&|)| +0#0000000&@52
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_@1|g|e|t|_|l|i|b|_|d|i|r|(+0#e000e06&|)| +0#0000000&@50
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|m|a|r|k|(+0#e000e06&|)| +0#0000000&@54
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|m|o|d|e|(+0#e000e06&|)| +0#0000000&@54
+@57|1|2|7|,|1| @8|5|7|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_nvim_features_08.dump b/runtime/syntax/testdir/dumps/vim_nvim_features_08.dump
new file mode 100644
index 0000000000..f453d1f93a
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/vim_nvim_features_08.dump
@@ -0,0 +1,20 @@
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|m|o|d|e|(+0#e000e06&|)| +0#0000000&@54
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|n|a|m|e|s|p|a|c|e|s|(+0#e000e06&|)| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|o|p|t|i|o|n|(+0#e000e06&|)| +0#0000000&@52
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|o|p|t|i|o|n|_|i|n|f|o|(+0#e000e06&|)| +0#0000000&@47
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|o|p|t|i|o|n|_|i|n|f|o|2|(+0#e000e06&|)| +0#0000000&@46
+>c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|o|p|t|i|o|n|_|v|a|l|u|e|(+0#e000e06&|)| +0#0000000&@46
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|p|r|o|c|(+0#e000e06&|)| +0#0000000&@54
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|p|r|o|c|_|c|h|i|l|d|r|e|n|(+0#e000e06&|)| +0#0000000&@45
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_@1|g|e|t|_|r|u|n|t|i|m|e|(+0#e000e06&|)| +0#0000000&@50
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|r|u|n|t|i|m|e|_|f|i|l|e|(+0#e000e06&|)| +0#0000000&@46
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|v|a|r|(+0#e000e06&|)| +0#0000000&@55
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|g|e|t|_|v@1|a|r|(+0#e000e06&|)| +0#0000000&@54
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_@1|i|d|(+0#e000e06&|)| +0#0000000&@59
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_@1|i|d|_|a|r@1|a|y|(+0#e000e06&|)| +0#0000000&@53
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_@1|i|d|_|d|i|c|t|(+0#e000e06&|)| +0#0000000&@54
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_@1|i|d|_|f|l|o|a|t|(+0#e000e06&|)| +0#0000000&@53
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|i|n|p|u|t|(+0#e000e06&|)| +0#0000000&@57
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|i|n|p|u|t|_|m|o|u|s|e|(+0#e000e06&|)| +0#0000000&@51
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_@1|i|n|s|p|e|c|t|_|c|e|l@1|(+0#e000e06&|)| +0#0000000&@49
+@57|1|4|5|,|1| @8|6@1|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_nvim_features_09.dump b/runtime/syntax/testdir/dumps/vim_nvim_features_09.dump
new file mode 100644
index 0000000000..2e170fe20a
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/vim_nvim_features_09.dump
@@ -0,0 +1,20 @@
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_@1|i|n|s|p|e|c|t|_|c|e|l@1|(+0#e000e06&|)| +0#0000000&@49
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_@1|i|n|v|a|l|i|d|a|t|e|_|g|l|y|p|h|_|c|a|c|h|e|(+0#e000e06&|)| +0#0000000&@39
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|l|i|s|t|_|b|u|f|s|(+0#e000e06&|)| +0#0000000&@53
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|l|i|s|t|_|c|h|a|n|s|(+0#e000e06&|)| +0#0000000&@52
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|l|i|s|t|_|r|u|n|t|i|m|e|_|p|a|t|h|s|(+0#e000e06&|)| +0#0000000&@44
+>c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|l|i|s|t|_|t|a|b|p|a|g|e|s|(+0#e000e06&|)| +0#0000000&@49
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|l|i|s|t|_|u|i|s|(+0#e000e06&|)| +0#0000000&@54
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|l|i|s|t|_|w|i|n|s|(+0#e000e06&|)| +0#0000000&@53
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|l|o|a|d|_|c|o|n|t|e|x|t|(+0#e000e06&|)| +0#0000000&@50
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|n|o|t|i|f|y|(+0#e000e06&|)| +0#0000000&@56
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_@1|n|s|_|g|e|t|(+0#e000e06&|)| +0#0000000&@55
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_@1|n|s|_|s|e|t|(+0#e000e06&|)| +0#0000000&@55
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|o|p|e|n|_|t|e|r|m|(+0#e000e06&|)| +0#0000000&@53
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|o|p|e|n|_|w|i|n|(+0#e000e06&|)| +0#0000000&@54
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|o|u|t|_|w|r|i|t|e|(+0#e000e06&|)| +0#0000000&@53
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|p|a|r|s|e|_|c|m|d|(+0#e000e06&|)| +0#0000000&@53
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|p|a|r|s|e|_|e|x|p|r|e|s@1|i|o|n|(+0#e000e06&|)| +0#0000000&@46
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|p|a|s|t|e|(+0#e000e06&|)| +0#0000000&@57
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|p|u|t|(+0#e000e06&|)| +0#0000000&@59
+@57|1|6|3|,|1| @8|7|4|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_nvim_features_10.dump b/runtime/syntax/testdir/dumps/vim_nvim_features_10.dump
new file mode 100644
index 0000000000..84d342c51d
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/vim_nvim_features_10.dump
@@ -0,0 +1,20 @@
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|p|u|t|(+0#e000e06&|)| +0#0000000&@59
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_@1|r|e|d|r|a|w|(+0#e000e06&|)| +0#0000000&@55
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|r|e|p|l|a|c|e|_|t|e|r|m|c|o|d|e|s|(+0#e000e06&|)| +0#0000000&@45
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_@1|r|u|n|t|i|m|e|_|i|n|s|p|e|c|t|(+0#e000e06&|)| +0#0000000&@46
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_@1|s|c|r|e@1|n|s|h|o|t|(+0#e000e06&|)| +0#0000000&@51
+>c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|s|e|l|e|c|t|_|p|o|p|u|p|m|e|n|u|_|i|t|e|m|(+0#e000e06&|)| +0#0000000&@41
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|s|e|t|_|c|u|r@1|e|n|t|_|b|u|f|(+0#e000e06&|)| +0#0000000&@47
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|s|e|t|_|c|u|r@1|e|n|t|_|d|i|r|(+0#e000e06&|)| +0#0000000&@47
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|s|e|t|_|c|u|r@1|e|n|t|_|l|i|n|e|(+0#e000e06&|)| +0#0000000&@46
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|s|e|t|_|c|u|r@1|e|n|t|_|t|a|b|p|a|g|e|(+0#e000e06&|)| +0#0000000&@43
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|s|e|t|_|c|u|r@1|e|n|t|_|w|i|n|(+0#e000e06&|)| +0#0000000&@47
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|s|e|t|_|h|l|(+0#e000e06&|)| +0#0000000&@56
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|s|e|t|_|h|l|_|n|s|(+0#e000e06&|)| +0#0000000&@53
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|s|e|t|_|h|l|_|n|s|_|f|a|s|t|(+0#e000e06&|)| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|s|e|t|_|k|e|y|m|a|p|(+0#e000e06&|)| +0#0000000&@52
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|s|e|t|_|o|p|t|i|o|n|(+0#e000e06&|)| +0#0000000&@52
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|s|e|t|_|o|p|t|i|o|n|_|v|a|l|u|e|(+0#e000e06&|)| +0#0000000&@46
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|s|e|t|_|v|a|r|(+0#e000e06&|)| +0#0000000&@55
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|s|e|t|_|v@1|a|r|(+0#e000e06&|)| +0#0000000&@54
+@57|1|8|1|,|1| @8|8|3|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_nvim_features_11.dump b/runtime/syntax/testdir/dumps/vim_nvim_features_11.dump
new file mode 100644
index 0000000000..22bc66747a
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/vim_nvim_features_11.dump
@@ -0,0 +1,20 @@
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|s|e|t|_|v@1|a|r|(+0#e000e06&|)| +0#0000000&@54
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_@1|s|t|a|t|s|(+0#e000e06&|)| +0#0000000&@56
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|s|t|r|w|i|d|t|h|(+0#e000e06&|)| +0#0000000&@54
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|t|a|b|p|a|g|e|_|d|e|l|_|v|a|r|(+0#e000e06&|)| +0#0000000&@47
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|t|a|b|p|a|g|e|_|g|e|t|_|n|u|m|b|e|r|(+0#e000e06&|)| +0#0000000&@44
+>c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|t|a|b|p|a|g|e|_|g|e|t|_|v|a|r|(+0#e000e06&|)| +0#0000000&@47
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|t|a|b|p|a|g|e|_|g|e|t|_|w|i|n|(+0#e000e06&|)| +0#0000000&@47
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|t|a|b|p|a|g|e|_|i|s|_|v|a|l|i|d|(+0#e000e06&|)| +0#0000000&@46
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|t|a|b|p|a|g|e|_|l|i|s|t|_|w|i|n|s|(+0#e000e06&|)| +0#0000000&@45
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|t|a|b|p|a|g|e|_|s|e|t|_|v|a|r|(+0#e000e06&|)| +0#0000000&@47
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|t|a|b|p|a|g|e|_|s|e|t|_|w|i|n|(+0#e000e06&|)| +0#0000000&@47
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_@1|u|n|p|a|c|k|(+0#e000e06&|)| +0#0000000&@55
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|c|l|o|s|e|(+0#e000e06&|)| +0#0000000&@53
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|d|e|l|_|v|a|r|(+0#e000e06&|)| +0#0000000&@51
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|g|e|t|_|b|u|f|(+0#e000e06&|)| +0#0000000&@51
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|g|e|t|_|c|o|n|f|i|g|(+0#e000e06&|)| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|g|e|t|_|c|u|r|s|o|r|(+0#e000e06&|)| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|g|e|t|_|h|e|i|g|h|t|(+0#e000e06&|)| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|g|e|t|_|n|u|m|b|e|r|(+0#e000e06&|)| +0#0000000&@48
+@57|1|9@1|,|1| @8|9|1|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_nvim_features_12.dump b/runtime/syntax/testdir/dumps/vim_nvim_features_12.dump
new file mode 100644
index 0000000000..d5033fb36e
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/vim_nvim_features_12.dump
@@ -0,0 +1,20 @@
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|g|e|t|_|n|u|m|b|e|r|(+0#e000e06&|)| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|g|e|t|_|o|p|t|i|o|n|(+0#e000e06&|)| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|g|e|t|_|p|o|s|i|t|i|o|n|(+0#e000e06&|)| +0#0000000&@46
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|g|e|t|_|t|a|b|p|a|g|e|(+0#e000e06&|)| +0#0000000&@47
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|g|e|t|_|v|a|r|(+0#e000e06&|)| +0#0000000&@51
+>c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|g|e|t|_|w|i|d|t|h|(+0#e000e06&|)| +0#0000000&@49
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|h|i|d|e|(+0#e000e06&|)| +0#0000000&@54
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|i|s|_|v|a|l|i|d|(+0#e000e06&|)| +0#0000000&@50
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|s|e|t|_|b|u|f|(+0#e000e06&|)| +0#0000000&@51
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|s|e|t|_|c|o|n|f|i|g|(+0#e000e06&|)| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|s|e|t|_|c|u|r|s|o|r|(+0#e000e06&|)| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|s|e|t|_|h|e|i|g|h|t|(+0#e000e06&|)| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|s|e|t|_|h|l|_|n|s|(+0#e000e06&|)| +0#0000000&@49
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|s|e|t|_|o|p|t|i|o|n|(+0#e000e06&|)| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|s|e|t|_|v|a|r|(+0#e000e06&|)| +0#0000000&@51
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|s|e|t|_|w|i|d|t|h|(+0#e000e06&|)| +0#0000000&@49
+|c+0#af5f00255&|a|l@1| +0#0000000&|n+0#00e0e07&|v|i|m|_|w|i|n|_|t|e|x|t|_|h|e|i|g|h|t|(+0#e000e06&|)| +0#0000000&@47
+@75
+|~+0#4040ff13&| @73
+| +0#0000000&@56|2|1|7|,|1| @8|B|o|t| 
diff --git a/runtime/syntax/testdir/input/vim_nvim_features.vim b/runtime/syntax/testdir/input/vim_nvim_features.vim
new file mode 100644
index 0000000000..b1b477ed01
--- /dev/null
+++ b/runtime/syntax/testdir/input/vim_nvim_features.vim
@@ -0,0 +1,229 @@
+" Neovim-specific highlighting
+" VIM_TEST_SETUP let g:vimsyn_vim_features = ["nvim"]
+
+
+echo v:lua v:msgpack_types v:relnum v:stderr v:termrequest v:virtnum
+
+
+echo &channel &inccommand &mousescroll &pumblend &redrawdebug &scrollback
+echo &shada &shadafile &statuscolumn &termpastefilter &termsync &winbar
+echo &winblend &winhighlight
+
+
+call api_info()
+call buffer_exists()
+call buffer_name()
+call buffer_number()
+call chanclose()
+call chansend()
+call ctxget()
+call ctxpop()
+call ctxpush()
+call ctxset()
+call ctxsize()
+call dictwatcheradd()
+call dictwatcherdel()
+call file_readable()
+call highlight_exists()
+call highlightID()
+call jobclose()
+call jobpid()
+call jobresize()
+call jobsend()
+call jobstart()
+call jobstop()
+call jobwait()
+call last_buffer_nr()
+call menu_get()
+call msgpackdump()
+call msgpackparse()
+call reg_recorded()
+call rpcnotify()
+call rpcrequest()
+call rpcstart()
+call rpcstop()
+call serverstart()
+call serverstop()
+call sockconnect()
+call stdioopen()
+call stdpath()
+call termopen()
+call test_write_list_log()
+call wait()
+
+call nvim_buf_add_highlight()
+call nvim_buf_attach()
+call nvim_buf_clear_highlight()
+call nvim_buf_clear_namespace()
+call nvim_buf_create_user_command()
+call nvim__buf_debug_extmarks()
+call nvim_buf_delete()
+call nvim_buf_del_extmark()
+call nvim_buf_del_keymap()
+call nvim_buf_del_mark()
+call nvim_buf_del_user_command()
+call nvim_buf_del_var()
+call nvim_buf_get_changedtick()
+call nvim_buf_get_commands()
+call nvim_buf_get_extmark_by_id()
+call nvim_buf_get_extmarks()
+call nvim_buf_get_keymap()
+call nvim_buf_get_lines()
+call nvim_buf_get_mark()
+call nvim_buf_get_name()
+call nvim_buf_get_number()
+call nvim_buf_get_offset()
+call nvim_buf_get_option()
+call nvim_buf_get_text()
+call nvim_buf_get_var()
+call nvim_buf_is_loaded()
+call nvim_buf_is_valid()
+call nvim_buf_line_count()
+call nvim_buf_set_extmark()
+call nvim_buf_set_keymap()
+call nvim_buf_set_lines()
+call nvim_buf_set_mark()
+call nvim_buf_set_name()
+call nvim_buf_set_option()
+call nvim_buf_set_text()
+call nvim_buf_set_var()
+call nvim_buf_set_virtual_text()
+call nvim__buf_stats()
+call nvim_call_dict_function()
+call nvim_call_function()
+call nvim_clear_autocmds()
+call nvim_cmd()
+call nvim_command()
+call nvim_command_output()
+call nvim__complete_set()
+call nvim_create_augroup()
+call nvim_create_autocmd()
+call nvim_create_buf()
+call nvim_create_namespace()
+call nvim_create_user_command()
+call nvim_del_augroup_by_id()
+call nvim_del_augroup_by_name()
+call nvim_del_autocmd()
+call nvim_del_current_line()
+call nvim_del_keymap()
+call nvim_del_mark()
+call nvim_del_user_command()
+call nvim_del_var()
+call nvim_echo()
+call nvim_err_write()
+call nvim_err_writeln()
+call nvim_eval()
+call nvim_eval_statusline()
+call nvim_exec()
+call nvim_exec2()
+call nvim_exec_autocmds()
+call nvim_feedkeys()
+call nvim_get_all_options_info()
+call nvim_get_autocmds()
+call nvim_get_chan_info()
+call nvim_get_color_by_name()
+call nvim_get_color_map()
+call nvim_get_commands()
+call nvim_get_context()
+call nvim_get_current_buf()
+call nvim_get_current_line()
+call nvim_get_current_tabpage()
+call nvim_get_current_win()
+call nvim_get_hl()
+call nvim_get_hl_by_id()
+call nvim_get_hl_by_name()
+call nvim_get_hl_id_by_name()
+call nvim_get_hl_ns()
+call nvim_get_keymap()
+call nvim__get_lib_dir()
+call nvim_get_mark()
+call nvim_get_mode()
+call nvim_get_namespaces()
+call nvim_get_option()
+call nvim_get_option_info()
+call nvim_get_option_info2()
+call nvim_get_option_value()
+call nvim_get_proc()
+call nvim_get_proc_children()
+call nvim__get_runtime()
+call nvim_get_runtime_file()
+call nvim_get_var()
+call nvim_get_vvar()
+call nvim__id()
+call nvim__id_array()
+call nvim__id_dict()
+call nvim__id_float()
+call nvim_input()
+call nvim_input_mouse()
+call nvim__inspect_cell()
+call nvim__invalidate_glyph_cache()
+call nvim_list_bufs()
+call nvim_list_chans()
+call nvim_list_runtime_paths()
+call nvim_list_tabpages()
+call nvim_list_uis()
+call nvim_list_wins()
+call nvim_load_context()
+call nvim_notify()
+call nvim__ns_get()
+call nvim__ns_set()
+call nvim_open_term()
+call nvim_open_win()
+call nvim_out_write()
+call nvim_parse_cmd()
+call nvim_parse_expression()
+call nvim_paste()
+call nvim_put()
+call nvim__redraw()
+call nvim_replace_termcodes()
+call nvim__runtime_inspect()
+call nvim__screenshot()
+call nvim_select_popupmenu_item()
+call nvim_set_current_buf()
+call nvim_set_current_dir()
+call nvim_set_current_line()
+call nvim_set_current_tabpage()
+call nvim_set_current_win()
+call nvim_set_hl()
+call nvim_set_hl_ns()
+call nvim_set_hl_ns_fast()
+call nvim_set_keymap()
+call nvim_set_option()
+call nvim_set_option_value()
+call nvim_set_var()
+call nvim_set_vvar()
+call nvim__stats()
+call nvim_strwidth()
+call nvim_tabpage_del_var()
+call nvim_tabpage_get_number()
+call nvim_tabpage_get_var()
+call nvim_tabpage_get_win()
+call nvim_tabpage_is_valid()
+call nvim_tabpage_list_wins()
+call nvim_tabpage_set_var()
+call nvim_tabpage_set_win()
+call nvim__unpack()
+call nvim_win_close()
+call nvim_win_del_var()
+call nvim_win_get_buf()
+call nvim_win_get_config()
+call nvim_win_get_cursor()
+call nvim_win_get_height()
+call nvim_win_get_number()
+call nvim_win_get_option()
+call nvim_win_get_position()
+call nvim_win_get_tabpage()
+call nvim_win_get_var()
+call nvim_win_get_width()
+call nvim_win_hide()
+call nvim_win_is_valid()
+call nvim_win_set_buf()
+call nvim_win_set_config()
+call nvim_win_set_cursor()
+call nvim_win_set_height()
+call nvim_win_set_hl_ns()
+call nvim_win_set_option()
+call nvim_win_set_var()
+call nvim_win_set_width()
+call nvim_win_text_height()
+
diff --git a/runtime/syntax/testdir/input/vim_nvim_variables.vim b/runtime/syntax/testdir/input/vim_nvim_variables.vim
deleted file mode 100644
index e7e7f5004e..0000000000
--- a/runtime/syntax/testdir/input/vim_nvim_variables.vim
+++ /dev/null
@@ -1,10 +0,0 @@
-" Neovim variable highlighting
-" VIM_TEST_SETUP let g:vimsyn_vim_features = ["nvim"]
-
-
-echo v:lua v:msgpack_types v:relnum v:stderr v:termrequest v:virtnum
-
-echo &channel &inccommand &mousescroll &pumblend &redrawdebug &scrollback
-echo &shada &shadafile &statuscolumn &termpastefilter &termsync &winbar
-echo &winblend &winhighlight
-
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index a9b068ab62..a28aa77af2 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 <dougkearns@gmail.com>
-" Last Change:	   2025 Jul 29
+" Last Change:	   2025 Aug 01
 " Former Maintainer: Charles E. Campbell
 
 " DO NOT CHANGE DIRECTLY.
@@ -161,6 +161,7 @@ syn keyword vimFuncName contained reg_recording reltime reltimefloat reltimestr
 syn keyword vimFuncName contained sort sound_clear sound_playevent sound_playfile sound_stop soundfold spellbadword spellsuggest split sqrt srand state str2blob str2float str2list str2nr strcharlen strcharpart strchars strdisplaywidth strftime strgetchar stridx string strlen strpart strptime strridx strtrans strutf16len strwidth submatch substitute swapfilelist swapinfo swapname synID synIDattr synIDtrans synconcealed synstack system systemlist tabpagebuflist tabpagenr tabpagewinnr tagfiles taglist tan tanh tempname term_dumpdiff term_dumpload term_dumpwrite term_getaltscreen term_getansicolors term_getattr term_getcursor term_getjob term_getline term_getscrolled term_getsize term_getstatus term_gettitle term_gettty term_list term_scrape term_sendkeys term_setansicolors
 syn keyword vimFuncName contained term_setapi term_setkill term_setrestore term_setsize term_start term_wait terminalprops test_alloc_fail test_autochdir test_feedinput test_garbagecollect_now test_garbagecollect_soon test_getvalue test_gui_event test_ignore_error test_mswin_event test_null_blob test_null_channel test_null_dict test_null_function test_null_job test_null_list test_null_partial test_null_string test_null_tuple test_option_not_set test_override test_refcount test_setmouse test_settime test_srand_seed test_unknown test_void timer_info timer_pause timer_start timer_stop timer_stopall tolower toupper tr trim trunc tuple2list type typename undofile undotree uniq utf16idx values virtcol virtcol2col visualmode wildmenumode wildtrigger win_execute win_findbuf
 syn keyword vimFuncName contained win_getid win_gettype win_gotoid win_id2tabwin win_id2win win_move_separator win_move_statusline win_screenpos win_splitmove winbufnr wincol windowsversion winheight winlayout winline winnr winrestcmd winrestview winsaveview winwidth wordcount writefile xor
+
 " Predefined variable names {{{2
 " GEN_SYN_VIM: vimVarName, START_STR='syn keyword vimVimVarName contained', END_STR=''
 syn keyword vimVimVarName contained count count1 prevcount errmsg warningmsg statusmsg shell_error this_session version lnum termresponse fname lang lc_time ctype charconvert_from charconvert_to fname_in fname_out fname_new fname_diff cmdarg foldstart foldend folddashes foldlevel progname servername dying exception throwpoint register cmdbang insertmode val key profiling fcs_reason fcs_choice beval_bufnr beval_winnr beval_winid beval_lnum beval_col beval_text scrollstart swapname swapchoice swapcommand char mouse_win mouse_winid mouse_lnum mouse_col operator searchforward hlsearch oldfiles windowid progpath completed_item option_new option_old option_oldlocal option_oldglobal option_command option_type errors false true none null numbermax numbermin numbersize
@@ -174,6 +175,8 @@ syn keyword vimVimVarName contained vim_did_enter testing t_number t_string t_fu
 
 if s:has("nvim")
   syn keyword vimOptionVarName contained channel inccommand mousescroll pumblend redrawdebug scrollback shada shadafile statuscolumn termpastefilter termsync winbar winblend winhighlight
+  syn keyword vimFuncName      contained api_info buffer_exists buffer_name buffer_number chanclose chansend ctxget ctxpop ctxpush ctxset ctxsize dictwatcheradd dictwatcherdel file_readable highlight_exists highlightID jobclose jobpid jobresize jobsend jobstart jobstop jobwait last_buffer_nr menu_get msgpackdump msgpackparse reg_recorded rpcnotify rpcrequest rpcstart rpcstop serverstart serverstop sockconnect stdioopen stdpath termopen test_write_list_log wait
+  syn match   vimFuncName      contained "\<nvim_\w\+\>"
   syn keyword vimVimVarName    contained lua msgpack_types relnum stderr termrequest virtnum
 endif