Merge remote-tracking branch 'vim/master'

Author: splhack

Makefile

@@ -67,16 +67,17 @@ all install uninstall tools config configure reconfig proto depend lint tags typ
 #    To do all this you need the Unix archive and compiled binaries.
 #    Before creating an archive first delete all backup files, *.orig, etc.
 
-MAJOR = 7
-MINOR = 4
+MAJOR = 8
+MINOR = 0
 
 # CHECKLIST for creating a new version:
 #
-# - Update Vim version number.  For a test version in: src/version.h, Contents,
-#   MAJOR/MINOR above, VIMMAJOR and VIMMINOR in src/Makefile, README*.txt,
-#   runtime/doc/*.txt and nsis/gvim.nsi.
+# - Update Vim version number.  For a test version in: src/version.h,
+#   READMEdir/Contents, MAJOR/MINOR above, VIMMAJOR and VIMMINOR in
+#   src/Makefile, README.txt, README.md, READMEdir/README*.txt,
+#   runtime/doc/*.txt and make nsis/gvim_version.nsh.
 #   For a minor/major version: src/GvimExt/GvimExt.reg, src/vim.def,
-#   src/vim16.def, src/gvim.exe.mnf.
+#   src/gvim.exe.mnf.
 # - Compile Vim with GTK, Perl, Python, Python3, TCL, Ruby, MZscheme, Lua (if
 #   you can make it all work), Cscope and "huge" features.  Exclude workshop
 #   and SNiFF.
@@ -96,7 +97,7 @@ MINOR = 4
 # - Check for missing entries in runtime/makemenu.vim (with checkmenu script).
 # - Check for missing options in runtime/optwin.vim et al. (with check.vim).
 # - Do "make menu" to update the runtime/synmenu.vim file.
-# - Add remarks for changes to runtime/doc/version7.txt.
+# - Add remarks for changes to runtime/doc/version8.txt.
 # - Check that runtime/doc/help.txt doesn't contain entries in "LOCAL
 #   ADDITIONS".
 # - In runtime/doc run "make" and "make html" to check for errors.
@@ -140,7 +141,7 @@ MINOR = 4
 #   > nmake -f Make_mvc.mak testclean
 #   > nmake -f Make_mvc.mak test
 #   - check the output.
-# - Rename (using tools/rename.bat):
+# - Rename (using ../tools/rename.bat):
 #           vim.exe to vimw32.exe
 #           tee/tee.exe to teew32.exe
 #           xxd/xxd.exe to xxdw32.exe
@@ -192,6 +193,7 @@ MINOR = 4
 #   version).
 # - go to ../nsis and do:
 #   > makensis gvim.nsi  (takes a few minutes).
+#      ignore warning for libwinpthread-1.dll
 # - Copy gvim##.exe to the dist directory.
 #
 # 64 bit builds (these are not in the normal distribution, the 32 bit build

README.txt

@@ -1,4 +1,4 @@
-README.txt for version 7.4 of Vim: Vi IMproved.
+README.txt for version 8.0 of Vim: Vi IMproved.
 
 
 WHAT IS VIM?

READMEdir/Contents

@@ -9,10 +9,10 @@ Vim		Vi IMproved.  A clone of the UNIX text editor Vi.  Very useful
 		messages, shows current file name in window title, on-line
 		help, rectangular cut/paste, etc., etc., etc...
 
-		Version 7.4.  Also runs under UNIX, MS-Windows, Mac, etc.
-		vim74rt.tgz  contains the documentation and syntax files.
-		vim74bin.tgz contains the binaries.
-		vim74src.tgz contains the sources.
+		Version 8.0.  Also runs under UNIX, MS-Windows, Mac, etc.
+		vim80rt.tgz  contains the documentation and syntax files.
+		vim80bin.tgz contains the binaries.
+		vim80src.tgz contains the sources.
 		Author: Bram Moolenaar et al.
 
 

READMEdir/README_ami.txt

@@ -1,4 +1,4 @@
-README_ami.txt for version 7.4 of Vim: Vi IMproved.
+README_ami.txt for version 8.0 of Vim: Vi IMproved.
 
 This file explains the installation of Vim on Amiga systems.
 See README.txt for general information about Vim.
@@ -16,8 +16,8 @@ easily upgrade to a new version.  For example:
 You would then unpack the archives like this:
 
   cd dh0:editors
-  tar xf t:vim60bin.tar
-  tar xf t:vim60rt.tar
+  tar xf t:vim80bin.tar
+  tar xf t:vim80rt.tar
 
 Set the $VIM environment variable to point to the top directory of your Vim
 files.  For the above example:

READMEdir/README_amibin.txt

@@ -1,8 +1,8 @@
-README_amibin.txt for version 7.4 of Vim: Vi IMproved.
+README_amibin.txt for version 8.0 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 (vim60rt.tgz).
+These files are in the runtime archive (vim80rt.tgz).
 
 
 The Amiga "bin" archive contains the Vim executable for the Amiga.  It was

READMEdir/README_amisrc.txt

@@ -1,8 +1,8 @@
-README_amisrc.txt for version 7.4 of Vim: Vi IMproved.
+README_amisrc.txt for version 8.0 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 (vim60rt.tgz).
+These files are in the runtime archive (vim80rt.tgz).
 
 
 The Amiga source archive contains the files needed to compile Vim on the

READMEdir/README_bindos.txt

@@ -1,16 +1,16 @@
-README_bindos.txt for version 7.4 of Vim: Vi IMproved.
+README_bindos.txt for version 8.0 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 (vim74rt.zip).
+These files are in the runtime archive (vim80rt.zip).
 
 
 There are several binary distributions of Vim for the PC.  You would normally
 pick only one of them, but it's also possible to install several.
 These ones are available (the version number may differ):
-	vim74w32.zip	Windows 95/98/NT/etc. console version
-	gvim74.zip	Windows 95/98/NT/etc. GUI version
-	gvim74ole.zip	Windows 95/98/NT/etc. GUI version with OLE
+	vim80w32.zip	Windows 95/98/NT/etc. console version
+	gvim80.zip	Windows 95/98/NT/etc. GUI version
+	gvim80ole.zip	Windows 95/98/NT/etc. GUI version with OLE
 
-You MUST also get the runtime archive (vim74rt.zip).
-The sources are also available (vim74src.zip).
+You MUST also get the runtime archive (vim80rt.zip).
+The sources are also available (vim80src.zip).

READMEdir/README_dos.txt

@@ -1,4 +1,4 @@
-README_dos.txt for version 7.4 of Vim: Vi IMproved.
+README_dos.txt for version 8.0 of Vim: Vi IMproved.
 
 This file explains the installation of Vim on MS-DOS and MS-Windows systems.
 See "README.txt" for general information about Vim.
@@ -41,19 +41,19 @@ These are the normal steps to install Vim from the .zip archives:
    located.  Check the $VIM setting to see where it points to:
 	set VIM
    For example, if you have
-	C:\vim\vim54
+	C:\vim\vim74
    do
 	cd C:\
    Binary and runtime Vim archives are normally unpacked in the same location,
    on top of each other.
 
-2. Unpack the zip archives.  This will create a new directory "vim\vim74",
+2. Unpack the zip archives.  This will create a new directory "vim\vim80",
    in which all the distributed Vim files are placed.  Since the directory
    name includes the version number, it is unlikely that you overwrite
    existing files.
    Examples:
-	pkunzip -d gvim74.zip
-	unzip vim74w32.zip
+	pkunzip -d gvim80.zip
+	unzip vim80w32.zip
 
    You need to unpack the runtime archive and at least one of the binary
    archives.  When using more than one binary version, be careful not to
@@ -69,7 +69,7 @@ These are the normal steps to install Vim from the .zip archives:
    archive and follow the instructions in the documentation.
 
 3. Change to the new directory:
-	cd vim\vim74
+	cd vim\vim80
    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
@@ -80,8 +80,8 @@ These are the normal steps to install Vim from the .zip archives:
      console or in a shell.  You can select one of the directories in your
      $PATH.  If you skip this, you can add Vim to the search path manually:
      The simplest is to add a line to your autoexec.bat.  Examples:
-	set path=%path%;C:\vim\vim74
-	set path=%path%;D:\editors\vim\vim74
+	set path=%path%;C:\vim\vim80
+	set path=%path%;D:\editors\vim\vim80
    - Create entries for Vim on the desktop and in the Start menu.
 
 That's it!
@@ -93,8 +93,8 @@ Remarks:
   won't show a menubar.  Then you need to set the $VIM environment variable to
   point to the top directory of your Vim files.  Example:
     set VIM=C:\editors\vim
-  Vim version 7.4 will look for your vimrc file in $VIM, and for the runtime
-  files in $VIM/vim74.  See ":help $VIM" for more information.
+  Vim version 8.0 will look for your vimrc file in $VIM, and for the runtime
+  files in $VIM/vim80.  See ":help $VIM" for more information.
 
 - To avoid confusion between distributed files of different versions and your
   own modified vim scripts, it is recommended to use this directory layout:
@@ -105,14 +105,14 @@ Remarks:
 	C:\vim\vimfiles\ftplugin\*.vim	Filetype plugins
 	C:\vim\...			Other files you made.
   Distributed files:
-	C:\vim\vim74\vim.exe		The Vim version 7.4 executable.
-	C:\vim\vim74\doc\*.txt		The version 7.4 documentation files.
-	C:\vim\vim74\bugreport.vim	A Vim version 7.4 script.
-	C:\vim\vim74\...		Other version 7.4 distributed files.
+	C:\vim\vim80\vim.exe		The Vim version 8.0 executable.
+	C:\vim\vim80\doc\*.txt		The version 8.0 documentation files.
+	C:\vim\vim80\bugreport.vim	A Vim version 8.0 script.
+	C:\vim\vim80\...		Other version 8.0 distributed files.
   In this case the $VIM environment variable would be set like this:
 	set VIM=C:\vim
-  Then $VIMRUNTIME will automatically be set to "$VIM\vim74".  Don't add
-  "vim74" to $VIM, that won't work.
+  Then $VIMRUNTIME will automatically be set to "$VIM\vim80".  Don't add
+  "vim80" to $VIM, that won't work.
 
 - You can put your Vim executable anywhere else.  If the executable is not
   with the other Vim files, you should set $VIM. The simplest is to add a line
@@ -136,8 +136,8 @@ Remarks:
      Select Properties.
   5. In the Program tab, change the "Cmdline" to add "/c" and the name of the
      Vim executable.  Examples:
-	C:\command.com /c C:\vim\vim74\vim.exe
-	C:\command.com /c D:\editors\vim\vim74\vim.exe
+	C:\command.com /c C:\vim\vim80\vim.exe
+	C:\command.com /c D:\editors\vim\vim80\vim.exe
   6. Select the font, window size, etc. that you like.  If this isn't
      possible, select "Advanced" in the Program tab, and deselect "MS-DOS
      mode".

READMEdir/README_extra.txt

@@ -1,4 +1,4 @@
-README_extra.txt for version 7.4 of Vim: Vi IMproved.
+README_extra.txt for version 8.0 of Vim: Vi IMproved.
 
 These extra files of Vim are for special purposes.  This README explains what
 the files are for.  For general information about Vim, see the "README.txt"

READMEdir/README_mac.txt

@@ -1,4 +1,4 @@
-README_mac.txt for version 7.4 of Vim: Vi IMproved.
+README_mac.txt for version 8.0 of Vim: Vi IMproved.
 
 This file explains the installation of MacVim.
 See "README.txt" for general information about Vim.

READMEdir/README_ole.txt

@@ -1,4 +1,4 @@
-README_ole.txt for version 7.4 of Vim: Vi IMproved.
+README_ole.txt for version 8.0 of Vim: Vi IMproved.
 
 This archive contains gvim.exe with OLE interface and VisVim.
 This version of gvim.exe can also load a number of interface dynamically (you

READMEdir/README_os2.txt

@@ -1,4 +1,4 @@
-README_os2.txt for version 7.4 of Vim: Vi IMproved.
+README_os2.txt for version 8.0 of Vim: Vi IMproved.
 
 This file used to explain the installation of Vim on OS/2 systems.
 However, support for OS/2 has been removed in patch 7.4.1008.

READMEdir/README_os390.txt

@@ -1,4 +1,4 @@
-README_zOS.txt for version 7.4 of Vim: Vi IMproved.
+README_zOS.txt for version 8.0 of Vim: Vi IMproved.
 
 This readme explains how to build Vim on z/OS.  Formerly called OS/390.
 See "README.txt" for general information about Vim.
@@ -78,7 +78,7 @@ Change to the vim directory and do:
 With X11:
 ---------
 
-WARNING: This instruction was not tested with Vim 7.4.
+WARNING: This instruction was not tested with Vim 7.4 or later.
 
 There are two ways for building VIM with X11 support. The first way is simple
 and results in a big executable (~13 Mb), the second needs a few additional

READMEdir/README_src.txt

@@ -1,8 +1,8 @@
-README_src.txt for version 7.4 of Vim: Vi IMproved.
+README_src.txt for version 8.0 of Vim: Vi IMproved.
 
 The source archive contains the files needed to compile Vim on Unix systems.
 It is packed for Unix systems (NL line separator).
 
 For more information, see the README.txt file that comes with the runtime
-archive (vim-7.4-rt.tar.gz).  To be able to run Vim you MUST get the runtime
+archive (vim-8.0-rt.tar.gz).  To be able to run Vim you MUST get the runtime
 archive too!

READMEdir/README_srcdos.txt

@@ -1,8 +1,8 @@
-README_srcdos.txt for version 7.4 of Vim: Vi IMproved.
+README_srcdos.txt for version 8.0 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 (vim74rt.zip).
+These files are in the runtime archive (vim80rt.zip).
 
 
 The DOS source archive contains the files needed to compile Vim on MS-DOS or

READMEdir/README_unix.txt

@@ -1,4 +1,4 @@
-README_unix.txt for version 7.4 of Vim: Vi IMproved.
+README_unix.txt for version 8.0 of Vim: Vi IMproved.
 
 This file explains the installation of Vim on Unix systems.
 See "README.txt" for general information about Vim.

READMEdir/README_vms.txt

@@ -1,4 +1,4 @@
-README_vms.txt for version 7.4 of Vim: Vi IMproved.
+README_vms.txt for version 8.0 of Vim: Vi IMproved.
 
 This file explains the installation of Vim on VMS systems.
 See "README.txt" in the runtime archive for information about Vim.

READMEdir/README_w32s.txt

@@ -1,4 +1,4 @@
-README_w32s.txt for version 7.4 of Vim: Vi IMproved.
+README_w32s.txt for version 8.0 of Vim: Vi IMproved.
 
 This archive contains the gvim.exe that was specifically compiled for use in
 the Win32s subsystem in MS-Windows 3.1 and 3.11.

nsis/gvim_version.nsh

@@ -1,6 +1,6 @@
 # Generated from Makefile: define the version numbers
 !ifndef __GVIM_VER__NSH__
 !define __GVIM_VER__NSH__
-!define VER_MAJOR 7
-!define VER_MINOR 4
+!define VER_MAJOR 8
+!define VER_MINOR 0
 !endif

runtime/autoload/netrw.vim

@@ -22,8 +22,8 @@
 if &cp || exists("g:loaded_netrw")
   finish
 endif
-" netrw requires vim having patch 213; netrw will benefit from vim's having patch#656, too
-if v:version < 704 || !has("patch213")
+" netrw requires vim having patch 7.4.213; netrw will benefit from vim's having patch#656, too
+if v:version < 704 || (v:version == 704 && !has("patch213"))
  if !exists("s:needpatch213")
   unsilent echomsg "***sorry*** this version of netrw requires vim v7.4 with patch 213"
  endif

runtime/doc/arabic.txt

@@ -1,4 +1,4 @@
-*arabic.txt*	For Vim version 7.4.  Last change: 2010 Nov 13
+*arabic.txt*	For Vim version 8.0.  Last change: 2010 Nov 13
 
 
 		  VIM REFERENCE MANUAL	  by Nadim Shaikli

runtime/doc/autocmd.txt

@@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 7.4.  Last change: 2016 Sep 03
+*autocmd.txt*   For Vim version 8.0.  Last change: 2016 Sep 03
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/change.txt

@@ -1,4 +1,4 @@
-*change.txt*    For Vim version 7.4.  Last change: 2016 Sep 11
+*change.txt*    For Vim version 8.0.  Last change: 2016 Sep 11
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/channel.txt

@@ -1,4 +1,4 @@
-*channel.txt*      For Vim version 7.4.  Last change: 2016 Sep 07
+*channel.txt*      For Vim version 8.0.  Last change: 2016 Sep 11
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -277,7 +277,7 @@ With a JSON channel the process can send commands to Vim that will be
 handled by Vim internally, it does not require a handler for the channel.
 
 Possible commands are:				*E903* *E904* *E905*
-    ["redraw"  {forced}]
+    ["redraw", {forced}]
     ["ex",     {Ex command}]
     ["normal", {Normal mode command}]
     ["expr",   {expression}, {number}]

runtime/doc/cmdline.txt

@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 7.4.  Last change: 2016 Aug 27
+*cmdline.txt*   For Vim version 8.0.  Last change: 2016 Aug 27
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/debug.txt

@@ -1,4 +1,4 @@
-*debug.txt*     For Vim version 7.4.  Last change: 2012 Feb 11
+*debug.txt*     For Vim version 8.0.  Last change: 2012 Feb 11
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/debugger.txt

@@ -1,4 +1,4 @@
-*debugger.txt*  For Vim version 7.4.  Last change: 2005 Mar 29
+*debugger.txt*  For Vim version 8.0.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Gordon Prieur

runtime/doc/develop.txt

@@ -1,4 +1,4 @@
-*develop.txt*   For Vim version 7.4.  Last change: 2016 Jan 31
+*develop.txt*   For Vim version 8.0.  Last change: 2016 Jan 31
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/diff.txt

@@ -1,4 +1,4 @@
-*diff.txt*      For Vim version 7.4.  Last change: 2016 Aug 24
+*diff.txt*      For Vim version 8.0.  Last change: 2016 Aug 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/digraph.txt

@@ -1,4 +1,4 @@
-*digraph.txt*   For Vim version 7.4.  Last change: 2014 Jun 19
+*digraph.txt*   For Vim version 8.0.  Last change: 2014 Jun 19
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar