Draw markedText in MMCoreTextView if imstyle=1

.gitignore

@@ -38,7 +38,6 @@ src/pathdef.c
 src/Obj*/pathdef.c
 gvimext.dll
 gvimext.lib
-gvim.lib
 runtime/doc/uganda.nsis.txt
 
 # Borland C++
@@ -80,7 +79,6 @@ src/testdir/dostmp/*
 src/testdir/messages
 src/testdir/viminfo
 src/testdir/opt_test.vim
-runtime/indent/testdir/*.out
 src/memfile_test
 src/json_test
 src/message_test

.lgtm.yml

@@ -1,4 +0,0 @@
-# Format of this file: https://lgtm.com/help/lgtm/lgtm.yml-configuration-file
-path_classifiers:
-  documentation:
-    - runtime/tutor/tutor*

.travis.yml

@@ -4,68 +4,47 @@ dist: trusty
 os:
   - osx
 
-osx_image:
-  - xcode7.3
-  - xcode8.3
-  - xcode9.4
-  - xcode10.2
+osx_image: xcode8
 
 compiler:
   - clang
 
-addons:
-  homebrew:
-    packages:
-    - lua
-    - ruby
-    - python3
-    update: true
-
 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.6/Python
     VIMCMD=src/MacVim/build/Release/MacVim.app/Contents/MacOS/Vim
-    "CONFOPT='--with-features=huge --enable-multibyte --enable-terminal --enable-netbeans --with-tlib=ncurses --enable-cscope --enable-perlinterp=dynamic --enable-pythoninterp=dynamic --enable-python3interp=dynamic --enable-rubyinterp=dynamic --with-ruby-command=/usr/local/opt/ruby/bin/ruby --enable-luainterp=dynamic --with-lua-prefix=/usr/local --enable-gui=macvim'"
-    DYLD_LIBRARY_PATH=/usr/local/opt/ruby/lib:$DYLD_LIBRARY_PATH # Ruby is keg-only in Homebrew, so need to manually link in the path so Vim will know where to look for the binaries.
+    "CONFOPT='--with-features=huge --enable-multibyte --enable-terminal --enable-netbeans --with-tlib=ncurses --enable-cscope --enable-perlinterp=dynamic --enable-pythoninterp=dynamic --enable-python3interp=dynamic --enable-rubyinterp=dynamic --enable-luainterp=dynamic --with-lua-prefix=/usr/local --enable-gui=macvim'"
 
 sudo: false
 
+before_install:
+  - brew update || brew update
+  - brew install python3
+  - brew install lua
+
 script:
-  - set -e
-  - if [ "$TRAVIS_OSX_IMAGE" = "xcode8.3" ]; then brew reinstall --build-from-source ruby; fi
-  - echo "Configuring MacVim" && echo -en "travis_fold:start:config\\r"
   - 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
-  - echo -en "travis_fold:end:config\\r"
-  - echo "Building MacVim" && echo -en "travis_fold:start:build\\r"
   - make -j$NPROC
-  - echo -en "travis_fold:end:build\\r"
-  - echo "Testing MacVim" && echo -en "travis_fold:start:test\\r"
   - rm -f result; $VIMCMD -g -f -c "redir>result" -c "lua print(\"Test\")" -c "redir END" -c q; cat result; echo; grep -q -w Test result
   - rm -f result; $VIMCMD -g -f -c "redir>result" -c "perl VIM::Msg(\"Test\")" -c "redir END" -c q; cat result; echo; grep -q -w Test result
   - rm -f result; $VIMCMD -g -f -c "redir>result" -c "py import sys; print(\"Test\")" -c "redir END" -c q; cat result; echo; grep -q -w Test result
   - rm -f result; $VIMCMD -g -f -c "redir>result" -c "py3 import sys; print(\"Test\")" -c "redir END" -c q; cat result; echo; grep -q -w Test result
   - rm -f result; $VIMCMD -g -f -c "redir>result" -c "ruby puts(\"Test\")" -c "redir END" -c q; cat result; echo; grep -q -w Test result
-  - rm -f result;
   - make test
-  - echo -en "travis_fold:end:test\\r"
-  - echo "Testing MacVim (GUI)" && echo -en "travis_fold:start:test_gui\\r"
   - make -C src/testdir clean
   - make -C src testgui
-  - echo -en "travis_fold:end:test_gui\\r"
 
 before_deploy:
   - make -C src macvim-dmg
@@ -76,7 +55,6 @@ deploy:
   file: src/MacVim/build/Release/MacVim.dmg
   skip_cleanup: true
   on:
-    condition: $TRAVIS_OSX_IMAGE = xcode10.2
     all_branches: true
     tags: true
     repo: macvim-dev/macvim

CONTRIBUTING.md

@@ -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.

Filelist

@@ -1,23 +1,17 @@
 # List of distributed Vim files.
-# Used by Makefile.
+# Used by Makefile and upload.aap.
 
 # source files for all source archives
 SRC_ALL =	\
 		.hgignore \
-		.lgtm.yml \
 		.travis.yml \
 		appveyor.yml \
-		ci/appveyor.bat \
-		src/Make_all.mak \
+		src/appveyor.bat \
 		src/README.txt \
 		src/alloc.h \
 		src/arabic.c \
 		src/arabic.h \
 		src/ascii.h \
-		src/autocmd.c \
-		src/beval.c \
-		src/beval.h \
-		src/blob.c \
 		src/blowfish.c \
 		src/buffer.c \
 		src/channel.c \
@@ -37,18 +31,19 @@ SRC_ALL =	\
 		src/ex_docmd.c \
 		src/ex_eval.c \
 		src/ex_getln.c \
+		src/farsi.c \
+		src/farsi.h \
 		src/feature.h \
 		src/fileio.c \
-		src/findfile.c \
 		src/fold.c \
 		src/getchar.c \
 		src/globals.h \
 		src/gui.c \
 		src/gui.h \
 		src/gui_beval.c \
+		src/gui_beval.h \
 		src/hardcopy.c \
 		src/hashtab.c \
-		src/indent.c \
 		src/json.c \
 		src/json_test.c \
 		src/kword_test.c \
@@ -83,18 +78,16 @@ SRC_ALL =	\
 		src/screen.c \
 		src/search.c \
 		src/sha256.c \
-		src/sign.c \
+		src/structs.h \
 		src/spell.c \
 		src/spell.h \
 		src/spellfile.c \
-		src/structs.h \
 		src/syntax.c \
 		src/tag.c \
 		src/term.c \
 		src/terminal.c \
 		src/term.h \
 		src/termlib.c \
-		src/textprop.c \
 		src/ui.c \
 		src/undo.c \
 		src/userfunc.c \
@@ -105,7 +98,9 @@ SRC_ALL =	\
 		src/window.c \
 		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 \
@@ -114,7 +109,6 @@ SRC_ALL =	\
 		src/testdir/sautest/autoload/*.vim \
 		src/testdir/runtest.vim \
 		src/testdir/shared.vim \
-		src/testdir/screendump.vim \
 		src/testdir/view_util.vim \
 		src/testdir/setup.vim \
 		src/testdir/gui_init.vim \
@@ -124,6 +118,7 @@ SRC_ALL =	\
 		src/testdir/test[0-9]*a.ok \
 		src/testdir/test_[a-z]*.ok \
 		src/testdir/test49.vim \
+		src/testdir/test60.vim \
 		src/testdir/test83-tags? \
 		src/testdir/test77a.com \
 		src/testdir/test_*.vim \
@@ -139,17 +134,10 @@ SRC_ALL =	\
 		src/testdir/pyxfile/*.py \
 		src/testdir/bench*.in \
 		src/testdir/bench*.vim \
-		src/testdir/dumps/*.dump \
 		src/testdir/samples/*.txt \
-		src/testdir/samples/test000 \
 		src/testdir/if_ver*.vim \
-		src/testdir/color_ramp.vim \
 		src/proto.h \
-		src/protodef.h \
 		src/proto/arabic.pro \
-		src/proto/autocmd.pro \
-		src/proto/beval.pro \
-		src/proto/blob.pro \
 		src/proto/blowfish.pro \
 		src/proto/buffer.pro \
 		src/proto/channel.pro \
@@ -167,15 +155,14 @@ SRC_ALL =	\
 		src/proto/ex_docmd.pro \
 		src/proto/ex_eval.pro \
 		src/proto/ex_getln.pro \
+		src/proto/farsi.pro \
 		src/proto/fileio.pro \
-		src/proto/findfile.pro \
 		src/proto/fold.pro \
 		src/proto/getchar.pro \
 		src/proto/gui.pro \
 		src/proto/gui_beval.pro \
 		src/proto/hardcopy.pro \
 		src/proto/hashtab.pro \
-		src/proto/indent.pro \
 		src/proto/json.pro \
 		src/proto/list.pro \
 		src/proto/main.pro \
@@ -198,7 +185,6 @@ SRC_ALL =	\
 		src/proto/screen.pro \
 		src/proto/search.pro \
 		src/proto/sha256.pro \
-		src/proto/sign.pro \
 		src/proto/spell.pro \
 		src/proto/spellfile.pro \
 		src/proto/syntax.pro \
@@ -206,7 +192,6 @@ SRC_ALL =	\
 		src/proto/term.pro \
 		src/proto/terminal.pro \
 		src/proto/termlib.pro \
-		src/proto/textprop.pro \
 		src/proto/ui.pro \
 		src/proto/undo.pro \
 		src/proto/userfunc.pro \
@@ -237,7 +222,7 @@ SRC_ALL =	\
 		src/libvterm/src/parser.c \
 		src/libvterm/src/pen.c \
 		src/libvterm/src/rect.h \
-		src/libvterm/src/termscreen.c \
+		src/libvterm/src/screen.c \
 		src/libvterm/src/state.c \
 		src/libvterm/src/unicode.c \
 		src/libvterm/src/utf8.h \
@@ -283,22 +268,6 @@ SRC_ALL =	\
 		src/libvterm/t/92lp1640917.test \
 		src/libvterm/t/harness.c \
 		src/libvterm/t/run-test.pl \
-		src/xdiff/COPYING \
-		src/xdiff/README.txt \
-		src/xdiff/xdiff.h \
-		src/xdiff/xdiffi.c \
-		src/xdiff/xdiffi.h \
-		src/xdiff/xemit.c \
-		src/xdiff/xemit.h \
-		src/xdiff/xhistogram.c \
-		src/xdiff/xinclude.h \
-		src/xdiff/xmacros.h \
-		src/xdiff/xpatience.c \
-		src/xdiff/xprepare.c \
-		src/xdiff/xprepare.h \
-		src/xdiff/xtypes.h \
-		src/xdiff/xutils.c \
-		src/xdiff/xutils.h \
 
 
 # source files for Unix only
@@ -315,6 +284,7 @@ SRC_UNIX =	\
 		src/INSTALLx.txt \
 		src/Makefile \
 		src/auto/configure \
+		src/config.aap.in \
 		src/config.h.in \
 		src/config.mk.dist \
 		src/config.mk.in \
@@ -339,6 +309,8 @@ SRC_UNIX =	\
 		src/gui_x11_pm.h \
 		src/hangulin.c \
 		src/if_xcmdsrv.c \
+		src/integration.c \
+		src/integration.h \
 		src/link.sh \
 		src/installman.sh \
 		src/installml.sh \
@@ -361,6 +333,7 @@ SRC_UNIX =	\
 		src/proto/if_xcmdsrv.pro \
 		src/proto/os_unix.pro \
 		src/proto/pty.pro \
+		src/proto/workshop.pro \
 		src/pty.c \
 		src/testdir/Makefile \
 		src/testdir/unix.vim \
@@ -370,6 +343,10 @@ SRC_UNIX =	\
 		src/vimtutor \
 		src/gvimtutor \
 		src/which.sh \
+		src/workshop.c \
+		src/workshop.h \
+		src/wsdebug.c \
+		src/wsdebug.h \
 		src/tee/Makefile \
 		src/xxd/Makefile \
 
@@ -428,9 +405,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 \
@@ -476,7 +450,6 @@ SRC_DOS =	\
 		nsis/gvim.nsi \
 		nsis/gvim_version.nsh \
 		nsis/README.txt \
-		nsis/lang/*.nsi \
 		uninstal.txt \
 		src/VisVim/Commands.cpp \
 		src/VisVim/Commands.h \
@@ -515,7 +488,8 @@ SRC_DOS_BIN =	\
 		src/xpm/x86/lib/libXpm.a \
 		src/xpm/x86/lib/libXpm.lib \
 		src/xpm/x86/lib-vc14/libXpm.lib \
-		nsis/icons.zip \
+		nsis/icons/*.bmp \
+		nsis/icons/*.ico \
 
 # source files for Amiga, DOS, etc. (also in the extra archive)
 SRC_AMI_DOS =	\
@@ -605,7 +579,6 @@ RT_ALL =	\
 		runtime/doc/*.txt \
 		runtime/doc/Makefile \
 		runtime/doc/doctags.c \
-		runtime/doc/test_urls.vim \
 		runtime/doc/vim.1 \
 		runtime/doc/evim.1 \
 		runtime/doc/vimdiff.1 \
@@ -627,6 +600,7 @@ RT_ALL =	\
 		runtime/macros/matchit.vim \
 		runtime/macros/maze/README.txt \
 		runtime/macros/maze/[mM]akefile \
+		runtime/macros/maze/main.aap \
 		runtime/macros/maze/maze.c \
 		runtime/macros/maze/maze_5.78 \
 		runtime/macros/maze/maze_mac \
@@ -654,7 +628,6 @@ RT_ALL =	\
 		runtime/tutor/tutor \
 		runtime/tutor/tutor.vim \
 		runtime/vimrc_example.vim \
-		runtime/pack/dist/opt/cfilter/plugin/cfilter.vim \
 		runtime/pack/dist/opt/dvorak/plugin/dvorak.vim \
 		runtime/pack/dist/opt/dvorak/dvorak/enable.vim \
 		runtime/pack/dist/opt/dvorak/dvorak/disable.vim \
@@ -663,7 +636,6 @@ RT_ALL =	\
 		runtime/pack/dist/opt/matchit/plugin/matchit.vim \
 		runtime/pack/dist/opt/matchit/doc/matchit.txt \
 		runtime/pack/dist/opt/matchit/doc/tags \
-		runtime/pack/dist/opt/matchit/autoload/*.vim \
 		runtime/pack/dist/opt/shellmenu/plugin/shellmenu.vim \
 		runtime/pack/dist/opt/swapmouse/plugin/swapmouse.vim \
 		runtime/pack/dist/opt/termdebug/plugin/termdebug.vim \
@@ -684,20 +656,13 @@ 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 \
 		runtime/indent/README.txt \
-		runtime/indent/Makefile \
-		runtime/indent/testdir/README.txt \
-		runtime/indent/testdir/*.vim \
-		runtime/indent/testdir/*.in \
-		runtime/indent/testdir/*.ok \
 		runtime/ftplugin/*.vim \
 		runtime/ftplugin/logtalk.dict \
 		runtime/ftplugin/README.txt \
@@ -731,7 +696,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 \
@@ -834,6 +798,8 @@ EXTRA =		\
 		$(SRC_EXTRA) \
 		README_extra.txt \
 		src/VisVim/VisVim.dll \
+		farsi/README.txt \
+		farsi/fonts/*/far-* \
 		runtime/vimlogo.xpm \
 		src/tee/Makefile \
 		src/tee/Make_mvc.mak \
@@ -870,8 +836,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 \
@@ -932,7 +896,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 \

LICENSE

@@ -1,78 +0,0 @@
-VIM LICENSE
-
-I)  There are no restrictions on distributing unmodified copies of Vim except
-    that they must include this license text.  You can also distribute
-    unmodified parts of Vim, likewise unrestricted except that they must
-    include this license text.  You are also allowed to include executables
-    that you made from the unmodified Vim sources, plus your own usage
-    examples and Vim scripts.
-
-II) It is allowed to distribute a modified (or extended) version of Vim,
-    including executables and/or source code, when the following four
-    conditions are met:
-    1) This license text must be included unmodified.
-    2) The modified Vim must be distributed in one of the following five ways:
-       a) If you make changes to Vim yourself, you must clearly describe in
-	  the distribution how to contact you.  When the maintainer asks you
-	  (in any way) for a copy of the modified Vim you distributed, you
-	  must make your changes, including source code, available to the
-	  maintainer without fee.  The maintainer reserves the right to
-	  include your changes in the official version of Vim.  What the
-	  maintainer will do with your changes and under what license they
-	  will be distributed is negotiable.  If there has been no negotiation
-	  then this license, or a later version, also applies to your changes.
-	  The current maintainer is Bram Moolenaar <Bram@vim.org>.  If this
-	  changes it will be announced in appropriate places (most likely
-	  vim.sf.net, www.vim.org and/or comp.editors).  When it is completely
-	  impossible to contact the maintainer, the obligation to send him
-	  your changes ceases.  Once the maintainer has confirmed that he has
-	  received your changes they will not have to be sent again.
-       b) If you have received a modified Vim that was distributed as
-	  mentioned under a) you are allowed to further distribute it
-	  unmodified, as mentioned at I).  If you make additional changes the
-	  text under a) applies to those changes.
-       c) Provide all the changes, including source code, with every copy of
-	  the modified Vim you distribute.  This may be done in the form of a
-	  context diff.  You can choose what license to use for new code you
-	  add.  The changes and their license must not restrict others from
-	  making their own changes to the official version of Vim.
-       d) When you have a modified Vim which includes changes as mentioned
-	  under c), you can distribute it without the source code for the
-	  changes if the following three conditions are met:
-	  - The license that applies to the changes permits you to distribute
-	    the changes to the Vim maintainer without fee or restriction, and
-	    permits the Vim maintainer to include the changes in the official
-	    version of Vim without fee or restriction.
-	  - You keep the changes for at least three years after last
-	    distributing the corresponding modified Vim.  When the maintainer
-	    or someone who you distributed the modified Vim to asks you (in
-	    any way) for the changes within this period, you must make them
-	    available to him.
-	  - You clearly describe in the distribution how to contact you.  This
-	    contact information must remain valid for at least three years
-	    after last distributing the corresponding modified Vim, or as long
-	    as possible.
-       e) When the GNU General Public License (GPL) applies to the changes,
-	  you can distribute the modified Vim under the GNU GPL version 2 or
-	  any later version.
-    3) A message must be added, at least in the output of the ":version"
-       command and in the intro screen, such that the user of the modified Vim
-       is able to see that it was modified.  When distributing as mentioned
-       under 2)e) adding the message is only required for as far as this does
-       not conflict with the license used for the changes.
-    4) The contact information as required under 2)a) and 2)d) must not be
-       removed or changed, except that the person himself can make
-       corrections.
-
-III) If you distribute a modified version of Vim, you are encouraged to use
-     the Vim license for your changes and make them available to the
-     maintainer, including the source code.  The preferred way to do this is
-     by e-mail or by uploading the files to a server and e-mailing the URL.
-     If the number of changes is small (e.g., a modified Makefile) e-mailing a
-     context diff will do.  The e-mail address to be used is
-     <maintainer@vim.org>
-
-IV)  It is not allowed to remove this license from the distribution of the Vim
-     sources, parts of it or from a modified version.  You may use this
-     license for previous Vim releases instead of the license that they came
-     with, at your option.

Makefile

@@ -32,26 +32,14 @@ first:
 
 # Some make programs use the last target for the $@ default; put the other
 # targets separately to always let $@ expand to "first" by default.
-all install uninstall tools config configure reconfig proto depend lint tags types test scripttests test_libvterm unittests testclean clean distclean:
+all install uninstall tools config configure reconfig proto depend lint tags types test scripttests unittests testclean clean distclean:
 	@if test ! -f src/auto/config.mk; then \
 		cp src/config.mk.dist src/auto/config.mk; \
 	fi
 	@echo "Starting make in the src directory."
 	@echo "If there are problems, cd to the src directory and run make there"
 	cd src && $(MAKE) $@
-	@# When the target is "test" also run the indent tests.
-	@if test "$@" = "test"; then \
-		$(MAKE) indenttest; \
-	fi
 
-# Executable used for running the indent tests.
-VIM_FOR_INDENTTEST = ../../src/vim
-
-indenttest:
-	cd runtime/indent && \
-		$(MAKE) clean VIM="$(VIM_FOR_INDENTTEST)" && \
-		$(MAKE) test VIM="$(VIM_FOR_INDENTTEST)"
-		
 
 #########################################################################
 # 2. Creating the various distribution files.
@@ -80,7 +68,7 @@ indenttest:
 #    Before creating an archive first delete all backup files, *.orig, etc.
 
 MAJOR = 8
-MINOR = 1
+MINOR = 0
 
 # CHECKLIST for creating a new version:
 #
@@ -132,28 +120,28 @@ MINOR = 1
 #
 # MS-Windows:
 # - Run make on Unix to update the ".mo" files.
-# - Get 32 bit libintl-8.dll, libiconv-2.dll and libgcc_s_sjlj-1.dll. E.g. from
+# - Get libintl-8.dll, libiconv-2.dll and libgcc_s_sjlj-1.dll. E.g. from
 #   https://mlocati.github.io/gettext-iconv-windows/ .
 #   Use the "shared-32.zip file and extract the archive to get the files.
-#   Put them in the gettext32 directory, "make dosrt" uses them.
-# - Get 64 bit libintl-8.dll and libiconv-2.dll. E.g. from
-#   https://mlocati.github.io/gettext-iconv-windows/ .
-#   Use the "shared-64.zip file and extract the archive to get the files.
-#   Put them in the gettext64 directory, "make dosrt" uses them.
+#   Put them in the top directory, "make dosrt" uses them.
 # - > make dossrc
 #   > make dosrt
 #   Unpack dist/vim##rt.zip and dist/vim##src.zip on an MS-Windows PC.
-#   This creates the directory vim/vim81 and puts all files in there.
 # Win32 console version build:
-# - See src/INSTALLpc.txt for installing the compiler and SDK.
-# - Set environment for Visual C++ 2015:
-#   > cd src
-#   > msvc2015.bat
-# - Build the console binary:
+# - Set environment for Visual C++ 2008, e.g.:
+#   > src/msvc2008.bat
+#   Or: 
+#   > C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\vcvars32.bat
+#   Or, when using the Visual C++ Toolkit 2003: "msvcsetup.bat" (adjust the
+#   paths when necessary).
+#   For Windows 98/ME the 2003 version is required, but then the executable
+#   won't work on Windows 7 and 64 bit systems.
+# - > cd src
 #   > nmake -f Make_mvc.mak
-# - Run the tests and check the ouput:
+# - Run the tests:
 #   > nmake -f Make_mvc.mak testclean
 #   > nmake -f Make_mvc.mak test
+#   - check the output.
 # - Rename (using ../tools/rename.bat):
 #           vim.exe to vimw32.exe
 #           tee/tee.exe to teew32.exe
@@ -164,18 +152,19 @@ MINOR = 1
 # Win32 GUI version build:
 # - > cd src
 #   > nmake -f Make_mvc.mak GUI=yes
-# - Run the tests and check the output:
+# - Run the tests:
 #   > nmake -f Make_mvc.mak testclean
 #   > nmake -f Make_mvc.mak testgvim
+#   - check the output.
 # - move "gvim.exe" to here (otherwise the OLE version will overwrite it).
 # - Move gvim.pdb to here.
 # - Copy "GvimExt/gvimext.dll" to here.
 # - Delete vimrun.exe, install.exe and uninstal.exe.
 # Win32 GUI version with OLE, PERL, Ruby, TCL, PYTHON and dynamic IME:
 # - Install the interfaces you want, see src/INSTALLpc.txt
-#   Adjust bigvim.bat to match the version of each interface you want.
 # - Build:
 #   > cd src
+#   Adjust bigvim.bat to match the version of each interface you want.
 #   > bigvim.bat
 # - Run the tests:
 #   > nmake -f Make_mvc.mak testclean
@@ -199,13 +188,11 @@ 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:
-#   > unzip icons.zip
 #   > makensis gvim.nsi  (takes a few minutes).
 #      ignore warning for libwinpthread-1.dll
 # - Copy gvim##.exe to the dist directory.
