diff --git a/Makefile b/Makefile index ad07376366..c77a6ec96c 100644 --- a/Makefile +++ b/Makefile @@ -153,7 +153,7 @@ MINOR = 1 # - > make dossrc # > make dosrt # Unpack dist/vim##rt.zip and dist/vim##src.zip on an MS-Windows PC. -# This creates the directory vim/vim90 and puts all files in there. +# This creates the directory vim/vim91 and puts all files in there. # Win32 console version build: # - See src/INSTALLpc.txt for installing the compiler and SDK. # - Set environment for Visual C++ 2015: @@ -209,7 +209,7 @@ MINOR = 1 # gvimext64.dll in src/GvimExt # gvimext64.dll can be obtained from: # https://github.com/vim/vim-win32-installer/releases -# It is part of gvim_9.0.*_x64.zip as vim/vim90/GvimExt/gvimext64.dll. +# It is part of gvim_9.1.*_x64.zip as vim/vim91/GvimExt/gvimext64.dll. # - Make sure there is a diff.exe two levels up (get it from a previous Vim # version). Also put winpty32.dll and winpty-agent.exe there. # - go to ../nsis and do: diff --git a/READMEdir/README_amibin.txt b/READMEdir/README_amibin.txt index ce03f14f7f..224ff36cd1 100644 --- a/READMEdir/README_amibin.txt +++ b/READMEdir/README_amibin.txt @@ -2,7 +2,7 @@ README_amibin.txt for version 9.1 of Vim: Vi IMproved. See "README.txt" for general information about Vim. See "README_ami.txt" for installation instructions for the Amiga. -These files are in the runtime archive (vim90rt.tgz). +These files are in the runtime archive (vim91rt.tgz). The Amiga "bin" archive contains the Vim executable for the Amiga. It was diff --git a/READMEdir/README_amisrc.txt b/READMEdir/README_amisrc.txt index 1d729b823d..5fd4cf2c90 100644 --- a/READMEdir/README_amisrc.txt +++ b/READMEdir/README_amisrc.txt @@ -2,7 +2,7 @@ README_amisrc.txt for version 9.1 of Vim: Vi IMproved. See "README.txt" for general information about Vim. See "README_ami.txt" for installation instructions for the Amiga. -These files are in the runtime archive (vim90rt.tgz). +These files are in the runtime archive (vim91rt.tgz). The Amiga source archive contains the files needed to compile Vim on the diff --git a/READMEdir/README_bindos.txt b/READMEdir/README_bindos.txt index fd9b769081..b1907dd77f 100644 --- a/READMEdir/README_bindos.txt +++ b/READMEdir/README_bindos.txt @@ -2,7 +2,7 @@ README_bindos.txt for version 9.1 of Vim: Vi IMproved. See "README.txt" for general information about Vim. See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows. -These files are in the runtime archive (vim90rt.zip). +These files are in the runtime archive (vim91rt.zip). There are several binary distributions of Vim for the PC. You would normally diff --git a/READMEdir/README_srcdos.txt b/READMEdir/README_srcdos.txt index ff69e482a7..e7ae7a26d8 100644 --- a/READMEdir/README_srcdos.txt +++ b/READMEdir/README_srcdos.txt @@ -2,7 +2,7 @@ README_srcdos.txt for version 9.1 of Vim: Vi IMproved. See "README.txt" for general information about Vim. See "README_dos.txt" for installation instructions for MS-Windows. -These files are in the runtime archive (vim90rt.zip). +These files are in the runtime archive (vim91rt.zip). The DOS source archive contains the files needed to compile Vim on MS-Windows. diff --git a/runtime/doc/Make_mvc.mak b/runtime/doc/Make_mvc.mak index c387ef8c4f..5bfe934e3d 100644 --- a/runtime/doc/Make_mvc.mak +++ b/runtime/doc/Make_mvc.mak @@ -12,7 +12,7 @@ # Correct the following line for the where executeable file vim is installed. # Please do not put the path in quotes. -VIMPROG = D:\Programs\Vim\vim90\vim.exe +VIMPROG = D:\Programs\Vim\vim91\vim.exe # Correct the following line for the directory where iconv installed. # Please do not put the path in quotes. diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index e0ebe7eedb..3cfe59ae70 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -86,8 +86,8 @@ Implement foreach() PR #12166 Errors when running tests with valgrind: - test_codestyle.vim: e.g.: - command line..script /home/mool/vim/vim90/src/testdir/runtest.vim[569]..function RunTheTest[52]..Test_test_files line 6: keycode_check.vim: space before tab: Expected 0 but got 7 - command line..script /home/mool/vim/vim90/src/testdir/runtest.vim[569]..function RunTheTest[52]..Test_test_files line 10: setup.vim: trailing white space: Expected 0 but got 23 + command line..script /home/mool/vim/vim91/src/testdir/runtest.vim[569]..function RunTheTest[52]..Test_test_files line 6: keycode_check.vim: space before tab: Expected 0 but got 7 + command line..script /home/mool/vim/vim91/src/testdir/runtest.vim[569]..function RunTheTest[52]..Test_test_files line 10: setup.vim: trailing white space: Expected 0 but got 23 - test_gui.vim: Found errors in Test_gui_mouse_event(): diff --git a/src/INSTALLpc.txt b/src/INSTALLpc.txt index 7400b49bb5..9c52e9f46e 100644 --- a/src/INSTALLpc.txt +++ b/src/INSTALLpc.txt @@ -915,45 +915,45 @@ work on MS-DOS because of the limited amount of memory available. After you've built the Vim binaries as described above, you're ready to install Vim on your system. However, if you've obtained the Vim sources using Git, Mercurial or by downloading them as a unix tar file, you must -first create a "vim90" directory. If you instead downloaded the sources as +first create a "vim91" directory. If you instead downloaded the sources as zip files, you can skip this setup as the zip archives already have the correct directory structure. - A. Create a Vim "runtime" subdirectory named "vim90" + A. Create a Vim "runtime" subdirectory named "vim91" ----------------------------------------------------- If you obtained your Vim sources as zip files, you can skip this step. Otherwise, continue reading. Go to the directory that contains the Vim "src" and "runtime" - directories and create a new subdirectory named "vim90". + directories and create a new subdirectory named "vim91". - Copy the "runtime" files into "vim90": - copy runtime\* vim90 - xcopy /s runtime\* vim90 + Copy the "runtime" files into "vim91": + copy runtime\* vim91 + xcopy /s runtime\* vim91 - B. Copy the new binaries into the "vim90" directory + B. Copy the new binaries into the "vim91" directory ---------------------------------------------------- Regardless of how you installed the Vim sources, you need to copy the - new binaries you created above into "vim90": + new binaries you created above into "vim91": - copy src\*.exe vim90 - copy src\tee\tee.exe vim90 - copy src\xxd\xxd.exe vim90 + copy src\*.exe vim91 + copy src\tee\tee.exe vim91 + copy src\xxd\xxd.exe vim91 To install the "Edit with Vim" popup menu, you need both 32-bit and 64-bit - versions of gvimext.dll. They should be copied to "vim90\GvimExt32" and - "vim90\GvimExt64" respectively. + versions of gvimext.dll. They should be copied to "vim91\GvimExt32" and + "vim91\GvimExt64" respectively. First, build the 32-bit version, then: - mkdir vim90\GvimExt32 - copy src\GvimExt\gvimext.dll vim90\GvimExt32 + mkdir vim91\GvimExt32 + copy src\GvimExt\gvimext.dll vim91\GvimExt32 Next, clean the 32-bit version and build the 64-bit version, then: - mkdir vim90\GvimExt64 - copy src\GvimExt\gvimext.dll vim90\GvimExt64 + mkdir vim91\GvimExt64 + copy src\GvimExt\gvimext.dll vim91\GvimExt64 - C. Copy gettext and iconv DLLs into the "vim90" directory + C. Copy gettext and iconv DLLs into the "vim91" directory ---------------------------------------------------------- Get gettext and iconv DLLs from the following site: https://github.com/mlocati/gettext-iconv-windows/releases @@ -961,7 +961,7 @@ correct directory structure. Download the files gettextX.X.X.X-iconvX.XX-shared-{32,64}.zip, extract DLLs and place them as follows: - vim90\ + vim91\ | libintl-8.dll | libiconv-2.dll | libgcc_s_sjlj-1.dll (only for 32-bit) @@ -975,18 +975,18 @@ correct directory structure. libintl-8.dll libiconv-2.dll - The DLLs in the "vim90" should be the same bitness with the (g)vim.exe. + The DLLs in the "vim91" should be the same bitness with the (g)vim.exe. - D. Move the "vim90" directory into the Vim installation subdirectory + D. Move the "vim91" directory into the Vim installation subdirectory --------------------------------------------------------------------- - Move the "vim90" subdirectory into the subdirectory where you want Vim + Move the "vim91" subdirectory into the subdirectory where you want Vim to be installed. Typically, this subdirectory will be named "vim". - If you already have a "vim90" subdirectory in "vim", delete it first + If you already have a "vim91" subdirectory in "vim", delete it first by running its uninstall.exe program. E. Install Vim --------------- - "cd" to your Vim installation subdirectory "vim\vim90" and run the + "cd" to your Vim installation subdirectory "vim\vim91" and run the "install.exe" program. It will ask you a number of questions about how you would like to have your Vim setup. Among these are: - You can tell it to write a "_vimrc" file with your preferences in the