NOISSUE rebrand vim to MNV's not Vim

Signed-off-by: Mehmet Samet Duman <yongdohyun@projecttick.org>

23 files changed, 164 insertions, 164 deletions

diff --git a/uvim/src/testdir/util/amiga.vim b/uvim/src/testdir/util/amiga.mnv
index 2837fe564d..61b0318972 100644
--- a/uvim/src/testdir/util/amiga.vim
+++ b/uvim/src/testdir/util/amiga.mnv
@@ -3,4 +3,4 @@ set shell=csh
 map! /tmp t:
 cmap !rm !Delete all
 
-source util/setup.vim
+source util/setup.mnv
diff --git a/uvim/src/testdir/util/check.vim b/uvim/src/testdir/util/check.mnv
index 8df985091c..731455ca11 100644
--- a/uvim/src/testdir/util/check.vim
+++ b/uvim/src/testdir/util/check.mnv
@@ -1,9 +1,9 @@
-source util/shared.vim
-source util/term_util.vim
+source util/shared.mnv
+source util/term_util.mnv
 
 " uses line-continuation
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo&mnv
 
 command -nargs=1 MissingFeature throw 'Skipped: ' .. <args> .. ' feature missing'
 
@@ -152,7 +152,7 @@ endfunc
 
 func SetupWindowSizeToForVisualDumps()
   " The dumps used as reference in these tests were created with a terminal
-  " width of 75 columns. The vim window that uses the remainder of the GUI
+  " width of 75 columns. The mnv window that uses the remainder of the GUI
   " window width must be at least 3 columns. In theory this means we need the
   " GUI shell to provide 78+ columns. However the GTK3 resize logic is flaky,
   " sometimes resulting in X11 Configure events that are narrower than
@@ -173,11 +173,11 @@ func SetupWindowSizeToForVisualDumps()
 endfunc
 
 " Command to check that making screendumps is supported.
-" Caller must source util/screendump.vim
+" Caller must source util/screendump.mnv
 command CheckScreendump call CheckScreendump()
 func CheckScreendump()
   let g:check_screendump_called = v:true
-  if !CanRunVimInTerminal()
+  if !CanRunMNVInTerminal()
     throw 'Skipped: cannot make screendumps'
   endif
   if has('gui_running')
@@ -185,11 +185,11 @@ func CheckScreendump()
   endif
 endfunc
 
-" Command to check that we can Run Vim in a terminal window
-command CheckRunVimInTerminal call CheckRunVimInTerminal()
-func CheckRunVimInTerminal()
-  if !CanRunVimInTerminal()
-    throw 'Skipped: cannot run Vim in a terminal window'
+" Command to check that we can Run MNV in a terminal window
+command CheckRunMNVInTerminal call CheckRunMNVInTerminal()
+func CheckRunMNVInTerminal()
+  if !CanRunMNVInTerminal()
+    throw 'Skipped: cannot run MNV in a terminal window'
   endif
 endfunc
 
@@ -352,7 +352,7 @@ command RunSocketServer call RunSocketServer()
 func RunSocketServer()
   if has("socketserver") && v:servername == ""
     try
-      call remote_startserver('VIMSOCKETSERVERTEST')
+      call remote_startserver('MNVSOCKETSERVERTEST')
     catch " not possible to start a remote server
       throw 'Skipped: Cannot start remote server'
     endtry
@@ -361,4 +361,4 @@ endfunc
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/util/color_ramp.vim b/uvim/src/testdir/util/color_ramp.mnv
index 8eed8f9863..8eed8f9863 100644
--- a/uvim/src/testdir/util/color_ramp.vim
+++ b/uvim/src/testdir/util/color_ramp.mnv
diff --git a/uvim/src/testdir/util/dos.vim b/uvim/src/testdir/util/dos.mnv
index 3134d341a3..a61add81f1 100644
--- a/uvim/src/testdir/util/dos.vim
+++ b/uvim/src/testdir/util/dos.mnv
@@ -6,4 +6,4 @@ if executable("cmd.exe")
    set shell=cmd.exe shellcmdflag=/D\ /c
 endif
 
-source util/setup.vim
+source util/setup.mnv
diff --git a/uvim/src/testdir/util/gen_opt_test.vim b/uvim/src/testdir/util/gen_opt_test.mnv
index 72ff49b62e..2ecda2e103 100644
--- a/uvim/src/testdir/util/gen_opt_test.vim
+++ b/uvim/src/testdir/util/gen_opt_test.mnv
@@ -1,7 +1,7 @@
-" Script to generate src/testdir/opt_test.vim from src/optiondefs.h and
+" Script to generate src/testdir/opt_test.mnv from src/optiondefs.h and
 " runtime/doc/options.txt
 
-set cpo&vim
+set cpo&mnv
 
 " Only do this when build with the +eval feature.
 if 1
@@ -50,8 +50,8 @@ let skip_setglobal_reasons = #{
 " Script header.
 " The test values contains multibyte characters.
 let script = [
-      \ '" DO NOT EDIT: Generated with util/gen_opt_test.vim',
-      \ '" Used by test_options_all.vim.',
+      \ '" DO NOT EDIT: Generated with util/gen_opt_test.mnv',
+      \ '" Used by test_options_all.mnv.',
       \ '',
       \ 'scriptencoding utf-8',
       \ ]
@@ -147,7 +147,7 @@ let test_values = {
       \ 'cedit': [['', '^Y', '^@', '<Esc>', '<t_xx>'],
       \		['xxx', 'f', '<xxx>', '<t_xxx>', '<Esc', '<t_xx']],
       \ 'clipboard': [['', 'unnamed', 'unnamedplus', 'autoselect',
-      \		'autoselectplus', 'autoselectml', 'html', 'exclude:vimdisplay',
+      \		'autoselectplus', 'autoselectml', 'html', 'exclude:mnvdisplay',
       \		'autoselect,unnamed', 'unnamed,exclude:.*'],
       \		['xxx', 'exclude:\\ze*', 'exclude:\\%(']],
       \ 'clipmethod': [['wayland', 'x11', 'wayland,x11', ''],['xxx', '--', 'wayland,,', ',x11']],
@@ -347,7 +347,7 @@ let test_values = {
       \ 'verbosefile': [['', './Xfile'], []],
       \ 'viewoptions': [['', 'cursor', 'folds', 'options', 'localoptions',
       \		'slash', 'unix', 'curdir', 'unix,slash'], ['xxx']],
-      \ 'viminfo': [['', '''50', '"30', "'100,<50,s10,h"], ['xxx', 'h']],
+      \ 'mnvinfo': [['', '''50', '"30', "'100,<50,s10,h"], ['xxx', 'h']],
       \ 'virtualedit': [['', 'block', 'insert', 'all', 'onemore', 'none',
       \		'NONE', 'all,block'],
       \		['xxx']],
@@ -434,7 +434,7 @@ if !empty(invalid_options)
 endif
 
 1
-call search('struct vimoption options')
+call search('struct mnvoption options')
 while 1
   if search('{"', 'W') > end
     break
@@ -535,7 +535,7 @@ while 1
   call add(script, 'endfunc')
 endwhile
 
-call writefile(script, 'opt_test.vim')
+call writefile(script, 'opt_test.mnv')
 
 " Write error messages if error occurs.
 catch
@@ -551,4 +551,4 @@ endif
 
 qa!
 
-" vim:sw=2:ts=8:noet:nosta:
+" mnv:sw=2:ts=8:noet:nosta:
diff --git a/uvim/src/testdir/util/gui_init.vim b/uvim/src/testdir/util/gui_init.mnv
index 4fa6cbc77a..600941d91b 100644
--- a/uvim/src/testdir/util/gui_init.vim
+++ b/uvim/src/testdir/util/gui_init.mnv
@@ -1,4 +1,4 @@
-" gvimrc for test_gui_init.vim
+" gmnvrc for test_gui_init.mnv
 
 if has('gui_motif') || has('gui_gtk2') || has('gui_gtk3')
   set guiheadroom=0
diff --git a/uvim/src/testdir/util/gui_preinit.mnv b/uvim/src/testdir/util/gui_preinit.mnv
new file mode 100644
index 0000000000..b93e1114f4
--- /dev/null
+++ b/uvim/src/testdir/util/gui_preinit.mnv
@@ -0,0 +1,7 @@
+" mnvrc for test_gui_init.mnv
+
+" Note that this flag must be added in the .mnvrc file, before switching on
+" syntax or filetype recognition (when the |gmnvrc| file is sourced the system
+" menu has already been loaded; the ":syntax on" and ":filetype on" commands
+" load the menu too).
+set guioptions+=M
diff --git a/uvim/src/testdir/util/gui_preinit.vim b/uvim/src/testdir/util/gui_preinit.vim
deleted file mode 100644
index c351b72461..0000000000
--- a/uvim/src/testdir/util/gui_preinit.vim
+++ /dev/null
@@ -1,7 +0,0 @@
-" vimrc for test_gui_init.vim
-
-" Note that this flag must be added in the .vimrc file, before switching on
-" syntax or filetype recognition (when the |gvimrc| file is sourced the system
-" menu has already been loaded; the ":syntax on" and ":filetype on" commands
-" load the menu too).
-set guioptions+=M
diff --git a/uvim/src/testdir/util/vim9.vim b/uvim/src/testdir/util/mnv9.mnv
index b994855b8c..4dad00938d 100644
--- a/uvim/src/testdir/util/vim9.vim
+++ b/uvim/src/testdir/util/mnv9.mnv
@@ -1,6 +1,6 @@
-vim9script
+mnv9script
 
-# Utility functions for testing Vim9 script
+# Utility functions for testing MNV9 script
 
 # Use a different file name for each run.
 var sequence = 1
@@ -112,11 +112,11 @@ enddef
 
 export def CheckDefAndScriptSuccess(lines: list<string>)
   CheckDefSuccess(lines)
-  CheckScriptSuccess(['vim9script'] + lines)
+  CheckScriptSuccess(['mnv9script'] + lines)
 enddef
 
 # Check that a command fails when used in a :def function and when used in
-# Vim9 script.
+# MNV9 script.
 # When "error" is a string, both with the same error.
 # When "error" is a list, the :def function fails with "error[0]" , the script
 # fails with "error[1]".
@@ -134,11 +134,11 @@ export def CheckDefAndScriptFailure(lines: list<string>, error: any, lnum = -3)
     return
   endif
   CheckDefFailure(lines, errorDef, lnum)
-  CheckScriptFailure(['vim9script'] + lines, errorScript, lnum + 1)
+  CheckScriptFailure(['mnv9script'] + lines, errorScript, lnum + 1)
 enddef
 
 # Check that a command fails when executed in a :def function and when used in
-# Vim9 script.
+# MNV9 script.
 # When "error" is a string, both with the same error.
 # When "error" is a list, the :def function fails with "error[0]" , the script
 # fails with "error[1]".
@@ -156,7 +156,7 @@ export def CheckDefExecAndScriptFailure(lines: list<string>, error: any, lnum =
     return
   endif
   CheckDefExecFailure(lines, errorDef, lnum)
-  CheckScriptFailure(['vim9script'] + lines, errorScript, lnum + 1)
+  CheckScriptFailure(['mnv9script'] + lines, errorScript, lnum + 1)
 enddef
 
 
@@ -191,7 +191,7 @@ export func CheckLegacyFailure(lines, error)
   endtry
 endfunc
 
-# Translate "lines" to legacy Vim script
+# Translate "lines" to legacy MNV script
 def LegacyTrans(lines: list<string>): list<string>
   return lines->mapnew((_, v) =>
 		v->substitute('\<VAR\>', 'let', 'g')
@@ -205,12 +205,12 @@ def LegacyTrans(lines: list<string>): list<string>
 enddef
 
 # Execute "lines" in a legacy function, translated as in
-# CheckLegacyAndVim9Success()
+# CheckLegacyAndMNV9Success()
 export def CheckTransLegacySuccess(lines: list<string>)
   CheckLegacySuccess(LegacyTrans(lines))
 enddef
 
-export def Vim9Trans(lines: list<string>): list<string>
+export def MNV9Trans(lines: list<string>): list<string>
   return lines->mapnew((_, v) =>
 	    v->substitute('\<VAR\>', 'var', 'g')
 	    ->substitute('\<LET ', '', 'g')
@@ -222,35 +222,35 @@ export def Vim9Trans(lines: list<string>): list<string>
 enddef
 
 # Execute "lines" in a :def function, translated as in
-# CheckLegacyAndVim9Success()
+# CheckLegacyAndMNV9Success()
 export def CheckTransDefSuccess(lines: list<string>)
-  CheckDefSuccess(Vim9Trans(lines))
+  CheckDefSuccess(MNV9Trans(lines))
 enddef
 
-# Execute "lines" in a Vim9 script, translated as in
-# CheckLegacyAndVim9Success()
-export def CheckTransVim9Success(lines: list<string>)
-  CheckScriptSuccess(['vim9script'] + Vim9Trans(lines))
+# Execute "lines" in a MNV9 script, translated as in
+# CheckLegacyAndMNV9Success()
+export def CheckTransMNV9Success(lines: list<string>)
+  CheckScriptSuccess(['mnv9script'] + MNV9Trans(lines))
 enddef
 
-# Execute "lines" in a legacy function, :def function and Vim9 script.
+# Execute "lines" in a legacy function, :def function and MNV9 script.
 # Use 'VAR' for a declaration.
 # Use 'LET' for an assignment
 # Use ' #"' for a comment
 # Use LSTART arg LMIDDLE expr LEND for lambda
-# Use 'TRUE' for 1 in legacy, true in Vim9
-# Use 'FALSE' for 0 in legacy, false in Vim9
-export def CheckLegacyAndVim9Success(lines: list<string>)
+# Use 'TRUE' for 1 in legacy, true in MNV9
+# Use 'FALSE' for 0 in legacy, false in MNV9
+export def CheckLegacyAndMNV9Success(lines: list<string>)
   CheckTransLegacySuccess(lines)
   CheckTransDefSuccess(lines)
-  CheckTransVim9Success(lines)
+  CheckTransMNV9Success(lines)
 enddef
 
-# Execute "lines" in a legacy function, :def function and Vim9 script.
+# Execute "lines" in a legacy function, :def function and MNV9 script.
 # Use 'VAR' for a declaration.
 # Use 'LET' for an assignment
 # Use ' #"' for a comment
-export def CheckLegacyAndVim9Failure(lines: list<string>, error: any)
+export def CheckLegacyAndMNV9Failure(lines: list<string>, error: any)
   var legacyError: string
   var defError: string
   var scriptError: string
@@ -276,7 +276,7 @@ export def CheckLegacyAndVim9Failure(lines: list<string>, error: any)
 				 ->substitute('#"', ' "', 'g'))
   CheckLegacyFailure(legacylines, legacyError)
 
-  var vim9lines = lines->mapnew((_, v) =>
+  var mnv9lines = lines->mapnew((_, v) =>
 				v->substitute('\<VAR\>', 'var', 'g')
 				 ->substitute('\<LET ', '', 'g')
 				 ->substitute('\<LSTART\>', '(', 'g')
@@ -284,8 +284,8 @@ export def CheckLegacyAndVim9Failure(lines: list<string>, error: any)
 				 ->substitute(' *\<LEND\> *', '', 'g')
 				 ->substitute('\<TRUE\>', 'true', 'g')
 				 ->substitute('\<FALSE\>', 'false', 'g'))
-  CheckDefExecFailure(vim9lines, defError)
-  CheckScriptFailure(['vim9script'] + vim9lines, scriptError)
+  CheckDefExecFailure(mnv9lines, defError)
+  CheckScriptFailure(['mnv9script'] + mnv9lines, scriptError)
 enddef
 
 # Check that "lines" inside a legacy function has no error.
@@ -319,34 +319,34 @@ export func CheckSourceLegacyFailure(lines, error)
 endfunc
 
 # Execute "lines" in a legacy function, translated as in
-# CheckSourceLegacyAndVim9Success()
+# CheckSourceLegacyAndMNV9Success()
 export def CheckSourceTransLegacySuccess(lines: list<string>)
   CheckSourceLegacySuccess(LegacyTrans(lines))
 enddef
 
 # Execute "lines" in a :def function, translated as in
-# CheckLegacyAndVim9Success()
+# CheckLegacyAndMNV9Success()
 export def CheckSourceTransDefSuccess(lines: list<string>)
-  CheckSourceDefSuccess(Vim9Trans(lines))
+  CheckSourceDefSuccess(MNV9Trans(lines))
 enddef
 
-# Execute "lines" in a Vim9 script, translated as in
-# CheckLegacyAndVim9Success()
-export def CheckSourceTransVim9Success(lines: list<string>)
-  CheckSourceScriptSuccess(['vim9script'] + Vim9Trans(lines))
+# Execute "lines" in a MNV9 script, translated as in
+# CheckLegacyAndMNV9Success()
+export def CheckSourceTransMNV9Success(lines: list<string>)
+  CheckSourceScriptSuccess(['mnv9script'] + MNV9Trans(lines))
 enddef
 
-# Execute "lines" in a legacy function, :def function and Vim9 script.
+# Execute "lines" in a legacy function, :def function and MNV9 script.
 # Use 'VAR' for a declaration.
 # Use 'LET' for an assignment
 # Use ' #"' for a comment
 # Use LSTART arg LMIDDLE expr LEND for lambda
-# Use 'TRUE' for 1 in legacy, true in Vim9
-# Use 'FALSE' for 0 in legacy, false in Vim9
-export def CheckSourceLegacyAndVim9Success(lines: list<string>)
+# Use 'TRUE' for 1 in legacy, true in MNV9
+# Use 'FALSE' for 0 in legacy, false in MNV9
+export def CheckSourceLegacyAndMNV9Success(lines: list<string>)
   CheckSourceTransLegacySuccess(lines)
   CheckSourceTransDefSuccess(lines)
-  CheckSourceTransVim9Success(lines)
+  CheckSourceTransMNV9Success(lines)
 enddef
 
 # :source a list of "lines" and check whether it fails with "error"
@@ -462,7 +462,7 @@ export func CheckSourceDefExecFailure(lines, error, lnum = -3)
 endfunc
 
 # Check that a command fails when used in a :def function and when used in
-# Vim9 script.
+# MNV9 script.
 # When "error" is a string, both with the same error.
 # When "error" is a list, the :def function fails with "error[0]" , the script
 # fails with "error[1]".
@@ -480,11 +480,11 @@ export def CheckSourceDefAndScriptFailure(lines: list<string>, error: any, lnum
     return
   endif
   CheckSourceDefFailure(lines, errorDef, lnum)
-  CheckSourceScriptFailure(['vim9script'] + lines, errorScript, lnum + 1)
+  CheckSourceScriptFailure(['mnv9script'] + lines, errorScript, lnum + 1)
 enddef
 
 # Check that a command fails when executed in a :def function and when used in
-# Vim9 script.
+# MNV9 script.
 # When "error" is a string, both with the same error.
 # When "error" is a list, the :def function fails with "error[0]" , the script
 # fails with "error[1]".
@@ -502,7 +502,7 @@ export def CheckSourceDefExecAndScriptFailure(lines: list<string>, error: any, l
     return
   endif
   CheckSourceDefExecFailure(lines, errorDef, lnum)
-  CheckSourceScriptFailure(['vim9script'] + lines, errorScript, lnum + 1)
+  CheckSourceScriptFailure(['mnv9script'] + lines, errorScript, lnum + 1)
 enddef
 
 export def CheckSourceSuccess(lines: list<string>)
@@ -519,14 +519,14 @@ enddef
 
 export def CheckSourceDefAndScriptSuccess(lines: list<string>)
   CheckSourceDefSuccess(lines)
-  CheckSourceScriptSuccess(['vim9script'] + lines)
+  CheckSourceScriptSuccess(['mnv9script'] + lines)
 enddef
 
-# Execute "lines" in a legacy function, :def function and Vim9 script.
+# Execute "lines" in a legacy function, :def function and MNV9 script.
 # Use 'VAR' for a declaration.
 # Use 'LET' for an assignment
 # Use ' #"' for a comment
-export def CheckSourceLegacyAndVim9Failure(lines: list<string>, error: any)
+export def CheckSourceLegacyAndMNV9Failure(lines: list<string>, error: any)
   var legacyError: string
   var defError: string
   var scriptError: string
@@ -542,8 +542,8 @@ export def CheckSourceLegacyAndVim9Failure(lines: list<string>, error: any)
   endif
 
   CheckSourceLegacyFailure(LegacyTrans(lines), legacyError)
-  var vim9lines = Vim9Trans(lines)
-  CheckSourceDefExecFailure(vim9lines, defError)
-  CheckSourceScriptFailure(['vim9script'] + vim9lines, scriptError)
+  var mnv9lines = MNV9Trans(lines)
+  CheckSourceDefExecFailure(mnv9lines, defError)
+  CheckSourceScriptFailure(['mnv9script'] + mnv9lines, scriptError)
 enddef
 
diff --git a/uvim/src/testdir/util/mouse.vim b/uvim/src/testdir/util/mouse.mnv
index e2979b771c..454a9a6713 100644
--- a/uvim/src/testdir/util/mouse.vim
+++ b/uvim/src/testdir/util/mouse.mnv
@@ -20,9 +20,9 @@ else
   let g:Ttymouse_netterm = []
 endif
 
-" Vim Mouse Codes.
+" MNV Mouse Codes.
 " Used by the GUI and by MS-Windows Consoles.
-" Keep these in sync with vim.h
+" Keep these in sync with mnv.h
 let s:MOUSE_CODE = {
   \ 'BTN_LEFT'    :  0x00,
   \ 'BTN_MIDDLE'  :  0x01,
@@ -369,4 +369,4 @@ func MouseShiftWheelRight(row, col)
   endif
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/util/popupbounce.vim b/uvim/src/testdir/util/popupbounce.mnv
index 5e63aca347..83cdf21571 100644
--- a/uvim/src/testdir/util/popupbounce.vim
+++ b/uvim/src/testdir/util/popupbounce.mnv
@@ -3,8 +3,8 @@
 "    cd src
 "    # Edit Makefile to uncomment PROFILE_CFLAGS and PROFILE_LIBS
 "    make reconfig
-"    ./vim --clean -S testdir/util/popupbounce.vim main.c
-"    gprof vim gmon.out | vim -
+"    ./mnv --clean -S testdir/util/popupbounce.mnv main.c
+"    gprof mnv gmon.out | mnv -
 
 " using line continuation
 set nocp
diff --git a/uvim/src/testdir/util/screendump.vim b/uvim/src/testdir/util/screendump.mnv
index c881eb9636..2f28c759a8 100644
--- a/uvim/src/testdir/util/screendump.vim
+++ b/uvim/src/testdir/util/screendump.mnv
@@ -87,7 +87,7 @@ def g:ScreenDumpLookForFFFDChars(
   endif
 enddef
 
-" Verify that Vim running in terminal buffer "buf" matches the screen dump.
+" Verify that MNV running in terminal buffer "buf" matches the screen dump.
 "
 " A copy of "options" is passed to "term_dumpwrite()".  For convenience, this
 " dictionary supports other optional entries:
@@ -108,8 +108,8 @@ enddef
 "
 " The file name used is "dumps/{filename}.dump".
 "
-" To ignore part of the dump, provide a "dumps/{filename}.vim" file with
-" Vim commands to be applied to both the reference and the current dump, so
+" To ignore part of the dump, provide a "dumps/{filename}.mnv" file with
+" MNV commands to be applied to both the reference and the current dump, so
 " that parts that are irrelevant are not used for the comparison.  The result
 " is NOT written, thus "term_dumpdiff()" shows the difference anyway.
 "
@@ -122,7 +122,7 @@ func VerifyScreenDump(buf, filename, options, ...)
     return 1
   endif
   let reference = 'dumps/' . a:filename . '.dump'
-  let filter = 'dumps/' . a:filename . '.vim'
+  let filter = 'dumps/' . a:filename . '.mnv'
   let testfile = 'failed/' . a:filename . '.dump'
 
   let options_copy = copy(a:options)
@@ -214,7 +214,7 @@ func VerifyScreenDump(buf, filename, options, ...)
     endfor
 
     " Always add the last error so that it is displayed on timeout.
-    " See TestTimeout() in runtest.vim.
+    " See TestTimeout() in runtest.mnv.
     if i > 0
       call remove(v:errors, -1)
     endif
@@ -228,4 +228,4 @@ func VerifyScreenDump(buf, filename, options, ...)
   return 0
 endfunc
 
-" vim:sw=2:ts=8:noet:
+" mnv:sw=2:ts=8:noet:
diff --git a/uvim/src/testdir/util/script_util.vim b/uvim/src/testdir/util/script_util.mnv
index a300b670c7..b385e76907 100644
--- a/uvim/src/testdir/util/script_util.vim
+++ b/uvim/src/testdir/util/script_util.mnv
@@ -1,4 +1,4 @@
-" Functions shared by the tests for Vim script
+" Functions shared by the tests for MNV script
 
 " Commands to track the execution path of a script
 com!		   XpathINIT  let g:Xpath = ''
diff --git a/uvim/src/testdir/util/setup.vim b/uvim/src/testdir/util/setup.mnv
index 485675aa33..08bc24bb6f 100644
--- a/uvim/src/testdir/util/setup.vim
+++ b/uvim/src/testdir/util/setup.mnv
@@ -15,7 +15,7 @@ if 1
 endif
 
 " Make sure 'runtimepath' and 'packpath' does not include $HOME.
-set rtp=$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after
+set rtp=$MNV/mnvfiles,$MNVRUNTIME,$MNV/mnvfiles/after
 if has('packages')
   let &packpath = &rtp
 endif
diff --git a/uvim/src/testdir/util/setup_gui.vim b/uvim/src/testdir/util/setup_gui.mnv
index 2e5e77771d..2e5e77771d 100644
--- a/uvim/src/testdir/util/setup_gui.vim
+++ b/uvim/src/testdir/util/setup_gui.mnv
diff --git a/uvim/src/testdir/util/shared.vim b/uvim/src/testdir/util/shared.mnv
index c49f305deb..1ea367392b 100644
--- a/uvim/src/testdir/util/shared.vim
+++ b/uvim/src/testdir/util/shared.mnv
@@ -5,7 +5,7 @@ if exists('*PythonProg')
   finish
 endif
 
-source util/view_util.vim
+source util/view_util.mnv
 
 " When 'term' is changed some status requests may be sent.  The responses may
 " interfere with what is being tested.  A short sleep is used to process any of
@@ -292,43 +292,43 @@ func s:feedkeys(timer)
   call feedkeys('x', 'nt')
 endfunc
 
-" Get the name of the Vim executable that we expect has been build in the src
+" Get the name of the MNV executable that we expect has been build in the src
 " directory.
-func s:GetJustBuildVimExe()
+func s:GetJustBuildMNVExe()
   if has("win32")
-    if !filereadable('..\vim.exe') && filereadable('..\vimd.exe')
+    if !filereadable('..\mnv.exe') && filereadable('..\mnvd.exe')
       " looks like the debug executable was intentionally build, so use it
-      return '..\vimd.exe'
+      return '..\mnvd.exe'
     endif
-    return '..\vim.exe'
+    return '..\mnv.exe'
   endif
-  return '../vim'
+  return '../mnv'
 endfunc
 
-" Get $VIMPROG to run the Vim executable.
-" The Makefile writes it as the first line in the "vimcmd" file.
-" Falls back to the Vim executable in the src directory.
-func GetVimProg()
-  if filereadable('vimcmd')
-    return readfile('vimcmd')[0]
+" Get $MNVPROG to run the MNV executable.
+" The Makefile writes it as the first line in the "mnvcmd" file.
+" Falls back to the MNV executable in the src directory.
+func GetMNVProg()
+  if filereadable('mnvcmd')
+    return readfile('mnvcmd')[0]
   endif
-  echo 'Cannot read the "vimcmd" file, falling back to ../vim.'
+  echo 'Cannot read the "mnvcmd" file, falling back to ../mnv.'
 
   " Probably the script was sourced instead of running "make".
-  " We assume Vim was just build in the src directory then.
-  return s:GetJustBuildVimExe()
+  " We assume MNV was just build in the src directory then.
+  return s:GetJustBuildMNVExe()
 endfunc
 
 let g:valgrind_cnt = 1
 
-" Get the command to run Vim, with -u NONE and --not-a-term arguments.
+" Get the command to run MNV, with -u NONE and --not-a-term arguments.
 " If there is an argument use it instead of "NONE".
-func GetVimCommand(...)
-  if filereadable('vimcmd')
-    let lines = readfile('vimcmd')
+func GetMNVCommand(...)
+  if filereadable('mnvcmd')
+    let lines = readfile('mnvcmd')
   else
-    echo 'Cannot read the "vimcmd" file, falling back to ../vim.'
-    let lines = [s:GetJustBuildVimExe()]
+    echo 'Cannot read the "mnvcmd" file, falling back to ../mnv.'
+    let lines = [s:GetJustBuildMNVExe()]
   endif
 
   if a:0 == 0
@@ -337,7 +337,7 @@ func GetVimCommand(...)
     let name = a:1
   endif
   " For Unix Makefile writes the command to use in the second line of the
-  " "vimcmd" file, including environment options.
+  " "mnvcmd" file, including environment options.
   " Other Makefiles just write the executable in the first line, so fall back
   " to that if there is no second line or it is empty.
   if len(lines) > 1 && lines[1] != ''
@@ -367,7 +367,7 @@ endfunc
 " Return one when it looks like the tests are run with valgrind, which means
 " that everything is much slower.
 func RunningWithValgrind()
-  return GetVimCommand() =~ '\<valgrind\>'
+  return GetMNVCommand() =~ '\<valgrind\>'
 endfunc
 
 func RunningAsan()
@@ -380,59 +380,59 @@ endfun
 
 const g:test_timeout = (ValgrindOrAsan()) ? 5000 * 4 : 5000
 
-" Get the command to run Vim, with --clean instead of "-u NONE".
-func GetVimCommandClean()
-  let cmd = GetVimCommand()
+" Get the command to run MNV, with --clean instead of "-u NONE".
+func GetMNVCommandClean()
+  let cmd = GetMNVCommand()
   let cmd = substitute(cmd, '-u NONE', '--clean', '')
   let cmd = substitute(cmd, '--not-a-term', '', '')
 
-  " Force using utf-8, Vim may pick up something else from the environment.
+  " Force using utf-8, MNV may pick up something else from the environment.
   let cmd ..= ' --cmd "set enc=utf8" '
 
-  " Optionally run Vim under valgrind
+  " Optionally run MNV under valgrind
   " let cmd = 'valgrind --tool=memcheck --leak-check=yes --num-callers=25 --log-file=valgrind ' . cmd
 
   return cmd
 endfunc
 
-" Get the command to run Vim, with --clean, and force to run in terminal so it
+" Get the command to run MNV, with --clean, and force to run in terminal so it
 " won't start a new GUI.
-func GetVimCommandCleanTerm()
-  " Add -v to have gvim run in the terminal (if possible)
-  return GetVimCommandClean() .. ' -v '
+func GetMNVCommandCleanTerm()
+  " Add -v to have gmnv run in the terminal (if possible)
+  return GetMNVCommandClean() .. ' -v '
 endfunc
 
-" Run Vim, using the "vimcmd" file and "-u NORC".
-" "before" is a list of Vim commands to be executed before loading plugins.
-" "after" is a list of Vim commands to be executed after loading plugins.
+" Run MNV, using the "mnvcmd" file and "-u NORC".
+" "before" is a list of MNV commands to be executed before loading plugins.
+" "after" is a list of MNV commands to be executed after loading plugins.
 " Plugins are not loaded, unless 'loadplugins' is set in "before".
-" Return 1 if Vim could be executed.
-func RunVim(before, after, arguments)
-  return RunVimPiped(a:before, a:after, a:arguments, '')
+" Return 1 if MNV could be executed.
+func RunMNV(before, after, arguments)
+  return RunMNVPiped(a:before, a:after, a:arguments, '')
 endfunc
 
-func RunVimPiped(before, after, arguments, pipecmd)
-  let cmd = GetVimCommand()
+func RunMNVPiped(before, after, arguments, pipecmd)
+  let cmd = GetMNVCommand()
   let args = ''
   if len(a:before) > 0
-    call writefile(a:before, 'Xbefore.vim')
-    let args .= ' --cmd "so Xbefore.vim"'
+    call writefile(a:before, 'Xbefore.mnv')
+    let args .= ' --cmd "so Xbefore.mnv"'
   endif
   if len(a:after) > 0
-    call writefile(a:after, 'Xafter.vim')
-    let args .= ' -S Xafter.vim'
+    call writefile(a:after, 'Xafter.mnv')
+    let args .= ' -S Xafter.mnv'
   endif
 
-  " Optionally run Vim under valgrind
+  " Optionally run MNV under valgrind
   " let cmd = 'valgrind --tool=memcheck --leak-check=yes --num-callers=25 --log-file=valgrind ' . cmd
 
   exe "silent !" .. a:pipecmd .. ' ' ..  cmd .. args .. ' ' .. a:arguments
 
   if len(a:before) > 0
-    call delete('Xbefore.vim')
+    call delete('Xbefore.mnv')
   endif
   if len(a:after) > 0
-    call delete('Xafter.vim')
+    call delete('Xafter.mnv')
   endif
   return 1
 endfunc
@@ -473,4 +473,4 @@ func AssertException(cmds, errstr)
   call assert_match(a:errstr, save_exception)
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/util/socketserver.vim b/uvim/src/testdir/util/socketserver.mnv
index 5492db626d..19ff56406a 100644
--- a/uvim/src/testdir/util/socketserver.vim
+++ b/uvim/src/testdir/util/socketserver.mnv
@@ -7,11 +7,11 @@ func TrySocketServer()
     let g:socketserver_only = v:true
 
     if v:servername == ""
-      call remote_startserver('VIMSOCKETSERVERTEST')
+      call remote_startserver('MNVSOCKETSERVERTEST')
     endif
   else
       let g:socketserver_only = v:false
     endif
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/util/summarize.vim b/uvim/src/testdir/util/summarize.mnv
index d0d4e00b2c..220846a30d 100644
--- a/uvim/src/testdir/util/summarize.vim
+++ b/uvim/src/testdir/util/summarize.mnv
@@ -1,8 +1,8 @@
-set cpo&vim
+set cpo&mnv
 if 1
   " This is executed only with the eval feature
   set nocompatible
-  set viminfo=
+  set mnvinfo=
   func Count(match, type)
     if a:type ==# 'executed'
       let g:executed += (a:match+0)
diff --git a/uvim/src/testdir/util/term_util.vim b/uvim/src/testdir/util/term_util.mnv
index 61ff9ce1b8..4150355ce5 100644
--- a/uvim/src/testdir/util/term_util.vim
+++ b/uvim/src/testdir/util/term_util.mnv
@@ -1,16 +1,16 @@
 " Functions about terminal shared by several tests
 
 " Only load this script once.
-if exists('*CanRunVimInTerminal')
+if exists('*CanRunMNVInTerminal')
   finish
 endif
 
-source util/shared.vim
+source util/shared.mnv
 
-" For most tests we need to be able to run terminal Vim with 256 colors.  On
+" For most tests we need to be able to run terminal MNV with 256 colors.  On
 " MS-Windows the console only has 16 colors and the GUI can't run in a
 " terminal.
-func CanRunVimInTerminal()
+func CanRunMNVInTerminal()
   return has('terminal') && !has('win32')
 endfunc
 
@@ -44,7 +44,7 @@ func TermWait(buf, ...)
   let g:test_is_flaky = 1
 endfunc
 
-" Run Vim with "arguments" in a new terminal window.
+" Run MNV with "arguments" in a new terminal window.
 " By default uses a size of 20 lines and 75 columns.
 " Returns the buffer number of the terminal.
 "
@@ -58,8 +58,8 @@ endfunc
 " "no_clean" - if non-zero then remove "--clean" from the command
 " "cmd"  - run any other command, e.g. "xxd" (used in xxd test)
 " "env"  - additional environment variables, e.g. $TERM variable
-func RunVimInTerminal(arguments, options)
-  " If Vim doesn't exit a swap file remains, causing other tests to fail.
+func RunMNVInTerminal(arguments, options)
+  " If MNV doesn't exit a swap file remains, causing other tests to fail.
   " Remove it here.
   call delete(".swp")
 
@@ -93,7 +93,7 @@ func RunVimInTerminal(arguments, options)
   endif
 
   if empty(get(a:options, 'cmd', ''))
-    let cmd = GetVimCommandCleanTerm() .. reset_u7 .. a:arguments
+    let cmd = GetMNVCommandCleanTerm() .. reset_u7 .. a:arguments
   else
     let cmd = get(a:options, 'cmd')
   endif
@@ -139,19 +139,19 @@ func RunVimInTerminal(arguments, options)
       call WaitFor({-> len(term_getline(buf, rows)) >= cols - 1 || len(term_getline(buf, rows - statusoff)) >= cols - 1})
     catch /timed out after/
       let lines = map(range(1, rows), {key, val -> term_getline(buf, val)})
-      call assert_report('RunVimInTerminal() failed, screen contents: ' . join(lines, "<NL>"))
+      call assert_report('RunMNVInTerminal() failed, screen contents: ' . join(lines, "<NL>"))
     endtry
   endif
 
-  " Starting a terminal to run Vim is always considered flaky.
+  " Starting a terminal to run MNV is always considered flaky.
   let g:test_is_flaky = 1
 
   return buf
 endfunc
 
-" Stop a Vim running in terminal buffer "buf".
-func StopVimInTerminal(buf, kill = 1)
-  " Using a terminal to run Vim is always considered flaky.
+" Stop a MNV running in terminal buffer "buf".
+func StopMNVInTerminal(buf, kill = 1)
+  " Using a terminal to run MNV is always considered flaky.
   let g:test_is_flaky = 1
 
   call assert_equal("running", term_getstatus(a:buf))
@@ -208,4 +208,4 @@ func Term_getlines(buf, lines)
 endfunc
 
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab
diff --git a/uvim/src/testdir/util/unix.vim b/uvim/src/testdir/util/unix.mnv
index 8a97129475..9ac6f7d5bf 100644
--- a/uvim/src/testdir/util/unix.vim
+++ b/uvim/src/testdir/util/unix.mnv
@@ -10,4 +10,4 @@ if 1
   let g:tester_HOME = $HOME
 endif
 
-source util/setup.vim
+source util/setup.mnv
diff --git a/uvim/src/testdir/util/view_util.vim b/uvim/src/testdir/util/view_util.mnv
index 5c5bfa81de..b355a81a54 100644
--- a/uvim/src/testdir/util/view_util.vim
+++ b/uvim/src/testdir/util/view_util.mnv
@@ -65,7 +65,7 @@ func CloseWindow() abort
 endfunc
 
 
-" When using RunVimInTerminal() we expect modifyOtherKeys level 2 to be enabled
+" When using RunMNVInTerminal() we expect modifyOtherKeys level 2 to be enabled
 " automatically.  The key + modifier Escape codes must then use the
 " modifyOtherKeys encoding.  They are recognized anyway, thus it's safer to use
 " than the raw code.
diff --git a/uvim/src/testdir/util/vms.vim b/uvim/src/testdir/util/vms.mnv
index 0a264e9560..b3833ee615 100644
--- a/uvim/src/testdir/util/vms.vim
+++ b/uvim/src/testdir/util/vms.mnv
@@ -3,4 +3,4 @@
 " Do not use any swap files
 set noswapfile
 
-source util/setup.vim
+source util/setup.mnv
diff --git a/uvim/src/testdir/util/window_manager.vim b/uvim/src/testdir/util/window_manager.mnv
index 7a3c0c0d08..7a8771f8bf 100644
--- a/uvim/src/testdir/util/window_manager.vim
+++ b/uvim/src/testdir/util/window_manager.mnv
@@ -104,4 +104,4 @@ func EndXServer(display)
   unlet s:x11_displays[a:display]
 endfunc
 
-" vim: shiftwidth=2 sts=2 expandtab
+" mnv: shiftwidth=2 sts=2 expandtab