@@ -469,25 +456,20 @@ dosrt_files: dist prepare no_title.vim
 	-rm $(IN_README_DIR)
 	mv dist/vim/$(VIMRTDIR)/runtime/* dist/vim/$(VIMRTDIR)
 	rmdir dist/vim/$(VIMRTDIR)/runtime
-# Add the message translations.  Trick: skip ja.mo/ja.euc-jp.mo and use
-# ja.sjis.mo instead.  Same for cs.mo / cs.cp1250.mo, pl.mo / pl.cp1250.mo,
-# sk.mo / sk.cp1250.mo, zh_CN.mo / zh_CN.cp936.mo, uk.mo / uk.cp1251.mo and
-# ru.mo / ru.cp1251.mo.
+# Add the message translations.  Trick: skip ja.mo and use ja.sjis.mo instead.
+# Same for cs.mo / cs.cp1250.mo, pl.mo / pl.cp1250.mo, sk.mo / sk.cp1250.mo,
+# zh_CN.mo / zh_CN.cp936.mo, uk.mo / uk.cp1251.mo and ru.mo / ru.cp1251.mo.
 	for i in $(LANG_DOS); do \
-	      if test "$$i" != "src/po/ja.mo" -a "$$i" != "src/po/ja.euc-jp.mo" -a "$$i" != "src/po/pl.mo" -a "$$i" != "src/po/cs.mo" -a "$$i" != "src/po/sk.mo" -a "$$i" != "src/po/zh_CN.mo" -a "$$i" != "src/po/ru.mo" -a "$$i" != "src/po/uk.mo"; then \
+	      if test "$$i" != "src/po/ja.mo" -a "$$i" != "src/po/pl.mo" -a "$$i" != "src/po/cs.mo" -a "$$i" != "src/po/sk.mo" -a "$$i" != "src/po/zh_CN.mo" -a "$$i" != "src/po/ru.mo" -a "$$i" != "src/po/uk.mo"; then \
 		n=`echo $$i | sed -e "s+src/po/\([-a-zA-Z0-9_]*\(.UTF-8\)*\)\(.sjis\)*\(.cp1250\)*\(.cp1251\)*\(.cp936\)*.mo+\1+"`; \
 		mkdir dist/vim/$(VIMRTDIR)/lang/$$n; \
 		mkdir dist/vim/$(VIMRTDIR)/lang/$$n/LC_MESSAGES; \
 		cp $$i dist/vim/$(VIMRTDIR)/lang/$$n/LC_MESSAGES/vim.mo; \
 	      fi \
 	    done
-	mkdir dist/vim/$(VIMRTDIR)/gettext32
-	cp gettext32/libintl-8.dll dist/vim/$(VIMRTDIR)/gettext32/
-	cp gettext32/libiconv-2.dll dist/vim/$(VIMRTDIR)/gettext32/
-	cp gettext32/libgcc_s_sjlj-1.dll dist/vim/$(VIMRTDIR)/gettext32/
-	mkdir dist/vim/$(VIMRTDIR)/gettext64
-	cp gettext64/libintl-8.dll dist/vim/$(VIMRTDIR)/gettext64/
-	cp gettext64/libiconv-2.dll dist/vim/$(VIMRTDIR)/gettext64/
+	cp libintl-8.dll dist/vim/$(VIMRTDIR)/
+	cp libiconv-2.dll dist/vim/$(VIMRTDIR)/
+	cp libgcc_s_sjlj-1.dll dist/vim/$(VIMRTDIR)/
 
 
 # Used before uploading.  Don't delete the AAPDIR/sign files!
@@ -514,10 +496,7 @@ dosbin_gvim: dist no_title.vim dist/$(COMMENT_GVIM)
 	cp vimrun.exe dist/vim/$(VIMRTDIR)/vimrun.exe
 	cp installw32.exe dist/vim/$(VIMRTDIR)/install.exe
 	cp uninstalw32.exe dist/vim/$(VIMRTDIR)/uninstal.exe
-	mkdir dist/vim/$(VIMRTDIR)/GvimExt32
-	cp gvimext.dll dist/vim/$(VIMRTDIR)/GvimExt32/gvimext.dll
-	mkdir dist/vim/$(VIMRTDIR)/GvimExt64
-	cp gvimext64.dll dist/vim/$(VIMRTDIR)/GvimExt64/gvimext.dll
+	cp gvimext.dll dist/vim/$(VIMRTDIR)/gvimext.dll
 	cd dist && zip -9 -rD -z gvim$(VERSION).zip vim <$(COMMENT_GVIM)
 	cp gvim.pdb dist/gvim$(VERSION).pdb
 

README.md

@@ -1,13 +1,12 @@
 Vim - the text editor - for Mac OS X
 
+This is the official GitHub repository for MacVim, the macOS port of [vim](https://github.com/vim/vim). It is based on
+[Björn Winckler's repository](https://github.com/b4winckler/macvim), which was official until he stepped down as the
+maintainer of the port.
 
-- MacVim homepage https://macvim-dev.github.io/macvim
+- MacVim homepage http://macvim-dev.github.io/macvim
 
-- Download the latest version from [Releases](https://github.com/macvim-dev/macvim/releases/latest).
-
-- Vim README: [README_vim.md](README_vim.md)
+- Vim README https://github.com/macvim-dev/macvim/blob/master/README_vim.md
 
 - Travis CI <a href="https://travis-ci.org/macvim-dev/macvim"><img src="https://travis-ci.org/macvim-dev/macvim.svg?branch=master" alt="Build Status"></a><a href="https://travis-ci.org/macvim-dev/homebrew-macvim"><img src="https://travis-ci.org/macvim-dev/homebrew-macvim.svg?branch=master" alt="Build Status"></a>
 
-- Packaged in [![Homebrew package](https://repology.org/badge/version-for-repo/homebrew/macvim.svg)](https://repology.org/metapackage/macvim/versions) [![MacPorts package](https://repology.org/badge/version-for-repo/macports/macvim.svg)](https://repology.org/metapackage/macvim/versions)
-

README.txt

@@ -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?

README_vim.md

@@ -1,12 +1,8 @@
-![Vim Logo](https://github.com/vim/vim/blob/master/runtime/vimlogo.gif)
-
+`README.md` for version 8.0 of Vim: Vi IMproved.
 [![Build Status](https://travis-ci.org/vim/vim.svg?branch=master)](https://travis-ci.org/vim/vim)
+[![Coverage Status](https://coveralls.io/repos/vim/vim/badge.svg?branch=master&service=github)](https://coveralls.io/github/vim/vim?branch=master)
 [![Appveyor Build status](https://ci.appveyor.com/api/projects/status/o2qht2kjm02sgghk?svg=true)](https://ci.appveyor.com/project/chrisbra/vim)
-[![Coverage Status](https://codecov.io/gh/vim/vim/coverage.svg?branch=master)](https://codecov.io/gh/vim/vim?branch=master)
 [![Coverity Scan](https://scan.coverity.com/projects/241/badge.svg)](https://scan.coverity.com/projects/vim)
-[![Language Grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/vim/vim.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/vim/vim/context:cpp)
-[![Debian CI](https://badges.debian.net/badges/debian/testing/vim/version.svg)](https://buildd.debian.org/vim)
-[![Packages](https://repology.org/badge/tiny-repos/vim.svg)](https://repology.org/metapackage/vim)
 
 
 ## What is Vim? ##
@@ -138,6 +134,3 @@ If nothing else works, report bugs directly:
 
 Send any other comments, patches, flowers and suggestions to:
 	Bram Moolenaar <Bram@vim.org>
-
-
-This is `README.md` for version 8.1 of Vim: Vi IMproved.

READMEdir/Contents

@@ -9,10 +9,10 @@ Vim		Vi IMproved.  A clone of the UNIX text editor Vi.  Very useful
 		messages, shows current file name in window title, on-line
 		help, rectangular cut/paste, etc., etc., etc...
 
-		Version 8.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.
 
 

READMEdir/README_ami.txt

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

READMEdir/README_amibin.txt

@@ -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

READMEdir/README_amisrc.txt

@@ -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

READMEdir/README_bindos.txt

@@ -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).

READMEdir/README_dos.txt

@@ -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".

READMEdir/README_extra.txt

@@ -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"

READMEdir/README_mac.txt

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

READMEdir/README_ole.txt

@@ -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

READMEdir/README_os2.txt

@@ -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.

READMEdir/README_os390.txt

@@ -1,4 +1,4 @@
-README_os390.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.

READMEdir/README_src.txt

@@ -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!

READMEdir/README_srcdos.txt

@@ -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

READMEdir/README_unix.txt

@@ -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.

READMEdir/README_vms.txt

@@ -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.

READMEdir/README_w32s.txt

@@ -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.

appveyor.yml

@@ -16,10 +16,9 @@ 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:
-  - ci/appveyor.bat
+  - src/appveyor.bat
 
 test_script:
   - cd src/testdir

farsi/README.txt

@@ -0,0 +1,2 @@
+For information about installation of Farsi fonts and Vim usage in Farsi mode,
+refer to the Farsi help file by typing ":help farsi" in Vim.

nsis/README.txt

@@ -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:
 
@@ -15,63 +15,28 @@ To build the installable .exe:
 	vimrun.exe,
 	install.exe,
 	uninstal.exe,
-	tee/tee.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).
 
-5.  Get a "diff.exe" program.  If you skip this the built-in diff will always
-    be used (which is fine for most users).  If you do have your own
-    "diff.exe" put it in the "../.." directory (above the "vim81" directory,
-    it's the same for all Vim versions).
+5.  Go to the OleVim directory and build OpenWithVim.exe and SendToVim.exe (or
+    get them from a binary archive).
+
+6.  Get a "diff.exe" program and put it in the "../.." directory (above the
+    "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
 
-6   Also put winpty32.dll and winpty-agent.exe in "../.." (above the "vim81"
-    directory).  This is required for the terminal window.
-
 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.
 
-Unpack the images:
-	cd nsis
-	unzip icons.zip
-
 To build then, enter:
 
-	cd nsis
 	makensis gvim.nsi

nsis/gvim_version.nsh

@@ -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

nsis/lang/danish.nsi

@@ -1,175 +0,0 @@
-# vi:set ts=8 sts=4 sw=4 et fdm=marker:
-#
-# danish.nsi: Danish language strings for gvim NSIS installer.
-#
-# Locale ID    : 1030
-# fileencoding : UTF-8
-# Author       : scootergrisen
-
-!insertmacro MUI_LANGUAGE "Danish"
-
-
-# Overwrite the default translation.
-# These strings should be always English.  Otherwise dosinst.c fails.
-LangString ^SetupCaption     ${LANG_DANISH}         "$(^Name) Setup"
-LangString ^UninstallCaption ${LANG_DANISH}         "$(^Name) Uninstall"
-
-##############################################################################
-# MUI Configuration Strings                                               {{{1
-##############################################################################
-
-#LangString str_dest_folder          ${LANG_DANISH}     "Destinationsmappe (skal slutte med $\"vim$\")"
-
-LangString str_show_readme          ${LANG_DANISH}     "Vis README efter installationen er gennemført"
-
-# Install types:
-LangString str_type_typical         ${LANG_DANISH}     "Typisk"
-
-LangString str_type_minimal         ${LANG_DANISH}     "Minimal"
-
-LangString str_type_full            ${LANG_DANISH}     "Fuld"
-
-
-##############################################################################
-# Section Titles & Description                                            {{{1
-##############################################################################
-
-LangString str_section_old_ver      ${LANG_DANISH}     "Afinstaller eksisterende version(er)"
-LangString str_desc_old_ver         ${LANG_DANISH}     "Afinstaller eksisterende Vim-version(er) fra dit system."
-
-LangString str_section_exe          ${LANG_DANISH}     "Vim GUI og afviklingsfiler"
-LangString str_desc_exe             ${LANG_DANISH}     "Vim GUI-eksekverbare- og afviklingsfiler. Komponenten kræves."
-
-LangString str_section_console      ${LANG_DANISH}     "Vim-konsolprogram"
-LangString str_desc_console         ${LANG_DANISH}     "Konsolversion af Vim (vim.exe)."
-
-LangString str_section_batch        ${LANG_DANISH}     "Opret .bat-filer"
-LangString str_desc_batch           ${LANG_DANISH}     "Opret .bat-filer til Vim-varianter i Windows-mappen til brug fra kommandolinjen."
-
-LangString str_group_icons          ${LANG_DANISH}     "Opret ikoner til Vim"
-LangString str_desc_icons           ${LANG_DANISH}     "Opret ikoner til Vim diverse steder for at hjælpe med at gøre adgangen let."
-
-LangString str_section_desktop      ${LANG_DANISH}     "På skrivebordet"
-LangString str_desc_desktop         ${LANG_DANISH}     "Opret ikoner til gVim-eksekverbare på skrivebordet."
-
-LangString str_section_start_menu   ${LANG_DANISH}     "I Programmer-mappen i menuen Start"
-LangString str_desc_start_menu      ${LANG_DANISH}     "Tilføj Vim i Programmer-mappen i menuen Start."
-
-#LangString str_section_quick_launch ${LANG_DANISH}     "I værktøjslinjen Hurtig start"
-#LangString str_desc_quick_launch    ${LANG_DANISH}     "Tilføj Vim-genvej i værktøjslinjen Hurtig start."
-
-LangString str_section_edit_with    ${LANG_DANISH}     "Tilføj Vim-genvejsmenu"
-LangString str_desc_edit_with       ${LANG_DANISH}     "Tilføj Vim til listen i $\"Åbn med...$\"-genvejsmenuen."
-
-#LangString str_section_edit_with32  ${LANG_DANISH}     "32-bit-version"
-#LangString str_desc_edit_with32     ${LANG_DANISH}     "Tilføj Vim til listen i $\"Åbn med...$\"-genvejsmenuen for 32-bit-programmer."
-
-#LangString str_section_edit_with64  ${LANG_DANISH}     "64-bit-version"
-#LangString str_desc_edit_with64     ${LANG_DANISH}     "Tilføj Vim til listen i $\"Åbn med...$\"-genvejsmenuen for 64-bit-programmer."
-
-LangString str_section_vim_rc       ${LANG_DANISH}     "Opret standardkonfiguration"
-LangString str_desc_vim_rc          ${LANG_DANISH}     "Opret en standardkonfigurationsfil (_vimrc) hvis der ikke allerede findes en."
-
-LangString str_group_plugin         ${LANG_DANISH}     "Opret plugin-mapper"
-LangString str_desc_plugin          ${LANG_DANISH}     "Opret plugin-mapper. Plugin-mapper giver mulighed for at udvide Vim ved at slippe en fil i en mappen."
-
-LangString str_section_plugin_home  ${LANG_DANISH}     "Private"
-LangString str_desc_plugin_home     ${LANG_DANISH}     "Opret plugin-mapper i HOME (hvis du har defineret et) eller Vim-installationsmappe."
-
-LangString str_section_plugin_vim   ${LANG_DANISH}     "Delte"
-LangString str_desc_plugin_vim      ${LANG_DANISH}     "Opret plugin-mapper i Vim-installationsmappe, det bruges af alle på systemet."
-
-LangString str_section_vis_vim      ${LANG_DANISH}     "VisVim-udvidelser"
-LangString str_desc_vis_vim         ${LANG_DANISH}     "VisVim-udvidelser til integrering i Microsoft Visual Studio."
-
-LangString str_section_nls          ${LANG_DANISH}     "Understøttelse af modersmål"
-LangString str_desc_nls             ${LANG_DANISH}     "Installer filer til understøttelse af modersmål."
-
-LangString str_unsection_register   ${LANG_DANISH}     "Afregistrer Vim"
-LangString str_desc_unregister      ${LANG_DANISH}     "Afregistrer Vim fra systemet."
-
-LangString str_unsection_exe        ${LANG_DANISH}     "Fjern Vim-eksekverbare-/afviklingsfiler"
-LangString str_desc_rm_exe          ${LANG_DANISH}     "Fjern alle Vim-eksekverbare- og afviklingsfiler."
-
-LangString str_ungroup_plugin       ${LANG_DANISH}     "Fjern plugin-mapper"
-LangString str_desc_rm_plugin       ${LANG_DANISH}     "Fjern plugin-mapperne, hvis de er tomme."
-
-LangString str_unsection_plugin_home ${LANG_DANISH}     "Private"
-LangString str_desc_rm_plugin_home  ${LANG_DANISH}     "Fjern plugin-mapperne fra HOME-mappen."
-
-LangString str_unsection_plugin_vim ${LANG_DANISH}     "Delte"
-LangString str_desc_rm_plugin_vim   ${LANG_DANISH}     "Fjern plugin-mapperne fra Vim-installationsmappen."
-
-LangString str_unsection_rootdir    ${LANG_DANISH}     "Fjern Vim-rodmappen"
-LangString str_desc_rm_rootdir      ${LANG_DANISH}     "Fjern Vim-rodmappen. Den indeholder dine Vim-konfigurationsfiler!"
-
-
-##############################################################################
-# Messages                                                                {{{1
-##############################################################################
-
-#LangString str_msg_too_many_ver  ${LANG_DANISH}     "Fandt $vim_old_ver_count Vim-versioner på dit system.$\r$\nInstallationsguiden kan højst håndtere ${VIM_MAX_OLD_VER}-versioner.$\r$\nFjern venligst nogle versioner og start igen."
-
-#LangString str_msg_invalid_root  ${LANG_DANISH}     "Ugyldig installationssti: $vim_install_root!$\r$\nDen skal slutte med $\"vim$\"."
-
-#LangString str_msg_bin_mismatch  ${LANG_DANISH}     "Uoverensstemmelse i binære sti!$\r$\n$\r$\nForventede at den binære sti var $\"$vim_bin_path$\",$\r$\nmen systemet indikerer at den binære sti er $\"$INSTDIR$\"."
-
-#LangString str_msg_vim_running   ${LANG_DANISH}     "Vim kører stadig på dit system.$\r$\nLuk venligst alle instanser af Vim inden du fortsætter."
-
-#LangString str_msg_register_ole  ${LANG_DANISH}     "Forsøger at registrere Vim med OLE. Der er ingen meddelelse til at indikere om det virker eller ej."
-
-#LangString str_msg_unreg_ole     ${LANG_DANISH}     "Forsøger at afregistrere Vim med OLE. Der er ingen meddelelse til at indikere om det virker eller ej."
-
-#LangString str_msg_rm_start      ${LANG_DANISH}     "Afinstallerer følgende version:"
-
-#LangString str_msg_rm_fail       ${LANG_DANISH}     "Kunne ikke afinstallere følgende version:"
-
-#LangString str_msg_no_rm_key     ${LANG_DANISH}     "Kan ikke finde registreringsdatabasenøgle for afinstallationsguiden."
-
-#LangString str_msg_no_rm_reg     ${LANG_DANISH}     "Kan ikke finde afinstallationsguiden fra registreringsdatabasen."
-
-#LangString str_msg_no_rm_exe     ${LANG_DANISH}     "Kan ikke tilgå afinstallationsguide."
-
-#LangString str_msg_rm_copy_fail  ${LANG_DANISH}     "Kunne ikke kopiere afinstallationsguide til midlertidig mappe."
-
-#LangString str_msg_rm_run_fail   ${LANG_DANISH}     "Kunne ikke køre afinstallationsguide."
-
-#LangString str_msg_abort_install ${LANG_DANISH}     "Installationsguiden vil afbryde."
-
-LangString str_msg_install_fail  ${LANG_DANISH}     "Installationen mislykkedes. Bedre held næste gang."
-
-LangString str_msg_rm_exe_fail   ${LANG_DANISH}     "Nogle filer i $0 er ikke blevet slettet!$\r$\nDu skal gøre det manuelt."
-
-#LangString str_msg_rm_root_fail  ${LANG_DANISH}     "ADVARSEL: Kan ikke fjerne $\"$vim_install_root$\", den er ikke tom!"
-
-LangString str_msg_uninstalling  ${LANG_DANISH}     "Afinstallerer den gamle version..."
-
-LangString str_msg_registering   ${LANG_DANISH}     "Registrerer..."
-
-LangString str_msg_unregistering ${LANG_DANISH}     "Afregistrerer..."
-
-
-##############################################################################
-# Dialog Box                                                              {{{1
-##############################################################################
-
-LangString str_vimrc_page_title    ${LANG_DANISH}     "Vælg _vimrc-indstillinger"
-LangString str_vimrc_page_subtitle ${LANG_DANISH}     "Vælg indstillingerne til forbedring, tastatur og mus."
-
-LangString str_msg_compat_title    ${LANG_DANISH}     " Vi- / Vim-opførsel "
-LangString str_msg_compat_desc     ${LANG_DANISH}     "&Kompatibilitet og forbedringer"
-LangString str_msg_compat_vi       ${LANG_DANISH}     "Vi-kompatibel"
-LangString str_msg_compat_vim      ${LANG_DANISH}     "Vim original"
-LangString str_msg_compat_defaults ${LANG_DANISH}     "Vim med nogle forbedringer (indlæs defaults.vim)"
-LangString str_msg_compat_all      ${LANG_DANISH}     "Vim med alle forbedringer (indlæs vimrc_example.vim) (standard)"
-
-LangString str_msg_keymap_title   ${LANG_DANISH}     " Tilknytninger "
-LangString str_msg_keymap_desc    ${LANG_DANISH}     "&Gentilknyt nogle få taster for Windows (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F osv.)"
-LangString str_msg_keymap_default ${LANG_DANISH}     "Gentilknyt ikke taster (standard)"
-LangString str_msg_keymap_windows ${LANG_DANISH}     "Gentilknyt nogle få taster"
-
-LangString str_msg_mouse_title   ${LANG_DANISH}     " Mus "
-LangString str_msg_mouse_desc    ${LANG_DANISH}     "&Opførsel af højre og venstre knapper"
-LangString str_msg_mouse_default ${LANG_DANISH}     "Højre: genvejsmenu, venstre: visuel tilstand (standard)"
-LangString str_msg_mouse_windows ${LANG_DANISH}     "Højre: genvejsmenu, venstre: vælg-tilstand (Windows)"
-LangString str_msg_mouse_unix    ${LANG_DANISH}     "Højre: udvider markering, venstre: visuel tilstand (Unix)"

nsis/lang/dutch.nsi

@@ -1,281 +0,0 @@
-# vi:set ts=8 sts=4 sw=4 et fdm=marker:
-#
-# dutch.nsi : Dutch language strings for gvim NSIS installer.
-#
-# Locale ID    : 1043
-# Locale Name  : nl
-# fileencoding : UTF-8
-# Author       : Peter Odding <peter@peterodding.com>
-
-!insertmacro MUI_LANGUAGE "Dutch"
-
-
-# Overwrite the default translation.
-# These strings should be always English.  Otherwise dosinst.c fails.
-LangString ^SetupCaption     ${LANG_DUTCH} \
-        "$(^Name) Setup"
-LangString ^UninstallCaption ${LANG_DUTCH} \
-        "$(^Name) Uninstall"
-
-##############################################################################
-# MUI Configuration Strings                                               {{{1
-##############################################################################
-
-#LangString str_dest_folder          ${LANG_DUTCH} \
-#    "Doelmap (moet eindigen op $\"vim$\")"
-
-LangString str_show_readme          ${LANG_DUTCH} \
-    "README weergeven na installatie"
-
-# Install types:
-LangString str_type_typical         ${LANG_DUTCH} \
-    "Gebruikelijk"
-
-LangString str_type_minimal         ${LANG_DUTCH} \
-    "Minimaal"
-
-LangString str_type_full            ${LANG_DUTCH} \
-    "Volledig"
-
-
-##############################################################################
-# Section Titles & Description                                            {{{1
-##############################################################################
-
-LangString str_section_old_ver      ${LANG_DUTCH} \
-    "Bestaande versie(s) de-installeren"
-LangString str_desc_old_ver         ${LANG_DUTCH} \
-    "Bestaande Vim versie(s) van je systeem verwijderen."
-
-LangString str_section_exe          ${LANG_DUTCH} \
-    "Vim GUI"
-LangString str_desc_exe             ${LANG_DUTCH} \
-    "Vim GUI uitvoerbare bestanden en runtime bestanden.  Dit component is vereist."
-
-LangString str_section_console      ${LANG_DUTCH} \
-    "Vim console programma"
-LangString str_desc_console         ${LANG_DUTCH} \
-    "Console versie van Vim (vim.exe)."
-
-LangString str_section_batch        ${LANG_DUTCH} \
-    "Creëer .bat bestanden"
-LangString str_desc_batch           ${LANG_DUTCH} \
-    "Creëer .bat bestanden voor Vim varianten in de Windows map voor \
-     commando regel gebruik."
-
-LangString str_group_icons          ${LANG_DUTCH} \
-    "Creëer pictogrammen for Vim"
-LangString str_desc_icons           ${LANG_DUTCH} \
-    "Creëer pictogrammen voor Vim op verschillende locaties voor gemakkelijke toegang."
-
-LangString str_section_desktop      ${LANG_DUTCH} \
-    "Op het bureaublad"
-LangString str_desc_desktop         ${LANG_DUTCH} \
-    "Creëer pictogrammen voor Vim uitvoerbare bestanden op het bureaublad."
-
-LangString str_section_start_menu   ${LANG_DUTCH} \
-    "In de Programma's map in het start menu"
-LangString str_desc_start_menu      ${LANG_DUTCH} \
-    "Voeg Vim toe aan de programma's map in het start menu.  \
-     Van toepassing op Windows 95 en later."
-
-#LangString str_section_quick_launch ${LANG_DUTCH} \
-#    "In de snel starten balk"
-#LangString str_desc_quick_launch    ${LANG_DUTCH} \
-#    "Voeg Vim snelkoppeling toe aan de snel starten balk."
-
-LangString str_section_edit_with    ${LANG_DUTCH} \
-    "Voeg Vim contextmenu toe"
-LangString str_desc_edit_with       ${LANG_DUTCH} \
-    "Voeg Vim toe aan de $\"Openen met...$\" contextmenu lijst."
-
-#LangString str_section_edit_with32  ${LANG_DUTCH} \
-#    "32-bit versie"
-#LangString str_desc_edit_with32     ${LANG_DUTCH} \
-#    "Voeg Vim toe aan de $\"Openen met...$\" contextmenu lijst \
-#     voor 32-bit toepassingen."
-
-#LangString str_section_edit_with64  ${LANG_DUTCH} \
-#    "64-bit versie"
-#LangString str_desc_edit_with64     ${LANG_DUTCH} \
-#    "Voeg Vim toe aan de $\"Openen met...$\" contextmenu lijst \
-#     voor 64-bit toepassingen."
-
-LangString str_section_vim_rc       ${LANG_DUTCH} \
-    "Creëer standaard configuratie"
-LangString str_desc_vim_rc          ${LANG_DUTCH} \
-    "Creëer een standaard configuratie bestand (_vimrc) als er nog geen bestaat."
-
-LangString str_group_plugin         ${LANG_DUTCH} \
-    "Creëer Plugin mappen"
-LangString str_desc_plugin          ${LANG_DUTCH} \
-    "Creëer plugin mappen.  Plugin mappen maken het mogelijk om \
-     Vim uit te breiden door een bestand in een map te plaatsen."
-
-LangString str_section_plugin_home  ${LANG_DUTCH} \
-    "Privé"
-LangString str_desc_plugin_home     ${LANG_DUTCH} \
-    "Create plugin directories in HOME directory."
-
-LangString str_section_plugin_vim   ${LANG_DUTCH} \
-    "Gedeeld"
-LangString str_desc_plugin_vim      ${LANG_DUTCH} \
-    "Creëer plugin mappen in Vim installatie map, deze worden gebruikt \
-     voor iedereen op het systeem."
-
-LangString str_section_vis_vim      ${LANG_DUTCH} \
-    "VisVim extensie"
-LangString str_desc_vis_vim         ${LANG_DUTCH} \
-    "VisVim extensie voor Microsoft Visual Studio integratie."
-
-LangString str_section_nls          ${LANG_DUTCH} \
-    "Ondersteuning voor andere talen"
-LangString str_desc_nls             ${LANG_DUTCH} \
-    "Bestanden voor ondersteuning van andere talen dan Engels installeren."
-
-LangString str_unsection_register   ${LANG_DUTCH} \
-    "Vim afmelden"
-LangString str_desc_unregister      ${LANG_DUTCH} \
-    "Registratie van Vim in het systeem ongedaan maken."
-
-LangString str_unsection_exe        ${LANG_DUTCH} \
-    "Vim uitvoerbare/runtime bestanden verwijderen"
-LangString str_desc_rm_exe          ${LANG_DUTCH} \
-    "Verwijder alle Vim uitvoerbare bestanden en runtime bestanden."
-
-LangString str_ungroup_plugin       ${LANG_DUTCH} \
-    "Remove plugin directories"
-LangString str_desc_rm_plugin       ${LANG_DUTCH} \
-    "Remove the plugin directories if they are empty."
-
-LangString str_unsection_plugin_home ${LANG_DUTCH} \
-    "Privé"
-LangString str_desc_rm_plugin_home  ${LANG_DUTCH} \
-    "Remove the plugin directories from HOME directory."
-
-LangString str_unsection_plugin_vim ${LANG_DUTCH} \
-    "Gedeeld"
-LangString str_desc_rm_plugin_vim   ${LANG_DUTCH} \
-    "Remove the plugin directories from Vim install directory."
-
-LangString str_unsection_rootdir    ${LANG_DUTCH} \
-    "Remove the Vim root directory"
-LangString str_desc_rm_rootdir      ${LANG_DUTCH} \
-    "Remove the Vim root directory. It contains your Vim configuration files!"
-
-
-##############################################################################
-# Messages                                                                {{{1
-##############################################################################
-
-#LangString str_msg_too_many_ver  ${LANG_DUTCH} \
-#    "Er zijn $vim_old_ver_count Vim versies op je systeem gevonden.$\r$\n\
-#     Deze installatie kan omgaan met maximaal ${VIM_MAX_OLD_VER} versies.$\r$\n\
-#     Verwijder a.u.b. wat versies en probeer het dan opnieuw."
-
-#LangString str_msg_invalid_root  ${LANG_DUTCH} \
-#    "Ongeldig installatiepad: $vim_install_root!$\r$\n\
-#     Het moet eindelijk op $\"vim$\"."
-
-#LangString str_msg_bin_mismatch  ${LANG_DUTCH} \
-#    "Binair pad onjuist!$\r$\n$\r$\n\
-#     Het binaire pad zou $\"$vim_bin_path$\" moeten zijn,$\r$\n\
-#     maar het systeem geeft aan dat het binaire pad $\"$INSTDIR$\" is."
-
-#LangString str_msg_vim_running   ${LANG_DUTCH} \
-#    "Vim is nog actief op je systeem.$\r$\n\
-#     Sluit a.u.b. alle instanties van Vim voordat je verder gaat."
-
-#LangString str_msg_register_ole  ${LANG_DUTCH} \
-#    "Bezig met proberen om Vim te registreren met OLE. \
-#     Er is geen bericht dat aangeeft of deze operatie slaagt."
-
-#LangString str_msg_unreg_ole     ${LANG_DUTCH} \
-#    "Bezig met proberen om Vim te de-registreren met OLE. \
-#     Er is geen bericht dat aangeeft of deze operatie slaagt."
-
-#LangString str_msg_rm_start      ${LANG_DUTCH} \
-#    "De volgende versies worden verwijderd:"
-
-#LangString str_msg_rm_fail       ${LANG_DUTCH} \
-#    "De volgende versies konden niet worden verwijderd:"
-
-#LangString str_msg_no_rm_key     ${LANG_DUTCH} \
-#    "Kan de uninstaller register sleutel niet vinden."
-
-#LangString str_msg_no_rm_reg     ${LANG_DUTCH} \
-#    "Kan de uninstaller niet vinden via het register."
-
-#LangString str_msg_no_rm_exe     ${LANG_DUTCH} \
-#    "Kan geen toegang krijgen tot de uninstaller."
-
-#LangString str_msg_rm_copy_fail  ${LANG_DUTCH} \
-#    "Kon de uninstaller niet naar een tijdelijke map kopiëren."
-
-#LangString str_msg_rm_run_fail   ${LANG_DUTCH} \
-#    "Kon de uninstaller niet uitvoeren."
-
-#LangString str_msg_abort_install ${LANG_DUTCH} \
-#    "Installatie wordt gestopt."
-
-LangString str_msg_install_fail  ${LANG_DUTCH} \
-    "Installatie is mislukt."
-
-LangString str_msg_rm_exe_fail   ${LANG_DUTCH} \
-    "Sommige bestanden in $0 zijn niet verwijderd!$\r$\n\
-     Dit moet je handmatig doen."
-
-#LangString str_msg_rm_root_fail  ${LANG_DUTCH} \
-#    "WAARSCHUWING: Kan $\"$vim_install_root$\" niet verwijderen omdat het niet leeg is!"
-
-LangString str_msg_uninstalling  ${LANG_DUTCH} \
-    "Uninstalling the old version..."
-
-LangString str_msg_registering   ${LANG_DUTCH} \
-    "Registering..."
-
-LangString str_msg_unregistering ${LANG_DUTCH} \
-    "Unregistering..."
-
-
-##############################################################################
-# Dialog Box                                                              {{{1
-##############################################################################
-
-LangString str_vimrc_page_title    ${LANG_DUTCH} \
-    "Choose _vimrc settings"
-LangString str_vimrc_page_subtitle ${LANG_DUTCH} \
-    "Choose the settings for enhancement, keyboard and mouse."
-
-LangString str_msg_compat_title    ${LANG_DUTCH} \
-    " Vi / Vim behavior "
-LangString str_msg_compat_desc     ${LANG_DUTCH} \
-    "&Compatibility and enhancements"
-LangString str_msg_compat_vi       ${LANG_DUTCH} \
-    "Vi compatible"
-LangString str_msg_compat_vim      ${LANG_DUTCH} \
-    "Vim original"
-LangString str_msg_compat_defaults ${LANG_DUTCH} \
-    "Vim with some enhancements (load defaults.vim)"
-LangString str_msg_compat_all      ${LANG_DUTCH} \
-    "Vim with all enhancements (load vimrc_example.vim) (Default)"
-
-LangString str_msg_keymap_title   ${LANG_DUTCH} \
-    " Mappings "
-LangString str_msg_keymap_desc    ${LANG_DUTCH} \
-    "&Remap a few keys for Windows (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F, etc)"
-LangString str_msg_keymap_default ${LANG_DUTCH} \
-    "Do not remap keys (Default)"
-LangString str_msg_keymap_windows ${LANG_DUTCH} \
-    "Remap a few keys"
-
-LangString str_msg_mouse_title   ${LANG_DUTCH} \
-    " Mouse "
-LangString str_msg_mouse_desc    ${LANG_DUTCH} \
-    "&Behavior of right and left buttons"
-LangString str_msg_mouse_default ${LANG_DUTCH} \
-    "Right: popup menu, Left: visual mode (Default)"
-LangString str_msg_mouse_windows ${LANG_DUTCH} \
-    "Right: popup menu, Left: select mode (Windows)"
-LangString str_msg_mouse_unix    ${LANG_DUTCH} \
-    "Right: extends selection, Left: visual mode (Unix)"

nsis/lang/english.nsi

@@ -1,280 +0,0 @@
-# vi:set ts=8 sts=4 sw=4 et fdm=marker:
-#
-# english.nsi: English language strings for gvim NSIS installer.
-#
-# Locale ID    : 1033
-# fileencoding : UTF-8
-# Author       : Guopeng Wen, Ken Takata
-
-!insertmacro MUI_LANGUAGE "English"
-
-
-# Overwrite the default translation.
-# These strings should be always English.  Otherwise dosinst.c fails.
-LangString ^SetupCaption     ${LANG_ENGLISH} \
-        "$(^Name) Setup"
-LangString ^UninstallCaption ${LANG_ENGLISH} \
-        "$(^Name) Uninstall"
-
-##############################################################################
-# MUI Configuration Strings                                               {{{1
-##############################################################################
-
-#LangString str_dest_folder          ${LANG_ENGLISH} \
-#    "Destination Folder (Must end with $\"vim$\")"
-
-LangString str_show_readme          ${LANG_ENGLISH} \
-    "Show README after installation finish"
-
-# Install types:
-LangString str_type_typical         ${LANG_ENGLISH} \
-    "Typical"
-
-LangString str_type_minimal         ${LANG_ENGLISH} \
-    "Minimal"
-
-LangString str_type_full            ${LANG_ENGLISH} \
-    "Full"
-
-
-##############################################################################
-# Section Titles & Description                                            {{{1
-##############################################################################
-
-LangString str_section_old_ver      ${LANG_ENGLISH} \
-    "Uninstall Existing Version(s)"
-LangString str_desc_old_ver         ${LANG_ENGLISH} \
-    "Uninstall existing Vim version(s) from your system."
-
-LangString str_section_exe          ${LANG_ENGLISH} \
-    "Vim GUI and runtime files"
-LangString str_desc_exe             ${LANG_ENGLISH} \
-    "Vim GUI executables and runtime files.  This component is required."
-
-LangString str_section_console      ${LANG_ENGLISH} \
-    "Vim console program"
-LangString str_desc_console         ${LANG_ENGLISH} \
-    "Console version of Vim (vim.exe)."
-
-LangString str_section_batch        ${LANG_ENGLISH} \
-    "Create .bat files"
-LangString str_desc_batch           ${LANG_ENGLISH} \
-    "Create .bat files for Vim variants in the Windows directory for \
-     command line use."
-
-LangString str_group_icons          ${LANG_ENGLISH} \
-    "Create icons for Vim"
-LangString str_desc_icons           ${LANG_ENGLISH} \
-    "Create icons for Vim at various locations to facilitate easy access."
-
-LangString str_section_desktop      ${LANG_ENGLISH} \
-    "On the Desktop"
-LangString str_desc_desktop         ${LANG_ENGLISH} \
-    "Create icons for gVim executables on the desktop."
-
-LangString str_section_start_menu   ${LANG_ENGLISH} \
-    "In the Start Menu Programs Folder"
-LangString str_desc_start_menu      ${LANG_ENGLISH} \
-    "Add Vim in the programs folder of the start menu."
-
-#LangString str_section_quick_launch ${LANG_ENGLISH} \
-#    "In the Quick Launch Bar"
-#LangString str_desc_quick_launch    ${LANG_ENGLISH} \
-#    "Add Vim shortcut in the quick launch bar."
-
-LangString str_section_edit_with    ${LANG_ENGLISH} \
-    "Add Vim Context Menu"
-LangString str_desc_edit_with       ${LANG_ENGLISH} \
-    "Add Vim to the $\"Open With...$\" context menu list."
-
-#LangString str_section_edit_with32  ${LANG_ENGLISH} \
-#    "32-bit Version"
-#LangString str_desc_edit_with32     ${LANG_ENGLISH} \
-#    "Add Vim to the $\"Open With...$\" context menu list \
-#     for 32-bit applications."
-
-#LangString str_section_edit_with64  ${LANG_ENGLISH} \
-#    "64-bit Version"
-#LangString str_desc_edit_with64     ${LANG_ENGLISH} \
-#    "Add Vim to the $\"Open With...$\" context menu list \
-#     for 64-bit applications."
-
-LangString str_section_vim_rc       ${LANG_ENGLISH} \
-    "Create Default Config"
-LangString str_desc_vim_rc          ${LANG_ENGLISH} \
-    "Create a default config file (_vimrc) if one does not already exist."
-
-LangString str_group_plugin         ${LANG_ENGLISH} \
-    "Create Plugin Directories"
-LangString str_desc_plugin          ${LANG_ENGLISH} \
-    "Create plugin directories.  Plugin directories allow extending Vim \
-     by dropping a file into a directory."
-
-LangString str_section_plugin_home  ${LANG_ENGLISH} \
-    "Private"
-LangString str_desc_plugin_home     ${LANG_ENGLISH} \
-    "Create plugin directories in HOME directory."
-
-LangString str_section_plugin_vim   ${LANG_ENGLISH} \
-    "Shared"
-LangString str_desc_plugin_vim      ${LANG_ENGLISH} \
-    "Create plugin directories in Vim install directory, it is used for \
-     everybody on the system."
-
-LangString str_section_vis_vim      ${LANG_ENGLISH} \
-    "VisVim Extension"
-LangString str_desc_vis_vim         ${LANG_ENGLISH} \
-    "VisVim Extension for Microsoft Visual Studio integration."
-
-LangString str_section_nls          ${LANG_ENGLISH} \
-    "Native Language Support"
-LangString str_desc_nls             ${LANG_ENGLISH} \
-    "Install files for native language support."
-
-LangString str_unsection_register   ${LANG_ENGLISH} \
-    "Unregister Vim"
-LangString str_desc_unregister      ${LANG_ENGLISH} \
-    "Unregister Vim from the system."
-
-LangString str_unsection_exe        ${LANG_ENGLISH} \
-    "Remove Vim Executables/Runtime Files"
-LangString str_desc_rm_exe          ${LANG_ENGLISH} \
-    "Remove all Vim executables and runtime files."
-
-LangString str_ungroup_plugin       ${LANG_ENGLISH} \
-    "Remove plugin directories"
-LangString str_desc_rm_plugin       ${LANG_ENGLISH} \
-    "Remove the plugin directories if they are empty."
-
-LangString str_unsection_plugin_home ${LANG_ENGLISH} \
-    "Private"
-LangString str_desc_rm_plugin_home  ${LANG_ENGLISH} \
-    "Remove the plugin directories from HOME directory."
-
-LangString str_unsection_plugin_vim ${LANG_ENGLISH} \
-    "Shared"
-LangString str_desc_rm_plugin_vim   ${LANG_ENGLISH} \
-    "Remove the plugin directories from Vim install directory."
-
-LangString str_unsection_rootdir    ${LANG_ENGLISH} \
-    "Remove the Vim root directory"
-LangString str_desc_rm_rootdir      ${LANG_ENGLISH} \
-    "Remove the Vim root directory. It contains your Vim configuration files!"
-
-
-##############################################################################
-# Messages                                                                {{{1
-##############################################################################
-
-#LangString str_msg_too_many_ver  ${LANG_ENGLISH} \
-#    "Found $vim_old_ver_count Vim versions on your system.$\r$\n\
-#     This installer can only handle ${VIM_MAX_OLD_VER} versions \
-#     at most.$\r$\n\
-#     Please remove some versions and start again."
-
-#LangString str_msg_invalid_root  ${LANG_ENGLISH} \
-#    "Invalid install path: $vim_install_root!$\r$\n\
-#     It should end with $\"vim$\"."
-
-#LangString str_msg_bin_mismatch  ${LANG_ENGLISH} \
-#    "Binary path mismatch!$\r$\n$\r$\n\
-#     Expect the binary path to be $\"$vim_bin_path$\",$\r$\n\
-#     but system indicates the binary path is $\"$INSTDIR$\"."
-
-#LangString str_msg_vim_running   ${LANG_ENGLISH} \
-#    "Vim is still running on your system.$\r$\n\
-#     Please close all instances of Vim before you continue."
-
-#LangString str_msg_register_ole  ${LANG_ENGLISH} \
-#    "Attempting to register Vim with OLE. \
-#     There is no message indicates whether this works or not."
-
-#LangString str_msg_unreg_ole     ${LANG_ENGLISH} \
-#    "Attempting to unregister Vim with OLE. \
-#     There is no message indicates whether this works or not."
-
-#LangString str_msg_rm_start      ${LANG_ENGLISH} \
-#    "Uninstalling the following version:"
-
-#LangString str_msg_rm_fail       ${LANG_ENGLISH} \
-#    "Fail to uninstall the following version:"
-
-#LangString str_msg_no_rm_key     ${LANG_ENGLISH} \
-#    "Cannot find uninstaller registry key."
-
-#LangString str_msg_no_rm_reg     ${LANG_ENGLISH} \
-#    "Cannot find uninstaller from registry."
-
-#LangString str_msg_no_rm_exe     ${LANG_ENGLISH} \
-#    "Cannot access uninstaller."
-
-#LangString str_msg_rm_copy_fail  ${LANG_ENGLISH} \
-#    "Fail to copy uninstaller to temporary directory."
-
-#LangString str_msg_rm_run_fail   ${LANG_ENGLISH} \
-#    "Fail to run uninstaller."
-
-#LangString str_msg_abort_install ${LANG_ENGLISH} \
-#    "Installer will abort."
-
-LangString str_msg_install_fail  ${LANG_ENGLISH} \
-    "Installation failed. Better luck next time."
-
-LangString str_msg_rm_exe_fail   ${LANG_ENGLISH} \
-    "Some files in $0 have not been deleted!$\r$\n\
-     You must do it manually."
-
-#LangString str_msg_rm_root_fail  ${LANG_ENGLISH} \
-#    "WARNING: Cannot remove $\"$vim_install_root$\", it is not empty!"
-
-LangString str_msg_uninstalling  ${LANG_ENGLISH} \
-    "Uninstalling the old version..."
-
-LangString str_msg_registering   ${LANG_ENGLISH} \
-    "Registering..."
-
-LangString str_msg_unregistering ${LANG_ENGLISH} \
-    "Unregistering..."
-
-
-##############################################################################
-# Dialog Box                                                              {{{1
-##############################################################################
-
-LangString str_vimrc_page_title    ${LANG_ENGLISH} \
-    "Choose _vimrc settings"
-LangString str_vimrc_page_subtitle ${LANG_ENGLISH} \
-    "Choose the settings for enhancement, keyboard and mouse."
-
-LangString str_msg_compat_title    ${LANG_ENGLISH} \
-    " Vi / Vim behavior "
-LangString str_msg_compat_desc     ${LANG_ENGLISH} \
-    "&Compatibility and enhancements"
-LangString str_msg_compat_vi       ${LANG_ENGLISH} \
-    "Vi compatible"
-LangString str_msg_compat_vim      ${LANG_ENGLISH} \
-    "Vim original"
-LangString str_msg_compat_defaults ${LANG_ENGLISH} \
-    "Vim with some enhancements (load defaults.vim)"
-LangString str_msg_compat_all      ${LANG_ENGLISH} \
-    "Vim with all enhancements (load vimrc_example.vim) (Default)"
-
-LangString str_msg_keymap_title   ${LANG_ENGLISH} \
-    " Mappings "
-LangString str_msg_keymap_desc    ${LANG_ENGLISH} \
-    "&Remap a few keys for Windows (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F, etc)"
-LangString str_msg_keymap_default ${LANG_ENGLISH} \
-    "Do not remap keys (Default)"
-LangString str_msg_keymap_windows ${LANG_ENGLISH} \
-    "Remap a few keys"
-
-LangString str_msg_mouse_title   ${LANG_ENGLISH} \
-    " Mouse "
-LangString str_msg_mouse_desc    ${LANG_ENGLISH} \
-    "&Behavior of right and left buttons"
-LangString str_msg_mouse_default ${LANG_ENGLISH} \
-    "Right: popup menu, Left: visual mode (Default)"
-LangString str_msg_mouse_windows ${LANG_ENGLISH} \
-    "Right: popup menu, Left: select mode (Windows)"
-LangString str_msg_mouse_unix    ${LANG_ENGLISH} \
-    "Right: extends selection, Left: visual mode (Unix)"

nsis/lang/german.nsi

@@ -1,280 +0,0 @@
-# vi:set ts=8 sts=4 sw=4 et fdm=marker:
-#
-# german.nsi : German language strings for gvim NSIS installer.
-#
-# Locale ID    : 1031
-# fileencoding : UTF-8
-# Author       : Christian Brabandt, tux
-
-!insertmacro MUI_LANGUAGE "German"
-
-
-# Overwrite the default translation.
-# These strings should be always English.  Otherwise dosinst.c fails.
-LangString ^SetupCaption     ${LANG_GERMAN} \
-        "$(^Name) Setup"
-LangString ^UninstallCaption ${LANG_GERMAN} \
-        "$(^Name) Uninstall"
-
-##############################################################################
-# MUI Configuration Strings                                               {{{1
-##############################################################################
-
-#LangString str_dest_folder          ${LANG_GERMAN} \
-#    "Zielverzeichnis auswählen (muss auf $\"vim$\" enden)"
-
-LangString str_show_readme          ${LANG_GERMAN} \
-    "README-Datei nach der Installation anzeigen"
-
-# Install types:
-LangString str_type_typical         ${LANG_GERMAN} \
-    "Typisch"
-
-LangString str_type_minimal         ${LANG_GERMAN} \
-    "Minimal"
-
-LangString str_type_full            ${LANG_GERMAN} \
-    "Vollständig"
-
-
-##############################################################################
-# Section Titles & Description                                            {{{1
-##############################################################################
-
-LangString str_section_old_ver      ${LANG_GERMAN} \
-    "Vorherige Version deinstallieren"
-LangString str_desc_old_ver         ${LANG_GERMAN} \
-    "Vorherige installierte Versionen auf diesem System deinstallieren."
-
-LangString str_section_exe          ${LANG_GERMAN} \
-    "Vim GUI"
-LangString str_desc_exe             ${LANG_GERMAN} \
-    "Vim (Anwendung) und Laufzeitdateien (Dieser Teil ist zwingend \
-     erforderlich)."
-
-LangString str_section_console      ${LANG_GERMAN} \
-    "Vim Konsolenanwendung"
-LangString str_desc_console         ${LANG_GERMAN} \
-    "Konsolenversion von Vim."
-
-LangString str_section_batch        ${LANG_GERMAN} \
-    ".bat-Dateien erstellen"
-LangString str_desc_batch           ${LANG_GERMAN} \
-    ".bat-Dateien erstellen, um Vim in der Konsole auszuführen."
-
-LangString str_group_icons          ${LANG_GERMAN} \
-    "Vim-Verknüpfungen erstellen"
-LangString str_desc_icons           ${LANG_GERMAN} \
-    "Verknüpfungen mit Vim für einfachen Aufruf erstellen."
-
-LangString str_section_desktop      ${LANG_GERMAN} \
-    "Auf dem Desktop"
-LangString str_desc_desktop         ${LANG_GERMAN} \
-    "Icons für GVim auf dem Desktop erstellen."
-
-LangString str_section_start_menu   ${LANG_GERMAN} \
-    "Im Startmenü"
-LangString str_desc_start_menu      ${LANG_GERMAN} \
-    "Vim im Programmverzeichnis des Startmenüs hinzufügen."
-
-#LangString str_section_quick_launch ${LANG_GERMAN} \
-#    "In der Schnellstartleiste"
-#LangString str_desc_quick_launch    ${LANG_GERMAN} \
-#    "Verknüpfung zu Vim in der Schnellstartleiste ablegen."
-
-LangString str_section_edit_with    ${LANG_GERMAN} \
-    "Vim zum Kontextmenü hinzufügen"
-LangString str_desc_edit_with       ${LANG_GERMAN} \
-    "Vim in das $\"Öffnen mit...$\"-Kontextmenü einfügen."
-
-#LangString str_section_edit_with32  ${LANG_GERMAN} \
-#    "32-Bit-Version"
-#LangString str_desc_edit_with32     ${LANG_GERMAN} \
-#    "Vim in das $\"Öffnen mit...$\"-Kontextmenü \
-#     für 32-Bit-Anwendungen integrieren."
-
-#LangString str_section_edit_with64  ${LANG_GERMAN} \
-#    "64-Bit-Version"
-#LangString str_desc_edit_with64     ${LANG_GERMAN} \
-#    "Vim in das $\"Öffnen mit...$\"-Kontextmenü \
-#     für 64-Bit-Anwendungen integrieren."
-
-LangString str_section_vim_rc       ${LANG_GERMAN} \
-    "Standard-Konfigurationsdatei erstellen"
-LangString str_desc_vim_rc          ${LANG_GERMAN} \
-    "Eine Standard-Konfigurationsdatei (_vimrc) erstellen, \
-     falls noch keine existiert."
-
-LangString str_group_plugin         ${LANG_GERMAN} \
-    "Plugin-Verzeichnisse anlegen"
-LangString str_desc_plugin          ${LANG_GERMAN} \
-    "Plugin-Verzeichnisse anlegen. Plugins erlauben es, Vim \
-     um zusätzliche Funktionen zu erweitern."
-
-LangString str_section_plugin_home  ${LANG_GERMAN} \
-    "Privat"
-LangString str_desc_plugin_home     ${LANG_GERMAN} \
-    "Erstelle Plugin-Verzeichnis im HOME Benutzerverzeichnis."
-
-LangString str_section_plugin_vim   ${LANG_GERMAN} \
-    "Freigegeben"
-LangString str_desc_plugin_vim      ${LANG_GERMAN} \
-    "Plugin-Verzeichnisse im Vim-Installationsverzeichnis erstellen. Diese werden \
-     für alle Benutzer dieses Systems genutzt."
-
-LangString str_section_vis_vim      ${LANG_GERMAN} \
-    "VisVim-Erweiterung"
-LangString str_desc_vis_vim         ${LANG_GERMAN} \
-    "VisVim-Erweiterung zur Integration in Microsoft Visual Studio."
-
-LangString str_section_nls          ${LANG_GERMAN} \
-    "Unterstützung für andere Sprachen"
-LangString str_desc_nls             ${LANG_GERMAN} \
-    "Dateien zur Unterstützung anderer Sprachen als Englisch installieren."
-
-LangString str_unsection_register   ${LANG_GERMAN} \
-    "Vim deinstallieren"
-LangString str_desc_unregister      ${LANG_GERMAN} \
-    "Vim vom System entfernen."
-
-LangString str_unsection_exe        ${LANG_GERMAN} \
-    "Vim-Anwendung und Laufzeitdateien entfernen"
-LangString str_desc_rm_exe          ${LANG_GERMAN} \
-    "Alle Vim-Anwendungen und Laufzeitdateien von diesem System entfernen."
-
-LangString str_ungroup_plugin       ${LANG_GERMAN} \
-    "Entferne Plugin-Verzeichnisse"
-LangString str_desc_rm_plugin       ${LANG_GERMAN} \
-    "Entferne Plugin-Verzeichnisse, falls sie leer sind."
-
-LangString str_unsection_plugin_home ${LANG_GERMAN} \
-    "Privat"
-LangString str_desc_rm_plugin_home  ${LANG_GERMAN} \
-    "Entfernt die Plugin-Verzeichnisse aus dem HOME Benutzerverzeichnis."
-
-LangString str_unsection_plugin_vim ${LANG_GERMAN} \
-    "Freigegeben"
-LangString str_desc_rm_plugin_vim   ${LANG_GERMAN} \
-    "Entfernt das Plugin-Verzeichnis aus dem Vim-Installationsverzeichnis."
-
-LangString str_unsection_rootdir    ${LANG_GERMAN} \
-    "Entferne Vim Installationsverzeichnis"
-LangString str_desc_rm_rootdir      ${LANG_GERMAN} \
-    "Entfernt das Vim Installationsverzeichnis. Es enthält die Vim Konfigurationsdateien!"
-
-
-##############################################################################
-# Messages                                                                {{{1
-##############################################################################
-
-#LangString str_msg_too_many_ver  ${LANG_GERMAN} \
-#    "$vim_old_ver_count Vim-Versionen auf diesem System gefunden..$\r$\n\
-#     Dieser Installer kann maximal ${VIM_MAX_OLD_VER} Versionen \
-#     handhaben.$\r$\n\
-#     Bitte alte Versionen entfernen und noch einmal probieren."
-
-#LangString str_msg_invalid_root  ${LANG_GERMAN} \
-#    "Nicht gültiges Installationsverzeichnis: $vim_install_root!$\r$\n\
-#     Der Pfad muss auf $\"vim$\" enden."
-
-#LangString str_msg_bin_mismatch  ${LANG_GERMAN} \
-#    "Pfaddiskrepanz!$\r$\n$\r$\n\
-#     Erwarte Anwendungsverzeichnis $\"$vim_bin_path$\",$\r$\n\
-#     aber fand Anwendungspfad $\"$INSTDIR$\" vor."
-
-#LangString str_msg_vim_running   ${LANG_GERMAN} \
-#    "Laufender Vim-Prozess erkannt.$\r$\n\
-#     Bitte alle laufenden Vim-Prozesse vor dem Fortfahren beenden."
-
-#LangString str_msg_register_ole  ${LANG_GERMAN} \
-#    "Versuche OLE-Registrierung durchzuführen."
-
-#LangString str_msg_unreg_ole     ${LANG_GERMAN} \
-#    "Versuche OLE-Registrierung zu löschen."
-
-#LangString str_msg_rm_start      ${LANG_GERMAN} \
-#    "Deinstalliere die folgende Version:"
-
-#LangString str_msg_rm_fail       ${LANG_GERMAN} \
-#    "Deinstallation der Version fehlgeschlagen:"
-
-#LangString str_msg_no_rm_key     ${LANG_GERMAN} \
-#    "Deinstallationsschlüssel in der Registrierungsdatenbank nicht gefunden."
-
-#LangString str_msg_no_rm_reg     ${LANG_GERMAN} \
-#    "Kein Uninstaller in der Registrierungsdatenbank gefunden."
-
-#LangString str_msg_no_rm_exe     ${LANG_GERMAN} \
-#    "Kein Zugriff auf den Uninstaller."
-
-#LangString str_msg_rm_copy_fail  ${LANG_GERMAN} \
-#    "Fehler beim Kopieren des Uninstallers in ein temporäres Verzeichnis."
-
-#LangString str_msg_rm_run_fail   ${LANG_GERMAN} \
-#    "Fehler beim Aufruf des Uninstallers."
-
-#LangString str_msg_abort_install ${LANG_GERMAN} \
-#    "Installation wird abgebrochen."
-
-LangString str_msg_install_fail  ${LANG_GERMAN} \
-    "Installation fehlerhaft beendet."
-
-LangString str_msg_rm_exe_fail   ${LANG_GERMAN} \
-    "Einige Dateien im Pfad $0 konnten nicht gelöscht werden!$\r$\n\
-     Diese Dateien müssen manuell gelöscht werden."
-
-#LangString str_msg_rm_root_fail  ${LANG_GERMAN} \
-#    "Achtung: Kann Verzeichnis $\"$vim_install_root$\" nicht entfernen, \
-#     weil es nicht leer ist!"
-
-LangString str_msg_uninstalling  ${LANG_GERMAN} \
-    "Deinstalliere alte Version..."
-
-LangString str_msg_registering   ${LANG_GERMAN} \
-    "Registriere..."
-
-LangString str_msg_unregistering ${LANG_GERMAN} \
-    "Entferne Registrierung..."
-
-
-##############################################################################
-# Dialog Box                                                              {{{1
-##############################################################################
-
-LangString str_vimrc_page_title    ${LANG_GERMAN} \
-    "Wähle _vimrc Konfigurationsoptionen"
-LangString str_vimrc_page_subtitle ${LANG_GERMAN} \
-    "Wähle Einstellungen zur Kompatibilität, Tastatur und Maus."
-
-LangString str_msg_compat_title    ${LANG_GERMAN} \
-    " Vi / Vim Verhalten "
-LangString str_msg_compat_desc     ${LANG_GERMAN} \
-    "&Kompatibilität und Erweiterungen"
-LangString str_msg_compat_vi       ${LANG_GERMAN} \
-    "Vi-kompatibel"
-LangString str_msg_compat_vim      ${LANG_GERMAN} \
-    "Vim Original"
-LangString str_msg_compat_defaults ${LANG_GERMAN} \
-    "Vim mit einigen Erweiterungen (Lädt defaults.vim)"
-LangString str_msg_compat_all      ${LANG_GERMAN} \
-    "Vim mit allen Erweiterungen (Lädt vimrc_example.vim) (Standard)"
-
-LangString str_msg_keymap_title   ${LANG_GERMAN} \
-    " Mappings für Windows Standard Tastenkombinationen "
-LangString str_msg_keymap_desc    ${LANG_GERMAN} \
-    "&Einige Tasten umkonfigurieren (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F, etc)"
-LangString str_msg_keymap_default ${LANG_GERMAN} \
-    "Keine Tasten umkonfigurieren (Standard)"
-LangString str_msg_keymap_windows ${LANG_GERMAN} \
-    "Einige Tasten umkonfigurieren"
-
-LangString str_msg_mouse_title   ${LANG_GERMAN} \
-    " Maus "
-LangString str_msg_mouse_desc    ${LANG_GERMAN} \
-    "&Verhalten der linken und rechten Buttons"
-LangString str_msg_mouse_default ${LANG_GERMAN} \
-    "Rechts: Popup Menü, Links: Visueller Modus (Standard)"
-LangString str_msg_mouse_windows ${LANG_GERMAN} \
-    "Rechts: Popup Menü, Links: Auswahl Modus (Windows)"
-LangString str_msg_mouse_unix    ${LANG_GERMAN} \
-    "Rechts: Auswahl erweitern, Links: Visueller Modus (Unix)"

nsis/lang/italian.nsi

@@ -1,283 +0,0 @@
-# vi:set ts=8 sts=4 sw=4 et fdm=marker:
-#
-# italian.nsi : Italian language strings for gvim NSIS installer.
-#
-# Locale ID    : 1040
-# Locale Name  : it
-# fileencoding : UTF-8
-# Author       : Antonio Colombo
-
-!insertmacro MUI_LANGUAGE "Italian"
-
-
-# Overwrite the default translation.
-# These strings should be always English.  Otherwise dosinst.c fails.
-LangString ^SetupCaption     ${LANG_ITALIAN} \
-        "$(^Name) Setup"
-LangString ^UninstallCaption ${LANG_ITALIAN} \
-        "$(^Name) Uninstall"
-
-##############################################################################
-# MUI Configuration Strings                                               {{{1
-##############################################################################
-
-#LangString str_dest_folder          ${LANG_ITALIAN} \
-#    "Cartella d'installazione (il nome deve finire con $\"vim$\")"
-
-LangString str_show_readme          ${LANG_ITALIAN} \
-    "Visualizza README al termine dell'installazione"
-
-# Install types:
-LangString str_type_typical         ${LANG_ITALIAN} \
-    "Tipica"
-
-LangString str_type_minimal         ${LANG_ITALIAN} \
-    "Minima"
-
-LangString str_type_full            ${LANG_ITALIAN} \
-    "Completa"
-
-
-##############################################################################
-# Section Titles & Description                                            {{{1
-##############################################################################
-
-LangString str_section_old_ver      ${LANG_ITALIAN} \
-    "Disinstalla versione/i esistente/i"
-LangString str_desc_old_ver         ${LANG_ITALIAN} \
-    "Disinstalla versione/i esistente/i di Vim dal vostro sistema."
-
-LangString str_section_exe          ${LANG_ITALIAN} \
-    "Vim GUI e file di supporto"
-LangString str_desc_exe             ${LANG_ITALIAN} \
-    "Vim GUI programmi e file di supporto.  Questa componente è indispensabile."
-
-LangString str_section_console      ${LANG_ITALIAN} \
-    "Vim console (vim.exe per MS-DOS)"
-LangString str_desc_console         ${LANG_ITALIAN} \
-    "Versione console di Vim (vim.exe)."
-
-LangString str_section_batch        ${LANG_ITALIAN} \
-    "Crea file di invocazione (MS-DOS) .bat"
-LangString str_desc_batch           ${LANG_ITALIAN} \
-    "Crea file di invocazione .bat per varianti di Vim nella directory \
-     di Windows, per utilizzo da linea di comando (MS-DOS)."
-
-LangString str_group_icons          ${LANG_ITALIAN} \
-    "Crea icone per Vim"
-LangString str_desc_icons           ${LANG_ITALIAN} \
-    "Crea icone per Vim in vari posti, per rendere facile l'accesso."
-
-LangString str_section_desktop      ${LANG_ITALIAN} \
-    "Sul Desktop"
-LangString str_desc_desktop         ${LANG_ITALIAN} \
-    "Crea icone per programma gVim sul desktop."
-
-LangString str_section_start_menu   ${LANG_ITALIAN} \
-    "Nella cartella del menù START"
-LangString str_desc_start_menu      ${LANG_ITALIAN} \
-    "Aggiungi Vim alle cartelle del menù START."
-
-#LangString str_section_quick_launch ${LANG_ITALIAN} \
-#    "Nella barra di Avvio Veloce"
-#LangString str_desc_quick_launch    ${LANG_ITALIAN} \
-#    "Aggiungi un puntatore a Vim nella barra di Avvio Veloce."
-
-LangString str_section_edit_with    ${LANG_ITALIAN} \
-    "Aggiungi Vim al Menù Contestuale"
-LangString str_desc_edit_with       ${LANG_ITALIAN} \
-    "Aggiungi Vim alla lista contestuale $\"Apri con...$\"."
-
-#LangString str_section_edit_with32  ${LANG_ITALIAN} \
-#    "Versione a 32-bit"
-#LangString str_desc_edit_with32     ${LANG_ITALIAN} \
-#    "Aggiungi Vim alla lista contestuale $\"Apri con...$\" \
-#     per applicazioni a 32-bit."
-
-#LangString str_section_edit_with64  ${LANG_ITALIAN} \
-#    "Versione a 64-bit"
-#LangString str_desc_edit_with64     ${LANG_ITALIAN} \
-#    "Aggiungi Vim alla lista contestuale $\"Apri con...$\" \
-#     per applicazioni a 64-bit."
-
-LangString str_section_vim_rc       ${LANG_ITALIAN} \
-    "Crea configurazione di default"
-LangString str_desc_vim_rc          ${LANG_ITALIAN} \
-    "Crea un file configurazione di default (_vimrc) se non \
-     ne esiste già uno."
-
-LangString str_group_plugin         ${LANG_ITALIAN} \
-    "Crea directory per plugin"
-LangString str_desc_plugin          ${LANG_ITALIAN} \
-    "Crea directory per plugin.  Consentono di aggiungere funzionalità \
-     a Vim mettendo file in una di queste directory."
-
-LangString str_section_plugin_home  ${LANG_ITALIAN} \
-    "Private"
-LangString str_desc_plugin_home     ${LANG_ITALIAN} \
-    "Crea directory per plugin nella directory HOME."
-
-LangString str_section_plugin_vim   ${LANG_ITALIAN} \
-    "Condivise"
-LangString str_desc_plugin_vim      ${LANG_ITALIAN} \
-    "Crea directory per plugin nella directory di installazione di Vim \
-     per uso da parte di tutti gli utenti di questo sistema."
-
-LangString str_section_vis_vim      ${LANG_ITALIAN} \
-    "Estensione VisVim"
-LangString str_desc_vis_vim         ${LANG_ITALIAN} \
-    "Estensione VisVim per integrazione con Microsoft Visual Studio."
-
-LangString str_section_nls          ${LANG_ITALIAN} \
-    "Supporto Multilingue (NLS)"
-LangString str_desc_nls             ${LANG_ITALIAN} \
-    "Installa file per supportare messaggi in diverse lingue."
-
-LangString str_unsection_register   ${LANG_ITALIAN} \
-    "Togli Vim dal Registry"
-LangString str_desc_unregister      ${LANG_ITALIAN} \
-    "Togli Vim dal Registry di configurazione sistema."
-
-LangString str_unsection_exe        ${LANG_ITALIAN} \
-    "Cancella programmi/file di supporto Vim"
-LangString str_desc_rm_exe          ${LANG_ITALIAN} \
-    "Cancella tutti i programmi/file di supporto di Vim."
-
-LangString str_ungroup_plugin       ${LANG_ITALIAN} \
-    "Cancella le directory per plugin"
-LangString str_desc_rm_plugin       ${LANG_ITALIAN} \
-    "Cancella le directory per plugin se sono vuote."
-
-LangString str_unsection_plugin_home ${LANG_ITALIAN} \
-    "Private"
-LangString str_desc_rm_plugin_home  ${LANG_ITALIAN} \
-    "Cancella le directory per plugin dalla directory HOME."
-
-LangString str_unsection_plugin_vim ${LANG_ITALIAN} \
-    "Condivise"
-LangString str_desc_rm_plugin_vim   ${LANG_ITALIAN} \
-    "Cancella le directory per plugin dalla directory di installazione di Vim."
-
-LangString str_unsection_rootdir    ${LANG_ITALIAN} \
-    "Cancella la directory di installazione di Vim"
-LangString str_desc_rm_rootdir      ${LANG_ITALIAN} \
-    "Cancella la directory di installazione di Vim. Contiene i vostri file di configurazione!"
-
-
-##############################################################################
-# Messages                                                                {{{1
-##############################################################################
-
-#LangString str_msg_too_many_ver  ${LANG_ITALIAN} \
-#    "Trovate $vim_old_ver_count versioni di Vim sul vostro sistema.$\r$\n\
-#     Questo programma di installazione può gestire solo \
-#     ${VIM_MAX_OLD_VER} versioni.$\r$\n\
-#     Disinstallate qualche versione precedente e ricominciate."
-
-#LangString str_msg_invalid_root  ${LANG_ITALIAN} \
-#    "Nome di directory di installazione non valida: $vim_install_root!$\r$\n\
-#     Dovrebbe terminare con $\"vim$\"."
-
-#LangString str_msg_bin_mismatch  ${LANG_ITALIAN} \
-#    "Conflitto nella directory di installazione!$\r$\n$\r$\n\
-#     Cartella di installazione dev'essere $\"$vim_bin_path$\",$\r$\n\
-#     ma il sistema segnala invece $\"$INSTDIR$\"."
-
-#LangString str_msg_vim_running   ${LANG_ITALIAN} \
-#    "Vim ancora in esecuzione sul vostro sistema.$\r$\n\
-#     Chiudete tutte le sessioni attive di Vim per continuare."
-
-#LangString str_msg_register_ole  ${LANG_ITALIAN} \
-#    "Tentativo di registrazione di Vim con OLE. \
-#     Non c'è messaggio che indica se è riuscito o no."
-
-#LangString str_msg_unreg_ole     ${LANG_ITALIAN} \
-#    "Tentativo di togliere dal Registry Vim con OLE. \
-#     Non c'è messaggio che indica se è riuscito o no."
-
-#LangString str_msg_rm_start      ${LANG_ITALIAN} \
-#    "Disinstallazione della seguente versione:"
-
-#LangString str_msg_rm_fail       ${LANG_ITALIAN} \
-#    "Disinstallazione non riuscita per la seguente versione:"
-
-#LangString str_msg_no_rm_key     ${LANG_ITALIAN} \
-#    "Non riesco a trovare chiave di disinstallazione nel Registry."
-
-#LangString str_msg_no_rm_reg     ${LANG_ITALIAN} \
-#    "Non riesco a trovare programma disinstallazione nel Registry."
-
-#LangString str_msg_no_rm_exe     ${LANG_ITALIAN} \
-#    "Non riesco a trovare programma disinstallazione."
-
-#LangString str_msg_rm_copy_fail  ${LANG_ITALIAN} \
-#    "Non riesco a copiare programma disinstallazione a una \
-#     directory temporanea."
-
-#LangString str_msg_rm_run_fail   ${LANG_ITALIAN} \
-#    "Non riesco a eseguire programma disinstallazione."
-
-#LangString str_msg_abort_install ${LANG_ITALIAN} \
-#    "Il programma di disinstallazione verrà chiuso senza aver fatto nulla."
-
-LangString str_msg_install_fail  ${LANG_ITALIAN} \
-    "Installazione non riuscita. Miglior fortuna alla prossima!"
-
-LangString str_msg_rm_exe_fail   ${LANG_ITALIAN} \
-    "Alcuni file in $0 non sono stati cancellati!$\r$\n\
-     Dovreste cancellarli voi stessi."
-
-#LangString str_msg_rm_root_fail  ${LANG_ITALIAN} \
-#    "AVVISO: Non posso cancellare $\"$vim_install_root$\", non è vuota!"
-
-LangString str_msg_uninstalling  ${LANG_ITALIAN} \
-    "Sto disinstallando la vecchia versione..."
-
-LangString str_msg_registering   ${LANG_ITALIAN} \
-    "Sto aggiungendo Vim al Registry..."
-
-LangString str_msg_unregistering ${LANG_ITALIAN} \
-    "Sto togliendo Vim dal Registry..."
-
-
-##############################################################################
-# Dialog Box                                                              {{{1
-##############################################################################
-
-LangString str_vimrc_page_title    ${LANG_ITALIAN} \
-    "Scelta impostazioni _vimrc"
-LangString str_vimrc_page_subtitle ${LANG_ITALIAN} \
-    "Scelta impostazioni per funzionalità ulteriori, tastiera e mouse."
-
-LangString str_msg_compat_title    ${LANG_ITALIAN} \
-    " comportamento come Vi / Vim "
-LangString str_msg_compat_desc     ${LANG_ITALIAN} \
-    "&Compatibilità e funzionalità ulteriori"
-LangString str_msg_compat_vi       ${LANG_ITALIAN} \
-    "Compatibile con Vi"
-LangString str_msg_compat_vim      ${LANG_ITALIAN} \
-    "Vim originale"
-LangString str_msg_compat_defaults ${LANG_ITALIAN} \
-    "Vim con alcune funzionalità ulteriori (esecuzione defaults.vim)"
-LangString str_msg_compat_all      ${LANG_ITALIAN} \
-    "Vim con tutte le funzionalità ulteriori (esecuzione vimrc_example.vim) (Default)"
-
-LangString str_msg_keymap_title   ${LANG_ITALIAN} \
-    " Mappature "
-LangString str_msg_keymap_desc    ${LANG_ITALIAN} \
-    "&Rimappatura di alcuni tasti per Windows (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F, etc.)"
-LangString str_msg_keymap_default ${LANG_ITALIAN} \
-    "Non effettuare rimappature di tasti (Default)"
-LangString str_msg_keymap_windows ${LANG_ITALIAN} \
-    "Rimappare solo alcuni tasti"
-
-LangString str_msg_mouse_title   ${LANG_ITALIAN} \
-    " Mouse "
-LangString str_msg_mouse_desc    ${LANG_ITALIAN} \
-    "&Comportamento dei pulsanti destro e sinistro"
-LangString str_msg_mouse_default ${LANG_ITALIAN} \
-    "Destro: popup menu, Sinistro: modalità visuale (Default)"
-LangString str_msg_mouse_windows ${LANG_ITALIAN} \
-    "Destro: popup menu, Sinistro: seleziona modalità (Windows)"
-LangString str_msg_mouse_unix    ${LANG_ITALIAN} \
-    "Destro: estende selezione, Sinistro: modalità visuale (Unix)"

nsis/lang/japanese.nsi

@@ -1,287 +0,0 @@
-# vi:set ts=8 sts=4 sw=4 et fdm=marker:
-#
-# japanese.nsi: Japanese language strings for gvim NSIS installer.
-#
-# Locale ID    : 1041
-# fileencoding : UTF-8
-# Author       : Ken Takata
-
-!insertmacro MUI_LANGUAGE "Japanese"
-
-
-# Overwrite the default translation.
-# These strings should be always English.  Otherwise dosinst.c fails.
-LangString ^SetupCaption     ${LANG_JAPANESE} \
-        "$(^Name) Setup"
-LangString ^UninstallCaption ${LANG_JAPANESE} \
-        "$(^Name) Uninstall"
-
-# Workarounds for NSIS Japanese translation. The messages are too long.
-# These should be better to be fixed by the NSIS upstream.
-LangString ^SpaceAvailable   ${LANG_JAPANESE} \
-        "利用可能なディスク容量："
-LangString ^SpaceRequired    ${LANG_JAPANESE} \
-        "必要なディスク容量："
-# Fix another NSIS Japanese translation. The access key was missing.
-LangString ^InstallBtn       ${LANG_JAPANESE} \
-        "インストール(&I)"
-
-##############################################################################
-# MUI Configuration Strings                                               {{{1
-##############################################################################
-
-#LangString str_dest_folder          ${LANG_JAPANESE} \
-#    "Destination Folder (Must end with $\"vim$\")"
-
-LangString str_show_readme          ${LANG_JAPANESE} \
-    "インストール完了後に README を表示する"
-
-# Install types:
-LangString str_type_typical         ${LANG_JAPANESE} \
-    "通常"
-
-LangString str_type_minimal         ${LANG_JAPANESE} \
-    "最小"
-
-LangString str_type_full            ${LANG_JAPANESE} \
-    "全て"
-
-
-##############################################################################
-# Section Titles & Description                                            {{{1
-##############################################################################
-
-LangString str_section_old_ver      ${LANG_JAPANESE} \
-    "既存のバージョンをアンインストール"
-LangString str_desc_old_ver         ${LANG_JAPANESE} \
-    "すでにインストールされている Vim をシステムから削除します。"
-
-LangString str_section_exe          ${LANG_JAPANESE} \
-    "Vim GUI とランタイムファイル"
-LangString str_desc_exe             ${LANG_JAPANESE} \
-    "Vim GUI 実行ファイルとラインタイムファイル。このコンポーネントは必須です。"
-
-LangString str_section_console      ${LANG_JAPANESE} \
-    "Vim コンソールプログラム"
-LangString str_desc_console         ${LANG_JAPANESE} \
-    "コンソール版の Vim (vim.exe)。"
-
-LangString str_section_batch        ${LANG_JAPANESE} \
-    ".bat ファイルを作成"
-LangString str_desc_batch           ${LANG_JAPANESE} \
-    "コマンドラインから Vim と関連コマンドを実行できるように、.bat ファイルを Windows ディレクトリに作成します。"
-
-LangString str_group_icons          ${LANG_JAPANESE} \
-    "Vim のアイコンを作成"
-LangString str_desc_icons           ${LANG_JAPANESE} \
-    "Vim を簡単に実行できるように、いくつかの場所にアイコンを作成します。"
-
-LangString str_section_desktop      ${LANG_JAPANESE} \
-    "デスクトップ上"
-LangString str_desc_desktop         ${LANG_JAPANESE} \
-    "gVim 実行ファイルのアイコンをデスクトップ上に作成します。"
-
-LangString str_section_start_menu   ${LANG_JAPANESE} \
-    "スタートメニューのプログラムフォルダー上"
-LangString str_desc_start_menu      ${LANG_JAPANESE} \
-    "Vim のアイコンをスタートメニューのプログラムフォルダー上に作成します。"
-
-#LangString str_section_quick_launch ${LANG_JAPANESE} \
-#    "In the Quick Launch Bar"
-#LangString str_desc_quick_launch    ${LANG_JAPANESE} \
-#    "Add Vim shortcut in the quick launch bar."
-
-LangString str_section_edit_with    ${LANG_JAPANESE} \
-    "Vim のコンテキストメニューを追加"
-LangString str_desc_edit_with       ${LANG_JAPANESE} \
-    "$\"Vimで編集する$\" をコンテキストメニューに追加します。"
-
-#LangString str_section_edit_with32  ${LANG_JAPANESE} \
-#    "32-bit Version"
-#LangString str_desc_edit_with32     ${LANG_JAPANESE} \
-#    "Add Vim to the $\"Open With...$\" context menu list \
-#     for 32-bit applications."
-
-#LangString str_section_edit_with64  ${LANG_JAPANESE} \
-#    "64-bit Version"
-#LangString str_desc_edit_with64     ${LANG_JAPANESE} \
-#    "Add Vim to the $\"Open With...$\" context menu list \
-#     for 64-bit applications."
-
-LangString str_section_vim_rc       ${LANG_JAPANESE} \
-    "既定のコンフィグを作成"
-LangString str_desc_vim_rc          ${LANG_JAPANESE} \
-    "もし無ければ、既定のコンフィグファイル (_vimrc) を作成します。"
-
-LangString str_group_plugin         ${LANG_JAPANESE} \
-    "プラグインディレクトリを作成"
-LangString str_desc_plugin          ${LANG_JAPANESE} \
-    "プラグインディレクトリを作成します。そこにプラグインファイルを置くことで Vim を拡張することができます。"
-
-LangString str_section_plugin_home  ${LANG_JAPANESE} \
-    "個人用"
-LangString str_desc_plugin_home     ${LANG_JAPANESE} \
-    "プラグインディレクトリをホームディレクトリに作成します。"
-
-LangString str_section_plugin_vim   ${LANG_JAPANESE} \
-    "共用"
-LangString str_desc_plugin_vim      ${LANG_JAPANESE} \
-    "プラグインディレクトリを Vim のインストールディレクトリに作成します。システムの全員で共有されます。"
-
-LangString str_section_vis_vim      ${LANG_JAPANESE} \
-    "VisVim 拡張"
-LangString str_desc_vis_vim         ${LANG_JAPANESE} \
-    "Microsoft Visual Studio 統合用の VisVim 拡張。"
-
-LangString str_section_nls          ${LANG_JAPANESE} \
-    "多言語サポート"
-LangString str_desc_nls             ${LANG_JAPANESE} \
-    "多言語サポート用のファイルをインストールします。"
-
-LangString str_unsection_register   ${LANG_JAPANESE} \
-    "Vim を登録解除"
-LangString str_desc_unregister      ${LANG_JAPANESE} \
-    "Vim をシステムから登録解除します。"
-
-LangString str_unsection_exe        ${LANG_JAPANESE} \
-    "Vim の実行ファイル/ランタイムファイルを削除"
-LangString str_desc_rm_exe          ${LANG_JAPANESE} \
-    "全ての Vim の実行ファイルとランタイムファイルを削除します。"
-
-LangString str_ungroup_plugin       ${LANG_JAPANESE} \
-    "プラグインディレクトリを削除"
-LangString str_desc_rm_plugin       ${LANG_JAPANESE} \
-    "プラグインディレクトリが空であればそれを削除します。"
-
-LangString str_unsection_plugin_home ${LANG_JAPANESE} \
-    "個人用"
-LangString str_desc_rm_plugin_home  ${LANG_JAPANESE} \
-    "プラグインディレクトリをホームディレクトリから削除します。"
-
-LangString str_unsection_plugin_vim ${LANG_JAPANESE} \
-    "共用"
-LangString str_desc_rm_plugin_vim   ${LANG_JAPANESE} \
-    "プラグインディレクトリを Vim のインストールディレクトリから削除します。"
-
-LangString str_unsection_rootdir    ${LANG_JAPANESE} \
-    "Vim のトップディレクトリを削除"
-LangString str_desc_rm_rootdir      ${LANG_JAPANESE} \
-    "Vim のトップディレクトリを削除します。あなたの Vim の設定ファイルも含まれていることに注意してください！"
-
-
-##############################################################################
-# Messages                                                                {{{1
-##############################################################################
-
-#LangString str_msg_too_many_ver  ${LANG_JAPANESE} \
-#    "Found $vim_old_ver_count Vim versions on your system.$\r$\n\
-#     This installer can only handle ${VIM_MAX_OLD_VER} versions \
-#     at most.$\r$\n\
-#     Please remove some versions and start again."
-
-#LangString str_msg_invalid_root  ${LANG_JAPANESE} \
-#    "Invalid install path: $vim_install_root!$\r$\n\
-#     It should end with $\"vim$\"."
-
-#LangString str_msg_bin_mismatch  ${LANG_JAPANESE} \
-#    "Binary path mismatch!$\r$\n$\r$\n\
-#     Expect the binary path to be $\"$vim_bin_path$\",$\r$\n\
-#     but system indicates the binary path is $\"$INSTDIR$\"."
-
-#LangString str_msg_vim_running   ${LANG_JAPANESE} \
-#    "Vim is still running on your system.$\r$\n\
-#     Please close all instances of Vim before you continue."
-
-#LangString str_msg_register_ole  ${LANG_JAPANESE} \
-#    "Attempting to register Vim with OLE. \
-#     There is no message indicates whether this works or not."
-
-#LangString str_msg_unreg_ole     ${LANG_JAPANESE} \
-#    "Attempting to unregister Vim with OLE. \
-#     There is no message indicates whether this works or not."
-
-#LangString str_msg_rm_start      ${LANG_JAPANESE} \
-#    "Uninstalling the following version:"
-
-#LangString str_msg_rm_fail       ${LANG_JAPANESE} \
-#    "Fail to uninstall the following version:"
-
-#LangString str_msg_no_rm_key     ${LANG_JAPANESE} \
-#    "Cannot find uninstaller registry key."
-
-#LangString str_msg_no_rm_reg     ${LANG_JAPANESE} \
-#    "Cannot find uninstaller from registry."
-
-#LangString str_msg_no_rm_exe     ${LANG_JAPANESE} \
-#    "Cannot access uninstaller."
-
-#LangString str_msg_rm_copy_fail  ${LANG_JAPANESE} \
-#    "Fail to copy uninstaller to temporary directory."
-
-#LangString str_msg_rm_run_fail   ${LANG_JAPANESE} \
-#    "Fail to run uninstaller."
-
-#LangString str_msg_abort_install ${LANG_JAPANESE} \
-#    "Installer will abort."
-
-LangString str_msg_install_fail  ${LANG_JAPANESE} \
-    "インストールに失敗しました。次はうまくいくことを祈ります。"
-
-LangString str_msg_rm_exe_fail   ${LANG_JAPANESE} \
-    "$0 内の一部のファイルは削除できませんでした!$\r$\n\
-     手動で削除する必要があります。"
-
-#LangString str_msg_rm_root_fail  ${LANG_JAPANESE} \
-#    "WARNING: Cannot remove $\"$vim_install_root$\", it is not empty!"
-
-LangString str_msg_uninstalling  ${LANG_JAPANESE} \
-    "古いバージョンをアンインストールしています..."
-
-LangString str_msg_registering   ${LANG_JAPANESE} \
-    "登録中..."
-
-LangString str_msg_unregistering ${LANG_JAPANESE} \
-    "登録解除中..."
-
-
-##############################################################################
-# Dialog Box                                                              {{{1
-##############################################################################
-
-LangString str_vimrc_page_title    ${LANG_JAPANESE} \
-    "_vimrc の設定を選んでください"
-LangString str_vimrc_page_subtitle ${LANG_JAPANESE} \
-    "拡張やキーボード、マウスの設定を選んでください。"
-
-LangString str_msg_compat_title    ${LANG_JAPANESE} \
-    " Vi / Vim の動作 "
-LangString str_msg_compat_desc     ${LANG_JAPANESE} \
-    "互換性と拡張(&C)"
-LangString str_msg_compat_vi       ${LANG_JAPANESE} \
-    "Vi 互換"
-LangString str_msg_compat_vim      ${LANG_JAPANESE} \
-    "Vim 独自"
-LangString str_msg_compat_defaults ${LANG_JAPANESE} \
-    "Vim 独自と多少の拡張 (defaults.vim を読み込み)"
-LangString str_msg_compat_all      ${LANG_JAPANESE} \
-    "Vim 独自と全ての拡張 (vimrc_example.vim を読み込み) (既定)"
-
-LangString str_msg_keymap_title   ${LANG_JAPANESE} \
-    " マッピング "
-LangString str_msg_keymap_desc    ${LANG_JAPANESE} \
-    "Windows用に一部のキーをリマップする(&R) (例: Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F など)"
-LangString str_msg_keymap_default ${LANG_JAPANESE} \
-    "リマップしない (既定)"
-LangString str_msg_keymap_windows ${LANG_JAPANESE} \
-    "リマップする"
-
-LangString str_msg_mouse_title   ${LANG_JAPANESE} \
-    " マウス "
-LangString str_msg_mouse_desc    ${LANG_JAPANESE} \
-    "右ボタンと左ボタンの動作(&B)"
-LangString str_msg_mouse_default ${LANG_JAPANESE} \
-    "右：ポップアップメニュー、左：ビジュアルモード (既定)"
-LangString str_msg_mouse_windows ${LANG_JAPANESE} \
-    "右：ポップアップメニュー、左：選択モード (Windows)"
-LangString str_msg_mouse_unix    ${LANG_JAPANESE} \
-    "右：選択を拡張、左：ビジュアルモード (Unix)"

nsis/lang/simpchinese.nsi

@@ -1,277 +0,0 @@
-# vi:set ts=8 sts=4 sw=4 et fdm=marker:
-#
-# simpchinese.nsi: Simplified Chinese language strings for gvim NSIS
-# installer.
-#
-# Locale ID    : 2052
-# fileencoding : UTF-8
-# Author       : Guopeng Wen
-
-!insertmacro MUI_LANGUAGE "SimpChinese"
-
-
-# Overwrite the default translation.
-# These strings should be always English.  Otherwise dosinst.c fails.
-LangString ^SetupCaption     ${LANG_SIMPCHINESE} \
-        "$(^Name) Setup"
-LangString ^UninstallCaption ${LANG_SIMPCHINESE} \
-        "$(^Name) Uninstall"
-
-##############################################################################
-# MUI Configuration Strings                                               {{{1
-##############################################################################
-
-#LangString str_dest_folder          ${LANG_SIMPCHINESE} \
-#    "安装路径 (必须以 vim 结尾)"
-
-LangString str_show_readme          ${LANG_SIMPCHINESE} \
-    "安装完成后显示 README 文件"
-
-# Install types:
-LangString str_type_typical         ${LANG_SIMPCHINESE} \
-    "典型安装"
-
-LangString str_type_minimal         ${LANG_SIMPCHINESE} \
-    "最小安装"
-
-LangString str_type_full            ${LANG_SIMPCHINESE} \
-    "完全安装"
-
-
-##############################################################################
-# Section Titles & Description                                            {{{1
-##############################################################################
-
-LangString str_section_old_ver      ${LANG_SIMPCHINESE} \
-    "卸载旧版本"
-LangString str_desc_old_ver         ${LANG_SIMPCHINESE} \
-    "卸载系统上旧版本的 Vim。"
-
-LangString str_section_exe          ${LANG_SIMPCHINESE} \
-    "安装 Vim 图形界面"
-LangString str_desc_exe             ${LANG_SIMPCHINESE} \
-    "安装 Vim 图形界面及脚本。此为必选安装。"
-
-LangString str_section_console      ${LANG_SIMPCHINESE} \
-    "安装 Vim 命令行程序"
-LangString str_desc_console         ${LANG_SIMPCHINESE} \
-    "安装 Vim 命令行程序 (vim.exe)。该程序在命令行窗口中运行。"
-
-LangString str_section_batch        ${LANG_SIMPCHINESE} \
-    "安装批处理文件"
-LangString str_desc_batch           ${LANG_SIMPCHINESE} \
-    "为 Vim 的各种变体创建批处理程序，以便在命令行下运行 Vim。"
-
-LangString str_group_icons          ${LANG_SIMPCHINESE} \
-    "创建 Vim 图标"
-LangString str_desc_icons           ${LANG_SIMPCHINESE} \
-    "为 Vim 创建若干图标，以方便使用 Vim。"
-
-LangString str_section_desktop      ${LANG_SIMPCHINESE} \
-    "在桌面上"
-LangString str_desc_desktop         ${LANG_SIMPCHINESE} \
-    "在桌面上为 Vim 创建若干图标，以方便启动 Vim。"
-
-LangString str_section_start_menu   ${LANG_SIMPCHINESE} \
-    "在启动菜单的程序菜单下"
-LangString str_desc_start_menu      ${LANG_SIMPCHINESE} \
-    "在启动菜单的程序菜单下添加 Vim 组。适用于 Windows 95 及以上版本。"
-
-#LangString str_section_quick_launch ${LANG_SIMPCHINESE} \
-#    "在快速启动启动栏中"
-#LangString str_desc_quick_launch    ${LANG_SIMPCHINESE} \
-#    "在快速启动栏中添加 Vim 图标。"
-
-LangString str_section_edit_with    ${LANG_SIMPCHINESE} \
-    "安装快捷菜单"
-LangString str_desc_edit_with       ${LANG_SIMPCHINESE} \
-    "将 Vim 添加到“打开方式”快捷菜单中。"
-
-#LangString str_section_edit_with32  ${LANG_SIMPCHINESE} \
-#    "32 位版本"
-#LangString str_desc_edit_with32     ${LANG_SIMPCHINESE} \
-#    "将 Vim 添加到 32 位程序的“打开方式”快捷菜单中。"
-
-#LangString str_section_edit_with64  ${LANG_SIMPCHINESE} \
-#    "64 位版本"
-#LangString str_desc_edit_with64     ${LANG_SIMPCHINESE} \
-#    "将 Vim 添加到 64 位程序的“打开方式”快捷菜单中。"
-
-LangString str_section_vim_rc       ${LANG_SIMPCHINESE} \
-    "创建缺省配置文件"
-LangString str_desc_vim_rc          ${LANG_SIMPCHINESE} \
-    "在安装目录下生成缺省的 Vim 配置文件(_vimrc)。\
-     如果该文件已经存在，则略过此项。"
-
-LangString str_group_plugin         ${LANG_SIMPCHINESE} \
-    "创建插件目录"
-LangString str_desc_plugin          ${LANG_SIMPCHINESE} \
-    "创建(空的)插件目录结构。插件目录用于安装 Vim 扩展插件，\
-     只要将文件复制到相关的子目录中即可。"
-
-LangString str_section_plugin_home  ${LANG_SIMPCHINESE} \
-    "私有插件目录"
-LangString str_desc_plugin_home     ${LANG_SIMPCHINESE} \
-    "Create plugin directories in HOME directory."
-
-LangString str_section_plugin_vim   ${LANG_SIMPCHINESE} \
-    "公共插件目录"
-LangString str_desc_plugin_vim      ${LANG_SIMPCHINESE} \
-    "在 Vim 安装目录下创建(空的)插件目录结构，系统上所有用户都能使用安装在\
-     该目录下的扩展插件。"
-
-LangString str_section_vis_vim      ${LANG_SIMPCHINESE} \
-    "安装 VisVim 插件"
-LangString str_desc_vis_vim         ${LANG_SIMPCHINESE} \
-    "安装用于与微软 Microsoft Visual Studio 进行集成的 VisVim 插件。"
-
-LangString str_section_nls          ${LANG_SIMPCHINESE} \
-    "安装多语言支持"
-LangString str_desc_nls             ${LANG_SIMPCHINESE} \
-    "安装用于多语言支持的文件。"
-
-LangString str_unsection_register   ${LANG_SIMPCHINESE} \
-    "删除 Vim 系统配置"
-LangString str_desc_unregister      ${LANG_SIMPCHINESE} \
-    "删除和 Vim 相关的系统配置。"
-
-LangString str_unsection_exe        ${LANG_SIMPCHINESE} \
-    "删除 Vim 执行文件以及脚本"
-LangString str_desc_rm_exe          ${LANG_SIMPCHINESE} \
-    "删除 Vim 的所有执行文件及脚本。"
-
-LangString str_ungroup_plugin       ${LANG_SIMPCHINESE} \
-    "Remove plugin directories"
-LangString str_desc_rm_plugin       ${LANG_SIMPCHINESE} \
-    "Remove the plugin directories if they are empty."
-
-LangString str_unsection_plugin_home ${LANG_SIMPCHINESE} \
-    "私有插件目录"
-LangString str_desc_rm_plugin_home  ${LANG_SIMPCHINESE} \
-    "Remove the plugin directories from HOME directory."
-
-LangString str_unsection_plugin_vim ${LANG_SIMPCHINESE} \
-    "公共插件目录"
-LangString str_desc_rm_plugin_vim   ${LANG_SIMPCHINESE} \
-    "Remove the plugin directories from Vim install directory."
-
-LangString str_unsection_rootdir    ${LANG_SIMPCHINESE} \
-    "Remove the Vim root directory"
-LangString str_desc_rm_rootdir      ${LANG_SIMPCHINESE} \
-    "Remove the Vim root directory. It contains your Vim configuration files!"
-
-
-##############################################################################
-# Messages                                                                {{{1
-##############################################################################
-
-#LangString str_msg_too_many_ver  ${LANG_SIMPCHINESE} \
-#    "您的系统上安装了 $vim_old_ver_count 个不同版本的 Vim，$\r$\n\
-#     但本安装程序最多只能处理 ${VIM_MAX_OLD_VER} 个版本。$\r$\n\
-#     请您手工删除一些旧版本以后再运行本安装程序。"
-
-#LangString str_msg_invalid_root  ${LANG_SIMPCHINESE} \
-#    "安装路径“$vim_install_root”无效！$\r$\n\
-#     该路径必须以 vim 结尾。"
-
-#LangString str_msg_bin_mismatch  ${LANG_SIMPCHINESE} \
-#    "Vim 执行程序安装路径异常！$\r$\n$\r$\n\
-#     该版本 Vim 的执行程序安装路径应该是“$vim_bin_path”,$\r$\n\
-#     而系统却指示该路径为“$INSTDIR”。"
-
-#LangString str_msg_vim_running   ${LANG_SIMPCHINESE} \
-#    "您的系统上仍有 Vim 在运行，$\r$\n\
-#     请您在执行后续步骤前退出这些 Vim。"
-
-#LangString str_msg_register_ole  ${LANG_SIMPCHINESE} \
-#    "试图注册 Vim OLE 服务器。请注意无论成功与否都不再显示进一步的信息。"
-
-#LangString str_msg_unreg_ole     ${LANG_SIMPCHINESE} \
-#    "试图注销 Vim OLE 服务器。请注意无论成功与否都不再显示进一步的信息。"
-
-#LangString str_msg_rm_start      ${LANG_SIMPCHINESE} \
-#    "开始卸载以下版本："
-
-#LangString str_msg_rm_fail       ${LANG_SIMPCHINESE} \
-#    "以下版本卸载失败："
-
-#LangString str_msg_no_rm_key     ${LANG_SIMPCHINESE} \
-#    "找不到卸载程序的注册表键。"
-
-#LangString str_msg_no_rm_reg     ${LANG_SIMPCHINESE} \
-#    "在注册表中未找到卸载程序路径。"
-
-#LangString str_msg_no_rm_exe     ${LANG_SIMPCHINESE} \
-#    "找不到卸载程序。"
-
-#LangString str_msg_rm_copy_fail  ${LANG_SIMPCHINESE} \
-#    "无法将卸载程序复制到临时目录。"
-
-#LangString str_msg_rm_run_fail   ${LANG_SIMPCHINESE} \
-#    "执行卸载程序失败。"
-
-#LangString str_msg_abort_install ${LANG_SIMPCHINESE} \
-#    "安装程序将退出。"
-
-LangString str_msg_install_fail  ${LANG_SIMPCHINESE} \
-    "安装失败。祝您下次好运。"
-
-LangString str_msg_rm_exe_fail   ${LANG_SIMPCHINESE} \
-    "目录“$0”下有部分文件删除失败！$\r$\n\
-     您只能手工删除该目录。"
-
-#LangString str_msg_rm_root_fail  ${LANG_SIMPCHINESE} \
-#    "警告：无法删除 Vim 安装目录“$vim_install_root”，\
-#     该目录下仍有其他文件。"
-
-LangString str_msg_uninstalling  ${LANG_SIMPCHINESE} \
-    "Uninstalling the old version..."
-
-LangString str_msg_registering   ${LANG_SIMPCHINESE} \
-    "Registering..."
-
-LangString str_msg_unregistering ${LANG_SIMPCHINESE} \
-    "Unregistering..."
-
-
-##############################################################################
-# Dialog Box                                                              {{{1
-##############################################################################
-
-LangString str_vimrc_page_title    ${LANG_SIMPCHINESE} \
-    "Choose _vimrc settings"
-LangString str_vimrc_page_subtitle ${LANG_SIMPCHINESE} \
-    "Choose the settings for enhancement, keyboard and mouse."
-
-LangString str_msg_compat_title    ${LANG_SIMPCHINESE} \
-    " Vi / Vim behavior "
-LangString str_msg_compat_desc     ${LANG_SIMPCHINESE} \
-    "&Compatibility and enhancements"
-LangString str_msg_compat_vi       ${LANG_SIMPCHINESE} \
-    "Vi compatible"
-LangString str_msg_compat_vim      ${LANG_SIMPCHINESE} \
-    "Vim original"
-LangString str_msg_compat_defaults ${LANG_SIMPCHINESE} \
-    "Vim with some enhancements (load defaults.vim)"
-LangString str_msg_compat_all      ${LANG_SIMPCHINESE} \
-    "Vim with all enhancements (load vimrc_example.vim) (Default)"
-
-LangString str_msg_keymap_title   ${LANG_SIMPCHINESE} \
-    " Mappings "
-LangString str_msg_keymap_desc    ${LANG_SIMPCHINESE} \
-    "&Remap a few keys for Windows (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F, etc)"
-LangString str_msg_keymap_default ${LANG_SIMPCHINESE} \
-    "Do not remap keys (Default)"
-LangString str_msg_keymap_windows ${LANG_SIMPCHINESE} \
-    "Remap a few keys"
-
-LangString str_msg_mouse_title   ${LANG_SIMPCHINESE} \
-    " Mouse "
-LangString str_msg_mouse_desc    ${LANG_SIMPCHINESE} \
-    "&Behavior of right and left buttons"
-LangString str_msg_mouse_default ${LANG_SIMPCHINESE} \
-    "Right: popup menu, Left: visual mode (Default)"
-LangString str_msg_mouse_windows ${LANG_SIMPCHINESE} \
-    "Right: popup menu, Left: select mode (Windows)"
-LangString str_msg_mouse_unix    ${LANG_SIMPCHINESE} \
-    "Right: extends selection, Left: visual mode (Unix)"

nsis/lang/tradchinese.nsi

@@ -1,278 +0,0 @@
-# vi:set ts=8 sts=4 sw=4 et fdm=marker:
-#
-# tradchinese.nsi: Traditional Chinese language strings for gvim NSIS
-# installer.
-#
-# Locale ID    : 1028
-# fileencoding : UTF-8
-# Author       : Guopeng Wen
-
-!insertmacro MUI_LANGUAGE "TradChinese"
-
-
-# Overwrite the default translation.
-# These strings should be always English.  Otherwise dosinst.c fails.
-LangString ^SetupCaption     ${LANG_TRADCHINESE} \
-        "$(^Name) Setup"
-LangString ^UninstallCaption ${LANG_TRADCHINESE} \
-        "$(^Name) Uninstall"
-
-##############################################################################
-# MUI Configuration Strings                                               {{{1
-##############################################################################
-
-#LangString str_dest_folder          ${LANG_TRADCHINESE} \
-#    "安裝資料夾 (必須以 vim 結尾)"
-
-LangString str_show_readme          ${LANG_TRADCHINESE} \
-    "安裝完成後顯示 README 檔案"
-
-# Install types:
-LangString str_type_typical         ${LANG_TRADCHINESE} \
-    "典型安裝"
-
-LangString str_type_minimal         ${LANG_TRADCHINESE} \
-    "最小安裝"
-
-LangString str_type_full            ${LANG_TRADCHINESE} \
-    "完全安裝"
-
-
-##############################################################################
-# Section Titles & Description                                            {{{1
-##############################################################################
-
-LangString str_section_old_ver      ${LANG_TRADCHINESE} \
-    "移除舊版本"
-LangString str_desc_old_ver         ${LANG_TRADCHINESE} \
-    "移除閣下電腦上舊版本的 Vim。"
-
-LangString str_section_exe          ${LANG_TRADCHINESE} \
-    "安裝 Vim 圖形界面程式"
-LangString str_desc_exe             ${LANG_TRADCHINESE} \
-    "安裝 Vim 圖形界面程式及腳本。此為必選安裝。"
-
-LangString str_section_console      ${LANG_TRADCHINESE} \
-    "安裝 Vim 命令行程式"
-LangString str_desc_console         ${LANG_TRADCHINESE} \
-    "安裝 Vim 命令行程式 (vim.exe)。該程式在控制臺窗口中運行。"
-
-LangString str_section_batch        ${LANG_TRADCHINESE} \
-    "安裝批次檔案"
-LangString str_desc_batch           ${LANG_TRADCHINESE} \
-    "為 Vim 的各種變體創建批次檔，以便在命令行下啟動 Vim。"
-
-LangString str_group_icons          ${LANG_TRADCHINESE} \
-    "建立 Vim 圖示"
-LangString str_desc_icons           ${LANG_TRADCHINESE} \
-    "建立若干 Vim 圖示，以便于使用 Vim。"
-
-LangString str_section_desktop      ${LANG_TRADCHINESE} \
-    "於桌面"
-LangString str_desc_desktop         ${LANG_TRADCHINESE} \
-    "建立若干 Vim 圖示於桌面上，以方便啟動 Vim。"
-
-LangString str_section_start_menu   ${LANG_TRADCHINESE} \
-    "於「開始」功能表的「程式」集"
-LangString str_desc_start_menu      ${LANG_TRADCHINESE} \
-    "在「開始」功能表的「程式」集中建立 Vim 啟動組。\
-     適用于 Windows 95 及以上版本。"
-
-#LangString str_section_quick_launch ${LANG_TRADCHINESE} \
-#    "於快速啟動列"
-#LangString str_desc_quick_launch    ${LANG_TRADCHINESE} \
-#    "在快速啟動列中建立 Vim 圖示。"
-
-LangString str_section_edit_with    ${LANG_TRADCHINESE} \
-    "安裝快捷選單"
-LangString str_desc_edit_with       ${LANG_TRADCHINESE} \
-    "在「打開方式」快捷選單中添加 Vim 項。"
-
-#LangString str_section_edit_with32  ${LANG_TRADCHINESE} \
-#    "32 位元版本"
-#LangString str_desc_edit_with32     ${LANG_TRADCHINESE} \
-#    "在 32 位元程式的「打開方式」快捷選單中添加 Vim 項。"
-
-#LangString str_section_edit_with64  ${LANG_TRADCHINESE} \
-#    "64 位元版本"
-#LangString str_desc_edit_with64     ${LANG_TRADCHINESE} \
-#    "在 64 位元程式的「打開方式」快捷選單中添加 Vim 項。"
-
-LangString str_section_vim_rc       ${LANG_TRADCHINESE} \
-    "建立默認設定檔"
-LangString str_desc_vim_rc          ${LANG_TRADCHINESE} \
-    "在安裝資料夾下建立默認的 Vim 設定檔(_vimrc)。\
-     若該設定檔已經存在，則略過此項。"
-
-LangString str_group_plugin         ${LANG_TRADCHINESE} \
-    "建立插件資料夾"
-LangString str_desc_plugin          ${LANG_TRADCHINESE} \
-    "建立(空的)插件資料夾結構。插件資料夾用于安裝 Vim 的擴展插件，\
-     只要將檔案復制到相關的子資料夾中即可。"
-
-LangString str_section_plugin_home  ${LANG_TRADCHINESE} \
-    "建立插件資料夾"
-LangString str_desc_plugin_home     ${LANG_TRADCHINESE} \
-    "Create plugin directories in HOME directory."
-
-LangString str_section_plugin_vim   ${LANG_TRADCHINESE} \
-    "建立共享插件資料夾"
-LangString str_desc_plugin_vim      ${LANG_TRADCHINESE} \
-    "在 Vim 安裝資料夾下建立(空的)插件資料夾結構，電腦上所有用戶都能使用安裝\
-     在該資料夾里的擴展插件。"
-
-LangString str_section_vis_vim      ${LANG_TRADCHINESE} \
-    "安裝 VisVim 插件"
-LangString str_desc_vis_vim         ${LANG_TRADCHINESE} \
-    "VisVim 是用于與微軟 Microsoft Visual Studio 軟體進行整合的插件。"
-
-LangString str_section_nls          ${LANG_TRADCHINESE} \
-    "安裝本地語言支持"
-LangString str_desc_nls             ${LANG_TRADCHINESE} \
-    "安裝用于支持本地語言的檔案。"
-
-LangString str_unsection_register   ${LANG_TRADCHINESE} \
-    "移除 Vim 系統設定"
-LangString str_desc_unregister      ${LANG_TRADCHINESE} \
-    "移除與 Vim 相關的系統設定。"
-
-LangString str_unsection_exe        ${LANG_TRADCHINESE} \
-    "移除 Vim 程式及腳本"
-LangString str_desc_rm_exe          ${LANG_TRADCHINESE} \
-    "移除所有的 Vim 程式及腳本。"
-
-LangString str_ungroup_plugin       ${LANG_TRADCHINESE} \
-    "Remove plugin directories"
-LangString str_desc_rm_plugin       ${LANG_TRADCHINESE} \
-    "Remove the plugin directories if they are empty."
-
-LangString str_unsection_plugin_home ${LANG_TRADCHINESE} \
-    "Private"
-LangString str_desc_rm_plugin_home  ${LANG_TRADCHINESE} \
-    "Remove the vimfiles directory in HOME directory."
-
-LangString str_unsection_plugin_vim ${LANG_TRADCHINESE} \
-    "Shared"
-LangString str_desc_rm_plugin_vim   ${LANG_TRADCHINESE} \
-    "Remove the vimfiles directory in Vim install directory."
-
-LangString str_unsection_rootdir    ${LANG_TRADCHINESE} \
-    "Remove the Vim root directory"
-LangString str_desc_rm_rootdir      ${LANG_TRADCHINESE} \
-    "Remove the Vim root directory. It contains your Vim configuration files!"
-
-
-##############################################################################
-# Messages                                                                {{{1
-##############################################################################
-
-#LangString str_msg_too_many_ver  ${LANG_TRADCHINESE} \
-#    "閣下的電腦上安裝了 $vim_old_ver_count 個不同版本的 Vim，$\r$\n\
-#     但是本安裝程式最多只能處理 ${VIM_MAX_OLD_VER} 個版本。$\r$\n\
-#     煩請閣下手工移除一些版本以后再運行本安裝程式。"
-
-#LangString str_msg_invalid_root  ${LANG_TRADCHINESE} \
-#    "安裝資料夾「$vim_install_root」無效！$\r$\n\
-#     該資料夾必須以「vim」結尾。"
-
-#LangString str_msg_bin_mismatch  ${LANG_TRADCHINESE} \
-#    "Vim 執行程式安裝路徑異常！$\r$\n$\r$\n\
-#     該版本 Vim 的執行程式安裝路徑應該是「$vim_bin_path」,$\r$\n\
-#     而系統卻指示該路徑為「$INSTDIR」。"
-
-#LangString str_msg_vim_running   ${LANG_TRADCHINESE} \
-#    "閣下的電腦上尚有正在運行之 Vim，$\r$\n\
-#     煩請閣下在執行后續步驟前將其全部退出。"
-
-#LangString str_msg_register_ole  ${LANG_TRADCHINESE} \
-#    "試圖注冊 Vim OLE 伺服程式。請注意不論成功與否都不再顯示進一步的信息。"
-
-#LangString str_msg_unreg_ole     ${LANG_TRADCHINESE} \
-#    "試圖注銷 Vim OLE 伺服程式。請注意不論成功與否都不再顯示進一步的信息。"
-
-#LangString str_msg_rm_start      ${LANG_TRADCHINESE} \
-#    "正移除如下版本："
-
-#LangString str_msg_rm_fail       ${LANG_TRADCHINESE} \
-#    "以下版本移除失敗："
-
-#LangString str_msg_no_rm_key     ${LANG_TRADCHINESE} \
-#    "找不到反安裝程式的登錄檔入口。"
-
-#LangString str_msg_no_rm_reg     ${LANG_TRADCHINESE} \
-#    "在登錄檔中未找到反安裝程式路徑。"
-
-#LangString str_msg_no_rm_exe     ${LANG_TRADCHINESE} \
-#    "找不到反安裝程式。"
-
-#LangString str_msg_rm_copy_fail  ${LANG_TRADCHINESE} \
-#    "無法將法將反安裝程式复制到臨時目錄。"
-
-#LangString str_msg_rm_run_fail   ${LANG_TRADCHINESE} \
-#    "執行反安裝程式失敗。"
-
-#LangString str_msg_abort_install ${LANG_TRADCHINESE} \
-#    "安裝程式將退出。"
-
-LangString str_msg_install_fail  ${LANG_TRADCHINESE} \
-    "安裝失敗。預祝下次好運。"
-
-LangString str_msg_rm_exe_fail   ${LANG_TRADCHINESE} \
-    "資料夾「$0」下有部分檔案未能移除！$\r$\n\
-     閣下只能手工移除該資料夾。"
-
-#LangString str_msg_rm_root_fail  ${LANG_TRADCHINESE} \
-#    "警告：無法刪除 Vim 安裝資料夾「$vim_install_root」，\
-#     該資料夾下仍有其他檔案。"
-
-LangString str_msg_uninstalling  ${LANG_TRADCHINESE} \
-    "Uninstalling the old version..."
-
-LangString str_msg_registering   ${LANG_TRADCHINESE} \
-    "Registering..."
-
-LangString str_msg_unregistering ${LANG_TRADCHINESE} \
-    "Unregistering..."
-
-
-##############################################################################
-# Dialog Box                                                              {{{1
-##############################################################################
-
-LangString str_vimrc_page_title    ${LANG_TRADCHINESE} \
-    "Choose _vimrc settings"
-LangString str_vimrc_page_subtitle ${LANG_TRADCHINESE} \
-    "Choose the settings for enhancement, keyboard and mouse."
-
-LangString str_msg_compat_title    ${LANG_TRADCHINESE} \
-    " Vi / Vim behavior "
-LangString str_msg_compat_desc     ${LANG_TRADCHINESE} \
-    "&Compatibility and enhancements"
-LangString str_msg_compat_vi       ${LANG_TRADCHINESE} \
-    "Vi compatible"
-LangString str_msg_compat_vim      ${LANG_TRADCHINESE} \
-    "Vim original"
-LangString str_msg_compat_defaults ${LANG_TRADCHINESE} \
-    "Vim with some enhancements (load defaults.vim)"
-LangString str_msg_compat_all      ${LANG_TRADCHINESE} \
-    "Vim with all enhancements (load vimrc_example.vim) (Default)"
-
-LangString str_msg_keymap_title   ${LANG_TRADCHINESE} \
-    " Mappings "
-LangString str_msg_keymap_desc    ${LANG_TRADCHINESE} \
-    "&Remap a few keys for Windows (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F, etc)"
-LangString str_msg_keymap_default ${LANG_TRADCHINESE} \
-    "Do not remap keys (Default)"
-LangString str_msg_keymap_windows ${LANG_TRADCHINESE} \
-    "Remap a few keys"
-
-LangString str_msg_mouse_title   ${LANG_TRADCHINESE} \
-    " Mouse "
-LangString str_msg_mouse_desc    ${LANG_TRADCHINESE} \
-    "&Behavior of right and left buttons"
-LangString str_msg_mouse_default ${LANG_TRADCHINESE} \
-    "Right: popup menu, Left: visual mode (Default)"
-LangString str_msg_mouse_windows ${LANG_TRADCHINESE} \
-    "Right: popup menu, Left: select mode (Windows)"
-LangString str_msg_mouse_unix    ${LANG_TRADCHINESE} \
-    "Right: extends selection, Left: visual mode (Unix)"

runtime/autoload/RstFold.vim

@@ -1,62 +0,0 @@
-" Author: Antony Lee <anntzer.lee@gmail.com>
-" Description: Helper functions for reStructuredText syntax folding
-" Last Modified: 2018-12-29
-
-function s:CacheRstFold()
-  if !g:rst_fold_enabled
-    return
-  endif
-
-  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()
-  let save_mark = getpos("'[")
-  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)
-  call setpos("'[", save_mark)
-  let b:RstFoldCache = closure.levels
-endfunction
-
-function RstFold#GetRstFold()
-  if !g:rst_fold_enabled
-    return
-  endif
-
-  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 !g:rst_fold_enabled
-    return
-  endif
-
-  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

runtime/autoload/ada.vim

@@ -591,7 +591,7 @@ function ada#Map_Menu (Text, Keys, Command)
 	\" :" . a:Command
       execute
 	\ "inoremap <buffer>" .
-	\ " <Leader>a" . a:Keys .
+	\ " <Learder>a" . a:Keys .
 	\" <C-O>:" . a:Command
    endif
    return

runtime/autoload/ccomplete.vim

@@ -1,7 +1,7 @@
 " Vim completion script
 " Language:	C
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2018 Aug 20
+" Last Change:	2012 Jun 20
 
 let s:cpo_save = &cpo
 set cpo&vim
@@ -72,10 +72,8 @@ function! ccomplete#Complete(findstart, base)
   " Split item in words, keep empty word after "." or "->".
   " "aa" -> ['aa'], "aa." -> ['aa', ''], "aa.bb" -> ['aa', 'bb'], etc.
   " We can't use split, because we need to skip nested [...].
-  " "aa[...]" -> ['aa', '[...]'], "aa.bb[...]" -> ['aa', 'bb', '[...]'], etc.
   let items = []
   let s = 0
-  let arrays = 0
   while 1
     let e = match(base, '\.\|->\|\[', s)
     if e < 0
@@ -109,7 +107,6 @@ function! ccomplete#Complete(findstart, base)
       endwhile
       let e += 1
       call add(items, strpart(base, s, e - s))
-      let arrays += 1
       let s = e
     endif
   endwhile
@@ -164,26 +161,15 @@ function! ccomplete#Complete(findstart, base)
 	endif
       endif
       let res = [{'match': match, 'tagline' : '', 'kind' : kind, 'info' : line}]
-    elseif len(items) == arrays + 1
-      " Completing one word and it's a local array variable: build tagline
-      " from declaration line
-      let match = items[0]
-      let kind = 'v'
-      let tagline = "\t/^" . line . '$/'
-      let res = [{'match': match, 'tagline' : tagline, 'kind' : kind, 'info' : line}]
     else
       " Completing "var.", "var.something", etc.
       let res = s:Nextitem(strpart(line, 0, col), items[1:], 0, 1)
     endif
   endif
 
-  if len(items) == 1 || len(items) == arrays + 1
+  if len(items) == 1
     " Only one part, no "." or "->": complete from tags file.
-    if len(items) == 1
-      let tags = taglist('^' . base)
-    else
-      let tags = taglist('^' . items[0] . '$')
-    endif
+    let tags = taglist('^' . base)
 
     " Remove members, these can't appear without something in front.
     call filter(tags, 'has_key(v:val, "kind") ? v:val["kind"] != "m" : 1')
@@ -530,24 +516,11 @@ function! s:StructMembers(typename, items, all)
     endif
   endif
 
-  " Skip over [...] items
-  let idx = 0
-  while 1
-    if idx >= len(a:items)
-      let target = ''		" No further items, matching all members
-      break
-    endif
-    if a:items[idx][0] != '['
-      let target = a:items[idx]
-      break
-    endif
-    let idx += 1
-  endwhile
   " Put matching members in matches[].
   let matches = []
   for l in qflist
     let memb = matchstr(l['text'], '[^\t]*')
-    if memb =~ '^' . target
+    if memb =~ '^' . a:items[0]
       " Skip matches local to another file.
       if match(l['text'], "\tfile:") < 0 || bufnr('%') == bufnr(matchstr(l['text'], '\t\zs[^\t]*'))
 	let item = {'match': memb, 'tagline': l['text']}
@@ -567,8 +540,8 @@ function! s:StructMembers(typename, items, all)
   endfor
 
   if len(matches) > 0
-    " Skip over next [...] items
-    let idx += 1
+    " Skip over [...] items
+    let idx = 1
     while 1
       if idx >= len(a:items)
 	return matches		" No further items, return the result.

runtime/autoload/csscomplete.vim

@@ -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 = []

runtime/autoload/dist/ft.vim

@@ -1,757 +0,0 @@
-" Vim functions for file type detection
-"
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2019 Jan 18
-
-" 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", "//" or "/*" 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 did_filetype()
-    " Filetype was already detected
-    return
-  endif
-  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 did_filetype()
-    " Filetype was already detected
-    return
-  endif
-  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 did_filetype()
-    " Filetype was already detected
-    return
-  endif
-  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 "plain" 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

runtime/autoload/paste.vim

@@ -1,25 +1,35 @@
 " Vim support file to help with paste mappings and menus
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2019 Jan 27
+" Last Change:	2017 Aug 30
 
 " 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.
 
-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"
+" Pasting blockwise and linewise selections is not possible in Insert and
+" Visual mode without the +virtualedit feature.  They are pasted as if they
+" were characterwise instead.  Add to that some tricks to leave the cursor in
+" the right position, also for "gi".
+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"
 
-func! paste#Paste()
-  let ove = &ve
-  set ve=all
-  normal! `^
-  if @+ != ''
-    normal! "+gP
-  endif
-  let c = col(".")
-  normal! i
-  if col(".") < c	" compensate for i<ESC> moving the cursor left
-    normal! l
-  endif
-  let &ve = ove
-endfunc
+  func! paste#Paste()
+    let ove = &ve
+    set ve=all
+    normal! `^
+    if @+ != ''
+      normal! "+gP
+    endif
+    let c = col(".")
+    normal! i
+    if col(".") < c	" compensate for i<ESC> moving the cursor left
+      normal! l
+    endif
+    let &ve = ove
+  endfunc
+else
+  let paste#paste_cmd = {'n': "\"=@+.'xy'<CR>gPFx\"_2x"}
+  let paste#paste_cmd['v'] = '"-c<Esc>gix<Esc>' . paste#paste_cmd['n'] . '"_x'
+  let paste#paste_cmd['i'] = 'x<Esc>' . paste#paste_cmd['n'] . '"_s'
+endif

runtime/autoload/phpcomplete.vim

@@ -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:  2018 Oct 10
+" Last Change:  2016 Oct 10
 "
 "	OPTIONS:
 "
@@ -146,8 +146,6 @@ function! phpcomplete#CompletePHP(findstart, base) " {{{
 	end
 
 	try
-		let eventignore = &eventignore
-		let &eventignore = 'all'
 		let winheight = winheight(0)
 		let winnr = winnr()
 
@@ -218,7 +216,6 @@ function! phpcomplete#CompletePHP(findstart, base) " {{{
 		endif
 	finally
 		silent! exec winnr.'resize '.winheight
-		let &eventignore = eventignore
 	endtry
 endfunction
 " }}}
@@ -1396,28 +1393,23 @@ function! phpcomplete#GetCallChainReturnType(classname_candidate, class_candidat
 			for classstructure in classcontents
 				let docblock_target_pattern = 'function\s\+&\?'.method.'\>\|\(public\|private\|protected\|var\).\+\$'.method.'\>\|@property.\+\$'.method.'\>'
 				let doc_str = phpcomplete#GetDocBlock(split(classstructure.content, '\n'), docblock_target_pattern)
-				let return_type_hint = phpcomplete#GetFunctionReturnTypeHint(split(classstructure.content, '\n'), 'function\s\+&\?'.method.'\>')
-				if doc_str != '' || return_type_hint != ''
+				if doc_str != ''
 					break
 				endif
 			endfor
-			if doc_str != '' || return_type_hint != ''
+			if doc_str != ''
 				let docblock = phpcomplete#ParseDocBlock(doc_str)
-				if has_key(docblock.return, 'type') || has_key(docblock.var, 'type') || len(docblock.properties) > 0 || return_type_hint != ''
-					if return_type_hint == ''
-						let type = has_key(docblock.return, 'type') ? docblock.return.type : has_key(docblock.var, 'type') ? docblock.var.type : ''
+				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
-					else
-						let type = return_type_hint
-					end
+					if type == ''
+						for property in docblock.properties
+							if property.description =~? method
+								let type = property.type
+								break
+							endif
+						endfor
+					endif
 
 					" there's a namespace in the type, threat the type as FQCN
 					if type =~ '\\'
@@ -1491,7 +1483,7 @@ function! phpcomplete#GetMethodStack(line) " {{{
 			continue
 		endif
 
-		" if it looks like a string
+		" if it's looks like a string
 		if current_char == "'" || current_char == '"'
 			" and it is not escaped
 			if prev_char != '\' || (prev_char == '\' && prev_prev_char == '\')
@@ -1595,11 +1587,9 @@ function! phpcomplete#GetClassName(start_line, context, current_namespace, impor
 		elseif function_file != '' && filereadable(function_file)
 			let file_lines = readfile(function_file)
 			let docblock_str = phpcomplete#GetDocBlock(file_lines, 'function\s*&\?\<'.function_name.'\>')
-			let return_type_hint = phpcomplete#GetFunctionReturnTypeHint(file_lines, 'function\s*&\?'.function_name.'\>')
 			let docblock = phpcomplete#ParseDocBlock(docblock_str)
-			let type = has_key(docblock.return, 'type') ? docblock.return.type : return_type_hint
-			if type != ''
-				let classname_candidate = type
+			if has_key(docblock.return, 'type')
+				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
 
@@ -1831,11 +1821,9 @@ function! phpcomplete#GetClassName(start_line, context, current_namespace, impor
 				elseif function_file != '' && filereadable(function_file)
 					let file_lines = readfile(function_file)
 					let docblock_str = phpcomplete#GetDocBlock(file_lines, 'function\s*&\?\<'.function_name.'\>')
-					let return_type_hint = phpcomplete#GetFunctionReturnTypeHint(file_lines, 'function\s*&\?'.function_name.'\>')
 					let docblock = phpcomplete#ParseDocBlock(docblock_str)
-					let type = has_key(docblock.return, 'type') ? docblock.return.type : return_type_hint
-					if type != ''
-						let classname_candidate = type
+					if has_key(docblock.return, 'type')
+						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)
@@ -2425,44 +2413,6 @@ function! phpcomplete#ParseDocBlock(docblock) " {{{
 endfunction
 " }}}
 
-function! phpcomplete#GetFunctionReturnTypeHint(sccontent, search)
-	let i = 0
-	let l = 0
-	let function_line_start = -1
-	let function_line_end = -1
-	let sccontent_len = len(a:sccontent)
-	let return_type = ''
-
-	while (i < sccontent_len)
-		let line = a:sccontent[i]
-		" search for a function declaration
-		if line =~? a:search
-			let l = i
-			let function_line_start = i
-			" now search for the first { where the function body starts
-			while l < sccontent_len
-				let line = a:sccontent[l]
-				if line =~? '\V{'
-					let function_line_end = l
-					break
-				endif
-				let l += 1
-			endwhile
-			break
-		endif
-		let i += 1
-	endwhile
-
-	" now grab the lines that holds the function declaration line
-	if function_line_start != -1 && function_line_end != -1
-		let function_line = join(a:sccontent[function_line_start :function_line_end], " ")
-		let class_name_pattern = '[a-zA-Z_\x7f-\xff\\][a-zA-Z_0-9\x7f-\xff\\]*'
-		let return_type = matchstr(function_line, '\c\s*:\s*\zs'.class_name_pattern.'\ze\s*{')
-	endif
-	return return_type
-
-endfunction
-
 function! phpcomplete#GetTypeFromDocBlockParam(docblock_type) " {{{
 	if a:docblock_type !~ '|'
 		return a:docblock_type
@@ -2622,7 +2572,7 @@ function! phpcomplete#GetCurrentNameSpace(file_lines) " {{{
 			" find kind flags from tags or built in methods for the objects we extracted
 			" they can be either classes, interfaces or namespaces, no other thing is importable in php
 			for [key, import] in items(imports)
-				" if theres a \ in the name we have it's definitely not a built in thing, look for tags
+				" if theres a \ in the name we have it's definetly not a built in thing, look for tags
 				if import.name =~ '\\'
 					let patched_ctags_detected = 0
 					let [classname, namespace_for_classes] = phpcomplete#ExpandClassName(import.name, '\', {})

runtime/autoload/rubycomplete.vim

@@ -1,9 +1,9 @@
 " Vim completion script
-" Language:		Ruby
-" Maintainer:		Mark Guzman <segfault@hasno.info>
-" URL:			https://github.com/vim-ruby/vim-ruby
-" Release Coordinator:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:		2019 Jan 06
+" Language:             Ruby
+" Maintainer:           Mark Guzman <segfault@hasno.info>
+" URL:                  https://github.com/vim-ruby/vim-ruby
+" Release Coordinator:  Doug Kearns <dougkearns@gmail.com>
+" Maintainer Version:   0.8.1
 " ----------------------------------------------------------------------------
 "
 " Ruby IRB/Complete author: Keiju ISHITSUKA(keiju@ishitsuka.com)
@@ -103,7 +103,7 @@ function! s:GetBufferRubyEntity( name, type, ... )
     endif
 
     let curpos = getpos(".")
-    let [enum,ecol] = searchpairpos( crex, '', '\(end\|}\)', 'W' )
+    let [enum,ecol] = searchpairpos( crex, '', '\(end\|}\)', 'wr' )
     call cursor(lastpos[1], lastpos[2])
 
     if lnum > enum
@@ -253,27 +253,15 @@ class VimRubyCompletion
 
 # {{{ buffer analysis magic
   def load_requires
-
-    custom_paths = VIM::evaluate("get(g:, 'rubycomplete_load_paths', [])")
-
-    if !custom_paths.empty?
-      $LOAD_PATH.concat(custom_paths).uniq!
-    end
-
     buf = VIM::Buffer.current
     enum = buf.line_number
     nums = Range.new( 1, enum )
     nums.each do |x|
-
       ln = buf[x]
       begin
-        if /.*require_relative\s*(.*)$/.match( ln )
-          eval( "require %s" % File.expand_path($1) )
-        elsif /.*require\s*(["'].*?["'])/.match( ln )
-          eval( "require %s" % $1 )
-        end
-      rescue Exception => e
-        dprint e.inspect
+        eval( "require %s" % $1 ) if /.*require\s*(.*)$/.match( ln )
+      rescue Exception
+        #ignore?
       end
     end
   end
@@ -356,13 +344,8 @@ class VimRubyCompletion
         if x != cur_line
           next if x == 0
           ln = buf[x]
-          is_const = false
-          if /^\s*(module|class|def|include)\s+/.match(ln) || is_const = /^\s*?[A-Z]([A-z]|[1-9])*\s*?[|]{0,2}=\s*?.+\s*?/.match(ln)
-            clscnt += 1 if /class|module/.match($1)
-            # We must make sure to load each constant only once to avoid errors
-            if is_const
-                ln.gsub!(/\s*?[|]{0,2}=\s*?/, '||=')
-            end
+          if /^\s*(module|class|def|include)\s+/.match(ln)
+            clscnt += 1 if $1 == "class"
             #dprint "\$1$1
             classdef += "%s\n" % ln
             classdef += "end\n" if /def\s+/.match(ln)
@@ -440,6 +423,7 @@ class VimRubyCompletion
     return get_buffer_entity_list( "class" )
   end
 
+
   def load_rails
     allow_rails = VIM::evaluate("exists('g:rubycomplete_rails') && g:rubycomplete_rails")
     return if allow_rails.to_i.zero?
@@ -545,6 +529,7 @@ class VimRubyCompletion
         ret += ActiveRecord::ConnectionAdapters::SchemaStatements.methods
     end
 
+
     return ret
   end
 
@@ -602,13 +587,11 @@ class VimRubyCompletion
 # {{{ main completion code
   def self.preload_rails
     a = VimRubyCompletion.new
-    if VIM::evaluate("has('nvim')") == 0
-      require 'thread'
-      Thread.new(a) do |b|
-        begin
-        b.load_rails
-        rescue
-        end
+    require 'Thread'
+    Thread.new(a) do |b|
+      begin
+      b.load_rails
+      rescue
       end
     end
     a.load_rails
@@ -629,6 +612,7 @@ class VimRubyCompletion
 
     want_gems = VIM::evaluate("get(g:, 'rubycomplete_load_gemfile')")
     load_gems unless want_gems.to_i.zero?
+    
 
     input = VIM::Buffer.current.line
     cpos = VIM::Window.current.cursor[1] - 1
@@ -682,7 +666,6 @@ class VimRubyCompletion
         message = Regexp.quote($4)
         dprint "const or cls 2 [recv: \'%s\', msg: \'%s\']" % [ receiver, message ]
         load_buffer_class( receiver )
-        load_buffer_module( receiver )
         begin
           classes = eval("#{receiver}.constants")
           #methods = eval("#{receiver}.methods")
@@ -803,6 +786,7 @@ class VimRubyCompletion
       methods += Kernel.public_methods
     end
 
+
     include_object = VIM::evaluate("exists('g:rubycomplete_include_object') && g:rubycomplete_include_object")
     methods = clean_sel( methods, message )
     methods = (methods-Object.instance_methods) if include_object == "0"
@@ -845,4 +829,5 @@ let s:rubycomplete_rails_loaded = 0
 call s:DefRuby()
 "}}} ruby-side code
 
+
 " vim:tw=78:sw=4:ts=8:et:fdm=marker:ft=vim:norl:

runtime/autoload/spellfile.vim

@@ -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'

runtime/autoload/sqlcomplete.vim

@@ -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)

runtime/autoload/tar.vim

@@ -152,12 +152,10 @@ fun! tar#Browse(tarfile)
    " assuming cygwin
    let tarfile=substitute(system("cygpath -u ".shellescape(tarfile,0)),'\n$','','e')
   endif
-
   let curlast= line("$")
   if tarfile =~# '\.\(gz\|tgz\)$'
-    let gzip_command = s:get_gzip_command(tarfile)
 "   call Decho("1: exe silent r! gzip -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - ")
-   exe "sil! r! " . gzip_command . " -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
+   exe "sil! r! gzip -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
   elseif tarfile =~# '\.lrp'
 "   call Decho("2: exe silent r! cat -- ".shellescape(tarfile,1)."|gzip -d -c -|".g:tar_cmd." -".g:tar_browseoptions." - ")
    exe "sil! r! cat -- ".shellescape(tarfile,1)."|gzip -d -c -|".g:tar_cmd." -".g:tar_browseoptions." - "
@@ -289,14 +287,12 @@ fun! tar#Read(fname,mode)
   else
    let tar_secure= " "
   endif
-
   if tarfile =~# '\.bz2$'
 "   call Decho("7: exe silent r! bzip2 -d -c ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp)
    exe "sil! r! bzip2 -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
   elseif tarfile =~# '\.\(gz\|tgz\)$'
-    let gzip_command = s:get_gzip_command(tarfile)
 "   call Decho("5: exe silent r! gzip -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd.' -'.g:tar_readoptions.' - '.tar_secure.shellescape(fname,1))
-   exe "sil! r! " . gzip_command . " -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
+   exe "sil! r! gzip -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
   elseif tarfile =~# '\.lrp$'
 "   call Decho("6: exe silent r! cat ".shellescape(tarfile,1)." | gzip -d -c - | ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp)
    exe "sil! r! cat -- ".shellescape(tarfile,1)." | gzip -d -c - | ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
@@ -393,8 +389,6 @@ fun! tar#Write(fname)
   let tarfile = substitute(b:tarfile,'tarfile:\(.\{-}\)::.*$','\1','')
   let fname   = substitute(b:tarfile,'tarfile:.\{-}::\(.*\)$','\1','')
 
-  let gzip_command = s:get_gzip_command(tarfile)
-
   " handle compressed archives
   if tarfile =~# '\.bz2'
    call system("bzip2 -d -- ".shellescape(tarfile,0))
@@ -402,12 +396,12 @@ fun! tar#Write(fname)
    let compress= "bzip2 -- ".shellescape(tarfile,0)
 "   call Decho("compress<".compress.">")
   elseif tarfile =~# '\.gz'
-   call system(gzip_command . " -d -- ".shellescape(tarfile,0))
+   call system("gzip -d -- ".shellescape(tarfile,0))
    let tarfile = substitute(tarfile,'\.gz','','e')
    let compress= "gzip -- ".shellescape(tarfile,0)
 "   call Decho("compress<".compress.">")
   elseif tarfile =~# '\.tgz'
-   call system(gzip_command . " -d -- ".shellescape(tarfile,0))
+   call system("gzip -d -- ".shellescape(tarfile,0))
    let tarfile = substitute(tarfile,'\.tgz','.tar','e')
    let compress= "gzip -- ".shellescape(tarfile,0)
    let tgz     = 1
@@ -587,10 +581,7 @@ fun! tar#Vimuntar(...)
 
   " if necessary, decompress the tarball; then, extract it
   if tartail =~ '\.tgz'
-   let gzip_command = s:get_gzip_command(tarfile)
-   if executable(gzip_command)
-    silent exe "!" . gzip_command . " -d ".shellescape(tartail)
-   elseif executable("gunzip")
+   if executable("gunzip")
     silent exe "!gunzip ".shellescape(tartail)
    elseif executable("gzip")
     silent exe "!gzip -d ".shellescape(tartail)
@@ -628,28 +619,6 @@ fun! tar#Vimuntar(...)
 "  call Dret("tar#Vimuntar")
 endfun
 
-func s:get_gzip_command(file)
-  " Try using the "file" command to get the actual compression type, since
-  " there is no standard way for the naming: ".tgz", ".tbz", ".txz", etc.
-  " If the "file" command doesn't work fall back to just using the file name.
-  if a:file =~# 'z$'
-    let filetype = system('file ' . a:file)
-    if filetype =~ 'bzip2 compressed' && executable('bzip2')
-      return 'bzip2'
-    endif
-    if filetype =~ 'XZ compressed' && executable('xz')
-      return 'xz'
-    endif
-  endif
-  if a:file =~# 'bz2$'
-    return 'bzip2'
-  endif
-  if a:file =~# 'xz$'
-    return 'xz'
-  endif
-  return 'gzip'
-endfunc
-
 " =====================================================================
 " Modelines And Restoration: {{{1
 let &cpo= s:keepcpo

runtime/autoload/tohtml.vim

@@ -1,6 +1,6 @@
 " Vim autoload file for the tohtml plugin.
 " Maintainer: Ben Fritz <fritzophrenic@gmail.com>
-" Last Change: 2018 Nov 11
+" Last Change: 2013 Sep 03
 "
 " Additional contributors:
 "
@@ -544,16 +544,12 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
     " add required javascript in reverse order so we can just call append again
     " and again without adjusting {{{
 
-    let s:uses_script = s:settings.dynamic_folds || s:settings.line_ids || !empty(s:settings.prevent_copy)
-
-    " insert script closing tag if needed
-    if s:uses_script
-      call append(style_start, [
-	    \ '',
-	    \ s:settings.use_xhtml ? '//]]>' : '-->',
-	    \ "</script>"
-	    \ ])
-    endif
+    " insert script closing tag
+    call append(style_start, [
+	  \ '',
+	  \ s:settings.use_xhtml ? '//]]>' : '-->',
+	  \ "</script>"
+	  \ ])
 
     " insert script which corrects the size of small input elements in
     " prevent_copy mode. See 2html.vim for details on why this is needed and how
@@ -579,61 +575,55 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
 	    \ '}'
 	    \ ])
     endif
-
+    "
     " insert javascript to get IDs from line numbers, and to open a fold before
     " jumping to any lines contained therein
-    if s:settings.line_ids
-      call append(style_start, [
-	    \ "  /* Always jump to new location even if the line was hidden inside a fold, or",
-	    \ "   * we corrected the raw number to a line ID.",
-	    \ "   */",
-	    \ "  if (lineElem) {",
-	    \ "    lineElem.scrollIntoView(true);",
-	    \ "  }",
-	    \ "  return true;",
-	    \ "}",
-	    \ "if ('onhashchange' in window) {",
-	    \ "  window.onhashchange = JumpToLine;",
-	    \ "}"
-	    \ ])
-
-      if s:settings.dynamic_folds
-	call append(style_start, [
-	      \ "",
-	      \ "  /* navigate upwards in the DOM tree to open all folds containing the line */",
-	      \ "  var node = lineElem;",
-	      \ "  while (node && node.id != 'vimCodeElement".s:settings.id_suffix."')",
-	      \ "  {",
-	      \ "    if (node.className == 'closed-fold')",
-	      \ "    {",
-	      \ "      /* toggle open the fold ID (remove window ID) */",
-	      \ "      toggleFold(node.id.substr(4));",
-	      \ "    }",
-	      \ "    node = node.parentNode;",
-	      \ "  }",
-	      \ ])
-      endif
-    endif
-
-    if s:settings.line_ids
+    call append(style_start, [
+	  \ "  /* Always jump to new location even if the line was hidden inside a fold, or",
+	  \ "   * we corrected the raw number to a line ID.",
+	  \ "   */",
+	  \ "  if (lineElem) {",
+	  \ "    lineElem.scrollIntoView(true);",
+	  \ "  }",
+	  \ "  return true;",
+	  \ "}",
+	  \ "if ('onhashchange' in window) {",
+	  \ "  window.onhashchange = JumpToLine;",
+	  \ "}"
+	  \ ])
+    if s:settings.dynamic_folds
       call append(style_start, [
 	    \ "",
-	    \ "/* function to open any folds containing a jumped-to line before jumping to it */",
-	    \ "function JumpToLine()",
-	    \ "{",
-	    \ "  var lineNum;",
-	    \ "  lineNum = window.location.hash;",
-	    \ "  lineNum = lineNum.substr(1); /* strip off '#' */",
-	    \ "",
-	    \ "  if (lineNum.indexOf('L') == -1) {",
-	    \ "    lineNum = 'L'+lineNum;",
+	    \ "  /* navigate upwards in the DOM tree to open all folds containing the line */",
+	    \ "  var node = lineElem;",
+	    \ "  while (node && node.id != 'vimCodeElement".s:settings.id_suffix."')",
+	    \ "  {",
+	    \ "    if (node.className == 'closed-fold')",
+	    \ "    {",
+	    \ "      /* toggle open the fold ID (remove window ID) */",
+	    \ "      toggleFold(node.id.substr(4));",
+	    \ "    }",
+	    \ "    node = node.parentNode;",
 	    \ "  }",
-	    \ "  if (lineNum.indexOf('W') == -1) {",
-	    \ "    lineNum = 'W1'+lineNum;",
-	    \ "  }",
-	    \ "  var lineElem = document.getElementById(lineNum);"
 	    \ ])
     endif
