iTerm2 PSMTabBarControl

https://github.com/gnachman/iTerm2/tree/master/ThirdParty/PSMTabBarControl
2026-06-02 11:19:22 +02:00 · 2016-10-01 23:48:20 -07:00
1540 changed files with 68587 additions and 180205 deletions
@@ -5,7 +5,6 @@ src/xxd/xxd
 src/auto/if_perl.c
 src/auto/gui_gtk_gresources.c
 src/auto/gui_gtk_gresources.h
-src/objects/.dirstamp
 src/tags

 # We do need src/auto/configure.
@@ -38,7 +37,6 @@ src/pathdef.c
 src/Obj*/pathdef.c
 gvimext.dll
 gvimext.lib
-gvim.lib
 runtime/doc/uganda.nsis.txt

 # Borland C++
@@ -79,11 +77,9 @@ src/testdir/test.log
 src/testdir/dostmp/*
 src/testdir/messages
 src/testdir/viminfo
-src/testdir/opt_test.vim
 src/memfile_test
 src/json_test
 src/message_test
-src/kword_test

 # From MacVim
 .*.swp
@@ -1,4 +0,0 @@
-# Format of this file: https://lgtm.com/help/lgtm/lgtm.yml-configuration-file
-path_classifiers:
-  documentation:
-    - runtime/tutor/tutor*
@@ -1,41 +1,37 @@
 language: c
-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.7/Python
+    vi_cv_dll_name_python3=/usr/local/Frameworks/Python.framework/Versions/3.5/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-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)
  - ./configure $CONFOPT --enable-fail-if-missing
  - cat src/auto/config.mk
-  - cat src/auto/config.h
  - grep -q -- "-DDYNAMIC_PERL_DLL=\\\\\"$vi_cv_dll_name_perl\\\\\"" src/auto/config.mk
  - grep -q -- "-DDYNAMIC_PYTHON_DLL=\\\\\"$vi_cv_dll_name_python\\\\\"" src/auto/config.mk
  - grep -q -- "-DDYNAMIC_PYTHON3_DLL=\\\\\"$vi_cv_dll_name_python3\\\\\"" src/auto/config.mk
@@ -51,24 +51,4 @@ Look in the header of the file for the name and email address.
 The maintainer will take care of issues and send updates to Bram for 
 distribution with Vim.

-If the maintainer does not respond, contact the vim-dev maillist.
-
-
-# Translations
-
-Translating messages and runtime files is very much appreciated!  These things can be translated:
-*   Messages in Vim, see [src/po/README.txt][1]
-*   Menus, see [runtime/lang/README.txt][2]
-*   Vim tutor, see [runtime/tutor/README.txt][3]
-*   Manual pages, see [runtime/doc/\*.1][4] for examples
-*   Desktop icon, see [runtime/vim.desktop][5] and [runtime/gvim.desktop][6]
-
-The help files can be translated and made available separately.
-See https://www.vim.org/translations.php for examples.
-
-[1]: https://github.com/vim/vim/blob/master/src/po/README.txt
-[2]: https://github.com/vim/vim/blob/master/runtime/lang/README.txt
-[3]: https://github.com/vim/vim/blob/master/runtime/tutor/README.txt
-[4]: https://github.com/vim/vim/blob/master/runtime/doc/vim.1
-[5]: https://github.com/vim/vim/blob/master/runtime/vim.desktop
-[6]: https://github.com/vim/vim/blob/master/runtime/gvim.desktop
+If the maintainer does not react, contact the vim-dev maillist.
@@ -4,18 +4,14 @@
 # source files for all source archives
 SRC_ALL =	\
 		.hgignore \
-		.lgtm.yml \
 		.travis.yml \
 		appveyor.yml \
-		src/Make_all.mak \
 		src/appveyor.bat \
 		src/README.txt \
 		src/alloc.h \
 		src/arabic.c \
 		src/arabic.h \
 		src/ascii.h \
-		src/beval.c \
-		src/beval.h \
 		src/blowfish.c \
 		src/buffer.c \
 		src/channel.c \
@@ -28,7 +24,6 @@ SRC_ALL =	\
 		src/edit.c \
 		src/eval.c \
 		src/evalfunc.c \
-		src/ex_cmdidxs.h \
 		src/ex_cmds.c \
 		src/ex_cmds.h \
 		src/ex_cmds2.c \
@@ -45,11 +40,11 @@ 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 \
 		src/json_test.c \
-		src/kword_test.c \
 		src/list.c \
 		src/keymap.h \
 		src/macros.h \
@@ -88,7 +83,6 @@ SRC_ALL =	\
 		src/syntax.c \
 		src/tag.c \
 		src/term.c \
-		src/terminal.c \
 		src/term.h \
 		src/termlib.c \
 		src/ui.c \
@@ -102,26 +96,20 @@ SRC_ALL =	\
 		src/tee/tee.c \
 		src/xxd/xxd.c \
 		src/main.aap \
-		src/testdir/gen_opt_test.vim \
 		src/testdir/main.aap \
 		src/testdir/README.txt \
 		src/testdir/Make_all.mak \
 		src/testdir/*.in \
 		src/testdir/*.py \
-		src/testdir/lsan-suppress.txt \
 		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 \
-		src/testdir/setup_gui.vim \
-		src/testdir/gui_preinit.vim \
 		src/testdir/test[0-9]*.ok \
 		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 \
@@ -134,17 +122,11 @@ SRC_ALL =	\
 		src/testdir/pythonx/topmodule/submodule/subsubmodule/subsubsubmodule.py \
 		src/testdir/python_after/*.py \
 		src/testdir/python_before/*.py \
-		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 \
@@ -197,7 +179,6 @@ SRC_ALL =	\
 		src/proto/syntax.pro \
 		src/proto/tag.pro \
 		src/proto/term.pro \
-		src/proto/terminal.pro \
 		src/proto/termlib.pro \
 		src/proto/ui.pro \
 		src/proto/undo.pro \
@@ -205,76 +186,6 @@ SRC_ALL =	\
 		src/proto/version.pro \
 		src/proto/winclip.pro \
 		src/proto/window.pro \
-		src/libvterm/.bzrignore \
-		src/libvterm/.gitignore \
-		src/libvterm/LICENSE \
-		src/libvterm/Makefile \
-		src/libvterm/README \
-		src/libvterm/tbl2inc_c.pl \
-		src/libvterm/vterm.pc.in \
-		src/libvterm/bin/unterm.c \
-		src/libvterm/bin/vterm-ctrl.c \
-		src/libvterm/bin/vterm-dump.c \
-		src/libvterm/doc/URLs \
-		src/libvterm/doc/seqs.txt \
-		src/libvterm/include/vterm.h \
-		src/libvterm/include/vterm_keycodes.h \
-		src/libvterm/src/encoding.c \
-		src/libvterm/src/encoding/DECdrawing.inc \
-		src/libvterm/src/encoding/DECdrawing.tbl \
-		src/libvterm/src/encoding/uk.inc \
-		src/libvterm/src/encoding/uk.tbl \
-		src/libvterm/src/keyboard.c \
-		src/libvterm/src/mouse.c \
-		src/libvterm/src/parser.c \
-		src/libvterm/src/pen.c \
-		src/libvterm/src/rect.h \
-		src/libvterm/src/screen.c \
-		src/libvterm/src/state.c \
-		src/libvterm/src/unicode.c \
-		src/libvterm/src/utf8.h \
-		src/libvterm/src/vterm.c \
-		src/libvterm/src/vterm_internal.h \
-		src/libvterm/t/02parser.test \
-		src/libvterm/t/03encoding_utf8.test \
-		src/libvterm/t/10state_putglyph.test \
-		src/libvterm/t/11state_movecursor.test \
-		src/libvterm/t/12state_scroll.test \
-		src/libvterm/t/13state_edit.test \
-		src/libvterm/t/14state_encoding.test \
-		src/libvterm/t/15state_mode.test \
-		src/libvterm/t/16state_resize.test \
-		src/libvterm/t/17state_mouse.test \
-		src/libvterm/t/18state_termprops.test \
-		src/libvterm/t/20state_wrapping.test \
-		src/libvterm/t/21state_tabstops.test \
-		src/libvterm/t/22state_save.test \
-		src/libvterm/t/25state_input.test \
-		src/libvterm/t/26state_query.test \
-		src/libvterm/t/27state_reset.test \
-		src/libvterm/t/28state_dbl_wh.test \
-		src/libvterm/t/29state_fallback.test \
-		src/libvterm/t/30pen.test \
-		src/libvterm/t/40screen_ascii.test \
-		src/libvterm/t/41screen_unicode.test \
-		src/libvterm/t/42screen_damage.test \
-		src/libvterm/t/43screen_resize.test \
-		src/libvterm/t/44screen_pen.test \
-		src/libvterm/t/45screen_protect.test \
-		src/libvterm/t/46screen_extent.test \
-		src/libvterm/t/47screen_dbl_wh.test \
-		src/libvterm/t/48screen_termprops.test \
-		src/libvterm/t/90vttest_01-movement-1.test \
-		src/libvterm/t/90vttest_01-movement-2.test \
-		src/libvterm/t/90vttest_01-movement-3.test \
-		src/libvterm/t/90vttest_01-movement-4.test \
-		src/libvterm/t/90vttest_02-screen-1.test \
-		src/libvterm/t/90vttest_02-screen-2.test \
-		src/libvterm/t/90vttest_02-screen-3.test \
-		src/libvterm/t/90vttest_02-screen-4.test \
-		src/libvterm/t/92lp1640917.test \
-		src/libvterm/t/harness.c \
-		src/libvterm/t/run-test.pl \


 # source files for Unix only
@@ -296,8 +207,7 @@ SRC_UNIX =	\
 		src/config.mk.dist \
 		src/config.mk.in \
 		src/configure \
-		src/configure.ac \
-		src/create_cmdidxs.vim \
+		src/configure.in \
 		src/gui_at_fs.c \
 		src/gui_at_sb.c \
 		src/gui_at_sb.h \
@@ -321,7 +231,7 @@ SRC_UNIX =	\
 		src/link.sh \
 		src/installman.sh \
 		src/installml.sh \
-		src/install-sh \
+		src/mkinstalldirs \
 		src/os_unix.c \
 		src/os_unix.h \
 		src/os_unixx.h \
@@ -412,9 +322,6 @@ SRC_DOS =	\
 		src/msvcsetup.bat \
 		src/msvc2008.bat \
 		src/msvc2010.bat \
-		src/msvc2015.bat \
-		src/msys32.bat \
-		src/msys64.bat \
 		src/dimm.idl \
 		src/dlldata.c \
 		src/dosinst.c \
@@ -459,7 +366,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 \
@@ -590,7 +496,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 \
@@ -650,7 +555,6 @@ RT_ALL =	\
 		runtime/pack/dist/opt/matchit/doc/tags \
 		runtime/pack/dist/opt/shellmenu/plugin/shellmenu.vim \
 		runtime/pack/dist/opt/swapmouse/plugin/swapmouse.vim \
-		runtime/pack/dist/opt/termdebug/plugin/termdebug.vim \

 # runtime files for all distributions without CR-NL translation
 RT_ALL_BIN =	\
@@ -668,11 +572,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 \
@@ -710,7 +612,6 @@ RT_NO_UNIX =	\

 # runtime for Amiga (also in the extra archive)
 RT_AMI_DOS =	\
-		runtime/doc/evim.man \
 		runtime/doc/vim.man \
 		runtime/doc/vimdiff.man \
 		runtime/doc/vimtutor.man \
@@ -816,6 +717,7 @@ EXTRA =		\
 		farsi/README.txt \
 		farsi/fonts/*/far-* \
 		runtime/vimlogo.xpm \
+		src/swis.s \
 		src/tee/Makefile \
 		src/tee/Make_mvc.mak \
 		src/tee/tee.c \
@@ -851,8 +753,6 @@ IN_README_DIR = \

 # generic language files
 LANG_GEN = \
-		runtime/doc/*-da.1 \
-		runtime/doc/*-da.UTF-8.1 \
 		runtime/doc/*-de.1 \
 		runtime/doc/*-de.UTF-8.1 \
 		runtime/doc/*-fr.1 \
@@ -913,7 +813,6 @@ LANG_SRC = \
 		src/po/check.vim \
 		src/po/cleanup.vim \
 		src/po/Makefile \
-		src/po/Make_all.mak \
 		src/po/Make_cyg.mak \
 		src/po/Make_ming.mak \
 		src/po/Make_mvc.mak \
@@ -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,27 @@ 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 and libiconv-2.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 +151,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 +187,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 +466,8 @@ 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)/


 # Used before uploading.  Don't delete the AAPDIR/sign files!
@@ -500,10 +494,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,13 +1,38 @@
-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?
+This file explains the installation of MacVim.
+See "README.txt" for general information about Vim.
+See "src/MacVim/README" for an overview of the MacVim specific source code.
+
+MacVim uses the usual configure/make steps to build the binary but instead of
+"make install" you just drag the app bundle into the directory you wish to
+install in (usually `/Applications').
+
+
+How to build and install
 ========================

-Download MacVim.dmg from latest binary release page https://github.com/macvim-dev/macvim/releases/latest , open the dmg file, and copy MacVim.app to /Applications.
+Run `./configure` in the `src/` directory with the flags you want (call
+`./configure --help` to see a list of flags) e.g.:

+    $ cd src
+    $ ./configure --with-features=huge \
+                  --enable-rubyinterp \
+                  --enable-pythoninterp \
+                  --enable-perlinterp \
+                  --enable-cscope

-Questions?
-========================
+Now build the project using `make`:

-Please take a look at the home page http://macvim-dev.github.io/macvim/
+    $ make

+The resulting app bundle will reside under `MacVim/build/Release`.  To try it
+out quickly, type:
+
+    $ open MacVim/build/Release/MacVim.app
+
+To install MacVim, type
+
+    $ open MacVim/build/Release
+
+and drag the MacVim icon into your `Applications` folder.
@@ -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,24 +76,17 @@ 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

 Function .onInit
  MessageBox MB_YESNO|MB_ICONQUESTION \
 	"This will install Vim ${VER_MAJOR}.${VER_MINOR} on your computer.$\n Continue?" \
-	/SD IDYES \
 	IDYES NoAbort
 	    Abort ; causes installer to quit.
 	NoAbort:
@@ -141,10 +127,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
@@ -196,7 +178,7 @@ FunctionEnd

 ##########################################################
 Section "Vim executables and runtime files"
-	SectionIn 1 2 3 RO
+	SectionIn 1 2 3

 	# we need also this here if the user changes the instdir
 	StrCpy $0 "$INSTDIR\vim${VER_MAJOR}${VER_MINOR}"
@@ -208,16 +190,13 @@ Section "Vim executables and runtime files"
 	File ${VIMSRC}\vimrun.exe
 	File /oname=tee.exe ${VIMSRC}\teew32.exe
 	File /oname=xxd.exe ${VIMSRC}\xxdw32.exe
+	File ${VIMTOOLS}\diff.exe
 	File ${VIMRT}\vimtutor.bat
 	File ${VIMRT}\README.txt
 	File ..\uninstal.txt
 	File ${VIMRT}\*.vim
 	File ${VIMRT}\rgb.txt

-	File ${VIMTOOLS}\diff.exe
-	File ${VIMTOOLS}\winpty32.dll
-	File ${VIMTOOLS}\winpty-agent.exe
-
 	SetOutPath $0\colors
 	File ${VIMRT}\colors\*.*

@@ -236,14 +215,6 @@ Section "Vim executables and runtime files"

 	SetOutPath $0\macros
 	File ${VIMRT}\macros\*.*
-	SetOutPath $0\macros\hanoi
-	File ${VIMRT}\macros\hanoi\*.*
-	SetOutPath $0\macros\life
-	File ${VIMRT}\macros\life\*.*
-	SetOutPath $0\macros\maze
-	File ${VIMRT}\macros\maze\*.*
-	SetOutPath $0\macros\urm
-	File ${VIMRT}\macros\urm\*.*

 	SetOutPath $0\pack\dist\opt\dvorak\dvorak
 	File ${VIMRT}\pack\dist\opt\dvorak\dvorak\*.*
@@ -267,18 +238,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 +316,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 +342,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 +382,9 @@ 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
 	SectionEnd
 !endif

@@ -478,43 +399,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 +424,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
@@ -1,48 +0,0 @@
-" Author: Antony Lee <anntzer.lee@gmail.com>
-" Description: Helper functions for reStructuredText syntax folding
-" Last Modified: 2018-01-07
-
-function s:CacheRstFold()
-  let closure = {'header_types': {}, 'max_level': 0, 'levels': {}}
-  function closure.Process(match) dict
-    let curline = getcurpos()[1]
-    if has_key(self.levels, curline - 1)
-      " For over+under-lined headers, the regex will match both at the
-      " overline and at the title itself; in that case, skip the second match.
-      return
-    endif
-    let lines = split(a:match, '\n')
-    let key = repeat(lines[-1][0], len(lines))
-    if !has_key(self.header_types, key)
-      let self.max_level += 1
-      let self.header_types[key] = self.max_level
-    endif
-    let self.levels[curline] = self.header_types[key]
-  endfunction
-  let save_cursor = getcurpos()
-  silent keeppatterns %s/\v^%(%(([=`:.'"~^_*+#-])\1+\n)?.{1,2}\n([=`:.'"~^_*+#-])\2+)|%(%(([=`:.''"~^_*+#-])\3{2,}\n)?.{3,}\n([=`:.''"~^_*+#-])\4{2,})$/\=closure.Process(submatch(0))/gn
-  call setpos('.', save_cursor)
-  let b:RstFoldCache = closure.levels
-endfunction
-
-function RstFold#GetRstFold()
-  if !has_key(b:, 'RstFoldCache')
-    call s:CacheRstFold()
-  endif
-  if has_key(b:RstFoldCache, v:lnum)
-    return '>' . b:RstFoldCache[v:lnum]
-  else
-    return '='
-  endif
-endfunction
-
-function RstFold#GetRstFoldText()
-  if !has_key(b:, 'RstFoldCache')
-    call s:CacheRstFold()
-  endif
-  let indent = repeat('  ', b:RstFoldCache[v:foldstart] - 1)
-  let thisline = getline(v:foldstart)
-  " For over+under-lined headers, skip the overline.
-  let text = thisline =~ '^\([=`:.''"~^_*+#-]\)\1\+$' ? getline(v:foldstart + 1) : thisline
-  return indent . text
-endfunction
@@ -2,13 +2,12 @@
 "  Description: Perform Ada specific completion & tagging.
 "     Language: Ada (2005)
 "	   $Id: ada.vim 887 2008-07-08 14:29:01Z krischik $
-"   Maintainer: Mathias Brousset <mathiasb17@gmail.com>
-"		Martin Krischik <krischik@users.sourceforge.net>
+"   Maintainer: Martin Krischik <krischik@users.sourceforge.net>
 "		Taylor Venable <taylor@metasyntax.net>
 "		Neil Bird <neil@fnxweb.com>
 "		Ned Okie <nokie@radford.edu>
 "      $Author: krischik $
-"	 $Date: 2017-01-31 20:20:05 +0200 (Mon, 01 Jan 2017) $
+"	 $Date: 2008-07-08 16:29:01 +0200 (Di, 08 Jul 2008) $
 "      Version: 4.6
 "    $Revision: 887 $
 "     $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/autoload/ada.vim $
@@ -24,7 +23,6 @@
 "	        09.05.2007 MK Session just won't work no matter how much
 "			      tweaking is done
 "		19.09.2007 NO still some mapleader problems
-"		31.01.2017 MB fix more mapleader problems
 "    Help Page: ft-ada-functions
 "------------------------------------------------------------------------------

@@ -449,7 +447,7 @@ function ada#Switch_Session (New_Session)

      if a:New_Session != v:this_session
 	 "
-	 "  We actually got a new session - otherwise there
+	 "  We actualy got a new session - otherwise there
 	 "  is nothing to do.
 	 "
 	 if strlen (v:this_session) > 0
@@ -587,11 +585,11 @@ function ada#Map_Menu (Text, Keys, Command)
 	\ " :"	  . a:Command . "<CR>"
      execute
 	\ "nnoremap <buffer>" .
-	\ " <Leader>a" . a:Keys .
+	\ escape(l:leader . "a" . a:Keys , '\') .
 	\" :" . a:Command
      execute
 	\ "inoremap <buffer>" .
-	\ " <Leader>a" . a:Keys .
+	\ escape(l:leader . "a" . a:Keys , '\') .
 	\" <C-O>:" . a:Command
   endif
   return
@@ -1,184 +0,0 @@
-" Language:           ConTeXt typesetting engine
-" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
-" Latest Revision:    2016 Oct 21
-
-let s:keepcpo= &cpo
-set cpo&vim
-
-" Helper functions {{{
-function! s:context_echo(message, mode)
-  redraw
-  echo "\r"
-  execute 'echohl' a:mode
-  echomsg '[ConTeXt]' a:message
-  echohl None
-endf
-
-function! s:sh()
-  return has('win32') || has('win64') || has('win16') || has('win95')
-        \ ? ['cmd.exe', '/C']
-        \ : ['/bin/sh', '-c']
-endfunction
-
-" For backward compatibility
-if exists('*win_getid')
-
-  function! s:win_getid()
-    return win_getid()
-  endf
-
-  function! s:win_id2win(winid)
-    return win_id2win(a:winid)
-  endf
-
-else
-
-  function! s:win_getid()
-    return winnr()
-  endf
-
-  function! s:win_id2win(winnr)
-    return a:winnr
-  endf
-
-endif
-" }}}
-
-" ConTeXt jobs {{{
-if has('job')
-
-  let g:context_jobs = []
-
-  " Print the status of ConTeXt jobs
-  function! context#job_status()
-    let l:jobs = filter(g:context_jobs, 'job_status(v:val) == "run"')
-    let l:n = len(l:jobs)
-    call s:context_echo(
-          \ 'There '.(l:n == 1 ? 'is' : 'are').' '.(l:n == 0 ? 'no' : l:n)
-          \ .' job'.(l:n == 1 ? '' : 's').' running'
-          \ .(l:n == 0 ? '.' : ' (' . join(l:jobs, ', ').').'),
-          \ 'ModeMsg')
-  endfunction
-
-  " Stop all ConTeXt jobs
-  function! context#stop_jobs()
-    let l:jobs = filter(g:context_jobs, 'job_status(v:val) == "run"')
-    for job in l:jobs
-      call job_stop(job)
-    endfor
-    sleep 1
-    let l:tmp = []
-    for job in l:jobs
-      if job_status(job) == "run"
-        call add(l:tmp, job)
-      endif
-    endfor
-    let g:context_jobs = l:tmp
-    if empty(g:context_jobs)
-      call s:context_echo('Done. No jobs running.', 'ModeMsg')
-    else
-      call s:context_echo('There are still some jobs running. Please try again.', 'WarningMsg')
-    endif
-  endfunction
-
-  function! context#callback(path, job, status)
-    if index(g:context_jobs, a:job) != -1 && job_status(a:job) != 'run' " just in case
-      call remove(g:context_jobs, index(g:context_jobs, a:job))
-    endif
-    call s:callback(a:path, a:job, a:status)
-  endfunction
-
-  function! context#close_cb(channel)
-    call job_status(ch_getjob(a:channel)) " Trigger exit_cb's callback for faster feedback
-  endfunction
-
-  function! s:typeset(path)
-    call add(g:context_jobs,
-          \ job_start(add(s:sh(), context#command() . ' ' . shellescape(fnamemodify(a:path, ":t"))), {
-          \   'close_cb' : 'context#close_cb',
-          \   'exit_cb'  : function(get(b:, 'context_callback', get(g:, 'context_callback', 'context#callback')),
-          \                         [a:path]),
-          \   'in_io'    : 'null'
-          \ }))
-  endfunction
-
-else " No jobs
-
-  function! context#job_status()
-    call s:context_echo('Not implemented', 'WarningMsg')
-  endfunction!
-
-  function! context#stop_jobs()
-    call s:context_echo('Not implemented', 'WarningMsg')
-  endfunction
-
-  function! context#callback(path, job, status)
-    call s:callback(a:path, a:job, a:status)
-  endfunction
-
-  function! s:typeset(path)
-    execute '!' . context#command() . ' ' . shellescape(fnamemodify(a:path, ":t"))
-    call call(get(b:, 'context_callback', get(g:, 'context_callback', 'context#callback')),
-          \ [a:path, 0, v:shell_error])
-  endfunction
-
-endif " has('job')
-
-function! s:callback(path, job, status) abort
-  if a:status < 0 " Assume the job was terminated
-    return
-  endif
-  " Get info about the current window
-  let l:winid = s:win_getid()             " Save window id
-  let l:efm = &l:errorformat              " Save local errorformat
-  let l:cwd = fnamemodify(getcwd(), ":p") " Save local working directory
-  " Set errorformat to parse ConTeXt errors
-  execute 'setl efm=' . escape(b:context_errorformat, ' ')
-  try " Set cwd to expand error file correctly
-    execute 'lcd' fnameescape(fnamemodify(a:path, ':h'))
-  catch /.*/
-    execute 'setl efm=' . escape(l:efm, ' ')
-    throw v:exception
-  endtry
-  try
-    execute 'cgetfile' fnameescape(fnamemodify(a:path, ':r') . '.log')
-    botright cwindow
-  finally " Restore cwd and errorformat
-    execute s:win_id2win(l:winid) . 'wincmd w'
-    execute 'lcd ' . fnameescape(l:cwd)
-    execute 'setl efm=' . escape(l:efm, ' ')
-  endtry
-  if a:status == 0
-    call s:context_echo('Success!', 'ModeMsg')
-  else
-    call s:context_echo('There are errors. ', 'ErrorMsg')
-  endif
-endfunction
-
-function! context#command()
-  return get(b:, 'context_mtxrun', get(g:, 'context_mtxrun', 'mtxrun'))
-        \ . ' --script context --autogenerate --nonstopmode'
-        \ . ' --synctex=' . (get(b:, 'context_synctex', get(g:, 'context_synctex', 0)) ? '1' : '0')
-        \ . ' ' . get(b:, 'context_extra_options', get(g:, 'context_extra_options', ''))
-endfunction
-
-" Accepts an optional path (useful for big projects, when the file you are
-" editing is not the project's root document). If no argument is given, uses
-" the path of the current buffer.
-function! context#typeset(...) abort
-  let l:path = fnamemodify(strlen(a:000[0]) > 0 ? a:1 : expand("%"), ":p")
-  let l:cwd = fnamemodify(getcwd(), ":p") " Save local working directory
-  call s:context_echo('Typesetting...',  'ModeMsg')
-  execute 'lcd' fnameescape(fnamemodify(l:path, ":h"))
-  try
-    call s:typeset(l:path)
-  finally " Restore local working directory
-    execute 'lcd ' . fnameescape(l:cwd)
-  endtry
-endfunction!
-"}}}
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
-
-" vim: sw=2 fdm=marker
@@ -1,25 +0,0 @@
-" Language:           ConTeXt typesetting engine
-" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
-" Latest Revision:    2016 Oct 15
-
-let s:keepcpo= &cpo
-set cpo&vim
-
-" Complete keywords in MetaPost blocks
-function! contextcomplete#Complete(findstart, base)
-  if a:findstart == 1
-    if len(synstack(line('.'), 1)) > 0 &&
-          \ synIDattr(synstack(line('.'), 1)[0], "name") ==# 'contextMPGraphic'
-      return syntaxcomplete#Complete(a:findstart, a:base)
-    else
-      return -3
-    endif
-  else
-    return syntaxcomplete#Complete(a:findstart, a:base)
-  endif
-endfunction
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
-
-" vim: sw=2 fdm=marker
@@ -4,7 +4,7 @@
 "           plus CSS Speech Module <http://www.w3.org/TR/css3-speech/>
 " Maintainer: Kao, Wei-Ko(othree) ( othree AT gmail DOT com )
 " Original Author: Mikolaj Machowski ( mikmach AT wp DOT pl )
