From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 17 May 2018 15:04:55 +0000 (+0200)
Subject: Vim 8.1 release
X-Git-Tag: v8.1.0000
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b1c9198afb7ff902588b45fbe44f0760a9f48375;p=vim

Vim 8.1 release

Update version number and information.  Fix a couple of tests.
---

diff --git a/Makefile b/Makefile
index a45af5a99..4a7c4c664 100644
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,7 @@ all install uninstall tools config configure reconfig proto depend lint tags typ
 #    Before creating an archive first delete all backup files, *.orig, etc.
 
 MAJOR = 8
-MINOR = 0
+MINOR = 1
 
 # CHECKLIST for creating a new version:
 #
@@ -131,7 +131,7 @@ MINOR = 0
 # - > make dossrc
 #   > make dosrt
 #   Unpack dist/vim##rt.zip and dist/vim##src.zip on an MS-Windows PC.
-#   This creates the directory vim/vim80 and puts all files in there.
+#   This creates the directory vim/vim81 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:
diff --git a/README.md b/README.md
index 41f08753e..0e7ebf2ce 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-`README.md` for version 8.0 of Vim: Vi IMproved.
+`README.md` for version 8.1 of Vim: Vi IMproved.
 
 [![Build Status](https://travis-ci.org/vim/vim.svg?branch=master)](https://travis-ci.org/vim/vim)
 [![Coverage Status](https://codecov.io/gh/vim/vim/coverage.svg?branch=master)](https://codecov.io/gh/vim/vim?branch=master)
diff --git a/README.txt b/README.txt
index eefa2efa3..e0132dc92 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-README.txt for version 8.0 of Vim: Vi IMproved.
+README.txt for version 8.1 of Vim: Vi IMproved.
 
 
 WHAT IS VIM?
diff --git a/READMEdir/Contents b/READMEdir/Contents
index 76bd909de..822eb2c5d 100644
--- a/READMEdir/Contents
+++ b/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 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.
+		Version 8.1.  Also runs under UNIX, MS-Windows, Mac, etc.
+		vim81rt.tgz  contains the documentation and syntax files.
+		vim81bin.tgz contains the binaries.
+		vim81src.tgz contains the sources.
 		Author: Bram Moolenaar et al.
 
 
diff --git a/READMEdir/README_ami.txt b/READMEdir/README_ami.txt
index 1ba595e91..fc9a30d42 100644
--- a/READMEdir/README_ami.txt
+++ b/READMEdir/README_ami.txt
@@ -1,4 +1,4 @@
-README_ami.txt for version 8.0 of Vim: Vi IMproved.
+README_ami.txt for version 8.1 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:vim80bin.tar
-  tar xf t:vim80rt.tar
+  tar xf t:vim81bin.tar
+  tar xf t:vim81rt.tar
 
 Set the $VIM environment variable to point to the top directory of your Vim
 files.  For the above example:
diff --git a/READMEdir/README_amibin.txt b/READMEdir/README_amibin.txt
index 2e323f366..5b9b02f92 100644
--- a/READMEdir/README_amibin.txt
+++ b/READMEdir/README_amibin.txt
@@ -1,8 +1,8 @@
-README_amibin.txt for version 8.0 of Vim: Vi IMproved.
+README_amibin.txt for version 8.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 (vim80rt.tgz).
+These files are in the runtime archive (vim81rt.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 c0d6ed226..966bd3408 100644
--- a/READMEdir/README_amisrc.txt
+++ b/READMEdir/README_amisrc.txt
@@ -1,8 +1,8 @@
-README_amisrc.txt for version 8.0 of Vim: Vi IMproved.
+README_amisrc.txt for version 8.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 (vim80rt.tgz).
+These files are in the runtime archive (vim81rt.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 c52fea0b6..7d10a6ffc 100644
--- a/READMEdir/README_bindos.txt
+++ b/READMEdir/README_bindos.txt
@@ -1,16 +1,16 @@
-README_bindos.txt for version 8.0 of Vim: Vi IMproved.
+README_bindos.txt for version 8.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 (vim80rt.zip).
+These files are in the runtime archive (vim81rt.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):
-	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
+	vim81w32.zip	Windows 95/98/NT/etc. console version
+	gvim81.zip	Windows 95/98/NT/etc. GUI version
+	gvim81ole.zip	Windows 95/98/NT/etc. GUI version with OLE
 
-You MUST also get the runtime archive (vim80rt.zip).
-The sources are also available (vim80src.zip).
+You MUST also get the runtime archive (vim81rt.zip).
+The sources are also available (vim81src.zip).
diff --git a/READMEdir/README_dos.txt b/READMEdir/README_dos.txt
index c8f49ac6a..ac6f090af 100644
--- a/READMEdir/README_dos.txt
+++ b/READMEdir/README_dos.txt
@@ -1,4 +1,4 @@
-README_dos.txt for version 8.0 of Vim: Vi IMproved.
+README_dos.txt for version 8.1 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\vim80
+	C:\vim\vim81
    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\vim80",
+2. Unpack the zip archives.  This will create a new directory "vim\vim81",
    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 gvim80.zip
-	unzip vim80w32.zip
+	pkunzip -d gvim81.zip
+	unzip vim81w32.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\vim80
+	cd vim\vim81
    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\vim80
-	set path=%path%;D:\editors\vim\vim80
+	set path=%path%;C:\vim\vim81
+	set path=%path%;D:\editors\vim\vim81
    - 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 8.0 will look for your vimrc file in $VIM, and for the runtime
-  files in $VIM/vim80.  See ":help $VIM" for more information.
+  Vim version 8.1 will look for your vimrc file in $VIM, and for the runtime
+  files in $VIM/vim81.  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\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.
+	C:\vim\vim81\vim.exe		The Vim version 8.1 executable.
+	C:\vim\vim81\doc\*.txt		The version 8.1 documentation files.
+	C:\vim\vim81\bugreport.vim	A Vim version 8.1 script.
+	C:\vim\vim81\...		Other version 8.1 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\vim80".  Don't add
-  "vim80" to $VIM, that won't work.
+  Then $VIMRUNTIME will automatically be set to "$VIM\vim81".  Don't add
+  "vim81" 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\vim80\vim.exe
-	C:\command.com /c D:\editors\vim\vim80\vim.exe
+	C:\command.com /c C:\vim\vim81\vim.exe
+	C:\command.com /c D:\editors\vim\vim81\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".
diff --git a/READMEdir/README_extra.txt b/READMEdir/README_extra.txt
index c42043eb0..ce629b2d6 100644
--- a/READMEdir/README_extra.txt
+++ b/READMEdir/README_extra.txt
@@ -1,4 +1,4 @@
-README_extra.txt for version 8.0 of Vim: Vi IMproved.
+README_extra.txt for version 8.1 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"
diff --git a/READMEdir/README_mac.txt b/READMEdir/README_mac.txt
index cdef1a26b..d76a11adb 100644
--- a/READMEdir/README_mac.txt
+++ b/READMEdir/README_mac.txt
@@ -1,4 +1,4 @@
-README_mac.txt for version 8.0 of Vim: Vi IMproved.
+README_mac.txt for version 8.1 of Vim: Vi IMproved.
 
 This file explains the installation of Vim on Macintosh systems.
 See "README.txt" for general information about Vim.
diff --git a/READMEdir/README_ole.txt b/READMEdir/README_ole.txt
index fb1fb01f5..4c7e64543 100644
--- a/READMEdir/README_ole.txt
+++ b/READMEdir/README_ole.txt
@@ -1,4 +1,4 @@
-README_ole.txt for version 8.0 of Vim: Vi IMproved.
+README_ole.txt for version 8.1 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
diff --git a/READMEdir/README_os2.txt b/READMEdir/README_os2.txt
index 61bef4c67..7d9c5ce77 100644
--- a/READMEdir/README_os2.txt
+++ b/READMEdir/README_os2.txt
@@ -1,4 +1,4 @@
-README_os2.txt for version 8.0 of Vim: Vi IMproved.
+README_os2.txt for version 8.1 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.
diff --git a/READMEdir/README_os390.txt b/READMEdir/README_os390.txt
index 0b0ec9a32..24c668c17 100644
--- a/READMEdir/README_os390.txt
+++ b/READMEdir/README_os390.txt
@@ -1,4 +1,4 @@
-README_zOS.txt for version 8.0 of Vim: Vi IMproved.
+README_zOS.txt for version 8.1 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.
diff --git a/READMEdir/README_src.txt b/READMEdir/README_src.txt
index 3ac297526..89b83570e 100644
--- a/READMEdir/README_src.txt
+++ b/READMEdir/README_src.txt
@@ -1,8 +1,8 @@
-README_src.txt for version 8.0 of Vim: Vi IMproved.
+README_src.txt for version 8.1 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-8.0-rt.tar.gz).  To be able to run Vim you MUST get the runtime
+archive (vim-8.1-rt.tar.gz).  To be able to run Vim you MUST get the runtime
 archive too!
diff --git a/READMEdir/README_srcdos.txt b/READMEdir/README_srcdos.txt
index b9cb0e540..6acb65265 100644
--- a/READMEdir/README_srcdos.txt
+++ b/READMEdir/README_srcdos.txt
@@ -1,8 +1,8 @@
-README_srcdos.txt for version 8.0 of Vim: Vi IMproved.
+README_srcdos.txt for version 8.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 (vim80rt.zip).
+These files are in the runtime archive (vim81rt.zip).
 
 
 The DOS source archive contains the files needed to compile Vim on MS-DOS or
diff --git a/READMEdir/README_unix.txt b/READMEdir/README_unix.txt
index 054f7fa86..ab8d18848 100644
--- a/READMEdir/README_unix.txt
+++ b/READMEdir/README_unix.txt
@@ -1,4 +1,4 @@
-README_unix.txt for version 8.0 of Vim: Vi IMproved.
+README_unix.txt for version 8.1 of Vim: Vi IMproved.
 
 This file explains the installation of Vim on Unix systems.
 See "README.txt" for general information about Vim.
diff --git a/READMEdir/README_vms.txt b/READMEdir/README_vms.txt
index 6f99c07b2..c1c76137a 100644
--- a/READMEdir/README_vms.txt
+++ b/READMEdir/README_vms.txt
@@ -1,4 +1,4 @@
-README_vms.txt for version 8.0 of Vim: Vi IMproved.
+README_vms.txt for version 8.1 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.
diff --git a/READMEdir/README_w32s.txt b/READMEdir/README_w32s.txt
index 311a17770..c4f9a0cec 100644
--- a/READMEdir/README_w32s.txt
+++ b/READMEdir/README_w32s.txt
@@ -1,4 +1,4 @@
-README_w32s.txt for version 8.0 of Vim: Vi IMproved.
+README_w32s.txt for version 8.1 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.
diff --git a/nsis/gvim_version.nsh b/nsis/gvim_version.nsh
index 4481f3295..f34feab0a 100644
--- a/nsis/gvim_version.nsh
+++ b/nsis/gvim_version.nsh
@@ -2,5 +2,5 @@
 !ifndef __GVIM_VER__NSH__
 !define __GVIM_VER__NSH__
 !define VER_MAJOR 8
-!define VER_MINOR 0
+!define VER_MINOR 1
 !endif
diff --git a/runtime/doc/arabic.txt b/runtime/doc/arabic.txt
index 5d0e9f39d..0572b85f8 100644
--- a/runtime/doc/arabic.txt
+++ b/runtime/doc/arabic.txt
@@ -1,4 +1,4 @@
-*arabic.txt*	For Vim version 8.0.  Last change: 2010 Nov 13
+*arabic.txt*	For Vim version 8.1.  Last change: 2010 Nov 13
 
 
 		  VIM REFERENCE MANUAL	  by Nadim Shaikli
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index 70dd43a9a..703590a5f 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 8.0.  Last change: 2018 May 03
+*autocmd.txt*   For Vim version 8.1.  Last change: 2018 May 03
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt
index ffc5abde7..05c18e64d 100644
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -1,4 +1,4 @@
-*change.txt*    For Vim version 8.0.  Last change: 2018 May 12
+*change.txt*    For Vim version 8.1.  Last change: 2018 May 12
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/channel.txt b/runtime/doc/channel.txt
index f0d459be2..9cc2be37a 100644
--- a/runtime/doc/channel.txt
+++ b/runtime/doc/channel.txt
@@ -1,4 +1,4 @@
-*channel.txt*      For Vim version 8.0.  Last change: 2018 Apr 18
+*channel.txt*      For Vim version 8.1.  Last change: 2018 Apr 18
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index d1f949d8d..d2c81967d 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 8.0.  Last change: 2018 May 14
+*cmdline.txt*   For Vim version 8.1.  Last change: 2018 May 14
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/debug.txt b/runtime/doc/debug.txt
index 4547eabe0..6d2cea5d8 100644
--- a/runtime/doc/debug.txt
+++ b/runtime/doc/debug.txt
@@ -1,4 +1,4 @@
-*debug.txt*     For Vim version 8.0.  Last change: 2017 Jul 15
+*debug.txt*     For Vim version 8.1.  Last change: 2017 Jul 15
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/debugger.txt b/runtime/doc/debugger.txt
index 7976395e4..9aa2fb846 100644
--- a/runtime/doc/debugger.txt
+++ b/runtime/doc/debugger.txt
@@ -1,4 +1,4 @@
-*debugger.txt*  For Vim version 8.0.  Last change: 2017 Nov 21
+*debugger.txt*  For Vim version 8.1.  Last change: 2017 Nov 21
 
 
 		  VIM REFERENCE MANUAL    by Gordon Prieur
diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt
index 28ba7cde6..20a623f36 100644
--- a/runtime/doc/develop.txt
+++ b/runtime/doc/develop.txt
@@ -1,4 +1,4 @@
-*develop.txt*   For Vim version 8.0.  Last change: 2018 May 02
+*develop.txt*   For Vim version 8.1.  Last change: 2018 May 02
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt
index e6e225ac0..e263e6b83 100644
--- a/runtime/doc/diff.txt
+++ b/runtime/doc/diff.txt
@@ -1,4 +1,4 @@
-*diff.txt*      For Vim version 8.0.  Last change: 2017 Oct 03
+*diff.txt*      For Vim version 8.1.  Last change: 2017 Oct 03
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/digraph.txt b/runtime/doc/digraph.txt
index a5cefc2f0..2a232228e 100644
--- a/runtime/doc/digraph.txt
+++ b/runtime/doc/digraph.txt
@@ -1,4 +1,4 @@
-*digraph.txt*   For Vim version 8.0.  Last change: 2016 Nov 04
+*digraph.txt*   For Vim version 8.1.  Last change: 2016 Nov 04
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index 583d89ccf..e553d467d 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -1,4 +1,4 @@
-*editing.txt*   For Vim version 8.0.  Last change: 2018 Mar 29
+*editing.txt*   For Vim version 8.1.  Last change: 2018 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 95405b4a7..0a142e452 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt*	For Vim version 8.0.  Last change: 2018 May 13
+*eval.txt*	For Vim version 8.1.  Last change: 2018 May 17
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -2288,8 +2288,6 @@ mode([expr])			String	current editing mode
 mzeval({expr})			any	evaluate |MzScheme| expression
 nextnonblank({lnum})		Number	line nr of non-blank line >= {lnum}
 nr2char({expr} [, {utf8}])	String	single char with ASCII/UTF8 value {expr}
-option_restore({list})		none	restore options saved by option_save()
-option_save({list})		List	save options values
 or({expr}, {expr})		Number	bitwise OR
 pathshorten({expr})		String	shorten directory names in a path
 perleval({expr})		any	evaluate |Perl| expression
diff --git a/runtime/doc/farsi.txt b/runtime/doc/farsi.txt
index a5b1de135..1bb9f2072 100644
--- a/runtime/doc/farsi.txt
+++ b/runtime/doc/farsi.txt
@@ -1,4 +1,4 @@
-*farsi.txt*     For Vim version 8.0.  Last change: 2015 Aug 29
+*farsi.txt*     For Vim version 8.1.  Last change: 2015 Aug 29
 
 
 		  VIM REFERENCE MANUAL    by Mortaza Ghassab Shiran
diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
index a5f2a1c8c..f41dc703e 100644
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -1,4 +1,4 @@
-*filetype.txt*  For Vim version 8.0.  Last change: 2018 Apr 18
+*filetype.txt*  For Vim version 8.1.  Last change: 2018 Apr 18
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/fold.txt b/runtime/doc/fold.txt
index bdf4a4851..ad3f51466 100644
--- a/runtime/doc/fold.txt
+++ b/runtime/doc/fold.txt
@@ -1,4 +1,4 @@
-*fold.txt*      For Vim version 8.0.  Last change: 2017 Mar 18
+*fold.txt*      For Vim version 8.1.  Last change: 2017 Mar 18
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/ft_ada.txt b/runtime/doc/ft_ada.txt
index 5f1b78e2e..b446faf17 100644
--- a/runtime/doc/ft_ada.txt
+++ b/runtime/doc/ft_ada.txt
@@ -1,4 +1,4 @@
-*ft_ada.txt*	For Vim version 8.0.  Last change: 2010 Jul 20
+*ft_ada.txt*	For Vim version 8.1.  Last change: 2010 Jul 20
 
 
 		    ADA FILE TYPE PLUG-INS REFERENCE MANUAL~
diff --git a/runtime/doc/ft_sql.txt b/runtime/doc/ft_sql.txt
index d87016822..9819c066a 100644
--- a/runtime/doc/ft_sql.txt
+++ b/runtime/doc/ft_sql.txt
@@ -1,4 +1,4 @@
-*ft_sql.txt*	For Vim version 8.0.  Last change: 2013 May 15
+*ft_sql.txt*	For Vim version 8.1.  Last change: 2013 May 15
 
 by David Fishburn
 
diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt
index 9cb116b21..a66d997a9 100644
--- a/runtime/doc/gui.txt
+++ b/runtime/doc/gui.txt
@@ -1,4 +1,4 @@
-*gui.txt*       For Vim version 8.0.  Last change: 2018 Mar 06
+*gui.txt*       For Vim version 8.1.  Last change: 2018 Mar 06
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/gui_w32.txt b/runtime/doc/gui_w32.txt
index d8052fe8d..9d676eaff 100644
--- a/runtime/doc/gui_w32.txt
+++ b/runtime/doc/gui_w32.txt
@@ -1,4 +1,4 @@
-*gui_w32.txt*   For Vim version 8.0.  Last change: 2017 Oct 27
+*gui_w32.txt*   For Vim version 8.1.  Last change: 2017 Oct 27
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/gui_x11.txt b/runtime/doc/gui_x11.txt
index b1c2cc620..8a5e9bfe0 100644
--- a/runtime/doc/gui_x11.txt
+++ b/runtime/doc/gui_x11.txt
@@ -1,4 +1,4 @@
-*gui_x11.txt*   For Vim version 8.0.  Last change: 2018 May 06
+*gui_x11.txt*   For Vim version 8.1.  Last change: 2018 May 06
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/hangulin.txt b/runtime/doc/hangulin.txt
index 08fb6126b..56f188b2d 100644
--- a/runtime/doc/hangulin.txt
+++ b/runtime/doc/hangulin.txt
@@ -1,4 +1,4 @@
-*hangulin.txt*  For Vim version 8.0.  Last change: 2015 Nov 24
+*hangulin.txt*  For Vim version 8.1.  Last change: 2015 Nov 24
 
 
 		  VIM REFERENCE MANUAL    by Chi-Deok Hwang and Sung-Hyun Nam
diff --git a/runtime/doc/hebrew.txt b/runtime/doc/hebrew.txt
index 16599126b..5400b4932 100644
--- a/runtime/doc/hebrew.txt
+++ b/runtime/doc/hebrew.txt
@@ -1,4 +1,4 @@
-*hebrew.txt*    For Vim version 8.0.  Last change: 2007 Jun 14
+*hebrew.txt*    For Vim version 8.1.  Last change: 2007 Jun 14
 
 
 	   VIM REFERENCE MANUAL    by Ron Aaron (and Avner Lottem)
diff --git a/runtime/doc/help.txt b/runtime/doc/help.txt
index 527b8f7f5..4c8eb94ef 100644
--- a/runtime/doc/help.txt
+++ b/runtime/doc/help.txt
@@ -1,4 +1,4 @@
-*help.txt*	For Vim version 8.0.  Last change: 2017 Oct 28
+*help.txt*	For Vim version 8.1.  Last change: 2017 Oct 28
 
 			VIM - main help file
 									 k
diff --git a/runtime/doc/helphelp.txt b/runtime/doc/helphelp.txt
index 80fc70c3b..29941c1ae 100644
--- a/runtime/doc/helphelp.txt
+++ b/runtime/doc/helphelp.txt
@@ -1,4 +1,4 @@
-*helphelp.txt*	For Vim version 8.0.  Last change: 2017 Mar 19
+*helphelp.txt*	For Vim version 8.1.  Last change: 2017 Mar 19
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/howto.txt b/runtime/doc/howto.txt
index a1b2578ad..f6973102c 100644
--- a/runtime/doc/howto.txt
+++ b/runtime/doc/howto.txt
@@ -1,4 +1,4 @@
-*howto.txt*	For Vim version 8.0.  Last change: 2006 Apr 02
+*howto.txt*	For Vim version 8.1.  Last change: 2006 Apr 02
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
diff --git a/runtime/doc/if_cscop.txt b/runtime/doc/if_cscop.txt
index 6662717b1..cf2aff2bc 100644
--- a/runtime/doc/if_cscop.txt
+++ b/runtime/doc/if_cscop.txt
@@ -1,4 +1,4 @@
-*if_cscop.txt*  For Vim version 8.0.  Last change: 2018 Jan 21
+*if_cscop.txt*  For Vim version 8.1.  Last change: 2018 Jan 21
 
 
 		  VIM REFERENCE MANUAL    by Andy Kahn
diff --git a/runtime/doc/if_lua.txt b/runtime/doc/if_lua.txt
index 2d6dcfcf5..51e332df7 100644
--- a/runtime/doc/if_lua.txt
+++ b/runtime/doc/if_lua.txt
@@ -1,4 +1,4 @@
-*if_lua.txt*    For Vim version 8.0.  Last change: 2015 Oct 16
+*if_lua.txt*    For Vim version 8.1.  Last change: 2015 Oct 16
 
 
 		  VIM REFERENCE MANUAL    by Luis Carvalho
diff --git a/runtime/doc/if_mzsch.txt b/runtime/doc/if_mzsch.txt
index a9a03139f..f118b17dc 100644
--- a/runtime/doc/if_mzsch.txt
+++ b/runtime/doc/if_mzsch.txt
@@ -1,4 +1,4 @@
-*if_mzsch.txt*  For Vim version 8.0.  Last change: 2017 Oct 08
+*if_mzsch.txt*  For Vim version 8.1.  Last change: 2017 Oct 08
 
 
 		  VIM REFERENCE MANUAL    by Sergey Khorev
diff --git a/runtime/doc/if_ole.txt b/runtime/doc/if_ole.txt
index be84f43b1..4ec9ac5f1 100644
--- a/runtime/doc/if_ole.txt
+++ b/runtime/doc/if_ole.txt
@@ -1,4 +1,4 @@
-*if_ole.txt*    For Vim version 8.0.  Last change: 2008 Aug 16
+*if_ole.txt*    For Vim version 8.1.  Last change: 2008 Aug 16
 
 
 		  VIM REFERENCE MANUAL    by Paul Moore
diff --git a/runtime/doc/if_perl.txt b/runtime/doc/if_perl.txt
index 11b144069..a06954e17 100644
--- a/runtime/doc/if_perl.txt
+++ b/runtime/doc/if_perl.txt
@@ -1,4 +1,4 @@
-*if_perl.txt*   For Vim version 8.0.  Last change: 2017 Nov 24
+*if_perl.txt*   For Vim version 8.1.  Last change: 2017 Nov 24
 
 
 		  VIM REFERENCE MANUAL    by Sven Verdoolaege
diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt
index 50e93ba13..89baef42f 100644
--- a/runtime/doc/if_pyth.txt
+++ b/runtime/doc/if_pyth.txt
@@ -1,4 +1,4 @@
-*if_pyth.txt*   For Vim version 8.0.  Last change: 2018 Jan 30
+*if_pyth.txt*   For Vim version 8.1.  Last change: 2018 Jan 30
 
 
 		  VIM REFERENCE MANUAL    by Paul Moore
diff --git a/runtime/doc/if_ruby.txt b/runtime/doc/if_ruby.txt
index 097739782..1b4fd40f3 100644
--- a/runtime/doc/if_ruby.txt
+++ b/runtime/doc/if_ruby.txt
@@ -1,4 +1,4 @@
-*if_ruby.txt*   For Vim version 8.0.  Last change: 2018 Mar 15
+*if_ruby.txt*   For Vim version 8.1.  Last change: 2018 Mar 15
 
 
 		  VIM REFERENCE MANUAL    by Shugo Maeda
diff --git a/runtime/doc/if_sniff.txt b/runtime/doc/if_sniff.txt
index d4488c9a2..cf6ed1c98 100644
--- a/runtime/doc/if_sniff.txt
+++ b/runtime/doc/if_sniff.txt
@@ -1,4 +1,4 @@
-*if_sniff.txt*	For Vim version 8.0.  Last change: 2016 Feb 27
+*if_sniff.txt*	For Vim version 8.1.  Last change: 2016 Feb 27
 
 
 		  VIM REFERENCE MANUAL
diff --git a/runtime/doc/if_tcl.txt b/runtime/doc/if_tcl.txt
index fb4e3c3b8..979a19b47 100644
--- a/runtime/doc/if_tcl.txt
+++ b/runtime/doc/if_tcl.txt
@@ -1,4 +1,4 @@
-*if_tcl.txt*    For Vim version 8.0.  Last change: 2016 Jan 01
+*if_tcl.txt*    For Vim version 8.1.  Last change: 2016 Jan 01
 
 
 		  VIM REFERENCE MANUAL    by Ingo Wilken
diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt
index 591830070..ac8bf5380 100644
--- a/runtime/doc/indent.txt
+++ b/runtime/doc/indent.txt
@@ -1,4 +1,4 @@
-*indent.txt*    For Vim version 8.0.  Last change: 2018 Apr 04
+*indent.txt*    For Vim version 8.1.  Last change: 2018 Apr 04
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index 1157e1529..f569ec5e8 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -1,4 +1,4 @@
-*index.txt*     For Vim version 8.0.  Last change: 2018 Apr 19
+*index.txt*     For Vim version 8.1.  Last change: 2018 Apr 19
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index 2f485102b..7c2547f10 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -1,4 +1,4 @@
-*insert.txt*    For Vim version 8.0.  Last change: 2018 Feb 10
+*insert.txt*    For Vim version 8.1.  Last change: 2018 Feb 10
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index 0f849341f..8325bb33b 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -1,4 +1,4 @@
-*intro.txt*     For Vim version 8.0.  Last change: 2018 Jan 24
+*intro.txt*     For Vim version 8.1.  Last change: 2018 Jan 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index 7e05fae53..18b61df00 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -1,4 +1,4 @@
-*map.txt*       For Vim version 8.0.  Last change: 2018 May 13
+*map.txt*       For Vim version 8.1.  Last change: 2018 May 13
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt
index c25eb647e..99ce10fab 100644
--- a/runtime/doc/mbyte.txt
+++ b/runtime/doc/mbyte.txt
@@ -1,4 +1,4 @@
-*mbyte.txt*     For Vim version 8.0.  Last change: 2018 Jan 21
+*mbyte.txt*     For Vim version 8.1.  Last change: 2018 Jan 21
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar et al.
diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt
index 4d51a84d2..b4a72ff64 100644
--- a/runtime/doc/message.txt
+++ b/runtime/doc/message.txt
@@ -1,4 +1,4 @@
-*message.txt*   For Vim version 8.0.  Last change: 2018 Feb 04
+*message.txt*   For Vim version 8.1.  Last change: 2018 Feb 04
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/mlang.txt b/runtime/doc/mlang.txt
index 8ded9cd1e..3d590e0e0 100644
--- a/runtime/doc/mlang.txt
+++ b/runtime/doc/mlang.txt
@@ -1,4 +1,4 @@
-*mlang.txt*     For Vim version 8.0.  Last change: 2018 May 06
+*mlang.txt*     For Vim version 8.1.  Last change: 2018 May 06
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt
index 329b099cf..25d87cfe9 100644
--- a/runtime/doc/motion.txt
+++ b/runtime/doc/motion.txt
@@ -1,4 +1,4 @@
-*motion.txt*    For Vim version 8.0.  Last change: 2017 Oct 15
+*motion.txt*    For Vim version 8.1.  Last change: 2017 Oct 15
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/netbeans.txt b/runtime/doc/netbeans.txt
index 722cec655..3e99f8b2b 100644
--- a/runtime/doc/netbeans.txt
+++ b/runtime/doc/netbeans.txt
@@ -1,4 +1,4 @@
-*netbeans.txt*  For Vim version 8.0.  Last change: 2016 Jul 15
+*netbeans.txt*  For Vim version 8.1.  Last change: 2016 Jul 15
 
 
 		  VIM REFERENCE MANUAL    by Gordon Prieur et al.
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index b05a47992..01c2d0e31 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 8.0.  Last change: 2018 May 15
+*options.txt*	For Vim version 8.1.  Last change: 2018 May 15
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
diff --git a/runtime/doc/os_390.txt b/runtime/doc/os_390.txt
index 118df6f33..5b4b9f7a6 100644
--- a/runtime/doc/os_390.txt
+++ b/runtime/doc/os_390.txt
@@ -1,4 +1,4 @@
-*os_390.txt*    For Vim version 8.0.  Last change: 2016 Feb 27
+*os_390.txt*    For Vim version 8.1.  Last change: 2016 Feb 27
 
 
 		  VIM REFERENCE MANUAL	  by Ralf Schandl
diff --git a/runtime/doc/os_amiga.txt b/runtime/doc/os_amiga.txt
index 2d9d2fcbd..ad083b58a 100644
--- a/runtime/doc/os_amiga.txt
+++ b/runtime/doc/os_amiga.txt
@@ -1,4 +1,4 @@
-*os_amiga.txt*  For Vim version 8.0.  Last change: 2010 Aug 14
+*os_amiga.txt*  For Vim version 8.1.  Last change: 2010 Aug 14
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/os_beos.txt b/runtime/doc/os_beos.txt
index 06749bed8..4639566e4 100644
--- a/runtime/doc/os_beos.txt
+++ b/runtime/doc/os_beos.txt
@@ -1,4 +1,4 @@
-*os_beos.txt*	For Vim version 8.0.  Last change: 2016 Mar 28
+*os_beos.txt*	For Vim version 8.1.  Last change: 2016 Mar 28
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/os_dos.txt b/runtime/doc/os_dos.txt
index 1167e2a43..b95095302 100644
--- a/runtime/doc/os_dos.txt
+++ b/runtime/doc/os_dos.txt
@@ -1,4 +1,4 @@
-*os_dos.txt*    For Vim version 8.0.  Last change: 2006 Mar 30
+*os_dos.txt*    For Vim version 8.1.  Last change: 2006 Mar 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/os_mac.txt b/runtime/doc/os_mac.txt
index 226d3ba81..72c0c160b 100644
--- a/runtime/doc/os_mac.txt
+++ b/runtime/doc/os_mac.txt
@@ -1,4 +1,4 @@
-*os_mac.txt*    For Vim version 8.0.  Last change: 2018 Jan 21
+*os_mac.txt*    For Vim version 8.1.  Last change: 2018 Jan 21
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar et al.
diff --git a/runtime/doc/os_mint.txt b/runtime/doc/os_mint.txt
index 06984b44f..96e139d3e 100644
--- a/runtime/doc/os_mint.txt
+++ b/runtime/doc/os_mint.txt
@@ -1,4 +1,4 @@
-*os_mint.txt*   For Vim version 8.0.  Last change: 2005 Mar 29
+*os_mint.txt*   For Vim version 8.1.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Jens M. Felderhoff
diff --git a/runtime/doc/os_msdos.txt b/runtime/doc/os_msdos.txt
index 6206ac83c..50fb4e899 100644
--- a/runtime/doc/os_msdos.txt
+++ b/runtime/doc/os_msdos.txt
@@ -1,4 +1,4 @@
-*os_msdos.txt*  For Vim version 8.0.  Last change: 2016 Feb 26
+*os_msdos.txt*  For Vim version 8.1.  Last change: 2016 Feb 26
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/os_os2.txt b/runtime/doc/os_os2.txt
index cb6358e46..789175661 100644
--- a/runtime/doc/os_os2.txt
+++ b/runtime/doc/os_os2.txt
@@ -1,4 +1,4 @@
-*os_os2.txt*    For Vim version 8.0.  Last change: 2015 Dec 31
+*os_os2.txt*    For Vim version 8.1.  Last change: 2015 Dec 31
 
 
 		  VIM REFERENCE MANUAL    by Paul Slootman
diff --git a/runtime/doc/os_qnx.txt b/runtime/doc/os_qnx.txt
index 952ccf917..466699fcf 100644
--- a/runtime/doc/os_qnx.txt
+++ b/runtime/doc/os_qnx.txt
@@ -1,4 +1,4 @@
-*os_qnx.txt*    For Vim version 8.0.  Last change: 2005 Mar 29
+*os_qnx.txt*    For Vim version 8.1.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Julian Kinraid
diff --git a/runtime/doc/os_risc.txt b/runtime/doc/os_risc.txt
index 2b12d205a..095d5a985 100644
--- a/runtime/doc/os_risc.txt
+++ b/runtime/doc/os_risc.txt
@@ -1,4 +1,4 @@
-*os_risc.txt*   For Vim version 8.0.  Last change: 2011 May 10
+*os_risc.txt*   For Vim version 8.1.  Last change: 2011 May 10
 
 
 		  VIM REFERENCE MANUAL    by Thomas Leonard
diff --git a/runtime/doc/os_unix.txt b/runtime/doc/os_unix.txt
index 805042200..4b69af5aa 100644
--- a/runtime/doc/os_unix.txt
+++ b/runtime/doc/os_unix.txt
@@ -1,4 +1,4 @@
-*os_unix.txt*   For Vim version 8.0.  Last change: 2005 Mar 29
+*os_unix.txt*   For Vim version 8.1.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/os_vms.txt b/runtime/doc/os_vms.txt
index 5a068166e..3e723b677 100644
--- a/runtime/doc/os_vms.txt
+++ b/runtime/doc/os_vms.txt
@@ -1,4 +1,4 @@
-*os_vms.txt*    For Vim version 8.0.  Last change: 2018 May 06
+*os_vms.txt*    For Vim version 8.1.  Last change: 2018 May 06
 
 
 		  VIM REFERENCE MANUAL
diff --git a/runtime/doc/os_win32.txt b/runtime/doc/os_win32.txt
index bb1dbdc46..8f4d30b12 100644
--- a/runtime/doc/os_win32.txt
+++ b/runtime/doc/os_win32.txt
@@ -1,4 +1,4 @@
-*os_win32.txt*  For Vim version 8.0.  Last change: 2017 Mar 21
+*os_win32.txt*  For Vim version 8.1.  Last change: 2017 Mar 21
 
 
 		  VIM REFERENCE MANUAL    by George Reilly
diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt
index ead319c29..337cbf726 100644
--- a/runtime/doc/pattern.txt
+++ b/runtime/doc/pattern.txt
@@ -1,4 +1,4 @@
-*pattern.txt*   For Vim version 8.0.  Last change: 2018 Mar 13
+*pattern.txt*   For Vim version 8.1.  Last change: 2018 Mar 13
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/pi_getscript.txt b/runtime/doc/pi_getscript.txt
index 1629a9103..419070682 100644
--- a/runtime/doc/pi_getscript.txt
+++ b/runtime/doc/pi_getscript.txt
@@ -1,4 +1,4 @@
-*pi_getscript.txt*  For Vim version 7.0.  Last change: 2017 Aug 01
+*pi_getscript.txt*  For Vim version 8.1.  Last change: 2017 Aug 01
 >
 		GETSCRIPT REFERENCE MANUAL  by Charles E. Campbell
 <
diff --git a/runtime/doc/pi_gzip.txt b/runtime/doc/pi_gzip.txt
index d8f63acd2..21b6520ee 100644
--- a/runtime/doc/pi_gzip.txt
+++ b/runtime/doc/pi_gzip.txt
@@ -1,4 +1,4 @@
-*pi_gzip.txt*   For Vim version 8.0.  Last change: 2016 Nov 06
+*pi_gzip.txt*   For Vim version 8.1.  Last change: 2016 Nov 06
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt
index e7cfdec22..b4f2f2693 100644
--- a/runtime/doc/pi_netrw.txt
+++ b/runtime/doc/pi_netrw.txt
@@ -1,4 +1,4 @@
-*pi_netrw.txt*  For Vim version 8.0.  Last change: 2017 Nov 03
+*pi_netrw.txt*  For Vim version 8.1.  Last change: 2017 Nov 03
 
 	    ------------------------------------------------
 	    NETRW REFERENCE MANUAL    by Charles E. Campbell
diff --git a/runtime/doc/pi_paren.txt b/runtime/doc/pi_paren.txt
index 1726ae6e5..d4ab4a08c 100644
--- a/runtime/doc/pi_paren.txt
+++ b/runtime/doc/pi_paren.txt
@@ -1,4 +1,4 @@
-*pi_paren.txt*  For Vim version 8.0.  Last change: 2013 May 08
+*pi_paren.txt*  For Vim version 8.1.  Last change: 2013 May 08
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/pi_spec.txt b/runtime/doc/pi_spec.txt
index 79213716d..abe5f1159 100644
--- a/runtime/doc/pi_spec.txt
+++ b/runtime/doc/pi_spec.txt
@@ -1,4 +1,4 @@
-*pi_spec.txt*   For Vim version 8.0.  Last change: 2006 Apr 24
+*pi_spec.txt*   For Vim version 8.1.  Last change: 2006 Apr 24
 
 by Gustavo Niemeyer ~
 
diff --git a/runtime/doc/pi_tar.txt b/runtime/doc/pi_tar.txt
index 1b03d31b0..7a6faf167 100644
--- a/runtime/doc/pi_tar.txt
+++ b/runtime/doc/pi_tar.txt
@@ -1,4 +1,4 @@
-*pi_tar.txt*	For Vim version 8.0.  Last change: 2013 Apr 17
+*pi_tar.txt*	For Vim version 8.1.  Last change: 2013 Apr 17
 
 		       +====================+
 		       | Tar File Interface |
diff --git a/runtime/doc/pi_vimball.txt b/runtime/doc/pi_vimball.txt
index 1996ddd7f..563b12a96 100644
--- a/runtime/doc/pi_vimball.txt
+++ b/runtime/doc/pi_vimball.txt
@@ -1,4 +1,4 @@
-*pi_vimball.txt*	For Vim version 8.0.  Last change: 2016 Apr 11
+*pi_vimball.txt*	For Vim version 8.1.  Last change: 2016 Apr 11
 
 			       ----------------
 			       Vimball Archiver
diff --git a/runtime/doc/pi_zip.txt b/runtime/doc/pi_zip.txt
index 3a536a7c1..c5fa391bf 100644
--- a/runtime/doc/pi_zip.txt
+++ b/runtime/doc/pi_zip.txt
@@ -1,4 +1,4 @@
-*pi_zip.txt*	For Vim version 8.0.  Last change: 2016 Sep 13
+*pi_zip.txt*	For Vim version 8.1.  Last change: 2016 Sep 13
 
 				+====================+
 				| Zip File Interface |
diff --git a/runtime/doc/print.txt b/runtime/doc/print.txt
index 62c37cfe6..b93a2305f 100644
--- a/runtime/doc/print.txt
+++ b/runtime/doc/print.txt
@@ -1,4 +1,4 @@
-*print.txt*     For Vim version 8.0.  Last change: 2010 Jul 20
+*print.txt*     For Vim version 8.1.  Last change: 2010 Jul 20
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index 5f2a4ddf2..c3f850437 100644
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -1,4 +1,4 @@
-*quickfix.txt*  For Vim version 8.0.  Last change: 2018 May 01
+*quickfix.txt*  For Vim version 8.1.  Last change: 2018 May 01
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index 8ec74e044..6f43022f0 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -1,4 +1,4 @@
-*quickref.txt*  For Vim version 8.0.  Last change: 2018 Apr 18
+*quickref.txt*  For Vim version 8.1.  Last change: 2018 Apr 18
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/quotes.txt b/runtime/doc/quotes.txt
index 0ecce3220..063a3148b 100644
--- a/runtime/doc/quotes.txt
+++ b/runtime/doc/quotes.txt
@@ -1,4 +1,4 @@
-*quotes.txt*    For Vim version 8.0.  Last change: 2018 Mar 29
+*quotes.txt*    For Vim version 8.1.  Last change: 2018 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/recover.txt b/runtime/doc/recover.txt
index e99ce872e..89703fdde 100644
--- a/runtime/doc/recover.txt
+++ b/runtime/doc/recover.txt
@@ -1,4 +1,4 @@
-*recover.txt*   For Vim version 8.0.  Last change: 2014 Mar 27
+*recover.txt*   For Vim version 8.1.  Last change: 2014 Mar 27
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/remote.txt b/runtime/doc/remote.txt
index 6b0d9dd41..f856c98fc 100644
--- a/runtime/doc/remote.txt
+++ b/runtime/doc/remote.txt
@@ -1,4 +1,4 @@
-*remote.txt*    For Vim version 8.0.  Last change: 2017 Nov 12
+*remote.txt*    For Vim version 8.1.  Last change: 2017 Nov 12
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt
index 6281040d7..62464780e 100644
--- a/runtime/doc/repeat.txt
+++ b/runtime/doc/repeat.txt
@@ -1,4 +1,4 @@
-*repeat.txt*    For Vim version 8.0.  Last change: 2018 Mar 04
+*repeat.txt*    For Vim version 8.1.  Last change: 2018 Mar 04
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/rileft.txt b/runtime/doc/rileft.txt
index 962b8905d..17bfdba7b 100644
--- a/runtime/doc/rileft.txt
+++ b/runtime/doc/rileft.txt
@@ -1,4 +1,4 @@
-*rileft.txt*    For Vim version 8.0.  Last change: 2006 Apr 24
+*rileft.txt*    For Vim version 8.1.  Last change: 2006 Apr 24
 
 
 		  VIM REFERENCE MANUAL    by Avner Lottem
diff --git a/runtime/doc/russian.txt b/runtime/doc/russian.txt
index 04efdf240..cf6487319 100644
--- a/runtime/doc/russian.txt
+++ b/runtime/doc/russian.txt
@@ -1,4 +1,4 @@
-*russian.txt*   For Vim version 8.0.  Last change: 2006 Apr 24
+*russian.txt*   For Vim version 8.1.  Last change: 2006 Apr 24
 
 
 		  VIM REFERENCE MANUAL    by Vassily Ragosin
diff --git a/runtime/doc/scroll.txt b/runtime/doc/scroll.txt
index 653e7edff..971fec8e9 100644
--- a/runtime/doc/scroll.txt
+++ b/runtime/doc/scroll.txt
@@ -1,4 +1,4 @@
-*scroll.txt*    For Vim version 8.0.  Last change: 2018 Apr 26
+*scroll.txt*    For Vim version 8.1.  Last change: 2018 Apr 26
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/sign.txt b/runtime/doc/sign.txt
index b61e4f102..dab63b1e4 100644
--- a/runtime/doc/sign.txt
+++ b/runtime/doc/sign.txt
@@ -1,4 +1,4 @@
-*sign.txt*      For Vim version 8.0.  Last change: 2016 Aug 17
+*sign.txt*      For Vim version 8.1.  Last change: 2016 Aug 17
 
 
 		  VIM REFERENCE MANUAL    by Gordon Prieur
diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt
index cac65aeb7..6f42eb398 100644
--- a/runtime/doc/spell.txt
+++ b/runtime/doc/spell.txt
@@ -1,4 +1,4 @@
-*spell.txt*	For Vim version 8.0.  Last change: 2018 Mar 29
+*spell.txt*	For Vim version 8.1.  Last change: 2018 Mar 29
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
diff --git a/runtime/doc/sponsor.txt b/runtime/doc/sponsor.txt
index d427dc057..6e42d157d 100644
--- a/runtime/doc/sponsor.txt
+++ b/runtime/doc/sponsor.txt
@@ -1,4 +1,4 @@
-*sponsor.txt*   For Vim version 8.0.  Last change: 2008 Jun 21
+*sponsor.txt*   For Vim version 8.1.  Last change: 2008 Jun 21
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 21a690597..0c15a1e09 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -1,4 +1,4 @@
-*starting.txt*  For Vim version 8.0.  Last change: 2018 May 05
+*starting.txt*  For Vim version 8.1.  Last change: 2018 May 05
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index b73a39ce9..88fda8ebf 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 8.0.  Last change: 2018 Apr 30
+*syntax.txt*	For Vim version 8.1.  Last change: 2018 Apr 30
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
diff --git a/runtime/doc/tabpage.txt b/runtime/doc/tabpage.txt
index 56d58ebaa..20dd1efbd 100644
--- a/runtime/doc/tabpage.txt
+++ b/runtime/doc/tabpage.txt
@@ -1,4 +1,4 @@
-*tabpage.txt*   For Vim version 8.0.  Last change: 2018 Mar 29
+*tabpage.txt*   For Vim version 8.1.  Last change: 2018 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 9390fa6f6..ea0b252f5 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -5084,6 +5084,7 @@ added-7.1	version7.txt	/*added-7.1*
 added-7.2	version7.txt	/*added-7.2*
 added-7.3	version7.txt	/*added-7.3*
 added-7.4	version7.txt	/*added-7.4*
+added-8.1	version8.txt	/*added-8.1*
 added-BeOS	version5.txt	/*added-BeOS*
 added-Mac	version5.txt	/*added-Mac*
 added-VMS	version5.txt	/*added-VMS*
@@ -5431,6 +5432,7 @@ changed-7.1	version7.txt	/*changed-7.1*
 changed-7.2	version7.txt	/*changed-7.2*
 changed-7.3	version7.txt	/*changed-7.3*
 changed-7.4	version7.txt	/*changed-7.4*
+changed-8.1	version8.txt	/*changed-8.1*
 changelist	motion.txt	/*changelist*
 changelog.vim	syntax.txt	/*changelog.vim*
 changenr()	eval.txt	/*changenr()*
@@ -7823,6 +7825,7 @@ new-session-files	version5.txt	/*new-session-files*
 new-spell	version7.txt	/*new-spell*
 new-style-testing	eval.txt	/*new-style-testing*
 new-tab-pages	version7.txt	/*new-tab-pages*
+new-terminal-window	version8.txt	/*new-terminal-window*
 new-undo-branches	version7.txt	/*new-undo-branches*
 new-unlisted-buffers	version6.txt	/*new-unlisted-buffers*
 new-user-defined	version5.txt	/*new-user-defined*
@@ -7936,6 +7939,7 @@ papp.vim	syntax.txt	/*papp.vim*
 paragraph	motion.txt	/*paragraph*
 pascal.vim	syntax.txt	/*pascal.vim*
 patches-8	version8.txt	/*patches-8*
+patches-8.1	version8.txt	/*patches-8.1*
 pathshorten()	eval.txt	/*pathshorten()*
 pattern	pattern.txt	/*pattern*
 pattern-atoms	pattern.txt	/*pattern-atoms*
@@ -8995,6 +8999,7 @@ terminal-colors	os_unix.txt	/*terminal-colors*
 terminal-communication	terminal.txt	/*terminal-communication*
 terminal-cursor-style	terminal.txt	/*terminal-cursor-style*
 terminal-debug	terminal.txt	/*terminal-debug*
+terminal-debugger	terminal.txt	/*terminal-debugger*
 terminal-diff	terminal.txt	/*terminal-diff*
 terminal-diffscreendump	terminal.txt	/*terminal-diffscreendump*
 terminal-dumptest	terminal.txt	/*terminal-dumptest*
@@ -9014,6 +9019,7 @@ terminal-to-job	terminal.txt	/*terminal-to-job*
 terminal-typing	terminal.txt	/*terminal-typing*
 terminal-unix	terminal.txt	/*terminal-unix*
 terminal-use	terminal.txt	/*terminal-use*
+terminal-window	terminal.txt	/*terminal-window*
 terminal.txt	terminal.txt	/*terminal.txt*
 terminfo	term.txt	/*terminfo*
 termresponse-variable	eval.txt	/*termresponse-variable*
@@ -9406,6 +9412,7 @@ version-7.2	version7.txt	/*version-7.2*
 version-7.3	version7.txt	/*version-7.3*
 version-7.4	version7.txt	/*version-7.4*
 version-8.0	version8.txt	/*version-8.0*
+version-8.1	version8.txt	/*version-8.1*
 version-variable	eval.txt	/*version-variable*
 version4.txt	version4.txt	/*version4.txt*
 version5.txt	version5.txt	/*version5.txt*
@@ -9417,6 +9424,7 @@ version7.3	version7.txt	/*version7.3*
 version7.4	version7.txt	/*version7.4*
 version7.txt	version7.txt	/*version7.txt*
 version8.0	version8.txt	/*version8.0*
+version8.1	version8.txt	/*version8.1*
 version8.txt	version8.txt	/*version8.txt*
 vi	intro.txt	/*vi*
 vi-differences	vi_diff.txt	/*vi-differences*
@@ -9429,6 +9437,7 @@ view-file	starting.txt	/*view-file*
 views-sessions	starting.txt	/*views-sessions*
 vim-7.4	version7.txt	/*vim-7.4*
 vim-8	version8.txt	/*vim-8*
+vim-8.1	version8.txt	/*vim-8.1*
 vim-additions	vi_diff.txt	/*vim-additions*
 vim-announce	intro.txt	/*vim-announce*
 vim-arguments	starting.txt	/*vim-arguments*
diff --git a/runtime/doc/tagsrch.txt b/runtime/doc/tagsrch.txt
index 6f006c0d0..555beb509 100644
--- a/runtime/doc/tagsrch.txt
+++ b/runtime/doc/tagsrch.txt
@@ -1,4 +1,4 @@
-*tagsrch.txt*   For Vim version 8.0.  Last change: 2018 May 04
+*tagsrch.txt*   For Vim version 8.1.  Last change: 2018 May 04
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt
index 61dfb4be4..c7579fe8b 100644
--- a/runtime/doc/term.txt
+++ b/runtime/doc/term.txt
@@ -1,4 +1,4 @@
-*term.txt*      For Vim version 8.0.  Last change: 2017 Oct 14
+*term.txt*      For Vim version 8.1.  Last change: 2017 Oct 14
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/terminal.txt b/runtime/doc/terminal.txt
index 5283ead59..8b8b77c84 100644
--- a/runtime/doc/terminal.txt
+++ b/runtime/doc/terminal.txt
@@ -1,10 +1,10 @@
-*terminal.txt*	For Vim version 8.0.  Last change: 2018 May 11
+*terminal.txt*	For Vim version 8.1.  Last change: 2018 May 17
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
 
 
-Terminal window support					*terminal*
+Terminal window support				*terminal* *terminal-window*
 
 
 The terminal feature is optional, use this to check if your Vim has it: >
@@ -613,7 +613,7 @@ Alternatively, press "s" to swap the first and second dump. Do this several
 times so that you can spot the difference in the context of the text.
 
 ==============================================================================
-5. Debugging						*terminal-debug*
+5. Debugging				*terminal-debug* *terminal-debugger*
 
 The Terminal debugging plugin can be used to debug a program with gdb and view
 the source code in a Vim window.  Since this is completely contained inside
diff --git a/runtime/doc/tips.txt b/runtime/doc/tips.txt
index d15b4bcac..3698348ea 100644
--- a/runtime/doc/tips.txt
+++ b/runtime/doc/tips.txt
@@ -1,4 +1,4 @@
-*tips.txt*      For Vim version 8.0.  Last change: 2009 Nov 07
+*tips.txt*      For Vim version 8.1.  Last change: 2009 Nov 07
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 526678df6..eda14bc73 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 8.0.  Last change: 2018 May 17
+*todo.txt*      For Vim version 8.1.  Last change: 2018 May 17
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -32,6 +32,9 @@ Only use this for bug reports, not for questions!  Those belong on the
 maillist.  Updates will be forwarded to the |vim_dev| maillist.  Issues
 entered there will not be repeated below, unless there is extra information.
 
+The #1234 numbers refer to an issue or pull request on github.  To see it in a
+browser use: https://github.com/vim/vim/issues/1234
+
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
@@ -65,9 +68,6 @@ Crash when mixing matchadd and substitute()? (Max Christian Pohle, 2018 May
 On Win32 when not in the console and t_Co >= 256, allow using 'tgc'.
 (Nobuhiro Takasaki, #2833)  Also check t_Co.
 
-Pop-up menu overlapping terminal is not cleared completely. (Lifepillar, 2018
-May 13, #2908)  Hint from Christian, May 14.
-
 balloon_show() does not work properly in the terminal. (Ben Jackson, 2017 Dec
 20, #2481)
 Also see #2352, want better control over balloon, perhaps set the position.
@@ -78,9 +78,6 @@ Errors found with random data:
 More warnings from static analysis:
 https://lgtm.com/projects/g/vim/vim/alerts/?mode=list
 
-When opening foo/x.txt and bar/x.txt get swap file warning.  Should check the
-file name. (Juergen Weigert)
-
 Script generated by :mksession does not work well if there are windows with
 modified buffers
   change "silent only" into "silent only!"
diff --git a/runtime/doc/uganda.txt b/runtime/doc/uganda.txt
index 64026a3c7..befb9f31d 100644
--- a/runtime/doc/uganda.txt
+++ b/runtime/doc/uganda.txt
@@ -1,4 +1,4 @@
-*uganda.txt*    For Vim version 8.0.  Last change: 2013 Jul 06
+*uganda.txt*    For Vim version 8.1.  Last change: 2018 May 17
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/undo.txt b/runtime/doc/undo.txt
index 77ecf9169..d271222d2 100644
--- a/runtime/doc/undo.txt
+++ b/runtime/doc/undo.txt
@@ -1,4 +1,4 @@
-*undo.txt*      For Vim version 8.0.  Last change: 2014 May 24
+*undo.txt*      For Vim version 8.1.  Last change: 2014 May 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/usr_01.txt b/runtime/doc/usr_01.txt
index b450c4e58..040bcd945 100644
--- a/runtime/doc/usr_01.txt
+++ b/runtime/doc/usr_01.txt
@@ -1,4 +1,4 @@
-*usr_01.txt*	For Vim version 8.0.  Last change: 2017 Jul 15
+*usr_01.txt*	For Vim version 8.1.  Last change: 2017 Jul 15
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_02.txt b/runtime/doc/usr_02.txt
index 2ccde79ec..2f976ba01 100644
--- a/runtime/doc/usr_02.txt
+++ b/runtime/doc/usr_02.txt
@@ -1,4 +1,4 @@
-*usr_02.txt*	For Vim version 8.0.  Last change: 2017 Mar 14
+*usr_02.txt*	For Vim version 8.1.  Last change: 2017 Mar 14
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_03.txt b/runtime/doc/usr_03.txt
index bd219fade..ba51aa203 100644
--- a/runtime/doc/usr_03.txt
+++ b/runtime/doc/usr_03.txt
@@ -1,4 +1,4 @@
-*usr_03.txt*	For Vim version 8.0.  Last change: 2017 Jul 21
+*usr_03.txt*	For Vim version 8.1.  Last change: 2017 Jul 21
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_04.txt b/runtime/doc/usr_04.txt
index 5b08263c7..1b4f57944 100644
--- a/runtime/doc/usr_04.txt
+++ b/runtime/doc/usr_04.txt
@@ -1,4 +1,4 @@
-*usr_04.txt*	For Vim version 8.0.  Last change: 2014 Aug 29
+*usr_04.txt*	For Vim version 8.1.  Last change: 2014 Aug 29
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_05.txt b/runtime/doc/usr_05.txt
index ee40463ee..368551a22 100644
--- a/runtime/doc/usr_05.txt
+++ b/runtime/doc/usr_05.txt
@@ -1,4 +1,4 @@
-*usr_05.txt*	For Vim version 8.0.  Last change: 2018 Feb 20
+*usr_05.txt*	For Vim version 8.1.  Last change: 2018 Feb 20
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_06.txt b/runtime/doc/usr_06.txt
index 2c4b64d46..e2750aeb6 100644
--- a/runtime/doc/usr_06.txt
+++ b/runtime/doc/usr_06.txt
@@ -1,4 +1,4 @@
-*usr_06.txt*	For Vim version 8.0.  Last change: 2009 Oct 28
+*usr_06.txt*	For Vim version 8.1.  Last change: 2009 Oct 28
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_07.txt b/runtime/doc/usr_07.txt
index 50fe4e985..a163006e0 100644
--- a/runtime/doc/usr_07.txt
+++ b/runtime/doc/usr_07.txt
@@ -1,4 +1,4 @@
-*usr_07.txt*	For Vim version 8.0.  Last change: 2017 Sep 18
+*usr_07.txt*	For Vim version 8.1.  Last change: 2017 Sep 18
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_08.txt b/runtime/doc/usr_08.txt
index 6b3db9b01..525385639 100644
--- a/runtime/doc/usr_08.txt
+++ b/runtime/doc/usr_08.txt
@@ -1,4 +1,4 @@
-*usr_08.txt*	For Vim version 8.0.  Last change: 2017 Aug 11
+*usr_08.txt*	For Vim version 8.1.  Last change: 2017 Aug 11
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_09.txt b/runtime/doc/usr_09.txt
index ac1463603..ee33f941f 100644
--- a/runtime/doc/usr_09.txt
+++ b/runtime/doc/usr_09.txt
@@ -1,4 +1,4 @@
-*usr_09.txt*	For Vim version 8.0.  Last change: 2017 Aug 11
+*usr_09.txt*	For Vim version 8.1.  Last change: 2017 Aug 11
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_10.txt b/runtime/doc/usr_10.txt
index dfa46303d..46f76770f 100644
--- a/runtime/doc/usr_10.txt
+++ b/runtime/doc/usr_10.txt
@@ -1,4 +1,4 @@
-*usr_10.txt*	For Vim version 8.0.  Last change: 2006 Nov 05
+*usr_10.txt*	For Vim version 8.1.  Last change: 2006 Nov 05
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_11.txt b/runtime/doc/usr_11.txt
index 31a53c081..13c08f91a 100644
--- a/runtime/doc/usr_11.txt
+++ b/runtime/doc/usr_11.txt
@@ -1,4 +1,4 @@
-*usr_11.txt*	For Vim version 8.0.  Last change: 2018 Apr 13
+*usr_11.txt*	For Vim version 8.1.  Last change: 2018 Apr 13
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_12.txt b/runtime/doc/usr_12.txt
index 078d1872a..13401b15e 100644
--- a/runtime/doc/usr_12.txt
+++ b/runtime/doc/usr_12.txt
@@ -1,4 +1,4 @@
-*usr_12.txt*	For Vim version 8.0.  Last change: 2017 Aug 11
+*usr_12.txt*	For Vim version 8.1.  Last change: 2017 Aug 11
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_20.txt b/runtime/doc/usr_20.txt
index b685b103e..afeb7133e 100644
--- a/runtime/doc/usr_20.txt
+++ b/runtime/doc/usr_20.txt
@@ -1,4 +1,4 @@
-*usr_20.txt*	For Vim version 8.0.  Last change: 2006 Apr 24
+*usr_20.txt*	For Vim version 8.1.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_21.txt b/runtime/doc/usr_21.txt
index 9bde60852..40388eee7 100644
--- a/runtime/doc/usr_21.txt
+++ b/runtime/doc/usr_21.txt
@@ -1,4 +1,4 @@
-*usr_21.txt*	For Vim version 8.0.  Last change: 2012 Nov 02
+*usr_21.txt*	For Vim version 8.1.  Last change: 2012 Nov 02
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_22.txt b/runtime/doc/usr_22.txt
index 68352da8f..17209976b 100644
--- a/runtime/doc/usr_22.txt
+++ b/runtime/doc/usr_22.txt
@@ -1,4 +1,4 @@
-*usr_22.txt*	For Vim version 8.0.  Last change: 2016 Dec 13
+*usr_22.txt*	For Vim version 8.1.  Last change: 2016 Dec 13
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_23.txt b/runtime/doc/usr_23.txt
index d9c113c45..049ca2068 100644
--- a/runtime/doc/usr_23.txt
+++ b/runtime/doc/usr_23.txt
@@ -1,4 +1,4 @@
-*usr_23.txt*	For Vim version 8.0.  Last change: 2006 Apr 24
+*usr_23.txt*	For Vim version 8.1.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_24.txt b/runtime/doc/usr_24.txt
index daf291d32..a5e334445 100644
--- a/runtime/doc/usr_24.txt
+++ b/runtime/doc/usr_24.txt
@@ -1,4 +1,4 @@
-*usr_24.txt*	For Vim version 8.0.  Last change: 2018 Mar 18
+*usr_24.txt*	For Vim version 8.1.  Last change: 2018 Mar 18
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_25.txt b/runtime/doc/usr_25.txt
index c193d5483..f5be3e048 100644
--- a/runtime/doc/usr_25.txt
+++ b/runtime/doc/usr_25.txt
@@ -1,4 +1,4 @@
-*usr_25.txt*	For Vim version 8.0.  Last change: 2016 Mar 28
+*usr_25.txt*	For Vim version 8.1.  Last change: 2016 Mar 28
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_26.txt b/runtime/doc/usr_26.txt
index 22d2eb7e0..f3afe9be9 100644
--- a/runtime/doc/usr_26.txt
+++ b/runtime/doc/usr_26.txt
@@ -1,4 +1,4 @@
-*usr_26.txt*	For Vim version 8.0.  Last change: 2006 Apr 24
+*usr_26.txt*	For Vim version 8.1.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_27.txt b/runtime/doc/usr_27.txt
index 653ee4343..7098c070d 100644
--- a/runtime/doc/usr_27.txt
+++ b/runtime/doc/usr_27.txt
@@ -1,4 +1,4 @@
-*usr_27.txt*	For Vim version 8.0.  Last change: 2018 Jan 26
+*usr_27.txt*	For Vim version 8.1.  Last change: 2018 Jan 26
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_28.txt b/runtime/doc/usr_28.txt
index bfb170ab1..e2565b01f 100644
--- a/runtime/doc/usr_28.txt
+++ b/runtime/doc/usr_28.txt
@@ -1,4 +1,4 @@
-*usr_28.txt*	For Vim version 8.0.  Last change: 2008 Jun 14
+*usr_28.txt*	For Vim version 8.1.  Last change: 2008 Jun 14
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_29.txt b/runtime/doc/usr_29.txt
index 87c39c7cf..996046e5d 100644
--- a/runtime/doc/usr_29.txt
+++ b/runtime/doc/usr_29.txt
@@ -1,4 +1,4 @@
-*usr_29.txt*	For Vim version 8.0.  Last change: 2016 Feb 27
+*usr_29.txt*	For Vim version 8.1.  Last change: 2016 Feb 27
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_30.txt b/runtime/doc/usr_30.txt
index 67f46596e..fa39dbf70 100644
--- a/runtime/doc/usr_30.txt
+++ b/runtime/doc/usr_30.txt
@@ -1,4 +1,4 @@
-*usr_30.txt*	For Vim version 8.0.  Last change: 2007 Nov 10
+*usr_30.txt*	For Vim version 8.1.  Last change: 2007 Nov 10
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_31.txt b/runtime/doc/usr_31.txt
index 2344a9877..13de489ba 100644
--- a/runtime/doc/usr_31.txt
+++ b/runtime/doc/usr_31.txt
@@ -1,4 +1,4 @@
-*usr_31.txt*	For Vim version 8.0.  Last change: 2007 May 08
+*usr_31.txt*	For Vim version 8.1.  Last change: 2007 May 08
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_32.txt b/runtime/doc/usr_32.txt
index 86c2ddb5c..9e48d53ea 100644
--- a/runtime/doc/usr_32.txt
+++ b/runtime/doc/usr_32.txt
@@ -1,4 +1,4 @@
-*usr_32.txt*	For Vim version 8.0.  Last change: 2010 Jul 20
+*usr_32.txt*	For Vim version 8.1.  Last change: 2010 Jul 20
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_40.txt b/runtime/doc/usr_40.txt
index b865cbe3f..151c4e6ee 100644
--- a/runtime/doc/usr_40.txt
+++ b/runtime/doc/usr_40.txt
@@ -1,4 +1,4 @@
-*usr_40.txt*	For Vim version 8.0.  Last change: 2013 Aug 05
+*usr_40.txt*	For Vim version 8.1.  Last change: 2013 Aug 05
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index bf324e661..279dd20c7 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -1,4 +1,4 @@
-*usr_41.txt*	For Vim version 8.0.  Last change: 2018 Apr 11
+*usr_41.txt*	For Vim version 8.1.  Last change: 2018 Apr 11
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_42.txt b/runtime/doc/usr_42.txt
index a440d689a..1e187e949 100644
--- a/runtime/doc/usr_42.txt
+++ b/runtime/doc/usr_42.txt
@@ -1,4 +1,4 @@
-*usr_42.txt*	For Vim version 8.0.  Last change: 2008 May 05
+*usr_42.txt*	For Vim version 8.1.  Last change: 2008 May 05
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_43.txt b/runtime/doc/usr_43.txt
index 9e2922653..331f5b8d4 100644
--- a/runtime/doc/usr_43.txt
+++ b/runtime/doc/usr_43.txt
@@ -1,4 +1,4 @@
-*usr_43.txt*	For Vim version 8.0.  Last change: 2015 Oct 23
+*usr_43.txt*	For Vim version 8.1.  Last change: 2015 Oct 23
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_44.txt b/runtime/doc/usr_44.txt
index 09de5774b..b6f37e2d3 100644
--- a/runtime/doc/usr_44.txt
+++ b/runtime/doc/usr_44.txt
@@ -1,4 +1,4 @@
-*usr_44.txt*	For Vim version 8.0.  Last change: 2017 May 06
+*usr_44.txt*	For Vim version 8.1.  Last change: 2017 May 06
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_45.txt b/runtime/doc/usr_45.txt
index 04466b711..e7844a8e9 100644
--- a/runtime/doc/usr_45.txt
+++ b/runtime/doc/usr_45.txt
@@ -1,4 +1,4 @@
-*usr_45.txt*	For Vim version 8.0.  Last change: 2008 Nov 15
+*usr_45.txt*	For Vim version 8.1.  Last change: 2008 Nov 15
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_90.txt b/runtime/doc/usr_90.txt
index 28d0c3249..5ecba6015 100644
--- a/runtime/doc/usr_90.txt
+++ b/runtime/doc/usr_90.txt
@@ -1,4 +1,4 @@
-*usr_90.txt*	For Vim version 8.0.  Last change: 2008 Sep 10
+*usr_90.txt*	For Vim version 8.1.  Last change: 2008 Sep 10
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_toc.txt b/runtime/doc/usr_toc.txt
index d3aa77f4a..6a6543d1a 100644
--- a/runtime/doc/usr_toc.txt
+++ b/runtime/doc/usr_toc.txt
@@ -1,4 +1,4 @@
-*usr_toc.txt*	For Vim version 8.0.  Last change: 2016 Mar 25
+*usr_toc.txt*	For Vim version 8.1.  Last change: 2016 Mar 25
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index a044d45a0..7c8f3111c 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -1,4 +1,4 @@
-*various.txt*   For Vim version 8.0.  Last change: 2018 Mar 29
+*various.txt*   For Vim version 8.1.  Last change: 2018 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/version4.txt b/runtime/doc/version4.txt
index c2b0f9cc2..3990a4b1b 100644
--- a/runtime/doc/version4.txt
+++ b/runtime/doc/version4.txt
@@ -1,4 +1,4 @@
-*version4.txt*  For Vim version 8.0.  Last change: 2006 Apr 24
+*version4.txt*  For Vim version 8.1.  Last change: 2006 Apr 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/version5.txt b/runtime/doc/version5.txt
index b1b71ef6d..a3e3cfeb1 100644
--- a/runtime/doc/version5.txt
+++ b/runtime/doc/version5.txt
@@ -1,4 +1,4 @@
-*version5.txt*  For Vim version 8.0.  Last change: 2016 Feb 27
+*version5.txt*  For Vim version 8.1.  Last change: 2016 Feb 27
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/version6.txt b/runtime/doc/version6.txt
index 37f8dc58c..533589585 100644
--- a/runtime/doc/version6.txt
+++ b/runtime/doc/version6.txt
@@ -1,4 +1,4 @@
-*version6.txt*  For Vim version 8.0.  Last change: 2018 Mar 18
+*version6.txt*  For Vim version 8.1.  Last change: 2018 Mar 18
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index d05871ea9..045bd3094 100644
--- a/runtime/doc/version7.txt
+++ b/runtime/doc/version7.txt
@@ -1,4 +1,4 @@
-*version7.txt*  For Vim version 8.0.  Last change: 2016 Jul 17
+*version7.txt*  For Vim version 8.1.  Last change: 2016 Jul 17
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/version8.txt b/runtime/doc/version8.txt
index c7de3c21a..8634c2842 100644
--- a/runtime/doc/version8.txt
+++ b/runtime/doc/version8.txt
@@ -1,4 +1,4 @@
-*version8.txt*  For Vim version 8.0.  Last change: 2018 May 17
+*version8.txt*  For Vim version 8.1.  Last change: 2018 May 17
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -26,6 +26,11 @@ COMPILE TIME CHANGES			|compile-changes-8|
 
 PATCHES					|patches-8|
 
+VERSION 8.1			|version-8.1|
+Changed					|changed-8.1|
+Added					|added-8.1|
+Patches					|patches-8.1|
+
 
 See |vi_diff.txt| for an overview of differences between Vi and Vim 8.0.
 See |version4.txt|, |version5.txt|, |version6.txt| and |version7.txt| for
@@ -14514,6 +14519,104 @@ Problem:    Test runner misses a comma.
 Solution:   Add the comma.
 Files:      src/testdir/runtest.vim
 
+
+==============================================================================
+VERSION 8.1				*version-8.1* *version8.1* *vim-8.1*
+
+This section is about improvements made between version 8.0 and 8.1.
+
+This release has hundreds of bug fixes, there is a new feature and there are
+many minor improvements.
+
+
+The terminal window				*new-terminal-window*
+-------------------
+
+You can now open a window which functions as a terminal.  You can use it for:
+- Running a command, such as "make", while editing in other windows
+- Running a shell and execute several commands
+- Use the terminal debugger plugin, see |terminal-debugger|
+
+All of this is especially useful when running Vim on a remote (ssh)
+connection, when you can't easily open more terminals.
+
+For more information see |terminal-window|.
+
+
+Changed							*changed-8.1*
+-------
+
+Internal: A few C99 features are now allowed such as // comments and a
+comma after the last enum entry.  See |style-compiler|.
+
+
+Added							*added-8.1*
+-----
+
+Various syntax, indent and other plugins were added.
+
+Functions:
+	All the term_ functions.
+
+	|assert_beeps()|
+	|assert_equalfile()|
+	|assert_report()|
+	|balloon_show()|
+	|balloon_split()|
+	|ch_canread()|
+	|getchangelist()|
+	|getjumplist()|
+	|getwinpos()|
+	|pyxeval()|
+	|remote_startserver()|
+	|setbufline()|
+	|test_ignore_error()|
+	|test_override()|
+	|trim()|
+	|win_screenpos()|
+
+Autocommands:
+	|CmdlineChanged|
+	|CmdlineEnter|
+	|CmdlineLeave|
+	|ColorSchemePre|
+	|DirChanged|
+	|ExitPre|
+	|TerminalOpen|
+	|TextChangedP|
+	|TextYankPost|
+
+Commands:
+	|:pyx|
+	|:pythonx|
+	|:pyxdo|
+	|:pyxfile|
+	|:terminal|
+	|:tmapclear|
+	|:tmap|
+	|:tnoremap|
+	|:tunmap|
+
+Options:
+	'balloonevalterm'
+	'imstyle'
+	'mzschemedll'
+	'mzschemegcdll'
+	'makeencoding'
+	'pumwidth'
+	'pythonhome'
+	'pythonthreehome'
+	'pyxversion'
+	'termwinkey'
+	'termwinscroll'
+	'termwinsize'
+	'viminfofile'
+	'winptydll'
+
+
+Patches							*patches-8.1*
+-------
+
 Patch 8.0.0001
 Problem:    Intro screen still mentions version7. (Paul)
 Solution:   Change it to version8.
@@ -25658,5 +25761,10 @@ Problem:    Compiler warning for unused arguments and missing prototype.
 Solution:   Add UNUSED.  Add static.
 Files:      src/mbyte.c, src/if_ruby.c
 
+Patch 8.0.1850
+Problem:    Todo items in source code not visible for users.
+Solution:   Move the todo items to the help file.
+Files:      src/terminal.c
+
 
  vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/doc/vi_diff.txt b/runtime/doc/vi_diff.txt
index 9a4981f03..a395c8877 100644
--- a/runtime/doc/vi_diff.txt
+++ b/runtime/doc/vi_diff.txt
@@ -1,4 +1,4 @@
-*vi_diff.txt*   For Vim version 8.0.  Last change: 2016 Aug 16
+*vi_diff.txt*   For Vim version 8.1.  Last change: 2016 Aug 16
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/visual.txt b/runtime/doc/visual.txt
index c799727a6..5e15b3b96 100644
--- a/runtime/doc/visual.txt
+++ b/runtime/doc/visual.txt
@@ -1,4 +1,4 @@
-*visual.txt*    For Vim version 8.0.  Last change: 2017 Sep 02
+*visual.txt*    For Vim version 8.1.  Last change: 2017 Sep 02
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt
index c6c8cadf1..e88cfcb93 100644
--- a/runtime/doc/windows.txt
+++ b/runtime/doc/windows.txt
@@ -1,4 +1,4 @@
-*windows.txt*   For Vim version 8.0.  Last change: 2018 Apr 24
+*windows.txt*   For Vim version 8.1.  Last change: 2018 Apr 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/workshop.txt b/runtime/doc/workshop.txt
index e7dd9b048..8a699a47d 100644
--- a/runtime/doc/workshop.txt
+++ b/runtime/doc/workshop.txt
@@ -1,4 +1,4 @@
-*workshop.txt*  For Vim version 8.0.  Last change: 2013 Jul 06
+*workshop.txt*  For Vim version 8.1.  Last change: 2013 Jul 06
 
 
 		  VIM REFERENCE MANUAL    by Gordon Prieur
diff --git a/runtime/makemenu.vim b/runtime/makemenu.vim
index 839dbdac0..3d76b4240 100644
--- a/runtime/makemenu.vim
+++ b/runtime/makemenu.vim
@@ -1,6 +1,6 @@
 " Script to define the syntax menu in synmenu.vim
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2013 Jul 28
+" Last Change:	2018 May 17
 
 " This is used by "make menu" in the src directory.
 edit <sfile>:p:h/synmenu.vim
@@ -69,11 +69,13 @@ SynMenu AB.Applix\ ELF:elf
 SynMenu AB.APT\ config:aptconf
 SynMenu AB.Arc\ Macro\ Language:aml
 SynMenu AB.Arch\ inventory:arch
+SynMenu AB.Arduino:arduino
 SynMenu AB.ART:art
 SynMenu AB.Ascii\ Doc:asciidoc
 SynMenu AB.ASP\ with\ VBScript:aspvbs
 SynMenu AB.ASP\ with\ Perl:aspperl
 SynMenu AB.Assembly.680x0:asm68k
+SynMenu AB.Assembly.AVR:avra
 SynMenu AB.Assembly.Flat:fasm
 SynMenu AB.Assembly.GNU:asm
 SynMenu AB.Assembly.GNU\ H-8300:asmh8300
@@ -89,6 +91,7 @@ SynMenu AB.ASN\.1:asn
 SynMenu AB.Asterisk\ config:asterisk
 SynMenu AB.Asterisk\ voicemail\ config:asteriskvm
 SynMenu AB.Atlas:atlas
+SynMenu AB.Autodoc:autodoc
 SynMenu AB.AutoHotKey:autohotkey
 SynMenu AB.AutoIt:autoit
 SynMenu AB.Automake:automake
@@ -103,6 +106,7 @@ SynMenu AB.Basic.IBasic:ibasic
 SynMenu AB.Basic.QBasic:basic
 SynMenu AB.Basic.Visual\ Basic:vb
 SynMenu AB.Bazaar\ commit\ file:bzr
+SynMenu AB.Bazel:bzl
 SynMenu AB.BC\ calculator:bc
 SynMenu AB.BDF\ font:bdf
 SynMenu AB.BibTeX.Bibliography\ database:bib
@@ -132,6 +136,7 @@ SynMenu C.Clever:cl
 SynMenu C.Clipper:clipper
 SynMenu C.Clojure:clojure
 SynMenu C.Cmake:cmake
+SynMenu C.Cmod:cmod
 SynMenu C.Cmusrc:cmusrc
 SynMenu C.Cobol:cobol
 SynMenu C.Coco/R:coco
@@ -158,6 +163,7 @@ SynMenu DE.D:d
 SynMenu DE.Datascript:datascript
 SynMenu DE.Debian.Debian\ ChangeLog:debchangelog
 SynMenu DE.Debian.Debian\ Control:debcontrol
+SynMenu DE.Debian.Debian\ Copyright:debcopyright
 SynMenu DE.Debian.Debian\ Sources\.list:debsources
 SynMenu DE.Denyhosts:denyhosts
 SynMenu DE.Desktop:desktop
@@ -166,12 +172,14 @@ SynMenu DE.Dictd\ config:dictdconf
 SynMenu DE.Diff:diff
 SynMenu DE.Digital\ Command\ Lang:dcl
 SynMenu DE.Dircolors:dircolors
+SynMenu DE.Dirpager:dirpager
 SynMenu DE.Django\ template:django
 SynMenu DE.DNS/BIND\ zone:bindzone
 SynMenu DE.Dnsmasq\ config:dnsmasq
 SynMenu DE.DocBook.auto-detect:docbk
 SynMenu DE.DocBook.SGML:docbksgml
 SynMenu DE.DocBook.XML:docbkxml
+SynMenu DE.Dockerfile:dockerfile
 SynMenu DE.Dot:dot
 SynMenu DE.Doxygen.C\ with\ doxygen:c.doxygen
 SynMenu DE.Doxygen.C++\ with\ doxygen:cpp.doxygen
@@ -199,6 +207,8 @@ SynMenu DE.ESQL-C:esqlc
 SynMenu DE.Essbase\ script:csc
 SynMenu DE.Esterel:esterel
 SynMenu DE.Eterm\ config:eterm
+SynMenu DE.Euphoria\ 3:euphoria3
+SynMenu DE.Euphoria\ 4:euphoria4
 SynMenu DE.Eviews:eviews
 SynMenu DE.Exim\ conf:exim
 SynMenu DE.Expect:expect
@@ -231,6 +241,8 @@ SynMenu FG.Git.Send\ Email:gitsendemail
 SynMenu FG.Gitolite:gitolite
 SynMenu FG.Gkrellmrc:gkrellmrc
 SynMenu FG.Gnash:gnash
+SynMenu FG.Go:go
+SynMenu FG.Godoc:godoc
 SynMenu FG.GP:gp
 SynMenu FG.GPG:gpg
 SynMenu FG.Grof:gprof
@@ -277,12 +289,14 @@ SynMenu HIJK.Inittab:inittab
 SynMenu HIJK.Inno\ setup:iss
 SynMenu HIJK.Innovation\ Data\ Processing.Upstream\ dat:upstreamdat
 SynMenu HIJK.Innovation\ Data\ Processing.Upstream\ log:upstreamlog
+SynMenu HIJK.Innovation\ Data\ Processing.Upstream\ rpt:upstreamrpt
 SynMenu HIJK.Innovation\ Data\ Processing.Upstream\ Install\ log:upstreaminstalllog
 SynMenu HIJK.Innovation\ Data\ Processing.Usserver\ log:usserverlog
 SynMenu HIJK.Innovation\ Data\ Processing.USW2KAgt\ log:usw2kagtlog
 SynMenu HIJK.InstallShield\ script:ishd
 SynMenu HIJK.Interactive\ Data\ Lang:idlang
 SynMenu HIJK.IPfilter:ipfilter
+SynMenu HIJK.J:j
 SynMenu HIJK.JAL:jal
 SynMenu HIJK.JAM:jam
 SynMenu HIJK.Jargon:jargon
@@ -294,9 +308,11 @@ SynMenu HIJK.JavaScript:javascript
 SynMenu HIJK.Jess:jess
 SynMenu HIJK.Jgraph:jgraph
 SynMenu HIJK.Jovial:jovial
+SynMenu HIJK.JSON:json
 SynMenu HIJK.Kconfig:kconfig
 SynMenu HIJK.KDE\ script:kscript
 SynMenu HIJK.Kimwitu++:kwt
+SynMenu HIJK.Kivy:kivy
 SynMenu HIJK.KixTart:kix
 
 SynMenu L.Lace:lace
@@ -305,6 +321,7 @@ SynMenu L.Latte:latte
 SynMenu L.Ld\ script:ld
 SynMenu L.LDAP.LDIF:ldif
 SynMenu L.LDAP.Configuration:ldapconf
+SynMenu L.Less:less
 SynMenu L.Lex:lex
 SynMenu L.LFTP\ config:lftp
 SynMenu L.Libao:libao
@@ -340,6 +357,7 @@ SynMenu M.Man\ page:man
 SynMenu M.Man\.conf:manconf
 SynMenu M.Maple\ V:maple
 SynMenu M.Markdown:markdown
+SynMenu M.Markdown\ with\ R\ statements:rmd
 SynMenu M.Mason:mason
 SynMenu M.Mathematica:mma
 SynMenu M.Matlab:matlab
@@ -349,6 +367,7 @@ SynMenu M.Messages\ (/var/log):messages
 SynMenu M.Metafont:mf
 SynMenu M.MetaPost:mp
 SynMenu M.MGL:mgl
+SynMenu M.MIX:mix
 SynMenu M.MMIX:mmix
 SynMenu M.Modconf:modconf
 SynMenu M.Model:model
@@ -356,6 +375,7 @@ SynMenu M.Modsim\ III:modsim3
 SynMenu M.Modula\ 2:modula2
 SynMenu M.Modula\ 3:modula3
 SynMenu M.Monk:monk
+SynMenu M.Motorola\ S-Record:srec
 SynMenu M.Mplayer\ config:mplayerconf
 SynMenu M.MOO:moo
 SynMenu M.Mrxvtrc:mrxvtrc
@@ -368,12 +388,15 @@ SynMenu M.MS-DOS/Windows.Registry:registry
 SynMenu M.MS-DOS/Windows.Resource\ file:rc
 SynMenu M.Msql:msql
 SynMenu M.MuPAD:mupad
+SynMenu M.Murphi:murphi
 SynMenu M.MUSHcode:mush
 SynMenu M.Muttrc:muttrc
 
+SynMenu NO.N1QL:n1ql
 SynMenu NO.Nanorc:nanorc
 SynMenu NO.Nastran\ input/DMAP:nastran
 SynMenu NO.Natural:natural
+SynMenu NO.NeoMutt\ setup\ files:neomuttrc
 SynMenu NO.Netrc:netrc
 SynMenu NO.Ninja:ninja
 SynMenu NO.Novell\ NCF\ batch:ncf
@@ -461,14 +484,18 @@ SynMenu R.RockLinux\ package\ desc\.:desc
 SynMenu R.Rpcgen:rpcgen
 SynMenu R.RPL/2:rpl
 SynMenu R.ReStructuredText:rst
+SynMenu M.ReStructuredText\ with\ R\ statements:rrst
 SynMenu R.RTF:rtf
 SynMenu R.Ruby:ruby
+SynMenu R.Rust:rust
 
 SynMenu S-Sm.S-Lang:slang
 SynMenu S-Sm.Samba\ config:samba
 SynMenu S-Sm.SAS:sas
 SynMenu S-Sm.Sass:sass
 SynMenu S-Sm.Sather:sather
+SynMenu S-Sm.Sbt:sbt
+SynMenu S-Sm.Scala:scala
 SynMenu S-Sm.Scheme:scheme
 SynMenu S-Sm.Scilab:scilab
 SynMenu S-Sm.Screen\ RC:screen
@@ -546,6 +573,8 @@ SynMenu Sn-Sy.Sudoers:sudoers
 SynMenu Sn-Sy.SVG:svg
 SynMenu Sn-Sy.Symbian\ meta-makefile:mmp
 SynMenu Sn-Sy.Sysctl\.conf:sysctl
+SynMenu Sn-Sy.Systemd:systemd
+SynMenu Sn-Sy.SystemVerilog:systemverilog
 
 SynMenu T.TADS:tads
 SynMenu T.Tags:tags
@@ -560,6 +589,7 @@ SynMenu T.TealInfo:tli
 SynMenu T.Telix\ Salt:tsalt
 SynMenu T.Termcap/Printcap:ptcap
 SynMenu T.Terminfo:terminfo
+SynMenu T.Tera\ Term:teraterm
 SynMenu T.TeX.TeX/LaTeX:tex
 SynMenu T.TeX.plain\ TeX:plaintex
 SynMenu T.TeX.Initex:initex
@@ -569,6 +599,7 @@ SynMenu T.TeX.Texinfo:texinfo
 SynMenu T.TF\ mud\ client:tf
 SynMenu T.Tidy\ configuration:tidy
 SynMenu T.Tilde:tilde
+SynMenu T.Tmux\ configuration:tmux
 SynMenu T.TPP:tpp
 SynMenu T.Trasys\ input:trasys
 SynMenu T.Treetop:treetop
@@ -586,6 +617,7 @@ SynMenu UV.Updatedb\.conf:updatedb
 SynMenu UV.Upstart:upstart
 SynMenu UV.Valgrind:valgrind
 SynMenu UV.Vera:vera
+SynMenu UV.Verbose\ TAP\ Output:tap
 SynMenu UV.Verilog-AMS\ HDL:verilogams
 SynMenu UV.Verilog\ HDL:verilog
 SynMenu UV.Vgrindefs:vgrindefs
@@ -597,6 +629,7 @@ SynMenu UV.Virata\ config:virata
 SynMenu UV.Visual\ Basic:vb
 SynMenu UV.VOS\ CM\ macro:voscm
 SynMenu UV.VRML:vrml
+SynMenu UV.Vroom:vroom
 SynMenu UV.VSE\ JCL:vsejcl
 
 SynMenu WXYZ.WEB.CWEB:cweb
diff --git a/runtime/synmenu.vim b/runtime/synmenu.vim
index 6814c60e8..ec4c48b3d 100644
--- a/runtime/synmenu.vim
+++ b/runtime/synmenu.vim
@@ -56,46 +56,50 @@ an 50.10.270 &Syntax.AB.Applix\ ELF :cal SetSyn("elf")<CR>
 an 50.10.280 &Syntax.AB.APT\ config :cal SetSyn("aptconf")<CR>
 an 50.10.290 &Syntax.AB.Arc\ Macro\ Language :cal SetSyn("aml")<CR>
 an 50.10.300 &Syntax.AB.Arch\ inventory :cal SetSyn("arch")<CR>
-an 50.10.310 &Syntax.AB.ART :cal SetSyn("art")<CR>
-an 50.10.320 &Syntax.AB.Ascii\ Doc :cal SetSyn("asciidoc")<CR>
-an 50.10.330 &Syntax.AB.ASP\ with\ VBScript :cal SetSyn("aspvbs")<CR>
-an 50.10.340 &Syntax.AB.ASP\ with\ Perl :cal SetSyn("aspperl")<CR>
-an 50.10.350 &Syntax.AB.Assembly.680x0 :cal SetSyn("asm68k")<CR>
-an 50.10.360 &Syntax.AB.Assembly.Flat :cal SetSyn("fasm")<CR>
-an 50.10.370 &Syntax.AB.Assembly.GNU :cal SetSyn("asm")<CR>
-an 50.10.380 &Syntax.AB.Assembly.GNU\ H-8300 :cal SetSyn("asmh8300")<CR>
-an 50.10.390 &Syntax.AB.Assembly.Intel\ IA-64 :cal SetSyn("ia64")<CR>
-an 50.10.400 &Syntax.AB.Assembly.Microsoft :cal SetSyn("masm")<CR>
-an 50.10.410 &Syntax.AB.Assembly.Netwide :cal SetSyn("nasm")<CR>
-an 50.10.420 &Syntax.AB.Assembly.PIC :cal SetSyn("pic")<CR>
-an 50.10.430 &Syntax.AB.Assembly.Turbo :cal SetSyn("tasm")<CR>
-an 50.10.440 &Syntax.AB.Assembly.VAX\ Macro\ Assembly :cal SetSyn("vmasm")<CR>
-an 50.10.450 &Syntax.AB.Assembly.Z-80 :cal SetSyn("z8a")<CR>
-an 50.10.460 &Syntax.AB.Assembly.xa\ 6502\ cross\ assember :cal SetSyn("a65")<CR>
-an 50.10.470 &Syntax.AB.ASN\.1 :cal SetSyn("asn")<CR>
-an 50.10.480 &Syntax.AB.Asterisk\ config :cal SetSyn("asterisk")<CR>
-an 50.10.490 &Syntax.AB.Asterisk\ voicemail\ config :cal SetSyn("asteriskvm")<CR>
-an 50.10.500 &Syntax.AB.Atlas :cal SetSyn("atlas")<CR>
-an 50.10.510 &Syntax.AB.AutoHotKey :cal SetSyn("autohotkey")<CR>
-an 50.10.520 &Syntax.AB.AutoIt :cal SetSyn("autoit")<CR>
-an 50.10.530 &Syntax.AB.Automake :cal SetSyn("automake")<CR>
-an 50.10.540 &Syntax.AB.Avenue :cal SetSyn("ave")<CR>
-an 50.10.550 &Syntax.AB.Awk :cal SetSyn("awk")<CR>
-an 50.10.560 &Syntax.AB.AYacc :cal SetSyn("ayacc")<CR>
-an 50.10.580 &Syntax.AB.B :cal SetSyn("b")<CR>
-an 50.10.590 &Syntax.AB.Baan :cal SetSyn("baan")<CR>
-an 50.10.600 &Syntax.AB.Basic.FreeBasic :cal SetSyn("freebasic")<CR>
-an 50.10.610 &Syntax.AB.Basic.IBasic :cal SetSyn("ibasic")<CR>
-an 50.10.620 &Syntax.AB.Basic.QBasic :cal SetSyn("basic")<CR>
-an 50.10.630 &Syntax.AB.Basic.Visual\ Basic :cal SetSyn("vb")<CR>
-an 50.10.640 &Syntax.AB.Bazaar\ commit\ file :cal SetSyn("bzr")<CR>
-an 50.10.650 &Syntax.AB.BC\ calculator :cal SetSyn("bc")<CR>
-an 50.10.660 &Syntax.AB.BDF\ font :cal SetSyn("bdf")<CR>
-an 50.10.670 &Syntax.AB.BibTeX.Bibliography\ database :cal SetSyn("bib")<CR>
-an 50.10.680 &Syntax.AB.BibTeX.Bibliography\ Style :cal SetSyn("bst")<CR>
-an 50.10.690 &Syntax.AB.BIND.BIND\ config :cal SetSyn("named")<CR>
-an 50.10.700 &Syntax.AB.BIND.BIND\ zone :cal SetSyn("bindzone")<CR>
-an 50.10.710 &Syntax.AB.Blank :cal SetSyn("blank")<CR>
+an 50.10.310 &Syntax.AB.Arduino :cal SetSyn("arduino")<CR>
+an 50.10.320 &Syntax.AB.ART :cal SetSyn("art")<CR>
+an 50.10.330 &Syntax.AB.Ascii\ Doc :cal SetSyn("asciidoc")<CR>
+an 50.10.340 &Syntax.AB.ASP\ with\ VBScript :cal SetSyn("aspvbs")<CR>
+an 50.10.350 &Syntax.AB.ASP\ with\ Perl :cal SetSyn("aspperl")<CR>
+an 50.10.360 &Syntax.AB.Assembly.680x0 :cal SetSyn("asm68k")<CR>
+an 50.10.370 &Syntax.AB.Assembly.AVR :cal SetSyn("avra")<CR>
+an 50.10.380 &Syntax.AB.Assembly.Flat :cal SetSyn("fasm")<CR>
+an 50.10.390 &Syntax.AB.Assembly.GNU :cal SetSyn("asm")<CR>
+an 50.10.400 &Syntax.AB.Assembly.GNU\ H-8300 :cal SetSyn("asmh8300")<CR>
+an 50.10.410 &Syntax.AB.Assembly.Intel\ IA-64 :cal SetSyn("ia64")<CR>
+an 50.10.420 &Syntax.AB.Assembly.Microsoft :cal SetSyn("masm")<CR>
+an 50.10.430 &Syntax.AB.Assembly.Netwide :cal SetSyn("nasm")<CR>
+an 50.10.440 &Syntax.AB.Assembly.PIC :cal SetSyn("pic")<CR>
+an 50.10.450 &Syntax.AB.Assembly.Turbo :cal SetSyn("tasm")<CR>
+an 50.10.460 &Syntax.AB.Assembly.VAX\ Macro\ Assembly :cal SetSyn("vmasm")<CR>
+an 50.10.470 &Syntax.AB.Assembly.Z-80 :cal SetSyn("z8a")<CR>
+an 50.10.480 &Syntax.AB.Assembly.xa\ 6502\ cross\ assember :cal SetSyn("a65")<CR>
+an 50.10.490 &Syntax.AB.ASN\.1 :cal SetSyn("asn")<CR>
+an 50.10.500 &Syntax.AB.Asterisk\ config :cal SetSyn("asterisk")<CR>
+an 50.10.510 &Syntax.AB.Asterisk\ voicemail\ config :cal SetSyn("asteriskvm")<CR>
+an 50.10.520 &Syntax.AB.Atlas :cal SetSyn("atlas")<CR>
+an 50.10.530 &Syntax.AB.Autodoc :cal SetSyn("autodoc")<CR>
+an 50.10.540 &Syntax.AB.AutoHotKey :cal SetSyn("autohotkey")<CR>
+an 50.10.550 &Syntax.AB.AutoIt :cal SetSyn("autoit")<CR>
+an 50.10.560 &Syntax.AB.Automake :cal SetSyn("automake")<CR>
+an 50.10.570 &Syntax.AB.Avenue :cal SetSyn("ave")<CR>
+an 50.10.580 &Syntax.AB.Awk :cal SetSyn("awk")<CR>
+an 50.10.590 &Syntax.AB.AYacc :cal SetSyn("ayacc")<CR>
+an 50.10.610 &Syntax.AB.B :cal SetSyn("b")<CR>
+an 50.10.620 &Syntax.AB.Baan :cal SetSyn("baan")<CR>
+an 50.10.630 &Syntax.AB.Basic.FreeBasic :cal SetSyn("freebasic")<CR>
+an 50.10.640 &Syntax.AB.Basic.IBasic :cal SetSyn("ibasic")<CR>
+an 50.10.650 &Syntax.AB.Basic.QBasic :cal SetSyn("basic")<CR>
+an 50.10.660 &Syntax.AB.Basic.Visual\ Basic :cal SetSyn("vb")<CR>
+an 50.10.670 &Syntax.AB.Bazaar\ commit\ file :cal SetSyn("bzr")<CR>
+an 50.10.680 &Syntax.AB.Bazel :cal SetSyn("bzl")<CR>
+an 50.10.690 &Syntax.AB.BC\ calculator :cal SetSyn("bc")<CR>
+an 50.10.700 &Syntax.AB.BDF\ font :cal SetSyn("bdf")<CR>
+an 50.10.710 &Syntax.AB.BibTeX.Bibliography\ database :cal SetSyn("bib")<CR>
+an 50.10.720 &Syntax.AB.BibTeX.Bibliography\ Style :cal SetSyn("bst")<CR>
+an 50.10.730 &Syntax.AB.BIND.BIND\ config :cal SetSyn("named")<CR>
+an 50.10.740 &Syntax.AB.BIND.BIND\ zone :cal SetSyn("bindzone")<CR>
+an 50.10.750 &Syntax.AB.Blank :cal SetSyn("blank")<CR>
 an 50.20.100 &Syntax.C.C :cal SetSyn("c")<CR>
 an 50.20.110 &Syntax.C.C++ :cal SetSyn("cpp")<CR>
 an 50.20.120 &Syntax.C.C# :cal SetSyn("cs")<CR>
@@ -117,75 +121,81 @@ an 50.20.270 &Syntax.C.Clever :cal SetSyn("cl")<CR>
 an 50.20.280 &Syntax.C.Clipper :cal SetSyn("clipper")<CR>
 an 50.20.290 &Syntax.C.Clojure :cal SetSyn("clojure")<CR>
 an 50.20.300 &Syntax.C.Cmake :cal SetSyn("cmake")<CR>
-an 50.20.310 &Syntax.C.Cmusrc :cal SetSyn("cmusrc")<CR>
-an 50.20.320 &Syntax.C.Cobol :cal SetSyn("cobol")<CR>
-an 50.20.330 &Syntax.C.Coco/R :cal SetSyn("coco")<CR>
-an 50.20.340 &Syntax.C.Cold\ Fusion :cal SetSyn("cf")<CR>
-an 50.20.350 &Syntax.C.Conary\ Recipe :cal SetSyn("conaryrecipe")<CR>
-an 50.20.360 &Syntax.C.Config.Cfg\ Config\ file :cal SetSyn("cfg")<CR>
-an 50.20.370 &Syntax.C.Config.Configure\.in :cal SetSyn("config")<CR>
-an 50.20.380 &Syntax.C.Config.Generic\ Config\ file :cal SetSyn("conf")<CR>
-an 50.20.390 &Syntax.C.CRM114 :cal SetSyn("crm")<CR>
-an 50.20.400 &Syntax.C.Crontab :cal SetSyn("crontab")<CR>
-an 50.20.410 &Syntax.C.CSDL :cal SetSyn("csdl")<CR>
-an 50.20.420 &Syntax.C.CSP :cal SetSyn("csp")<CR>
-an 50.20.430 &Syntax.C.Ctrl-H :cal SetSyn("ctrlh")<CR>
-an 50.20.440 &Syntax.C.Cucumber :cal SetSyn("cucumber")<CR>
-an 50.20.450 &Syntax.C.CUDA :cal SetSyn("cuda")<CR>
-an 50.20.460 &Syntax.C.CUPL.CUPL :cal SetSyn("cupl")<CR>
-an 50.20.470 &Syntax.C.CUPL.Simulation :cal SetSyn("cuplsim")<CR>
-an 50.20.480 &Syntax.C.CVS.commit\ file :cal SetSyn("cvs")<CR>
-an 50.20.490 &Syntax.C.CVS.cvsrc :cal SetSyn("cvsrc")<CR>
-an 50.20.500 &Syntax.C.Cyn++ :cal SetSyn("cynpp")<CR>
-an 50.20.510 &Syntax.C.Cynlib :cal SetSyn("cynlib")<CR>
+an 50.20.310 &Syntax.C.Cmod :cal SetSyn("cmod")<CR>
+an 50.20.320 &Syntax.C.Cmusrc :cal SetSyn("cmusrc")<CR>
+an 50.20.330 &Syntax.C.Cobol :cal SetSyn("cobol")<CR>
+an 50.20.340 &Syntax.C.Coco/R :cal SetSyn("coco")<CR>
+an 50.20.350 &Syntax.C.Cold\ Fusion :cal SetSyn("cf")<CR>
+an 50.20.360 &Syntax.C.Conary\ Recipe :cal SetSyn("conaryrecipe")<CR>
+an 50.20.370 &Syntax.C.Config.Cfg\ Config\ file :cal SetSyn("cfg")<CR>
+an 50.20.380 &Syntax.C.Config.Configure\.in :cal SetSyn("config")<CR>
+an 50.20.390 &Syntax.C.Config.Generic\ Config\ file :cal SetSyn("conf")<CR>
+an 50.20.400 &Syntax.C.CRM114 :cal SetSyn("crm")<CR>
+an 50.20.410 &Syntax.C.Crontab :cal SetSyn("crontab")<CR>
+an 50.20.420 &Syntax.C.CSDL :cal SetSyn("csdl")<CR>
+an 50.20.430 &Syntax.C.CSP :cal SetSyn("csp")<CR>
+an 50.20.440 &Syntax.C.Ctrl-H :cal SetSyn("ctrlh")<CR>
+an 50.20.450 &Syntax.C.Cucumber :cal SetSyn("cucumber")<CR>
+an 50.20.460 &Syntax.C.CUDA :cal SetSyn("cuda")<CR>
+an 50.20.470 &Syntax.C.CUPL.CUPL :cal SetSyn("cupl")<CR>
+an 50.20.480 &Syntax.C.CUPL.Simulation :cal SetSyn("cuplsim")<CR>
+an 50.20.490 &Syntax.C.CVS.commit\ file :cal SetSyn("cvs")<CR>
+an 50.20.500 &Syntax.C.CVS.cvsrc :cal SetSyn("cvsrc")<CR>
+an 50.20.510 &Syntax.C.Cyn++ :cal SetSyn("cynpp")<CR>
+an 50.20.520 &Syntax.C.Cynlib :cal SetSyn("cynlib")<CR>
 an 50.30.100 &Syntax.DE.D :cal SetSyn("d")<CR>
 an 50.30.110 &Syntax.DE.Datascript :cal SetSyn("datascript")<CR>
 an 50.30.120 &Syntax.DE.Debian.Debian\ ChangeLog :cal SetSyn("debchangelog")<CR>
 an 50.30.130 &Syntax.DE.Debian.Debian\ Control :cal SetSyn("debcontrol")<CR>
-an 50.30.140 &Syntax.DE.Debian.Debian\ Sources\.list :cal SetSyn("debsources")<CR>
-an 50.30.150 &Syntax.DE.Denyhosts :cal SetSyn("denyhosts")<CR>
-an 50.30.160 &Syntax.DE.Desktop :cal SetSyn("desktop")<CR>
-an 50.30.170 &Syntax.DE.Dict\ config :cal SetSyn("dictconf")<CR>
-an 50.30.180 &Syntax.DE.Dictd\ config :cal SetSyn("dictdconf")<CR>
-an 50.30.190 &Syntax.DE.Diff :cal SetSyn("diff")<CR>
-an 50.30.200 &Syntax.DE.Digital\ Command\ Lang :cal SetSyn("dcl")<CR>
-an 50.30.210 &Syntax.DE.Dircolors :cal SetSyn("dircolors")<CR>
-an 50.30.220 &Syntax.DE.Django\ template :cal SetSyn("django")<CR>
-an 50.30.230 &Syntax.DE.DNS/BIND\ zone :cal SetSyn("bindzone")<CR>
-an 50.30.240 &Syntax.DE.Dnsmasq\ config :cal SetSyn("dnsmasq")<CR>
-an 50.30.250 &Syntax.DE.DocBook.auto-detect :cal SetSyn("docbk")<CR>
-an 50.30.260 &Syntax.DE.DocBook.SGML :cal SetSyn("docbksgml")<CR>
-an 50.30.270 &Syntax.DE.DocBook.XML :cal SetSyn("docbkxml")<CR>
-an 50.30.280 &Syntax.DE.Dot :cal SetSyn("dot")<CR>
-an 50.30.290 &Syntax.DE.Doxygen.C\ with\ doxygen :cal SetSyn("c.doxygen")<CR>
-an 50.30.300 &Syntax.DE.Doxygen.C++\ with\ doxygen :cal SetSyn("cpp.doxygen")<CR>
-an 50.30.310 &Syntax.DE.Doxygen.IDL\ with\ doxygen :cal SetSyn("idl.doxygen")<CR>
-an 50.30.320 &Syntax.DE.Doxygen.Java\ with\ doxygen :cal SetSyn("java.doxygen")<CR>
-an 50.30.330 &Syntax.DE.Doxygen.DataScript\ with\ doxygen :cal SetSyn("datascript.doxygen")<CR>
-an 50.30.340 &Syntax.DE.Dracula :cal SetSyn("dracula")<CR>
-an 50.30.350 &Syntax.DE.DSSSL :cal SetSyn("dsl")<CR>
-an 50.30.360 &Syntax.DE.DTD :cal SetSyn("dtd")<CR>
-an 50.30.370 &Syntax.DE.DTML\ (Zope) :cal SetSyn("dtml")<CR>
-an 50.30.380 &Syntax.DE.DTrace :cal SetSyn("dtrace")<CR>
-an 50.30.390 &Syntax.DE.Dts/dtsi :cal SetSyn("dts")<CR>
-an 50.30.400 &Syntax.DE.Dylan.Dylan :cal SetSyn("dylan")<CR>
-an 50.30.410 &Syntax.DE.Dylan.Dylan\ interface :cal SetSyn("dylanintr")<CR>
-an 50.30.420 &Syntax.DE.Dylan.Dylan\ lid :cal SetSyn("dylanlid")<CR>
-an 50.30.440 &Syntax.DE.EDIF :cal SetSyn("edif")<CR>
-an 50.30.450 &Syntax.DE.Eiffel :cal SetSyn("eiffel")<CR>
-an 50.30.460 &Syntax.DE.Elinks\ config :cal SetSyn("elinks")<CR>
-an 50.30.470 &Syntax.DE.Elm\ filter\ rules :cal SetSyn("elmfilt")<CR>
-an 50.30.480 &Syntax.DE.Embedix\ Component\ Description :cal SetSyn("ecd")<CR>
-an 50.30.490 &Syntax.DE.ERicsson\ LANGuage :cal SetSyn("erlang")<CR>
-an 50.30.500 &Syntax.DE.ESMTP\ rc :cal SetSyn("esmtprc")<CR>
-an 50.30.510 &Syntax.DE.ESQL-C :cal SetSyn("esqlc")<CR>
-an 50.30.520 &Syntax.DE.Essbase\ script :cal SetSyn("csc")<CR>
-an 50.30.530 &Syntax.DE.Esterel :cal SetSyn("esterel")<CR>
-an 50.30.540 &Syntax.DE.Eterm\ config :cal SetSyn("eterm")<CR>
-an 50.30.550 &Syntax.DE.Eviews :cal SetSyn("eviews")<CR>
-an 50.30.560 &Syntax.DE.Exim\ conf :cal SetSyn("exim")<CR>
-an 50.30.570 &Syntax.DE.Expect :cal SetSyn("expect")<CR>
-an 50.30.580 &Syntax.DE.Exports :cal SetSyn("exports")<CR>
+an 50.30.140 &Syntax.DE.Debian.Debian\ Copyright :cal SetSyn("debcopyright")<CR>
+an 50.30.150 &Syntax.DE.Debian.Debian\ Sources\.list :cal SetSyn("debsources")<CR>
+an 50.30.160 &Syntax.DE.Denyhosts :cal SetSyn("denyhosts")<CR>
+an 50.30.170 &Syntax.DE.Desktop :cal SetSyn("desktop")<CR>
+an 50.30.180 &Syntax.DE.Dict\ config :cal SetSyn("dictconf")<CR>
+an 50.30.190 &Syntax.DE.Dictd\ config :cal SetSyn("dictdconf")<CR>
+an 50.30.200 &Syntax.DE.Diff :cal SetSyn("diff")<CR>
+an 50.30.210 &Syntax.DE.Digital\ Command\ Lang :cal SetSyn("dcl")<CR>
+an 50.30.220 &Syntax.DE.Dircolors :cal SetSyn("dircolors")<CR>
+an 50.30.230 &Syntax.DE.Dirpager :cal SetSyn("dirpager")<CR>
+an 50.30.240 &Syntax.DE.Django\ template :cal SetSyn("django")<CR>
+an 50.30.250 &Syntax.DE.DNS/BIND\ zone :cal SetSyn("bindzone")<CR>
+an 50.30.260 &Syntax.DE.Dnsmasq\ config :cal SetSyn("dnsmasq")<CR>
+an 50.30.270 &Syntax.DE.DocBook.auto-detect :cal SetSyn("docbk")<CR>
+an 50.30.280 &Syntax.DE.DocBook.SGML :cal SetSyn("docbksgml")<CR>
+an 50.30.290 &Syntax.DE.DocBook.XML :cal SetSyn("docbkxml")<CR>
+an 50.30.300 &Syntax.DE.Dockerfile :cal SetSyn("dockerfile")<CR>
+an 50.30.310 &Syntax.DE.Dot :cal SetSyn("dot")<CR>
+an 50.30.320 &Syntax.DE.Doxygen.C\ with\ doxygen :cal SetSyn("c.doxygen")<CR>
+an 50.30.330 &Syntax.DE.Doxygen.C++\ with\ doxygen :cal SetSyn("cpp.doxygen")<CR>
+an 50.30.340 &Syntax.DE.Doxygen.IDL\ with\ doxygen :cal SetSyn("idl.doxygen")<CR>
+an 50.30.350 &Syntax.DE.Doxygen.Java\ with\ doxygen :cal SetSyn("java.doxygen")<CR>
+an 50.30.360 &Syntax.DE.Doxygen.DataScript\ with\ doxygen :cal SetSyn("datascript.doxygen")<CR>
+an 50.30.370 &Syntax.DE.Dracula :cal SetSyn("dracula")<CR>
+an 50.30.380 &Syntax.DE.DSSSL :cal SetSyn("dsl")<CR>
+an 50.30.390 &Syntax.DE.DTD :cal SetSyn("dtd")<CR>
+an 50.30.400 &Syntax.DE.DTML\ (Zope) :cal SetSyn("dtml")<CR>
+an 50.30.410 &Syntax.DE.DTrace :cal SetSyn("dtrace")<CR>
+an 50.30.420 &Syntax.DE.Dts/dtsi :cal SetSyn("dts")<CR>
+an 50.30.430 &Syntax.DE.Dylan.Dylan :cal SetSyn("dylan")<CR>
+an 50.30.440 &Syntax.DE.Dylan.Dylan\ interface :cal SetSyn("dylanintr")<CR>
+an 50.30.450 &Syntax.DE.Dylan.Dylan\ lid :cal SetSyn("dylanlid")<CR>
+an 50.30.470 &Syntax.DE.EDIF :cal SetSyn("edif")<CR>
+an 50.30.480 &Syntax.DE.Eiffel :cal SetSyn("eiffel")<CR>
+an 50.30.490 &Syntax.DE.Elinks\ config :cal SetSyn("elinks")<CR>
+an 50.30.500 &Syntax.DE.Elm\ filter\ rules :cal SetSyn("elmfilt")<CR>
+an 50.30.510 &Syntax.DE.Embedix\ Component\ Description :cal SetSyn("ecd")<CR>
+an 50.30.520 &Syntax.DE.ERicsson\ LANGuage :cal SetSyn("erlang")<CR>
+an 50.30.530 &Syntax.DE.ESMTP\ rc :cal SetSyn("esmtprc")<CR>
+an 50.30.540 &Syntax.DE.ESQL-C :cal SetSyn("esqlc")<CR>
+an 50.30.550 &Syntax.DE.Essbase\ script :cal SetSyn("csc")<CR>
+an 50.30.560 &Syntax.DE.Esterel :cal SetSyn("esterel")<CR>
+an 50.30.570 &Syntax.DE.Eterm\ config :cal SetSyn("eterm")<CR>
+an 50.30.580 &Syntax.DE.Euphoria\ 3 :cal SetSyn("euphoria3")<CR>
+an 50.30.590 &Syntax.DE.Euphoria\ 4 :cal SetSyn("euphoria4")<CR>
+an 50.30.600 &Syntax.DE.Eviews :cal SetSyn("eviews")<CR>
+an 50.30.610 &Syntax.DE.Exim\ conf :cal SetSyn("exim")<CR>
+an 50.30.620 &Syntax.DE.Expect :cal SetSyn("expect")<CR>
+an 50.30.630 &Syntax.DE.Exports :cal SetSyn("exports")<CR>
 an 50.40.100 &Syntax.FG.Falcon :cal SetSyn("falcon")<CR>
 an 50.40.110 &Syntax.FG.Fantom :cal SetSyn("fan")<CR>
 an 50.40.120 &Syntax.FG.Fetchmail :cal SetSyn("fetchmail")<CR>
@@ -212,18 +222,20 @@ an 50.40.330 &Syntax.FG.Git.Send\ Email :cal SetSyn("gitsendemail")<CR>
 an 50.40.340 &Syntax.FG.Gitolite :cal SetSyn("gitolite")<CR>
 an 50.40.350 &Syntax.FG.Gkrellmrc :cal SetSyn("gkrellmrc")<CR>
 an 50.40.360 &Syntax.FG.Gnash :cal SetSyn("gnash")<CR>
-an 50.40.370 &Syntax.FG.GP :cal SetSyn("gp")<CR>
-an 50.40.380 &Syntax.FG.GPG :cal SetSyn("gpg")<CR>
-an 50.40.390 &Syntax.FG.Grof :cal SetSyn("gprof")<CR>
-an 50.40.400 &Syntax.FG.Group\ file :cal SetSyn("group")<CR>
-an 50.40.410 &Syntax.FG.Grub :cal SetSyn("grub")<CR>
-an 50.40.420 &Syntax.FG.GNU\ Server\ Pages :cal SetSyn("gsp")<CR>
-an 50.40.430 &Syntax.FG.GNUplot :cal SetSyn("gnuplot")<CR>
-an 50.40.440 &Syntax.FG.GrADS\ scripts :cal SetSyn("grads")<CR>
-an 50.40.450 &Syntax.FG.Gretl :cal SetSyn("gretl")<CR>
-an 50.40.460 &Syntax.FG.Groff :cal SetSyn("groff")<CR>
-an 50.40.470 &Syntax.FG.Groovy :cal SetSyn("groovy")<CR>
-an 50.40.480 &Syntax.FG.GTKrc :cal SetSyn("gtkrc")<CR>
+an 50.40.370 &Syntax.FG.Go :cal SetSyn("go")<CR>
+an 50.40.380 &Syntax.FG.Godoc :cal SetSyn("godoc")<CR>
+an 50.40.390 &Syntax.FG.GP :cal SetSyn("gp")<CR>
+an 50.40.400 &Syntax.FG.GPG :cal SetSyn("gpg")<CR>
+an 50.40.410 &Syntax.FG.Grof :cal SetSyn("gprof")<CR>
+an 50.40.420 &Syntax.FG.Group\ file :cal SetSyn("group")<CR>
+an 50.40.430 &Syntax.FG.Grub :cal SetSyn("grub")<CR>
+an 50.40.440 &Syntax.FG.GNU\ Server\ Pages :cal SetSyn("gsp")<CR>
+an 50.40.450 &Syntax.FG.GNUplot :cal SetSyn("gnuplot")<CR>
+an 50.40.460 &Syntax.FG.GrADS\ scripts :cal SetSyn("grads")<CR>
+an 50.40.470 &Syntax.FG.Gretl :cal SetSyn("gretl")<CR>
+an 50.40.480 &Syntax.FG.Groff :cal SetSyn("groff")<CR>
+an 50.40.490 &Syntax.FG.Groovy :cal SetSyn("groovy")<CR>
+an 50.40.500 &Syntax.FG.GTKrc :cal SetSyn("gtkrc")<CR>
 an 50.50.100 &Syntax.HIJK.Haml :cal SetSyn("haml")<CR>
 an 50.50.110 &Syntax.HIJK.Hamster :cal SetSyn("hamster")<CR>
 an 50.50.120 &Syntax.HIJK.Haskell.Haskell :cal SetSyn("haskell")<CR>
@@ -257,55 +269,60 @@ an 50.50.400 &Syntax.HIJK.Inittab :cal SetSyn("inittab")<CR>
 an 50.50.410 &Syntax.HIJK.Inno\ setup :cal SetSyn("iss")<CR>
 an 50.50.420 &Syntax.HIJK.Innovation\ Data\ Processing.Upstream\ dat :cal SetSyn("upstreamdat")<CR>
 an 50.50.430 &Syntax.HIJK.Innovation\ Data\ Processing.Upstream\ log :cal SetSyn("upstreamlog")<CR>
-an 50.50.440 &Syntax.HIJK.Innovation\ Data\ Processing.Upstream\ Install\ log :cal SetSyn("upstreaminstalllog")<CR>
-an 50.50.450 &Syntax.HIJK.Innovation\ Data\ Processing.Usserver\ log :cal SetSyn("usserverlog")<CR>
-an 50.50.460 &Syntax.HIJK.Innovation\ Data\ Processing.USW2KAgt\ log :cal SetSyn("usw2kagtlog")<CR>
-an 50.50.470 &Syntax.HIJK.InstallShield\ script :cal SetSyn("ishd")<CR>
-an 50.50.480 &Syntax.HIJK.Interactive\ Data\ Lang :cal SetSyn("idlang")<CR>
-an 50.50.490 &Syntax.HIJK.IPfilter :cal SetSyn("ipfilter")<CR>
-an 50.50.510 &Syntax.HIJK.JAL :cal SetSyn("jal")<CR>
-an 50.50.520 &Syntax.HIJK.JAM :cal SetSyn("jam")<CR>
-an 50.50.530 &Syntax.HIJK.Jargon :cal SetSyn("jargon")<CR>
-an 50.50.540 &Syntax.HIJK.Java.Java :cal SetSyn("java")<CR>
-an 50.50.550 &Syntax.HIJK.Java.JavaCC :cal SetSyn("javacc")<CR>
-an 50.50.560 &Syntax.HIJK.Java.Java\ Server\ Pages :cal SetSyn("jsp")<CR>
-an 50.50.570 &Syntax.HIJK.Java.Java\ Properties :cal SetSyn("jproperties")<CR>
-an 50.50.580 &Syntax.HIJK.JavaScript :cal SetSyn("javascript")<CR>
-an 50.50.590 &Syntax.HIJK.Jess :cal SetSyn("jess")<CR>
-an 50.50.600 &Syntax.HIJK.Jgraph :cal SetSyn("jgraph")<CR>
-an 50.50.610 &Syntax.HIJK.Jovial :cal SetSyn("jovial")<CR>
-an 50.50.630 &Syntax.HIJK.Kconfig :cal SetSyn("kconfig")<CR>
-an 50.50.640 &Syntax.HIJK.KDE\ script :cal SetSyn("kscript")<CR>
-an 50.50.650 &Syntax.HIJK.Kimwitu++ :cal SetSyn("kwt")<CR>
-an 50.50.660 &Syntax.HIJK.KixTart :cal SetSyn("kix")<CR>
+an 50.50.440 &Syntax.HIJK.Innovation\ Data\ Processing.Upstream\ rpt :cal SetSyn("upstreamrpt")<CR>
+an 50.50.450 &Syntax.HIJK.Innovation\ Data\ Processing.Upstream\ Install\ log :cal SetSyn("upstreaminstalllog")<CR>
+an 50.50.460 &Syntax.HIJK.Innovation\ Data\ Processing.Usserver\ log :cal SetSyn("usserverlog")<CR>
+an 50.50.470 &Syntax.HIJK.Innovation\ Data\ Processing.USW2KAgt\ log :cal SetSyn("usw2kagtlog")<CR>
+an 50.50.480 &Syntax.HIJK.InstallShield\ script :cal SetSyn("ishd")<CR>
+an 50.50.490 &Syntax.HIJK.Interactive\ Data\ Lang :cal SetSyn("idlang")<CR>
+an 50.50.500 &Syntax.HIJK.IPfilter :cal SetSyn("ipfilter")<CR>
+an 50.50.520 &Syntax.HIJK.J :cal SetSyn("j")<CR>
+an 50.50.530 &Syntax.HIJK.JAL :cal SetSyn("jal")<CR>
+an 50.50.540 &Syntax.HIJK.JAM :cal SetSyn("jam")<CR>
+an 50.50.550 &Syntax.HIJK.Jargon :cal SetSyn("jargon")<CR>
+an 50.50.560 &Syntax.HIJK.Java.Java :cal SetSyn("java")<CR>
+an 50.50.570 &Syntax.HIJK.Java.JavaCC :cal SetSyn("javacc")<CR>
+an 50.50.580 &Syntax.HIJK.Java.Java\ Server\ Pages :cal SetSyn("jsp")<CR>
+an 50.50.590 &Syntax.HIJK.Java.Java\ Properties :cal SetSyn("jproperties")<CR>
+an 50.50.600 &Syntax.HIJK.JavaScript :cal SetSyn("javascript")<CR>
+an 50.50.610 &Syntax.HIJK.Jess :cal SetSyn("jess")<CR>
+an 50.50.620 &Syntax.HIJK.Jgraph :cal SetSyn("jgraph")<CR>
+an 50.50.630 &Syntax.HIJK.Jovial :cal SetSyn("jovial")<CR>
+an 50.50.640 &Syntax.HIJK.JSON :cal SetSyn("json")<CR>
+an 50.50.660 &Syntax.HIJK.Kconfig :cal SetSyn("kconfig")<CR>
+an 50.50.670 &Syntax.HIJK.KDE\ script :cal SetSyn("kscript")<CR>
+an 50.50.680 &Syntax.HIJK.Kimwitu++ :cal SetSyn("kwt")<CR>
+an 50.50.690 &Syntax.HIJK.Kivy :cal SetSyn("kivy")<CR>
+an 50.50.700 &Syntax.HIJK.KixTart :cal SetSyn("kix")<CR>
 an 50.60.100 &Syntax.L.Lace :cal SetSyn("lace")<CR>
 an 50.60.110 &Syntax.L.LamdaProlog :cal SetSyn("lprolog")<CR>
 an 50.60.120 &Syntax.L.Latte :cal SetSyn("latte")<CR>
 an 50.60.130 &Syntax.L.Ld\ script :cal SetSyn("ld")<CR>
 an 50.60.140 &Syntax.L.LDAP.LDIF :cal SetSyn("ldif")<CR>
 an 50.60.150 &Syntax.L.LDAP.Configuration :cal SetSyn("ldapconf")<CR>
-an 50.60.160 &Syntax.L.Lex :cal SetSyn("lex")<CR>
-an 50.60.170 &Syntax.L.LFTP\ config :cal SetSyn("lftp")<CR>
-an 50.60.180 &Syntax.L.Libao :cal SetSyn("libao")<CR>
-an 50.60.190 &Syntax.L.LifeLines\ script :cal SetSyn("lifelines")<CR>
-an 50.60.200 &Syntax.L.Lilo :cal SetSyn("lilo")<CR>
-an 50.60.210 &Syntax.L.Limits\ config :cal SetSyn("limits")<CR>
-an 50.60.220 &Syntax.L.Linden\ scripting :cal SetSyn("lsl")<CR>
-an 50.60.230 &Syntax.L.Liquid :cal SetSyn("liquid")<CR>
-an 50.60.240 &Syntax.L.Lisp :cal SetSyn("lisp")<CR>
-an 50.60.250 &Syntax.L.Lite :cal SetSyn("lite")<CR>
-an 50.60.260 &Syntax.L.LiteStep\ RC :cal SetSyn("litestep")<CR>
-an 50.60.270 &Syntax.L.Locale\ Input :cal SetSyn("fdcc")<CR>
-an 50.60.280 &Syntax.L.Login\.access :cal SetSyn("loginaccess")<CR>
-an 50.60.290 &Syntax.L.Login\.defs :cal SetSyn("logindefs")<CR>
-an 50.60.300 &Syntax.L.Logtalk :cal SetSyn("logtalk")<CR>
-an 50.60.310 &Syntax.L.LOTOS :cal SetSyn("lotos")<CR>
-an 50.60.320 &Syntax.L.LotusScript :cal SetSyn("lscript")<CR>
-an 50.60.330 &Syntax.L.Lout :cal SetSyn("lout")<CR>
-an 50.60.340 &Syntax.L.LPC :cal SetSyn("lpc")<CR>
-an 50.60.350 &Syntax.L.Lua :cal SetSyn("lua")<CR>
-an 50.60.360 &Syntax.L.Lynx\ Style :cal SetSyn("lss")<CR>
-an 50.60.370 &Syntax.L.Lynx\ config :cal SetSyn("lynx")<CR>
+an 50.60.160 &Syntax.L.Less :cal SetSyn("less")<CR>
+an 50.60.170 &Syntax.L.Lex :cal SetSyn("lex")<CR>
+an 50.60.180 &Syntax.L.LFTP\ config :cal SetSyn("lftp")<CR>
+an 50.60.190 &Syntax.L.Libao :cal SetSyn("libao")<CR>
+an 50.60.200 &Syntax.L.LifeLines\ script :cal SetSyn("lifelines")<CR>
+an 50.60.210 &Syntax.L.Lilo :cal SetSyn("lilo")<CR>
+an 50.60.220 &Syntax.L.Limits\ config :cal SetSyn("limits")<CR>
+an 50.60.230 &Syntax.L.Linden\ scripting :cal SetSyn("lsl")<CR>
+an 50.60.240 &Syntax.L.Liquid :cal SetSyn("liquid")<CR>
+an 50.60.250 &Syntax.L.Lisp :cal SetSyn("lisp")<CR>
+an 50.60.260 &Syntax.L.Lite :cal SetSyn("lite")<CR>
+an 50.60.270 &Syntax.L.LiteStep\ RC :cal SetSyn("litestep")<CR>
+an 50.60.280 &Syntax.L.Locale\ Input :cal SetSyn("fdcc")<CR>
+an 50.60.290 &Syntax.L.Login\.access :cal SetSyn("loginaccess")<CR>
+an 50.60.300 &Syntax.L.Login\.defs :cal SetSyn("logindefs")<CR>
+an 50.60.310 &Syntax.L.Logtalk :cal SetSyn("logtalk")<CR>
+an 50.60.320 &Syntax.L.LOTOS :cal SetSyn("lotos")<CR>
+an 50.60.330 &Syntax.L.LotusScript :cal SetSyn("lscript")<CR>
+an 50.60.340 &Syntax.L.Lout :cal SetSyn("lout")<CR>
+an 50.60.350 &Syntax.L.LPC :cal SetSyn("lpc")<CR>
+an 50.60.360 &Syntax.L.Lua :cal SetSyn("lua")<CR>
+an 50.60.370 &Syntax.L.Lynx\ Style :cal SetSyn("lss")<CR>
+an 50.60.380 &Syntax.L.Lynx\ config :cal SetSyn("lynx")<CR>
 an 50.70.100 &Syntax.M.M4 :cal SetSyn("m4")<CR>
 an 50.70.110 &Syntax.M.MaGic\ Point :cal SetSyn("mgp")<CR>
 an 50.70.120 &Syntax.M.Mail :cal SetSyn("mail")<CR>
@@ -318,55 +335,60 @@ an 50.70.180 &Syntax.M.Man\ page :cal SetSyn("man")<CR>
 an 50.70.190 &Syntax.M.Man\.conf :cal SetSyn("manconf")<CR>
 an 50.70.200 &Syntax.M.Maple\ V :cal SetSyn("maple")<CR>
 an 50.70.210 &Syntax.M.Markdown :cal SetSyn("markdown")<CR>
-an 50.70.220 &Syntax.M.Mason :cal SetSyn("mason")<CR>
-an 50.70.230 &Syntax.M.Mathematica :cal SetSyn("mma")<CR>
-an 50.70.240 &Syntax.M.Matlab :cal SetSyn("matlab")<CR>
-an 50.70.250 &Syntax.M.Maxima :cal SetSyn("maxima")<CR>
-an 50.70.260 &Syntax.M.MEL\ (for\ Maya) :cal SetSyn("mel")<CR>
-an 50.70.270 &Syntax.M.Messages\ (/var/log) :cal SetSyn("messages")<CR>
-an 50.70.280 &Syntax.M.Metafont :cal SetSyn("mf")<CR>
-an 50.70.290 &Syntax.M.MetaPost :cal SetSyn("mp")<CR>
-an 50.70.300 &Syntax.M.MGL :cal SetSyn("mgl")<CR>
-an 50.70.310 &Syntax.M.MMIX :cal SetSyn("mmix")<CR>
-an 50.70.320 &Syntax.M.Modconf :cal SetSyn("modconf")<CR>
-an 50.70.330 &Syntax.M.Model :cal SetSyn("model")<CR>
-an 50.70.340 &Syntax.M.Modsim\ III :cal SetSyn("modsim3")<CR>
-an 50.70.350 &Syntax.M.Modula\ 2 :cal SetSyn("modula2")<CR>
-an 50.70.360 &Syntax.M.Modula\ 3 :cal SetSyn("modula3")<CR>
-an 50.70.370 &Syntax.M.Monk :cal SetSyn("monk")<CR>
-an 50.70.380 &Syntax.M.Mplayer\ config :cal SetSyn("mplayerconf")<CR>
-an 50.70.390 &Syntax.M.MOO :cal SetSyn("moo")<CR>
-an 50.70.400 &Syntax.M.Mrxvtrc :cal SetSyn("mrxvtrc")<CR>
-an 50.70.410 &Syntax.M.MS-DOS/Windows.4DOS\ \.bat\ file :cal SetSyn("btm")<CR>
-an 50.70.420 &Syntax.M.MS-DOS/Windows.\.bat\/\.cmd\ file :cal SetSyn("dosbatch")<CR>
-an 50.70.430 &Syntax.M.MS-DOS/Windows.\.ini\ file :cal SetSyn("dosini")<CR>
-an 50.70.440 &Syntax.M.MS-DOS/Windows.Message\ text :cal SetSyn("msmessages")<CR>
-an 50.70.450 &Syntax.M.MS-DOS/Windows.Module\ Definition :cal SetSyn("def")<CR>
-an 50.70.460 &Syntax.M.MS-DOS/Windows.Registry :cal SetSyn("registry")<CR>
-an 50.70.470 &Syntax.M.MS-DOS/Windows.Resource\ file :cal SetSyn("rc")<CR>
-an 50.70.480 &Syntax.M.Msql :cal SetSyn("msql")<CR>
-an 50.70.490 &Syntax.M.MuPAD :cal SetSyn("mupad")<CR>
-an 50.70.500 &Syntax.M.MUSHcode :cal SetSyn("mush")<CR>
-an 50.70.510 &Syntax.M.Muttrc :cal SetSyn("muttrc")<CR>
-an 50.80.100 &Syntax.NO.Nanorc :cal SetSyn("nanorc")<CR>
-an 50.80.110 &Syntax.NO.Nastran\ input/DMAP :cal SetSyn("nastran")<CR>
-an 50.80.120 &Syntax.NO.Natural :cal SetSyn("natural")<CR>
-an 50.80.130 &Syntax.NO.Neomuttrc :cal SetSyn("neomuttrc")<CR>
-an 50.80.140 &Syntax.NO.Netrc :cal SetSyn("netrc")<CR>
-an 50.80.150 &Syntax.NO.Ninja :cal SetSyn("ninja")<CR>
-an 50.80.160 &Syntax.NO.Novell\ NCF\ batch :cal SetSyn("ncf")<CR>
-an 50.80.170 &Syntax.NO.Not\ Quite\ C\ (LEGO) :cal SetSyn("nqc")<CR>
-an 50.80.180 &Syntax.NO.Nroff :cal SetSyn("nroff")<CR>
-an 50.80.190 &Syntax.NO.NSIS\ script :cal SetSyn("nsis")<CR>
-an 50.80.200 &Syntax.NO.Obj\ 3D\ wavefront :cal SetSyn("obj")<CR>
-an 50.80.210 &Syntax.NO.Objective\ C :cal SetSyn("objc")<CR>
-an 50.80.220 &Syntax.NO.Objective\ C++ :cal SetSyn("objcpp")<CR>
-an 50.80.230 &Syntax.NO.OCAML :cal SetSyn("ocaml")<CR>
-an 50.80.240 &Syntax.NO.Occam :cal SetSyn("occam")<CR>
-an 50.80.250 &Syntax.NO.Omnimark :cal SetSyn("omnimark")<CR>
-an 50.80.260 &Syntax.NO.OpenROAD :cal SetSyn("openroad")<CR>
-an 50.80.270 &Syntax.NO.Open\ Psion\ Lang :cal SetSyn("opl")<CR>
-an 50.80.280 &Syntax.NO.Oracle\ config :cal SetSyn("ora")<CR>
+an 50.70.220 &Syntax.M.Markdown\ with\ R\ statements :cal SetSyn("rmd")<CR>
+an 50.70.230 &Syntax.M.Mason :cal SetSyn("mason")<CR>
+an 50.70.240 &Syntax.M.Mathematica :cal SetSyn("mma")<CR>
+an 50.70.250 &Syntax.M.Matlab :cal SetSyn("matlab")<CR>
+an 50.70.260 &Syntax.M.Maxima :cal SetSyn("maxima")<CR>
+an 50.70.270 &Syntax.M.MEL\ (for\ Maya) :cal SetSyn("mel")<CR>
+an 50.70.280 &Syntax.M.Messages\ (/var/log) :cal SetSyn("messages")<CR>
+an 50.70.290 &Syntax.M.Metafont :cal SetSyn("mf")<CR>
+an 50.70.300 &Syntax.M.MetaPost :cal SetSyn("mp")<CR>
+an 50.70.310 &Syntax.M.MGL :cal SetSyn("mgl")<CR>
+an 50.70.320 &Syntax.M.MIX :cal SetSyn("mix")<CR>
+an 50.70.330 &Syntax.M.MMIX :cal SetSyn("mmix")<CR>
+an 50.70.340 &Syntax.M.Modconf :cal SetSyn("modconf")<CR>
+an 50.70.350 &Syntax.M.Model :cal SetSyn("model")<CR>
+an 50.70.360 &Syntax.M.Modsim\ III :cal SetSyn("modsim3")<CR>
+an 50.70.370 &Syntax.M.Modula\ 2 :cal SetSyn("modula2")<CR>
+an 50.70.380 &Syntax.M.Modula\ 3 :cal SetSyn("modula3")<CR>
+an 50.70.390 &Syntax.M.Monk :cal SetSyn("monk")<CR>
+an 50.70.400 &Syntax.M.Motorola\ S-Record :cal SetSyn("srec")<CR>
+an 50.70.410 &Syntax.M.Mplayer\ config :cal SetSyn("mplayerconf")<CR>
+an 50.70.420 &Syntax.M.MOO :cal SetSyn("moo")<CR>
+an 50.70.430 &Syntax.M.Mrxvtrc :cal SetSyn("mrxvtrc")<CR>
+an 50.70.440 &Syntax.M.MS-DOS/Windows.4DOS\ \.bat\ file :cal SetSyn("btm")<CR>
+an 50.70.450 &Syntax.M.MS-DOS/Windows.\.bat\/\.cmd\ file :cal SetSyn("dosbatch")<CR>
+an 50.70.460 &Syntax.M.MS-DOS/Windows.\.ini\ file :cal SetSyn("dosini")<CR>
+an 50.70.470 &Syntax.M.MS-DOS/Windows.Message\ text :cal SetSyn("msmessages")<CR>
+an 50.70.480 &Syntax.M.MS-DOS/Windows.Module\ Definition :cal SetSyn("def")<CR>
+an 50.70.490 &Syntax.M.MS-DOS/Windows.Registry :cal SetSyn("registry")<CR>
+an 50.70.500 &Syntax.M.MS-DOS/Windows.Resource\ file :cal SetSyn("rc")<CR>
+an 50.70.510 &Syntax.M.Msql :cal SetSyn("msql")<CR>
+an 50.70.520 &Syntax.M.MuPAD :cal SetSyn("mupad")<CR>
+an 50.70.530 &Syntax.M.Murphi :cal SetSyn("murphi")<CR>
+an 50.70.540 &Syntax.M.MUSHcode :cal SetSyn("mush")<CR>
+an 50.70.550 &Syntax.M.Muttrc :cal SetSyn("muttrc")<CR>
+an 50.80.100 &Syntax.NO.N1QL :cal SetSyn("n1ql")<CR>
+an 50.80.110 &Syntax.NO.Nanorc :cal SetSyn("nanorc")<CR>
+an 50.80.120 &Syntax.NO.Nastran\ input/DMAP :cal SetSyn("nastran")<CR>
+an 50.80.130 &Syntax.NO.Natural :cal SetSyn("natural")<CR>
+an 50.80.140 &Syntax.NO.NeoMutt\ setup\ files :cal SetSyn("neomuttrc")<CR>
+an 50.80.150 &Syntax.NO.Netrc :cal SetSyn("netrc")<CR>
+an 50.80.160 &Syntax.NO.Ninja :cal SetSyn("ninja")<CR>
+an 50.80.170 &Syntax.NO.Novell\ NCF\ batch :cal SetSyn("ncf")<CR>
+an 50.80.180 &Syntax.NO.Not\ Quite\ C\ (LEGO) :cal SetSyn("nqc")<CR>
+an 50.80.190 &Syntax.NO.Nroff :cal SetSyn("nroff")<CR>
+an 50.80.200 &Syntax.NO.NSIS\ script :cal SetSyn("nsis")<CR>
+an 50.80.220 &Syntax.NO.Obj\ 3D\ wavefront :cal SetSyn("obj")<CR>
+an 50.80.230 &Syntax.NO.Objective\ C :cal SetSyn("objc")<CR>
+an 50.80.240 &Syntax.NO.Objective\ C++ :cal SetSyn("objcpp")<CR>
+an 50.80.250 &Syntax.NO.OCAML :cal SetSyn("ocaml")<CR>
+an 50.80.260 &Syntax.NO.Occam :cal SetSyn("occam")<CR>
+an 50.80.270 &Syntax.NO.Omnimark :cal SetSyn("omnimark")<CR>
+an 50.80.280 &Syntax.NO.OpenROAD :cal SetSyn("openroad")<CR>
+an 50.80.290 &Syntax.NO.Open\ Psion\ Lang :cal SetSyn("opl")<CR>
+an 50.80.300 &Syntax.NO.Oracle\ config :cal SetSyn("ora")<CR>
 an 50.90.100 &Syntax.PQ.Packet\ filter\ conf :cal SetSyn("pf")<CR>
 an 50.90.110 &Syntax.PQ.Palm\ resource\ compiler :cal SetSyn("pilrc")<CR>
 an 50.90.120 &Syntax.PQ.Pam\ config :cal SetSyn("pamconf")<CR>
@@ -437,168 +459,178 @@ an 50.100.300 &Syntax.R.RockLinux\ package\ desc\. :cal SetSyn("desc")<CR>
 an 50.100.310 &Syntax.R.Rpcgen :cal SetSyn("rpcgen")<CR>
 an 50.100.320 &Syntax.R.RPL/2 :cal SetSyn("rpl")<CR>
 an 50.100.330 &Syntax.R.ReStructuredText :cal SetSyn("rst")<CR>
-an 50.100.340 &Syntax.R.RTF :cal SetSyn("rtf")<CR>
-an 50.100.350 &Syntax.R.Ruby :cal SetSyn("ruby")<CR>
-an 50.110.100 &Syntax.S-Sm.S-Lang :cal SetSyn("slang")<CR>
-an 50.110.110 &Syntax.S-Sm.Samba\ config :cal SetSyn("samba")<CR>
-an 50.110.120 &Syntax.S-Sm.SAS :cal SetSyn("sas")<CR>
-an 50.110.130 &Syntax.S-Sm.Sass :cal SetSyn("sass")<CR>
-an 50.110.140 &Syntax.S-Sm.Sather :cal SetSyn("sather")<CR>
-an 50.110.150 &Syntax.S-Sm.Scheme :cal SetSyn("scheme")<CR>
-an 50.110.160 &Syntax.S-Sm.Scilab :cal SetSyn("scilab")<CR>
-an 50.110.170 &Syntax.S-Sm.Screen\ RC :cal SetSyn("screen")<CR>
-an 50.110.180 &Syntax.S-Sm.SCSS :cal SetSyn("scss")<CR>
-an 50.110.190 &Syntax.S-Sm.SDC\ Synopsys\ Design\ Constraints :cal SetSyn("sdc")<CR>
-an 50.110.200 &Syntax.S-Sm.SDL :cal SetSyn("sdl")<CR>
-an 50.110.210 &Syntax.S-Sm.Sed :cal SetSyn("sed")<CR>
-an 50.110.220 &Syntax.S-Sm.Sendmail\.cf :cal SetSyn("sm")<CR>
-an 50.110.230 &Syntax.S-Sm.Send-pr :cal SetSyn("sendpr")<CR>
-an 50.110.240 &Syntax.S-Sm.Sensors\.conf :cal SetSyn("sensors")<CR>
-an 50.110.250 &Syntax.S-Sm.Service\ Location\ config :cal SetSyn("slpconf")<CR>
-an 50.110.260 &Syntax.S-Sm.Service\ Location\ registration :cal SetSyn("slpreg")<CR>
-an 50.110.270 &Syntax.S-Sm.Service\ Location\ SPI :cal SetSyn("slpspi")<CR>
-an 50.110.280 &Syntax.S-Sm.Services :cal SetSyn("services")<CR>
-an 50.110.290 &Syntax.S-Sm.Setserial\ config :cal SetSyn("setserial")<CR>
-an 50.110.300 &Syntax.S-Sm.SGML.SGML\ catalog :cal SetSyn("catalog")<CR>
-an 50.110.310 &Syntax.S-Sm.SGML.SGML\ DTD :cal SetSyn("sgml")<CR>
-an 50.110.320 &Syntax.S-Sm.SGML.SGML\ Declaration :cal SetSyn("sgmldecl")<CR>
-an 50.110.330 &Syntax.S-Sm.SGML.SGML-linuxdoc :cal SetSyn("sgmllnx")<CR>
-an 50.110.340 &Syntax.S-Sm.Shell\ script.sh\ and\ ksh :cal SetSyn("sh")<CR>
-an 50.110.350 &Syntax.S-Sm.Shell\ script.csh :cal SetSyn("csh")<CR>
-an 50.110.360 &Syntax.S-Sm.Shell\ script.tcsh :cal SetSyn("tcsh")<CR>
-an 50.110.370 &Syntax.S-Sm.Shell\ script.zsh :cal SetSyn("zsh")<CR>
-an 50.110.380 &Syntax.S-Sm.SiCAD :cal SetSyn("sicad")<CR>
-an 50.110.390 &Syntax.S-Sm.Sieve :cal SetSyn("sieve")<CR>
-an 50.110.400 &Syntax.S-Sm.Simula :cal SetSyn("simula")<CR>
-an 50.110.410 &Syntax.S-Sm.Sinda.Sinda\ compare :cal SetSyn("sindacmp")<CR>
-an 50.110.420 &Syntax.S-Sm.Sinda.Sinda\ input :cal SetSyn("sinda")<CR>
-an 50.110.430 &Syntax.S-Sm.Sinda.Sinda\ output :cal SetSyn("sindaout")<CR>
-an 50.110.440 &Syntax.S-Sm.SiSU :cal SetSyn("sisu")<CR>
-an 50.110.450 &Syntax.S-Sm.SKILL.SKILL :cal SetSyn("skill")<CR>
-an 50.110.460 &Syntax.S-Sm.SKILL.SKILL\ for\ Diva :cal SetSyn("diva")<CR>
-an 50.110.470 &Syntax.S-Sm.Slice :cal SetSyn("slice")<CR>
-an 50.110.480 &Syntax.S-Sm.SLRN.Slrn\ rc :cal SetSyn("slrnrc")<CR>
-an 50.110.490 &Syntax.S-Sm.SLRN.Slrn\ score :cal SetSyn("slrnsc")<CR>
-an 50.110.500 &Syntax.S-Sm.SmallTalk :cal SetSyn("st")<CR>
-an 50.110.510 &Syntax.S-Sm.Smarty\ Templates :cal SetSyn("smarty")<CR>
-an 50.110.520 &Syntax.S-Sm.SMIL :cal SetSyn("smil")<CR>
-an 50.110.530 &Syntax.S-Sm.SMITH :cal SetSyn("smith")<CR>
-an 50.120.100 &Syntax.Sn-Sy.SNMP\ MIB :cal SetSyn("mib")<CR>
-an 50.120.110 &Syntax.Sn-Sy.SNNS.SNNS\ network :cal SetSyn("snnsnet")<CR>
-an 50.120.120 &Syntax.Sn-Sy.SNNS.SNNS\ pattern :cal SetSyn("snnspat")<CR>
-an 50.120.130 &Syntax.Sn-Sy.SNNS.SNNS\ result :cal SetSyn("snnsres")<CR>
-an 50.120.140 &Syntax.Sn-Sy.Snobol4 :cal SetSyn("snobol4")<CR>
-an 50.120.150 &Syntax.Sn-Sy.Snort\ Configuration :cal SetSyn("hog")<CR>
-an 50.120.160 &Syntax.Sn-Sy.SPEC\ (Linux\ RPM) :cal SetSyn("spec")<CR>
-an 50.120.170 &Syntax.Sn-Sy.Specman :cal SetSyn("specman")<CR>
-an 50.120.180 &Syntax.Sn-Sy.Spice :cal SetSyn("spice")<CR>
-an 50.120.190 &Syntax.Sn-Sy.Spyce :cal SetSyn("spyce")<CR>
-an 50.120.200 &Syntax.Sn-Sy.Speedup :cal SetSyn("spup")<CR>
-an 50.120.210 &Syntax.Sn-Sy.Splint :cal SetSyn("splint")<CR>
-an 50.120.220 &Syntax.Sn-Sy.Squid\ config :cal SetSyn("squid")<CR>
-an 50.120.230 &Syntax.Sn-Sy.SQL.SAP\ HANA :cal SetSyn("sqlhana")<CR>
-an 50.120.240 &Syntax.Sn-Sy.SQL.ESQL-C :cal SetSyn("esqlc")<CR>
-an 50.120.250 &Syntax.Sn-Sy.SQL.MySQL :cal SetSyn("mysql")<CR>
-an 50.120.260 &Syntax.Sn-Sy.SQL.PL/SQL :cal SetSyn("plsql")<CR>
-an 50.120.270 &Syntax.Sn-Sy.SQL.SQL\ Anywhere :cal SetSyn("sqlanywhere")<CR>
-an 50.120.280 &Syntax.Sn-Sy.SQL.SQL\ (automatic) :cal SetSyn("sql")<CR>
-an 50.120.290 &Syntax.Sn-Sy.SQL.SQL\ (Oracle) :cal SetSyn("sqloracle")<CR>
-an 50.120.300 &Syntax.Sn-Sy.SQL.SQL\ Forms :cal SetSyn("sqlforms")<CR>
-an 50.120.310 &Syntax.Sn-Sy.SQL.SQLJ :cal SetSyn("sqlj")<CR>
-an 50.120.320 &Syntax.Sn-Sy.SQL.SQL-Informix :cal SetSyn("sqlinformix")<CR>
-an 50.120.330 &Syntax.Sn-Sy.SQR :cal SetSyn("sqr")<CR>
-an 50.120.340 &Syntax.Sn-Sy.Ssh.ssh_config :cal SetSyn("sshconfig")<CR>
-an 50.120.350 &Syntax.Sn-Sy.Ssh.sshd_config :cal SetSyn("sshdconfig")<CR>
-an 50.120.360 &Syntax.Sn-Sy.Standard\ ML :cal SetSyn("sml")<CR>
-an 50.120.370 &Syntax.Sn-Sy.Stata.SMCL :cal SetSyn("smcl")<CR>
-an 50.120.380 &Syntax.Sn-Sy.Stata.Stata :cal SetSyn("stata")<CR>
-an 50.120.390 &Syntax.Sn-Sy.Stored\ Procedures :cal SetSyn("stp")<CR>
-an 50.120.400 &Syntax.Sn-Sy.Strace :cal SetSyn("strace")<CR>
-an 50.120.410 &Syntax.Sn-Sy.Streaming\ descriptor\ file :cal SetSyn("sd")<CR>
-an 50.120.420 &Syntax.Sn-Sy.Subversion\ commit :cal SetSyn("svn")<CR>
-an 50.120.430 &Syntax.Sn-Sy.Sudoers :cal SetSyn("sudoers")<CR>
-an 50.120.440 &Syntax.Sn-Sy.SVG :cal SetSyn("svg")<CR>
-an 50.120.450 &Syntax.Sn-Sy.Symbian\ meta-makefile :cal SetSyn("mmp")<CR>
-an 50.120.460 &Syntax.Sn-Sy.Sysctl\.conf :cal SetSyn("sysctl")<CR>
-an 50.130.100 &Syntax.T.TADS :cal SetSyn("tads")<CR>
-an 50.130.110 &Syntax.T.Tags :cal SetSyn("tags")<CR>
-an 50.130.120 &Syntax.T.TAK.TAK\ compare :cal SetSyn("takcmp")<CR>
-an 50.130.130 &Syntax.T.TAK.TAK\ input :cal SetSyn("tak")<CR>
-an 50.130.140 &Syntax.T.TAK.TAK\ output :cal SetSyn("takout")<CR>
-an 50.130.150 &Syntax.T.Tar\ listing :cal SetSyn("tar")<CR>
-an 50.130.160 &Syntax.T.Task\ data :cal SetSyn("taskdata")<CR>
-an 50.130.170 &Syntax.T.Task\ 42\ edit :cal SetSyn("taskedit")<CR>
-an 50.130.180 &Syntax.T.Tcl/Tk :cal SetSyn("tcl")<CR>
-an 50.130.190 &Syntax.T.TealInfo :cal SetSyn("tli")<CR>
-an 50.130.200 &Syntax.T.Telix\ Salt :cal SetSyn("tsalt")<CR>
-an 50.130.210 &Syntax.T.Termcap/Printcap :cal SetSyn("ptcap")<CR>
-an 50.130.220 &Syntax.T.Terminfo :cal SetSyn("terminfo")<CR>
-an 50.130.230 &Syntax.T.TeX.TeX/LaTeX :cal SetSyn("tex")<CR>
-an 50.130.240 &Syntax.T.TeX.plain\ TeX :cal SetSyn("plaintex")<CR>
-an 50.130.250 &Syntax.T.TeX.Initex :cal SetSyn("initex")<CR>
-an 50.130.260 &Syntax.T.TeX.ConTeXt :cal SetSyn("context")<CR>
-an 50.130.270 &Syntax.T.TeX.TeX\ configuration :cal SetSyn("texmf")<CR>
-an 50.130.280 &Syntax.T.TeX.Texinfo :cal SetSyn("texinfo")<CR>
-an 50.130.290 &Syntax.T.TF\ mud\ client :cal SetSyn("tf")<CR>
-an 50.130.300 &Syntax.T.Tidy\ configuration :cal SetSyn("tidy")<CR>
-an 50.130.310 &Syntax.T.Tilde :cal SetSyn("tilde")<CR>
-an 50.130.320 &Syntax.T.TPP :cal SetSyn("tpp")<CR>
-an 50.130.330 &Syntax.T.Trasys\ input :cal SetSyn("trasys")<CR>
-an 50.130.340 &Syntax.T.Treetop :cal SetSyn("treetop")<CR>
-an 50.130.350 &Syntax.T.Trustees :cal SetSyn("trustees")<CR>
-an 50.130.360 &Syntax.T.TSS.Command\ Line :cal SetSyn("tsscl")<CR>
-an 50.130.370 &Syntax.T.TSS.Geometry :cal SetSyn("tssgm")<CR>
-an 50.130.380 &Syntax.T.TSS.Optics :cal SetSyn("tssop")<CR>
-an 50.140.100 &Syntax.UV.Udev\ config :cal SetSyn("udevconf")<CR>
-an 50.140.110 &Syntax.UV.Udev\ permissions :cal SetSyn("udevperm")<CR>
-an 50.140.120 &Syntax.UV.Udev\ rules :cal SetSyn("udevrules")<CR>
-an 50.140.130 &Syntax.UV.UIT/UIL :cal SetSyn("uil")<CR>
-an 50.140.140 &Syntax.UV.UnrealScript :cal SetSyn("uc")<CR>
-an 50.140.150 &Syntax.UV.Updatedb\.conf :cal SetSyn("updatedb")<CR>
-an 50.140.160 &Syntax.UV.Upstart :cal SetSyn("upstart")<CR>
-an 50.140.180 &Syntax.UV.Valgrind :cal SetSyn("valgrind")<CR>
-an 50.140.190 &Syntax.UV.Vera :cal SetSyn("vera")<CR>
-an 50.140.200 &Syntax.UV.Verilog-AMS\ HDL :cal SetSyn("verilogams")<CR>
-an 50.140.210 &Syntax.UV.Verilog\ HDL :cal SetSyn("verilog")<CR>
-an 50.140.220 &Syntax.UV.Vgrindefs :cal SetSyn("vgrindefs")<CR>
-an 50.140.230 &Syntax.UV.VHDL :cal SetSyn("vhdl")<CR>
-an 50.140.240 &Syntax.UV.Vim.Vim\ help\ file :cal SetSyn("help")<CR>
-an 50.140.250 &Syntax.UV.Vim.Vim\ script :cal SetSyn("vim")<CR>
-an 50.140.260 &Syntax.UV.Vim.Viminfo\ file :cal SetSyn("viminfo")<CR>
-an 50.140.270 &Syntax.UV.Virata\ config :cal SetSyn("virata")<CR>
-an 50.140.280 &Syntax.UV.Visual\ Basic :cal SetSyn("vb")<CR>
-an 50.140.290 &Syntax.UV.VOS\ CM\ macro :cal SetSyn("voscm")<CR>
-an 50.140.300 &Syntax.UV.VRML :cal SetSyn("vrml")<CR>
-an 50.140.310 &Syntax.UV.VSE\ JCL :cal SetSyn("vsejcl")<CR>
-an 50.150.100 &Syntax.WXYZ.WEB.CWEB :cal SetSyn("cweb")<CR>
-an 50.150.110 &Syntax.WXYZ.WEB.WEB :cal SetSyn("web")<CR>
-an 50.150.120 &Syntax.WXYZ.WEB.WEB\ Changes :cal SetSyn("change")<CR>
-an 50.150.130 &Syntax.WXYZ.Webmacro :cal SetSyn("webmacro")<CR>
-an 50.150.140 &Syntax.WXYZ.Website\ MetaLanguage :cal SetSyn("wml")<CR>
-an 50.150.160 &Syntax.WXYZ.wDiff :cal SetSyn("wdiff")<CR>
-an 50.150.180 &Syntax.WXYZ.Wget\ config :cal SetSyn("wget")<CR>
-an 50.150.190 &Syntax.WXYZ.Whitespace\ (add) :cal SetSyn("whitespace")<CR>
-an 50.150.200 &Syntax.WXYZ.WildPackets\ EtherPeek\ Decoder :cal SetSyn("dcd")<CR>
-an 50.150.210 &Syntax.WXYZ.WinBatch/Webbatch :cal SetSyn("winbatch")<CR>
-an 50.150.220 &Syntax.WXYZ.Windows\ Scripting\ Host :cal SetSyn("wsh")<CR>
-an 50.150.230 &Syntax.WXYZ.WSML :cal SetSyn("wsml")<CR>
-an 50.150.240 &Syntax.WXYZ.WvDial :cal SetSyn("wvdial")<CR>
-an 50.150.260 &Syntax.WXYZ.X\ Keyboard\ Extension :cal SetSyn("xkb")<CR>
-an 50.150.270 &Syntax.WXYZ.X\ Pixmap :cal SetSyn("xpm")<CR>
-an 50.150.280 &Syntax.WXYZ.X\ Pixmap\ (2) :cal SetSyn("xpm2")<CR>
-an 50.150.290 &Syntax.WXYZ.X\ resources :cal SetSyn("xdefaults")<CR>
-an 50.150.300 &Syntax.WXYZ.XBL :cal SetSyn("xbl")<CR>
-an 50.150.310 &Syntax.WXYZ.Xinetd\.conf :cal SetSyn("xinetd")<CR>
-an 50.150.320 &Syntax.WXYZ.Xmodmap :cal SetSyn("xmodmap")<CR>
-an 50.150.330 &Syntax.WXYZ.Xmath :cal SetSyn("xmath")<CR>
-an 50.150.340 &Syntax.WXYZ.XML :cal SetSyn("xml")<CR>
-an 50.150.350 &Syntax.WXYZ.XML\ Schema\ (XSD) :cal SetSyn("xsd")<CR>
-an 50.150.360 &Syntax.WXYZ.XQuery :cal SetSyn("xquery")<CR>
-an 50.150.370 &Syntax.WXYZ.Xslt :cal SetSyn("xslt")<CR>
-an 50.150.380 &Syntax.WXYZ.XFree86\ Config :cal SetSyn("xf86conf")<CR>
-an 50.150.400 &Syntax.WXYZ.YAML :cal SetSyn("yaml")<CR>
-an 50.150.410 &Syntax.WXYZ.Yacc :cal SetSyn("yacc")<CR>
-an 50.150.430 &Syntax.WXYZ.Zimbu :cal SetSyn("zimbu")<CR>
+an 50.110.100 &Syntax.M.ReStructuredText\ with\ R\ statements :cal SetSyn("rrst")<CR>
+an 50.120.100 &Syntax.R.RTF :cal SetSyn("rtf")<CR>
+an 50.120.110 &Syntax.R.Ruby :cal SetSyn("ruby")<CR>
+an 50.120.120 &Syntax.R.Rust :cal SetSyn("rust")<CR>
+an 50.130.100 &Syntax.S-Sm.S-Lang :cal SetSyn("slang")<CR>
+an 50.130.110 &Syntax.S-Sm.Samba\ config :cal SetSyn("samba")<CR>
+an 50.130.120 &Syntax.S-Sm.SAS :cal SetSyn("sas")<CR>
+an 50.130.130 &Syntax.S-Sm.Sass :cal SetSyn("sass")<CR>
+an 50.130.140 &Syntax.S-Sm.Sather :cal SetSyn("sather")<CR>
+an 50.130.150 &Syntax.S-Sm.Sbt :cal SetSyn("sbt")<CR>
+an 50.130.160 &Syntax.S-Sm.Scala :cal SetSyn("scala")<CR>
+an 50.130.170 &Syntax.S-Sm.Scheme :cal SetSyn("scheme")<CR>
+an 50.130.180 &Syntax.S-Sm.Scilab :cal SetSyn("scilab")<CR>
+an 50.130.190 &Syntax.S-Sm.Screen\ RC :cal SetSyn("screen")<CR>
+an 50.130.200 &Syntax.S-Sm.SCSS :cal SetSyn("scss")<CR>
+an 50.130.210 &Syntax.S-Sm.SDC\ Synopsys\ Design\ Constraints :cal SetSyn("sdc")<CR>
+an 50.130.220 &Syntax.S-Sm.SDL :cal SetSyn("sdl")<CR>
+an 50.130.230 &Syntax.S-Sm.Sed :cal SetSyn("sed")<CR>
+an 50.130.240 &Syntax.S-Sm.Sendmail\.cf :cal SetSyn("sm")<CR>
+an 50.130.250 &Syntax.S-Sm.Send-pr :cal SetSyn("sendpr")<CR>
+an 50.130.260 &Syntax.S-Sm.Sensors\.conf :cal SetSyn("sensors")<CR>
+an 50.130.270 &Syntax.S-Sm.Service\ Location\ config :cal SetSyn("slpconf")<CR>
+an 50.130.280 &Syntax.S-Sm.Service\ Location\ registration :cal SetSyn("slpreg")<CR>
+an 50.130.290 &Syntax.S-Sm.Service\ Location\ SPI :cal SetSyn("slpspi")<CR>
+an 50.130.300 &Syntax.S-Sm.Services :cal SetSyn("services")<CR>
+an 50.130.310 &Syntax.S-Sm.Setserial\ config :cal SetSyn("setserial")<CR>
+an 50.130.320 &Syntax.S-Sm.SGML.SGML\ catalog :cal SetSyn("catalog")<CR>
+an 50.130.330 &Syntax.S-Sm.SGML.SGML\ DTD :cal SetSyn("sgml")<CR>
+an 50.130.340 &Syntax.S-Sm.SGML.SGML\ Declaration :cal SetSyn("sgmldecl")<CR>
+an 50.130.350 &Syntax.S-Sm.SGML.SGML-linuxdoc :cal SetSyn("sgmllnx")<CR>
+an 50.130.360 &Syntax.S-Sm.Shell\ script.sh\ and\ ksh :cal SetSyn("sh")<CR>
+an 50.130.370 &Syntax.S-Sm.Shell\ script.csh :cal SetSyn("csh")<CR>
+an 50.130.380 &Syntax.S-Sm.Shell\ script.tcsh :cal SetSyn("tcsh")<CR>
+an 50.130.390 &Syntax.S-Sm.Shell\ script.zsh :cal SetSyn("zsh")<CR>
+an 50.130.400 &Syntax.S-Sm.SiCAD :cal SetSyn("sicad")<CR>
+an 50.130.410 &Syntax.S-Sm.Sieve :cal SetSyn("sieve")<CR>
+an 50.130.420 &Syntax.S-Sm.Simula :cal SetSyn("simula")<CR>
+an 50.130.430 &Syntax.S-Sm.Sinda.Sinda\ compare :cal SetSyn("sindacmp")<CR>
+an 50.130.440 &Syntax.S-Sm.Sinda.Sinda\ input :cal SetSyn("sinda")<CR>
+an 50.130.450 &Syntax.S-Sm.Sinda.Sinda\ output :cal SetSyn("sindaout")<CR>
+an 50.130.460 &Syntax.S-Sm.SiSU :cal SetSyn("sisu")<CR>
+an 50.130.470 &Syntax.S-Sm.SKILL.SKILL :cal SetSyn("skill")<CR>
+an 50.130.480 &Syntax.S-Sm.SKILL.SKILL\ for\ Diva :cal SetSyn("diva")<CR>
+an 50.130.490 &Syntax.S-Sm.Slice :cal SetSyn("slice")<CR>
+an 50.130.500 &Syntax.S-Sm.SLRN.Slrn\ rc :cal SetSyn("slrnrc")<CR>
+an 50.130.510 &Syntax.S-Sm.SLRN.Slrn\ score :cal SetSyn("slrnsc")<CR>
+an 50.130.520 &Syntax.S-Sm.SmallTalk :cal SetSyn("st")<CR>
+an 50.130.530 &Syntax.S-Sm.Smarty\ Templates :cal SetSyn("smarty")<CR>
+an 50.130.540 &Syntax.S-Sm.SMIL :cal SetSyn("smil")<CR>
+an 50.130.550 &Syntax.S-Sm.SMITH :cal SetSyn("smith")<CR>
+an 50.140.100 &Syntax.Sn-Sy.SNMP\ MIB :cal SetSyn("mib")<CR>
+an 50.140.110 &Syntax.Sn-Sy.SNNS.SNNS\ network :cal SetSyn("snnsnet")<CR>
+an 50.140.120 &Syntax.Sn-Sy.SNNS.SNNS\ pattern :cal SetSyn("snnspat")<CR>
+an 50.140.130 &Syntax.Sn-Sy.SNNS.SNNS\ result :cal SetSyn("snnsres")<CR>
+an 50.140.140 &Syntax.Sn-Sy.Snobol4 :cal SetSyn("snobol4")<CR>
+an 50.140.150 &Syntax.Sn-Sy.Snort\ Configuration :cal SetSyn("hog")<CR>
+an 50.140.160 &Syntax.Sn-Sy.SPEC\ (Linux\ RPM) :cal SetSyn("spec")<CR>
+an 50.140.170 &Syntax.Sn-Sy.Specman :cal SetSyn("specman")<CR>
+an 50.140.180 &Syntax.Sn-Sy.Spice :cal SetSyn("spice")<CR>
+an 50.140.190 &Syntax.Sn-Sy.Spyce :cal SetSyn("spyce")<CR>
+an 50.140.200 &Syntax.Sn-Sy.Speedup :cal SetSyn("spup")<CR>
+an 50.140.210 &Syntax.Sn-Sy.Splint :cal SetSyn("splint")<CR>
+an 50.140.220 &Syntax.Sn-Sy.Squid\ config :cal SetSyn("squid")<CR>
+an 50.140.230 &Syntax.Sn-Sy.SQL.SAP\ HANA :cal SetSyn("sqlhana")<CR>
+an 50.140.240 &Syntax.Sn-Sy.SQL.ESQL-C :cal SetSyn("esqlc")<CR>
+an 50.140.250 &Syntax.Sn-Sy.SQL.MySQL :cal SetSyn("mysql")<CR>
+an 50.140.260 &Syntax.Sn-Sy.SQL.PL/SQL :cal SetSyn("plsql")<CR>
+an 50.140.270 &Syntax.Sn-Sy.SQL.SQL\ Anywhere :cal SetSyn("sqlanywhere")<CR>
+an 50.140.280 &Syntax.Sn-Sy.SQL.SQL\ (automatic) :cal SetSyn("sql")<CR>
+an 50.140.290 &Syntax.Sn-Sy.SQL.SQL\ (Oracle) :cal SetSyn("sqloracle")<CR>
+an 50.140.300 &Syntax.Sn-Sy.SQL.SQL\ Forms :cal SetSyn("sqlforms")<CR>
+an 50.140.310 &Syntax.Sn-Sy.SQL.SQLJ :cal SetSyn("sqlj")<CR>
+an 50.140.320 &Syntax.Sn-Sy.SQL.SQL-Informix :cal SetSyn("sqlinformix")<CR>
+an 50.140.330 &Syntax.Sn-Sy.SQR :cal SetSyn("sqr")<CR>
+an 50.140.340 &Syntax.Sn-Sy.Ssh.ssh_config :cal SetSyn("sshconfig")<CR>
+an 50.140.350 &Syntax.Sn-Sy.Ssh.sshd_config :cal SetSyn("sshdconfig")<CR>
+an 50.140.360 &Syntax.Sn-Sy.Standard\ ML :cal SetSyn("sml")<CR>
+an 50.140.370 &Syntax.Sn-Sy.Stata.SMCL :cal SetSyn("smcl")<CR>
+an 50.140.380 &Syntax.Sn-Sy.Stata.Stata :cal SetSyn("stata")<CR>
+an 50.140.390 &Syntax.Sn-Sy.Stored\ Procedures :cal SetSyn("stp")<CR>
+an 50.140.400 &Syntax.Sn-Sy.Strace :cal SetSyn("strace")<CR>
+an 50.140.410 &Syntax.Sn-Sy.Streaming\ descriptor\ file :cal SetSyn("sd")<CR>
+an 50.140.420 &Syntax.Sn-Sy.Subversion\ commit :cal SetSyn("svn")<CR>
+an 50.140.430 &Syntax.Sn-Sy.Sudoers :cal SetSyn("sudoers")<CR>
+an 50.140.440 &Syntax.Sn-Sy.SVG :cal SetSyn("svg")<CR>
+an 50.140.450 &Syntax.Sn-Sy.Symbian\ meta-makefile :cal SetSyn("mmp")<CR>
+an 50.140.460 &Syntax.Sn-Sy.Sysctl\.conf :cal SetSyn("sysctl")<CR>
+an 50.140.470 &Syntax.Sn-Sy.Systemd :cal SetSyn("systemd")<CR>
+an 50.140.480 &Syntax.Sn-Sy.SystemVerilog :cal SetSyn("systemverilog")<CR>
+an 50.150.100 &Syntax.T.TADS :cal SetSyn("tads")<CR>
+an 50.150.110 &Syntax.T.Tags :cal SetSyn("tags")<CR>
+an 50.150.120 &Syntax.T.TAK.TAK\ compare :cal SetSyn("takcmp")<CR>
+an 50.150.130 &Syntax.T.TAK.TAK\ input :cal SetSyn("tak")<CR>
+an 50.150.140 &Syntax.T.TAK.TAK\ output :cal SetSyn("takout")<CR>
+an 50.150.150 &Syntax.T.Tar\ listing :cal SetSyn("tar")<CR>
+an 50.150.160 &Syntax.T.Task\ data :cal SetSyn("taskdata")<CR>
+an 50.150.170 &Syntax.T.Task\ 42\ edit :cal SetSyn("taskedit")<CR>
+an 50.150.180 &Syntax.T.Tcl/Tk :cal SetSyn("tcl")<CR>
+an 50.150.190 &Syntax.T.TealInfo :cal SetSyn("tli")<CR>
+an 50.150.200 &Syntax.T.Telix\ Salt :cal SetSyn("tsalt")<CR>
+an 50.150.210 &Syntax.T.Termcap/Printcap :cal SetSyn("ptcap")<CR>
+an 50.150.220 &Syntax.T.Terminfo :cal SetSyn("terminfo")<CR>
+an 50.150.230 &Syntax.T.Tera\ Term :cal SetSyn("teraterm")<CR>
+an 50.150.240 &Syntax.T.TeX.TeX/LaTeX :cal SetSyn("tex")<CR>
+an 50.150.250 &Syntax.T.TeX.plain\ TeX :cal SetSyn("plaintex")<CR>
+an 50.150.260 &Syntax.T.TeX.Initex :cal SetSyn("initex")<CR>
+an 50.150.270 &Syntax.T.TeX.ConTeXt :cal SetSyn("context")<CR>
+an 50.150.280 &Syntax.T.TeX.TeX\ configuration :cal SetSyn("texmf")<CR>
+an 50.150.290 &Syntax.T.TeX.Texinfo :cal SetSyn("texinfo")<CR>
+an 50.150.300 &Syntax.T.TF\ mud\ client :cal SetSyn("tf")<CR>
+an 50.150.310 &Syntax.T.Tidy\ configuration :cal SetSyn("tidy")<CR>
+an 50.150.320 &Syntax.T.Tilde :cal SetSyn("tilde")<CR>
+an 50.150.330 &Syntax.T.Tmux\ configuration :cal SetSyn("tmux")<CR>
+an 50.150.340 &Syntax.T.TPP :cal SetSyn("tpp")<CR>
+an 50.150.350 &Syntax.T.Trasys\ input :cal SetSyn("trasys")<CR>
+an 50.150.360 &Syntax.T.Treetop :cal SetSyn("treetop")<CR>
+an 50.150.370 &Syntax.T.Trustees :cal SetSyn("trustees")<CR>
+an 50.150.380 &Syntax.T.TSS.Command\ Line :cal SetSyn("tsscl")<CR>
+an 50.150.390 &Syntax.T.TSS.Geometry :cal SetSyn("tssgm")<CR>
+an 50.150.400 &Syntax.T.TSS.Optics :cal SetSyn("tssop")<CR>
+an 50.160.100 &Syntax.UV.Udev\ config :cal SetSyn("udevconf")<CR>
+an 50.160.110 &Syntax.UV.Udev\ permissions :cal SetSyn("udevperm")<CR>
+an 50.160.120 &Syntax.UV.Udev\ rules :cal SetSyn("udevrules")<CR>
+an 50.160.130 &Syntax.UV.UIT/UIL :cal SetSyn("uil")<CR>
+an 50.160.140 &Syntax.UV.UnrealScript :cal SetSyn("uc")<CR>
+an 50.160.150 &Syntax.UV.Updatedb\.conf :cal SetSyn("updatedb")<CR>
+an 50.160.160 &Syntax.UV.Upstart :cal SetSyn("upstart")<CR>
+an 50.160.180 &Syntax.UV.Valgrind :cal SetSyn("valgrind")<CR>
+an 50.160.190 &Syntax.UV.Vera :cal SetSyn("vera")<CR>
+an 50.160.200 &Syntax.UV.Verbose\ TAP\ Output :cal SetSyn("tap")<CR>
+an 50.160.210 &Syntax.UV.Verilog-AMS\ HDL :cal SetSyn("verilogams")<CR>
+an 50.160.220 &Syntax.UV.Verilog\ HDL :cal SetSyn("verilog")<CR>
+an 50.160.230 &Syntax.UV.Vgrindefs :cal SetSyn("vgrindefs")<CR>
+an 50.160.240 &Syntax.UV.VHDL :cal SetSyn("vhdl")<CR>
+an 50.160.250 &Syntax.UV.Vim.Vim\ help\ file :cal SetSyn("help")<CR>
+an 50.160.260 &Syntax.UV.Vim.Vim\ script :cal SetSyn("vim")<CR>
+an 50.160.270 &Syntax.UV.Vim.Viminfo\ file :cal SetSyn("viminfo")<CR>
+an 50.160.280 &Syntax.UV.Virata\ config :cal SetSyn("virata")<CR>
+an 50.160.290 &Syntax.UV.Visual\ Basic :cal SetSyn("vb")<CR>
+an 50.160.300 &Syntax.UV.VOS\ CM\ macro :cal SetSyn("voscm")<CR>
+an 50.160.310 &Syntax.UV.VRML :cal SetSyn("vrml")<CR>
+an 50.160.320 &Syntax.UV.Vroom :cal SetSyn("vroom")<CR>
+an 50.160.330 &Syntax.UV.VSE\ JCL :cal SetSyn("vsejcl")<CR>
+an 50.170.100 &Syntax.WXYZ.WEB.CWEB :cal SetSyn("cweb")<CR>
+an 50.170.110 &Syntax.WXYZ.WEB.WEB :cal SetSyn("web")<CR>
+an 50.170.120 &Syntax.WXYZ.WEB.WEB\ Changes :cal SetSyn("change")<CR>
+an 50.170.130 &Syntax.WXYZ.Webmacro :cal SetSyn("webmacro")<CR>
+an 50.170.140 &Syntax.WXYZ.Website\ MetaLanguage :cal SetSyn("wml")<CR>
+an 50.170.160 &Syntax.WXYZ.wDiff :cal SetSyn("wdiff")<CR>
+an 50.170.180 &Syntax.WXYZ.Wget\ config :cal SetSyn("wget")<CR>
+an 50.170.190 &Syntax.WXYZ.Whitespace\ (add) :cal SetSyn("whitespace")<CR>
+an 50.170.200 &Syntax.WXYZ.WildPackets\ EtherPeek\ Decoder :cal SetSyn("dcd")<CR>
+an 50.170.210 &Syntax.WXYZ.WinBatch/Webbatch :cal SetSyn("winbatch")<CR>
+an 50.170.220 &Syntax.WXYZ.Windows\ Scripting\ Host :cal SetSyn("wsh")<CR>
+an 50.170.230 &Syntax.WXYZ.WSML :cal SetSyn("wsml")<CR>
+an 50.170.240 &Syntax.WXYZ.WvDial :cal SetSyn("wvdial")<CR>
+an 50.170.260 &Syntax.WXYZ.X\ Keyboard\ Extension :cal SetSyn("xkb")<CR>
+an 50.170.270 &Syntax.WXYZ.X\ Pixmap :cal SetSyn("xpm")<CR>
+an 50.170.280 &Syntax.WXYZ.X\ Pixmap\ (2) :cal SetSyn("xpm2")<CR>
+an 50.170.290 &Syntax.WXYZ.X\ resources :cal SetSyn("xdefaults")<CR>
+an 50.170.300 &Syntax.WXYZ.XBL :cal SetSyn("xbl")<CR>
+an 50.170.310 &Syntax.WXYZ.Xinetd\.conf :cal SetSyn("xinetd")<CR>
+an 50.170.320 &Syntax.WXYZ.Xmodmap :cal SetSyn("xmodmap")<CR>
+an 50.170.330 &Syntax.WXYZ.Xmath :cal SetSyn("xmath")<CR>
+an 50.170.340 &Syntax.WXYZ.XML :cal SetSyn("xml")<CR>
+an 50.170.350 &Syntax.WXYZ.XML\ Schema\ (XSD) :cal SetSyn("xsd")<CR>
+an 50.170.360 &Syntax.WXYZ.XQuery :cal SetSyn("xquery")<CR>
+an 50.170.370 &Syntax.WXYZ.Xslt :cal SetSyn("xslt")<CR>
+an 50.170.380 &Syntax.WXYZ.XFree86\ Config :cal SetSyn("xf86conf")<CR>
+an 50.170.400 &Syntax.WXYZ.YAML :cal SetSyn("yaml")<CR>
+an 50.170.410 &Syntax.WXYZ.Yacc :cal SetSyn("yacc")<CR>
+an 50.170.430 &Syntax.WXYZ.Zimbu :cal SetSyn("zimbu")<CR>
 
 " The End Of The Syntax Menu
 
diff --git a/runtime/syntax/upstreamrpt.vim b/runtime/syntax/upstreamrpt.vim
index 170fc8f50..21c25633a 100644
--- a/runtime/syntax/upstreamrpt.vim
+++ b/runtime/syntax/upstreamrpt.vim
@@ -307,4 +307,4 @@ hi def link upstreamdat_Parameter Type
 "hi def link upstreamdat_Filespec Underlined
 hi def link upstreamdat_Comment Comment
 
-let b:current_syntax = "upstreamdat"
+let b:current_syntax = "upstreamrpt"
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index 7b255e282..c3e134468 100644
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -25,6 +25,8 @@ syn keyword vimCommand contained	abc[lear] argdo au bel[owright] bp[revious] bro
 syn keyword vimCommand contained	abo[veleft] arge[dit] bN[ext] bf[irst] br[ewind] bufdo c[hange] cat[ch] cdo cg[etfile] checkt[ime] cmapc[lear] colo[rscheme] cope[n] cscope debugg[reedy] deletl dep diffpu[t] dl ds[earch] echoe[rr] en[dif] ex filetype fix[del] for gui helpg[rep] ia in ju[mps] keepp[atterns] laddb[uffer] lbo[ttom] ld[o] lfir[st] lh[elpgrep] lmapc[lear] loadkeymap lpf[ile] luafile mak[e] mk[exrc] mz[scheme] nbs[tart] noh[lsearch] o[pen] ownsyntax pe[rl] pp[op] profd[el] pta[g] ptp[revious] py3 python3 q[uit] red[o] res[ize] rightb[elow] rundo sIg sN[ext] sbN[ext] sbm[odified] scI scp se[t] sfir[st] sgi sh[ell] sign sir sme snoreme spe[llgood] spellw[rong] sre[wind] srp startr[eplace] sunme sy t tabc[lose] tabl[ast] tabp[revious] tcld[o] tj[ump] tn[ext] try una[bbreviate] unlo[ckvar] verb[ose] vimgrepa[dd] wN[ext] winc[md] wq x[it] xnoreme xwininfo
 syn keyword vimCommand contained	al[l] argg[lobal] b[uffer] bl[ast] brea[k] buffers cabc[lear] cb[uffer] ce[nter] cgetb[uffer] chi[story] cn[ext] com cp[revious] cstag delc[ommand] deletp di[splay] diffs[plit] dli[st] dsp[lit] echom[sg] endf[unction] exi[t] filt[er] fo[ld] fu[nction] gvim helpt[ags] iabc[lear] intro k lN[ext] laddf[ile] lc[d] le[ft] lg[etfile] lhi[story] lne[xt] loc[kmarks] lr[ewind] lv[imgrep] marks mks[ession] mzf[ile] new nor ol[dfiles] p[rint] ped[it] pre[serve] promptf[ind] ptf[irst] ptr[ewind] py3do pythonx qa[ll] redi[r] ret[ab] ru[ntime] rv[iminfo] sIl sa[rgument] sb[uffer] sbn[ext] sce scr[iptnames] setf[iletype] sg sgl si sil[ent] sl[eep] smenu snoremenu spelld[ump] spr[evious] srg st[op] stj[ump] sunmenu syn tN[ext] tabd[o] tabm[ove] tabr[ewind] tclf[ile] tl[ast] tno[remap] ts[elect] undoj[oin] uns[ilent] vert[ical] viu[sage] w[rite] windo wqa[ll] xa[ll] xnoremenu y[ank]
 syn keyword vimCommand contained	ar[gs] argl[ocal] ba[ll] bm[odified] breaka[dd] bun[load] cad[dbuffer] cbo[ttom] cex[pr] cgete[xpr] cl[ist] cnew[er] comc[lear] cpf[ile] cuna[bbrev] delel delf[unction] dif[fupdate] difft[his] do e[dit] echon endfo[r] exu[sage] fin[d] foldc[lose] g h[elp] hi if is[earch] kee[pmarks] lNf[ile] lan[guage] lch[dir] lefta[bove] lgetb[uffer] ll lnew[er] lockv[ar] ls lvimgrepa[dd] mat[ch] mksp[ell]
+syn keyword vimCommand contained	ter[minal]
+
 syn match   vimCommand contained	"\<z[-+^.=]\=\>"
 syn keyword vimStdPlugin contained	DiffOrig Man N[ext] P[rint] S TOhtml XMLent XMLns
 
diff --git a/src/GvimExt/GvimExt.reg b/src/GvimExt/GvimExt.reg
index 860424484..2b8ebf08b 100644
--- a/src/GvimExt/GvimExt.reg
+++ b/src/GvimExt/GvimExt.reg
@@ -15,6 +15,6 @@ REGEDIT4
 [HKEY_LOCAL_MACHINE\Software\Vim\Gvim]
    "path"="gvim.exe"
 
-[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\Vim 8.0]
-   "DisplayName"="Vim 8.0: Edit with Vim popup menu entry"
+[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\Vim 8.1]
+   "DisplayName"="Vim 8.1: Edit with Vim popup menu entry"
    "UninstallString"="uninstal.exe"
diff --git a/src/Makefile b/src/Makefile
index 673875e58..98fd14220 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1035,7 +1035,7 @@ MAN1DIR = /man1
 
 ### Vim version (adjusted by a script)
 VIMMAJOR = 8
-VIMMINOR = 0
+VIMMINOR = 1
 
 ### Location of Vim files (should not need to be changed, and  {{{1
 ### some things might not work when they are changed!)
@@ -3454,271 +3454,272 @@ $(APPDIR)/Contents:
 ### (automatically generated by 'make depend')
 ### Dependencies:
 objects/arabic.o: arabic.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h
 objects/beval.o: beval.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h
 objects/blowfish.o: blowfish.c vim.h auto/config.h feature.h os_unix.h \
- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
- regexp.h gui.h alloc.h beval.h proto/beval.pro proto/gui_beval.pro \
- ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h
+ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
+ proto.h globals.h farsi.h arabic.h
 objects/buffer.o: buffer.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h version.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h version.h
 objects/charset.o: charset.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h
 objects/crypt.o: crypt.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h
 objects/crypt_zip.o: crypt_zip.c vim.h auto/config.h feature.h os_unix.h \
- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
- regexp.h gui.h alloc.h beval.h proto/beval.pro proto/gui_beval.pro \
- ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h
-objects/dict.o: dict.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
+ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
  proto.h globals.h farsi.h arabic.h
+objects/dict.o: dict.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h
 objects/diff.o: diff.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h
 objects/digraph.o: digraph.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h
 objects/edit.o: edit.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h
 objects/eval.o: eval.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h version.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h version.h
 objects/evalfunc.o: evalfunc.c vim.h auto/config.h feature.h os_unix.h \
- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
- regexp.h gui.h alloc.h beval.h proto/beval.pro proto/gui_beval.pro \
- ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h version.h
-objects/ex_cmds.o: ex_cmds.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
+ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
  proto.h globals.h farsi.h arabic.h version.h
+objects/ex_cmds.o: ex_cmds.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h version.h
 objects/ex_cmds2.o: ex_cmds2.c vim.h auto/config.h feature.h os_unix.h \
- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
- regexp.h gui.h alloc.h beval.h proto/beval.pro proto/gui_beval.pro \
- ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h version.h
+ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
+ proto.h globals.h farsi.h arabic.h version.h
 objects/ex_docmd.o: ex_docmd.c vim.h auto/config.h feature.h os_unix.h \
- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
- regexp.h gui.h alloc.h beval.h proto/beval.pro proto/gui_beval.pro \
- ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h ex_cmdidxs.h
+ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
+ proto.h globals.h farsi.h arabic.h ex_cmdidxs.h
 objects/ex_eval.o: ex_eval.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h
 objects/ex_getln.o: ex_getln.c vim.h auto/config.h feature.h os_unix.h \
- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
- regexp.h gui.h alloc.h beval.h proto/beval.pro proto/gui_beval.pro \
- ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h
-objects/farsi.o: farsi.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
+ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
  proto.h globals.h farsi.h arabic.h
+objects/farsi.o: farsi.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h
 objects/fileio.o: fileio.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h
 objects/fold.o: fold.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h
 objects/getchar.o: getchar.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h
 objects/hardcopy.o: hardcopy.c vim.h auto/config.h feature.h os_unix.h \
- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
- regexp.h gui.h alloc.h beval.h proto/beval.pro proto/gui_beval.pro \
- ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h version.h
+ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
+ proto.h globals.h farsi.h arabic.h version.h
 objects/hashtab.o: hashtab.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h
 objects/if_cscope.o: if_cscope.c vim.h auto/config.h feature.h os_unix.h \
- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
- regexp.h gui.h alloc.h beval.h proto/beval.pro proto/gui_beval.pro \
- ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h if_cscope.h
+ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
+ proto.h globals.h farsi.h arabic.h if_cscope.h
 objects/if_xcmdsrv.o: if_xcmdsrv.c vim.h auto/config.h feature.h os_unix.h \
- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
- regexp.h gui.h alloc.h beval.h proto/beval.pro proto/gui_beval.pro \
- ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h version.h
+ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
+ proto.h globals.h farsi.h arabic.h version.h
 objects/json.o: json.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h
 objects/list.o: list.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h
 objects/main.o: main.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h
 objects/mark.o: mark.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h
 objects/memfile.o: memfile.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h
 objects/memline.o: memline.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h
 objects/menu.o: menu.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h
 objects/message.o: message.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h
 objects/misc1.o: misc1.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h version.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h version.h
 objects/misc2.o: misc2.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h
 objects/move.o: move.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h
 objects/mbyte.o: mbyte.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h
 objects/normal.o: normal.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h
 objects/ops.o: ops.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h ascii.h \
- keymap.h term.h macros.h option.h structs.h regexp.h gui.h alloc.h \
- beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h proto.h \
- globals.h farsi.h arabic.h
+ keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro structs.h \
+ regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h farsi.h \
+ arabic.h
 objects/option.o: option.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h
 objects/os_unix.o: os_unix.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h if_mzsch.h os_unixx.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h if_mzsch.h os_unixx.h
 objects/pathdef.o: auto/pathdef.c vim.h auto/config.h feature.h os_unix.h \
- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
- regexp.h gui.h alloc.h beval.h proto/beval.pro proto/gui_beval.pro \
- ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h
+ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
+ proto.h globals.h farsi.h arabic.h
 objects/popupmnu.o: popupmnu.c vim.h auto/config.h feature.h os_unix.h \
- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
- regexp.h gui.h alloc.h beval.h proto/beval.pro proto/gui_beval.pro \
- ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h
+ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
+ proto.h globals.h farsi.h arabic.h
 objects/pty.o: pty.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h ascii.h \
- keymap.h term.h macros.h option.h structs.h regexp.h gui.h alloc.h \
- beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h proto.h \
- globals.h farsi.h arabic.h
+ keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro structs.h \
+ regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h farsi.h \
+ arabic.h
 objects/quickfix.o: quickfix.c vim.h auto/config.h feature.h os_unix.h \
- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
- regexp.h gui.h alloc.h beval.h proto/beval.pro proto/gui_beval.pro \
- ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h
+ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
+ proto.h globals.h farsi.h arabic.h
 objects/regexp.o: regexp.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h regexp_nfa.c
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h regexp_nfa.c
 objects/screen.o: screen.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h
 objects/search.o: search.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h
 objects/sha256.o: sha256.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h
 objects/spell.o: spell.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h
 objects/spellfile.o: spellfile.c vim.h auto/config.h feature.h os_unix.h \
- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
- regexp.h gui.h alloc.h beval.h proto/beval.pro proto/gui_beval.pro \
- ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h
-objects/syntax.o: syntax.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
+ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
  proto.h globals.h farsi.h arabic.h
+objects/syntax.o: syntax.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h
 objects/tag.o: tag.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h ascii.h \
- keymap.h term.h macros.h option.h structs.h regexp.h gui.h alloc.h \
- beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h proto.h \
- globals.h farsi.h arabic.h
+ keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro structs.h \
+ regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h farsi.h \
+ arabic.h
 objects/term.o: term.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h libvterm/include/vterm.h \
+ libvterm/include/vterm_keycodes.h
 objects/terminal.o: terminal.c vim.h auto/config.h feature.h os_unix.h \
- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
- regexp.h gui.h alloc.h beval.h proto/beval.pro proto/gui_beval.pro \
- ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h \
- libvterm/include/vterm.h libvterm/include/vterm_keycodes.h
+ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
+ proto.h globals.h farsi.h arabic.h libvterm/include/vterm.h \
+ libvterm/include/vterm_keycodes.h
 objects/ui.o: ui.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h ascii.h \
- keymap.h term.h macros.h option.h structs.h regexp.h gui.h alloc.h \
- beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h proto.h \
- globals.h farsi.h arabic.h
+ keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro structs.h \
+ regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h farsi.h \
+ arabic.h
 objects/undo.o: undo.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h
 objects/userfunc.o: userfunc.c vim.h auto/config.h feature.h os_unix.h \
- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
- regexp.h gui.h alloc.h beval.h proto/beval.pro proto/gui_beval.pro \
- ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h
+ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
+ proto.h globals.h farsi.h arabic.h
 objects/version.o: version.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h version.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h version.h
 objects/window.o: window.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h
 objects/gui.o: gui.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h ascii.h \
- keymap.h term.h macros.h option.h structs.h regexp.h gui.h alloc.h \
- beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h proto.h \
- globals.h farsi.h arabic.h
+ keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro structs.h \
+ regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h farsi.h \
+ arabic.h
 objects/gui_gtk.o: gui_gtk.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h gui_gtk_f.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h gui_gtk_f.h
 objects/gui_gtk_f.o: gui_gtk_f.c vim.h auto/config.h feature.h os_unix.h \
- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
- regexp.h gui.h alloc.h beval.h proto/beval.pro proto/gui_beval.pro \
- ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h gui_gtk_f.h
+ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
+ proto.h globals.h farsi.h arabic.h gui_gtk_f.h
 objects/gui_motif.o: gui_motif.c vim.h auto/config.h feature.h os_unix.h \
- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
- regexp.h gui.h alloc.h beval.h proto/beval.pro proto/gui_beval.pro \
- ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h gui_xmebw.h \
- ../pixmaps/alert.xpm ../pixmaps/error.xpm ../pixmaps/generic.xpm \
- ../pixmaps/info.xpm ../pixmaps/quest.xpm gui_x11_pm.h \
- ../pixmaps/tb_new.xpm ../pixmaps/tb_open.xpm ../pixmaps/tb_close.xpm \
- ../pixmaps/tb_save.xpm ../pixmaps/tb_print.xpm ../pixmaps/tb_cut.xpm \
- ../pixmaps/tb_copy.xpm ../pixmaps/tb_paste.xpm ../pixmaps/tb_find.xpm \
+ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
+ proto.h globals.h farsi.h arabic.h gui_xmebw.h ../pixmaps/alert.xpm \
+ ../pixmaps/error.xpm ../pixmaps/generic.xpm ../pixmaps/info.xpm \
+ ../pixmaps/quest.xpm gui_x11_pm.h ../pixmaps/tb_new.xpm \
+ ../pixmaps/tb_open.xpm ../pixmaps/tb_close.xpm ../pixmaps/tb_save.xpm \
+ ../pixmaps/tb_print.xpm ../pixmaps/tb_cut.xpm ../pixmaps/tb_copy.xpm \
+ ../pixmaps/tb_paste.xpm ../pixmaps/tb_find.xpm \
  ../pixmaps/tb_find_next.xpm ../pixmaps/tb_find_prev.xpm \
  ../pixmaps/tb_find_help.xpm ../pixmaps/tb_exit.xpm \
  ../pixmaps/tb_undo.xpm ../pixmaps/tb_redo.xpm ../pixmaps/tb_help.xpm \
@@ -3732,25 +3733,24 @@ objects/gui_motif.o: gui_motif.c vim.h auto/config.h feature.h os_unix.h \
  ../pixmaps/tb_vsplit.xpm ../pixmaps/tb_maxwidth.xpm \
  ../pixmaps/tb_minwidth.xpm
 objects/gui_xmdlg.o: gui_xmdlg.c vim.h auto/config.h feature.h os_unix.h \
- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
- regexp.h gui.h alloc.h beval.h proto/beval.pro proto/gui_beval.pro \
- ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h
+ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
+ proto.h globals.h farsi.h arabic.h
 objects/gui_xmebw.o: gui_xmebw.c vim.h auto/config.h feature.h os_unix.h \
- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
- regexp.h gui.h alloc.h beval.h proto/beval.pro proto/gui_beval.pro \
- ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h gui_xmebwp.h \
- gui_xmebw.h
+ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
+ proto.h globals.h farsi.h arabic.h gui_xmebwp.h gui_xmebw.h
 objects/gui_athena.o: gui_athena.c vim.h auto/config.h feature.h os_unix.h \
- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
- regexp.h gui.h alloc.h beval.h proto/beval.pro proto/gui_beval.pro \
- ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h gui_at_sb.h \
- gui_x11_pm.h ../pixmaps/tb_new.xpm ../pixmaps/tb_open.xpm \
- ../pixmaps/tb_close.xpm ../pixmaps/tb_save.xpm ../pixmaps/tb_print.xpm \
- ../pixmaps/tb_cut.xpm ../pixmaps/tb_copy.xpm ../pixmaps/tb_paste.xpm \
- ../pixmaps/tb_find.xpm ../pixmaps/tb_find_next.xpm \
- ../pixmaps/tb_find_prev.xpm ../pixmaps/tb_find_help.xpm \
- ../pixmaps/tb_exit.xpm ../pixmaps/tb_undo.xpm ../pixmaps/tb_redo.xpm \
- ../pixmaps/tb_help.xpm ../pixmaps/tb_macro.xpm ../pixmaps/tb_make.xpm \
+ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
+ proto.h globals.h farsi.h arabic.h gui_at_sb.h gui_x11_pm.h \
+ ../pixmaps/tb_new.xpm ../pixmaps/tb_open.xpm ../pixmaps/tb_close.xpm \
+ ../pixmaps/tb_save.xpm ../pixmaps/tb_print.xpm ../pixmaps/tb_cut.xpm \
+ ../pixmaps/tb_copy.xpm ../pixmaps/tb_paste.xpm ../pixmaps/tb_find.xpm \
+ ../pixmaps/tb_find_next.xpm ../pixmaps/tb_find_prev.xpm \
+ ../pixmaps/tb_find_help.xpm ../pixmaps/tb_exit.xpm \
+ ../pixmaps/tb_undo.xpm ../pixmaps/tb_redo.xpm ../pixmaps/tb_help.xpm \
+ ../pixmaps/tb_macro.xpm ../pixmaps/tb_make.xpm \
  ../pixmaps/tb_save_all.xpm ../pixmaps/tb_jump.xpm \
  ../pixmaps/tb_ctags.xpm ../pixmaps/tb_load_session.xpm \
  ../pixmaps/tb_save_session.xpm ../pixmaps/tb_new_session.xpm \
@@ -3760,99 +3760,94 @@ objects/gui_athena.o: gui_athena.c vim.h auto/config.h feature.h os_unix.h \
  ../pixmaps/tb_vsplit.xpm ../pixmaps/tb_maxwidth.xpm \
  ../pixmaps/tb_minwidth.xpm
 objects/gui_gtk_x11.o: gui_gtk_x11.c vim.h auto/config.h feature.h os_unix.h \
- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
- regexp.h gui.h alloc.h beval.h proto/beval.pro proto/gui_beval.pro \
- ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h \
- auto/gui_gtk_gresources.h gui_gtk_f.h ../runtime/vim32x32.xpm \
- ../runtime/vim16x16.xpm ../runtime/vim48x48.xpm
+ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
+ proto.h globals.h farsi.h arabic.h auto/gui_gtk_gresources.h gui_gtk_f.h \
+ ../runtime/vim32x32.xpm ../runtime/vim16x16.xpm ../runtime/vim48x48.xpm
 objects/gui_x11.o: gui_x11.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h ../runtime/vim32x32.xpm \
- ../runtime/vim16x16.xpm ../runtime/vim48x48.xpm
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h ../runtime/vim32x32.xpm ../runtime/vim16x16.xpm \
+ ../runtime/vim48x48.xpm
 objects/gui_at_sb.o: gui_at_sb.c vim.h auto/config.h feature.h os_unix.h \
- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
- regexp.h gui.h alloc.h beval.h proto/beval.pro proto/gui_beval.pro \
- ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h gui_at_sb.h
+ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
+ proto.h globals.h farsi.h arabic.h gui_at_sb.h
 objects/gui_at_fs.o: gui_at_fs.c vim.h auto/config.h feature.h os_unix.h \
- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
- regexp.h gui.h alloc.h beval.h proto/beval.pro proto/gui_beval.pro \
- ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h gui_at_sb.h
+ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
+ proto.h globals.h farsi.h arabic.h gui_at_sb.h
 objects/json_test.o: json_test.c main.c vim.h auto/config.h feature.h os_unix.h \
- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
- regexp.h gui.h alloc.h beval.h proto/beval.pro proto/gui_beval.pro \
- ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h json.c
+ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
+ proto.h globals.h farsi.h arabic.h json.c
 objects/kword_test.o: kword_test.c main.c vim.h auto/config.h feature.h os_unix.h \
- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
- regexp.h gui.h alloc.h beval.h proto/beval.pro proto/gui_beval.pro \
- ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h charset.c
+ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
+ proto.h globals.h farsi.h arabic.h charset.c
 objects/memfile_test.o: memfile_test.c main.c vim.h auto/config.h feature.h \
- os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h \
- structs.h regexp.h gui.h alloc.h beval.h proto/beval.pro \
- proto/gui_beval.pro ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h \
- memfile.c
+ os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
+ proto.h globals.h farsi.h arabic.h memfile.c
 objects/message_test.o: message_test.c main.c vim.h auto/config.h feature.h \
- os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h \
- structs.h regexp.h gui.h alloc.h beval.h proto/beval.pro \
- proto/gui_beval.pro ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h \
- message.c
+ os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
+ proto.h globals.h farsi.h arabic.h message.c
 objects/hangulin.o: hangulin.c vim.h auto/config.h feature.h os_unix.h \
- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
- regexp.h gui.h alloc.h beval.h proto/beval.pro proto/gui_beval.pro \
- ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h
-objects/if_lua.o: if_lua.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
+ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
  proto.h globals.h farsi.h arabic.h
+objects/if_lua.o: if_lua.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h
 objects/if_mzsch.o: if_mzsch.c vim.h auto/config.h feature.h os_unix.h \
- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
- regexp.h gui.h alloc.h beval.h proto/beval.pro proto/gui_beval.pro \
- ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h if_mzsch.h \
- mzscheme_base.c
+ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
+ proto.h globals.h farsi.h arabic.h if_mzsch.h mzscheme_base.c
 objects/if_perl.o: auto/if_perl.c vim.h auto/config.h feature.h os_unix.h \
- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
- regexp.h gui.h alloc.h beval.h proto/beval.pro proto/gui_beval.pro \
- ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h
+ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
+ proto.h globals.h farsi.h arabic.h
 objects/if_perlsfio.o: if_perlsfio.c vim.h auto/config.h feature.h os_unix.h \
- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
- regexp.h gui.h alloc.h beval.h proto/beval.pro proto/gui_beval.pro \
- ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h
+ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
+ proto.h globals.h farsi.h arabic.h
 objects/if_python.o: if_python.c vim.h auto/config.h feature.h os_unix.h \
- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
- regexp.h gui.h alloc.h beval.h proto/beval.pro proto/gui_beval.pro \
- ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h if_py_both.h
+ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
+ proto.h globals.h farsi.h arabic.h if_py_both.h
 objects/if_python3.o: if_python3.c vim.h auto/config.h feature.h os_unix.h \
- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
- regexp.h gui.h alloc.h beval.h proto/beval.pro proto/gui_beval.pro \
- ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h if_py_both.h
+ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
+ proto.h globals.h farsi.h arabic.h if_py_both.h
 objects/if_tcl.o: if_tcl.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h
 objects/if_ruby.o: if_ruby.c auto/config.h vim.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h version.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h version.h
 objects/gui_beval.o: gui_beval.c vim.h auto/config.h feature.h os_unix.h \
- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
- regexp.h gui.h alloc.h beval.h proto/beval.pro proto/gui_beval.pro \
- ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h
+ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
+ proto.h globals.h farsi.h arabic.h
 objects/workshop.o: workshop.c auto/config.h integration.h vim.h feature.h \
- os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h \
- structs.h regexp.h gui.h alloc.h beval.h proto/beval.pro \
- proto/gui_beval.pro ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h \
- version.h workshop.h
+ os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
+ proto.h globals.h farsi.h arabic.h version.h workshop.h
 objects/wsdebug.o: wsdebug.c
 objects/integration.o: integration.c vim.h auto/config.h feature.h os_unix.h \
- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
- regexp.h gui.h alloc.h beval.h proto/beval.pro proto/gui_beval.pro \
- ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h integration.h
+ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
+ proto.h globals.h farsi.h arabic.h integration.h
 objects/netbeans.o: netbeans.c vim.h auto/config.h feature.h os_unix.h \
- auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
- regexp.h gui.h alloc.h beval.h proto/beval.pro proto/gui_beval.pro \
- ex_cmds.h spell.h proto.h globals.h farsi.h arabic.h version.h
+ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
+ proto.h globals.h farsi.h arabic.h version.h
 objects/channel.o: channel.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
- ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
- alloc.h beval.h proto/beval.pro proto/gui_beval.pro ex_cmds.h spell.h \
- proto.h globals.h farsi.h arabic.h
+ ascii.h keymap.h term.h macros.h option.h beval.h proto/gui_beval.pro \
+ structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h \
+ farsi.h arabic.h
 objects/gui_gtk_gresources.o: auto/gui_gtk_gresources.c
diff --git a/src/gui_w32.c b/src/gui_w32.c
index 25fbe9f75..350b6fc43 100644
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -286,6 +286,8 @@ typedef int LPNMHDR;
 typedef int LONG;
 typedef int WNDPROC;
 typedef int UINT_PTR;
+typedef int COLORREF;
+typedef int HCURSOR;
 #endif
 
 #ifndef GET_X_LPARAM
diff --git a/src/gvim.exe.mnf b/src/gvim.exe.mnf
index 21ccfcec2..dd8f22596 100644
--- a/src/gvim.exe.mnf
+++ b/src/gvim.exe.mnf
@@ -2,7 +2,7 @@
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" >
   <assemblyIdentity
     processorArchitecture="*"
-    version="8.0.0.0"
+    version="8.1.0.0"
     type="win32"
     name="Vim"
   />
diff --git a/src/proto/evalfunc.pro b/src/proto/evalfunc.pro
index 279c82404..c79b59c0d 100644
--- a/src/proto/evalfunc.pro
+++ b/src/proto/evalfunc.pro
@@ -1,10 +1,10 @@
 /* evalfunc.c */
-buf_T* get_buf_tv(typval_T *tv, int curtab_only);
 char_u *get_function_name(expand_T *xp, int idx);
 char_u *get_expr_name(expand_T *xp, int idx);
 int find_internal_func(char_u *name);
 int call_internal_func(char_u *name, int argcount, typval_T *argvars, typval_T *rettv);
 buf_T *buflist_find_by_name(char_u *name, int curtab_only);
+buf_T *get_buf_tv(typval_T *tv, int curtab_only);
 void execute_redir_str(char_u *value, int value_len);
 void mzscheme_call_vim(char_u *name, typval_T *args, typval_T *rettv);
 float_T vim_round(float_T f);
diff --git a/src/proto/fold.pro b/src/proto/fold.pro
index cda536b27..d8e349420 100644
--- a/src/proto/fold.pro
+++ b/src/proto/fold.pro
@@ -31,12 +31,12 @@ void foldInitWin(win_T *new_win);
 int find_wl_entry(win_T *win, linenr_T lnum);
 void foldAdjustVisual(void);
 void foldAdjustCursor(void);
-void foldMoveRange(garray_T *gap, linenr_T line1, linenr_T line2, linenr_T dest);
 void cloneFoldGrowArray(garray_T *from, garray_T *to);
 void deleteFoldRecurse(garray_T *gap);
 void foldMarkAdjust(win_T *wp, linenr_T line1, linenr_T line2, long amount, long amount_after);
 int getDeepestNesting(void);
 char_u *get_foldtext(win_T *wp, linenr_T lnum, linenr_T lnume, foldinfo_T *foldinfo, char_u *buf);
 void foldtext_cleanup(char_u *str);
+void foldMoveRange(garray_T *gap, linenr_T line1, linenr_T line2, linenr_T dest);
 int put_folds(FILE *fd, win_T *wp);
 /* vim: set ft=c : */
diff --git a/src/proto/mark.pro b/src/proto/mark.pro
index 448b45273..623a0599e 100644
--- a/src/proto/mark.pro
+++ b/src/proto/mark.pro
@@ -22,9 +22,9 @@ void ex_changes(exarg_T *eap);
 void mark_adjust(linenr_T line1, linenr_T line2, long amount, long amount_after);
 void mark_adjust_nofold(linenr_T line1, linenr_T line2, long amount, long amount_after);
 void mark_col_adjust(linenr_T lnum, colnr_T mincol, long lnum_amount, long col_amount);
+void cleanup_jumplist(win_T *wp, int loadfiles);
 void copy_jumplist(win_T *from, win_T *to);
 void free_jumplist(win_T *wp);
-void cleanup_jumplist(win_T *wp, int loadfiles);
 void set_last_cursor(win_T *win);
 void free_all_marks(void);
 int read_viminfo_filemark(vir_T *virp, int force);
diff --git a/src/proto/misc1.pro b/src/proto/misc1.pro
index 4b613e6b1..0e1d22e60 100644
--- a/src/proto/misc1.pro
+++ b/src/proto/misc1.pro
@@ -1,5 +1,4 @@
 /* misc1.c */
-int get_whitespace_line_start(linenr_T lnum);
 int get_indent(void);
 int get_indent_lnum(linenr_T lnum);
 int get_indent_buf(buf_T *buf, linenr_T lnum);
@@ -59,8 +58,8 @@ char_u *expand_env_save_opt(char_u *src, int one);
 void expand_env(char_u *src, char_u *dst, int dstlen);
 void expand_env_esc(char_u *srcp, char_u *dst, int dstlen, int esc, int one, char_u *startstr);
 char_u *vim_getenv(char_u *name, int *mustfree);
+void vim_unsetenv(char_u *var);
 void vim_setenv(char_u *name, char_u *val);
-void vim_unsetenv(char_u *name);
 char_u *get_env_name(expand_T *xp, int idx);
 char_u *get_users(expand_T *xp, int idx);
 int match_user(char_u *name);
diff --git a/src/proto/ops.pro b/src/proto/ops.pro
index b00cc50a4..13e063e27 100644
--- a/src/proto/ops.pro
+++ b/src/proto/ops.pro
@@ -21,7 +21,7 @@ int do_record(int c);
 int do_execreg(int regname, int colon, int addcr, int silent);
 int insert_reg(int regname, int literally_arg);
 int get_spec_reg(int regname, char_u **argp, int *allocated, int errmsg);
-int cmdline_paste_reg(int regname, int literally, int remcr);
+int cmdline_paste_reg(int regname, int literally_arg, int remcr);
 void adjust_clip_reg(int *rp);
 void shift_delete_registers(void);
 int op_delete(oparg_T *oap);
diff --git a/src/proto/os_unix.pro b/src/proto/os_unix.pro
index fbdad1570..5d90c0e84 100644
--- a/src/proto/os_unix.pro
+++ b/src/proto/os_unix.pro
@@ -60,7 +60,6 @@ int mch_get_shellsize(void);
 int mch_report_winsize(int fd, int rows, int cols);
 void mch_set_shellsize(void);
 void mch_new_shellsize(void);
-int mch_parse_cmd(char_u *cmd, int use_shcf, char ***argv, int *argc);
 void may_send_sigint(int c, pid_t pid, pid_t wpid);
 int mch_call_shell(char_u *cmd, int options);
 void mch_job_start(char **argv, job_T *job, jobopt_T *options);
diff --git a/src/proto/popupmnu.pro b/src/proto/popupmnu.pro
index 8fd4ac90f..d5e1bbd23 100644
--- a/src/proto/popupmnu.pro
+++ b/src/proto/popupmnu.pro
@@ -10,5 +10,5 @@ void ui_remove_balloon(void);
 void ui_post_balloon(char_u *mesg, list_T *list);
 void ui_may_remove_balloon(void);
 void pum_show_popupmenu(vimmenu_T *menu);
-void pum_make_popup(char_u *path_name, int mouse_pos);
+void pum_make_popup(char_u *path_name, int use_mouse_pos);
 /* vim: set ft=c : */
diff --git a/src/proto/quickfix.pro b/src/proto/quickfix.pro
index a801edd0e..d32655f07 100644
--- a/src/proto/quickfix.pro
+++ b/src/proto/quickfix.pro
@@ -21,7 +21,7 @@ void ex_cc(exarg_T *eap);
 void ex_cnext(exarg_T *eap);
 void ex_cfile(exarg_T *eap);
 void ex_vimgrep(exarg_T *eap);
-int get_errorlist(qf_info_T *qi, win_T *wp, int qf_idx, list_T *list);
+int get_errorlist(qf_info_T *qi_arg, win_T *wp, int qf_idx, list_T *list);
 int qf_get_properties(win_T *wp, dict_T *what, dict_T *retdict);
 int set_errorlist(win_T *wp, list_T *list, int action, char_u *title, dict_T *what);
 int set_ref_in_quickfix(int copyID);
diff --git a/src/proto/search.pro b/src/proto/search.pro
index 4e63bf31a..eeaa37cdd 100644
--- a/src/proto/search.pro
+++ b/src/proto/search.pro
@@ -5,10 +5,10 @@ char_u *reverse_text(char_u *s);
 void save_re_pat(int idx, char_u *pat, int magic);
 void save_search_patterns(void);
 void restore_search_patterns(void);
+void free_search_patterns(void);
 void save_last_search_pattern(void);
 void restore_last_search_pattern(void);
 char_u *last_search_pattern(void);
-void free_search_patterns(void);
 int ignorecase(char_u *pat);
 int ignorecase_opt(char_u *pat, int ic_in, int scs);
 int pat_has_uppercase(char_u *pat);
diff --git a/src/proto/window.pro b/src/proto/window.pro
index e53123c55..b21b4633f 100644
--- a/src/proto/window.pro
+++ b/src/proto/window.pro
@@ -27,7 +27,7 @@ int may_open_tabpage(void);
 int make_tabpages(int maxcount);
 int valid_tabpage(tabpage_T *tpc);
 int valid_tabpage_win(tabpage_T *tpc);
-void close_tabpage(tabpage_T *tpc);
+void close_tabpage(tabpage_T *tab);
 tabpage_T *find_tabpage(int n);
 int tabpage_index(tabpage_T *ftp);
 void goto_tabpage(int n);
diff --git a/src/testdir/test_normal.vim b/src/testdir/test_normal.vim
index 2d1446bfd..857294f06 100644
--- a/src/testdir/test_normal.vim
+++ b/src/testdir/test_normal.vim
@@ -1313,7 +1313,7 @@ func! Test_normal23_K()
   norm! 0K
   call assert_equal('version8.txt', fnamemodify(bufname('%'), ':t'))
   call assert_equal('help', &ft)
-  call assert_match('\*version8\.0\*', getline('.'))
+  call assert_match('\*version8\.\d\*', getline('.'))
   helpclose
 
   set keywordprg=:new
diff --git a/src/testdir/test_xxd.vim b/src/testdir/test_xxd.vim
index 0ddcff036..6e6789329 100644
--- a/src/testdir/test_xxd.vim
+++ b/src/testdir/test_xxd.vim
@@ -52,7 +52,11 @@ func! Test_xxd()
   " Test 5: Print 120 bytes as continuous hexdump with 20 octets per line
   let s:test += 1
   %d
-  exe '0r! ' . s:xxd_cmd . ' -l 120 -ps -c 20 ../../runtime/doc/xxd.1'
+  let fname = '../../runtime/doc/xxd.1'
+  if has('win32') && !filereadable(fname)
+    let fname = '../../doc/xxd.1'
+  endif
+  exe '0r! ' . s:xxd_cmd . ' -l 120 -ps -c 20 ' . fname
   $d
   let expected = [
       \ '2e54482058584420312022417567757374203139',
@@ -66,7 +70,7 @@ func! Test_xxd()
   " Test 6: Print the date from xxd.1
   let s:test += 1
   %d
-  exe '0r! ' . s:xxd_cmd . ' -s 0x36 -l 13 -c 13 ../../runtime/doc/xxd.1'
+  exe '0r! ' . s:xxd_cmd . ' -s 0x36 -l 13 -c 13 ' . fname
   $d
   call assert_equal('00000036: 3231 7374 204d 6179 2031 3939 36  21st May 1996', getline(1), s:Mess(s:test))
 
diff --git a/src/version.c b/src/version.c
index 27d87a600..8ff2445d9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -761,3706 +761,6 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
-/**/
-    1850,
-/**/
-    1849,
-/**/
-    1848,
-/**/
-    1847,
-/**/
-    1846,
-/**/
-    1845,
-/**/
-    1844,
-/**/
-    1843,
-/**/
-    1842,
-/**/
-    1841,
-/**/
-    1840,
-/**/
-    1839,
-/**/
-    1838,
-/**/
-    1837,
-/**/
-    1836,
-/**/
-    1835,
-/**/
-    1834,
-/**/
-    1833,
-/**/
-    1832,
-/**/
-    1831,
-/**/
-    1830,
-/**/
-    1829,
-/**/
-    1828,
-/**/
-    1827,
-/**/
-    1826,
-/**/
-    1825,
-/**/
-    1824,
-/**/
-    1823,
-/**/
-    1822,
-/**/
-    1821,
-/**/
-    1820,
-/**/
-    1819,
-/**/
-    1818,
-/**/
-    1817,
-/**/
-    1816,
-/**/
-    1815,
-/**/
-    1814,
-/**/
-    1813,
-/**/
-    1812,
-/**/
-    1811,
-/**/
-    1810,
-/**/
-    1809,
-/**/
-    1808,
-/**/
-    1807,
-/**/
-    1806,
-/**/
-    1805,
-/**/
-    1804,
-/**/
-    1803,
-/**/
-    1802,
-/**/
-    1801,
-/**/
-    1800,
-/**/
-    1799,
-/**/
-    1798,
-/**/
-    1797,
-/**/
-    1796,
-/**/
-    1795,
-/**/
-    1794,
-/**/
-    1793,
-/**/
-    1792,
-/**/
-    1791,
-/**/
-    1790,
-/**/
-    1789,
-/**/
-    1788,
-/**/
-    1787,
-/**/
-    1786,
-/**/
-    1785,
-/**/
-    1784,
-/**/
-    1783,
-/**/
-    1782,
-/**/
-    1781,
-/**/
-    1780,
-/**/
-    1779,
-/**/
-    1778,
-/**/
-    1777,
-/**/
-    1776,
-/**/
-    1775,
-/**/
-    1774,
-/**/
-    1773,
-/**/
-    1772,
-/**/
-    1771,
-/**/
-    1770,
-/**/
-    1769,
-/**/
-    1768,
-/**/
-    1767,
-/**/
-    1766,
-/**/
-    1765,
-/**/
-    1764,
-/**/
-    1763,
-/**/
-    1762,
-/**/
-    1761,
-/**/
-    1760,
-/**/
-    1759,
-/**/
-    1758,
-/**/
-    1757,
-/**/
-    1756,
-/**/
-    1755,
-/**/
-    1754,
-/**/
-    1753,
-/**/
-    1752,
-/**/
-    1751,
-/**/
-    1750,
-/**/
-    1749,
-/**/
-    1748,
-/**/
-    1747,
-/**/
-    1746,
-/**/
-    1745,
-/**/
-    1744,
-/**/
-    1743,
-/**/
-    1742,
-/**/
-    1741,
-/**/
-    1740,
-/**/
-    1739,
-/**/
-    1738,
-/**/
-    1737,
-/**/
-    1736,
-/**/
-    1735,
-/**/
-    1734,
-/**/
-    1733,
-/**/
-    1732,
-/**/
-    1731,
-/**/
-    1730,
-/**/
-    1729,
-/**/
-    1728,
-/**/
-    1727,
-/**/
-    1726,
-/**/
-    1725,
-/**/
-    1724,
-/**/
-    1723,
-/**/
-    1722,
-/**/
-    1721,
-/**/
-    1720,
-/**/
-    1719,
-/**/
-    1718,
-/**/
-    1717,
-/**/
-    1716,
-/**/
-    1715,
-/**/
-    1714,
-/**/
-    1713,
-/**/
-    1712,
-/**/
-    1711,
-/**/
-    1710,
-/**/
-    1709,
-/**/
-    1708,
-/**/
-    1707,
-/**/
-    1706,
-/**/
-    1705,
-/**/
-    1704,
-/**/
-    1703,
-/**/
-    1702,
-/**/
-    1701,
-/**/
-    1700,
-/**/
-    1699,
-/**/
-    1698,
-/**/
-    1697,
-/**/
-    1696,
-/**/
-    1695,
-/**/
-    1694,
-/**/
-    1693,
-/**/
-    1692,
-/**/
-    1691,
-/**/
-    1690,
-/**/
-    1689,
-/**/
-    1688,
-/**/
-    1687,
-/**/
-    1686,
-/**/
-    1685,
-/**/
-    1684,
-/**/
-    1683,
-/**/
-    1682,
-/**/
-    1681,
-/**/
-    1680,
-/**/
-    1679,
-/**/
-    1678,
-/**/
-    1677,
-/**/
-    1676,
-/**/
-    1675,
-/**/
-    1674,
-/**/
-    1673,
-/**/
-    1672,
-/**/
-    1671,
-/**/
-    1670,
-/**/
-    1669,
-/**/
-    1668,
-/**/
-    1667,
-/**/
-    1666,
-/**/
-    1665,
-/**/
-    1664,
-/**/
-    1663,
-/**/
-    1662,
-/**/
-    1661,
-/**/
-    1660,
-/**/
-    1659,
-/**/
-    1658,
-/**/
-    1657,
-/**/
-    1656,
-/**/
-    1655,
-/**/
-    1654,
-/**/
-    1653,
-/**/
-    1652,
-/**/
-    1651,
-/**/
-    1650,
-/**/
-    1649,
-/**/
-    1648,
-/**/
-    1647,
-/**/
-    1646,
-/**/
-    1645,
-/**/
-    1644,
-/**/
-    1643,
-/**/
-    1642,
-/**/
-    1641,
-/**/
-    1640,
-/**/
-    1639,
-/**/
-    1638,
-/**/
-    1637,
-/**/
-    1636,
-/**/
-    1635,
-/**/
-    1634,
-/**/
-    1633,
-/**/
-    1632,
-/**/
-    1631,
-/**/
-    1630,
-/**/
-    1629,
-/**/
-    1628,
-/**/
-    1627,
-/**/
-    1626,
-/**/
-    1625,
-/**/
-    1624,
-/**/
-    1623,
-/**/
-    1622,
-/**/
-    1621,
-/**/
-    1620,
-/**/
-    1619,
-/**/
-    1618,
-/**/
-    1617,
-/**/
-    1616,
-/**/
-    1615,
-/**/
-    1614,
-/**/
-    1613,
-/**/
-    1612,
-/**/
-    1611,
-/**/
-    1610,
-/**/
-    1609,
-/**/
-    1608,
-/**/
-    1607,
-/**/
-    1606,
-/**/
-    1605,
-/**/
-    1604,
-/**/
-    1603,
-/**/
-    1602,
-/**/
-    1601,
-/**/
-    1600,
-/**/
-    1599,
-/**/
-    1598,
-/**/
-    1597,
-/**/
-    1596,
-/**/
-    1595,
-/**/
-    1594,
-/**/
-    1593,
-/**/
-    1592,
-/**/
-    1591,
-/**/
-    1590,
-/**/
-    1589,
-/**/
-    1588,
-/**/
-    1587,
-/**/
-    1586,
-/**/
-    1585,
-/**/
-    1584,
-/**/
-    1583,
-/**/
-    1582,
-/**/
-    1581,
-/**/
-    1580,
-/**/
-    1579,
-/**/
-    1578,
-/**/
-    1577,
-/**/
-    1576,
-/**/
-    1575,
-/**/
-    1574,
-/**/
-    1573,
-/**/
-    1572,
-/**/
-    1571,
-/**/
-    1570,
-/**/
-    1569,
-/**/
-    1568,
-/**/
-    1567,
-/**/
-    1566,
-/**/
-    1565,
-/**/
-    1564,
-/**/
-    1563,
-/**/
-    1562,
-/**/
-    1561,
-/**/
-    1560,
-/**/
-    1559,
-/**/
-    1558,
-/**/
-    1557,
-/**/
-    1556,
-/**/
-    1555,
-/**/
-    1554,
-/**/
-    1553,
-/**/
-    1552,
-/**/
-    1551,
-/**/
-    1550,
-/**/
-    1549,
-/**/
-    1548,
-/**/
-    1547,
-/**/
-    1546,
-/**/
-    1545,
-/**/
-    1544,
-/**/
-    1543,
-/**/
-    1542,
-/**/
-    1541,
-/**/
-    1540,
-/**/
-    1539,
-/**/
-    1538,
-/**/
-    1537,
-/**/
-    1536,
-/**/
-    1535,
-/**/
-    1534,
-/**/
-    1533,
-/**/
-    1532,
-/**/
-    1531,
-/**/
-    1530,
-/**/
-    1529,
-/**/
-    1528,
-/**/
-    1527,
-/**/
-    1526,
-/**/
-    1525,
-/**/
-    1524,
-/**/
-    1523,
-/**/
-    1522,
-/**/
-    1521,
-/**/
-    1520,
-/**/
-    1519,
-/**/
-    1518,
-/**/
-    1517,
-/**/
-    1516,
-/**/
-    1515,
-/**/
-    1514,
-/**/
-    1513,
-/**/
-    1512,
-/**/
-    1511,
-/**/
-    1510,
-/**/
-    1509,
-/**/
-    1508,
-/**/
-    1507,
-/**/
-    1506,
-/**/
-    1505,
-/**/
-    1504,
-/**/
-    1503,
-/**/
-    1502,
-/**/
-    1501,
-/**/
-    1500,
-/**/
-    1499,
-/**/
-    1498,
-/**/
-    1497,
-/**/
-    1496,
-/**/
-    1495,
-/**/
-    1494,
-/**/
-    1493,
-/**/
-    1492,
-/**/
-    1491,
-/**/
-    1490,
-/**/
-    1489,
-/**/
-    1488,
-/**/
-    1487,
-/**/
-    1486,
-/**/
-    1485,
-/**/
-    1484,
-/**/
-    1483,
-/**/
-    1482,
-/**/
-    1481,
-/**/
-    1480,
-/**/
-    1479,
-/**/
-    1478,
-/**/
-    1477,
-/**/
-    1476,
-/**/
-    1475,
-/**/
-    1474,
-/**/
-    1473,
-/**/
-    1472,
-/**/
-    1471,
-/**/
-    1470,
-/**/
-    1469,
-/**/
-    1468,
-/**/
-    1467,
-/**/
-    1466,
-/**/
-    1465,
-/**/
-    1464,
-/**/
-    1463,
-/**/
-    1462,
-/**/
-    1461,
-/**/
-    1460,
-/**/
-    1459,
-/**/
-    1458,
-/**/
-    1457,
-/**/
-    1456,
-/**/
-    1455,
-/**/
-    1454,
-/**/
-    1453,
-/**/
-    1452,
-/**/
-    1451,
-/**/
-    1450,
-/**/
-    1449,
-/**/
-    1448,
-/**/
-    1447,
-/**/
-    1446,
-/**/
-    1445,
-/**/
-    1444,
-/**/
-    1443,
-/**/
-    1442,
-/**/
-    1441,
-/**/
-    1440,
-/**/
-    1439,
-/**/
-    1438,
-/**/
-    1437,
-/**/
-    1436,
-/**/
-    1435,
-/**/
-    1434,
-/**/
-    1433,
-/**/
-    1432,
-/**/
-    1431,
-/**/
-    1430,
-/**/
-    1429,
-/**/
-    1428,
-/**/
-    1427,
-/**/
-    1426,
-/**/
-    1425,
-/**/
-    1424,
-/**/
-    1423,
-/**/
-    1422,
-/**/
-    1421,
-/**/
-    1420,
-/**/
-    1419,
-/**/
-    1418,
-/**/
-    1417,
-/**/
-    1416,
-/**/
-    1415,
-/**/
-    1414,
-/**/
-    1413,
-/**/
-    1412,
-/**/
-    1411,
-/**/
-    1410,
-/**/
-    1409,
-/**/
-    1408,
-/**/
-    1407,
-/**/
-    1406,
-/**/
-    1405,
-/**/
-    1404,
-/**/
-    1403,
-/**/
-    1402,
-/**/
-    1401,
-/**/
-    1400,
-/**/
-    1399,
-/**/
-    1398,
-/**/
-    1397,
-/**/
-    1396,
-/**/
-    1395,
-/**/
-    1394,
-/**/
-    1393,
-/**/
-    1392,
-/**/
-    1391,
-/**/
-    1390,
-/**/
-    1389,
-/**/
-    1388,
-/**/
-    1387,
-/**/
-    1386,
-/**/
-    1385,
-/**/
-    1384,
-/**/
-    1383,
-/**/
-    1382,
-/**/
-    1381,
-/**/
-    1380,
-/**/
-    1379,
-/**/
-    1378,
-/**/
-    1377,
-/**/
-    1376,
-/**/
-    1375,
-/**/
-    1374,
-/**/
-    1373,
-/**/
-    1372,
-/**/
-    1371,
-/**/
-    1370,
-/**/
-    1369,
-/**/
-    1368,
-/**/
-    1367,
-/**/
-    1366,
-/**/
-    1365,
-/**/
-    1364,
-/**/
-    1363,
-/**/
-    1362,
-/**/
-    1361,
-/**/
-    1360,
-/**/
-    1359,
-/**/
-    1358,
-/**/
-    1357,
-/**/
-    1356,
-/**/
-    1355,
-/**/
-    1354,
-/**/
-    1353,
-/**/
-    1352,
-/**/
-    1351,
-/**/
-    1350,
-/**/
-    1349,
-/**/
-    1348,
-/**/
-    1347,
-/**/
-    1346,
-/**/
-    1345,
-/**/
-    1344,
-/**/
-    1343,
-/**/
-    1342,
-/**/
-    1341,
-/**/
-    1340,
-/**/
-    1339,
-/**/
-    1338,
-/**/
-    1337,
-/**/
-    1336,
-/**/
-    1335,
-/**/
-    1334,
-/**/
-    1333,
-/**/
-    1332,
-/**/
-    1331,
-/**/
-    1330,
-/**/
-    1329,
-/**/
-    1328,
-/**/
-    1327,
-/**/
-    1326,
-/**/
-    1325,
-/**/
-    1324,
-/**/
-    1323,
-/**/
-    1322,
-/**/
-    1321,
-/**/
-    1320,
-/**/
-    1319,
-/**/
-    1318,
-/**/
-    1317,
-/**/
-    1316,
-/**/
-    1315,
-/**/
-    1314,
-/**/
-    1313,
-/**/
-    1312,
-/**/
-    1311,
-/**/
-    1310,
-/**/
-    1309,
-/**/
-    1308,
-/**/
-    1307,
-/**/
-    1306,
-/**/
-    1305,
-/**/
-    1304,
-/**/
-    1303,
-/**/
-    1302,
-/**/
-    1301,
-/**/
-    1300,
-/**/
-    1299,
-/**/
-    1298,
-/**/
-    1297,
-/**/
-    1296,
-/**/
-    1295,
-/**/
-    1294,
-/**/
-    1293,
-/**/
-    1292,
-/**/
-    1291,
-/**/
-    1290,
-/**/
-    1289,
-/**/
-    1288,
-/**/
-    1287,
-/**/
-    1286,
-/**/
-    1285,
-/**/
-    1284,
-/**/
-    1283,
-/**/
-    1282,
-/**/
-    1281,
-/**/
-    1280,
-/**/
-    1279,
-/**/
-    1278,
-/**/
-    1277,
-/**/
-    1276,
-/**/
-    1275,
-/**/
-    1274,
-/**/
-    1273,
-/**/
-    1272,
-/**/
-    1271,
-/**/
-    1270,
-/**/
-    1269,
-/**/
-    1268,
-/**/
-    1267,
-/**/
-    1266,
-/**/
-    1265,
-/**/
-    1264,
-/**/
-    1263,
-/**/
-    1262,
-/**/
-    1261,
-/**/
-    1260,
-/**/
-    1259,
-/**/
-    1258,
-/**/
-    1257,
-/**/
-    1256,
-/**/
-    1255,
-/**/
-    1254,
-/**/
-    1253,
-/**/
-    1252,
-/**/
-    1251,
-/**/
-    1250,
-/**/
-    1249,
-/**/
-    1248,
-/**/
-    1247,
-/**/
-    1246,
-/**/
-    1245,
-/**/
-    1244,
-/**/
-    1243,
-/**/
-    1242,
-/**/
-    1241,
-/**/
-    1240,
-/**/
-    1239,
-/**/
-    1238,
-/**/
-    1237,
-/**/
-    1236,
-/**/
-    1235,
-/**/
-    1234,
-/**/
-    1233,
-/**/
-    1232,
-/**/
-    1231,
-/**/
-    1230,
-/**/
-    1229,
-/**/
-    1228,
-/**/
-    1227,
-/**/
-    1226,
-/**/
-    1225,
-/**/
-    1224,
-/**/
-    1223,
-/**/
-    1222,
-/**/
-    1221,
-/**/
-    1220,
-/**/
-    1219,
-/**/
-    1218,
-/**/
-    1217,
-/**/
-    1216,
-/**/
-    1215,
-/**/
-    1214,
-/**/
-    1213,
-/**/
-    1212,
-/**/
-    1211,
-/**/
-    1210,
-/**/
-    1209,
-/**/
-    1208,
-/**/
-    1207,
-/**/
-    1206,
-/**/
-    1205,
-/**/
-    1204,
-/**/
-    1203,
-/**/
-    1202,
-/**/
-    1201,
-/**/
-    1200,
-/**/
-    1199,
-/**/
-    1198,
-/**/
-    1197,
-/**/
-    1196,
-/**/
-    1195,
-/**/
-    1194,
-/**/
-    1193,
-/**/
-    1192,
-/**/
-    1191,
-/**/
-    1190,
-/**/
-    1189,
-/**/
-    1188,
-/**/
-    1187,
-/**/
-    1186,
-/**/
-    1185,
-/**/
-    1184,
-/**/
-    1183,
-/**/
-    1182,
-/**/
-    1181,
-/**/
-    1180,
-/**/
-    1179,
-/**/
-    1178,
-/**/
-    1177,
-/**/
-    1176,
-/**/
-    1175,
-/**/
-    1174,
-/**/
-    1173,
-/**/
-    1172,
-/**/
-    1171,
-/**/
-    1170,
-/**/
-    1169,
-/**/
-    1168,
-/**/
-    1167,
-/**/
-    1166,
-/**/
-    1165,
-/**/
-    1164,
-/**/
-    1163,
-/**/
-    1162,
-/**/
-    1161,
-/**/
-    1160,
-/**/
-    1159,
-/**/
-    1158,
-/**/
-    1157,
-/**/
-    1156,
-/**/
-    1155,
-/**/
-    1154,
-/**/
-    1153,
-/**/
-    1152,
-/**/
-    1151,
-/**/
-    1150,
-/**/
-    1149,
-/**/
-    1148,
-/**/
-    1147,
-/**/
-    1146,
-/**/
-    1145,
-/**/
-    1144,
-/**/
-    1143,
-/**/
-    1142,
-/**/
-    1141,
-/**/
-    1140,
-/**/
-    1139,
-/**/
-    1138,
-/**/
-    1137,
-/**/
-    1136,
-/**/
-    1135,
-/**/
-    1134,
-/**/
-    1133,
-/**/
-    1132,
-/**/
-    1131,
-/**/
-    1130,
-/**/
-    1129,
-/**/
-    1128,
-/**/
-    1127,
-/**/
-    1126,
-/**/
-    1125,
-/**/
-    1124,
-/**/
-    1123,
-/**/
-    1122,
-/**/
-    1121,
-/**/
-    1120,
-/**/
-    1119,
-/**/
-    1118,
-/**/
-    1117,
-/**/
-    1116,
-/**/
-    1115,
-/**/
-    1114,
-/**/
-    1113,
-/**/
-    1112,
-/**/
-    1111,
-/**/
-    1110,
-/**/
-    1109,
-/**/
-    1108,
-/**/
-    1107,
-/**/
-    1106,
-/**/
-    1105,
-/**/
-    1104,
-/**/
-    1103,
-/**/
-    1102,
-/**/
-    1101,
-/**/
-    1100,
-/**/
-    1099,
-/**/
-    1098,
-/**/
-    1097,
-/**/
-    1096,
-/**/
-    1095,
-/**/
-    1094,
-/**/
-    1093,
-/**/
-    1092,
-/**/
-    1091,
-/**/
-    1090,
-/**/
-    1089,
-/**/
-    1088,
-/**/
-    1087,
-/**/
-    1086,
-/**/
-    1085,
-/**/
-    1084,
-/**/
-    1083,
-/**/
-    1082,
-/**/
-    1081,
-/**/
-    1080,
-/**/
-    1079,
-/**/
-    1078,
-/**/
-    1077,
-/**/
-    1076,
-/**/
-    1075,
-/**/
-    1074,
-/**/
-    1073,
-/**/
-    1072,
-/**/
-    1071,
-/**/
-    1070,
-/**/
-    1069,
-/**/
-    1068,
-/**/
-    1067,
-/**/
-    1066,
-/**/
-    1065,
-/**/
-    1064,
-/**/
-    1063,
-/**/
-    1062,
-/**/
-    1061,
-/**/
-    1060,
-/**/
-    1059,
-/**/
-    1058,
-/**/
-    1057,
-/**/
-    1056,
-/**/
-    1055,
-/**/
-    1054,
-/**/
-    1053,
-/**/
-    1052,
-/**/
-    1051,
-/**/
-    1050,
-/**/
-    1049,
-/**/
-    1048,
-/**/
-    1047,
-/**/
-    1046,
-/**/
-    1045,
-/**/
-    1044,
-/**/
-    1043,
-/**/
-    1042,
-/**/
-    1041,
-/**/
-    1040,
-/**/
-    1039,
-/**/
-    1038,
-/**/
-    1037,
-/**/
-    1036,
-/**/
-    1035,
-/**/
-    1034,
-/**/
-    1033,
-/**/
-    1032,
-/**/
-    1031,
-/**/
-    1030,
-/**/
-    1029,
-/**/
-    1028,
-/**/
-    1027,
-/**/
-    1026,
-/**/
-    1025,
-/**/
-    1024,
-/**/
-    1023,
-/**/
-    1022,
-/**/
-    1021,
-/**/
-    1020,
-/**/
-    1019,
-/**/
-    1018,
-/**/
-    1017,
-/**/
-    1016,
-/**/
-    1015,
-/**/
-    1014,
-/**/
-    1013,
-/**/
-    1012,
-/**/
-    1011,
-/**/
-    1010,
-/**/
-    1009,
-/**/
-    1008,
-/**/
-    1007,
-/**/
-    1006,
-/**/
-    1005,
-/**/
-    1004,
-/**/
-    1003,
-/**/
-    1002,
-/**/
-    1001,
-/**/
-    1000,
-/**/
-    999,
-/**/
-    998,
-/**/
-    997,
-/**/
-    996,
-/**/
-    995,
-/**/
-    994,
-/**/
-    993,
-/**/
-    992,
-/**/
-    991,
-/**/
-    990,
-/**/
-    989,
-/**/
-    988,
-/**/
-    987,
-/**/
-    986,
-/**/
-    985,
-/**/
-    984,
-/**/
-    983,
-/**/
-    982,
-/**/
-    981,
-/**/
-    980,
-/**/
-    979,
-/**/
-    978,
-/**/
-    977,
-/**/
-    976,
-/**/
-    975,
-/**/
-    974,
-/**/
-    973,
-/**/
-    972,
-/**/
-    971,
-/**/
-    970,
-/**/
-    969,
-/**/
-    968,
-/**/
-    967,
-/**/
-    966,
-/**/
-    965,
-/**/
-    964,
-/**/
-    963,
-/**/
-    962,
-/**/
-    961,
-/**/
-    960,
-/**/
-    959,
-/**/
-    958,
-/**/
-    957,
-/**/
-    956,
-/**/
-    955,
-/**/
-    954,
-/**/
-    953,
-/**/
-    952,
-/**/
-    951,
-/**/
-    950,
-/**/
-    949,
-/**/
-    948,
-/**/
-    947,
-/**/
-    946,
-/**/
-    945,
-/**/
-    944,
-/**/
-    943,
-/**/
-    942,
-/**/
-    941,
-/**/
-    940,
-/**/
-    939,
-/**/
-    938,
-/**/
-    937,
-/**/
-    936,
-/**/
-    935,
-/**/
-    934,
-/**/
-    933,
-/**/
-    932,
-/**/
-    931,
-/**/
-    930,
-/**/
-    929,
-/**/
-    928,
-/**/
-    927,
-/**/
-    926,
-/**/
-    925,
-/**/
-    924,
-/**/
-    923,
-/**/
-    922,
-/**/
-    921,
-/**/
-    920,
-/**/
-    919,
-/**/
-    918,
-/**/
-    917,
-/**/
-    916,
-/**/
-    915,
-/**/
-    914,
-/**/
-    913,
-/**/
-    912,
-/**/
-    911,
-/**/
-    910,
-/**/
-    909,
-/**/
-    908,
-/**/
-    907,
-/**/
-    906,
-/**/
-    905,
-/**/
-    904,
-/**/
-    903,
-/**/
-    902,
-/**/
-    901,
-/**/
-    900,
-/**/
-    899,
-/**/
-    898,
-/**/
-    897,
-/**/
-    896,
-/**/
-    895,
-/**/
-    894,
-/**/
-    893,
-/**/
-    892,
-/**/
-    891,
-/**/
-    890,
-/**/
-    889,
-/**/
-    888,
-/**/
-    887,
-/**/
-    886,
-/**/
-    885,
-/**/
-    884,
-/**/
-    883,
-/**/
-    882,
-/**/
-    881,
-/**/
-    880,
-/**/
-    879,
-/**/
-    878,
-/**/
-    877,
-/**/
-    876,
-/**/
-    875,
-/**/
-    874,
-/**/
-    873,
-/**/
-    872,
-/**/
-    871,
-/**/
-    870,
-/**/
-    869,
-/**/
-    868,
-/**/
-    867,
-/**/
-    866,
-/**/
-    865,
-/**/
-    864,
-/**/
-    863,
-/**/
-    862,
-/**/
-    861,
-/**/
-    860,
-/**/
-    859,
-/**/
-    858,
-/**/
-    857,
-/**/
-    856,
-/**/
-    855,
-/**/
-    854,
-/**/
-    853,
-/**/
-    852,
-/**/
-    851,
-/**/
-    850,
-/**/
-    849,
-/**/
-    848,
-/**/
-    847,
-/**/
-    846,
-/**/
-    845,
-/**/
-    844,
-/**/
-    843,
-/**/
-    842,
-/**/
-    841,
-/**/
-    840,
-/**/
-    839,
-/**/
-    838,
-/**/
-    837,
-/**/
-    836,
-/**/
-    835,
-/**/
-    834,
-/**/
-    833,
-/**/
-    832,
-/**/
-    831,
-/**/
-    830,
-/**/
-    829,
-/**/
-    828,
-/**/
-    827,
-/**/
-    826,
-/**/
-    825,
-/**/
-    824,
-/**/
-    823,
-/**/
-    822,
-/**/
-    821,
-/**/
-    820,
-/**/
-    819,
-/**/
-    818,
-/**/
-    817,
-/**/
-    816,
-/**/
-    815,
-/**/
-    814,
-/**/
-    813,
-/**/
-    812,
-/**/
-    811,
-/**/
-    810,
-/**/
-    809,
-/**/
-    808,
-/**/
-    807,
-/**/
-    806,
-/**/
-    805,
-/**/
-    804,
-/**/
-    803,
-/**/
-    802,
-/**/
-    801,
-/**/
-    800,
-/**/
-    799,
-/**/
-    798,
-/**/
-    797,
-/**/
-    796,
-/**/
-    795,
-/**/
-    794,
-/**/
-    793,
-/**/
-    792,
-/**/
-    791,
-/**/
-    790,
-/**/
-    789,
-/**/
-    788,
-/**/
-    787,
-/**/
-    786,
-/**/
-    785,
-/**/
-    784,
-/**/
-    783,
-/**/
-    782,
-/**/
-    781,
-/**/
-    780,
-/**/
-    779,
-/**/
-    778,
-/**/
-    777,
-/**/
-    776,
-/**/
-    775,
-/**/
-    774,
-/**/
-    773,
-/**/
-    772,
-/**/
-    771,
-/**/
-    770,
-/**/
-    769,
-/**/
-    768,
-/**/
-    767,
-/**/
-    766,
-/**/
-    765,
-/**/
-    764,
-/**/
-    763,
-/**/
-    762,
-/**/
-    761,
-/**/
-    760,
-/**/
-    759,
-/**/
-    758,
-/**/
-    757,
-/**/
-    756,
-/**/
-    755,
-/**/
-    754,
-/**/
-    753,
-/**/
-    752,
-/**/
-    751,
-/**/
-    750,
-/**/
-    749,
-/**/
-    748,
-/**/
-    747,
-/**/
-    746,
-/**/
-    745,
-/**/
-    744,
-/**/
-    743,
-/**/
-    742,
-/**/
-    741,
-/**/
-    740,
-/**/
-    739,
-/**/
-    738,
-/**/
-    737,
-/**/
-    736,
-/**/
-    735,
-/**/
-    734,
-/**/
-    733,
-/**/
-    732,
-/**/
-    731,
-/**/
-    730,
-/**/
-    729,
-/**/
-    728,
-/**/
-    727,
-/**/
-    726,
-/**/
-    725,
-/**/
-    724,
-/**/
-    723,
-/**/
-    722,
-/**/
-    721,
-/**/
-    720,
-/**/
-    719,
-/**/
-    718,
-/**/
-    717,
-/**/
-    716,
-/**/
-    715,
-/**/
-    714,
-/**/
-    713,
-/**/
-    712,
-/**/
-    711,
-/**/
-    710,
-/**/
-    709,
-/**/
-    708,
-/**/
-    707,
-/**/
-    706,
-/**/
-    705,
-/**/
-    704,
-/**/
-    703,
-/**/
-    702,
-/**/
-    701,
-/**/
-    700,
-/**/
-    699,
-/**/
-    698,
-/**/
-    697,
-/**/
-    696,
-/**/
-    695,
-/**/
-    694,
-/**/
-    693,
-/**/
-    692,
-/**/
-    691,
-/**/
-    690,
-/**/
-    689,
-/**/
-    688,
-/**/
-    687,
-/**/
-    686,
-/**/
-    685,
-/**/
-    684,
-/**/
-    683,
-/**/
-    682,
-/**/
-    681,
-/**/
-    680,
-/**/
-    679,
-/**/
-    678,
-/**/
-    677,
-/**/
-    676,
-/**/
-    675,
-/**/
-    674,
-/**/
-    673,
-/**/
-    672,
-/**/
-    671,
-/**/
-    670,
-/**/
-    669,
-/**/
-    668,
-/**/
-    667,
-/**/
-    666,
-/**/
-    665,
-/**/
-    664,
-/**/
-    663,
-/**/
-    662,
-/**/
-    661,
-/**/
-    660,
-/**/
-    659,
-/**/
-    658,
-/**/
-    657,
-/**/
-    656,
-/**/
-    655,
-/**/
-    654,
-/**/
-    653,
-/**/
-    652,
-/**/
-    651,
-/**/
-    650,
-/**/
-    649,
-/**/
-    648,
-/**/
-    647,
-/**/
-    646,
-/**/
-    645,
-/**/
-    644,
-/**/
-    643,
-/**/
-    642,
-/**/
-    641,
-/**/
-    640,
-/**/
-    639,
-/**/
-    638,
-/**/
-    637,
-/**/
-    636,
-/**/
-    635,
-/**/
-    634,
-/**/
-    633,
-/**/
-    632,
-/**/
-    631,
-/**/
-    630,
-/**/
-    629,
-/**/
-    628,
-/**/
-    627,
-/**/
-    626,
-/**/
-    625,
-/**/
-    624,
-/**/
-    623,
-/**/
-    622,
-/**/
-    621,
-/**/
-    620,
-/**/
-    619,
-/**/
-    618,
-/**/
-    617,
-/**/
-    616,
-/**/
-    615,
-/**/
-    614,
-/**/
-    613,
-/**/
-    612,
-/**/
-    611,
-/**/
-    610,
-/**/
-    609,
-/**/
-    608,
-/**/
-    607,
-/**/
-    606,
-/**/
-    605,
-/**/
-    604,
-/**/
-    603,
-/**/
-    602,
-/**/
-    601,
-/**/
-    600,
-/**/
-    599,
-/**/
-    598,
-/**/
-    597,
-/**/
-    596,
-/**/
-    595,
-/**/
-    594,
-/**/
-    593,
-/**/
-    592,
-/**/
-    591,
-/**/
-    590,
-/**/
-    589,
-/**/
-    588,
-/**/
-    587,
-/**/
-    586,
-/**/
-    585,
-/**/
-    584,
-/**/
-    583,
-/**/
-    582,
-/**/
-    581,
-/**/
-    580,
-/**/
-    579,
-/**/
-    578,
-/**/
-    577,
-/**/
-    576,
-/**/
-    575,
-/**/
-    574,
-/**/
-    573,
-/**/
-    572,
-/**/
-    571,
-/**/
-    570,
-/**/
-    569,
-/**/
-    568,
-/**/
-    567,
-/**/
-    566,
-/**/
-    565,
-/**/
-    564,
-/**/
-    563,
-/**/
-    562,
-/**/
-    561,
-/**/
-    560,
-/**/
-    559,
-/**/
-    558,
-/**/
-    557,
-/**/
-    556,
-/**/
-    555,
-/**/
-    554,
-/**/
-    553,
-/**/
-    552,
-/**/
-    551,
-/**/
-    550,
-/**/
-    549,
-/**/
-    548,
-/**/
-    547,
-/**/
-    546,
-/**/
-    545,
-/**/
-    544,
-/**/
-    543,
-/**/
-    542,
-/**/
-    541,
-/**/
-    540,
-/**/
-    539,
-/**/
-    538,
-/**/
-    537,
-/**/
-    536,
-/**/
-    535,
-/**/
-    534,
-/**/
-    533,
-/**/
-    532,
-/**/
-    531,
-/**/
-    530,
-/**/
-    529,
-/**/
-    528,
-/**/
-    527,
-/**/
-    526,
-/**/
-    525,
-/**/
-    524,
-/**/
-    523,
-/**/
-    522,
-/**/
-    521,
-/**/
-    520,
-/**/
-    519,
-/**/
-    518,
-/**/
-    517,
-/**/
-    516,
-/**/
-    515,
-/**/
-    514,
-/**/
-    513,
-/**/
-    512,
-/**/
-    511,
-/**/
-    510,
-/**/
-    509,
-/**/
-    508,
-/**/
-    507,
-/**/
-    506,
-/**/
-    505,
-/**/
-    504,
-/**/
-    503,
-/**/
-    502,
-/**/
-    501,
-/**/
-    500,
-/**/
-    499,
-/**/
-    498,
-/**/
-    497,
-/**/
-    496,
-/**/
-    495,
-/**/
-    494,
-/**/
-    493,
-/**/
-    492,
-/**/
-    491,
-/**/
-    490,
-/**/
-    489,
-/**/
-    488,
-/**/
-    487,
-/**/
-    486,
-/**/
-    485,
-/**/
-    484,
-/**/
-    483,
-/**/
-    482,
-/**/
-    481,
-/**/
-    480,
-/**/
-    479,
-/**/
-    478,
-/**/
-    477,
-/**/
-    476,
-/**/
-    475,
-/**/
-    474,
-/**/
-    473,
-/**/
-    472,
-/**/
-    471,
-/**/
-    470,
-/**/
-    469,
-/**/
-    468,
-/**/
-    467,
-/**/
-    466,
-/**/
-    465,
-/**/
-    464,
-/**/
-    463,
-/**/
-    462,
-/**/
-    461,
-/**/
-    460,
-/**/
-    459,
-/**/
-    458,
-/**/
-    457,
-/**/
-    456,
-/**/
-    455,
-/**/
-    454,
-/**/
-    453,
-/**/
-    452,
-/**/
-    451,
-/**/
-    450,
-/**/
-    449,
-/**/
-    448,
-/**/
-    447,
-/**/
-    446,
-/**/
-    445,
-/**/
-    444,
-/**/
-    443,
-/**/
-    442,
-/**/
-    441,
-/**/
-    440,
-/**/
-    439,
-/**/
-    438,
-/**/
-    437,
-/**/
-    436,
-/**/
-    435,
-/**/
-    434,
-/**/
-    433,
-/**/
-    432,
-/**/
-    431,
-/**/
-    430,
-/**/
-    429,
-/**/
-    428,
-/**/
-    427,
-/**/
-    426,
-/**/
-    425,
-/**/
-    424,
-/**/
-    423,
-/**/
-    422,
-/**/
-    421,
-/**/
-    420,
-/**/
-    419,
-/**/
-    418,
-/**/
-    417,
-/**/
-    416,
-/**/
-    415,
-/**/
-    414,
-/**/
-    413,
-/**/
-    412,
-/**/
-    411,
-/**/
-    410,
-/**/
-    409,
-/**/
-    408,
-/**/
-    407,
-/**/
-    406,
-/**/
-    405,
-/**/
-    404,
-/**/
-    403,
-/**/
-    402,
-/**/
-    401,
-/**/
-    400,
-/**/
-    399,
-/**/
-    398,
-/**/
-    397,
-/**/
-    396,
-/**/
-    395,
-/**/
-    394,
-/**/
-    393,
-/**/
-    392,
-/**/
-    391,
-/**/
-    390,
-/**/
-    389,
-/**/
-    388,
-/**/
-    387,
-/**/
-    386,
-/**/
-    385,
-/**/
-    384,
-/**/
-    383,
-/**/
-    382,
-/**/
-    381,
-/**/
-    380,
-/**/
-    379,
-/**/
-    378,
-/**/
-    377,
-/**/
-    376,
-/**/
-    375,
-/**/
-    374,
-/**/
-    373,
-/**/
-    372,
-/**/
-    371,
-/**/
-    370,
-/**/
-    369,
-/**/
-    368,
-/**/
-    367,
-/**/
-    366,
-/**/
-    365,
-/**/
-    364,
-/**/
-    363,
-/**/
-    362,
-/**/
-    361,
-/**/
-    360,
-/**/
-    359,
-/**/
-    358,
-/**/
-    357,
-/**/
-    356,
-/**/
-    355,
-/**/
-    354,
-/**/
-    353,
-/**/
-    352,
-/**/
-    351,
-/**/
-    350,
-/**/
-    349,
-/**/
-    348,
-/**/
-    347,
-/**/
-    346,
-/**/
-    345,
-/**/
-    344,
-/**/
-    343,
-/**/
-    342,
-/**/
-    341,
-/**/
-    340,
-/**/
-    339,
-/**/
-    338,
-/**/
-    337,
-/**/
-    336,
-/**/
-    335,
-/**/
-    334,
-/**/
-    333,
-/**/
-    332,
-/**/
-    331,
-/**/
-    330,
-/**/
-    329,
-/**/
-    328,
-/**/
-    327,
-/**/
-    326,
-/**/
-    325,
-/**/
-    324,
-/**/
-    323,
-/**/
-    322,
-/**/
-    321,
-/**/
-    320,
-/**/
-    319,
-/**/
-    318,
-/**/
-    317,
-/**/
-    316,
-/**/
-    315,
-/**/
-    314,
-/**/
-    313,
-/**/
-    312,
-/**/
-    311,
-/**/
-    310,
-/**/
-    309,
-/**/
-    308,
-/**/
-    307,
-/**/
-    306,
-/**/
-    305,
-/**/
-    304,
-/**/
-    303,
-/**/
-    302,
-/**/
-    301,
-/**/
-    300,
-/**/
-    299,
-/**/
-    298,
-/**/
-    297,
-/**/
-    296,
-/**/
-    295,
-/**/
-    294,
-/**/
-    293,
-/**/
-    292,
-/**/
-    291,
-/**/
-    290,
-/**/
-    289,
-/**/
-    288,
-/**/
-    287,
-/**/
-    286,
-/**/
-    285,
-/**/
-    284,
-/**/
-    283,
-/**/
-    282,
-/**/
-    281,
-/**/
-    280,
-/**/
-    279,
-/**/
-    278,
-/**/
-    277,
-/**/
-    276,
-/**/
-    275,
-/**/
-    274,
-/**/
-    273,
-/**/
-    272,
-/**/
-    271,
-/**/
-    270,
-/**/
-    269,
-/**/
-    268,
-/**/
-    267,
-/**/
-    266,
-/**/
-    265,
-/**/
-    264,
-/**/
-    263,
-/**/
-    262,
-/**/
-    261,
-/**/
-    260,
-/**/
-    259,
-/**/
-    258,
-/**/
-    257,
-/**/
-    256,
-/**/
-    255,
-/**/
-    254,
-/**/
-    253,
-/**/
-    252,
-/**/
-    251,
-/**/
-    250,
-/**/
-    249,
-/**/
-    248,
-/**/
-    247,
-/**/
-    246,
-/**/
-    245,
-/**/
-    244,
-/**/
-    243,
-/**/
-    242,
-/**/
-    241,
-/**/
-    240,
-/**/
-    239,
-/**/
-    238,
-/**/
-    237,
-/**/
-    236,
-/**/
-    235,
-/**/
-    234,
-/**/
-    233,
-/**/
-    232,
-/**/
-    231,
-/**/
-    230,
-/**/
-    229,
-/**/
-    228,
-/**/
-    227,
-/**/
-    226,
-/**/
-    225,
-/**/
-    224,
-/**/
-    223,
-/**/
-    222,
-/**/
-    221,
-/**/
-    220,
-/**/
-    219,
-/**/
-    218,
-/**/
-    217,
-/**/
-    216,
-/**/
-    215,
-/**/
-    214,
-/**/
-    213,
-/**/
-    212,
-/**/
-    211,
-/**/
-    210,
-/**/
-    209,
-/**/
-    208,
-/**/
-    207,
-/**/
-    206,
-/**/
-    205,
-/**/
-    204,
-/**/
-    203,
-/**/
-    202,
-/**/
-    201,
-/**/
-    200,
-/**/
-    199,
-/**/
-    198,
-/**/
-    197,
-/**/
-    196,
-/**/
-    195,
-/**/
-    194,
-/**/
-    193,
-/**/
-    192,
-/**/
-    191,
-/**/
-    190,
-/**/
-    189,
-/**/
-    188,
-/**/
-    187,
-/**/
-    186,
-/**/
-    185,
-/**/
-    184,
-/**/
-    183,
-/**/
-    182,
-/**/
-    181,
-/**/
-    180,
-/**/
-    179,
-/**/
-    178,
-/**/
-    177,
-/**/
-    176,
-/**/
-    175,
-/**/
-    174,
-/**/
-    173,
-/**/
-    172,
-/**/
-    171,
-/**/
-    170,
-/**/
-    169,
-/**/
-    168,
-/**/
-    167,
-/**/
-    166,
-/**/
-    165,
-/**/
-    164,
-/**/
-    163,
-/**/
-    162,
-/**/
-    161,
-/**/
-    160,
-/**/
-    159,
-/**/
-    158,
-/**/
-    157,
-/**/
-    156,
-/**/
-    155,
-/**/
-    154,
-/**/
-    153,
-/**/
-    152,
-/**/
-    151,
-/**/
-    150,
-/**/
-    149,
-/**/
-    148,
-/**/
-    147,
-/**/
-    146,
-/**/
-    145,
-/**/
-    144,
-/**/
-    143,
-/**/
-    142,
-/**/
-    141,
-/**/
-    140,
-/**/
-    139,
-/**/
-    138,
-/**/
-    137,
-/**/
-    136,
-/**/
-    135,
-/**/
-    134,
-/**/
-    133,
-/**/
-    132,
-/**/
-    131,
-/**/
-    130,
-/**/
-    129,
-/**/
-    128,
-/**/
-    127,
-/**/
-    126,
-/**/
-    125,
-/**/
-    124,
-/**/
-    123,
-/**/
-    122,
-/**/
-    121,
-/**/
-    120,
-/**/
-    119,
-/**/
-    118,
-/**/
-    117,
-/**/
-    116,
-/**/
-    115,
-/**/
-    114,
-/**/
-    113,
-/**/
-    112,
-/**/
-    111,
-/**/
-    110,
-/**/
-    109,
-/**/
-    108,
-/**/
-    107,
-/**/
-    106,
-/**/
-    105,
-/**/
-    104,
-/**/
-    103,
-/**/
-    102,
-/**/
-    101,
-/**/
-    100,
-/**/
-    99,
-/**/
-    98,
-/**/
-    97,
-/**/
-    96,
-/**/
-    95,
-/**/
-    94,
-/**/
-    93,
-/**/
-    92,
-/**/
-    91,
-/**/
-    90,
-/**/
-    89,
-/**/
-    88,
-/**/
-    87,
-/**/
-    86,
-/**/
-    85,
-/**/
-    84,
-/**/
-    83,
-/**/
-    82,
-/**/
-    81,
-/**/
-    80,
-/**/
-    79,
-/**/
-    78,
-/**/
-    77,
-/**/
-    76,
-/**/
-    75,
-/**/
-    74,
-/**/
-    73,
-/**/
-    72,
-/**/
-    71,
-/**/
-    70,
-/**/
-    69,
-/**/
-    68,
-/**/
-    67,
-/**/
-    66,
-/**/
-    65,
-/**/
-    64,
-/**/
-    63,
-/**/
-    62,
-/**/
-    61,
-/**/
-    60,
-/**/
-    59,
-/**/
-    58,
-/**/
-    57,
-/**/
-    56,
-/**/
-    55,
-/**/
-    54,
-/**/
-    53,
-/**/
-    52,
-/**/
-    51,
-/**/
-    50,
-/**/
-    49,
-/**/
-    48,
-/**/
-    47,
-/**/
-    46,
-/**/
-    45,
-/**/
-    44,
-/**/
-    43,
-/**/
-    42,
-/**/
-    41,
-/**/
-    40,
-/**/
-    39,
-/**/
-    38,
-/**/
-    37,
-/**/
-    36,
-/**/
-    35,
-/**/
-    34,
-/**/
-    33,
-/**/
-    32,
-/**/
-    31,
-/**/
-    30,
-/**/
-    29,
-/**/
-    28,
-/**/
-    27,
-/**/
-    26,
-/**/
-    25,
-/**/
-    24,
-/**/
-    23,
-/**/
-    22,
-/**/
-    21,
-/**/
-    20,
-/**/
-    19,
-/**/
-    18,
-/**/
-    17,
-/**/
-    16,
-/**/
-    15,
-/**/
-    14,
-/**/
-    13,
-/**/
-    12,
-/**/
-    11,
-/**/
-    10,
-/**/
-    9,
-/**/
-    8,
-/**/
-    7,
-/**/
-    6,
-/**/
-    5,
-/**/
-    4,
-/**/
-    3,
-/**/
-    2,
-/**/
-    1,
 /**/
     0
 };
diff --git a/src/version.h b/src/version.h
index 62c12b0fc..d3e575d95 100644
--- a/src/version.h
+++ b/src/version.h
@@ -15,13 +15,13 @@
 
 #define VIM_VERSION_MAJOR		 8
 #define VIM_VERSION_MAJOR_STR		"8"
-#define VIM_VERSION_MINOR		 0
-#define VIM_VERSION_MINOR_STR		"0"
+#define VIM_VERSION_MINOR		 1
+#define VIM_VERSION_MINOR_STR		"1"
 #define VIM_VERSION_100	    (VIM_VERSION_MAJOR * 100 + VIM_VERSION_MINOR)
 
-#define VIM_VERSION_BUILD		 281
-#define VIM_VERSION_BUILD_BCD		0x119
-#define VIM_VERSION_BUILD_STR		"281"
+#define VIM_VERSION_BUILD		 282
+#define VIM_VERSION_BUILD_BCD		0x11a
+#define VIM_VERSION_BUILD_STR		"282"
 #define VIM_VERSION_PATCHLEVEL		 0
 #define VIM_VERSION_PATCHLEVEL_STR	"0"
 /* Used by MacOS port should be one of: development, alpha, beta, final */
@@ -33,8 +33,8 @@
  * VIM_VERSION_MEDIUM is used for the startup-screen.
  * VIM_VERSION_LONG is used for the ":version" command and "Vim -h".
  */
-#define VIM_VERSION_NODOT	"vim80"
-#define VIM_VERSION_SHORT	"8.0"
-#define VIM_VERSION_MEDIUM	"8.0"
-#define VIM_VERSION_LONG	"VIM - Vi IMproved 8.0 (2016 Sep 12)"
-#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 8.0 (2016 Sep 12, compiled "
+#define VIM_VERSION_NODOT	"vim81"
+#define VIM_VERSION_SHORT	"8.1"
+#define VIM_VERSION_MEDIUM	"8.1"
+#define VIM_VERSION_LONG	"VIM - Vi IMproved 8.1 (2018 May 17)"
+#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 8.1 (2018 May 17, compiled "
diff --git a/src/vim.def b/src/vim.def
index 7ae7f8de9..e0368fce1 100644
--- a/src/vim.def
+++ b/src/vim.def
@@ -1,4 +1,4 @@
 CODE PRELOAD EXECUTEONLY
 DATA MULTIPLE SHARED
-DESCRIPTION 'Vim 8.0'
+DESCRIPTION 'Vim 8.1'
 HEAPSIZE 0,0