+    call append(style_start, [
+	  \ "",
+	  \ "/* function to open any folds containing a jumped-to line before jumping to it */",
+	  \ "function JumpToLine()",
+	  \ "{",
+	  \ "  var lineNum;",
+	  \ "  lineNum = window.location.hash;",
+	  \ "  lineNum = lineNum.substr(1); /* strip off '#' */",
+	  \ "",
+	  \ "  if (lineNum.indexOf('L') == -1) {",
+	  \ "    lineNum = 'L'+lineNum;",
+	  \ "  }",
+	  \ "  if (lineNum.indexOf('W') == -1) {",
+	  \ "    lineNum = 'W1'+lineNum;",
+	  \ "  }",
+	  \ "  lineElem = document.getElementById(lineNum);"
+	  \ ])
 
     " Insert javascript to toggle matching folds open and closed in all windows,
     " if dynamic folding is active.
@@ -658,13 +648,11 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
 	    \ ])
     endif
 
-    if s:uses_script
-      " insert script tag; javascript is always needed for the line number
-      " normalization for URL hashes
-      call append(style_start, [
-	    \ "<script type='text/javascript'>",
-	    \ s:settings.use_xhtml ? '//<![CDATA[' : "<!--"])
-    endif
+    " insert script tag; javascript is always needed for the line number
+    " normalization for URL hashes
+    call append(style_start, [
+	  \ "<script type='text/javascript'>",
+	  \ s:settings.use_xhtml ? '//<![CDATA[' : "<!--"])
 
     " Insert styles from all the generated html documents and additional styles
     " for the table-based layout of the side-by-side diff. The diff should take