-" Last Change: 2018 Jul 02
+" Last Change: 2016 Jan 11

 let s:values = split("all additive-symbols align-content align-items align-self animation animation-delay animation-direction animation-duration animation-fill-mode animation-iteration-count animation-name animation-play-state animation-timing-function backface-visibility background background-attachment background-blend-mode background-clip background-color background-image background-origin background-position background-repeat background-size block-size border border-block-end border-block-end-color border-block-end-style border-block-end-width border-block-start border-block-start-color border-block-start-style border-block-start-width border-bottom border-bottom-color border-bottom-left-radius border-bottom-right-radius border-bottom-style border-bottom-width border-collapse border-color border-image border-image-outset border-image-repeat border-image-slice border-image-source border-image-width border-inline-end border-inline-end-color border-inline-end-style border-inline-end-width border-inline-start border-inline-start-color border-inline-start-style border-inline-start-width border-left border-left-color border-left-style border-left-width border-radius border-right border-right-color border-right-style border-right-width border-spacing border-style border-top border-top-color border-top-left-radius border-top-right-radius border-top-style border-top-width border-width bottom box-decoration-break box-shadow box-sizing break-after break-before break-inside caption-side clear clip clip-path color columns column-count column-fill column-gap column-rule column-rule-color column-rule-style column-rule-width column-span column-width content counter-increment counter-reset cue cue-before cue-after cursor direction display empty-cells fallback filter flex flex-basis flex-direction flex-flow flex-grow flex-shrink flex-wrap float font font-family font-feature-settings font-kerning font-language-override font-size font-size-adjust font-stretch font-style font-synthesis font-variant font-variant-alternates font-variant-caps font-variant-east-asian font-variant-ligatures font-variant-numeric font-variant-position font-weight grid grid-area grid-auto-columns grid-auto-flow grid-auto-position grid-auto-rows grid-column grid-column-start grid-column-end grid-row grid-row-start grid-row-end grid-template grid-template-areas grid-template-rows grid-template-columns height hyphens image-rendering image-resolution image-orientation ime-mode inline-size isolation justify-content left letter-spacing line-break line-height list-style list-style-image list-style-position list-style-type margin margin-block-end margin-block-start margin-bottom margin-inline-end margin-inline-start margin-left margin-right margin-top marks mask mask-type max-block-size max-height max-inline-size max-width max-zoom min-block-size min-height min-inline-size min-width min-zoom mix-blend-mode negative object-fit object-position offset-block-end offset-block-start offset-inline-end offset-inline-start opacity order orientation orphans outline outline-color outline-offset outline-style outline-width overflow overflow-wrap overflow-x overflow-y pad padding padding-block-end padding-block-start padding-bottom padding-inline-end padding-inline-start padding-left padding-right padding-top page-break-after page-break-before page-break-inside pause-before pause-after pause perspective perspective-origin pointer-events position prefix quotes range resize rest rest-before rest-after right ruby-align ruby-merge ruby-position scroll-behavior scroll-snap-coordinate scroll-snap-destination scroll-snap-points-x scroll-snap-points-y scroll-snap-type scroll-snap-type-x scroll-snap-type-y shape-image-threshold shape-margin shape-outside speak speak-as suffix symbols system table-layout tab-size text-align text-align-last text-combine-upright text-decoration text-decoration-color text-decoration-line text-emphasis text-emphasis-color text-emphasis-position text-emphasis-style text-indent text-orientation text-overflow text-rendering text-shadow text-transform text-underline-position top touch-action transform transform-box transform-origin transform-style transition transition-delay transition-duration transition-property transition-timing-function unicode-bidi unicode-range user-zoom vertical-align visibility voice-balance voice-duration voice-family voice-pitch voice-rate voice-range voice-stress voice-volume white-space widows width will-change word-break word-spacing word-wrap writing-mode z-index zoom")

@@ -19,6 +19,7 @@ function! csscomplete#CompleteCSS(findstart, base)
    while start >= 0 && line[start - 1] =~ '\%(\k\|-\)'
      let start -= 1
    endwhile
+    let b:after = line[compl_begin :]
    let b:compl_context = line[0:compl_begin]
    return start
  endif
@@ -36,14 +37,11 @@ function! csscomplete#CompleteCSS(findstart, base)
  " 5. if @ complete at-rule
  " 6. if ! complete important
  if exists("b:compl_context")
-    let line = getline('.')
-    let compl_begin = col('.') - 2
-    let after = line[compl_begin:]
    let line = b:compl_context
+    let after = b:after
    unlet! b:compl_context
  else
    let line = a:base
-    let after = ''
  endif

  let res = []
@@ -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
@@ -1,6 +1,6 @@
 " Vim autoload file for editing compressed files.
 " Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2016 Sep 28
+" Last Change: 2014 Nov 05

 " These functions are used by the gzip plugin.

@@ -63,9 +63,6 @@ fun gzip#read(cmd)
  " set 'modifiable'
  let ma_save = &ma
  setlocal ma
-  " set 'write'
-  let write_save = &write
-  set write
  " Reset 'foldenable', otherwise line numbers get adjusted.
  if has("folding")
    let fen_save = &fen
@@ -130,7 +127,6 @@ fun gzip#read(cmd)
  let &pm = pm_save
  let &cpo = cpo_save
  let &l:ma = ma_save
-  let &write = write_save
  if has("folding")
    let &l:fen = fen_save
  endif
@@ -1,7 +1,7 @@
 " Vim completion script
 " Language:	Java Script
 " Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
-" Last Change:	2017 Mar 04
+" Last Change:	2006 Apr 30

 function! javascriptcomplete#CompleteJS(findstart, base)
  if a:findstart
@@ -563,7 +563,7 @@ function! javascriptcomplete#CompleteJS(findstart, base)
 	for i in arguments
 		let g:ia = i
 		let f_elements = matchlist(i, 'function\s\+\(\k\+\)\s*(\(.\{-}\))')
-		if len(f_elements) >= 3
+		if len(f_elements) == 3
 			let b:js_menuinfo[f_elements[1].'('] = f_elements[2]
 		endif
 	endfor
@@ -1,6 +1,6 @@
 " Vim support file to help with paste mappings and menus
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2017 Aug 30
+" Last Change:	2006 Jun 23

 " Define the string to use for items that are present both in Edit, Popup and
 " Toolbar menu.  Also used in mswin.vim and macmap.vim.
@@ -12,7 +12,7 @@
 if has("virtualedit")
  let paste#paste_cmd = {'n': ":call paste#Paste()<CR>"}
  let paste#paste_cmd['v'] = '"-c<Esc>' . paste#paste_cmd['n']
-  let paste#paste_cmd['i'] = "\<c-\>\<c-o>\"+gP"
+  let paste#paste_cmd['i'] = 'x<BS><Esc>' . paste#paste_cmd['n'] . 'gi'

  func! paste#Paste()
    let ove = &ve
@@ -3,7 +3,7 @@
 " Maintainer:	Dávid Szabó ( complex857 AT gmail DOT com )
 " Previous Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
 " URL: https://github.com/shawncplus/phpcomplete.vim
-" Last Change:  2016 Oct 10
+" Last Change:  2015 Jul 13
 "
 "	OPTIONS:
 "
@@ -195,8 +195,6 @@ function! phpcomplete#CompletePHP(findstart, base) " {{{
 			" }}}
 		elseif context =~? 'implements'
 			return phpcomplete#CompleteClassName(a:base, ['i'], current_namespace, imports)
-		elseif context =~? 'instanceof'
-			return phpcomplete#CompleteClassName(a:base, ['c', 'n'], current_namespace, imports)
 		elseif context =~? 'extends\s\+.\+$' && a:base == ''
 			return ['implements']
 		elseif context =~? 'extends'
@@ -789,8 +787,6 @@ function! phpcomplete#CompleteClassName(base, kinds, current_namespace, imports)

 	if kinds == ['c', 'i']
 		let filterstr = 'v:val =~? "\\(class\\|interface\\)\\s\\+[a-zA-Z_\\x7f-\\xff][a-zA-Z_0-9\\x7f-\\xff]*\\s*"'
-	elseif kinds == ['c', 'n']
-		let filterstr = 'v:val =~? "\\(class\\|namespace\\)\\s\\+[a-zA-Z_\\x7f-\\xff][a-zA-Z_0-9\\x7f-\\xff]*\\s*"'
 	elseif kinds == ['c']
 		let filterstr = 'v:val =~? "class\\s\\+[a-zA-Z_\\x7f-\\xff][a-zA-Z_0-9\\x7f-\\xff]*\\s*"'
 	elseif kinds == ['i']
@@ -1000,7 +996,7 @@ function! phpcomplete#CompleteUserClass(context, base, sccontent, visibility) "
 		let required_modifiers += ['static']
 	endif
 	let all_variable = filter(deepcopy(a:sccontent),
-					\ 'v:val =~ "\\(^\\s*\\(var\\s\\+\\|public\\s\\+\\|protected\\s\\+\\|private\\s\\+\\|final\\s\\+\\|abstract\\s\\+\\|static\\s\\+\\)\\+\\$\\|^\\s*\\(\\/\\|\\*\\)*\\s*@property\\s\\+\\S\\+\\s\\S\\{-}\\s*$\\)"')
+					\ 'v:val =~ "^\\s*\\(var\\s\\+\\|public\\s\\+\\|protected\\s\\+\\|private\\s\\+\\|final\\s\\+\\|abstract\\s\\+\\|static\\s\\+\\)\\+\\$"')

 	let variables = []
 	for i in all_variable
@@ -1164,14 +1160,6 @@ function! phpcomplete#GetTaglist(pattern) " {{{
 	endif

 	let tags = taglist(a:pattern)
-	for tag in tags
-		for prop in keys(tag)
-			if prop == 'cmd' || prop == 'static' || prop == 'kind' || prop == 'builtin'
-				continue
-			endif
-			let tag[prop] = substitute(tag[prop], '\\\\', '\\', 'g')
-		endfor
-	endfor
 	let s:cache_tags[a:pattern] = tags
 	let has_key = has_key(s:cache_tags, a:pattern)
 	let s:cache_tags_checksum = cache_checksum
@@ -1391,7 +1379,7 @@ function! phpcomplete#GetCallChainReturnType(classname_candidate, class_candidat
 			" Get Structured information of all classes and subclasses including namespace and includes
 			" try to find the method's return type in docblock comment
 			for classstructure in classcontents
-				let docblock_target_pattern = 'function\s\+&\?'.method.'\>\|\(public\|private\|protected\|var\).\+\$'.method.'\>\|@property.\+\$'.method.'\>'
+				let docblock_target_pattern = 'function\s\+&\?'.method.'\|\(public\|private\|protected\|var\).\+\$'.method
 				let doc_str = phpcomplete#GetDocBlock(split(classstructure.content, '\n'), docblock_target_pattern)
 				if doc_str != ''
 					break
@@ -1399,17 +1387,8 @@ function! phpcomplete#GetCallChainReturnType(classname_candidate, class_candidat
 			endfor
 			if doc_str != ''
 				let docblock = phpcomplete#ParseDocBlock(doc_str)
-				if has_key(docblock.return, 'type') || has_key(docblock.var, 'type') || len(docblock.properties) > 0
-					let type = has_key(docblock.return, 'type') ? docblock.return.type : has_key(docblock.var, 'type') ? docblock.var.type : ''
-
-					if type == ''
-						for property in docblock.properties
-							if property.description =~? method
-								let type = property.type
-								break
-							endif
-						endfor
-					endif
+				if has_key(docblock.return, 'type') || has_key(docblock.var, 'type')
+					let type = has_key(docblock.return, 'type') ? docblock.return.type : docblock.var.type

 					" there's a namespace in the type, threat the type as FQCN
 					if type =~ '\\'
@@ -1575,9 +1554,6 @@ function! phpcomplete#GetClassName(start_line, context, current_namespace, impor
 	elseif get(methodstack, 0) =~# function_invocation_pattern
 		let function_name = matchstr(methodstack[0], '^\s*\zs'.function_name_pattern)
 		let function_file = phpcomplete#GetFunctionLocation(function_name, a:current_namespace)
-		if function_file == ''
-			let function_file = phpcomplete#GetFunctionLocation(function_name, '\')
-		endif

 		if function_file == 'VIMPHP_BUILTINFUNCTION'
 			" built in function, grab the return type from the info string
@@ -1593,7 +1569,7 @@ function! phpcomplete#GetClassName(start_line, context, current_namespace, impor
 				let [class_candidate_namespace, function_imports] = phpcomplete#GetCurrentNameSpace(file_lines)
 				" try to expand the classname of the returned type with the context got from the function's source file

-				let [classname_candidate, class_candidate_namespace] = phpcomplete#ExpandClassName(classname_candidate, class_candidate_namespace, function_imports)
+				let [classname_candidate, unused] = phpcomplete#ExpandClassName(classname_candidate, class_candidate_namespace, function_imports)
 			endif
 		endif
 		if classname_candidate != ''
@@ -1674,10 +1650,9 @@ function! phpcomplete#GetClassName(start_line, context, current_namespace, impor
 					let sub_methodstack = phpcomplete#GetMethodStack(matchstr(line, '^\s*'.object.'\s*=&\?\s*\s\+\zs.*'))
 					let [classname_candidate, class_candidate_namespace] = phpcomplete#GetCallChainReturnType(
 						\ classname,
-						\ namespace_for_class,
+						\ a:current_namespace,
 						\ a:imports,
 						\ sub_methodstack)
-
 					return (class_candidate_namespace == '\' || class_candidate_namespace == '') ? classname_candidate : class_candidate_namespace.'\'.classname_candidate
 				endif
 			endif
@@ -1808,9 +1783,6 @@ function! phpcomplete#GetClassName(start_line, context, current_namespace, impor
 				let [function_name, function_namespace] = phpcomplete#ExpandClassName(function_name, a:current_namespace, a:imports)

 				let function_file = phpcomplete#GetFunctionLocation(function_name, function_namespace)
-				if function_file == ''
-					let function_file = phpcomplete#GetFunctionLocation(function_name, '\')
-				endif

 				if function_file == 'VIMPHP_BUILTINFUNCTION'
 					" built in function, grab the return type from the info string
@@ -1826,7 +1798,7 @@ function! phpcomplete#GetClassName(start_line, context, current_namespace, impor
 						let classname_candidate = docblock.return.type
 						let [class_candidate_namespace, function_imports] = phpcomplete#GetCurrentNameSpace(file_lines)
 						" try to expand the classname of the returned type with the context got from the function's source file
-						let [classname_candidate, class_candidate_namespace] = phpcomplete#ExpandClassName(classname_candidate, class_candidate_namespace, function_imports)
+						let [classname_candidate, unused] = phpcomplete#ExpandClassName(classname_candidate, class_candidate_namespace, function_imports)
 						break
 					endif
 				endif
@@ -1889,8 +1861,6 @@ function! phpcomplete#GetClassName(start_line, context, current_namespace, impor
 				for tag in tags
 					if tag.kind ==? 'v' && tag.cmd =~? '=\s*new\s\+\zs'.class_name_pattern.'\ze'
 						let classname = matchstr(tag.cmd, '=\s*new\s\+\zs'.class_name_pattern.'\ze')
-						" unescape the classname, it would have "\" doubled since it is an ex command
-						let classname = substitute(classname, '\\\(\_.\)', '\1', 'g')
 						return classname
 					endif
 				endfor
@@ -2107,19 +2077,6 @@ function! phpcomplete#GetClassContentsStructure(file_path, file_lines, class_nam
 	endif
 	call searchpair('{', '', '}', 'W')
 	let class_closing_bracket_line = line('.')
-
-	" Include class docblock
-	let doc_line = cfline - 1
-	if getline(doc_line) =~? '^\s*\*/'
-		while doc_line != 0
-			if getline(doc_line) =~? '^\s*/\*\*'
-				let cfline = doc_line
-				break
-			endif
-			let doc_line -= 1
-		endwhile
-	endif
-
 	let classcontent = join(getline(cfline, class_closing_bracket_line), "\n")

 	let used_traits = []
@@ -2284,19 +2241,8 @@ function! phpcomplete#GetDocBlock(sccontent, search) " {{{
 		let line = a:sccontent[i]
 		" search for a function declaration
 		if line =~? a:search
-			if line =~? '@property'
-				let doc_line = i
-				while doc_line != sccontent_len - 1
-					if a:sccontent[doc_line] =~? '^\s*\*/'
-						let l = doc_line
-						break
-					endif
-					let doc_line += 1
-				endwhile
-			else
-				let l = i - 1
-			endif
-			" start backward search for the comment block
+			let l = i - 1
+			" start backward serch for the comment block
 			while l != 0
 				let line = a:sccontent[l]
 				" if it's a one line docblock like comment and we can just return it right away
@@ -2317,7 +2263,7 @@ function! phpcomplete#GetDocBlock(sccontent, search) " {{{
 				return ''
 			end

-			while l >= 0
+			while l != 0
 				let line = a:sccontent[l]
 				if line =~? '^\s*/\*\*'
 					let comment_start = l
@@ -2351,10 +2297,9 @@ function! phpcomplete#ParseDocBlock(docblock) " {{{
 		\ 'return': {},
 		\ 'throws': [],
 		\ 'var': {},
-		\ 'properties': [],
 		\ }

-	let res.description = substitute(matchstr(a:docblock, '\zs\_.\{-}\ze\(@type\|@var\|@param\|@return\|$\)'), '\(^\_s*\|\_s*$\)', '', 'g')
+	let res.description = substitute(matchstr(a:docblock, '\zs\_.\{-}\ze\(@var\|@param\|@return\|$\)'), '\(^\_s*\|\_s*$\)', '', 'g')
 	let docblock_lines = split(a:docblock, "\n")

 	let param_lines = filter(copy(docblock_lines), 'v:val =~? "^@param"')
@@ -2389,26 +2334,15 @@ function! phpcomplete#ParseDocBlock(docblock) " {{{
 		endif
 	endfor

-	let var_line = filter(copy(docblock_lines), 'v:val =~? "^\\(@var\\|@type\\)"')
+	let var_line = filter(copy(docblock_lines), 'v:val =~? "^@var"')
 	if len(var_line) > 0
-		let var_parts = matchlist(var_line[0], '\(@var\|@type\)\s\+\(\S\+\)\s*\(.*\)')
+		let var_parts = matchlist(var_line[0], '@var\s\+\(\S\+\)\s*\(.*\)')
 		let res['var'] = {
 					\ 'line': var_parts[0],
-					\ 'type': phpcomplete#GetTypeFromDocBlockParam(get(var_parts, 2, '')),
-					\ 'description': get(var_parts, 3, '')}
+					\ 'type': phpcomplete#GetTypeFromDocBlockParam(get(var_parts, 1, '')),
+					\ 'description': get(var_parts, 2, '')}
 	endif

-	let property_lines = filter(copy(docblock_lines), 'v:val =~? "^@property"')
-	for property_line in property_lines
-		let parts = matchlist(property_line, '\(@property\)\s\+\(\S\+\)\s*\(.*\)')
-		if len(parts) > 0
-			call add(res.properties, {
-						\ 'line': parts[0],
-						\ 'type': phpcomplete#GetTypeFromDocBlockParam(get(parts, 2, '')),
-						\ 'description': get(parts, 3, '')})
-		endif
-	endfor
-
 	return res
 endfunction
 " }}}
@@ -2564,7 +2498,6 @@ function! phpcomplete#GetCurrentNameSpace(file_lines) " {{{
 						let	name = matchstr(name, '\\\zs[^\\]\+\ze$')
 					endif
 				endif
-
 				" leading slash is not required use imports are always absolute
 				let imports[name] = {'name': object, 'kind': ''}
 			endfor
@@ -2600,7 +2533,6 @@ function! phpcomplete#GetCurrentNameSpace(file_lines) " {{{
 								elseif !exists('no_namespace_candidate')
 									" save the first namespacless match to be used if no better
 									" candidate found later on
-									let tag.namespace = namespace_for_classes
 									let no_namespace_candidate = tag
 								endif
 							endif
@@ -196,7 +196,7 @@ function! rubycomplete#Complete(findstart, base)
            if c =~ '\w'
                continue
            elseif ! c =~ '\.'
-                let idx = -1
+                idx = -1
                break
            else
                break
@@ -1,415 +0,0 @@
-" Author: Kevin Ballard
-" Description: Helper functions for Rust commands/mappings
-" Last Modified: May 27, 2014
-" For bugs, patches and license go to https://github.com/rust-lang/rust.vim
-
-" Jump {{{1
-
-function! rust#Jump(mode, function) range
-	let cnt = v:count1
-	normal! m'
-	if a:mode ==# 'v'
-		norm! gv
-	endif
-	let foldenable = &foldenable
-	set nofoldenable
-	while cnt > 0
-		execute "call <SID>Jump_" . a:function . "()"
-		let cnt = cnt - 1
-	endwhile
-	let &foldenable = foldenable
-endfunction
-
-function! s:Jump_Back()
-	call search('{', 'b')
-	keepjumps normal! w99[{
-endfunction
-
-function! s:Jump_Forward()
-	normal! j0
-	call search('{', 'b')
-	keepjumps normal! w99[{%
-	call search('{')
-endfunction
-
-" Run {{{1
-
-function! rust#Run(bang, args)
-	let args = s:ShellTokenize(a:args)
-	if a:bang
-		let idx = index(l:args, '--')
-		if idx != -1
-			let rustc_args = idx == 0 ? [] : l:args[:idx-1]
-			let args = l:args[idx+1:]
-		else
-			let rustc_args = l:args
-			let args = []
-		endif
-	else
-		let rustc_args = []
-	endif
-
-	let b:rust_last_rustc_args = l:rustc_args
-	let b:rust_last_args = l:args
-
-	call s:WithPath(function("s:Run"), rustc_args, args)
-endfunction
-
-function! s:Run(dict, rustc_args, args)
-	let exepath = a:dict.tmpdir.'/'.fnamemodify(a:dict.path, ':t:r')
-	if has('win32')
-		let exepath .= '.exe'
-	endif
-
-	let relpath = get(a:dict, 'tmpdir_relpath', a:dict.path)
-	let rustc_args = [relpath, '-o', exepath] + a:rustc_args
-
-	let rustc = exists("g:rustc_path") ? g:rustc_path : "rustc"
-
-	let pwd = a:dict.istemp ? a:dict.tmpdir : ''
-	let output = s:system(pwd, shellescape(rustc) . " " . join(map(rustc_args, 'shellescape(v:val)')))
-	if output != ''
-		echohl WarningMsg
-		echo output
-		echohl None
-	endif
-	if !v:shell_error
-		exe '!' . shellescape(exepath) . " " . join(map(a:args, 'shellescape(v:val)'))
-	endif
-endfunction
-
-" Expand {{{1
-
-function! rust#Expand(bang, args)
-	let args = s:ShellTokenize(a:args)
-	if a:bang && !empty(l:args)
-		let pretty = remove(l:args, 0)
-	else
-		let pretty = "expanded"
-	endif
-	call s:WithPath(function("s:Expand"), pretty, args)
-endfunction
-
-function! s:Expand(dict, pretty, args)
-	try
-		let rustc = exists("g:rustc_path") ? g:rustc_path : "rustc"
-
-		if a:pretty =~? '^\%(everybody_loops$\|flowgraph=\)'
-			let flag = '--xpretty'
-		else
-			let flag = '--pretty'
-		endif
-		let relpath = get(a:dict, 'tmpdir_relpath', a:dict.path)
-		let args = [relpath, '-Z', 'unstable-options', l:flag, a:pretty] + a:args
-		let pwd = a:dict.istemp ? a:dict.tmpdir : ''
-		let output = s:system(pwd, shellescape(rustc) . " " . join(map(args, 'shellescape(v:val)')))
-		if v:shell_error
-			echohl WarningMsg
-			echo output
-			echohl None
-		else
-			new
-			silent put =output
-			1
-			d
-			setl filetype=rust
-			setl buftype=nofile
-			setl bufhidden=hide
-			setl noswapfile
-			" give the buffer a nice name
-			let suffix = 1
-			let basename = fnamemodify(a:dict.path, ':t:r')
-			while 1
-				let bufname = basename
-				if suffix > 1 | let bufname .= ' ('.suffix.')' | endif
-				let bufname .= '.pretty.rs'
-				if bufexists(bufname)
-					let suffix += 1
-					continue
-				endif
-				exe 'silent noautocmd keepalt file' fnameescape(bufname)
-				break
-			endwhile
-		endif
-	endtry
-endfunction
-
-function! rust#CompleteExpand(lead, line, pos)
-	if a:line[: a:pos-1] =~ '^RustExpand!\s*\S*$'
-		" first argument and it has a !
-		let list = ["normal", "expanded", "typed", "expanded,identified", "flowgraph=", "everybody_loops"]
-		if !empty(a:lead)
-			call filter(list, "v:val[:len(a:lead)-1] == a:lead")
-		endif
-		return list
-	endif
-
-	return glob(escape(a:lead, "*?[") . '*', 0, 1)
-endfunction
-
-" Emit {{{1
-
-function! rust#Emit(type, args)
-	let args = s:ShellTokenize(a:args)
-	call s:WithPath(function("s:Emit"), a:type, args)
-endfunction
-
-function! s:Emit(dict, type, args)
-	try
-		let output_path = a:dict.tmpdir.'/output'
-
-		let rustc = exists("g:rustc_path") ? g:rustc_path : "rustc"
-
-		let relpath = get(a:dict, 'tmpdir_relpath', a:dict.path)
-		let args = [relpath, '--emit', a:type, '-o', output_path] + a:args
-		let pwd = a:dict.istemp ? a:dict.tmpdir : ''
-		let output = s:system(pwd, shellescape(rustc) . " " . join(map(args, 'shellescape(v:val)')))
-		if output != ''
-			echohl WarningMsg
-			echo output
-			echohl None
-		endif
-		if !v:shell_error
-			new
-			exe 'silent keepalt read' fnameescape(output_path)
-			1
-			d
-			if a:type == "llvm-ir"
-				setl filetype=llvm
-				let extension = 'll'
-			elseif a:type == "asm"
-				setl filetype=asm
-				let extension = 's'
-			endif
-			setl buftype=nofile
-			setl bufhidden=hide
-			setl noswapfile
-			if exists('l:extension')
-				" give the buffer a nice name
-				let suffix = 1
-				let basename = fnamemodify(a:dict.path, ':t:r')
-				while 1
-					let bufname = basename
-					if suffix > 1 | let bufname .= ' ('.suffix.')' | endif
-					let bufname .= '.'.extension
-					if bufexists(bufname)
-						let suffix += 1
-						continue
-					endif
-					exe 'silent noautocmd keepalt file' fnameescape(bufname)
-					break
-				endwhile
-			endif
-		endif
-	endtry
-endfunction
-
-" Utility functions {{{1
-
-" Invokes func(dict, ...)
-" Where {dict} is a dictionary with the following keys:
-"   'path' - The path to the file
-"   'tmpdir' - The path to a temporary directory that will be deleted when the
-"              function returns.
-"   'istemp' - 1 if the path is a file inside of {dict.tmpdir} or 0 otherwise.
-" If {istemp} is 1 then an additional key is provided:
-"   'tmpdir_relpath' - The {path} relative to the {tmpdir}.
-"
-" {dict.path} may be a path to a file inside of {dict.tmpdir} or it may be the
-" existing path of the current buffer. If the path is inside of {dict.tmpdir}
-" then it is guaranteed to have a '.rs' extension.
-function! s:WithPath(func, ...)
-	let buf = bufnr('')
-	let saved = {}
-	let dict = {}
-	try
-		let saved.write = &write
-		set write
-		let dict.path = expand('%')
-		let pathisempty = empty(dict.path)
-
-		" Always create a tmpdir in case the wrapped command wants it
-		let dict.tmpdir = tempname()
-		call mkdir(dict.tmpdir)
-
-		if pathisempty || !saved.write
-			let dict.istemp = 1
-			" if we're doing this because of nowrite, preserve the filename
-			if !pathisempty
-				let filename = expand('%:t:r').".rs"
-			else
-				let filename = 'unnamed.rs'
-			endif
-			let dict.tmpdir_relpath = filename
-			let dict.path = dict.tmpdir.'/'.filename
-
-			let saved.mod = &mod
-			set nomod
-
-			silent exe 'keepalt write! ' . fnameescape(dict.path)
-			if pathisempty
-				silent keepalt 0file
-			endif
-		else
-			let dict.istemp = 0
-			update
-		endif
-
-		call call(a:func, [dict] + a:000)
-	finally
-		if bufexists(buf)
-			for [opt, value] in items(saved)
-				silent call setbufvar(buf, '&'.opt, value)
-				unlet value " avoid variable type mismatches
-			endfor
-		endif
-		if has_key(dict, 'tmpdir') | silent call s:RmDir(dict.tmpdir) | endif
-	endtry
-endfunction
-
-function! rust#AppendCmdLine(text)
-	call setcmdpos(getcmdpos())
-	let cmd = getcmdline() . a:text
-	return cmd
-endfunction
-
-" Tokenize the string according to sh parsing rules
-function! s:ShellTokenize(text)
-	" states:
-	" 0: start of word
-	" 1: unquoted
-	" 2: unquoted backslash
-	" 3: double-quote
-	" 4: double-quoted backslash
-	" 5: single-quote
-	let l:state = 0
-	let l:current = ''
-	let l:args = []
-	for c in split(a:text, '\zs')
-		if l:state == 0 || l:state == 1 " unquoted
-			if l:c ==# ' '
-				if l:state == 0 | continue | endif
-				call add(l:args, l:current)
-				let l:current = ''
-				let l:state = 0
-			elseif l:c ==# '\'
-				let l:state = 2
-			elseif l:c ==# '"'
-				let l:state = 3
-			elseif l:c ==# "'"
-				let l:state = 5
-			else
-				let l:current .= l:c
-				let l:state = 1
-			endif
-		elseif l:state == 2 " unquoted backslash
-			if l:c !=# "\n" " can it even be \n?
-				let l:current .= l:c
-			endif
-			let l:state = 1
-		elseif l:state == 3 " double-quote
-			if l:c ==# '\'
-				let l:state = 4
-			elseif l:c ==# '"'
-				let l:state = 1
-			else
-				let l:current .= l:c
-			endif
-		elseif l:state == 4 " double-quoted backslash
-			if stridx('$`"\', l:c) >= 0
-				let l:current .= l:c
-			elseif l:c ==# "\n" " is this even possible?
-				" skip it
-			else
-				let l:current .= '\'.l:c
-			endif
-			let l:state = 3
-		elseif l:state == 5 " single-quoted
-			if l:c == "'"
-				let l:state = 1
-			else
-				let l:current .= l:c
-			endif
-		endif
-	endfor
-	if l:state != 0
-		call add(l:args, l:current)
-	endif
-	return l:args
-endfunction
-
-function! s:RmDir(path)
-	" sanity check; make sure it's not empty, /, or $HOME
-	if empty(a:path)
-		echoerr 'Attempted to delete empty path'
-		return 0
-	elseif a:path == '/' || a:path == $HOME
-		echoerr 'Attempted to delete protected path: ' . a:path
-		return 0
-	endif
-	return system("rm -rf " . shellescape(a:path))
-endfunction
-
-" Executes {cmd} with the cwd set to {pwd}, without changing Vim's cwd.
-" If {pwd} is the empty string then it doesn't change the cwd.
-function! s:system(pwd, cmd)
-	let cmd = a:cmd
-	if !empty(a:pwd)
-		let cmd = 'cd ' . shellescape(a:pwd) . ' && ' . cmd
-	endif
-	return system(cmd)
-endfunction
-
-" Playpen Support {{{1
-" Parts of gist.vim by Yasuhiro Matsumoto <mattn.jp@gmail.com> reused
-" gist.vim available under the BSD license, available at
-" http://github.com/mattn/gist-vim
-function! s:has_webapi()
-    if !exists("*webapi#http#post")
-	try
-	    call webapi#http#post()
-	catch
-	endtry
-    endif
-    return exists("*webapi#http#post")
-endfunction
-
-function! rust#Play(count, line1, line2, ...) abort
-    redraw
-
-    let l:rust_playpen_url = get(g:, 'rust_playpen_url', 'https://play.rust-lang.org/')
-    let l:rust_shortener_url = get(g:, 'rust_shortener_url', 'https://is.gd/')
-
-    if !s:has_webapi()
-	echohl ErrorMsg | echomsg ':RustPlay depends on webapi.vim (https://github.com/mattn/webapi-vim)' | echohl None
-	return
-    endif
-
-    let bufname = bufname('%')
-    if a:count < 1
-	let content = join(getline(a:line1, a:line2), "\n")
-    else
-	let save_regcont = @"
-	let save_regtype = getregtype('"')
-	silent! normal! gvy
-	let content = @"
-	call setreg('"', save_regcont, save_regtype)
-    endif
-
-    let body = l:rust_playpen_url."?code=".webapi#http#encodeURI(content)
-
-    if strlen(body) > 5000
-	echohl ErrorMsg | echomsg 'Buffer too large, max 5000 encoded characters ('.strlen(body).')' | echohl None
-	return
-    endif
-
-    let payload = "format=simple&url=".webapi#http#encodeURI(body)
-    let res = webapi#http#post(l:rust_shortener_url.'create.php', payload, {})
-    let url = res.content
-
-    redraw | echomsg 'Done: '.url
-endfunction
-
-" }}}1
-
-" vim: set noet sw=8 ts=8:
@@ -1,107 +0,0 @@
-" Author: Stephen Sugden <stephen@stephensugden.com>
-"
-" Adapted from https://github.com/fatih/vim-go
-" For bugs, patches and license go to https://github.com/rust-lang/rust.vim
-
-if !exists("g:rustfmt_autosave")
-	let g:rustfmt_autosave = 0
-endif
-
-if !exists("g:rustfmt_command")
-	let g:rustfmt_command = "rustfmt"
-endif
-
-if !exists("g:rustfmt_options")
-	let g:rustfmt_options = ""
-endif
-
-if !exists("g:rustfmt_fail_silently")
-	let g:rustfmt_fail_silently = 0
-endif
-
-let s:got_fmt_error = 0
-
-function! s:RustfmtCommandRange(filename, line1, line2)
-	let l:arg = {"file": shellescape(a:filename), "range": [a:line1, a:line2]}
-	return printf("%s %s --write-mode=overwrite --file-lines '[%s]'", g:rustfmt_command, g:rustfmt_options, json_encode(l:arg))
-endfunction
-
-function! s:RustfmtCommand(filename)
-	return g:rustfmt_command . " --write-mode=overwrite " . g:rustfmt_options . " " . shellescape(a:filename)
-endfunction
-
-function! s:RunRustfmt(command, curw, tmpname)
-	if exists("*systemlist")
-		let out = systemlist(a:command)
-	else
-		let out = split(system(a:command), '\r\?\n')
-	endif
-
-	if v:shell_error == 0 || v:shell_error == 3
-		" remove undo point caused via BufWritePre
-		try | silent undojoin | catch | endtry
-
-		" Replace current file with temp file, then reload buffer
-		call rename(a:tmpname, expand('%'))
-		silent edit!
-		let &syntax = &syntax
-
-		" only clear location list if it was previously filled to prevent
-		" clobbering other additions
-		if s:got_fmt_error
-			let s:got_fmt_error = 0
-			call setloclist(0, [])
-			lwindow
-		endif
-	elseif g:rustfmt_fail_silently == 0
-		" otherwise get the errors and put them in the location list
-		let errors = []
-
-		for line in out
-			" src/lib.rs:13:5: 13:10 error: expected `,`, or `}`, found `value`
-			let tokens = matchlist(line, '^\(.\{-}\):\(\d\+\):\(\d\+\):\s*\(\d\+:\d\+\s*\)\?\s*error: \(.*\)')
-			if !empty(tokens)
-				call add(errors, {"filename": @%,
-						 \"lnum":     tokens[2],
-						 \"col":      tokens[3],
-						 \"text":     tokens[5]})
-			endif
-		endfor
-
-		if empty(errors)
-			% | " Couldn't detect rustfmt error format, output errors
-		endif
-
-		if !empty(errors)
-			call setloclist(0, errors, 'r')
-			echohl Error | echomsg "rustfmt returned error" | echohl None
-		endif
-
-		let s:got_fmt_error = 1
-		lwindow
-		" We didn't use the temp file, so clean up
-		call delete(a:tmpname)
-	endif
-
-	call winrestview(a:curw)
-endfunction
-
-function! rustfmt#FormatRange(line1, line2)
-	let l:curw = winsaveview()
-	let l:tmpname = expand("%:p:h") . "/." . expand("%:p:t") . ".rustfmt"
-	call writefile(getline(1, '$'), l:tmpname)
-
-	let command = s:RustfmtCommandRange(l:tmpname, a:line1, a:line2)
-
-	call s:RunRustfmt(command, l:curw, l:tmpname)
-endfunction
-
-function! rustfmt#Format()
-	let l:curw = winsaveview()
-	let l:tmpname = expand("%:p:h") . "/." . expand("%:p:t") . ".rustfmt"
-	call writefile(getline(1, '$'), l:tmpname)
-
-	let command = s:RustfmtCommand(l:tmpname)
-
-	call s:RunRustfmt(command, l:curw, l:tmpname)
-endfunction
@@ -22,7 +22,6 @@ function! spellfile#LoadFile(lang)
    endif
    return
  endif
-  let lang = tolower(a:lang)

  " If the URL changes we try all files again.
  if s:spellfile_URL != g:spellfile_URL
@@ -31,13 +30,13 @@ function! spellfile#LoadFile(lang)
  endif

  " I will say this only once!
-  if has_key(s:donedict, lang . &enc)
+  if has_key(s:donedict, a:lang . &enc)
    if &verbose
      echomsg 'spellfile#LoadFile(): Tried this language/encoding before.'
    endif
    return
  endif
-  let s:donedict[lang . &enc] = 1
+  let s:donedict[a:lang . &enc] = 1

  " Find spell directories we can write in.
  let [dirlist, dirchoices] = spellfile#GetDirChoices()
@@ -58,14 +57,14 @@ function! spellfile#LoadFile(lang)
    endif
  endif

-  let msg = 'Cannot find spell file for "' . lang . '" in ' . &enc
+  let msg = 'Cannot find spell file for "' . a:lang . '" in ' . &enc
  let msg .= "\nDo you want me to try downloading it?"
  if confirm(msg, "&Yes\n&No", 2) == 1
    let enc = &encoding
    if enc == 'iso-8859-15'
      let enc = 'latin1'
    endif
-    let fname = lang . '.' . enc . '.spl'
+    let fname = a:lang . '.' . enc . '.spl'

    " Split the window, read the file into a new buffer.
    " Remember the buffer number, we check it below.
@@ -96,7 +95,7 @@ function! spellfile#LoadFile(lang)
 	let newbufnr = winbufnr(0)
      endif

-      let fname = lang . '.ascii.spl'
+      let fname = a:lang . '.ascii.spl'
      echo 'Could not find it, trying ' . fname . '...'
      call spellfile#Nread(fname)
      if getline(2) !~ 'VIMspell'
@@ -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,111 +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>
-" Repository:   https://github.com/chrisbra/vim-xml-ftplugin
-" License: VIM License
-" 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
@@ -41,24 +41,8 @@ this autocmd might be useful:
     autocmd SourcePre */colors/blue_sky.vim set background=dark
 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
-
-To customize a colorscheme use another name, e.g.  "~/.vim/colors/mine.vim",
-and use `:runtime` to load the original colorscheme:
-	" load the "evening" colorscheme
-	runtime colors/evening.vim
-	" change the color of statements
-	hi Statement ctermfg=Blue guifg=Blue
+In case you want to tweak a colorscheme after it was loaded, check out that
+ColorScheme autocmd event.

 To see which highlight group is used where, find the help for
 "highlight-groups" and "group-name".
@@ -73,8 +57,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,6 +1,6 @@
 " Vim color file
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2016 Oct 10
+" Last Change:	2006 Apr 14

 " This color scheme uses a dark grey background.

@@ -46,8 +46,8 @@ hi CursorColumn term=reverse ctermbg=Black guibg=grey40
 hi CursorLine term=underline cterm=underline guibg=grey40

 " Groups for syntax highlighting
-hi Constant term=underline ctermfg=Magenta guifg=#ffa0a0
-hi Special term=bold ctermfg=LightRed guifg=Orange
+hi Constant term=underline ctermfg=Magenta guifg=#ffa0a0 guibg=grey5
+hi Special term=bold ctermfg=LightRed guifg=Orange guibg=grey5
 if &t_Co > 8
  hi Statement term=bold cterm=bold ctermfg=Yellow guifg=#ffff60 gui=bold
 endif
@@ -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 specific 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
@@ -1,7 +1,7 @@
 " Vim compiler file
-" Compiler:             BDF to PCF Conversion
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2006-04-19
+" Compiler:         BDF to PCF Conversion
+" Maintainer:       Nikolai Weibull <now@bitwi.se>
+" Latest Revision:  2006-04-19

 if exists("current_compiler")
  finish
@@ -1,35 +0,0 @@
-" Vim compiler file
-" Compiler:         Cargo Compiler
-" Maintainer:       Damien Radtke <damienradtke@gmail.com>
-" Latest Revision:  2014 Sep 24
-" For bugs, patches and license go to https://github.com/rust-lang/rust.vim
-
-if exists('current_compiler')
-	finish
-endif
-runtime compiler/rustc.vim
-let current_compiler = "cargo"
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-if exists(':CompilerSet') != 2
-	command -nargs=* CompilerSet setlocal <args>
-endif
-
-if exists('g:cargo_makeprg_params')
-	execute 'CompilerSet makeprg=cargo\ '.escape(g:cargo_makeprg_params, ' \|"').'\ $*'
-else
-	CompilerSet makeprg=cargo\ $*
-endif
-
-" Ignore general cargo progress messages
-CompilerSet errorformat+=
-			\%-G%\\s%#Downloading%.%#,
-			\%-G%\\s%#Compiling%.%#,
-			\%-G%\\s%#Finished%.%#,
-			\%-G%\\s%#error:\ Could\ not\ compile\ %.%#,
-			\%-G%\\s%#To\ learn\ more\\,%.%#
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
@@ -1,54 +0,0 @@
-" Vim compiler file
-" Compiler:     ConTeXt typesetting engine
-" Maintainer:   Nicola Vitacolonna <nvitacolonna@gmail.com>
-" Last Change:  2016 Oct 21
-
-if exists("current_compiler")
-  finish
-endif
-let s:keepcpo= &cpo
-set cpo&vim
-
-if exists(":CompilerSet") != 2    " older Vim always used :setlocal
-  command -nargs=* CompilerSet setlocal <args>
-endif
-
-" If makefile exists and we are not asked to ignore it, we use standard make
-" (do not redefine makeprg)
-if get(b:, 'context_ignore_makefile', get(g:, 'context_ignore_makefile', 0)) ||
-      \ (!filereadable('Makefile') && !filereadable('makefile'))
-  let current_compiler = 'context'
-  " The following assumes that the current working directory is set to the
-  " directory of the file to be typeset
-  let &l:makeprg = get(b:, 'context_mtxrun', get(g:, 'context_mtxrun', 'mtxrun'))
-        \ . ' --script context --autogenerate --nonstopmode --synctex='
-        \ . (get(b:, 'context_synctex', get(g:, 'context_synctex', 0)) ? '1' : '0')
-        \ . ' ' . get(b:, 'context_extra_options', get(g:, 'context_extra_options', ''))
-        \ . ' ' . shellescape(expand('%:p:t'))
-else
-  let current_compiler = 'make'
-endif
-
-let b:context_errorformat = ''
-      \ . '%-Popen source%.%#> %f,'
-      \ . '%-Qclose source%.%#> %f,'
-      \ . "%-Popen source%.%#name '%f',"
-      \ . "%-Qclose source%.%#name '%f',"
-      \ . '%Etex %trror%.%#mp error on line %l in file %f:%.%#,'
-      \ . 'tex %trror%.%#error on line %l in file %f: %m,'
-      \ . '%Elua %trror%.%#error on line %l in file %f:,'
-      \ . '%+Emetapost %#> error: %#,'
-      \ . '! error: %#%m,'
-      \ . '%-C %#,'
-      \ . '%C! %m,'
-      \ . '%Z[ctxlua]%m,'
-      \ . '%+C<*> %.%#,'
-      \ . '%-C%.%#,'
-      \ . '%Z...%m,'
-      \ . '%-Zno-error,'
-      \ . '%-G%.%#' " Skip remaining lines
-
-execute 'CompilerSet errorformat=' . escape(b:context_errorformat, ' ')
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
@@ -1,16 +0,0 @@
-" Vim compiler file
-" Compiler:	csslint for CSS
-" Maintainer: Daniel Moch <daniel@danielmoch.com>
-" Last Change: 2016 May 21
-
-if exists("current_compiler")
-  finish
-endif
-let current_compiler = "csslint"
-
-if exists(":CompilerSet") != 2		" older Vim always used :setlocal
-  command -nargs=* CompilerSet setlocal <args>
-endif
-
-CompilerSet makeprg=csslint\ --format=compact
-CompilerSet errorformat=%-G,%-G%f:\ lint\ free!,%f:\ line\ %l\\,\ col\ %c\\,\ %trror\ -\ %m,%f:\ line\ %l\\,\ col\ %c\\,\ %tarning\ -\ %m,%f:\ line\ %l\\,\ col\ %c\\,\ %m
@@ -1,7 +1,7 @@
 " Vim compiler file
-" Compiler:             GNU C Compiler
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2010-10-14
+" Compiler:         GNU C Compiler
+" Maintainer:       Nikolai Weibull <now@bitwi.se>
+" Latest Revision:  2010-10-14
 " 			added line suggested by Anton Lindqvist 2016 Mar 31

 if exists("current_compiler")
@@ -1,26 +0,0 @@
-" Vim compiler file
-" Compiler:         GHC Haskell Compiler
-" Maintainer:       Daniel Campoverde <alx@sillybytes.net>
-" Latest Revision:  2016-11-29
-
-if exists("current_compiler")
-  finish
-endif
-let current_compiler = "ghc"
-
-let s:cpo_save = &cpo
-set cpo&vim
-
-CompilerSet errorformat=
-    \%-G%.%#:\ build,
-    \%-G%.%#preprocessing\ library\ %.%#,
-    \%-G[%.%#]%.%#,
-    \%E%f:%l:%c:\ %m,
-    \%-G--%.%#
-
-if exists('g:compiler_ghc_ignore_unmatched_lines')
-  CompilerSet errorformat+=%-G%.%#
-endif
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
@@ -1,16 +0,0 @@
-" Vim compiler file
-" Compiler:	Pylint for Python
-" Maintainer: Daniel Moch <daniel@danielmoch.com>
-" Last Change: 2016 May 20
-
-if exists("current_compiler")
-  finish
-endif
-let current_compiler = "pylint"
-
-if exists(":CompilerSet") != 2		" older Vim always used :setlocal
-  command -nargs=* CompilerSet setlocal <args>
-endif
-
-CompilerSet makeprg=pylint\ --output-format=text\ --msg-template=\"{path}:{line}:{column}:{C}:\ [{symbol}]\ {msg}\"\ --reports=no
-CompilerSet errorformat=%A%f:%l:%c:%t:\ %m,%A%f:%l:\ %m,%A%f:(%l):\ %m,%-Z%p^%.%#,%-G%.%#
@@ -1,8 +1,7 @@
 " Vim compiler file
-" Compiler:             sphinx >= 1.0.8, http://www.sphinx-doc.org
-" Description:          reStructuredText Documentation Format
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2017-03-31
+" Compiler:         reStructuredText Documentation Format
+" Maintainer:       Nikolai Weibull <now@bitwi.se>
+" Latest Revision:  2006-04-19

 if exists("current_compiler")
  finish
@@ -12,18 +11,12 @@ let current_compiler = "rst"
 let s:cpo_save = &cpo
 set cpo&vim

-if exists(":CompilerSet") != 2
-  command -nargs=* CompilerSet setlocal <args>
-endif
-
-CompilerSet errorformat=
-      \%f\\:%l:\ %tEBUG:\ %m,
-      \%f\\:%l:\ %tNFO:\ %m,
-      \%f\\:%l:\ %tARNING:\ %m,
-      \%f\\:%l:\ %tRROR:\ %m,
-      \%f\\:%l:\ %tEVERE:\ %m,
-      \%f\\:%s:\ %tARNING:\ %m,
-      \%f\\:%s:\ %tRROR:\ %m,
+setlocal errorformat=
+      \%f:%l:\ (%tEBUG/0)\ %m,
+      \%f:%l:\ (%tNFO/1)\ %m,
+      \%f:%l:\ (%tARNING/2)\ %m,
+      \%f:%l:\ (%tRROR/3)\ %m,
+      \%f:%l:\ (%tEVERE/3)\ %m,
      \%D%*\\a[%*\\d]:\ Entering\ directory\ `%f',
      \%X%*\\a[%*\\d]:\ Leaving\ directory\ `%f',
      \%DMaking\ %*\\a\ in\ %f
@@ -1,46 +0,0 @@
-" Vim compiler file
-" Compiler:         Rust Compiler
-" Maintainer:       Chris Morgan <me@chrismorgan.info>
-" Latest Revision:  2013 Jul 12
-" For bugs, patches and license go to https://github.com/rust-lang/rust.vim
-
-if exists("current_compiler")
-	finish
-endif
-let current_compiler = "rustc"
-
-let s:cpo_save = &cpo
-set cpo&vim
-
-if exists(":CompilerSet") != 2
-	command -nargs=* CompilerSet setlocal <args>
-endif
-
-if exists("g:rustc_makeprg_no_percent") && g:rustc_makeprg_no_percent != 0
-	CompilerSet makeprg=rustc
-else
-	CompilerSet makeprg=rustc\ \%
-endif
-
-" Old errorformat (before nightly 2016/08/10)
-CompilerSet errorformat=
-			\%f:%l:%c:\ %t%*[^:]:\ %m,
-			\%f:%l:%c:\ %*\\d:%*\\d\ %t%*[^:]:\ %m,
-			\%-G%f:%l\ %s,
-			\%-G%*[\ ]^,
-			\%-G%*[\ ]^%*[~],
-			\%-G%*[\ ]...
-
-" New errorformat (after nightly 2016/08/10)
-CompilerSet errorformat+=
-			\%-G,
-			\%-Gerror:\ aborting\ %.%#,
-			\%-Gerror:\ Could\ not\ compile\ %.%#,
-			\%Eerror:\ %m,
-			\%Eerror[E%n]:\ %m,
-			\%Wwarning:\ %m,
-			\%Inote:\ %m,
-			\%C\ %#-->\ %f:%l:%c
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
@@ -1,7 +1,7 @@
 " The default vimrc file.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last change:	2017 Jun 13
+" Last change:	2016 Sep 02
 "
 " This is loaded if no vimrc file was found.
 " Except when Vim is run with "-u NONE" or "-C".
@@ -21,16 +21,7 @@ endif

 " Use Vim settings, rather than Vi settings (much better!).
 " This must be first, because it changes other options as a side effect.
-" Avoid side effects when it was already reset.
-if &compatible
-  set nocompatible
-endif
-
-" When the +eval feature is missing, the set command above will be skipped.
-" Use a trick to reset compatible only when the +eval feature is missing.
-silent! while 0
-  set nocompatible
-silent! endwhile
+set nocompatible

 " Allow backspacing over everything in insert mode.
 set backspace=indent,eol,start
@@ -106,13 +97,12 @@ if has("autocmd")
    au!

    " When editing a file, always jump to the last known cursor position.
-    " Don't do it when the position is invalid, when inside an event handler
-    " (happens when dropping a file on gvim) and for a commit message (it's
-    " likely a different one than last time).
+    " Don't do it when the position is invalid or when inside an event handler
+    " (happens when dropping a file on gvim).
    autocmd BufReadPost *
-      \ if line("'\"") >= 1 && line("'\"") <= line("$") && &ft !~# 'commit'
-      \ |   exe "normal! g`\""
-      \ | endif
+      \ if line("'\"") >= 1 && line("'\"") <= line("$") |
+      \   exe "normal! g`\"" |
+      \ endif

  augroup END

@@ -30,10 +30,8 @@ DOCS = \
 	filetype.txt \
 	fold.txt \
 	ft_ada.txt \
-	ft_rust.txt \
 	ft_sql.txt \
 	gui.txt \
-	gui_mac.txt \
 	gui_w32.txt \
 	gui_x11.txt \
 	hangulin.txt \
@@ -102,7 +100,6 @@ DOCS = \
 	tabpage.txt \
 	tagsrch.txt \
 	term.txt \
-	terminal.txt \
 	tips.txt \
 	todo.txt \
 	uganda.txt \
@@ -168,7 +165,6 @@ HTMLS = \
 	filetype.html \
 	fold.html \
 	ft_ada.html \
-	ft_rust.html \
 	ft_sql.html \
 	gui.html \
 	gui_w32.html \
@@ -238,7 +234,6 @@ HTMLS = \
 	tabpage.html \
 	tagsrch.html \
 	term.html \
-	terminal.html \
 	tips.html \
 	todo.html \
 	uganda.html \
@@ -344,7 +339,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 +371,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
@@ -10,11 +10,11 @@ Arabic Language support (options & mappings) for Vim		*Arabic*

 								*E800*
 In order to use right-to-left and Arabic mapping support, it is
-necessary to compile Vim with the |+arabic| feature.
+necessary to compile VIM with the |+arabic| feature.

 These functions have been created by Nadim Shaikli <nadim-at-arabeyes.org>

-It is best to view this file with these settings within Vim's GUI: >
+It is best to view this file with these settings within VIM's GUI: >

 	:set encoding=utf-8
 	:set arabicshape
@@ -42,7 +42,7 @@ the user interface remains the standard Vi interface.

 Highlights
 ----------
-o  Editing left-to-right files as in the original Vim hasn't changed.
+o  Editing left-to-right files as in the original VIM hasn't changed.

 o  Viewing and editing files in right-to-left windows.	 File
   orientation is per window, so it is possible to view the same
@@ -52,7 +52,7 @@ o  No special terminal with right-to-left capabilities is required.
   The right-to-left changes are completely hardware independent.
   Only Arabic fonts are necessary.

-o  Compatible with the original Vim.   Almost all features work in
+o  Compatible with the original VIM.   Almost all features work in
   right-to-left mode (there are liable to be bugs).

 o  Changing keyboard mapping and reverse insert modes using a single
@@ -66,14 +66,14 @@ o  While in Arabic mode, numbers are entered from left to right.  Upon

 o  Arabic keymapping on the command line in reverse insert mode.

-o  Proper Bidirectional functionality is possible given Vim is
+o  Proper Bidirectional functionality is possible given VIM is
   started within a Bidi capable terminal emulator.


 Arabic Fonts						*arabicfonts*
 ------------

-Vim requires monospaced fonts of which there are many out there.
+VIM requires monospaced fonts of which there are many out there.
 Arabic requires ISO-8859-6 as well as Presentation Form-B fonts
 (without Form-B, Arabic will _NOT_ be usable).	It is highly
 recommended that users search for so-called 'ISO-10646-1' fonts.
@@ -96,13 +96,13 @@ o  Installation of fonts for X Window systems (Unix/Linux)

 Usage
 -----
-Prior to the actual usage of Arabic within Vim, a number of settings
+Prior to the actual usage of Arabic within VIM, a number of settings
 need to be accounted for and invoked.

 o  Setting the Arabic fonts

-   +  For Vim GUI set the 'guifont' to your_ARABIC_FONT.  This is done
-      by entering the following command in the Vim window.
+   +  For VIM GUI set the 'guifont' to your_ARABIC_FONT.  This is done
+      by entering the following command in the VIM window.
 >
 		:set guifont=your_ARABIC_FONT
 <
@@ -115,7 +115,7 @@ o  Setting the Arabic fonts
      you can include ':set guifont=your_ARABIC_FONT' to your .vimrc
      file.

-   +  Under the X Window environment, you can also start Vim with
+   +  Under the X Window environment, you can also start VIM with
      '-fn your_ARABIC_FONT' option.

 o  Setting the appropriate character Encoding
@@ -124,7 +124,7 @@ o  Setting the appropriate character Encoding
 >
 		:set encoding=utf-8
 <
-   to your .vimrc file (entering the command manually into you Vim
+   to your .vimrc file (entering the command manually into you VIM
   window is highly discouraged).  In short, include ':set
   encoding=utf-8' to your .vimrc file.

@@ -137,11 +137,11 @@ o  Setting the appropriate character Encoding
 o  Enable Arabic settings [short-cut]

   In order to simplify and streamline things, you can either invoke
-   Vim with the command-line option,
+   VIM with the command-line option,

     % vim -A my_utf8_arabic_file ...

-   or enable 'arabic' via the following command within Vim
+   or enable 'arabic' via the following command within VIM
 >
 		:set arabic
 <
@@ -189,7 +189,7 @@ o  Enable Arabic settings [short-cut]
 >
 		:set keymap=arabic
 <
-      in your Vim window.  You can also append the 'keymap' set command to
+      in your VIM window.  You can also append the 'keymap' set command to
      your .vimrc file.  In other words, you can include ':set keymap=arabic'
      to your .vimrc file.

@@ -202,7 +202,7 @@ o  Enable Arabic settings [short-cut]

   +  Arabic deletion of a combined pair character

-      By default Vim has the 'delcombine' option disabled.  This option
+      By default VIM has the 'delcombine' option disabled.  This option
      allows the deletion of ALEF in a LAM_ALEF (LAA) combined character
      and still retain the LAM (i.e. it reverts to treating the combined
      character as its natural two characters form -- this also pertains
@@ -211,13 +211,13 @@ o  Enable Arabic settings [short-cut]
 >
 		:set delcombine
 <
-      in our Vim window.  You can also append the 'delcombine' set command
+      in our VIM window.  You can also append the 'delcombine' set command
      to your .vimrc file.  In other words, you can include ':set delcombine'
      to your .vimrc file.

   +  Arabic right-to-left Mode

-      By default Vim starts in Left-to-right mode.  'rightleft' is the
+      By default VIM starts in Left-to-right mode.  'rightleft' is the
      command that allows one to alter a window's orientation - that can
      be accomplished via,

@@ -253,7 +253,7 @@ o  Enable Arabic settings [short-cut]
 >
 		:set arabicshape
 <
-      in our Vim window.  You can also append the 'arabicshape' set
+      in our VIM window.  You can also append the 'arabicshape' set
      command to your .vimrc file.  In other words, you can include
      ':set arabicshape' to your .vimrc file.

@@ -261,7 +261,7 @@ o  Enable Arabic settings [short-cut]
 Keymap/Keyboard						*arabickeymap*
 ---------------

-The character/letter encoding used in Vim is the standard UTF-8.
+The character/letter encoding used in VIM is the standard UTF-8.
 It is widely discouraged that any other encoding be used or even
 attempted.

@@ -294,7 +294,7 @@ o  Keyboard
 Restrictions
 ------------

-o  Vim in its GUI form does not currently support Bi-directionality
+o  VIM in its GUI form does not currently support Bi-directionality
   (i.e. the ability to see both Arabic and Latin intermixed within
   the same line).

@@ -319,4 +319,4 @@ There is one known minor bug,

 No other bugs are known to exist.

- vim:tw=78:ts=8:noet:ft=help:norl:
+ vim:tw=78:ts=8:ft=help:norl:
@@ -1,10 +1,10 @@
-*autocmd.txt*   For Vim version 8.1.  Last change: 2018 May 03
+*autocmd.txt*   For Vim version 8.0.  Last change: 2016 Sep 21


 		  VIM REFERENCE MANUAL    by Bram Moolenaar


-Automatic commands				*autocommand* *autocommands*
+Automatic commands					*autocommand*

 For a basic explanation, see section |40.3| in the user manual.

@@ -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*
 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
@@ -87,16 +79,11 @@ exception is that "<sfile>" is expanded when the autocmd is defined.  Example:

 Here Vim expands <sfile> to the name of the file containing this line.

-`:autocmd` adds to the list of autocommands regardless of whether they are
-already present.  When your .vimrc file is sourced twice, the autocommands
-will appear twice.  To avoid this, define your autocommands in a group, so
-that you can easily clear them: >
+When your .vimrc file is sourced twice, the autocommands will appear twice.
+To avoid this, put this command in your .vimrc file, before defining
+autocommands: >

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

 If you don't want to remove all autocommands, you can instead use a variable
 to ensure that Vim includes the autocommands only once: >
@@ -143,15 +130,8 @@ prompt.  When one command outputs two messages this can happen anyway.

 :au[tocmd]! [group] {event}
 			Remove ALL autocommands for {event}.
-			Warning: You should not do this without a group for
-			|BufRead| and other common events, it can break
-			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.

 When the [group] argument is not given, Vim uses the current group (as defined
 with ":augroup"); otherwise, Vim uses the group defined with [group].
@@ -262,7 +242,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 +270,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 +279,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 +306,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 +314,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 has been 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 +436,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 +483,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 +507,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,24 +593,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.  Exiting may still be
-				cancelled if there is a modified buffer that
-				isn't automatically saved, use |VimLeavePre|
-				for really exiting.
 							*FileChangedShell*
 FileChangedShell		When Vim notices that the modification time of
 				a file has changed since editing started.
@@ -682,7 +601,7 @@ FileChangedShell		When Vim notices that the modification time of
 				|timestamp|
 				Mostly triggered after executing a shell
 				command, but also with a |:checktime| command
-				or when gvim regains input focus.
+				or when Gvim regains input focus.
 				This autocommand is triggered for each changed
 				file.  It is not used when 'autoread' is set
 				and the buffer was not changed.  If a
@@ -693,7 +612,7 @@ FileChangedShell		When Vim notices that the modification time of
 				to tell Vim what to do next.
 				NOTE: When this autocommand is executed, the
 				current buffer "%" may be different from the
-				buffer that was changed, which is in "<afile>".
+				buffer that was changed "<afile>".
 				NOTE: The commands must not change the current
 				buffer, jump to another buffer or delete a
 				buffer.  *E246* *E811*
@@ -723,8 +642,7 @@ FileType			When the 'filetype' option has been set.  The
 				pattern is matched against the filetype.
 				<afile> can be used for the name of the file
 				where this option was set, and <amatch> for
-				the new value of 'filetype'.  Navigating to
-				another window or buffer is not allowed.
+				the new value of 'filetype'.
 				See |filetypes|.
 							*FileWriteCmd*
 FileWriteCmd			Before writing to a file, when not writing the
@@ -811,7 +729,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
@@ -889,7 +807,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
@@ -958,7 +875,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.
@@ -985,11 +901,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|
@@ -1012,39 +923,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! :-)
@@ -1089,10 +971,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
@@ -1402,7 +1283,7 @@ Careful: '[ and '] change when using commands that change the buffer.
 In commands which expect a file name, you can use "<afile>" for the file name
 that is being read |:<afile>| (you can also use "%" for the current file
 name).  "<abuf>" can be used for the buffer number of the currently effective
-buffer.  This also works for buffers that don't have a name.  But it doesn't
+buffer.  This also works for buffers that doesn't have a name.  But it doesn't
 work for files without a buffer (e.g., with ":r file").

 							*gzip-example*
@@ -1593,4 +1474,4 @@ This will write the file without triggering the autocommands defined by the
 gzip plugin.


- vim:tw=78:ts=8:noet:ft=help:norl:
+ vim:tw=78:ts=8:ft=help:norl:
@@ -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: 2016 Sep 11


 		  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*
@@ -177,6 +177,8 @@ gR			Enter Virtual Replace mode: Each character you type
 			<Tab> may replace several characters at once.
 			Repeat the entered text [count]-1 times.  See
 			|Virtual-Replace-mode| for more details.
+			{not available when compiled without the |+vreplace|
+			feature}

 							*c*
 ["x]c{motion}		Delete {motion} text [into register x] and start
@@ -301,6 +303,8 @@ gr{char}		Replace the virtual characters under the cursor with
 			space.  See |gR| and |Virtual-Replace-mode| for more
 			details.  As with |r| a count may be given.
 			{char} can be entered like with |r|.
+			{not available when compiled without the |+vreplace|
+			feature}

 						*digraph-arg*
 The argument for Normal mode commands like |r| and |t| is a single character.
@@ -442,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
@@ -529,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
@@ -632,14 +635,12 @@ For other systems the tmpnam() library function is used.
 			For the {pattern} see |pattern|.
 			{string} can be a literal string, or something
 			special; see |sub-replace-special|.
-							*E939*
 			When [range] and [count] are omitted, replace in the
-			current line only.  When [count] is given, replace in
-			[count] lines, starting with the last line in [range].
-			When [range] is omitted start in the current line.
-			[count] must be a positive number.  Also see
-			|cmdline-ranges|.
-
+			current line only.
+			When [count] is given, replace in [count] lines,
+			starting with the last line in [range].  When [range]
+			is omitted start in the current line.
+			Also see |cmdline-ranges|.
 			See |:s_flags| for [flags].

 :[range]s[ubstitute] [flags] [count]
@@ -683,7 +684,6 @@ g&			Synonym for `:%s//~/&` (repeat last substitute with
 							*:s_flags*
 The flags that you can use for the substitute commands:

-							*:&&*
 [&]	Must be the first one: Keep the flags from the previous substitute
 	command.  Examples: >
 		:&&
@@ -913,7 +913,8 @@ Exceptions:
 Substitute with an expression			*sub-replace-expression*
 						*sub-replace-\=* *s/\=*
 When the substitute string starts with "\=" the remainder is interpreted as an
-expression.
+expression.  This does not work recursively: a |substitute()| function inside
+the expression cannot use "\=" for the substitute string.

 The special meaning for characters as mentioned at |sub-replace-special| does
 not apply except for "<CR>".  A <NL> character is used as a line break, you
@@ -983,11 +984,6 @@ This replaces each 'E' character with a euro sign.  Read more in |<Char->|.
 			this (that's a good habit anyway).
 			`:retab!` may also change a sequence of spaces by
 			<Tab> characters, which can mess up a printf().
-			If the |+vartabs| feature is enabled then a list of
-			tab widths separated by commas may be used in place of
-			a single tabstop.  Each value in the list represents
-			the width of one tabstop, except the final value which
-			applies to all following tabstops.
 			{not in Vi}

 							*retab-example*
@@ -1446,55 +1442,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
@@ -1880,4 +1827,4 @@ The sorting can be interrupted, but if you interrupt it too late in the
 process you may end up with duplicated lines.  This also depends on the system
 library function used.

- vim:tw=78:ts=8:noet:ft=help:norl:
+ vim:tw=78:ts=8:ft=help:norl:
@@ -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: 2016 Sep 20


 		  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.

 ==============================================================================
@@ -156,13 +155,7 @@ Use |ch_status()| to see if the channel could be opened.
 	func MyCloseHandler(channel)
 <		Vim will invoke callbacks that handle data before invoking
 		close_cb, thus when this function is called no more data will
-		be passed to the callbacks.
-							*channel-drop*
-"drop"		Specifies when to drop messages:
-		    "auto"	When there is no callback to handle a message.
-				The "close_cb" is also considered for this.
-		    "never"	All messages will be kept.
-
+		be received.
 							*waittime*
 "waittime"	The time to wait for the connection to be made in
 		milliseconds.  A negative number waits forever.
@@ -376,7 +369,7 @@ Leave out the fourth argument if no response is to be sent:
 ==============================================================================
 6. Using a RAW or NL channel				*channel-raw*

-If mode is RAW or NL then a message can be sent like this: >
+If mode is RAW or NL then a message can be send like this: >
    let response = ch_evalraw(channel, {string})

 The {string} is sent as-is.  The response will be what can be read from the
@@ -425,11 +418,7 @@ This uses the channel timeout.  To read without a timeout, just get any
 message that is available: >
 	let output = ch_read(channel, {'timeout': 0})
 When no message was available then the result is v:none for a JSON or JS mode
-channels, an empty string for a RAW or NL channel.  You can use |ch_canread()|
-to check if there is something to read.
-
-Note that when there is no callback, messages are dropped.  To avoid that add
-a close callback to the channel.
+channels, an empty string for a RAW or NL channel.

 To read all output from a RAW channel that is available: >
 	let output = ch_readraw(channel)
@@ -476,11 +465,6 @@ it like this: >
 Without the handler you need to read the output with |ch_read()| or
 |ch_readraw()|. You can do this in the close callback, see |read-in-close-cb|.

-Note that if the job exits before you read the output, the output may be lost.
-This depends on the system (on Unix this happens because closing the write end
-of a pipe causes the read end to get EOF).  To avoid this make the job sleep
-for a short while before it exits.
-
 The handler defined for "out_cb" will not receive stderr.  If you want to
 handle that separately, add an "err_cb" handler: >
    let job = job_start(command, {"out_cb": "MyHandler",
@@ -490,11 +474,6 @@ If you want to handle both stderr and stdout with one handler use the
 "callback" option: >
    let job = job_start(command, {"callback": "MyHandler"}) 

-Depending on the system, starting a job can put Vim in the background, the
-started job gets the focus.  To avoid that, use the `foreground()` function.
-This might not always work when called early, put in the callback handler or
-use a timer to call it after the job has started.
-
 You can send a message to the command with ch_evalraw().  If the channel is in
 JSON or JS mode you can use ch_evalexpr().

@@ -519,7 +498,7 @@ By default this reads the whole buffer.  This can be changed with the "in_top"
 and "in_bot" options.

 A special mode is when "in_top" is set to zero and "in_bot" is not set: Every
-time a line is added to the buffer, the last-but-one line will be sent to the
+time a line is added to the buffer, the last-but-one line will be send to the
 job stdin.  This allows for editing the last line and sending it when pressing
 Enter.
 							*channel-close-in*
@@ -537,7 +516,7 @@ If the job can take some time and you don't need intermediate results, you can
 add a close callback and read the output there: >

 	func! CloseHandler(channel)
-	  while ch_status(a:channel, {'part': 'out'}) == 'buffered'
+	  while ch_status(a:channel) == 'buffered'
 	    echomsg ch_read(a:channel)
 	  endwhile
 	endfunc
@@ -550,7 +529,7 @@ You will want to do something more useful than "echomsg".

 To start another process without creating a channel: >
    let job = job_start(command,
-	\ {"in_io": "null", "out_io": "null", "err_io": "null"})
+    	\ {"in_io": "null", "out_io": "null", "err_io": "null"})

 This starts {command} in the background, Vim does not wait for it to finish.

@@ -611,26 +590,21 @@ See |job_setoptions()| and |ch_setoptions()|.
 						*job-close_cb*
 "close_cb": handler	Callback for when the channel is closed.  Same as
 			"close_cb" on |ch_open()|, see |close_cb|.
-						*job-drop*
-"drop": when		Specifies when to drop messages.  Same as "drop" on
-			|ch_open()|, see |channel-drop|.  For "auto" the
-			exit_cb is not considered.
 						*job-exit_cb*
 "exit_cb": handler	Callback for when the job ends.  The arguments are the
 			job and the exit status.
-			Vim checks up to 10 times per second for jobs that
-			ended.  The check can also be triggered by calling
-			|job_status()|, which may then invoke the exit_cb
-			handler.
+			Vim checks about every 10 seconds for jobs that ended.
+			The check also be triggered by calling |job_status()|,
+			which may then invoke the exit_cb handler.
 			Note that data can be buffered, callbacks may still be
 			called after the process ends.
 							*job-timeout*
-"timeout": time		The time to wait for a request when blocking, E.g.
+"timeout"		The time to wait for a request when blocking, E.g.
 			when using ch_evalexpr().  In milliseconds.  The
 			default is 2000 (2 seconds).
 						*out_timeout* *err_timeout*
-"out_timeout": time	Timeout for stdout.  Only when using pipes.
-"err_timeout": time	Timeout for stderr.  Only when using pipes.
+"out_timeout"		Timeout for stdout.  Only when using pipes.
+"err_timeout"		Timeout for stderr.  Only when using pipes.
 			Note: when setting "timeout" the part specific mode is
 			overwritten.  Therefore set "timeout" first and the
 			part specific mode later.
@@ -642,23 +616,17 @@ See |job_setoptions()| and |ch_setoptions()|.
 			The default is "term".

 						*job-term*
-"term": "open"		Start a terminal in a new window and connect the job
-			stdin/stdout/stderr to it.  Similar to using
-			`:terminal`.
+"term": "open"		Start a terminal and connect the job
+			stdin/stdout/stderr to it.
 			NOTE: Not implemented yet!

 "channel": {channel}	Use an existing channel instead of creating a new one.
 			The parts of the channel that get used for the new job
 			will be disconnected from what they were used before.
-			If the channel was still used by another job this may
+			If the channel was still use by another job this may
 			cause I/O errors.
 			Existing callbacks and other settings remain.

-"pty": 1		Use a pty (pseudo-tty) instead of a pipe when
-			possible.  This is most useful in combination with a
-			terminal window, see |terminal|.
-			{only on Unix and Unix-like systems}
-
 				*job-in_io* *in_top* *in_bot* *in_name* *in_buf*
 "in_io": "null"		disconnect stdin (read from /dev/null)
 "in_io": "pipe"		stdin is connected to the channel (default)
@@ -673,7 +641,7 @@ See |job_setoptions()| and |ch_setoptions()|.
 "out_io": "null"	disconnect stdout (goes to /dev/null)
 "out_io": "pipe"	stdout is connected to the channel (default)
 "out_io": "file"	stdout writes to a file
-"out_io": "buffer"	stdout appends to a buffer (see below)
+"out_io": "buffer" 	stdout appends to a buffer (see below)
 "out_name": "/path/file" the name of the file or buffer to write to
 "out_buf": number	the number of the buffer to write to
 "out_modifiable": 0	when writing to a buffer, 'modifiable' will be off
@@ -686,7 +654,7 @@ See |job_setoptions()| and |ch_setoptions()|.
 "err_io": "null"	disconnect stderr  (goes to /dev/null)
 "err_io": "pipe"	stderr is connected to the channel (default)
 "err_io": "file"	stderr writes to a file
-"err_io": "buffer"	stderr appends to a buffer (see below)
+"err_io": "buffer" 	stderr appends to a buffer (see below)
 "err_name": "/path/file" the name of the file or buffer to write to
 "err_buf": number	the number of the buffer to write to
 "err_modifiable": 0	when writing to a buffer, 'modifiable' will be off
@@ -697,10 +665,6 @@ See |job_setoptions()| and |ch_setoptions()|.
 "block_write": number	only for testing: pretend every other write to stdin
 			will block

-"env": dict		environment variables for the new process
-"cwd": "/path/to/dir"	current working directory for the new process;
-			if the directory does not exist an error is given
-

 Writing to a buffer ~
 							*out_io-buffer*
@@ -736,6 +700,10 @@ The "out_msg" option can be used to specify whether a new buffer will have the
 first line set to "Reading from channel output...".  The default is to add the
 message.  "err_msg" does the same for channel error.

+'modifiable' option off, or write to a buffer that has 'modifiable' off.  That
+means that lines will be appended to the buffer, but the user can't easily
+change the buffer.
+
 When an existing buffer is to be written where 'modifiable' is off and the
 "out_modifiable" or "err_modifiable" options is not zero, an error is given
 and the buffer will not be written to.
@@ -771,49 +739,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.
-
-The CTRL-W key can be used to start a window command, such as CTRL-W w to
-switch to the next window.  This also works in Insert mode (use Shift-CTRL-W
-to delete a word). When leaving the window Insert mode will be stopped.  When
-coming back to the prompt window Insert mode will be restored.
-
-Any command that starts Insert mode, such as "a", "i", "A" and "I", will move
-the cursor to the last line.  "A" will move to the end of the line, "I" to the
-start of the line.
-
-
- vim:tw=78:ts=8:noet:ft=help:norl:
+ 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: 2016 Aug 27


 		  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),
@@ -231,10 +229,9 @@ CTRL-Y		When there is a modeless selection, copy the selection into
 		the clipboard. |modeless-selection|
 		If there is no selection CTRL-Y is inserted as a character.

-CTRL-M or CTRL-J		*c_CTRL-M* *c_CTRL-J* *c_<NL>* *c_<CR>* *c_CR*
+CTRL-J					*c_CTRL-J* *c_<NL>* *c_<CR>* *c_CR*
 <CR> or <NL>	start entered command
-
-CTRL-[						*c_CTRL-[* *c_<Esc>* *c_Esc*
+							*c_<Esc>* *c_Esc*
 <Esc>		When typed and 'x' not present in 'cpoptions', quit
 		Command-line mode without executing.  In macros or when 'x'
 		present in 'cpoptions', start entered command.
@@ -361,11 +358,8 @@ terminals)
 		List entries 6 to 12 from the search history: >
 			:history / 6,12
 <
-		List the penultimate entry from all histories: >
-			:history all -2
-<
-		List the most recent two entries from all histories: >
-			:history all -2,
+		List the recent five entries from all histories: >
+			:history all -5,

 :keepp[atterns] {command}			*:keepp* *:keeppatterns*
 		Execute {command}, without adding anything to the search
@@ -412,17 +406,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,15 +449,8 @@ 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
-line.
-
 If you like tcsh's autolist completion, you can use this mapping:
 	:cnoremap X <C-L><C-D>
 (Where X is the command key to use, <C-L> is CTRL-L and <C-D> is CTRL-D)
@@ -835,21 +819,14 @@ Also see |`=|.
 			       *:<cword>* *:<cWORD>* *:<cfile>* *<cfile>*
 			       *:<sfile>* *<sfile>* *:<afile>* *<afile>*
 			       *:<abuf>* *<abuf>* *:<amatch>* *<amatch>*
-			       *:<cexpr>* *<cexpr>*
 			       *<slnum>* *E495* *E496* *E497* *E499* *E500*
 Note: these are typed literally, they are not special keys!
 	<cword>    is replaced with the word under the cursor (like |star|)
 	<cWORD>    is replaced with the WORD under the cursor (see |WORD|)
-	<cexpr>    is replaced with the word under the cursor, including more
-		   to form a C expression.  E.g., when the cursor is on "arg"
-		   of "ptr->arg" then the result is "ptr->arg"; when the
-		   cursor is on "]" of "list[idx]" then the result is
-		   "list[idx]".  This is used for |v:beval_text|.
 	<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
@@ -894,8 +871,7 @@ These modifiers can be given, in this order:
 		directory.
 	:.	Reduce file name to be relative to current directory, if
 		possible.  File name is unmodified if it is not below the
-		current directory, but on MS-Windows the drive is removed if
-		it is the current drive.
+		current directory.
 		For maximum shortness, use ":~:.".
 	:h	Head of the file name (the last component and any separators
 		removed).  Cannot be used with :e, :r or :t.
@@ -1080,10 +1056,10 @@ There are several ways to leave the command-line window:
 		Insert and in Normal mode.
 CTRL-C		Continue in Command-line mode.  The command-line under the
 		cursor is used as the command-line.  Works both in Insert and
-		in Normal mode.  There is no redraw, thus the window will
-		remain visible.
+		in Normal mode.  ":close" also works.  There is no redraw,
+		thus the window will remain visible.
 :quit		Discard the command line and go back to Normal mode.
-		":close", ":exit", ":xit" and CTRL-\ CTRL-N also work.
+		":exit", ":xit" and CTRL-\ CTRL-N also work.
 :qall		Quit Vim, unless there are changes in some buffer.
 :qall!		Quit Vim, discarding changes to any buffer.

@@ -1164,4 +1140,4 @@ The character used for the pattern indicates the type of command-line:
 	@	string for |input()|
 	-	text for |:insert| or |:append|

- vim:tw=78:ts=8:noet:ft=help:norl:
+ vim:tw=78:ts=8:ft=help:norl:
@@ -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: 2012 Feb 11


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -53,7 +53,7 @@ Use this command to start Vim:
 	valgrind --log-file=valgrind.log --leak-check=full ./vim

 Note: Vim will run much slower.  If your .vimrc is big or you have several
-plugins you need to be patient for startup, or run with the "--clean"
+plugins you need to be patient for startup, or run with the "-u NONE"
 argument.

 There are often a few leaks from libraries, such as getpwuid() and
@@ -172,4 +172,4 @@ Visual C++ 2005 Express Edition can be downloaded for free from:
    http://msdn.microsoft.com/vstudio/express/visualC/default.aspx

 =========================================================================
- vim:tw=78:ts=8:noet:ft=help:norl:
+ vim:tw=78:ts=8:ft=help:norl:
@@ -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
@@ -139,4 +137,4 @@ Programming Environment.

 For Sun NetBeans support see |netbeans|.

- vim:tw=78:sw=4:ts=8:noet:ft=help:norl:
+ vim:tw=78:sw=4:ts=8:ft=help:norl:
@@ -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: 2016 Jan 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.

 ==============================================================================
@@ -144,10 +143,9 @@ and its environment.

 VIM IS... NOT						*design-not*

- Vim is not a shell or an Operating System.  It does provide a terminal
-  window, in which you can run a shell or debugger.  E.g. to be able to do
-  this over an ssh connection.  But if you don't need a text editor with that
-  it is out of scope (use something like screen or tmux instead).
+- Vim is not a shell or an Operating System.  You will not be able to run a
+  shell inside Vim or use it to control a debugger.  This should work the
+  other way around: Use Vim as a component from a shell or in an IDE.
  A satirical way to say this: "Unlike Emacs, Vim does not attempt to include
  everything but the kitchen sink, but some people say that you can clean one
  with it.  ;-)"
@@ -179,47 +177,16 @@ The basic steps to make changes to the code:
 5. Make a patch with "git diff".  You can also create a pull request on
   github, but it's the diff that matters.
 6. Make a note about what changed, preferably mentioning the problem and the
-   solution.  Send an email to the |vim-dev| maillist with an explanation and
+   solution.  Send an email to the vim-dev maillist with an explanation and
   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*
@@ -563,4 +530,4 @@ long	    32 or 64 bit signed, can hold a pointer
 Note that some compilers cannot handle long lines or strings.  The C89
 standard specifies a limit of 509 characters.

- vim:tw=78:ts=8:noet:ft=help:norl:
+ vim:tw=78:ts=8:ft=help:norl:
@@ -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: 2016 Aug 24


 		  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
@@ -131,8 +131,6 @@ file for a moment and come back to the same file and be in diff mode again.
 		related options only happens in a window that has 'diff' set,
 		if the current window does not have 'diff' set then no options
 		in it are changed.
-		Hidden buffers are also removed from the list of diff'ed
-		buffers.

 The `:diffoff` command resets the relevant options to the values they had when
 using `:diffsplit`, `:diffpatch` , `:diffthis`. or starting Vim in diff mode.
@@ -166,8 +164,7 @@ The alignment of text will go wrong when:

 All the buffers edited in a window where the 'diff' option is set will join in
 the diff.  This is also possible for hidden buffers.  They must have been
-edited in a window first for this to be possible.  To get rid of the hidden
-buffers use `:diffoff!`.
+edited in a window first for this to be possible.

 					*:DiffOrig* *diff-original-file*
 Since 'diff' is a window-local option, it's possible to view the same buffer
@@ -226,8 +223,8 @@ The diffs are highlighted with these groups:
 				(searching from the end of the line).  The
 				text in between is highlighted.  This means
 				that parts in the middle that are still the
-				same are highlighted anyway.  The 'diffopt'
-				flags "iwhite" and "icase" are used here.
+				same are highlighted anyway.  Only "iwhite" of
+				'diffopt' is used here.
 |hl-DiffDelete|	DiffDelete	Deleted lines.  Also called filler lines,
 				because they don't really exist in this
 				buffer.
@@ -326,7 +323,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
 <
@@ -384,16 +381,12 @@ Example (this does almost the same as 'diffexpr' being empty): >
 	   endif
 	   silent execute "!diff -a --binary " . opt . v:fname_in . " " . v:fname_new .
 		\  " > " . v:fname_out
-	   redraw!
 	endfunction

 The "-a" argument is used to force comparing the files as text, comparing as
 binaries isn't useful.  The "--binary" argument makes the files read in binary
 mode, so that a CTRL-Z doesn't end the text on DOS.

-The `redraw!` command may not be needed, depending on whether executing a
-shell command shows something on the display or not.
-
 						*E810* *E97*
 Vim will do a test if the diff output looks alright.  If it doesn't, you will
 get an error message.  Possible causes:
@@ -445,4 +438,4 @@ evaluating 'patchexpr'.  This hopefully avoids that files in the current
 directory are accidentally patched.  Vim will also delete files starting with
 v:fname_in and ending in ".rej" and ".orig".

- vim:tw=78:ts=8:noet:ft=help:norl:
+ vim:tw=78:ts=8:ft=help:norl:
@@ -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: 2014 Jun 19


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -147,7 +147,7 @@ a standard meaning:
 	Two			2	Hook
 	Nine			9	Horn

-	Equals			=	Cyrillic (= used as second char)
+	Equals			=	Cyrillic (= used as second char) 
 	Asterisk		*	Greek
 	Percent sign		%	Greek/Cyrillic special
 	Plus			+	smalls: Arabic, capitals: Hebrew
@@ -926,7 +926,6 @@ char  digraph	hex	dec	official name ~
 †	/-	2020	8224	DAGGER
 ‡	/=	2021	8225	DOUBLE DAGGER
 ‥	..	2025	8229	TWO DOT LEADER
-…	,.	2026	8230	HORIZONTAL ELLIPSIS
 ‰	%0	2030	8240	PER MILLE SIGN
 ′	1'	2032	8242	PRIME
 ″	2'	2033	8243	DOUBLE PRIME
@@ -1488,4 +1487,4 @@ char  digraph	hex	dec	official name ~
 ﬅ	ft	FB05	64261	LATIN SMALL LIGATURE LONG S T
 ﬆ	st	FB06	64262	LATIN SMALL LIGATURE ST

- vim:tw=78:ts=8:noet:ft=help:norl:
+ vim:tw=78:ts=8:ft=help:norl:
@@ -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: 2016 Aug 06


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -181,8 +181,7 @@ start editing another file, Vim will refuse this.  In order to overrule this
 protection, add a '!' to the command.  The changes will then be lost.  For
 example: ":q" will not work if the buffer was changed, but ":q!" will.  To see
 whether the buffer was changed use the "CTRL-G" command.  The message includes
-the string "[Modified]" if the buffer has been changed, or "+" if the 'm' flag
-is in 'shortmess'.
+the string "[Modified]" if the buffer has been changed.

 If you want to automatically save the changes without asking, switch on the
 'autowriteall' option.  'autowrite' is the associated Vi-compatible option
@@ -276,7 +275,7 @@ If you want to keep the changed buffer without saving it, switch on the

 							*:vie* *:view*
 :vie[w][!] [++opt] [+cmd] file
-			When used in Ex mode: Leave |Ex-mode|, go back to
+			When used in Ex mode: Leave |Ex mode|, go back to
 			Normal mode.  Otherwise same as |:edit|, but set
 			'readonly' option for this buffer.  {not in Vi}

@@ -424,15 +423,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
@@ -626,16 +616,16 @@ list of the current window.
 			Also see |++opt| and |+cmd|.
 			{Vi: no ++opt}

-:[count]arge[dit][!] [++opt] [+cmd] {name} ..		*:arge* *:argedit*
-			Add {name}s to the argument list and edit it.
+:[count]arge[dit][!] [++opt] [+cmd] {name}		*:arge* *:argedit*
+			Add {name} to the argument list and edit it.
 			When {name} already exists in the argument list, this
 			entry is edited.
 			This is like using |:argadd| and then |:edit|.
-			Spaces in filenames have to be escaped with "\".
+			Note that only one file name is allowed, and spaces
+			inside the file name are allowed, like with |:edit|.
 			[count] is used like with |:argadd|.
-			If the current file cannot be |abandon|ed {name}s will
-			still be added to the argument list, but won't be
-			edited. No check for duplicates is done.
+			[!] is required if the current file cannot be
+			|abandon|ed.
 			Also see |++opt| and |+cmd|.
 			{not in Vi}

@@ -659,7 +649,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 +664,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 +680,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 +690,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 +822,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 +874,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|

@@ -901,8 +898,8 @@ flag is used for the ":substitute" command to avoid an error for files where
 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*
+						*E502* *E503* *E504* *E505*
+						*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 +955,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
@@ -982,12 +976,12 @@ WRITING WITH MULTIPLE BUFFERS				*buffer-write*

 							*:wa* *:wall*
 :wa[ll]			Write all changed buffers.  Buffers without a file
-			name cause an error message.  Buffers which are
-			readonly are not written. {not in Vi}
+			name or which are readonly are not written. {not in
+			Vi}

 :wa[ll]!		Write all changed buffers, even the ones that are
 			readonly.  Buffers without a file name are not
-			written and cause an error message. {not in Vi}
+			written. {not in Vi}


 Vim will warn you if you try to overwrite a file that has been changed
@@ -1114,7 +1108,6 @@ The names can be in upper- or lowercase.
 			window in the current tab page the current tab page is
 			closed |tab-page|.
 			Triggers the |QuitPre| autocommand event.
-			See |CTRL-W_q| for quitting another window.

 :conf[irm] q[uit]	Quit, but give prompt when changes have been made, or
 			the last file in the argument list has not been
@@ -1204,8 +1197,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}

 ==============================================================================
@@ -1335,11 +1327,9 @@ present in 'cpoptions' and "!" is not used in the command.
 :chd[ir][!] [path]	Same as |:cd|.

 							*:lc* *:lcd*
-:lc[d][!] {path}	Like |:cd|, but only set the current directory when
-			the cursor is in the current window.  The current
-			directory for other windows is not changed, switching
-			to another window will stop using {path}.
-			{not in Vi}
+:lc[d][!] {path}	Like |:cd|, but only set the current directory for the
+			current window.  The current directory for other
+			windows is not changed. {not in Vi}

 							*:lch* *:lchdir*
 :lch[dir][!]		Same as |:lcd|. {not in Vi}
@@ -1567,13 +1557,6 @@ If you want to automatically reload a file when it has been changed outside of
 Vim, set the 'autoread' option.  This doesn't work at the moment you write the
 file though, only when the file wasn't changed inside of Vim.

-If you do not want to be asked or automatically reload the file, you can use
-this: >
-	set buftype=nofile
-
-Or, when starting gvim from a shell: >
-	gvim file.log -c "set buftype=nofile"
-
 Note that if a FileChangedShell autocommand is defined you will not get a
 warning message or prompt.  The autocommand is expected to handle this.

@@ -1744,7 +1727,7 @@ There are three different types of searching:
   This searches the same directories, but in a different order.

   Note that completion for ":find", ":sfind", and ":tabfind" commands do not
-   currently work with 'path' items that contain a URL or use the double star
+   currently work with 'path' items that contain a url or use the double star
   with depth limiter (/usr/**2) or upward search (;) notations.

- vim:tw=78:ts=8:noet:ft=help:norl:
+ vim:tw=78:ts=8:ft=help:norl:
@@ -25,9 +25,11 @@ MS-Windows のメモ帳のような動作です。
 .PP
 引数や Vim についての詳細は vim(1) を参照してください。
 .PP
-オプション 'insertmode' が設定され、テキストを直接、入力できるようになります。
+オプション 'insertmode' が設定され、テキストを直接、入力できるようになりま
+す。
 .br
-コピーとペーストのキー操作が MS-Windows と同じになるように、マップが設定されます。
+コピーとペーストのキー操作が MS-Windows と同じになるように、マップが設定され
+ます。
 CTRL-X が切り取り、CTRL-C がコピー、CTRL-V がペーストです。
 標準の CTRL-V の操作は CTRL-Q に割り当てられます。
 .SH オプション
@@ -39,7 +41,8 @@ eVim の初期化スクリプト。
 .SH 別名
 evim は "gumbies のための Vim" とも呼ばれています。
 evim を使っているあなたはきっと、頭にハンカチをかぶっているのです。
-(訳注: gumbies は Monty Python に登場するおもしろ集団。ハンカチをかぶっている。)
+(訳注: gumbies は Monty Python に登場するおもしろ集団。ハンカチをかぶっ
+ている。)
 .SH 関連項目
 vim(1)
 .SH 著者
@@ -1,52 +0,0 @@
-EVIM(1)                                                                EVIM(1)
-
-
-
-NAME
-       evim - easy Vim, edit a file with Vim and setup for modeless editing
-
-SYNOPSIS
-       evim [options] [file ..]
-       eview
-
-DESCRIPTION
-       eVim starts Vim and sets options to make it behave like a modeless edi-
-       tor.  This is still Vim but used as  a  point-and-click  editor.   This
-       feels  a lot like using Notepad on MS-Windows.  eVim will always run in
-       the GUI, to enable the use of menus and toolbar.
-
-       Only to be used for people who really can't work with Vim in the normal
-       way.  Editing will be much less efficient.
-
-       eview  is  the  same, but starts in read-only mode.  It works just like
-       evim -R.
-
-       See vim(1) for details about Vim, options, etc.
-
-       The 'insertmode' option is set to be able to type text directly.
-       Mappings are setup to make Copy and  Paste  work  with  the  MS-Windows
-       keys.   CTRL-X  cuts  text,  CTRL-C copies text and CTRL-V pastes text.
-       Use CTRL-Q to obtain the original meaning of CTRL-V.
-
-OPTIONS
-       See vim(1).
-
-FILES
-       /usr/local/lib/vim/evim.vim
-                      The script loaded to initialize eVim.
-
-AKA
-       Also Known As "Vim for gumbies".  When using evim you are  expected  to
-       take  a  handkerchief,  make  a knot in each corner and wear it on your
-       head.
-
-SEE ALSO
-       vim(1)
-
-AUTHOR
-       Most of Vim was made by Bram Moolenaar, with a lot of help from others.
-       See the Help/Credits menu.
-
-
-
-                               2002 February 16                        EVIM(1)
@@ -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
@@ -266,4 +266,4 @@ changes made in the current line.

 For more information about the bugs refer to rileft.txt.

- vim:tw=78:ts=8:noet:ft=help:norl:
+ vim:tw=78:ts=8:ft=help:norl:
@@ -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: 2016 Sep 09


 		  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 each 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: >

@@ -357,12 +353,12 @@ define yourself.  There are a few ways to avoid this:
   You need to define your own mapping before the plugin is loaded (before
   editing a file of that type).  The plugin will then skip installing the
   default mapping.
-						*no_mail_maps*
+
 3. Disable defining mappings for a specific filetype by setting a variable,
   which contains the name of the filetype.  For the "mail" filetype this
   would be: >
 	:let no_mail_maps = 1
-<						*no_plugin_maps*
+
 4. Disable defining mappings for all filetypes by setting a variable: >
 	:let no_plugin_maps = 1
 <
@@ -577,8 +573,6 @@ Man {number} {name}

 Global mapping:
 <Leader>K	Displays the manual page for the word under the cursor.
-<Plug>ManPreGetPage  idem, allows for using a mapping: >
-			nmap <F1> <Plug>ManPreGetPage<CR>

 Local mappings:
 CTRL-]		Jump to the manual page for the word under the cursor.
@@ -606,17 +600,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 +651,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


@@ -649,12 +661,6 @@ Since the text for this plugin is rather long it has been put in a separate
 file: |pi_spec.txt|.


-RUST							*ft-rust*
-
-Since the text for this plugin is rather long it has been put in a separate
-file: |ft_rust.txt|.
-
-
 SQL							*ft-sql*

 Since the text for this plugin is rather long it has been put in a separate
@@ -676,23 +682,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:noet:ft=help:norl:
+ 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: 2016 Jan 02


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -64,7 +64,7 @@ whichever is lower.  These are empty or white lines and lines starting
 with a character in 'foldignore'.  White space is skipped before checking for
 characters in 'foldignore'.  For C use "#" to ignore preprocessor lines.

-When you want to ignore lines in another way, use the "expr" method.  The
+When you want to ignore lines in another way, use the 'expr' method.  The
 |indent()| function can be used in 'foldexpr' to get the indent of a line.


@@ -79,7 +79,7 @@ This will call a function to compute the fold level: >
 	:set foldexpr=MyFoldLevel(v:lnum)
 This will make a fold out of paragraphs separated by blank lines: >
 	:set foldexpr=getline(v:lnum)=~'^\\s*$'&&getline(v:lnum+1)=~'\\S'?'<1':1
-This does the same: >
+this does the same: >
 	:set foldexpr=getline(v:lnum-1)=~'^\\s*$'&&getline(v:lnum)=~'\\S'?'>1':1

 Note that backslashes must be used to escape characters that ":set" handles
@@ -139,7 +139,7 @@ fold level.  But note that foldlevel() may return -1 if the level is not known
 yet.  And it returns the level at the start of the line, while a fold might
 end in that line.

-It may happen that folds are not updated properly.  You can use |zx| or |zX|
+It may happened that folds are not updated properly.  You can use |zx| or |zX|
 to force updating folds.


@@ -203,7 +203,7 @@ and the level given by the marker:
 1. If a marker with the same fold level is encountered, the previous fold
   ends and another fold with the same level starts.
 2. If a marker with a higher fold level is found, a nested fold is started.
-3. If a marker with a lower fold level is found, all folds up to and including
+3. if a marker with a lower fold level is found, all folds up to and including
   this level end and a fold with the specified level starts.

 The number indicates the fold level.  A zero cannot be used (a marker with
@@ -601,4 +601,4 @@ used.  Otherwise the values from the window where the buffer was edited last
 are used.

 ==============================================================================
- vim:tw=78:ts=8:noet:ft=help:norl:
+ vim:tw=78:ts=8:ft=help:norl:
@@ -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~
@@ -116,7 +116,7 @@ NOTE: "gnat xref -v" is very tricky to use as it has almost no diagnostic
    then "gnat xref -v *.ad?"
 4)  Project manager support is completely broken - don't even try "gnat xref
    -Padacl.gpr".
-5)  Vim is faster when the tags file is sorted - use "sort --unique
+5)  VIM is faster when the tags file is sorted - use "sort --unique
    --ignore-case --output=tags tags" .
 6)  Remember to insert "!_TAG_FILE_SORTED 2 %sort ui" as first line to mark
    the file assorted.
@@ -249,7 +249,7 @@ g:decada.Make_Command	string
 		External command used for |g:decada.Make()| (|'makeprg'|).

 						       *g:decada.Error_Format*
-g:decada.Error_Format	string
+g:decada.Error_Format|	string
 		Error format (|'errorformat'|).

 ==============================================================================
@@ -1,239 +0,0 @@
-*ft_rust.txt*	For Vim version 8.1.  Last change: 2017 Nov 02
-
-This is documentation for the Rust filetype plugin.
-
-==============================================================================
-CONTENTS                                                      *rust*
-
-1. Introduction                                                   |rust-intro|
-2. Settings                                                    |rust-settings|
-3. Commands                                                    |rust-commands|
-4. Mappings                                                    |rust-mappings|
-
-==============================================================================
-INTRODUCTION                                                      *rust-intro*
-
-This plugin provides syntax and supporting functionality for the Rust
-filetype.
-
-==============================================================================
-SETTINGS                                                       *rust-settings*
-
-This plugin has a few variables you can define in your vimrc that change the
-behavior of the plugin.
-
-                                                                *g:rustc_path*
-g:rustc_path~
-	Set this option to the path to rustc for use in the |:RustRun| and
-	|:RustExpand| commands. If unset, "rustc" will be located in $PATH: >
-	    let g:rustc_path = $HOME."/bin/rustc"
-<
-
-                                                  *g:rustc_makeprg_no_percent*
-g:rustc_makeprg_no_percent~
-	Set this option to 1 to have 'makeprg' default to "rustc" instead of
-	"rustc %": >
-	    let g:rustc_makeprg_no_percent = 1
-<
-
-                                                              *g:rust_conceal*
-g:rust_conceal~
-	Set this option to turn on the basic |conceal| support: >
-	    let g:rust_conceal = 1
-<
-
-                                                     *g:rust_conceal_mod_path*
-g:rust_conceal_mod_path~
-	Set this option to turn on |conceal| for the path connecting token
-	"::": >
-	    let g:rust_conceal_mod_path = 1
-<
-
-                                                          *g:rust_conceal_pub*
-g:rust_conceal_pub~
-	Set this option to turn on |conceal| for the "pub" token: >
-	    let g:rust_conceal_pub = 1
-<
-
-                                                     *g:rust_recommended_style*
-g:rust_recommended_style~
-        Set this option to enable vim indentation and textwidth settings to
-        conform to style conventions of the rust standard library (i.e. use 4
-        spaces for indents and sets 'textwidth' to 99). This option is enabled
-	by default. To disable it: >
-	    let g:rust_recommended_style = 0
-<
-
-                                                                 *g:rust_fold*
-g:rust_fold~
-	Set this option to turn on |folding|: >
-	    let g:rust_fold = 1
-<
-	Value		Effect ~
-	0		No folding
-	1		Braced blocks are folded. All folds are open by
-			default.
-	2		Braced blocks are folded. 'foldlevel' is left at the
-			global value (all folds are closed by default).
-
-                                                  *g:rust_bang_comment_leader*
-g:rust_bang_comment_leader~
-	Set this option to 1 to preserve the leader on multi-line doc comments
-	using the /*! syntax: >
-	    let g:rust_bang_comment_leader = 1
-<
-
-                                                 *g:ftplugin_rust_source_path*
-g:ftplugin_rust_source_path~
-	Set this option to a path that should be prepended to 'path' for Rust
-	source files: >
-	    let g:ftplugin_rust_source_path = $HOME.'/dev/rust'
-<
-
-                                                       *g:rustfmt_command*
-g:rustfmt_command~
-	Set this option to the name of the 'rustfmt' executable in your $PATH. If
-	not specified it defaults to 'rustfmt' : >
-	    let g:rustfmt_command = 'rustfmt'
-<
-                                                       *g:rustfmt_autosave*
-g:rustfmt_autosave~
-	Set this option to 1 to run |:RustFmt| automatically when saving a
-	buffer. If not specified it defaults to 0 : >
-	    let g:rustfmt_autosave = 0
-<
-                                                       *g:rustfmt_fail_silently*
-g:rustfmt_fail_silently~
-	Set this option to 1 to prevent 'rustfmt' from populating the
-	|location-list| with errors. If not specified it defaults to 0: >
-	    let g:rustfmt_fail_silently = 0
-<
-                                                       *g:rustfmt_options*
-g:rustfmt_options~
-	Set this option to a string of options to pass to 'rustfmt'. The
-	write-mode is already set to 'overwrite'. If not specified it
-	defaults to '' : >
-	    let g:rustfmt_options = ''
-<
-
-                                                          *g:rust_playpen_url*
-g:rust_playpen_url~
-	Set this option to override the URL for the playpen to use: >
-	    let g:rust_playpen_url = 'https://play.rust-lang.org/'
-<
-
-                                                        *g:rust_shortener_url*
-g:rust_shortener_url~
-	Set this option to override the URL for the URL shortener: >
-	    let g:rust_shortener_url = 'https://is.gd/'
-<
-
-
-==============================================================================
-COMMANDS                                                       *rust-commands*
-
-:RustRun  [args]                                                    *:RustRun*
-:RustRun! [rustc-args] [--] [args]
-		Compiles and runs the current file. If it has unsaved changes,
-		it will be saved first using |:update|. If the current file is
-		an unnamed buffer, it will be written to a temporary file
-		first. The compiled binary is always placed in a temporary
-		directory, but is run from the current directory.
-
-		The arguments given to |:RustRun| will be passed to the
-		compiled binary.
-
-		If ! is specified, the arguments are passed to rustc instead.
-		A "--" argument will separate the rustc arguments from the
-		arguments passed to the binary.
-
-		If |g:rustc_path| is defined, it is used as the path to rustc.
-		Otherwise it is assumed rustc can be found in $PATH.
-
-:RustExpand  [args]                                              *:RustExpand*
-:RustExpand! [TYPE] [args]
-		Expands the current file using --pretty and displays the
-		results in a new split. If the current file has unsaved
-		changes, it will be saved first using |:update|. If the
-		current file is an unnamed buffer, it will be written to a
-		temporary file first.
-
-		The arguments given to |:RustExpand| will be passed to rustc.
-		This is largely intended for specifying various --cfg
-		configurations.
-
-		If ! is specified, the first argument is the expansion type to
-		pass to rustc --pretty. Otherwise it will default to
-		"expanded".
-
-		If |g:rustc_path| is defined, it is used as the path to rustc.
-		Otherwise it is assumed rustc can be found in $PATH.
-
-:RustEmitIr [args]                                               *:RustEmitIr*
-		Compiles the current file to LLVM IR and displays the results
-		in a new split. If the current file has unsaved changes, it
-		will be saved first using |:update|. If the current file is an
-		unnamed buffer, it will be written to a temporary file first.
-
-		The arguments given to |:RustEmitIr| will be passed to rustc.
-
-		If |g:rustc_path| is defined, it is used as the path to rustc.
-		Otherwise it is assumed rustc can be found in $PATH.
-
-:RustEmitAsm [args]                                             *:RustEmitAsm*
-		Compiles the current file to assembly and displays the results
-		in a new split. If the current file has unsaved changes, it
-		will be saved first using |:update|. If the current file is an
-		unnamed buffer, it will be written to a temporary file first.
-
-		The arguments given to |:RustEmitAsm| will be passed to rustc.
-
-		If |g:rustc_path| is defined, it is used as the path to rustc.
-		Otherwise it is assumed rustc can be found in $PATH.
-
-:RustPlay                                                          *:RustPlay*
-		This command will only work if you have web-api.vim installed
-		(available at https://github.com/mattn/webapi-vim).  It sends the
-		current selection, or if nothing is selected, the entirety of the
-		current buffer to the Rust playpen, and emits a message with the
-		shortened URL to the playpen.
-
-		|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
-		default "https://is.gd/"
-
-:RustFmt                                                       *:RustFmt*
-		Runs |g:rustfmt_command| on the current buffer. If
-		|g:rustfmt_options| is set then those will be passed to the
-		executable.
-
-		If |g:rustfmt_fail_silently| is 0 (the default) then it
-		will populate the |location-list| with the errors from
-		|g:rustfmt_command|. If |g:rustfmt_fail_silently| is set to 1
-		then it will not populate the |location-list|.
-
-:RustFmtRange                                                  *:RustFmtRange*
-		Runs |g:rustfmt_command| with selected range. See
-		|:RustFmt| for any other information.
-
-==============================================================================
-MAPPINGS                                                       *rust-mappings*
-
-This plugin defines mappings for |[[| and |]]| to support hanging indents.
-
-It also has a few other mappings:
-
-							*rust_<D-r>*
-<D-r>			Executes |:RustRun| with no arguments.
-			Note: This binding is only available in MacVim.
-
-							*rust_<D-R>*
-<D-R>			Populates the command line with |:RustRun|! using the
-			arguments given to the last invocation, but does not
-			execute it.
-			Note: This binding is only available in MacVim.
-
-==============================================================================
- vim:tw=78:sw=4:ts=8:noet:ft=help:norl:
@@ -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

@@ -777,4 +777,4 @@ Setting the filetype back to Perl sets all the usual "perl" related items back
 as they were.


-vim:tw=78:ts=8:noet:ft=help:norl:
+vim:tw=78:ts=8:ft=help:norl:
@@ -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: 2014 Mar 08


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -67,7 +67,7 @@ When the GUI starts up initializations are carried out, in this order:
    executed as an Ex command.
  - If the user gvimrc file exists, it is sourced.  The name of this file is
    normally "$HOME/.gvimrc".  You can check this with ":version".
-  - For Win32, $HOME is set by Vim if needed, see |$HOME-windows|.
+  - For Win32, when $HOME is not set, "$VIM\_gvimrc" is used.
  - When a "_gvimrc" file is not found, ".gvimrc" is tried too.  And vice
    versa.
  The name of the first file found is stored in $MYGVIMRC, unless it was
@@ -79,8 +79,7 @@ When the GUI starts up initializations are carried out, in this order:
  and DOS/Win32 "_gvimrc" is tried first.

 NOTE: All but the first one are not carried out if Vim was started with
-"-u NONE" or "-u DEFAULTS" and no "-U" argument was given, or when started
-with "-U NONE".
+"-u NONE" and no "-U" argument was given, or when started with "-U NONE".

 All this happens AFTER the normal Vim initializations, like reading your
 .vimrc file.  See |initialization|.
@@ -134,7 +133,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 +161,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 +481,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 +497,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
@@ -801,40 +784,10 @@ In the Win32 and GTK+ GUI, starting a menu name with ']' excludes that menu
 from the main menu bar.  You must then use the |:popup| or |:tearoff| command
 to display it.

-					*window-toolbar* *WinBar*
-Each window can have a local toolbar.  This uses the first line of the window,
-thus reduces the space for the text by one line.  The items in the toolbar
-must start with "WinBar".
-
-Only text can be used.  When using Unicode, special characters can be used to
-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>
-<
-The window toolbar uses the ToolbarLine and ToolbarButton highlight groups.
-
-When splitting the window the window toolbar is not copied to the new window.
-
 							*popup-menu*
 In the Win32, GTK+, Motif, Athena and Photon GUI, you can define the
 special menu "PopUp".  This is the menu that is displayed when the right mouse
 button is pressed, if 'mousemodel' is set to popup or popup_setpos.
-Example: >
-    nnoremenu 1.40 PopUp.&Paste	"+gP
-    menu PopUp


 5.3 Showing What Menus Are Mapped To			*showing-menus*
@@ -993,15 +946,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 +960,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.

 ==============================================================================
@@ -1079,4 +1023,4 @@ careful!
 For the Win32 GUI the external commands are executed in a separate window.
 See |gui-shell-win32|.

- vim:tw=78:sw=4:ts=8:noet:ft=help:norl:
+ vim:tw=78:sw=4:ts=8:ft=help:norl:
@@ -12,15 +12,14 @@ The MacVim Graphical User Interface			*macvim* *gui-macvim*
 4. Special colors		|macvim-colors|
 5. Menus			|macvim-menus|
 6. Toolbar			|macvim-toolbar|
- 7. Touch Bar			|macvim-touchbar|
- 8. Dialogs			|macvim-dialogs|
- 9. System services		|macvim-services|
-10. mvim:// URL handler		|macvim-url-handler|
-11. Keyboard shortcuts		|macvim-shortcuts|
-12. Trackpad gestures		|macvim-gestures|
-13. International		|macvim-international|
-14. Known bugs/missing features	|macvim-todo|
-15. Hints			|macvim-hints|
+ 7. Dialogs			|macvim-dialogs|
+ 8. System services		|macvim-services|
+ 9. mvim:// URL handler		|macvim-url-handler|
+10. Keyboard shortcuts		|macvim-shortcuts|
+11. Trackpad gestures		|macvim-gestures|
+12. International		|macvim-international|
+13. Known bugs/missing features	|macvim-todo|
+14. Hints			|macvim-hints|

 Other relevant documentation:
 |gui.txt|	For generic items of the GUI.
@@ -159,36 +158,55 @@ have files open in e.g. splits by changing the "Open files from applications"
 option in the General preference pane).  Finally, you can use Mac OS X System
 Services to open files in MacVim, see |macvim-services|.

-Use |mvim| script to start MacVim from Terminal.
-
-Or use the "open" command (this method can not be used to pass parameters to
+There are essentially two ways to start MacVim from Terminal: either call the
+Vim binary with the -g switch >
+	/Applications/MacVim.app/Contents/MacOS/Vim -g file ...
+or use the "open" command (this method can not be used to pass parameters to
 Vim) >
 	open -a MacVim file ...
 The advantage of using the latter method is that the settings relating to file
 opening in the preferences panel are respected, and files open instantly if
 |Quickstart| is enabled.

+To save yourself from having to type the entire path to the Vim binary each
+time you start MacVim, you could create an alias such as >
+	alias gvim='/Applications/MacVim.app/Contents/MacOS/Vim -g'
+and add that to "~/.profile".
+
+Note: Do NOT call the MacVim binary inside the app bundle to start MacVim.
+
+							*mvim*
+A more flexible way to start MacVim is to use the shell script "mvim" which
+comes bundled with MacVim.  Put this script in a folder in your path and then
+simply type "mvim" to start MacVim.  This script will try to find MacVim.app
+in various typical folders such as >
+	~/Applications              ~/Applications/vim
+	/Applications               /Applications/vim
+	/Applications/Utilities     /Applications/Utilities/vim
+If you would rather put MacVim.app in some other directory then that is also
+possible, simply set the environment variable VIM_APP_DIR to whatever folder
+you have placed MacVim.app in.
+
+The "mvim" script can be symlinked to in order to start up MacVim in different
+modes as follows (assuming you placed "mvim" in "/usr/local/bin"): >
+	* Diff:		ln -s /usr/local/bin/mvim mvimdiff
+	* Read-only:	ln -s /usr/local/bin/mvim mview
+	* Ex:		ln -s /usr/local/bin/mvim mex
+	* Restricted:	ln -s /usr/local/bin/mvim rmvim
+If the symlink destination starts with "m" (or "g"), Vim will start in GUI
+mode.  Removing the initial "m" from the above destination names makes Vim
+start without the GUI.  (In the last case, the destination name can be
+"rmvim", "rgvim" or "rvim".)
+
+Note: Starting MacVim by creating a symlink to >
+	.../MacVim.app/Contents/MacOS/Vim
+with 'ln -s' does not work.
+
 Once in terminal Vim it is possible to start MacVim by using the following
 command:
 	:gui [++opt] [+cmd] [-f|-b] [files...]
 Note: Forking ("-b") currently does not work.

-							*mvim*
-The "mvim" shell script bundled with MacVim. >
-	/Applications/MacVim.app/Contents/bin/mvim
-This is a wrapper script to launch Vim executable in the bundle.  Put this
-folder >
-	/Applications/MacVim.app/Contents/bin
-in your path and then simply type "mvim" to start MacVim from Terminal. >
-	$ mvim
-You can also specify files to open with. >
-	$ mvim file ...
-Also the bin folder has convenient scripts for diffing and opening file as the file is read-only. >
-	* Diff:		mvimdiff
-	* Read-only:	mview
-
-You can use "vim", "vimdiff", and "view" if you want to use non-GUI Vim.
-
 							*Quickstart*
 Quickstart ensures that new windows open instantaneously e.g. when <D-n> is
 pressed.  This feature can be enabled from the Advanced preferences pane (it
@@ -243,7 +261,6 @@ MMLoginShellArgument		login shell parameter [string]
 MMLoginShellCommand		which shell to use to launch Vim [string]
 MMNoFontSubstitution		disable automatic font substitution [bool]
 MMNoTitleBarWindow		hide title bar [bool]
-MMShareFindPboard		share search text to Find Pasteboard [bool]
 MMShowAddTabButton		enable "add tab" button on tabline [bool]
 MMTabMaxWidth			maximum width of a tab [int]
 MMTabMinWidth			minimum width of a tab [int]
@@ -346,7 +363,7 @@ associated: a title, a key equivalent and an action message.  When a menu is
 displayed the title is shown on the left and the key equivalent (if any) is
 shown on the right.  Key equivalents enable you to access a menu item using
 the keyboard instead of having to use the mouse.  When a menu item is clicked
-it will send its associated action message.  Actions can be used to instruct
+it will send it's associated action message.  Actions can be used to instruct
 MacVim to paste some text (paste:), open a new window (newWindow:), etc.
 Certain actions are standard throughout OS X which is why MacVim must be able
 to set these for each menu item.  (E.g. the menu item "Edit.Paste" must be
@@ -468,47 +485,19 @@ empty space which will shink or expand so that the items to the right of it
 are right-aligned.  A space (flexspace) will be created for any toolbar item
 whose name begins with "-space" ("-flexspace") and ends with "-"

-Toolbar icons should be tiff, png, icns, or heic, of dimension 32x32 or 24x24
-pixels.  The larger size is used when 'tbis' is "medium" or "large", otherwise
-the smaller size is used (which is the default).  If the icon file only
-contains one dimension then Mac OS X will scale the icon to the appropriate
-dimension if necessary.  To avoid this, use a file format which supports
-multiple resolutions (such as icns) and provide both 32x32 and 24x24 versions
-of the icon.
+Toolbar icons should be tiff, png or icns, of dimension 32x32 or 24x24 pixels.
+The larger size is used when 'tbis' is "medium" or "large", otherwise the
+smaller size is used (which is the default).  If the icon file only contains
+one dimension then Mac OS X will scale the icon to the appropriate dimension
+if necessary.  To avoid this, use a file format which supports multiple
+resolutions (such as icns) and provide both 32x32 and 24x24 versions of the
+icon.

 Note: Only a subset of the builtin toolbar items presently have icons.  If no
 icon can be found a warning triangle is displayed instead.

 ==============================================================================
-7. Touch Bar						*macvim-touchbar*
-
-Touch Bar in MacVim works similar to the toolbar (see |macvim-toolbar|).  The
-difference is that you use the special menu "TouchBar" instead of "ToolBar": >
-	:an TouchBar.Hello          :echo "Hello"<CR>
-
-The separators work similar to how toolbars work: >
-	:an TouchBar.-Sep-          <Nop>
-	:an TouchBar.-space1-       <Nop>
-	:an TouchBar.-flexspace2-   <Nop>
-
-The first example is a Vim separator (see |menu-separator|) and injects a
-space between two buttons. The second creates a smaller space than a normal
-separator and are specified by names that begin with "-space" and ends with
-"-". The third creates a flexible empty space which will shrink or expand so
-that items after it will be right-aligned, and is specified by names that
-begin with "-flexspace" and ends with "-".
-
-You can specify icons for Touch Bar buttons the same way for toolbar icons.
-Touch Bar icons should ideally be 36x36 pixels, and no larger than 44x44
-pixels. You can also use default template icons provided by Apple by using
-their template names. An example: >
-	:an icon=NSTouchBarListViewTemplate TouchBar.ShowList <Nop>
-
-This feature only works on Mac devices that come with Touch Bars. On the ones
-that don't, nothing will show up.
-
-==============================================================================
-8. Dialogs						*macvim-dialogs*
+7. Dialogs						*macvim-dialogs*

 Dialogs can be controlled with the keyboard in two ways.  By default each
 button in a dialog is bound to a key.  The button that is highlighted by blue
@@ -527,7 +516,7 @@ select the current button.  The current button is indicated with a blue
 outline.

 ==============================================================================
-9. System services					*macvim-services*
+8. System services					*macvim-services*

 MacVim supports two system services.  These can be accessed from the MacVim
 submenu in the Services menu or by right-clicking a selection.  For services
@@ -545,7 +534,7 @@ The services respect the "Open files from applications" setting in the general
 preferences.

 ==============================================================================
-10. mvim:// URL handler				*mvim://* *macvim-url-handler*
+9. mvim:// URL handler				*mvim://* *macvim-url-handler*

 MacVim supports a custom URL handler for "mvim://" URLs. The handler is
 supposed to be compatible to TextMate's URL scheme as documented at >
@@ -566,7 +555,7 @@ will open the file /etc/profile on line 20 when clicked in a web browser.
 Note that url has to be a file:// url pointing to an existing local file.

 ==============================================================================
-11. Keyboard shortcuts					*macvim-shortcuts*
+10. Keyboard shortcuts					*macvim-shortcuts*

 Most keyboard shortcuts in MacVim are bound to menu items and can be
 discovered by looking through the menus (see |macvim-menus| on how to create
@@ -646,7 +635,7 @@ sometimes be slightly involved.  Here are all the things you need to consider:
 - A few command key mappings are set up by MacVim, see |cmd-movement|.

 ==============================================================================
-12. Trackpad gestures					*macvim-gestures*
+11. Trackpad gestures					*macvim-gestures*

 MacVim supports trackpad swipe gestures.  By default this can be used to
 navigate back/forward in the help (try it!).
@@ -662,10 +651,6 @@ Each gesture generates one of the following Vim pseudo keys:
 	Generated when swiping three fingers across the trackpad in a
 	vertical direction.  (Not supported by the Apple Magic Mouse.)

-						 *<ForceClick>*
-	Generated when doing a Force click by pressing hard on a trackpad.
-	(Only supported on trackpads that support Force Touch.)
-
 You can map these keys like with any other key using the |:map| family of
 commands.  For example, the following commands map left/right swipe to change
 to the previous/next tab in normal mode: >
@@ -681,7 +666,7 @@ As another example, here is how to switch buffers by swiping left/right: >
 See the section on |key-mapping| for more help on how to map keys.

 ==============================================================================
-13. International					*macvim-international*
+12. International					*macvim-international*

 When editing non-English text it may be convenient to keep separate keyboard
 layouts for normal and insert mode.  This is supported via the 'imd' option on
@@ -702,7 +687,7 @@ wrong layout when going back to normal mode, then select the layout you want
 to use in normal mode and type ":set imd" followed by ":set noimd".

 ==============================================================================
-14. Known bugs/missing features				*macvim-todo*
+13. Known bugs/missing features				*macvim-todo*

 This list is by no means exhaustive, it only enumerates some of the more
 prominent bugs/missing features.
@@ -719,14 +704,14 @@ prominent bugs/missing features.
 - The toolbar looks ugly and is not very useful.

 If you find new bugs then please post your findings to the vim_mac mailing
-list:							*vim_mac_group*   >
+list:							*vim_mac*   >
 	http://groups.google.com/group/vim_mac

 This is also the best place for making feature requests as well as for asking
 general questions about MacVim.

 ==============================================================================
-15. Hints						*macvim-hints*
+14. Hints						*macvim-hints*

 In this section some general (not necessarily MacVim specific) hints are
 given.
@@ -838,4 +823,4 @@ page.
 Solution: ~
 Post your question on the |vim_mac| mailing list and wait for an answer.

- vim:tw=78:sw=4:ts=8:noet:ft=help:norl:
+ vim:tw=78:sw=4:ts=8:ft=help:norl:
@@ -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
@@ -49,6 +49,10 @@ If you want Vim to start with a maximized window, add this command to your
 vimrc or gvimrc file: >
 	au GUIEnter * simalt ~x
 <
+								*gui-w32s*
+There is a specific version of gvim.exe that runs under the Win32s subsystem
+of Windows 3.1 or 3.11.  See |win32s|.
+

 Using Vim as a plugin					*gui-w32-windowid*

@@ -96,10 +100,9 @@ when you have got a new version):
 You can also install Vim in the "Send To" menu:
 1. Start a Windows Explorer
 2. Navigate to your sendto directory:
+   Windows 95: %windir%\sendto (e.g. "c:\windows\sendto")
   Windows NT: %windir%\profiles\%user%\sendto (e.g.
-	       "c:\winnt\profiles\mattha\sendto")
-   Windows XP: C:\Documents and Settings\%user%\SendTo
-   Windows Vista: C:\Users\%user%\AppData\Roaming\Microsoft\Windows\SendTo .
+	       "c:\winnt\profiles\mattha\sendto").
 3. Right-click in the file pane and select New->Shortcut
 4. Follow the shortcut wizard, using the full path to VIM/GVIM.

@@ -271,17 +274,35 @@ WARNING: If you close this window with the "X" button, and confirm the
 question if you really want to kill the application, Vim may be killed too!
 (This does not apply to commands run asynchronously with ":!start".)

-The window in which the commands are executed will be the default you have set
-up for "Console" in Control Panel.
+In Windows 95, the window in which the commands are executed is always 25x80
+characters, to be as DOS compatible as possible (this matters!).  The default
+system font is used.  On NT, the window will be the default you have set up for
+"Console" in Control Panel.  On Win32s, the properties of the DOS box are
+determined by _default.pif in the windows directory.
+
+							*msdos-mode*
+If you get a dialog that says "This program is set to run in MS-DOS mode..."
+when you run an external program, you can solve this by changing the
+properties of the associated shortcut:
+- Use a Windows Explorer to find the command.com that is used.  It can be
+  c:\command.com, c:\dos\command.com, c:\windows\command.com, etc.
+- With the right mouse button, select properties of this command.com.
+- In the Program tab select "Advanced".
+- Unselect "MS-DOS mode".
+- Click "OK" twice.

 							*win32-!start*
 Normally, Vim waits for a command to complete before continuing (this makes
 sense for most shell commands which produce output for Vim to use).  If you
 want Vim to start a program and return immediately, you can use the following
-syntax: >
+syntax on W95 & NT: >
 	:!start [/min] {command}
 The optional "/min" causes the window to be minimized.

+On Win32s, you will have to go to another window instead.  Don't forget that
+you must tell Windows 3.1x to keep executing a DOS command in the background
+while you switch back to Vim.
+
 ==============================================================================
 5. Special colors					*win32-colors*

@@ -290,7 +311,7 @@ On Win32, the normal DOS colors can be used.  See |dos-colors|.
 Additionally the system configured colors can also be used.  These are known
 by the names Sys_XXX, where XXX is the appropriate system color name, from the
 following list (see the Win32 documentation for full descriptions).  Case is
-ignored.
+ignored.  Note: On Win32s not all of these colors are supported.

 Sys_3DDKShadow		Sys_3DFace			Sys_BTNFace
 Sys_3DHilight		Sys_3DHighlight			Sys_BTNHilight
@@ -382,8 +403,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*
@@ -442,7 +493,7 @@ with the Intellimouse driver 2.2 and when "Universal Scrolling" is turned on.

 XPM support						*w32-xpm-support*

-GVim can be build on MS-Windows with support for XPM files.  |+xpm_w32|
+Gvim can be build on MS-Windows with support for XPM files.  |+xpm_w32|
 See the Make_mvc.mak file for instructions, search for XPM.

 To try out if XPM support works do this: >
@@ -451,4 +502,4 @@ To try out if XPM support works do this: >
 	:exe 'sign place 1 line=1 name=vimxpm file=' . expand('%:p')
 <

- vim:tw=78:sw=4:ts=8:noet:ft=help:norl:
+ vim:tw=78:sw=4:ts=8:ft=help:norl:
@@ -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: 2016 Sep 12


 		  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.

@@ -291,9 +288,8 @@ For CDE "dtwm" (a derivative of Motif) add this line in the .Xdefaults: >
 For "mwm" (Motif window manager) the line would be: >
   Mwm*Vim*iconImage: /usr/local/share/vim/vim32x32.xpm

+Mouse Pointers Available in X11				*X11_mouse_shapes*

-Mouse Pointers Available in X11 ~
-						*X11_mouse_shapes*
 By using the |'mouseshape'| option, the mouse pointer can be automatically
 changed whenever Vim enters one of its various modes (e.g., Insert or
 Command).  Currently, the available pointers are:
@@ -367,9 +363,7 @@ to the GTK documentation, however little there is, on how to do this.
 See http://developer.gnome.org/doc/API/2.0/gtk/gtk-Resource-Files.html
 for more information.

-
-Tooltip Colors ~
-							*gtk-tooltip-colors*
+						*gtk-tooltip-colors*
 Example, which sets the tooltip colors to black on light-yellow: >

 	style "tooltips"
@@ -387,122 +381,15 @@ distribution.
 For GTK+ 3, an effect similar to the above can be obtained by adding the
 following snippet of CSS code to $XDG_HOME_DIR/gtk-3.0/gtk.css (usually,
 $HOME/.config/gtk-3.0/gtk.css):
-
-For GTK+ 3 < 3.20: >
-
+ >
 	.tooltip {
 		background-color: #ffffcc;
 		color: #000000;
 	}
 <
-For GTK+ 3 >= 3.20: >

-	tooltip {
-	    background-color: #ffffcc;
-	    text-shadow: none;
-	}
+Using Vim as a GTK+ plugin				*gui-gtk-socketid*

-	tooltip label {
-	    color: #2e3436;
-	}
-<
-
-A Quick Look at GTK+ CSS ~
-							*gtk-css*
-The contents of this subsection apply to GTK+ 3.20 or later which provides
-stable support for GTK+ CSS:
-
-	https://developer.gnome.org/gtk3/stable/theming.html
-
-GTK+ uses CSS for styling and layout of widgets.  In this subsection, we'll
-have a quick look at GTK+ CSS through simple, illustrative examples.
-
-Example 1.  Empty Space Adjustment ~
-
-By default, the toolbar and the tabline of the GTK+ 3 GUI are somewhat larger
-than those of the GTK+ 2 GUI.  Some people may want to make them look similar
-to the GTK+ 2 GUI in size.
-
-To do that, we'll try reducing empty space around icons and labels that looks
-apparently superfluous.
-
-Add the following lines to $XDG_HOME_DIR/gtk-3.0/gtk.css (usually,
-$HOME/.config/gtk-3.0/gtk.css): >
-
-	toolbar button {
-	    margin-top: -2px;
-	    margin-right: 0px;
-	    margin-bottom: -2px;
-	    margin-left: 0px;
-
-	    padding-top: 0px;
-	    padding-right: 0px;
-	    padding-bottom: 0px;
-	    padding-left: 0px
-	}
-
-	notebook tab {
-	    margin-top: -1px;
-	    margin-right: 3px;
-	    margin-bottom: -1px;
-	    margin-left: 3px;
-
-	    padding-top: 0px;
-	    padding-right: 0px;
-	    padding-bottom: 0px;
-	    padding-left: 0px
-	}
-<
-Since it's a CSS, they can be rewritten using shorthand: >
-
-	toolbar button {
-	    margin: -2px 0px;
-	    padding: 0px;
-	}
-
-	notebook tab {
-	    margin: -1px 3px;
-	    padding: 0px
-	}
-<
-Note: You might want to use 'toolbariconsize' to adjust the icon size, too.
-
-Note: Depending on the icon theme and/or the font in use, some extra tweaks
-may be needed for a satisfactory result.
-
-Note: In addition to margin and padding, you can use border.  For details,
-refer to the box model of CSS, e.g.,
-
-	https://www.w3schools.com/css/css_boxmodel.asp
-
-Example 2.  More Than Just Colors ~
-
-GTK+ CSS supports gradients as well: >
-
-	tooltip {
-	    background-image: -gtk-gradient(linear,
-					    0 0, 0 1,
-					    color-stop(0, #344752),
-					    color-stop(0.5, #546772),
-					    color-stop(1, #243742));
-	}
-
-	tooltip label {
-	    color: #f3f3f3;
-	}
-<
-Gradients can be used to make a GUI element visually distinguishable from
-others without relying on high contrast. Accordingly, effective use of them is
-a useful technique to give a theme a sense of unity in color and luminance.
-
-Note: Theming can be difficult since it must make every application look
-equally good; making a single application more charming often gets others
-unexpectedly less attractive or even deteriorates their usability.  Keep this
-in mind always when you try improving a theme.
-
-
-Using Vim as a GTK+ plugin ~
-							*gui-gtk-socketid*
 When the GTK+ version of Vim starts up normally, it creates its own top level
 window (technically, a 'GtkWindow').  GTK+ provides an embedding facility with
 its GtkSocket and GtkPlug widgets.  If one GTK+ application creates a
@@ -547,8 +434,8 @@ Note: Avoid use of --enable-gnome-check with GTK+ 3 GUI build.  The
 functionality mentioned above is consolidated in GTK+ 3.


-GNOME session support ~
-					*gui-gnome-session* *gnome-session*
+GNOME session support			*gui-gnome-session* *gnome-session*
+
 On logout, Vim shows the well-known exit confirmation dialog if any buffers
 are modified.  Clicking [Cancel] will stop the logout process.  Otherwise the
 current session is stored to disk by using the |:mksession| command, and
@@ -685,7 +572,7 @@ Of these three, Vim uses PRIMARY when reading and writing the "* register
 register.  Vim does not access the SECONDARY selection.

 Examples: (assuming the default option values)
- Select a URL in Visual mode in Vim.  Go to your browser and click the
+- Select an URL in Visual mode in Vim.  Go to your browser and click the
  middle mouse button in the URL text field.  The selected text will be
  inserted (hopefully!).  Note: in Firefox you can set the
  middlemouse.contentLoadURL preference to true in about:config, then the
@@ -730,4 +617,4 @@ and use CLIPBOARD ("+) for cut/copy/paste operations.  You thus have access to
 both by choosing to use either of the "* or "+ registers.


- vim:tw=78:sw=4:ts=8:noet:ft=help:norl:
+ vim:tw=78:sw=4:ts=8:ft=help:norl:
@@ -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
@@ -6,7 +6,7 @@

 Introduction					*hangul*
 ------------
-It is to input hangul, the Korean language, with Vim GUI version.
+It is to input hangul, the Korean language, with VIM GUI version.
 If you have a XIM program, you can use another |+xim| feature.
 Basically, it is for anybody who has no XIM program.

@@ -31,7 +31,7 @@ You should set LANG variable to Korean locale such as ko, ko_KR.eucKR
 or ko_KR.UTF-8.
 If you set LC_ALL variable, it should be set to Korean locale also.

-Vim resource
+VIM resource
 ------------
 You may want to set 'encoding' and 'fileencodings'.
 Next are examples: >
@@ -53,12 +53,12 @@ If both are set, VIM_KEYBOARD has higher priority.

 Hangul Fonts
 ------------
-If you use GTK version of gvim, you should set 'guifont' and 'guifontwide'.
+If you use GTK version of GVIM, you should set 'guifont' and 'guifontwide'.
 For example: >
    set guifont=Courier\ 12
    set guifontwide=NanumGothicCoding\ 12

-If you use Motif or Athena version of gvim, you should set 'guifontset' in
+If you use Motif or Athena version of GVIM, you should set 'guifontset' in
 your vimrc.  You can set fontset in the .Xdefaults file.

 $HOME/.gvimrc: >
@@ -77,12 +77,12 @@ $HOME/.Xdefaults: >

 attention! the , (comma) or ; (semicolon)

-And there should be no ':set guifont'.  If it exists, then gvim ignores
-':set guifontset'.  It means Vim runs without fontset supporting.
+And there should be no ':set guifont'.  If it exists, then Gvim ignores
+':set guifontset'.  It means VIM runs without fontset supporting.
 So, you can see only English.  Hangul does not be correctly displayed.

-After "fontset" feature is enabled, Vim does not allow using english
-font only in "font" setting for syntax.
+After 'fontset' feature is enabled, VIM does not allow using english
+font only in 'font' setting for syntax.
 For example, if you use >
   :set guifontset=eng_font,your_font
 in your .gvimrc, then you should do for syntax >
@@ -99,7 +99,7 @@ We don't support Johab font.
 We don't support Hanja input.
 And We don't have any plan to support them.

-If you really need such features, you can use console version of Vim with a
+If you really need such features, you can use console version of VIM with a
 capable terminal emulator.

 Bug or Comment
@@ -109,4 +109,4 @@ Send comments, patches and suggestions to:
 				    SungHyun Nam <goweol@gmail.com>
 				    Chi-Deok Hwang <...>

- vim:tw=78:ts=8:noet:ft=help:norl:
+ vim:tw=78:ts=8:ft=help:norl:
@@ -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)
@@ -139,4 +139,4 @@ The result is that all Hebrew characters are displayed as ~x.  To solve this
 problem, set isprint=@,128-255.


- vim:tw=78:ts=8:noet:ft=help:norl:
+ vim:tw=78:ts=8:ft=help:norl:
@@ -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
@@ -31,7 +31,7 @@ Get specific help:  It is possible to go directly to whatever you want help
 		    help entries for "word".
 		    Or use ":helpgrep word". |:helpgrep|

-Vim stands for Vi IMproved.  Most of Vim was made by Bram Moolenaar, but only
+VIM stands for Vi IMproved.  Most of VIM was made by Bram Moolenaar, but only
 through the help of many others.  See |credits|.
 ------------------------------------------------------------------------------
 						*doc-file-list* *Q_ct*
@@ -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
@@ -226,4 +223,4 @@ will try to find help for it.  Especially for options in single quotes, e.g.
 'compatible'.

 ------------------------------------------------------------------------------
- vim:tw=78:fo=tcq2:isk=!-~,^*,^\|,^\":ts=8:noet:ft=help:norl:
+ vim:tw=78:fo=tcq2:isk=!-~,^*,^\|,^\":ts=8:ft=help:norl:
@@ -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: 2016 Apr 01


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -28,16 +28,10 @@ Help on help files					*helphelp*

 						*{subject}* *E149* *E661*
 :h[elp] {subject}	Like ":help", additionally jump to the tag {subject}.
-			For example:  >
-				:help options
-
-<			{subject} can include wildcards such as "*", "?" and
+			{subject} can include wildcards like "*", "?" and
 			"[a-z]":
 			   :help z?	jump to help for any "z" command
 			   :help z.	jump to the help for "z."
-			But when a tag exists it is taken literally:
-			   :help :?	jump to help for ":?"
-
 			If there is no full match for the pattern, or there
 			are several matches, the "best" match will be used.
 			A sophisticated algorithm is used to decide which
@@ -74,19 +68,18 @@ Help on help files					*helphelp*
 			example to find help for CTRL-V in Insert mode: >
 				:help i^V
 <
-			It is also possible to first do ":help" and then
+			To use a regexp |pattern|, first do ":help" and then
 			use ":tag {pattern}" in the help window.  The
 			":tnext" command can then be used to jump to other
 			matches, "tselect" to list matches and choose one. >
-				:help index
-				:tselect /.*mode
+				:help index| :tse z.

 <			When there is no argument you will see matches for
 			"help", to avoid listing all possible matches (that
 			would be very slow).
 			The number of matches displayed is limited to 300.

-			The `:help` command can be followed by '|' and another
+			This command can be followed by '|' and another
 			command, but you don't need to escape the '|' inside a
 			help command.  So these both work: >
 				:help |
@@ -142,8 +135,7 @@ Help on help files					*helphelp*
 			already opened, then the location list for that window
 			is used.  Otherwise, a new help window is opened and
 			the location list for that window is set.  The
-			location list for the current window is not changed
-			then.
+			location list for the current window is not changed.

 							*:exu* *:exusage*
 :exu[sage]		Show help on Ex commands.  Added to simulate the Nvi
@@ -315,7 +307,7 @@ the applicable Vim version.  The last field specifies the last modification
 date of the file.  Each field is separated by a tab.

 At the bottom of the help file, place a Vim modeline to set the 'textwidth'
-and 'tabstop' options and the 'filetype' to "help".  Never set a global option
+and 'tabstop' options and the 'filetype' to 'help'.  Never set a global option
 in such a modeline, that can have consequences undesired by whoever reads that
 help.

@@ -370,4 +362,4 @@ highlighting.  So do these:

 You can find the details in $VIMRUNTIME/syntax/help.vim

- vim:tw=78:ts=8:noet:ft=help:norl:
+ vim:tw=78:ts=8:ft=help:norl:
@@ -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
@@ -93,4 +93,4 @@ How to ...				*howdoi* *how-do-i* *howto* *how-to*
 |2html.vim|		convert a colored file to HTML
 |less|			use Vim like less or more with syntax highlighting

- vim:tw=78:ts=8:noet:ft=help:norl:
+ vim:tw=78:ts=8:ft=help:norl:
@@ -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: 2011 Jun 12


 		  VIM REFERENCE MANUAL    by Andy Kahn
@@ -91,10 +91,9 @@ suggested use.)
 2. Cscope related commands				*cscope-commands*

 		*:cscope* *:cs* *:scs* *:scscope* *E259* *E262* *E561* *E560*
-All cscope commands are accessed through suboptions to the cscope commands.
-	`:cscope` or `:cs` is the main command
-	`:scscope` or `:scs` does the same and splits the window
-	`:lcscope` or `:lcs` uses the location list, see |:lcscope|
+All cscope commands are accessed through suboptions to the main cscope
+command ":cscope".  The shortest abbreviation is ":cs".  The ":scscope"
+command does the same and also splits the window (short: "scs").

 The available subcommands are:

@@ -468,20 +467,38 @@ 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.

- vim:tw=78:ts=8:noet:ft=help:norl:
+ vim:tw=78:ts=8:ft=help:norl:
@@ -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
@@ -125,9 +125,9 @@ Vim evaluation and command execution, and others.
 				Non-numeric keys are not used to initialize
 				the list. See also |lua-eval| for conversion
 				rules. Example: >
-				    :lua t = {math.pi, false, say = 'hi'}
-				    :echo luaeval('vim.list(t)')
-				    :" [3.141593, v:false], 'say' is ignored
+					:lua t = {math.pi, false, say = 'hi'}
+					:echo luaeval('vim.list(t)')
+					:" [3.141593, 0], 'say' is ignored
 <
 	vim.dict([arg])		Returns an empty dictionary or, if "arg" is a
 				Lua table, returns a dict d such that d[k] =
@@ -136,14 +136,13 @@ Vim evaluation and command execution, and others.
 				strings. Keys that are not strings are not
 				used to initialize the dictionary. See also
 				|lua-eval| for conversion rules. Example: >
-				    :lua t = {math.pi, false, say = 'hi'}
-				    :echo luaeval('vim.dict(t)')
-				    :" {'1': 3.141593, '2': v:false,
-				    :" 'say': 'hi'}
+					:lua t = {math.pi, false, say = 'hi'}
+					:echo luaeval('vim.dict(t)')
+					:" {'say': 'hi'}, numeric keys ignored
 <
 	vim.funcref({name})	Returns a Funcref to function {name} (see
 				|Funcref|). It is equivalent to Vim's
-				function().
+				"function". NOT IMPLEMENTED YET

 	vim.buffer([arg])	If "arg" is a number, returns buffer with
 				number "arg" in the buffer list or, if "arg"
@@ -167,7 +166,7 @@ Vim evaluation and command execution, and others.
 				or window, respectively. Examples: >
 					:lua l = vim.list()
 					:lua print(type(l), vim.type(l))
-					:" list
+					:" userdata list
 <
 	vim.command({cmd})	Executes the vim (ex-mode) command {cmd}.
 				Examples: >
@@ -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
@@ -249,7 +249,7 @@ Windows							    *mzscheme-window*
 5. mzeval() Vim function				    *mzscheme-mzeval*

 To facilitate bi-directional interface, you can use |mzeval()| function to
-evaluate MzScheme expressions and pass their values to Vim script.
+evaluate MzScheme expressions and pass their values to VimL.

 ==============================================================================
 6. Using Function references				    *mzscheme-funcref*
@@ -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
@@ -312,4 +309,4 @@ MzScheme's raco command:
  raco pkg install cext-lib         # raco ctool command
 <
 ======================================================================
-  vim:tw=78:ts=8:noet:sts=4:ft=help:norl:
+  vim:tw=78:ts=8:sts=4:ft=help:norl:
@@ -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
@@ -41,9 +41,9 @@ instance), code similar to the following should be used:
 	$vim = new Win32::OLE 'Vim.Application';

 [C#] >
-        // Add a reference to Vim in your project. 
+        // Add a reference to VIM in your project. 
        // Choose the COM tab.
-        // Select "Vim Ole Interface 1.1 Type Library"
+        // Select "VIM Ole Interface 1.1 Type Library"
 	Vim.Vim vimobj = new Vim.Vim();

 Vim does not support acting as a "hidden" OLE server, like some other OLE
@@ -202,4 +202,4 @@ In Vim >
 [.Net remarks provided by Dave Fishburn and Brian Sturk]

 ==============================================================================
- vim:tw=78:ts=8:noet:ft=help:norl:
+ vim:tw=78:ts=8:ft=help:norl:
@@ -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
@@ -7,7 +7,7 @@
 Perl and Vim				*perl* *Perl*

 1. Editing Perl files			|perl-editing|
-2. Compiling Vim with Perl interface	|perl-compiling|
+2. Compiling VIM with Perl interface	|perl-compiling|
 3. Using the Perl interface		|perl-using|
 4. Dynamic loading			|perl-dynamic|

@@ -33,7 +33,7 @@ Vim in the $VIMRUNTIME/tools directory.  This script has currently more
 features than Exuberant ctags' Perl support.

 ==============================================================================
-2. Compiling Vim with Perl interface			*perl-compiling*
+2. Compiling VIM with Perl interface			*perl-compiling*

 To compile Vim with Perl interface, you need Perl 5.004 (or later).  Perl must
 be installed before you compile Vim.  Vim's Perl interface does NOT work with
@@ -44,9 +44,8 @@ The Perl patches for Vim were made by:
 	Sven Verdoolaege <skimo@breughel.ufsia.ac.be>
 	Matt Gerassimof

-Perl for MS-Windows (and other platforms) can be found at:
-http://www.perl.org/ The ActiveState one should work, Strawberry Perl is a
-good alternative.
+Perl for MS-Windows can be found at: http://www.perl.com/
+The ActiveState one should work.

 ==============================================================================
 3. Using the Perl interface				*perl-using*
@@ -113,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
@@ -304,4 +303,4 @@ version of the shared library must match the Perl version Vim was compiled
 with.

 ==============================================================================
- vim:tw=78:ts=8:noet:ft=help:norl:
+ vim:tw=78:ts=8:ft=help:norl:
@@ -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: 2016 Sep 17


 		  VIM REFERENCE MANUAL    by Paul Moore
@@ -16,8 +16,6 @@ The Python Interface to Vim				*python* *Python*
 8. pyeval(), py3eval() Vim functions		|python-pyeval|
 9. Dynamic loading				|python-dynamic|
 10. Python 3					|python3|
-11. Python X					|python_x|
-12. Building with Python support		|python-building|

 {Vi does not have any of these commands}

@@ -175,8 +173,8 @@ vim.eval(str)						*python-eval*

 	    :py tagList = vim.eval('taglist("eval_expr")')
 <	The latter will return a python list of python dicts, for instance:
-	[{'cmd': '/^eval_expr(arg, nextcmd)$/', 'static': 0, 'name': ~
-	'eval_expr', 'kind': 'f', 'filename': './src/eval.c'}] ~
+	[{'cmd': '/^eval_expr(arg, nextcmd)$/', 'static': 0, 'name':
+	'eval_expr', 'kind': 'f', 'filename': './src/eval.c'}]

 vim.bindeval(str)					*python-bindeval*
 	Like |python-eval|, but returns special objects described in 
@@ -677,11 +675,11 @@ vim.Function object				*python-Function*
                     dictionary. Note that explicit `self` keyword used when 
                     calling resulting object overrides this attribute.
        auto_rebind  Boolean. True if partial created from this Python object 
-                     and stored in the Vim script dictionary should be
-                     automatically rebound to the dictionary it is stored in
-                     when this dictionary is indexed. Exposes Vim internal
-                     difference between `dict.func` (auto_rebind=True) and
-                     `function(dict.func,dict)` (auto_rebind=False). This
+                     and stored in the VimL dictionary should be automatically 
+                     rebound to the dictionary it is stored in when this 
+                     dictionary is indexed. Exposes Vim internal difference 
+                     between `dict.func` (auto_rebind=True) and 
+                     `function(dict.func,dict)` (auto_rebind=False). This 
                     attribute makes no sense if `self` attribute is `None`.

    Constructor additionally accepts `args`, `self` and `auto_rebind` 
@@ -712,10 +710,7 @@ vim.Function object				*python-Function*
 8. pyeval() and py3eval() Vim functions			*python-pyeval*

 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.
+functions to evaluate Python expressions and pass their values to VimL.

 ==============================================================================
 9. Dynamic loading					*python-dynamic*
@@ -734,11 +729,9 @@ To use the Python interface the Python DLL must be in your search path.  In a
 console window type "path" to see what directories are used.  The 'pythondll'
 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
-"python\d*.dll\c".
+The name of the DLL must match the Python version Vim was compiled with.
+Currently the name is "python24.dll".  That is for Python 2.4.  To know for
+sure edit "gvim.exe" and search for "python\d*.dll\c".


 Unix ~
@@ -809,8 +802,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,109 +811,5 @@ 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*
-
-Because most python code can be written so that it works with python 2.6+ and
-python 3 the pyx* functions and commands have been written.  They work exactly
-the same as the Python 2 and 3 variants, but select the Python version using
-the 'pyxversion' setting.
-
-You should set 'pyxversion' in your |.vimrc| to prefer Python 2 or Python 3
-for Python commands. If you change this setting at runtime you may risk that
-state of plugins (such as initialization) may be lost.
-
-If you want to use a module, you can put it in the {rtp}/pythonx directory.
-See |pythonx-directory|.
-
-							*:pyx* *:pythonx*
-The `:pyx` and `:pythonx` commands work similar to `:python`.  A simple check
-if the `:pyx` command is working: >
-	:pyx print("Hello")
-
-To see what version of Python is being used: >
-	:pyx import sys
-	:pyx print(sys.version)
-<
-					*:pyxfile* *python_x-special-comments*
-The `:pyxfile` command works similar to `:pyfile`.  However you can add one of
-these comments to force Vim using `:pyfile` or `:py3file`: >
-  #!/any string/python2		" Shebang. Must be the first line of the file.
-  #!/any string/python3		" Shebang. Must be the first line of the file.
-  # requires python 2.x		" Maximum lines depend on 'modelines'.
-  # requires python 3.x		" Maximum lines depend on 'modelines'.
-Unlike normal modelines, the bottom of the file is not checked.
-If none of them are found, the 'pyxversion' setting is used.
-							*W20* *W21*
-If Vim does not support the selected Python version a silent message will be
-printed.  Use `:messages` to read them.
-
-							*:pyxdo*
-The `:pyxdo` command works similar to `:pydo`.
-
-							*has-pythonx*
-You can test if pyx* commands are available with: >
-	if has('pythonx')
-	  echo 'pyx* commands are available. (Python ' . &pyx . ')'
-	endif
-
-When compiled with only one of |+python| or |+python3|, the has() returns 1.
-When compiled with both |+python| and |+python3|, the test depends on the
-'pyxversion' setting.  If 'pyxversion' is 0, it tests Python 3 first, and if
-it is not available then Python 2.  If 'pyxversion' is 2 or 3, it tests only
-Python 2 or 3 respectively.
-
-Note that for `has('pythonx')` to work it may try to dynamically load Python 3
-or 2.  This may have side effects, especially when Vim can only load one of
-the two.
-
-If a user prefers Python 2 and want to fallback to Python 3, he needs to set
-'pyxversion' explicitly in his |.vimrc|.  E.g.: >
-	if has('python')
-	  set pyx=2
-	elseif has('python3')
-	  set pyx=3
-	endif
-
-==============================================================================
-12. Building with Python support			*python-building*
-
-A few hints for building with Python 2 or 3 support.
-
-UNIX
-
-See src/Makefile for how to enable including the Python interface.
-
-On Ubuntu you will want to install these packages for Python 2:
-	python
-	python-dev
-For Python 3:
-	python3
-	python3-dev
-For Python 3.6:
-	python3.6
-	python3.6-dev
-
-If you have more than one version of Python 3, you need to link python3 to the
-one you prefer, before running configure.
-
-==============================================================================
- vim:tw=78:ts=8:noet:ft=help:norl:
+ vim:tw=78:ts=8:ft=help:norl:
@@ -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
@@ -72,7 +72,7 @@ To see what version of Ruby you have: >

 							*:rubyfile* *:rubyf*
 :rubyf[ile] {file}	Execute the Ruby script in {file}.  This is the same as
-			`:ruby load 'file'`, but allows file name completion.
+			":ruby load 'file'", but allows file name completion.

 Executing Ruby commands is not possible in the |sandbox|.

@@ -145,7 +145,7 @@ self[{n}]	Returns the buffer object for the number {n}.  The first number

 Methods:

-name		Returns the full name of the buffer.
+name		Returns the name of the buffer.
 number		Returns the number of the buffer.
 count		Returns the number of lines.
 length		Returns the number of lines.
@@ -181,7 +181,6 @@ height = {n}	Sets the window height to {n}.
 width		Returns the width of the window.
 width = {n}	Sets the window width to {n}.
 cursor		Returns a [row, col] array for the cursor position.
-		First line number is 1 and first column number is 0.
 cursor = [{row}, {col}]
 		Sets the cursor position to {row} and {col}.

@@ -208,22 +207,21 @@ MS-Windows ~

 You need to install the right version of Ruby for this to work.  You can find
 the package to download from:
-http://rubyinstaller.org/downloads/
-Currently that is rubyinstaller-2.2.5.exe
+http://www.garbagecollect.jp/ruby/mswin32/en/download/release.html
+Currently that is ruby-1.9.2-p136-i386-mswin32.zip

 To use the Ruby interface the Ruby DLL must be in your search path.  In a
 console window type "path" to see what directories are used.  The 'rubydll'
 option can be also used to specify the Ruby DLL.

 The name of the DLL must match the Ruby version Vim was compiled with.
-Currently the name is "msvcrt-ruby220.dll".  That is for Ruby 2.2.X.  To know
+Currently the name is "msvcrt-ruby191.dll".  That is for Ruby 1.9.1.  To know
 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.
+If you want to build Vim with Ruby 1.9.1, you need to edit the config.h file
+and comment-out the check for _MSC_VER.
+You may also need to rename the include directory name to match the version,
+strangely for Ruby 1.9.3 the directory is called 1.9.1.


 Unix ~
@@ -234,4 +232,4 @@ version of the shared library must match the Ruby version Vim was compiled
 with.

 ==============================================================================
- vim:tw=78:ts=8:noet:ft=help:norl:
+ vim:tw=78:ts=8:ft=help:norl:
@@ -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
@@ -8,4 +8,4 @@
 The SNiFF+ support was removed at patch 7.4.1433.  If you want to check it out
 sync to before that.

- vim:tw=78:ts=8:noet:ft=help:norl:
+ vim:tw=78:ts=8:ft=help:norl:
@@ -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
@@ -544,4 +544,4 @@ of DYNAMIC_TCL_DLL file what was specified at compile time.  The version of
 the shared library must match the Tcl version Vim was compiled with.

 ==============================================================================
- vim:tw=78:ts=8:noet:ft=help:norl:
+ vim:tw=78:ts=8:ft=help:norl:
@@ -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
@@ -324,21 +324,6 @@ The examples below assume a 'shiftwidth' of 4.
 		  {                          {
 		      void function();       void function();
 		  }                          }
-<
-							*cino-E*
-	EN    Indent inside C++ linkage specifications (extern "C" or
-	      extern "C++") N characters extra compared to a normal block.
-	      (default 0).
-
-		cino=			   cino=E-s >
-		  extern "C" {               extern "C" {
-		      void function();       void function();
-		  }                          }
-
-		  extern "C"                 extern "C"
-		  {                          {
-		      void function();       void function();
-		  }                          }
 <
 							*cino-p*
 	pN    Parameter declarations for K&R-style function declarations will
@@ -414,10 +399,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 +413,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
@@ -570,7 +554,7 @@ The examples below assume a 'shiftwidth' of 4.


 The defaults, spelled out in full, are:
-	cinoptions=>s,e0,n0,f0,{0,}0,^0,L-1,:s,=s,l0,b0,gs,hs,N0,E0,ps,ts,is,+s,
+	cinoptions=>s,e0,n0,f0,{0,}0,^0,L-1,:s,=s,l0,b0,gs,hs,N0,ps,ts,is,+s,
 			c3,C0,/0,(2s,us,U0,w0,W0,k0,m0,j0,J0,)20,*70,#0

 Vim puts a line in column 1 if:
@@ -907,25 +891,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*
@@ -1156,4 +1121,4 @@ indent for a continuation line, a line that starts with a backslash: >
 Three times shiftwidth is the default value.


- vim:tw=78:ts=8:noet:ft=help:norl:
+ vim:tw=78:ts=8:ft=help:norl:
@@ -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: 2016 Aug 27


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -309,10 +309,10 @@ tag		char	      note action in Normal mode	~
 |B|		B		1  cursor N WORDS backward
 |C|		["x]C		2  change from the cursor position to the end
 				   of the line, and N-1 more lines [into
-				   register x]; synonym for "c$"
+				   buffer x]; synonym for "c$"
 |D|		["x]D		2  delete the characters under the cursor
 				   until the end of the line and N-1 more
-				   lines [into register x]; synonym for "d$"
+				   lines [into buffer x]; synonym for "d$"
 |E|		E		1  cursor forward to the end of WORD N
 |F|		F{char}		1  cursor to the Nth occurrence of {char} to
 				   the left
@@ -329,13 +329,13 @@ tag		char	      note action in Normal mode	~
 				   opposite direction
 |O|		O		2  begin a new line above the cursor and
 				   insert text, repeat N times
-|P|		["x]P		2  put the text [from register x] before the
+|P|		["x]P		2  put the text [from buffer x] before the
 				   cursor N times
 |Q|		Q		   switch to "Ex" mode
 |R|		R		2  enter replace mode: overtype existing
 				   characters, repeat the entered text N-1
 				   times
-|S|		["x]S		2  delete N lines [into register x] and start
+|S|		["x]S		2  delete N lines [into buffer x] and start
 				   insert; synonym for "cc".
 |T|		T{char}		1  cursor till after Nth occurrence of {char}
 				   to the left
@@ -343,8 +343,8 @@ tag		char	      note action in Normal mode	~
 |V|		V		   start linewise Visual mode
 |W|		W		1  cursor N WORDS forward
 |X|		["x]X		2  delete N characters before the cursor [into
-				   register x]
-|Y|		["x]Y		   yank N lines [into register x]; synonym for
+				   buffer x]
+|Y|		["x]Y		   yank N lines [into buffer x]; synonym for
 				   "yy"
 |ZZ|		ZZ		   store current file if modified, and exit
 |ZQ|		ZQ		   exit current file always
@@ -367,12 +367,12 @@ tag		char	      note action in Normal mode	~
 |`}|		`}		1  cursor to the end of the current paragraph
 |a|		a		2  append text after the cursor N times
 |b|		b		1  cursor N words backward
-|c|		["x]c{motion}	2  delete Nmove text [into register x] and
-				   start insert
-|cc|		["x]cc		2  delete N lines [into register x] and start
+|c|		["x]c{motion}	2  delete Nmove text [into buffer x] and start
 				   insert
-|d|		["x]d{motion}	2  delete Nmove text [into register x]
-|dd|		["x]dd		2  delete N lines [into register x]
+|cc|		["x]cc		2  delete N lines [into buffer x] and start
+				   insert
+|d|		["x]d{motion}	2  delete Nmove text [into buffer x]
+|dd|		["x]dd		2  delete N lines [into buffer x]
 |do|		do		2  same as ":diffget"
 |dp|		dp		2  same as ":diffput"
 |e|		e		1  cursor forward to the end of word N
@@ -398,16 +398,16 @@ tag		char	      note action in Normal mode	~
 |q?|		q?		   edit ? command-line in command-line window
 |r|		r{char}		2  replace N chars with {char}
 |s|		["x]s		2  (substitute) delete N characters [into
-				   register x] and start insert
+				   buffer x] and start insert
 |t|		t{char}		1  cursor till before Nth occurrence of {char}
 				   to the right
 |u|		u		2  undo changes
 |v|		v		   start characterwise Visual mode
 |w|		w		1  cursor N words forward
 |x|		["x]x		2  delete N characters under and after the
-				   cursor [into register x]
-|y|		["x]y{motion}	   yank Nmove text [into register x]
-|yy|		["x]yy		   yank N lines [into register x]
+				   cursor [into buffer x]
+|y|		["x]y{motion}	   yank Nmove text [into buffer x]
+|yy|		["x]yy		   yank N lines [into buffer x]
 |z|		z{char}		   commands starting with 'z', see |z| below
 |{|		{		1  cursor N paragraphs backward
 |bar|		|		1  cursor to column N
@@ -528,11 +528,8 @@ tag		command		   action in Normal mode	~
 |CTRL-W_CTRL-]|	CTRL-W CTRL-]	   same as "CTRL-W ]"
 |CTRL-W_CTRL-^|	CTRL-W CTRL-^	   same as "CTRL-W ^"
 |CTRL-W_CTRL-_|	CTRL-W CTRL-_	   same as "CTRL-W _"
-|CTRL-W_quote|	CTRL-W "	   terminal window: paste register
 |CTRL-W_+|	CTRL-W +	   increase current window height N lines
 |CTRL-W_-|	CTRL-W -	   decrease current window height N lines
-|CTRL-W_.|	CTRL-W .	   terminal window: type CTRL-W
-|CTRL-W_:|	CTRL-W :	   same as |:|, edit a command line
 |CTRL-W_<|	CTRL-W <	   decrease current window width N columns
 |CTRL-W_=|	CTRL-W =	   make all windows the same height & width
 |CTRL-W_>|	CTRL-W >	   increase current window width N columns
@@ -540,7 +537,6 @@ tag		command		   action in Normal mode	~
 |CTRL-W_J|	CTRL-W J	   move current window to the very bottom
 |CTRL-W_K|	CTRL-W K	   move current window to the very top
 |CTRL-W_L|	CTRL-W L	   move current window to the far right
-|CTRL-W_N|	CTRL-W N	   terminal window: go to Terminal Normal mode
 |CTRL-W_P|	CTRL-W P	   go to preview window
 |CTRL-W_R|	CTRL-W R	   rotate windows upwards N times
 |CTRL-W_S|	CTRL-W S	   same as "CTRL-W s"
@@ -959,7 +955,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
@@ -1006,14 +1002,12 @@ tag		command	      action in Command-line editing mode	~
 |c_CTRL-L|	CTRL-L		do completion on the pattern in front of the
 				cursor and insert the longest common part
 |c_<CR>|	<CR>		execute entered command
-|c_CTRL-M|	CTRL-M		same as <CR>
+|c_<CR>|	CTRL-M		same as <CR>
 |c_CTRL-N|	CTRL-N		after using 'wildchar' with multiple matches:
-				go to next match, otherwise: recall older
-				command-line from history.
+				go to next match, otherwise: same as <Down>
 		CTRL-O		not used
 |c_CTRL-P|	CTRL-P		after using 'wildchar' with multiple matches:
-				go to previous match, otherwise: recall older
-				command-line from history.
+				go to previous match, otherwise: same as <Up>
 |c_CTRL-Q|	CTRL-Q		same as CTRL-V, unless it's used for terminal
 				control flow
 |c_CTRL-R|	CTRL-R {0-9a-z"%#*:= CTRL-F CTRL-P CTRL-W CTRL-A}
@@ -1032,7 +1026,7 @@ tag		command	      action in Command-line editing mode	~
 		CTRL-Y		copy (yank) modeless selection
 		CTRL-Z		not used (reserved for suspend)
 |c_<Esc>|	<Esc>		abandon command-line without executing it
-|c_CTRL-[|	CTRL-[		same as <Esc>
+|c_<Esc>|	CTRL-[		same as <Esc>
 |c_CTRL-\_CTRL-N| CTRL-\ CTRL-N	go to Normal mode, abandon command-line
 |c_CTRL-\_CTRL-G| CTRL-\ CTRL-G	go to mode specified with 'insertmode',
 				abandon command-line
@@ -1448,10 +1442,6 @@ tag	      command	      action ~
 |:python|	:py[thon]	execute Python command
 |:pydo|		:pyd[o]		execute Python command for each line
 |:pyfile|	:pyf[ile]	execute Python script file
-|:pyx|		:pyx		execute |python_x| command
-|:pythonx|	:pythonx	same as :pyx
-|:pyxdo|	:pyxd[o]	execute |python_x| command for each line
-|:pyxfile|	:pyxf[ile]	execute |python_x| script file
 |:quit|		:q[uit]		quit current window (when one window quit Vim)
 |:quitall|	:quita[ll]	quit Vim
 |:qall|		:qa[ll]		quit Vim
@@ -1579,23 +1569,18 @@ tag	      command	      action ~
 |:tcldo|	:tcld[o]	execute Tcl command for each line
 |:tclfile|	:tclf[ile]	execute Tcl script file
 |:tearoff|	:te[aroff]	tear-off a menu
-|:terminal|	:ter[minal]	open a terminal window
 |:tfirst|	:tf[irst]	jump to first matching tag
 |:throw|	:th[row]	throw an exception
 |:tjump|	:tj[ump]	like ":tselect", but jump directly when there
 				is only one match
 |:tlast|	:tl[ast]	jump to last matching tag
-|:tmapclear|	:tmapc[lear]	remove all mappings for Terminal-Job mode
-|:tmap|		:tma[p]		like ":map" but for Terminal-Job mode
 |:tmenu|	:tm[enu]	define menu tooltip
 |:tnext|	:tn[ext]	jump to next matching tag
-|:tnoremap|	:tno[remap]	like ":noremap" but for Terminal-Job mode
 |:topleft|	:to[pleft]	make split window appear at top or far left
 |:tprevious|	:tp[revious]	jump to previous matching tag
 |:trewind|	:tr[ewind]	jump to first matching tag
 |:try|		:try		execute commands, abort on error or exception
 |:tselect|	:ts[elect]	list matching tags and select one
-|:tunmap|	:tunma[p]	like ":unmap" but for Terminal-Job mode
 |:tunmenu|	:tu[nmenu]	remove menu tooltip
 |:undo|		:u[ndo]		undo last change(s)
 |:undojoin|	:undoj[oin]	join next change with previous undo block
@@ -1659,4 +1644,4 @@ tag	      command	      action ~
 |:~|		:~		repeat last ":substitute"


- vim:tw=78:ts=8:noet:ft=help:norl:
+ vim:tw=78:ts=8:ft=help:norl:
--- a/Show More
+++ b/Show More