Draw markedText in MMCoreTextView if imstyle=1

Remove InlineIM from Preferences
Control InlineIM by imstyle
2026-06-07 15:37:14 +02:00 · 2017-09-20 19:13:23 -07:00 · 2017-09-20 19:13:23 -07:00 · 2017-09-20 19:13:23 -07:00
774 changed files with 30483 additions and 68590 deletions
@@ -38,7 +38,6 @@ src/pathdef.c
 src/Obj*/pathdef.c
 gvimext.dll
 gvimext.lib
-gvim.lib
 runtime/doc/uganda.nsis.txt

 # Borland C++
@@ -1,4 +0,0 @@
-# Format of this file: https://lgtm.com/help/lgtm/lgtm.yml-configuration-file
-path_classifiers:
-  documentation:
-    - runtime/tutor/tutor*
@@ -4,32 +4,30 @@ dist: trusty
 os:
  - osx

-osx_image: xcode9.3
+osx_image: xcode8

 compiler:
  - clang

 env:
  - MACOSX_DEPLOYMENT_TARGET=10.8
-    XCODEFLAGS="MACOSX_DEPLOYMENT_TARGET=10.8"
-    VERSIONER_PERL_VERSION=5.18
+    VERSIONER_PERL_VERSION=5.16
    VERSIONER_PYTHON_VERSION=2.7
    vi_cv_path_python=/usr/bin/python
    vi_cv_path_python3=/usr/local/bin/python3
    vi_cv_path_plain_lua=/usr/local/bin/lua
-    vi_cv_dll_name_perl=/System/Library/Perl/5.18/darwin-thread-multi-2level/CORE/libperl.dylib
+    vi_cv_dll_name_perl=/System/Library/Perl/5.16/darwin-thread-multi-2level/CORE/libperl.dylib
    vi_cv_dll_name_python=/System/Library/Frameworks/Python.framework/Versions/2.7/Python
    vi_cv_dll_name_python3=/usr/local/Frameworks/Python.framework/Versions/3.6/Python
    VIMCMD=src/MacVim/build/Release/MacVim.app/Contents/MacOS/Vim
-    "CONFOPT='--with-features=huge --enable-multibyte --enable-terminal --enable-netbeans --with-tlib=ncurses --enable-cscope --enable-perlinterp=dynamic --enable-pythoninterp=dynamic --enable-python3interp=dynamic --enable-rubyinterp=dynamic --with-ruby-command=/usr/local/bin/ruby --enable-luainterp=dynamic --with-lua-prefix=/usr/local --enable-gui=macvim'"
+    "CONFOPT='--with-features=huge --enable-multibyte --enable-terminal --enable-netbeans --with-tlib=ncurses --enable-cscope --enable-perlinterp=dynamic --enable-pythoninterp=dynamic --enable-python3interp=dynamic --enable-rubyinterp=dynamic --enable-luainterp=dynamic --with-lua-prefix=/usr/local --enable-gui=macvim'"

 sudo: false

 before_install:
  - brew update || brew update
-  - brew upgrade python
+  - brew install python3
  - brew install lua
-  - brew install ruby

 script:
  - NPROC=$(getconf _NPROCESSORS_ONLN)
@@ -4,7 +4,6 @@
 # source files for all source archives
 SRC_ALL =	\
 		.hgignore \
-		.lgtm.yml \
 		.travis.yml \
 		appveyor.yml \
 		src/appveyor.bat \
@@ -13,8 +12,6 @@ SRC_ALL =	\
 		src/arabic.c \
 		src/arabic.h \
 		src/ascii.h \
-		src/beval.c \
-		src/beval.h \
 		src/blowfish.c \
 		src/buffer.c \
 		src/channel.c \
@@ -44,6 +41,7 @@ SRC_ALL =	\
 		src/gui.c \
 		src/gui.h \
 		src/gui_beval.c \
+		src/gui_beval.h \
 		src/hardcopy.c \
 		src/hashtab.c \
 		src/json.c \
@@ -111,7 +109,6 @@ SRC_ALL =	\
 		src/testdir/sautest/autoload/*.vim \
 		src/testdir/runtest.vim \
 		src/testdir/shared.vim \
-		src/testdir/screendump.vim \
 		src/testdir/view_util.vim \
 		src/testdir/setup.vim \
 		src/testdir/gui_init.vim \
@@ -121,6 +118,7 @@ SRC_ALL =	\
 		src/testdir/test[0-9]*a.ok \
 		src/testdir/test_[a-z]*.ok \
 		src/testdir/test49.vim \
+		src/testdir/test60.vim \
 		src/testdir/test83-tags? \
 		src/testdir/test77a.com \
 		src/testdir/test_*.vim \
@@ -136,14 +134,10 @@ SRC_ALL =	\
 		src/testdir/pyxfile/*.py \
 		src/testdir/bench*.in \
 		src/testdir/bench*.vim \
-		src/testdir/dumps/*.dump \
 		src/testdir/samples/*.txt \
-		src/testdir/samples/test000 \
 		src/testdir/if_ver*.vim \
-		src/testdir/color_ramp.vim \
 		src/proto.h \
 		src/proto/arabic.pro \
-		src/proto/beval.pro \
 		src/proto/blowfish.pro \
 		src/proto/buffer.pro \
 		src/proto/channel.pro \
@@ -411,7 +405,6 @@ SRC_DOS =	\
 		src/msvcsetup.bat \
 		src/msvc2008.bat \
 		src/msvc2010.bat \
-		src/msvc2015.bat \
 		src/dimm.idl \
 		src/dlldata.c \
 		src/dosinst.c \
@@ -456,7 +449,6 @@ SRC_DOS =	\
 		src/xxd/Make_mvc.mak \
 		nsis/gvim.nsi \
 		nsis/gvim_version.nsh \
-		nsis/vimrc.ini \
 		nsis/README.txt \
 		uninstal.txt \
 		src/VisVim/Commands.cpp \
@@ -587,7 +579,6 @@ RT_ALL =	\
 		runtime/doc/*.txt \
 		runtime/doc/Makefile \
 		runtime/doc/doctags.c \
-		runtime/doc/test_urls.vim \
 		runtime/doc/vim.1 \
 		runtime/doc/evim.1 \
 		runtime/doc/vimdiff.1 \
@@ -665,11 +656,9 @@ RT_SCRIPTS =	\
 		runtime/makemenu.vim \
 		runtime/autoload/*.vim \
 		runtime/autoload/README.txt \
-		runtime/autoload/dist/*.vim \
 		runtime/autoload/xml/*.vim \
 		runtime/colors/*.vim \
 		runtime/colors/README.txt \
-		runtime/colors/tools/*.vim \
 		runtime/compiler/*.vim \
 		runtime/compiler/README.txt \
 		runtime/indent/*.vim \
@@ -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 = 1
+MINOR = 0

 # CHECKLIST for creating a new version:
 #
@@ -120,28 +120,28 @@ MINOR = 1
 #
 # MS-Windows:
 # - Run make on Unix to update the ".mo" files.
-# - Get 32 bit libintl-8.dll, libiconv-2.dll and libgcc_s_sjlj-1.dll. E.g. from
+# - Get libintl-8.dll, libiconv-2.dll and libgcc_s_sjlj-1.dll. E.g. from
 #   https://mlocati.github.io/gettext-iconv-windows/ .
 #   Use the "shared-32.zip file and extract the archive to get the files.
-#   Put them in the gettext32 directory, "make dosrt" uses them.
-# - Get 64 bit libintl-8.dll and libiconv-2.dll. E.g. from
-#   https://mlocati.github.io/gettext-iconv-windows/ .
-#   Use the "shared-64.zip file and extract the archive to get the files.
-#   Put them in the gettext64 directory, "make dosrt" uses them.
+#   Put them in the top directory, "make dosrt" uses them.
 # - > make dossrc
 #   > make dosrt
 #   Unpack dist/vim##rt.zip and dist/vim##src.zip on an MS-Windows PC.
-#   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:
-#   > cd src
-#   > msvc2015.bat
-# - Build the console binary:
+# - Set environment for Visual C++ 2008, e.g.:
+#   > src/msvc2008.bat
+#   Or: 
+#   > C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\vcvars32.bat
+#   Or, when using the Visual C++ Toolkit 2003: "msvcsetup.bat" (adjust the
+#   paths when necessary).
+#   For Windows 98/ME the 2003 version is required, but then the executable
+#   won't work on Windows 7 and 64 bit systems.
+# - > cd src
 #   > nmake -f Make_mvc.mak
-# - Run the tests and check the ouput:
+# - Run the tests:
 #   > nmake -f Make_mvc.mak testclean
 #   > nmake -f Make_mvc.mak test
+#   - check the output.
 # - Rename (using ../tools/rename.bat):
 #           vim.exe to vimw32.exe
 #           tee/tee.exe to teew32.exe
@@ -152,18 +152,19 @@ MINOR = 1
 # Win32 GUI version build:
 # - > cd src
 #   > nmake -f Make_mvc.mak GUI=yes
-# - Run the tests and check the output:
+# - Run the tests:
 #   > nmake -f Make_mvc.mak testclean
 #   > nmake -f Make_mvc.mak testgvim
+#   - check the output.
 # - move "gvim.exe" to here (otherwise the OLE version will overwrite it).
 # - Move gvim.pdb to here.
 # - Copy "GvimExt/gvimext.dll" to here.
 # - Delete vimrun.exe, install.exe and uninstal.exe.
 # Win32 GUI version with OLE, PERL, Ruby, TCL, PYTHON and dynamic IME:
 # - Install the interfaces you want, see src/INSTALLpc.txt
-#   Adjust bigvim.bat to match the version of each interface you want.
 # - Build:
 #   > cd src
+#   Adjust bigvim.bat to match the version of each interface you want.
 #   > bigvim.bat
 # - Run the tests:
 #   > nmake -f Make_mvc.mak testclean
@@ -187,11 +188,10 @@ MINOR = 1
 #	gvimext64.dll in src/GvimExt
 #	VisVim.dll in src/VisVim
 #   Note: VisVim needs to be build with MSVC 5, newer versions don't work.
-#   gvimext64.dll can be obtained from:
-#   https://github.com/vim/vim-win32-installer/releases
-#	It is part of gvim_8.0.*_x64.zip as vim/vim80/GvimExt/gvimext64.dll.
+#   gvimext64.dll can be obtained from http://code.google.com/p/vim-win3264/
+#	It is part of vim72.zip as vim72/gvimext.dll.
 # - Make sure there is a diff.exe two levels up (get it from a previous Vim
-#   version).  Also put winpty32.dll and winpty-agent.exe there.
+#   version).
 # - go to ../nsis and do:
 #   > makensis gvim.nsi  (takes a few minutes).
 #      ignore warning for libwinpthread-1.dll
@@ -467,13 +467,9 @@ dosrt_files: dist prepare no_title.vim
 		cp $$i dist/vim/$(VIMRTDIR)/lang/$$n/LC_MESSAGES/vim.mo; \
 	      fi \
 	    done
-	mkdir dist/vim/$(VIMRTDIR)/gettext32
-	cp gettext32/libintl-8.dll dist/vim/$(VIMRTDIR)/gettext32/
-	cp gettext32/libiconv-2.dll dist/vim/$(VIMRTDIR)/gettext32/
-	cp gettext32/libgcc_s_sjlj-1.dll dist/vim/$(VIMRTDIR)/gettext32/
-	mkdir dist/vim/$(VIMRTDIR)/gettext64
-	cp gettext64/libintl-8.dll dist/vim/$(VIMRTDIR)/gettext64/
-	cp gettext64/libiconv-2.dll dist/vim/$(VIMRTDIR)/gettext64/
+	cp libintl-8.dll dist/vim/$(VIMRTDIR)/
+	cp libiconv-2.dll dist/vim/$(VIMRTDIR)/
+	cp libgcc_s_sjlj-1.dll dist/vim/$(VIMRTDIR)/


 # Used before uploading.  Don't delete the AAPDIR/sign files!
@@ -500,10 +496,7 @@ dosbin_gvim: dist no_title.vim dist/$(COMMENT_GVIM)
 	cp vimrun.exe dist/vim/$(VIMRTDIR)/vimrun.exe
 	cp installw32.exe dist/vim/$(VIMRTDIR)/install.exe
 	cp uninstalw32.exe dist/vim/$(VIMRTDIR)/uninstal.exe
-	mkdir dist/vim/$(VIMRTDIR)/GvimExt32
-	cp gvimext.dll dist/vim/$(VIMRTDIR)/GvimExt32/gvimext.dll
-	mkdir dist/vim/$(VIMRTDIR)/GvimExt64
-	cp gvimext64.dll dist/vim/$(VIMRTDIR)/GvimExt64/gvimext.dll
+	cp gvimext.dll dist/vim/$(VIMRTDIR)/gvimext.dll
 	cd dist && zip -9 -rD -z gvim$(VERSION).zip vim <$(COMMENT_GVIM)
 	cp gvim.pdb dist/gvim$(VERSION).pdb

@@ -1,4 +1,4 @@
-README.txt for version 8.1 of Vim: Vi IMproved.
+README.txt for version 8.0 of Vim: Vi IMproved.


 WHAT IS VIM?
@@ -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.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.
+		Version 8.0.  Also runs under UNIX, MS-Windows, Mac, etc.
+		vim80rt.tgz  contains the documentation and syntax files.
+		vim80bin.tgz contains the binaries.
+		vim80src.tgz contains the sources.
 		Author: Bram Moolenaar et al.


@@ -1,4 +1,4 @@
-README_ami.txt for version 8.1 of Vim: Vi IMproved.
+README_ami.txt for version 8.0 of Vim: Vi IMproved.

 This file explains the installation of Vim on Amiga systems.
 See README.txt for general information about Vim.
@@ -16,8 +16,8 @@ easily upgrade to a new version.  For example:
 You would then unpack the archives like this:

  cd dh0:editors
-  tar xf t:vim81bin.tar
-  tar xf t:vim81rt.tar
+  tar xf t:vim80bin.tar
+  tar xf t:vim80rt.tar

 Set the $VIM environment variable to point to the top directory of your Vim
 files.  For the above example:
@@ -1,8 +1,8 @@
-README_amibin.txt for version 8.1 of Vim: Vi IMproved.
+README_amibin.txt for version 8.0 of Vim: Vi IMproved.

 See "README.txt" for general information about Vim.
 See "README_ami.txt" for installation instructions for the Amiga.
-These files are in the runtime archive (vim81rt.tgz).
+These files are in the runtime archive (vim80rt.tgz).


 The Amiga "bin" archive contains the Vim executable for the Amiga.  It was
@@ -1,8 +1,8 @@
-README_amisrc.txt for version 8.1 of Vim: Vi IMproved.
+README_amisrc.txt for version 8.0 of Vim: Vi IMproved.

 See "README.txt" for general information about Vim.
 See "README_ami.txt" for installation instructions for the Amiga.
-These files are in the runtime archive (vim81rt.tgz).
+These files are in the runtime archive (vim80rt.tgz).


 The Amiga source archive contains the files needed to compile Vim on the
@@ -1,16 +1,16 @@
-README_bindos.txt for version 8.1 of Vim: Vi IMproved.
+README_bindos.txt for version 8.0 of Vim: Vi IMproved.

 See "README.txt" for general information about Vim.
 See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows.
-These files are in the runtime archive (vim81rt.zip).
+These files are in the runtime archive (vim80rt.zip).


 There are several binary distributions of Vim for the PC.  You would normally
 pick only one of them, but it's also possible to install several.
 These ones are available (the version number may differ):
-	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
+	vim80w32.zip	Windows 95/98/NT/etc. console version
+	gvim80.zip	Windows 95/98/NT/etc. GUI version
+	gvim80ole.zip	Windows 95/98/NT/etc. GUI version with OLE

-You MUST also get the runtime archive (vim81rt.zip).
-The sources are also available (vim81src.zip).
+You MUST also get the runtime archive (vim80rt.zip).
+The sources are also available (vim80src.zip).
@@ -1,4 +1,4 @@
-README_dos.txt for version 8.1 of Vim: Vi IMproved.
+README_dos.txt for version 8.0 of Vim: Vi IMproved.

 This file explains the installation of Vim on MS-DOS and MS-Windows systems.
 See "README.txt" for general information about Vim.
@@ -41,19 +41,19 @@ These are the normal steps to install Vim from the .zip archives:
   located.  Check the $VIM setting to see where it points to:
 	set VIM
   For example, if you have
-	C:\vim\vim81
+	C:\vim\vim80
   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\vim81",
+2. Unpack the zip archives.  This will create a new directory "vim\vim80",
   in which all the distributed Vim files are placed.  Since the directory
   name includes the version number, it is unlikely that you overwrite
   existing files.
   Examples:
-	pkunzip -d gvim81.zip
-	unzip vim81w32.zip
+	pkunzip -d gvim80.zip
+	unzip vim80w32.zip

   You need to unpack the runtime archive and at least one of the binary
   archives.  When using more than one binary version, be careful not to
@@ -69,7 +69,7 @@ These are the normal steps to install Vim from the .zip archives:
   archive and follow the instructions in the documentation.

 3. Change to the new directory:
-	cd vim\vim81
+	cd vim\vim80
   Run the "install.exe" program.  It will ask you a number of questions about
   how you would like to have your Vim setup.  Among these are:
   - You can tell it to write a "_vimrc" file with your preferences in the
@@ -80,8 +80,8 @@ These are the normal steps to install Vim from the .zip archives:
     console or in a shell.  You can select one of the directories in your
     $PATH.  If you skip this, you can add Vim to the search path manually:
     The simplest is to add a line to your autoexec.bat.  Examples:
-	set path=%path%;C:\vim\vim81
-	set path=%path%;D:\editors\vim\vim81
+	set path=%path%;C:\vim\vim80
+	set path=%path%;D:\editors\vim\vim80
   - Create entries for Vim on the desktop and in the Start menu.

 That's it!
@@ -93,8 +93,8 @@ Remarks:
  won't show a menubar.  Then you need to set the $VIM environment variable to
  point to the top directory of your Vim files.  Example:
    set VIM=C:\editors\vim
-  Vim version 8.1 will look for your vimrc file in $VIM, and for the runtime
-  files in $VIM/vim81.  See ":help $VIM" for more information.
+  Vim version 8.0 will look for your vimrc file in $VIM, and for the runtime
+  files in $VIM/vim80.  See ":help $VIM" for more information.

 - To avoid confusion between distributed files of different versions and your
  own modified vim scripts, it is recommended to use this directory layout:
@@ -105,14 +105,14 @@ Remarks:
 	C:\vim\vimfiles\ftplugin\*.vim	Filetype plugins
 	C:\vim\...			Other files you made.
  Distributed files:
-	C:\vim\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.
+	C:\vim\vim80\vim.exe		The Vim version 8.0 executable.
+	C:\vim\vim80\doc\*.txt		The version 8.0 documentation files.
+	C:\vim\vim80\bugreport.vim	A Vim version 8.0 script.
+	C:\vim\vim80\...		Other version 8.0 distributed files.
  In this case the $VIM environment variable would be set like this:
 	set VIM=C:\vim
-  Then $VIMRUNTIME will automatically be set to "$VIM\vim81".  Don't add
-  "vim81" to $VIM, that won't work.
+  Then $VIMRUNTIME will automatically be set to "$VIM\vim80".  Don't add
+  "vim80" to $VIM, that won't work.

 - You can put your Vim executable anywhere else.  If the executable is not
  with the other Vim files, you should set $VIM. The simplest is to add a line
@@ -136,8 +136,8 @@ Remarks:
     Select Properties.
  5. In the Program tab, change the "Cmdline" to add "/c" and the name of the
     Vim executable.  Examples:
-	C:\command.com /c C:\vim\vim81\vim.exe
-	C:\command.com /c D:\editors\vim\vim81\vim.exe
+	C:\command.com /c C:\vim\vim80\vim.exe
+	C:\command.com /c D:\editors\vim\vim80\vim.exe
  6. Select the font, window size, etc. that you like.  If this isn't
     possible, select "Advanced" in the Program tab, and deselect "MS-DOS
     mode".
@@ -1,4 +1,4 @@
-README_extra.txt for version 8.1 of Vim: Vi IMproved.
+README_extra.txt for version 8.0 of Vim: Vi IMproved.

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

 How to install MacVim?
 ========================
@@ -1,4 +1,4 @@
-README_ole.txt for version 8.1 of Vim: Vi IMproved.
+README_ole.txt for version 8.0 of Vim: Vi IMproved.

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

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

 This readme explains how to build Vim on z/OS.  Formerly called OS/390.
 See "README.txt" for general information about Vim.
@@ -1,8 +1,8 @@
-README_src.txt for version 8.1 of Vim: Vi IMproved.
+README_src.txt for version 8.0 of Vim: Vi IMproved.

 The source archive contains the files needed to compile Vim on Unix systems.
 It is packed for Unix systems (NL line separator).

 For more information, see the README.txt file that comes with the runtime
-archive (vim-8.1-rt.tar.gz).  To be able to run Vim you MUST get the runtime
+archive (vim-8.0-rt.tar.gz).  To be able to run Vim you MUST get the runtime
 archive too!
@@ -1,8 +1,8 @@
-README_srcdos.txt for version 8.1 of Vim: Vi IMproved.
+README_srcdos.txt for version 8.0 of Vim: Vi IMproved.

 See "README.txt" for general information about Vim.
 See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows.
-These files are in the runtime archive (vim81rt.zip).
+These files are in the runtime archive (vim80rt.zip).


 The DOS source archive contains the files needed to compile Vim on MS-DOS or
@@ -1,4 +1,4 @@
-README_unix.txt for version 8.1 of Vim: Vi IMproved.
+README_unix.txt for version 8.0 of Vim: Vi IMproved.

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

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

 This archive contains the gvim.exe that was specifically compiled for use in
 the Win32s subsystem in MS-Windows 3.1 and 3.11.
@@ -16,7 +16,6 @@ matrix:

 before_build:
  - '"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 /release'
-  - 'set INCLUDE=%INCLUDE%C:\Program Files (x86)\Windows Kits\8.1\Include\um'

 build_script:
  - src/appveyor.bat
@@ -1,5 +1,5 @@
 This builds a one-click install for Vim for Win32 using the Nullsoft
-Installation System (NSIS), available at http://nsis.sourceforge.net/
+Installation System (NSIS), available at http://www.nullsoft.com/free/nsis/

 To build the installable .exe:

@@ -17,14 +17,8 @@ To build the installable .exe:
 	uninstal.exe,
 	xxd/xxd.exe,

-    Then execute tools/rename.bat to rename the executables. (mv command is
-    required.)
-
 3.  Go to the GvimExt directory and build gvimext.dll (or get it from a binary
-    archive).  Both 64- and 32-bit versions are needed and should be placed
-    as follows:
-	64-bit: src/GvimExt/gvimext64.dll
-	32-bit: src/GvimExt/gvimext.dll
+    archive).

 4.  Go to the VisVim directory and build VisVim.dll (or get it from a binary
    archive).
@@ -33,35 +27,13 @@ To build the installable .exe:
    get them from a binary archive).

 6.  Get a "diff.exe" program and put it in the "../.." directory (above the
-    "vim80" directory, it's the same for all Vim versions).
+    "vim61" directory, it's the same for all Vim versions).
    You can find one in previous Vim versions or in this archive:
 		http://www.mossbayeng.com/~ron/vim/diffutils.tar.gz
-    Also put winpty32.dll and winpty-agent.exe there.

 7.  Do "make uganda.nsis.txt" in runtime/doc.  This requires sed, you may have
    to do this on Unix.  Make sure the file is in DOS file format!

-8.  Get gettext and iconv DLLs from the following site:
-	https://github.com/mlocati/gettext-iconv-windows/releases
-    Both 64- and 32-bit versions are needed.
-    Download the files gettextX.X.X.X-iconvX.XX-shared-{32,64}.zip, extract
-    DLLs and place them as follows:
-
-	<GETTEXT directory>
-	    |
-	    + gettext32/
-	    |	libintl-8.dll
-	    |	libiconv-2.dll
-	    |	libgcc_s_sjlj-1.dll
-	    |
-	    ` gettext64/
-		libintl-8.dll
-		libiconv-2.dll
-
-    The default <GETTEXT directory> is "..", however, you can change it by
-    passing /DGETTEXT=... option to the makensis command.
-
-
 Install NSIS if you didn't do that already.
 Also install UPX, if you want a compressed file.

@@ -20,15 +20,8 @@
  !define VIMTOOLS ..\..
 !endif

-# Location of gettext.
-# It must contain two directories: gettext32 and gettext64.
-# See README.txt for detail.
-!ifndef GETTEXT
-  !define GETTEXT ${VIMRT}
-!endif
-
 # Comment the next line if you don't have UPX.
-# Get it at https://upx.github.io/
+# Get it at http://upx.sourceforge.net
 !define HAVE_UPX

 # comment the next line if you do not want to add Native Language Support
@@ -83,17 +76,11 @@ SilentInstall normal
 # These are the pages we use
 Page license
 Page components
-Page custom SetCustom ValidateCustom ": _vimrc setting"
 Page directory "" "" CheckInstallDir
 Page instfiles
 UninstPage uninstConfirm
 UninstPage instfiles

-# Reserve files
-# Needed for showing the _vimrc setting page faster.
-ReserveFile /plugin InstallOptions.dll
-ReserveFile vimrc.ini
-
 ##########################################################
 # Functions

@@ -141,10 +128,6 @@ Function .onInit
  StrCpy $1 "-register-OLE"
  StrCpy $2 "gvim evim gview gvimdiff vimtutor"

-  # Extract InstallOptions files
-  # $PLUGINSDIR will automatically be removed when the installer closes
-  InitPluginsDir
-  File /oname=$PLUGINSDIR\vimrc.ini "vimrc.ini"
 FunctionEnd

 Function .onUserAbort
@@ -267,18 +250,12 @@ Section "Vim executables and runtime files"
 	SetOutPath $0\pack\dist\opt\swapmouse\plugin
 	File ${VIMRT}\pack\dist\opt\swapmouse\plugin\*.*

-	SetOutPath $0\pack\dist\opt\termdebug\plugin
-	File ${VIMRT}\pack\dist\opt\termdebug\plugin\*.*
-
 	SetOutPath $0\plugin
 	File ${VIMRT}\plugin\*.*

 	SetOutPath $0\autoload
 	File ${VIMRT}\autoload\*.*

-	SetOutPath $0\autoload\dist
-	File ${VIMRT}\autoload\dist\*.*
-
 	SetOutPath $0\autoload\xml
 	File ${VIMRT}\autoload\xml\*.*

@@ -351,67 +328,24 @@ Section "Add an Edit-with-Vim context menu entry"
 	SetOutPath $0
 	ClearErrors
 	SetOverwrite try
-
 	${If} ${RunningX64}
-	  # Install 64-bit gvimext.dll into the GvimExt64 directory.
-	  SetOutPath $0\GvimExt64
-	  ClearErrors
 	  File /oname=gvimext.dll ${VIMSRC}\GvimExt\gvimext64.dll
-!ifdef HAVE_NLS
-	  File ${GETTEXT}\gettext64\libintl-8.dll
-	  File ${GETTEXT}\gettext64\libiconv-2.dll
-!endif
-
-	  IfErrors 0 GvimExt64Done
-
-	  # Can't copy gvimext.dll, create it under another name and rename it
-	  # on next reboot.
-	  GetTempFileName $3 $0\GvimExt64
-	  File /oname=$3 ${VIMSRC}\GvimExt\gvimext64.dll
-	  Rename /REBOOTOK $3 $0\GvimExt64\gvimext.dll
-!ifdef HAVE_NLS
-	  GetTempFileName $3 $0\GvimExt64
-	  File /oname=$3 ${GETTEXT}\gettext64\libintl-8.dll
-	  Rename /REBOOTOK $3 $0\GvimExt64\libintl-8.dll
-	  GetTempFileName $3 $0\GvimExt64
-	  File /oname=$3 ${GETTEXT}\gettext64\libiconv-2.dll
-	  Rename /REBOOTOK $3 $0\GvimExt64\libiconv-2.dll
-!endif
+	${Else}
+	  File /oname=gvimext.dll ${VIMSRC}\GvimExt\gvimext.dll
 	${EndIf}
-
-	GvimExt64Done:
-
-	# Install 32-bit gvimext.dll into the GvimExt32 directory.
-	SetOutPath $0\GvimExt32
-	ClearErrors
-
-	File /oname=gvimext.dll ${VIMSRC}\GvimExt\gvimext.dll
-!ifdef HAVE_NLS
-	File ${GETTEXT}\gettext32\libintl-8.dll
-	File ${GETTEXT}\gettext32\libiconv-2.dll
-	File ${GETTEXT}\gettext32\libgcc_s_sjlj-1.dll
-!endif
-
-	IfErrors 0 GvimExt32Done
+	IfErrors 0 GvimExtDone

 	# Can't copy gvimext.dll, create it under another name and rename it on
 	# next reboot.
-	GetTempFileName $3 $0\GvimExt32
-	File /oname=$3 ${VIMSRC}\GvimExt\gvimext.dll
-	Rename /REBOOTOK $3 $0\GvimExt32\gvimext.dll
-!ifdef HAVE_NLS
-	GetTempFileName $3 $0\GvimExt32
-	File /oname=$3 ${GETTEXT}\gettext32\libintl-8.dll
-	Rename /REBOOTOK $3 $0\GvimExt32\libintl-8.dll
-	GetTempFileName $3 $0\GvimExt32
-	File /oname=$3 ${GETTEXT}\gettext32\libiconv-2.dll
-	Rename /REBOOTOK $3 $0\GvimExt32\libiconv-2.dll
-	GetTempFileName $3 $0\GvimExt32
-	File /oname=$3 ${GETTEXT}\gettext32\libgcc_s_sjlj-1.dll
-	Rename /REBOOTOK $3 $0\GvimExt32\libgcc_s_sjlj-1.dll
-!endif
+	GetTempFileName $3 $0
+	${If} ${RunningX64}
+	  File /oname=$3 ${VIMSRC}\GvimExt\gvimext64.dll
+	${Else}
+	  File /oname=$3 ${VIMSRC}\GvimExt\gvimext.dll
+	${EndIf}
+	Rename /REBOOTOK $3 $0\gvimext.dll

-	GvimExt32Done:
+	GvimExtDone:
 	SetOverwrite lastused

 	# We don't have a separate entry for the "Open With..." menu, assume
@@ -420,7 +354,7 @@ Section "Add an Edit-with-Vim context menu entry"
 SectionEnd

 ##########################################################
-Section "Create a _vimrc if it doesn't exist" sec_vimrc_id
+Section "Create a _vimrc if it doesn't exist"
 	SectionIn 1 3

 	StrCpy $1 "$1 -create-vimrc"
@@ -460,10 +394,10 @@ SectionEnd
 		File ${VIMRT}\keymap\README.txt
 		File ${VIMRT}\keymap\*.vim
 		SetOutPath $0
-		File ${GETTEXT}\gettext32\libintl-8.dll
-		File ${GETTEXT}\gettext32\libiconv-2.dll
-		#File /nonfatal ${VIMRT}\libwinpthread-1.dll
-		File /nonfatal ${GETTEXT}\gettext32\libgcc_s_sjlj-1.dll
+		File ${VIMRT}\libintl-8.dll
+		File ${VIMRT}\libiconv-2.dll
+		File /nonfatal ${VIMRT}\libwinpthread-1.dll
+		File /nonfatal ${VIMRT}\libgcc_s_sjlj-1.dll
 	SectionEnd
 !endif

@@ -478,43 +412,6 @@ Section -post
 	BringToFront
 SectionEnd

-##########################################################
-Function SetCustom
-	# Display the InstallOptions dialog
-
-	# Check if a _vimrc should be created
-	SectionGetFlags ${sec_vimrc_id} $3
-	IntOp $3 $3 & 1
-	StrCmp $3 "1" +2 0
-	  Abort
-
-	InstallOptions::dialog "$PLUGINSDIR\vimrc.ini"
-	Pop $3
-FunctionEnd
-
-Function ValidateCustom
-	ReadINIStr $3 "$PLUGINSDIR\vimrc.ini" "Field 2" "State"
-	StrCmp $3 "1" 0 +3
-	  StrCpy $1 "$1 -vimrc-remap no"
-	  Goto behave
-
-	  StrCpy $1 "$1 -vimrc-remap win"
-
-	behave:
-	ReadINIStr $3 "$PLUGINSDIR\vimrc.ini" "Field 5" "State"
-	StrCmp $3 "1" 0 +3
-	  StrCpy $1 "$1 -vimrc-behave unix"
-	  Goto done
-
-	ReadINIStr $3 "$PLUGINSDIR\vimrc.ini" "Field 6" "State"
-	StrCmp $3 "1" 0 +3
-	  StrCpy $1 "$1 -vimrc-behave mswin"
-	  Goto done
-
-	  StrCpy $1 "$1 -vimrc-behave default"
-	done:
-FunctionEnd
-
 ##########################################################
 Section Uninstall
 	# Apparently $INSTDIR is set to the directory where the uninstaller is
@@ -540,11 +437,6 @@ Section Uninstall
 	   $\nIt contains the Vim executables and runtime files." IDNO NoRemoveExes

 	Delete /REBOOTOK $0\*.dll
-	Delete /REBOOTOK $0\GvimExt32\*.dll
-	${If} ${RunningX64}
-	  Delete /REBOOTOK $0\GvimExt64\*.dll
-	${EndIf}
-
 	ClearErrors
 	# Remove everything but *.dll files.  Avoids that
 	# a lot remains when gvimext.dll cannot be deleted.
@@ -2,5 +2,5 @@
 !ifndef __GVIM_VER__NSH__
 !define __GVIM_VER__NSH__
 !define VER_MAJOR 8
-!define VER_MINOR 1
+!define VER_MINOR 0
 !endif
@@ -1,68 +0,0 @@
-[Settings]
-NumFields=7
-
-[Field 1]
-Type=GroupBox
-Left=0
-Right=-1
-Top=0
-Bottom=53
-Text=" Key remapping "
-
-[Field 2]
-Type=radiobutton
-Text=Do not remap keys for Windows behavior (Default)
-Left=10
-Right=-10
-Top=17
-Bottom=25
-State=1
-Flags=GROUP
-
-[Field 3]
-Type=radiobutton
-Text=Remap a few keys for Windows behavior (<C-V>, <C-C>, <C-A>, <C-S>, <C-F>, etc)
-Left=10
-Right=-10
-Top=30
-Bottom=47
-State=0
-Flags=NOTABSTOP
-
-[Field 4]
-Type=GroupBox
-Left=0
-Right=-1
-Top=55
-Bottom=-5
-Text=" Mouse behavior "
-
-[Field 5]
-Type=radiobutton
-Text=Right button extends selection, left button starts visual mode (Unix)
-Left=10
-Right=-5
-Top=72
-Bottom=80
-State=0
-Flags=GROUP
-
-[Field 6]
-Type=radiobutton
-Text=Right button has a popup menu, left button starts select mode (Windows)
-Left=10
-Right=-5
-Top=85
-Bottom=93
-State=0
-Flags=NOTABSTOP
-
-[Field 7]
-Type=radiobutton
-Text=Right button has a popup menu, left button starts visual mode (Default)
-Left=10
-Right=-5
-Top=98
-Bottom=106
-State=1
-Flags=NOTABSTOP
@@ -591,7 +591,7 @@ function ada#Map_Menu (Text, Keys, Command)
 	\" :" . a:Command
      execute
 	\ "inoremap <buffer>" .
-	\ " <Leader>a" . a:Keys .
+	\ " <Learder>a" . a:Keys .
 	\" <C-O>:" . a:Command
   endif
   return
@@ -1,745 +0,0 @@
-" Vim functions for file type detection
-"
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2017 Dec 05
-
-" These functions are moved here from runtime/filetype.vim to make startup
-" faster.
-
-" Line continuation is used here, remove 'C' from 'cpoptions'
-let s:cpo_save = &cpo
-set cpo&vim
-
-func dist#ft#Check_inp()
-  if getline(1) =~ '^\*'
-    setf abaqus
-  else
-    let n = 1
-    if line("$") > 500
-      let nmax = 500
-    else
-      let nmax = line("$")
-    endif
-    while n <= nmax
-      if getline(n) =~? "^header surface data"
-	setf trasys
-	break
-      endif
-      let n = n + 1
-    endwhile
-  endif
-endfunc
-
-" This function checks for the kind of assembly that is wanted by the user, or
-" can be detected from the first five lines of the file.
-func dist#ft#FTasm()
-  " make sure b:asmsyntax exists
-  if !exists("b:asmsyntax")
-    let b:asmsyntax = ""
-  endif
-
-  if b:asmsyntax == ""
-    call dist#ft#FTasmsyntax()
-  endif
-
-  " if b:asmsyntax still isn't set, default to asmsyntax or GNU
-  if b:asmsyntax == ""
-    if exists("g:asmsyntax")
-      let b:asmsyntax = g:asmsyntax
-    else
-      let b:asmsyntax = "asm"
-    endif
-  endif
-
-  exe "setf " . fnameescape(b:asmsyntax)
-endfunc
-
-func dist#ft#FTasmsyntax()
-  " see if file contains any asmsyntax=foo overrides. If so, change
-  " b:asmsyntax appropriately
-  let head = " ".getline(1)." ".getline(2)." ".getline(3)." ".getline(4).
-	\" ".getline(5)." "
-  let match = matchstr(head, '\sasmsyntax=\zs[a-zA-Z0-9]\+\ze\s')
-  if match != ''
-    let b:asmsyntax = match
-  elseif ((head =~? '\.title') || (head =~? '\.ident') || (head =~? '\.macro') || (head =~? '\.subtitle') || (head =~? '\.library'))
-    let b:asmsyntax = "vmasm"
-  endif
-endfunc
-
-" Check if one of the first five lines contains "VB_Name".  In that case it is
-" probably a Visual Basic file.  Otherwise it's assumed to be "alt" filetype.
-func dist#ft#FTVB(alt)
-  if getline(1).getline(2).getline(3).getline(4).getline(5) =~? 'VB_Name\|Begin VB\.\(Form\|MDIForm\|UserControl\)'
-    setf vb
-  else
-    exe "setf " . a:alt
-  endif
-endfunc
-
-func dist#ft#FTbtm()
-  if exists("g:dosbatch_syntax_for_btm") && g:dosbatch_syntax_for_btm
-    setf dosbatch
-  else
-    setf btm
-  endif
-endfunc
-
-func dist#ft#BindzoneCheck(default)
-  if getline(1).getline(2).getline(3).getline(4) =~ '^; <<>> DiG [0-9.]\+.* <<>>\|$ORIGIN\|$TTL\|IN\s\+SOA'
-    setf bindzone
-  elseif a:default != ''
-    exe 'setf ' . a:default
-  endif
-endfunc
-
-func dist#ft#FTlpc()
-  if exists("g:lpc_syntax_for_c")
-    let lnum = 1
-    while lnum <= 12
-      if getline(lnum) =~# '^\(//\|inherit\|private\|protected\|nosave\|string\|object\|mapping\|mixed\)'
-	setf lpc
-	return
-      endif
-      let lnum = lnum + 1
-    endwhile
-  endif
-  setf c
-endfunc
-
-func dist#ft#FTheader()
-  if match(getline(1, min([line("$"), 200])), '^@\(interface\|end\|class\)') > -1
-    if exists("g:c_syntax_for_h")
-      setf objc
-    else
-      setf objcpp
-    endif
-  elseif exists("g:c_syntax_for_h")
-    setf c
-  elseif exists("g:ch_syntax_for_h")
-    setf ch
-  else
-    setf cpp
-  endif
-endfunc
-
-" This function checks if one of the first ten lines start with a '@'.  In
-" that case it is probably a change file.
-" If the first line starts with # or ! it's probably a ch file.
-" If a line has "main", "include", "//" ir "/*" it's probably ch.
-" Otherwise CHILL is assumed.
-func dist#ft#FTchange()
-  let lnum = 1
-  while lnum <= 10
-    if getline(lnum)[0] == '@'
-      setf change
-      return
-    endif
-    if lnum == 1 && (getline(1)[0] == '#' || getline(1)[0] == '!')
-      setf ch
-      return
-    endif
-    if getline(lnum) =~ "MODULE"
-      setf chill
-      return
-    endif
-    if getline(lnum) =~ 'main\s*(\|#\s*include\|//'
-      setf ch
-      return
-    endif
-    let lnum = lnum + 1
-  endwhile
-  setf chill
-endfunc
-
-func dist#ft#FTent()
-  " This function checks for valid cl syntax in the first five lines.
-  " Look for either an opening comment, '#', or a block start, '{".
-  " If not found, assume SGML.
-  let lnum = 1
-  while lnum < 6
-    let line = getline(lnum)
-    if line =~ '^\s*[#{]'
-      setf cl
-      return
-    elseif line !~ '^\s*$'
-      " Not a blank line, not a comment, and not a block start,
-      " so doesn't look like valid cl code.
-      break
-    endif
-    let lnum = lnum + 1
-  endw
-  setf dtd
-endfunc
-
-func dist#ft#EuphoriaCheck()
-  if exists('g:filetype_euphoria')
-    exe 'setf ' . g:filetype_euphoria
-  else
-    setf euphoria3
-  endif
-endfunc
-
-func dist#ft#DtraceCheck()
-  let lines = getline(1, min([line("$"), 100]))
-  if match(lines, '^module\>\|^import\>') > -1
-    " D files often start with a module and/or import statement.
-    setf d
-  elseif match(lines, '^#!\S\+dtrace\|#pragma\s\+D\s\+option\|:\S\{-}:\S\{-}:') > -1
-    setf dtrace
-  else
-    setf d
-  endif
-endfunc
-
-func dist#ft#FTe()
-  if exists('g:filetype_euphoria')
-    exe 'setf ' . g:filetype_euphoria
-  else
-    let n = 1
-    while n < 100 && n < line("$")
-      if getline(n) =~ "^\\s*\\(<'\\|'>\\)\\s*$"
-	setf specman
-	return
-      endif
-      let n = n + 1
-    endwhile
-    setf eiffel
-  endif
-endfunc
-
-" Distinguish between HTML, XHTML and Django
-func dist#ft#FThtml()
-  let n = 1
-  while n < 10 && n < line("$")
-    if getline(n) =~ '\<DTD\s\+XHTML\s'
-      setf xhtml
-      return
-    endif
-    if getline(n) =~ '{%\s*\(extends\|block\|load\)\>\|{#\s\+'
-      setf htmldjango
-      return
-    endif
-    let n = n + 1
-  endwhile
-  setf html
-endfunc
-
-" Distinguish between standard IDL and MS-IDL
-func dist#ft#FTidl()
-  let n = 1
-  while n < 50 && n < line("$")
-    if getline(n) =~ '^\s*import\s\+"\(unknwn\|objidl\)\.idl"'
-      setf msidl
-      return
-    endif
-    let n = n + 1
-  endwhile
-  setf idl
-endfunc
-
-" Distinguish between "default" and Cproto prototype file. */
-func dist#ft#ProtoCheck(default)
-  " Cproto files have a comment in the first line and a function prototype in
-  " the second line, it always ends in ";".  Indent files may also have
-  " comments, thus we can't match comments to see the difference.
-  " IDL files can have a single ';' in the second line, require at least one
-  " chacter before the ';'.
-  if getline(2) =~ '.;$'
-    setf cpp
-  else
-    exe 'setf ' . a:default
-  endif
-endfunc
-
-func dist#ft#FTm()
-  let n = 1
-  let saw_comment = 0 " Whether we've seen a multiline comment leader.
-  while n < 100
-    let line = getline(n)
-    if line =~ '^\s*/\*'
-      " /* ... */ is a comment in Objective C and Murphi, so we can't conclude
-      " it's either of them yet, but track this as a hint in case we don't see
-      " anything more definitive.
-      let saw_comment = 1
-    endif
-    if line =~ '^\s*\(#\s*\(include\|import\)\>\|@import\>\|//\)'
-      setf objc
-      return
-    endif
-    if line =~ '^\s*%'
-      setf matlab
-      return
-    endif
-    if line =~ '^\s*(\*'
-      setf mma
-      return
-    endif
-    if line =~ '^\c\s*\(\(type\|var\)\>\|--\)'
-      setf murphi
-      return
-    endif
-    let n = n + 1
-  endwhile
-
-  if saw_comment
-    " We didn't see anything definitive, but this looks like either Objective C
-    " or Murphi based on the comment leader. Assume the former as it is more
-    " common.
-    setf objc
-  elseif exists("g:filetype_m")
-    " Use user specified default filetype for .m
-    exe "setf " . g:filetype_m
-  else
-    " Default is matlab
-    setf matlab
-  endif
-endfunc
-
-func dist#ft#FTmms()
-  let n = 1
-  while n < 10
-    let line = getline(n)
-    if line =~ '^\s*\(%\|//\)' || line =~ '^\*'
-      setf mmix
-      return
-    endif
-    if line =~ '^\s*#'
-      setf make
-      return
-    endif
-    let n = n + 1
-  endwhile
-  setf mmix
-endfunc
-
-" This function checks if one of the first five lines start with a dot.  In
-" that case it is probably an nroff file: 'filetype' is set and 1 is returned.
-func dist#ft#FTnroff()
-  if getline(1)[0] . getline(2)[0] . getline(3)[0] . getline(4)[0] . getline(5)[0] =~ '\.'
-    setf nroff
-    return 1
-  endif
-  return 0
-endfunc
-
-func dist#ft#FTmm()
-  let n = 1
-  while n < 10
-    let line = getline(n)
-    if line =~ '^\s*\(#\s*\(include\|import\)\>\|@import\>\|/\*\)'
-      setf objcpp
-      return
-    endif
-    let n = n + 1
-  endwhile
-  setf nroff
-endfunc
-
-func dist#ft#FTpl()
-  if exists("g:filetype_pl")
-    exe "setf " . g:filetype_pl
-  else
-    " recognize Prolog by specific text in the first non-empty line
-    " require a blank after the '%' because Perl uses "%list" and "%translate"
-    let l = getline(nextnonblank(1))
-    if l =~ '\<prolog\>' || l =~ '^\s*\(%\+\(\s\|$\)\|/\*\)' || l =~ ':-'
-      setf prolog
-    else
-      setf perl
-    endif
-  endif
-endfunc
-
-func dist#ft#FTinc()
-  if exists("g:filetype_inc")
-    exe "setf " . g:filetype_inc
-  else
-    let lines = getline(1).getline(2).getline(3)
-    if lines =~? "perlscript"
-      setf aspperl
-    elseif lines =~ "<%"
-      setf aspvbs
-    elseif lines =~ "<?"
-      setf php
-    else
-      call dist#ft#FTasmsyntax()
-      if exists("b:asmsyntax")
-	exe "setf " . fnameescape(b:asmsyntax)
-      else
-	setf pov
-      endif
-    endif
-  endif
-endfunc
-
-func dist#ft#FTprogress_cweb()
-  if exists("g:filetype_w")
-    exe "setf " . g:filetype_w
-    return
-  endif
-  if getline(1) =~ '&ANALYZE' || getline(3) =~ '&GLOBAL-DEFINE'
-    setf progress
-  else
-    setf cweb
-  endif
-endfunc
-
-func dist#ft#FTprogress_asm()
-  if exists("g:filetype_i")
-    exe "setf " . g:filetype_i
-    return
-  endif
-  " This function checks for an assembly comment the first ten lines.
-  " If not found, assume Progress.
-  let lnum = 1
-  while lnum <= 10 && lnum < line('$')
-    let line = getline(lnum)
-    if line =~ '^\s*;' || line =~ '^\*'
-      call dist#ft#FTasm()
-      return
-    elseif line !~ '^\s*$' || line =~ '^/\*'
-      " Not an empty line: Doesn't look like valid assembly code.
-      " Or it looks like a Progress /* comment
-      break
-    endif
-    let lnum = lnum + 1
-  endw
-  setf progress
-endfunc
-
-func dist#ft#FTprogress_pascal()
-  if exists("g:filetype_p")
-    exe "setf " . g:filetype_p
-    return
-  endif
-  " This function checks for valid Pascal syntax in the first ten lines.
-  " Look for either an opening comment or a program start.
-  " If not found, assume Progress.
-  let lnum = 1
-  while lnum <= 10 && lnum < line('$')
-    let line = getline(lnum)
-    if line =~ '^\s*\(program\|unit\|procedure\|function\|const\|type\|var\)\>'
-	\ || line =~ '^\s*{' || line =~ '^\s*(\*'
-      setf pascal
-      return
-    elseif line !~ '^\s*$' || line =~ '^/\*'
-      " Not an empty line: Doesn't look like valid Pascal code.
-      " Or it looks like a Progress /* comment
-      break
-    endif
-    let lnum = lnum + 1
-  endw
-  setf progress
-endfunc
-
-func dist#ft#FTr()
-  let max = line("$") > 50 ? 50 : line("$")
-
-  for n in range(1, max)
-    " Rebol is easy to recognize, check for that first
-    if getline(n) =~? '\<REBOL\>'
-      setf rebol
-      return
-    endif
-  endfor
-
-  for n in range(1, max)
-    " R has # comments
-    if getline(n) =~ '^\s*#'
-      setf r
-      return
-    endif
-    " Rexx has /* comments */
-    if getline(n) =~ '^\s*/\*'
-      setf rexx
-      return
-    endif
-  endfor
-
-  " Nothing recognized, use user default or assume Rexx
-  if exists("g:filetype_r")
-    exe "setf " . g:filetype_r
-  else
-    " Rexx used to be the default, but R appears to be much more popular.
-    setf r
-  endif
-endfunc
-
-func dist#ft#McSetf()
-  " Rely on the file to start with a comment.
-  " MS message text files use ';', Sendmail files use '#' or 'dnl'
-  for lnum in range(1, min([line("$"), 20]))
-    let line = getline(lnum)
-    if line =~ '^\s*\(#\|dnl\)'
-      setf m4  " Sendmail .mc file
-      return
-    elseif line =~ '^\s*;'
-      setf msmessages  " MS Message text file
-      return
-    endif
-  endfor
-  setf m4  " Default: Sendmail .mc file
-endfunc
-
-" Called from filetype.vim and scripts.vim.
-func dist#ft#SetFileTypeSH(name)
-  if expand("<amatch>") =~ g:ft_ignore_pat
-    return
-  endif
-  if a:name =~ '\<csh\>'
-    " Some .sh scripts contain #!/bin/csh.
-    call dist#ft#SetFileTypeShell("csh")
-    return
-  elseif a:name =~ '\<tcsh\>'
-    " Some .sh scripts contain #!/bin/tcsh.
-    call dist#ft#SetFileTypeShell("tcsh")
-    return
-  elseif a:name =~ '\<zsh\>'
-    " Some .sh scripts contain #!/bin/zsh.
-    call dist#ft#SetFileTypeShell("zsh")
-    return
-  elseif a:name =~ '\<ksh\>'
-    let b:is_kornshell = 1
-    if exists("b:is_bash")
-      unlet b:is_bash
-    endif
-    if exists("b:is_sh")
-      unlet b:is_sh
-    endif
-  elseif exists("g:bash_is_sh") || a:name =~ '\<bash\>' || a:name =~ '\<bash2\>'
-    let b:is_bash = 1
-    if exists("b:is_kornshell")
-      unlet b:is_kornshell
-    endif
-    if exists("b:is_sh")
-      unlet b:is_sh
-    endif
-  elseif a:name =~ '\<sh\>'
-    let b:is_sh = 1
-    if exists("b:is_kornshell")
-      unlet b:is_kornshell
-    endif
-    if exists("b:is_bash")
-      unlet b:is_bash
-    endif
-  endif
-  call dist#ft#SetFileTypeShell("sh")
-endfunc
-
-" For shell-like file types, check for an "exec" command hidden in a comment,
-" as used for Tcl.
-" Also called from scripts.vim, thus can't be local to this script.
-func dist#ft#SetFileTypeShell(name)
-  if expand("<amatch>") =~ g:ft_ignore_pat
-    return
-  endif
-  let l = 2
-  while l < 20 && l < line("$") && getline(l) =~ '^\s*\(#\|$\)'
-    " Skip empty and comment lines.
-    let l = l + 1
-  endwhile
-  if l < line("$") && getline(l) =~ '\s*exec\s' && getline(l - 1) =~ '^\s*#.*\\$'
-    " Found an "exec" line after a comment with continuation
-    let n = substitute(getline(l),'\s*exec\s\+\([^ ]*/\)\=', '', '')
-    if n =~ '\<tclsh\|\<wish'
-      setf tcl
-      return
-    endif
-  endif
-  exe "setf " . a:name
-endfunc
-
-func dist#ft#CSH()
-  if exists("g:filetype_csh")
-    call dist#ft#SetFileTypeShell(g:filetype_csh)
-  elseif &shell =~ "tcsh"
-    call dist#ft#SetFileTypeShell("tcsh")
-  else
-    call dist#ft#SetFileTypeShell("csh")
-  endif
-endfunc
-
-let s:ft_rules_udev_rules_pattern = '^\s*\cudev_rules\s*=\s*"\([^"]\{-1,}\)/*".*'
-func dist#ft#FTRules()
-  let path = expand('<amatch>:p')
-  if path =~ '^/\(etc/udev/\%(rules\.d/\)\=.*\.rules\|lib/udev/\%(rules\.d/\)\=.*\.rules\)$'
-    setf udevrules
-    return
-  endif
-  if path =~ '^/etc/ufw/'
-    setf conf  " Better than hog
-    return
-  endif
-  if path =~ '^/\(etc\|usr/share\)/polkit-1/rules\.d'
-    setf javascript
-    return
-  endif
-  try
-    let config_lines = readfile('/etc/udev/udev.conf')
-  catch /^Vim\%((\a\+)\)\=:E484/
-    setf hog
-    return
-  endtry
-  let dir = expand('<amatch>:p:h')
-  for line in config_lines
-    if line =~ s:ft_rules_udev_rules_pattern
-      let udev_rules = substitute(line, s:ft_rules_udev_rules_pattern, '\1', "")
-      if dir == udev_rules
-	setf udevrules
-      endif
-      break
-    endif
-  endfor
-  setf hog
-endfunc
-
-func dist#ft#SQL()
-  if exists("g:filetype_sql")
-    exe "setf " . g:filetype_sql
-  else
-    setf sql
-  endif
-endfunc
-
-" If the file has an extension of 't' and is in a directory 't' or 'xt' then
-" it is almost certainly a Perl test file.
-" If the first line starts with '#' and contains 'perl' it's probably a Perl
-" file.
-" (Slow test) If a file contains a 'use' statement then it is almost certainly
-" a Perl file.
-func dist#ft#FTperl()
-  let dirname = expand("%:p:h:t")
-  if expand("%:e") == 't' && (dirname == 't' || dirname == 'xt')
-    setf perl
-    return 1
-  endif
-  if getline(1)[0] == '#' && getline(1) =~ 'perl'
-    setf perl
-    return 1
-  endif
-  let save_cursor = getpos('.')
-  call cursor(1,1)
-  let has_use = search('^use\s\s*\k', 'c', 30)
-  call setpos('.', save_cursor)
-  if has_use
-    setf perl
-    return 1
-  endif
-  return 0
-endfunc
-
-" Choose context, plaintex, or tex (LaTeX) based on these rules:
-" 1. Check the first line of the file for "%&<format>".
-" 2. Check the first 1000 non-comment lines for LaTeX or ConTeXt keywords.
-" 3. Default to "latex" or to g:tex_flavor, can be set in user's vimrc.
-func dist#ft#FTtex()
-  let firstline = getline(1)
-  if firstline =~ '^%&\s*\a\+'
-    let format = tolower(matchstr(firstline, '\a\+'))
-    let format = substitute(format, 'pdf', '', '')
-    if format == 'tex'
-      let format = 'latex'
-    elseif format == 'plaintex'
-      let format = 'plain'
-    endif
-  elseif expand('%') =~ 'tex/context/.*/.*.tex'
-    let format = 'context'
-  else
-    " Default value, may be changed later:
-    let format = exists("g:tex_flavor") ? g:tex_flavor : 'plain'
-    " Save position, go to the top of the file, find first non-comment line.
-    let save_cursor = getpos('.')
-    call cursor(1,1)
-    let firstNC = search('^\s*[^[:space:]%]', 'c', 1000)
-    if firstNC " Check the next thousand lines for a LaTeX or ConTeXt keyword.
-      let lpat = 'documentclass\>\|usepackage\>\|begin{\|newcommand\>\|renewcommand\>'
-      let cpat = 'start\a\+\|setup\a\+\|usemodule\|enablemode\|enableregime\|setvariables\|useencoding\|usesymbols\|stelle\a\+\|verwende\a\+\|stel\a\+\|gebruik\a\+\|usa\a\+\|imposta\a\+\|regle\a\+\|utilisemodule\>'
-      let kwline = search('^\s*\\\%(' . lpat . '\)\|^\s*\\\(' . cpat . '\)',
-			      \ 'cnp', firstNC + 1000)
-      if kwline == 1	" lpat matched
-	let format = 'latex'
-      elseif kwline == 2	" cpat matched
-	let format = 'context'
-      endif		" If neither matched, keep default set above.
-      " let lline = search('^\s*\\\%(' . lpat . '\)', 'cn', firstNC + 1000)
-      " let cline = search('^\s*\\\%(' . cpat . '\)', 'cn', firstNC + 1000)
-      " if cline > 0
-      "   let format = 'context'
-      " endif
-      " if lline > 0 && (cline == 0 || cline > lline)
-      "   let format = 'tex'
-      " endif
-    endif " firstNC
-    call setpos('.', save_cursor)
-  endif " firstline =~ '^%&\s*\a\+'
-
-  " Translation from formats to file types.  TODO:  add AMSTeX, RevTex, others?
-  if format == 'plain'
-    setf plaintex
-  elseif format == 'context'
-    setf context
-  else " probably LaTeX
-    setf tex
-  endif
-  return
-endfunc
-
-func dist#ft#FTxml()
-  let n = 1
-  while n < 100 && n < line("$")
-    let line = getline(n)
-    " DocBook 4 or DocBook 5.
-    let is_docbook4 = line =~ '<!DOCTYPE.*DocBook'
-    let is_docbook5 = line =~ ' xmlns="http://docbook.org/ns/docbook"'
-    if is_docbook4 || is_docbook5
-      let b:docbk_type = "xml"
-      if is_docbook5
-	let b:docbk_ver = 5
-      else
-	let b:docbk_ver = 4
-      endif
-      setf docbk
-      return
-    endif
-    if line =~ 'xmlns:xbl="http://www.mozilla.org/xbl"'
-      setf xbl
-      return
-    endif
-    let n += 1
-  endwhile
-  setf xml
-endfunc
-
-func dist#ft#FTy()
-  let n = 1
-  while n < 100 && n < line("$")
-    let line = getline(n)
-    if line =~ '^\s*%'
-      setf yacc
-      return
-    endif
-    if getline(n) =~ '^\s*\(#\|class\>\)' && getline(n) !~ '^\s*#\s*include'
-      setf racc
-      return
-    endif
-    let n = n + 1
-  endwhile
-  setf yacc
-endfunc
-
-func dist#ft#Redif()
-  let lnum = 1
-  while lnum <= 5 && lnum < line('$')
-    if getline(lnum) =~ "^\ctemplate-type:"
-      setf redif
-      return
-    endif
-    let lnum = lnum + 1
-  endwhile
-endfunc
-
-
-" Restore 'cpoptions'
-let &cpo = s:cpo_save
-unlet s:cpo_save
@@ -2,7 +2,7 @@
 " Language:    SQL
 " Maintainer:  David Fishburn <dfishburn dot vim at gmail dot com>
 " Version:     16.0
-" Last Change: 2017 Oct 15
+" Last Change: 2015 Dec 29
 " Homepage:    http://www.vim.org/scripts/script.php?script_id=1572
 " Usage:       For detailed help
 "              ":help sql.txt"
@@ -860,7 +860,7 @@ function! s:SQLCGetColumns(table_name, list_type)

         " Start characterwise visual mode
         " Advance right one character
-         " Search forward until one of the following:
+         " Search foward until one of the following:
         "     1.  Another select/update/delete statement
         "     2.  A ; at the end of a line (the delimiter)
         "     3.  The end of the file (incase no delimiter)
@@ -1,112 +0,0 @@
-" Vim plugin for formatting XML
-" Last Change: Thu, 22 May 2018 21:26:55 +0100
-" Version: 0.1
-" Author: Christian Brabandt <cb@256bit.org>
-" Script:  http://www.vim.org/scripts/script.php?script_id=
-" License: VIM License
-" GetLatestVimScripts: ???? 18 :AutoInstall: xmlformat.vim
-" Documentation: see :h xmlformat.txt (TODO!)
-" ---------------------------------------------------------------------
-" Load Once: {{{1
-if exists("g:loaded_xmlformat") || &cp
-  finish
-endif
-let g:loaded_xmlformat = 1
-let s:keepcpo       = &cpo
-set cpo&vim
-
-" Main function: Format the input {{{1
-func! xmlformat#Format()
-  " only allow reformatting through the gq command
-  " (e.g. Vim is in normal mode)
-  if mode() != 'n'
-    " do not fall back to internal formatting
-    return 0
-  endif
-  let sw  = shiftwidth()
-  let prev = prevnonblank(v:lnum-1)
-  let s:indent = indent(prev)/sw
-  let result = []
-  let lastitem = prev ? getline(prev) : ''
-  let is_xml_decl = 0
-  " split on `<`, but don't split on very first opening <
-  for item in split(join(getline(v:lnum, (v:lnum + v:count - 1))), '.\@<=[>]\zs')
-    if s:EndTag(item)
-      let s:indent = s:DecreaseIndent()
-      call add(result, s:Indent(item))
-    elseif s:EmptyTag(lastitem)
-      call add(result, s:Indent(item))
-    elseif s:StartTag(lastitem) && s:IsTag(item)
-      let s:indent += 1
-      call add(result, s:Indent(item))
-     else
-       if !s:IsTag(item)
-         " Simply split on '<'
-         let t=split(item, '.<\@=\zs')
-         let s:indent+=1
-         call add(result, s:Indent(t[0]))
-         let s:indent = s:DecreaseIndent()
-         call add(result, s:Indent(t[1]))
-       else
-        call add(result, s:Indent(item))
-      endif
-     endif
-     let lastitem = item
-   endfor
-
-   if !empty(result)
-    exe v:lnum. ",". (v:lnum + v:count - 1). 'd'
-    call append(v:lnum - 1, result)
-    " Might need to remove the last line, if it became empty because of the
-    " append() call
-    let last = v:lnum + len(result)
-    if getline(last) is ''
-      exe last. 'd'
-    endif
-  endif
-
-  " do not run internal formatter!
-  return 0
-endfunc
-" Check if given tag is XML Declaration header {{{1
-func! s:IsXMLDecl(tag)
-  return a:tag =~? '^\s*<?xml\s\?\%(version="[^"]*"\)\?\s\?\%(encoding="[^"]*"\)\? ?>\s*$'
-endfunc
-" Return tag indented by current level {{{1
-func! s:Indent(item)
-  return repeat(' ', shiftwidth()*s:indent). s:Trim(a:item)
-endfu
-" Return item trimmed from leading whitespace {{{1
-func! s:Trim(item)
-  if exists('*trim')
-    return trim(a:item)
-  else
-    return matchstr(a:item, '\S\+.*')
-  endif
-endfunc
-" Check if tag is a new opening tag <tag> {{{1
-func! s:StartTag(tag)
-  return a:tag =~? '^\s*<[^/?]'
-endfunc
-" Remove one level of indentation {{{1
-func! s:DecreaseIndent()
-  return (s:indent > 0 ? s:indent - 1 : 0)
-endfunc
-" Check if tag is a closing tag </tag> {{{1
-func! s:EndTag(tag)
-  return a:tag =~? '^\s*</'
-endfunc
-" Check that the tag is actually a tag and not {{{1
-" something like "foobar</foobar>"
-func! s:IsTag(tag)
-  return s:Trim(a:tag)[0] == '<'
-endfunc
-" Check if tag is empty <tag/> {{{1
-func! s:EmptyTag(tag)
-  return a:tag =~ '/>\s*$'
-endfunc
-" Restoration And Modelines: {{{1
-let &cpo= s:keepcpo
-unlet s:keepcpo
-" Modeline {{{1
-" vim: fdm=marker fdl=0 ts=2 et sw=0 sts=-1
@@ -42,16 +42,7 @@ this autocmd might be useful:
 Replace "blue_sky" with the name of the colorscheme.

 In case you want to tweak a colorscheme after it was loaded, check out the
-ColorScheme autocommand event.
-
-To clean up just before loading another colorscheme, use the ColorSchemePre
-autocommand event.  For example:
-	let g:term_ansi_colors = ...
-	augroup MyColorscheme
-	  au!
-	  au ColorSchemePre * unlet g:term_ansi_colors
-	  au ColorSchemePre * au! MyColorscheme
-	augroup END
+ColorScheme autocmd event.

 To customize a colorscheme use another name, e.g.  "~/.vim/colors/mine.vim",
 and use `:runtime` to load the original colorscheme:
@@ -73,8 +64,6 @@ Search for "highlight_init".
 If you think you have a color scheme that is good enough to be used by others,
 please check the following items:

- Source the $VIMRUNTIME/colors/tools/check_colors.vim script to check for
-  common mistakes.
 - Does it work in a color terminal as well as in the GUI?
 - Is "g:colors_name" set to a meaningful value?  In case of doubt you can do
  it this way:
@@ -1,136 +0,0 @@
-" This script tests a color scheme for some errors. Load the scheme and source
-" this script. e.g. :e colors/desert.vim | :so check_colors.vim
-" Will output possible errors.
-
-let s:save_cpo= &cpo
-set cpo&vim
-
-func! Test_check_colors()
-  call cursor(1,1)
-  let err={}
-
-  " 1) Check g:colors_name is existing
-  if !search('\<\%(g:\)\?colors_name\>', 'cnW')
-    let err['colors_name'] = 'g:colors_name not set'
-  else
-    let err['colors_name'] = 'OK'
-  endif
-
-  " 2) Check for some well-defined highlighting groups
-  " Some items, check several groups, e.g. Diff, Spell
-  let hi_groups = ['ColorColumn', 'Diff', 'ErrorMsg', 'Folded',
-        \ 'FoldColumn', 'IncSearch', 'LineNr', 'ModeMsg', 'MoreMsg', 'NonText',
-        \ 'Normal', 'Pmenu', 'Todo', 'Search', 'Spell', 'StatusLine', 'TabLine',
-        \ 'Title', 'Visual', 'WarningMsg', 'WildMenu']
-  let groups={}
-  for group in hi_groups
-    if search('\c@suppress\s\+'.group, 'cnW')
-      " skip check, if the script contains a line like
-      " @suppress Visual:
-      let groups[group] = 'Ignoring '.group
-      continue
-    endif
-    if !search('hi\%[ghlight] \+'.group, 'cnW')
-      let groups[group] = 'No highlight definition for '.group
-      continue
-    endif
-    if !search('hi\%[ghlight] \+'.group. '.*fg=', 'cnW')
-      let groups[group] = 'Missing foreground color for '.group
-      continue
-    endif
-    if search('hi\%[ghlight] \+'.group. '.*guibg=', 'cnW') &&
-        \ !search('hi\%[ghlight] \+'.group. '.*ctermbg=', 'cnW')
-      let groups[group] = 'Missing bg terminal color for '.group
-      continue
-    endif
-    call search('hi\%[ghlight] \+'.group, 'cW')
-    " only check in the current line
-    if !search('guifg', 'cnW', line('.'))   || !search('ctermfg', 'cnW', line('.'))
-      " do not check for background colors, they could be intentionally left out
-      let groups[group] = 'Missing fg definition for '.group
-    endif
-    call cursor(1,1)
-  endfor
-  let err['highlight'] = groups
-
-  " 3) Check, that it does not set background highlighting
-  " Doesn't ':hi Normal ctermfg=253 ctermfg=233' also set the background sometimes?
-  let bg_set='\(set\?\|setl\(ocal\)\?\) .*\(background\|bg\)=\(dark\|light\)'
-  let bg_let='let \%([&]\%([lg]:\)\?\)\%(background\|bg\)\s*=\s*\([''"]\?\)\w\+\1'
-  let bg_pat='\%('.bg_set. '\|'.bg_let.'\)'
-  let line=search(bg_pat, 'cnW')
-  if search(bg_pat, 'cnW')
-    exe line
-    if search('hi \U\w\+\s\+\S', 'cbnW')
-      let err['background'] = 'Should not set background option after :hi statement'
-    endif
-  else
-    let err['background'] = 'OK'
-  endif
-  call cursor(1,1)
-
-  " 4) Check, that t_Co is checked
-  let pat = '[&]t_Co\s*[<>=]=\?\s*\d\+'
-  if !search(pat, 'ncW')
-    let err['t_Co'] = 'Does not check terminal for capable colors'
-  endif
-
-  " 5) Initializes correctly, e.g. should have a section like
-  " hi clear
-  " if exists("syntax_on")
-  " syntax reset
-  " endif
-  let pat='hi\%[ghlight]\s*clear\n\s*if\s*exists(\([''"]\)syntax_on\1)\n\s*syn\%[tax]\s*reset\n\s*endif'
-  if !search(pat, 'cnW')
-    let err['init'] = 'No initialization'
-  endif
-
-  " 6) Does not use :syn on
-  if search('syn\%[tax]\s\+on', 'cnW')
-    let err['background'] = 'Should not issue :syn on'
-  endif
-
-  " 7) Does not define filetype specfic groups like vimCommand, htmlTag,
-  let hi_groups = ['vim', 'html', 'python', 'sh', 'ruby']
-  for group in hi_groups
-    let pat='\Chi\%[ghlight]\s*\zs'.group.'\w\+\>'
-    if search(pat, 'cnW')
-      let line = search(pat, 'cW')
-      let err['filetype'] = get(err, 'filetype', 'Should not define: ') . matchstr(getline('.'), pat). ' '
-    endif
-    call cursor(1,1)
-  endfor
-  let g:err = err
-
-  " print Result
-  call Result(err)
-endfu
-
-fu! Result(err)
-  let do_roups = 0
-  echohl Title|echomsg "---------------"|echohl Normal
-  for key in sort(keys(a:err))
-    if key is# 'highlight'
-      let do_groups = 1
-      continue
-    else
-      if a:err[key] !~ 'OK'
-        echohl Title
-      endif
-      echomsg printf("%15s: %s", key, a:err[key])
-      echohl Normal
-    endif
-  endfor
-  echohl Title|echomsg "---------------"|echohl Normal
-  if do_groups
-    echohl Title | echomsg "Groups" | echohl Normal
-    for v1 in sort(keys(a:err['highlight']))
-      echomsg printf("%25s: %s", v1, a:err['highlight'][v1])
-    endfor
-  endif
-endfu
-
-call Test_check_colors()
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
@@ -344,7 +344,7 @@ xxd.man: xxd.1
 	nroff -man xxd.1 | sed -e s/.//g > xxd.man

 uganda.nsis.txt: uganda.txt
-	sed -e 's/[ 	]*\*[-a-zA-Z0-9.]*\*//g' -e 's/vim:tw=78:.*//' \
+	sed -e 's/[ 	]*\*[-a-zA-Z0-9.]*\*//g' -e 's/vim:tw=78://' \
 		uganda.txt | uniq >uganda.nsis.txt

 # Awk version of .txt to .html conversion.
@@ -376,10 +376,6 @@ tags.ref tags.html: tags
 perlhtml: tags $(DOCS)
 	./vim2html.pl tags $(DOCS)

-# Check URLs in the help with "curl".
-test_urls:
-	vim -S test_urls.vim
-
 clean:
 	-rm doctags *.html tags.ref

@@ -1,4 +1,4 @@
-*arabic.txt*	For Vim version 8.1.  Last change: 2010 Nov 13
+*arabic.txt*	For Vim version 8.0.  Last change: 2010 Nov 13


 		  VIM REFERENCE MANUAL	  by Nadim Shaikli
@@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 8.1.  Last change: 2018 May 03
+*autocmd.txt*   For Vim version 8.0.  Last change: 2017 Jul 14


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -21,6 +21,7 @@ For a basic explanation, see section |40.3| in the user manual.
 11. Disabling autocommands	|autocmd-disable|

 {Vi does not have any of these commands}
+{only when the |+autocmd| feature has not been disabled at compile time}

 ==============================================================================
 1. Introduction						*autocmd-intro*
@@ -32,7 +33,7 @@ files matching *.c.  You can also use autocommands to implement advanced
 features, such as editing compressed files (see |gzip-example|).  The usual
 place to put autocommands is in your .vimrc or .exrc file.

-				*E203* *E204* *E143* *E855* *E937* *E952*
+					*E203* *E204* *E143* *E855* *E937*
 WARNING: Using autocommands is very powerful, and may lead to unexpected side
 effects.  Be careful not to destroy your text.
 - It's a good idea to do some testing on an expendable copy of a file first.
@@ -56,8 +57,6 @@ effects.  Be careful not to destroy your text.
 			Add {cmd} to the list of commands that Vim will
 			execute automatically on {event} for a file matching
 			{pat} |autocmd-patterns|.
-			Note: A quote character is seen as argument to the
-			:autocmd and won't start a comment.
 			Vim always adds the {cmd} after existing autocommands,
 			so that the autocommands execute in the order in which
 			they were given.  See |autocmd-nested| for [nested].
@@ -69,14 +68,7 @@ Note: The ":autocmd" command can only be followed by another command when the
 '|' appears before {cmd}.  This works: >
 	:augroup mine | au! BufRead | augroup END
 But this sees "augroup" as part of the defined command: >
-	:augroup mine | au! BufRead * | augroup END
 	:augroup mine | au BufRead * set tw=70 | augroup END
-Instead you can put the group name into the command: >
-	:au! mine BufRead *
-	:au mine BufRead * set tw=70
-Or use `:execute`: >
-	:augroup mine | exe "au! BufRead *" | augroup END
-	:augroup mine | exe "au BufRead * set tw=70" | augroup END

 Note that special characters (e.g., "%", "<cword>") in the ":autocmd"
 arguments are not expanded when the autocommand is defined.  These will be
@@ -93,8 +85,7 @@ will appear twice.  To avoid this, define your autocommands in a group, so
 that you can easily clear them: >

 	augroup vimrc
-	  " Remove all vimrc autocommands
-	  autocmd!
+	  autocmd!	" Remove all vimrc autocommands
 	  au BufNewFile,BufRead *.html so <sfile>:h/html.vim
 	augroup END

@@ -148,8 +139,6 @@ prompt.  When one command outputs two messages this can happen anyway.
 			plugins, syntax highlighting, etc.

 :au[tocmd]! [group]	Remove ALL autocommands.
-			Note: a quote will be seen as argument to the :autocmd
-			and won't start a comment.
 			Warning: You should normally not do this without a
 			group, it breaks plugins, syntax highlighting, etc.

@@ -262,7 +251,6 @@ Name			triggered by ~
 |BufCreate|		just after adding a buffer to the buffer list
 |BufDelete|		before deleting a buffer from the buffer list
 |BufWipeout|		before completely deleting a buffer
-|TerminalOpen|		after a terminal buffer was created

 |BufFilePre|		before changing the name of the current buffer
 |BufFilePost|		after changing the name of the current buffer
@@ -291,8 +279,7 @@ Name			triggered by ~
 |GUIFailed|		after starting the GUI failed
 |TermResponse|		after the terminal response to |t_RV| is received

-|QuitPre|		when using `:quit`, before deciding whether to exit
-|ExitPre|		when using a command that may make Vim exit
+|QuitPre|		when using `:quit`, before deciding whether to quit
 |VimLeavePre|		before exiting Vim, before writing the viminfo file
 |VimLeave|		before exiting Vim, after writing the viminfo file

@@ -301,8 +288,6 @@ Name			triggered by ~
 |FileChangedShellPost|	After handling a file changed since editing started
 |FileChangedRO|		before making the first change to a read-only file

-|DirChanged|		after the working directory has changed
-
 |ShellCmdPost|		after executing a shell command
 |ShellFilterPost|	after filtering with a shell command

@@ -330,10 +315,6 @@ Name			triggered by ~
 |CmdwinEnter|		after entering the command-line window
 |CmdwinLeave|		before leaving the command-line window

-|CmdlineChanged|	after a change was made to the command-line text
-|CmdlineEnter|		after the cursor moves to the command line
-|CmdlineLeave|		before the cursor leaves the command line
-
 |InsertEnter|		starting Insert mode
 |InsertChange|		when typing <Insert> while in Insert or Replace mode
 |InsertLeave|		when leaving Insert mode
@@ -342,12 +323,7 @@ Name			triggered by ~

 |TextChanged|		after a change was made to the text in Normal mode
 |TextChangedI|		after a change was made to the text in Insert mode
-			when popup menu is not visible
-|TextChangedP|		after a change was made to the text in Insert mode
-			when popup menu visible
-|TextYankPost|		after text is yanked or deleted

-|ColorSchemePre|	before loading a color scheme
 |ColorScheme|		after loading a color scheme

 |RemoteReply|		a reply from a server Vim was received
@@ -469,9 +445,6 @@ BufWinEnter			After a buffer is displayed in a window.  This
 				existing buffer.  But it does happen for a
 				":split" with the name of the current buffer,
 				since it reloads that buffer.
-				Does not happen for a terminal window, because
-				it starts in Terminal-Job mode and Normal mode
-				commands won't work. Use |TerminalOpen| instead.
 							*BufWinLeave*
 BufWinLeave			Before a buffer is removed from a window.
 				Not when it's still visible in another window.
@@ -519,29 +492,6 @@ CmdUndefined			When a user command is used but it isn't
 				command is defined.  An alternative is to
 				always define the user command and have it
 				invoke an autoloaded function.  See |autoload|.
-							*CmdlineChanged*
-CmdlineChanged			After a change was made to the text in the
-				command line.  Be careful not to mess up
-				the command line, it may cause Vim to lock up.
-				<afile> is set to a single character,
-				indicating the type of command-line.
-				|cmdwin-char|
-							*CmdlineEnter*
-CmdlineEnter			After moving the cursor to the command line,
-				where the user can type a command or search
-				string.
-				<afile> is set to a single character,
-				indicating the type of command-line.
-				|cmdwin-char|
-							*CmdlineLeave*
-CmdlineLeave			Before leaving the command line.
-				Also when abandoning the command line, after
-				typing CTRL-C or <Esc>.
-				When the commands result in an error the
-				command line is still executed.
-				<afile> is set to a single character,
-				indicating the type of command-line.
-				|cmdwin-char|
 							*CmdwinEnter*
 CmdwinEnter			After entering the command-line window.
 				Useful for setting options specifically for
@@ -566,10 +516,6 @@ ColorScheme			After loading a color scheme. |:colorscheme|
 				set, and <amatch> for the new colorscheme
 				name.

-							*ColorSchemePre*
-ColorSchemePre			Before loading a color scheme. |:colorscheme|
-				Useful to setup removing things added by a
-				color scheme, before another one is loaded.

 							*CompleteDone*
 CompleteDone			After Insert mode completion is done.  Either
@@ -656,21 +602,6 @@ FileChangedRO			Before making the first change to a read-only
 							*E881*
 				If the number of lines changes saving for undo
 				may fail and the change will be aborted.
-							*DirChanged*
-DirChanged			The working directory has changed in response
-				to the |:cd| or |:lcd| commands, or as a
-				result of the 'autochdir' option.
-				The pattern can be:
-					"window" to trigger on `:lcd
-					"global" to trigger on `:cd`
-					"auto"   to trigger on 'autochdir'.
-					"drop"	 to trigger on editing a file
-				<afile> is set to the new directory name.
-							*ExitPre*
-ExitPre				When using `:quit`, `:wq` in a way it makes
-				Vim exit, or using `:qall`, just after
-				|QuitPre|.  Can be used to close any
-				non-essential window.
 							*FileChangedShell*
 FileChangedShell		When Vim notices that the modification time of
 				a file has changed since editing started.
@@ -808,7 +739,7 @@ InsertCharPre			When a character is typed in Insert mode,
 				inserted literally.
 				It is not allowed to change the text |textlock|.
 				The event is not triggered when 'paste' is
-				set. {only with the +eval feature}
+				set.
 							*InsertEnter*
 InsertEnter			Just before starting Insert mode.  Also for
 				Replace mode and Virtual Replace mode.  The
@@ -886,7 +817,6 @@ QuitPre				When using `:quit`, `:wq` or `:qall`, before
 				or quits Vim.  Can be used to close any
 				non-essential window if the current window is
 				the last ordinary window.
-				Also see |ExitPre|.
 							*RemoteReply*
 RemoteReply			When a reply from a Vim that functions as
 				server was received |server2client()|.  The
@@ -955,7 +885,6 @@ SwapExists			Detected an existing swap file when starting
 				It is not allowed to change to another buffer,
 				change a buffer name or change directory
 				here.
-				{only available with the +eval feature}
 							*Syntax*
 Syntax				When the 'syntax' option has been set.  The
 				pattern is matched against the syntax name.
@@ -982,11 +911,6 @@ TermChanged			After the value of 'term' has changed.  Useful
 				for re-loading the syntax file to update the
 				colors, fonts and other terminal-dependent
 				settings.  Executed for all loaded buffers.
-							*TerminalOpen*
-TerminalOpen			Just after a terminal buffer was created, with
-				`:terminal` or |term_start()|. This event is
-				triggered even if the buffer is created
-				without a window, with the ++hidden option.
 							*TermResponse*
 TermResponse			After the response to |t_RV| is received from
 				the terminal.  The value of |v:termresponse|
@@ -1009,39 +933,10 @@ TextChangedI			After a change was made to the text in the
 				current buffer in Insert mode.
 				Not triggered when the popup menu is visible.
 				Otherwise the same as TextChanged.
-							*TextChangedP*
-TextChangedP			After a change was made to the text in the
-				current buffer in Insert mode, only when the
-				popup menu is visible.  Otherwise the same as
-				TextChanged.
-							*TextYankPost*
-TextYankPost			After text has been yanked or deleted in the
-				current buffer.  The following values of
-				|v:event| can be used to determine the operation
-				that triggered this autocmd:
-				   operator    	The operation performed.
-				   regcontents 	Text that was stored in the
-						register, as a list of lines,
-						like with: >
-						getreg(r, 1, 1)
-<				   regname	Name of the |register| or
-						empty string for the unnamed
-						register.
-				   regtype	Type of the register, see
-						|getregtype()|.
-				Not triggered when |quote_| is used nor when
-				called recursively.
-				It is not allowed to change the buffer text,
-				see |textlock|.
-				{only when compiled with the +eval feature}
 							*User*
 User				Never executed automatically.  To be used for
 				autocommands that are only executed with
 				":doautocmd".
-				Note that when `:doautocmd User MyEvent` is
-				used while there are no matching autocommands,
-				you will get an error.  If you don't want
-				that, define a dummy autocommand yourself.
 							*UserGettingBored*
 UserGettingBored		When the user presses the same key 42 times.
 				Just kidding! :-)
@@ -1086,10 +981,9 @@ WinEnter			After entering another window.  Not done for
 				If the window is for another buffer, Vim
 				executes the BufEnter autocommands after the
 				WinEnter autocommands.
-				Note: For split and tabpage commands the
-				WinEnter event is triggered after the split
-				or tab command but before the file is loaded.
-
+				Note: When using ":split fname" the WinEnter
+				event is triggered after the split but before
+				the file "fname" is loaded.
 							*WinLeave*
 WinLeave			Before leaving a window.  If the window to be
 				entered next is for a different buffer, Vim
@@ -1,4 +1,4 @@
-*change.txt*    For Vim version 8.1.  Last change: 2018 May 12
+*change.txt*    For Vim version 8.0.  Last change: 2017 Feb 12


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -110,7 +110,7 @@ is an error when 'cpoptions' includes the 'E' flag.
 J			Join [count] lines, with a minimum of two lines.
 			Remove the indent and insert up to two spaces (see
 			below).  Fails when on the last line of the buffer.
-			If [count] is too big it is reduced to the number of
+			If [count] is too big it is reduce to the number of
 			lines available.

 							*v_J*
@@ -446,7 +446,7 @@ This depends on the 'nrformats' option:

 For decimals a leading negative sign is considered for incrementing/
 decrementing, for binary, octal and hex values, it won't be considered.  To
-ignore the sign Visually select the number before using CTRL-A or CTRL-X.
+ignore the sign Visually select the number before using CTRL-A or CTRL-X. 

 For numbers with leading zeros (including all octal and hexadecimal numbers),
 Vim preserves the number of characters in the number when possible.  CTRL-A on
@@ -533,7 +533,6 @@ If the 'shiftround' option is on, the indent is rounded to a multiple of
 If the 'smartindent' option is on, or 'cindent' is on and 'cinkeys' contains
 '#' with a zero value, shift right does not affect lines starting with '#'
 (these are supposed to be C preprocessor lines that must stay in column 1).
-This can be changed with the 'cino' option, see |cino-#|.

 When the 'expandtab' option is off (this is the default) Vim uses <Tab>s as
 much as possible to make the indent.  You can use ">><<" to replace an indent
@@ -1445,55 +1444,6 @@ to the name of an external program for Vim to use for text formatting.  The
 'textwidth' and other options have no effect on formatting by an external
 program.

-                                                        *format-formatexpr*
-The 'formatexpr' option can be set to a Vim Script function that performs
-reformatting of the buffer.  This should usually happen in an |ftplugin|,
-since formatting is highly dependent on the type of file.  It makes
-sense to use an |autoload| script, so the corresponding script is only loaded
-when actually needed and the script should be called <filetype>format.vim.
-
-For example, the XML filetype plugin distributed with Vim in the $VIMRUNTIME
-directory, sets the 'formatexpr' option to: >
-
-   setlocal formatexpr=xmlformat#Format()
-
-That means, you will find the corresponding script, defining the
-xmlformat#Format() function, in the directory:
-`$VIMRUNTIME/autoload/xmlformat.vim`
-
-Here is an example script that removes trailing whitespace from the selected
-text.  Put it in your autoload directory, e.g. ~/.vim/autoload/format.vim: >
-
-  func! format#Format()
-    " only reformat on explicit gq command
-    if mode() != 'n'
-      " fall back to Vims internal reformatting
-      return 1
-    endif
-    let lines = getline(v:lnum, v:lnum + v:count - 1)
-    call map(lines, {key, val -> substitute(val, '\s\+$', '', 'g')})
-    call setline('.', lines)
-
-    " do not run internal formatter!
-    return 0
-  endfunc
-
-You can then enable the formatting by executing: >
-  setlocal formatexpr=format#Format()
->
-Note: this function explicitly returns non-zero when called from insert mode
-(which basically means, text is inserted beyond the 'textwidth' limit).  This
-causes Vim to fall back to reformat the text by using the internal formatter.
-
-However, if the |gq| command is used to reformat the text, the function
-will receive the selected lines, trim trailing whitespace from those lines and
-put them back in place.  If you are going to split single lines into multiple
-lines, be careful not to overwrite anything.
-
-If you want to allow reformatting of text from insert or replace mode, one has
-to be very careful, because the function might be called recursively.  For
-debugging it helps to set the 'debug' option.
-
 							*right-justify*
 There is no command in Vim to right justify text.  You can do it with
 an external command, like "par" (e.g.: "!}par" to format until the end of the
@@ -1,4 +1,4 @@
-*channel.txt*      For Vim version 8.1.  Last change: 2018 Apr 18
+*channel.txt*      For Vim version 8.0.  Last change: 2017 Aug 11


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -22,7 +22,6 @@ The Netbeans interface also uses a channel. |netbeans|
 9. Starting a job without a channel	|job-start-nochannel|
 10. Job options				|job-options|
 11. Controlling a job			|job-control|
-12. Using a prompt buffer		|prompt-buffer|

 {Vi does not have any of these features}
 {only when compiled with the |+channel| feature for channel stuff}
@@ -56,7 +55,7 @@ JS	JavaScript style JSON-like encoding |js_encode()|
 Common combination are:
 - Using a job connected through pipes in NL mode.  E.g., to run a style
  checker and receive errors and warnings.
- Using a daemon, connecting over a socket in JSON mode.  E.g. to lookup
+- Using a deamon, connecting over a socket in JSON mode.  E.g. to lookup
  cross-references in a database.

 ==============================================================================
@@ -771,43 +770,5 @@ signals.  E.g. to force a job to stop, "kill it": >

 For more options see |job_stop()|.

-==============================================================================
-12. Using a prompt buffer				*prompt-buffer*
-
-If you want to type input for the job in a Vim window you have a few options:
- Use a normal buffer and handle all possible commands yourself.
-  This will be complicated, since there are so many possible commands.
- Use a terminal window.  This works well if what you type goes directly to
-  the job and the job output is directly displayed in the window.
-  See |terminal-window|.
- Use a prompt window. This works well when entering a line for the job in Vim
-  while displaying (possibly filtered) output from the job.
-
-A prompt buffer is created by setting 'buftype' to "prompt". You would
-normally only do that in a newly created buffer.
-
-The user can edit and enter one line of text at the very last line of the
-buffer.  When pressing Enter in the prompt line the callback set with
-|prompt_setcallback()| is invoked.  It would normally send the line to a job.
-Another callback would receive the output from the job and display it in the
-buffer, below the prompt (and above the next prompt).
-
-Only the text in the last line, after the prompt, is editable. The rest of the
-buffer is not modifiable with Normal mode commands.  It can be modified by
-calling functions, such as |append()|.  Using other commands may mess up the
-buffer.
-
-After setting 'buftype' to "prompt" Vim does not automatically start Insert
-mode, use `:startinsert` if you want to enter Insert mode, so that the user
-can start typing a line.
-
-The text of the prompt can be set with the |prompt_setprompt()| function.
-
-The user can go to Normal mode and navigate through the buffer.  This can be
-useful see older output or copy text.
-
-Any command that starts Insert mode, such as "a", "i", "A" and "I", will move
-the cursor to the last line, after the prompt.
-

 vim:tw=78:ts=8:ft=help:norl:
@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 8.1.  Last change: 2018 May 14
+*cmdline.txt*   For Vim version 8.0.  Last change: 2017 Sep 17


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -175,14 +175,12 @@ CTRL-R CTRL-F				*c_CTRL-R_CTRL-F* *c_<C-R>_<C-F>*
 CTRL-R CTRL-P				*c_CTRL-R_CTRL-P* *c_<C-R>_<C-P>*
 CTRL-R CTRL-W				*c_CTRL-R_CTRL-W* *c_<C-R>_<C-W>*
 CTRL-R CTRL-A				*c_CTRL-R_CTRL-A* *c_<C-R>_<C-A>*
-CTRL-R CTRL-L				*c_CTRL-R_CTRL-L* *c_<C-R>_<C-L>*
 		Insert the object under the cursor:
 			CTRL-F	the Filename under the cursor
 			CTRL-P	the Filename under the cursor, expanded with
 				'path' as in |gf|
 			CTRL-W	the Word under the cursor
 			CTRL-A	the WORD under the cursor; see |WORD|
-			CTRL-L	the line under the cursor

 		When 'incsearch' is set the cursor position at the end of the
 		currently displayed match is used.  With CTRL-W the part of
@@ -194,8 +192,8 @@ CTRL-R CTRL-L				*c_CTRL-R_CTRL-L* *c_<C-R>_<C-L>*

 					*c_CTRL-R_CTRL-R* *c_<C-R>_<C-R>*
 					*c_CTRL-R_CTRL-O* *c_<C-R>_<C-O>*
-CTRL-R CTRL-R {0-9a-z"%#:-=. CTRL-F CTRL-P CTRL-W CTRL-A CTRL-L}
-CTRL-R CTRL-O {0-9a-z"%#:-=. CTRL-F CTRL-P CTRL-W CTRL-A CTRL-L}
+CTRL-R CTRL-R {0-9a-z"%#:-=. CTRL-F CTRL-P CTRL-W CTRL-A}
+CTRL-R CTRL-O {0-9a-z"%#:-=. CTRL-F CTRL-P CTRL-W CTRL-A}
 		Insert register or object under the cursor.  Works like
 		|c_CTRL-R| but inserts the text literally.  For example, if
 		register a contains "xy^Hz" (where ^H is a backspace),
@@ -412,17 +410,14 @@ CTRL-D		List names that match the pattern in front of the cursor.
 		match is inserted.  After the last match, the first is used
 		again (wrap around).
 		The behavior can be changed with the 'wildmode' option.
-							*c_<S-Tab>*
-<S-Tab>		Like 'wildchar' or <Tab>, but begin with the last match and
-		then go to the previous match.
-		<S-Tab> does not work everywhere.
 							*c_CTRL-N*
 CTRL-N		After using 'wildchar' which got multiple matches, go to next
 		match.  Otherwise recall more recent command-line from history.
-							*c_CTRL-P*
+<S-Tab>							*c_CTRL-P* *c_<S-Tab>*
 CTRL-P		After using 'wildchar' which got multiple matches, go to
 		previous match.  Otherwise recall older command-line from
-		history.
+		history.  <S-Tab> only works with the GUI, on the Amiga and
+		with MS-DOS.
 							*c_CTRL-A*
 CTRL-A		All names that match the pattern in front of the cursor are
 		inserted.
@@ -458,10 +453,6 @@ a previous version <Esc> was used).  In the pattern standard wildcards '*' and
 '?' are accepted when matching file names.  '*' matches any string, '?'
 matches exactly one character.

-When repeating 'wildchar' or CTRL-N you cycle through the matches, eventually
-ending up back to what was typed.  If the first match is not what you wanted,
-you can use <S-Tab> or CTRL-P to go straight back to what you typed.
-
 The 'wildignorecase' option can be set to ignore case in filenames.

 The 'wildmenu' option can be set to show the matches just above the command
@@ -848,8 +839,7 @@ Note: these are typed literally, they are not special keys!
 	<cfile>    is replaced with the path name under the cursor (like what
 		   |gf| uses)
 	<afile>    When executing autocommands, is replaced with the file name
-		   of the buffer being manipulated, or the file for a read or
-		   write.
+		   for a file read or write.
 	<abuf>     When executing autocommands, is replaced with the currently
 		   effective buffer number (for ":r file" and ":so file" it is
 		   the current buffer, the file being read/sourced is not in a
@@ -1,4 +1,4 @@
-*debug.txt*     For Vim version 8.1.  Last change: 2017 Jul 15
+*debug.txt*     For Vim version 8.0.  Last change: 2017 Jul 15


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1,4 +1,4 @@
-*debugger.txt*  For Vim version 8.1.  Last change: 2017 Nov 21
+*debugger.txt*  For Vim version 8.0.  Last change: 2005 Mar 29


 		  VIM REFERENCE MANUAL    by Gordon Prieur
@@ -95,12 +95,10 @@ list and colors can be set via X resources (XmNballoonEvalFontList,
 XmNballoonEvalBackground, and XmNballoonEvalForeground).
 The 'balloondelay' option sets the delay before an attempt is made to show a
 balloon.
-The 'ballooneval' and/or the 'balloonevalterm' option needs to be set to
-switch it on.
+The 'ballooneval' option needs to be set to switch it on.

-Balloon evaluation is only available in the GUI when compiled with the
-|+balloon_eval| feature.  For the terminal the  |+balloon_eval_term| feature
-matters.
+Balloon evaluation is only available when compiled with the |+balloon_eval|
+feature.

 The Balloon evaluation functions are also used to show a tooltip for the
 toolbar.  The 'ballooneval' option does not need to be set for this.  But the
@@ -1,4 +1,4 @@
-*develop.txt*   For Vim version 8.1.  Last change: 2018 May 02
+*develop.txt*   For Vim version 8.0.  Last change: 2017 Jul 31


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -18,8 +18,7 @@ See the file README.txt in the "src" directory for an overview of the source
 code.

 Vim is open source software.  Everybody is encouraged to contribute to help
-improving Vim.  For sending patches a unified diff "diff -u" is preferred.
-You can create a pull request on github, but it's not required.
+improving Vim.  For sending patches a context diff "diff -c" is preferred.
 Also see http://vim.wikia.com/wiki/How_to_make_and_submit_a_patch.

 ==============================================================================
@@ -183,43 +182,12 @@ The basic steps to make changes to the code:
   include the diff. Or create a pull request on github.


-C COMPILER				*style-compiler* *ANSI-C* *C89* *C99*
+C COMPILER						*style-compiler*

 The minimal C compiler version supported is C89, also known as ANSI C.
-Later standards, such as C99, are not widely supported, or at least not 100%
-supported.  Therefore we use only some of the C99 features and disallow some
-(at least for now).
+Later standards don't add much and C89 is the widest supported.

-Please don't make changes everywhere to use the C99 features, it causes merge
-problems for existing patches.  Only use them for new and changed code.
-
-Comments ~
-
-Traditionally Vim uses /* comments */.  We intend to keep it that way,
-especially for file and function headers.  For new code or lines of code that
-change, it is allowed to use // comments.  Especially when it comes after
-code:
-	int some_var;  // single line comment useful here
-
-Enums ~
-
-The last item in an enum may have a trailing comma.  C89 didn't allow this.
-
-Types ~
-
-"long long" is allowed and can be expected to be 64 bits.  Use %lld in printf
-formats.  Also "long long unsigned" with %llu.
-
-Not to be used ~
-
-These C99 features are not to be used, because not enough compilers support
-them:
- Declaration after Statements (MSVC 2012 does not support it).  All
-  declarations need to be at the start of the block.
- Variable length arrays (even in C11 this is an optional feature).
- _Bool and _Complex types.
- "inline" (it's hardly ever needed, let the optimizer do its work)
- flexible array members: Not supported by HP-UX C compiler (John Marriott)
+One restriction that this implies: no // comments, only /* comments */.


 USE OF COMMON FUNCTIONS					*style-functions*
@@ -1,4 +1,4 @@
-*diff.txt*      For Vim version 8.1.  Last change: 2017 Oct 03
+*diff.txt*      For Vim version 8.0.  Last change: 2017 Sep 02


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -10,7 +10,7 @@ eight versions of the same file.

 The basics are explained in section |08.7| of the user manual.

-1. Starting diff mode		|start-vimdiff|
+1. Starting diff mode		|vimdiff|
 2. Viewing diffs		|view-diffs|
 3. Jumping to diffs		|jumpto-diffs|
 4. Copying diffs		|copy-diffs|
@@ -19,7 +19,7 @@ The basics are explained in section |08.7| of the user manual.
 {not in Vi}

 ==============================================================================
-1. Starting diff mode					*start-vimdiff*
+1. Starting diff mode

 The easiest way to start editing in diff mode is with the "vimdiff" command.
 This starts Vim as usual, and additionally sets up for viewing the differences
@@ -326,7 +326,7 @@ g:diff_translations to zero: >

    let g:diff_translations = 0
 <
-After setting this variable, reload the syntax script: >
+After setting this variable, Reload the syntax script: >

    set syntax=diff
 <
@@ -1,4 +1,4 @@
-*digraph.txt*   For Vim version 8.1.  Last change: 2016 Nov 04
+*digraph.txt*   For Vim version 8.0.  Last change: 2016 Nov 04


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1,4 +1,4 @@
-*editing.txt*   For Vim version 8.1.  Last change: 2018 Mar 29
+*editing.txt*   For Vim version 8.0.  Last change: 2017 Aug 21


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -424,15 +424,6 @@ On Unix and a few other systems you can also use backticks for the file name
 argument, for example: >
 	:next `find . -name ver\\*.c -print`
 	:view `ls -t *.patch  \| head -n1`
-Vim will run the command in backticks using the 'shell' and use the standard
-output as argument for the given Vim command (error messages from the shell
-command will be discarded).
-To see what shell command Vim is running, set the 'verbose' option to 4. When
-the shell command returns a non-zero exit code, an error message will be
-displayed and the Vim command will be aborted. To avoid this make the shell
-always return zero like so: >
-       :next `find . -name ver\\*.c -print \|\| true`
-
 The backslashes before the star are required to prevent the shell from
 expanding "ver*.c" prior to execution of the find program.  The backslash
 before the shell pipe symbol "|" prevents Vim from parsing it as command
@@ -659,7 +650,8 @@ list of the current window.
 			There is no check for duplicates, it is possible to
 			add a file to the argument list twice.
 			The currently edited file is not changed.
-			{not in Vi}
+			{not in Vi} {not available when compiled without the
+			|+listcmds| feature}
 			Note: you can also use this method: >
 				:args ## x
 <			This will add the "x" item and sort the new list.
@@ -673,7 +665,8 @@ list of the current window.
 			when it's deleted from the argument list.
 			Example: >
 				:argdel *.obj
-<			{not in Vi}
+<			{not in Vi} {not available when compiled without the
+			|+listcmds| feature}

 :[range]argd[elete]	Delete the {range} files from the argument list.
 			Example: >
@@ -688,7 +681,8 @@ list of the current window.
 <			Removes all the files from the arglist.
 			When the last number in the range is too high, up to
 			the last argument is deleted.
-			{not in Vi}
+			{not in Vi} {not available when compiled without the
+			|+listcmds| feature}

 							*:argu* *:argument*
 :[count]argu[ment] [count] [++opt] [+cmd]
@@ -697,14 +691,16 @@ list of the current window.
 			when changes have been made and Vim does not want to
 			|abandon| the current buffer.
 			Also see |++opt| and |+cmd|.
-			{not in Vi}
+			{not in Vi} {not available when compiled without the
+			|+listcmds| feature}

 :[count]argu[ment]! [count] [++opt] [+cmd]
 			Edit file [count] in the argument list, discard any
 			changes to the current buffer.  When [count] is
 			omitted the current entry is used.
 			Also see |++opt| and |+cmd|.
-			{not in Vi}
+			{not in Vi} {not available when compiled without the
+			|+listcmds| feature}

 :[count]n[ext] [++opt] [+cmd]			*:n* *:ne* *:next* *E165* *E163*
 			Edit [count] next file.  This fails when changes have
@@ -827,6 +823,7 @@ fourth file in the argument list.  This happens when you do ":e file".
 LOCAL ARGUMENT LIST

 {not in Vi}
+{not available when compiled without the |+windows| or |+listcmds| features}

 							*:arglocal*
 :argl[ocal]		Make a local copy of the global argument list.
@@ -878,7 +875,8 @@ USING THE ARGUMENT LIST
 			autocommand event is disabled by adding it to
 			'eventignore'.  This considerably speeds up editing
 			each file.
-			{not in Vi}
+			{not in Vi} {not available when compiled without the
+			|+listcmds| feature}
 			Also see |:windo|, |:tabdo|, |:bufdo|, |:cdo|, |:ldo|,
 			|:cfdo| and |:lfdo|

@@ -902,7 +900,7 @@ Note: When the 'write' option is off, you are not able to write any file.

 							*:w* *:write*
 						*E502* *E503* *E504* *E505*
-						*E512* *E514* *E667* *E796* *E949*
+						*E512* *E514* *E667* *E796*
 :w[rite] [++opt]	Write the whole buffer to the current file.  This is
 			the normal way to save changes to a file.  It fails
 			when the 'readonly' option is set or when there is
@@ -958,9 +956,6 @@ used, for example, when the write fails and you want to try again later with
 ":w #".  This can be switched off by removing the 'A' flag from the
 'cpoptions' option.

-Note that the 'fsync' option matters here.  If it's set it may make writes
-slower (but safer).
-
 							*:sav* *:saveas*
 :sav[eas][!] [++opt] {file}
 			Save the current buffer under the name {file} and set
@@ -1204,8 +1199,7 @@ MULTIPLE WINDOWS AND BUFFERS				*window-exit*
 :wqa[ll]! [++opt]
 :xa[ll]!	Write all changed buffers, even the ones that are readonly,
 		and exit Vim.  If there are buffers without a file name or
-		which cannot be written for another reason, or there is a
-		terminal with a running job, Vim will not quit.
+		which cannot be written for another reason, Vim will not quit.
 		{not in Vi}

 ==============================================================================
@@ -1,4 +1,4 @@
-*farsi.txt*     For Vim version 8.1.  Last change: 2015 Aug 29
+*farsi.txt*     For Vim version 8.0.  Last change: 2015 Aug 29


 		  VIM REFERENCE MANUAL    by Mortaza Ghassab Shiran
@@ -1,4 +1,4 @@
-*filetype.txt*  For Vim version 8.1.  Last change: 2018 Apr 18
+*filetype.txt*  For Vim version 8.0.  Last change: 2017 Mar 28


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -43,7 +43,7 @@ Detail: The ":filetype on" command will load one of these files:
 	BufNewFile and BufRead events.  If the file type is not found by the
 	name, the file $VIMRUNTIME/scripts.vim is used to detect it from the
 	contents of the file.
-	When the GUI is running or will start soon, the |menu.vim| script is
+	When the GUI is running or will start soon, the menu.vim script is
 	also sourced.  See |'go-M'| about avoiding that.

 To add your own file types, see |new-filetype| below.  To search for help on a
@@ -319,10 +319,6 @@ then Vim will load all plugins in these directories and below:

 Note that the last one is the value of $VIMRUNTIME which has been expanded.

-Note that when using a plugin manager or |packages| many directories will be
-added to 'runtimepath'.  These plugins earch require their own directory,
-don't put them directly in ~/.vim/plugin.
-
 What if it looks like your plugin is not being loaded?  You can find out what
 happens when Vim starts up by using the |-V| argument: >

@@ -606,17 +602,35 @@ MANPAGER				      *manpager.vim*
 The :Man command allows you to turn Vim into a manpager (that syntax highlights
 manpages and follows linked manpages on hitting CTRL-]).

-For bash,zsh,ksh or dash, add to the config file (.bashrc,.zshrc, ...)
+Works on:

-	export MANPAGER="vim -M +MANPAGER -"
+  - Linux
+  - Mac OS
+  - FreeBSD
+  - Cygwin
+  - Win 10 under Bash

-For (t)csh, add to the config file
+Untested:

-	setenv MANPAGER "vim -M +MANPAGER -"
+  - Amiga OS
+  - BeOS
+  - OS/2

-For fish, add to the config file
+For bash,zsh,ksh or dash by adding to the config file (.bashrc,.zshrc, ...)

-	set -x MANPAGER "vim -M +MANPAGER -"
+	export MANPAGER="env MAN_PN=1 vim -M +MANPAGER -"
+
+For (t)csh by adding to the config file
+
+	setenv MANPAGER "env MAN_PN=1 vim -M +MANPAGER -"
+
+For fish by adding to the config file
+
+	set -x MANPAGER "env MAN_PN=1 vim -M +MANPAGER -"
+
+If man sets the $MAN_PN environment variable, like man-db, the most common
+implementation on Linux and Mac OS, then the "env MAN_PN=1 " part above is
+superfluous.

 PDF							*ft-pdf-plugin*

@@ -639,7 +653,7 @@ By default the following options are set, in accordance with PEP8: >
 	setlocal expandtab shiftwidth=4 softtabstop=4 tabstop=8

 To disable this behaviour, set the following variable in your vimrc: >
-
+	
 	let g:python_recommended_style = 0


@@ -676,23 +690,4 @@ You can change the default by defining the variable g:tex_flavor to the format
 Currently no other formats are recognized.


-VIM							*ft-vim-plugin*
-
-The Vim filetype plugin defines mappings to move to the start and end of
-functions with [[ and ]].  Move around comments with ]" and [".
-
-The mappings can be disabled with: >
-	let g:no_vim_maps = 1
-
-
-ZIMBU							*ft-zimbu-plugin*
-
-The Zimbu filetype plugin defines mappings to move to the start and end of
-functions with [[ and ]].
-
-The mappings can be disabled with: >
-	let g:no_zimbu_maps = 1
-<
-
-
 vim:tw=78:ts=8:ft=help:norl:
@@ -1,4 +1,4 @@
-*fold.txt*      For Vim version 8.1.  Last change: 2017 Mar 18
+*fold.txt*      For Vim version 8.0.  Last change: 2017 Mar 18


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1,4 +1,4 @@
-*ft_ada.txt*	For Vim version 8.1.  Last change: 2010 Jul 20
+*ft_ada.txt*	For Vim version 8.0.  Last change: 2010 Jul 20


 		    ADA FILE TYPE PLUG-INS REFERENCE MANUAL~
@@ -199,7 +199,7 @@ COMMANDS                                                       *rust-commands*
 		|g:rust_playpen_url| is the base URL to the playpen, by default
 		"https://play.rust-lang.org/".

-		|g:rust_shortener_url| is the base URL for the shortener, by
+		|g:rust_shortener_url| is the base URL for the shorterner, by
 		default "https://is.gd/"

 :RustFmt                                                       *:RustFmt*
@@ -1,4 +1,4 @@
-*ft_sql.txt*	For Vim version 8.1.  Last change: 2013 May 15
+*ft_sql.txt*	For Vim version 8.0.  Last change: 2013 May 15

 by David Fishburn

@@ -1,4 +1,4 @@
-*gui.txt*       For Vim version 8.1.  Last change: 2018 Mar 06
+*gui.txt*       For Vim version 8.0.  Last change: 2017 Sep 19


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -134,7 +134,7 @@ task bar with the 'guiheadroom' option.
 :winp[os]
 		Display current position of the top left corner of the GUI vim
 		window in pixels.  Does not work in all versions.
-		Also see |getwinpos()|, |getwinposx()| and |getwinposy()|.
+		Also see |getwinposx()| and |getwinposy()|.

 :winp[os] {X} {Y}							*E466*
 		Put the GUI vim window at the given {X} and {Y} coordinates.
@@ -162,7 +162,7 @@ window Vim is running in with these commands: >
 							*gui-IME* *iBus*
 Input methods for international characters in X that rely on the XIM
 framework, most notably iBus, have been known to produce undesirable results
-in gvim. These may include an inability to enter spaces, or long delays
+in gVim. These may include an inability to enter spaces, or long delays
 between typing a character and it being recognized by the application.

 One workaround that has been successful, for unknown reasons, is to prevent
@@ -482,7 +482,6 @@ menus and menu items.  They are most useful for things that you can't remember
 what the key sequence was.

 For creating menus in a different language, see |:menutrans|.
-If you don't want to use menus at all, see |'go-M'|.

 							*menu.vim*
 The default menus are read from the file "$VIMRUNTIME/menu.vim".  See
@@ -499,22 +498,7 @@ in the menu (which can take a bit of time to load).  If you want to have all
 filetypes already present at startup, add: >
 	:let do_syntax_sel_menu = 1

-The following menuitems show all available color schemes, keymaps and compiler
-settings:
-	Edit > Color Scheme ~
-	Edit > Keymap ~
-	Tools > Set Compiler ~
-However, they can also take a bit of time to load, because they search all
-related files from the directories in 'runtimepath'.  Therefore they are
-loaded lazily (by the |CursorHold| event), or you can also load them manually.
-If you want to have all these items already present at startup, add: >
-	:let do_no_lazyload_menus = 1
-
-Note that the menu.vim is sourced when `:syntax on` or `:filetype on` is
-executed or after your .vimrc file is sourced.  This means that the 'encoding'
-option and the language of messages (`:language messages`) must be set before
-that (if you want to change them).
-
+<
 							*console-menus*
 Although this documentation is in the GUI section, you can actually use menus
 in console mode too.  You will have to load |menu.vim| explicitly then, it is
@@ -812,17 +796,11 @@ make the items look like icons.
 If the items do not fit then the last ones cannot be used.  The toolbar does
 not wrap.

-Note that Vim may be in any mode when executing these commands.  The menu
-should be defined for Normal mode and will be executed without changing the
-current mode. Thus if the current window is in Visual mode and the menu
-command does not intentionally change the mode, Vim will remain in Visual
-mode.  Best is to use `:nnoremenu` to avoid side effects.
-
 Example for debugger tools: >
-	nnoremenu 1.10 WinBar.Step :Step<CR>
-	nnoremenu 1.20 WinBar.Next :Next<CR>
-	nnoremenu 1.30 WinBar.Finish :Finish<CR>
-	nnoremenu 1.40 WinBar.Cont :Continue<CR>
+	amenu 1.10 WinBar.Step :Step<CR>
+	amenu 1.20 WinBar.Next :Next<CR>
+	amenu 1.30 WinBar.Finish :Finish<CR>
+	amenu 1.40 WinBar.Cont :Continue<CR>
 <
 The window toolbar uses the ToolbarLine and ToolbarButton highlight groups.

@@ -993,15 +971,10 @@ it behaves in a strange way.
 :popu[p] {name}			Popup the menu {name}.  The menu named must
 				have at least one subentry, but need not
 				appear on the menu-bar (see |hidden-menus|).
-				{only available for Win32, MacVim, and GTK GUI
-				or in the terminal when compiled with
-				+insert_expand}
+				{only available for Win32, MacVim, and GTK GUI}

 :popu[p]! {name}		Like above, but use the position of the mouse
 				pointer instead of the cursor.
-				In the terminal this is the last known
-				position, which is usually at the last click
-				or release (mouse movement is irrelevant).

 Example: >
 	:popup File
@@ -1012,10 +985,6 @@ pointer if ! was used). >
 	:popup ]Toolbar
 This creates a popup menu that doesn't exist on the main menu-bar.

-Note that in the GUI the :popup command will return immediately, before a
-selection has been made.  In the terminal the commands waits for the user to
-make a selection.
-
 Note that a menu that starts with ']' will not be displayed.

 ==============================================================================
@@ -1,4 +1,4 @@
-*gui_w32.txt*   For Vim version 8.1.  Last change: 2017 Oct 27
+*gui_w32.txt*   For Vim version 8.0.  Last change: 2014 Dec 20


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -382,8 +382,38 @@ Note that a menu that starts with ']' will not be displayed.
 ==============================================================================
 7. Command line arguments				*gui-w32-cmdargs*

-Command line arguments behave the same way as with the console application,
-see |win32-cmdargs|.
+Analysis of a command line into parameters is not standardised in MS Windows.
+Gvim has to provide logic to analyse a command line.  This logic is likely to
+be different from the default logic provided by a compilation system used to
+build vim.  The differences relate to unusual double quote (") usage.
+The arguments "C:\My Music\freude.txt" and "+/Sch\"iller" are handled in the
+same way.  The argument "+/Sch""iller" may be handled different by gvim and
+vim, depending what it was compiled with.
+
+The rules are:
+      a) A parameter is a sequence of graphic characters.
+      b) Parameters are separated by white space.
+      c) A parameter can be enclosed in double quotes to include white space.
+      d) A sequence of zero or more backslashes (\) and a double quote (")
+	is special.  The effective number of backslashes is halved, rounded
+	down.  An even number of backslashes reverses the acceptability of
+	spaces and tabs, an odd number of backslashes produces a literal
+	double quote.
+
+So:
+	"	is a special double quote
+	\"	is a literal double quote
+	\\"	is a literal backslash and a special double quote
+	\\\"	is a literal backslash and a literal double quote
+	\\\\"	is 2 literal backslashes and a special double quote
+	\\\\\"	is 2 literal backslashes and a literal double quote
+	etc.
+
+Example: >
+	gvim "C:\My Music\freude" +"set ignorecase" +/"\"foo\\" +\"bar\\\"
+
+opens "C:\My Music\freude" and executes the line mode commands: >
+	set ignorecase; /"foo\ and /bar\"

 ==============================================================================
 8. Various						*gui-w32-various*
@@ -1,4 +1,4 @@
-*gui_x11.txt*   For Vim version 8.1.  Last change: 2018 May 06
+*gui_x11.txt*   For Vim version 8.0.  Last change: 2017 Jul 28


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -61,9 +61,6 @@ launches the gui but doesn't fork (see |mvim|). However, doing |:gui| in an
 already running vim will never fork in MacVim.

 "gvim --nofork" does the same as "gvim -f".
-
-When there are running jobs Vim will not fork, because the processes would no
-longer be child processes.
 								*E851* *E852*
 When starting the GUI fails Vim will try to continue running in the terminal.

@@ -1,4 +1,4 @@
-*hangulin.txt*  For Vim version 8.1.  Last change: 2015 Nov 24
+*hangulin.txt*  For Vim version 8.0.  Last change: 2015 Nov 24


 		  VIM REFERENCE MANUAL    by Chi-Deok Hwang and Sung-Hyun Nam
@@ -1,4 +1,4 @@
-*hebrew.txt*    For Vim version 8.1.  Last change: 2007 Jun 14
+*hebrew.txt*    For Vim version 8.0.  Last change: 2007 Jun 14


 	   VIM REFERENCE MANUAL    by Ron Aaron (and Avner Lottem)
@@ -1,4 +1,4 @@
-*help.txt*	For Vim version 8.1.  Last change: 2017 Oct 28
+*help.txt*	For Vim version 8.0.  Last change: 2016 Sep 12

 			VIM - main help file
 									 k
@@ -142,7 +142,6 @@ Special issues ~
 |print.txt|	printing
 |remote.txt|	using Vim as a server or client
 |term.txt|	using different terminals and mice
-|terminal.txt|	Terminal window support
 |digraph.txt|	list of available digraphs
 |mbyte.txt|	multi-byte text support
 |mlang.txt|	non-English language support
@@ -151,7 +150,6 @@ Special issues ~
 |hebrew.txt|	Hebrew language support and editing
 |russian.txt|	Russian language support and editing
 |ft_ada.txt|	Ada (the programming language) support
-|ft_rust.txt|	Filetype plugin for Rust
 |ft_sql.txt|	about the SQL filetype plugin
 |hangulin.txt|	Hangul (Korean) input mode
 |rileft.txt|	right-to-left editing mode
@@ -205,7 +203,6 @@ Standard plugins ~
 |pi_logipat.txt|   Logical operators on patterns
 |pi_netrw.txt|     Reading and writing files over a network
 |pi_paren.txt|     Highlight matching parens
-|pi_spec.txt|      Filetype plugin to work with rpm spec files
 |pi_tar.txt|       Tar file explorer
 |pi_vimball.txt|   Create a self-installing Vim script
 |pi_zip.txt|       Zip archive explorer
@@ -1,4 +1,4 @@
-*helphelp.txt*	For Vim version 8.1.  Last change: 2017 Mar 19
+*helphelp.txt*	For Vim version 8.0.  Last change: 2017 Mar 19


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1,4 +1,4 @@
-*howto.txt*	For Vim version 8.1.  Last change: 2006 Apr 02
+*howto.txt*	For Vim version 8.0.  Last change: 2006 Apr 02


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1,4 +1,4 @@
-*if_cscop.txt*  For Vim version 8.1.  Last change: 2018 Jan 21
+*if_cscop.txt*  For Vim version 8.0.  Last change: 2017 Jun 14


 		  VIM REFERENCE MANUAL    by Andy Kahn
@@ -468,18 +468,36 @@ license or OS distribution), then you can download it for free from:
 	http://cscope.sourceforge.net/
 This is released by SCO under the BSD license.

+If you want a newer version of cscope, you will probably have to buy it.
+According to the (old) nvi documentation:
+
+	You can buy version 13.3 source with an unrestricted license
+	for $400 from AT&T Software Solutions by calling +1-800-462-8146.
+
+Also you can download cscope 13.x and mlcscope 14.x (multi-lingual cscope
+which supports C, C++, Java, lex, yacc, breakpoint listing, Ingres, and SDL)
+from World-Wide Exptools Open Source packages page:
+	http://www.bell-labs.com/project/wwexptools/packages.html
+
 In Solaris 2.x, if you have the C compiler license, you will also have
 cscope.  Both are usually located under /opt/SUNWspro/bin

+SGI developers can also get it.  Search for Cscope on this page:
+	http://freeware.sgi.com/index-by-alpha.html
+	https://toolbox.sgi.com/toolbox/utilities/cscope/
+The second one is for those who have a password for the SGI toolbox.
+
 There is source to an older version of a cscope clone (called "cs") available
 on the net.  Due to various reasons, this is not supported with Vim.

 The cscope interface/support for Vim was originally written by
 Andy Kahn <ackahn@netapp.com>.  The original structure (as well as a tiny
-bit of code) was adapted from the cscope interface in nvi.
+bit of code) was adapted from the cscope interface in nvi.  Please report
+any problems, suggestions, patches, et al., you have for the usage of
+cscope within Vim to him.
 							*cscope-win32*
-For a cscope version for Win32 see (seems abandoned):
-	https://code.google.com/archive/p/cscope-win32/
+For a cscope version for Win32 see:
+	http://code.google.com/p/cscope-win32/

 Win32 support was added by Sergey Khorev <sergey.khorev@gmail.com>.  Contact
 him if you have Win32-specific issues.
@@ -1,4 +1,4 @@
-*if_lua.txt*    For Vim version 8.1.  Last change: 2015 Oct 16
+*if_lua.txt*    For Vim version 8.0.  Last change: 2015 Oct 16


 		  VIM REFERENCE MANUAL    by Luis Carvalho
@@ -1,4 +1,4 @@
-*if_mzsch.txt*  For Vim version 8.1.  Last change: 2017 Oct 08
+*if_mzsch.txt*  For Vim version 8.0.  Last change: 2016 Jan 24


 		  VIM REFERENCE MANUAL    by Sergey Khorev
@@ -278,15 +278,12 @@ When you don't use the MzScheme interface you don't need them, thus you can
 use Vim without these DLL files.
 NOTE: Newer version of MzScheme (Racket) require earlier (trampolined)
 initialisation via scheme_main_setup.  So Vim always loads the MzScheme DLL at
-startup if possible.  This may make Vim startup slower.
+startup if possible.

 To use the MzScheme interface the MzScheme DLLs must be in your search path.
 In a console window type "path" to see what directories are used.

-On MS-Windows the options 'mzschemedll' and 'mzschemegcdll' are used for the
-name of the library to load.  The initial value is specified at build time.
-
-The version of the DLL must match the MzScheme version Vim was compiled with.
+The names of the DLLs must match the MzScheme version Vim was compiled with.
 For MzScheme version 209 they will be "libmzsch209_000.dll" and
 "libmzgc209_000.dll". To know for sure look at the output of the ":version"
 command, look for -DDYNAMIC_MZSCH_DLL="something" and
@@ -1,4 +1,4 @@
-*if_ole.txt*    For Vim version 8.1.  Last change: 2008 Aug 16
+*if_ole.txt*    For Vim version 8.0.  Last change: 2008 Aug 16


 		  VIM REFERENCE MANUAL    by Paul Moore
@@ -1,4 +1,4 @@
-*if_perl.txt*   For Vim version 8.1.  Last change: 2017 Nov 24
+*if_perl.txt*   For Vim version 8.0.  Last change: 2015 Oct 16


 		  VIM REFERENCE MANUAL    by Sven Verdoolaege
@@ -112,7 +112,7 @@ possible.
 Here is an overview of the functions that are available to Perl: >

  :perl VIM::Msg("Text")		# displays a message
-  :perl VIM::Msg("Wrong!", "ErrorMsg")	# displays an error message
+  :perl VIM::Msg("Error", "ErrorMsg")	# displays an error message
  :perl VIM::Msg("remark", "Comment")	# displays a highlighted message
  :perl VIM::SetOption("ai")		# sets a vim option
  :perl $nbuf = VIM::Buffers()		# returns the number of buffers
@@ -1,4 +1,4 @@
-*if_pyth.txt*   For Vim version 8.1.  Last change: 2018 Jan 30
+*if_pyth.txt*   For Vim version 8.0.  Last change: 2017 Mar 09


 		  VIM REFERENCE MANUAL    by Paul Moore
@@ -715,8 +715,6 @@ To facilitate bi-directional interface, you can use |pyeval()| and |py3eval()|
 functions to evaluate Python expressions and pass their values to Vim script.
 |pyxeval()| is also available.

-The Python value "None" is converted to v:none.
-
 ==============================================================================
 9. Dynamic loading					*python-dynamic*

@@ -736,8 +734,8 @@ or 'pythonthreedll' option can be also used to specify the Python DLL.

 The name of the DLL should match the Python version Vim was compiled with.
 Currently the name for Python 2 is "python27.dll", that is for Python 2.7.
-That is the default value for 'pythondll'.  For Python 3 it is python36.dll
-(Python 3.6).  To know for sure edit "gvim.exe" and search for
+That is the default value for 'pythondll'.  For Python 3 it is python35.dll
+(Python 3.5).  To know for sure edit "gvim.exe" and search for
 "python\d*.dll\c".


@@ -809,8 +807,7 @@ Raising SystemExit exception in python isn't endorsed way to quit vim, use: >
 You can test what Python version is available with: >
 	if has('python')
 	  echo 'there is Python 2.x'
-	endif
-  	if has('python3')
+  	elseif has('python3')
 	  echo 'there is Python 3.x'
 	endif

@@ -819,24 +816,6 @@ dynamically, these has() calls will try to load them.  If only one can be
 loaded at a time, just checking if Python 2 or 3 are available will prevent
 the other one from being available.

-To avoid loading the dynamic library, only check if Vim was compiled with
-python support: >
-	if has('python_compiled')
-	  echo 'compiled with Python 2.x support'
-	  if has('python_dynamic')
-	    echo 'Python 2.x dynamically loaded'
-	  endif
-	endif
-  	if has('python3_compiled')
-	  echo 'compiled with Python 3.x support'
-	  if has('python3_dynamic')
-	    echo 'Python 3.x dynamically loaded'
-	  endif
-	endif
-
-This also tells you whether Python is dynamically loaded, which will fail if
-the runtime library cannot be found.
-
 ==============================================================================
 11. Python X						*python_x* *pythonx*

@@ -1,4 +1,4 @@
-*if_ruby.txt*   For Vim version 8.1.  Last change: 2018 Mar 15
+*if_ruby.txt*   For Vim version 8.0.  Last change: 2016 Sep 01


 		  VIM REFERENCE MANUAL    by Shugo Maeda
@@ -221,9 +221,6 @@ for sure edit "gvim.exe" and search for "ruby\d*.dll\c".
 If you want to build Vim with RubyInstaller 1.9 or 2.X using MSVC, you need
 some tricks.  See the src/INSTALLpc.txt for detail.

-If Vim is built with RubyInstaller 2.4 or later, you may also need to add
-"C:\Ruby<version>\bin\ruby_builtin_dlls" to the PATH environment variable.
-

 Unix ~

@@ -1,4 +1,4 @@
-*if_sniff.txt*	For Vim version 8.1.  Last change: 2016 Feb 27
+*if_sniff.txt*	For Vim version 8.0.  Last change: 2016 Feb 27


 		  VIM REFERENCE MANUAL
@@ -1,4 +1,4 @@
-*if_tcl.txt*    For Vim version 8.1.  Last change: 2016 Jan 01
+*if_tcl.txt*    For Vim version 8.0.  Last change: 2016 Jan 01


 		  VIM REFERENCE MANUAL    by Ingo Wilken
@@ -1,4 +1,4 @@
-*indent.txt*    For Vim version 8.1.  Last change: 2018 Apr 04
+*indent.txt*    For Vim version 8.0.  Last change: 2014 Dec 06


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -414,10 +414,10 @@ The examples below assume a 'shiftwidth' of 4.
 							*cino-(*
 	(N    When in unclosed parentheses, indent N characters from the line
 	      with the unclosed parentheses.  Add a 'shiftwidth' for every
-	      extra unclosed parentheses.  When N is 0 or the unclosed
-	      parentheses is the first non-white character in its line, line
-	      up with the next non-white character after the unclosed
-	      parentheses.  (default 'shiftwidth' * 2).
+	      unclosed parentheses.  When N is 0 or the unclosed parentheses
+	      is the first non-white character in its line, line up with the
+	      next non-white character after the unclosed parentheses.
+	      (default 'shiftwidth' * 2).

 		cino=			  cino=(0 >
 		  if (c1 && (c2 ||	    if (c1 && (c2 ||
@@ -428,8 +428,7 @@ The examples below assume a 'shiftwidth' of 4.
 		     {			       {
 <
 							*cino-u*
-	uN    Same as (N, but for one nesting level deeper.
-	      (default 'shiftwidth').
+	uN    Same as (N, but for one level deeper.  (default 'shiftwidth').

 		cino=			  cino=u2 >
 		  if (c123456789	    if (c123456789
@@ -907,25 +906,6 @@ In PHP braces are not required inside 'case/default' blocks therefore 'case:'
 and 'default:' are indented at the same level than the 'switch()' to avoid
 meaningless indentation. You can use the above option to return to the
 traditional way.
-------------
-
-							*PHP_noArrowMatching*
-By default the indent script will indent multi-line chained calls by matching
-the position of the '->': >
-
-    $user_name_very_long->name()
-                        ->age()
-                        ->info();
-
-You can revert to the classic way of indenting by setting this option to 1: >
-    :let g:PHP_noArrowMatching = 1
-
-You will obtain the following result: >
-
-    $user_name_very_long->name()
-        ->age()
-        ->info();
-


 PYTHON							*ft-python-indent*
@@ -1,4 +1,4 @@
-*index.txt*     For Vim version 8.1.  Last change: 2018 Apr 19
+*index.txt*     For Vim version 8.0.  Last change: 2017 Aug 02


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -959,7 +959,7 @@ tag		command	      note action in Visual mode	~
 |v_i{|		i{		   same as iB
 |v_i}|		i}		   same as iB
 |v_o|		o		   move cursor to other corner of area
-|v_r|		r		2  replace highlighted area with a character
+|v_r|		r		2  delete highlighted area and start insert
 |v_s|		s		2  delete highlighted area and start insert
 |v_u|		u		2  make highlighted area lowercase
 |v_v|		v		   make Visual mode characterwise or stop
@@ -1,4 +1,4 @@
-*insert.txt*    For Vim version 8.1.  Last change: 2018 Feb 10
+*insert.txt*    For Vim version 8.0.  Last change: 2017 May 30


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -433,7 +433,7 @@ An example for using CTRL-G U: >
 	inoremap ( ()<C-G>U<Left>

 This makes it possible to use the cursor keys in Insert mode, without breaking
-the undo sequence and therefore using |.| (redo) will work as expected.
+the undo sequence and therefore using |.| (redo) will work as expected. 
 Also entering a text like (with the "(" mapping from above): >

   Lorem ipsum (dolor
@@ -1103,8 +1103,6 @@ items:
 			item with the same word is already present.
 	empty		when non-zero this match will be added even when it is
 			an empty string
-	user_data 	custom data which is associated with the item and
-			available in |v:completed_item|

 All of these except "icase", "dup" and "empty" must be a string.  If an item
 does not meet these requirements then an error message is given and further
@@ -1198,8 +1196,6 @@ The menu is used when:

 The 'pumheight' option can be used to set a maximum height.  The default is to
 use all space available.
-The 'pumwidth' option can be used to set a minimum width.  The default is 15
-characters.

 There are three states:
 1. A complete match has been inserted, e.g., after using CTRL-N or CTRL-P.
@@ -1300,8 +1296,7 @@ it here: http://ctags.sourceforge.net/  Version 5.6 or later is recommended.
 For version 5.5.4 you should add a patch that adds the "typename:" field:
 	ftp://ftp.vim.org/pub/vim/unstable/patches/ctags-5.5.4.patch
 A compiled .exe for MS-Windows can be found at:
-	http://ctags.sourceforge.net/
-	https://github.com/universal-ctags/ctags-win32
+	http://georgevreilly.com/vim/ctags.html

 If you want to complete system functions you can do something like this.  Use
 ctags to generate a tags file for all the system header files: >
@@ -1477,7 +1472,7 @@ The completions provided by CTRL-X CTRL-O are sensitive to the context:

 Notes:
 - Vim will load/evaluate code in order to provide completions.  This may
-   cause some code execution, which may be a concern. This is no longer
+   cause some code execution, which may be a concern. This is no longer 
   enabled by default, to enable this feature add >
     let g:rubycomplete_buffer_loading = 1
 <- In context 1 above, Vim can parse the entire buffer to add a list of
@@ -1533,15 +1528,15 @@ that begin with the filetype, "php", in this case.  For example these syntax
 groups are included by default with the PHP: phpEnvVar, phpIntVar,
 phpFunctions.

-If you wish non-filetype syntax items to also be included, you can use a
-regular expression syntax (added in version 13.0 of
-autoload\syntaxcomplete.vim) to add items.  Looking at the output from
-":syntax list" while editing a PHP file I can see some of these entries: >
+If you wish non-filetype syntax items to also be included, you can use a 
+regular expression syntax (added in version 13.0 of autoload\syntaxcomplete.vim)
+to add items.  Looking at the output from ":syntax list" while editing a PHP file 
+I can see some of these entries: >
    htmlArg,htmlTag,htmlTagName,javaScriptStatement,javaScriptGlobalObjects

 To pick up any JavaScript and HTML keyword syntax groups while editing a PHP
-file, you can use 3 different regexs, one for each language.  Or you can
-simply restrict the include groups to a particular value, without using
+file, you can use 3 different regexs, one for each language.  Or you can 
+simply restrict the include groups to a particular value, without using 
 a regex string: >
    let g:omni_syntax_group_include_php = 'php\w\+,javaScript\w\+,html\w\+'
    let g:omni_syntax_group_include_php = 'phpFunctions,phpMethods'
@@ -1554,9 +1549,9 @@ highlight.  These items will be available within the omni completion list.

 Some people may find this list unwieldy or are only interested in certain
 items.  There are two ways to prune this list (if necessary).  If you find
-certain syntax groups you do not wish displayed you can use two different
-methods to identify these groups.  The first specifically lists the syntax
-groups by name.  The second uses a regular expression to identify both
+certain syntax groups you do not wish displayed you can use two different 
+methods to identify these groups.  The first specifically lists the syntax 
+groups by name.  The second uses a regular expression to identify both 
 syntax groups.  Simply add one the following to your vimrc: >
    let g:omni_syntax_group_exclude_php = 'phpCoreConstant,phpConstant'
    let g:omni_syntax_group_exclude_php = 'php\w*Constant'
@@ -1579,22 +1574,22 @@ vimrc: >

 For plugin developers, the plugin exposes a public function OmniSyntaxList.
 This function can be used to request a List of syntax items.  When editing a
-SQL file (:e syntax.sql) you can use the ":syntax list" command to see the
+SQL file (:e syntax.sql) you can use the ":syntax list" command to see the 
 various groups and syntax items.  For example: >
-    syntax list
+    syntax list 

-Yields data similar to this:
-    sqlOperator    xxx some prior all like and any escape exists in is not ~
-                       or intersect minus between distinct ~
-                       links to Operator ~
-    sqlType        xxx varbit varchar nvarchar bigint int uniqueidentifier ~
-                       date money long tinyint unsigned xml text smalldate ~
-                       double datetime nchar smallint numeric time bit char ~
-                       varbinary binary smallmoney ~
-                       image float integer timestamp real decimal ~
+Yields data similar to this: >
+    sqlOperator    xxx some prior all like and any escape exists in is not 
+                       or intersect minus between distinct
+                       links to Operator
+    sqlType        xxx varbit varchar nvarchar bigint int uniqueidentifier 
+                       date money long tinyint unsigned xml text smalldate 
+                       double datetime nchar smallint numeric time bit char 
+                       varbinary binary smallmoney
+                       image float integer timestamp real decimal

 There are two syntax groups listed here: sqlOperator and sqlType.  To retrieve
-a List of syntax items you can call OmniSyntaxList a number of different
+a List of syntax items you can call OmniSyntaxList a number of different 
 ways.  To retrieve all syntax items regardless of syntax group:  >
    echo OmniSyntaxList( [] )

@@ -1611,6 +1606,7 @@ From within a plugin, you would typically assign the output to a List: >
    let myKeywords = []
    let myKeywords = OmniSyntaxList( ['sqlKeyword'] )

+    

 SQL							*ft-sql-omni*

@@ -1,4 +1,4 @@
-*intro.txt*     For Vim version 8.1.  Last change: 2018 Jan 24
+*intro.txt*     For Vim version 8.0.  Last change: 2017 Sep 04


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -138,7 +138,7 @@ There are two ways to report bugs, both work:
   see the message.  If you don't want that, e.g. because it is a security
   issue, send it to <bugs@vim.org>, this only goes to the Vim maintainer
   (that's Bram).
-2. Open an issue on GitHub: https://github.com/vim/vim/issues
+2. Open issue on GitHub: https://github.com/vim/vim/issues
   The text will be forwarded to the vim-dev maillist.

 Please be brief; all the time that is spent on answering mail is subtracted
@@ -1,4 +1,4 @@
-*map.txt*       For Vim version 8.1.  Last change: 2018 May 13
+*map.txt*       For Vim version 8.0.  Last change: 2017 Sep 17


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -29,7 +29,7 @@ manual.
 1. Key mapping				*key-mapping* *mapping* *macro*

 Key mapping is used to change the meaning of typed keys.  The most common use
-is to define a sequence of commands for a function key.  Example: >
+is to define a sequence commands for a function key.  Example: >

 	:map <F2> a<C-R>=strftime("%c")<CR><Esc>

@@ -542,9 +542,9 @@ scenario: >
 	:imap <M-C> foo
 	:set encoding=utf-8
 The mapping for <M-C> is defined with the latin1 encoding, resulting in a 0xc3
-byte.  If you type the character á (0xe1 <M-a>) in UTF-8 encoding this is the
+byte.  If you type the character á (0xe1 <M-a>) in UTF-8 encoding this is the
 two bytes 0xc3 0xa1.  You don't want the 0xc3 byte to be mapped then or
-otherwise it would be impossible to type the á character.
+otherwise it would be impossible to type the á character.

 					*<Leader>* *mapleader*
 To define a mapping which uses the "mapleader" variable, the special string
@@ -917,9 +917,7 @@ an additional rule:
 full-id	  In front of the match is a non-keyword character, or this is where
 	  the line or insertion starts.  Exception: When the abbreviation is
 	  only one character, it is not recognized if there is a non-keyword
-	  character in front of it, other than a space or a tab. However, for
-	  the command line "'<,'>" (or any other marks) is ignored, as if the
-	  command line starts after it.
+	  character in front of it, other than a space or a tab.

 end-id	  In front of the match is a keyword character, or a space or a tab,
 	  or this is where the line or insertion starts.
@@ -1274,7 +1272,6 @@ By default, the arguments of user defined commands do not undergo completion.
 However, by specifying one or the other of the following attributes, argument
 completion can be enabled:

-	-complete=arglist	file names in argument list
 	-complete=augroup	autocmd groups
 	-complete=buffer	buffer names
 	-complete=behave	:behave suboptions
@@ -1,4 +1,4 @@
-*mbyte.txt*     For Vim version 8.1.  Last change: 2018 Jan 21
+*mbyte.txt*     For Vim version 8.0.  Last change: 2016 Jul 21


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar et al.
@@ -26,9 +26,8 @@ For changing the language of messages and menus see |mlang.txt|.
 7.  Input on X11			|mbyte-XIM|
 8.  Input on MS-Windows			|mbyte-IME|
 9.  Input with a keymap			|mbyte-keymap|
-10. Input with imactivatefunc()		|mbyte-func|
-11. Using UTF-8				|mbyte-utf8|
-12. Overview of options			|mbyte-options|
+10. Using UTF-8				|mbyte-utf8|
+11. Overview of options			|mbyte-options|

 NOTE: This file contains UTF-8 characters.  These may show up as strange
 characters or boxes when using another encoding.
@@ -1255,35 +1254,7 @@ Combining forms:
 ﭏ    0xfb4f  Xal  alef-lamed

 ==============================================================================
-10.  Input with imactivatefunc()				*mbyte-func*
-
-Vim has the 'imactivatefunc' and 'imstatusfunc' options. These are useful to
-activate/deactivate the input method from Vim in any way, also with an external
-command. For example, fcitx provide fcitx-remote command: >
-
-	set iminsert=2
-	set imsearch=2
-	set imcmdline
-
-	set imactivatefunc=ImActivate
-	function! ImActivate(active)
-	  if a:active
-	    call system('fcitx-remote -o')
-	  else
-	    call system('fcitx-remote -c')
-	  endif
-	endfunction
-
-	set imstatusfunc=ImStatus
-	function! ImStatus()
-	  return system('fcitx-remote')[0] is# '2'
-	endfunction
-
-Using this script, you can activate/deactivate XIM via Vim even when it is not
-compiled with |+xim|.
-
-==============================================================================
-11. Using UTF-8				*mbyte-utf8* *UTF-8* *utf-8* *utf8*
+10. Using UTF-8				*mbyte-utf8* *UTF-8* *utf-8* *utf8*
 							*Unicode* *unicode*
 The Unicode character set was designed to include all characters from other
 character sets.  Therefore it is possible to write text in any language using
@@ -1431,7 +1402,7 @@ not everybody is able to type a composing character.


 ==============================================================================
-12. Overview of options					*mbyte-options*
+11. Overview of options					*mbyte-options*

 These options are relevant for editing multi-byte files.  Check the help in
 options.txt for detailed information.
@@ -1,4 +1,4 @@
-*message.txt*   For Vim version 8.1.  Last change: 2018 Feb 04
+*message.txt*   For Vim version 8.0.  Last change: 2017 Mar 25


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -76,7 +76,7 @@ See `:messages` above.
 LIST OF MESSAGES
 			*E222* *E228* *E232* *E256* *E293* *E298* *E304* *E317*
 			*E318* *E356* *E438* *E439* *E440* *E316* *E320* *E322*
-			*E323* *E341* *E473* *E570* *E685* *E950*  >
+			*E323* *E341* *E473* *E570* *E685*  >
  Add to read buffer
  makemap: Illegal mode
  Cannot create BalloonEval with both message and callback
@@ -97,7 +97,6 @@ LIST OF MESSAGES
  Internal error
  Internal error: {function}
  fatal error in cs_manage_matches
-  Invalid count for del_bytes(): {N}

 This is an internal error.  If you can reproduce it, please send in a bug
 report. |bugs|
@@ -464,6 +463,12 @@ changed.  To avoid the message reset the 'warn' option.
 Something inside Vim went wrong and resulted in a NULL pointer.  If you know
 how to reproduce this problem, please report it. |bugs|

+							*E172*  >
+  Only one file name allowed
+
+The ":edit" command only accepts one file name.  When you want to specify
+several files for editing use ":next" |:next|.
+
 						*E41* *E82* *E83* *E342*  >
  Out of memory!
  Out of memory!  (allocating {number} bytes)
@@ -640,9 +645,6 @@ starts.  It can be fixed in one of these ways:
 - Just write the file again the next day.  Or set your clock to the next day,
  write the file twice and set the clock back.

-If you get W11 all the time, you may need to disable "Acronis Active
-Protection" or register Vim as a trusted service/application.
-
 							*W12*  >
  Warning: File "{filename}" has changed and the buffer was changed in Vim as well

@@ -1,4 +1,4 @@
-*mlang.txt*     For Vim version 8.1.  Last change: 2018 May 06
+*mlang.txt*     For Vim version 8.0.  Last change: 2017 Mar 04


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -190,8 +190,8 @@ you can do it without restarting Vim: >
 	:source $VIMRUNTIME/menu.vim

 Each part of a menu path is translated separately.  The result is that when
-"Help" is translated to "Hilfe" and "Overview" to "Überblick" then
-"Help.Overview" will be translated to "Hilfe.Überblick".
+"Help" is translated to "Hilfe" and "Overview" to "Überblick" then
+"Help.Overview" will be translated to "Hilfe.Überblick".

 ==============================================================================
 3. Scripts						*multilang-scripts*
@@ -1,4 +1,4 @@
-*motion.txt*    For Vim version 8.1.  Last change: 2017 Oct 15
+*motion.txt*    For Vim version 8.0.  Last change: 2017 Mar 12


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1317,10 +1317,7 @@ the current line is included.  You can then use "%" to go to the matching line.
 H			To line [count] from top (Home) of window (default:
 			first line on the window) on the first non-blank
 			character |linewise|.  See also 'startofline' option.
-			Cursor is adjusted for 'scrolloff' option, unless an
-			operator is pending, in which case the text may
-			scroll.  E.g. "yH" yanks from the first visible line
-			until the cursor line (inclusive).
+			Cursor is adjusted for 'scrolloff' option.

 						*M*
 M			To Middle line of window, on the first non-blank
@@ -1330,10 +1327,7 @@ M			To Middle line of window, on the first non-blank
 L			To line [count] from bottom of window (default: Last
 			line on the window) on the first non-blank character
 			|linewise|.  See also 'startofline' option.
-			Cursor is adjusted for 'scrolloff' option, unless an
-			operator is pending, in which case the text may
-			scroll.  E.g. "yL" yanks from the cursor to the last
-			visible line.
+			Cursor is adjusted for 'scrolloff' option.

 <LeftMouse>		Moves to the position on the screen where the mouse
 			click is |exclusive|.  See also |<LeftMouse>|.  If the
@@ -1,4 +1,4 @@
-*netbeans.txt*  For Vim version 8.1.  Last change: 2016 Jul 15
+*netbeans.txt*  For Vim version 8.0.  Last change: 2016 Jul 15


 		  VIM REFERENCE MANUAL    by Gordon Prieur et al.
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 8.1.  Last change: 2018 May 15
+*options.txt*	For Vim version 8.0.  Last change: 2017 Sep 16


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -50,7 +50,7 @@ achieve special effects.  These options come in three forms:
 :se[t] {option}&vi	Reset option to its Vi default value. {not in Vi}
 :se[t] {option}&vim	Reset option to its Vim default value. {not in Vi}

-:se[t] all&		Set all options to their default value.  The values of
+:se[t] all&		Set all options to their default value.  The values of 
 			these options are not changed:
 			  all terminal options, starting with t_
 			  'columns'
@@ -402,8 +402,8 @@ Setting the filetype
 			used to set the option value in, unless this is a help
 			window, in which case the window below help window is
 			used (skipping the option-window).
-			{not available when compiled without the |+eval|
-			feature}
+			{not available when compiled without the |+eval| or
+			|+autocmd| features}

 								*$HOME*
 Using "~" is like using "$HOME", but it is only recognized at the start of an
@@ -891,7 +891,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	'background' is not dark/light, 'background' will be set and the
 	screen is redrawn.  This may have side effects, make t_BG empty in
 	your .vimrc if you suspect this problem.  The response to |t_RB| can
-	be found in |v:termrbgresp|.
+	be found in |v:termrgbresp|.

 	When starting the GUI, the default value for 'background' will be
 	"light".  When the value is not set in the .gvimrc, and Vim detects
@@ -1092,9 +1092,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 <	Use 'backupdir' to put the backup in a different directory.

 						*'backupskip'* *'bsk'*
-'backupskip' 'bsk'	string	(default: "$TMPDIR/*,$TMP/*,$TEMP/*"
-				 Unix: "/tmp/*,$TMPDIR/*,$TMP/*,$TEMP/*"
-				 Mac: "/private/tmp/*,$TMPDIR/*,$TMP/*,$TEMP/*")
+'backupskip' 'bsk'	string	(default: "/tmp/*,$TMPDIR/*,$TMP/*,$TEMP/*")
 			global
 			{not in Vi}
 			{not available when compiled without the |+wildignore|
@@ -1134,16 +1132,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			{not in Vi}
 			{only available when compiled with the |+balloon_eval|
 			feature}
-	Switch on the |balloon-eval| functionality for the GUI.
-
-		       *'balloonevalterm'* *'bevalterm'* *'noballoonevalterm'*
-		       *'nobevalterm'*
-'balloonevalterm' 'bevalterm'	boolean	(default off)
-			global
-			{not in Vi}
-			{only available when compiled with the
-			|+balloon_eval_term| feature}
-	Switch on the |balloon-eval| functionality for the terminal.
+	Switch on the |balloon-eval| functionality.

 						     *'balloonexpr'* *'bexpr'*
 'balloonexpr' 'bexpr'	string	(default "")
@@ -1340,7 +1329,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			    characters.  It permits dynamic French paragraph
 			    indentation (negative) or emphasizing the line
 			    continuation (positive).
-		sbr	    Display the 'showbreak' value before applying the
+		sbr	    Display the 'showbreak' value before applying the 
 			    additional indent.
 	The default value for min is 20 and shift is 0.

@@ -1400,16 +1389,14 @@ A jump table for the options with a short description can be found at |Q_op|.
 			written
 	  nowrite	buffer which will not be written
 	  acwrite	buffer which will always be written with BufWriteCmd
-			autocommands.
+			autocommands. {not available when compiled without the
+			|+autocmd| feature}
 	  quickfix	quickfix buffer, contains list of errors |:cwindow|
 			or list of locations |:lwindow|
 	  help		help buffer (you are not supposed to set this
 			manually)
 	  terminal	buffer for a |terminal| (you are not supposed to set
 			this manually)
-	  prompt	buffer where only the last line can be edited, meant
-			to be used by a plugin, see |prompt-buffer|
-			{only when compiled with the |+channel| feature}

 	This option is used together with 'bufhidden' and 'swapfile' to
 	specify special kinds of buffers.   See |special-buffers|.
@@ -1835,7 +1822,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	'copyindent'	+ off		don't copy indent structure
 	'cpoptions'	& (all flags)	Vi-compatible flags
 	'cscopepathcomp'+ 0		don't show directories in tags list
-	'cscoperelative'+ off		don't use basename of path as prefix
+	'cscoperelative'+ off		
 	'cscopetag'	+ off		don't use cscope for ":tag"
 	'cscopetagorder'+ 0		see |cscopetagorder|
 	'cscopeverbose'	+ off		see |cscopeverbose|
@@ -2143,7 +2130,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 								*cpo-E*
 		E	It is an error when using "y", "d", "c", "g~", "gu" or
 			"gU" on an Empty region.  The operators only work when
-			at least one character is to be operated on.  Example:
+			at least one character is to be operate on.  Example:
 			This makes "y0" fail in the first column.
 								*cpo-f*
 		f	When included, a ":read" command with a file name
@@ -2493,6 +2480,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 'cursorbind' 'crb'	boolean  (default off)
 			local to window
 			{not in Vi}
+			{not available when compiled without the |+cursorbind|
+			feature}
 	When this option is set, as the cursor in the current
 	window moves other cursorbound windows (windows that also have
 	this option set) move their cursors to the corresponding line and
@@ -2587,11 +2576,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	contain a list of words.  This can be one word per line, or several
 	words per line, separated by non-keyword characters (white space is
 	preferred).  Maximum line length is 510 bytes.
-
-	When this option is empty or an entry "spell" is present, and spell
-	checking is enabled, words in the word lists for the currently active
-	'spelllang' are used. See |spell|.
-
+	When this option is empty, or an entry "spell" is present, spell
+	checking is enabled the currently active spelling is used. |spell|
 	To include a comma in a file name precede it with a backslash.  Spaces
 	after a comma are ignored, otherwise spaces are included in the file
 	name.  See |option-backslash| about using backslashes.
@@ -2662,9 +2648,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 		vertical	Start diff mode with vertical splits (unless
 				explicitly specified otherwise).

-		hiddenoff	Do not use diff mode for a buffer when it
-				becomes hidden.
-
 		foldcolumn:{n}	Set the 'foldcolumn' option to {n} when
 				starting diff mode.  Without this 2 is used.

@@ -2946,6 +2929,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 'eventignore' 'ei'	string	(default "")
 			global
 			{not in Vi}
+			{not available when compiled without the |+autocmd|
+			feature}
 	A list of autocommand event names, which are to be ignored.
 	When set to "all" or when "all" is one of the items, all autocommand
 	events are ignored, autocommands will not be executed.
@@ -3194,6 +3179,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 'filetype' 'ft'		string (default: "")
 			local to buffer
 			{not in Vi}
+			{not available when compiled without the |+autocmd|
+			feature}
 	When this option is set, the FileType autocommand event is triggered.
 	All autocommands that match with the value of this option will be
 	executed.  Thus the value of 'filetype' is used in place of the file
@@ -3492,7 +3479,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	when internal formatting is used.  Make sure the cursor is kept in the
 	same spot relative to the text then!  The |mode()| function will
 	return "i" or "R" in this situation.
-
+	
 	When the expression evaluates to non-zero Vim will fall back to using
 	the internal format mechanism.

@@ -3557,8 +3544,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	systems without an fsync() implementation, this variable is always
 	off.
 	Also see 'swapsync' for controlling fsync() on swap files.
-	'fsync' also applies to |writefile()|, unless a flag is used to
-	overrule it.

 			    *'fullscreen'* *'fu'* *'nofullscreen'* *'nofu'*
 'fullscreen' 'fu'	boolean (default off)
@@ -3974,14 +3959,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	To avoid problems with flags that are added in the future, use the
 	"+=" and "-=" feature of ":set" |add-option-flags|.

-	Valid characters are as follows:
-								*'go-!'*
-	  '!'	External commands are executed in a terminal window.  Without
-		this flag the MS-Windows GUI will open a console window to
-		execute the command.  The Unix GUI will simulate a dumb
-		terminal to list the command output.
-		The terminal window will be positioned at the bottom, and grow
-		upwards as needed.
+	Valid letters are as follows:
 							*guioptions_a* *'go-a'*
 	  'a'	Autoselect:  If present, then whenever VISUAL mode is started,
 		or the Visual area extended, Vim tries to become the owner of
@@ -4040,7 +4018,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 		that this flag must be added in the .vimrc file, before
 		switching on syntax or filetype recognition (when the |gvimrc|
 		file is sourced the system menu has already been loaded; the
-		`:syntax on` and `:filetype on` commands load the menu too).
+		":syntax on" and ":filetype on" commands load the menu too).
 								*'go-g'*
 	  'g'	Grey menu items: Make menu items that are not active grey.  If
 		'g' is not included inactive menu items are not shown at all.
@@ -4084,13 +4062,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 		removing it after the GUI has started has no effect.
 								*'go-F'*
 	  'F'	Add a footer.  Only for Motif.  See |gui-footer|.
-								*'go-k'*
-	  'k'	Keep the GUI window size when adding/removing a scrollbar, or
-		toolbar, tabline, etc.  Instead, the behavior is similar to
-		when the window is maximized and will adjust 'lines' and
-		'columns' to fit to the window.  Without the 'k' flag Vim will
-		try to keep 'lines' and 'columns' the same when adding and
-		removing GUI components.
+

 						*'guipty'* *'noguipty'*
 'guipty'		boolean	(default on)
@@ -4234,7 +4206,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			    set.
 	|hl-Question|	 r  |hit-enter| prompt and yes/no questions
 	|hl-StatusLine|	 s  status line of current window |status-line|
-	|hl-StatusLineNC|  S  status lines of not-current windows
+	|hl-StatusLineNC| S  status lines of not-current windows
 	|hl-Title|	 t  Titles for output from ":set all", ":autocmd" etc.
 	|hl-VertSplit|	 c  column used to separate vertically split windows
 	|hl-Visual|	 v  Visual mode
@@ -4390,11 +4362,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 'imactivatefunc' 'imaf'	string (default "")
 			global
 			{not in Vi}
-			{only available when compiled with the |+multi_byte|
-			feature}
+			{only available when compiled with |+xim| and
+			|+GUI_GTK|}
 	This option specifies a function that will be called to
-	activate or deactivate the Input Method.
-	It is not used in the GUI.
+	activate/inactivate Input Method.

 	Example: >
 		function ImActivateFunc(active)
@@ -4443,8 +4414,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 'imcmdline' 'imc'	boolean (default off)
 			global
 			{not in Vi}
-			{only available when compiled with the |+multi_byte|
-			feature}
+			{only available when compiled with the |+xim|,
+			|+multi_byte_ime| or |global-ime| features}
 	When set the Input Method is always on when starting to edit a command
 	line, unless entering a search pattern (see 'imsearch' for that).
 	Setting this option is useful when your input method allows entering
@@ -4455,8 +4426,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 'imdisable' 'imd'	boolean (default off, on for some systems (SGI))
 			global
 			{not in Vi}
-			{only available when compiled with the |+multi_byte|
-			feature}
+			{only available when compiled with the |+xim|,
+			|+multi_byte_ime| or |global-ime| features, always
+			available in MacVim}
 	When set the Input Method is never used.  This is useful to disable
 	the IM when it doesn't work properly.
 	Currently this option is on by default for SGI/IRIX.  This may change
@@ -4471,6 +4443,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 		0	:lmap is off and IM is off
 		1	:lmap is ON and IM is off
 		2	:lmap is off and IM is ON
+	2 is available only when compiled with the |+multi_byte_ime|, |+xim|
+	or |global-ime|.
 	To always reset the option to zero when leaving Insert mode with <Esc>
 	this can be used: >
 		:inoremap <ESC> <ESC>:set iminsert=0<CR>
@@ -4483,10 +4457,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	The value 0 may not work correctly with Athena and Motif with some XIM
 	methods.  Use 'imdisable' to disable XIM then.

-	You can set 'imactivatefunc' and 'imstatusfunc' to handle IME/XIM
-	via external command if vim is not compiled with the |+xim|,
-	|+multi_byte_ime| or |global-ime|.
-
 						*'imsearch'* *'ims'*
 'imsearch' 'ims'	number (default -1)
 			local to buffer
@@ -4509,11 +4479,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 'imstatusfunc' 'imsf'	string (default "")
 			global
 			{not in Vi}
-			{only available when compiled with the |+multi_byte|
-			feature}
+			{only available when compiled with |+xim| and
+			|+GUI_GTK|}
 	This option specifies a function that is called to obtain the status
 	of Input Method.  It must return a positive number when IME is active.
-	It is not used in the GUI.

 	Example: >
 		function ImStatusFunc()
@@ -4535,8 +4504,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	1   over-the-spot style
 	See: |xim-input-style|

-	For a long time on-the-spot style had been used in the GTK version of
-	vim, however, it is known that it causes troubles when using mappings,
+	For a long time on-the-spot sytle had been used in GTK version of vim,
+	however, it is known that it causes troubles when using mappings,
 	|single-repeat|, etc.  Therefore over-the-spot style becomes the
 	default now.  This should work fine for most people, however if you
 	have any problem with it, try using on-the-spot style.
@@ -4602,17 +4571,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	match may not be found.  This is to avoid that Vim hangs while you
 	are typing the pattern.
 	The highlighting can be set with the 'i' flag in 'highlight'.
-	When 'hlsearch' is on, all matched strings are highlighted too while
-	typing a search command. See also: 'hlsearch'.
-	If you don't want turn 'hlsearch' on, but want to highlight all matches
-	while searching, you can turn on and off 'hlsearch' with autocmd.
-	Example: >
-		augroup vimrc-incsearch-highlight
-		  autocmd!
-		  autocmd CmdlineEnter /,\? :set hlsearch
-		  autocmd CmdlineLeave /,\? :set nohlsearch
-		augroup END
-<
+	See also: 'hlsearch'.
 	CTRL-L can be used to add one character from after the current match
 	to the command line.  If 'ignorecase' and 'smartcase' are set and the
 	command line has no uppercase characters, the added character is
@@ -5287,8 +5246,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 			global or local to buffer |global-local|
 			{not in Vi}
 	Program to use for the ":make" command.  See |:make_makeprg|.
-	This option may contain '%' and '#' characters (see  |:_%| and |:_#|),
-	which are expanded to the current and alternate file name.  Use |::S|
+	This option may contain '%' and '#' characters (see  |:_%| and |:_#|), 
+	which are expanded to the current and alternate file name.  Use |::S| 
 	to escape file names in case they contain special characters.
 	Environment variables are expanded |:set_env|.  See |option-backslash|
 	about including spaces and backslashes.
@@ -5320,7 +5279,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 		:au FileType c,cpp,java set mps+==:;

 <	For a more advanced way of using "%", see the matchit.vim plugin in
-	the $VIMRUNTIME/pack/dist/opt/matchit directory. |add-local-help|
+	the $VIMRUNTIME/macros directory. |add-local-help|

 						*'matchtime'* *'mat'*
 'matchtime' 'mat'	number	(default 5)
@@ -5355,7 +5314,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	more depth, set 'maxfuncdepth' to a bigger number.  But this will use
 	more memory, there is the danger of failing when memory is exhausted.
 	Increasing this limit above 200 also changes the maximum for Ex
-	command recursion, see |E169|.
+	command resursion, see |E169|.
 	See also |:function|.

 						*'maxmapdepth'* *'mmd'* *E223*
@@ -5376,11 +5335,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 			{not in Vi}
 	Maximum amount of memory (in Kbyte) to use for one buffer.  When this
 	limit is reached allocating extra memory for a buffer will cause
-	other memory to be freed.
-	The maximum usable value is about 2000000.  Use this to work without a
-	limit.
-	The value is ignored when 'swapfile' is off.
-	Also see 'maxmemtot'.
+	other memory to be freed.  The maximum usable value is about 2000000.
+	Use this to work without a limit.  Also see 'maxmemtot'.

 						*'maxmempattern'* *'mmp'*
 'maxmempattern' 'mmp'	number	(default 1000)
@@ -5409,8 +5365,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	need more than 2 Gbyte for text editing?  Keep in mind that text is
 	stored in the swap file, one can edit files > 2 Gbyte anyway.  We do
 	need the memory to store undo info.
-	Buffers with 'swapfile' off still count to the total amount of memory
-	used.
 	Also see 'maxmem'.

 						*'menuitems'* *'mis'*
@@ -5507,8 +5461,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	an explanation.
 	When 'buftype' is "nowrite" or "nofile" this option may be set, but
 	will be ignored.
-	Note that the text may actually be the same, e.g. 'modified' is set
-	when using "rA" on an "A".

 						*'more'* *'nomore'*
 'more'			boolean	(Vim default: on, Vi default: off)
@@ -5530,7 +5482,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	sysmouse and Linux console with gpm).  For using the mouse in the
 	GUI, see |gui-mouse|.
 	The mouse can be enabled for different modes:
-		n	Normal mode and Terminal modes
+		n	Normal mode
 		v	Visual mode
 		i	Insert mode
 		c	Command-line mode
@@ -5597,8 +5549,6 @@ A jump table for the options with a short description can be found at |Q_op|.

 	In the "popup" model the right mouse button produces a pop-up menu.
 	You need to define this first, see |popup-menu|.
-	In a terminal the popup menu works if Vim is compiled with the
-	|+insert_expand| option.

 	Note that you can further refine the meaning of buttons with mappings.
 	See |gui-mouse-mapping|.  But mappings are NOT used for modeless
@@ -5680,33 +5630,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	time in msec between two mouse clicks for the second click to be
 	recognized as a multi click.

-						*'mzschemedll'*
-'mzschemedll'		string	(default depends on the build)
-			global
-			{not in Vi}
-			{only available when compiled with the |+mzscheme/dyn|
-			feature}
-	Specifies the name of the MzScheme shared library. The default is
-	DYNAMIC_MZSCH_DLL which was specified at compile time.
-	Environment variables are expanded |:set_env|.
-	The value must be set in the |vimrc| script or earlier.  In the
-	startup, before the |load-plugins| step.
-	This option cannot be set from a |modeline| or in the |sandbox|, for
-	security reasons.
-
-						*'mzschemegcdll'*
-'mzschemegcdll'		string	(default depends on the build)
-			global
-			{not in Vi}
-			{only available when compiled with the |+mzscheme/dyn|
-			feature}
-	Specifies the name of the MzScheme GC shared library. The default is
-	DYNAMIC_MZGC_DLL which was specified at compile time.
-	The value can be equal to 'mzschemedll' if it includes the GC code.
-	Environment variables are expanded |:set_env|.
-	This option cannot be set from a |modeline| or in the |sandbox|, for
-	security reasons.
-
 						    *'mzquantum'* *'mzq'*
 'mzquantum' 'mzq'	number	(default 100)
 			global
@@ -5931,11 +5854,11 @@ A jump table for the options with a short description can be found at |Q_op|.
 	copy of the original file will be kept.  The name of the copy is the
 	name of the original file with the string in the 'patchmode' option
 	appended.  This option should start with a dot.  Use a string like
-	".orig" or ".org".  'backupdir' must not be empty for this to work
-	(Detail: The backup file is renamed to the patchmode file after the
-	new file has been successfully written, that's why it must be possible
-	to write a backup file).  If there was no file to be backed up, an
-	empty file is created.
+	".org".  'backupdir' must not be empty for this to work (Detail: The
+	backup file is renamed to the patchmode file after the new file has
+	been successfully written, that's why it must be possible to write a
+	backup file).  If there was no file to be backed up, an empty file is
+	created.
 	When the 'backupskip' pattern matches, a patchmode file is not made.
 	Using 'patchmode' for compressed files appends the extension at the
 	end (e.g., "file.gz.orig"), thus the resulting name isn't always
@@ -6137,15 +6060,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Insert mode completion.  When zero as much space as available is used.
 	|ins-completion-menu|.

-						*'pumwidth'* *'pw'*
-'pumwidth' 'pw'		number	(default 15)
-			global
-			{not available when compiled without the
-			|+insert_expand| feature}
-			{not in Vi}
-	Determines the minimum width to use for the popup menu for Insert mode
-	completion.  |ins-completion-menu|.
-
 						*'pythondll'*
 'pythondll'		string	(default depends on the build)
 			global
@@ -6164,6 +6078,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			{not in Vi}
 			{only available when compiled with the |+python/dyn|
 			feature}
+	Note: EXPERIMENTAL. It may be changed or removed in the future.
 	Specifies the name of the Python 2.x home directory. When 'pythonhome'
 	and the PYTHONHOME environment variable are not set, PYTHON_HOME,
 	which was specified at compile time, will be used for the Python 2.x
@@ -6190,11 +6105,13 @@ A jump table for the options with a short description can be found at |Q_op|.
 			{not in Vi}
 			{only available when compiled with the |+python3/dyn|
 			feature}
+	Note: EXPERIMENTAL. It may be changed or removed in the future.
 	Specifies the name of the Python 3 home directory. When
 	'pythonthreehome' and the PYTHONHOME environment variable are not set,
 	PYTHON3_HOME, which was specified at compile time, will be used for
 	the Python 3 home directory.
 	Environment variables are expanded |:set_env|.
+
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.

@@ -6255,7 +6172,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			{only available when compiled with the |+reltime|
 			feature}
 	The time in milliseconds for redrawing the display.  This applies to
-	searching for patterns for 'hlsearch', |:match| highlighting and syntax
+	searching for patterns for 'hlsearch', |:match| highlighting an syntax
 	highlighting.
 	When redrawing takes more than this many milliseconds no further
 	matches will be highlighted.
@@ -6299,7 +6216,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	characters are put before the number.
 	See |hl-LineNr|  and |hl-CursorLineNr| for the highlighting used for
 	the number.
-
+	
 	The number in front of the cursor line also depends on the value of
 	'number', see |number_relativenumber| for all combinations of the two
 	options.
@@ -6341,10 +6258,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 		  geom	    pixelGeometry	int	0 - 2 (see below)
 		  renmode   renderingMode	int	0 - 6 (see below)
 		  taamode   textAntialiasMode	int	0 - 3 (see below)
-		  scrlines  Scroll Lines	int	(deprecated)

-		See this URL for detail (except for scrlines):
-		  https://msdn.microsoft.com/en-us/library/dd368190.aspx
+		See this URL for detail:
+		  http://msdn.microsoft.com/en-us/library/dd368190.aspx

 		For geom: structure of a device pixel.
 		  0 - DWRITE_PIXEL_GEOMETRY_FLAT
@@ -6352,7 +6268,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 		  2 - DWRITE_PIXEL_GEOMETRY_BGR

 		See this URL for detail:
-		  https://msdn.microsoft.com/en-us/library/dd368114.aspx
+		  http://msdn.microsoft.com/en-us/library/dd368114.aspx

 		For renmode: method of rendering glyphs.
 		  0 - DWRITE_RENDERING_MODE_DEFAULT
@@ -6364,7 +6280,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 		  6 - DWRITE_RENDERING_MODE_OUTLINE

 		See this URL for detail:
-		  https://msdn.microsoft.com/en-us/library/dd368118.aspx
+		  http://msdn.microsoft.com/en-us/library/dd368118.aspx

 		For taamode: antialiasing mode used for drawing text.
 		  0 - D2D1_TEXT_ANTIALIAS_MODE_DEFAULT
@@ -6373,41 +6289,15 @@ A jump table for the options with a short description can be found at |Q_op|.
 		  3 - D2D1_TEXT_ANTIALIAS_MODE_ALIASED

 		See this URL for detail:
-		  https://msdn.microsoft.com/en-us/library/dd368170.aspx
-
-		For scrlines:
-		This was used for optimizing scrolling behavior, however this
-		is now deprecated.  If specified, it is simply ignored.
+		  http://msdn.microsoft.com/en-us/library/dd368170.aspx

 		Example: >
 		  set encoding=utf-8
-		  set gfn=Ricty_Diminished:h12
+		  set gfn=Ricty_Diminished:h12:cSHIFTJIS
 		  set rop=type:directx
 <
-		If select a raster font (Courier, Terminal or FixedSys which
-		have ".fon" extension in file name) to 'guifont', it will be
-		drawn by GDI as a fallback.
-
-		NOTE: It is known that some fonts and options combination
-		causes trouble on drawing glyphs.
-
-		  - 'renmode:5' and 'renmode:6' will not work with some
-		    special made fonts (True-Type fonts which includes only
-		    bitmap glyphs).
-		  - 'taamode:3' will not work with some vector fonts.
-
-		NOTE: With this option, you can display colored emoji
-		(emoticon) in Windows 8.1 or later.  To display colored emoji,
-		there are some conditions which you should notice.
-
-		  - If your font includes non-colored emoji already, it will
-		    be used.
-		  - If your font doesn't have emoji, the system chooses an
-		    alternative symbol font.  On Windows 10, "Segoe UI Emoji"
-		    will be used.
-		  - When this alternative font didn't have fixed width glyph,
-		    emoji might be rendered beyond the bounding box of drawing
-		    cell.
+		If select a raster font (Courier, Terminal or FixedSys) to
+		'guifont', it fallbacks to be drawn by GDI automatically.

 	Other render types are currently not supported.

@@ -6618,8 +6508,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	to find files which replace a distributed runtime files.  You can put
 	a directory after $VIMRUNTIME to find files which add to distributed
 	runtime files.
-	When Vim is started with |--clean| the home directory entries are not
-	included.
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.

@@ -6638,6 +6526,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 'scrollbind' 'scb'	boolean  (default off)
 			local to window
 			{not in Vi}
+			{not available when compiled without the |+scrollbind|
+			feature}
 	See also |scroll-binding|.  When this option is set, the current
 	window scrolls as other scrollbind windows (windows that also have
 	this option set) scroll.  This option is useful for viewing the
@@ -6675,6 +6565,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 						*'scrollopt'* *'sbo'*
 'scrollopt' 'sbo'	string	(default "ver,jump")
 			global
+			{not available when compiled without the |+scrollbind|
+			feature}
 			{not in Vi}
 	This is a comma-separated list of words that specifies how
 	'scrollbind' windows should behave.  'sbo' stands for ScrollBind
@@ -6764,7 +6656,7 @@ A jump table for the options with a short description can be found at |Q_op|.

 						*'sessionoptions'* *'ssop'*
 'sessionoptions' 'ssop'	string	(default: "blank,buffers,curdir,folds,
-					 help,options,tabpages,winsize,terminal")
+					       help,options,tabpages,winsize")
 			global
 			{not in Vi}
 			{not available when compiled without the |+mksession|
@@ -6796,7 +6688,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	   tabpages	all tab pages; without this only the current tab page
 			is restored, so that you can make a session for each
 			tab page separately
-	   terminal	include terminal windows where the command can be restored
 	   unix		with Unix end-of-line format (single <NL>), even when
 			on Windows or DOS
 	   winpos	position of the whole Vim window
@@ -6820,21 +6711,14 @@ A jump table for the options with a short description can be found at |Q_op|.
 	It is allowed to give an argument to the command, e.g.  "csh -f".
 	See |option-backslash| about including spaces and backslashes.
 	Environment variables are expanded |:set_env|.
-
 	If the name of the shell contains a space, you might need to enclose
-	it in quotes or escape the space.  Example with quotes: >
+	it in quotes.  Example: >
 		:set shell=\"c:\program\ files\unix\sh.exe\"\ -f
 <	Note the backslash before each quote (to avoid starting a comment) and
 	each space (to avoid ending the option value).  Also note that the
 	"-f" is not inside the quotes, because it is not part of the command
-	name.  Vim automagically recognizes the backslashes that are path
+	name.  And Vim automagically recognizes the backslashes that are path
 	separators.
-	Example with escaped space (Vim will do this when initializing the
-	option from $SHELL): >
-		:set shell=/bin/with\\\ space/sh
-<	The resulting value of 'shell' is  "/bin/with\ space/sh", two
-	backslashes are consumed by `:set`.
-
 	Under MS-Windows, when the executable ends in ".com" it must be
 	included.  Thus setting the shell to "command.com" or "4dos.com"
 	works, but "command" and "4dos" do not work for all commands (e.g.,
@@ -7592,6 +7476,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	W F   Preview window flag, text is ",PRV".
 	y F   Type of file in the buffer, e.g., "[vim]".  See 'filetype'.
 	Y F   Type of file in the buffer, e.g., ",VIM".  See 'filetype'.
+	      {not available when compiled without |+autocmd| feature}
 	q S   "[Quickfix List]", "[Location List]" or empty.
 	k S   Value of "b:keymap_name" or 'keymap' when |:lmap| mappings are
 	      being used: "<keymap>"
@@ -7615,9 +7500,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	a S   Argument list status as in default title.  ({current} of {max})
 	      Empty if the argument file count is zero or one.
 	{ NF  Evaluate expression between '%{' and '}' and substitute result.
-	      Note that there is no '%' before the closing '}'.  The
-	      expression cannot contain a '}' character, call a function to
-	      work around that.
+	      Note that there is no '%' before the closing '}'.
 	( -   Start of item group.  Can be used for setting the width and
 	      alignment of a section.  Must be followed by %) somewhere.
 	) -   End of item group.  No width fields allowed.
@@ -7738,7 +7621,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Also see |swap-file| and |'swapsync'|.
 	If you want to open a new buffer without creating a swap file for it,
 	use the |:noswapfile| modifier.
-	See 'directory' for where the swap file is created.

 	This option is used together with 'bufhidden' and 'buftype' to
 	specify special kinds of buffers.   See |special-buffers|.
@@ -8088,71 +7970,46 @@ A jump table for the options with a short description can be found at |Q_op|.
 		:set encoding=utf-8
 <	You need to do this when your system has no locale support for UTF-8.

-					*'termguicolors'* *'tgc'* *E954*
+						*'termguicolors'* *'tgc'*
 'termguicolors' 'tgc'	boolean (default off)
 			global
 			{not in Vi}
 			{not available when compiled without the
 			|+termguicolors| feature}
 	When on, uses |highlight-guifg| and |highlight-guibg| attributes in
-	the terminal (thus using 24-bit color).
-
-	Requires a ISO-8613-3 compatible terminal.  If setting this option
-	does not work (produces a colorless UI) reading |xterm-true-color|
-	might help.
-
-	For Win32 console, Windows 10 version 1703 (Creators Update) or later
-	is required. Use this check to find out: >
-		if has('vcon')
-<	This requires Vim to be built with the |+vtp| feature.
-
+	the terminal (thus using 24-bit color). Requires a ISO-8613-3
+	compatible terminal.
+	If setting this option does not work (produces a colorless UI)
+	reading |xterm-true-color| might help.
 	Note that the "cterm" attributes are still used, not the "gui" ones.
 	NOTE: This option is reset when 'compatible' is set.

-						*'termwinscroll'* *'twsl'*
-'termwinscroll' 'twsl'	number	(default 10000)
-			local to buffer
-			{not in Vi}
-			{not available when compiled without the
-			|+terminal| feature}
-	Number of scrollback lines to keep.  When going over this limit the
-	first 10% of the scrollback lines are deleted.  This is just to reduce
-	the memory usage.  See |Terminal-Normal|.
-
-						*'termwinkey'* *'twk'*
-'termwinkey' 'twk'	string	(default "")
+						*'termkey'* *'tk'*
+'termkey' 'tk'		string	(default "")
 			local to window
 			{not in Vi}
 	The key that starts a CTRL-W command in a terminal window.  Other keys
 	are sent to the job running in the window.
 	The <> notation can be used, e.g.: >
-		:set termwinkey=<C-L>
+		:set termkey=<C-L>
 <	The string must be one key stroke but can be multiple bytes.
 	When not set CTRL-W is used, so that CTRL-W : gets you to the command
-	line.  If 'termwinkey' is set to CTRL-L then CTRL-L : gets you to the
+	line.  If 'termkey' is set to CTRL-L then CTRL-L : gets you to the
 	command line.

-						*'termwinsize'* *'tws'*
-'termwinsize' 'tws'	string	(default "")
+						*'termsize'* *'tms'*
+'termsize' 'tms'	string	(default "")
 			local to window
 			{not in Vi}
-	Size of the |terminal| window.  Format: {rows}x{columns} or
-	{rows}*{columns}.
+	Size of the |terminal| window.  Format: {rows}x{columns}.
 	- When empty the terminal gets the size from the window.
-	- When set with a "x" (e.g., "24x80") the terminal size is not
-	  adjusted to the window size.  If the window is smaller only the
-	  top-left part is displayed.
-	- When set with a "*" (e.g., "10*50") the terminal size follows the
-	  window size, but will not be smaller than the specified rows and/or
-	  columns.
-	- When rows is zero then use the height of the window.
-	- When columns is zero then use the width of the window.
-	- Using "0x0" or "0*0" is the same as empty.
-
-	Examples:
-	  "30x0" uses 30 rows and the current window width.
-	  "20*0" uses at least 20 rows and the current window width.
-	  "0*40" uses the current window height and at least 40 columns.
+	- When set (e.g., "24x80") the terminal size is not adjusted to the
+	  window size.  If the window is smaller only the top-left part is
+	  displayed.
+	  When rows is zero then use the height of the window.
+	  When columns is zero then use the width of the window.
+	  For example: "30x0" uses 30 rows with the current window width.
+	  Using "0x0" is the same as empty.
 	Note that the command running in the terminal window may still change
 	the size of the terminal.  In that case the Vim window will be
 	adjusted to that size, if possible.
@@ -8210,7 +8067,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	non-keyword characters (white space is preferred).  Maximum line
 	length is 510 bytes.
 	To obtain a file to be used here, check out this ftp site:
-	[Sorry this link doesn't work anymore, do you know the right one?]
+	[Sorry this link doesn't work anymore, do you know the right one?] 
 	ftp://ftp.ox.ac.uk/pub/wordlists/  First get the README file.
 	To include a comma in a file name precede it with a backslash.  Spaces
 	after a comma are ignored, otherwise spaces are included in the file
@@ -8528,7 +8385,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	number, more intelligent detection process runs.
 	The "xterm2" value will be set if the xterm version is reported to be
 	from 95 to 276.  The "sgr" value will be set if the xterm version is
-	277 or higher and when Vim detects Mac Terminal.app or iTerm2.
+	277 or highter.
 	If you do not want 'ttymouse' to be set to "xterm2" or "sgr"
 	automatically, set t_RV to an empty string: >
 		:set t_RV=
@@ -8609,7 +8466,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Save the whole buffer for undo when reloading it.  This applies to the
 	":e!" command and reloading for when the buffer changed outside of
 	Vim. |FileChangedShell|
-	The save only happens when this option is negative or when the number
+	The save only happens when this options is negative or when the number
 	of lines is smaller than the value of this option.
 	Set this option to zero to disable undo for a reload.

@@ -8694,7 +8551,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	security reasons.

 						*'viewoptions'* *'vop'*
-'viewoptions' 'vop'	string	(default: "folds,options,cursor,curdir")
+'viewoptions' 'vop'	string	(default: "folds,options,cursor")
 			global
 			{not in Vi}
 			{not available when compiled without the |+mksession|
@@ -8712,7 +8569,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 			slashes
 	   unix		with Unix end-of-line format (single <NL>), even when
 			on Windows or DOS
-	   curdir	the window-local directory, if set with `:lcd`

 	"slash" and "unix" are useful on Windows when sharing view files
 	with Unix.  The Unix version of Vim cannot source dos format scripts,
@@ -1,4 +1,4 @@
-*os_390.txt*    For Vim version 8.1.  Last change: 2016 Feb 27
+*os_390.txt*    For Vim version 8.0.  Last change: 2016 Feb 27


 		  VIM REFERENCE MANUAL	  by Ralf Schandl
@@ -1,4 +1,4 @@
-*os_amiga.txt*  For Vim version 8.1.  Last change: 2010 Aug 14
+*os_amiga.txt*  For Vim version 8.0.  Last change: 2010 Aug 14


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1,4 +1,4 @@
-*os_beos.txt*	For Vim version 8.1.  Last change: 2016 Mar 28
+*os_beos.txt*	For Vim version 8.0.  Last change: 2016 Mar 28


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1,4 +1,4 @@
-*os_dos.txt*    For Vim version 8.1.  Last change: 2006 Mar 30
+*os_dos.txt*    For Vim version 8.0.  Last change: 2006 Mar 30


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1,4 +1,4 @@
-*os_mac.txt*    For Vim version 8.1.  Last change: 2018 Jan 21
+*os_mac.txt*    For Vim version 8.0.  Last change: 2017 Apr 28


 		  VIM REFERENCE MANUAL    by Bram Moolenaar et al.
@@ -168,9 +168,8 @@ If you want to disable it, pass `--disable-darwin` to the configure script: >
 and then run `make` to build Vim.  The order of the options doesn't matter.

 To make sure at runtime whether or not the darwin feature is compiled in, you
-can use `has('osxdarwin')` which returns 1 if the feature is compiled in; 0
-otherwise.  For backward compatibility, you can still use `macunix` instead of
-`osxdarwin`.
+can use `has('macunix')` which returns 1 if the feature is compiled in; 0
+otherwise.

 Notable use cases where `--disable-darwin` is turned out to be useful are:

@@ -1,4 +1,4 @@
-*os_mint.txt*   For Vim version 8.1.  Last change: 2005 Mar 29
+*os_mint.txt*   For Vim version 8.0.  Last change: 2005 Mar 29


 		  VIM REFERENCE MANUAL    by Jens M. Felderhoff
@@ -1,4 +1,4 @@
-*os_msdos.txt*  For Vim version 8.1.  Last change: 2016 Feb 26
+*os_msdos.txt*  For Vim version 8.0.  Last change: 2016 Feb 26


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1,4 +1,4 @@
-*os_os2.txt*    For Vim version 8.1.  Last change: 2015 Dec 31
+*os_os2.txt*    For Vim version 8.0.  Last change: 2015 Dec 31


 		  VIM REFERENCE MANUAL    by Paul Slootman
@@ -1,4 +1,4 @@
-*os_qnx.txt*    For Vim version 8.1.  Last change: 2005 Mar 29
+*os_qnx.txt*    For Vim version 8.0.  Last change: 2005 Mar 29


 		  VIM REFERENCE MANUAL    by Julian Kinraid
@@ -1,4 +1,4 @@
-*os_risc.txt*   For Vim version 8.1.  Last change: 2011 May 10
+*os_risc.txt*   For Vim version 8.0.  Last change: 2011 May 10


 		  VIM REFERENCE MANUAL    by Thomas Leonard
@@ -1,4 +1,4 @@
-*os_unix.txt*   For Vim version 8.1.  Last change: 2005 Mar 29
+*os_unix.txt*   For Vim version 8.0.  Last change: 2005 Mar 29


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1,4 +1,4 @@
-*os_vms.txt*    For Vim version 8.1.  Last change: 2018 May 06
+*os_vms.txt*    For Vim version 8.0.  Last change: 2014 Aug 29


 		  VIM REFERENCE MANUAL
@@ -702,13 +702,13 @@ In a cluster that contains nodes with different architectures like below:
 $show cluster
 View of Cluster from system ID 11655  node: TOR                                                                     18-AUG-2008 11:58:31
 +---------------------------------+
-|        SYSTEMS        | MEMBERS |
-+-----------------------+---------|
-|  NODE  |   SOFTWARE   |  STATUS |
-+--------+--------------+---------|
-| TOR    | VMS V7.3-2   | MEMBER  |
-| TITAN2 | VMS V8.3     | MEMBER  |
-| ODIN   | VMS V7.3-2   | MEMBER  |
+¦        SYSTEMS        ¦ MEMBERS ¦
+-----------------------+---------¦
+¦  NODE  ¦   SOFTWARE   ¦  STATUS ¦
+--------+--------------+---------¦
+¦ TOR    ¦ VMS V7.3-2   ¦ MEMBER  ¦
+¦ TITAN2 ¦ VMS V8.3     ¦ MEMBER  ¦
+¦ ODIN   ¦ VMS V7.3-2   ¦ MEMBER  ¦
 +---------------------------------+

 It is convenient to have a common VIM directory but execute different
@@ -1,4 +1,4 @@
-*os_win32.txt*  For Vim version 8.1.  Last change: 2017 Mar 21
+*os_win32.txt*  For Vim version 8.0.  Last change: 2017 Mar 21


 		  VIM REFERENCE MANUAL    by George Reilly
@@ -81,45 +81,10 @@ The directory of the Vim executable is appended to $PATH.  This is mostly to
 make "!xxd" work, as it is in the Tools menu.  And it also means that when
 executable() returns 1 the executable can actually be executed.

-Command line arguments					*win32-cmdargs*
+Quotes in file names					*win32-quotes*

-Analysis of a command line into parameters is not standardised in MS Windows.
-Vim and gvim used to use different logic to parse it (before 7.4.432), and the
-logic was also depended on what it was compiled with.  Now Vim and gvim both
-use the CommandLineToArgvW() Win32 API, so they behave in the same way.
-
-The basic rules are:					*win32-backslashes*
-      a) A parameter is a sequence of graphic characters.
-      b) Parameters are separated by white space.
-      c) A parameter can be enclosed in double quotes to include white space.
-      d) A sequence of zero or more backslashes (\) and a double quote (")
-	is special.  The effective number of backslashes is halved, rounded
-	down.  An even number of backslashes reverses the acceptability of
-	spaces and tabs, an odd number of backslashes produces a literal
-	double quote.
-
-So:
-	"	is a special double quote
-	\"	is a literal double quote
-	\\"	is a literal backslash and a special double quote
-	\\\"	is a literal backslash and a literal double quote
-	\\\\"	is 2 literal backslashes and a special double quote
-	\\\\\"	is 2 literal backslashes and a literal double quote
-	etc.
-
-Example: >
-	vim "C:\My Music\freude" +"set ignorecase" +/"\"foo\\" +\"bar\\\"
-
-opens "C:\My Music\freude" and executes the line mode commands: >
-	set ignorecase; /"foo\ and /bar\"
-
-These rules are also described in the reference of the CommandLineToArgvW API:
-    https://msdn.microsoft.com/en-us/library/windows/desktop/bb776391.aspx
-
-							*win32-quotes*
-There are additional rules for quotes (which are not well documented).
-As described above, quotes inside a file name (or any other command line
-argument) can be escaped with a backslash.  E.g. >
+Quotes inside a file name (or any other command line argument) can be escaped
+with a backslash.  E.g. >
 	vim -c "echo 'foo\"bar'"

 Alternatively use three quotes to get one: >
@@ -1,4 +1,4 @@
-*pattern.txt*   For Vim version 8.1.  Last change: 2018 Mar 13
+*pattern.txt*   For Vim version 8.0.  Last change: 2017 Jun 05


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -905,7 +905,7 @@ $	At end of pattern or in front of "\|", "\)" or "\n" ('magic' on):
 	becomes invalid.  Vim doesn't automatically update the matches.
 	Similar to moving the cursor for "\%#" |/\%#|.

-						*/\%l* */\%>l* */\%<l* *E951*
+						*/\%l* */\%>l* */\%<l*
 \%23l	Matches in a specific line.
 \%<23l	Matches above a specific line (lower line number).
 \%>23l	Matches below a specific line (higher line number).
@@ -1166,8 +1166,7 @@ x	A single character, with no special meaning, matches itself
 	- Matching with a collection can be slow, because each character in
 	  the text has to be compared with each character in the collection.
 	  Use one of the other atoms above when possible.  Example: "\d" is
-	  much faster than "[0-9]" and matches the same characters.  However,
-	  the new |NFA| regexp engine deals with this better than the old one.
+	  much faster than "[0-9]" and matches the same characters.

 						*/\%[]* *E69* *E70* *E369*
 \%[]	A sequence of optionally matched atoms.  This always matches.
@@ -1,4 +1,4 @@
-*pi_getscript.txt*  For Vim version 8.1.  Last change: 2017 Aug 01
+*pi_getscript.txt*  For Vim version 7.0.  Last change: 2017 Aug 01
 >
 		GETSCRIPT REFERENCE MANUAL  by Charles E. Campbell
 <
@@ -1,4 +1,4 @@
-*pi_gzip.txt*   For Vim version 8.1.  Last change: 2016 Nov 06
+*pi_gzip.txt*   For Vim version 8.0.  Last change: 2016 Nov 06


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1,4 +1,4 @@
-*pi_netrw.txt*  For Vim version 8.1.  Last change: 2017 Nov 03
+*pi_netrw.txt*  For Vim version 8.0.  Last change: 2016 Apr 20

 	    ------------------------------------------------
 	    NETRW REFERENCE MANUAL    by Charles E. Campbell
@@ -6,7 +6,7 @@
 Author:  Charles E. Campbell  <NdrOchip@ScampbellPfamily.AbizM>
 	  (remove NOSPAM from Campbell's email first)

-Copyright: Copyright (C) 2017 Charles E Campbell    *netrw-copyright*
+Copyright: Copyright (C) 2016 Charles E Campbell    *netrw-copyright*
 	The VIM LICENSE applies to the files in this package, including
 	netrw.vim, pi_netrw.txt, netrwFileHandlers.vim, netrwSettings.vim, and
 	syntax/netrw.vim.  Like anything else that's free, netrw.vim and its
@@ -17,6 +17,7 @@ Copyright: Copyright (C) 2017 Charles E Campbell    *netrw-copyright*
 	holder be liable for any damages resulting from the use of this
 	software. Use at your own risk!

+
 		*netrw*
 		*dav*    *ftp*    *netrw-file*  *rcp*    *scp*
 		*davs*   *http*   *netrw.vim*   *rsync*  *sftp*
@@ -72,7 +73,7 @@ Copyright: Copyright (C) 2017 Charles E Campbell    *netrw-copyright*
      Improving Browsing..................................|netrw-ssh-hack|
      Listing Bookmarks And History.......................|netrw-qb|
      Making A New Directory..............................|netrw-d|
-      Making The Browsing Directory The Current Directory.|netrw-cd|
+      Making The Browsing Directory The Current Directory.|netrw-c|
      Marking Files.......................................|netrw-mf|
      Unmarking Files.....................................|netrw-mF|
      Marking Files By Location List......................|netrw-qL|
@@ -82,7 +83,6 @@ Copyright: Copyright (C) 2017 Charles E Campbell    *netrw-copyright*
      Marked Files: Arbitrary Shell Command, En Bloc......|netrw-mX|
      Marked Files: Arbitrary Vim Command.................|netrw-mv|
      Marked Files: Argument List.........................|netrw-ma| |netrw-mA|
-      Marked Files: Buffer List...........................|netrw-cb| |netrw-cB|
      Marked Files: Compression And Decompression.........|netrw-mz|
      Marked Files: Copying...............................|netrw-mc|
      Marked Files: Diff..................................|netrw-md|
@@ -155,7 +155,7 @@ Windows' ftp doesn't support .netrc; however, one may have in one's .vimrc:  >

   let g:netrw_ftp_cmd= 'c:\Windows\System32\ftp -s:C:\Users\MyUserName\MACHINE'
 <
-Netrw will substitute the host's machine name for "MACHINE" from the URL it is
+Netrw will substitute the host's machine name for "MACHINE" from the url it is
 attempting to open, and so one may specify >
 	userid
 	password
@@ -212,7 +212,7 @@ EXTERNAL APPLICATIONS AND PROTOCOLS			*netrw-externapp* {{{2
          http:   g:netrw_http_cmd     = "fetch"      elseif fetch is available
 	  http:   *g:netrw_http_put_cmd* = "curl -T"
 	   rcp:   *g:netrw_rcp_cmd*      = "rcp"
-	 rsync:   *g:netrw_rsync_cmd*    = "rsync"     (see |g:netrw_rsync_sep|)
+	 rsync:   *g:netrw_rsync_cmd*    = "rsync -a"
 	   scp:   *g:netrw_scp_cmd*      = "scp -q"
 	  sftp:   *g:netrw_sftp_cmd*     = "sftp"
 	  file:   *g:netrw_file_cmd*     = "elinks" or "links"
@@ -223,7 +223,7 @@ EXTERNAL APPLICATIONS AND PROTOCOLS			*netrw-externapp* {{{2

 		    elinks : "-source >"
 		    links  : "-dump >"
-		    curl   : "-L -o"
+		    curl   : "-o"
 		    wget   : "-q -O"
 		    fetch  : "-o"
 <
@@ -238,7 +238,7 @@ EXTERNAL APPLICATIONS AND PROTOCOLS			*netrw-externapp* {{{2

 READING						*netrw-read* *netrw-nread* {{{2

-	Generally, one may just use the URL notation with a normal editing
+	Generally, one may just use the url notation with a normal editing
 	command, such as >

 		:e ftp://[user@]machine/path
@@ -260,7 +260,7 @@ READING						*netrw-read* *netrw-nread* {{{2

 WRITING					*netrw-write* *netrw-nwrite* {{{2

-	One may just use the URL notation with a normal file writing
+	One may just use the url notation with a normal file writing
 	command, such as >

 		:w ftp://[user@]machine/path
@@ -281,7 +281,7 @@ WRITING					*netrw-write* *netrw-nwrite* {{{2

 SOURCING					*netrw-source* {{{2

-	One may just use the URL notation with the normal file sourcing
+	One may just use the url notation with the normal file sourcing
 	command, such as >

 		:so ftp://[user@]machine/path
@@ -479,7 +479,7 @@ file using root-relative paths, use the full path:
 ==============================================================================
 4. Network-Oriented File Transfer			*netrw-xfer* {{{1

-Network-oriented file transfer under Vim is implemented by a vim script
+Network-oriented file transfer under Vim is implemented by a VimL-based script
 (<netrw.vim>) using plugin techniques.  It currently supports both reading and
 writing across networks using rcp, scp, ftp or ftp+<.netrc>, scp, fetch,
 dav/cadaver, rsync, or sftp.
@@ -532,7 +532,7 @@ variable (ex. scp uses the variable g:netrw_scp_cmd, which is defaulted to
 	let g:netrw_sftp_cmd= '"c:\Program Files\PuTTY\psftp.exe"'
 <
 (note: it has been reported that windows 7 with putty v0.6's "-batch" option
-       doesn't work, so its best to leave it off for that system)
+       doesn't work, so it's best to leave it off for that system)

 See |netrw-p8| for more about putty, pscp, psftp, etc.

@@ -734,11 +734,11 @@ such as netrw.
 The usual read/write commands are supported.  There are also a few
 additional commands available.  Often you won't need to use Nwrite or
 Nread as shown in |netrw-transparent| (ie. simply use >
-  :e URL
-  :r URL
-  :w URL
+  :e url
+  :r url
+  :w url
 instead, as appropriate) -- see |netrw-urls|.  In the explanations
-below, a {netfile} is a URL to a remote file.
+below, a {netfile} is an url to a remote file.

 						*:Nwrite*  *:Nw*
 :[range]Nw[rite]	Write the specified lines to the current
@@ -868,11 +868,9 @@ variables listed below, and may be modified by the user.
    g:netrw_http_cmd     var   ="fetch -o"     if      fetch is available
    g:netrw_http_cmd     var   ="wget -O"      else if wget  is available
    g:netrw_http_put_cmd var   ="curl -T"
-    |g:netrw_list_cmd|     var   ="ssh USEPORT HOSTNAME ls -Fa"
+    |g:netrw_list_cmd|    var   ="ssh USEPORT HOSTNAME ls -Fa"
    g:netrw_rcp_cmd      var   ="rcp"
-    g:netrw_rsync_cmd    var   ="rsync"
-    *g:netrw_rsync_sep*    var   ="/"            used to separate the hostname
-                                               from the file spec
+    g:netrw_rsync_cmd    var   ="rsync -a"
    g:netrw_scp_cmd      var   ="scp -q"
    g:netrw_sftp_cmd     var   ="sftp" >
    -------------------------------------------------------------------------
@@ -1009,7 +1007,7 @@ where [protocol] is typically scp or ftp.  As an example, try: >
 	vim ftp://ftp.home.vim.org/pub/vim/
 <
 For local directories, the trailing slash is not required.  Again, because it's
-easy to miss: to browse remote directories, the URL must terminate with a
+easy to miss: to browse remote directories, the url must terminate with a
 slash!

 If you'd like to avoid entering the password repeatedly for remote directory
@@ -1079,9 +1077,9 @@ QUICK REFERENCE: MAPS				*netrw-browse-maps* {{{2
 	 <c-r>	Browse using a gvim server                           |netrw-ctrl-r|
 	 <c-tab> Shrink/expand a netrw/explore window                |netrw-c-tab|
 	   -	Makes Netrw go up one directory                      |netrw--|
-	   a	Cycles between normal display,                       |netrw-a|
+	   a	Toggles between normal display,                      |netrw-a|
 	    	hiding (suppress display of files matching g:netrw_list_hide)
-	    	and showing (display only files which match g:netrw_list_hide)
+	    	showing (display only files which match g:netrw_list_hide)
 	   c	Make browsing directory the current directory        |netrw-c|
 	   C	Setting the editing window                           |netrw-C|
 	   d	Make a directory                                     |netrw-d|
@@ -1092,7 +1090,6 @@ QUICK REFERENCE: MAPS				*netrw-browse-maps* {{{2
 	   gh	Quick hide/unhide of dot-files                       |netrw-gh|
 	   gn	Make top of tree the directory below the cursor      |netrw-gn|
 	   i	Cycle between thin, long, wide, and tree listings    |netrw-i|
-	   I	Toggle the displaying of the banner                  |netrw-I|
 	   mb	Bookmark current directory                           |netrw-mb|
 	   mc	Copy marked files to marked-file target directory    |netrw-mc|
 	   md	Apply diff to marked files (up to 3)                 |netrw-md|
@@ -1172,26 +1169,25 @@ QUICK REFERENCE: COMMANDS	*netrw-explore-cmds* *netrw-browse-cmds* {{{2

 BANNER DISPLAY						*netrw-I*

-One may toggle the displaying of the banner by pressing "I".
+One may toggle the banner display on and off by pressing "I".

 Also See: |g:netrw_banner|


-BOOKMARKING A DIRECTORY		*netrw-mb* *netrw-bookmark* *netrw-bookmarks* {{{2
+BOOKMARKING A DIRECTORY *netrw-mb* *netrw-bookmark* *netrw-bookmarks* {{{2

 One may easily "bookmark" the currently browsed directory by using >

 	mb
 <
 								*.netrwbook*
-Bookmarks are retained in between sessions of vim in a file called .netrwbook
-as a |List|, which is typically stored in the first directory on the user's
-'|runtimepath|'; entries are kept in sorted order.
+Bookmarks are retained in between sessions in a $HOME/.netrwbook file, and are
+kept in sorted order.

 If there are marked files and/or directories, mb will add them to the bookmark
 list.

-								*netrw-:NetrwMB*
+*netrw-:NetrwMB*
 Addtionally, one may use :NetrwMB to bookmark files or directories. >

 	:NetrwMB[!] [files/directories]
@@ -1210,7 +1206,7 @@ The :NetrwMB command is available outside of netrw buffers (once netrw has been
 invoked in the session).

 The file ".netrwbook" holds bookmarks when netrw (and vim) is not active.  By
-default, its stored on the first directory on the user's |'runtimepath'|.
+default, it's stored on the first directory on the user's |'runtimepath'|.

 Related Topics:
 	|netrw-gb| how to return (go) to a bookmark
@@ -1422,20 +1418,20 @@ Related Topics:

 CHANGING TO A PREDECESSOR DIRECTORY		*netrw-u* *netrw-updir* {{{2

-Every time you change to a new directory (new for the current session), netrw
-will save the directory in a recently-visited directory history list (unless
-|g:netrw_dirhistmax| is zero; by default, it holds ten entries).  With the "u"
-map, one can change to an earlier directory (predecessor).  To do the
-opposite, see |netrw-U|.
+Every time you change to a new directory (new for the current session),
+netrw will save the directory in a recently-visited directory history
+list (unless |g:netrw_dirhistmax| is zero; by default, it's ten).  With the
+"u" map, one can change to an earlier directory (predecessor).  To do
+the opposite, see |netrw-U|.

-The "u" map also accepts counts to go back in the history several slots.  For
-your convenience, qb (see |netrw-qb|) lists the history number which may be
-used in that count.
+The "u" map also accepts counts to go back in the history several slots.
+For your convenience, qb (see |netrw-qb|) lists the history number which may
+be used in that count.

 						*.netrwhist*
 See |g:netrw_dirhistmax| for how to control the quantity of history stack
 slots.  The file ".netrwhist" holds history when netrw (and vim) is not
-active.  By default, its stored on the first directory on the user's
+active.  By default, it's stored on the first directory on the user's
 |'runtimepath'|.

 Related Topics:
@@ -1471,10 +1467,10 @@ changing the top of the tree listing.

 NETRW CLEAN					*netrw-clean* *:NetrwClean* {{{2

-With :NetrwClean one may easily remove netrw from one's home directory;
+With NetrwClean one may easily remove netrw from one's home directory;
 more precisely, from the first directory on your |'runtimepath'|.

-With :NetrwClean!, netrw will attempt to remove netrw from all directories on
+With NetrwClean!, netrw will attempt to remove netrw from all directories on
 your |'runtimepath'|.  Of course, you have to have write/delete permissions
 correct to do this.

@@ -1506,7 +1502,7 @@ Netrw determines which special handler by the following method:
    If g:netrw_browsex_viewer == '-', then netrwFileHandlers#Invoke() will be
    used instead (see |netrw_filehandler|).

-  * for Windows 32 or 64, the URL and FileProtocolHandler dlls are used.
+  * for Windows 32 or 64, the url and FileProtocolHandler dlls are used.
  * for Gnome (with gnome-open): gnome-open is used.
  * for KDE (with kfmclient)   : kfmclient is used
  * for Mac OS X               : open is used.
@@ -1522,10 +1518,9 @@ will apply a special handler to it (like "x" works when in a netrw buffer).
 One may also use visual mode (see |visual-start|) to select the text that the
 special handler will use.  Normally gx uses expand("<cfile>") to pick up the
 text under the cursor; one may change what |expand()| uses via the
-|g:netrw_gx| variable (options include "<cword>", "<cWORD>").  Note that
-expand("<cfile>") depends on the |'isfname'| setting.  Alternatively, one may
-select the text to be used by gx by making a visual selection (see
-|visual-block|) and then pressing gx.
+|g:netrw_gx| variable.  Alternatively, one may select the text to be used by
+gx via first making a visual selection (see |visual-block|) or by changing
+the |'isfname'| option (which is global, so netrw doesn't modify it).

 Associated setting variables:
 	|g:netrw_gx|	control how gx picks up the text under the cursor
@@ -1617,11 +1612,6 @@ A further approach is to delete files which match a pattern.
      This will cause the matching files to be marked.  Then,
      press "D".

-If your vim has 7.4 with patch#1107, then |g:netrw_localrmdir| no longer
-is used to remove directories; instead, vim's |delete()| is used with
-the "d" option.  Please note that only empty directories may be deleted
-with the "D" mapping.  Regular files are deleted with |delete()|, too.
-
 The |g:netrw_rm_cmd|, |g:netrw_rmf_cmd|, and |g:netrw_rmdir_cmd| variables are
 used to control the attempts to remove remote files and directories.  The
 g:netrw_rm_cmd is used with files, and its default value is:
@@ -1685,18 +1675,17 @@ DIRECTORY EXPLORATION COMMANDS  {{{2
 	  The [N] specifies a |g:netrw_winsize| just for the new :Lexplore
 	  window.

-	  Those who like this method often also like tree style displays;
+	  Those who like this method often also often like tree style displays;
 	  see |g:netrw_liststyle|.

-:[N]Lexplore! [dir] is similar to :Lexplore, except that the full-height
-	  Explorer window will open on the right hand side and an
-	  uninitialized |g:netrw_chgwin| will be set to 1 (eg. edits will
-	  preferentially occur in the leftmost window).
-
 	  Also see: |netrw-C|           |g:netrw_browse_split|   |g:netrw_wiw|
 		    |netrw-p| |netrw-P|   |g:netrw_chgwin|
 		    |netrw-c-tab|       |g:netrw_winsize|

+:[N]Lexplore! is like :Lexplore, except that the full-height Explorer window
+	  will open on the right hand side and an uninitialized |g:netrw_chgwin|
+	  will be set to 1.
+
 						*netrw-:Sexplore*
 :[N]Sexplore will always split the window before invoking the local-directory
 	  browser.  As with Explore, the splitting is normally done
@@ -1858,11 +1847,9 @@ EXECUTING FILE UNDER CURSOR VIA SYSTEM()			*netrw-X* {{{2

 Pressing X while the cursor is atop an executable file will yield a prompt
 using the filename asking for any arguments.  Upon pressing a [return], netrw
-will then call |system()| with that command and arguments.  The result will be
-displayed by |:echomsg|, and so |:messages| will repeat display of the result.
-Ansi escape sequences will be stripped out.
-
-See |cmdline-window| for directions for more on how to edit the arguments.
+will then call |system()| with that command and arguments.  The result will
+be displayed by |:echomsg|, and so |:messages| will repeat display of the
+result.  Ansi escape sequences will be stripped out.


 FORCING TREATMENT AS A FILE OR DIRECTORY	*netrw-gd* *netrw-gf* {{{2
@@ -2085,7 +2072,7 @@ Associated setting variables:	|g:netrw_localmkdir|   |g:netrw_mkdir_cmd|
 				|g:netrw_remote_mkdir| |netrw-%|


-MAKING THE BROWSING DIRECTORY THE CURRENT DIRECTORY	*netrw-cd* {{{2
+MAKING THE BROWSING DIRECTORY THE CURRENT DIRECTORY	*netrw-c* {{{2

 By default, |g:netrw_keepdir| is 1.  This setting means that the current
 directory will not track the browsing directory. (done for backwards
@@ -2100,9 +2087,6 @@ the two directories the same, use the "c" map (just type c).  That map will
 set Vim's notion of the current directory to netrw's current browsing
 directory.

-*netrw-c* : This map's name has been changed from "c" to cd (see |netrw-cd|).
-          This change was done to allow for |netrw-cb| and |netrw-cB| maps.
-
 Associated setting variable: |g:netrw_keepdir|

 MARKING FILES					*netrw-:MF*	*netrw-mf* {{{2
@@ -2147,7 +2131,6 @@ The following netrw maps make use of marked files:
    |netrw-mg|	Apply vimgrep to marked files
    |netrw-mm|	Move marked files to target
    |netrw-mp|	Print marked files
-    |netrw-ms|	Netrw will source marked files
    |netrw-mt|	Set target for |netrw-mm| and |netrw-mc|
    |netrw-mT|	Generate tags using marked files
    |netrw-mv|	Apply vim command to marked files
@@ -2222,9 +2205,6 @@ converts "*" into ".*" (see |regexp|) and marks files based on that.  In the
 future I may make it possible to use |regexp|s instead of glob()-style
 expressions (yet-another-option).

-See |cmdline-window| for directions on more on how to edit the regular
-expression.
-

 MARKED FILES, ARBITRARY VIM COMMAND				*netrw-mv*  {{{2
 	    (See |netrw-mf| and |netrw-mr| for how to mark files)
@@ -2238,9 +2218,8 @@ the local marked file list, individually:
 	* run vim command
 	* sil! keepalt wq!

-A prompt, "Enter vim command: ", will be issued to elicit the vim command you
-wish used.  See |cmdline-window| for directions for more on how to edit the
-command.
+A prompt, "Enter vim command: ", will be issued to elicit the vim command
+you wish used.


 MARKED FILES, ARBITRARY SHELL COMMAND				*netrw-mx* {{{2
@@ -2291,17 +2270,7 @@ MARKED FILES: ARGUMENT LIST				*netrw-ma* *netrw-mA*
 Using ma, one moves filenames from the marked file list to the argument list.
 Using mA, one moves filenames from the argument list to the marked file list.

-See Also: |netrw-cb| |netrw-cB| |netrw-qF| |argument-list| |:args|
-
-
-MARKED FILES: BUFFER LIST				*netrw-cb* *netrw-cB*
-	    (See |netrw-mf| and |netrw-mr| for how to mark files)
-		      (uses the global marked-file list)
-
-Using cb, one moves  filenames from the marked file list to the buffer list.
-Using cB, one copies filenames from the buffer list to the marked file list.
-
-See Also: |netrw-ma| |netrw-mA| |netrw-qF| |buffer-list| |:buffers|
+See Also: |netrw-qF| |argument-list| |:args|


 MARKED FILES: COMPRESSION AND DECOMPRESSION		*netrw-mz* {{{2
@@ -2337,8 +2306,8 @@ One may also copy directories and their contents (local only) to a target
 directory.

 Associated setting variables:
-	|g:netrw_localcopycmd|		|g:netrw_localcopycmdopt|
-	|g:netrw_localcopydircmd|	|g:netrw_localcopydircmdopt|
+	|g:netrw_localcopycmd|
+	|g:netrw_localcopydircmd|
 	|g:netrw_ssh_cmd|

 MARKED FILES: DIFF						*netrw-md* {{{2
@@ -2483,8 +2452,8 @@ When a remote set of files are tagged, the resulting tags file is "obtained";
 ie. a copy is transferred to the local system's directory.  The now local tags
 file is then modified so that one may use it through the network.  The
 modification made concerns the names of the files in the tags; each filename is
-preceded by the netrw-compatible URL used to obtain it.  When one subsequently
-uses one of the go to tag actions (|tags|), the URL will be used by netrw to
+preceded by the netrw-compatible url used to obtain it.  When one subsequently
+uses one of the go to tag actions (|tags|), the url will be used by netrw to
 edit the desired file and go to the tag.

 Associated setting variables: |g:netrw_ctags| |g:netrw_ssh_cmd|
@@ -2586,8 +2555,8 @@ your browsing preferences.  (see also: |netrw-settings|)
 				    editing.  It will also use the specified tab
 				    and window numbers to perform editing
 				    (see |clientserver|, |netrw-ctrl-r|)
-				This option does not affect the production of
-				|:Lexplore| windows.
+				This option does not affect |:Lexplore|
+				windows.

 				Related topics:
 				    |g:netrw_alto|	|g:netrw_altv|
@@ -2746,7 +2715,6 @@ your browsing preferences.  (see also: |netrw-settings|)
  *g:netrw_home*		The home directory for where bookmarks and
 				history are saved (as .netrwbook and
 				.netrwhist).
-				Netrw uses |expand()|on the string.
 				 default: the first directory on the
 				         |'runtimepath'|

@@ -2767,7 +2735,7 @@ your browsing preferences.  (see also: |netrw-settings|)
 				 default: (if ssh is executable)
 				          "ssh HOSTNAME ls -FLa"

-  *g:netrw_list_cmd_options*	If this variable exists, then its contents are
+ *g:netrw_list_cmd_options*	If this variable exists, then its contents are
 				appended to the g:netrw_list_cmd.  For
 				example, use "2>/dev/null" to get rid of banner
 				messages on unix systems.
@@ -2793,52 +2761,26 @@ your browsing preferences.  (see also: |netrw-settings|)
 				 let g:netrw_list_hide= netrw_gitignore#Hide().'.*\.swp$'
 				default: ""

-  *g:netrw_localcopycmd*	="cp"           Linux/Unix/MacOS/Cygwin
-				=expand("$COMSPEC")             Windows
+  *g:netrw_localcopycmd*	="cp" Linux/Unix/MacOS/Cygwin
+				="copy" Windows
 				Copies marked files (|netrw-mf|) to target
 				directory (|netrw-mt|, |netrw-mc|)

-  *g:netrw_localcopycmdopt*	=''             Linux/Unix/MacOS/Cygwin
-  				=' \c copy'                     Windows
-				Options for the |g:netrw_localcopycmd|
-
-  *g:netrw_localcopydircmd*	="cp"           Linux/Unix/MacOS/Cygwin
- 				=expand("$COMSPEC")             Windows
+ *g:netrw_localcopydircmd*	="cp -R"	Linux/Unix/MacOS/Cygwin
+				="xcopy /e /c /h/ /i /k"	Windows
 				Copies directories to target directory.
 				(|netrw-mc|, |netrw-mt|)

-  *g:netrw_localcopydircmdopt*	=" -R"          Linux/Unix/MacOS/Cygwin
-				=" /c xcopy /e /c /h/ /i /k"    Windows
-				Options for |g:netrw_localcopydircmd|
+  *g:netrw_localmkdir*		command for making a local directory
+				 default: "mkdir"

-  *g:netrw_localmkdir*		="mkdir"        Linux/Unix/MacOS/Cygwin
-				=expand("$COMSPEC")             Windows
-                                command for making a local directory
-
-  *g:netrw_localmkdiropt*	=""             Linux/Unix/MacOS/Cygwin
-				=" /c mkdir"                    Windows
-				Options for |g:netrw_localmkdir|
-
-  *g:netrw_localmovecmd*	="mv"           Linux/Unix/MacOS/Cygwin
-				=expand("$COMSPEC")             Windows
+  *g:netrw_localmovecmd*	="mv" Linux/Unix/MacOS/Cygwin
+				="move" Windows
 				Moves marked files (|netrw-mf|) to target
 				directory (|netrw-mt|, |netrw-mm|)

-  *g:netrw_localmovecmdopt*	=""             Linux/Unix/MacOS/Cygwin
-				=" /c move"                     Windows
-				Options for |g:netrw_localmovecmd|
-
-  *g:netrw_localrmdir*		="rmdir"        Linux/Unix/MacOS/Cygwin
- 				=expand("$COMSPEC")             Windows
-				Remove directory command (rmdir)
-				This variable is only used if your vim is
-				earlier than 7.4 or if your vim doesn't
-				have patch#1107.  Otherwise, |delete()|
-				is used with the "d" option.
-
-  *g:netrw_localrmdiropt*	=""             Linux/Unix/MacOS/Cygwin
-				=" /c rmdir"                    Windows
-				Options for |g:netrw_localrmdir|
+  *g:netrw_localrmdir*		remove directory command (rmdir)
+				 default: "rmdir"

  *g:netrw_maxfilenamelen*	=32 by default, selected so as to make long
 				    listings fit on 80 column displays.
@@ -2951,23 +2893,17 @@ your browsing preferences.  (see also: |netrw-settings|)
 					netrwTilde   : *
 					netrwTmp     : tmp* *tmp

-				In addition, those groups mentioned in
-				|'suffixes'| are also added to the special
-				file highlighting group.
-				 These syntax highlighting groups are linked
-				to netrwGray or Folded by default
-				(see |hl-Folded|), but one may put lines like >
+				These syntax highlighting groups are linked
+				to Folded or DiffChange by default
+				(see |hl-Folded| and |hl-DiffChange|), but
+				one may put lines like >
 					hi link netrwCompress Visual
 <				into one's <.vimrc> to use one's own
 				preferences.  Alternatively, one may
-				put such specifications into >
-					.vim/after/syntax/netrw.vim.
-<				 The netrwGray highlighting is set up by
-				netrw when >
-	       				* netrwGray has not been previously
-					  defined
-					* the gui is running
-<				 As an example, I myself use a dark-background
+				put such specifications into
+				.vim/after/syntax/netrw.vim.
+
+				As an example, I myself use a dark-background
 				colorscheme with the following in
 				.vim/after/syntax/netrw.vim: >

@@ -3202,8 +3138,8 @@ If there are no marked files: (see |netrw-mf|)

    Renaming files and directories involves moving the cursor to the
    file/directory to be moved (renamed) and pressing "R".  You will then be
-    queried for what you want the file/directory to be renamed to.  You may
-    select a range of lines with the "V" command (visual selection), and then
+    queried for what you want the file/directory to be renamed to  You may select
+    a range of lines with the "V" command (visual selection), and then
    press "R"; you will be queried for each file as to what you want it
    renamed to.

@@ -3235,20 +3171,16 @@ If there are marked files:  (see |netrw-mf|)

    Note that moving files is a dangerous operation; copies are safer.  That's
    because a "move" for remote files is actually a copy + delete -- and if
-    the copy fails and the delete succeeds you may lose the file.
+    the copy fails and the delete does not, you may lose the file.
    Use at your own risk.

-The *g:netrw_rename_cmd* variable is used to implement remote renaming.  By
-default its value is: >
+The g:netrw_rename_cmd variable is used to implement remote renaming.  By
+default its value is:

 	ssh HOSTNAME mv
-<
-One may rename a block of files and directories by selecting them with
-V (|linewise-visual|) when using thin style.

-See |cmdline-editing| for more on how to edit the command line; in particular,
-you'll find <ctrl-f> (initiates cmdline window editing) and <ctrl-c> (uses the
-command line under the cursor) useful in conjunction with the R command.
+One may rename a block of files and directories by selecting them with
+V (|linewise-visual|) when using thin style


 SELECTING SORTING STYLE			*netrw-s* *netrw-sort* {{{2
@@ -3269,8 +3201,8 @@ number.  Subsequent selection of a file to edit (|netrw-cr|) will use that
 window.

 	* C : by itself, will select the current window holding a netrw buffer
-	  for subsequent editing via |netrw-cr|.  The C mapping is only available
-	  while in netrw buffers.
+	  for editing via |netrw-cr|.  The C mapping is only available while in
+	  netrw buffers.

 	* [count]C : the count will be used as the window number to be used
 	  for subsequent editing via |netrw-cr|.
@@ -3283,7 +3215,7 @@ window.
 Using >
 	let g:netrw_chgwin= -1
 will restore the default editing behavior
-(ie. subsequent editing will use the current window).
+(ie. editing will use the current window).

 Related topics:			|netrw-cr| |g:netrw_browse_split|
 Associated setting variables:	|g:netrw_chgwin|
@@ -3304,9 +3236,9 @@ only if your terminal supports differentiating <c-tab> from a plain

  * Else bring up a |:Lexplore| window

-If |g:netrw_usetab| exists and is zero, or if there is a pre-existing mapping
+If |g:netrw_usetab| exists or is zero, or if there is a pre-existing mapping
 for <c-tab>, then the <c-tab> will not be mapped.  One may map something other
-than a <c-tab>, too: (but you'll still need to have had |g:netrw_usetab| set). >
+than a <c-tab>, too: (but you'll still need to have had g:netrw_usetab set) >

 	nmap <unique> (whatever)	<Plug>NetrwShrink
 <
@@ -3339,10 +3271,9 @@ The user function is passed one argument; it resembles >

 	fun! ExampleUserMapFunc(islocal)
 <
-where a:islocal is 1 if its a local-directory system call or 0 when
+where a:islocal is 1 if it's a local-directory system call or 0 when
 remote-directory system call.

-			        *netrw-call*  *netrw-expose*  *netrw-modify*
 Use netrw#Expose("varname")          to access netrw-internal (script-local)
 				     variables.
 Use netrw#Modify("varname",newvalue) to change netrw-internal variables.
@@ -3664,7 +3595,7 @@ Example: Clear netrw's marked file list via a mapping on gu >

 								*netrw-p16*
 	P16. When editing remote files (ex. :e ftp://hostname/path/file),
-	     under Windows I get an |E303| message complaining that its unable
+	     under Windows I get an |E303| message complaining that it's unable
 	     to open a swap file.

 	     (romainl) It looks like you are starting Vim from a protected
@@ -3718,7 +3649,7 @@ Example: Clear netrw's marked file list via a mapping on gu >
 	P21. I've made a directory (or file) with an accented character, but
 		netrw isn't letting me enter that directory/read that file:

-		Its likely that the shell or o/s is using a different encoding
+		It's likely that the shell or o/s is using a different encoding
 		than you have vim (netrw) using.  A patch to vim supporting
 		"systemencoding" may address this issue in the future; for
 		now, just have netrw use the proper encoding.  For example: >
@@ -3834,102 +3765,6 @@ netrw:
 ==============================================================================
 12. History						*netrw-history* {{{1

-	v162:	Sep 19, 2016	* (haya14busa) pointed out two syntax errors
-				  with a patch; these are now fixed.
-		Oct 26, 2016	* I started using mate-terminal and found that
-				  x and gx (|netrw-x| and |netrw-gx|) were no
-				  longer working.  Fixed (using atril when
-				  $DESKTOP_SESSION is "mate").
-		Nov 04, 2016	* (Martin Vuille) pointed out that @+ was
-				  being restored with keepregstar rather than
-				  keepregplus.
-		Nov 09, 2016	* Broke apart the command from the options,
-				  mostly for Windows.  Introduced new netrw
-				  settings: |g:netrw_localcopycmdopt|
-				  |g:netrw_localcopydircmdopt| |g:netrw_localmkdiropt|
-				  |g:netrw_localmovecmdopt| |g:netrw_localrmdiropt|
-		Nov 21, 2016	* (mattn) provided a patch for preview; swapped
-				  winwidth() with winheight()
-		Nov 22, 2016	* (glacambre) reported that files containing
-				  spaces weren't being obtained properly via
-				  scp.  Fix: apparently using single quotes
-				  such as with 'file name' wasn't enough; the
-				  spaces inside the quotes also had to be
-				  escaped (ie. 'file\ name').
-				* Also fixed obtain (|netrw-O|) to be able to
-				  obtain files with spaces in their names
-		Dec 20, 2016	* (xc1427) Reported that using "I" (|netrw-I|)
-				  when atop "Hiding" in the banner also caused
-				  the active-banner hiding control to occur
-		Jan 03, 2017	* (Enno Nagel) reported that attempting to
-				  apply netrw to a directory that was without
-				  read permission caused a syntax error.
-		Jan 13, 2017	* (Ingo Karkat) provided a patch which makes
-				  using netrw#Call() better.  Now returns
-				  value of internal routines return, for example.
-		Jan 13, 2017	* (Ingo Karkat) changed netrw#FileUrlRead to
-				  use |:edit| instead of |:read|.  I also
-				  changed the routine name to netrw#FileUrlEdit.
-		Jan 16, 2017	* (Sayem) reported a problem where :Lexplore
-				  could generate a new listing buffer and
-				  window instead of toggling the netrw display.
-				  Unfortunately, the directions for eliciting
-				  the problem weren't complete, so I may or
-				  may not have fixed that issue.
-		Feb 06, 2017	* Implemented cb and cB.  Changed "c" to "cd".
-				  (see |netrw-cb|, |netrw-cB|, and |netrw-cd|)
-		Mar 21, 2017	* previously, netrw would specify (safe) settings
-				  even when the setting was already safe for
-				  netrw.  Netrw now attempts to leave such
-				  already-netrw-safe settings alone.
-				  (affects s:NetrwOptionRestore() and
-				  s:NetrwSafeOptions(); also introduced
-				  s:NetrwRestoreSetting())
-		Jun 26, 2017	* (Christian Brabandt) provided a patch to
-				  allow curl to follow redirects (ie. -L
-				  option)
-		Jun 26, 2017	* (Callum Howard) reported a problem with
-				  :Lexpore not removing the Lexplore window
-				  after a change-directory
-		Aug 30, 2017	* (Ingo Karkat) one cannot switch to the
-				  previously edited file (e.g. with CTRL-^)
-				  after editing a file:// URL.  Patch to
-				  have a "keepalt" included.
-		Oct 17, 2017	* (Adam Faryna) reported that gn (|netrw-gn|)
-				  did not work on directories in the current
-				  tree
-	v157:	Apr 20, 2016	* (Nicola) had set up a "nmap <expr> ..." with
-				  a function that returned a 0 while silently
-				  invoking a shell command.  The shell command
-				  activated a ShellCmdPost event which in turn
-				  called s:LocalBrowseRefresh().  That looks
-				  over all netrw buffers for changes needing
-				  refreshes.  However, inside a |:map-<expr>|,
-				  tab and window changes are disallowed.  Fixed.
-				  (affects netrw's s:LocalBrowseRefresh())
-				* |g:netrw_localrmdir| not used any more, but
-				  the relevant patch that causes |delete()| to
-				  take over was #1107 (not #1109).
-				* |expand()| is now used on |g:netrw_home|;
-				  consequently, g:netrw_home may now use
-				  environment variables
-				* s:NetrwLeftmouse and s:NetrwCLeftmouse will
-				  return without doing anything if invoked
-				  when inside a non-netrw window
-		Jun 15, 2016	* gx now calls netrw#GX() which returns
-				  the word under the cursor.  The new
-				  wrinkle: if one is in a netrw buffer,
-				  then netrw's s:NetrwGetWord().
-		Jun 22, 2016	* Netrw was executing all its associated
-				  Filetype commands silently; I'm going
-				  to try doing that "noisily" and see if
-				  folks have a problem with that.
-		Aug 12, 2016	* Changed order of tool selection for
-				  handling http://... viewing.
-				  (Nikolay Aleksandrovich Pavlov)
-		Aug 21, 2016	* Included hiding/showing/all for tree
-				  listings
-				* Fixed refresh (^L) for tree listings
 	v156:	Feb 18, 2016	* Changed =~ to =~# where appropriate
 		Feb 23, 2016	* s:ComposePath(base,subdir) now uses
 				  fnameescape() on the base portion
@@ -3961,9 +3796,9 @@ netrw:
 				  tell me how they're useful and should be
 				  retained?
 		Nov 20, 2015	* Added |netrw-ma| and |netrw-mA| support
-		Nov 20, 2015	* gx (|netrw-gx|) on a URL downloaded the
+		Nov 20, 2015	* gx (|netrw-gx|) on an url downloaded the
 				  file in addition to simply bringing up the
-				  URL in a browser.  Fixed.
+				  url in a browser.  Fixed.
 		Nov 23, 2015	* Added |g:netrw_sizestyle| support
 		Nov 27, 2015	* Inserted a lot of <c-u>s into various netrw
 				  maps.
@@ -1,4 +1,4 @@
-*pi_paren.txt*  For Vim version 8.1.  Last change: 2013 May 08
+*pi_paren.txt*  For Vim version 8.0.  Last change: 2013 May 08


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1,4 +1,4 @@
-*pi_spec.txt*   For Vim version 8.1.  Last change: 2006 Apr 24
+*pi_spec.txt*   For Vim version 8.0.  Last change: 2006 Apr 24

 by Gustavo Niemeyer ~

@@ -1,4 +1,4 @@
-*pi_tar.txt*	For Vim version 8.1.  Last change: 2013 Apr 17
+*pi_tar.txt*	For Vim version 8.0.  Last change: 2013 Apr 17

 		       +====================+
 		       | Tar File Interface |
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Kazuki Sakamoto	4dd200f7ac	Draw markedText in MMCoreTextView if imstyle=1	2017-09-20 19:13:23 -07:00
Kazuki Sakamoto	ff28b66f41	Remove InlineIM from Preferences	2017-09-20 19:13:23 -07:00
Kazuki Sakamoto	d23c46d07e	Control InlineIM by imstyle	2017-09-20 19:13:23 -07:00