@@ -779,7 +767,7 @@ func! tohtml#GetUserSettings() "{{{
     if user_settings.no_pre == 0
       call tohtml#GetOption(user_settings,
 	    \ 'expand_tabs',
-	    \ &expandtab || &ts != 8 || &vts != '' || user_settings.number_lines ||
+	    \ &expandtab || &ts != 8 || user_settings.number_lines ||
 	    \   (user_settings.dynamic_folds && !user_settings.no_foldcolumn))
     else
       let user_settings.expand_tabs = 1

runtime/autoload/xmlformat.vim

@@ -1,115 +0,0 @@
-" Vim plugin for formatting XML
-" Last Change: Thu, 07 Dec 2018
-"     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)
-  let is_comment = s:IsComment(a:tag)
-  return a:tag =~? '^\s*<[^/?]' && !is_comment
-endfunc
-func! s:IsComment(tag)
-  return a:tag =~? '<!--'
-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

runtime/bugreport.vim

@@ -2,7 +2,7 @@
 :" information about the environment of a possible bug in Vim.
 :"
 :" Maintainer:	Bram Moolenaar <Bram@vim.org>
-:" Last change:	2019 Jan 27
+:" Last change:	2005 Jun 12
 :"
 :" To use inside Vim:
 :"	:so $VIMRUNTIME/bugreport.vim
@@ -54,7 +54,9 @@
 :endif
 :set all
 :set termcap
-:au
+:if has("autocmd")
+:  au
+:endif
 :if 1
 :  echo "--- Normal/Visual mode mappings ---"
 :endif

runtime/colors/README.txt

@@ -42,16 +42,7 @@ this autocmd might be useful:
 Replace "blue_sky" with the name of the colorscheme.
 
 In case you want to tweak a colorscheme after it was loaded, check out the
-ColorScheme autocommand event.
-
-To clean up just before loading another colorscheme, use the ColorSchemePre
-autocommand event.  For example:
-	let g:term_ansi_colors = ...
-	augroup MyColorscheme
-	  au!
-	  au ColorSchemePre * unlet g:term_ansi_colors
-	  au ColorSchemePre * au! MyColorscheme
-	augroup END
+ColorScheme autocmd event.
 
 To customize a colorscheme use another name, e.g.  "~/.vim/colors/mine.vim",
 and use `:runtime` to load the original colorscheme:
@@ -73,8 +64,6 @@ Search for "highlight_init".
 If you think you have a color scheme that is good enough to be used by others,
 please check the following items:
 
-- Source the $VIMRUNTIME/colors/tools/check_colors.vim script to check for
-  common mistakes.
 - Does it work in a color terminal as well as in the GUI?
 - Is "g:colors_name" set to a meaningful value?  In case of doubt you can do
   it this way:

runtime/colors/macvim.vim

@@ -1,7 +1,6 @@
 " MacVim colorscheme
 "
-" Author:       Bjorn Winckler <bjorn.winckler@gmail.com>
-" Maintainer:   macvim-dev (https://github.com/macvim-dev)
+" Maintainer:   Bjorn Winckler <bjorn.winckler@gmail.com>
 " Last Change:  2008 May 9
 "
 " This is the default MacVim color scheme.  It supports both light and dark

runtime/colors/tools/check_colors.vim

@@ -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

runtime/compiler/eruby.vim

@@ -3,7 +3,6 @@
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
 " URL:			https://github.com/vim-ruby/vim-ruby
 " Release Coordinator:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:		2018 Jan 25
 
 if exists("current_compiler")
   finish
@@ -29,8 +28,8 @@ CompilerSet errorformat=
     \%W%f:%l:\ warning:\ %m,
     \%E%f:%l:in\ %*[^:]:\ %m,
     \%E%f:%l:\ %m,
-    \%-C%\t%\\d%#:%#\ %#from\ %f:%l:in\ %.%#,
-    \%-Z%\t%\\d%#:%#\ %#from\ %f:%l,
+    \%-C%\tfrom\ %f:%l:in\ %.%#,
+    \%-Z%\tfrom\ %f:%l,
     \%-Z%p^,
     \%-G%.%#
 

runtime/compiler/rake.vim

@@ -3,7 +3,6 @@
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
 " URL:			https://github.com/vim-ruby/vim-ruby
 " Release Coordinator:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:		2018 Mar 02
 
 if exists("current_compiler")
   finish
@@ -21,12 +20,12 @@ CompilerSet makeprg=rake
 
 CompilerSet errorformat=
       \%D(in\ %f),
-      \%\\s%#%\\d%#:%#\ %#from\ %f:%l:%m,
-      \%\\s%#%\\d%#:%#\ %#from\ %f:%l:,
-      \%\\s%##\ %f:%l:%m%\\&%.%#%\\D:%\\d%\\+:%.%#,
-      \%\\s%##\ %f:%l%\\&%.%#%\\D:%\\d%\\+,
-      \%\\s%#[%f:%l:\ %#%m%\\&%.%#%\\D:%\\d%\\+:%.%#,
-      \%\\s%#%f:%l:\ %#%m%\\&%.%#%\\D:%\\d%\\+:%.%#,
+      \%\\s%#from\ %f:%l:%m,
+      \%\\s%#from\ %f:%l:,
+      \%\\s%##\ %f:%l:%m,
+      \%\\s%##\ %f:%l,
+      \%\\s%#[%f:%l:\ %#%m,
+      \%\\s%#%f:%l:\ %#%m,
       \%\\s%#%f:%l:,
       \%m\ [%f:%l]:,
       \%+Erake\ aborted!,

runtime/compiler/rspec.vim

@@ -3,7 +3,6 @@
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
 " URL:			https://github.com/vim-ruby/vim-ruby
 " Release Coordinator:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:		2018 Aug 07
 
 if exists("current_compiler")
   finish
@@ -24,8 +23,7 @@ CompilerSet errorformat=
     \%E%.%#:in\ `load':\ %f:%l:%m,
     \%E%f:%l:in\ `%*[^']':\ %m,
     \%-Z\ \ \ \ \ %\\+\#\ %f:%l:%.%#,
-    \%E\ \ \ \ \ Failure/Error:\ %m,
-    \%E\ \ \ \ \ Failure/Error:,
+    \%E\ \ %\\d%\\+)%.%#,
     \%C\ \ \ \ \ %m,
     \%C%\\s%#,
     \%-G%.%#

runtime/compiler/ruby.vim

@@ -4,7 +4,7 @@
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
 " URL:			https://github.com/vim-ruby/vim-ruby
 " Release Coordinator:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:		2019 Jan 06
+" ----------------------------------------------------------------------------
 
 if exists("current_compiler")
   finish
@@ -21,21 +21,21 @@ set cpo-=C
 " default settings runs script normally
 " add '-c' switch to run syntax check only:
 "
-"   CompilerSet makeprg=ruby\ -c
+"   CompilerSet makeprg=ruby\ -wc\ $*
 "
 " or add '-c' at :make command line:
 "
 "   :make -c %<CR>
 "
-CompilerSet makeprg=ruby
+CompilerSet makeprg=ruby\ -w\ $*
 
 CompilerSet errorformat=
     \%+E%f:%l:\ parse\ error,
     \%W%f:%l:\ warning:\ %m,
     \%E%f:%l:in\ %*[^:]:\ %m,
     \%E%f:%l:\ %m,
-    \%-C%\t%\\d%#:%#\ %#from\ %f:%l:in\ %.%#,
-    \%-Z%\t%\\d%#:%#\ %#from\ %f:%l,
+    \%-C%\tfrom\ %f:%l:in\ %.%#,
+    \%-Z%\tfrom\ %f:%l,
     \%-Z%p^,
     \%-G%.%#
 

runtime/compiler/rubyunit.vim

@@ -3,7 +3,6 @@
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
 " URL:			https://github.com/vim-ruby/vim-ruby
 " Release Coordinator:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:		2014 Mar 23
 
 if exists("current_compiler")
   finish

runtime/compiler/stack.vim

@@ -1,37 +0,0 @@
-" Vim compiler file
-" Compiler:         Haskell Stack
-" Maintainer:       Daniel Campoverde <alx@sillybytes.net>
-" Latest Revision:  2018-08-27
-
-if exists("current_compiler")
-  finish
-endif
-let current_compiler = "stack"
-
-let s:cpo_save = &cpo
-set cpo&vim
-
-
-CompilerSet errorformat=
-    \%-G%.%#:\ build\ %.%#,
-    \%-G%.%#:\ configure\ %.%#,
-    \%-G[%.%#]%.%#,
-    \%-G%.%#preprocessing\ %.%#,
-    \%-G%.%#configuring\ %.%#,
-    \%-G%.%#building\ %.%#,
-    \%-G%.%#linking\ %.%#,
-    \%-G%.%#installing\ %.%#,
-    \%-G%.%#registering\ %.%#,
-    \%-G%.%#:\ copy/register%.%#,
-    \%-G%.%#process\ exited\ %.%#,
-    \%-G%.%#--builddir=%.%#,
-    \%-G--%.%#,
-    \%-G%.%#\|%.%#,
-    \%E%f:%l:%c:\ error:,%+Z\ \ \ \ %m,
-    \%E%f:%l:%c:\ error:\ %m,%-Z,
-    \%W%f:%l:%c:\ warning:,%+Z\ \ \ \ %m,
-    \%W%f:%l:%c:\ warning:\ %m,%-Z,
-
-
-let &cpo = s:cpo_save
-unlet s:cpo_save

runtime/defaults.vim

@@ -1,7 +1,7 @@
 " The default vimrc file.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last change:	2019 Feb 18
+" Last change:	2017 Jun 13
 "
 " This is loaded if no vimrc file was found.
 " Except when Vim is run with "-u NONE" or "-C".
@@ -90,8 +90,8 @@ if &t_Co > 2 || has("gui_running")
   let c_comment_strings=1
 endif
 
-" Only do this part when Vim was compiled with the +eval feature.
-if 1
+" Only do this part when compiled with support for autocommands.
+if has("autocmd")
 
   " Enable file type detection.
   " Use the default filetype settings, so that mail gets 'tw' set to 72,
@@ -116,7 +116,7 @@ if 1
 
   augroup END
 
-endif
+endif " has("autocmd")
 
 " Convenient command to see the difference between the current buffer and the
 " file it was loaded from, thus the changes you made.

runtime/delmenu.vim

@@ -5,7 +5,6 @@
 " Last Change:	2001 May 27
 
 aunmenu *
-tlunmenu *
 
 silent! unlet did_install_default_menus
 silent! unlet did_install_syntax_menu

runtime/doc/Makefile

@@ -103,7 +103,6 @@ DOCS = \
 	tagsrch.txt \
 	term.txt \
 	terminal.txt \
-	textprop.txt \
 	tips.txt \
 	todo.txt \
 	uganda.txt \
@@ -240,7 +239,6 @@ HTMLS = \
 	tagsrch.html \
 	term.html \
 	terminal.html \
-	textprop.html \
 	tips.html \
 	todo.html \
 	uganda.html \
@@ -346,7 +344,7 @@ xxd.man: xxd.1
 	nroff -man xxd.1 | sed -e s/.//g > xxd.man
 
 uganda.nsis.txt: uganda.txt
-	sed -e 's/[ 	]*\*[-a-zA-Z0-9.]*\*//g' -e 's/vim:tw=78:.*//' \
+	sed -e 's/[ 	]*\*[-a-zA-Z0-9.]*\*//g' -e 's/vim:tw=78://' \
 		uganda.txt | uniq >uganda.nsis.txt
 
 # Awk version of .txt to .html conversion.
@@ -378,10 +376,6 @@ tags.ref tags.html: tags
 perlhtml: tags $(DOCS)
 	./vim2html.pl tags $(DOCS)
 
-# Check URLs in the help with "curl".
-test_urls:
-	vim -S test_urls.vim
-
 clean:
 	-rm doctags *.html tags.ref
 

runtime/doc/arabic.txt

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

runtime/doc/autocmd.txt

@@ -1,10 +1,10 @@
-*autocmd.txt*   For Vim version 8.1.  Last change: 2019 Jan 19
+*autocmd.txt*   For Vim version 8.0.  Last change: 2017 Jul 14
 
 
 		  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* *E937*
 WARNING: Using autocommands is very powerful, and may lead to unexpected side
 effects.  Be careful not to destroy your text.
 - It's a good idea to do some testing on an expendable copy of a file first.
@@ -56,8 +57,6 @@ effects.  Be careful not to destroy your text.
 			Add {cmd} to the list of commands that Vim will
 			execute automatically on {event} for a file matching
 			{pat} |autocmd-patterns|.
-			Note: A quote character is seen as argument to the
-			:autocmd and won't start a comment.
 			Vim always adds the {cmd} after existing autocommands,
 			so that the autocommands execute in the order in which
 			they were given.  See |autocmd-nested| for [nested].
@@ -69,14 +68,7 @@ Note: The ":autocmd" command can only be followed by another command when the
 '|' appears before {cmd}.  This works: >
 	:augroup mine | au! BufRead | augroup END
 But this sees "augroup" as part of the defined command: >
-	:augroup mine | au! BufRead * | augroup END
 	:augroup mine | au BufRead * set tw=70 | augroup END
-Instead you can put the group name into the command: >
-	:au! mine BufRead *
-	:au mine BufRead * set tw=70
-Or use `:execute`: >
-	:augroup mine | exe "au! BufRead *" | augroup END
-	:augroup mine | exe "au BufRead * set tw=70" | augroup END
 
 Note that special characters (e.g., "%", "<cword>") in the ":autocmd"
 arguments are not expanded when the autocommand is defined.  These will be
@@ -93,8 +85,7 @@ will appear twice.  To avoid this, define your autocommands in a group, so
 that you can easily clear them: >
 
 	augroup vimrc
-	  " Remove all vimrc autocommands
-	  autocmd!
+	  autocmd!	" Remove all vimrc autocommands
 	  au BufNewFile,BufRead *.html so <sfile>:h/html.vim
 	augroup END
 
@@ -148,8 +139,6 @@ prompt.  When one command outputs two messages this can happen anyway.
 			plugins, syntax highlighting, etc.
 
 :au[tocmd]! [group]	Remove ALL autocommands.
-			Note: a quote will be seen as argument to the :autocmd
-			and won't start a comment.
 			Warning: You should normally not do this without a
 			group, it breaks plugins, syntax highlighting, etc.
 
@@ -262,7 +251,6 @@ Name			triggered by ~
 |BufCreate|		just after adding a buffer to the buffer list
 |BufDelete|		before deleting a buffer from the buffer list
 |BufWipeout|		before completely deleting a buffer
-|TerminalOpen|		after a terminal buffer was created
 
 |BufFilePre|		before changing the name of the current buffer
 |BufFilePost|		after changing the name of the current buffer
@@ -291,8 +279,7 @@ Name			triggered by ~
 |GUIFailed|		after starting the GUI failed
 |TermResponse|		after the terminal response to |t_RV| is received
 
-|QuitPre|		when using `:quit`, before deciding whether to exit
-|ExitPre|		when using a command that may make Vim exit
+|QuitPre|		when using `:quit`, before deciding whether to quit
 |VimLeavePre|		before exiting Vim, before writing the viminfo file
 |VimLeave|		before exiting Vim, after writing the viminfo file
 
@@ -301,9 +288,6 @@ Name			triggered by ~
 |FileChangedShellPost|	After handling a file changed since editing started
 |FileChangedRO|		before making the first change to a read-only file
 
-|DiffUpdated|		after diffs have been updated
-|DirChanged|		after the working directory has changed
-
 |ShellCmdPost|		after executing a shell command
 |ShellFilterPost|	after filtering with a shell command
 
@@ -311,7 +295,6 @@ Name			triggered by ~
 |FuncUndefined|		a user function is used but it isn't defined
 |SpellFileMissing|	a spell file is used but it can't be found
 |SourcePre|		before sourcing a Vim script
-|SourcePost|		after sourcing a Vim script
 |SourceCmd|		before sourcing a Vim script |Cmd-event|
 
 |VimResized|		after the Vim window size changed
@@ -332,10 +315,6 @@ Name			triggered by ~
 |CmdwinEnter|		after entering the command-line window
 |CmdwinLeave|		before leaving the command-line window
 
-|CmdlineChanged|	after a change was made to the command-line text
-|CmdlineEnter|		after the cursor moves to the command line
-|CmdlineLeave|		before the cursor leaves the command line
-
 |InsertEnter|		starting Insert mode
 |InsertChange|		when typing <Insert> while in Insert or Replace mode
 |InsertLeave|		when leaving Insert mode
@@ -344,12 +323,7 @@ Name			triggered by ~
 
 |TextChanged|		after a change was made to the text in Normal mode
 |TextChangedI|		after a change was made to the text in Insert mode
-			when popup menu is not visible
-|TextChangedP|		after a change was made to the text in Insert mode
-			when popup menu visible
-|TextYankPost|		after text 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
@@ -471,9 +445,6 @@ BufWinEnter			After a buffer is displayed in a window.  This
 				existing buffer.  But it does happen for a
 				":split" with the name of the current buffer,
 				since it reloads that buffer.
-				Does not happen for a terminal window, because
-				it starts in Terminal-Job mode and Normal mode
-				commands won't work. Use |TerminalOpen| instead.
 							*BufWinLeave*
 BufWinLeave			Before a buffer is removed from a window.
 				Not when it's still visible in another window.
@@ -521,29 +492,6 @@ CmdUndefined			When a user command is used but it isn't
 				command is defined.  An alternative is to
 				always define the user command and have it
 				invoke an autoloaded function.  See |autoload|.
-							*CmdlineChanged*
-CmdlineChanged			After a change was made to the text in the
-				command line.  Be careful not to mess up
-				the command line, it may cause Vim to lock up.
-				<afile> is set to a single character,
-				indicating the type of command-line.
-				|cmdwin-char|
-							*CmdlineEnter*
-CmdlineEnter			After moving the cursor to the command line,
-				where the user can type a command or search
-				string.
-				<afile> is set to a single character,
-				indicating the type of command-line.
-				|cmdwin-char|
-							*CmdlineLeave*
-CmdlineLeave			Before leaving the command line.
-				Also when abandoning the command line, after
-				typing CTRL-C or <Esc>.
-				When the commands result in an error the
-				command line is still executed.
-				<afile> is set to a single character,
-				indicating the type of command-line.
-				|cmdwin-char|
 							*CmdwinEnter*
 CmdwinEnter			After entering the command-line window.
 				Useful for setting options specifically for
@@ -568,10 +516,6 @@ ColorScheme			After loading a color scheme. |:colorscheme|
 				set, and <amatch> for the new colorscheme
 				name.
 
-							*ColorSchemePre*
-ColorSchemePre			Before loading a color scheme. |:colorscheme|
-				Useful to setup removing things added by a
-				color scheme, before another one is loaded.
 
 							*CompleteDone*
 CompleteDone			After Insert mode completion is done.  Either
@@ -658,29 +602,6 @@ FileChangedRO			Before making the first change to a read-only
 							*E881*
 				If the number of lines changes saving for undo
 				may fail and the change will be aborted.
-							*DiffUpdated*
-DiffUpdated			After diffs have been updated.  Depending on
-				what kind of diff is being used (internal or
-				external) this can be triggered on every
-				change or when doing |:diffupdate|.
-							*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.
@@ -760,14 +681,13 @@ FilterReadPre			Before reading a file from a filter command.
 				Not triggered when 'shelltemp' is off.
 							*FilterWritePost*
 FilterWritePost			After writing a file for a filter command or
-				making a diff with an external diff (see
-				DiffUpdated for internal diff).
+				making a diff.
 				Vim checks the pattern against the name of
 				the current buffer as with FilterWritePre.
 				Not triggered when 'shelltemp' is off.
 							*FilterWritePre*
 FilterWritePre			Before writing a file for a filter command or
-				making a diff with an external diff.
+				making a diff.
 				Vim checks the pattern against the name of
 				the current buffer, not the name of the
 				temporary file that is the output of the
@@ -819,7 +739,7 @@ InsertCharPre			When a character is typed in Insert mode,
 				inserted literally.
 				It is not allowed to change the text |textlock|.
 				The event is not triggered when 'paste' is
-				set. {only with the +eval feature}
+				set.
 							*InsertEnter*
 InsertEnter			Just before starting Insert mode.  Also for
 				Replace mode and Virtual Replace mode.  The
@@ -837,14 +757,13 @@ MenuPopup			Just before showing the popup menu (under the
 				right mouse button).  Useful for adjusting the
 				menu for what is under the cursor or mouse
 				pointer.
-				The pattern is matched against one or two
-				characters representing the mode:
+				The pattern is matched against a single
+				character representing the mode:
 					n	Normal
 					v	Visual
 					o	Operator-pending
 					i	Insert
 					c	Command line
-					tl	Terminal
 							*OptionSet*
 OptionSet			After setting an option.  The pattern is
 				matched against the long option name.
@@ -868,9 +787,6 @@ OptionSet			After setting an option.  The pattern is
 				plugin. You can always use `:noa` to prevent
 				triggering this autocommand.
 
-				When using |:set| in the autocommand the event
-				is not triggered again.
-
 							*QuickFixCmdPre*
 QuickFixCmdPre			Before a quickfix command is run (|:make|,
 				|:lmake|, |:grep|, |:lgrep|, |:grepadd|,
@@ -901,7 +817,6 @@ QuitPre				When using `:quit`, `:wq` or `:qall`, before
 				or quits Vim.  Can be used to close any
 				non-essential window if the current window is
 				the last ordinary window.
-				Also see |ExitPre|.
 							*RemoteReply*
 RemoteReply			When a reply from a Vim that functions as
 				server was received |server2client()|.  The
@@ -926,12 +841,6 @@ ShellFilterPost			After executing a shell command with
 							*SourcePre*
 SourcePre			Before sourcing a Vim script. |:source|
 				<afile> is the name of the file being sourced.
-							*SourcePost*
-SourcePost			After sourcing a Vim script. |:source|
-				<afile> is the name of the file being sourced.
-				Not triggered when sourcing was interrupted.
-				Also triggered after a SourceCmd autocommand
-				was triggered.
 							*SourceCmd*
 SourceCmd			When sourcing a Vim script. |:source|
 				<afile> is the name of the file being sourced.
@@ -976,7 +885,6 @@ SwapExists			Detected an existing swap file when starting
 				It is not allowed to change to another buffer,
 				change a buffer name or change directory
 				here.
-				{only available with the +eval feature}
 							*Syntax*
 Syntax				When the 'syntax' option has been set.  The
 				pattern is matched against the syntax name.
@@ -1003,11 +911,6 @@ TermChanged			After the value of 'term' has changed.  Useful
 				for re-loading the syntax file to update the
 				colors, fonts and other terminal-dependent
 				settings.  Executed for all loaded buffers.
-							*TerminalOpen*
-TerminalOpen			Just after a terminal buffer was created, with
-				`:terminal` or |term_start()|. This event is
-				triggered even if the buffer is created
-				without a window, with the ++hidden option.
 							*TermResponse*
 TermResponse			After the response to |t_RV| is received from
 				the terminal.  The value of |v:termresponse|
@@ -1018,10 +921,8 @@ TermResponse			After the response to |t_RV| is received from
 				anything else that takes time is involved.
 							*TextChanged*
 TextChanged			After a change was made to the text in the
-				current buffer in Normal mode.  That is after
-				|b:changedtick| has changed (also when that
-				happened before the TextChanged autocommand
-				was defined).
+				current buffer in Normal mode.  That is when
+				|b:changedtick| has changed.
 				Not triggered when there is typeahead or when
 				an operator is pending.
 				Careful: This is triggered very often, don't
@@ -1032,39 +933,10 @@ TextChangedI			After a change was made to the text in the
 				current buffer in Insert mode.
 				Not triggered when the popup menu is visible.
 				Otherwise the same as TextChanged.
-							*TextChangedP*
-TextChangedP			After a change was made to the text in the
-				current buffer in Insert mode, only when the
-				popup menu is visible.  Otherwise the same as
-				TextChanged.
-							*TextYankPost*
-TextYankPost			After text has been yanked or deleted in the
-				current buffer.  The following values of
-				|v:event| can be used to determine the operation
-				that triggered this autocmd:
-				   operator    	The operation performed.
-				   regcontents 	Text that was stored in the
-						register, as a list of lines,
-						like with: >
-						getreg(r, 1, 1)
-<				   regname	Name of the |register| or
-						empty string for the unnamed
-						register.
-				   regtype	Type of the register, see
-						|getregtype()|.
-				Not triggered when |quote_| is used nor when
-				called recursively.
-				It is not allowed to change the buffer text,
-				see |textlock|.
-				{only when compiled with the +eval feature}
 							*User*
 User				Never executed automatically.  To be used for
 				autocommands that are only executed with
 				":doautocmd".
-				Note that when `:doautocmd User MyEvent` is
-				used while there are no matching autocommands,
-				you will get an error.  If you don't want
-				that, define a dummy autocommand yourself.
 							*UserGettingBored*
 UserGettingBored		When the user presses the same key 42 times.
 				Just kidding! :-)
@@ -1109,10 +981,9 @@ WinEnter			After entering another window.  Not done for
 				If the window is for another buffer, Vim
 				executes the BufEnter autocommands after the
 				WinEnter autocommands.
-				Note: For split and tabpage commands the
-				WinEnter event is triggered after the split
-				or tab command but before the file is loaded.
-
+				Note: When using ":split fname" the WinEnter
+				event is triggered after the split but before
+				the file "fname" is loaded.
 							*WinLeave*
 WinLeave			Before leaving a window.  If the window to be
 				entered next is for a different buffer, Vim
@@ -1422,7 +1293,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*
@@ -1613,4 +1484,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:

runtime/doc/change.txt

@@ -1,4 +1,4 @@
-*change.txt*    For Vim version 8.1.  Last change: 2019 Feb 05
+*change.txt*    For Vim version 8.0.  Last change: 2017 Feb 12
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -110,7 +110,7 @@ is an error when 'cpoptions' includes the 'E' flag.
 J			Join [count] lines, with a minimum of two lines.
 			Remove the indent and insert up to two spaces (see
 			below).  Fails when on the last line of the buffer.
-			If [count] is too big it is reduced to the number of
+			If [count] is too big it is reduce to the number of
 			lines available.
 
 							*v_J*
@@ -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
@@ -476,10 +480,6 @@ SHIFTING LINES LEFT OR RIGHT				*shift-left-right*
 							*<*
 <{motion}		Shift {motion} lines one 'shiftwidth' leftwards.
 
-			If the 'vartabstop' feature is enabled, and the
-			'shiftwidth' option is set to zero, the amount of
-			indent is calculated at the first non-blank character
-			in the line.
 							*<<*
 <<			Shift [count] lines one 'shiftwidth' leftwards.
 
@@ -491,10 +491,6 @@ SHIFTING LINES LEFT OR RIGHT				*shift-left-right*
 							*>*
  >{motion}		Shift {motion} lines one 'shiftwidth' rightwards.
 
-			If the 'vartabstop' feature is enabled, and the
-			'shiftwidth' option is set to zero, the amount of
-			indent is calculated at the first non-blank character
-			in the line.
 							*>>*
  >>			Shift [count] lines one 'shiftwidth' rightwards.
 
@@ -537,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
@@ -640,11 +635,11 @@ 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.
-							*E939*
 			[count] must be a positive number.  Also see
 			|cmdline-ranges|.
 
@@ -716,7 +711,6 @@ The flags that you can use for the substitute commands:
 	search pattern.
 	{not in Vi: highlighting of the match, other responses than 'y' or 'n'}
 
-							*:s_e*
 [e]     When the search pattern fails, do not issue an error message and, in
 	particular, continue in maps as if no error occurred.  This is most
 	useful to prevent the "No match" error from breaking a mapping.  Vim
@@ -728,7 +722,6 @@ The flags that you can use for the substitute commands:
 		Interrupted
 	{not in Vi}
 
-							*:s_g*
 [g]	Replace all occurrences in the line.  Without this argument,
 	replacement occurs only for the first occurrence in each line.  If
 	the 'edcompatible' option is on, Vim remembers this flag and toggles
@@ -736,30 +729,26 @@ The flags that you can use for the substitute commands:
 	pattern.  If the 'gdefault' option is on, this flag is on by default
 	and the [g] argument switches it off.
 
-							*:s_i*
 [i]	Ignore case for the pattern.  The 'ignorecase' and 'smartcase' options
 	are not used.
 	{not in Vi}
 
-							*:s_I*
 [I]	Don't ignore case for the pattern.  The 'ignorecase' and 'smartcase'
 	options are not used.
 	{not in Vi}
 
-							*:s_n*
 [n]	Report the number of matches, do not actually substitute.  The [c]
 	flag is ignored.  The matches are reported as if 'report' is zero.
 	Useful to |count-items|.
 	If \= |sub-replace-expression| is used, the expression will be
 	evaluated in the |sandbox| at every match.
 
-[p]	Print the line containing the last substitute.  *:s_p*
+[p]	Print the line containing the last substitute.
 
-[#]	Like [p] and prepend the line number.  *:s_#*
+[#]	Like [p] and prepend the line number.
 
-[l]	Like [p] but print the text like |:list|.  *:s_l*
+[l]	Like [p] but print the text like |:list|.
 
-							*:s_r*
 [r]	Only useful in combination with `:&` or `:s` without arguments.  `:&r`
 	works the same way as `:~`:  When the search pattern is empty, use the
 	previously used search pattern instead of the search pattern from the
@@ -858,7 +847,7 @@ the |substitute()| function with the following exceptions:
   - magic is always set without regard to 'magic'.
   - A ~ inserts a tilde literally.
   - <CR> and \r inserts a carriage-return (CTRL-M).
-  - \<CR> does not have a special meaning. It's just one of \x.
+  - \<CR> does not have a special meaning. it's just one of \x.
 
 Examples: >
   :s/a\|b/xxx\0xxx/g		 modifies "a b"	     to "xxxaxxx xxxbxxx"
@@ -944,9 +933,9 @@ When the result is a |List| then the items are joined with separating line
 breaks.  Thus each item becomes a line, except that they can contain line
 breaks themselves.
 
-The |submatch()| function can be used to obtain matched text.  The whole
-matched text can be accessed with "submatch(0)".  The text matched with the
-first pair of () with "submatch(1)".  Likewise for further sub-matches in ().
+The whole matched text can be accessed with "submatch(0)".  The text matched
+with the first pair of () with "submatch(1)".  Likewise for further
+sub-matches in ().
 
 Be careful: The separation character must not appear in the expression!
 Consider using a character like "@" or ":".  There is no problem if the result
@@ -997,11 +986,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*
@@ -1460,55 +1444,6 @@ to the name of an external program for Vim to use for text formatting.  The
 'textwidth' and other options have no effect on formatting by an external
 program.
 
-                                                        *format-formatexpr*
-The 'formatexpr' option can be set to a Vim script function that performs
-reformatting of the buffer.  This should usually happen in an |ftplugin|,
-since formatting is highly dependent on the type of file.  It makes
-sense to use an |autoload| script, so the corresponding script is only loaded
-when actually needed and the script should be called <filetype>format.vim.
-
-For example, the XML filetype plugin distributed with Vim in the $VIMRUNTIME
-directory, sets the 'formatexpr' option to: >
-
-   setlocal formatexpr=xmlformat#Format()
-
-That means, you will find the corresponding script, defining the
-xmlformat#Format() function, in the directory:
-`$VIMRUNTIME/autoload/xmlformat.vim`
-
-Here is an example script that removes trailing whitespace from the selected
-text.  Put it in your autoload directory, e.g. ~/.vim/autoload/format.vim: >
-
-  func! format#Format()
-    " only reformat on explicit gq command
-    if mode() != 'n'
-      " fall back to Vims internal reformatting
-      return 1
-    endif
-    let lines = getline(v:lnum, v:lnum + v:count - 1)
-    call map(lines, {key, val -> substitute(val, '\s\+$', '', 'g')})
-    call setline('.', lines)
-
-    " do not run internal formatter!
-    return 0
-  endfunc
-
-You can then enable the formatting by executing: >
-  setlocal formatexpr=format#Format()
-
-Note: this function explicitly returns non-zero when called from insert mode
-(which basically means, text is inserted beyond the 'textwidth' limit).  This
-causes Vim to fall back to reformat the text by using the internal formatter.
-
-However, if the |gq| command is used to reformat the text, the function
-will receive the selected lines, trim trailing whitespace from those lines and
-put them back in place.  If you are going to split single lines into multiple
-lines, be careful not to overwrite anything.
-
-If you want to allow reformatting of text from insert or replace mode, one has
-to be very careful, because the function might be called recursively.  For
-debugging it helps to set the 'debug' option.
-
 							*right-justify*
 There is no command in Vim to right justify text.  You can do it with
 an external command, like "par" (e.g.: "!}par" to format until the end of the
@@ -1720,17 +1655,6 @@ j	Where it makes sense, remove a comment leader when joining lines.  For
 		         // in the list ~
 	Becomes:
 		int i;   // the index in the list ~
-p	Don't break lines at single spaces that follow periods.  This is
-	intended to complement 'joinspaces' and |cpo-J|, for prose with
-	sentences separated by two spaces.  For example, with 'textwidth' set
-	to 28: >
-		Surely you're joking, Mr. Feynman!
-<	Becomes: >
-		Surely you're joking,
-		Mr. Feynman!
-<	Instead of: >
-		Surely you're joking, Mr.
-		Feynman!
 
 
 With 't' and 'c' you can specify when Vim performs auto-wrapping:
@@ -1905,4 +1829,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:

runtime/doc/channel.txt

@@ -1,4 +1,4 @@
-*channel.txt*      For Vim version 8.1.  Last change: 2018 Apr 18
+*channel.txt*      For Vim version 8.0.  Last change: 2017 Aug 11
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -22,7 +22,6 @@ The Netbeans interface also uses a channel. |netbeans|
 9. Starting a job without a channel	|job-start-nochannel|
 10. Job options				|job-options|
 11. Controlling a job			|job-control|
-12. Using a prompt buffer		|prompt-buffer|
 
 {Vi does not have any of these features}
 {only when compiled with the |+channel| feature for channel stuff}
@@ -56,7 +55,7 @@ JS	JavaScript style JSON-like encoding |js_encode()|
 Common combination are:
 - Using a job connected through pipes in NL mode.  E.g., to run a style
   checker and receive errors and warnings.
-- Using a daemon, connecting over a socket in JSON mode.  E.g. to lookup
+- Using a deamon, connecting over a socket in JSON mode.  E.g. to lookup
   cross-references in a database.
 
 ==============================================================================
@@ -163,9 +162,6 @@ Use |ch_status()| to see if the channel could be opened.
 				The "close_cb" is also considered for this.
 		    "never"	All messages will be kept.
 
-							*channel-noblock*
-"noblock"	Same effect as |job-noblock|.  Only matters for writing.
-
 							*waittime*
 "waittime"	The time to wait for the connection to be made in
 		milliseconds.  A negative number waits forever.
@@ -597,17 +593,6 @@ See |job_setoptions()| and |ch_setoptions()|.
 			Note: when writing to a file or buffer and when
 			reading from a buffer NL mode is used by default.
 
-						*job-noblock*
-"noblock": 1		When writing use a non-blocking write call.  This
-			avoids getting stuck if Vim should handle other
-			messages in between, e.g. when a job sends back data
-			to Vim.  It implies that when `ch_sendraw()` returns
-			not all data may have been written yet.
-			This option was added in patch 8.1.0350, test with: >
-				if has("patch-8.1.350")
-				  let options['noblock'] = 1
-				endif
-<
 						*job-callback*
 "callback": handler	Callback for something to read on any part of the
 			channel.
@@ -785,49 +770,5 @@ signals.  E.g. to force a job to stop, "kill it": >
 
 For more options see |job_stop()|.
 
-==============================================================================
-12. Using a prompt buffer				*prompt-buffer*
 
-If you want to type input for the job in a Vim window you have a few options:
-- Use a normal buffer and handle all possible commands yourself.
-  This will be complicated, since there are so many possible commands.
-- Use a terminal window.  This works well if what you type goes directly to
-  the job and the job output is directly displayed in the window.
-  See |terminal-window|.
-- Use a prompt window. This works well when entering a line for the job in Vim
-  while displaying (possibly filtered) output from the job.
-
-A prompt buffer is created by setting 'buftype' to "prompt". You would
-normally only do that in a newly created buffer.
-
-The user can edit and enter one line of text at the very last line of the
-buffer.  When pressing Enter in the prompt line the callback set with
-|prompt_setcallback()| is invoked.  It would normally send the line to a job.
-Another callback would receive the output from the job and display it in the
-buffer, below the prompt (and above the next prompt).
-
-Only the text in the last line, after the prompt, is editable. The rest of the
-buffer is not modifiable with Normal mode commands.  It can be modified by
-calling functions, such as |append()|.  Using other commands may mess up the
-buffer.
-
-After setting 'buftype' to "prompt" Vim does not automatically start Insert
-mode, use `:startinsert` if you want to enter Insert mode, so that the user
-can start typing a line.
-
-The text of the prompt can be set with the |prompt_setprompt()| function.
-
-The user can go to Normal mode and navigate through the buffer.  This can be
-useful see older output or copy text.
-
-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:

runtime/doc/cmdline.txt

@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 8.1.  Last change: 2018 May 14
+*cmdline.txt*   For Vim version 8.0.  Last change: 2017 Sep 17
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -175,14 +175,12 @@ CTRL-R CTRL-F				*c_CTRL-R_CTRL-F* *c_<C-R>_<C-F>*
 CTRL-R CTRL-P				*c_CTRL-R_CTRL-P* *c_<C-R>_<C-P>*
 CTRL-R CTRL-W				*c_CTRL-R_CTRL-W* *c_<C-R>_<C-W>*
 CTRL-R CTRL-A				*c_CTRL-R_CTRL-A* *c_<C-R>_<C-A>*
-CTRL-R CTRL-L				*c_CTRL-R_CTRL-L* *c_<C-R>_<C-L>*
 		Insert the object under the cursor:
 			CTRL-F	the Filename under the cursor
 			CTRL-P	the Filename under the cursor, expanded with
 				'path' as in |gf|
 			CTRL-W	the Word under the cursor
 			CTRL-A	the WORD under the cursor; see |WORD|
-			CTRL-L	the line under the cursor
 
 		When 'incsearch' is set the cursor position at the end of the
 		currently displayed match is used.  With CTRL-W the part of
@@ -194,8 +192,8 @@ CTRL-R CTRL-L				*c_CTRL-R_CTRL-L* *c_<C-R>_<C-L>*
 
 					*c_CTRL-R_CTRL-R* *c_<C-R>_<C-R>*
 					*c_CTRL-R_CTRL-O* *c_<C-R>_<C-O>*
-CTRL-R CTRL-R {0-9a-z"%#:-=. CTRL-F CTRL-P CTRL-W CTRL-A CTRL-L}
-CTRL-R CTRL-O {0-9a-z"%#:-=. CTRL-F CTRL-P CTRL-W CTRL-A CTRL-L}
+CTRL-R CTRL-R {0-9a-z"%#:-=. CTRL-F CTRL-P CTRL-W CTRL-A}
+CTRL-R CTRL-O {0-9a-z"%#:-=. CTRL-F CTRL-P CTRL-W CTRL-A}
 		Insert register or object under the cursor.  Works like
 		|c_CTRL-R| but inserts the text literally.  For example, if
 		register a contains "xy^Hz" (where ^H is a backspace),
@@ -412,17 +410,14 @@ CTRL-D		List names that match the pattern in front of the cursor.
 		match is inserted.  After the last match, the first is used
 		again (wrap around).
 		The behavior can be changed with the 'wildmode' option.
-							*c_<S-Tab>*
-<S-Tab>		Like 'wildchar' or <Tab>, but begin with the last match and
-		then go to the previous match.
-		<S-Tab> does not work everywhere.
 							*c_CTRL-N*
 CTRL-N		After using 'wildchar' which got multiple matches, go to next
 		match.  Otherwise recall more recent command-line from history.
-							*c_CTRL-P*
+<S-Tab>							*c_CTRL-P* *c_<S-Tab>*
 CTRL-P		After using 'wildchar' which got multiple matches, go to
 		previous match.  Otherwise recall older command-line from
-		history.
+		history.  <S-Tab> only works with the GUI, on the Amiga and
+		with MS-DOS.
 							*c_CTRL-A*
 CTRL-A		All names that match the pattern in front of the cursor are
 		inserted.
@@ -458,10 +453,6 @@ a previous version <Esc> was used).  In the pattern standard wildcards '*' and
 '?' are accepted when matching file names.  '*' matches any string, '?'
 matches exactly one character.
 
-When repeating 'wildchar' or CTRL-N you cycle through the matches, eventually
-ending up back to what was typed.  If the first match is not what you wanted,
-you can use <S-Tab> or CTRL-P to go straight back to what you typed.
-
 The 'wildignorecase' option can be set to ignore case in filenames.
 
 The 'wildmenu' option can be set to show the matches just above the command
@@ -534,45 +525,8 @@ after a command causes the rest of the line to be ignored.  This can be used
 to add comments.  Example: >
 	:set ai		"set 'autoindent' option
 It is not possible to add a comment to a shell command ":!cmd" or to the
-":map" command and a few others (mainly commands that expect expressions)
-that see the '"' as part of their argument:
-
-    :argdo
-    :autocmd
-    :bufdo
-    :cexpr (and the like)
-    :cdo (and the like)
-    :command
-    :cscope (and the like)
-    :debug
-    :display
-    :echo (and the like)
-    :elseif
-    :execute
-    :folddoopen
-    :folddoclosed
-    :for
-    :grep (and the like)
-    :help (and the like)
-    :if
-    :let
-    :make
-    :map (and the like including :abbrev commands)
-    :menu (and the like)
-    :mkspell
-    :normal
-    :ownsyntax
-    :popup
-    :promptfind (and the like)
-    :registers
-    :return
-    :sort
-    :syntax
-    :tabdo
-    :tearoff
-    :vimgrep (and the like)
-    :while
-    :windo
+":map" command and a few others, because they see the '"' as part of their
+argument.  This is mentioned where the command is explained.
 
 							*:bar* *:\bar*
 '|' can be used to separate commands, so you can give multiple commands in one
@@ -869,12 +823,11 @@ it, no matter how many backslashes.
 	   \\#			\#
 Also see |`=|.
 
-			       *:<cword>* *<cword>* *:<cWORD>* *<cWORD>*
-			       *:<cexpr>* *<cexpr>* *:<cfile>* *<cfile>*
-			       *:<afile>* *<afile>* *:<abuf>* *<abuf>*
-			       *:<amatch>* *<amatch>*
-			       *:<sfile>* *<sfile>* *:<slnum>* *<slnum>*
-			       *:<sflnum>* *<sflnum>* *E499* *E500*
+			       *:<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|)
@@ -886,17 +839,15 @@ Note: these are typed literally, they are not special keys!
 	<cfile>    is replaced with the path name under the cursor (like what
 		   |gf| uses)
 	<afile>    When executing autocommands, is replaced with the file name
-		   of the buffer being manipulated, or the file for a read or
-		   write.  *E495*
+		   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
-		   buffer).  *E496*
+		   buffer).
 	<amatch>   When executing autocommands, is replaced with the match for
-		   which this autocommand was executed.  *E497*
-		   It differs from <afile> only when the file name isn't used
-		   to match with (for FileType, Syntax and SpellFileMissing
-		   events).
+		   which this autocommand was executed.  It differs from
+		   <afile> only when the file name isn't used to match with
+		   (for FileType, Syntax and SpellFileMissing events).
 	<sfile>    When executing a ":source" command, is replaced with the
 		   file name of the sourced file.  *E498*
 		   When executing a function, is replaced with:
@@ -906,12 +857,9 @@ Note: these are typed literally, they are not special keys!
 		   Note that filename-modifiers are useless when <sfile> is
 		   used inside a function.
 	<slnum>	   When executing a ":source" command, is replaced with the
-		   line number.  *E842*
+	           line number.  *E842*
 		   When executing a function it's the line number relative to
 		   the start of the function.
-	<sflnum>   When executing a script, is replaced with the line number.
-		   It differs from <slnum> in that <sflnum> is replaced with
-		   the script line number in any situation.  *E961*
 
 							 *filename-modifiers*
 *:_%:* *::8* *::p* *::.* *::~* *::h* *::t* *::r* *::e* *::s* *::gs* *::S*
@@ -936,8 +884,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.
@@ -1206,4 +1153,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:

runtime/doc/debug.txt

@@ -1,4 +1,4 @@
-*debug.txt*     For Vim version 8.1.  Last change: 2017 Jul 15
+*debug.txt*     For Vim version 8.0.  Last change: 2017 Jul 15
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -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:

runtime/doc/debugger.txt

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

runtime/doc/develop.txt

@@ -1,4 +1,4 @@
-*develop.txt*   For Vim version 8.1.  Last change: 2019 Feb 17
+*develop.txt*   For Vim version 8.0.  Last change: 2017 Jul 31
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -18,8 +18,7 @@ See the file README.txt in the "src" directory for an overview of the source
 code.
 
 Vim is open source software.  Everybody is encouraged to contribute to help
-improving Vim.  For sending patches a unified diff "diff -u" is preferred.
-You can create a pull request on github, but it's not required.
+improving Vim.  For sending patches a context diff "diff -c" is preferred.
 Also see http://vim.wikia.com/wiki/How_to_make_and_submit_a_patch.
 
 ==============================================================================
@@ -183,43 +182,12 @@ The basic steps to make changes to the code:
    include the diff. Or create a pull request on github.
 
 
-C COMPILER				*style-compiler* *ANSI-C* *C89* *C99*
+C COMPILER						*style-compiler*
 
 The minimal C compiler version supported is C89, also known as ANSI C.
-Later standards, such as C99, are not widely supported, or at least not 100%
-supported.  Therefore we use only some of the C99 features and disallow some
-(at least for now).
+Later standards don't add much and C89 is the widest supported.
 
-Please don't make changes everywhere to use the C99 features, it causes merge
-problems for existing patches.  Only use them for new and changed code.
-
-Comments ~
-
-Traditionally Vim uses /* comments */.  We intend to keep it that way,
-especially for file and function headers.  For new code or lines of code that
-change, it is allowed to use // comments.  Especially when it comes after
-code:
-	int some_var;  // single line comment useful here
-
-Enums ~
-
-The last item in an enum may have a trailing comma.  C89 didn't allow this.
-
-Types ~
-
-"long long" is allowed and can be expected to be 64 bits.  Use %lld in printf
-formats.  Also "long long unsigned" with %llu.
-
-Not to be used ~
-
-These C99 features are not to be used, because not enough compilers support
-them:
-- Declaration after Statements (MSVC 2012 does not support it).  All
-  declarations need to be at the start of the block.
-- Variable length arrays (even in C11 this is an optional feature).
-- _Bool and _Complex types.
-- "inline" (it's hardly ever needed, let the optimizer do its work)
-- flexible array members: Not supported by HP-UX C compiler (John Marriott)
+One restriction that this implies: no // comments, only /* comments */.
 
 
 USE OF COMMON FUNCTIONS					*style-functions*
@@ -355,24 +323,6 @@ OK:	    if (cond)
                cmd;
 	    }
 
-When a block has one line the braces can be left out.  When an if/else has
-braces on one block, it usually looks better when the other block also has
-braces:
-OK:	    if (cond)
-	       cmd;
-	    else
-               cmd;
-
-OK:	    if (cond)
-	    {
-	       cmd;
-	    }
-	    else
-	    {
-               cmd;
-               cmd;
-	    }
-
 Use ANSI (new style) function declarations with the return type on a separate
 indented line.
 
@@ -385,10 +335,10 @@ OK:	/*
 	 */
 	    int
 	function_name(
-	    int		arg1,		// short comment about arg1
-	    int		arg2)		// short comment about arg2
+	    int		arg1,		/* short comment about arg1 */
+	    int		arg2)		/* short comment about arg2 */
 	{
-	    int		local;		// comment about local
+	    int		local;		/* comment about local */
 
 	    local = arg1 * arg2;
 
@@ -581,4 +531,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:

runtime/doc/diff.txt

@@ -1,4 +1,4 @@
-*diff.txt*      For Vim version 8.1.  Last change: 2017 Oct 03
+*diff.txt*      For Vim version 8.0.  Last change: 2017 Sep 02
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -10,7 +10,7 @@ eight versions of the same file.
 
 The basics are explained in section |08.7| of the user manual.
 
-1. Starting diff mode		|start-vimdiff|
+1. Starting diff mode		|vimdiff|
 2. Viewing diffs		|view-diffs|
 3. Jumping to diffs		|jumpto-diffs|
 4. Copying diffs		|copy-diffs|
@@ -19,7 +19,7 @@ The basics are explained in section |08.7| of the user manual.
 {not in Vi}
 
 ==============================================================================
-1. Starting diff mode					*start-vimdiff*
+1. Starting diff mode
 
 The easiest way to start editing in diff mode is with the "vimdiff" command.
 This starts Vim as usual, and additionally sets up for viewing the differences
@@ -39,9 +39,7 @@ The second and following arguments may also be a directory name.  Vim will
 then append the file name of the first argument to the directory name to find
 the file.
 
-By default an internal diff library will be used.  When 'diffopt' or
-'diffexpr' has been set an external "diff" command will be used.  This only
-works when such a diff program is available.
+This only works when a standard "diff" command is available.  See 'diffexpr'.
 
 Diffs are local to the current tab page |tab-page|.  You can't see diffs with
 a window in another tab page.  This does make it possible to have several
@@ -328,7 +326,7 @@ g:diff_translations to zero: >
 
     let g:diff_translations = 0
 <
-After setting this variable, reload the syntax script: >
+After setting this variable, Reload the syntax script: >
 
     set syntax=diff
 <
@@ -346,9 +344,8 @@ between file1 and file2: >
 
 The ">" is replaced with the value of 'shellredir'.
 
-The output of "diff" must be a normal "ed" style diff or a unified diff.  Do
-NOT use a context diff.  This example explains the format that Vim expects for
-the "ed" style diff: >
+The output of "diff" must be a normal "ed" style diff.  Do NOT use a context
+diff.  This example explains the format that Vim expects: >
 
 	1a2
 	> bbb
@@ -387,16 +384,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:
@@ -448,4 +441,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:

runtime/doc/digraph.txt

@@ -1,4 +1,4 @@
-*digraph.txt*   For Vim version 8.1.  Last change: 2019 Feb 17
+*digraph.txt*   For Vim version 8.0.  Last change: 2016 Nov 04
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -24,9 +24,7 @@ An alternative is using the 'keymap' option.
 1. Defining digraphs					*digraphs-define*
 
 						*:dig* *:digraphs*
-:dig[raphs][!]		Show currently defined digraphs.
-			With [!] headers are used to make it a bit easier to
-			find a specific character.
+:dig[raphs]		show currently defined digraphs.
 							*E104* *E39*
 :dig[raphs] {char1}{char2} {number} ...
 			Add digraph {char1}{char2} to the list.  {number} is
@@ -59,9 +57,18 @@ conversion to be available, it might fail.  For the NUL character you will see
 "10".  That's because NUL characters are internally represented with a NL
 character.  When you write the file it will become a NUL character.
 
-Example: >
-	digraph oe 339
-This defines the "oe" digraph for a character that is number 339 in Unicode.
+When Vim was compiled without the |+multi_byte| feature, you need to specify
+the character in the encoding given with 'encoding'.  You might want to use
+something like this: >
+
+	if has("multi_byte")
+		digraph oe 339
+	elseif &encoding == "iso-8859-15"
+		digraph oe 189
+	endif
+
+This defines the "oe" digraph for a character that is number 339 in Unicode
+and 189 in latin9 (iso-8859-15).
 
 ==============================================================================
 2. Using digraphs					*digraphs-use*
@@ -104,14 +111,11 @@ this, you will have to type <BS> e again.  To avoid this don't set the
 
 You may have problems using Vim with characters which have a value above 128.
 For example: You insert ue (u-umlaut) and the editor echoes \334 in Insert
-mode.  After leaving the Insert mode everything is fine.  On some Unix systems
-this means you have to define the environment-variable LC_CTYPE.  If you are
-using csh, then put the following line in your .cshrc: >
-	setenv LC_CTYPE en_US.utf8
-(or similar for a different language or country). The value must be a valid
-locale on your system, i.e. on Unix-like systems it must be present in the
-output of >
-	locale -a
+mode.  After leaving the Insert mode everything is fine.  Note that fmt
+removes all characters with a value above 128 from the text being formatted.
+On some Unix systems this means you have to define the environment-variable
+LC_CTYPE.  If you are using csh, then put the following line in your .cshrc: >
+	setenv LC_CTYPE iso_8859_1
 
 ==============================================================================
 3. Default digraphs					*digraphs-default*
@@ -155,7 +159,8 @@ a standard meaning:
 Example: a: is ä  and o: is ö
 
 These are the RFC1345 digraphs for the one-byte characters.  See the output of
-":digraphs" for the others.
+":digraphs" for the others.  The characters above 255 are only available when
+Vim was compiled with the |+multi_byte| feature.
 
 EURO
 
@@ -1483,4 +1488,4 @@ char  digraph	hex	dec	official name ~
 ſt	ft	FB05	64261	LATIN SMALL LIGATURE LONG S T
 st	st	FB06	64262	LATIN SMALL LIGATURE ST
 
- vim:tw=78:ts=8:noet:ft=help:norl:
+ vim:tw=78:ts=8:ft=help:norl:

runtime/doc/editing.txt

@@ -1,4 +1,4 @@
-*editing.txt*   For Vim version 8.1.  Last change: 2018 Dec 16
+*editing.txt*   For Vim version 8.0.  Last change: 2017 Aug 21
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -424,15 +424,6 @@ On Unix and a few other systems you can also use backticks for the file name
 argument, for example: >
 	:next `find . -name ver\\*.c -print`
 	:view `ls -t *.patch  \| head -n1`
-Vim will run the command in backticks using the 'shell' and use the standard
-output as argument for the given Vim command (error messages from the shell
-command will be discarded).
-To see what shell command Vim is running, set the 'verbose' option to 4. When
-the shell command returns a non-zero exit code, an error message will be
-displayed and the Vim command will be aborted. To avoid this make the shell
-always return zero like so: >
-       :next `find . -name ver\\*.c -print \|\| true`
-
 The backslashes before the star are required to prevent the shell from
 expanding "ver*.c" prior to execution of the find program.  The backslash
 before the shell pipe symbol "|" prevents Vim from parsing it as command
@@ -659,7 +650,8 @@ list of the current window.
 			There is no check for duplicates, it is possible to
 			add a file to the argument list twice.
 			The currently edited file is not changed.
-			{not in Vi}
+			{not in Vi} {not available when compiled without the
+			|+listcmds| feature}
 			Note: you can also use this method: >
 				:args ## x
 <			This will add the "x" item and sort the new list.
@@ -673,7 +665,8 @@ list of the current window.
 			when it's deleted from the argument list.
 			Example: >
 				:argdel *.obj
-<			{not in Vi}
+<			{not in Vi} {not available when compiled without the
+			|+listcmds| feature}
 
 :[range]argd[elete]	Delete the {range} files from the argument list.
 			Example: >
@@ -688,7 +681,8 @@ list of the current window.
 <			Removes all the files from the arglist.
 			When the last number in the range is too high, up to
 			the last argument is deleted.
-			{not in Vi}
+			{not in Vi} {not available when compiled without the
+			|+listcmds| feature}
 
 							*:argu* *:argument*
 :[count]argu[ment] [count] [++opt] [+cmd]
@@ -697,14 +691,16 @@ list of the current window.
 			when changes have been made and Vim does not want to
 			|abandon| the current buffer.
 			Also see |++opt| and |+cmd|.
-			{not in Vi}
+			{not in Vi} {not available when compiled without the
+			|+listcmds| feature}
 
 :[count]argu[ment]! [count] [++opt] [+cmd]
 			Edit file [count] in the argument list, discard any
 			changes to the current buffer.  When [count] is
 			omitted the current entry is used.
 			Also see |++opt| and |+cmd|.
-			{not in Vi}
+			{not in Vi} {not available when compiled without the
+			|+listcmds| feature}
 
 :[count]n[ext] [++opt] [+cmd]			*:n* *:ne* *:next* *E165* *E163*
 			Edit [count] next file.  This fails when changes have
@@ -827,6 +823,7 @@ fourth file in the argument list.  This happens when you do ":e file".
 LOCAL ARGUMENT LIST
 
 {not in Vi}
+{not available when compiled without the |+windows| or |+listcmds| features}
 
 							*:arglocal*
 :argl[ocal]		Make a local copy of the global argument list.
@@ -878,7 +875,8 @@ USING THE ARGUMENT LIST
 			autocommand event is disabled by adding it to
 			'eventignore'.  This considerably speeds up editing
 			each file.
-			{not in Vi}
+			{not in Vi} {not available when compiled without the
+			|+listcmds| feature}
 			Also see |:windo|, |:tabdo|, |:bufdo|, |:cdo|, |:ldo|,
 			|:cfdo| and |:lfdo|
 
@@ -901,8 +899,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 +956,6 @@ used, for example, when the write fails and you want to try again later with
 ":w #".  This can be switched off by removing the 'A' flag from the
 'cpoptions' option.
 
-Note that the 'fsync' option matters here.  If it's set it may make writes
-slower (but safer).
-
 							*:sav* *:saveas*
 :sav[eas][!] [++opt] {file}
 			Save the current buffer under the name {file} and set
@@ -1204,8 +1199,7 @@ MULTIPLE WINDOWS AND BUFFERS				*window-exit*
 :wqa[ll]! [++opt]
 :xa[ll]!	Write all changed buffers, even the ones that are readonly,
 		and exit Vim.  If there are buffers without a file name or
-		which cannot be written for another reason, or there is a
-		terminal with a running job, Vim will not quit.
+		which cannot be written for another reason, Vim will not quit.
 		{not in Vi}
 
 ==============================================================================
@@ -1415,7 +1409,7 @@ cannot be read without the right key.
 The text in the swap file and the undo file is also encrypted.  *E843*
 However, this is done block-by-block and may reduce the time needed to crack a
 password.  You can disable the swap file, but then a crash will cause you to
-lose your work.  The undo file can be disabled without too much disadvantage. >
+lose your work.  The undo file can be disabled without much disadvantage. >
 	:set noundofile
 	:noswapfile edit secrets
 
@@ -1747,4 +1741,4 @@ There are three different types of searching:
    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:

runtime/doc/evim-ja.UTF-8.1

@@ -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 著者

runtime/doc/evim.man

@@ -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)

runtime/doc/farsi.txt

@@ -1,4 +1,4 @@
-*farsi.txt*     For Vim version 8.1.  Last change: 2019 Feb 16
+*farsi.txt*     For Vim version 8.0.  Last change: 2015 Aug 29
 
 
 		  VIM REFERENCE MANUAL    by Mortaza Ghassab Shiran
@@ -9,12 +9,261 @@ Right to Left and Farsi Mapping for Vim		*farsi* *Farsi*
 {Vi does not have any of these commands}
 
 						*E27*
-Farsi support has been removed in patch 8.1.0932.  At that time it was
-outdated and unused.
+In order to use right-to-left and Farsi mapping support, it is necessary to
+compile Vim with the |+farsi| feature.
 
-If you would like to bring Farsi support back, please have a look at the old
-Farsi code, as it was present at the 8.1 release.  It should be merged with
-Arabic support using the Unicode character set.
+These functions have been made by Mortaza G. Shiran <shiran@jps.net>
 
 
- vim:tw=78:ts=8:noet:ft=help:norl:
+Introduction
+------------
+In right-to-left oriented files the characters appear on the screen from right
+to left.  This kind of file is most useful when writing Farsi documents,
+composing faxes or writing Farsi memos.
+
+The commands, prompts and help files are not in Farsi, therefore the user
+interface remains the standard Vi interface.
+
+
+Highlights
+----------
+o  Editing left-to-right files as in the original Vim, no change.
+
+o  Viewing and editing files in right-to-left windows.   File orientation is
+   per window, so it is possible to view the same file in right-to-left and
+   left-to-right modes, simultaneously.
+
+o  Compatibility to the original Vim.   Almost all features work in
+   right-to-left mode (see bugs below).
+
+o  Changing keyboard mapping and reverse insert modes using a single
+   command.
+
+o  Backing from reverse insert mode to the correct place in the file
+   (if possible).
+
+o  While in Farsi mode, numbers are entered from left to right.  Upon entering
+   a none number character, that character will be inserted just into the
+   left of the last number.
+
+o  No special terminal with right-to-left capabilities is required.  The
+   right-to-left changes are completely hardware independent.  Only
+   Farsi font is necessary.
+
+o  Farsi keymapping on the command line in reverse insert mode.
+
+o  Toggling between left-to-right and right-to-left via F8 function key.
+
+o  Toggling between Farsi ISIR-3342 standard encoding and Vim Farsi via F9
+   function key.  Since this makes sense only for the text written in
+   right-to-left mode, this function is also supported only in right-to-left
+   mode.
+
+Farsi Fonts					*farsi-fonts*
+-----------
+
+The following files are found in the subdirectories of the '$VIM/farsi/fonts'
+directory:
+
+   +  far-a01.pcf    X Windows fonts for Unix including Linux systems
+   +  far-a01.bf     X Windows fonts for SunOS
+   +  far-a01.f16    a screen fonts for Unix including Linux systems
+   +  far-a01.fon    a monospaced fonts for Windows NT/95/98
+   +  far-a01.com    a screen fonts for DOS
+
+
+Font Installation
+-----------------
+
+o  Installation of fonts for MS Window systems (NT/95/98)
+
+   From 'Control Panel' folder, start the 'Fonts' program.  Then from 'file'
+   menu item select 'Install New Fonts ...'.  Browse and select the
+   'far-a01.fon', then follow the installation guide.
+   NOTE: several people have reported that this does not work.  The solution
+   is unknown.
+
+o  Installation of fonts for X Window systems (Unix/Linux)
+
+   Depending on your system, copy far-a01.pcf.Z or far-a01.pcf.gz into a
+   directory of your choice.  Change to the directory containing the Farsi
+   fonts and execute the following commands:
+
+   >  mkfontdir
+   >  xset +fp path_name_of_farsi_fonts_directory
+
+o  Installation of fonts for X Window systems (SunOS)
+
+   Copy far-a01.bf font into a directory of your choice.
+   Change to the directory containing the far-a01.fb fonts and
+   execute the following commands:
+
+   >  fldfamily
+   >  xset +fp path_name_of_fonts_directory
+
+o  Installation of ASCII screen fonts (Unix/Linux)
+
+   For Linux system, copy the far-a01.f16 fonts into /usr/lib/kbd/consolefonts
+   directory and execute the setfont program as "setfont far-a01.f16".  For
+   other systems (e.g. SCO Unix), please refer to the fonts installation
+   section of your system administration manuals.
+
+o  Installation of ASCII screen fonts (DOS)
+
+   After system power on, prior to the first use of Vim, upload the Farsi
+   fonts by executing the far-a01.com font uploading program.
+
+
+Usage
+-----
+Prior to starting Vim, the environment in which Vim can run in Farsi mode,
+must be set.  In addition to installation of Farsi fonts, following points
+refer to some of the system environments, which you may need to set:
+Key code mapping, loading graphic card in ASCII screen mode, setting the IO
+driver in 8 bit clean mode ... .
+
+o  Setting the Farsi fonts
+
+   +  For Vim GUI set the 'guifont' to far-a01.  This is done by entering
+      ':set guifont=far-a01' in the Vim window.
+
+      You can have 'guifont' set to far-a01 by Vim during the Vim startup
+      by appending the ':set guifont=far-a01' into your .vimrc file
+      (in case of NT/95/98 platforms _vimrc).
+
+      Under the X Window environment, you can also start Vim with the
+      '-fn far-a01' option.
+
+   +  For Vim within a xterm, start a xterm with the Farsi fonts (e.g.
+      kterm -fn far-a01).  Then start Vim inside the kterm.
+
+   +  For Vim under DOS, prior to the first usage of Vim, upload the Farsi
+      fonts by executing the far-a01.com fonts uploading program.
+
+o  Farsi Keymapping Activation
+
+   To activate the Farsi keymapping, set either 'altkeymap' or 'fkmap'.
+   This is done by entering ':set akm' or ':set fk' in the Vim window.
+   You can have 'altkeymap' or 'fkmap' set as default by appending ':set akm'
+   or ':set fk' in your .vimrc file or _vimrc in case of NT/95/98 platforms.
+
+   To turn off the Farsi keymapping as a default second language keymapping,
+   reset the 'altkeymap' by entering ':set noakm'.
+
+o  right-to-left Farsi Mode
+
+   By default Vim starts in Left-to-right mode.  Following are ways to change
+   the window orientation:
+
+   + Start Vim with the -F option (e.g. vim -F ...).
+
+   + Use the F8 function key to toggle between left-to-right and right-to-left.
+
+   + While in Left-to-right mode, enter 'set rl' in the command line ('rl' is
+     the abbreviation for rightleft).
+
+   + Put the 'set rl' line in your '.vimrc' file to start Vim in
+     right-to-left mode permanently.
+
+Encoding
+--------
+
+The letter encoding used is the Vim extended ISIR-3342 standard with a built
+in function to convert between Vim extended ISIR-3342 and ISIR-3342 standard.
+
+For document portability reasons, the letter encoding is kept the same across
+different platforms (i.e. UNIX's, NT/95/98, MS DOS, ...).
+
+
+o  Keyboard
+
+   +  CTRL-_ in insert/replace modes toggles between Farsi(akm)/Latin
+      mode as follows:
+
+   +  CTRL-_ moves the cursor to the end of the typed text in edit mode.
+
+   +  CTRL-_ in command mode only toggles keyboard mapping between Farsi(akm)/
+      Latin.  The Farsi text is then entered in reverse insert mode.
+
+   +  F8 - Toggles between left-to-right and right-to-left.
+
+   +  F9 - Toggles the encoding between ISIR-3342 standard and Vim extended
+      ISIR-3342 (supported only in right-to-left mode).
+
+   +  Keyboard mapping is based on the Iranian ISIRI-2901 standard.
+      Following table shows the keyboard mapping while Farsi(akm) mode set:
+
+	-------------------------------------
+	`  1  2  3  4  5  6  7  8  9  0  -  =
+	¢  ±  ²  ³  ´  µ  ¶  ·  ¸  ¹  °  ­  ½
+	-------------------------------------
+	~  !  @  #  $  %  ^  &  *  (  )  _  +
+	~  £  §  ®  ¤  ¥  ª  ¬  è  ¨  ©  é  «
+	-------------------------------------
+	q  w  e  r  t  z  u  i  o  p  [  ]
+	Ó  Ò  Æ  Ù  Ø  Õ  Ö  à  Ê  É  Ç  ˆ
+	-------------------------------------
+	Q  W  E  R  T  Z  U  I  O  P  {  }
+	÷  õ  ô  ó  ò  ý  ð  ö  [  ]  {  }
+	-------------------------------------
+	a  s  d  f  g  h  j  k  l  ;  '  \
+	Ñ  Ð  á  Ã  Ü  Á  Å  Þ  Ý  Ú  Û  ë
+	-------------------------------------
+	A  S  D  F  G  H  J  K  L  :  "  |
+	ù  û  þ  ú  ø  À  ü  æ  ç  º  »  ê
+	-------------------------------------
+	<  y  x  c  v  b  n  m  ,  .  /
+	¾  ×  Ô  Î  Í  Ì  Ë  Ä  ß  ¦  ¯
+	-------------------------------------
+	>  Y  X  C  V  B  N  M  <  >  ?
+	¼  ñ  Ô  Ï  Í  ¡  Ë  Â  ¾  ¼  ¿
+	-------------------------------------
+
+Note:
+	¡  stands for Farsi PSP (break without space)
+
+	¢  stands for Farsi PCN (for HAMZE attribute)
+
+Restrictions
+------------
+
+o  In insert/replace mode and fkmap (Farsi mode) set, CTRL-B is not
+   supported.
+
+o  If you change the character mapping between Latin/Farsi, the redo buffer
+   will be reset (emptied).  That is, redo is valid and will function (using
+   '.') only within the mode you are in.
+
+o  While numbers are entered in Farsi mode, the redo buffer will be reset
+   (emptied).  That is, you cannot redo the last changes (using '.') after
+   entering numbers.
+
+o  While in left-to-right mode and Farsi mode set, CTRL-R is not supported.
+
+o  While in right-to-left mode, the search on 'Latin' pattern does not work,
+   except if you enter the Latin search pattern in reverse.
+
+o  In command mode there is no support for entering numbers from left
+   to right and also for the sake of flexibility the keymapping logic is
+   restricted.
+
+o  Under the X Window environment, if you want to run Vim within a xterm
+   terminal emulator and Farsi mode set, you need to have an ANSI compatible
+   xterm terminal emulator.  This is because the letter codes above 128 decimal
+   have certain meanings in the standard xterm terminal emulator.
+
+   Note: Under X Window environment, Vim GUI works fine in Farsi mode.
+	 This eliminates the need of any xterm terminal emulator.
+
+
+Bugs
+----
+While in insert/replace and Farsi mode set, if you repeatedly change the
+cursor position (via cursor movement) and enter new text and then try to undo
+the last change, the undo will lag one change behind.  But as you continue to
+undo, you will reach the original line of text.  You can also use U to undo all
+changes made in the current line.
+
+For more information about the bugs refer to rileft.txt.
+
+ vim:tw=78:ts=8:ft=help:norl:

runtime/doc/filetype.txt

@@ -1,4 +1,4 @@
-*filetype.txt*  For Vim version 8.1.  Last change: 2018 Apr 18
+*filetype.txt*  For Vim version 8.0.  Last change: 2017 Mar 28
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -43,7 +43,7 @@ Detail: The ":filetype on" command will load one of these files:
 	BufNewFile and BufRead events.  If the file type is not found by the
 	name, the file $VIMRUNTIME/scripts.vim is used to detect it from the
 	contents of the file.
-	When the GUI is running or will start soon, the |menu.vim| script is
+	When the GUI is running or will start soon, the menu.vim script is
 	also sourced.  See |'go-M'| about avoiding that.
 
 To add your own file types, see |new-filetype| below.  To search for help on a
@@ -319,10 +319,6 @@ then Vim will load all plugins in these directories and below:
 
 Note that the last one is the value of $VIMRUNTIME which has been expanded.
 
-Note that when using a plugin manager or |packages| many directories will be
-added to 'runtimepath'.  These plugins 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: >
 
@@ -606,17 +602,35 @@ MANPAGER				      *manpager.vim*
 The :Man command allows you to turn Vim into a manpager (that syntax highlights
 manpages and follows linked manpages on hitting CTRL-]).
 
-For bash,zsh,ksh or dash, add to the config file (.bashrc,.zshrc, ...)
+Works on:
 
-	export MANPAGER="vim -M +MANPAGER -"
+  - Linux
+  - Mac OS
+  - FreeBSD
+  - Cygwin
+  - Win 10 under Bash
 
-For (t)csh, add to the config file
+Untested:
 
-	setenv MANPAGER "vim -M +MANPAGER -"
+  - Amiga OS
+  - BeOS
+  - OS/2
 
-For fish, add to the config file
+For bash,zsh,ksh or dash by adding to the config file (.bashrc,.zshrc, ...)
 
-	set -x MANPAGER "vim -M +MANPAGER -"
+	export MANPAGER="env MAN_PN=1 vim -M +MANPAGER -"
+
+For (t)csh by adding to the config file
+
+	setenv MANPAGER "env MAN_PN=1 vim -M +MANPAGER -"
+
+For fish by adding to the config file
+
+	set -x MANPAGER "env MAN_PN=1 vim -M +MANPAGER -"
+
+If man sets the $MAN_PN environment variable, like man-db, the most common
+implementation on Linux and Mac OS, then the "env MAN_PN=1 " part above is
+superfluous.
 
 PDF							*ft-pdf-plugin*
 
@@ -638,40 +652,11 @@ By default the following options are set, in accordance with PEP8: >
 
 	setlocal expandtab shiftwidth=4 softtabstop=4 tabstop=8
 
-To disable this behavior, set the following variable in your vimrc: >
-
+To disable this behaviour, set the following variable in your vimrc: >
+	
 	let g:python_recommended_style = 0
 
 
-R MARKDOWN						*ft-rmd-plugin*
-
-By default ftplugin/html.vim is not sourced. If you want it sourced, add to
-your |vimrc|: >
-	let rmd_include_html = 1
-
-The 'formatexpr' option is set dynamically with different values for R code
-and for Markdown code. If you prefer that 'formatexpr' is not set, add to your
-|vimrc|: >
-	let rmd_dynamic_comments = 0
-
-
-R RESTRUCTURED TEXT					*ft-rrst-plugin*
-
-The 'formatexpr' option is set dynamically with different values for R code
-and for ReStructured text. If you prefer that 'formatexpr' is not set, add to
-your |vimrc|: >
-	let rrst_dynamic_comments = 0
-
-
-RESTRUCTUREDTEXT					*ft-rst-plugin*
-
-The following formatting setting are optionally available: >
-	setlocal expandtab shiftwidth=3 softtabstop=3 tabstop=8
-
-To enable this behavior, set the following variable in your vimrc: >
-	let g:rst_style = 1
-
-
 RPM SPEC						*ft-spec-plugin*
 
 Since the text for this plugin is rather long it has been put in a separate
@@ -705,23 +690,4 @@ You can change the default by defining the variable g:tex_flavor to the format
 Currently no other formats are recognized.
 
 
-VIM							*ft-vim-plugin*
-
-The Vim filetype plugin defines mappings to move to the start and end of
-functions with [[ and ]].  Move around comments with ]" and [".
-
-The mappings can be disabled with: >
-	let g:no_vim_maps = 1
-
-
-ZIMBU							*ft-zimbu-plugin*
-
-The Zimbu filetype plugin defines mappings to move to the start and end of
-functions with [[ and ]].
-
-The mappings can be disabled with: >
-	let g:no_zimbu_maps = 1
-<
-
-
- vim:tw=78:ts=8:noet:ft=help:norl:
+ vim:tw=78:ts=8:ft=help:norl:

runtime/doc/fold.txt

@@ -1,4 +1,4 @@
-*fold.txt*      For Vim version 8.1.  Last change: 2017 Mar 18
+*fold.txt*      For Vim version 8.0.  Last change: 2017 Mar 18
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -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:

runtime/doc/ft_ada.txt

@@ -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~
@@ -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'|).
 
 ==============================================================================

runtime/doc/ft_rust.txt

@@ -1,6 +1,4 @@
-*ft_rust.txt*	For Vim version 8.1.  Last change: 2017 Nov 02
-
-This is documentation for the Rust filetype plugin.
+*ft_rust.txt*      Filetype plugin for Rust
 
 ==============================================================================
 CONTENTS                                                      *rust*
@@ -201,7 +199,7 @@ COMMANDS                                                       *rust-commands*
 		|g:rust_playpen_url| is the base URL to the playpen, by default
 		"https://play.rust-lang.org/".
 
-		|g:rust_shortener_url| is the base URL for the shortener, by
+		|g:rust_shortener_url| is the base URL for the shorterner, by
 		default "https://is.gd/"
 
 :RustFmt                                                       *:RustFmt*
@@ -236,4 +234,4 @@ It also has a few other mappings:
 			Note: This binding is only available in MacVim.
 
 ==============================================================================
- vim:tw=78:sw=4:ts=8:noet:ft=help:norl:
+ vim:tw=78:sw=4:noet:ts=8:ft=help:norl:

runtime/doc/ft_sql.txt

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

runtime/doc/gui.txt

@@ -1,4 +1,4 @@
-*gui.txt*       For Vim version 8.1.  Last change: 2019 Jan 06
+*gui.txt*       For Vim version 8.0.  Last change: 2017 Sep 19
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -134,7 +134,7 @@ task bar with the 'guiheadroom' option.
 :winp[os]
 		Display current position of the top left corner of the GUI vim
 		window in pixels.  Does not work in all versions.
-		Also see |getwinpos()|, |getwinposx()| and |getwinposy()|.
+		Also see |getwinposx()| and |getwinposy()|.
 
 :winp[os] {X} {Y}							*E466*
 		Put the GUI vim window at the given {X} and {Y} coordinates.
@@ -162,7 +162,7 @@ window Vim is running in with these commands: >
 							*gui-IME* *iBus*
 Input methods for international characters in X that rely on the XIM
 framework, most notably iBus, have been known to produce undesirable results
-in gvim. These may include an inability to enter spaces, or long delays
+in gVim. These may include an inability to enter spaces, or long delays
 between typing a character and it being recognized by the application.
 
 One workaround that has been successful, for unknown reasons, is to prevent
@@ -482,7 +482,6 @@ menus and menu items.  They are most useful for things that you can't remember
 what the key sequence was.
 
 For creating menus in a different language, see |:menutrans|.
-If you don't want to use menus at all, see |'go-M'|.
 
 							*menu.vim*
 The default menus are read from the file "$VIMRUNTIME/menu.vim".  See
@@ -499,22 +498,7 @@ in the menu (which can take a bit of time to load).  If you want to have all
 filetypes already present at startup, add: >
 	:let do_syntax_sel_menu = 1
 
-The following menuitems show all available color schemes, keymaps and compiler
-settings:
-	Edit > Color Scheme ~
-	Edit > Keymap ~
-	Tools > Set Compiler ~
-However, they can also take a bit of time to load, because they search all
-related files from the directories in 'runtimepath'.  Therefore they are
-loaded lazily (by the |CursorHold| event), or you can also load them manually.
-If you want to have all these items already present at startup, add: >
-	:let do_no_lazyload_menus = 1
-
-Note that the menu.vim is sourced when `:syntax on` or `:filetype on` is
-executed or after your .vimrc file is sourced.  This means that the 'encoding'
-option and the language of messages (`:language messages`) must be set before
-that (if you want to change them).
-
+<
 							*console-menus*
 Although this documentation is in the GUI section, you can actually use menus
 in console mode too.  You will have to load |menu.vim| explicitly then, it is
@@ -547,16 +531,15 @@ floating menus that do not appear on the main menu bar.
 
 5.2 Creating New Menus					*creating-menus*
 
-				*:me*  *:menu*   *:noreme*  *:noremenu*
-				*:am*  *:amenu*  *:an*      *:anoremenu*
-				*:nme* *:nmenu*  *:nnoreme* *:nnoremenu*
-				*:ome* *:omenu*  *:onoreme* *:onoremenu*
-				*:vme* *:vmenu*  *:vnoreme* *:vnoremenu*
-				*:xme* *:xmenu*  *:xnoreme* *:xnoremenu*
-				*:sme* *:smenu*  *:snoreme* *:snoremenu*
-				*:ime* *:imenu*  *:inoreme* *:inoremenu*
-				*:cme* *:cmenu*  *:cnoreme* *:cnoremenu*
-				*:tlm* *:tlmenu* *:tln*     *:tlnoremenu*
+				*:me*  *:menu*  *:noreme*  *:noremenu*
+				*:am*  *:amenu* *:an*      *:anoremenu*
+				*:nme* *:nmenu* *:nnoreme* *:nnoremenu*
+				*:ome* *:omenu* *:onoreme* *:onoremenu*
+				*:vme* *:vmenu* *:vnoreme* *:vnoremenu*
+				*:xme* *:xmenu* *:xnoreme* *:xnoremenu*
+				*:sme* *:smenu* *:snoreme* *:snoremenu*
+				*:ime* *:imenu* *:inoreme* *:inoremenu*
+				*:cme* *:cmenu* *:cnoreme* *:cnoremenu*
 				*E330* *E327* *E331* *E336* *E333*
 				*E328* *E329* *E337* *E792*
 To create a new menu item, use the ":menu" commands.  They are mostly like
@@ -572,10 +555,6 @@ the mouse button down on this will pop up a menu containing the item
 "Big Changes", which is a sub-menu containing the item "Delete All Spaces",
 which when selected, performs the operation.
 
-To create a menu for terminal mode, use |:tlmenu| instead of |:tmenu| unlike
-key mapping (|:tmap|). This is because |:tmenu| is already used for defining
-tooltips for menus. See |terminal-typing|.
-
 Special characters in a menu name:
 
 	&	The next character is the shortcut key.  Make sure each
@@ -594,9 +573,9 @@ With the shortcut "F" (while keeping the <Alt> key pressed), and then "O",
 this menu can be used.  The second part is shown as "Open     :e".  The ":e"
 is right aligned, and the "O" is underlined, to indicate it is the shortcut.
 
-The ":amenu" command can be used to define menu entries for all modes at once,
-except for Terminal mode.  To make the command work correctly, a character is
-automatically inserted for some modes:
+The ":amenu" command can be used to define menu entries for all modes at once.
+To make the command work correctly, a character is automatically inserted for
+some modes:
 	mode		inserted	appended	~
 	Normal		nothing		nothing
 	Visual		<C-C>		<C-\><C-G>
@@ -817,17 +796,11 @@ make the items look like icons.
 If the items do not fit then the last ones cannot be used.  The toolbar does
 not wrap.
 
-Note that Vim may be in any mode when executing these commands.  The menu
-should be defined for Normal mode and will be executed without changing the
-current mode. Thus if the current window is in Visual mode and the menu
-command does not intentionally change the mode, Vim will remain in Visual
-mode.  Best is to use `:nnoremenu` to avoid side effects.
-
 Example for debugger tools: >
-	nnoremenu 1.10 WinBar.Step :Step<CR>
-	nnoremenu 1.20 WinBar.Next :Next<CR>
-	nnoremenu 1.30 WinBar.Finish :Finish<CR>
-	nnoremenu 1.40 WinBar.Cont :Continue<CR>
+	amenu 1.10 WinBar.Step :Step<CR>
+	amenu 1.20 WinBar.Next :Next<CR>
+	amenu 1.30 WinBar.Finish :Finish<CR>
+	amenu 1.40 WinBar.Cont :Continue<CR>
 <
 The window toolbar uses the ToolbarLine and ToolbarButton highlight groups.
 
@@ -871,16 +844,6 @@ be used to complete the name of the menu item.
 				insert-mode menu Eg: >
 	:emenu File.Exit
 
-:[range]em[enu] {mode} {menu}	Like above, but execute the menu for {mode}:
-				    'n': |:nmenu|  Normal mode
-				    'v': |:vmenu|  Visual mode
-				    's': |:smenu|  Select mode
-				    'o': |:omenu|  Operator-pending mode
-				    't': |:tlmenu| Terminal mode
-				    'i': |:imenu|  Insert mode
-				    'c': |:cmenu|  Cmdline mode
-
-
 If the console-mode vim has been compiled with WANT_MENU defined, you can
 use :emenu to access useful menu items you may have got used to from GUI
 mode.  See 'wildmenu' for an option that works well with this.  See
@@ -901,7 +864,6 @@ using the last visual selection.
 						*:sunme* *:sunmenu*
 						*:iunme* *:iunmenu*
 						*:cunme* *:cunmenu*
-						*:tlu*   *:tlunmenu*
 To delete a menu item or a whole submenu, use the unmenu commands, which are
 analogous to the unmap commands.  Eg: >
     :unmenu! Edit.Paste
@@ -915,9 +877,7 @@ may be used to complete the name of the menu item for the appropriate mode.
 To remove all menus use:			*:unmenu-all*  >
 	:unmenu *	" remove all menus in Normal and visual mode
 	:unmenu! *	" remove all menus in Insert and Command-line mode
-	:aunmenu *	" remove all menus in all modes, except for Terminal
-			" mode
-	:tlunmenu *	" remove all menus in Terminal mode
+	:aunmenu *	" remove all menus in all modes
 
 If you want to get rid of the menu bar: >
 	:set guioptions-=m
@@ -970,8 +930,6 @@ See section |42.4| in the user manual.
 :tu[nmenu] {menupath}		Remove a tip for a menu or tool.
 				{only in X11 and Win32 GUI}
 
-Note: To create menus for terminal mode, use |:tlmenu| instead.
-
 When a tip is defined for a menu item, it appears in the command-line area
 when the mouse is over that item, much like a standard Windows menu hint in
 the status bar.  (Except when Vim is in Command-line mode, when of course
@@ -1013,15 +971,10 @@ it behaves in a strange way.
 :popu[p] {name}			Popup the menu {name}.  The menu named must
 				have at least one subentry, but need not
 				appear on the menu-bar (see |hidden-menus|).
-				{only available for Win32, MacVim, and GTK GUI
-				or in the terminal when compiled with
-				+insert_expand}
+				{only available for Win32, MacVim, and GTK GUI}
 
 :popu[p]! {name}		Like above, but use the position of the mouse
 				pointer instead of the cursor.
-				In the terminal this is the last known
-				position, which is usually at the last click
-				or release (mouse movement is irrelevant).
 
 Example: >
 	:popup File
@@ -1032,10 +985,6 @@ pointer if ! was used). >
 	:popup ]Toolbar
 This creates a popup menu that doesn't exist on the main menu-bar.
 
-Note that in the GUI the :popup command will return immediately, before a
-selection has been made.  In the terminal the commands waits for the user to
-make a selection.
-
 Note that a menu that starts with ']' will not be displayed.
 
 ==============================================================================
@@ -1099,4 +1048,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:

runtime/doc/gui_mac.txt

@@ -1,4 +1,4 @@
-*gui_mac.txt*	For Vim version 8.1.  Last change: 2018 Dec 17
+*gui_mac.txt*	For Vim version 8.0.  Last change: 2012 Jan 13
 
 
 		  VIM REFERENCE MANUAL    by Bjorn Winckler
@@ -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.
@@ -30,7 +29,7 @@ Other relevant documentation:
 ==============================================================================
 1. MacVim differences					*macvim-differences*
 
-One of the goals of MacVim is to make Vim behave like a proper macOS
+One of the goals of MacVim is to make Vim behave like a proper Mac OS X
 application.  For this reason MacVim behaves slightly different from other GUI
 ports of Vim.  Most of the modifications are provided in the system gvimrc
 file; you can quickly open this file and look at it yourself by typing: >
@@ -65,8 +64,8 @@ file at all. In this situation, you will need to set both 'encoding' and
 the file is read into memory, the original bytes are left untouched.
 
 							*macvim-shift-movement*
-Text editors on macOS lets the user hold down shift+movement key to extend the
-selection.  Also, pressing a printable key whilst selecting replaces the
+Text editors on Mac OS X lets the user hold down shift+movement key to extend
+the selection.  Also, pressing a printable key whilst selecting replaces the
 current selection with that character.  MacVim can emulate this kind of
 behaviour (by providing key bindings and by setting 'keymodel' and
 'selectmode' to non-default values) although it is not enabled by default.  To
@@ -120,22 +119,15 @@ These are the non-standard commands that MacVim supports:
 	|:macaction|	|:macmenu|
 
 							*macvim-find*
-Whenever you search for something in Vim (e.g. using "/"), or hit <D-e> when
-you have text selected, the search query is copied to the macOS "Find
-Pasteboard".  The idea is that if you search for something and switch to
-another application, then you can hit <D-g> (or <D-G>) to repeat the search in
-the new app.  The same feature works if you search in some app, switch to
-MacVim and hit <D-g>.
-
-If you would like to turn off sharing Vim's search query to the macOS Find
-Pasteboard, you can set |MMShareFindPboard| to "NO". Even when that's set,
-<D-g> will still use the OS Find Pasteboard for searching (use |n| instead if
-that's not what you want), and <D-e> ("Edit -> Use Selection for Find") will
-still share the search pattern to Find Pasteboard.
+Whenever you search for something in Vim (e.g. using "/") the search query is
+copied to the OS X "Find Pasteboard".  The idea is that if you search for
+something and switch to another application, then you can hit <D-g> (or <D-G>)
+to repeat the search in the new app.  The same feature works if you search in
+some app, switch to MacVim and hit <D-g>.
 
 Note that the command |n| is not the same as <D-g>.  The former will repeat
 the last search made in Vim, whereas the latter searches for the string on the
-macOS Find Pasteboard using the action findNext: (see |:macaction|).
+OS X Find Pasteboard using the action findNext: (see |:macaction|).
 
 The <D-g> key equivalent is a great way to bring a search from one window to
 another in MacVim.  Simply search for something in one window (using "/") then
@@ -163,7 +155,7 @@ up the "Open with" menu.  You can also drag and drop files onto the Dock icon
 to open them in tabs in a new window, or you can drop them in an already open
 window to open the files in tabs in that specific window (it is possible to
 have files open in e.g. splits by changing the "Open files from applications"
-option in the General preference pane).  Finally, you can use macOS System
+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.
@@ -213,9 +205,9 @@ history as the window you just closed (however the next window you open will).
 For these reasons Quickstart is disabled by default.
 
 						*odbeditor* *external-editor*
-MacVim can act as an 'external editor' for macOS applications that support the
-ODB Editor Protocol (or the 'external editor' protocol).  Each application has
-different ways of configuring this option, check the application's
+MacVim can act as an 'external editor' for Mac OS X applications that support
+the ODB Editor Protocol (or the 'external editor' protocol).  Each application
+has different ways of configuring this option, check the application's
 documentation.  Once configured properly MacVim can be used to open files in
 such an application.
 
@@ -238,32 +230,32 @@ circumstances.  These options can still be changed with the "defaults" command
 by opening Terminal and typing >
 	defaults write org.vim.MacVim KEY VALUE
 Check the man page on "defaults" for more information on this command as well
-as general information regarding macOS user defaults.
+as general information regarding Mac OS X user defaults.
 
 Here is a list of relevant dictionary entries:
 
 KEY				VALUE ~
-*MMCellWidthMultiplier*		width of a normal glyph in em units [float]
-*MMDialogsTrackPwd*		open/save dialogs track the Vim pwd [bool]
-*MMFullScreenFadeTime*		fade delay for non-native fullscreen [float]
-*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]
-*MMTabOptimumWidth*		default width of a tab [int]
-*MMTextInsetBottom*		text area offset in pixels [int]
-*MMTextInsetLeft*		text area offset in pixels [int]
-*MMTextInsetRight*		text area offset in pixels [int]
-*MMTextInsetTop*		text area offset in pixels [int]
-*MMTexturedWindow*		use brushed metal window (Tiger only) [bool]
-*MMTranslateCtrlClick*		interpret ctrl-click as right-click [bool]
-*MMUseMouseTime*		use mousetime to detect multiple clicks [bool]
-*MMVerticalSplit*		files open in vertical splits [bool]
-*MMZoomBoth*			zoom button maximizes both directions [bool]
+MMCellWidthMultiplier		width of a normal glyph in em units [float]
+MMDialogsTrackPwd		open/save dialogs track the Vim pwd [bool]
+MMFullScreenFadeTime		fade delay for non-native fullscreen [float]
+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]
+MMTabOptimumWidth		default width of a tab [int]
+MMTextInsetBottom		text area offset in pixels [int]
+MMTextInsetLeft			text area offset in pixels [int]
+MMTextInsetRight		text area offset in pixels [int]
+MMTextInsetTop			text area offset in pixels [int]
+MMTexturedWindow		use brushed metal window (Tiger only) [bool]
+MMTranslateCtrlClick		interpret ctrl-click as right-click [bool]
+MMUseMouseTime			use mousetime to detect multiple clicks [bool]
+MMVerticalSplit			files open in vertical splits [bool]
+MMZoomBoth			zoom button maximizes both directions [bool]
 
 As an example, if you have more than one mouse button and would wish to free
 up Ctrl-click so you can bind it to something else, then the appropriate
@@ -344,18 +336,18 @@ highlight color when a window becomes inactive.
 ==============================================================================
 5. Menus						*macvim-menus*
 
-Menus in macOS behave slightly different from other platforms.  For that
+Menus in Mac OS X behave slightly different from other platforms.  For that
 reason two new commands have been added to Vim.  To understand what these
-commands do you must first understand how menus work on macOS.
+commands do you must first understand how menus work on OS X.
 
 Each entry in a menu is called a "menu item".  With each menu item is
 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 macOS which is why MacVim must be able
+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
 bound to the action "paste:" otherwise pasting won't work in dialogs since
 that is the action that instructs them to paste something.)
@@ -447,8 +439,6 @@ Action				Description ~
 fileOpen:			Show "File Open" dialog
 findNext:			Search forward using the "Find Pasteboard"
 findPrevious:			Search backward using the "Find Pasteboard"
-useSelectionForFind:		Search the selected text and share to "Find
-				Pasteboard"
 fontSizeDown:			Decrease font size
 fontSizeUp:			Increase font size
 hide:				Hide MacVim
@@ -477,47 +467,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 macOS 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
@@ -536,12 +498,13 @@ 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
 to work, MacVim.app should be located in the /Applications folder.  (You might
-have to logout and then login again before macOS detects the MacVim services.)
+have to logout and then login again before Mac OS X detects the MacVim
+services.)
 
 These are the currently supported services:
 	* New MacVim Buffer With Selection: Create a new buffer and paste the
@@ -553,7 +516,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 >
@@ -574,7 +537,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
@@ -648,13 +611,13 @@ sometimes be slightly involved.  Here are all the things you need to consider:
 - Bindings to <D-..> are case sensitive: <D-d> is not the same as <D-D>.  If
   you want to map something to Cmd+Shift+d, then you need to use <D-D>, not
   <D-S-d> or <D-S-D>.
-- Some command key shortcuts are reserved by macOS and cannot be mapped to
+- Some command key shortcuts are reserved by Mac OS X and cannot be mapped to
   (e.g. <D-Tab>).  However, some of these shortcuts can be freed up in the
   System Preferences under Keyboard (e.g. Cmd+Space).
 - 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!).
@@ -670,10 +633,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: >
@@ -689,13 +648,13 @@ 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
-macOS 10.5 or later (on 10.4 the 'imd' option support is not as useful as it
-only switches between Roman and non-Roman input sources and it has been known
-not to work very reliably).
+Mac OS X 10.5 or later (on 10.4 the 'imd' option support is not as useful as
+it only switches between Roman and non-Roman input sources and it has been
+known not to work very reliably).
 
 For example: When 'noimd' is enabled (i.e. IM is enabled) the input source is
 saved when toggling between normal and insert mode, so you can use a US layout
@@ -710,14 +669,11 @@ 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.
 
-- Under macOS Mojave (10.14), the default renderer (Core Text renderer) has
-  some performance issues and scrolling is not as smooth as previous macOS
-  versions (10.13 or below).
 - Localized menus are not supported.  Choosing anything but "English" in the
   "International" pane of "System Prefences" may break the menus (and
   toolbar).
@@ -729,19 +685,15 @@ prominent bugs/missing features.
   then opened in Preview where it may be printed.
 - The toolbar looks ugly and is not very useful.
 
-Other bugs and issues are tracked on Github. If you find new bugs then please
-file an issue there: >
-	https://github.com/macvim-dev/macvim/issues
-
-There is also a vim_mac mailing list. You can also post your findings of bugs
-and issues there as well:				*vim_mac_group*   >
+If you find new bugs then please post your findings to the vim_mac mailing
+list:							*vim_mac_group*   >
 	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.
@@ -853,4 +805,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:

runtime/doc/gui_w32.txt

@@ -1,4 +1,4 @@
-*gui_w32.txt*   For Vim version 8.1.  Last change: 2017 Oct 27
+*gui_w32.txt*   For Vim version 8.0.  Last change: 2014 Dec 20
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -382,8 +382,38 @@ Note that a menu that starts with ']' will not be displayed.
 ==============================================================================
 7. Command line arguments				*gui-w32-cmdargs*
 
-Command line arguments behave the same way as with the console application,
-see |win32-cmdargs|.
+Analysis of a command line into parameters is not standardised in MS Windows.
+Gvim has to provide logic to analyse a command line.  This logic is likely to
+be different from the default logic provided by a compilation system used to
+build vim.  The differences relate to unusual double quote (") usage.
+The arguments "C:\My Music\freude.txt" and "+/Sch\"iller" are handled in the
+same way.  The argument "+/Sch""iller" may be handled different by gvim and
+vim, depending what it was compiled with.
+
+The rules are:
+      a) A parameter is a sequence of graphic characters.
+      b) Parameters are separated by white space.
+      c) A parameter can be enclosed in double quotes to include white space.
+      d) A sequence of zero or more backslashes (\) and a double quote (")
+	is special.  The effective number of backslashes is halved, rounded
+	down.  An even number of backslashes reverses the acceptability of
+	spaces and tabs, an odd number of backslashes produces a literal
+	double quote.
+
+So:
+	"	is a special double quote
+	\"	is a literal double quote
+	\\"	is a literal backslash and a special double quote
+	\\\"	is a literal backslash and a literal double quote
+	\\\\"	is 2 literal backslashes and a special double quote
+	\\\\\"	is 2 literal backslashes and a literal double quote
+	etc.
+
+Example: >
+	gvim "C:\My Music\freude" +"set ignorecase" +/"\"foo\\" +\"bar\\\"
+
+opens "C:\My Music\freude" and executes the line mode commands: >
+	set ignorecase; /"foo\ and /bar\"
 
 ==============================================================================
 8. Various						*gui-w32-various*
@@ -442,7 +472,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 +481,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: