patch 8.0.0007v8.0.0007

Problem:    Vim 7.4 is still mentioned in a few places.
Solution:   Update to Vim 8.  (Uncle Bill, closes #1094)

4 files changed, 21 insertions, 19 deletions

diff --git a/src/INSTALLpc.txt b/src/INSTALLpc.txt
index 10db488020..5661f9655c 100644
--- a/src/INSTALLpc.txt
+++ b/src/INSTALLpc.txt
@@ -722,40 +722,40 @@ The MS-DOS support was removed in patch 7.4.1399.
 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 "vim74" directory.  If you instead downloaded the sources as
+first create a "vim80" 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 "vim74"
+  A.  Create a Vim "runtime" subdirectory named "vim80"
   -----------------------------------------------------
   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 "vim74".
+  directories and create a new subdirectory named "vim80".
 
-  Copy the "runtime" files into "vim74":
-     copy runtime\* vim74
+  Copy the "runtime" files into "vim80":
+     copy runtime\* vim80
 
-  B.  Copy the new binaries into the "vim74" directory
+  B.  Copy the new binaries into the "vim80" directory
   ----------------------------------------------------
   Regardless of how you installed the Vim sources, you need to copy the
-  new binaries you created above into "vim74":
+  new binaries you created above into "vim80":
 
-     copy src\*.exe vim74
-     copy src\GvimExt\gvimext.dll vim74
-     copy src\xxd\xxd.exe vim74
+     copy src\*.exe vim80
+     copy src\GvimExt\gvimext.dll vim80
+     copy src\xxd\xxd.exe vim80
 
-  C.  Move the "vim74" directory into the Vim installation subdirectory
+  C.  Move the "vim80" directory into the Vim installation subdirectory
   ---------------------------------------------------------------------
-  Move the "vim74" subdirectory into the subdirectory where you want Vim
+  Move the "vim80" subdirectory into the subdirectory where you want Vim
   to be installed.  Typically, this subdirectory will be named "vim".
-  If you already have a "vim74" subdirectory in "vim", delete it first
+  If you already have a "vim80" subdirectory in "vim", delete it first
   by running its uninstal.exe program.
 
   D.  Install Vim
   ---------------
-  "cd" to your Vim installation subdirectory "vim\vim74" and run the
+  "cd" to your Vim installation subdirectory "vim\vim80" 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
diff --git a/src/version.c b/src/version.c
index 239779294e..660b8285e0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    7,
+/**/
     6,
 /**/
     5,
diff --git a/src/vimtutor b/src/vimtutor
index 70d9ec7412..e53201df58 100755
--- a/src/vimtutor
+++ b/src/vimtutor
@@ -11,12 +11,12 @@
 
 # Vim could be called "vim" or "vi".  Also check for "vimN", for people who
 # have Vim installed with its version number.
-# We anticipate up to a future Vim 8 version :-).
-seq="vim vim8 vim75 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi"
+# We anticipate up to a future Vim 8.1 version :-).
+seq="vim vim81 vim80 vim8 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi"
 if test "$1" = "-g"; then 
   # Try to use the GUI version of Vim if possible, it will fall back
   # on Vim if Gvim is not installed.
-  seq="gvim gvim8 gvim75 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq"
+  seq="gvim gvim81 gvim80 gvim8 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq"
   shift
 fi
 
diff --git a/uninstal.txt b/uninstal.txt
index 9d0801026a..9b0d967856 100644
--- a/uninstal.txt
+++ b/uninstal.txt
@@ -55,8 +55,8 @@ Here are guidelines for removing Vim by hand:
    skip the next step.
 
 5. Delete the distributed files.  If you followed the directions, these will
-   be located in a directory like "C:\vim\vim74".  If the $VIM environment
-   variable is set, the directory will be $VIM\vim74.  Delete the "vim74"
+   be located in a directory like "C:\vim\vim80".  If the $VIM environment
+   variable is set, the directory will be $VIM\vim80.  Delete the "vim80"
    directory and all that is in it.  Warning: If you changed any of the
    distributed files, or added some of your own files, you might want to save
    these first.  But normally you would not have changed or added files here.