MacVim Snapshot 150

Binary targets macOS 10.8+ - Vim patch 8.1.0235 - Touch Bar support #715 - Force click support #716 - New guioption 'k' #708 - Fix CoreText renderer Script interfaces have compatibility with these versions - Lua 5.3 - Perl 5.18 - Python2 2.7 - Python3 3.7 - Ruby 2.5
Workaround for test87
2026-06-02 11:19:22 +02:00 · 2018-08-02 21:58:32 -07:00 · 2018-08-02 21:44:16 -07:00 · 2018-08-02 21:28:40 -07:00 · 2018-08-02 22:23:57 +02:00 · 2018-08-02 21:46:51 +02:00
590 changed files with 49670 additions and 19026 deletions
@@ -0,0 +1,4 @@
+# Format of this file: https://lgtm.com/help/lgtm/lgtm.yml-configuration-file
+path_classifiers:
+  documentation:
+    - runtime/tutor/tutor*
@@ -4,21 +4,22 @@ dist: trusty
 os:
  - osx

-osx_image: xcode9.2
+osx_image: xcode9.3

 compiler:
  - clang

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

@@ -51,4 +51,24 @@ 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 react, contact the vim-dev maillist.
+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
@@ -4,8 +4,10 @@
 # source files for all source archives
 SRC_ALL =	\
 		.hgignore \
+		.lgtm.yml \
 		.travis.yml \
 		appveyor.yml \
+		src/Make_all.mak \
 		src/appveyor.bat \
 		src/README.txt \
 		src/alloc.h \
@@ -411,6 +413,8 @@ SRC_DOS =	\
 		src/msvc2008.bat \
 		src/msvc2010.bat \
 		src/msvc2015.bat \
+		src/msys32.bat \
+		src/msys64.bat \
 		src/dimm.idl \
 		src/dlldata.c \
 		src/dosinst.c \
@@ -706,6 +710,7 @@ 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 \
@@ -846,6 +851,8 @@ 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 \
@@ -906,6 +913,7 @@ LANG_SRC = \
 		src/po/check.vim \
 		src/po/cleanup.vim \
 		src/po/Makefile \
+		src/po/Make_all.mak \
 		src/po/Make_cyg.mak \
 		src/po/Make_ming.mak \
 		src/po/Make_mvc.mak \
@@ -68,7 +68,7 @@ all install uninstall tools config configure reconfig proto depend lint tags typ
 #    Before creating an archive first delete all backup files, *.orig, etc.

 MAJOR = 8
-MINOR = 0
+MINOR = 1

 # CHECKLIST for creating a new version:
 #
@@ -131,7 +131,7 @@ MINOR = 0
 # - > make dossrc
 #   > make dosrt
 #   Unpack dist/vim##rt.zip and dist/vim##src.zip on an MS-Windows PC.
-#   This creates the directory vim/vim80 and puts all files in there.
+#   This creates the directory vim/vim81 and puts all files in there.
 # Win32 console version build:
 # - See src/INSTALLpc.txt for installing the compiler and SDK.
 # - Set environment for Visual C++ 2015:
@@ -1,4 +1,4 @@
-README.txt for version 8.0 of Vim: Vi IMproved.
+README.txt for version 8.1 of Vim: Vi IMproved.


 WHAT IS VIM?
@@ -9,10 +9,10 @@ Vim		Vi IMproved.  A clone of the UNIX text editor Vi.  Very useful
 		messages, shows current file name in window title, on-line
 		help, rectangular cut/paste, etc., etc., etc...

-		Version 8.0.  Also runs under UNIX, MS-Windows, Mac, etc.
-		vim80rt.tgz  contains the documentation and syntax files.
-		vim80bin.tgz contains the binaries.
-		vim80src.tgz contains the sources.
+		Version 8.1.  Also runs under UNIX, MS-Windows, Mac, etc.
+		vim81rt.tgz  contains the documentation and syntax files.
+		vim81bin.tgz contains the binaries.
+		vim81src.tgz contains the sources.
 		Author: Bram Moolenaar et al.


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

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

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

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

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


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

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


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

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


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

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

 This file explains the installation of Vim on MS-DOS and MS-Windows systems.
 See "README.txt" for general information about Vim.
@@ -41,19 +41,19 @@ These are the normal steps to install Vim from the .zip archives:
   located.  Check the $VIM setting to see where it points to:
 	set VIM
   For example, if you have
-	C:\vim\vim80
+	C:\vim\vim81
   do
 	cd C:\
   Binary and runtime Vim archives are normally unpacked in the same location,
   on top of each other.

-2. Unpack the zip archives.  This will create a new directory "vim\vim80",
+2. Unpack the zip archives.  This will create a new directory "vim\vim81",
   in which all the distributed Vim files are placed.  Since the directory
   name includes the version number, it is unlikely that you overwrite
   existing files.
   Examples:
-	pkunzip -d gvim80.zip
-	unzip vim80w32.zip
+	pkunzip -d gvim81.zip
+	unzip vim81w32.zip

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

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

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

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

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

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

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

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

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

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

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

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

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


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

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

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

 This archive contains the gvim.exe that was specifically compiled for use in
 the Win32s subsystem in MS-Windows 3.1 and 3.11.
@@ -267,6 +267,9 @@ Section "Vim executables and runtime files"
 	SetOutPath $0\pack\dist\opt\swapmouse\plugin
 	File ${VIMRT}\pack\dist\opt\swapmouse\plugin\*.*

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

@@ -2,5 +2,5 @@
 !ifndef __GVIM_VER__NSH__
 !define __GVIM_VER__NSH__
 !define VER_MAJOR 8
-!define VER_MINOR 0
+!define VER_MINOR 1
 !endif
@@ -0,0 +1,48 @@
+" Author: Antony Lee <anntzer.lee@gmail.com>
+" Description: Helper functions for reStructuredText syntax folding
+" Last Modified: 2018-01-07
+
+function s:CacheRstFold()
+  let closure = {'header_types': {}, 'max_level': 0, 'levels': {}}
+  function closure.Process(match) dict
+    let curline = getcurpos()[1]
+    if has_key(self.levels, curline - 1)
+      " For over+under-lined headers, the regex will match both at the
+      " overline and at the title itself; in that case, skip the second match.
+      return
+    endif
+    let lines = split(a:match, '\n')
+    let key = repeat(lines[-1][0], len(lines))
+    if !has_key(self.header_types, key)
+      let self.max_level += 1
+      let self.header_types[key] = self.max_level
+    endif
+    let self.levels[curline] = self.header_types[key]
+  endfunction
+  let save_cursor = getcurpos()
+  silent keeppatterns %s/\v^%(%(([=`:.'"~^_*+#-])\1+\n)?.{1,2}\n([=`:.'"~^_*+#-])\2+)|%(%(([=`:.''"~^_*+#-])\3{2,}\n)?.{3,}\n([=`:.''"~^_*+#-])\4{2,})$/\=closure.Process(submatch(0))/gn
+  call setpos('.', save_cursor)
+  let b:RstFoldCache = closure.levels
+endfunction
+
+function RstFold#GetRstFold()
+  if !has_key(b:, 'RstFoldCache')
+    call s:CacheRstFold()
+  endif
+  if has_key(b:RstFoldCache, v:lnum)
+    return '>' . b:RstFoldCache[v:lnum]
+  else
+    return '='
+  endif
+endfunction
+
+function RstFold#GetRstFoldText()
+  if !has_key(b:, 'RstFoldCache')
+    call s:CacheRstFold()
+  endif
+  let indent = repeat('  ', b:RstFoldCache[v:foldstart] - 1)
+  let thisline = getline(v:foldstart)
+  " For over+under-lined headers, skip the overline.
+  let text = thisline =~ '^\([=`:.''"~^_*+#-]\)\1\+$' ? getline(v:foldstart + 1) : thisline
+  return indent . text
+endfunction
@@ -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: 2016 Jan 11
+" Last Change: 2018 Jul 02

 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,7 +19,6 @@ 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
@@ -37,11 +36,14 @@ 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 = []
@@ -22,8 +22,8 @@
 if &cp || exists("g:loaded_netrw")
  finish
 endif
-" netrw requires vim having patch 213; netrw will benefit from vim's having patch#656, too
-if v:version < 704 || !has("patch213")
+" netrw requires vim having patch 7.4.213; netrw will benefit from vim's having patch#656, too
+if v:version < 704 || (v:version == 704 && !has("patch213"))
 if !exists("s:needpatch213")
  unsilent echomsg "***sorry*** this version of netrw requires vim v7.4 with patch 213"
 endif
@@ -22,6 +22,7 @@ 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
@@ -30,13 +31,13 @@ function! spellfile#LoadFile(lang)
  endif

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

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

-  let msg = 'Cannot find spell file for "' . a:lang . '" in ' . &enc
+  let msg = 'Cannot find spell file for "' . 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 = a:lang . '.' . enc . '.spl'
+    let fname = lang . '.' . enc . '.spl'

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

-      let fname = a:lang . '.ascii.spl'
+      let fname = lang . '.ascii.spl'
      echo 'Could not find it, trying ' . fname . '...'
      call spellfile#Nread(fname)
      if getline(2) !~ 'VIMspell'
@@ -0,0 +1,111 @@
+" Vim plugin for formatting XML
+" Last Change: Thu, 22 May 2018 21:26:55 +0100
+" Version: 0.1
+" Author: Christian Brabandt <cb@256bit.org>
+" Repository:   https://github.com/chrisbra/vim-xml-ftplugin
+" License: VIM License
+" Documentation: see :h xmlformat.txt (TODO!)
+" ---------------------------------------------------------------------
+" Load Once: {{{1
+if exists("g:loaded_xmlformat") || &cp
+  finish
+endif
+let g:loaded_xmlformat = 1
+let s:keepcpo       = &cpo
+set cpo&vim
+
+" Main function: Format the input {{{1
+func! xmlformat#Format()
+  " only allow reformatting through the gq command
+  " (e.g. Vim is in normal mode)
+  if mode() != 'n'
+    " do not fall back to internal formatting
+    return 0
+  endif
+  let sw  = shiftwidth()
+  let prev = prevnonblank(v:lnum-1)
+  let s:indent = indent(prev)/sw
+  let result = []
+  let lastitem = prev ? getline(prev) : ''
+  let is_xml_decl = 0
+  " split on `<`, but don't split on very first opening <
+  for item in split(join(getline(v:lnum, (v:lnum + v:count - 1))), '.\@<=[>]\zs')
+    if s:EndTag(item)
+      let s:indent = s:DecreaseIndent()
+      call add(result, s:Indent(item))
+    elseif s:EmptyTag(lastitem)
+      call add(result, s:Indent(item))
+    elseif s:StartTag(lastitem) && s:IsTag(item)
+      let s:indent += 1
+      call add(result, s:Indent(item))
+     else
+       if !s:IsTag(item)
+         " Simply split on '<'
+         let t=split(item, '.<\@=\zs')
+         let s:indent+=1
+         call add(result, s:Indent(t[0]))
+         let s:indent = s:DecreaseIndent()
+         call add(result, s:Indent(t[1]))
+       else
+        call add(result, s:Indent(item))
+      endif
+     endif
+     let lastitem = item
+   endfor
+
+   if !empty(result)
+    exe v:lnum. ",". (v:lnum + v:count - 1). 'd'
+    call append(v:lnum - 1, result)
+    " Might need to remove the last line, if it became empty because of the
+    " append() call
+    let last = v:lnum + len(result)
+    if getline(last) is ''
+      exe last. 'd'
+    endif
+  endif
+
+  " do not run internal formatter!
+  return 0
+endfunc
+" Check if given tag is XML Declaration header {{{1
+func! s:IsXMLDecl(tag)
+  return a:tag =~? '^\s*<?xml\s\?\%(version="[^"]*"\)\?\s\?\%(encoding="[^"]*"\)\? ?>\s*$'
+endfunc
+" Return tag indented by current level {{{1
+func! s:Indent(item)
+  return repeat(' ', shiftwidth()*s:indent). s:Trim(a:item)
+endfu
+" Return item trimmed from leading whitespace {{{1
+func! s:Trim(item)
+  if exists('*trim')
+    return trim(a:item)
+  else
+    return matchstr(a:item, '\S\+.*')
+  endif
+endfunc
+" Check if tag is a new opening tag <tag> {{{1
+func! s:StartTag(tag)
+  return a:tag =~? '^\s*<[^/?]'
+endfunc
+" Remove one level of indentation {{{1
+func! s:DecreaseIndent()
+  return (s:indent > 0 ? s:indent - 1 : 0)
+endfunc
+" Check if tag is a closing tag </tag> {{{1
+func! s:EndTag(tag)
+  return a:tag =~? '^\s*</'
+endfunc
+" Check that the tag is actually a tag and not {{{1
+" something like "foobar</foobar>"
+func! s:IsTag(tag)
+  return s:Trim(a:tag)[0] == '<'
+endfunc
+" Check if tag is empty <tag/> {{{1
+func! s:EmptyTag(tag)
+  return a:tag =~ '/>\s*$'
+endfunc
+" Restoration And Modelines: {{{1
+let &cpo= s:keepcpo
+unlet s:keepcpo
+" Modeline {{{1
+" vim: fdm=marker fdl=0 ts=2 et sw=0 sts=-1
@@ -42,7 +42,16 @@ 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 autocmd event.
+ColorScheme autocommand event.
+
+To clean up just before loading another colorscheme, use the ColorSchemePre
+autocommand event.  For example:
+	let g:term_ansi_colors = ...
+	augroup MyColorscheme
+	  au!
+	  au ColorSchemePre * unlet g:term_ansi_colors
+	  au ColorSchemePre * au! MyColorscheme
+	augroup END

 To customize a colorscheme use another name, e.g.  "~/.vim/colors/mine.vim",
 and use `:runtime` to load the original colorscheme:
@@ -64,7 +73,8 @@ 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 tools/check_colors.vim script to check for common mistakes.
+- Source the $VIMRUNTIME/colors/tools/check_colors.vim script to check for
+  common mistakes.
 - Does it work in a color terminal as well as in the GUI?
 - Is "g:colors_name" set to a meaningful value?  In case of doubt you can do
  it this way:
@@ -1,5 +1,5 @@
 " This script tests a color scheme for some errors. Load the scheme and source
-" this script. e.g. :e colors/desert.vim | :so test_colors.vim
+" this script. e.g. :e colors/desert.vim | :so check_colors.vim
 " Will output possible errors.

 let s:save_cpo= &cpo
@@ -90,7 +90,7 @@ func! Test_check_colors()
    let err['background'] = 'Should not issue :syn on'
  endif

-  " 7) Does not define filetype specfic groups like vimCommand, htmlTag,
+  " 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\+\>'
@@ -1,4 +1,4 @@
-*arabic.txt*	For Vim version 8.0.  Last change: 2010 Nov 13
+*arabic.txt*	For Vim version 8.1.  Last change: 2010 Nov 13


 		  VIM REFERENCE MANUAL	  by Nadim Shaikli
@@ -319,4 +319,4 @@ There is one known minor bug,

 No other bugs are known to exist.

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


 		  VIM REFERENCE MANUAL    by Bram Moolenaar


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

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

@@ -345,8 +345,9 @@ Name			triggered by ~
 			when popup menu is not visible
 |TextChangedP|		after a change was made to the text in Insert mode
 			when popup menu visible
-|TextYankPost|		after text is yanked or deleted
+|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
@@ -468,6 +469,9 @@ 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.
@@ -562,6 +566,10 @@ 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
@@ -662,7 +670,10 @@ DirChanged			The working directory has changed in response
 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.
+				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.
@@ -1030,6 +1041,10 @@ TextYankPost			After text has been yanked or deleted in the
 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! :-)
@@ -1074,9 +1089,10 @@ 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: When using ":split fname" the WinEnter
-				event is triggered after the split but before
-				the file "fname" is loaded.
+				Note: For split and tabpage commands the
+				WinEnter event is triggered after the split
+				or tab command but before the file is loaded.
+
 							*WinLeave*
 WinLeave			Before leaving a window.  If the window to be
 				entered next is for a different buffer, Vim
@@ -1386,7 +1402,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 doesn't have a name.  But it doesn't
+buffer.  This also works for buffers that don't have a name.  But it doesn't
 work for files without a buffer (e.g., with ":r file").

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


- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*change.txt*    For Vim version 8.0.  Last change: 2017 Feb 12
+*change.txt*    For Vim version 8.1.  Last change: 2018 May 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 reduce to the number of
+			If [count] is too big it is reduced to the number of
 			lines available.

 							*v_J*
@@ -177,8 +177,6 @@ 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
@@ -303,8 +301,6 @@ 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.
@@ -446,7 +442,7 @@ This depends on the 'nrformats' option:

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

 For numbers with leading zeros (including all octal and hexadecimal numbers),
 Vim preserves the number of characters in the number when possible.  CTRL-A on
@@ -533,6 +529,7 @@ 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
@@ -986,6 +983,11 @@ 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*
@@ -1444,6 +1446,55 @@ 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
@@ -1829,4 +1880,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:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*channel.txt*      For Vim version 8.0.  Last change: 2017 Aug 11
+*channel.txt*      For Vim version 8.1.  Last change: 2018 Apr 18


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -22,6 +22,7 @@ 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}
@@ -55,7 +56,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 deamon, connecting over a socket in JSON mode.  E.g. to lookup
+- Using a daemon, connecting over a socket in JSON mode.  E.g. to lookup
  cross-references in a database.

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

 For more options see |job_stop()|.

+==============================================================================
+12. Using a prompt buffer				*prompt-buffer*

- vim:tw=78:ts=8:ft=help:norl:
+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:
@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 8.0.  Last change: 2017 Oct 19
+*cmdline.txt*   For Vim version 8.1.  Last change: 2018 May 14


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -175,12 +175,14 @@ 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
@@ -192,8 +194,8 @@ CTRL-R CTRL-A				*c_CTRL-R_CTRL-A* *c_<C-R>_<C-A>*

 					*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-R CTRL-O {0-9a-z"%#:-=. CTRL-F CTRL-P CTRL-W CTRL-A}
+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}
 		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),
@@ -410,14 +412,17 @@ 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.
-<S-Tab>							*c_CTRL-P* *c_<S-Tab>*
+							*c_CTRL-P*
 CTRL-P		After using 'wildchar' which got multiple matches, go to
 		previous match.  Otherwise recall older command-line from
-		history.  <S-Tab> only works with the GUI, on the Amiga and
-		with MS-DOS.
+		history.
 							*c_CTRL-A*
 CTRL-A		All names that match the pattern in front of the cursor are
 		inserted.
@@ -453,6 +458,10 @@ 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
@@ -885,7 +894,8 @@ 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.
+		current directory, but on MS-Windows the drive is removed if
+		it is the current drive.
 		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.
@@ -1154,4 +1164,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:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*debug.txt*     For Vim version 8.0.  Last change: 2017 Jul 15
+*debug.txt*     For Vim version 8.1.  Last change: 2017 Jul 15


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -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:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*debugger.txt*  For Vim version 8.0.  Last change: 2017 Nov 21
+*debugger.txt*  For Vim version 8.1.  Last change: 2017 Nov 21


 		  VIM REFERENCE MANUAL    by Gordon Prieur
@@ -139,4 +139,4 @@ Programming Environment.

 For Sun NetBeans support see |netbeans|.

- vim:tw=78:sw=4:ts=8:ft=help:norl:
+ vim:tw=78:sw=4:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*develop.txt*   For Vim version 8.0.  Last change: 2017 Jul 31
+*develop.txt*   For Vim version 8.1.  Last change: 2018 May 02


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -18,7 +18,8 @@ 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 context diff "diff -c" is preferred.
+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.
 Also see http://vim.wikia.com/wiki/How_to_make_and_submit_a_patch.

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


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

 The minimal C compiler version supported is C89, also known as ANSI C.
-Later standards don't add much and C89 is the widest supported.
+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).

-One restriction that this implies: no // comments, only /* comments */.
+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)


 USE OF COMMON FUNCTIONS					*style-functions*
@@ -531,4 +563,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:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*diff.txt*      For Vim version 8.0.  Last change: 2017 Oct 03
+*diff.txt*      For Vim version 8.1.  Last change: 2017 Oct 03


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -441,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:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*digraph.txt*   For Vim version 8.0.  Last change: 2016 Nov 04
+*digraph.txt*   For Vim version 8.1.  Last change: 2016 Nov 04


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1488,4 +1488,4 @@ char  digraph	hex	dec	official name ~
 ﬅ	ft	FB05	64261	LATIN SMALL LIGATURE LONG S T
 ﬆ	st	FB06	64262	LATIN SMALL LIGATURE ST

- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*editing.txt*   For Vim version 8.0.  Last change: 2018 Feb 19
+*editing.txt*   For Vim version 8.1.  Last change: 2018 Mar 29


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -424,6 +424,15 @@ 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
@@ -650,8 +659,7 @@ 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 available when compiled without the
-			|+listcmds| feature}
+			{not in Vi}
 			Note: you can also use this method: >
 				:args ## x
 <			This will add the "x" item and sort the new list.
@@ -665,8 +673,7 @@ list of the current window.
 			when it's deleted from the argument list.
 			Example: >
 				:argdel *.obj
-<			{not in Vi} {not available when compiled without the
-			|+listcmds| feature}
+<			{not in Vi}

 :[range]argd[elete]	Delete the {range} files from the argument list.
 			Example: >
@@ -681,8 +688,7 @@ 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 available when compiled without the
-			|+listcmds| feature}
+			{not in Vi}

 							*:argu* *:argument*
 :[count]argu[ment] [count] [++opt] [+cmd]
@@ -691,16 +697,14 @@ 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 available when compiled without the
-			|+listcmds| feature}
+			{not in Vi}

 :[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 available when compiled without the
-			|+listcmds| feature}
+			{not in Vi}

 :[count]n[ext] [++opt] [+cmd]			*:n* *:ne* *:next* *E165* *E163*
 			Edit [count] next file.  This fails when changes have
@@ -823,7 +827,6 @@ 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.
@@ -875,8 +878,7 @@ USING THE ARGUMENT LIST
 			autocommand event is disabled by adding it to
 			'eventignore'.  This considerably speeds up editing
 			each file.
-			{not in Vi} {not available when compiled without the
-			|+listcmds| feature}
+			{not in Vi}
 			Also see |:windo|, |:tabdo|, |:bufdo|, |:cdo|, |:ldo|,
 			|:cfdo| and |:lfdo|

@@ -899,8 +901,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* *E949*
 :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
@@ -1745,4 +1747,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:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*eval.txt*	For Vim version 8.0.  Last change: 2018 Mar 20
+*eval.txt*	For Vim version 8.1.  Last change: 2018 May 17


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1548,10 +1548,12 @@ v:errmsg	Last given error message.  It's allowed to set this variable.
 	:  ... handle error
 <		"errmsg" also works, for backwards compatibility.

-					*v:errors* *errors-variable*
+				*v:errors* *errors-variable* *assert-return*
 v:errors	Errors found by assert functions, such as |assert_true()|.
 		This is a list of strings.
 		The assert functions append an item when an assert fails.
+		The return value indicates this: a one is returned if an item
+		was added to v:errors, otherwise zero is returned.
 		To remove old results make it empty: >
 	:let v:errors = []
 <		If v:errors is set to anything but a list it is made an empty
@@ -2020,26 +2022,26 @@ argidx()			Number	current index in the argument list
 arglistid([{winnr} [, {tabnr}]]) Number	argument list id
 argv({nr})			String	{nr} entry of the argument list
 argv()				List	the argument list
-assert_beeps({cmd})		none	assert {cmd} causes a beep
+assert_beeps({cmd})		Number	assert {cmd} causes a beep
 assert_equal({exp}, {act} [, {msg}])
-				none	assert {exp} is equal to {act}
+				Number	assert {exp} is equal to {act}
 assert_equalfile({fname-one}, {fname-two})
-				none	assert file contents is equal
+				Number	assert file contents is equal
 assert_exception({error} [, {msg}])
-				none	assert {error} is in v:exception
-assert_fails({cmd} [, {error}])	none	assert {cmd} fails
+				Number	assert {error} is in v:exception
+assert_fails({cmd} [, {error}])	Number	assert {cmd} fails
 assert_false({actual} [, {msg}])
-				none	assert {actual} is false
+				Number	assert {actual} is false
 assert_inrange({lower}, {upper}, {actual} [, {msg}])
-				none	assert {actual} is inside the range
+				Number	assert {actual} is inside the range
 assert_match({pat}, {text} [, {msg}])
-				none	assert {pat} matches {text}
+				Number	assert {pat} matches {text}
 assert_notequal({exp}, {act} [, {msg}])
-				none	assert {exp} is not equal {act}
+				Number	assert {exp} is not equal {act}
 assert_notmatch({pat}, {text} [, {msg}])
-				none	assert {pat} not matches {text}
-assert_report({msg})		none	report a test failure
-assert_true({actual} [, {msg}])	none	assert {actual} is true
+				Number	assert {pat} not matches {text}
+assert_report({msg})		Number	report a test failure
+assert_true({actual} [, {msg}])	Number	assert {actual} is true
 asin({expr})			Float	arc sine of {expr}
 atan({expr})			Float	arc tangent of {expr}
 atan2({expr1}, {expr2})		Float	arc tangent of {expr1} / {expr2}
@@ -2106,8 +2108,11 @@ cscope_connection([{num}, {dbpath} [, {prepend}]])
 cursor({lnum}, {col} [, {off}])
 				Number	move cursor to {lnum}, {col}, {off}
 cursor({list})			Number	move cursor to position in {list}
+debugbreak({pid})		Number  interrupt process being debugged
 deepcopy({expr} [, {noref}])	any	make a full copy of {expr}
 delete({fname} [, {flags}])	Number	delete the file or directory {fname}
+deletebufline({expr}, {first}[, {last}])
+				Number	delete lines from buffer {expr}
 did_filetype()			Number	|TRUE| if FileType autocmd event used
 diff_filler({lnum})		Number	diff filler lines about {lnum}
 diff_hlID({lnum}, {col})	Number	diff highlighting at {lnum}/{col}
@@ -2191,7 +2196,7 @@ gettabvar({nr}, {varname} [, {def}])
 				any	variable {varname} in tab {nr} or {def}
 gettabwinvar({tabnr}, {winnr}, {name} [, {def}])
 				any	{name} in {winnr} in tab page {tabnr}
-getwininfo([{winid}])		List	list of windows
+getwininfo([{winid}])		List	list of info about each window
 getwinpos([{timeout}])		List	X and Y coord in pixels of the Vim window
 getwinposx()			Number	X coord in pixels of the Vim window
 getwinposy()			Number	Y coord in pixels of the Vim window
@@ -2234,7 +2239,7 @@ islocked({expr})		Number	|TRUE| if {expr} is locked
 isnan({expr})			Number	|TRUE| if {expr} is NaN
 items({dict})			List	key-value pairs in {dict}
 job_getchannel({job})		Channel	get the channel handle for {job}
-job_info({job})			Dict	get information about {job}
+job_info([{job}])		Dict	get information about {job}
 job_setoptions({job}, {options}) none	set options for {job}
 job_start({command} [, {options}])
 				Job	start a job
@@ -2286,14 +2291,16 @@ mode([expr])			String	current editing mode
 mzeval({expr})			any	evaluate |MzScheme| expression
 nextnonblank({lnum})		Number	line nr of non-blank line >= {lnum}
 nr2char({expr} [, {utf8}])	String	single char with ASCII/UTF8 value {expr}
-option_restore({list})		none	restore options saved by option_save()
-option_save({list})		List	save options values
 or({expr}, {expr})		Number	bitwise OR
 pathshorten({expr})		String	shorten directory names in a path
 perleval({expr})		any	evaluate |Perl| expression
 pow({x}, {y})			Float	{x} to the power of {y}
 prevnonblank({lnum})		Number	line nr of non-blank line <= {lnum}
 printf({fmt}, {expr1}...)	String	format text
+prompt_addtext({buf}, {expr})	none	add text to a prompt buffer
+prompt_setcallback({buf}, {expr}) none	set prompt callback function
+prompt_setinterrupt({buf}, {text}) none	set prompt interrupt function
+prompt_setprompt({buf}, {text}) none	set prompt text
 pumvisible()			Number	whether popup menu is visible
 pyeval({expr})			any	evaluate |Python| expression
 py3eval({expr})			any	evaluate |python3| expression
@@ -2302,6 +2309,8 @@ range({expr} [, {max} [, {stride}]])
 				List	items from {expr} to {max}
 readfile({fname} [, {binary} [, {max}]])
 				List	get list of lines from file {fname}
+reg_executing()			String	get the executing register name
+reg_recording()			String	get the recording register name
 reltime([{start} [, {end}]])	List	get time value
 reltimefloat({time})		Float	turn the time value into a Float
 reltimestr({time})		String	turn time value into a String
@@ -2423,6 +2432,7 @@ term_dumpload({filename} [, {options}])
 term_dumpwrite({buf}, {filename} [, {options}])
 				none	dump terminal window contents
 term_getaltscreen({buf})	Number	get the alternate screen flag
+term_getansicolors({buf})	List	get ANSI palette in GUI color mode
 term_getattr({attr}, {what})	Number	get the value of attribute {what}
 term_getcursor({buf})		List	get the cursor position of a terminal
 term_getjob({buf})		Job	get the job associated with a terminal
@@ -2435,8 +2445,12 @@ term_gettty({buf}, [{input}])	String	get the tty name of a terminal
 term_list()			List	get the list of terminal buffers
 term_scrape({buf}, {row})	List	get row of a terminal screen
 term_sendkeys({buf}, {keys})	none	send keystrokes to a terminal
-term_setkill({buf}, {how}) 	none	set signal to stop job in terminal
+term_setansicolors({buf}, {colors})
+				none	set ANSI palette in GUI color mode
+term_setkill({buf}, {how})	none	set signal to stop job in terminal
 term_setrestore({buf}, {command}) none	set command to restore terminal
+term_setsize({buf}, {rows}, {cols})
+				none	set the size of a terminal
 term_start({cmd}, {options})	Job	open a terminal window and run a job
 term_wait({buf} [, {time}])	Number  wait for screen to be updated
 test_alloc_fail({id}, {countdown}, {repeat})
@@ -2463,7 +2477,7 @@ tolower({expr})			String	the String {expr} switched to lowercase
 toupper({expr})			String	the String {expr} switched to uppercase
 tr({src}, {fromstr}, {tostr})	String	translate chars of {src} in {fromstr}
 					to chars in {tostr}
-trim({text}[, {mask}]) 		String	trim characters in {mask} from {text}
+trim({text}[, {mask}])		String	trim characters in {mask} from {text}
 trunc({expr})			Float	truncate Float {expr}
 type({name})			Number	type of variable {name}
 undofile({name})		String	undo file name for {name}
@@ -2550,6 +2564,21 @@ append({lnum}, {expr})					*append()*
 		0 for success.  Example: >
 			:let failed = append(line('$'), "# THE END")
 			:let failed = append(0, ["Chapter 1", "the beginning"])
+
+appendbufline({expr}, {lnum}, {text})			*appendbufline()*
+		Like |append()| but append the text in buffer {expr}.
+
+		For the use of {expr}, see |bufname()|.
+
+		{lnum} is used like with |append()|.  Note that using |line()|
+		would use the current buffer, not the one appending to.
+		Use "$" to append at the end of the buffer.
+
+		On success 0 is returned, on failure 1 is returned.
+
+		If {expr} is not a valid buffer or {lnum} is not valid, an
+		error message is given. Example: >
+			:let failed = appendbufline(13, 0, "# THE START")
 <
 							*argc()*
 argc()		The result is the number of files in the argument list of the
@@ -2588,12 +2617,13 @@ argv([{nr}])	The result is the {nr}th file in the argument list of the
 assert_beeps({cmd})					*assert_beeps()*
 		Run {cmd} and add an error message to |v:errors| if it does
 		NOT produce a beep or visual bell.
-		Also see |assert_fails()|.
+		Also see |assert_fails()| and |assert-return|.

 							*assert_equal()*
 assert_equal({expected}, {actual} [, {msg}])
 		When {expected} and {actual} are not equal an error message is
-		added to |v:errors|.
+		added to |v:errors| and 1 is returned.  Otherwise zero is
+		returned |assert-return|.
 		There is no automatic conversion, the String "4" is different
 		from the Number 4.  And the number 4 is different from the
 		Float 4.0.  The value of 'ignorecase' is not used here, case
@@ -2609,13 +2639,14 @@ assert_equal({expected}, {actual} [, {msg}])
 assert_equalfile({fname-one}, {fname-two})
 		When the files {fname-one} and {fname-two} do not contain
 		exactly the same text an error message is added to |v:errors|.
+		Also see |assert-return|.
 		When {fname-one} or {fname-two} does not exist the error will
 		mention that.
 		Mainly useful with |terminal-diff|.

 assert_exception({error} [, {msg}])			*assert_exception()*
 		When v:exception does not contain the string {error} an error
-		message is added to |v:errors|.
+		message is added to |v:errors|.  Also see |assert-return|.
 		This can be used to assert that a command throws an exception.
 		Using the error number, followed by a colon, avoids problems
 		with translations: >
@@ -2628,14 +2659,15 @@ assert_exception({error} [, {msg}])			*assert_exception()*

 assert_fails({cmd} [, {error}])					*assert_fails()*
 		Run {cmd} and add an error message to |v:errors| if it does
-		NOT produce an error.
+		NOT produce an error.  Also see |assert-return|.
 		When {error} is given it must match in |v:errmsg|.
 		Note that beeping is not considered an error, and some failing
 		commands only beep.  Use |assert_beeps()| for those.

 assert_false({actual} [, {msg}])				*assert_false()*
 		When {actual} is not false an error message is added to
-		|v:errors|, like with |assert_equal()|.
+		|v:errors|, like with |assert_equal()|. 
+		Also see |assert-return|.
 		A value is false when it is zero. When {actual} is not a
 		number the assert fails.
 		When {msg} is omitted an error in the form
@@ -2644,7 +2676,7 @@ assert_false({actual} [, {msg}])				*assert_false()*
 assert_inrange({lower}, {upper}, {actual} [, {msg}])	 *assert_inrange()*
 		This asserts number values.  When {actual}  is lower than
 		{lower} or higher than {upper} an error message is added to
-		|v:errors|.
+		|v:errors|.  Also see |assert-return|.
 		When {msg} is omitted an error in the form
 		"Expected range {lower} - {upper}, but got {actual}" is
 		produced.
@@ -2652,7 +2684,7 @@ assert_inrange({lower}, {upper}, {actual} [, {msg}])	 *assert_inrange()*
 								*assert_match()*
 assert_match({pattern}, {actual} [, {msg}])
 		When {pattern} does not match {actual} an error message is
-		added to |v:errors|.
+		added to |v:errors|.  Also see |assert-return|.

 		{pattern} is used as with |=~|: The matching is always done
 		like 'magic' was set and 'cpoptions' is empty, no matter what
@@ -2673,18 +2705,22 @@ assert_match({pattern}, {actual} [, {msg}])
 assert_notequal({expected}, {actual} [, {msg}])
 		The opposite of `assert_equal()`: add an error message to
 		|v:errors| when {expected} and {actual} are equal.
+		Also see |assert-return|.

 							*assert_notmatch()*
 assert_notmatch({pattern}, {actual} [, {msg}])
 		The opposite of `assert_match()`: add an error message to
 		|v:errors| when {pattern} matches {actual}.
+		Also see |assert-return|.

 assert_report({msg})					*assert_report()*
 		Report a test failure directly, using {msg}.
+		Always returns one.

 assert_true({actual} [, {msg}])				*assert_true()*
 		When {actual} is not true an error message is added to
 		|v:errors|, like with |assert_equal()|.
+		Also see |assert-return|.
 		A value is TRUE when it is a non-zero number.  When {actual}
 		is not a number the assert fails.
 		When {msg} is omitted an error in the form "Expected True but
@@ -3445,6 +3481,11 @@ cursor({list})
 		position within a <Tab> or after the last character.
 		Returns 0 when the position could be set, -1 otherwise.

+debugbreak({pid})					*debugbreak()*
+		Specifically used to interrupt a program being debugged.  It
+		will cause process {pid} to get a SIGTRAP.  Behavior for other
+		processes is undefined. See |terminal-debugger|.
+		{only available on MS-Windows}

 deepcopy({expr} [, {noref}])				*deepcopy()* *E698*
 		Make a copy of {expr}.  For Numbers and Strings this isn't
@@ -3485,8 +3526,19 @@ delete({fname} [, {flags}])					*delete()*
 		successful and -1 when the deletion failed or partly failed.

 		Use |remove()| to delete an item from a |List|.
-		To delete a line from the buffer use |:delete|.  Use |:exe|
-		when the line number is in a variable.
+		To delete a line from the buffer use |:delete| or
+		|deletebufline()|.
+
+deletebufline({expr}, {first}[, {last}])		*deletebufline()*
+		Delete lines {first} to {last} (inclusive) from buffer {expr}.
+		If {last} is omitted then delete line {first} only.
+		On success 0 is returned, on failure 1 is returned.
+
+		For the use of {expr}, see |bufname()| above.
+
+		{first} and {last} are used like with |setline()|. Note that
+		when using |line()| this refers to the current buffer. Use "$"
+		to refer to the last line in buffer {expr}.

 							*did_filetype()*
 did_filetype()	Returns |TRUE| when autocommands are being executed and the
@@ -3577,6 +3629,7 @@ executable({expr})					*executable()*
 			1	exists
 			0	does not exist
 			-1	not implemented on this system
+		|exepath()| can be used to get the full path of an executable.

 execute({command} [, {silent}])					*execute()*
 		Execute an Ex command or commands and return the output as a
@@ -4469,6 +4522,7 @@ getcompletion({pat}, {type} [, {filtered}])		*getcompletion()*
 		specifies what for.  The following completion types are
 		supported:

+		arglist		file names in argument list
 		augroup		autocmd groups
 		buffer		buffer names
 		behave		:behave suboptions
@@ -4635,7 +4689,7 @@ getline({lnum} [, {end}])
 		from the current buffer.  Example: >
 			getline(1)
 <		When {lnum} is a String that doesn't start with a
-		digit, line() is called to translate the String into a Number.
+		digit, |line()| is called to translate the String into a Number.
 		To get the line under the cursor: >
 			getline(".")
 <		When {lnum} is smaller than 1 or bigger than the number of
@@ -4722,6 +4776,7 @@ getqflist([{what}])					*getqflist()*
 		list item is a dictionary with these entries:
 			bufnr	number of buffer that has the file name, use
 				bufname() to get the name
+			module	module name
 			lnum	line number in the buffer (first line is 1)
 			col	column number (first column is 1)
 			vcol	|TRUE|: "col" is visual column
@@ -4747,8 +4802,8 @@ getqflist([{what}])					*getqflist()*
 		returns only the items listed in {what} as a dictionary. The
 		following string items are supported in {what}:
 			changedtick	get the total number of changes made
-					to the list
-			context	get the context stored with |setqflist()|
+					to the list |quickfix-changedtick|
+			context	get the |quickfix-context|
 			efm	errorformat to use when parsing "lines". If
 				not present, then the 'errorformat' option
 				value is used.
@@ -4757,15 +4812,15 @@ getqflist([{what}])					*getqflist()*
 				current list or the list specified by "nr"
 			idx	index of the current entry in the list
 			items	quickfix list entries
-			lines	use 'errorformat' to extract items from a list
-				of lines and return the resulting entries.
-				Only a |List| type is accepted.  The current
-				quickfix list is not modified.
+			lines	parse a list of lines using 'efm' and return
+				the resulting entries.  Only a |List| type is
+				accepted.  The current quickfix list is not
+				modified. See |quickfix-parse|.
 			nr	get information for this quickfix list; zero
 				means the current quickfix list and "$" means
 				the last quickfix list
 			size	number of entries in the quickfix list
-			title	get the list title
+			title	get the list title |quickfix-title|
 			winid	get the quickfix |window-ID|
 			all	all of the above quickfix properties
 		Non-string items in {what} are ignored. To get the value of a
@@ -4783,7 +4838,7 @@ getqflist([{what}])					*getqflist()*
 		The returned dictionary contains the following entries:
 			changedtick	total number of changes made to the
 					list |quickfix-changedtick|
-			context	context information stored with |setqflist()|.
+			context	quickfix list context. See |quickfix-context|
 				If not present, set to "".
 			id	quickfix list ID |quickfix-ID|. If not
 				present, set to 0.
@@ -4798,12 +4853,11 @@ getqflist([{what}])					*getqflist()*
 				to "".
 			winid	quickfix |window-ID|. If not present, set to 0

-		Examples: >
+		Examples (See also |getqflist-examples|): >
 			:echo getqflist({'all': 1})
 			:echo getqflist({'nr': 2, 'title': 1})
 			:echo getqflist({'lines' : ["F1:10:L10"]})
 <
-
 getreg([{regname} [, 1 [, {list}]]])			*getreg()*
 		The result is a String, which is the contents of register
 		{regname}.  Example: >
@@ -4882,6 +4936,41 @@ gettabwinvar({tabnr}, {winnr}, {varname} [, {def}])		*gettabwinvar()*
 			:let list_is_on = gettabwinvar(1, 2, '&list')
 			:echo "myvar = " . gettabwinvar(3, 1, 'myvar')
 <
+		To obtain all window-local variables use: >
+			gettabwinvar({tabnr}, {winnr}, '&')
+
+getwininfo([{winid}])					*getwininfo()*
+		Returns information about windows as a List with Dictionaries.
+
+		If {winid} is given Information about the window with that ID
+		is returned.  If the window does not exist the result is an
+		empty list.
+
+		Without {winid} information about all the windows in all the
+		tab pages is returned.
+
+		Each List item is a Dictionary with the following entries:
+			bufnr		number of buffer in the window
+			height		window height (excluding winbar)
+			loclist		1 if showing a location list
+					{only with the +quickfix feature}
+			quickfix	1 if quickfix or location list window
+					{only with the +quickfix feature}
+			terminal	1 if a terminal window
+					{only with the +terminal feature}
+			tabnr		tab page number
+			variables	a reference to the dictionary with
+					window-local variables
+			width		window width
+			winbar		1 if the window has a toolbar, 0
+					otherwise
+			wincol		leftmost screen column of the window,
+					col from |win_screenpos()|
+			winid		|window-ID|
+			winnr		window number
+			winrow		topmost screen column of the window,
+					row from |win_screenpos()|
+
 getwinpos([{timeout}])					*getwinpos()*
 		The result is a list with two numbers, the result of
 		getwinposx() and getwinposy() combined: 
@@ -4915,37 +5004,6 @@ getwinposy()	The result is a Number, which is the Y coordinate in pixels of
 		The result will be -1 if the information is not available.
 		The value can be used with `:winpos`.

-getwininfo([{winid}])					*getwininfo()*
-		Returns information about windows as a List with Dictionaries.
-
-		If {winid} is given Information about the window with that ID
-		is returned.  If the window does not exist the result is an
-		empty list.
-
-		Without {winid} information about all the windows in all the
-		tab pages is returned.
-
-		Each List item is a Dictionary with the following entries:
-			bufnr		number of buffer in the window
-			height		window height (excluding winbar)
-			winbar		1 if the window has a toolbar, 0
-					otherwise
-			loclist		1 if showing a location list
-					{only with the +quickfix feature}
-			quickfix	1 if quickfix or location list window
-					{only with the +quickfix feature}
-			terminal	1 if a terminal window
-					{only with the +terminal feature}
-			tabnr		tab page number
-			variables	a reference to the dictionary with
-					window-local variables
-			width		window width
-			winid		|window-ID|
-			winnr		window number
-
-		To obtain all window-local variables use: >
-			gettabwinvar({tabnr}, {winnr}, '&')
-
 getwinvar({winnr}, {varname} [, {def}])				*getwinvar()*
 		Like |gettabwinvar()| for the current tabpage.
 		Examples: >
@@ -5386,10 +5444,11 @@ job_getchannel({job})					 *job_getchannel()*
 <
 		{only available when compiled with the |+job| feature}

-job_info({job})						*job_info()*
+job_info([{job}])					*job_info()*
 		Returns a Dictionary with information about {job}:
 		   "status"	what |job_status()| returns
 		   "channel"	what |job_getchannel()| returns
+		   "cmd"	List of command arguments used to start the job
 		   "process"	process ID
 		   "tty_in"	terminal input name, empty when none
 		   "tty_out"	terminal output name, empty when none
@@ -5397,6 +5456,8 @@ job_info({job})						*job_info()*
 		   "exit_cb"	function to be called on exit
 		   "stoponexit"	|job-stoponexit|

+		Without any arguments, returns a List with all Job objects.
+
 job_setoptions({job}, {options})			*job_setoptions()*
 		Change options for {job}.  Supported are:
 		   "stoponexit"	|job-stoponexit|
@@ -5438,6 +5499,20 @@ job_start({command} [, {options}])			*job_start()*
 		The returned Job object can be used to get the status with
 		|job_status()| and stop the job with |job_stop()|.

+		Note that the job object will be deleted if there are no
+		references to it.  This closes the stdin and stderr, which may
+		cause the job to fail with an error.  To avoid this keep a
+		reference to the job.  Thus instead of: >
+	call job_start('my-command')
+<		use: >
+	let myjob = job_start('my-command')
+<		and unlet "myjob" once the job is not needed or is past the
+		point where it would fail (e.g. when it prints a message on
+		startup).  Keep in mind that variables local to a function
+		will cease to exist if the function returns.  Use a
+		script-local variable if needed: >
+	let s:myjob = job_start('my-command')
+<
 		{options} must be a Dictionary.  It can contain many optional
 		items, see |job-options|.

@@ -5804,7 +5879,8 @@ maparg({name} [, {mode} [, {abbr} [, {dict}]]])			*maparg()*
 		listing.

 		When there is no mapping for {name}, an empty String is
-		returned.
+		returned.  When the mapping for {name} is empty, then "<Nop>"
+		is returned.

 		The {name} can have special key names, like in the ":map"
 		command.
@@ -5871,9 +5947,10 @@ mapcheck({name} [, {mode} [, {abbr}]])			*mapcheck()*
 		mapping that matches with {name}, while maparg() only finds a
 		mapping for {name} exactly.
 		When there is no mapping that starts with {name}, an empty
-		String is returned.  If there is one, the rhs of that mapping
+		String is returned.  If there is one, the RHS of that mapping
 		is returned.  If there are several mappings that start with
-		{name}, the rhs of one of them is returned.
+		{name}, the RHS of one of them is returned.  This will be
+		"<Nop>" if the RHS is empty.
 		The mappings local to the current buffer are checked first,
 		then the global mappings.
 		This function can be used to check if a mapping can be added
@@ -5939,7 +6016,7 @@ match({expr}, {pat} [, {start} [, {count}]])			*match()*
 		the pattern.  'smartcase' is NOT used.  The matching is always
 		done like 'magic' is set and 'cpoptions' is empty.

-					*matchadd()* *E798* *E799* *E801*
+				*matchadd()* *E798* *E799* *E801* *E957*
 matchadd({group}, {pattern} [, {priority} [, {id} [, {dict}]]])
 		Defines a pattern to be highlighted in the current window (a
 		"match").  It will be highlighted with {group}.  Returns an
@@ -5978,6 +6055,8 @@ matchadd({group}, {pattern} [, {priority} [, {id} [, {dict}]]])
 			conceal	    Special character to show instead of the
 				    match (only for |hl-Conceal| highlighted
 				    matches, see |:syn-cchar|)
+			window	    Instead of the current window use the
+				    window with this number or window ID.

 		The number of matches is not limited, as it is the case with
 		the |:match| commands.
@@ -6134,6 +6213,8 @@ mkdir({name} [, {path} [, {prot}]])
 		Example: >
 			:call mkdir($HOME . "/tmp/foo/bar", "p", 0700)
 <		This function is not available in the |sandbox|.
+		There is no error if the directory already exists and the "p"
+		flag is passed (since patch 8.0.1708).
 		Not available on all systems.  To check use: >
 			:if exists("*mkdir")
 <
@@ -6143,32 +6224,38 @@ mode([expr])	Return a string that indicates the current mode.
 		a non-empty String (|non-zero-arg|), then the full mode is
 		returned, otherwise only the first letter is returned.

-			n	Normal, Terminal-Normal
-			no	Operator-pending
-			v	Visual by character
-			V	Visual by line
-			CTRL-V	Visual blockwise
-			s	Select by character
-			S	Select by line
-			CTRL-S	Select blockwise
-			i	Insert
-			ic	Insert mode completion |compl-generic|
-			ix	Insert mode |i_CTRL-X| completion
-			R	Replace |R|
-			Rc	Replace mode completion |compl-generic|
-			Rv	Virtual Replace |gR|
-			Rx	Replace mode |i_CTRL-X| completion
-			c	Command-line editing
-			cv	Vim Ex mode |gQ|
-			ce	Normal Ex mode |Q|
-			r	Hit-enter prompt
-			rm	The -- more -- prompt
-			r?	A |:confirm| query of some sort
-			!	Shell or external command is executing
-			t	Terminal-Job mode: keys go to the job
+		   n	    Normal, Terminal-Normal
+		   no	    Operator-pending
+		   niI	    Normal using |i_CTRL-O| in |Insert-mode|
+		   niR	    Normal using |i_CTRL-O| in |Replace-mode|
+		   niV	    Normal using |i_CTRL-O| in |Virtual-Replace-mode|
+		   v	    Visual by character
+		   V	    Visual by line
+		   CTRL-V   Visual blockwise
+		   s	    Select by character
+		   S	    Select by line
+		   CTRL-S   Select blockwise
+		   i	    Insert
+		   ic	    Insert mode completion |compl-generic|
+		   ix	    Insert mode |i_CTRL-X| completion
+		   R	    Replace |R|
+		   Rc	    Replace mode completion |compl-generic|
+		   Rv	    Virtual Replace |gR|
+		   Rx	    Replace mode |i_CTRL-X| completion
+		   c	    Command-line editing
+		   cv	    Vim Ex mode |gQ|
+		   ce	    Normal Ex mode |Q|
+		   r	    Hit-enter prompt
+		   rm	    The -- more -- prompt
+		   r?	    A |:confirm| query of some sort
+		   !	    Shell or external command is executing
+		   t	    Terminal-Job mode: keys go to the job
 		This is useful in the 'statusline' option or when used
 		with |remote_expr()| In most other places it always returns
 		"c" or "n".
+		Note that in the future more modes and more specific modes may
+		be added. It's better not to compare the whole string but only
+		the leading character(s).
 		Also see |visualmode()|.

 mzeval({expr})							*mzeval()*
@@ -6210,31 +6297,6 @@ nr2char({expr} [, {utf8}])				*nr2char()*
 		characters.  nr2char(0) is a real NUL and terminates the
 		string, thus results in an empty string.

-option_restore({list})					*option_restore()*
-		Restore options previously saved by option_save().
-		When buffer-local options have been saved, this function must
-		be called when the same buffer is the current buffer.
-		When window-local options have been saved, this function must
-		be called when the same window is the current window.
-		When in the wrong buffer and/or window an error is given and
-		the local options won't be restored.
-		NOT IMPLEMENTED YET!
-
-option_save({list})					*option_save()*
-		Saves the options named in {list}.  The returned value can be
-		passed to option_restore().  Example: >
-			let s:saved_options = option_save([
-			    \ 'ignorecase',
-			    \ 'iskeyword',
-			    \ ])
-			 au <buffer> BufLeave *
-			    \ call option_restore(s:saved_options)
-<		The advantage over using `:let` is that global and local
-		values are handled and the script ID is restored, so that
-		`:verbose set` will show where the option was originally set,
-		not where it was restored.
-		NOT IMPLEMENTED YET!
-
 or({expr}, {expr})					*or()*
 		Bitwise OR on the two arguments.  The arguments are converted
 		to a number.  A List, Dict or Float argument causes an error.
@@ -6478,6 +6540,52 @@ printf({fmt}, {expr1} ...)				*printf()*
 		arguments an error is given.  Up to 18 arguments can be used.


+prompt_setcallback({buf}, {expr})			*prompt_setcallback()*
+		Set prompt callback for buffer {buf} to {expr}.  When {expr}
+		is an empty string the callback is removed.  This has only
+		effect if {buf} has 'buftype' set to "prompt".
+
+		The callback is invoked when pressing Enter.  The current
+		buffer will always be the prompt buffer.  A new line for a
+		prompt is added before invoking the callback, thus the prompt
+		for which the callback was invoked will be in the last but one
+		line.
+		If the callback wants to add text to the buffer, it must
+		insert it above the last line, since that is where the current
+		prompt is.  This can also be done asynchronously.
+		The callback is invoked with one argument, which is the text
+		that was entered at the prompt.  This can be an empty string
+		if the user only typed Enter.
+		Example: >
+		   call prompt_setcallback(bufnr(''), function('s:TextEntered'))
+		   func s:TextEntered(text)
+		     if a:text == 'exit' || a:text == 'quit'
+		       stopinsert
+		       close
+		     else
+		       call append(line('$') - 1, 'Entered: "' . a:text . '"')
+		       " Reset 'modified' to allow the buffer to be closed.
+		       set nomodified
+		     endif
+		   endfunc
+
+prompt_setinterrupt({buf}, {expr})			*prompt_setinterrupt()*
+		Set a callback for buffer {buf} to {expr}.  When {expr} is an
+		empty string the callback is removed.  This has only effect if
+		{buf} has 'buftype' set to "prompt".
+
+		This callback will be invoked when pressing CTRL-C in Insert
+		mode.  Without setting a callback Vim will exit Insert mode,
+		as in any buffer.
+
+prompt_setprompt({buf}, {text})				*prompt_setprompt()*
+		Set prompt for buffer {buf} to {text}.  You most likely want
+		{text} to end in a space.
+		The result is only visible if {buf} has 'buftype' set to
+		"prompt".  Example: >
+			call prompt_setprompt(bufnr(''), 'command: ')
+
+
 pumvisible()						*pumvisible()*
 		Returns non-zero when the popup menu is visible, zero
 		otherwise.  See |ins-completion-menu|.
@@ -6565,6 +6673,15 @@ readfile({fname} [, {binary} [, {max}]])
 		the result is an empty list.
 		Also see |writefile()|.

+reg_executing()						*reg_executing()*
+		Returns the single letter name of the register being executed.
+		Returns an empty string when no register is being executed.
+		See |@|.
+
+reg_recording()						*reg_recording()*
+		Returns the single letter name of the register being recorded.
+		Returns an empty string string when not recording.  See |q|.
+
 reltime([{start} [, {end}]])				*reltime()*
 		Return an item that represents a time value.  The format of
 		the item depends on the system.  It can be passed to
@@ -6949,6 +7066,7 @@ searchpair({start}, {middle}, {end} [, {flags} [, {skip}
 		When evaluating {skip} causes an error the search is aborted
 		and -1 returned.
 		{skip} can be a string, a lambda, a funcref or a partial.
+		Anything else makes the function fail.

 		For {stopline} and {timeout} see |search()|.

@@ -7227,6 +7345,8 @@ setqflist({list} [, {action} [, {what}]])		*setqflist()*
 				buffer
 		    filename	name of a file; only used when "bufnr" is not
 				present or it is invalid.
+		    module	name of a module; if given it will be used in
+				quickfix error window instead of the filename.
 		    lnum	line number in the file
 		    pattern	search pattern used to locate the error
 		    col		column number
@@ -7275,7 +7395,7 @@ setqflist({list} [, {action} [, {what}]])		*setqflist()*
 		only the items listed in {what} are set. The first {list}
 		argument is ignored.  The following items can be specified in
 		{what}:
-		    context	any Vim type can be stored as a context
+		    context	quickfix list context. See |quickfix-context|
 		    efm		errorformat to use when parsing text from
 				"lines". If this is not present, then the
 				'errorformat' option value is used.
@@ -7297,10 +7417,10 @@ setqflist({list} [, {action} [, {what}]])		*setqflist()*
 		list is modified, "id" should be used instead of "nr" to
 		specify the list.

-		Examples: >
+		Examples (See also |setqflist-examples|): >
 		   :call setqflist([], 'r', {'title': 'My search'})
 		   :call setqflist([], 'r', {'nr': 2, 'title': 'Errors'})
-		   :call setqflist([], 'a', {'id':myid, 'lines':["F1:10:L10"]})
+		   :call setqflist([], 'a', {'id':qfid, 'lines':["F1:10:L10"]})
 <
 		Returns zero for success, -1 for failure.

@@ -8196,9 +8316,9 @@ term_dumpdiff({filename}, {filename} [, {options}])
 		   "term_name"	     name to use for the buffer name, instead
 				     of the first file name.
 		   "term_rows"	     vertical size to use for the terminal,
-				     instead of using 'termsize'
+				     instead of using 'termwinsize'
 		   "term_cols"	     horizontal size to use for the terminal,
-				     instead of using 'termsize'
+				     instead of using 'termwinsize'
 		   "vertical"	     split the window vertically
 		   "curwin"	     use the current window, do not split the
 				     window; fails if the current buffer
@@ -8247,6 +8367,18 @@ term_getaltscreen({buf})				*term_getaltscreen()*
 		{buf} is used as with |term_getsize()|.
 		{only available when compiled with the |+terminal| feature}

+term_getansicolors({buf})				*term_getansicolors()*
+		Get the ANSI color palette in use by terminal {buf}.
+		Returns a List of length 16 where each element is a String
+		representing a color in hexadecimal "#rrggbb" format.
+		Also see |term_setansicolors()| and |g:terminal_ansi_colors|.
+		If neither was used returns the default colors.
+
+		{buf} is used as with |term_getsize()|.  If the buffer does not
+		exist or is not a terminal window, an empty list is returned.
+		{only available when compiled with the |+terminal| feature and
+		with GUI enabled and/or the |+termguicolors| feature}
+
 term_getattr({attr}, {what})				*term_getattr()*
 		Given {attr}, a value returned by term_scrape() in the "attr"
 		item, return whether {what} is on.  {what} can be one of:
@@ -8378,6 +8510,37 @@ term_sendkeys({buf}, {keys})				*term_sendkeys()*
 		means the character CTRL-X.
 		{only available when compiled with the |+terminal| feature}

+term_setansicolors({buf}, {colors})			*term_setansicolors()*
+		Set the ANSI color palette used by terminal {buf}.
+		{colors} must be a List of 16 valid color names or hexadecimal
+		color codes, like those accepted by |highlight-guifg|.
+		Also see |term_getansicolors()| and |g:terminal_ansi_colors|.
+
+		The colors normally are:
+			0    black
+			1    dark red
+			2    dark green
+			3    brown
+			4    dark blue
+			5    dark magenta
+			6    dark cyan
+			7    light grey
+			8    dark grey
+			9    red
+			10   green
+			11   yellow
+			12   blue
+			13   magenta
+			14   cyan
+			15   white
+
+		These colors are used in the GUI and in the terminal when
+		'termguicolors' is set.  When not using GUI colors (GUI mode
+		or 'termguicolors'), the terminal window always uses the 16
+		ANSI colors of the underlying terminal.
+		{only available when compiled with the |+terminal| feature and
+		with GUI enabled and/or the |+termguicolors| feature}
+
 term_setkill({buf}, {how})				*term_setkill()*
 		When exiting Vim or trying to close the terminal window in
 		another way, {how} defines whether the job in the terminal can
@@ -8400,8 +8563,15 @@ term_setrestore({buf}, {command})			*term_setrestore()*
 		Use "NONE" to not restore this window.
 		{only available when compiled with the |+terminal| feature}

-term_setsize({buf}, {expr})				*term_setsize()*
-		Not implemented yet.
+term_setsize({buf}, {rows}, {cols})		*term_setsize()* *E955*
+		Set the size of terminal {buf}. The size of the window
+		containing the terminal will also be adjusted, if possible.
+		If {rows} or {cols} is zero or negative, that dimension is not
+		changed.
+
+		{buf} must be the buffer number of a terminal window.  Use an
+		empty string for the current buffer.  If the buffer does not
+		exist or is not a terminal window, an error is given.
 		{only available when compiled with the |+terminal| feature}

 term_start({cmd}, {options})				*term_start()*
@@ -8435,10 +8605,12 @@ term_start({cmd}, {options})				*term_start()*
 		   "term_name"	     name to use for the buffer name, instead
 				     of the command name.
 		   "term_rows"	     vertical size to use for the terminal,
-				     instead of using 'termsize'
+				     instead of using 'termwinsize'
 		   "term_cols"	     horizontal size to use for the terminal,
-				     instead of using 'termsize'
-		   "vertical"	     split the window vertically
+				     instead of using 'termwinsize'
+		   "vertical"	     split the window vertically; note that
+				     other window position can be defined with
+				     command modifiers, such as |:belowright|.
 		   "curwin"	     use the current window, do not split the
 				     window; fails if the current buffer
 				     cannot be |abandon|ed
@@ -8462,6 +8634,9 @@ term_start({cmd}, {options})				*term_start()*
 				     CTRL-D is used on MS-Windows. For Python
 				     use CTRL-Z or "exit()". For a shell use
 				     "exit".  A CR is always added.
+		   "ansi_colors"     A list of 16 color names or hex codes
+				     defining the ANSI palette used in GUI
+				     color modes.  See |g:terminal_ansi_colors|.

 		{only available when compiled with the |+terminal| feature}

@@ -8533,6 +8708,8 @@ test_override({name}, {val})				*test_override()*
 		redraw       disable the redrawing() function
 		char_avail   disable the char_avail() function
 		starting     reset the "starting" variable, see below
+		nfa_fail     makes the NFA regexp engine fail to force a
+			     fallback to the old engine
 		ALL	     clear all overrides ({val} is not used)

 		"starting" is to be used when a test should behave like
@@ -8669,12 +8846,12 @@ trim({text}[, {mask}])						*trim()*
 		This code deals with multibyte characters properly.

 		Examples: >
-			echo trim("  \r\t\t\r RESERVE \t \t\n\x0B\x0B")."_TAIL"
+			echo trim("   some text ")
+<		returns "some text" >
+			echo trim("  \r\t\t\r RESERVE \t\n\x0B\xA0") . "_TAIL"
 <		returns "RESERVE_TAIL" >
-			echo trim("needrmvRESERVEnnneeedddrrmmmmvv", "ednmrv")
-<		returns "RESERVE" >
-			echo trim("rm<blob1><blob2><any_chars>rrmm<blob1><blob2><blob2>", "rm<blob1><blob2>")
-<		returns "any_chas"
+			echo trim("rm<Xrm<>X>rrm", "rm<>")
+<		returns "Xrm<>X" (characters in the middle are not removed)

 trunc({expr})							*trunc()*
 		Return the largest integral value with magnitude less than or
@@ -8882,7 +9059,7 @@ win_id2win({expr})					*win_id2win()*
 win_screenpos({nr})					*win_screenpos()*
 		Return the screen position of window {nr} as a list with two
 		numbers: [row, col].  The first window always has position
-		[1, 1].
+		[1, 1], unless there is a tabline, then it is [2, 1].
 		{nr} can be the window number or the |window-ID|.
 		Return [0, 0] if the window cannot be found in the current
 		tabpage.
@@ -9073,22 +9250,16 @@ There are four types of features:
    Example: >
 	:if has("gui_running")
 <							*has-patch*
-3.  Included patches.  The "patch123" feature means that patch 123 has been
-    included.  Note that this form does not check the version of Vim, you need
-    to inspect |v:version| for that.
-    Example (checking version 6.2.148 or later): >
-	:if v:version > 602 || v:version == 602 && has("patch148")
-<    Note that it's possible for patch 147 to be omitted even though 148 is
-    included.
-
-4.  Beyond a certain version or at a certain version and including a specific
-    patch.  The "patch-7.4.237" feature means that the Vim version is 7.5 or
-    later, or it is version 7.4 and patch 237 was included.
-    Note that this only works for patch 7.4.237 and later, before that you
-    need to use the example above that checks v:version.  Example: >
+3.  Beyond a certain version or at a certain version and including a specific
+    patch.  The "patch-7.4.248" feature means that the Vim version is 7.5 or
+    later, or it is version 7.4 and patch 248 was included.  Example: >
 	:if has("patch-7.4.248")
-<    Note that it's possible for patch 147 to be omitted even though 148 is
-    included.
+<    Note that it's possible for patch 248 to be omitted even though 249 is
+    included.  Only happens when cherry-picking patches.
+    Note that this form only works for patch 7.4.237 and later, before that
+    you need to check for the patch and the  v:version.  Example (checking
+    version 6.2.148 or later): >
+	:if v:version > 602 || (v:version == 602 && has("patch148"))

 Hint: To find out if Vim supports backslashes in a file name (MS-Windows),
 use: `if exists('+shellslash')`
@@ -9100,6 +9271,7 @@ amiga			Amiga version of Vim.
 arabic			Compiled with Arabic support |Arabic|.
 arp			Compiled with ARP support (Amiga).
 autocmd			Compiled with autocommand support. |autocommand|
+autochdir		Compiled with support for 'autochdir'
 autoservername		Automatically enable |clientserver|
 balloon_eval		Compiled with |balloon-eval| support.
 balloon_multiline	GUI supports multiline balloons.
@@ -9252,6 +9424,7 @@ tgetent			Compiled with tgetent support, able to use a termcap
 timers			Compiled with |timer_start()| support.
 title			Compiled with window title support |'title'|.
 toolbar			Compiled with support for |gui-toolbar|.
+touchbar		Compiled with support for Touch Bar in MacVim.
 transparency            Compiled with 'transparency' support.
 ttyin			input is a terminal (tty)
 ttyout			output is a terminal (tty)
@@ -9274,11 +9447,12 @@ vtp			Compiled for vcon support |+vtp| (check vcon to find
 			out if it works in the current console).
 wildignore		Compiled with 'wildignore' option.
 wildmenu		Compiled with 'wildmenu' option.
+win16			old version for MS-Windows 3.1 (always False)
 win32			Win32 version of Vim (MS-Windows 95 and later, 32 or
 			64 bits)
 win32unix		Win32 version of Vim, using Unix files (Cygwin)
 win64			Win64 version of Vim (MS-Windows 64 bit).
-win95			Win32 version for MS-Windows 95/98/ME.
+win95			Win32 version for MS-Windows 95/98/ME (always False)
 winaltkeys		Compiled with 'winaltkeys' option.
 windows			Compiled with support for more than one window.
 writebackup		Compiled with 'writebackup' default on.
@@ -9893,6 +10067,14 @@ This does NOT work: >
 			variables are automatically deleted when the function
 			ends.

+:unl[et] ${env-name} ...			*:unlet-environment* *:unlet-$*
+			Remove environment variable {env-name}.
+			Can mix {name} and ${env-name} in one :unlet command.
+			No error message is given for a non-existing
+			variable, also without !.
+			If the system does not support deleting an environment
+			variable, it is made emtpy.
+
 :lockv[ar][!] [depth] {name} ...			*:lockvar* *:lockv*
 			Lock the internal variable {name}.  Locking means that
 			it can no longer be changed (until it is unlocked).
@@ -11412,7 +11594,7 @@ The sandbox is also used for the |:sandbox| command.

 These items are not allowed in the sandbox:
 	- changing the buffer text
-	- defining or changing mapping, autocommands, functions, user commands
+	- defining or changing mapping, autocommands, user commands
 	- setting certain options (see |option-summary|)
 	- setting certain v: variables (see |v:var|)  *E794*
 	- executing a shell command
@@ -11434,6 +11616,7 @@ location.  Insecure in this context are:
 - sourcing a .vimrc or .exrc in the current directory
 - while executing in the sandbox
 - value coming from a modeline
+- executing a function that was defined in the sandbox

 Note that when in the sandbox and saving an option value and restoring it, the
 option will still be marked as it was set in the sandbox.
@@ -11476,4 +11659,4 @@ without the |+eval| feature.
 Find more information in the file src/testdir/README.txt.


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


 		  VIM REFERENCE MANUAL    by Mortaza Ghassab Shiran
@@ -266,4 +266,4 @@ changes made in the current line.

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

- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*filetype.txt*  For Vim version 8.0.  Last change: 2018 Feb 04
+*filetype.txt*  For Vim version 8.1.  Last change: 2018 Apr 18


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -319,6 +319,10 @@ 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: >

@@ -691,4 +695,4 @@ The mappings can be disabled with: >
 <


- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*fold.txt*      For Vim version 8.0.  Last change: 2017 Mar 18
+*fold.txt*      For Vim version 8.1.  Last change: 2017 Mar 18


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -601,4 +601,4 @@ used.  Otherwise the values from the window where the buffer was edited last
 are used.

 ==============================================================================
- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*ft_ada.txt*	For Vim version 8.0.  Last change: 2010 Jul 20
+*ft_ada.txt*	For Vim version 8.1.  Last change: 2010 Jul 20


 		    ADA FILE TYPE PLUG-INS REFERENCE MANUAL~
@@ -249,7 +249,7 @@ g:decada.Make_Command	string
 		External command used for |g:decada.Make()| (|'makeprg'|).

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

 ==============================================================================
@@ -1,4 +1,6 @@
-*ft_rust.txt*      Filetype plugin for Rust
+*ft_rust.txt*	For Vim version 8.1.  Last change: 2017 Nov 02
+
+This is documentation for the Rust filetype plugin.

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

 by David Fishburn

@@ -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:ft=help:norl:
+vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*gui.txt*       For Vim version 8.0.  Last change: 2018 Mar 06
+*gui.txt*       For Vim version 8.1.  Last change: 2018 Mar 06


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1001,7 +1001,7 @@ it behaves in a strange way.
 				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 irrelevalt).
+				or release (mouse movement is irrelevant).

 Example: >
 	:popup File
@@ -1079,4 +1079,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:ft=help:norl:
+ vim:tw=78:sw=4:ts=8:noet:ft=help:norl:
@@ -12,14 +12,15 @@ The MacVim Graphical User Interface			*macvim* *gui-macvim*
 4. Special colors		|macvim-colors|
 5. Menus			|macvim-menus|
 6. Toolbar			|macvim-toolbar|
- 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|
+ 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|

 Other relevant documentation:
 |gui.txt|	For generic items of the GUI.
@@ -345,7 +346,7 @@ associated: a title, a key equivalent and an action message.  When a menu is
 displayed the title is shown on the left and the key equivalent (if any) is
 shown on the right.  Key equivalents enable you to access a menu item using
 the keyboard instead of having to use the mouse.  When a menu item is clicked
-it will send it's associated action message.  Actions can be used to instruct
+it will send its associated action message.  Actions can be used to instruct
 MacVim to paste some text (paste:), open a new window (newWindow:), etc.
 Certain actions are standard throughout OS X which is why MacVim must be able
 to set these for each menu item.  (E.g. the menu item "Edit.Paste" must be
@@ -467,19 +468,47 @@ 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 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.
+Toolbar icons should be tiff, png, icns, or heic, of dimension 32x32 or 24x24
+pixels.  The larger size is used when 'tbis' is "medium" or "large", otherwise
+the smaller size is used (which is the default).  If the icon file only
+contains one dimension then Mac OS X will scale the icon to the appropriate
+dimension if necessary.  To avoid this, use a file format which supports
+multiple resolutions (such as icns) and provide both 32x32 and 24x24 versions
+of the icon.

 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. Dialogs						*macvim-dialogs*
+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*

 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
@@ -498,7 +527,7 @@ select the current button.  The current button is indicated with a blue
 outline.

 ==============================================================================
-8. System services					*macvim-services*
+9. 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
@@ -516,7 +545,7 @@ The services respect the "Open files from applications" setting in the general
 preferences.

 ==============================================================================
-9. mvim:// URL handler				*mvim://* *macvim-url-handler*
+10. 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 >
@@ -537,7 +566,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.

 ==============================================================================
-10. Keyboard shortcuts					*macvim-shortcuts*
+11. 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
@@ -617,7 +646,7 @@ sometimes be slightly involved.  Here are all the things you need to consider:
 - A few command key mappings are set up by MacVim, see |cmd-movement|.

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

 MacVim supports trackpad swipe gestures.  By default this can be used to
 navigate back/forward in the help (try it!).
@@ -633,6 +662,10 @@ 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: >
@@ -648,7 +681,7 @@ As another example, here is how to switch buffers by swiping left/right: >
 See the section on |key-mapping| for more help on how to map keys.

 ==============================================================================
-12. International					*macvim-international*
+13. 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
@@ -669,7 +702,7 @@ wrong layout when going back to normal mode, then select the layout you want
 to use in normal mode and type ":set imd" followed by ":set noimd".

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

 This list is by no means exhaustive, it only enumerates some of the more
 prominent bugs/missing features.
@@ -693,7 +726,7 @@ This is also the best place for making feature requests as well as for asking
 general questions about MacVim.

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

 In this section some general (not necessarily MacVim specific) hints are
 given.
@@ -1,4 +1,4 @@
-*gui_w32.txt*   For Vim version 8.0.  Last change: 2017 Oct 27
+*gui_w32.txt*   For Vim version 8.1.  Last change: 2017 Oct 27


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -442,7 +442,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 +451,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:ft=help:norl:
+ vim:tw=78:sw=4:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*gui_x11.txt*   For Vim version 8.0.  Last change: 2017 Jul 28
+*gui_x11.txt*   For Vim version 8.1.  Last change: 2018 May 06


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

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

@@ -727,4 +730,4 @@ and use CLIPBOARD ("+) for cut/copy/paste operations.  You thus have access to
 both by choosing to use either of the "* or "+ registers.


- vim:tw=78:sw=4:ts=8:ft=help:norl:
+ vim:tw=78:sw=4:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*hangulin.txt*  For Vim version 8.0.  Last change: 2015 Nov 24
+*hangulin.txt*  For Vim version 8.1.  Last change: 2015 Nov 24


 		  VIM REFERENCE MANUAL    by Chi-Deok Hwang and Sung-Hyun Nam
@@ -109,4 +109,4 @@ Send comments, patches and suggestions to:
 				    SungHyun Nam <goweol@gmail.com>
 				    Chi-Deok Hwang <...>

- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*hebrew.txt*    For Vim version 8.0.  Last change: 2007 Jun 14
+*hebrew.txt*    For Vim version 8.1.  Last change: 2007 Jun 14


 	   VIM REFERENCE MANUAL    by Ron Aaron (and Avner Lottem)
@@ -139,4 +139,4 @@ The result is that all Hebrew characters are displayed as ~x.  To solve this
 problem, set isprint=@,128-255.


- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*help.txt*	For Vim version 8.0.  Last change: 2017 Oct 28
+*help.txt*	For Vim version 8.1.  Last change: 2017 Oct 28

 			VIM - main help file
 									 k
@@ -226,4 +226,4 @@ will try to find help for it.  Especially for options in single quotes, e.g.
 'compatible'.

 ------------------------------------------------------------------------------
- vim:tw=78:fo=tcq2:isk=!-~,^*,^\|,^\":ts=8:ft=help:norl:
+ vim:tw=78:fo=tcq2:isk=!-~,^*,^\|,^\":ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*helphelp.txt*	For Vim version 8.0.  Last change: 2017 Mar 19
+*helphelp.txt*	For Vim version 8.1.  Last change: 2017 Mar 19


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -370,4 +370,4 @@ highlighting.  So do these:

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

- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*howto.txt*	For Vim version 8.0.  Last change: 2006 Apr 02
+*howto.txt*	For Vim version 8.1.  Last change: 2006 Apr 02


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -93,4 +93,4 @@ How to ...				*howdoi* *how-do-i* *howto* *how-to*
 |2html.vim|		convert a colored file to HTML
 |less|			use Vim like less or more with syntax highlighting

- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*if_cscop.txt*  For Vim version 8.0.  Last change: 2018 Jan 21
+*if_cscop.txt*  For Vim version 8.1.  Last change: 2018 Jan 21


 		  VIM REFERENCE MANUAL    by Andy Kahn
@@ -484,4 +484,4 @@ For a cscope version for Win32 see (seems abandoned):
 Win32 support was added by Sergey Khorev <sergey.khorev@gmail.com>.  Contact
 him if you have Win32-specific issues.

- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*if_lua.txt*    For Vim version 8.0.  Last change: 2015 Oct 16
+*if_lua.txt*    For Vim version 8.1.  Last change: 2015 Oct 16


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

 	vim.buffer([arg])	If "arg" is a number, returns buffer with
 				number "arg" in the buffer list or, if "arg"
@@ -166,7 +167,7 @@ Vim evaluation and command execution, and others.
 				or window, respectively. Examples: >
 					:lua l = vim.list()
 					:lua print(type(l), vim.type(l))
-					:" userdata list
+					:" list
 <
 	vim.command({cmd})	Executes the vim (ex-mode) command {cmd}.
 				Examples: >
@@ -1,4 +1,4 @@
-*if_mzsch.txt*  For Vim version 8.0.  Last change: 2017 Oct 08
+*if_mzsch.txt*  For Vim version 8.1.  Last change: 2017 Oct 08


 		  VIM REFERENCE MANUAL    by Sergey Khorev
@@ -312,4 +312,4 @@ MzScheme's raco command:
  raco pkg install cext-lib         # raco ctool command
 <
 ======================================================================
-  vim:tw=78:ts=8:sts=4:ft=help:norl:
+  vim:tw=78:ts=8:noet:sts=4:ft=help:norl:
@@ -1,4 +1,4 @@
-*if_ole.txt*    For Vim version 8.0.  Last change: 2008 Aug 16
+*if_ole.txt*    For Vim version 8.1.  Last change: 2008 Aug 16


 		  VIM REFERENCE MANUAL    by Paul Moore
@@ -202,4 +202,4 @@ In Vim >
 [.Net remarks provided by Dave Fishburn and Brian Sturk]

 ==============================================================================
- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*if_perl.txt*   For Vim version 8.0.  Last change: 2017 Nov 24
+*if_perl.txt*   For Vim version 8.1.  Last change: 2017 Nov 24


 		  VIM REFERENCE MANUAL    by Sven Verdoolaege
@@ -44,8 +44,9 @@ The Perl patches for Vim were made by:
 	Sven Verdoolaege <skimo@breughel.ufsia.ac.be>
 	Matt Gerassimof

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

 ==============================================================================
 3. Using the Perl interface				*perl-using*
@@ -303,4 +304,4 @@ version of the shared library must match the Perl version Vim was compiled
 with.

 ==============================================================================
- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*if_pyth.txt*   For Vim version 8.0.  Last change: 2018 Jan 30
+*if_pyth.txt*   For Vim version 8.1.  Last change: 2018 Jan 30


 		  VIM REFERENCE MANUAL    by Paul Moore
@@ -924,4 +924,4 @@ If you have more than one version of Python 3, you need to link python3 to the
 one you prefer, before running configure.

 ==============================================================================
- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*if_ruby.txt*   For Vim version 8.0.  Last change: 2018 Mar 15
+*if_ruby.txt*   For Vim version 8.1.  Last change: 2018 Mar 15


 		  VIM REFERENCE MANUAL    by Shugo Maeda
@@ -145,7 +145,7 @@ self[{n}]	Returns the buffer object for the number {n}.  The first number

 Methods:

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

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

 ==============================================================================
- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*if_sniff.txt*	For Vim version 8.0.  Last change: 2016 Feb 27
+*if_sniff.txt*	For Vim version 8.1.  Last change: 2016 Feb 27


 		  VIM REFERENCE MANUAL
@@ -8,4 +8,4 @@
 The SNiFF+ support was removed at patch 7.4.1433.  If you want to check it out
 sync to before that.

- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*if_tcl.txt*    For Vim version 8.0.  Last change: 2016 Jan 01
+*if_tcl.txt*    For Vim version 8.1.  Last change: 2016 Jan 01


 		  VIM REFERENCE MANUAL    by Ingo Wilken
@@ -544,4 +544,4 @@ of DYNAMIC_TCL_DLL file what was specified at compile time.  The version of
 the shared library must match the Tcl version Vim was compiled with.

 ==============================================================================
- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*indent.txt*    For Vim version 8.0.  Last change: 2014 Dec 06
+*indent.txt*    For Vim version 8.1.  Last change: 2018 Apr 04


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

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

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


 PYTHON							*ft-python-indent*
@@ -1136,4 +1156,4 @@ indent for a continuation line, a line that starts with a backslash: >
 Three times shiftwidth is the default value.


- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*index.txt*     For Vim version 8.0.  Last change: 2017 Aug 02
+*index.txt*     For Vim version 8.1.  Last change: 2018 Apr 19


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -959,7 +959,7 @@ tag		command	      note action in Visual mode	~
 |v_i{|		i{		   same as iB
 |v_i}|		i}		   same as iB
 |v_o|		o		   move cursor to other corner of area
-|v_r|		r		2  delete highlighted area and start insert
+|v_r|		r		2  replace highlighted area with a character
 |v_s|		s		2  delete highlighted area and start insert
 |v_u|		u		2  make highlighted area lowercase
 |v_v|		v		   make Visual mode characterwise or stop
@@ -1659,4 +1659,4 @@ tag	      command	      action ~
 |:~|		:~		repeat last ":substitute"


- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*insert.txt*    For Vim version 8.0.  Last change: 2018 Feb 10
+*insert.txt*    For Vim version 8.1.  Last change: 2018 Feb 10


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -434,11 +434,11 @@ An example for using CTRL-G U: >

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

   Lorem ipsum (dolor

-will be repeatable by the |.|to the expected
+will be repeatable by using |.| to the expected

   Lorem ipsum (dolor)

@@ -1535,7 +1535,7 @@ phpFunctions.

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

@@ -2005,4 +2005,4 @@ self explanatory.  Using the long or the short version depends on the
 	[READ ERRORS]			not all of the file could be read


- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*intro.txt*     For Vim version 8.0.  Last change: 2018 Jan 24
+*intro.txt*     For Vim version 8.1.  Last change: 2018 Jan 24


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -906,4 +906,4 @@ buffer lines	logical lines	window lines	screen lines ~
 				6. ~ 

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


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

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

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

+	-complete=arglist	file names in argument list
 	-complete=augroup	autocmd groups
 	-complete=buffer	buffer names
 	-complete=behave	:behave suboptions
@@ -1549,4 +1552,4 @@ local to the script and use mappings local to the script.  When the user
 invokes the user command, it will run in the context of the script it was
 defined in.  This matters if |<SID>| is used in a command.

- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*mbyte.txt*     For Vim version 8.0.  Last change: 2018 Jan 21
+*mbyte.txt*     For Vim version 8.1.  Last change: 2018 Jan 21


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar et al.
@@ -1467,4 +1467,4 @@ Contributions specifically for the multi-byte features by:
 	Taro Muraoka  <koron@tka.att.ne.jp>
 	Yasuhiro Matsumoto <mattn@mail.goo.ne.jp>

- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*message.txt*   For Vim version 8.0.  Last change: 2018 Feb 04
+*message.txt*   For Vim version 8.1.  Last change: 2018 Feb 04


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -866,4 +866,4 @@ The |g<| command can be used to see the last page of previous command output.
 This is especially useful if you accidentally typed <Space> at the hit-enter
 prompt.

- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*mlang.txt*     For Vim version 8.0.  Last change: 2017 Mar 04
+*mlang.txt*     For Vim version 8.1.  Last change: 2018 May 06


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

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

 ==============================================================================
 3. Scripts						*multilang-scripts*
@@ -210,4 +210,4 @@ a message adapt to language preferences of the user, >
 	:endif
 <

- vim:tw=78:sw=4:ts=8:ft=help:norl:
+ vim:tw=78:sw=4:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*motion.txt*    For Vim version 8.0.  Last change: 2017 Oct 15
+*motion.txt*    For Vim version 8.1.  Last change: 2017 Oct 15


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1019,12 +1019,13 @@ These commands are not marks themselves, but jump to a mark:
 ==============================================================================
 8. Jumps					*jump-motions*

-A "jump" is one of the following commands: "'", "`", "G", "/", "?", "n",
-"N", "%", "(", ")", "[[", "]]", "{", "}", ":s", ":tag", "L", "M", "H" and
-the commands that start editing a new file.  If you make the cursor "jump"
-with one of these commands, the position of the cursor before the jump is
+A "jump" is a command that normally moves the cursor several lines away.  If
+you make the cursor "jump" the position of the cursor before the jump is
 remembered.  You can return to that position with the "''" and "``" command,
-unless the line containing that position was changed or deleted.
+unless the line containing that position was changed or deleted.  The
+following commands are "jump" commands: "'", "`", "G", "/", "?", "n", "N",
+"%", "(", ")", "[[", "]]", "{", "}", ":s", ":tag", "L", "M", "H" and the
+commands that start editing a new file. 

 							*CTRL-O*
 CTRL-O			Go to [count] Older cursor position in jump list
@@ -1163,7 +1164,7 @@ remembered.
 							*:changes*
 :changes		Print the change list.  A ">" character indicates the
 			current position.  Just after a change it is below the
-			newest entry, indicating that "g;" takes you to the
+			newest entry, indicating that `g;` takes you to the
 			newest entry position.  The first column indicates the
 			count needed to take you to this position.  Example:

@@ -1173,8 +1174,8 @@ remembered.
 				    1    14   54 the latest changed line
 				>

-			The "3g;" command takes you to line 9.  Then the
-			output of ":changes is:
+			The `3g;` command takes you to line 9.  Then the
+			output of `:changes` is:

 				change line  col text ~
 				>   0     9    8 bla bla bla
@@ -1340,4 +1341,4 @@ L			To line [count] from bottom of window (default: Last
 			position is in a status line, that window is made the
 			active window and the cursor is not moved.  {not in Vi}

- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*netbeans.txt*  For Vim version 8.0.  Last change: 2016 Jul 15
+*netbeans.txt*  For Vim version 8.1.  Last change: 2016 Jul 15


 		  VIM REFERENCE MANUAL    by Gordon Prieur et al.
@@ -409,9 +409,9 @@ defineAnnoType typeNum typeName tooltip glyphFile fg bg
 		Vim will define a sign for the annotation.
 		When color is a number, this is the "#rrggbb" Red, Green and
 		Blue values of the color (see |gui-colors|) and the
-		highlighting is only defined for GVim.
+		highlighting is only defined for gVim.
 		When color is a name, this color is defined both for Vim
-		running in a color terminal and for GVim.
+		running in a color terminal and for gVim.
 		When both "fg" and "bg" are "none" no line highlighting is
 		used (new in version 2.1).
 		When "glyphFile" is empty, no text sign is used (new in
@@ -1007,4 +1007,4 @@ Expert tab MIME Type property.  NetBeans is MIME oriented and the External
 Editor will only open MIME types specified in this property.


- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 8.0.  Last change: 2018 Mar 13
+*options.txt*	For Vim version 8.1.  Last change: 2018 May 15


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -835,7 +835,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 			{not in Vi}
 	When a file has been detected to have been changed outside of Vim and
 	it has not been changed inside of Vim, automatically read it again.
-	When the file has been deleted this is not done.  |timestamp|
+	When the file has been deleted this is not done, so you have the text
+	from before it was deleted.  When it appears again then it is read.
+	|timestamp|
 	If this option has a local value, use this command to switch back to
 	using the global value: >
 		:set autoread<
@@ -1092,7 +1094,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 <	Use 'backupdir' to put the backup in a different directory.

 						*'backupskip'* *'bsk'*
-'backupskip' 'bsk'	string	(default: "/tmp/*,$TMPDIR/*,$TMP/*,$TEMP/*")
+'backupskip' 'bsk'	string	(default: "$TMPDIR/*,$TMP/*,$TEMP/*"
+				 Unix: "/tmp/*,$TMPDIR/*,$TMP/*,$TEMP/*"
+				 Mac: "/private/tmp/*,$TMPDIR/*,$TMP/*,$TEMP/*")
 			global
 			{not in Vi}
 			{not available when compiled without the |+wildignore|
@@ -1405,6 +1409,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 			manually)
 	  terminal	buffer for a |terminal| (you are not supposed to set
 			this manually)
+	  prompt	buffer where only the last line can be edited, meant
+			to be used by a plugin, see |prompt-buffer|
+			{only when compiled with the |+channel| feature}

 	This option is used together with 'bufhidden' and 'swapfile' to
 	specify special kinds of buffers.   See |special-buffers|.
@@ -2103,10 +2110,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 			See also |map_bar|.
 								*cpo-B*
 		B	A backslash has no special meaning in mappings,
-			abbreviations and the "to" part of the menu commands.
-			Remove this flag to be able to use a backslash like a
-			CTRL-V.  For example, the command ":map X \<Esc>"
-			results in X being mapped to:
+			abbreviations, user commands and the "to" part of the
+			menu commands.  Remove this flag to be able to use a
+			backslash like a CTRL-V.  For example, the command
+			":map X \<Esc>" results in X being mapped to:
 				'B' included:	"\^["	 (^[ is a real <Esc>)
 				'B' excluded:	"<Esc>"  (5 characters)
 				('<' excluded in both cases)
@@ -2138,7 +2145,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 								*cpo-E*
 		E	It is an error when using "y", "d", "c", "g~", "gu" or
 			"gU" on an Empty region.  The operators only work when
-			at least one character is to be operate on.  Example:
+			at least one character is to be operated on.  Example:
 			This makes "y0" fail in the first column.
 								*cpo-f*
 		f	When included, a ":read" command with a file name
@@ -2582,8 +2589,11 @@ A jump table for the options with a short description can be found at |Q_op|.
 	contain a list of words.  This can be one word per line, or several
 	words per line, separated by non-keyword characters (white space is
 	preferred).  Maximum line length is 510 bytes.
-	When this option is empty, or an entry "spell" is present, spell
-	checking is enabled the currently active spelling is used. |spell|
+
+	When this option is empty or an entry "spell" is present, and spell
+	checking is enabled, words in the word lists for the currently active
+	'spelllang' are used. See |spell|.
+
 	To include a comma in a file name precede it with a backslash.  Spaces
 	after a comma are ignored, otherwise spaces are included in the file
 	name.  See |option-backslash| about using backslashes.
@@ -4382,7 +4392,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 'imactivatefunc' 'imaf'	string (default "")
 			global
 			{not in Vi}
-			{only available when compiled with |+mbyte|}
+			{only available when compiled with the |+multi_byte|
+			feature}
 	This option specifies a function that will be called to
 	activate or deactivate the Input Method.
 	It is not used in the GUI.
@@ -4434,7 +4445,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 'imcmdline' 'imc'	boolean (default off)
 			global
 			{not in Vi}
-			{only available when compiled with |+mbyte|}
+			{only available when compiled with the |+multi_byte|
+			feature}
 	When set the Input Method is always on when starting to edit a command
 	line, unless entering a search pattern (see 'imsearch' for that).
 	Setting this option is useful when your input method allows entering
@@ -4445,7 +4457,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 'imdisable' 'imd'	boolean (default off, on for some systems (SGI))
 			global
 			{not in Vi}
-			{only available when compiled with |+mbyte|}
+			{only available when compiled with the |+multi_byte|
+			feature}
 	When set the Input Method is never used.  This is useful to disable
 	the IM when it doesn't work properly.
 	Currently this option is on by default for SGI/IRIX.  This may change
@@ -4498,7 +4511,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 'imstatusfunc' 'imsf'	string (default "")
 			global
 			{not in Vi}
-			{only available when compiled with |+mbyte|}
+			{only available when compiled with the |+multi_byte|
+			feature}
 	This option specifies a function that is called to obtain the status
 	of Input Method.  It must return a positive number when IME is active.
 	It is not used in the GUI.
@@ -5343,7 +5357,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	more depth, set 'maxfuncdepth' to a bigger number.  But this will use
 	more memory, there is the danger of failing when memory is exhausted.
 	Increasing this limit above 200 also changes the maximum for Ex
-	command resursion, see |E169|.
+	command recursion, see |E169|.
 	See also |:function|.

 						*'maxmapdepth'* *'mmd'* *E223*
@@ -5382,7 +5396,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Running into the limit often means that the pattern is very
 	inefficient or too complex.  This may already happen with the pattern
 	"\(.\)*" on a very long line.  ".*" works much better.
-	Vim may run out of memory before hitting the 'maxmempattern' limit.
+	Might also happen on redraw, when syntax rules try to match a complex
+	text structure.
+	Vim may run out of memory before hitting the 'maxmempattern' limit, in
+	which case you get an "Out of memory" error instead.

 						*'maxmemtot'* *'mmt'*
 'maxmemtot' 'mmt'	number	(default between 2048 and 10240 (system
@@ -6243,7 +6260,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			{only available when compiled with the |+reltime|
 			feature}
 	The time in milliseconds for redrawing the display.  This applies to
-	searching for patterns for 'hlsearch', |:match| highlighting an syntax
+	searching for patterns for 'hlsearch', |:match| highlighting and syntax
 	highlighting.
 	When redrawing takes more than this many milliseconds no further
 	matches will be highlighted.
@@ -7321,6 +7338,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 	set.
 	NOTE: This option is set to 0 when 'compatible' is set.

+	If Vim is compiled with the |+vartabs| feature then the value of
+	'softtabstop' will be ignored if |'varsofttabstop'| is set to
+	anything other than an empty string.
+
 						*'spell'* *'nospell'*
 'spell'			boolean	(default off)
 			local to window
@@ -7603,7 +7624,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	a S   Argument list status as in default title.  ({current} of {max})
 	      Empty if the argument file count is zero or one.
 	{ NF  Evaluate expression between '%{' and '}' and substitute result.
-	      Note that there is no '%' before the closing '}'.
+	      Note that there is no '%' before the closing '}'.  The
+	      expression cannot contain a '}' character, call a function to
+	      work around that.
 	( -   Start of item group.  Can be used for setting the width and
 	      alignment of a section.  Must be followed by %) somewhere.
 	) -   End of item group.  No width fields allowed.
@@ -7870,6 +7893,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 	   though.  Otherwise aligned comments will be wrong when 'tabstop' is
 	   changed.

+	If Vim is compiled with the |+vartabs| feature then the value of
+	'tabstop' will be ignored if |'vartabstop'| is set to anything other
+	than an empty string.
+
 			*'tagbsearch'* *'tbs'* *'notagbsearch'* *'notbs'*
 'tagbsearch' 'tbs'	boolean	(default on)
 			global
@@ -8095,32 +8122,50 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Note that the "cterm" attributes are still used, not the "gui" ones.
 	NOTE: This option is reset when 'compatible' is set.

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

-						*'termsize'* *'tms'*
-'termsize' 'tms'	string	(default "")
+						*'termwinsize'* *'tws'*
+'termwinsize' 'tws'	string	(default "")
 			local to window
 			{not in Vi}
-	Size of the |terminal| window.  Format: {rows}x{columns}.
+	Size of the |terminal| window.  Format: {rows}x{columns} or
+	{rows}*{columns}.
 	- When empty the terminal gets the size from the window.
-	- When set (e.g., "24x80") the terminal size is not adjusted to the
-	  window size.  If the window is smaller only the top-left part is
-	  displayed.
-	  When rows is zero then use the height of the window.
-	  When columns is zero then use the width of the window.
-	  For example: "30x0" uses 30 rows with the current window width.
-	  Using "0x0" is the same as empty.
+	- When set with a "x" (e.g., "24x80") the terminal size is not
+	  adjusted to the window size.  If the window is smaller only the
+	  top-left part is displayed.
+	- When set with a "*" (e.g., "10*50") the terminal size follows the
+	  window size, but will not be smaller than the specified rows and/or
+	  columns.
+	- When rows is zero then use the height of the window.
+	- When columns is zero then use the width of the window.
+	- Using "0x0" or "0*0" is the same as empty.
+
+	Examples:
+	  "30x0" uses 30 rows and the current window width.
+	  "20*0" uses at least 20 rows and the current window width.
+	  "0*40" uses the current window height and at least 40 columns.
 	Note that the command running in the terminal window may still change
 	the size of the terminal.  In that case the Vim window will be
 	adjusted to that size, if possible.
@@ -8611,6 +8656,44 @@ A jump table for the options with a short description can be found at |Q_op|.
 	written to disk (see |crash-recovery|).  Also used for the
 	|CursorHold| autocommand event.

+					*'varsofttabstop'* *'vsts'*
+'varsofttabstop' 'vsts'	string	(default "")
+			local to buffer
+			{only available when compiled with the |+vartabs|
+			feature}
+			{not in Vi}
+	A list of the number of spaces that a <Tab> counts for while editing,
+	such as inserting a <Tab> or using <BS>.  It "feels" like variable-
+	width <Tab>s are being inserted, while in fact a mixture of spaces
+	and <Tab>s is used.  Tab widths are separated with commas, with the
+	final value applying to all subsequent tabs.
+
+	For example, when editing assembly language files where statements
+	start in the 9th column and comments in the 41st, it may be useful
+	to use the following: >
+		:set varsofttabstop=8,32,8
+<	This will set soft tabstops with 8 and 8 + 32 spaces, and 8 more
+	for every column thereafter.
+
+	Note that the value of |'softtabstop'| will be ignored while
+	'varsofttabstop' is set.
+
+						*'vartabstop'* *'vts'*
+'vartabstop' 'vts'	string	(default "")
+			local to buffer
+			{only available when compiled with the |+vartabs|
+			feature}
+			{not in Vi}
+	A list of the number of spaces that a <Tab> in the file counts for,
+	separated by commas.  Each value corresponds to one tab, with the
+	final value applying to all subsequent tabs. For example: >
+		:set vartabstop=4,20,10,8
+<	This will make the first tab 4 spaces wide, the second 20 spaces,
+	the third 10 spaces, and all following tabs 8 spaces.
+
+	Note that the value of |'tabstop'| will be ignored while 'vartabstop'
+	is set.
+
 						*'verbose'* *'vbs'*
 'verbose' 'vbs'		number	(default 0)
 			global
@@ -9296,4 +9379,4 @@ A jump table for the options with a short description can be found at |Q_op|.
 	screen.  When non-zero, characters are sent to the terminal one by
 	one.  For MS-DOS pcterm this does not work.  For debugging purposes.

- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*os_390.txt*    For Vim version 8.0.  Last change: 2016 Feb 27
+*os_390.txt*    For Vim version 8.1.  Last change: 2016 Feb 27


 		  VIM REFERENCE MANUAL	  by Ralf Schandl
@@ -131,4 +131,4 @@ Also look at:


 ------------------------------------------------------------------------------
- vim:tw=78:fo=tcq2:ts=8:ft=help:norl:
+ vim:tw=78:fo=tcq2:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*os_amiga.txt*  For Vim version 8.0.  Last change: 2010 Aug 14
+*os_amiga.txt*  For Vim version 8.1.  Last change: 2010 Aug 14


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -144,4 +144,4 @@ Installation ~
 	;End VIM


- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*os_beos.txt*	For Vim version 8.0.  Last change: 2016 Mar 28
+*os_beos.txt*	For Vim version 8.1.  Last change: 2016 Mar 28


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -144,7 +144,7 @@ The default value for $VIM is set at compile time and can be determined with >
  :version

 The normal value is /boot/home/config/share/vim.  If you don't like it you can
-set the Vim environment variable to override this, or set 'helpfile' in your
+set the VIM environment variable to override this, or set 'helpfile' in your
 .vimrc: >

  :if version >= 500
@@ -317,4 +317,4 @@ it is about 1191K.
 <rhialto@polder.ubc.kun.nl>
 http://polder.ubc.kun.nl/~rhialto/be

- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*os_dos.txt*    For Vim version 8.0.  Last change: 2006 Mar 30
+*os_dos.txt*    For Vim version 8.1.  Last change: 2006 Mar 30


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -295,4 +295,4 @@ When starting up, Vim checks for the presence of "sh" anywhere in the 'shell'
 option.  If it is present, Vim sets the 'shellcmdflag' and 'shellquote' or
 'shellxquote' options will be set as described above.

- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*os_mac.txt*    For Vim version 8.0.  Last change: 2018 Jan 21
+*os_mac.txt*    For Vim version 8.1.  Last change: 2018 Jan 21


 		  VIM REFERENCE MANUAL    by Bram Moolenaar et al.
@@ -183,4 +183,4 @@ the system clipboard, the darwin feature should be disabled to prevent Vim
 from hanging at runtime.


- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*os_mint.txt*   For Vim version 8.0.  Last change: 2005 Mar 29
+*os_mint.txt*   For Vim version 8.1.  Last change: 2005 Mar 29


 		  VIM REFERENCE MANUAL    by Jens M. Felderhoff
@@ -36,4 +36,4 @@ Send bug reports to

 	Jens M. Felderhoff, e-mail: <jmf@infko.uni-koblenz.de>

- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*os_msdos.txt*  For Vim version 8.0.  Last change: 2016 Feb 26
+*os_msdos.txt*  For Vim version 8.1.  Last change: 2016 Feb 26


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -12,4 +12,4 @@ work, there is not enough memory.  The DOS32 version (using DJGPP) might still
 work on older systems.


- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*os_os2.txt*    For Vim version 8.0.  Last change: 2015 Dec 31
+*os_os2.txt*    For Vim version 8.1.  Last change: 2015 Dec 31


 		  VIM REFERENCE MANUAL    by Paul Slootman
@@ -10,4 +10,4 @@ This file used to contain the particularities for the OS/2 version of Vim.
 The OS/2 support was removed in patch 7.4.1008.


- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*os_qnx.txt*    For Vim version 8.0.  Last change: 2005 Mar 29
+*os_qnx.txt*    For Vim version 8.1.  Last change: 2005 Mar 29


 		  VIM REFERENCE MANUAL    by Julian Kinraid
@@ -135,4 +135,4 @@ Todo:
 	- Replace usage of fork() with spawn() when launching external
 	  programs.

- vim:tw=78:sw=4:ts=8:ts=8:ft=help:norl:
+ vim:tw=78:sw=4:ts=8:noet:ts=8:ft=help:norl:
@@ -1,4 +1,4 @@
-*os_risc.txt*   For Vim version 8.0.  Last change: 2011 May 10
+*os_risc.txt*   For Vim version 8.1.  Last change: 2011 May 10


 		  VIM REFERENCE MANUAL    by Thomas Leonard
@@ -9,4 +9,4 @@ The RISC OS support has been removed from Vim with patch 7.3.187.
 If you would like to use Vim on RISC OS get the files from before that patch.


- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*os_unix.txt*   For Vim version 8.0.  Last change: 2005 Mar 29
+*os_unix.txt*   For Vim version 8.1.  Last change: 2005 Mar 29


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -57,4 +57,4 @@ For real color terminals the ":highlight" command can be used.
 The file "tools/vim132" is a shell script that can be used to put Vim in 132
 column mode on a vt100 and lookalikes.

- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*os_vms.txt*    For Vim version 8.0.  Last change: 2014 Aug 29
+*os_vms.txt*    For Vim version 8.1.  Last change: 2018 May 06


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

 It is convenient to have a common VIM directory but execute different
@@ -952,4 +952,4 @@ of OS_VMS.TXT:
 	Bruce Hunsaker <BNHunsaker@chq.byu.edu>
 	Sandor Kopanyi <sandor.kopanyi@mailbox.hu>

- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*os_win32.txt*  For Vim version 8.0.  Last change: 2017 Mar 21
+*os_win32.txt*  For Vim version 8.1.  Last change: 2017 Mar 21


 		  VIM REFERENCE MANUAL    by George Reilly
@@ -169,7 +169,7 @@ you will need to get a version older than that.
 ==============================================================================
 6. Running under Windows 3.1				*win32-win3.1*

-					*win32s* *windows-3.1* *gui-w32s*
+				*win32s* *windows-3.1* *gui-w32s* *win16*
 There was a special version of gvim that runs under Windows 3.1 and 3.11.
 Support was removed in patch 7.4.1363.

@@ -303,4 +303,4 @@ A. Yes, place your favorite icon in bitmaps/vim.ico in a directory of
   'runtimepath'.  For example ~/vimfiles/bitmaps/vim.ico.


- vim:tw=78:fo=tcq2:ts=8:ft=help:norl:
+ vim:tw=78:fo=tcq2:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*pattern.txt*   For Vim version 8.0.  Last change: 2018 Mar 13
+*pattern.txt*   For Vim version 8.1.  Last change: 2018 Mar 13


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -293,6 +293,14 @@ the "#" is under your left hand middle finger (search to the left and up) and
 the "*" is under your right hand middle finger (search to the right and down).
 (this depends on your keyboard layout though).

+								*E956*
+In very rare cases a regular expression is used recursively.  This can happen
+when executing a pattern takes a long time and when checkig for messages on
+channels a callback is invoked that also uses a pattern or an autocommand is
+triggered.  In most cases this should be fine, but if a pattern is in use when
+it's used again it fails.  Usually this means there is something wrong with
+the pattern.
+
 ==============================================================================
 2. The definition of a pattern		*search-pattern* *pattern* *[pattern]*
 					*regular-expression* *regexp* *Pattern*
@@ -1409,4 +1417,4 @@ Finally, these constructs are unique to Perl:
 		":2match" for another plugin.


- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*pi_getscript.txt*  For Vim version 7.0.  Last change: 2017 Aug 01
+*pi_getscript.txt*  For Vim version 8.1.  Last change: 2017 Aug 01
 >
 		GETSCRIPT REFERENCE MANUAL  by Charles E. Campbell
 <
@@ -479,4 +479,4 @@ v2  May 14, 2003 :   extracts name of item to be obtained from the
                     and they became numbers.  Fixes comparison.

 ==============================================================================
-vim:tw=78:ts=8:ft=help:fdm=marker
+vim:tw=78:ts=8:noet:ft=help:fdm=marker
@@ -1,4 +1,4 @@
-*pi_gzip.txt*   For Vim version 8.0.  Last change: 2016 Nov 06
+*pi_gzip.txt*   For Vim version 8.1.  Last change: 2016 Nov 06


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -40,4 +40,4 @@ compression.  Thus editing the patchmode file will not give you the automatic
 decompression.  You have to rename the file if you want this.

 ==============================================================================
- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
@@ -118,4 +118,4 @@ Copyright: (c) 2004-2015 by Charles E. Campbell	*logiPat-copyright*


 ==============================================================================
-vim:tw=78:ts=8:ft=help
+vim:tw=78:ts=8:noet:ft=help
@@ -1,4 +1,4 @@
-*pi_netrw.txt*  For Vim version 8.0.  Last change: 2017 Nov 03
+*pi_netrw.txt*  For Vim version 8.1.  Last change: 2017 Nov 03

 	    ------------------------------------------------
 	    NETRW REFERENCE MANUAL    by Charles E. Campbell
@@ -4267,4 +4267,4 @@ netrw:

 ==============================================================================
 Modelines: {{{1
- vim:tw=78:ts=8:ft=help:norl:fdm=marker
+ vim:tw=78:ts=8:noet:ft=help:norl:fdm=marker
--- a/Show More
+++ b/Show More