1206 files changed, 1349 insertions, 1349 deletions

diff --git a/uvim/runtime/syntax/testdir/README.txt b/uvim/runtime/syntax/testdir/README.txt
index bd3730435f..16211fc90b 100644
--- a/uvim/runtime/syntax/testdir/README.txt
+++ b/uvim/runtime/syntax/testdir/README.txt
@@ -1,7 +1,7 @@
 Tests for syntax highlighting plugins
 =====================================
 
-Summary: Files in the "input" directory are edited by Vim with syntax
+Summary: Files in the "input" directory are edited by MNV with syntax
 highlighting enabled.  Screendumps are generated and compared with the
 expected screendumps in the "dumps" directory.  This will uncover any
 character attributes that differ.
@@ -34,7 +34,7 @@ Make sure to include some interesting constructs with plenty of complicated
 highlighting.  Optionally, pre-configure the testing environment by including
 setup commands at the top of the input file.  The format for these lines is:
 
-	VIM_TEST_SETUP {command}
+	MNV_TEST_SETUP {command}
 
 where {command} is any valid Ex command, which extends to the end of the line.
 The first 20 lines of the input file are ALWAYS scanned for setup commands and
@@ -44,22 +44,22 @@ errors in the input file but this is not required.
 
 Continuing the Java example:
 
-	// VIM_TEST_SETUP let g:java_space_errors = 1
-	// VIM_TEST_SETUP let g:java_minlines = 5
+	// MNV_TEST_SETUP let g:java_space_errors = 1
+	// MNV_TEST_SETUP let g:java_minlines = 5
 	class Test { }
 
-As an alternative, setup commands can be included in an external Vim script
+As an alternative, setup commands can be included in an external MNV script
 file in the "input/setup" directory.  This script file must have the same base
 name as the input file.
 
 So, the equivalent example configuration using this method would be to create
-an "input/setup/java.vim" script file with the following lines:
+an "input/setup/java.mnv" script file with the following lines:
 
 	let g:java_space_errors = 1
 	let g:java_minlines = 5
 
 Both inline setup commands and setup scripts may be used at the same time, the
-script file will be sourced before any VIM_TEST_SETUP commands are executed.
+script file will be sourced before any MNV_TEST_SETUP commands are executed.
 
 Every line of a source file must not be longer than 1425 (19 x 75) characters.
 
@@ -83,12 +83,12 @@ available syntax tests for Java:
 command arguments when you press certain keys, e.g. Tab or Ctrl-i.)
 
 As an alternative, you can specify a subset of test filenames for running as
-a regular expression and assign it to a VIM_SYNTAX_TEST_FILTER environment
+a regular expression and assign it to a MNV_SYNTAX_TEST_FILTER environment
 variable; e.g. to run all tests whose base names contain "fold", use any of:
 
-	make test -e 'VIM_SYNTAX_TEST_FILTER = fold.*\..\+'
-	make test VIM_SYNTAX_TEST_FILTER='fold.*\..\+'
-	VIM_SYNTAX_TEST_FILTER='fold.*\..\+' make test
+	make test -e 'MNV_SYNTAX_TEST_FILTER = fold.*\..\+'
+	make test MNV_SYNTAX_TEST_FILTER='fold.*\..\+'
+	MNV_SYNTAX_TEST_FILTER='fold.*\..\+' make test
 
 Consider quoting the variable value to avoid any interpretation by the shell.
 
@@ -121,7 +121,7 @@ is covered by the test.  You can follow these steps:
 
 1. Edit the syntax plugin somewhere in your personal setup.  Use a file
    somewhere to try out the changes.
-2. Go to the directory where you have the Vim code checked out and replace the
+2. Go to the directory where you have the MNV code checked out and replace the
    syntax plugin.  Run the tests: "make test".  Usually the tests will still
    pass, but if you fixed syntax highlighting that was already visible in the
    input file, carefully check that the changes in the screendump are
@@ -134,7 +134,7 @@ is covered by the test.  You can follow these steps:
 2. Edit the input file for your language to add the items you have improved.
    (TODO: how to add another screendump?).
    Run the tests and you should get failures.  (You may opt for faster failure
-   by assigning a small number, e.g. "1", to a VIM_SYNTAX_TEST_WAIT_TIME
+   by assigning a small number, e.g. "1", to a MNV_SYNTAX_TEST_WAIT_TIME
    environment variable and gambling away an "uncertain" possibility of
    success.)  Like with the previous step, carefully check that the new
    screendumps in the "failed" directory are good.  Update the syntax plugin
@@ -142,8 +142,8 @@ is covered by the test.  You can follow these steps:
    effect of the syntax plugin improvements.  Then move the screendumps from
    the "failed" to the "dumps" directory.  Now "make test" should succeed.
 3. Prepare a pull request with the modified files:
-	- syntax plugin:    syntax/{name}.vim
-	- Vim setup file:   syntax/testdir/input/setup/{name}.vim (if any)
+	- syntax plugin:    syntax/{name}.mnv
+	- MNV setup file:   syntax/testdir/input/setup/{name}.mnv (if any)
 	- test input file:  syntax/testdir/input/{name}.{ext}
 	- test dump files:  syntax/testdir/dumps/{name}_*.dump
    Since no input file is ever executed when you run the tests, review and
@@ -159,10 +159,10 @@ Viewing generated screendumps (local)
 -------------------------------------
 
 You may also wish to look at the whole batch of failed screendumps after
-running "make test".  Source the "viewdumps.vim" script for this task:
+running "make test".  Source the "viewdumps.mnv" script for this task:
 
-	[VIMRUNTIME=../..] \
-	../../src/vim --clean -S testdir/viewdumps.vim \
+	[MNVRUNTIME=../..] \
+	../../src/mnv --clean -S testdir/viewdumps.mnv \
 				[testdir/dumps/java_*.dump ...]
 
 By default, all screendumps found in the "failed" directory will be added to
@@ -195,7 +195,7 @@ directory by creating a symlink:
 
 You can now examine the extracted screendumps:
 
-	./src/vim --clean -S runtime/syntax/testdir/viewdumps.vim \
+	./src/mnv --clean -S runtime/syntax/testdir/viewdumps.mnv \
 				/tmp/runtime/syntax/testdir/failed/*.dump
 
 
@@ -203,7 +203,7 @@ Viewing generated screendumps (submitted for a pull request)
 ------------------------------------------------------------
 
 Note: There is also a "git difftool" extension described in
-      src/testdir/commondumps.vim
+      src/testdir/commondumps.mnv
 
 First, you need to check out the topic branch with the proposed changes and
 write down a difference list between the HEAD commit (index) and its parent
@@ -237,7 +237,7 @@ you can now examine the screendumps from the "failed" directory (note that new
 screendumps will be shown with no difference between their versions):
 
 	cd ..
-	../../../src/vim --clean -S viewdumps.vim
+	../../../src/mnv --clean -S viewdumps.mnv
 
 
 TODO: test syncing by jumping around
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_blocks_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_blocks_00.dump
index 4b65f164ba..4b65f164ba 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_blocks_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_blocks_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_blocks_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_blocks_01.dump
index 7eb90cc029..7eb90cc029 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_blocks_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_blocks_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_blocks_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_blocks_02.dump
index df9b1f78f3..df9b1f78f3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_blocks_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_blocks_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods2_00.dump
index 39857166da..39857166da 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods2_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods2_01.dump
index ff3e810322..ff3e810322 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods2_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods2_02.dump
index 22c31e20fe..22c31e20fe 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods2_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods2_03.dump
index ed7c835e02..ed7c835e02 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods2_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods_00.dump
index a2168b590d..a2168b590d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods_01.dump
index 360e0e356a..360e0e356a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods_02.dump
index b2848bc9a7..b2848bc9a7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods_03.dump
index f71c49c3d8..f71c49c3d8 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods_04.dump
index 0fd7af7c58..0fd7af7c58 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods_05.dump
index 69721afafc..69721afafc 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods_06.dump
index b9436311ba..b9436311ba 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_builtin_object_methods_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_comment_strings_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_comment_strings_00.dump
index e310e47c52..e310e47c52 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_comment_strings_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_comment_strings_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_comment_strings_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_comment_strings_01.dump
index 9ed03150e5..9ed03150e5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_comment_strings_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_comment_strings_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_comments_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_comments_00.dump
index dc43347b0b..dc43347b0b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_comments_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_comments_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_comments_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_comments_01.dump
index 4a2795dbe2..4a2795dbe2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_comments_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_comments_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_comments_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_comments_02.dump
index 34e51d71ac..34e51d71ac 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_comments_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_comments_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_comments_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_comments_03.dump
index 7eb54fa592..7eb54fa592 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_comments_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_comments_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_comments_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_comments_04.dump
index 3572cb34bf..3572cb34bf 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_comments_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_comments_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_comments_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_comments_05.dump
index e7d14e588a..e7d14e588a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_comments_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_comments_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_constructors_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_constructors_00.dump
index 6aa0cba8d8..6aa0cba8d8 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_constructors_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_constructors_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_00.dump
index 6c01f4271b..6c01f4271b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_01.dump
index e16bd69e59..e16bd69e59 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_02.dump
index 891384240a..891384240a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_03.dump
index 48f1253284..48f1253284 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_04.dump
index 2c507e1ed0..2c507e1ed0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_05.dump
index abf71b017e..abf71b017e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_06.dump
index 85c8000a8c..85c8000a8c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_07.dump
index 928fc56aa9..928fc56aa9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_08.dump
index 22c33e877c..22c33e877c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_09.dump
index a8db5cd3ee..a8db5cd3ee 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_10.dump
index 6d359140b5..6d359140b5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_11.dump
index b416e91501..b416e91501 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_12.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_12.dump
index d7d8b7ed35..d7d8b7ed35 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_def_variables_12.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_def_variables_12.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_class_fold_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_class_fold_00.dump
index a370779d19..a370779d19 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_class_fold_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_class_fold_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_class_fold_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_class_fold_01.dump
index eb4ae910ee..eb4ae910ee 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_class_fold_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_class_fold_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_class_fold_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_class_fold_02.dump
index 31ab784ce1..31ab784ce1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_class_fold_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_class_fold_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_class_fold_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_class_fold_03.dump
index 97457ba72e..97457ba72e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_class_fold_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_class_fold_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_class_fold_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_class_fold_04.dump
index a7fcfe7daf..a7fcfe7daf 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_class_fold_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_class_fold_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_00.dump
index 48b1b931bf..48b1b931bf 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_01.dump
index e407c48cf3..e407c48cf3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_02.dump
index 80de241940..80de241940 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_03.dump
index b91691e3fa..b91691e3fa 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_04.dump
index 46b383bf96..46b383bf96 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_05.dump
index 5de68b2859..5de68b2859 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_06.dump
index f6b5bbda81..f6b5bbda81 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_07.dump
index 75399df7fa..75399df7fa 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_08.dump
index 0f735c5829..0f735c5829 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_09.dump
index 07ed29a00a..07ed29a00a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_10.dump
index 5f63535a65..5f63535a65 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_11.dump
index 8a097c24ea..8a097c24ea 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_12.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_12.dump
index 0af7a4fd55..0af7a4fd55 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_12.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_12.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_13.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_13.dump
index dba3c326ca..dba3c326ca 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_13.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_13.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_14.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_14.dump
index d3e36b612f..d3e36b612f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_14.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_14.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_15.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_15.dump
index 0e982b0678..0e982b0678 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_15.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_15.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_16.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_16.dump
index 2aac4046d7..2aac4046d7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_16.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_16.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_17.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_17.dump
index bbcd3683ae..bbcd3683ae 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_17.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_17.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_18.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_18.dump
index 7f043f5470..7f043f5470 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_18.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_18.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_19.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_19.dump
index 4699962f7a..4699962f7a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_19.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_19.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_20.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_20.dump
index 67fdb5d1e0..67fdb5d1e0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_20.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_20.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_21.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_21.dump
index efb41a43e5..efb41a43e5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_21.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_21.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_22.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_22.dump
index 630385357c..630385357c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_22.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_22.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_23.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_23.dump
index d53b9d9fae..d53b9d9fae 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_23.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_23.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_24.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_24.dump
index 2714e67fca..2714e67fca 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_24.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_24.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_25.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_25.dump
index f3c66fec5f..f3c66fec5f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_25.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_25.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_26.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_26.dump
index e687f3b5d0..e687f3b5d0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_26.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_26.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_27.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_27.dump
index 404739b8b2..404739b8b2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_27.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_27.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_28.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_28.dump
index c7352db6e6..c7352db6e6 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_28.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_28.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_29.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_29.dump
index de0d9e9298..de0d9e9298 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_29.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_29.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_30.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_30.dump
index 7bae3e042b..7bae3e042b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_30.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_30.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_31.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_31.dump
index f1131a4d60..f1131a4d60 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_31.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_31.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_32.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_32.dump
index a50b6a861d..a50b6a861d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_32.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_32.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_33.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_33.dump
index c45488123f..c45488123f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_33.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_33.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_34.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_34.dump
index 784020926f..784020926f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_34.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_34.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_35.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_35.dump
index 20121203e6..20121203e6 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_35.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_35.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_36.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_36.dump
index 805ad1426b..805ad1426b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_36.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_36.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_37.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_37.dump
index 7e297dabad..7e297dabad 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_37.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_37.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_38.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_38.dump
index 071b0ef5c7..071b0ef5c7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_38.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_38.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_39.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_39.dump
index 355244dd2f..355244dd2f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_39.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_39.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_40.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_40.dump
index 309839a5e1..309839a5e1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_40.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_40.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_41.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_41.dump
index 3cefd9fe95..3cefd9fe95 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_41.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_41.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_42.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_42.dump
index c4b5ddd8dd..c4b5ddd8dd 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_42.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_42.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_43.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_43.dump
index 84d24d0936..84d24d0936 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_43.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_43.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_44.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_44.dump
index cc15234cc5..cc15234cc5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_44.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_44.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_45.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_45.dump
index ac36858445..ac36858445 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_45.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_45.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_46.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_46.dump
index c7f37a9b71..c7f37a9b71 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_46.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_46.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_47.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_47.dump
index a83f90b50f..a83f90b50f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_47.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_47.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_48.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_48.dump
index 158d4d24ba..158d4d24ba 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_48.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_48.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_49.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_49.dump
index f94e39210d..f94e39210d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_49.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_49.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_50.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_50.dump
index 62e5b5c49a..62e5b5c49a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_50.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_50.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_51.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_51.dump
index c8ce286a56..c8ce286a56 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_51.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_51.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_52.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_52.dump
index f1d21db59c..f1d21db59c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_52.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_52.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_53.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_53.dump
index 15511c3906..15511c3906 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_53.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_53.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_54.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_54.dump
index de2558dcde..de2558dcde 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_54.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_54.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_55.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_55.dump
index b0838eec2f..b0838eec2f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_55.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_55.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_56.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_56.dump
index 133a501589..133a501589 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_56.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_56.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_57.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_57.dump
index 8441704654..8441704654 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_57.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_57.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_58.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_58.dump
index 859389dcb0..859389dcb0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_58.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_58.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_59.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_59.dump
index 4137a55a43..4137a55a43 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_59.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_59.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_60.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_60.dump
index 13cb087a3a..13cb087a3a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_60.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_60.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_61.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_61.dump
index 31261ce9c9..31261ce9c9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_61.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_61.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_62.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_62.dump
index b145a0c17b..b145a0c17b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_62.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_62.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_63.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_63.dump
index a2992fadd0..a2992fadd0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_63.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_63.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_64.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_64.dump
index b1eb631ef1..b1eb631ef1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_64.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_64.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_65.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_65.dump
index 72124d17a0..72124d17a0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_65.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_65.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_66.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_66.dump
index 5553301525..5553301525 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_66.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_66.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_67.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_67.dump
index 0f1d5fd5df..0f1d5fd5df 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_commands_67.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_commands_67.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_echo_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_echo_00.dump
index c900d829a2..c900d829a2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_echo_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_echo_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_echo_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_echo_01.dump
index 15c6e390e3..15c6e390e3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_echo_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_echo_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_echo_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_echo_02.dump
index 9d46396b0d..9d46396b0d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_echo_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_echo_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum2_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum2_00.dump
index fa28754896..fa28754896 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum2_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum2_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum2_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum2_01.dump
index 2b47e5723e..2b47e5723e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum2_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum2_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_00.dump
index f75f63f997..f75f63f997 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_01.dump
index 44352cfd3f..44352cfd3f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_02.dump
index 6f50dcd67a..6f50dcd67a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_03.dump
index 5bcf508c24..5bcf508c24 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_04.dump
index 2aa72a9bdf..2aa72a9bdf 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_05.dump
index e4e7836b22..e4e7836b22 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_06.dump
index 38215de42e..38215de42e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_fold_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_fold_00.dump
index 5842cffa2f..5842cffa2f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_fold_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_fold_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_fold_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_fold_01.dump
index 73744dd7b6..73744dd7b6 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_fold_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_fold_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_fold_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_fold_02.dump
index b88ba571e8..b88ba571e8 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_enum_fold_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_enum_fold_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_for_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_for_00.dump
index 5d5b08fedb..5d5b08fedb 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_for_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_for_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_for_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_for_01.dump
index 1335c9fa7e..1335c9fa7e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_for_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_for_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_for_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_for_02.dump
index 9b0f7f1860..9b0f7f1860 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_for_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_for_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_for_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_for_03.dump
index 7b813bc343..7b813bc343 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_for_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_for_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_for_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_for_04.dump
index 9d4db8f915..9d4db8f915 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_for_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_for_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_for_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_for_05.dump
index 8e6c2e7d3f..8e6c2e7d3f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_for_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_for_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_function_def_tail_comment_errors_00.dump
index b3a368d48d..b3a368d48d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_function_def_tail_comment_errors_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_function_def_tail_comment_errors_01.dump
index bfc9103cdb..bfc9103cdb 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_function_def_tail_comment_errors_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_function_def_tail_comment_errors_02.dump
index b7d3c83310..b7d3c83310 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_function_def_tail_comment_errors_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_function_def_tail_comments_00.dump
index f50d4a5055..f50d4a5055 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_function_def_tail_comments_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_function_def_tail_comments_01.dump
index 5498379d35..5498379d35 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_function_def_tail_comments_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_function_def_tail_comments_02.dump
index daaca61419..daaca61419 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_function_def_tail_comments_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_import_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_import_00.dump
index b54d713038..b54d713038 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_import_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_import_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_import_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_import_01.dump
index 51f8ba9e57..51f8ba9e57 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_import_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_import_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_import_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_import_02.dump
index 0fc54ef3ca..0fc54ef3ca 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_import_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_import_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_import_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_import_03.dump
index efbc9203d9..efbc9203d9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_import_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_import_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_import_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_import_04.dump
index d1e55258a6..d1e55258a6 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_import_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_import_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_import_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_import_05.dump
index 7d5e19fdae..7d5e19fdae 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_import_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_import_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_import_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_import_06.dump
index 28c5926225..28c5926225 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_import_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_import_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_interface_fold_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_interface_fold_00.dump
index 39aa281414..39aa281414 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_interface_fold_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_interface_fold_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_interface_fold_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_interface_fold_01.dump
index 9d89454ada..9d89454ada 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_interface_fold_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_interface_fold_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_interface_fold_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_interface_fold_02.dump
index ea070ef8ac..ea070ef8ac 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_interface_fold_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_interface_fold_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_00.dump
index 6694ed7194..6694ed7194 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_01.dump
index e4881b8ee4..e4881b8ee4 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_02.dump
index aa40a19db3..aa40a19db3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_03.dump
index 9f70a8ce56..9f70a8ce56 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_04.dump
index 71897e5037..71897e5037 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_05.dump
index d1a98e7553..d1a98e7553 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_06.dump
index 0af6e896db..0af6e896db 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_07.dump
index 72e34392be..72e34392be 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_08.dump
index 4234423889..4234423889 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_09.dump
index 52af3d8259..52af3d8259 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_10.dump
index c2158724ce..c2158724ce 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_11.dump
index c29d680cd2..c29d680cd2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_12.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_12.dump
index b1bc7cdbfa..b1bc7cdbfa 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_12.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_12.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_13.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_13.dump
index b41c983297..b41c983297 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_13.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_13.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_14.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_14.dump
index 6c0659877c..6c0659877c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_14.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_14.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_15.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_15.dump
index 383207f7ea..383207f7ea 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_15.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_15.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_16.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_16.dump
index 80f70dd589..80f70dd589 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_16.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_let_heredoc_16.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_loadkeymap_00.dump
index ac066ec60b..ac066ec60b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_loadkeymap_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_loadkeymap_01.dump
index 4133ae3226..4133ae3226 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_loadkeymap_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_ex_type_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_type_00.dump
index c5fa4c94e5..c5fa4c94e5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_ex_type_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_ex_type_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_00.dump
index 1e66891af3..1e66891af3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_01.dump
index 39067b0bee..39067b0bee 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_02.dump
index 442725444e..442725444e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_03.dump
index 8e3d22ff3f..8e3d22ff3f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_04.dump
index eeee94f511..eeee94f511 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_05.dump
index 32d0c59b6c..32d0c59b6c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_06.dump
index ec18961874..ec18961874 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_07.dump
index 77f871048c..77f871048c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_08.dump
index c1f31fcfc6..c1f31fcfc6 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_09.dump
index 277f7ba50d..277f7ba50d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_10.dump
index d83a170c17..d83a170c17 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_11.dump
index fdea0d092c..fdea0d092c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_12.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_12.dump
index 6ad0079b85..6ad0079b85 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_expressions_12.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_expressions_12.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_00.dump
index 8ca5f8b7f1..8ca5f8b7f1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_01.dump
index cb8b0aa108..cb8b0aa108 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_02.dump
index db1e0130cd..db1e0130cd 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_03.dump
index fae788c085..fae788c085 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_04.dump
index 0fbf9c339c..0fbf9c339c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_05.dump
index bc258f6aee..bc258f6aee 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_06.dump
index e26a13a6ae..e26a13a6ae 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_07.dump
index c61c89a2c4..c61c89a2c4 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_08.dump
index 657983f01c..657983f01c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_09.dump
index 9e02888b21..9e02888b21 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_10.dump
index 6624a78c2b..6624a78c2b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_11.dump
index 53e8445e1f..53e8445e1f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_12.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_12.dump
index 522ffddce7..522ffddce7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_12.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_12.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_13.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_13.dump
index f36c967295..f36c967295 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_13.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_13.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_14.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_14.dump
index 8511d6fe38..8511d6fe38 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_14.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_14.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_15.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_15.dump
index dfdacdd959..dfdacdd959 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_15.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_15.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_16.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_16.dump
index 31a186f251..31a186f251 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_16.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_16.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_17.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_17.dump
index 82f79ef536..82f79ef536 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_function_calls_17.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_function_calls_17.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_enum_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_enum_00.dump
index 165cc4c798..165cc4c798 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_enum_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_enum_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_enum_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_enum_01.dump
index e7f1197014..e7f1197014 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_enum_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_enum_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_enum_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_enum_02.dump
index 4dde18a4f9..4dde18a4f9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_enum_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_enum_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_00.dump
index 875858659c..875858659c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_01.dump
index fb51a8e22f..fb51a8e22f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_02.dump
index b797ebfd4e..b797ebfd4e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_03.dump
index 2fc1beb437..2fc1beb437 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_04.dump
index b8b324cefe..b8b324cefe 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_05.dump
index 2269292539..2269292539 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_06.dump
index 508abd90d4..508abd90d4 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_07.dump
index 881fb09688..881fb09688 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_08.dump
index c243859a68..c243859a68 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_09.dump
index 4e41855706..4e41855706 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_10.dump
index ffda6f920f..ffda6f920f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_11.dump
index 5a6e030712..5a6e030712 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_12.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_12.dump
index e4e65e3bf0..e4e65e3bf0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_12.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_list_12.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_00.dump
index ef792b5b3a..ef792b5b3a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_01.dump
index d68c0a2ad3..d68c0a2ad3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_02.dump
index c9388ef44b..c9388ef44b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_03.dump
index 84f58af60b..84f58af60b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_04.dump
index f0ef27db55..f0ef27db55 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_05.dump
index 32901e8ee4..32901e8ee4 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_06.dump
index c613084a97..c613084a97 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_07.dump
index 8ce2d2becd..8ce2d2becd 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_08.dump
index 9e436a3740..9e436a3740 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_09.dump
index eadf090b10..eadf090b10 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_10.dump
index b5c825be21..b5c825be21 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_function_example_set_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_functions_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_functions_00.dump
index 41fc359fd5..41fc359fd5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_functions_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_functions_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_functions_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_functions_01.dump
index 15d655b6a7..15d655b6a7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_functions_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_functions_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_functions_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_functions_02.dump
index e0029f6262..e0029f6262 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_functions_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_functions_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_functions_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_functions_03.dump
index e38ebf06bb..e38ebf06bb 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_functions_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_functions_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_functions_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_functions_04.dump
index 791efc23c9..791efc23c9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_functions_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_functions_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_generic_functions_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_functions_05.dump
index a804b2f192..a804b2f192 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_generic_functions_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_generic_functions_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_00.dump
index 3f189294a2..3f189294a2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_01.dump
index 4481e4774a..4481e4774a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_02.dump
index d3016acb91..d3016acb91 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_03.dump
index 93d206708c..93d206708c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_04.dump
index 63ed50fe01..63ed50fe01 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_05.dump
index 73e0237f4c..73e0237f4c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_06.dump
index fc7f19b874..fc7f19b874 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_07.dump
index 831c23bd23..831c23bd23 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_08.dump
index 10fad7f49f..10fad7f49f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_09.dump
index 3dbfd3cefa..3dbfd3cefa 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_lambdas_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_lambdas_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_legacy_header_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_legacy_header_00.dump
index f01edc18fb..f01edc18fb 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_legacy_header_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_legacy_header_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_legacy_header_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_legacy_header_01.dump
index 8c1c39c25d..8c1c39c25d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_legacy_header_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_legacy_header_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_legacy_header_fold_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_legacy_header_fold_00.dump
index 89b32ceae0..89b32ceae0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_legacy_header_fold_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_legacy_header_fold_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_legacy_header_fold_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_legacy_header_fold_01.dump
index 55ff243559..55ff243559 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_legacy_header_fold_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_legacy_header_fold_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_no_comment_strings_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_no_comment_strings_00.dump
index ee6f101a54..ee6f101a54 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_no_comment_strings_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_no_comment_strings_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_no_comment_strings_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_no_comment_strings_01.dump
index 7ee5d5b85b..7ee5d5b85b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_no_comment_strings_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_no_comment_strings_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_shebang_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_shebang_00.dump
index c4f6f80902..c4f6f80902 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_shebang_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_shebang_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords2_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords2_00.dump
index 8a7d4edd94..8a7d4edd94 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords2_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords2_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords2_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords2_01.dump
index aaa99d7464..aaa99d7464 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords2_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords2_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords2_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords2_02.dump
index 9f998522d9..9f998522d9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords2_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords2_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords2_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords2_03.dump
index 17439c33d7..17439c33d7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords2_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords2_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords3_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords3_00.dump
index aada2bbb4f..aada2bbb4f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords3_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords3_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords3_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords3_01.dump
index f1c2d22300..f1c2d22300 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords3_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords3_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords_00.dump
index ea8eaecb47..ea8eaecb47 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords_01.dump
index 1777272462..1777272462 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords_02.dump
index feed1359e0..feed1359e0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords_03.dump
index 934eaa5e06..934eaa5e06 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords_04.dump
index 4e9ce2c159..4e9ce2c159 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords_05.dump
index af95527c2e..af95527c2e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_super_this_keywords_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_super_this_keywords_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_tuples_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_tuples_00.dump
index 4467a67bbe..4467a67bbe 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_tuples_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_tuples_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_tuples_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_tuples_01.dump
index 0499393c99..0499393c99 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_tuples_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_tuples_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_types_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_types_00.dump
index 515da0f089..515da0f089 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_types_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_types_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_types_example_object_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_types_example_object_00.dump
index a60f904057..a60f904057 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_types_example_object_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_types_example_object_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_types_example_object_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_types_example_object_01.dump
index 21d48d7c59..21d48d7c59 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_types_example_object_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_types_example_object_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_types_object_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_types_object_00.dump
index efd7f06a07..efd7f06a07 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_types_object_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_types_object_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_types_object_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_types_object_01.dump
index 7f9cd31527..7f9cd31527 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_types_object_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_types_object_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_variables_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_00.dump
index fea017b492..fea017b492 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_variables_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_variables_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_01.dump
index baaaeabcca..baaaeabcca 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_variables_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_variables_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_02.dump
index 1c315aee23..1c315aee23 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_variables_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_variables_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_03.dump
index bb0a3660ba..bb0a3660ba 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_variables_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_variables_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_04.dump
index 09eecdfa63..09eecdfa63 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_variables_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_variables_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_05.dump
index 53f4fe1dd2..53f4fe1dd2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_variables_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_variables_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_06.dump
index 898f64284c..898f64284c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_variables_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_variables_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_07.dump
index f0aadcbbd1..f0aadcbbd1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_variables_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_variables_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_08.dump
index cb8f53f0d3..cb8f53f0d3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_variables_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_variables_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_09.dump
index 9515d52442..9515d52442 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_variables_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_variables_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_10.dump
index 10f79433d4..10f79433d4 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_variables_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_variables_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_11.dump
index ebaabb82ef..ebaabb82ef 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_variables_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_variables_12.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_12.dump
index 642e30b2cc..642e30b2cc 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_variables_12.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_12.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_variables_13.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_13.dump
index 638d2b6082..638d2b6082 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_variables_13.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_13.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_variables_14.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_14.dump
index afe83a8d7b..afe83a8d7b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_variables_14.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_14.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim9_variables_15.dump b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_15.dump
index a3a34d954b..a3a34d954b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim9_variables_15.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv9_variables_15.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_comment_strings_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_comment_strings_00.dump
index 7a1f9cbd6b..7a1f9cbd6b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_comment_strings_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_comment_strings_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_comment_strings_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_comment_strings_01.dump
index c44edc9b3e..c44edc9b3e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_comment_strings_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_comment_strings_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_comments_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_comments_00.dump
index 5e6b5a2f0f..5e6b5a2f0f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_comments_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_comments_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_comments_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_comments_01.dump
index 2c52e515da..2c52e515da 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_comments_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_comments_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_comments_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_comments_02.dump
index 5156e42793..5156e42793 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_comments_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_comments_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_comments_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_comments_03.dump
index a125c0bb18..a125c0bb18 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_comments_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_comments_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_comments_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_comments_04.dump
index 48acc83f63..48acc83f63 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_comments_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_comments_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_abbreviate_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_abbreviate_00.dump
index dbcca1edc2..dbcca1edc2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_abbreviate_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_abbreviate_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_abbreviate_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_abbreviate_01.dump
index 335408834f..335408834f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_abbreviate_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_abbreviate_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_abbreviate_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_abbreviate_02.dump
index c13bcbd29d..c13bcbd29d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_abbreviate_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_abbreviate_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_abbreviate_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_abbreviate_03.dump
index c364e75539..c364e75539 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_abbreviate_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_abbreviate_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_at_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_at_00.dump
index d5b99a61e3..d5b99a61e3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_at_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_at_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_at_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_at_01.dump
index f151b1e612..f151b1e612 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_at_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_at_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_at_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_at_02.dump
index eb953944f2..eb953944f2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_at_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_at_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_at_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_at_03.dump
index bdfe8cb747..bdfe8cb747 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_at_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_at_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_augroup_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_augroup_00.dump
index 1435c62f7e..1435c62f7e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_augroup_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_augroup_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_augroup_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_augroup_01.dump
index 37bc23dc57..37bc23dc57 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_augroup_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_augroup_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_augroup_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_augroup_02.dump
index 1a311c4cf7..1a311c4cf7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_augroup_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_augroup_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_augroup_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_augroup_03.dump
index c5f527cc23..c5f527cc23 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_augroup_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_augroup_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_augroup_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_augroup_04.dump
index 4f7fc37771..4f7fc37771 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_augroup_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_augroup_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_00.dump
index 82090d4caf..82090d4caf 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_01.dump
index 4b2480bb84..4b2480bb84 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_02.dump
index 7af6098a79..7af6098a79 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_03.dump
index c669cbb921..c669cbb921 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_04.dump
index 4f18da29ed..4f18da29ed 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_05.dump
index 1823bf05e2..1823bf05e2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_06.dump
index 4c03fefed1..4c03fefed1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_07.dump
index ca3c695175..ca3c695175 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_08.dump
index 59d0a40a9a..59d0a40a9a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_09.dump
index 8efefee3aa..8efefee3aa 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_10.dump
index b35de96498..b35de96498 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_11.dump
index 6a71d9d049..6a71d9d049 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_12.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_12.dump
index 971dc181e6..971dc181e6 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_12.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_12.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_13.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_13.dump
index 1d2ecbfaf5..1d2ecbfaf5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_13.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_13.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_14.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_14.dump
index 765dccbc56..765dccbc56 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_14.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_14.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_15.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_15.dump
index 5cebc2c44d..5cebc2c44d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_autocmd_15.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_autocmd_15.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_behave_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_behave_00.dump
index 3b90d8c963..3b90d8c963 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_behave_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_behave_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_breakpoint_commands_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_breakpoint_commands_00.dump
index 33e0d7d1cd..33e0d7d1cd 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_breakpoint_commands_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_breakpoint_commands_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_breakpoint_commands_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_breakpoint_commands_01.dump
index 7ee1e128d5..7ee1e128d5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_breakpoint_commands_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_breakpoint_commands_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_breakpoint_commands_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_breakpoint_commands_02.dump
index 1faa79ccbe..1faa79ccbe 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_breakpoint_commands_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_breakpoint_commands_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_breakpoint_commands_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_breakpoint_commands_03.dump
index 18450b879f..18450b879f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_breakpoint_commands_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_breakpoint_commands_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_breakpoint_commands_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_breakpoint_commands_04.dump
index 3e21309a81..3e21309a81 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_breakpoint_commands_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_breakpoint_commands_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_breakpoint_commands_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_breakpoint_commands_05.dump
index 8525bc7b2e..8525bc7b2e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_breakpoint_commands_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_breakpoint_commands_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_call_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_call_00.dump
index 13fdb02e2c..13fdb02e2c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_call_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_call_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_call_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_call_01.dump
index ddae2cca9c..ddae2cca9c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_call_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_call_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_call_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_call_02.dump
index 67f8905f21..67f8905f21 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_call_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_call_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_call_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_call_03.dump
index 6669a0a7ac..6669a0a7ac 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_call_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_call_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_catch_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_catch_00.dump
index de76e72a25..de76e72a25 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_catch_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_catch_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_cd_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_cd_00.dump
index fa388fef1d..fa388fef1d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_cd_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_cd_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_cd_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_cd_01.dump
index 388e9d5e96..388e9d5e96 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_cd_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_cd_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_cd_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_cd_02.dump
index f2fefb1ae1..f2fefb1ae1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_cd_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_cd_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_cd_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_cd_03.dump
index 1be9f06e2b..1be9f06e2b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_cd_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_cd_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_cd_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_cd_04.dump
index ce3e8bd6c2..ce3e8bd6c2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_cd_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_cd_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_cd_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_cd_05.dump
index b7b7bfb5d5..b7b7bfb5d5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_cd_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_cd_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_cd_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_cd_06.dump
index f2ad382494..f2ad382494 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_cd_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_cd_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_00.dump
index 8ddf51eff5..8ddf51eff5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_01.dump
index 78492c7f3d..78492c7f3d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_02.dump
index dd95498f4e..dd95498f4e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_03.dump
index aa0e2f0c32..aa0e2f0c32 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_04.dump
index c819f228cd..c819f228cd 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_05.dump
index d5cccc3289..d5cccc3289 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_06.dump
index ce8e796578..ce8e796578 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_07.dump
index e88760eaa3..e88760eaa3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_08.dump
index 63a768760d..63a768760d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_09.dump
index bc89f17530..bc89f17530 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_10.dump
index 5cc86bdcf2..5cc86bdcf2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_11.dump
index 1e50b3f141..1e50b3f141 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_modifiers_00.dump
index a6984d4c22..a6984d4c22 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_modifiers_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_modifiers_01.dump
index 3c2fac5720..3c2fac5720 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_modifiers_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_modifiers_02.dump
index 05b0489521..05b0489521 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_modifiers_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_modifiers_03.dump
index 6af289dec4..6af289dec4 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_modifiers_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_modifiers_04.dump
index 53ac039c2d..53ac039c2d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_modifiers_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_modifiers_05.dump
index 2f09531969..2f09531969 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_modifiers_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_modifiers_06.dump
index 9b089ae2b0..9b089ae2b0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_modifiers_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_modifiers_07.dump
index be01800d8b..be01800d8b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_command_modifiers_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_00.dump
index f76ed95f83..f76ed95f83 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_01.dump
index 71de8142a6..71de8142a6 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_02.dump
index 98b142a75b..98b142a75b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_03.dump
index fcedbfe3cc..fcedbfe3cc 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_04.dump
index 2a4372e58f..2a4372e58f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_05.dump
index 8c9b77acd6..8c9b77acd6 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_06.dump
index 368df373f9..368df373f9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_07.dump
index 7507a133fa..7507a133fa 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_08.dump
index 970062ec9d..970062ec9d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_09.dump
index 6a8def6869..6a8def6869 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_10.dump
index 2a6deef87f..2a6deef87f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_11.dump
index a309127dcd..a309127dcd 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_12.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_12.dump
index 06203eb3fd..06203eb3fd 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_12.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_12.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_13.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_13.dump
index a9e23fb2e8..a9e23fb2e8 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_13.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_13.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_14.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_14.dump
index 26142ba640..26142ba640 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_14.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_14.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_15.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_15.dump
index 08cf8f7891..08cf8f7891 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_15.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_15.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_16.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_16.dump
index a9a77266b7..a9a77266b7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_16.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_16.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_17.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_17.dump
index 9f0186aaf6..9f0186aaf6 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_17.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_17.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_18.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_18.dump
index ff65ca356b..ff65ca356b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_18.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_18.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_19.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_19.dump
index 2b91ce8c27..2b91ce8c27 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_19.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_19.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_20.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_20.dump
index bf02f0157a..bf02f0157a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_20.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_20.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_21.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_21.dump
index 2ee8d6fbdc..2ee8d6fbdc 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_21.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_21.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_22.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_22.dump
index 376f35a219..376f35a219 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_22.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_22.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_23.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_23.dump
index 9c180652fd..9c180652fd 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_23.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_23.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_24.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_24.dump
index 1e45efe3c4..1e45efe3c4 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_24.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_24.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_25.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_25.dump
index 2c63093785..2c63093785 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_25.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_25.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_26.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_26.dump
index 147c58c75c..147c58c75c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_26.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_26.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_27.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_27.dump
index db85b31e87..db85b31e87 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_27.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_27.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_28.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_28.dump
index 5d1200e6cb..5d1200e6cb 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_28.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_28.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_29.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_29.dump
index 1b9117b388..1b9117b388 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_29.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_29.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_30.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_30.dump
index 5bcbeef9af..5bcbeef9af 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_30.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_30.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_31.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_31.dump
index 5abc5ab7f4..5abc5ab7f4 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_31.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_31.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_32.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_32.dump
index 8ec5f2f9a5..8ec5f2f9a5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_32.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_32.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_33.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_33.dump
index cc321b4ecb..cc321b4ecb 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_33.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_33.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_34.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_34.dump
index bb2242efa2..bb2242efa2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_34.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_34.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_35.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_35.dump
index 64447816b8..64447816b8 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_35.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_35.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_36.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_36.dump
index 031dcb1588..031dcb1588 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_36.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_36.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_37.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_37.dump
index 739767ea0c..739767ea0c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_37.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_37.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_38.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_38.dump
index 0ee37ba1da..0ee37ba1da 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_38.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_38.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_39.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_39.dump
index 71e0796dce..71e0796dce 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_39.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_39.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_40.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_40.dump
index 1a5394dd17..1a5394dd17 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_40.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_40.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_41.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_41.dump
index 9586e55504..9586e55504 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_41.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_41.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_42.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_42.dump
index 058fc102b7..058fc102b7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_42.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_42.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_43.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_43.dump
index 736510c9ae..736510c9ae 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_43.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_43.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_44.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_44.dump
index 9e5160d460..9e5160d460 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_44.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_44.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_45.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_45.dump
index 135407e8ce..135407e8ce 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_45.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_45.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_46.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_46.dump
index 2dc666444f..2dc666444f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_46.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_46.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_47.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_47.dump
index b5426c5b45..b5426c5b45 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_47.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_47.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_48.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_48.dump
index 6c3ee2f4de..6c3ee2f4de 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_48.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_48.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_49.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_49.dump
index 5e7527e119..5e7527e119 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_49.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_49.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_50.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_50.dump
index 13d729c01d..13d729c01d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_50.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_50.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_51.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_51.dump
index 643459ba1e..643459ba1e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_51.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_51.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_52.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_52.dump
index 64f99821cd..64f99821cd 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_52.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_52.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_53.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_53.dump
index 5e3d63d7f9..5e3d63d7f9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_53.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_53.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_54.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_54.dump
index da5b8ab7a1..da5b8ab7a1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_54.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_54.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_55.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_55.dump
index 736a9c5094..736a9c5094 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_55.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_55.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_56.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_56.dump
index 86f8660aba..86f8660aba 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_56.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_56.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_57.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_57.dump
index 71b504ea1b..71b504ea1b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_57.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_57.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_58.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_58.dump
index 6753a5100a..6753a5100a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_58.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_58.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_59.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_59.dump
index 57073b2e25..57073b2e25 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_59.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_59.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_60.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_60.dump
index b230033778..b230033778 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_60.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_60.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_61.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_61.dump
index ffc8eab758..ffc8eab758 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_61.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_61.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_62.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_62.dump
index 54d4e484e9..54d4e484e9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_62.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_62.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_63.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_63.dump
index 5d3070de16..5d3070de16 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_63.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_63.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_64.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_64.dump
index 64c9f4dc3d..64c9f4dc3d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_64.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_64.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_65.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_65.dump
index 51b2aa18f2..51b2aa18f2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_65.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_65.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_66.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_66.dump
index ab374c22c7..ab374c22c7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_66.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_66.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_67.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_67.dump
index 7677b76cb1..7677b76cb1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_commands_67.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_commands_67.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_debug_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_debug_00.dump
index 5ee2c340d6..5ee2c340d6 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_debug_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_debug_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_debuggreedy_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_debuggreedy_00.dump
index 17af170e19..17af170e19 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_debuggreedy_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_debuggreedy_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_debuggreedy_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_debuggreedy_01.dump
index a850ee8b68..a850ee8b68 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_debuggreedy_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_debuggreedy_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_debuggreedy_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_debuggreedy_02.dump
index 357f8bb297..357f8bb297 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_debuggreedy_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_debuggreedy_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_00.dump
index 2f87f33053..2f87f33053 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_01.dump
index f13f4f4e3c..f13f4f4e3c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_02.dump
index 14cffbda09..14cffbda09 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_03.dump
index 4ab6ef5e9b..4ab6ef5e9b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_04.dump
index 6b5e93d8dc..6b5e93d8dc 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_05.dump
index 6519226746..6519226746 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_06.dump
index 3c4b3ab06c..3c4b3ab06c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_07.dump
index 87f3964bd0..87f3964bd0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_00.dump
index cbf57d74a4..cbf57d74a4 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_01.dump
index 50073ed433..50073ed433 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_02.dump
index 435894cbad..435894cbad 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_03.dump
index 39f91a710f..39f91a710f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_04.dump
index 00d7f43b6c..00d7f43b6c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_05.dump
index 6177af78e2..6177af78e2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_06.dump
index f2045053d1..f2045053d1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_07.dump
index 698735cb4f..698735cb4f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_08.dump
index 29ce8a25b4..29ce8a25b4 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_09.dump
index df82f27683..df82f27683 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_10.dump
index 0b67be09e9..0b67be09e9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_fold_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_fold_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_nested_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_nested_00.dump
index 9fe6696f43..9fe6696f43 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_nested_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_nested_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_nested_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_nested_01.dump
index 0fc35aaf48..0fc35aaf48 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_nested_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_nested_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_nested_fold_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_nested_fold_00.dump
index 26c48152e8..26c48152e8 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_nested_fold_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_nested_fold_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_return_type_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_return_type_00.dump
index 04e16a4a54..04e16a4a54 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_return_type_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_return_type_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_return_type_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_return_type_01.dump
index ed7fd6c579..ed7fd6c579 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_return_type_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_return_type_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_return_type_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_return_type_02.dump
index dc6ab66845..dc6ab66845 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_return_type_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_return_type_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_return_type_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_return_type_03.dump
index a4e71137c5..a4e71137c5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_def_return_type_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_def_return_type_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_defer_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_defer_00.dump
index d5a5f5f26a..d5a5f5f26a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_defer_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_defer_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_delfunction_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_delfunction_00.dump
index 8eb82e74fd..8eb82e74fd 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_delfunction_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_delfunction_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_delfunction_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_delfunction_01.dump
index 27d466b167..27d466b167 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_delfunction_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_delfunction_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_delfunction_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_delfunction_02.dump
index 64f7d3026d..64f7d3026d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_delfunction_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_delfunction_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_do_commands_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_do_commands_00.dump
index 3b5518cb9e..3b5518cb9e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_do_commands_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_do_commands_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_do_commands_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_do_commands_01.dump
index ccbca1b82a..ccbca1b82a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_do_commands_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_do_commands_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_do_commands_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_do_commands_02.dump
index cbdabcd357..cbdabcd357 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_do_commands_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_do_commands_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_do_commands_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_do_commands_03.dump
index 8454ec94dc..8454ec94dc 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_do_commands_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_do_commands_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_echo_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_echo_00.dump
index 077f03dcbf..077f03dcbf 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_echo_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_echo_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_echo_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_echo_01.dump
index f23db5d580..f23db5d580 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_echo_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_echo_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_echo_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_echo_02.dump
index 54b1cfe704..54b1cfe704 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_echo_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_echo_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_echo_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_echo_03.dump
index 239a31dfa9..239a31dfa9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_echo_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_echo_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_eval_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_eval_00.dump
index ba9907670a..ba9907670a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_eval_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_eval_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_eval_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_eval_01.dump
index 292a190b9a..292a190b9a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_eval_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_eval_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_execute_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_execute_00.dump
index e5c53af920..e5c53af920 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_execute_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_execute_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_execute_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_execute_01.dump
index 685addd961..685addd961 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_execute_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_execute_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_execute_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_execute_02.dump
index f5f892e62b..f5f892e62b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_execute_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_execute_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_execute_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_execute_03.dump
index 7f52581b96..7f52581b96 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_execute_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_execute_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_filetype_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_filetype_00.dump
index 69b29f8fd0..69b29f8fd0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_filetype_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_filetype_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_filetype_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_filetype_01.dump
index 1a42053b2b..1a42053b2b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_filetype_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_filetype_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_filter_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_filter_00.dump
index 0aaf0eb6a0..0aaf0eb6a0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_filter_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_filter_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_for_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_for_00.dump
index c13fecae06..c13fecae06 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_for_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_for_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_for_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_for_01.dump
index 3ee064ab77..3ee064ab77 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_for_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_for_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_for_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_for_02.dump
index b67143fc53..b67143fc53 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_for_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_for_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_for_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_for_03.dump
index 3851717258..3851717258 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_for_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_for_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_00.dump
index e6f67d5b30..e6f67d5b30 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_01.dump
index c009a805c3..c009a805c3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_02.dump
index ebe59a877d..ebe59a877d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_03.dump
index 09c3a5491f..09c3a5491f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_04.dump
index 9e49064bec..9e49064bec 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_05.dump
index 2b726b372e..2b726b372e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_06.dump
index 6eaeddd8ab..6eaeddd8ab 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_07.dump
index 5b68b92026..5b68b92026 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_08.dump
index e49c5ffb9d..e49c5ffb9d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_09.dump
index 19f42e1260..19f42e1260 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_10.dump
index 3a384803f2..3a384803f2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_11.dump
index 6ada5e7309..6ada5e7309 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_12.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_12.dump
index 7b3b789ae3..7b3b789ae3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_12.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_12.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_13.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_13.dump
index 69be8a98f1..69be8a98f1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_13.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_13.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_14.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_14.dump
index 03e3550056..03e3550056 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_14.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_14.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_15.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_15.dump
index df284e0278..df284e0278 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_15.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_15.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_def_tail_comment_errors_00.dump
index 82bdf388dd..82bdf388dd 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_def_tail_comment_errors_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_def_tail_comment_errors_01.dump
index c76fa06e43..c76fa06e43 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_def_tail_comment_errors_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_def_tail_comment_errors_02.dump
index 025986f526..025986f526 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_def_tail_comment_errors_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_def_tail_comments_00.dump
index 111094edcd..111094edcd 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_def_tail_comments_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_def_tail_comments_01.dump
index 0049aeddc3..0049aeddc3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_def_tail_comments_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_def_tail_comments_02.dump
index ae919ba17b..ae919ba17b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_def_tail_comments_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_00.dump
index 4fa7e437ae..4fa7e437ae 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_01.dump
index 78eef92c4c..78eef92c4c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_02.dump
index 7bb08c7666..7bb08c7666 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_03.dump
index b41ea7eb83..b41ea7eb83 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_04.dump
index f6a6ff34ee..f6a6ff34ee 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_05.dump
index b3555a3c43..b3555a3c43 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_06.dump
index 4ad53bda38..4ad53bda38 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_07.dump
index 3a6a96e9a2..3a6a96e9a2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_08.dump
index 0ee8bbcfe7..0ee8bbcfe7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_09.dump
index 12e9f33542..12e9f33542 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_10.dump
index 065c637055..065c637055 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_11.dump
index dc37818741..dc37818741 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_12.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_12.dump
index b118773bb5..b118773bb5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_12.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_12.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_13.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_13.dump
index a73c91e526..a73c91e526 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_13.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_13.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_14.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_14.dump
index c1e406164b..c1e406164b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_14.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_14.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_15.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_15.dump
index 48a877e159..48a877e159 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_15.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_15.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_16.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_16.dump
index e3d9bbd956..e3d9bbd956 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_16.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_16.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_17.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_17.dump
index db3157e51b..db3157e51b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_17.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_17.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_18.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_18.dump
index dfdba9126a..dfdba9126a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_18.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_18.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_19.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_19.dump
index 6d5f7a8a37..6d5f7a8a37 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_fold_19.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_fold_19.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_nested_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_nested_00.dump
index dd0f87a923..dd0f87a923 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_nested_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_nested_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_nested_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_nested_01.dump
index 1f035effe5..1f035effe5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_nested_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_nested_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_nested_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_nested_02.dump
index 6061a76568..6061a76568 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_nested_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_nested_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_nested_fold_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_nested_fold_00.dump
index 85ca3ef50b..85ca3ef50b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_function_nested_fold_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_function_nested_fold_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_grep_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_grep_00.dump
index 702882a714..702882a714 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_grep_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_grep_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_grep_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_grep_01.dump
index fd6df33d5a..fd6df33d5a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_grep_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_grep_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_grep_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_grep_02.dump
index 0dd1030c50..0dd1030c50 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_grep_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_grep_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_help_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_help_00.dump
index c740147518..c740147518 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_help_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_help_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_help_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_help_01.dump
index 82350a74de..82350a74de 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_help_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_help_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_help_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_help_02.dump
index 392120ace3..392120ace3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_help_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_help_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_help_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_help_03.dump
index 1cce14f6e0..1cce14f6e0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_help_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_help_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_helpgrep_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_helpgrep_00.dump
index 1e4b383439..1e4b383439 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_helpgrep_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_helpgrep_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_highlight_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_highlight_00.dump
index 8e32efb164..8e32efb164 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_highlight_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_highlight_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_highlight_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_highlight_01.dump
index 0e3ab04015..0e3ab04015 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_highlight_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_highlight_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_highlight_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_highlight_02.dump
index f91917d432..f91917d432 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_highlight_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_highlight_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_highlight_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_highlight_03.dump
index f5da0db9b0..f5da0db9b0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_highlight_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_highlight_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_highlight_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_highlight_04.dump
index 72ff60d6c9..72ff60d6c9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_highlight_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_highlight_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_highlight_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_highlight_05.dump
index 50c41e16bf..50c41e16bf 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_highlight_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_highlight_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_highlight_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_highlight_06.dump
index 5f6791da02..5f6791da02 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_highlight_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_highlight_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_history_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_history_00.dump
index 7a1eb3eb2a..7a1eb3eb2a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_history_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_history_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_history_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_history_01.dump
index 71c8a8cd23..71c8a8cd23 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_history_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_history_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_history_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_history_02.dump
index 56d12fe989..56d12fe989 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_history_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_history_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_history_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_history_03.dump
index 828d95ad19..828d95ad19 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_history_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_history_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_history_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_history_04.dump
index 07fab77be4..07fab77be4 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_history_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_history_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_history_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_history_05.dump
index 57b9480181..57b9480181 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_history_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_history_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_import_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_import_00.dump
index 8d1e40f005..8d1e40f005 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_import_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_import_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_import_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_import_01.dump
index 62070f9740..62070f9740 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_import_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_import_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_import_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_import_02.dump
index 9fb21c2f41..9fb21c2f41 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_import_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_import_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_import_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_import_03.dump
index 686b8bdf11..686b8bdf11 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_import_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_import_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_import_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_import_04.dump
index 957e4d9988..957e4d9988 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_import_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_import_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_import_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_import_05.dump
index 151b5eb3e1..151b5eb3e1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_import_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_import_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_import_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_import_06.dump
index 7716921dd0..7716921dd0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_import_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_import_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_00.dump
index 9209db3283..9209db3283 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_01.dump
index 9b9054d2c1..9b9054d2c1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_02.dump
index 704b3e6cea..704b3e6cea 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_03.dump
index d291e9b7a1..d291e9b7a1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_04.dump
index f32a38a764..f32a38a764 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_05.dump
index 938098877a..938098877a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_06.dump
index 9a55c3b69f..9a55c3b69f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_07.dump
index a807f486a2..a807f486a2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_08.dump
index 285d4f2855..285d4f2855 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_09.dump
index 29fcdc64b8..29fcdc64b8 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_language_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_language_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_00.dump
index bce7662396..bce7662396 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_01.dump
index 0ac68d2e28..0ac68d2e28 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_02.dump
index 16ccba8cc7..16ccba8cc7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_03.dump
index 705cafca75..705cafca75 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_04.dump
index 5b8263a2c7..5b8263a2c7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_05.dump
index ae0c3159f1..ae0c3159f1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_06.dump
index cca169c05a..cca169c05a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_07.dump
index bfa037dedd..bfa037dedd 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_08.dump
index 661c39eb69..661c39eb69 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_09.dump
index 611d6aa737..611d6aa737 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_10.dump
index bdd6e5c37a..bdd6e5c37a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_11.dump
index e8904f3266..e8904f3266 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_12.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_12.dump
index a65d1ff236..a65d1ff236 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_12.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_12.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_13.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_13.dump
index b69d31d850..b69d31d850 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_13.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_13.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_14.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_14.dump
index 9e1273f37e..9e1273f37e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_14.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_let_heredoc_14.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_loadkeymap_00.dump
index ab573500b7..ab573500b7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_loadkeymap_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_loadkeymap_01.dump
index fb5cde1e8d..fb5cde1e8d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_loadkeymap_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_after_bar_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_loadkeymap_after_bar_00.dump
index 4ecde124bb..4ecde124bb 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_after_bar_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_loadkeymap_after_bar_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_after_colon_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_loadkeymap_after_colon_00.dump
index d7911d86b5..d7911d86b5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_after_colon_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_loadkeymap_after_colon_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_lua_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_lua_00.dump
index d2f0702e0f..d2f0702e0f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_lua_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_lua_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_lua_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_lua_01.dump
index 6e9e4e85a3..6e9e4e85a3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_lua_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_lua_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_lua_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_lua_02.dump
index 93e67aa4e5..93e67aa4e5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_lua_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_lua_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_lua_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_lua_03.dump
index 5c68059cc7..5c68059cc7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_lua_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_lua_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_lua_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_lua_04.dump
index 2e8168ce91..2e8168ce91 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_lua_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_lua_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_lua_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_lua_05.dump
index fe494cd543..fe494cd543 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_lua_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_lua_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_lua_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_lua_06.dump
index b031e67ceb..b031e67ceb 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_lua_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_lua_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_lua_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_lua_07.dump
index 307376941f..307376941f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_lua_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_lua_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_lua_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_lua_08.dump
index 7e70c985e7..7e70c985e7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_lua_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_lua_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_make_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_make_00.dump
index f7bc47c7c8..f7bc47c7c8 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_make_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_make_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_make_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_make_01.dump
index 570358cbba..570358cbba 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_make_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_make_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_make_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_make_02.dump
index f8328fe83d..f8328fe83d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_make_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_make_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_map_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_map_00.dump
index 80b2d5353a..80b2d5353a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_map_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_map_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_map_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_map_01.dump
index b7b32c1863..b7b32c1863 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_map_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_map_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_map_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_map_02.dump
index 07257b6db3..07257b6db3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_map_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_map_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_map_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_map_03.dump
index 86d4d0ae59..86d4d0ae59 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_map_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_map_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_map_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_map_04.dump
index c742d09742..c742d09742 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_map_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_map_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_map_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_map_05.dump
index c3765cea2a..c3765cea2a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_map_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_map_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_map_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_map_06.dump
index 4e5b057440..4e5b057440 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_map_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_map_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_map_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_map_07.dump
index c8476d82db..c8476d82db 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_map_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_map_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_00.dump
index b328f5a410..b328f5a410 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_01.dump
index e940ee803f..e940ee803f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_02.dump
index bd0e393c9d..bd0e393c9d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_03.dump
index 19e555f998..19e555f998 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_04.dump
index bc2c2f675f..bc2c2f675f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_05.dump
index d2b889b8b8..d2b889b8b8 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_06.dump
index 224afb2d1b..224afb2d1b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_07.dump
index a2f23ea0f7..a2f23ea0f7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_08.dump
index 27f607a6c9..27f607a6c9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_09.dump
index 46eaca326b..46eaca326b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_10.dump
index 32cc2249af..32cc2249af 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_11.dump
index c986357c09..c986357c09 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_12.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_12.dump
index 02064018ce..02064018ce 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mark_12.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mark_12.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_match_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_match_00.dump
index c36c8b08a7..c36c8b08a7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_match_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_match_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_match_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_match_01.dump
index 01c51e0221..01c51e0221 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_match_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_match_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_match_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_match_02.dump
index 1a8e7b65a3..1a8e7b65a3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_match_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_match_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_match_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_match_03.dump
index 002bbf6406..002bbf6406 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_match_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_match_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_menu_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menu_00.dump
index 2c2d4c3dc1..2c2d4c3dc1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_menu_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menu_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_menu_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menu_01.dump
index bc17da919a..bc17da919a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_menu_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menu_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_menu_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menu_02.dump
index 83bb8c17e0..83bb8c17e0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_menu_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menu_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_menu_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menu_03.dump
index 84dd1599cd..84dd1599cd 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_menu_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menu_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_menu_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menu_04.dump
index 9c99fb70a2..9c99fb70a2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_menu_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menu_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_menu_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menu_05.dump
index d86687905b..d86687905b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_menu_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menu_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_menutranslate_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menutranslate_00.dump
index 448d554af8..448d554af8 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_menutranslate_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menutranslate_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_menutranslate_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menutranslate_01.dump
index 35fd08b57d..35fd08b57d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_menutranslate_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menutranslate_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_menutranslate_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menutranslate_02.dump
index d163d17cee..d163d17cee 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_menutranslate_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menutranslate_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_menutranslate_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menutranslate_03.dump
index 17d7482d6c..17d7482d6c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_menutranslate_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_menutranslate_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_vimgrep_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mnvgrep_00.dump
index b7862da29b..b7862da29b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_vimgrep_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mnvgrep_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_vimgrep_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mnvgrep_01.dump
index 869a3b11df..869a3b11df 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_vimgrep_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mnvgrep_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_vimgrep_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mnvgrep_02.dump
index fefec2425b..fefec2425b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_vimgrep_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mnvgrep_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_vimgrep_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mnvgrep_03.dump
index f77f5c4e5a..f77f5c4e5a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_vimgrep_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mnvgrep_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_vimgrep_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mnvgrep_04.dump
index df3f54fc03..df3f54fc03 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_vimgrep_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mnvgrep_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mzscheme_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mzscheme_00.dump
index 736e6d8843..736e6d8843 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mzscheme_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mzscheme_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mzscheme_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mzscheme_01.dump
index 900e1431da..900e1431da 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mzscheme_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mzscheme_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mzscheme_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mzscheme_02.dump
index ee29fa2885..ee29fa2885 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mzscheme_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mzscheme_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mzscheme_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mzscheme_03.dump
index 403b9d355b..403b9d355b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mzscheme_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mzscheme_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mzscheme_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mzscheme_04.dump
index 2e8168ce91..2e8168ce91 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mzscheme_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mzscheme_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mzscheme_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mzscheme_05.dump
index fe494cd543..fe494cd543 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mzscheme_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mzscheme_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mzscheme_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mzscheme_06.dump
index b031e67ceb..b031e67ceb 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mzscheme_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mzscheme_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mzscheme_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mzscheme_07.dump
index 307376941f..307376941f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mzscheme_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mzscheme_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_mzscheme_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mzscheme_08.dump
index 7e70c985e7..7e70c985e7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_mzscheme_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_mzscheme_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_normal_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_normal_00.dump
index 83ca511826..83ca511826 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_normal_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_normal_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_normal_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_normal_01.dump
index 73a5480724..73a5480724 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_normal_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_normal_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_perl_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_perl_00.dump
index 4af9df1ea3..4af9df1ea3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_perl_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_perl_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_perl_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_perl_01.dump
index 900e1431da..900e1431da 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_perl_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_perl_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_perl_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_perl_02.dump
index aa39d8f4a7..aa39d8f4a7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_perl_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_perl_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_perl_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_perl_03.dump
index 7624326514..7624326514 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_perl_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_perl_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_perl_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_perl_04.dump
index ce18b19807..ce18b19807 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_perl_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_perl_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_perl_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_perl_05.dump
index fe494cd543..fe494cd543 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_perl_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_perl_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_perl_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_perl_06.dump
index b031e67ceb..b031e67ceb 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_perl_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_perl_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_perl_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_perl_07.dump
index 307376941f..307376941f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_perl_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_perl_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_perl_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_perl_08.dump
index 7e70c985e7..7e70c985e7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_perl_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_perl_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_profile_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_profile_00.dump
index 4ff1540da1..4ff1540da1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_profile_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_profile_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_profile_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_profile_01.dump
index 5c206a31a9..5c206a31a9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_profile_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_profile_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_profile_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_profile_02.dump
index dd038ced85..dd038ced85 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_profile_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_profile_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_prompt_commands_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_prompt_commands_00.dump
index fb755ba282..fb755ba282 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_prompt_commands_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_prompt_commands_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_prompt_commands_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_prompt_commands_01.dump
index dcf8400c29..dcf8400c29 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_prompt_commands_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_prompt_commands_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_prompt_commands_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_prompt_commands_02.dump
index 688010a8e9..688010a8e9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_prompt_commands_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_prompt_commands_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_00.dump
index 181e58fa97..181e58fa97 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_01.dump
index 0c1907885c..0c1907885c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_02.dump
index d0df28fe25..d0df28fe25 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_03.dump
index 6efefdaada..6efefdaada 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_04.dump
index e110c12368..e110c12368 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_05.dump
index d8a7ca0723..d8a7ca0723 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_06.dump
index 4eb24b96b1..4eb24b96b1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_07.dump
index 43d833f2d3..43d833f2d3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_08.dump
index e181dd6eec..e181dd6eec 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_09.dump
index 4382132ac3..4382132ac3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_python_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_python_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_range_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_range_00.dump
index ecc0c73c62..ecc0c73c62 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_range_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_range_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_range_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_range_01.dump
index 76085289fe..76085289fe 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_range_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_range_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_range_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_range_02.dump
index acfcf5431d..acfcf5431d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_range_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_range_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_range_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_range_03.dump
index 89477a99e4..89477a99e4 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_range_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_range_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_range_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_range_04.dump
index d9869fe34b..d9869fe34b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_range_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_range_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_range_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_range_05.dump
index cadd7bbaa8..cadd7bbaa8 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_range_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_range_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_redir_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_redir_00.dump
index eae6fb50a6..eae6fb50a6 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_redir_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_redir_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_redir_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_redir_01.dump
index 64189fa903..64189fa903 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_redir_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_redir_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_redir_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_redir_02.dump
index 225197ea2f..225197ea2f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_redir_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_redir_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_redir_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_redir_03.dump
index 8e5d933924..8e5d933924 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_redir_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_redir_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_redir_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_redir_04.dump
index 0a4027adc9..0a4027adc9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_redir_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_redir_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_ruby_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_ruby_00.dump
index 14dc87e54a..14dc87e54a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_ruby_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_ruby_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_ruby_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_ruby_01.dump
index 900e1431da..900e1431da 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_ruby_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_ruby_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_ruby_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_ruby_02.dump
index aa39d8f4a7..aa39d8f4a7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_ruby_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_ruby_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_ruby_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_ruby_03.dump
index 5c68059cc7..5c68059cc7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_ruby_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_ruby_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_ruby_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_ruby_04.dump
index 2e8168ce91..2e8168ce91 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_ruby_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_ruby_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_ruby_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_ruby_05.dump
index fe494cd543..fe494cd543 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_ruby_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_ruby_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_ruby_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_ruby_06.dump
index b031e67ceb..b031e67ceb 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_ruby_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_ruby_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_ruby_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_ruby_07.dump
index 2e87ddb22a..2e87ddb22a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_ruby_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_ruby_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_ruby_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_ruby_08.dump
index 7e70c985e7..7e70c985e7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_ruby_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_ruby_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_00.dump
index 34ffa47212..34ffa47212 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_01.dump
index f927cda64c..f927cda64c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_02.dump
index f6e93228df..f6e93228df 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_03.dump
index 3c3f6b6928..3c3f6b6928 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_04.dump
index 3d9fcd20b0..3d9fcd20b0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_05.dump
index d544528364..d544528364 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_06.dump
index 5d944c371a..5d944c371a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_07.dump
index c8402b5433..c8402b5433 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_backslash_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_backslash_00.dump
index 9b7370db86..9b7370db86 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_backslash_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_backslash_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_backslash_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_backslash_01.dump
index c99a3a6f4e..c99a3a6f4e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_backslash_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_backslash_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_backslash_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_backslash_02.dump
index 4250195d6c..4250195d6c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_backslash_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_backslash_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_backslash_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_backslash_03.dump
index f0f1662db0..f0f1662db0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_backslash_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_backslash_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_backslash_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_backslash_04.dump
index 04e6eadc5d..04e6eadc5d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_set_backslash_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_set_backslash_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_sleep_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_sleep_00.dump
index 0e99c5a7cd..0e99c5a7cd 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_sleep_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_sleep_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_sort_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_sort_00.dump
index e44a78c109..e44a78c109 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_sort_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_sort_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_sort_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_sort_01.dump
index a8b105d474..a8b105d474 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_sort_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_sort_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_sort_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_sort_02.dump
index ce5dc8dea8..ce5dc8dea8 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_sort_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_sort_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_sort_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_sort_03.dump
index a5f9960652..a5f9960652 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_sort_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_sort_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_00.dump
index 08ab0b29e8..08ab0b29e8 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_01.dump
index 763a0f889e..763a0f889e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_02.dump
index 716f4af1de..716f4af1de 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_03.dump
index 036a279ff5..036a279ff5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_04.dump
index b4ea513b89..b4ea513b89 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_05.dump
index 3b6bc92f58..3b6bc92f58 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_06.dump
index 00569af72b..00569af72b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_07.dump
index 13956ce91b..13956ce91b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_08.dump
index bd1b5d0b18..bd1b5d0b18 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_09.dump
index bbe6bb3b25..bbe6bb3b25 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_10.dump
index c04abd2691..c04abd2691 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_11.dump
index 7c6405238e..7c6405238e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_substitute_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_substitute_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_00.dump
index c350e5fb9b..c350e5fb9b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_01.dump
index f55f9875aa..f55f9875aa 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_02.dump
index 2253a0258b..2253a0258b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_03.dump
index cef4588620..cef4588620 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_04.dump
index 0825ee3356..0825ee3356 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_05.dump
index 57afb7816a..57afb7816a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_06.dump
index 67ba95814c..67ba95814c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_07.dump
index 696f88cb07..696f88cb07 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_08.dump
index 156ff01e59..156ff01e59 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_09.dump
index a7ed5c811e..a7ed5c811e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_10.dump
index 7031132d74..7031132d74 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_11.dump
index c14f06636a..c14f06636a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_12.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_12.dump
index 28a905a8f8..28a905a8f8 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_12.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_12.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_13.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_13.dump
index e828336806..e828336806 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_13.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_13.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_14.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_14.dump
index f648fee758..f648fee758 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_14.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_14.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_15.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_15.dump
index 6945ec2c62..6945ec2c62 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_15.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_15.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_16.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_16.dump
index 3d1a002d69..3d1a002d69 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_16.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_16.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_17.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_17.dump
index c923c00d45..c923c00d45 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_17.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_17.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_18.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_18.dump
index 605dc0cba1..605dc0cba1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_18.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_18.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_19.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_19.dump
index 3dbd5826bf..3dbd5826bf 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_19.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_19.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_20.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_20.dump
index e05dc99127..e05dc99127 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_20.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_20.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_21.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_21.dump
index e0746ea9d6..e0746ea9d6 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntax_21.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntax_21.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntime_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntime_00.dump
index cb145648f8..cb145648f8 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntime_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntime_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntime_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntime_01.dump
index 732b2e7673..732b2e7673 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntime_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntime_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntime_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntime_02.dump
index 3badec4e5b..3badec4e5b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_syntime_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_syntime_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_tcl_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_tcl_00.dump
index 958ae82dff..958ae82dff 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_tcl_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_tcl_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_tcl_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_tcl_01.dump
index 900e1431da..900e1431da 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_tcl_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_tcl_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_tcl_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_tcl_02.dump
index aa39d8f4a7..aa39d8f4a7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_tcl_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_tcl_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_tcl_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_tcl_03.dump
index 5c68059cc7..5c68059cc7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_tcl_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_tcl_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_tcl_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_tcl_04.dump
index 2e8168ce91..2e8168ce91 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_tcl_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_tcl_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_tcl_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_tcl_05.dump
index fe494cd543..fe494cd543 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_tcl_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_tcl_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_tcl_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_tcl_06.dump
index b031e67ceb..b031e67ceb 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_tcl_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_tcl_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_tcl_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_tcl_07.dump
index 307376941f..307376941f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_tcl_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_tcl_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_tcl_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_tcl_08.dump
index 3a29c20b0b..3a29c20b0b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_tcl_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_tcl_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_terminal_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_terminal_00.dump
index 52ce080878..52ce080878 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_terminal_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_terminal_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_terminal_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_terminal_01.dump
index 2058a78942..2058a78942 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_terminal_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_terminal_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_terminal_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_terminal_02.dump
index 1ed13e510d..1ed13e510d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_terminal_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_terminal_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_terminal_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_terminal_03.dump
index 4701fa3d7a..4701fa3d7a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_terminal_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_terminal_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_terminal_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_terminal_04.dump
index 0609af5aa7..0609af5aa7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_terminal_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_terminal_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_throw_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_throw_00.dump
index a596aed7c9..a596aed7c9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_throw_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_throw_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_uniq_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_uniq_00.dump
index 146ff038ca..146ff038ca 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_uniq_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_uniq_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_uniq_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_uniq_01.dump
index 5489eaa152..5489eaa152 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_uniq_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_uniq_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_wincmd_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_wincmd_00.dump
index f2e33d0d08..f2e33d0d08 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_wincmd_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_wincmd_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_wincmd_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_wincmd_01.dump
index e5daa83466..e5daa83466 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_wincmd_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_wincmd_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_wincmd_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_wincmd_02.dump
index fe6b8552e1..fe6b8552e1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_wincmd_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_wincmd_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_ex_wincmd_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_ex_wincmd_03.dump
index af7faa3e64..af7faa3e64 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_ex_wincmd_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_ex_wincmd_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_00.dump
index 91fa0f54f6..91fa0f54f6 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_01.dump
index b111646c71..b111646c71 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_02.dump
index 89d199ad81..89d199ad81 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_03.dump
index e625a05fca..e625a05fca 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_04.dump
index 728e47ca6d..728e47ca6d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_05.dump
index a57b1c8103..a57b1c8103 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_06.dump
index 81e340dea2..81e340dea2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_07.dump
index 428a2ede18..428a2ede18 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_08.dump
index 95dd9099ad..95dd9099ad 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_09.dump
index 2063012d61..2063012d61 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_10.dump
index a17403edce..a17403edce 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_11.dump
index 38e9322184..38e9322184 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_12.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_12.dump
index cb1099b7e9..cb1099b7e9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_12.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_12.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_13.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_13.dump
index 1cd89fdf89..1cd89fdf89 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_13.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_13.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_14.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_14.dump
index 59727033bc..59727033bc 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_14.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_14.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_15.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_15.dump
index ffafa54201..ffafa54201 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_15.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_15.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_16.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_16.dump
index 398b2b8ca3..398b2b8ca3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_16.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_16.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_17.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_17.dump
index 65b6b11223..65b6b11223 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_17.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_17.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_18.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_18.dump
index dd8c961389..dd8c961389 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_18.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_18.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_19.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_19.dump
index 05e9989d95..05e9989d95 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_19.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_19.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_20.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_20.dump
index 1a9b6a6a00..1a9b6a6a00 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_20.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_20.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_21.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_21.dump
index e49a5b752c..e49a5b752c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_21.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_21.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_22.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_22.dump
index 0e5d818fac..0e5d818fac 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_22.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_22.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_23.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_23.dump
index 19fb9a4238..19fb9a4238 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_23.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_23.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_expressions_24.dump b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_24.dump
index 6231d525cc..6231d525cc 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_expressions_24.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_expressions_24.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_00.dump
index 68d1ec63a1..68d1ec63a1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_01.dump
index 05ba8237b0..05ba8237b0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_02.dump
index 9de7ceebbf..9de7ceebbf 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_03.dump
index 20e4ecffa7..20e4ecffa7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_04.dump
index 0b24a8ebdf..0b24a8ebdf 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_05.dump
index ae5ffb84d4..ae5ffb84d4 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_06.dump
index 40b1322990..40b1322990 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_07.dump
index 8e4c2494bf..8e4c2494bf 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_08.dump
index 882b3258df..882b3258df 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_09.dump
index 207e4efcc1..207e4efcc1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_10.dump
index c385765365..c385765365 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_11.dump
index 09576638a1..09576638a1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_12.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_12.dump
index e4a47d3831..e4a47d3831 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_12.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_12.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_13.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_13.dump
index 6ad6d7d0a9..6ad6d7d0a9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_13.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_13.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_14.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_14.dump
index b5d23c07fe..b5d23c07fe 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_14.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_14.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_15.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_15.dump
index 50bf79772f..50bf79772f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_calls_15.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_calls_15.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_00.dump
index fc69801f61..fc69801f61 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_01.dump
index fd296bc039..fd296bc039 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_02.dump
index a06d1aa3b9..a06d1aa3b9 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_03.dump
index 3dcc8e7170..3dcc8e7170 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_04.dump
index d33a29da62..d33a29da62 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_05.dump
index 88e95928d5..88e95928d5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_06.dump
index cde39acfb7..cde39acfb7 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_07.dump
index b114753a03..b114753a03 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_08.dump
index 5c74c14aa2..5c74c14aa2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_09.dump
index 2d3d20fe19..2d3d20fe19 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_10.dump
index 338836f681..338836f681 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_11.dump
index 6e2e0519aa..6e2e0519aa 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_12.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_12.dump
index 0e972533da..0e972533da 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_12.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_12.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_13.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_13.dump
index cf9f6cc8ed..cf9f6cc8ed 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_13.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_13.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_14.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_14.dump
index c4d5265aaa..c4d5265aaa 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_14.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_14.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_15.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_15.dump
index 663c073c1d..663c073c1d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_15.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_15.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_16.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_16.dump
index 816d15ccb0..816d15ccb0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_16.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_16.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_17.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_17.dump
index 139a557165..139a557165 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_17.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_17.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_18.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_18.dump
index 05464652d5..05464652d5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_18.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_18.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_19.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_19.dump
index b6c1b12216..b6c1b12216 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_19.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_19.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_20.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_20.dump
index 05682bce4c..05682bce4c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_20.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_20.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_21.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_21.dump
index 3cbed5db1f..3cbed5db1f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_21.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_21.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_22.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_22.dump
index ae22145f14..ae22145f14 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_22.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_22.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_23.dump b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_23.dump
index 160b7b5ede..160b7b5ede 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_function_variables_23.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_function_variables_23.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_00.dump
index a6cd90a18e..a6cd90a18e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_01.dump
index 46c4c926f2..46c4c926f2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_02.dump
index 87a6258d89..87a6258d89 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_03.dump
index 484a0c3e5d..484a0c3e5d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_04.dump
index f852d6fee4..f852d6fee4 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_05.dump
index 4a85d5e010..4a85d5e010 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_06.dump
index 008f04fd36..008f04fd36 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_07.dump
index 8bec3fe58e..8bec3fe58e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_08.dump
index 70a7ff8408..70a7ff8408 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_09.dump
index 156de87e1c..156de87e1c 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_key_notation_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_key_notation_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_lambdas_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_lambdas_00.dump
index 5d365c3f3f..5d365c3f3f 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_lambdas_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_lambdas_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_lambdas_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_lambdas_01.dump
index 4de33e5fdd..4de33e5fdd 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_lambdas_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_lambdas_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_lambdas_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_lambdas_02.dump
index f930e1dfe4..f930e1dfe4 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_lambdas_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_lambdas_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_lambdas_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_lambdas_03.dump
index 297288d21b..297288d21b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_lambdas_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_lambdas_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_lambdas_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_lambdas_04.dump
index 38b3ad0205..38b3ad0205 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_lambdas_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_lambdas_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_lambdas_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_lambdas_05.dump
index b588e334f3..b588e334f3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_lambdas_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_lambdas_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_lambdas_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_lambdas_06.dump
index 5e9b19e770..5e9b19e770 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_lambdas_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_lambdas_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_lambdas_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_lambdas_07.dump
index a8f4162b54..a8f4162b54 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_lambdas_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_lambdas_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_line_continuation_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_line_continuation_00.dump
index b9fd0ad5fe..b9fd0ad5fe 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_line_continuation_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_line_continuation_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_line_continuation_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_line_continuation_01.dump
index 11577d8de2..11577d8de2 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_line_continuation_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_line_continuation_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_line_continuation_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_line_continuation_02.dump
index 23b5388a9e..23b5388a9e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_line_continuation_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_line_continuation_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_line_continuation_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_line_continuation_03.dump
index 9ff096f479..9ff096f479 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_line_continuation_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_line_continuation_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_new_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_new_00.dump
index 511a5f9552..511a5f9552 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_new_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_new_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_new_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_new_01.dump
index 06651c4734..06651c4734 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_new_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_new_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_00.dump
index eb0e402765..eb0e402765 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_01.dump
index 834941044b..834941044b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_02.dump
index fe5afce6fd..fe5afce6fd 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_03.dump
index 3b3a4fc657..3b3a4fc657 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_04.dump
index 372d91cb72..372d91cb72 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_05.dump
index bdb3d147c0..bdb3d147c0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_06.dump
index 713a60e1db..713a60e1db 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_07.dump
index 38ba63c4b1..38ba63c4b1 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_08.dump
index f453d1f93a..f453d1f93a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_09.dump
index 2e170fe20a..2e170fe20a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_10.dump
index 84d342c51d..84d342c51d 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_11.dump
index 22bc66747a..22bc66747a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_12.dump b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_12.dump
index d5033fb36e..d5033fb36e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_nvim_features_12.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_nmnv_features_12.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_no_comment_strings_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_no_comment_strings_00.dump
index acb0a2e698..acb0a2e698 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_no_comment_strings_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_no_comment_strings_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_no_comment_strings_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_no_comment_strings_01.dump
index 6b22d4113b..6b22d4113b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_no_comment_strings_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_no_comment_strings_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_predefined_user_commands_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_predefined_user_commands_00.dump
index 8d0e81c230..8d0e81c230 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_predefined_user_commands_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_predefined_user_commands_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_predefined_user_commands_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_predefined_user_commands_01.dump
index 39475638f0..39475638f0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_predefined_user_commands_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_predefined_user_commands_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_shebang_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_shebang_00.dump
index ffb7bafa08..ffb7bafa08 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_shebang_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_shebang_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_00.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_00.dump
index b06b1497c0..b06b1497c0 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_00.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_00.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_01.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_01.dump
index 2d0f659031..2d0f659031 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_01.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_01.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_02.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_02.dump
index fac2cbf866..fac2cbf866 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_02.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_02.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_03.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_03.dump
index cf025188cd..cf025188cd 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_03.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_03.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_04.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_04.dump
index b633655bac..b633655bac 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_04.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_04.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_05.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_05.dump
index 0a11e8d22a..0a11e8d22a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_05.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_05.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_06.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_06.dump
index 031115c191..031115c191 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_06.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_06.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_07.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_07.dump
index a8219d9829..a8219d9829 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_07.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_07.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_08.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_08.dump
index 5ca7f0d364..5ca7f0d364 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_08.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_08.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_09.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_09.dump
index 737a044c63..737a044c63 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_09.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_09.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_10.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_10.dump
index d7a7d46d4b..d7a7d46d4b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_10.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_10.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_11.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_11.dump
index 042f712354..042f712354 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_11.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_11.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_12.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_12.dump
index d2acc484d5..d2acc484d5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_12.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_12.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_13.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_13.dump
index 11593c5d7e..11593c5d7e 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_13.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_13.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_14.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_14.dump
index e85091b1d8..e85091b1d8 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_14.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_14.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_15.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_15.dump
index 567fd59df5..567fd59df5 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_15.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_15.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_16.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_16.dump
index 5a4618c68b..5a4618c68b 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_16.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_16.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_17.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_17.dump
index 2a49205a91..2a49205a91 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_17.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_17.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_18.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_18.dump
index 4e6913502a..4e6913502a 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_18.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_18.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_19.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_19.dump
index 5510ea6406..5510ea6406 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_19.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_19.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_20.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_20.dump
index 2b1c0c7e30..2b1c0c7e30 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_20.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_20.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_21.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_21.dump
index a721556daf..a721556daf 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_21.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_21.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_22.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_22.dump
index 48956348b3..48956348b3 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_22.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_22.dump
diff --git a/uvim/runtime/syntax/testdir/dumps/vim_variables_23.dump b/uvim/runtime/syntax/testdir/dumps/mnv_variables_23.dump
index a8897b5ad8..a8897b5ad8 100644
--- a/uvim/runtime/syntax/testdir/dumps/vim_variables_23.dump
+++ b/uvim/runtime/syntax/testdir/dumps/mnv_variables_23.dump
diff --git a/uvim/runtime/syntax/testdir/ftplugin/java.vim b/uvim/runtime/syntax/testdir/ftplugin/java.mnv
index da198e18e7..da198e18e7 100644
--- a/uvim/runtime/syntax/testdir/ftplugin/java.vim
+++ b/uvim/runtime/syntax/testdir/ftplugin/java.mnv
diff --git a/uvim/runtime/syntax/testdir/input/c.c b/uvim/runtime/syntax/testdir/input/c.c
index 595721b0a5..52336cd034 100644
--- a/uvim/runtime/syntax/testdir/input/c.c
+++ b/uvim/runtime/syntax/testdir/input/c.c
@@ -1,15 +1,15 @@
 /* vi:set ts=8 sts=4 sw=4 noet:
- * VIM_TEST_SETUP let g:c_comment_strings = 1
+ * MNV_TEST_SETUP let g:c_comment_strings = 1
  *
- * VIM - Vi IMproved	by Bram Moolenaar
+ * MNV - MNV is not Vim	by Bram Moolenaar
  *
- * Do ":help uganda"  in Vim to read copying and usage conditions.
- * Do ":help credits" in Vim to see a list of people who contributed.
- * See README.txt for an overview of the Vim source code.
+ * Do ":help uganda"  in MNV to read copying and usage conditions.
+ * Do ":help credits" in MNV to see a list of people who contributed.
+ * See README.txt for an overview of the MNV source code.
  */
 
 #define EXTERN
-#include "vim.h"
+#include "mnv.h"
 
 #ifdef __CYGWIN__
 # include <cygwin/version.h>
@@ -18,7 +18,7 @@
 # include <limits.h>
 #endif
 
-#if defined(MSWIN) && (!defined(FEAT_GUI_MSWIN) || defined(VIMDLL))
+#if defined(MSWIN) && (!defined(FEAT_GUI_MSWIN) || defined(MNVDLL))
 # include "iscygpty.h"
 #endif
 
@@ -29,12 +29,12 @@
 #define EDIT_TAG    3	    // tag name argument given, use tagname
 #define EDIT_QF	    4	    // start in quickfix mode
 
-#if (defined(UNIX) || defined(VMS)) && !defined(NO_VIM_MAIN)
+#if (defined(UNIX) || defined(VMS)) && !defined(NO_MNV_MAIN)
 static int file_owned(char *fname);
 #endif
 static void mainerr(int, char_u *);
 static void early_arg_scan(mparm_T *parmp);
-#ifndef NO_VIM_MAIN
+#ifndef NO_MNV_MAIN
 static void usage(void);
 static void parse_command_name(mparm_T *parmp);
 static void command_line_scan(mparm_T *parmp);
@@ -81,18 +81,18 @@ static mparm_T	params;
 static void *s_vbuf = NULL;		// buffer for setvbuf()
 #endif
 
-#ifndef NO_VIM_MAIN	// skip this for unittests
+#ifndef NO_MNV_MAIN	// skip this for unittests
 
 static char_u *start_dir = NULL;	// current working dir on startup
 
 static int has_dash_c_arg = FALSE;
 
-# ifdef VIMDLL
+# ifdef MNVDLL
 __declspec(dllexport)
 # endif
     int
 # ifdef MSWIN
-VimMain
+MNVMain
 # else
 main
 # endif
@@ -118,6 +118,6 @@ main
      */
     return mzscheme_main();
 #else
-    return vim_main2();
+    return mnv_main2();
 #endif
 }
diff --git a/uvim/runtime/syntax/testdir/input/codeowners.txt b/uvim/runtime/syntax/testdir/input/codeowners.txt
index e72a77035f..c2fb96cb2d 100644
--- a/uvim/runtime/syntax/testdir/input/codeowners.txt
+++ b/uvim/runtime/syntax/testdir/input/codeowners.txt
@@ -9,4 +9,4 @@
 docs/*	docs@example.com @other
 **/logs @octocat
 
-# vim: set ft=codeowners:
+# mnv: set ft=codeowners:
diff --git a/uvim/runtime/syntax/testdir/input/cpp_noreturn.cpp b/uvim/runtime/syntax/testdir/input/cpp_noreturn.cpp
index 9c50dea2ec..b4457e055e 100644
--- a/uvim/runtime/syntax/testdir/input/cpp_noreturn.cpp
+++ b/uvim/runtime/syntax/testdir/input/cpp_noreturn.cpp
@@ -1,6 +1,6 @@
 // C++ attributes - noreturn (since C++11)
 
-// Source: https://en.cppreference.com/w/c/language/noreturn.html [modified by Vim Project]
+// Source: https://en.cppreference.com/w/c/language/noreturn.html [modified by MNV Project]
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/uvim/runtime/syntax/testdir/input/csh.csh b/uvim/runtime/syntax/testdir/input/csh.csh
index 332b626e52..1dfc1fd296 100644
--- a/uvim/runtime/syntax/testdir/input/csh.csh
+++ b/uvim/runtime/syntax/testdir/input/csh.csh
@@ -1,4 +1,4 @@
-# https://github.com/vim/vim/pull/19172#issuecomment-3751574224
+# https://github.com/Project-Tick/Project-Tick/pull/19172#issuecomment-3751574224
 
 set script_dir="" #comment
 set script_dir=""
diff --git a/uvim/runtime/syntax/testdir/input/gdb_multiline_commands.gdb b/uvim/runtime/syntax/testdir/input/gdb_multiline_commands.gdb
index 747d5d4c44..6738921d9a 100644
--- a/uvim/runtime/syntax/testdir/input/gdb_multiline_commands.gdb
+++ b/uvim/runtime/syntax/testdir/input/gdb_multiline_commands.gdb
@@ -1,5 +1,5 @@
 # GDB multiline commands
-# VIM_TEST_SETUP setl fdc=2 fdl=999 fdm=syntax
+# MNV_TEST_SETUP setl fdc=2 fdl=999 fdm=syntax
 
 define hello
   echo Hello, world!\n
diff --git a/uvim/runtime/syntax/testdir/input/help.txt b/uvim/runtime/syntax/testdir/input/help.txt
index 2338bbcc94..d7eb03271f 100644
--- a/uvim/runtime/syntax/testdir/input/help.txt
+++ b/uvim/runtime/syntax/testdir/input/help.txt
@@ -1,21 +1,21 @@
 
 
-		  VIM REFERENCE MANUAL	  by Bram Moolenaar
+		  MNV REFERENCE MANUAL	  by Bram Moolenaar
 					  and Somebody Else
 					  and Another Person
 
 
-		  VIM USER MANUAL	  by Bram Moolenaar
+		  MNV USER MANUAL	  by Bram Moolenaar
 					  and Somebody Else
 					  and Another Person
 
 
-VIM HELP FILE FORMAT
+MNV HELP FILE FORMAT
 
 
-Issue #17721 (Strange >vim highlighting in help documentation?)~
+Issue #17721 (Strange >mnv highlighting in help documentation?)~
 
-				*restore-cursor* *last-position-jump*  >vim
+				*restore-cursor* *last-position-jump*  >mnv
     augroup RestoreCursor
       autocmd!
       autocmd BufReadPost *
@@ -37,25 +37,25 @@ recommended style (https://ziglang.org/documentation/master/): >
 
 NOTE, WARNING and DEPRECATED~
 
-When you 'send a file to Vim', Vim changes to that file's directory.  Note,
+When you 'send a file to MNV', MNV changes to that file's directory.  Note,
 however, that any long directory names will appear in their short (MS-DOS)
 form on some Windows versions.  This is a limitation of the Windows "Send To"
 mechanism.
 
 
 EXAMPLE LANGUAGES~
-							*vim9-mix*
-There is one way to use both legacy and Vim9 syntax in one script file: >vim9
+							*mnv9-mix*
+There is one way to use both legacy and MNV9 syntax in one script file: >mnv9
 
-	" legacy Vim script comments may go here
-	if !has('vim9script')
-	   " legacy Vim script commands go here
+	" legacy MNV script comments may go here
+	if !has('mnv9script')
+	   " legacy MNV script commands go here
 	   finish
 	endif
-	vim9script
-	# Vim9 script commands go here
+	mnv9script
+	# MNV9 script commands go here
 
-This allows for writing a script that takes advantage of the Vim9 script
-syntax if possible, but will also work on a Vim version without it.
+This allows for writing a script that takes advantage of the MNV9 script
+syntax if possible, but will also work on a MNV version without it.
 
- vim:tw=78:ts=8:noet:ft=help:norl:
+ mnv:tw=78:ts=8:noet:ft=help:norl:
diff --git a/uvim/runtime/syntax/testdir/input/help_ex_version.txt b/uvim/runtime/syntax/testdir/input/help_ex_version.txt
index 0333abfde0..474e1800f8 100644
--- a/uvim/runtime/syntax/testdir/input/help_ex_version.txt
+++ b/uvim/runtime/syntax/testdir/input/help_ex_version.txt
@@ -6,10 +6,10 @@
 			date is mentioned.  Otherwise a fixed release-date is
 			shown.
 			The following lines contain information about which
-			features were enabled when Vim was compiled.  When
+			features were enabled when MNV was compiled.  When
 			there is a preceding '+', the feature is included,
 			when there is a '-' it is excluded.  To change this,
-			you have to edit feature.h and recompile Vim.
+			you have to edit feature.h and recompile MNV.
 			To check for this in an expression, see |has()|.
 			Here is an overview of the features.
 			The first column shows the smallest version in which
@@ -21,7 +21,7 @@
 			   -    never, feature was removed
 			 (none) system dependent
 			Thus if a feature is marked with "N", it is included
-			in the normal and huge versions of Vim.
+			in the normal and huge versions of MNV.
 
 							*+feature-list*
    *+acl*		|ACL| support included
@@ -69,13 +69,13 @@ m  *+debug*		Compiled for debugging.
 N  *+dialog_gui*	Support for |:confirm| with GUI dialog.
 N  *+dialog_con*	Support for |:confirm| with console dialog.
 N  *+dialog_con_gui*	Support for |:confirm| with GUI and console dialog.
-N  *+diff*		|vimdiff| and 'diff'
+N  *+diff*		|mnvdiff| and 'diff'
 N  *+digraphs*		|digraphs| *E196*
    *+directx*		Win32 GUI only: DirectX and 'renderoptions'
    *+dnd*		Support for DnD into the "~ register |quote_~|.
 H  *+emacs_tags*	|emacs-tags| files
 N  *+eval*		expression evaluation |eval.txt|
-T  *+ex_extra*		always on now, used to be for Vim's extra Ex commands
+T  *+ex_extra*		always on now, used to be for MNV's extra Ex commands
 N  *+extra_search*	'hlsearch' and 'incsearch' options.
 -  *+farsi*		Removed: |farsi| language
 T  *+file_in_path*	|gf|, |CTRL-W_f| and |<cfile>|  Always enabled since
@@ -105,7 +105,7 @@ H  *+langmap*		'langmap'
 N  *+libcall*		|libcall()|
 N  *+linebreak*		'linebreak', 'breakat' and 'showbreak'
 T  *+lispindent*	'lisp'
-T  *+listcmds*		Vim commands for the list of buffers |buffer-hidden|
+T  *+listcmds*		MNV commands for the list of buffers |buffer-hidden|
 			and argument list |:argdelete|
 T  *+localmap*		Support for mappings local to a buffer |:map-local|
 m  *+lua*		|Lua| interface
@@ -194,8 +194,8 @@ T  *+user_commands*	User-defined commands. |user-commands|
 H  *+vartabs*		Variable-width tab stops. 'vartabstop'
 T  *+vertsplit*		Vertically split windows |:vsplit|; Always enabled
 			since 8.0.1118.
-T  *+vim9script*	|Vim9| script
-N  *+viminfo*		'viminfo'
+T  *+mnv9script*	|MNV9| script
+N  *+mnvinfo*		'mnvinfo'
 T  *+virtualedit*	'virtualedit' Always enabled since 8.1.826.
 T  *+visual*		Visual mode |Visual-mode| Always enabled since 7.4.200.
 T  *+visualextra*	extra Visual mode commands |blockwise-operators|
@@ -227,7 +227,7 @@ N  *+X11*		Unix only: can restore window title |X11|
 			be dynamically loaded.
 
 :ve[rsion] {nr}		Is now ignored.  This was previously used to check the
-			version number of a .vimrc file.  It was removed,
+			version number of a .mnvrc file.  It was removed,
 			because you can now use the ":if" command for
 			version-dependent behavior.
 
@@ -235,4 +235,4 @@ N  *+X11*		Unix only: can restore window title |X11|
 :redi[r][!] > {file}	Redirect messages to file {file}.  The messages which
 
 
- vim:tw=78:ts=8:noet:ft=help:norl:
+ mnv:tw=78:ts=8:noet:ft=help:norl:
diff --git a/uvim/runtime/syntax/testdir/input/html.html b/uvim/runtime/syntax/testdir/input/html.html
index a4d0eb5d8f..4a9b7a471d 100644
--- a/uvim/runtime/syntax/testdir/input/html.html
+++ b/uvim/runtime/syntax/testdir/input/html.html
@@ -2,7 +2,7 @@
   HTML Syntax Test File
   Maintainer: Doug Kearns <dougkearns@gmail.com>
   Last Change: 2024 Jun 13
-  VIM_TEST_SETUP let g:html_no_rendering = 1
+  MNV_TEST_SETUP let g:html_no_rendering = 1
 
   TODO: Investigate macOS test failures when comparing italicized text with,
     for example, <em> and <i> elements.  FreeBSD fails with an empty <strike>
diff --git a/uvim/runtime/syntax/testdir/input/html_fold_expr.html b/uvim/runtime/syntax/testdir/input/html_fold_expr.html
index f85e7fa003..81be6463a7 100644
--- a/uvim/runtime/syntax/testdir/input/html_fold_expr.html
+++ b/uvim/runtime/syntax/testdir/input/html_fold_expr.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
-VIM_TEST_SETUP setlocal foldcolumn=8 foldlevel=8 foldmethod=expr
+MNV_TEST_SETUP setlocal foldcolumn=8 foldlevel=8 foldmethod=expr
 
 
 
diff --git a/uvim/runtime/syntax/testdir/input/html_fold_syntax.html b/uvim/runtime/syntax/testdir/input/html_fold_syntax.html
index 73579aa9a9..6be4ccb9a6 100644
--- a/uvim/runtime/syntax/testdir/input/html_fold_syntax.html
+++ b/uvim/runtime/syntax/testdir/input/html_fold_syntax.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <!--
-VIM_TEST_SETUP let g:html_syntax_folding = 1
-VIM_TEST_SETUP setlocal foldcolumn=8 foldlevel=8 foldmethod=syntax
+MNV_TEST_SETUP let g:html_syntax_folding = 1
+MNV_TEST_SETUP setlocal foldcolumn=8 foldlevel=8 foldmethod=syntax
 
 
 -->
diff --git a/uvim/runtime/syntax/testdir/input/java_annotations.java b/uvim/runtime/syntax/testdir/input/java_annotations.java
index c5871c3c8d..969f3b3be5 100644
--- a/uvim/runtime/syntax/testdir/input/java_annotations.java
+++ b/uvim/runtime/syntax/testdir/input/java_annotations.java
@@ -1,4 +1,4 @@
-// VIM_TEST_SETUP let g:java_highlight_functions = 'style'
+// MNV_TEST_SETUP let g:java_highlight_functions = 'style'
 
 
 import java.lang.annotation.ElementType;
diff --git a/uvim/runtime/syntax/testdir/input/java_annotations_signature.java b/uvim/runtime/syntax/testdir/input/java_annotations_signature.java
index 8236218550..c85732a704 100644
--- a/uvim/runtime/syntax/testdir/input/java_annotations_signature.java
+++ b/uvim/runtime/syntax/testdir/input/java_annotations_signature.java
@@ -1,5 +1,5 @@
-// VIM_TEST_SETUP let g:java_highlight_functions = 'style'
-// VIM_TEST_SETUP let g:java_highlight_signature = 1
+// MNV_TEST_SETUP let g:java_highlight_functions = 'style'
+// MNV_TEST_SETUP let g:java_highlight_signature = 1
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
diff --git a/uvim/runtime/syntax/testdir/input/java_comments_html.java b/uvim/runtime/syntax/testdir/input/java_comments_html.java
index 74e0e1515f..6951344443 100644
--- a/uvim/runtime/syntax/testdir/input/java_comments_html.java
+++ b/uvim/runtime/syntax/testdir/input/java_comments_html.java
@@ -1,16 +1,16 @@
-// VIM_TEST_SETUP unlet! g:java_no_tab_space_error g:java_ignore_javadoc
-// VIM_TEST_SETUP unlet! g:java_no_trail_space_error
-// VIM_TEST_SETUP unlet! g:java_consent_to_html_syntax_folding
-// VIM_TEST_SETUP let[g:java_space_errors,g:java_comment_strings]=[1,1]
-// VIM_TEST_SETUP let[g:java_ignore_markdown,g:html_syntax_folding]=[1,1]
-// VIM_TEST_SETUP let g:markdown_fenced_languages = ["java"]
+// MNV_TEST_SETUP unlet! g:java_no_tab_space_error g:java_ignore_javadoc
+// MNV_TEST_SETUP unlet! g:java_no_trail_space_error
+// MNV_TEST_SETUP unlet! g:java_consent_to_html_syntax_folding
+// MNV_TEST_SETUP let[g:java_space_errors,g:java_comment_strings]=[1,1]
+// MNV_TEST_SETUP let[g:java_ignore_markdown,g:html_syntax_folding]=[1,1]
+// MNV_TEST_SETUP let g:markdown_fenced_languages = ["java"]
 
 
 
 
-// VIM_TEST_SETUP setlocal spell fdc=2 fdl=64 fdm=syntax fen
-// VIM_TEST_SETUP highlight link javaCommentStart Todo
-// VIM_TEST_SETUP highlight link javaCommentTitle Underlined
+// MNV_TEST_SETUP setlocal spell fdc=2 fdl=64 fdm=syntax fen
+// MNV_TEST_SETUP highlight link javaCommentStart Todo
+// MNV_TEST_SETUP highlight link javaCommentTitle Underlined
 
 
 
diff --git a/uvim/runtime/syntax/testdir/input/java_comments_markdown.java b/uvim/runtime/syntax/testdir/input/java_comments_markdown.java
index c6be7312b0..1e4d56e529 100644
--- a/uvim/runtime/syntax/testdir/input/java_comments_markdown.java
+++ b/uvim/runtime/syntax/testdir/input/java_comments_markdown.java
@@ -1,18 +1,18 @@
-// VIM_TEST_SETUP unlet! g:java_no_tab_space_error g:java_ignore_javadoc
-// VIM_TEST_SETUP unlet! g:java_no_trail_space_error
-// VIM_TEST_SETUP let[g:java_space_errors,g:java_comment_strings]=[1,1]
-// VIM_TEST_SETUP let[g:java_ignore_html,g:markdown_syntax_conceal]=[1,1]
-// VIM_TEST_SETUP let g:html_syntax_folding = 1
-// VIM_TEST_SETUP let g:java_consent_to_html_syntax_folding = 1
-// VIM_TEST_SETUP let g:markdown_fenced_languages = ["java"]
-
-
-// VIM_TEST_SETUP defer execute('match Visual /\%>21l\s\+$/')
-// VIM_TEST_SETUP setl spell fdc=2 fdl=64 fdm=syntax fen cole=3 cocu=n
-// VIM_TEST_SETUP highlight link javaCommentStart Todo
-// VIM_TEST_SETUP highlight link javaMarkdownCommentTitle Underlined
-// VIM_TEST_SETUP highlight link markdownH2 NonText
-// VIM_TEST_SETUP highlight link markdownHeadingRule NonText
+// MNV_TEST_SETUP unlet! g:java_no_tab_space_error g:java_ignore_javadoc
+// MNV_TEST_SETUP unlet! g:java_no_trail_space_error
+// MNV_TEST_SETUP let[g:java_space_errors,g:java_comment_strings]=[1,1]
+// MNV_TEST_SETUP let[g:java_ignore_html,g:markdown_syntax_conceal]=[1,1]
+// MNV_TEST_SETUP let g:html_syntax_folding = 1
+// MNV_TEST_SETUP let g:java_consent_to_html_syntax_folding = 1
+// MNV_TEST_SETUP let g:markdown_fenced_languages = ["java"]
+
+
+// MNV_TEST_SETUP defer execute('match Visual /\%>21l\s\+$/')
+// MNV_TEST_SETUP setl spell fdc=2 fdl=64 fdm=syntax fen cole=3 cocu=n
+// MNV_TEST_SETUP highlight link javaCommentStart Todo
+// MNV_TEST_SETUP highlight link javaMarkdownCommentTitle Underlined
+// MNV_TEST_SETUP highlight link markdownH2 NonText
+// MNV_TEST_SETUP highlight link markdownHeadingRule NonText
 
 
 
diff --git a/uvim/runtime/syntax/testdir/input/java_contextual_keywords.java b/uvim/runtime/syntax/testdir/input/java_contextual_keywords.java
index c38854d31f..af1377cf2f 100644
--- a/uvim/runtime/syntax/testdir/input/java_contextual_keywords.java
+++ b/uvim/runtime/syntax/testdir/input/java_contextual_keywords.java
@@ -1,4 +1,4 @@
-// VIM_TEST_SETUP highlight link javaConceptKind NonText
+// MNV_TEST_SETUP highlight link javaConceptKind NonText
 
 
 
diff --git a/uvim/runtime/syntax/testdir/input/java_enfoldment.java b/uvim/runtime/syntax/testdir/input/java_enfoldment.java
index ecf763905f..3afeaaec69 100644
--- a/uvim/runtime/syntax/testdir/input/java_enfoldment.java
+++ b/uvim/runtime/syntax/testdir/input/java_enfoldment.java
@@ -1,15 +1,15 @@
-// VIM_TEST_SETUP setlocal fen fdc=2 fdl=8 fdm=syntax
-// VIM_TEST_SETUP let g:java_foldtext_show_first_or_second_line = 1
-// VIM_TEST_SETUP let g:java_highlight_java_lang = 1
-// VIM_TEST_SETUP let g:java_ignore_folding = "x"
-// VIM_TEST_SETUP let g:java_lookbehind_byte_counts = {'javaBlock': -1}
+// MNV_TEST_SETUP setlocal fen fdc=2 fdl=8 fdm=syntax
+// MNV_TEST_SETUP let g:java_foldtext_show_first_or_second_line = 1
+// MNV_TEST_SETUP let g:java_highlight_java_lang = 1
+// MNV_TEST_SETUP let g:java_ignore_folding = "x"
+// MNV_TEST_SETUP let g:java_lookbehind_byte_counts = {'javaBlock': -1}
 
 
 
 
 
-// VIM_TEST_SETUP highlight link javaBlockOtherStart Structure
-// VIM_TEST_SETUP highlight link javaBlockStart Todo
+// MNV_TEST_SETUP highlight link javaBlockOtherStart Structure
+// MNV_TEST_SETUP highlight link javaBlockStart Todo
 
 
 
diff --git a/uvim/runtime/syntax/testdir/input/java_generics.java b/uvim/runtime/syntax/testdir/input/java_generics.java
index 35f978e0ae..4dc760c6ec 100644
--- a/uvim/runtime/syntax/testdir/input/java_generics.java
+++ b/uvim/runtime/syntax/testdir/input/java_generics.java
@@ -1,11 +1,11 @@
-// VIM_TEST_SETUP let g:java_highlight_functions = 'style'
-// VIM_TEST_SETUP let g:java_highlight_generics = 1
-// VIM_TEST_SETUP let g:java_highlight_java_lang = 1
+// MNV_TEST_SETUP let g:java_highlight_functions = 'style'
+// MNV_TEST_SETUP let g:java_highlight_generics = 1
+// MNV_TEST_SETUP let g:java_highlight_java_lang = 1
 
 
-// VIM_TEST_SETUP hi link javaGenericsC1 Todo
-// VIM_TEST_SETUP hi link javaGenericsC2 Error
-// VIM_TEST_SETUP hi link javaWildcardBound Error
+// MNV_TEST_SETUP hi link javaGenericsC1 Todo
+// MNV_TEST_SETUP hi link javaGenericsC2 Error
+// MNV_TEST_SETUP hi link javaWildcardBound Error
 
 
 import java.math.BigInteger;
diff --git a/uvim/runtime/syntax/testdir/input/java_generics_signature.java b/uvim/runtime/syntax/testdir/input/java_generics_signature.java
index 37617143a4..9c0d4d5ac6 100644
--- a/uvim/runtime/syntax/testdir/input/java_generics_signature.java
+++ b/uvim/runtime/syntax/testdir/input/java_generics_signature.java
@@ -1,11 +1,11 @@
-// VIM_TEST_SETUP let g:java_highlight_functions = 'style'
-// VIM_TEST_SETUP let g:java_highlight_signature = 1
-// VIM_TEST_SETUP let g:java_highlight_generics = 1
-// VIM_TEST_SETUP let g:java_highlight_java_lang = 1
-
-// VIM_TEST_SETUP hi link javaGenericsC1 Todo
-// VIM_TEST_SETUP hi link javaGenericsC2 Error
-// VIM_TEST_SETUP hi link javaWildcardBound Error
+// MNV_TEST_SETUP let g:java_highlight_functions = 'style'
+// MNV_TEST_SETUP let g:java_highlight_signature = 1
+// MNV_TEST_SETUP let g:java_highlight_generics = 1
+// MNV_TEST_SETUP let g:java_highlight_java_lang = 1
+
+// MNV_TEST_SETUP hi link javaGenericsC1 Todo
+// MNV_TEST_SETUP hi link javaGenericsC2 Error
+// MNV_TEST_SETUP hi link javaWildcardBound Error
 
 
 import java.math.BigInteger;
diff --git a/uvim/runtime/syntax/testdir/input/java_lambda_expressions.java b/uvim/runtime/syntax/testdir/input/java_lambda_expressions.java
index 95531f918f..31974a9a0e 100644
--- a/uvim/runtime/syntax/testdir/input/java_lambda_expressions.java
+++ b/uvim/runtime/syntax/testdir/input/java_lambda_expressions.java
@@ -1,4 +1,4 @@
-// VIM_TEST_SETUP let g:java_highlight_functions = 'style'
+// MNV_TEST_SETUP let g:java_highlight_functions = 'style'
 
 
 import java.lang.annotation.ElementType;
diff --git a/uvim/runtime/syntax/testdir/input/java_lambda_expressions_signature.java b/uvim/runtime/syntax/testdir/input/java_lambda_expressions_signature.java
index 0d89e9c8e9..f15c379f17 100644
--- a/uvim/runtime/syntax/testdir/input/java_lambda_expressions_signature.java
+++ b/uvim/runtime/syntax/testdir/input/java_lambda_expressions_signature.java
@@ -1,5 +1,5 @@
-// VIM_TEST_SETUP let g:java_highlight_functions = 'style'
-// VIM_TEST_SETUP let g:java_highlight_signature = 1
+// MNV_TEST_SETUP let g:java_highlight_functions = 'style'
+// MNV_TEST_SETUP let g:java_highlight_signature = 1
 
 import java.lang.annotation.ElementType;
 import java.util.function.BinaryOperator;
diff --git a/uvim/runtime/syntax/testdir/input/java_method_references.java b/uvim/runtime/syntax/testdir/input/java_method_references.java
index 640ab1edb0..7942308148 100644
--- a/uvim/runtime/syntax/testdir/input/java_method_references.java
+++ b/uvim/runtime/syntax/testdir/input/java_method_references.java
@@ -1,5 +1,5 @@
-// VIM_TEST_SETUP let g:java_highlight_functions = 'style'
-// VIM_TEST_SETUP let g:java_highlight_generics = 1
+// MNV_TEST_SETUP let g:java_highlight_functions = 'style'
+// MNV_TEST_SETUP let g:java_highlight_generics = 1
 
 
 import java.lang.invoke.MethodHandle;
diff --git a/uvim/runtime/syntax/testdir/input/java_method_references_signature.java b/uvim/runtime/syntax/testdir/input/java_method_references_signature.java
index 61e4c0da3a..8abfa1af8e 100644
--- a/uvim/runtime/syntax/testdir/input/java_method_references_signature.java
+++ b/uvim/runtime/syntax/testdir/input/java_method_references_signature.java
@@ -1,6 +1,6 @@
-// VIM_TEST_SETUP let g:java_highlight_functions = 'style'
-// VIM_TEST_SETUP let g:java_highlight_signature = 1
-// VIM_TEST_SETUP let g:java_highlight_generics = 1
+// MNV_TEST_SETUP let g:java_highlight_functions = 'style'
+// MNV_TEST_SETUP let g:java_highlight_signature = 1
+// MNV_TEST_SETUP let g:java_highlight_generics = 1
 
 import java.lang.invoke.MethodHandle;
 import java.util.function.BiPredicate;
diff --git a/uvim/runtime/syntax/testdir/input/java_methods_indent2.java b/uvim/runtime/syntax/testdir/input/java_methods_indent2.java
index 507bc7333c..ed904eaccb 100644
--- a/uvim/runtime/syntax/testdir/input/java_methods_indent2.java
+++ b/uvim/runtime/syntax/testdir/input/java_methods_indent2.java
@@ -1,6 +1,6 @@
-// VIM_TEST_SETUP let g:java_highlight_functions = 'indent2'
-// VIM_TEST_SETUP let g:java_highlight_generics = 1
-// VIM_TEST_SETUP set encoding=utf-8 termencoding=utf-8
+// MNV_TEST_SETUP let g:java_highlight_functions = 'indent2'
+// MNV_TEST_SETUP let g:java_highlight_generics = 1
+// MNV_TEST_SETUP set encoding=utf-8 termencoding=utf-8
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 
diff --git a/uvim/runtime/syntax/testdir/input/java_methods_indent2_signature.java b/uvim/runtime/syntax/testdir/input/java_methods_indent2_signature.java
index 2fdc5c294c..1594f4f46a 100644
--- a/uvim/runtime/syntax/testdir/input/java_methods_indent2_signature.java
+++ b/uvim/runtime/syntax/testdir/input/java_methods_indent2_signature.java
@@ -1,6 +1,6 @@
-// VIM_TEST_SETUP let g:java_highlight_functions = 'indent2'
-// VIM_TEST_SETUP let g:java_highlight_signature = 1
-// VIM_TEST_SETUP set encoding=utf-8 termencoding=utf-8
+// MNV_TEST_SETUP let g:java_highlight_functions = 'indent2'
+// MNV_TEST_SETUP let g:java_highlight_signature = 1
+// MNV_TEST_SETUP set encoding=utf-8 termencoding=utf-8
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 
diff --git a/uvim/runtime/syntax/testdir/input/java_methods_indent4.java b/uvim/runtime/syntax/testdir/input/java_methods_indent4.java
index 48f13f8f58..96ed361c11 100644
--- a/uvim/runtime/syntax/testdir/input/java_methods_indent4.java
+++ b/uvim/runtime/syntax/testdir/input/java_methods_indent4.java
@@ -1,6 +1,6 @@
-// VIM_TEST_SETUP let g:java_highlight_functions = 'indent4'
-// VIM_TEST_SETUP let g:java_highlight_generics = 1
-// VIM_TEST_SETUP set encoding=utf-8 termencoding=utf-8
+// MNV_TEST_SETUP let g:java_highlight_functions = 'indent4'
+// MNV_TEST_SETUP let g:java_highlight_generics = 1
+// MNV_TEST_SETUP set encoding=utf-8 termencoding=utf-8
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 
diff --git a/uvim/runtime/syntax/testdir/input/java_methods_indent4_signature.java b/uvim/runtime/syntax/testdir/input/java_methods_indent4_signature.java
index ee101d2a37..6da95e30df 100644
--- a/uvim/runtime/syntax/testdir/input/java_methods_indent4_signature.java
+++ b/uvim/runtime/syntax/testdir/input/java_methods_indent4_signature.java
@@ -1,6 +1,6 @@
-// VIM_TEST_SETUP let g:java_highlight_functions = 'indent4'
-// VIM_TEST_SETUP let g:java_highlight_signature = 1
-// VIM_TEST_SETUP set encoding=utf-8 termencoding=utf-8
+// MNV_TEST_SETUP let g:java_highlight_functions = 'indent4'
+// MNV_TEST_SETUP let g:java_highlight_signature = 1
+// MNV_TEST_SETUP set encoding=utf-8 termencoding=utf-8
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 
diff --git a/uvim/runtime/syntax/testdir/input/java_methods_indent8.java b/uvim/runtime/syntax/testdir/input/java_methods_indent8.java
index 0c672a8948..ed41f39f44 100644
--- a/uvim/runtime/syntax/testdir/input/java_methods_indent8.java
+++ b/uvim/runtime/syntax/testdir/input/java_methods_indent8.java
@@ -1,6 +1,6 @@
-// VIM_TEST_SETUP let g:java_highlight_functions = 'indent8'
-// VIM_TEST_SETUP let g:java_highlight_generics = 1
-// VIM_TEST_SETUP set encoding=utf-8 termencoding=utf-8
+// MNV_TEST_SETUP let g:java_highlight_functions = 'indent8'
+// MNV_TEST_SETUP let g:java_highlight_generics = 1
+// MNV_TEST_SETUP set encoding=utf-8 termencoding=utf-8
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 
diff --git a/uvim/runtime/syntax/testdir/input/java_methods_indent8_signature.java b/uvim/runtime/syntax/testdir/input/java_methods_indent8_signature.java
index 57c02a42cf..f2f7de17a0 100644
--- a/uvim/runtime/syntax/testdir/input/java_methods_indent8_signature.java
+++ b/uvim/runtime/syntax/testdir/input/java_methods_indent8_signature.java
@@ -1,6 +1,6 @@
-// VIM_TEST_SETUP let g:java_highlight_functions = 'indent8'
-// VIM_TEST_SETUP let g:java_highlight_signature = 1
-// VIM_TEST_SETUP set encoding=utf-8 termencoding=utf-8
+// MNV_TEST_SETUP let g:java_highlight_functions = 'indent8'
+// MNV_TEST_SETUP let g:java_highlight_signature = 1
+// MNV_TEST_SETUP set encoding=utf-8 termencoding=utf-8
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 
diff --git a/uvim/runtime/syntax/testdir/input/java_methods_style.java b/uvim/runtime/syntax/testdir/input/java_methods_style.java
index 50bfa96ba5..e927b817c7 100644
--- a/uvim/runtime/syntax/testdir/input/java_methods_style.java
+++ b/uvim/runtime/syntax/testdir/input/java_methods_style.java
@@ -1,6 +1,6 @@
-// VIM_TEST_SETUP let g:java_highlight_functions = 'style'
-// VIM_TEST_SETUP let g:java_highlight_generics = 1
-// VIM_TEST_SETUP set encoding=utf-8 termencoding=utf-8
+// MNV_TEST_SETUP let g:java_highlight_functions = 'style'
+// MNV_TEST_SETUP let g:java_highlight_generics = 1
+// MNV_TEST_SETUP set encoding=utf-8 termencoding=utf-8
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 
diff --git a/uvim/runtime/syntax/testdir/input/java_methods_style_signature.java b/uvim/runtime/syntax/testdir/input/java_methods_style_signature.java
index a0a3d18bef..f713ebeae6 100644
--- a/uvim/runtime/syntax/testdir/input/java_methods_style_signature.java
+++ b/uvim/runtime/syntax/testdir/input/java_methods_style_signature.java
@@ -1,6 +1,6 @@
-// VIM_TEST_SETUP let g:java_highlight_functions = 'style'
-// VIM_TEST_SETUP let g:java_highlight_signature = 1
-// VIM_TEST_SETUP set encoding=utf-8 termencoding=utf-8
+// MNV_TEST_SETUP let g:java_highlight_functions = 'style'
+// MNV_TEST_SETUP let g:java_highlight_signature = 1
+// MNV_TEST_SETUP set encoding=utf-8 termencoding=utf-8
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 
diff --git a/uvim/runtime/syntax/testdir/input/java_previews_430.java b/uvim/runtime/syntax/testdir/input/java_previews_430.java
index 15d8ba2cea..34f0078ff5 100644
--- a/uvim/runtime/syntax/testdir/input/java_previews_430.java
+++ b/uvim/runtime/syntax/testdir/input/java_previews_430.java
@@ -1,4 +1,4 @@
-// VIM_TEST_SETUP let g:java_syntax_previews = [430]
+// MNV_TEST_SETUP let g:java_syntax_previews = [430]
 
 
 
diff --git a/uvim/runtime/syntax/testdir/input/java_previews_455.java b/uvim/runtime/syntax/testdir/input/java_previews_455.java
index 69f3798430..ebd9ba0829 100644
--- a/uvim/runtime/syntax/testdir/input/java_previews_455.java
+++ b/uvim/runtime/syntax/testdir/input/java_previews_455.java
@@ -1,4 +1,4 @@
-// VIM_TEST_SETUP let g:java_syntax_previews = [455, 488, 507, 530]
+// MNV_TEST_SETUP let g:java_syntax_previews = [455, 488, 507, 530]
 
 
 
diff --git a/uvim/runtime/syntax/testdir/input/java_unfoldment.java b/uvim/runtime/syntax/testdir/input/java_unfoldment.java
index fb3a96f8e0..ca8760245a 100644
--- a/uvim/runtime/syntax/testdir/input/java_unfoldment.java
+++ b/uvim/runtime/syntax/testdir/input/java_unfoldment.java
@@ -1,15 +1,15 @@
-// VIM_TEST_SETUP setlocal fen fdc=2 fdl=8 fdm=syntax
-// VIM_TEST_SETUP let g:java_highlight_java_lang = 1
-// VIM_TEST_SETUP let g:java_ignore_folding = "bcdi"
-// VIM_TEST_SETUP let g:java_lookbehind_byte_counts = {'javaBlock': -1}
-// VIM_TEST_SETUP let g:java_mark_braces_in_parens_as_errors = 1
+// MNV_TEST_SETUP setlocal fen fdc=2 fdl=8 fdm=syntax
+// MNV_TEST_SETUP let g:java_highlight_java_lang = 1
+// MNV_TEST_SETUP let g:java_ignore_folding = "bcdi"
+// MNV_TEST_SETUP let g:java_lookbehind_byte_counts = {'javaBlock': -1}
+// MNV_TEST_SETUP let g:java_mark_braces_in_parens_as_errors = 1
 
 
 
 
 
-// VIM_TEST_SETUP highlight link javaBlockOtherStart Structure
-// VIM_TEST_SETUP highlight link javaBlockStart Todo
+// MNV_TEST_SETUP highlight link javaBlockOtherStart Structure
+// MNV_TEST_SETUP highlight link javaBlockStart Todo
 
 
 
diff --git a/uvim/runtime/syntax/testdir/input/vim9_blocks.vim b/uvim/runtime/syntax/testdir/input/mnv9_blocks.mnv
index 20a68fc5ab..26bbbb388c 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_blocks.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_blocks.mnv
@@ -1,6 +1,6 @@
-vim9script
-# Vim9 blocks
-# VIM_TESTSETUP set list listchars=trail:-
+mnv9script
+# MNV9 blocks
+# MNV_TESTSETUP set list listchars=trail:-
 
 
 {
diff --git a/uvim/runtime/syntax/testdir/input/vim9_builtin_object_methods.vim b/uvim/runtime/syntax/testdir/input/mnv9_builtin_object_methods.mnv
index 5b49ae91f8..b05b36ea88 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_builtin_object_methods.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_builtin_object_methods.mnv
@@ -1,5 +1,5 @@
-vim9script
-# Vim9 special methods - new*(), empty(), len(), string()
+mnv9script
+# MNV9 special methods - new*(), empty(), len(), string()
 
 
 def new()
diff --git a/uvim/runtime/syntax/testdir/input/vim9_builtin_object_methods2.vim b/uvim/runtime/syntax/testdir/input/mnv9_builtin_object_methods2.mnv
index 61396c3ba2..8bfbdccc38 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_builtin_object_methods2.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_builtin_object_methods2.mnv
@@ -1,7 +1,7 @@
-vim9script
-# Vim |builtin-object-methods| and namesake builtin functions
-# VIM_TEST_SETUP hi link vim9MethodName Special
-# VIM_TEST_SETUP hi link vim9This Todo
+mnv9script
+# MNV |builtin-object-methods| and namesake builtin functions
+# MNV_TEST_SETUP hi link mnv9MethodName Special
+# MNV_TEST_SETUP hi link mnv9This Todo
 
 
 class PairClassTest
diff --git a/uvim/runtime/syntax/testdir/input/vim9_comment_strings.vim b/uvim/runtime/syntax/testdir/input/mnv9_comment_strings.mnv
index 854f7d76bc..adfae6493e 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_comment_strings.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_comment_strings.mnv
@@ -1,6 +1,6 @@
-vim9script
-# Vim9 comment strings
-# VIM_TEST_SETUP let g:vimsyn_comment_strings = v:true
+mnv9script
+# MNV9 comment strings
+# MNV_TEST_SETUP let g:mnvsyn_comment_strings = v:true
 
 
 # pre "string" post
diff --git a/uvim/runtime/syntax/testdir/input/vim9_comments.vim b/uvim/runtime/syntax/testdir/input/mnv9_comments.mnv
index 360bb57833..0aafc3114a 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_comments.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_comments.mnv
@@ -1,8 +1,8 @@
-vim9script
-# Vim9 comments
+mnv9script
+# MNV9 comments
 
 
-# Vim9-script comment
+# MNV9-script comment
 
  # string only recognised with leading char
  "useless string"
@@ -13,17 +13,17 @@ function! Foo()
 endfunction
 
 def! Bar()
-  # Vim9-script comment
+  # MNV9-script comment
   "useless string" # comment
 enddef
 
 command -count FooCommand {
-  # Vim9-script comment
+  # MNV9-script comment
   "useless string" # comment
 }
 
 autocmd BufNewFile * {
-  # Vim9-script comment
+  # MNV9-script comment
   "useless string" # comment
 }
 
@@ -81,7 +81,7 @@ endif
 
 
 # PR: #14975
-# https://github.com/vim/vim/pull/14975#issuecomment-2832643115
+# https://github.com/Project-Tick/Project-Tick/pull/14975#issuecomment-2832643115
 
 var d = {
     a: 0,
@@ -92,8 +92,8 @@ b: 0,
 
 
 # PR: #19390
-# https://github.com/vim/vim/pull/19390#issue-3933755846
+# https://github.com/Project-Tick/Project-Tick/pull/19390#issue-3933755846
 
-# E1234: should not have vim9CommentTitle on 'E1234:'
-# ERR34: should have vim9CommentTitle on 'ERR34:'
+# E1234: should not have mnv9CommentTitle on 'E1234:'
+# ERR34: should have mnv9CommentTitle on 'ERR34:'
 
diff --git a/uvim/runtime/syntax/testdir/input/vim9_constructors.vim b/uvim/runtime/syntax/testdir/input/mnv9_constructors.mnv
index 3b49969e27..ca424a53c4 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_constructors.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_constructors.mnv
@@ -1,5 +1,5 @@
-vim9script
-# Vim9 constructors
+mnv9script
+# MNV9 constructors
 
 
 class A
diff --git a/uvim/runtime/syntax/testdir/input/vim9_def_variables.vim b/uvim/runtime/syntax/testdir/input/mnv9_def_variables.mnv
index a058bcf950..4c0d8aae78 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_def_variables.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_def_variables.mnv
@@ -1,5 +1,5 @@
-vim9script
-# Vim9 function variables
+mnv9script
+# MNV9 function variables
 
 
 def Foo()
@@ -214,7 +214,7 @@ for k in keys(t:) | echo t:[k] | endfor
 for k in keys(g:) | echo g:[k] | endfor
 for k in keys(v:) | echo v:[k] | endfor
 
-# Neovim-specific variables (not highlighted by default)
+# Neomnv-specific variables (not highlighted by default)
 
 echo v:lua v:msgpack_types v:relnum v:stderr v:termrequest v:virtnum
 
diff --git a/uvim/runtime/syntax/testdir/input/vim9_ex_class_fold.vim b/uvim/runtime/syntax/testdir/input/mnv9_ex_class_fold.mnv
index ea89b9dfc0..35f953011e 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_ex_class_fold.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_ex_class_fold.mnv
@@ -1,7 +1,7 @@
-vim9script
-# Vim9 :class command
-# VIM_TEST_SETUP let g:vimsyn_folding = 'cfi'
-# VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
+mnv9script
+# MNV9 :class command
+# MNV_TEST_SETUP let g:mnvsyn_folding = 'cfi'
+# MNV_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
 
 
 interface Interface1
diff --git a/uvim/runtime/syntax/testdir/input/vim9_ex_commands.vim b/uvim/runtime/syntax/testdir/input/mnv9_ex_commands.mnv
index 90da5e812b..f484b2b254 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_ex_commands.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_ex_commands.mnv
@@ -1,5 +1,5 @@
-vim9script
-# Vim9 Ex commands
+mnv9script
+# MNV9 Ex commands
 
 
 # START NOT MATCHED
@@ -208,7 +208,7 @@ vim9script
 :grep
 :grepadd
 :gui
-:gvim
+:gmnv
 :hardcopy
 :help
 :helpclose
@@ -304,8 +304,8 @@ vim9script
 :luado
 :luafile
 :lunmap
-:lvimgrep
-:lvimgrepadd
+:lmnvgrep
+:lmnvgrepadd
 :lwindow
 :make
 :mapclear
@@ -320,7 +320,7 @@ vim9script
 :mksession
 :mkspell
 :mkview
-:mkvimrc
+:mkmnvrc
 :move
 :mzfile
 :mzscheme
@@ -416,7 +416,7 @@ vim9script
 :rubyfile
 :rundo
 :runtime
-:rviminfo
+:rmnvinfo
 :sall
 :sandbox
 :sargument
@@ -550,10 +550,10 @@ vim9script
 :vertical
 :vglobal/.../
 :view
-:vim9cmd
-# :vim9script
-:vimgrep
-:vimgrepadd
+:mnv9cmd
+# :mnv9script
+:mnvgrep
+:mnvgrepadd
 :visual
 :viusage
 :vmap
@@ -578,7 +578,7 @@ vim9script
 :wqall
 :write
 :wundo
-:wviminfo
+:wmnvinfo
 :xall
 :xmap
 :xmapclear
@@ -789,7 +789,7 @@ Foo() | goto
 Foo() | grep
 Foo() | grepadd
 Foo() | gui
-Foo() | gvim
+Foo() | gmnv
 Foo() | hardcopy
 Foo() | help
 Foo() | helpclose
@@ -884,8 +884,8 @@ Foo() | lua
 Foo() | luado
 Foo() | luafile
 Foo() | lunmap
-Foo() | lvimgrep
-Foo() | lvimgrepadd
+Foo() | lmnvgrep
+Foo() | lmnvgrepadd
 Foo() | lwindow
 Foo() | make
 Foo() | mark
@@ -901,7 +901,7 @@ Foo() | mkexrc
 Foo() | mksession
 Foo() | mkspell
 Foo() | mkview
-Foo() | mkvimrc
+Foo() | mkmnvrc
 Foo() | mzfile
 Foo() | mzscheme
 Foo() | nbclose
@@ -996,7 +996,7 @@ Foo() | rubydo
 Foo() | rubyfile
 Foo() | rundo
 Foo() | runtime
-Foo() | rviminfo
+Foo() | rmnvinfo
 Foo() | sall
 Foo() | sandbox
 Foo() | sargument
@@ -1129,10 +1129,10 @@ Foo() | verbose
 Foo() | version
 Foo() | vertical
 Foo() | vglobal/.../
-Foo() | vim9cmd
-# call Foo() | vim9script
-Foo() | vimgrep
-Foo() | vimgrepadd
+Foo() | mnv9cmd
+# call Foo() | mnv9script
+Foo() | mnvgrep
+Foo() | mnvgrepadd
 Foo() | visual
 Foo() | viusage
 Foo() | view
@@ -1158,7 +1158,7 @@ Foo() | wprevious
 Foo() | wq
 Foo() | wqall
 Foo() | wundo
-Foo() | wviminfo
+Foo() | wmnvinfo
 Foo() | xall
 Foo() | xmapclear
 Foo() | xmap
diff --git a/uvim/runtime/syntax/testdir/input/vim9_ex_echo.vim b/uvim/runtime/syntax/testdir/input/mnv9_ex_echo.mnv
index e09dd04c0a..c08b43322f 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_ex_echo.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_ex_echo.mnv
@@ -1,6 +1,6 @@
-vim9script
-# Vim9 :echo commands
-# VIM_TEST_SETUP hi link vimVar Identifier
+mnv9script
+# MNV9 :echo commands
+# MNV_TEST_SETUP hi link mnvVar Identifier
 
 
 echo         # comment
diff --git a/uvim/runtime/syntax/testdir/input/vim9_ex_enum.vim b/uvim/runtime/syntax/testdir/input/mnv9_ex_enum.mnv
index 8529deda24..4f6eec4da6 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_ex_enum.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_ex_enum.mnv
@@ -1,6 +1,6 @@
-vim9script
-# Vim :enum command
-# VIM_TEST_SETUP hi link vim9EnumValue Todo
+mnv9script
+# MNV :enum command
+# MNV_TEST_SETUP hi link mnv9EnumValue Todo
 
 
 interface Interface1
diff --git a/uvim/runtime/syntax/testdir/input/vim9_ex_enum2.vim b/uvim/runtime/syntax/testdir/input/mnv9_ex_enum2.mnv
index f602d794fe..84d1096857 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_ex_enum2.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_ex_enum2.mnv
@@ -1,7 +1,7 @@
-vim9script
-# Vim9 :enum command
-# VIM_TEST_SETUP hi link vim9EnumValue Todo
-# See: https://github.com/vim/vim/pull/16365#issuecomment-2571420551
+mnv9script
+# MNV9 :enum command
+# MNV_TEST_SETUP hi link mnv9EnumValue Todo
+# See: https://github.com/Project-Tick/Project-Tick/pull/16365#issuecomment-2571420551
 
 
 enum Letter
diff --git a/uvim/runtime/syntax/testdir/input/vim9_ex_enum_fold.vim b/uvim/runtime/syntax/testdir/input/mnv9_ex_enum_fold.mnv
index b4769d5813..e05220622c 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_ex_enum_fold.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_ex_enum_fold.mnv
@@ -1,8 +1,8 @@
-vim9script
-# Vim9 :enum command
-# VIM_TEST_SETUP let g:vimsyn_folding = 'efi'
-# VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
-# VIM_TEST_SETUP hi link vim9EnumValue Todo
+mnv9script
+# MNV9 :enum command
+# MNV_TEST_SETUP let g:mnvsyn_folding = 'efi'
+# MNV_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
+# MNV_TEST_SETUP hi link mnv9EnumValue Todo
 
 
 interface Interface1
diff --git a/uvim/runtime/syntax/testdir/input/vim9_ex_for.vim b/uvim/runtime/syntax/testdir/input/mnv9_ex_for.mnv
index f23b3cc505..95efb2f0f1 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_ex_for.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_ex_for.mnv
@@ -1,5 +1,5 @@
-vim9script
-# Vim9 :for command
+mnv9script
+# MNV9 :for command
 
 
 # :for {var} in {object}
diff --git a/uvim/runtime/syntax/testdir/input/vim9_ex_function_def_tail_comment_errors.vim b/uvim/runtime/syntax/testdir/input/mnv9_ex_function_def_tail_comment_errors.mnv
index dda1449584..2db5cdee53 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_ex_function_def_tail_comment_errors.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_ex_function_def_tail_comment_errors.mnv
@@ -1,6 +1,6 @@
-vim9script
-# Vim9 :function and :def tail comment errors
-# VIM_TEST_SETUP unlet! g:vimsyn_folding
+mnv9script
+# MNV9 :function and :def tail comment errors
+# MNV_TEST_SETUP unlet! g:mnvsyn_folding
 
 
 fun Test1() abort		# fun
diff --git a/uvim/runtime/syntax/testdir/input/vim9_ex_function_def_tail_comments.vim b/uvim/runtime/syntax/testdir/input/mnv9_ex_function_def_tail_comments.mnv
index b2803854d4..cac7aeefde 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_ex_function_def_tail_comments.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_ex_function_def_tail_comments.mnv
@@ -1,6 +1,6 @@
-vim9script
-# Vim9 :function and :def tail comments
-# VIM_TEST_SETUP unlet! g:vimsyn_folding
+mnv9script
+# MNV9 :function and :def tail comments
+# MNV_TEST_SETUP unlet! g:mnvsyn_folding
 
 
 fun Test1() abort		" fun
diff --git a/uvim/runtime/syntax/testdir/input/mnv9_ex_import.mnv b/uvim/runtime/syntax/testdir/input/mnv9_ex_import.mnv
new file mode 100644
index 0000000000..9b6be57ce2
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/mnv9_ex_import.mnv
@@ -0,0 +1,120 @@
+mnv9script
+# MNV9 :import command
+# MNV_TEST_SETUP hi link mnvImportName Todo
+
+
+import "foo.mnv"
+import true ? "foo.mnv" : "bar.mnv"
+
+import true ?
+  "foo.mnv" :
+  "bar.mnv"
+
+import true
+  ? "foo.mnv"
+  : "bar.mnv"
+
+import true ? # comment
+  # comment 
+  "foo.mnv" :
+  # comment
+  "bar.mnv"
+
+import true # comment
+  # comment 
+  ? "foo.mnv"
+  # comment
+  : "bar.mnv"
+
+import "foo.mnv" as bar
+import true ? "foo.mnv" : "bar.mnv" as baz
+
+import true ?
+  "foo.mnv" :
+  "bar.mnv"
+  as baz
+
+import true
+  ? "foo.mnv"
+  : "bar.mnv"
+  as baz
+
+import true ? # comment
+  # comment 
+  "foo.mnv" :
+  # comment
+  "bar.mnv"
+  # comment
+  as baz
+
+import true # comment
+  # comment 
+  ? "foo.mnv"
+  # comment
+  : "bar.mnv"
+  # comment
+  as baz
+
+echo "Foo" | import "foo.mnv"
+
+
+# autoload
+
+import autoload "foo.mnv"
+import autoload true ? "foo.mnv" : "bar.mnv"
+
+import autoload true ?
+  "foo.mnv" :
+  "bar.mnv"
+
+import autoload true
+  ? "foo.mnv"
+  : "bar.mnv"
+
+import autoload true ? # comment
+  # comment 
+  "foo.mnv" :
+  # comment
+  "bar.mnv"
+
+import autoload true # comment
+  # comment 
+  ? "foo.mnv"
+  # comment
+  : "bar.mnv"
+
+import autoload "foo.mnv" as bar
+import autoload true ? "foo.mnv" : "bar.mnv" as baz
+
+import autoload true ?
+  "foo.mnv" :
+  "bar.mnv"
+  as baz
+
+import autoload true
+  ? "foo.mnv"
+  : "bar.mnv"
+  as baz
+
+import autoload true ? # comment
+  # comment 
+  "foo.mnv" :
+  # comment
+  "bar.mnv"
+  # comment
+  as baz
+
+import autoload true # comment
+  # comment 
+  ? "foo.mnv"
+  # comment
+  : "bar.mnv"
+  # comment
+  as baz
+
+
+# "as" keyword in expr
+
+var as = "modules/"
+import true ? as .. "foo.mnv" : as .. "bar.mnv" as other
+
diff --git a/uvim/runtime/syntax/testdir/input/vim9_ex_interface_fold.vim b/uvim/runtime/syntax/testdir/input/mnv9_ex_interface_fold.mnv
index f108e749a0..a64302c682 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_ex_interface_fold.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_ex_interface_fold.mnv
@@ -1,7 +1,7 @@
-vim9script
-# Vim9 :interface command
-# VIM_TEST_SETUP let g:vimsyn_folding = 'i'
-# VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
+mnv9script
+# MNV9 :interface command
+# MNV_TEST_SETUP let g:mnvsyn_folding = 'i'
+# MNV_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
 
 
 interface Interface1
diff --git a/uvim/runtime/syntax/testdir/input/vim9_ex_let_heredoc.vim b/uvim/runtime/syntax/testdir/input/mnv9_ex_let_heredoc.mnv
index 184089c819..9697d91de2 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_ex_let_heredoc.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_ex_let_heredoc.mnv
@@ -1,7 +1,7 @@
-vim9script
-# Vim9 heredoc
-# VIM_TEST_SETUP let g:vimsyn_folding = "h"
-# VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
+mnv9script
+# MNV9 heredoc
+# MNV_TEST_SETUP let g:mnvsyn_folding = "h"
+# MNV_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
 
 
 var foo =<< END
diff --git a/uvim/runtime/syntax/testdir/input/vim9_ex_loadkeymap.vim b/uvim/runtime/syntax/testdir/input/mnv9_ex_loadkeymap.mnv
index b6b5fece9d..5fd5bc36b3 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_ex_loadkeymap.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_ex_loadkeymap.mnv
@@ -1,5 +1,5 @@
-vim9script
-# Vim9 :loadkeymap command
+mnv9script
+# MNV9 :loadkeymap command
 
 
 scriptencoding utf-8
@@ -20,9 +20,9 @@ a A    Basic mapping
 c              <char-0103>     Special notation allowed in RHS - octal
 <char-0x0064>  <char-0x0044>   Special notation allowed in LHS and RHS - hexadecimal
 
-# Vim-script comment characters
-\# <char-0x00a3>               Line should not match as a Vim9-script comment
+# MNV-script comment characters
+\# <char-0x00a3>               Line should not match as a MNV9-script comment
 # Line should not match as a legacy-script comment
 " “
-: #                            Line should not match as a Vim9-script comment
+: #                            Line should not match as a MNV9-script comment
 
diff --git a/uvim/runtime/syntax/testdir/input/vim9_ex_type.vim b/uvim/runtime/syntax/testdir/input/mnv9_ex_type.mnv
index 1408ac8555..af82f9912c 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_ex_type.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_ex_type.mnv
@@ -1,5 +1,5 @@
-vim9script
-# Vim9 :type command
+mnv9script
+# MNV9 :type command
 
 
 type Foo = string
diff --git a/uvim/runtime/syntax/testdir/input/vim9_expressions.vim b/uvim/runtime/syntax/testdir/input/mnv9_expressions.mnv
index 05a9fe7235..5fd25b024a 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_expressions.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_expressions.mnv
@@ -1,5 +1,5 @@
-vim9script
-# Vim9 expressions
+mnv9script
+# MNV9 expressions
 
 
 # Boolean
@@ -180,7 +180,7 @@ def Foo(): bool
 enddef
 
 
-# Issue #14423 (vim.vim: Opt out of vimSearch*)
+# Issue #14423 (mnv.mnv: Opt out of mnvSearch*)
 
 :?truthy
 const truthy: number = false
@@ -201,7 +201,7 @@ def Foo()
 enddef
 
 
-# Issue #16227 (Vim script ternary expression highlighting)
+# Issue #16227 (MNV script ternary expression highlighting)
 
 var foo = 'foo'                         # comment
 var bar = foo == 'foo' ? 'bar' : 'baz'
diff --git a/uvim/runtime/syntax/testdir/input/vim9_function_calls.vim b/uvim/runtime/syntax/testdir/input/mnv9_function_calls.mnv
index 63e82c662f..65369c66c9 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_function_calls.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_function_calls.mnv
@@ -1,7 +1,7 @@
-vim9script
-# Vim9 function calls
-# VIM_TEST_SETUP hi link vimUserFunc Todo
-# VIM_TEST_SETUP hi link vim9UserFunc Todo
+mnv9script
+# MNV9 function calls
+# MNV_TEST_SETUP hi link mnvUserFunc Todo
+# MNV_TEST_SETUP hi link mnv9UserFunc Todo
 
 
 call abs(42)
@@ -300,11 +300,11 @@ module.foo().bar()
 module.foo().substitute()
 
 
-# Issue 16721 (Vim script highlight of builtin function after |)
+# Issue 16721 (MNV script highlight of builtin function after |)
 
-&directory = $'{$MYVIMDIR}/.data/swap/'
-&backupdir = $'{$MYVIMDIR}/.data/backup//'
-&undodir = $'{$MYVIMDIR}/.data/undo//'
+&directory = $'{$MYMNVDIR}/.data/swap/'
+&backupdir = $'{$MYMNVDIR}/.data/backup//'
+&undodir = $'{$MYMNVDIR}/.data/undo//'
 if !isdirectory(&undodir)   | mkdir(&undodir, "p")   | endif
 if !isdirectory(&backupdir) | mkdir(&backupdir, "p") | endif
 if !isdirectory(&directory) | mkdir(&directory, "p") | endif
diff --git a/uvim/runtime/syntax/testdir/input/vim9_generic_function_example_enum.vim b/uvim/runtime/syntax/testdir/input/mnv9_generic_function_example_enum.mnv
index 037392134b..00621dea4d 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_generic_function_example_enum.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_generic_function_example_enum.mnv
@@ -1,9 +1,9 @@
-vim9script
-# VIM_TEST_SETUP highlight link vim9DefTypeParam Todo
-# VIM_TEST_SETUP highlight link vim9EnumValue Identifier
-# VIM_TEST_SETUP let g:vimsyn_folding = "ef"
-# VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
-# See: https://github.com/vim/vim/pull/17313#issuecomment-3033537127 (Aliaksei Budavei)
+mnv9script
+# MNV_TEST_SETUP highlight link mnv9DefTypeParam Todo
+# MNV_TEST_SETUP highlight link mnv9EnumValue Identifier
+# MNV_TEST_SETUP let g:mnvsyn_folding = "ef"
+# MNV_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
+# See: https://github.com/Project-Tick/Project-Tick/pull/17313#issuecomment-3033537127 (Aliaksei Budavei)
 
 
 enum CommonPair
diff --git a/uvim/runtime/syntax/testdir/input/vim9_generic_function_example_list.vim b/uvim/runtime/syntax/testdir/input/mnv9_generic_function_example_list.mnv
index f1abbdb3b1..8fb745ad1a 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_generic_function_example_list.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_generic_function_example_list.mnv
@@ -1,11 +1,11 @@
-vim9script
-# VIM_TEST_SETUP let g:vimsyn_folding = "cfi"
-# VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
-# VIM_TEST_SETUP hi link vim9DefTypeParam Todo
-# See: https://github.com/vim/vim/pull/17313#issuecomment-3046696820 (Aliaksei Budavei)
+mnv9script
+# MNV_TEST_SETUP let g:mnvsyn_folding = "cfi"
+# MNV_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
+# MNV_TEST_SETUP hi link mnv9DefTypeParam Todo
+# See: https://github.com/Project-Tick/Project-Tick/pull/17313#issuecomment-3046696820 (Aliaksei Budavei)
 
 
-# See https://github.com/vim/vim/pull/16604#issuecomment-265202845 .
+# See https://github.com/Project-Tick/Project-Tick/pull/16604#issuecomment-265202845 .
 export interface Listable
     def Cons<E>(_: E): Listable
     def Reverse<E>(): Listable
diff --git a/uvim/runtime/syntax/testdir/input/vim9_generic_function_example_set.vim b/uvim/runtime/syntax/testdir/input/mnv9_generic_function_example_set.mnv
index fb8f65116e..71c8912cd4 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_generic_function_example_set.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_generic_function_example_set.mnv
@@ -1,10 +1,10 @@
-vim9script
-# VIM_TEST_SETUP let g:vimsyn_folding = "cf"
-# VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
-# VIM_TEST_SETUP hi link vim9DefTypeParam Todo
-# See: https://github.com/vim/vim/pull/17313#issuecomment-3046696820 (Aliaksei Budavei)
+mnv9script
+# MNV_TEST_SETUP let g:mnvsyn_folding = "cf"
+# MNV_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
+# MNV_TEST_SETUP hi link mnv9DefTypeParam Todo
+# See: https://github.com/Project-Tick/Project-Tick/pull/17313#issuecomment-3046696820 (Aliaksei Budavei)
 
-# See https://github.com/vim/vim/issues/14330#issuecomment-2028938515 .
+# See https://github.com/Project-Tick/Project-Tick/issues/14330#issuecomment-2028938515 .
 export class Set
     final _elements: dict<number>
     const _Mapper: func(number, string): any
diff --git a/uvim/runtime/syntax/testdir/input/vim9_generic_functions.vim b/uvim/runtime/syntax/testdir/input/mnv9_generic_functions.mnv
index 4800752d3f..fed2cced45 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_generic_functions.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_generic_functions.mnv
@@ -1,8 +1,8 @@
-vim9script
-# Vim9 generic functions
-# VIM_TEST_SETUP let g:vimsyn_folding = "cf"
-# VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
-# VIM_TEST_SETUP hi link vim9DefTypeParam Todo
+mnv9script
+# MNV9 generic functions
+# MNV_TEST_SETUP let g:mnvsyn_folding = "cf"
+# MNV_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
+# MNV_TEST_SETUP hi link mnv9DefTypeParam Todo
 
 
 # :help generic-functions
@@ -78,7 +78,7 @@ class Bar extends Foo
 endclass
 
 
-# Issue: https://github.com/vim/vim/pull/17722#issuecomment-3075531052
+# Issue: https://github.com/Project-Tick/Project-Tick/pull/17722#issuecomment-3075531052
 
 export def Id<U>(): func(U): U
     return (X_: U) => X_
diff --git a/uvim/runtime/syntax/testdir/input/vim9_lambdas.vim b/uvim/runtime/syntax/testdir/input/mnv9_lambdas.mnv
index 4f7d1cde3c..667dcd2bac 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_lambdas.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_lambdas.mnv
@@ -1,7 +1,7 @@
-vim9script
-# Vim9 lambda expressions
-# VIM_TEST_SETUP hi link vim9LambdaOperator Todo
-# VIM_TEST_SETUP hi link vim9LambdaParen Todo
+mnv9script
+# MNV9 lambda expressions
+# MNV_TEST_SETUP hi link mnv9LambdaOperator Todo
+# MNV_TEST_SETUP hi link mnv9LambdaParen Todo
 
 
 var Foo: func
@@ -117,7 +117,7 @@ echo (() => 42)()
 echo ((x: string): number => 42)("foo")
 
 
-# :help vim9-lambda
+# :help mnv9-lambda
 
 var list = [1, 2, 3]
 echo filter(list, (k, v) =>
@@ -146,15 +146,15 @@ var d = mapnew(dict, (k, v): string => {
    })
 
 
-# Issue #15970 (vim9: Restore and extend the recognition of Enum body items)
+# Issue #15970 (mnv9: Restore and extend the recognition of Enum body items)
 
 def Op(): func(func(number, number): number): func(number, Digit): number
     return (F: func(number, number): number) =>
 	(x: number, y: Digit): number => F(x, y.value)
-enddef ####################### ^ vimCommand?
+enddef ####################### ^ mnvCommand?
 
 
-# Issue #16965 (vim syntax: wrong highlight with lambda, autoload, and false keyword)
+# Issue #16965 (mnv syntax: wrong highlight with lambda, autoload, and false keyword)
 
 autocmd BufRead * timer_start(0, (_) => f#a(false, false))
 autocmd
diff --git a/uvim/runtime/syntax/testdir/input/vim9_legacy_header.vim b/uvim/runtime/syntax/testdir/input/mnv9_legacy_header.mnv
index 75fde68c68..d9afd0c86c 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_legacy_header.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_legacy_header.mnv
@@ -1,17 +1,17 @@
-" Vim9 legacy script header
+" MNV9 legacy script header
 
 
 " comment
 
-if !has('vim9script')
+if !has('mnv9script')
   # 42 " comment
-  source foo.vim
+  source foo.mnv
   finish
 endif
 
 " comment
 
-vim9script noclear
+mnv9script noclear
 
 # comment
 
diff --git a/uvim/runtime/syntax/testdir/input/mnv9_legacy_header_fold.mnv b/uvim/runtime/syntax/testdir/input/mnv9_legacy_header_fold.mnv
new file mode 100644
index 0000000000..e6b0751ae3
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/mnv9_legacy_header_fold.mnv
@@ -0,0 +1,22 @@
+" MNV9 legacy script header
+" MNV_TEST_SETUP let g:mnvsyn_folding = "H"
+" MNV_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
+
+
+" comment
+
+if !has('mnv9script')
+  # 42 " comment
+  source foo.mnv
+  finish
+endif
+
+" comment
+
+mnv9script noclear
+
+# comment
+
+ # string only recognised with leading char
+ "useless string"
+
diff --git a/uvim/runtime/syntax/testdir/input/vim9_no_comment_strings.vim b/uvim/runtime/syntax/testdir/input/mnv9_no_comment_strings.mnv
index b9bdddb914..270f2cf31c 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_no_comment_strings.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_no_comment_strings.mnv
@@ -1,6 +1,6 @@
-vim9script
-# Vim9 no comment strings
-# VIM_TEST_SETUP let g:vimsyn_comment_strings = v:false
+mnv9script
+# MNV9 no comment strings
+# MNV_TEST_SETUP let g:mnvsyn_comment_strings = v:false
 
 
 # pre "string" post
diff --git a/uvim/runtime/syntax/testdir/input/mnv9_shebang.mnv b/uvim/runtime/syntax/testdir/input/mnv9_shebang.mnv
new file mode 100644
index 0000000000..60f8f0fc7e
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/mnv9_shebang.mnv
@@ -0,0 +1,8 @@
+#!/usr/bin/env mnv -S
+mnv9script
+# MNV9 shebang line
+
+
+# just a line comment
+#!/usr/bin/env mnv -S
+
diff --git a/uvim/runtime/syntax/testdir/input/vim9_super_this_keywords.vim b/uvim/runtime/syntax/testdir/input/mnv9_super_this_keywords.mnv
index 43f29fedee..fbb35ae5d6 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_super_this_keywords.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_super_this_keywords.mnv
@@ -1,7 +1,7 @@
-vim9script
-# Vim9 this and super keywords
-# VIM_TEST_SETUP hi link vim9This Todo
-# VIM_TEST_SETUP hi link vim9Super Todo
+mnv9script
+# MNV9 this and super keywords
+# MNV_TEST_SETUP hi link mnv9This Todo
+# MNV_TEST_SETUP hi link mnv9Super Todo
 
 
 def Echo(...args: list<any>)
diff --git a/uvim/runtime/syntax/testdir/input/vim9_super_this_keywords2.vim b/uvim/runtime/syntax/testdir/input/mnv9_super_this_keywords2.mnv
index 8db05e5501..dbf20dfc92 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_super_this_keywords2.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_super_this_keywords2.mnv
@@ -1,8 +1,8 @@
-vim9script
-# Vim9 this and super keywords
-# VIM_TEST_SETUP hi link vim9Super Todo
-# VIM_TEST_SETUP hi link vim9This Todo
-# See: https://github.com/vim/vim/pull/16476#issuecomment-2638191110
+mnv9script
+# MNV9 this and super keywords
+# MNV_TEST_SETUP hi link mnv9Super Todo
+# MNV_TEST_SETUP hi link mnv9This Todo
+# See: https://github.com/Project-Tick/Project-Tick/pull/16476#issuecomment-2638191110
 
 
 class A
diff --git a/uvim/runtime/syntax/testdir/input/vim9_super_this_keywords3.vim b/uvim/runtime/syntax/testdir/input/mnv9_super_this_keywords3.mnv
index a80c8c8737..6412cf2b95 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_super_this_keywords3.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_super_this_keywords3.mnv
@@ -1,8 +1,8 @@
-vim9script
-# Vim9 this and super keywords
-# VIM_TEST_SETUP hi link vim9Super Todo
-# VIM_TEST_SETUP hi link vim9This Todo
-# See: https://github.com/vim/vim/pull/16476#issuecomment-2635119478
+mnv9script
+# MNV9 this and super keywords
+# MNV_TEST_SETUP hi link mnv9Super Todo
+# MNV_TEST_SETUP hi link mnv9This Todo
+# See: https://github.com/Project-Tick/Project-Tick/pull/16476#issuecomment-2635119478
 
 
 class A
diff --git a/uvim/runtime/syntax/testdir/input/vim9_tuples.vim b/uvim/runtime/syntax/testdir/input/mnv9_tuples.mnv
index 2470f38b2f..946a6be1b7 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_tuples.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_tuples.mnv
@@ -1,8 +1,8 @@
-vim9script
-# Vim9 tuples
+mnv9script
+# MNV9 tuples
 
 
-# https://github.com/vim/vim/pull/16935#issuecomment-2738310273
+# https://github.com/Project-Tick/Project-Tick/pull/16935#issuecomment-2738310273
 
 function LegacyMakeEntry(key, value) abort
     return (a:key, a:value)
diff --git a/uvim/runtime/syntax/testdir/input/vim9_types.vim b/uvim/runtime/syntax/testdir/input/mnv9_types.mnv
index 97a3636fcb..b68d2a2126 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_types.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_types.mnv
@@ -1,7 +1,7 @@
-vim9script
-# Vim9 types
-# VIM_TEST_SETUP hi link vimTypeAny Todo
-# VIM_TEST_SETUP hi link vim9VariableTypeAny Todo
+mnv9script
+# MNV9 types
+# MNV_TEST_SETUP hi link mnvTypeAny Todo
+# MNV_TEST_SETUP hi link mnv9VariableTypeAny Todo
 
 
 # builtin types (distinct any highlighting)
diff --git a/uvim/runtime/syntax/testdir/input/vim9_types_example_object.vim b/uvim/runtime/syntax/testdir/input/mnv9_types_example_object.mnv
index f5f902db7f..11ac3cd68d 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_types_example_object.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_types_example_object.mnv
@@ -1,5 +1,5 @@
-vim9script
-# Vim9 object type constructor
+mnv9script
+# MNV9 object type constructor
 
 
 # Issue #18677 (No recognition of object<any> types - Aliaksei Budavei)
diff --git a/uvim/runtime/syntax/testdir/input/vim9_types_object.vim b/uvim/runtime/syntax/testdir/input/mnv9_types_object.mnv
index 7cf6eec05a..266aa02c71 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_types_object.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_types_object.mnv
@@ -1,7 +1,7 @@
-vim9script
-# Vim9 object type constructor
-# VIM_TEST_SETUP hi link vimTypeObject Todo
-# VIM_TEST_SETUP hi link vimTypeObjectBracket Title
+mnv9script
+# MNV9 object type constructor
+# MNV_TEST_SETUP hi link mnvTypeObject Todo
+# MNV_TEST_SETUP hi link mnvTypeObjectBracket Title
 
 
 interface I
diff --git a/uvim/runtime/syntax/testdir/input/vim9_variables.vim b/uvim/runtime/syntax/testdir/input/mnv9_variables.mnv
index 7344db8ce1..8e307f060f 100644
--- a/uvim/runtime/syntax/testdir/input/vim9_variables.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv9_variables.mnv
@@ -1,5 +1,5 @@
-vim9script
-# Vim9 variable highlighting
+mnv9script
+# MNV9 variable highlighting
 
 
 # Declarations
@@ -259,7 +259,7 @@ for k in keys(t:) | echo t:[k] | endfor
 for k in keys(g:) | echo g:[k] | endfor
 for k in keys(v:) | echo v:[k] | endfor
 
-# Neovim-specific variables (not highlighted by default)
+# Neomnv-specific variables (not highlighted by default)
 
 echo v:lua v:msgpack_types v:relnum v:stderr v:termrequest v:virtnum
 
diff --git a/uvim/runtime/syntax/testdir/input/vim_comment_strings.vim b/uvim/runtime/syntax/testdir/input/mnv_comment_strings.mnv
index 0626403941..11707b045a 100644
--- a/uvim/runtime/syntax/testdir/input/vim_comment_strings.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_comment_strings.mnv
@@ -1,5 +1,5 @@
-" Vim comment strings
-" VIM_TEST_SETUP let g:vimsyn_comment_strings = v:true
+" MNV comment strings
+" MNV_TEST_SETUP let g:mnvsyn_comment_strings = v:true
 
 
 " pre "string" post
diff --git a/uvim/runtime/syntax/testdir/input/vim_comments.vim b/uvim/runtime/syntax/testdir/input/mnv_comments.mnv
index 6c1f990a05..6bfa03aec3 100644
--- a/uvim/runtime/syntax/testdir/input/vim_comments.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_comments.mnv
@@ -1,4 +1,4 @@
-" Vim comments
+" MNV comments
 
 
 " Legacy-script comment
@@ -11,17 +11,17 @@ function! Foo()
 endfunction
 
 def! Bar()
-  # Vim9-script comment
+  # MNV9-script comment
   "useless string" # comment
 enddef
 
 command -nargs=1 FooCommand {
-  # Vim9-script comment
+  # MNV9-script comment
   "useless string" # comment
 }
 
 autocmd BufNewFile * {
-  # Vim9-script comment
+  # MNV9-script comment
   "useless string" # comment
 }
 
@@ -74,10 +74,10 @@ enddef
 
 
 " PR: #19390
-" https://github.com/vim/vim/pull/19390#issue-3933755846
+" https://github.com/Project-Tick/Project-Tick/pull/19390#issue-3933755846
 
 def CommentTitle2()
-  # E1234: should not have vim9CommentTitle on 'E1234:'
-  # ERR34: should have vim9CommentTitle on 'ERR34:'
+  # E1234: should not have mnv9CommentTitle on 'E1234:'
+  # ERR34: should have mnv9CommentTitle on 'ERR34:'
 enddef
 
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_abbreviate.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_abbreviate.mnv
index 5965311e82..c40b47e229 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_abbreviate.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_abbreviate.mnv
@@ -1,7 +1,7 @@
-" Vim :abbreviate commands
-" VIM_TEST_SETUP hi link vimMapLhs Identifier
-" VIM_TEST_SETUP hi link vimMapRhs Todo
-" VIM_TEST_SETUP hi link vimMapRhsContinue Todo
+" MNV :abbreviate commands
+" MNV_TEST_SETUP hi link mnvMapLhs Identifier
+" MNV_TEST_SETUP hi link mnvMapRhs Todo
+" MNV_TEST_SETUP hi link mnvMapRhsContinue Todo
 
 
 abbrev <buffer> foo foobar
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_at.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_at.mnv
index 5994088ec2..c0674a4945 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_at.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_at.mnv
@@ -1,4 +1,4 @@
-" Vim :@ command
+" MNV :@ command
 
 
 @0
@@ -32,7 +32,7 @@
 @a " comment
 
 
-def Vim9Context()
+def MNV9Context()
   :@0
   :@1
   :@2
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_augroup.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_augroup.mnv
index 3f43a7553e..c5a34ea9ba 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_augroup.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_augroup.mnv
@@ -1,7 +1,7 @@
-" Vim :augroup command
-" VIM_TEST_SETUP let g:vimsyn_folding = "a"
-" VIM_TEST_SETUP setl fdc=2 fdl=999 fdm=syntax
-" VIM_TEST_SETUP hi link vimAugroupName Todo
+" MNV :augroup command
+" MNV_TEST_SETUP let g:mnvsyn_folding = "a"
+" MNV_TEST_SETUP setl fdc=2 fdl=999 fdm=syntax
+" MNV_TEST_SETUP hi link mnvAugroupName Todo
 
 
 augroup foo
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_autocmd.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_autocmd.mnv
index 2216a427ec..e864479641 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_autocmd.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_autocmd.mnv
@@ -1,6 +1,6 @@
-" Vim :autocmd command
-" VIM_TEST_SETUP hi link vimAutoCmdGroup Todo
-" VIM_TEST_SETUP hi link vimUserAutoEvent Title
+" MNV :autocmd command
+" MNV_TEST_SETUP hi link mnvAutoCmdGroup Todo
+" MNV_TEST_SETUP hi link mnvUserAutoEvent Title
 
 
 " Define
@@ -99,10 +99,10 @@ autocmd foogroup BufRead *.txt
 
 " Multiple patterns
 
-autocmd BufRead *.txt,*.vim,*.c      echo "Foo" | echo "Bar"
-autocmd BufRead <buffer>,*.vim,*.c   echo "Foo" | echo "Bar"
+autocmd BufRead *.txt,*.mnv,*.c      echo "Foo" | echo "Bar"
+autocmd BufRead <buffer>,*.mnv,*.c   echo "Foo" | echo "Bar"
 autocmd BufRead *.txt,<buffer>,*.c   echo "Foo" | echo "Bar"
-autocmd BufRead *.txt,*.vim,<buffer> echo "Foo" | echo "Bar"
+autocmd BufRead *.txt,*.mnv,<buffer> echo "Foo" | echo "Bar"
 
 autocmd BufRead <buffer=1>,<buffer=2>,<buffer=3> echo "Foo" | echo "Bar"
 
@@ -245,8 +245,8 @@ au BufRead */*.[^-t-]xt
 au BufRead */*.[\^]xt
 au BufRead */*.[^^]xt
 
-au BufRead */*.txt,*/*.vim
-au BufRead */*.{txt,vim}
+au BufRead */*.txt,*/*.mnv
+au BufRead */*.{txt,mnv}
 au BufRead */*.{t{x,t},v{i,m}}
 
 " literal
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_behave.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_behave.mnv
index 6f5e5ec124..7f06fe6076 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_behave.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_behave.mnv
@@ -1,4 +1,4 @@
-" Vim :behave command
+" MNV :behave command
 
 
 behave mswin
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_breakpoint_commands.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_breakpoint_commands.mnv
index 565cea3258..671646908c 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_breakpoint_commands.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_breakpoint_commands.mnv
@@ -1,9 +1,9 @@
-" Vim :break* commands
-" VIM_TEST_SETUP hi link vimBreakpointNumber Number
-" VIM_TEST_SETUP hi link vimBreakpointFunctionLine Number
-" VIM_TEST_SETUP hi link vimBreakpointFileLine Number
-" VIM_TEST_SETUP hi link vimBreakpointFilename Identifier
-" VIM_TEST_SETUP hi link vimBreakpointFunction Type
+" MNV :break* commands
+" MNV_TEST_SETUP hi link mnvBreakpointNumber Number
+" MNV_TEST_SETUP hi link mnvBreakpointFunctionLine Number
+" MNV_TEST_SETUP hi link mnvBreakpointFileLine Number
+" MNV_TEST_SETUP hi link mnvBreakpointFilename Identifier
+" MNV_TEST_SETUP hi link mnvBreakpointFunction Type
 
 
 breakadd func Foo
@@ -40,7 +40,7 @@ function Foo()
   breakdel file 42 foo.txt
 endfunction
 
-def Vim9Context()
+def MNV9Context()
   breakadd func Foo
   breakadd func 42 Foo
   breakadd file foo.txt
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_call.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_call.mnv
index 809a4103f3..5e2a8caf9f 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_call.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_call.mnv
@@ -1,4 +1,4 @@
-" Vim :call command
+" MNV :call command
 
 
 " Functions with same-named Ex commands
diff --git a/uvim/runtime/syntax/testdir/input/mnv_ex_catch.mnv b/uvim/runtime/syntax/testdir/input/mnv_ex_catch.mnv
new file mode 100644
index 0000000000..20bf351551
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_catch.mnv
@@ -0,0 +1,19 @@
+" MNV :catch command
+
+
+" :help :catch
+
+catch /^MNV:Interrupt$/		" catch interrupts (CTRL-C)
+catch /^MNV\%((\a\+)\)\=:E/	" catch all MNV errors
+catch /^MNV\%((\a\+)\)\=:/	" catch errors and interrupts
+catch /^MNV(write):/		" catch all errors in :write
+catch /^MNV\%((\a\+)\)\=:E123:/	" catch error E123
+catch /my-exception/		" catch user exception
+catch /.*/			" catch everything
+catch				" same as /.*/
+
+" :help :try
+
+try | sleep 100 | catch /^MNV:Interrupt$/ | endtry
+try | edit | catch /^MNV(edit):E\d\+/ | echo "error" | endtry
+
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_cd.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_cd.mnv
index 21adc31615..6ed6f779e6 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_cd.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_cd.mnv
@@ -1,5 +1,5 @@
-" Vim :cd commands
-" VIM_TEST_SETUP hi link vimCdArg Todo
+" MNV :cd commands
+" MNV_TEST_SETUP hi link mnvCdArg Todo
 
 
 cd
@@ -99,7 +99,7 @@ tchdir  foo " comment
 tchdir! foo " comment
 
 
-" Issue #17964 (Vim script highlight: endif is not highlighted after lcd)
+" Issue #17964 (MNV script highlight: endif is not highlighted after lcd)
 
 def LcdBack()
     if get(g:, "lcd", 0)
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_command.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_command.mnv
index a2f01a708e..79ac94b702 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_command.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_command.mnv
@@ -1,6 +1,6 @@
-" Vim :command, :delcommand and :comclear commands
-" VIM_TEST_SETUP hi link vimUserCmdName Todo
-" VIM_TEST_SETUP hi link vimDelcommandName Todo
+" MNV :command, :delcommand and :comclear commands
+" MNV_TEST_SETUP hi link mnvUserCmdName Todo
+" MNV_TEST_SETUP hi link mnvDelcommandName Todo
 
 
 " List
@@ -133,12 +133,12 @@ comclear " comment
 comclear | echo "Foo"
 
 
-" Issue #14135 (vim.vim syntax highlighting broken wrt system())
+" Issue #14135 (mnv.mnv syntax highlighting broken wrt system())
 
 com Foo call system('ls')
 
 
-" Issue #17001 (Wrong vimUserCmdAttrError highlighting in vim.vim)
+" Issue #17001 (Wrong mnvUserCmdAttrError highlighting in mnv.mnv)
 
 command! -bang -nargs=* -complete=file Make AsyncRun -program=make @ <args>
 
@@ -170,9 +170,9 @@ command! Foo
       \ echo "Foo"
 
 
-" Issue #18414 (Syntax group vimUserCmdReplacement lacking a keepend?)
+" Issue #18414 (Syntax group mnvUserCmdReplacement lacking a keepend?)
 
-def Vim9Context()
+def MNV9Context()
   command! MyFunction MyFunc()
   # I am a comment
 
@@ -189,7 +189,7 @@ command! ToggleWrap setlocal wrap!
 
 " Issue #18448 (comment for subsequent command is not highlighted)
 
-def Vim9Context()
+def MNV9Context()
   command! -nargs=1 -complete=file Rg :term rg <args>
   # command! -nargs=1 -complete=file Rg :term ++shell rg <args>
 enddef
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_command_modifiers.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_command_modifiers.mnv
index 64b4782f69..5c4443a667 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_command_modifiers.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_command_modifiers.mnv
@@ -1,4 +1,4 @@
-" Vim Ex command modifiers
+" MNV Ex command modifiers
 
 
  aboveleft        echo "Foo"
@@ -30,7 +30,7 @@ topleft           echo "Foo"
 unsilent          echo "Foo"
 verbose           echo "Foo"
 vertical          echo "Foo"
-vim9cmd           echo "Foo"
+mnv9cmd           echo "Foo"
 
 
 :  aboveleft       echo "Foo"
@@ -65,7 +65,7 @@ vim9cmd           echo "Foo"
 :unsilent          echo "Foo"
 :verbose           echo "Foo"
 :vertical          echo "Foo"
-:vim9cmd           echo "Foo"
+:mnv9cmd           echo "Foo"
 
 
 echo|aboveleft           echo "Foo"
@@ -99,10 +99,10 @@ echo | topleft           echo "Foo"
 echo | unsilent          echo "Foo"
 echo | verbose           echo "Foo"
 echo | vertical          echo "Foo"
-echo | vim9cmd           echo "Foo"
+echo | mnv9cmd           echo "Foo"
 
 
-aboveleft belowright botright browse confirm filter /pattern/ filter! /pattern/ hide horizontal keepalt keepjumps keepmarks keeppatterns leftabove legacy lockmarks noautocmd noswapfile rightbelow sandbox silent silent! tab topleft unsilent verbose vertical vim9cmd echo "Foo"
+aboveleft belowright botright browse confirm filter /pattern/ filter! /pattern/ hide horizontal keepalt keepjumps keepmarks keeppatterns leftabove legacy lockmarks noautocmd noswapfile rightbelow sandbox silent silent! tab topleft unsilent verbose vertical mnv9cmd echo "Foo"
 aboveleft
       \ belowright
       \ botright
@@ -130,6 +130,6 @@ aboveleft
       \ unsilent
       \ verbose
       \ vertical
-      \ vim9cmd
+      \ mnv9cmd
       \ echo "Foo"
 
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_commands.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_commands.mnv
index 96199acbb5..a573f6a4b1 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_commands.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_commands.mnv
@@ -204,7 +204,7 @@
 :grep
 :grepadd
 :gui
-:gvim
+:gmnv
 :hardcopy
 :help
 :helpclose
@@ -303,8 +303,8 @@
 :lua
 :luado
 :luafile
-:lvimgrep
-:lvimgrepadd
+:lmnvgrep
+:lmnvgrepadd
 :lwindow
 :move
 :mark
@@ -319,7 +319,7 @@
 :mkexrc
 :mksession
 :mkspell
-:mkvimrc
+:mkmnvrc
 :mkview
 :mode
 :mzscheme
@@ -417,7 +417,7 @@
 :rubyfile
 :rundo
 :runtime
-:rviminfo
+:rmnvinfo
 :substitute
 :sNext
 :sandbox
@@ -550,9 +550,9 @@
 :version
 :verbose
 :vertical
-:vim9cmd
-:vimgrep
-:vimgrepadd
+:mnv9cmd
+:mnvgrep
+:mnvgrepadd
 :visual
 :viusage
 :view
@@ -578,7 +578,7 @@
 :wq
 :wqall
 :wundo
-:wviminfo
+:wmnvinfo
 :xit
 :xall
 :xmapclear
@@ -788,7 +788,7 @@ call Foo() | goto
 call Foo() | grep
 call Foo() | grepadd
 call Foo() | gui
-call Foo() | gvim
+call Foo() | gmnv
 call Foo() | hardcopy
 call Foo() | help
 call Foo() | helpclose
@@ -888,8 +888,8 @@ call Foo() | lunmap
 call Foo() | lua
 call Foo() | luado
 call Foo() | luafile
-call Foo() | lvimgrep
-call Foo() | lvimgrepadd
+call Foo() | lmnvgrep
+call Foo() | lmnvgrepadd
 call Foo() | lwindow
 call Foo() | move
 call Foo() | mark
@@ -904,7 +904,7 @@ call Foo() | messages
 call Foo() | mkexrc
 call Foo() | mksession
 call Foo() | mkspell
-call Foo() | mkvimrc
+call Foo() | mkmnvrc
 call Foo() | mkview
 call Foo() | mode
 call Foo() | mzscheme
@@ -1002,7 +1002,7 @@ call Foo() | rubydo
 call Foo() | rubyfile
 call Foo() | rundo
 call Foo() | runtime
-call Foo() | rviminfo
+call Foo() | rmnvinfo
 call Foo() | substitute
 call Foo() | sNext
 call Foo() | sandbox
@@ -1135,9 +1135,9 @@ call Foo() | vglobal/.../
 call Foo() | version
 call Foo() | verbose
 call Foo() | vertical
-call Foo() | vim9cmd
-call Foo() | vimgrep
-call Foo() | vimgrepadd
+call Foo() | mnv9cmd
+call Foo() | mnvgrep
+call Foo() | mnvgrepadd
 call Foo() | visual
 call Foo() | viusage
 call Foo() | view
@@ -1163,7 +1163,7 @@ call Foo() | wprevious
 call Foo() | wq
 call Foo() | wqall
 call Foo() | wundo
-call Foo() | wviminfo
+call Foo() | wmnvinfo
 call Foo() | xit
 call Foo() | xall
 call Foo() | xmapclear
@@ -1178,7 +1178,7 @@ call Foo() | yank
 call Foo() | z
 
 
-" Vim9-script only
+" MNV9-script only
 
 :abstract
 :class
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_debug.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_debug.mnv
index 6c9174c366..cf6b71e85e 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_debug.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_debug.mnv
@@ -1,4 +1,4 @@
-" Vim :debug command
+" MNV :debug command
 
 
 debug echo "..."
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_debuggreedy.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_debuggreedy.mnv
index 27c93a0e6c..3a0f9cf35d 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_debuggreedy.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_debuggreedy.mnv
@@ -1,4 +1,4 @@
-" Vim :debuggreedy command
+" MNV :debuggreedy command
 
 
 debuggreedy
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_def.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_def.mnv
index 7b1d39f4d1..c4d29ba1be 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_def.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_def.mnv
@@ -1,4 +1,4 @@
-" Vim :def command
+" MNV :def command
 
 
 " List
@@ -99,7 +99,7 @@ def Foo(
     z: string = "zed")
 enddef
 
-" Issue #16243 (Vim script def parameters syntax highlight is wrong)
+" Issue #16243 (MNV script def parameters syntax highlight is wrong)
 
 def Test(lines: list<number> = [line('.'), line('.')]): void
 enddef
@@ -108,7 +108,7 @@ enddef
 " Comments
 
 def Foo()
-  # Vim9-script comment
+  # MNV9-script comment
   "useless string"
 enddef
 
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_def_fold.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_def_fold.mnv
index 00aff00e89..30e6b4ae71 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_def_fold.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_def_fold.mnv
@@ -1,6 +1,6 @@
-" Vim :def command
-" VIM_TEST_SETUP let g:vimsyn_folding = "f"
-" VIM_TEST_SETUP setl fdc=2 fdl=999 fdm=syntax
+" MNV :def command
+" MNV_TEST_SETUP let g:mnvsyn_folding = "f"
+" MNV_TEST_SETUP setl fdc=2 fdl=999 fdm=syntax
 
 
 " List
@@ -105,7 +105,7 @@ enddef
 " Comments
 
 def Foo()
-  # Vim9-script comment
+  # MNV9-script comment
   "useless string"
 enddef
 
@@ -144,7 +144,7 @@ enddef
 
 " Issue #15671
 " No recognition of :fun or :def bodies commencing with empty lines if
-" g:vimsyn_folding contains "f"
+" g:mnvsyn_folding contains "f"
 
 def MA1()
 
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_def_nested.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_def_nested.mnv
index 57800ebcd3..18fc4bc1fb 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_def_nested.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_def_nested.mnv
@@ -1,6 +1,6 @@
-vim9script
-# Vim9 :def command (nested)
-# VIM_TEST_SETUP hi link vim9This Todo
+mnv9script
+# MNV9 :def command (nested)
+# MNV_TEST_SETUP hi link mnv9This Todo
 
 
 class Test
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_def_nested_fold.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_def_nested_fold.mnv
index 897d25e50f..a1f55d0701 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_def_nested_fold.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_def_nested_fold.mnv
@@ -1,8 +1,8 @@
-vim9script
-# Vim9 :def command (nested)
-# VIM_TEST_SETUP let g:vimsyn_folding = 'f'
-# VIM_TEST_SETUP setl fdc=2 fdm=syntax
-# VIM_TEST_SETUP hi link vim9This Todo
+mnv9script
+# MNV9 :def command (nested)
+# MNV_TEST_SETUP let g:mnvsyn_folding = 'f'
+# MNV_TEST_SETUP setl fdc=2 fdm=syntax
+# MNV_TEST_SETUP hi link mnv9This Todo
 
 
 class Test
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_def_return_type.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_def_return_type.mnv
index af88721ff4..004f99c011 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_def_return_type.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_def_return_type.mnv
@@ -1,9 +1,9 @@
-vim9script
-# Vim9 function return types
-# VIM_TEST_SETUP hi link vimUserType Todo
+mnv9script
+# MNV9 function return types
+# MNV_TEST_SETUP hi link mnvUserType Todo
 
 
-# Issue #14442 (vim.vim: confusion for function return types starting on another line)
+# Issue #14442 (mnv.mnv: confusion for function return types starting on another line)
 
 def TestA______________________________________________________________():
     \ void
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_defer.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_defer.mnv
index dd74f0c6ef..5db0a26f0d 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_defer.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_defer.mnv
@@ -1,5 +1,5 @@
-" Vim :defer command
-" VIM_TEST_SETUP hi link vimUserFunc Todo
+" MNV :defer command
+" MNV_TEST_SETUP hi link mnvUserFunc Todo
 
 
 function Foo()
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_delfunction.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_delfunction.mnv
index 04c33e9262..910cb4502e 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_delfunction.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_delfunction.mnv
@@ -1,4 +1,4 @@
-" Vim :delfunction command
+" MNV :delfunction command
 
 
 delfunction Foo
@@ -27,7 +27,7 @@ delfunction Foo | echo "Foo"
 delfunction Foo " comment
 
 
-" Issue https://github.com/vim/vim/pull/17420#issuecomment-2927798687
+" Issue https://github.com/Project-Tick/Project-Tick/pull/17420#issuecomment-2927798687
 " (arg named /fu%\[nction]/)
 
 silent! delfunc! func
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_do_commands.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_do_commands.mnv
index a4965940f2..c327cc661e 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_do_commands.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_do_commands.mnv
@@ -1,4 +1,4 @@
-" Vim :*do commands
+" MNV :*do commands
 
 
 argdo  echo "..."
@@ -28,7 +28,7 @@ tabdo echo "..."
 windo echo "..."
 
 
-def Vim9Context()
+def MNV9Context()
   argdo  echo "..."
   argdo! echo "..."
 
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_echo.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_echo.mnv
index 7715df1cbc..7ce2b1287f 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_echo.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_echo.mnv
@@ -1,4 +1,4 @@
-" Vim :echo commands
+" MNV :echo commands
 
 
 echo        "Answer = " 42
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_eval.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_eval.mnv
index e4f629337d..91bba9661b 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_eval.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_eval.mnv
@@ -1,4 +1,4 @@
-" Vim :eval command
+" MNV :eval command
 
 
 eval "Foo"->append(0)
@@ -14,7 +14,7 @@ echo "Foo" | eval "Foo"->append(0)
 
 eval "Foo"->append(0) " comment
 
-def Vim9Context()
+def MNV9Context()
   eval "Foo"->append(0) # comment
 enddef
 
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_execute.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_execute.mnv
index 5f4b7d47e7..683d0a9d33 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_execute.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_execute.mnv
@@ -1,4 +1,4 @@
-" Vim :execute command
+" MNV :execute command
 
 
 " :help :execute
@@ -51,7 +51,7 @@ execute| echo "Foo"
 " trailing comment needs |
 execute "Foo" | " comment
 
-def Vim9Context()
+def MNV9Context()
   # trailing comment allowed
   execute "Foo" # comment
 enddef
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_filetype.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_filetype.mnv
index 8dd153c522..14fcf92c97 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_filetype.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_filetype.mnv
@@ -1,4 +1,4 @@
-" Vim :filetype command
+" MNV :filetype command
 
 
 filetype
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_filter.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_filter.mnv
index 79471c9f9f..276aee25ea 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_filter.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_filter.mnv
@@ -1,5 +1,5 @@
-" Vim :filter command
-" VIM_TEST_SETUP hi link vimCmdSep Operator
+" MNV :filter command
+" MNV_TEST_SETUP hi link mnvCmdSep Operator
 
 
 filter  pa\%(tt\)ern  oldfiles
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_for.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_for.mnv
index d72f6d6fd1..7649d5dfe6 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_for.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_for.mnv
@@ -1,4 +1,4 @@
-" Vim :for command
+" MNV :for command
 
 
 " :for {var} in {object}
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_function.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_function.mnv
index 8a0f398fe2..ef509f62dd 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_function.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_function.mnv
@@ -1,4 +1,4 @@
-" Vim :function command
+" MNV :function command
 
 
 " List
@@ -230,7 +230,7 @@ function Foo(...)
 endfunction
 
 
-" Issue #16243 (Vim script def parameters syntax highlight is wrong)
+" Issue #16243 (MNV script def parameters syntax highlight is wrong)
 
 function Test(lines = [line('.'), line('.')])
 endfunction
@@ -257,7 +257,7 @@ echo "Foo" | function Foo()
 endfunction
 
 
-" Issue https://github.com/vim/vim/pull/17420#issuecomment-2927798687
+" Issue https://github.com/Project-Tick/Project-Tick/pull/17420#issuecomment-2927798687
 " (function named /s:fu%\[nction]/)
 
 func! s:func(_, func)
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_function_def_tail_comment_errors.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_function_def_tail_comment_errors.mnv
index dbcba980b8..020b42d888 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_function_def_tail_comment_errors.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_function_def_tail_comment_errors.mnv
@@ -1,5 +1,5 @@
-" Vim :function and :def tail comment errors
-" VIM_TEST_SETUP unlet! g:vimsyn_folding
+" MNV :function and :def tail comment errors
+" MNV_TEST_SETUP unlet! g:mnvsyn_folding
 
 
 fun s:Test1() abort		# fun
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_function_def_tail_comments.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_function_def_tail_comments.mnv
index a29d3a9988..353e6f68ec 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_function_def_tail_comments.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_function_def_tail_comments.mnv
@@ -1,5 +1,5 @@
-" Vim :function and :def tail comments
-" VIM_TEST_SETUP unlet! g:vimsyn_folding
+" MNV :function and :def tail comments
+" MNV_TEST_SETUP unlet! g:mnvsyn_folding
 
 
 fun s:Test1() abort		" fun
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_function_fold.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_function_fold.mnv
index c64c62de86..20d74929fd 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_function_fold.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_function_fold.mnv
@@ -1,6 +1,6 @@
-" Vim :function command
-" VIM_TEST_SETUP let g:vimsyn_folding = "f"
-" VIM_TEST_SETUP setl fdc=2 fdl=999 fdm=syntax
+" MNV :function command
+" MNV_TEST_SETUP let g:mnvsyn_folding = "f"
+" MNV_TEST_SETUP setl fdc=2 fdl=999 fdm=syntax
 
 
 " List
@@ -232,7 +232,7 @@ function Foo(...)
 endfunction
 
 
-" Issue #16243 (Vim script def parameters syntax highlight is wrong)
+" Issue #16243 (MNV script def parameters syntax highlight is wrong)
 
 function Test(lines = [line('.'), line('.')])
 endfunction
@@ -259,7 +259,7 @@ echo "Foo" | function Foo()
 endfunction
 
 
-" Issue https://github.com/vim/vim/pull/17420#issuecomment-2927798687
+" Issue https://github.com/Project-Tick/Project-Tick/pull/17420#issuecomment-2927798687
 " (function named /s:fu%\[nction]/)
 
 func! s:func(_, func)
@@ -308,7 +308,7 @@ endfunction
 
 " Issue #15671
 " No recognition of :fun or :def bodies commencing with empty lines if
-" g:vimsyn_folding contains "f"
+" g:mnvsyn_folding contains "f"
 
 fun FA1()
 
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_function_nested.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_function_nested.mnv
index 0e0c36a1fa..a0e787a1ab 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_function_nested.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_function_nested.mnv
@@ -1,4 +1,4 @@
-" Vim :def and :function commands (nested)
+" MNV :def and :function commands (nested)
 
 
 def FunA(): string
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_function_nested_fold.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_function_nested_fold.mnv
index a2563b8471..6aa403cb41 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_function_nested_fold.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_function_nested_fold.mnv
@@ -1,6 +1,6 @@
-" Vim :def and :function commands (nested)
-" VIM_TEST_SETUP let g:vimsyn_folding = 'f'
-" VIM_TEST_SETUP setl fdc=2 fdm=syntax
+" MNV :def and :function commands (nested)
+" MNV_TEST_SETUP let g:mnvsyn_folding = 'f'
+" MNV_TEST_SETUP setl fdc=2 fdm=syntax
 
 
 def FunA(): string
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_grep.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_grep.mnv
index 8e4e72df92..9c9ca3def7 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_grep.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_grep.mnv
@@ -1,6 +1,6 @@
-" Vim :*grep and :*grepadd commands
-" VIM_TEST_SETUP hi link vimCmdSep Operator
-" VIM_TEST_SETUP hi link vimGrepBarEscape Special
+" MNV :*grep and :*grepadd commands
+" MNV_TEST_SETUP hi link mnvCmdSep Operator
+" MNV_TEST_SETUP hi link mnvGrepBarEscape Special
 
 
 grep  'pat\|tern' foo.txt
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_help.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_help.mnv
index c673fe6b0a..c673fe6b0a 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_help.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_help.mnv
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_helpgrep.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_helpgrep.mnv
index 8c686de073..27b811c24b 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_helpgrep.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_helpgrep.mnv
@@ -1,5 +1,5 @@
-" Vim :helpgrep command
-" VIM_TEST_SETUP hi link vimHelpgrepPattern Todo
+" MNV :helpgrep command
+" MNV_TEST_SETUP hi link mnvHelpgrepPattern Todo
 
 
 helpgrep :help
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_highlight.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_highlight.mnv
index 1e53e176ce..bb258b40d4 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_highlight.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_highlight.mnv
@@ -1,5 +1,5 @@
-" Vim :highlight command
-" VIM_TEST_SETUP hi link vimHiGroup Todo
+" MNV :highlight command
+" MNV_TEST_SETUP hi link mnvHiGroup Todo
 
 
 " List
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_history.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_history.mnv
index 42dbcabd7d..e3ca50ec46 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_history.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_history.mnv
@@ -1,5 +1,5 @@
-" Vim :history command
-" VIM_TEST_SETUP hi link vimHistoryRange Todo
+" MNV :history command
+" MNV_TEST_SETUP hi link mnvHistoryRange Todo
 
 history		1,9
 history cmd	1,9
@@ -43,7 +43,7 @@ history all 1,9 | echo "..."
 history all 1,9 " comment
 
 
-def Vim9Context()
+def MNV9Context()
   history		1,9
   history cmd		1,9
   history :		1,9
diff --git a/uvim/runtime/syntax/testdir/input/mnv_ex_import.mnv b/uvim/runtime/syntax/testdir/input/mnv_ex_import.mnv
new file mode 100644
index 0000000000..2cdce587f6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_import.mnv
@@ -0,0 +1,119 @@
+" MNV :import command
+" MNV_TEST_SETUP hi link mnvImportName Todo
+
+
+import "foo.mnv"
+impor v:true ? "foo.mnv" : "bar.mnv"
+
+import v:true ?
+      \ "foo.mnv" :
+      \ "bar.mnv"
+
+import v:true
+      \ ? "foo.mnv"
+      \ : "bar.mnv"
+
+import v:true ?
+      "\ comment 
+      \ "foo.mnv" :
+      "\ comment 
+      \ "bar.mnv"
+
+import v:true
+      "\ comment 
+      \ ? "foo.mnv"
+      "\ comment
+      \ : "bar.mnv"
+
+import "foo.mnv" as bar
+import v:true ? "foo.mnv" : "bar.mnv" as baz
+
+import v:true ?
+      \ "foo.mnv" :
+      \ "bar.mnv"
+      \ as baz
+
+import v:true
+      \ ? "foo.mnv"
+      \ : "bar.mnv"
+      \ as baz
+
+import v:true ?
+      "\ comment 
+      \ "foo.mnv" :
+      "\ comment 
+      \ "bar.mnv"
+      "\ comment
+      \ as baz
+
+import v:true
+      "\ comment 
+      \ ? "foo.mnv"
+      "\ comment
+      \ : "bar.mnv"
+      "\ comment
+      \ as baz
+
+echo "Foo" | import "foo.mnv"
+
+
+" autoload
+
+import autoload "foo.mnv"
+import autoload v:true ? "foo.mnv" : "bar.mnv"
+
+import autoload v:true ?
+      \ "foo.mnv" :
+      \ "bar.mnv"
+
+import autoload v:true
+      \ ? "foo.mnv"
+      \ : "bar.mnv"
+
+import autoload v:true ?
+      "\ comment 
+      \"foo.mnv" :
+      "\ comment
+      \ "bar.mnv"
+
+import autoload v:true
+      "\ comment 
+      \ ? "foo.mnv"
+      "\ comment
+      \ : "bar.mnv"
+
+import autoload "foo.mnv" as bar
+import autoload v:true ? "foo.mnv" : "bar.mnv" as baz
+
+import autoload v:true ?
+      \ "foo.mnv" :
+      \ "bar.mnv"
+      \ as baz
+
+import autoload v:true
+      \ ? "foo.mnv"
+      \ : "bar.mnv"
+      \ as baz
+
+import autoload v:true ?
+      "\ comment 
+      \ "foo.mnv" :
+      "\ comment 
+      \ "bar.mnv"
+      "\ comment
+      \ as baz
+
+import autoload v:true
+      "\ comment 
+      \ ? "foo.mnv"
+      "\ comment
+      \ : "bar.mnv"
+      "\ comment
+      \ as baz
+
+
+" "as" keyword in expr
+
+let as = "modules/"
+import v:true ? as .. "foo.mnv" : as .. "bar.mnv" as other
+
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_language.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_language.mnv
index d4742a412f..ba79cb0557 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_language.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_language.mnv
@@ -1,5 +1,5 @@
-" Vim :language command
-" VIM_TEST_SETUP hi link vimLanguageName Todo
+" MNV :language command
+" MNV_TEST_SETUP hi link mnvLanguageName Todo
 
 
 " print commands
@@ -87,7 +87,7 @@ language ctype    de_DE.UTF-8@euro | echo "..."
 language time     de_DE.UTF-8@euro | echo "..."
 language messages de_DE.UTF-8@euro | echo "..."
 
-def Vim9Context()
+def MNV9Context()
 
   # print commands
 
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_let_heredoc.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_let_heredoc.mnv
index 7c45ab5e6a..516053a32e 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_let_heredoc.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_let_heredoc.mnv
@@ -1,6 +1,6 @@
-" Vim :let heredoc command
-" VIM_TEST_SETUP let g:vimsyn_folding = "h"
-" VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
+" MNV :let heredoc command
+" MNV_TEST_SETUP let g:mnvsyn_folding = "h"
+" MNV_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
 
 
 let foo =<< END
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_loadkeymap.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_loadkeymap.mnv
index 853256c911..88fb6e16b1 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_loadkeymap.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_loadkeymap.mnv
@@ -1,4 +1,4 @@
-" Vim :loadkeymap command
+" MNV :loadkeymap command
 
 
 scriptencoding utf-8
@@ -19,8 +19,8 @@ a A    Basic mapping
 c              <char-0103>     Special notation allowed in RHS - octal
 <char-0x0064>  <char-0x0044>   Special notation allowed in LHS and RHS - hexadecimal
 
-" Vim-script comment characters
-# <char-0x00a3>                Line should not match as a Vim9-script comment
+" MNV-script comment characters
+# <char-0x00a3>                Line should not match as a MNV9-script comment
 " Line should not match as a legacy-script comment
 \" “
 : "                            Line should not match as a legacy-script comment
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_bar.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_loadkeymap_after_bar.mnv
index 4f4c5af40f..e0a722e83d 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_bar.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_loadkeymap_after_bar.mnv
@@ -1,4 +1,4 @@
-" Vim :loadkeymap command (after "|")
+" MNV :loadkeymap command (after "|")
 
 
 scriptencoding utf-8
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_colon.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_loadkeymap_after_colon.mnv
index 9500cbd5bc..ee73b87969 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_colon.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_loadkeymap_after_colon.mnv
@@ -1,4 +1,4 @@
-" Vim :loadkeymap command (after ":")
+" MNV :loadkeymap command (after ":")
 
 
 scriptencoding utf-8
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_lua.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_lua.mnv
index 55d151e463..eace6dea3a 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_lua.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_lua.mnv
@@ -1,7 +1,7 @@
-" Vim :lua, :luado and :luafile commands
-" VIM_TEST_SETUP let g:vimsyn_embed = "l"
-" VIM_TEST_SETUP let g:vimsyn_folding = "fl"
-" VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
+" MNV :lua, :luado and :luafile commands
+" MNV_TEST_SETUP let g:mnvsyn_embed = "l"
+" MNV_TEST_SETUP let g:mnvsyn_folding = "fl"
+" MNV_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
 
 
 lua << EOF
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_make.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_make.mnv
index 0ef3046d7d..31bbdace62 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_make.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_make.mnv
@@ -1,6 +1,6 @@
-" Vim :*make commands
-" VIM_TEST_SETUP hi link vimCmdSep Operator
-" VIM_TEST_SETUP hi link vimMakeBarEscape Special
+" MNV :*make commands
+" MNV_TEST_SETUP hi link mnvCmdSep Operator
+" MNV_TEST_SETUP hi link mnvMakeBarEscape Special
 
 
 make
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_map.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_map.mnv
index b7c33ef498..31103f5dd7 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_map.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_map.mnv
@@ -1,7 +1,7 @@
-" Vim :map commands
-" VIM_TEST_SETUP hi link vimMapLhs Identifier
-" VIM_TEST_SETUP hi link vimMapRhs Todo
-" VIM_TEST_SETUP hi link vimMapRhsContinue Todo
+" MNV :map commands
+" MNV_TEST_SETUP hi link mnvMapLhs Identifier
+" MNV_TEST_SETUP hi link mnvMapRhs Todo
+" MNV_TEST_SETUP hi link mnvMapRhsContinue Todo
 
 
 map!
@@ -42,7 +42,7 @@ tmapclear <buffer>
 map _l :!ls <Bar> more^M:echo "rhs"<CR>
 " \|        'b' is not in 'cpoptions'
 map _l :!ls \| more^M:echo "rhs"<CR>
-" ^V|       always, in Vim and Vi
+" ^V|       always, in MNV and Vi
 map _l :!ls | more^M:echo "rhs"<CR>
 
 map lhs :search('foo\\|bar')<CR>:echo "rhs"<CR>
@@ -118,7 +118,7 @@ nnoremap <Leader>bar :echo (
 
 
 " Example:
-"   /autoload/netrw.vim
+"   /autoload/netrw.mnv
 
 if !hasmapto('<Plug>NetrwOpenFile')          |nmap <buffer> <silent> <nowait> %	<Plug>NetrwOpenFile|endif
 
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_mark.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_mark.mnv
index 31df3b2684..59fcb3fb27 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_mark.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_mark.mnv
@@ -1,6 +1,6 @@
-" Vim :mark and :k commands
-" :k not available in Vim9
-" VIM_TEST_SETUP hi link vimMarkArg Todo
+" MNV :mark and :k commands
+" :k not available in MNV9
+" MNV_TEST_SETUP hi link mnvMarkArg Todo
 
 
 mark `
@@ -183,7 +183,7 @@ endfunction
 mark "
 mark ^
 mark .
-" TODO: matches as vimFunc
+" TODO: matches as mnvFunc
 " mark (
 mark )
 mark {
@@ -194,7 +194,7 @@ mark 9
 k"
 k^
 k.
-" TODO: matches as vimFunc
+" TODO: matches as mnvFunc
 " k(
 k)
 k{
@@ -205,7 +205,7 @@ k9
 k "
 k ^
 k .
-" TODO: matches as vimFunc
+" TODO: matches as mnvFunc
 " k (
 k )
 k {
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_match.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_match.mnv
index 473cfb366f..7866631e02 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_match.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_match.mnv
@@ -1,4 +1,4 @@
-" Vim :match command
+" MNV :match command
 
 
 match FooGroup /Foo/
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_menu.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_menu.mnv
index 87098e031c..e0981ef46a 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_menu.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_menu.mnv
@@ -1,4 +1,4 @@
-" Vim :menu commands
+" MNV :menu commands
 
 
 " :help disable menus
@@ -29,7 +29,7 @@ function Foo()
 endfunction
 
 
-" Example: runtime/menu.vim (modified)
+" Example: runtime/menu.mnv (modified)
 an <silent> 10.330 &File.&Close<Tab>:close :confirm close<CR>
 
 an <silent> 10.330 &File.&Close<Tab>:close
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_menutranslate.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_menutranslate.mnv
index 8986cd36a7..81e67b1bf9 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_menutranslate.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_menutranslate.mnv
@@ -1,4 +1,4 @@
-" Vim :menutranslate command
+" MNV :menutranslate command
 
 
 menutranslate clear
diff --git a/uvim/runtime/syntax/testdir/input/mnv_ex_mnvgrep.mnv b/uvim/runtime/syntax/testdir/input/mnv_ex_mnvgrep.mnv
new file mode 100644
index 0000000000..a790ba1141
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_mnvgrep.mnv
@@ -0,0 +1,69 @@
+" MNV :*mnvgrep and :*mnvgrepadd commands
+" MNV_TEST_SETUP hi link mnvMNVgrepFile Todo
+" MNV_TEST_SETUP hi link mnvCmdSep Operator
+" MNV_TEST_SETUP hi link mnvMNVgrepBarEscape Special
+
+
+mnvgrep pa\%(tt\)ern   foo.txt
+mnvgrep /pa\%(tt\)ern/ foo.txt
+
+mnvgrep! pa\%(tt\)ern   foo.txt
+mnvgrep! /pa\%(tt\)ern/ foo.txt
+
+mnvgrep /pa\%(tt\)ern/gjf foo.txt
+
+" trailing bar, no tail comment
+mnvgrep /pa\%(t|t\)ern/ b\|a\|r.txt | echo "Foo"
+mnvgrep /pa\%(t"t\)ern/ b"a"r.txt   | echo "Foo"
+
+mnvgrepadd pa\%(tt\)ern   foo.txt
+mnvgrepadd /pa\%(tt\)ern/ foo.txt
+
+mnvgrepadd! pa\%(tt\)ern   foo.txt
+mnvgrepadd! /pa\%(tt\)ern/ foo.txt
+
+mnvgrepadd /pa\%(tt\)ern/gjf foo.txt
+
+" trailing bar, no tail comment
+mnvgrepadd /pa\%(t|t\)ern/ b\|a\|r.txt | echo "Foo"
+mnvgrepadd /pa\%(t"t\)ern/ b"a"r.txt   | echo "Foo"
+
+lmnvgrep pa\%(tt\)ern   foo.txt
+lmnvgrep /pa\%(tt\)ern/ foo.txt
+
+lmnvgrep! pa\%(tt\)ern   foo.txt
+lmnvgrep! /pa\%(tt\)ern/ foo.txt
+
+lmnvgrep /pa\%(tt\)ern/gjf foo.txt
+
+" trailing bar, no tail comment
+lmnvgrep /pa\%(t|t\)ern/ b\|a\|r.txt | echo "Foo"
+lmnvgrep /pa\%(t"t\)ern/ b"a"r.txt   | echo "Foo"
+
+lmnvgrepadd pa\%(tt\)ern   foo.txt
+lmnvgrepadd /pa\%(tt\)ern/ foo.txt
+
+lmnvgrepadd! pa\%(tt\)ern   foo.txt
+lmnvgrepadd! /pa\%(tt\)ern/ foo.txt
+
+lmnvgrepadd /pa\%(tt\)ern/gjf foo.txt
+
+" trailing bar, no tail comment
+lmnvgrepadd /pa\%(t|t\)ern/ b\|a\|r.txt | echo "Foo"
+lmnvgrepadd /pa\%(t"t\)ern/ b"a"r.txt   | echo "Foo"
+
+
+" file args
+
+" multiple files
+mnvgrep pa\%(tt\)ern   foo.txt bar.txt
+mnvgrep /pa\%(tt\)ern/ foo.txt bar.txt
+
+" wildcard patterns
+mnvgrep pa\%(tt\)ern   **/*.txt
+mnvgrep /pa\%(tt\)ern/ **/*.txt
+
+" special filename characters
+mnvgrep pa\%(tt\)ern   %
+mnvgrep /pa\%(tt\)ern/ %
+
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_mzscheme.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_mzscheme.mnv
index 6844c49f76..1e2dd6c469 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_mzscheme.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_mzscheme.mnv
@@ -1,7 +1,7 @@
-" Vim :mzscheme and :mzfile commands
-" VIM_TEST_SETUP let g:vimsyn_embed = "m"
-" VIM_TEST_SETUP let g:vimsyn_folding = "fm"
-" VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
+" MNV :mzscheme and :mzfile commands
+" MNV_TEST_SETUP let g:mnvsyn_embed = "m"
+" MNV_TEST_SETUP let g:mnvsyn_folding = "fm"
+" MNV_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
 
 
 lua << EOF
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_normal.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_normal.mnv
index 6bd73982bc..7a58cb31ba 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_normal.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_normal.mnv
@@ -1,4 +1,4 @@
-" Vim :normal command
+" MNV :normal command
 
 
 normal j
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_perl.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_perl.mnv
index cccab1892b..a7eceedbc9 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_perl.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_perl.mnv
@@ -1,7 +1,7 @@
-" Vim :perl and :perldo commands
-" VIM_TEST_SETUP let g:vimsyn_embed = "p"
-" VIM_TEST_SETUP let g:vimsyn_folding = "fp"
-" VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
+" MNV :perl and :perldo commands
+" MNV_TEST_SETUP let g:mnvsyn_embed = "p"
+" MNV_TEST_SETUP let g:mnvsyn_folding = "fp"
+" MNV_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
 
 
 lua << EOF
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_profile.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_profile.mnv
index ba80aaab7f..38df8fced6 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_profile.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_profile.mnv
@@ -1,4 +1,4 @@
-" Vim :profile and :profdel commands
+" MNV :profile and :profdel commands
 
 
 profile  start /tmp/myprofile
@@ -6,12 +6,12 @@ profile  stop
 profile  pause
 profile  continue
 profile  func MyFunc
-profile  file MyScript.vim 
-profile! file MyScript.vim
+profile  file MyScript.mnv 
+profile! file MyScript.mnv
 profile  dump
 
 profdel  func MyFunc
-profdel  file MyScript.vim
+profdel  file MyScript.mnv
 profdel  here
 
 
@@ -22,12 +22,12 @@ profile  stop                 " comment
 profile  pause                " comment
 profile  continue             " comment
 profile  func MyFunc          " comment
-profile  file MyScript.vim    " comment
-profile! file MyScript.vim    " comment
+profile  file MyScript.mnv    " comment
+profile! file MyScript.mnv    " comment
 profile  dump                 " comment
 
 profdel  func MyFunc          " comment
-profdel  file MyScript.vim    " comment
+profdel  file MyScript.mnv    " comment
 profdel  here                 " comment
 
 
@@ -38,11 +38,11 @@ profile  stop                 | echo "Foo"
 profile  pause                | echo "Foo"
 profile  continue             | echo "Foo"
 profile  func MyFunc          | echo "Foo"
-profile  file MyScript.vim    | echo "Foo"
-profile! file MyScript.vim    | echo "Foo"
+profile  file MyScript.mnv    | echo "Foo"
+profile! file MyScript.mnv    | echo "Foo"
 profile  dump                 | echo "Foo"
 
 profdel  func MyFunc          | echo "Foo"
-profdel  file MyScript.vim    | echo "Foo"
+profdel  file MyScript.mnv    | echo "Foo"
 profdel  here                 | echo "Foo"
 
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_prompt_commands.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_prompt_commands.mnv
index 1f15313155..d02246add2 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_prompt_commands.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_prompt_commands.mnv
@@ -1,4 +1,4 @@
-" Vim :prompt{find,repl} commands
+" MNV :prompt{find,repl} commands
 
 
 promptfind foo
@@ -22,7 +22,7 @@ promptfind foo " more search string
 promptfind foo | more search string
 
 
-def Vim9Context()
+def MNV9Context()
   promptfind foo
   promptrepl foo
 
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_python.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_python.mnv
index 8adc0e7ea7..4e92e9af3f 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_python.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_python.mnv
@@ -1,9 +1,9 @@
-" Vim :python, :pydo and :pyfile commands
-" Vim :python3, :py3do and :py3file commands
-" Vim :pythonx, :pyxdo and :pyxfile commands
-" VIM_TEST_SETUP let g:vimsyn_embed = "P"
-" VIM_TEST_SETUP let g:vimsyn_folding = "fP"
-" VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
+" MNV :python, :pydo and :pyfile commands
+" MNV :python3, :py3do and :py3file commands
+" MNV :pythonx, :pyxdo and :pyxfile commands
+" MNV_TEST_SETUP let g:mnvsyn_embed = "P"
+" MNV_TEST_SETUP let g:mnvsyn_folding = "fP"
+" MNV_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
 
 
 lua << EOF
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_range.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_range.mnv
index 88e7ad4715..88e7ad4715 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_range.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_range.mnv
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_redir.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_redir.mnv
index 2b5319aa57..1bc2c8a1b1 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_redir.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_redir.mnv
@@ -1,4 +1,4 @@
-" Vim :redir command
+" MNV :redir command
 
 
 redir  > filename
@@ -47,7 +47,7 @@ redir END
 
 " Issue #18319 (redir command not highlighted in some cases)
 
-def Vim9Context()
+def MNV9Context()
 
 var foo: string
 if true
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_ruby.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_ruby.mnv
index 32a39de46b..8a872640b9 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_ruby.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_ruby.mnv
@@ -1,7 +1,7 @@
-" Vim :ruby, :rubydo and :rubyfile commands
-" VIM_TEST_SETUP let g:vimsyn_embed = "r"
-" VIM_TEST_SETUP let g:vimsyn_folding = "fr"
-" VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
+" MNV :ruby, :rubydo and :rubyfile commands
+" MNV_TEST_SETUP let g:mnvsyn_embed = "r"
+" MNV_TEST_SETUP let g:mnvsyn_folding = "fr"
+" MNV_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
 
 
 lua << EOF
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_set.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_set.mnv
index 379f8065ea..3ce3efa3b9 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_set.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_set.mnv
@@ -1,4 +1,4 @@
-" Vim :set command
+" MNV :set command
 
 
 set
@@ -18,7 +18,7 @@ set invallowrevins
 
 set aleph&
 set aleph&vi
-set aleph&vim
+set aleph&mnv
 
 set all&
 
@@ -118,7 +118,7 @@ set quoteescape=\
 echo "Foo"
 
 
-" Issue #16913 (vim syntax: set langmap may have wrong highlight)
+" Issue #16913 (mnv syntax: set langmap may have wrong highlight)
 
 set langmap+=ФЫВАПРОЛДЖЭЁ;ASDFGHJKL\\:\\"\\|
 set langmap+=ЯЧСМИТЬБЮ;ZXCVBNM<>
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_set_backslash.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_set_backslash.mnv
index 53851a7693..161e8b1230 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_set_backslash.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_set_backslash.mnv
@@ -1,8 +1,8 @@
-" Vim :set command (escaped characters)
-" VIM_TEST_SETUP hi link vimSetEscape      DiffAdd
-" VIM_TEST_SETUP hi link vimSetBarEscape   DiffDelete
-" VIM_TEST_SETUP hi link vimSetQuoteEscape DiffDelete
-" VIM_TEST_SETUP hi link vimSetEqual       DiffChange
+" MNV :set command (escaped characters)
+" MNV_TEST_SETUP hi link mnvSetEscape      DiffAdd
+" MNV_TEST_SETUP hi link mnvSetBarEscape   DiffDelete
+" MNV_TEST_SETUP hi link mnvSetQuoteEscape DiffDelete
+" MNV_TEST_SETUP hi link mnvSetEqual       DiffChange
 
 
 echo "-- 1 --"
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_sleep.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_sleep.mnv
index 534550c503..ffc731caf9 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_sleep.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_sleep.mnv
@@ -1,4 +1,4 @@
-" Vim :sleep command
+" MNV :sleep command
 
 
 sleep	     " sleep for one second
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_sort.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_sort.mnv
index 97d030dfd3..b7160c89c6 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_sort.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_sort.mnv
@@ -1,5 +1,5 @@
-" Vim :sort command
-" VIM_TEST_SETUP hi link vimCmdSep Operator
+" MNV :sort command
+" MNV_TEST_SETUP hi link mnvCmdSep Operator
 
 
 sort 
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_substitute.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_substitute.mnv
index 983b39d044..a57d577c5d 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_substitute.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_substitute.mnv
@@ -1,4 +1,4 @@
-" Vim :substitute command
+" MNV :substitute command
 
 
 substitute/foo/bar/&
@@ -50,7 +50,7 @@ s$/$//$ " comment
 s%/%//% " comment
 s&/&//& " comment
 s'/'//' " comment
-" FIXME - matches vimUserFunc
+" FIXME - matches mnvUserFunc
 " s(/(//( " comment
 s)/)//) " comment
 s*/*//* " comment
@@ -84,7 +84,7 @@ s $/$//$ " comment
 s %/%//% " comment
 s &/&//& " comment
 s '/'//' " comment
-" FIXME - matches vimUserFunc
+" FIXME - matches mnvUserFunc
 " s (/(//( " comment
 s )/)//) " comment
 s */*//* " comment
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_syntax.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_syntax.mnv
index 851931206c..4b9d81c1ac 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_syntax.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_syntax.mnv
@@ -1,5 +1,5 @@
-" Vim :syntax command
-" VIM_TEST_SETUP hi link vimGroupList Todo
+" MNV :syntax command
+" MNV_TEST_SETUP hi link mnvGroupList Todo
 
 
 " :syn-case
@@ -29,8 +29,8 @@ syntax foldlevel minimum
 
 " :syn-include
 
-syntax include @Foo <sfile>:p:h/foo.vim
-syntax include <sfile>:p:h/foo.vim
+syntax include @Foo <sfile>:p:h/foo.mnv
+syntax include <sfile>:p:h/foo.mnv
 
 " :syn-iskeyword
 
@@ -307,7 +307,7 @@ syn keyword testKeyword
 
 " leaking contained groups
 
-" Example: runtime/syntax/zsh.vim
+" Example: runtime/syntax/zsh.mnv
 "   "cluster" should not be highlighted outside of :syntax commands
 
 function! s:ContainedGroup()
@@ -319,7 +319,7 @@ function! s:ContainedGroup()
 endfunction
 
 
-" early termination of vimSynRegion
+" early termination of mnvSynRegion
 
 syn region testRegion
       "\ | does not end the args region
@@ -328,13 +328,13 @@ syn region testRegion
       \ end="end"
 
 
-" Issue #18491 (Two ")"s are incorrectly colored 'vimOperError' in syntax/mail.vim)
+" Issue #18491 (Two ")"s are incorrectly colored 'mnvOperError' in syntax/mail.mnv)
 
 syn match	mailHeaderKey	contained contains=mailHeaderEmail,mailEmail,@NoSpell "\v(^(\> ?)*)@<=(from|reply-to):.*$" fold
 
 
 " Issue #19366 (highlight error for contains elements in a new line)
-" syntax/typst.vim
+" syntax/typst.mnv
 
 " Code {{{1
 syntax cluster typstCode
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_syntime.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_syntime.mnv
index b085480532..a2065d4c78 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_syntime.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_syntime.mnv
@@ -1,4 +1,4 @@
-" Vim :syntime command
+" MNV :syntime command
 
 
 syntime on
@@ -18,7 +18,7 @@ syntime report | echo "..."
 syntime report " comment
 
 
-def Vim9Context()
+def MNV9Context()
   syntime on
   syntime off
   syntime clear
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_tcl.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_tcl.mnv
index 2558bb8b97..cda19e6fe5 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_tcl.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_tcl.mnv
@@ -1,7 +1,7 @@
-" Vim :tcl, :tcldo and :tclfile commands
-" VIM_TEST_SETUP let g:vimsyn_embed = "t"
-" VIM_TEST_SETUP let g:vimsyn_folding = "ft"
-" VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
+" MNV :tcl, :tcldo and :tclfile commands
+" MNV_TEST_SETUP let g:mnvsyn_embed = "t"
+" MNV_TEST_SETUP let g:mnvsyn_folding = "ft"
+" MNV_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
 
 
 lua << EOF
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_terminal.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_terminal.mnv
index 8fc6e04a11..289e2e51fb 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_terminal.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_terminal.mnv
@@ -1,5 +1,5 @@
-" Vim :terminal command
-" VIM_TEST_SETUP hi link vimTerminalCommand Todo
+" MNV :terminal command
+" MNV_TEST_SETUP hi link mnvTerminalCommand Todo
 
 
 terminal
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_throw.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_throw.mnv
index c64afc8d71..53b919d683 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_throw.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_throw.mnv
@@ -1,4 +1,4 @@
-" Vim :throw command
+" MNV :throw command
 
 
 " :help :throw
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_uniq.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_uniq.mnv
index d7aacc2b2e..3279449e06 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_uniq.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_uniq.mnv
@@ -1,5 +1,5 @@
-" Vim :uniq command
-" VIM_TEST_SETUP hi link vimCmdSep Operator
+" MNV :uniq command
+" MNV_TEST_SETUP hi link mnvCmdSep Operator
 
 
 uniq 
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_wincmd.vim b/uvim/runtime/syntax/testdir/input/mnv_ex_wincmd.mnv
index 68fac3ae44..701f5bd0ff 100644
--- a/uvim/runtime/syntax/testdir/input/vim_ex_wincmd.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_ex_wincmd.mnv
@@ -1,6 +1,6 @@
-" Vim :wincmd command
-" VIM_TEST_SETUP hi link vimWincmdArg Todo
-" VIM_TEST_SETUP hi link vimCmdSep Special
+" MNV :wincmd command
+" MNV_TEST_SETUP hi link mnvWincmdArg Todo
+" MNV_TEST_SETUP hi link mnvCmdSep Special
 
 
 wincmd s
@@ -55,7 +55,7 @@ wincmd s | echo "Foo"
 wincmd s " comment
 
 
-def Vim9Context()
+def MNV9Context()
   var wincmd = 42
   wincmd = 42
   :wincmd =
diff --git a/uvim/runtime/syntax/testdir/input/vim_expressions.vim b/uvim/runtime/syntax/testdir/input/mnv_expressions.mnv
index ae146c021e..ba4f7de153 100644
--- a/uvim/runtime/syntax/testdir/input/vim_expressions.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_expressions.mnv
@@ -1,4 +1,4 @@
-" Vim expressions
+" MNV expressions
 
 
 " String
@@ -45,8 +45,8 @@ echo '''foo'
 echo 'foo'''
 echo 'foo''bar'
 
-" Unreported issue (incorrectly matches as vimString vimMark vimOper NONE)
-" https://github.com/tpope/vim-unimpaired/blob/6d44a6dc2ec34607c41ec78acf81657248580bf1/plugin/unimpaired.vim#L232
+" Unreported issue (incorrectly matches as mnvString mnvMark mnvOper NONE)
+" https://github.com/tpope/mnv-unimpaired/blob/6d44a6dc2ec34607c41ec78acf81657248580bf1/plugin/unimpaired.mnv#L232
 let cmd = 'put!=repeat(nr2char(10), v:count1)|silent '']+'
 
 
@@ -168,7 +168,7 @@ echo [1,
       \]
 echo [1, 'two', 1 + 2, "fo" .. "ur"]
 
-" Issue #5830 (Incorrect syntax highlighting in Vim script when omitting space in list of string)
+" Issue #5830 (Incorrect syntax highlighting in MNV script when omitting space in list of string)
 let l = ['a','b','c']
 
 " Dictionary
@@ -370,7 +370,7 @@ echo expr !~?    expr
 echo expr is?    expr
 echo expr isnot? expr
 
-" Unreported issue ("is" incorrectly matches as "echo vimNumber *vimCommand* vimNumber")
+" Unreported issue ("is" incorrectly matches as "echo mnvNumber *mnvCommand* mnvNumber")
 echo 42 is 42
 
 " Line continuation
@@ -399,12 +399,12 @@ let foo = foo +
 call Foo(v:true, v:false, v:null)
 
 
-" Issue #16221 (vimString becomes vimVar when preceded by !)
+" Issue #16221 (mnvString becomes mnvVar when preceded by !)
 
 let bar = !'g:bar'->exists()
 
 
-" Issue #14423 (vim.vim: Opt out of vimSearch*)
+" Issue #14423 (mnv.mnv: Opt out of mnvSearch*)
 
 ?truthy
 let truthy = 0
diff --git a/uvim/runtime/syntax/testdir/input/vim_function_calls.vim b/uvim/runtime/syntax/testdir/input/mnv_function_calls.mnv
index 60158161c4..aa563d1c7a 100644
--- a/uvim/runtime/syntax/testdir/input/vim_function_calls.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_function_calls.mnv
@@ -1,5 +1,5 @@
-" Vim function calls
-" VIM_TEST_SETUP hi link vimUserFunc Todo
+" MNV function calls
+" MNV_TEST_SETUP hi link mnvUserFunc Todo
 
 
 call abs(42)
@@ -132,7 +132,7 @@ swapname (42)
 
 let type = type(42)
 call type(42)
-" Vim9 command
+" MNV9 command
 " type(42)
 " type (42)
 
diff --git a/uvim/runtime/syntax/testdir/input/vim_function_variables.vim b/uvim/runtime/syntax/testdir/input/mnv_function_variables.mnv
index 5322604fec..adf2d26f58 100644
--- a/uvim/runtime/syntax/testdir/input/vim_function_variables.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_function_variables.mnv
@@ -1,4 +1,4 @@
-" Vim function variable highlighting
+" MNV function variable highlighting
 
 
 function Foo()
@@ -402,7 +402,7 @@ for k in keys(s:) | echo s:[k] | endfor
 for k in keys(a:) | echo a:[k] | endfor
 for k in keys(v:) | echo v:[k] | endfor
 
-" Neovim-specific variables (not highlighted by default)
+" Neomnv-specific variables (not highlighted by default)
 
 echo v:lua v:msgpack_types v:relnum v:stderr v:termrequest v:virtnum
 
diff --git a/uvim/runtime/syntax/testdir/input/vim_key_notation.vim b/uvim/runtime/syntax/testdir/input/mnv_key_notation.mnv
index 5730e62bf6..5730e62bf6 100644
--- a/uvim/runtime/syntax/testdir/input/vim_key_notation.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_key_notation.mnv
diff --git a/uvim/runtime/syntax/testdir/input/vim_lambdas.vim b/uvim/runtime/syntax/testdir/input/mnv_lambdas.mnv
index 5503e3fb32..a26530f63e 100644
--- a/uvim/runtime/syntax/testdir/input/vim_lambdas.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_lambdas.mnv
@@ -1,7 +1,7 @@
-" Vim lambda expressions
-" VIM_TEST_SETUP hi link vimLambdaOperator Todo
-" VIM_TEST_SETUP hi link vimLambdaBrace Todo
-" VIM_TEST_SETUP hi link vimFuncParam Identifier
+" MNV lambda expressions
+" MNV_TEST_SETUP hi link mnvLambdaOperator Todo
+" MNV_TEST_SETUP hi link mnvLambdaBrace Todo
+" MNV_TEST_SETUP hi link mnvFuncParam Identifier
 
 
 let expr = 42
@@ -128,7 +128,7 @@ let Foo = {-> {-> #{
 		\ {'repeat': 3})
 
 
-" Issue https://github.com/vim/vim/pull/17420#issuecomment-2927798687
+" Issue https://github.com/Project-Tick/Project-Tick/pull/17420#issuecomment-2927798687
 " (string immediately after -> operator)
 
 let [func, _func_] = [{->"func"}(), 'func']
diff --git a/uvim/runtime/syntax/testdir/input/vim_line_continuation.vim b/uvim/runtime/syntax/testdir/input/mnv_line_continuation.mnv
index b7a004b49b..cd092f56b6 100644
--- a/uvim/runtime/syntax/testdir/input/vim_line_continuation.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_line_continuation.mnv
@@ -1,4 +1,4 @@
-" Vim line continuations with interspersed comments
+" MNV line continuations with interspersed comments
 
 
 function Foo(
diff --git a/uvim/runtime/syntax/testdir/input/vim_new.vim b/uvim/runtime/syntax/testdir/input/mnv_new.mnv
index e7e18142bf..979446a0c4 100644
--- a/uvim/runtime/syntax/testdir/input/vim_new.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_new.mnv
@@ -1,6 +1,6 @@
-vim9script
-# Vim :new command and class constructors
-# TODO: move to vim9_constructor and create new vim_ex_new and vim9_ex_new
+mnv9script
+# MNV :new command and class constructors
+# TODO: move to mnv9_constructor and create new mnv_ex_new and mnv9_ex_new
 #       tests
 
 
diff --git a/uvim/runtime/syntax/testdir/input/mnv_nmnv_features.mnv b/uvim/runtime/syntax/testdir/input/mnv_nmnv_features.mnv
new file mode 100644
index 0000000000..1ccf1e4d04
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/mnv_nmnv_features.mnv
@@ -0,0 +1,229 @@
+" Neomnv-specific highlighting
+" MNV_TEST_SETUP let g:mnvsyn_mnv_features = ["nmnv"]
+
+
+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 nmnv_buf_add_highlight()
+call nmnv_buf_attach()
+call nmnv_buf_clear_highlight()
+call nmnv_buf_clear_namespace()
+call nmnv_buf_create_user_command()
+call nmnv__buf_debug_extmarks()
+call nmnv_buf_delete()
+call nmnv_buf_del_extmark()
+call nmnv_buf_del_keymap()
+call nmnv_buf_del_mark()
+call nmnv_buf_del_user_command()
+call nmnv_buf_del_var()
+call nmnv_buf_get_changedtick()
+call nmnv_buf_get_commands()
+call nmnv_buf_get_extmark_by_id()
+call nmnv_buf_get_extmarks()
+call nmnv_buf_get_keymap()
+call nmnv_buf_get_lines()
+call nmnv_buf_get_mark()
+call nmnv_buf_get_name()
+call nmnv_buf_get_number()
+call nmnv_buf_get_offset()
+call nmnv_buf_get_option()
+call nmnv_buf_get_text()
+call nmnv_buf_get_var()
+call nmnv_buf_is_loaded()
+call nmnv_buf_is_valid()
+call nmnv_buf_line_count()
+call nmnv_buf_set_extmark()
+call nmnv_buf_set_keymap()
+call nmnv_buf_set_lines()
+call nmnv_buf_set_mark()
+call nmnv_buf_set_name()
+call nmnv_buf_set_option()
+call nmnv_buf_set_text()
+call nmnv_buf_set_var()
+call nmnv_buf_set_virtual_text()
+call nmnv__buf_stats()
+call nmnv_call_dict_function()
+call nmnv_call_function()
+call nmnv_clear_autocmds()
+call nmnv_cmd()
+call nmnv_command()
+call nmnv_command_output()
+call nmnv__complete_set()
+call nmnv_create_augroup()
+call nmnv_create_autocmd()
+call nmnv_create_buf()
+call nmnv_create_namespace()
+call nmnv_create_user_command()
+call nmnv_del_augroup_by_id()
+call nmnv_del_augroup_by_name()
+call nmnv_del_autocmd()
+call nmnv_del_current_line()
+call nmnv_del_keymap()
+call nmnv_del_mark()
+call nmnv_del_user_command()
+call nmnv_del_var()
+call nmnv_echo()
+call nmnv_err_write()
+call nmnv_err_writeln()
+call nmnv_eval()
+call nmnv_eval_statusline()
+call nmnv_exec()
+call nmnv_exec2()
+call nmnv_exec_autocmds()
+call nmnv_feedkeys()
+call nmnv_get_all_options_info()
+call nmnv_get_autocmds()
+call nmnv_get_chan_info()
+call nmnv_get_color_by_name()
+call nmnv_get_color_map()
+call nmnv_get_commands()
+call nmnv_get_context()
+call nmnv_get_current_buf()
+call nmnv_get_current_line()
+call nmnv_get_current_tabpage()
+call nmnv_get_current_win()
+call nmnv_get_hl()
+call nmnv_get_hl_by_id()
+call nmnv_get_hl_by_name()
+call nmnv_get_hl_id_by_name()
+call nmnv_get_hl_ns()
+call nmnv_get_keymap()
+call nmnv__get_lib_dir()
+call nmnv_get_mark()
+call nmnv_get_mode()
+call nmnv_get_namespaces()
+call nmnv_get_option()
+call nmnv_get_option_info()
+call nmnv_get_option_info2()
+call nmnv_get_option_value()
+call nmnv_get_proc()
+call nmnv_get_proc_children()
+call nmnv__get_runtime()
+call nmnv_get_runtime_file()
+call nmnv_get_var()
+call nmnv_get_vvar()
+call nmnv__id()
+call nmnv__id_array()
+call nmnv__id_dict()
+call nmnv__id_float()
+call nmnv_input()
+call nmnv_input_mouse()
+call nmnv__inspect_cell()
+call nmnv__invalidate_glyph_cache()
+call nmnv_list_bufs()
+call nmnv_list_chans()
+call nmnv_list_runtime_paths()
+call nmnv_list_tabpages()
+call nmnv_list_uis()
+call nmnv_list_wins()
+call nmnv_load_context()
+call nmnv_notify()
+call nmnv__ns_get()
+call nmnv__ns_set()
+call nmnv_open_term()
+call nmnv_open_win()
+call nmnv_out_write()
+call nmnv_parse_cmd()
+call nmnv_parse_expression()
+call nmnv_paste()
+call nmnv_put()
+call nmnv__redraw()
+call nmnv_replace_termcodes()
+call nmnv__runtime_inspect()
+call nmnv__screenshot()
+call nmnv_select_popupmenu_item()
+call nmnv_set_current_buf()
+call nmnv_set_current_dir()
+call nmnv_set_current_line()
+call nmnv_set_current_tabpage()
+call nmnv_set_current_win()
+call nmnv_set_hl()
+call nmnv_set_hl_ns()
+call nmnv_set_hl_ns_fast()
+call nmnv_set_keymap()
+call nmnv_set_option()
+call nmnv_set_option_value()
+call nmnv_set_var()
+call nmnv_set_vvar()
+call nmnv__stats()
+call nmnv_strwidth()
+call nmnv_tabpage_del_var()
+call nmnv_tabpage_get_number()
+call nmnv_tabpage_get_var()
+call nmnv_tabpage_get_win()
+call nmnv_tabpage_is_valid()
+call nmnv_tabpage_list_wins()
+call nmnv_tabpage_set_var()
+call nmnv_tabpage_set_win()
+call nmnv__unpack()
+call nmnv_win_close()
+call nmnv_win_del_var()
+call nmnv_win_get_buf()
+call nmnv_win_get_config()
+call nmnv_win_get_cursor()
+call nmnv_win_get_height()
+call nmnv_win_get_number()
+call nmnv_win_get_option()
+call nmnv_win_get_position()
+call nmnv_win_get_tabpage()
+call nmnv_win_get_var()
+call nmnv_win_get_width()
+call nmnv_win_hide()
+call nmnv_win_is_valid()
+call nmnv_win_set_buf()
+call nmnv_win_set_config()
+call nmnv_win_set_cursor()
+call nmnv_win_set_height()
+call nmnv_win_set_hl_ns()
+call nmnv_win_set_option()
+call nmnv_win_set_var()
+call nmnv_win_set_width()
+call nmnv_win_text_height()
+
diff --git a/uvim/runtime/syntax/testdir/input/vim_no_comment_strings.vim b/uvim/runtime/syntax/testdir/input/mnv_no_comment_strings.mnv
index 3a28ab101a..87da706e26 100644
--- a/uvim/runtime/syntax/testdir/input/vim_no_comment_strings.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_no_comment_strings.mnv
@@ -1,5 +1,5 @@
-" Vim comment strings
-" VIM_TEST_SETUP let g:vimsyn_comment_strings = v:false
+" MNV comment strings
+" MNV_TEST_SETUP let g:mnvsyn_comment_strings = v:false
 
 
 " pre "string" post
diff --git a/uvim/runtime/syntax/testdir/input/vim_predefined_user_commands.vim b/uvim/runtime/syntax/testdir/input/mnv_predefined_user_commands.mnv
index 8b178909a1..ac0d0a3fc7 100644
--- a/uvim/runtime/syntax/testdir/input/vim_predefined_user_commands.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_predefined_user_commands.mnv
@@ -1,4 +1,4 @@
-" Vim predefined user commands
+" MNV predefined user commands
 
 
 " :CompilerSet - runtime/compiler/
@@ -8,7 +8,7 @@ CompilerSet errorformat=\ %#[%.%#]\ %#%f:%l:%v:%*\\d:%*\\d:\ %t%[%^:]%#:%m,
     \%A\ %#[%.%#]\ %f:%l:\ %m,%-Z\ %#[%.%#]\ %p^,%C\ %#[%.%#]\ %#%m
 
 
-" :SynMenu - runtime/makemenu.vim
+" :SynMenu - runtime/makemenu.mnv
 
 SynMenu AB.A2ps\ config:a2ps
 SynMenu AB.Aap:aap
diff --git a/uvim/runtime/syntax/testdir/input/mnv_shebang.mnv b/uvim/runtime/syntax/testdir/input/mnv_shebang.mnv
new file mode 100644
index 0000000000..8f08db98b6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/mnv_shebang.mnv
@@ -0,0 +1,5 @@
+#!/usr/bin/env mnv -S
+" MNV shebang line
+
+
+#!/usr/bin/env mnv -S
diff --git a/uvim/runtime/syntax/testdir/input/vim_variables.vim b/uvim/runtime/syntax/testdir/input/mnv_variables.mnv
index d062efbb03..03a169dde2 100644
--- a/uvim/runtime/syntax/testdir/input/vim_variables.vim
+++ b/uvim/runtime/syntax/testdir/input/mnv_variables.mnv
@@ -1,4 +1,4 @@
-" Vim variable highlighting
+" MNV variable highlighting
 
 
 " :let
@@ -401,7 +401,7 @@ for k in keys(s:) | echo s:[k] | endfor
 for k in keys(a:) | echo a:[k] | endfor
 for k in keys(v:) | echo v:[k] | endfor
 
-" Neovim-specific variables (not highlighted by default)
+" Neomnv-specific variables (not highlighted by default)
 
 echo v:lua v:msgpack_types v:relnum v:stderr v:termrequest v:virtnum
 
diff --git a/uvim/runtime/syntax/testdir/input/modula2_iso.def b/uvim/runtime/syntax/testdir/input/modula2_iso.def
index b979ccf70c..356a31c1ca 100644
--- a/uvim/runtime/syntax/testdir/input/modula2_iso.def
+++ b/uvim/runtime/syntax/testdir/input/modula2_iso.def
@@ -1,8 +1,8 @@
-(* Modula-2 ISO Test File for Vim Syntax Colouring *)
+(* Modula-2 ISO Test File for MNV Syntax Colouring *)
 
 (* --------------------------------------------------
- * THIS FILE IS LICENSED UNDER THE VIM LICENSE
- * see https://github.com/vim/vim/blob/master/LICENSE
+ * THIS FILE IS LICENSED UNDER THE MNV LICENSE
+ * see https://github.com/Project-Tick/Project-Tick/blob/master/LICENSE
  * -------------------------------------------------- *)
 
 
diff --git a/uvim/runtime/syntax/testdir/input/modula2_pim.def b/uvim/runtime/syntax/testdir/input/modula2_pim.def
index e008160d34..4042e3c086 100644
--- a/uvim/runtime/syntax/testdir/input/modula2_pim.def
+++ b/uvim/runtime/syntax/testdir/input/modula2_pim.def
@@ -1,8 +1,8 @@
-(* Modula-2 PIM Test File for Vim Syntax Colouring *)
+(* Modula-2 PIM Test File for MNV Syntax Colouring *)
 
 (* --------------------------------------------------
- * THIS FILE IS LICENSED UNDER THE VIM LICENSE
- * see https://github.com/vim/vim/blob/master/LICENSE
+ * THIS FILE IS LICENSED UNDER THE MNV LICENSE
+ * see https://github.com/Project-Tick/Project-Tick/blob/master/LICENSE
  * -------------------------------------------------- *)
 
 DEFINITION MODULE Foobar; (*!m2pim*)
diff --git a/uvim/runtime/syntax/testdir/input/modula2_r10.def b/uvim/runtime/syntax/testdir/input/modula2_r10.def
index 0872d5dfb9..6c75c40b7b 100644
--- a/uvim/runtime/syntax/testdir/input/modula2_r10.def
+++ b/uvim/runtime/syntax/testdir/input/modula2_r10.def
@@ -1,8 +1,8 @@
-(* Modula-2 R10 Test File for Vim Syntax Colouring *) 
+(* Modula-2 R10 Test File for MNV Syntax Colouring *) 
 
 (* --------------------------------------------------
- * THIS FILE IS LICENSED UNDER THE VIM LICENSE
- * see https://github.com/vim/vim/blob/master/LICENSE
+ * THIS FILE IS LICENSED UNDER THE MNV LICENSE
+ * see https://github.com/Project-Tick/Project-Tick/blob/master/LICENSE
  * -------------------------------------------------- *)
 
 DEFINITION MODULE Foobar; (*!m2r10*)
diff --git a/uvim/runtime/syntax/testdir/input/progress_comments.p b/uvim/runtime/syntax/testdir/input/progress_comments.p
index dd831fe8c5..053f8a4405 100644
--- a/uvim/runtime/syntax/testdir/input/progress_comments.p
+++ b/uvim/runtime/syntax/testdir/input/progress_comments.p
@@ -1,5 +1,5 @@
 /*
- * VIM_TEST_SETUP set filetype=progress
+ * MNV_TEST_SETUP set filetype=progress
  */
 
 define variable customer_name as character no-undo.
diff --git a/uvim/runtime/syntax/testdir/input/python2_strings.py b/uvim/runtime/syntax/testdir/input/python2_strings.py
index a5625b7d65..3a68742787 100644
--- a/uvim/runtime/syntax/testdir/input/python2_strings.py
+++ b/uvim/runtime/syntax/testdir/input/python2_strings.py
@@ -79,4 +79,4 @@ test = UR"""Raw Unicode string with quotes ' and "
 and literal \t and \040 and \xFF
 and escapes \u00A1 and \U00010605"""
 
-# vim: syntax=python2
+# mnv: syntax=python2
diff --git a/uvim/runtime/syntax/testdir/input/python_constants_builtin_default.py b/uvim/runtime/syntax/testdir/input/python_constants_builtin_default.py
index d55e656328..075feb2211 100644
--- a/uvim/runtime/syntax/testdir/input/python_constants_builtin_default.py
+++ b/uvim/runtime/syntax/testdir/input/python_constants_builtin_default.py
@@ -1,8 +1,8 @@
 # Built-in Constants
 # https://docs.python.org/3/library/constants.html
 
-# VIM_TEST_SETUP unlet g:python_constant_highlight
-# VIM_TEST_SETUP unlet g:python_no_builtin_highlight
+# MNV_TEST_SETUP unlet g:python_constant_highlight
+# MNV_TEST_SETUP unlet g:python_no_builtin_highlight
 test = False
 test = True
 test = None
diff --git a/uvim/runtime/syntax/testdir/input/python_constants_builtin_highlight.py b/uvim/runtime/syntax/testdir/input/python_constants_builtin_highlight.py
index e092b186e4..6a6d5d60e5 100644
--- a/uvim/runtime/syntax/testdir/input/python_constants_builtin_highlight.py
+++ b/uvim/runtime/syntax/testdir/input/python_constants_builtin_highlight.py
@@ -1,8 +1,8 @@
 # Built-in Constants
 # https://docs.python.org/3/library/constants.html
 
-# VIM_TEST_SETUP let g:python_constant_highlight = 1
-# VIM_TEST_SETUP unlet g:python_no_builtin_highlight
+# MNV_TEST_SETUP let g:python_constant_highlight = 1
+# MNV_TEST_SETUP unlet g:python_no_builtin_highlight
 test = False
 test = True
 test = None
diff --git a/uvim/runtime/syntax/testdir/input/python_constants_keyword_default.py b/uvim/runtime/syntax/testdir/input/python_constants_keyword_default.py
index 7b3d9c9c63..5bd43e5a0e 100644
--- a/uvim/runtime/syntax/testdir/input/python_constants_keyword_default.py
+++ b/uvim/runtime/syntax/testdir/input/python_constants_keyword_default.py
@@ -1,8 +1,8 @@
 # Built-in Constants
 # https://docs.python.org/3/library/constants.html
 
-# VIM_TEST_SETUP unlet g:python_constant_highlight
-# VIM_TEST_SETUP let g:python_no_builtin_highlight = 1
+# MNV_TEST_SETUP unlet g:python_constant_highlight
+# MNV_TEST_SETUP let g:python_no_builtin_highlight = 1
 test = False
 test = True
 test = None
diff --git a/uvim/runtime/syntax/testdir/input/python_constants_keyword_highlight.py b/uvim/runtime/syntax/testdir/input/python_constants_keyword_highlight.py
index 60f3fb227d..86e4892cdf 100644
--- a/uvim/runtime/syntax/testdir/input/python_constants_keyword_highlight.py
+++ b/uvim/runtime/syntax/testdir/input/python_constants_keyword_highlight.py
@@ -1,8 +1,8 @@
 # Built-in Constants
 # https://docs.python.org/3/library/constants.html
 
-# VIM_TEST_SETUP let g:python_constant_highlight = 1
-# VIM_TEST_SETUP let g:python_no_builtin_highlight = 1
+# MNV_TEST_SETUP let g:python_constant_highlight = 1
+# MNV_TEST_SETUP let g:python_no_builtin_highlight = 1
 test = False
 test = True
 test = None
diff --git a/uvim/runtime/syntax/testdir/input/selftestdir/README.txt b/uvim/runtime/syntax/testdir/input/selftestdir/README.txt
index ec4cacb1a7..dea112ad5c 100644
--- a/uvim/runtime/syntax/testdir/input/selftestdir/README.txt
+++ b/uvim/runtime/syntax/testdir/input/selftestdir/README.txt
@@ -1,6 +1,6 @@
 The test files with made-up syntax in this directory serve for additional
 linewise checks to be manually performed whenever the algorithm managing
-screen dump file generation is modified (../../runtest.vim#RunTest()).
+screen dump file generation is modified (../../runtest.mnv#RunTest()).
 
 This is mainly used for debugging and testing the syntax test suite.
 
diff --git a/uvim/runtime/syntax/testdir/input/setup/help.vim b/uvim/runtime/syntax/testdir/input/setup/help.mnv
index 038175adaa..038175adaa 100644
--- a/uvim/runtime/syntax/testdir/input/setup/help.vim
+++ b/uvim/runtime/syntax/testdir/input/setup/help.mnv
diff --git a/uvim/runtime/syntax/testdir/input/setup/help_ex_version.vim b/uvim/runtime/syntax/testdir/input/setup/help_ex_version.mnv
index 22953b8c45..22953b8c45 100644
--- a/uvim/runtime/syntax/testdir/input/setup/help_ex_version.vim
+++ b/uvim/runtime/syntax/testdir/input/setup/help_ex_version.mnv
diff --git a/uvim/runtime/syntax/testdir/input/setup/html_fold_expr.vim b/uvim/runtime/syntax/testdir/input/setup/html_fold_expr.mnv
index e8daae0e74..e8daae0e74 100644
--- a/uvim/runtime/syntax/testdir/input/setup/html_fold_expr.vim
+++ b/uvim/runtime/syntax/testdir/input/setup/html_fold_expr.mnv
diff --git a/uvim/runtime/syntax/testdir/input/setup/java_module_info.vim b/uvim/runtime/syntax/testdir/input/setup/java_module_info.mnv
index 2711c1a9a0..6d3d634a4d 100644
--- a/uvim/runtime/syntax/testdir/input/setup/java_module_info.vim
+++ b/uvim/runtime/syntax/testdir/input/setup/java_module_info.mnv
@@ -1,4 +1,4 @@
-vim9script
+mnv9script
 
 # Test filenames are required to begin with the filetype name prefix,
 # whereas the name of a Java module declaration must be "module-info".
diff --git a/uvim/runtime/syntax/testdir/input/setup/markdown_circularity.vim b/uvim/runtime/syntax/testdir/input/setup/markdown_circularity.mnv
index a0b2d985a3..a0b2d985a3 100644
--- a/uvim/runtime/syntax/testdir/input/setup/markdown_circularity.vim
+++ b/uvim/runtime/syntax/testdir/input/setup/markdown_circularity.mnv
diff --git a/uvim/runtime/syntax/testdir/input/setup/markdown_conceal.vim b/uvim/runtime/syntax/testdir/input/setup/markdown_conceal.mnv
index a1585b18bb..a1585b18bb 100644
--- a/uvim/runtime/syntax/testdir/input/setup/markdown_conceal.vim
+++ b/uvim/runtime/syntax/testdir/input/setup/markdown_conceal.mnv
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_blocks.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_blocks.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_blocks.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_builtin_object_methods2.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_builtin_object_methods2.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_builtin_object_methods2.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_comments.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_comments.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_comments.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_def_variables.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_def_variables.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_def_variables.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_class_fold.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_class_fold.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_class_fold.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_commands.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_commands.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_commands.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_enum.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_enum.mnv
new file mode 100644
index 0000000000..531177ca35
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_enum.mnv
@@ -0,0 +1 @@
+hi link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_enum2.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_enum2.mnv
new file mode 100644
index 0000000000..531177ca35
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_enum2.mnv
@@ -0,0 +1 @@
+hi link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_for.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_for.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_for.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_function_def_tail_comment_errors.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_function_def_tail_comment_errors.mnv
new file mode 100644
index 0000000000..9029f40087
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_function_def_tail_comment_errors.mnv
@@ -0,0 +1,2 @@
+highlight link mnvVar Identifier
+highlight link mnvFunctionScope Special
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_function_def_tail_comments.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_function_def_tail_comments.mnv
new file mode 100644
index 0000000000..9029f40087
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_function_def_tail_comments.mnv
@@ -0,0 +1,2 @@
+highlight link mnvVar Identifier
+highlight link mnvFunctionScope Special
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_import.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_import.mnv
new file mode 100644
index 0000000000..531177ca35
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_import.mnv
@@ -0,0 +1 @@
+hi link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_interface_fold.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_interface_fold.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_interface_fold.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_let_heredoc.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_let_heredoc.mnv
new file mode 100644
index 0000000000..e6aa760ca5
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_let_heredoc.mnv
@@ -0,0 +1,2 @@
+highlight link mnvVar Identifier
+
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_loadkeymap.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_loadkeymap.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_ex_loadkeymap.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_expressions.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_expressions.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_expressions.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_lambdas.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_lambdas.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_lambdas.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_legacy_header.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_legacy_header.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_legacy_header.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_super_this_keywords.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_super_this_keywords.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_super_this_keywords.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_super_this_keywords2.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_super_this_keywords2.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_super_this_keywords2.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_super_this_keywords3.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_super_this_keywords3.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_super_this_keywords3.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv9_variables.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv9_variables.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv9_variables.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_comments.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_comments.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_comments.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_call.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_call.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_call.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_command.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_command.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_command.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_commands.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_commands.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_commands.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_def.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_def.mnv
new file mode 100644
index 0000000000..9029f40087
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_def.mnv
@@ -0,0 +1,2 @@
+highlight link mnvVar Identifier
+highlight link mnvFunctionScope Special
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_def_fold.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_def_fold.mnv
new file mode 100644
index 0000000000..9029f40087
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_def_fold.mnv
@@ -0,0 +1,2 @@
+highlight link mnvVar Identifier
+highlight link mnvFunctionScope Special
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_def_nested.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_def_nested.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_def_nested.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_def_nested_fold.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_def_nested_fold.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_def_nested_fold.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_echo.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_echo.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_echo.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_execute.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_execute.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_execute.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_for.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_for.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_for.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_function.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_function.mnv
new file mode 100644
index 0000000000..9029f40087
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_function.mnv
@@ -0,0 +1,2 @@
+highlight link mnvVar Identifier
+highlight link mnvFunctionScope Special
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_function_def_tail_comment_errors.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_function_def_tail_comment_errors.mnv
new file mode 100644
index 0000000000..9029f40087
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_function_def_tail_comment_errors.mnv
@@ -0,0 +1,2 @@
+highlight link mnvVar Identifier
+highlight link mnvFunctionScope Special
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_function_def_tail_comments.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_function_def_tail_comments.mnv
new file mode 100644
index 0000000000..9029f40087
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_function_def_tail_comments.mnv
@@ -0,0 +1,2 @@
+highlight link mnvVar Identifier
+highlight link mnvFunctionScope Special
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_function_fold.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_function_fold.mnv
new file mode 100644
index 0000000000..9029f40087
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_function_fold.mnv
@@ -0,0 +1,2 @@
+highlight link mnvVar Identifier
+highlight link mnvFunctionScope Special
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_import.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_import.mnv
new file mode 100644
index 0000000000..531177ca35
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_import.mnv
@@ -0,0 +1 @@
+hi link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_let_heredoc.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_let_heredoc.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_let_heredoc.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_loadkeymap.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_loadkeymap.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_loadkeymap.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_loadkeymap_after_bar.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_loadkeymap_after_bar.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_loadkeymap_after_bar.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_loadkeymap_after_colon.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_loadkeymap_after_colon.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_loadkeymap_after_colon.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_map.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_map.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_map.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_match.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_match.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_match.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_menu.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_menu.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_menu.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_redir.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_redir.mnv
new file mode 100644
index 0000000000..7d027095ca
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_redir.mnv
@@ -0,0 +1,2 @@
+highlight link mnvVar Identifier
+highlight link mnvRedirFile String
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_substitute.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_substitute.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_substitute.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_ex_syntax.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_syntax.mnv
new file mode 100644
index 0000000000..9029f40087
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_ex_syntax.mnv
@@ -0,0 +1,2 @@
+highlight link mnvVar Identifier
+highlight link mnvFunctionScope Special
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_expressions.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_expressions.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_expressions.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_function_variables.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_function_variables.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_function_variables.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_lambdas.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_lambdas.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_lambdas.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_line_continuation.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_line_continuation.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_line_continuation.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/mnv_variables.mnv b/uvim/runtime/syntax/testdir/input/setup/mnv_variables.mnv
new file mode 100644
index 0000000000..153907d0c6
--- /dev/null
+++ b/uvim/runtime/syntax/testdir/input/setup/mnv_variables.mnv
@@ -0,0 +1 @@
+highlight link mnvVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_blocks.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_blocks.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_blocks.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_builtin_object_methods2.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_builtin_object_methods2.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_builtin_object_methods2.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_comments.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_comments.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_comments.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_def_variables.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_def_variables.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_def_variables.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_class_fold.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_ex_class_fold.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_class_fold.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_commands.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_ex_commands.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_commands.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_enum.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_ex_enum.vim
deleted file mode 100644
index ebd90ede92..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_enum.vim
+++ /dev/null
@@ -1 +0,0 @@
-hi link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_enum2.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_ex_enum2.vim
deleted file mode 100644
index ebd90ede92..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_enum2.vim
+++ /dev/null
@@ -1 +0,0 @@
-hi link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_for.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_ex_for.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_for.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_function_def_tail_comment_errors.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_ex_function_def_tail_comment_errors.vim
deleted file mode 100644
index 9dee81d648..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_function_def_tail_comment_errors.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-highlight link vimVar Identifier
-highlight link vimFunctionScope Special
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_function_def_tail_comments.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_ex_function_def_tail_comments.vim
deleted file mode 100644
index 9dee81d648..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_function_def_tail_comments.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-highlight link vimVar Identifier
-highlight link vimFunctionScope Special
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_import.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_ex_import.vim
deleted file mode 100644
index ebd90ede92..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_import.vim
+++ /dev/null
@@ -1 +0,0 @@
-hi link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_interface_fold.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_ex_interface_fold.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_interface_fold.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_let_heredoc.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_ex_let_heredoc.vim
deleted file mode 100644
index 3a0ec2dae5..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_let_heredoc.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-highlight link vimVar Identifier
-
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_loadkeymap.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_ex_loadkeymap.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_ex_loadkeymap.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_expressions.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_expressions.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_expressions.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_lambdas.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_lambdas.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_lambdas.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_legacy_header.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_legacy_header.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_legacy_header.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_super_this_keywords.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_super_this_keywords.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_super_this_keywords.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_super_this_keywords2.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_super_this_keywords2.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_super_this_keywords2.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_super_this_keywords3.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_super_this_keywords3.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_super_this_keywords3.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim9_variables.vim b/uvim/runtime/syntax/testdir/input/setup/vim9_variables.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim9_variables.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_comments.vim b/uvim/runtime/syntax/testdir/input/setup/vim_comments.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_comments.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_call.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_call.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_call.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_command.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_command.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_command.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_commands.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_commands.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_commands.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_def.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_def.vim
deleted file mode 100644
index 9dee81d648..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_def.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-highlight link vimVar Identifier
-highlight link vimFunctionScope Special
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_def_fold.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_def_fold.vim
deleted file mode 100644
index 9dee81d648..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_def_fold.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-highlight link vimVar Identifier
-highlight link vimFunctionScope Special
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_def_nested.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_def_nested.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_def_nested.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_def_nested_fold.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_def_nested_fold.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_def_nested_fold.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_echo.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_echo.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_echo.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_execute.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_execute.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_execute.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_for.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_for.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_for.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_function.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_function.vim
deleted file mode 100644
index 9dee81d648..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_function.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-highlight link vimVar Identifier
-highlight link vimFunctionScope Special
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_function_def_tail_comment_errors.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_function_def_tail_comment_errors.vim
deleted file mode 100644
index 9dee81d648..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_function_def_tail_comment_errors.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-highlight link vimVar Identifier
-highlight link vimFunctionScope Special
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_function_def_tail_comments.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_function_def_tail_comments.vim
deleted file mode 100644
index 9dee81d648..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_function_def_tail_comments.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-highlight link vimVar Identifier
-highlight link vimFunctionScope Special
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_function_fold.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_function_fold.vim
deleted file mode 100644
index 9dee81d648..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_function_fold.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-highlight link vimVar Identifier
-highlight link vimFunctionScope Special
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_import.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_import.vim
deleted file mode 100644
index ebd90ede92..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_import.vim
+++ /dev/null
@@ -1 +0,0 @@
-hi link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_let_heredoc.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_let_heredoc.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_let_heredoc.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_loadkeymap.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_loadkeymap.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_loadkeymap.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_loadkeymap_after_bar.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_loadkeymap_after_bar.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_loadkeymap_after_bar.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_loadkeymap_after_colon.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_loadkeymap_after_colon.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_loadkeymap_after_colon.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_map.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_map.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_map.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_match.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_match.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_match.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_menu.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_menu.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_menu.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_redir.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_redir.vim
deleted file mode 100644
index 6193cc4e58..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_redir.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-highlight link vimVar Identifier
-highlight link vimRedirFile String
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_substitute.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_substitute.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_substitute.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_ex_syntax.vim b/uvim/runtime/syntax/testdir/input/setup/vim_ex_syntax.vim
deleted file mode 100644
index 9dee81d648..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_ex_syntax.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-highlight link vimVar Identifier
-highlight link vimFunctionScope Special
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_expressions.vim b/uvim/runtime/syntax/testdir/input/setup/vim_expressions.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_expressions.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_function_variables.vim b/uvim/runtime/syntax/testdir/input/setup/vim_function_variables.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_function_variables.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_lambdas.vim b/uvim/runtime/syntax/testdir/input/setup/vim_lambdas.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_lambdas.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_line_continuation.vim b/uvim/runtime/syntax/testdir/input/setup/vim_line_continuation.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_line_continuation.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/setup/vim_variables.vim b/uvim/runtime/syntax/testdir/input/setup/vim_variables.vim
deleted file mode 100644
index 9223fa8d0c..0000000000
--- a/uvim/runtime/syntax/testdir/input/setup/vim_variables.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight link vimVar Identifier
diff --git a/uvim/runtime/syntax/testdir/input/sh_09.sh b/uvim/runtime/syntax/testdir/input/sh_09.sh
index ad22bfb400..c999d624af 100644
--- a/uvim/runtime/syntax/testdir/input/sh_09.sh
+++ b/uvim/runtime/syntax/testdir/input/sh_09.sh
@@ -1,5 +1,5 @@
 #!/bin/dash
-# Test file for vim the check () subshells
+# Test file for mnv the check () subshells
 ( cd ; $pwd ) | wc -c
 ( cd $1 ; $pwd ) | wc -c
 ( cd ${1} ; $pwd ) | wc -c
diff --git a/uvim/runtime/syntax/testdir/input/sh_12.sh b/uvim/runtime/syntax/testdir/input/sh_12.sh
index dcfa553547..b3d43b6d29 100644
--- a/uvim/runtime/syntax/testdir/input/sh_12.sh
+++ b/uvim/runtime/syntax/testdir/input/sh_12.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
-# VIM_TEST_SETUP highlight link shArrayValue Identifier
-# VIM_TEST_SETUP highlight link shBracketExprDelim Structure
-# VIM_TEST_SETUP highlight link shCharClass Todo
-# VIM_TEST_SETUP highlight link shRange CursorLine
+# MNV_TEST_SETUP highlight link shArrayValue Identifier
+# MNV_TEST_SETUP highlight link shBracketExprDelim Structure
+# MNV_TEST_SETUP highlight link shCharClass Todo
+# MNV_TEST_SETUP highlight link shRange CursorLine
 
 
 
diff --git a/uvim/runtime/syntax/testdir/input/sh_13.sh b/uvim/runtime/syntax/testdir/input/sh_13.sh
index 18fd0d1335..b959e0e399 100644
--- a/uvim/runtime/syntax/testdir/input/sh_13.sh
+++ b/uvim/runtime/syntax/testdir/input/sh_13.sh
@@ -1,6 +1,6 @@
 #!/bin/dash
 # Issue #17026 (bash highlighting requires space after $())
-# https://github.com/vim/vim/issues/17026#issuecomment-2774112284
+# https://github.com/Project-Tick/Project-Tick/issues/17026#issuecomment-2774112284
 
 _comp_compgen_split -l -- "$(
     tmux list-commands -F "#{command_list_name}"
diff --git a/uvim/runtime/syntax/testdir/input/sh_functions_bash.sh b/uvim/runtime/syntax/testdir/input/sh_functions_bash.sh
index 161f14f978..1c56592376 100644
--- a/uvim/runtime/syntax/testdir/input/sh_functions_bash.sh
+++ b/uvim/runtime/syntax/testdir/input/sh_functions_bash.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
-# VIM_TEST_SETUP setlocal fen fdc=2 fdl=8 fdm=syntax
-# VIM_TEST_SETUP let g:sh_fold_enabled = 1 + 2 + 4
+# MNV_TEST_SETUP setlocal fen fdc=2 fdl=8 fdm=syntax
+# MNV_TEST_SETUP let g:sh_fold_enabled = 1 + 2 + 4
 
 
 typeset -i n=0
diff --git a/uvim/runtime/syntax/testdir/input/sh_functions_dash.sh b/uvim/runtime/syntax/testdir/input/sh_functions_dash.sh
index 15b133ab92..e6be9260c7 100644
--- a/uvim/runtime/syntax/testdir/input/sh_functions_dash.sh
+++ b/uvim/runtime/syntax/testdir/input/sh_functions_dash.sh
@@ -1,6 +1,6 @@
 #!/bin/dash
-# VIM_TEST_SETUP setlocal fen fdc=2 fdl=8 fdm=syntax
-# VIM_TEST_SETUP let g:sh_fold_enabled = 1 + 2 + 4
+# MNV_TEST_SETUP setlocal fen fdc=2 fdl=8 fdm=syntax
+# MNV_TEST_SETUP let g:sh_fold_enabled = 1 + 2 + 4
 
 
 thence()
diff --git a/uvim/runtime/syntax/testdir/input/sh_functions_ksh2020.sh b/uvim/runtime/syntax/testdir/input/sh_functions_ksh2020.sh
index 0a1b21edeb..14a99f0e68 100644
--- a/uvim/runtime/syntax/testdir/input/sh_functions_ksh2020.sh
+++ b/uvim/runtime/syntax/testdir/input/sh_functions_ksh2020.sh
@@ -1,6 +1,6 @@
 #!/bin/ksh2020
-# VIM_TEST_SETUP setlocal fen fdc=2 fdl=8 fdm=syntax
-# VIM_TEST_SETUP let g:sh_fold_enabled = 1 + 2 + 4
+# MNV_TEST_SETUP setlocal fen fdc=2 fdl=8 fdm=syntax
+# MNV_TEST_SETUP let g:sh_fold_enabled = 1 + 2 + 4
 
 
 typeset -i 10 n=0
diff --git a/uvim/runtime/syntax/testdir/input/sh_functions_ksh88.sh b/uvim/runtime/syntax/testdir/input/sh_functions_ksh88.sh
index d2eae00f89..030a5fa59c 100644
--- a/uvim/runtime/syntax/testdir/input/sh_functions_ksh88.sh
+++ b/uvim/runtime/syntax/testdir/input/sh_functions_ksh88.sh
@@ -1,6 +1,6 @@
 #!/bin/ksh88
-# VIM_TEST_SETUP setlocal fen fdc=2 fdl=8 fdm=syntax
-# VIM_TEST_SETUP let g:sh_fold_enabled = 1 + 2 + 4
+# MNV_TEST_SETUP setlocal fen fdc=2 fdl=8 fdm=syntax
+# MNV_TEST_SETUP let g:sh_fold_enabled = 1 + 2 + 4
 
 
 typeset -i 10 n=0
diff --git a/uvim/runtime/syntax/testdir/input/sh_functions_mksh.sh b/uvim/runtime/syntax/testdir/input/sh_functions_mksh.sh
index 04b56bb5a2..2eba028344 100644
--- a/uvim/runtime/syntax/testdir/input/sh_functions_mksh.sh
+++ b/uvim/runtime/syntax/testdir/input/sh_functions_mksh.sh
@@ -1,6 +1,6 @@
 #!/bin/mksh
-# VIM_TEST_SETUP setlocal fen fdc=2 fdl=8 fdm=syntax
-# VIM_TEST_SETUP let g:sh_fold_enabled = 1 + 2 + 4
+# MNV_TEST_SETUP setlocal fen fdc=2 fdl=8 fdm=syntax
+# MNV_TEST_SETUP let g:sh_fold_enabled = 1 + 2 + 4
 
 
 typeset -i10 n=0
diff --git a/uvim/runtime/syntax/testdir/input/skhdrc.skhdrc b/uvim/runtime/syntax/testdir/input/skhdrc.skhdrc
index a33e9c3dde..60911562c9 100644
--- a/uvim/runtime/syntax/testdir/input/skhdrc.skhdrc
+++ b/uvim/runtime/syntax/testdir/input/skhdrc.skhdrc
@@ -101,4 +101,4 @@ super - z : echo "super is cmd alias"
 
 # End of configuration
 
-# vim:ft=skhd:
+# mnv:ft=skhd:
diff --git a/uvim/runtime/syntax/testdir/input/sudoers_Defaults.sudoers b/uvim/runtime/syntax/testdir/input/sudoers_Defaults.sudoers
index 770e8955a6..0c7faf4ca9 100644
--- a/uvim/runtime/syntax/testdir/input/sudoers_Defaults.sudoers
+++ b/uvim/runtime/syntax/testdir/input/sudoers_Defaults.sudoers
@@ -1,7 +1,7 @@
 # vi:ft=sudoers
 Host_Alias NODES = ! node0, 192.168.10.1
 User_Alias ADMIN = alice, bob
-Cmnd_Alias VIM = /usr/bin/vim, sha224:d14a028c2a3a2bc9476102bb288234c415a2b01f828ea62ac5b3e42f /usr/bin/view, sha256:47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU= /usr/bin/vimdiff
+Cmnd_Alias MNV = /usr/bin/mnv, sha224:d14a028c2a3a2bc9476102bb288234c415a2b01f828ea62ac5b3e42f /usr/bin/view, sha256:47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU= /usr/bin/mnvdiff
 Runas_Alias ROOT = charlie, dave
 
 # Boolean Flags
@@ -11,7 +11,7 @@ Defaults@!node0, !node1 !! env_reset
 Defaults@10.0.0.1 , !172.16.0.1/12, !!192.168.0.1/255.255.0.0 !! fqdn
 Defaults:ALL, ADMIN ignore_dot
 Defaults:user0, #1000, %group0, %#1000 mail_all_cmnds
-Defaults!ALL,VIM noexec
+Defaults!ALL,MNV noexec
 Defaults!list,sudoedit !path_info
 Defaults! /bin/ls requiretty
 Defaults!!/bin/less , /bin/more set_home
@@ -24,7 +24,7 @@ Defaults:ALL passwd_tries = 3, passwd_timeout = 2.5, umask = 0027
 Defaults@ALL ! passwd_timeout , !!! umask
 
 # Strings
-Defaults editor = "/usr/bin/vim:/bin/vi"
+Defaults editor = "/usr/bin/mnv:/bin/vi"
 Defaults secure_path = /usr/sbin\:/usr/bin
 Defaults>ALL syslog_badpri=alert,syslog_goodpri=notice
 
diff --git a/uvim/runtime/syntax/testdir/input/tcsh.tcsh b/uvim/runtime/syntax/testdir/input/tcsh.tcsh
index 332b626e52..1dfc1fd296 100644
--- a/uvim/runtime/syntax/testdir/input/tcsh.tcsh
+++ b/uvim/runtime/syntax/testdir/input/tcsh.tcsh
@@ -1,4 +1,4 @@
-# https://github.com/vim/vim/pull/19172#issuecomment-3751574224
+# https://github.com/Project-Tick/Project-Tick/pull/19172#issuecomment-3751574224
 
 set script_dir="" #comment
 set script_dir=""
diff --git a/uvim/runtime/syntax/testdir/input/vim9_ex_import.vim b/uvim/runtime/syntax/testdir/input/vim9_ex_import.vim
deleted file mode 100644
index bedd5bbda7..0000000000
--- a/uvim/runtime/syntax/testdir/input/vim9_ex_import.vim
+++ /dev/null
@@ -1,120 +0,0 @@
-vim9script
-# Vim9 :import command
-# VIM_TEST_SETUP hi link vimImportName Todo
-
-
-import "foo.vim"
-import true ? "foo.vim" : "bar.vim"
-
-import true ?
-  "foo.vim" :
-  "bar.vim"
-
-import true
-  ? "foo.vim"
-  : "bar.vim"
-
-import true ? # comment
-  # comment 
-  "foo.vim" :
-  # comment
-  "bar.vim"
-
-import true # comment
-  # comment 
-  ? "foo.vim"
-  # comment
-  : "bar.vim"
-
-import "foo.vim" as bar
-import true ? "foo.vim" : "bar.vim" as baz
-
-import true ?
-  "foo.vim" :
-  "bar.vim"
-  as baz
-
-import true
-  ? "foo.vim"
-  : "bar.vim"
-  as baz
-
-import true ? # comment
-  # comment 
-  "foo.vim" :
-  # comment
-  "bar.vim"
-  # comment
-  as baz
-
-import true # comment
-  # comment 
-  ? "foo.vim"
-  # comment
-  : "bar.vim"
-  # comment
-  as baz
-
-echo "Foo" | import "foo.vim"
-
-
-# autoload
-
-import autoload "foo.vim"
-import autoload true ? "foo.vim" : "bar.vim"
-
-import autoload true ?
-  "foo.vim" :
-  "bar.vim"
-
-import autoload true
-  ? "foo.vim"
-  : "bar.vim"
-
-import autoload true ? # comment
-  # comment 
-  "foo.vim" :
-  # comment
-  "bar.vim"
-
-import autoload true # comment
-  # comment 
-  ? "foo.vim"
-  # comment
-  : "bar.vim"
-
-import autoload "foo.vim" as bar
-import autoload true ? "foo.vim" : "bar.vim" as baz
-
-import autoload true ?
-  "foo.vim" :
-  "bar.vim"
-  as baz
-
-import autoload true
-  ? "foo.vim"
-  : "bar.vim"
-  as baz
-
-import autoload true ? # comment
-  # comment 
-  "foo.vim" :
-  # comment
-  "bar.vim"
-  # comment
-  as baz
-
-import autoload true # comment
-  # comment 
-  ? "foo.vim"
-  # comment
-  : "bar.vim"
-  # comment
-  as baz
-
-
-# "as" keyword in expr
-
-var as = "modules/"
-import true ? as .. "foo.vim" : as .. "bar.vim" as other
-
diff --git a/uvim/runtime/syntax/testdir/input/vim9_legacy_header_fold.vim b/uvim/runtime/syntax/testdir/input/vim9_legacy_header_fold.vim
deleted file mode 100644
index db48abd967..0000000000
--- a/uvim/runtime/syntax/testdir/input/vim9_legacy_header_fold.vim
+++ /dev/null
@@ -1,22 +0,0 @@
-" Vim9 legacy script header
-" VIM_TEST_SETUP let g:vimsyn_folding = "H"
-" VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
-
-
-" comment
-
-if !has('vim9script')
-  # 42 " comment
-  source foo.vim
-  finish
-endif
-
-" comment
-
-vim9script noclear
-
-# comment
-
- # string only recognised with leading char
- "useless string"
-
diff --git a/uvim/runtime/syntax/testdir/input/vim9_shebang.vim b/uvim/runtime/syntax/testdir/input/vim9_shebang.vim
deleted file mode 100644
index bd5ca914fc..0000000000
--- a/uvim/runtime/syntax/testdir/input/vim9_shebang.vim
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env vim -S
-vim9script
-# Vim9 shebang line
-
-
-# just a line comment
-#!/usr/bin/env vim -S
-
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_catch.vim b/uvim/runtime/syntax/testdir/input/vim_ex_catch.vim
deleted file mode 100644
index f7fad2672f..0000000000
--- a/uvim/runtime/syntax/testdir/input/vim_ex_catch.vim
+++ /dev/null
@@ -1,19 +0,0 @@
-" Vim :catch command
-
-
-" :help :catch
-
-catch /^Vim:Interrupt$/		" catch interrupts (CTRL-C)
-catch /^Vim\%((\a\+)\)\=:E/	" catch all Vim errors
-catch /^Vim\%((\a\+)\)\=:/	" catch errors and interrupts
-catch /^Vim(write):/		" catch all errors in :write
-catch /^Vim\%((\a\+)\)\=:E123:/	" catch error E123
-catch /my-exception/		" catch user exception
-catch /.*/			" catch everything
-catch				" same as /.*/
-
-" :help :try
-
-try | sleep 100 | catch /^Vim:Interrupt$/ | endtry
-try | edit | catch /^Vim(edit):E\d\+/ | echo "error" | endtry
-
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_import.vim b/uvim/runtime/syntax/testdir/input/vim_ex_import.vim
deleted file mode 100644
index 07df827b9e..0000000000
--- a/uvim/runtime/syntax/testdir/input/vim_ex_import.vim
+++ /dev/null
@@ -1,119 +0,0 @@
-" Vim :import command
-" VIM_TEST_SETUP hi link vimImportName Todo
-
-
-import "foo.vim"
-impor v:true ? "foo.vim" : "bar.vim"
-
-import v:true ?
-      \ "foo.vim" :
-      \ "bar.vim"
-
-import v:true
-      \ ? "foo.vim"
-      \ : "bar.vim"
-
-import v:true ?
-      "\ comment 
-      \ "foo.vim" :
-      "\ comment 
-      \ "bar.vim"
-
-import v:true
-      "\ comment 
-      \ ? "foo.vim"
-      "\ comment
-      \ : "bar.vim"
-
-import "foo.vim" as bar
-import v:true ? "foo.vim" : "bar.vim" as baz
-
-import v:true ?
-      \ "foo.vim" :
-      \ "bar.vim"
-      \ as baz
-
-import v:true
-      \ ? "foo.vim"
-      \ : "bar.vim"
-      \ as baz
-
-import v:true ?
-      "\ comment 
-      \ "foo.vim" :
-      "\ comment 
-      \ "bar.vim"
-      "\ comment
-      \ as baz
-
-import v:true
-      "\ comment 
-      \ ? "foo.vim"
-      "\ comment
-      \ : "bar.vim"
-      "\ comment
-      \ as baz
-
-echo "Foo" | import "foo.vim"
-
-
-" autoload
-
-import autoload "foo.vim"
-import autoload v:true ? "foo.vim" : "bar.vim"
-
-import autoload v:true ?
-      \ "foo.vim" :
-      \ "bar.vim"
-
-import autoload v:true
-      \ ? "foo.vim"
-      \ : "bar.vim"
-
-import autoload v:true ?
-      "\ comment 
-      \"foo.vim" :
-      "\ comment
-      \ "bar.vim"
-
-import autoload v:true
-      "\ comment 
-      \ ? "foo.vim"
-      "\ comment
-      \ : "bar.vim"
-
-import autoload "foo.vim" as bar
-import autoload v:true ? "foo.vim" : "bar.vim" as baz
-
-import autoload v:true ?
-      \ "foo.vim" :
-      \ "bar.vim"
-      \ as baz
-
-import autoload v:true
-      \ ? "foo.vim"
-      \ : "bar.vim"
-      \ as baz
-
-import autoload v:true ?
-      "\ comment 
-      \ "foo.vim" :
-      "\ comment 
-      \ "bar.vim"
-      "\ comment
-      \ as baz
-
-import autoload v:true
-      "\ comment 
-      \ ? "foo.vim"
-      "\ comment
-      \ : "bar.vim"
-      "\ comment
-      \ as baz
-
-
-" "as" keyword in expr
-
-let as = "modules/"
-import v:true ? as .. "foo.vim" : as .. "bar.vim" as other
-
diff --git a/uvim/runtime/syntax/testdir/input/vim_ex_vimgrep.vim b/uvim/runtime/syntax/testdir/input/vim_ex_vimgrep.vim
deleted file mode 100644
index b7688a014e..0000000000
--- a/uvim/runtime/syntax/testdir/input/vim_ex_vimgrep.vim
+++ /dev/null
@@ -1,69 +0,0 @@
-" Vim :*vimgrep and :*vimgrepadd commands
-" VIM_TEST_SETUP hi link vimVimgrepFile Todo
-" VIM_TEST_SETUP hi link vimCmdSep Operator
-" VIM_TEST_SETUP hi link vimVimgrepBarEscape Special
-
-
-vimgrep pa\%(tt\)ern   foo.txt
-vimgrep /pa\%(tt\)ern/ foo.txt
-
-vimgrep! pa\%(tt\)ern   foo.txt
-vimgrep! /pa\%(tt\)ern/ foo.txt
-
-vimgrep /pa\%(tt\)ern/gjf foo.txt
-
-" trailing bar, no tail comment
-vimgrep /pa\%(t|t\)ern/ b\|a\|r.txt | echo "Foo"
-vimgrep /pa\%(t"t\)ern/ b"a"r.txt   | echo "Foo"
-
-vimgrepadd pa\%(tt\)ern   foo.txt
-vimgrepadd /pa\%(tt\)ern/ foo.txt
-
-vimgrepadd! pa\%(tt\)ern   foo.txt
-vimgrepadd! /pa\%(tt\)ern/ foo.txt
-
-vimgrepadd /pa\%(tt\)ern/gjf foo.txt
-
-" trailing bar, no tail comment
-vimgrepadd /pa\%(t|t\)ern/ b\|a\|r.txt | echo "Foo"
-vimgrepadd /pa\%(t"t\)ern/ b"a"r.txt   | echo "Foo"
-
-lvimgrep pa\%(tt\)ern   foo.txt
-lvimgrep /pa\%(tt\)ern/ foo.txt
-
-lvimgrep! pa\%(tt\)ern   foo.txt
-lvimgrep! /pa\%(tt\)ern/ foo.txt
-
-lvimgrep /pa\%(tt\)ern/gjf foo.txt
-
-" trailing bar, no tail comment
-lvimgrep /pa\%(t|t\)ern/ b\|a\|r.txt | echo "Foo"
-lvimgrep /pa\%(t"t\)ern/ b"a"r.txt   | echo "Foo"
-
-lvimgrepadd pa\%(tt\)ern   foo.txt
-lvimgrepadd /pa\%(tt\)ern/ foo.txt
-
-lvimgrepadd! pa\%(tt\)ern   foo.txt
-lvimgrepadd! /pa\%(tt\)ern/ foo.txt
-
-lvimgrepadd /pa\%(tt\)ern/gjf foo.txt
-
-" trailing bar, no tail comment
-lvimgrepadd /pa\%(t|t\)ern/ b\|a\|r.txt | echo "Foo"
-lvimgrepadd /pa\%(t"t\)ern/ b"a"r.txt   | echo "Foo"
-
-
-" file args
-
-" multiple files
-vimgrep pa\%(tt\)ern   foo.txt bar.txt
-vimgrep /pa\%(tt\)ern/ foo.txt bar.txt
-
-" wildcard patterns
-vimgrep pa\%(tt\)ern   **/*.txt
-vimgrep /pa\%(tt\)ern/ **/*.txt
-
-" special filename characters
-vimgrep pa\%(tt\)ern   %
-vimgrep /pa\%(tt\)ern/ %
-
diff --git a/uvim/runtime/syntax/testdir/input/vim_nvim_features.vim b/uvim/runtime/syntax/testdir/input/vim_nvim_features.vim
deleted file mode 100644
index b1b477ed01..0000000000
--- a/uvim/runtime/syntax/testdir/input/vim_nvim_features.vim
+++ /dev/null
@@ -1,229 +0,0 @@
-" 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/uvim/runtime/syntax/testdir/input/vim_shebang.vim b/uvim/runtime/syntax/testdir/input/vim_shebang.vim
deleted file mode 100644
index fd91617ae0..0000000000
--- a/uvim/runtime/syntax/testdir/input/vim_shebang.vim
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env vim -S
-" Vim shebang line
-
-
-#!/usr/bin/env vim -S
diff --git a/uvim/runtime/syntax/testdir/runtest.vim b/uvim/runtime/syntax/testdir/runtest.mnv
index f71ccf1638..a09c6f1e1d 100644
--- a/uvim/runtime/syntax/testdir/runtest.vim
+++ b/uvim/runtime/syntax/testdir/runtest.mnv
@@ -3,7 +3,7 @@
 " Current directory must be runtime/syntax.
 
 " needed because of line-continuation lines
-set cpo&vim
+set cpo&mnv
 
 " Only do this with the +eval feature
 if 1
@@ -70,23 +70,23 @@ endif
 " therefore we must "cd" there.
 cd ../../src/testdir
 
-let s:vimcmdSyntaxFname = fnameescape(syntaxDir .. '/testdir/vimcmd')
+let s:mnvcmdSyntaxFname = fnameescape(syntaxDir .. '/testdir/mnvcmd')
 
-" Adapt "runtime/syntax/testdir/vimcmd" for "src/testdir/util/shared.vim".
-if filereadable(s:vimcmdSyntaxFname)
-  call delete('vimcmd')
-  call filecopy(s:vimcmdSyntaxFname, 'vimcmd')
-  exe 'au ExitPre <buffer> call delete("' .. fnameescape(getcwd() .. '/vimcmd') .. '")'
+" Adapt "runtime/syntax/testdir/mnvcmd" for "src/testdir/util/shared.mnv".
+if filereadable(s:mnvcmdSyntaxFname)
+  call delete('mnvcmd')
+  call filecopy(s:mnvcmdSyntaxFname, 'mnvcmd')
+  exe 'au ExitPre <buffer> call delete("' .. fnameescape(getcwd() .. '/mnvcmd') .. '")'
 endif
 
-source util/screendump.vim
-source util/term_util.vim
+source util/screendump.mnv
+source util/term_util.mnv
 exe 'cd ' .. fnameescape(syntaxDir)
 
-" For these tests we need to be able to run terminal Vim with 256 colors.  On
+" For these tests we need to be able to run terminal MNV with 256 colors.  On
 " MS-Windows the console only has 16 colors and the GUI can't run in a
 " terminal.
-if !CanRunVimInTerminal()
+if !CanRunMNVInTerminal()
   call Fatal('Cannot make screendumps, aborting')
 endif
 
@@ -117,10 +117,10 @@ func HandleSwapExists()
 endfunc
 
 " Trace ruler liveness on demand.
-if !empty($VIM_SYNTAX_TEST_LOG) && filewritable($VIM_SYNTAX_TEST_LOG)
+if !empty($MNV_SYNTAX_TEST_LOG) && filewritable($MNV_SYNTAX_TEST_LOG)
   def s:TraceRulerLiveness(context: string, times: number, tail: string)
     writefile([printf('%s: %4d: %s', context, times, tail)],
-	$VIM_SYNTAX_TEST_LOG,
+	$MNV_SYNTAX_TEST_LOG,
 	'a')
   enddef
 else
@@ -159,7 +159,7 @@ def s:TermPollRuler(
 	CannotDumpPage: func,	# (TYPE FOR LEGACY CONTEXT CALL SITES.)
 	buf: number,
 	in_name_and_out_name: string): list<string>
-  # Expect defaults from "term_util#RunVimInTerminal()".
+  # Expect defaults from "term_util#RunMNVInTerminal()".
   if winwidth(1) != 75 || winheight(1) != 20
     ch_log(printf('Aborting for %s: (75 x 20) != (%d x %d)',
       in_name_and_out_name,
@@ -173,7 +173,7 @@ def s:TermPollRuler(
   redraw
   # The contents of "ruler".
   var ruler: list<string> = []
-  # Attempts at most, targeting ASan-instrumented Vim builds.
+  # Attempts at most, targeting ASan-instrumented MNV builds.
   var times: number = 2048
   # Check "real estate" of the terminal buffer.  Read and compare its ruler
   # line and let "Xtestscript#s:AssertCursorForwardProgress()" do the rest.
@@ -196,7 +196,7 @@ enddef
 " the terminal buffer.  (Call the function before calling "VerifyScreenDump()"
 " for the first time.)
 def s:TermWaitAndPollRuler(buf: number, in_name_and_out_name: string): list<string>
-  # Expect defaults from "term_util#RunVimInTerminal()".
+  # Expect defaults from "term_util#RunMNVInTerminal()".
   if winwidth(1) != 75 || winheight(1) != 20
     ch_log(printf('Aborting for %s: (75 x 20) != (%d x %d)',
       in_name_and_out_name,
@@ -206,11 +206,11 @@ def s:TermWaitAndPollRuler(buf: number, in_name_and_out_name: string): list<stri
   endif
   # The contents of "ruler".
   var ruler: string = ''
-  # Attempts at most, targeting ASan-instrumented Vim builds.
+  # Attempts at most, targeting ASan-instrumented MNV builds.
   var times: number = 32768
   # Check "real estate" of the terminal buffer.  Expect a known token to be
   # rendered in the terminal buffer; its prefix must be "is_" so that buffer
-  # variables from "sh.vim" can be matched (see "Xtestscript#ShellInfo()").
+  # variables from "sh.mnv" can be matched (see "Xtestscript#ShellInfo()").
   # Verify that the whole line is available!
   while ruler !~# '^is_.\+\s\%(All\|Top\)$' && times > 0
     ruler = term_getline(buf, 20)
@@ -268,28 +268,28 @@ func RunTest()
     endfunc
 
     func LoadFiletype(type)
-      for file in glob("ftplugin/" .. a:type .. "*.vim", 1, 1)
+      for file in glob("ftplugin/" .. a:type .. "*.mnv", 1, 1)
 	exe "source " .. file
       endfor
       redraw!
     endfunc
 
-    func SetUpVim()
+    func SetUpMNV()
       call cursor(1, 1)
-      " Defend against rogue VIM_TEST_SETUP commands.
+      " Defend against rogue MNV_TEST_SETUP commands.
       for _ in range(20)
-	let lnum = search('\C\<VIM_TEST_SETUP\>', 'eW', 20)
+	let lnum = search('\C\<MNV_TEST_SETUP\>', 'eW', 20)
 	if lnum < 1
 	  break
 	endif
-	exe substitute(getline(lnum), '\C.*\<VIM_TEST_SETUP\>', '', '')
+	exe substitute(getline(lnum), '\C.*\<MNV_TEST_SETUP\>', '', '')
       endfor
       call cursor(1, 1)
-      " BEGIN [runtime/defaults.vim]
+      " BEGIN [runtime/defaults.mnv]
       " Also, disable italic highlighting to avoid issues on some terminals.
       set display=lastline ruler scrolloff=5 t_ZH= t_ZR=
       syntax on
-      " END [runtime/defaults.vim]
+      " END [runtime/defaults.mnv]
       redraw!
     endfunc
 
@@ -394,9 +394,9 @@ func RunTest()
     enddef
   END
   let MAX_FAILED_COUNT = 5
-  let DUMP_OPTS = exists("$VIM_SYNTAX_TEST_WAIT_TIME") &&
-	  \ !empty($VIM_SYNTAX_TEST_WAIT_TIME)
-      \ ? {'wait': max([1, str2nr($VIM_SYNTAX_TEST_WAIT_TIME)])}
+  let DUMP_OPTS = exists("$MNV_SYNTAX_TEST_WAIT_TIME") &&
+	  \ !empty($MNV_SYNTAX_TEST_WAIT_TIME)
+      \ ? {'wait': max([1, str2nr($MNV_SYNTAX_TEST_WAIT_TIME)])}
       \ : {}
   lockvar DUMP_OPTS MAX_FAILED_COUNT XTESTSCRIPT
   let ok_count = 0
@@ -406,7 +406,7 @@ func RunTest()
   let last_test_status = 'invalid'
   let filter = ''
   " Create a map of setup configuration filenames with their basenames as keys.
-  let setup = glob('input/setup/*.vim', 1, 1)
+  let setup = glob('input/setup/*.mnv', 1, 1)
     \ ->reduce({d, f -> extend(d, {fnamemodify(f, ':t:r'): f})}, {})
   " Turn a subset of filenames etc. requested for testing into a pattern.
   if filereadable('../testdir/Xfilter')
@@ -422,9 +422,9 @@ func RunTest()
     let fnames = readdir(dirpath, {fname -> fname !~ '^README\.txt$'})
   else
     let dirpath = 'input/'
-    let filter ..= exists("$VIM_SYNTAX_TEST_FILTER") &&
-		\ !empty($VIM_SYNTAX_TEST_FILTER)
-      \ ? (empty(filter) ? '' : '\|') .. $VIM_SYNTAX_TEST_FILTER
+    let filter ..= exists("$MNV_SYNTAX_TEST_FILTER") &&
+		\ !empty($MNV_SYNTAX_TEST_FILTER)
+      \ ? (empty(filter) ? '' : '\|') .. $MNV_SYNTAX_TEST_FILTER
       \ : ''
     let fnames = readdir(dirpath,
 	\ {subset -> {fname -> fname !~ '\~$' && fname =~# subset}}(
@@ -459,18 +459,18 @@ func RunTest()
       " for the terminal window.
       redraw
 
-      " Let "Xtestscript#SetUpVim()" turn the syntax on.
+      " Let "Xtestscript#SetUpMNV()" turn the syntax on.
       let prefix = '-Nu NONE -S Xtestscript'
       let path = get(setup, root, '')
       " Source the found setup configuration file.
       let args = !empty(path)
 	\ ? prefix .. ' -S ' .. path
 	\ : prefix
-      let buf = RunVimInTerminal(args, {})
+      let buf = RunMNVInTerminal(args, {})
       " edit the file only after catching the SwapExists event
       call term_sendkeys(buf, ":edit " .. fname .. "\<CR>")
       " set up the testing environment
-      call term_sendkeys(buf, ":call SetUpVim()\<CR>")
+      call term_sendkeys(buf, ":call SetUpMNV()\<CR>")
       " load filetype specific settings
       call term_sendkeys(buf, ":call LoadFiletype('" .. filetype .. "')\<CR>")
 
@@ -512,7 +512,7 @@ func RunTest()
 	  " Make a screendump of every 18 lines of the file: failed/root_NN.dump
 	  let fail += VerifyScreenDump(buf, root_next, DUMP_OPTS)
 	endwhile
-	call StopVimInTerminal(buf)
+	call StopMNVInTerminal(buf)
       finally
 	call delete('Xtestscript')
       endtry
@@ -602,7 +602,7 @@ func RunTest()
 
   if !empty(failed_tests)
     call Message('')
-    call Message('View generated screendumps with "../../src/vim --clean -S testdir/viewdumps.vim"')
+    call Message('View generated screendumps with "../../src/mnv --clean -S testdir/viewdumps.mnv"')
   endif
 
   call AppendMessages('== SUMMARY SYNTAX TESTS ==')
@@ -620,4 +620,4 @@ endif
 
 qall!
 
-" vim:sw=2:ts=8:noet:
+" mnv:sw=2:ts=8:noet:
diff --git a/uvim/runtime/syntax/testdir/tools/maketestdeps b/uvim/runtime/syntax/testdir/tools/maketestdeps
index 61bf061f71..b8712723b8 100755
--- a/uvim/runtime/syntax/testdir/tools/maketestdeps
+++ b/uvim/runtime/syntax/testdir/tools/maketestdeps
@@ -3,7 +3,7 @@
 # - a phony target 'java' depends on all of the testdir/input/java*.java
 # - when the syntax file is changed, timestamps of the JAVA files are updated so that the tests will
 #   be rerun against updated syntax
-# - when a vim setup file for test, e.g. testdir/input/setup/java_module_info.vim, is changed,
+# - when a mnv setup file for test, e.g. testdir/input/setup/java_module_info.mnv, is changed,
 #   timestamp of the corresponding input, testdir/input/java_module_info.java, is updated
 #
 # NOTE: At the moment this script DOES NOT strictly track dependency, like cpp on c, so run
@@ -17,19 +17,19 @@ for input in testdir/input/*.*; do
 	basename=$(basename "$input")
 
 	case "$basename" in
-		vim9_*.*) ft=vim;;
+		mnv9_*.*) ft=mnv;;
 		*_*.*) ft=${basename%%_*};;
 		*.*) ft=${basename%%.*};;
 		*) exit 1
 	esac
 
-	vimsetup=$dirname/setup/${basename%.*}.vim
-	if [ ! -r "$vimsetup" ]; then
-		vimsetup=
+	mnvsetup=$dirname/setup/${basename%.*}.mnv
+	if [ ! -r "$mnvsetup" ]; then
+		mnvsetup=
 	fi
 
 	cat << EOF
-$input: $ft.vim $vimsetup
+$input: $ft.mnv $mnvsetup
 	touch -c \$@
 $basename:: $input
 $ft:: $basename
diff --git a/uvim/runtime/syntax/testdir/tools/regenerate_screendumps.sh b/uvim/runtime/syntax/testdir/tools/regenerate_screendumps.sh
index f85252a32a..9dfdad306f 100755
--- a/uvim/runtime/syntax/testdir/tools/regenerate_screendumps.sh
+++ b/uvim/runtime/syntax/testdir/tools/regenerate_screendumps.sh
@@ -9,13 +9,13 @@
 #	argument.
 # 5) Summarise any differences.
 #
-# Provided that "git difftool" is set up (see src/testdir/commondumps.vim),
+# Provided that "git difftool" is set up (see src/testdir/commondumps.mnv),
 # run "git difftool HEAD -- '**/*.dump'" to collate tracked and generated
 # screendumps.
 
 case "$1" in
 -h | --help)
-	printf >&2 "Usage: [time VIM_SYNTAX_TEST_LOG=/tmp/log] $0 [1 | 2 | ...]\n"
+	printf >&2 "Usage: [time MNV_SYNTAX_TEST_LOG=/tmp/log] $0 [1 | 2 | ...]\n"
 	exit 0
 	;;
 esac
@@ -48,9 +48,9 @@ spuriosities=''
 # Because the clean target of Make will be executed before each syntax test,
 # this environment variable needs to be pointed to an existing file that is
 # created in a directory not affectable by the target.
-if test -w "$VIM_SYNTAX_TEST_LOG"
+if test -w "$MNV_SYNTAX_TEST_LOG"
 then
-	log=-e VIM_SYNTAX_TEST_LOG="$VIM_SYNTAX_TEST_LOG"
+	log=-e MNV_SYNTAX_TEST_LOG="$MNV_SYNTAX_TEST_LOG"
 else
 	log=
 fi
@@ -123,4 +123,4 @@ then
 	exit 87
 fi
 
-# vim:sw=8:ts=8:noet:nosta:
+# mnv:sw=8:ts=8:noet:nosta:
diff --git a/uvim/runtime/syntax/testdir/viewdumps.vim b/uvim/runtime/syntax/testdir/viewdumps.mnv
index 9c4de1b930..6e501da264 100644
--- a/uvim/runtime/syntax/testdir/viewdumps.vim
+++ b/uvim/runtime/syntax/testdir/viewdumps.mnv
@@ -1,8 +1,8 @@
-vim9script
+mnv9script
 
 exec 'source ' .. (((cwdpath: string) => cwdpath
-  ->strpart(0, cwdpath->strridx('/vim')))(getcwd()))
-  .. '/vim/src/testdir/commondumps.vim'
+  ->strpart(0, cwdpath->strridx('/mnv')))(getcwd()))
+  .. '/mnv/src/testdir/commondumps.mnv'
 g:Init('\<syntax\>', -1)
 
 # THE FOLLOWING SETTINGS PERTAIN TO "input/" FILES THAT ARE LIKELY TO BE
@@ -11,14 +11,14 @@ g:Init('\<syntax\>', -1)
 # Match "LC_ALL=C" of Makefile.
 language C
 
-# Match the settings from term_util.vim#RunVimInTerminal().
+# Match the settings from term_util.mnv#RunMNVInTerminal().
 set t_Co=256 background=light
 hi Normal ctermfg=NONE ctermbg=NONE
 
-# Match the settings from runtest.vim#Xtestscript#SetUpVim().
+# Match the settings from runtest.mnv#Xtestscript#SetUpMNV().
 set display=lastline ruler scrolloff=5 t_ZH= t_ZR=
 
 # Anticipate non-Latin-1 characters in "input/" files.
 set encoding=utf-8 termencoding=utf-8
 
-# vim:fdm=syntax:sw=2:ts=8:noet:nosta:
+# mnv:fdm=syntax:sw=2:ts=8:noet:nosta: