summaryrefslogtreecommitdiff
path: root/uvim/runtime/syntax/testdir/input
diff options
context:
space:
mode:
Diffstat (limited to 'uvim/runtime/syntax/testdir/input')
-rw-r--r--uvim/runtime/syntax/testdir/input/c.c26
-rw-r--r--uvim/runtime/syntax/testdir/input/codeowners.txt2
-rw-r--r--uvim/runtime/syntax/testdir/input/cpp_noreturn.cpp2
-rw-r--r--uvim/runtime/syntax/testdir/input/csh.csh2
-rw-r--r--uvim/runtime/syntax/testdir/input/gdb_multiline_commands.gdb2
-rw-r--r--uvim/runtime/syntax/testdir/input/help.txt32
-rw-r--r--uvim/runtime/syntax/testdir/input/help_ex_version.txt20
-rw-r--r--uvim/runtime/syntax/testdir/input/html.html2
-rw-r--r--uvim/runtime/syntax/testdir/input/html_fold_expr.html2
-rw-r--r--uvim/runtime/syntax/testdir/input/html_fold_syntax.html4
-rw-r--r--uvim/runtime/syntax/testdir/input/java_annotations.java2
-rw-r--r--uvim/runtime/syntax/testdir/input/java_annotations_signature.java4
-rw-r--r--uvim/runtime/syntax/testdir/input/java_comments_html.java18
-rw-r--r--uvim/runtime/syntax/testdir/input/java_comments_markdown.java30
-rw-r--r--uvim/runtime/syntax/testdir/input/java_contextual_keywords.java2
-rw-r--r--uvim/runtime/syntax/testdir/input/java_enfoldment.java14
-rw-r--r--uvim/runtime/syntax/testdir/input/java_generics.java12
-rw-r--r--uvim/runtime/syntax/testdir/input/java_generics_signature.java16
-rw-r--r--uvim/runtime/syntax/testdir/input/java_lambda_expressions.java2
-rw-r--r--uvim/runtime/syntax/testdir/input/java_lambda_expressions_signature.java4
-rw-r--r--uvim/runtime/syntax/testdir/input/java_method_references.java4
-rw-r--r--uvim/runtime/syntax/testdir/input/java_method_references_signature.java6
-rw-r--r--uvim/runtime/syntax/testdir/input/java_methods_indent2.java6
-rw-r--r--uvim/runtime/syntax/testdir/input/java_methods_indent2_signature.java6
-rw-r--r--uvim/runtime/syntax/testdir/input/java_methods_indent4.java6
-rw-r--r--uvim/runtime/syntax/testdir/input/java_methods_indent4_signature.java6
-rw-r--r--uvim/runtime/syntax/testdir/input/java_methods_indent8.java6
-rw-r--r--uvim/runtime/syntax/testdir/input/java_methods_indent8_signature.java6
-rw-r--r--uvim/runtime/syntax/testdir/input/java_methods_style.java6
-rw-r--r--uvim/runtime/syntax/testdir/input/java_methods_style_signature.java6
-rw-r--r--uvim/runtime/syntax/testdir/input/java_previews_430.java2
-rw-r--r--uvim/runtime/syntax/testdir/input/java_previews_455.java2
-rw-r--r--uvim/runtime/syntax/testdir/input/java_unfoldment.java14
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_blocks.mnv (renamed from uvim/runtime/syntax/testdir/input/vim9_blocks.vim)6
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_builtin_object_methods.mnv (renamed from uvim/runtime/syntax/testdir/input/vim9_builtin_object_methods.vim)4
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_builtin_object_methods2.mnv (renamed from uvim/runtime/syntax/testdir/input/vim9_builtin_object_methods2.vim)8
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_comment_strings.mnv (renamed from uvim/runtime/syntax/testdir/input/vim9_comment_strings.vim)6
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_comments.mnv (renamed from uvim/runtime/syntax/testdir/input/vim9_comments.vim)20
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_constructors.mnv (renamed from uvim/runtime/syntax/testdir/input/vim9_constructors.vim)4
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_def_variables.mnv (renamed from uvim/runtime/syntax/testdir/input/vim9_def_variables.vim)6
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_ex_class_fold.mnv (renamed from uvim/runtime/syntax/testdir/input/vim9_ex_class_fold.vim)8
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_ex_commands.mnv (renamed from uvim/runtime/syntax/testdir/input/vim9_ex_commands.vim)44
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_ex_echo.mnv (renamed from uvim/runtime/syntax/testdir/input/vim9_ex_echo.vim)6
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_ex_enum.mnv (renamed from uvim/runtime/syntax/testdir/input/vim9_ex_enum.vim)6
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_ex_enum2.mnv (renamed from uvim/runtime/syntax/testdir/input/vim9_ex_enum2.vim)8
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_ex_enum_fold.mnv (renamed from uvim/runtime/syntax/testdir/input/vim9_ex_enum_fold.vim)10
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_ex_for.mnv (renamed from uvim/runtime/syntax/testdir/input/vim9_ex_for.vim)4
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_ex_function_def_tail_comment_errors.mnv (renamed from uvim/runtime/syntax/testdir/input/vim9_ex_function_def_tail_comment_errors.vim)6
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_ex_function_def_tail_comments.mnv (renamed from uvim/runtime/syntax/testdir/input/vim9_ex_function_def_tail_comments.vim)6
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_ex_import.mnv120
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_ex_interface_fold.mnv (renamed from uvim/runtime/syntax/testdir/input/vim9_ex_interface_fold.vim)8
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_ex_let_heredoc.mnv (renamed from uvim/runtime/syntax/testdir/input/vim9_ex_let_heredoc.vim)8
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_ex_loadkeymap.mnv (renamed from uvim/runtime/syntax/testdir/input/vim9_ex_loadkeymap.vim)10
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_ex_type.mnv (renamed from uvim/runtime/syntax/testdir/input/vim9_ex_type.vim)4
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_expressions.mnv (renamed from uvim/runtime/syntax/testdir/input/vim9_expressions.vim)8
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_function_calls.mnv (renamed from uvim/runtime/syntax/testdir/input/vim9_function_calls.vim)16
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_generic_function_example_enum.mnv (renamed from uvim/runtime/syntax/testdir/input/vim9_generic_function_example_enum.vim)12
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_generic_function_example_list.mnv (renamed from uvim/runtime/syntax/testdir/input/vim9_generic_function_example_list.vim)12
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_generic_function_example_set.mnv (renamed from uvim/runtime/syntax/testdir/input/vim9_generic_function_example_set.vim)12
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_generic_functions.mnv (renamed from uvim/runtime/syntax/testdir/input/vim9_generic_functions.vim)12
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_lambdas.mnv (renamed from uvim/runtime/syntax/testdir/input/vim9_lambdas.vim)16
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_legacy_header.mnv (renamed from uvim/runtime/syntax/testdir/input/vim9_legacy_header.vim)8
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_legacy_header_fold.mnv22
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_no_comment_strings.mnv (renamed from uvim/runtime/syntax/testdir/input/vim9_no_comment_strings.vim)6
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_shebang.mnv8
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_super_this_keywords.mnv (renamed from uvim/runtime/syntax/testdir/input/vim9_super_this_keywords.vim)8
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_super_this_keywords2.mnv (renamed from uvim/runtime/syntax/testdir/input/vim9_super_this_keywords2.vim)10
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_super_this_keywords3.mnv (renamed from uvim/runtime/syntax/testdir/input/vim9_super_this_keywords3.vim)10
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_tuples.mnv (renamed from uvim/runtime/syntax/testdir/input/vim9_tuples.vim)6
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_types.mnv (renamed from uvim/runtime/syntax/testdir/input/vim9_types.vim)8
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_types_example_object.mnv (renamed from uvim/runtime/syntax/testdir/input/vim9_types_example_object.vim)4
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_types_object.mnv (renamed from uvim/runtime/syntax/testdir/input/vim9_types_object.vim)8
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv9_variables.mnv (renamed from uvim/runtime/syntax/testdir/input/vim9_variables.vim)6
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_comment_strings.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_comment_strings.vim)4
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_comments.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_comments.vim)14
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_abbreviate.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_abbreviate.vim)8
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_at.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_at.vim)4
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_augroup.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_augroup.vim)8
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_autocmd.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_autocmd.vim)16
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_behave.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_behave.vim)2
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_breakpoint_commands.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_breakpoint_commands.vim)14
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_call.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_call.vim)2
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_catch.mnv19
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_cd.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_cd.vim)6
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_command.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_command.vim)16
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_command_modifiers.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_command_modifiers.vim)12
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_commands.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_commands.vim)38
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_debug.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_debug.vim)2
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_debuggreedy.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_debuggreedy.vim)2
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_def.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_def.vim)6
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_def_fold.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_def_fold.vim)10
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_def_nested.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_def_nested.vim)6
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_def_nested_fold.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_def_nested_fold.vim)10
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_def_return_type.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_def_return_type.vim)8
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_defer.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_defer.vim)4
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_delfunction.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_delfunction.vim)4
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_do_commands.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_do_commands.vim)4
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_echo.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_echo.vim)2
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_eval.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_eval.vim)4
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_execute.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_execute.vim)4
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_filetype.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_filetype.vim)2
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_filter.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_filter.vim)4
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_for.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_for.vim)2
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_function.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_function.vim)6
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_function_def_tail_comment_errors.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_function_def_tail_comment_errors.vim)4
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_function_def_tail_comments.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_function_def_tail_comments.vim)4
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_function_fold.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_function_fold.vim)12
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_function_nested.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_function_nested.vim)2
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_function_nested_fold.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_function_nested_fold.vim)6
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_grep.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_grep.vim)6
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_help.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_help.vim)bin986 -> 986 bytes
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_helpgrep.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_helpgrep.vim)4
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_highlight.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_highlight.vim)4
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_history.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_history.vim)6
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_import.mnv119
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_language.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_language.vim)6
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_let_heredoc.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_let_heredoc.vim)6
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_loadkeymap.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_loadkeymap.vim)6
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_loadkeymap_after_bar.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_bar.vim)2
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_loadkeymap_after_colon.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_colon.vim)2
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_lua.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_lua.vim)8
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_make.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_make.vim)6
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_map.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_map.vim)12
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_mark.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_mark.vim)12
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_match.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_match.vim)2
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_menu.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_menu.vim)4
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_menutranslate.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_menutranslate.vim)2
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_mnvgrep.mnv69
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_mzscheme.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_mzscheme.vim)8
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_normal.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_normal.vim)2
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_perl.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_perl.vim)8
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_profile.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_profile.vim)20
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_prompt_commands.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_prompt_commands.vim)4
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_python.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_python.vim)12
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_range.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_range.vim)0
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_redir.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_redir.vim)4
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_ruby.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_ruby.vim)8
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_set.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_set.vim)6
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_set_backslash.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_set_backslash.vim)10
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_sleep.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_sleep.vim)2
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_sort.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_sort.vim)4
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_substitute.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_substitute.vim)6
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_syntax.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_syntax.vim)16
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_syntime.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_syntime.vim)4
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_tcl.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_tcl.vim)8
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_terminal.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_terminal.vim)4
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_throw.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_throw.vim)2
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_uniq.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_uniq.vim)4
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_ex_wincmd.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_ex_wincmd.vim)8
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_expressions.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_expressions.vim)14
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_function_calls.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_function_calls.vim)6
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_function_variables.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_function_variables.vim)4
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_key_notation.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_key_notation.vim)0
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_lambdas.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_lambdas.vim)10
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_line_continuation.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_line_continuation.vim)2
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_new.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_new.vim)6
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_nmnv_features.mnv229
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_no_comment_strings.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_no_comment_strings.vim)4
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_predefined_user_commands.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_predefined_user_commands.vim)4
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_shebang.mnv5
-rw-r--r--uvim/runtime/syntax/testdir/input/mnv_variables.mnv (renamed from uvim/runtime/syntax/testdir/input/vim_variables.vim)4
-rw-r--r--uvim/runtime/syntax/testdir/input/modula2_iso.def6
-rw-r--r--uvim/runtime/syntax/testdir/input/modula2_pim.def6
-rw-r--r--uvim/runtime/syntax/testdir/input/modula2_r10.def6
-rw-r--r--uvim/runtime/syntax/testdir/input/progress_comments.p2
-rw-r--r--uvim/runtime/syntax/testdir/input/python2_strings.py2
-rw-r--r--uvim/runtime/syntax/testdir/input/python_constants_builtin_default.py4
-rw-r--r--uvim/runtime/syntax/testdir/input/python_constants_builtin_highlight.py4
-rw-r--r--uvim/runtime/syntax/testdir/input/python_constants_keyword_default.py4
-rw-r--r--uvim/runtime/syntax/testdir/input/python_constants_keyword_highlight.py4
-rw-r--r--uvim/runtime/syntax/testdir/input/selftestdir/README.txt2
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/help.mnv (renamed from uvim/runtime/syntax/testdir/input/setup/help.vim)0
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/help_ex_version.mnv (renamed from uvim/runtime/syntax/testdir/input/setup/help_ex_version.vim)0
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/html_fold_expr.mnv (renamed from uvim/runtime/syntax/testdir/input/setup/html_fold_expr.vim)0
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/java_module_info.mnv (renamed from uvim/runtime/syntax/testdir/input/setup/java_module_info.vim)2
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/markdown_circularity.mnv (renamed from uvim/runtime/syntax/testdir/input/setup/markdown_circularity.vim)0
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/markdown_conceal.mnv (renamed from uvim/runtime/syntax/testdir/input/setup/markdown_conceal.vim)0
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv9_blocks.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv9_builtin_object_methods2.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv9_comments.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv9_def_variables.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv9_ex_class_fold.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv9_ex_commands.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv9_ex_enum.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv9_ex_enum2.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv9_ex_for.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv9_ex_function_def_tail_comment_errors.mnv2
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv9_ex_function_def_tail_comments.mnv2
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv9_ex_import.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv9_ex_interface_fold.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv9_ex_let_heredoc.mnv2
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv9_ex_loadkeymap.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv9_expressions.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv9_lambdas.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv9_legacy_header.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv9_super_this_keywords.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv9_super_this_keywords2.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv9_super_this_keywords3.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv9_variables.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv_comments.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv_ex_call.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv_ex_command.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv_ex_commands.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv_ex_def.mnv2
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv_ex_def_fold.mnv2
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv_ex_def_nested.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv_ex_def_nested_fold.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv_ex_echo.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv_ex_execute.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv_ex_for.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv_ex_function.mnv2
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv_ex_function_def_tail_comment_errors.mnv2
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv_ex_function_def_tail_comments.mnv2
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv_ex_function_fold.mnv2
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv_ex_import.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv_ex_let_heredoc.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv_ex_loadkeymap.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv_ex_loadkeymap_after_bar.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv_ex_loadkeymap_after_colon.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv_ex_map.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv_ex_match.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv_ex_menu.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv_ex_redir.mnv2
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv_ex_substitute.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv_ex_syntax.mnv2
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv_expressions.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv_function_variables.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv_lambdas.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv_line_continuation.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/mnv_variables.mnv1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim9_blocks.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim9_builtin_object_methods2.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim9_comments.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim9_def_variables.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim9_ex_class_fold.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim9_ex_commands.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim9_ex_enum.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim9_ex_enum2.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim9_ex_for.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim9_ex_function_def_tail_comment_errors.vim2
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim9_ex_function_def_tail_comments.vim2
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim9_ex_import.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim9_ex_interface_fold.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim9_ex_let_heredoc.vim2
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim9_ex_loadkeymap.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim9_expressions.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim9_lambdas.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim9_legacy_header.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim9_super_this_keywords.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim9_super_this_keywords2.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim9_super_this_keywords3.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim9_variables.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim_comments.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim_ex_call.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim_ex_command.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim_ex_commands.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim_ex_def.vim2
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim_ex_def_fold.vim2
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim_ex_def_nested.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim_ex_def_nested_fold.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim_ex_echo.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim_ex_execute.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim_ex_for.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim_ex_function.vim2
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim_ex_function_def_tail_comment_errors.vim2
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim_ex_function_def_tail_comments.vim2
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim_ex_function_fold.vim2
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim_ex_import.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim_ex_let_heredoc.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim_ex_loadkeymap.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim_ex_loadkeymap_after_bar.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim_ex_loadkeymap_after_colon.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim_ex_map.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim_ex_match.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim_ex_menu.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim_ex_redir.vim2
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim_ex_substitute.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim_ex_syntax.vim2
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim_expressions.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim_function_variables.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim_lambdas.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim_line_continuation.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/setup/vim_variables.vim1
-rw-r--r--uvim/runtime/syntax/testdir/input/sh_09.sh2
-rw-r--r--uvim/runtime/syntax/testdir/input/sh_12.sh8
-rw-r--r--uvim/runtime/syntax/testdir/input/sh_13.sh2
-rw-r--r--uvim/runtime/syntax/testdir/input/sh_functions_bash.sh4
-rw-r--r--uvim/runtime/syntax/testdir/input/sh_functions_dash.sh4
-rw-r--r--uvim/runtime/syntax/testdir/input/sh_functions_ksh2020.sh4
-rw-r--r--uvim/runtime/syntax/testdir/input/sh_functions_ksh88.sh4
-rw-r--r--uvim/runtime/syntax/testdir/input/sh_functions_mksh.sh4
-rw-r--r--uvim/runtime/syntax/testdir/input/skhdrc.skhdrc2
-rw-r--r--uvim/runtime/syntax/testdir/input/sudoers_Defaults.sudoers6
-rw-r--r--uvim/runtime/syntax/testdir/input/tcsh.tcsh2
-rw-r--r--uvim/runtime/syntax/testdir/input/vim9_ex_import.vim120
-rw-r--r--uvim/runtime/syntax/testdir/input/vim9_legacy_header_fold.vim22
-rw-r--r--uvim/runtime/syntax/testdir/input/vim9_shebang.vim8
-rw-r--r--uvim/runtime/syntax/testdir/input/vim_ex_catch.vim19
-rw-r--r--uvim/runtime/syntax/testdir/input/vim_ex_import.vim119
-rw-r--r--uvim/runtime/syntax/testdir/input/vim_ex_vimgrep.vim69
-rw-r--r--uvim/runtime/syntax/testdir/input/vim_nvim_features.vim229
-rw-r--r--uvim/runtime/syntax/testdir/input/vim_shebang.vim5
302 files changed, 1273 insertions, 1273 deletions
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
Binary files differ
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