iTerm2 PSMTabBarControl

https://github.com/gnachman/iTerm2/tree/master/ThirdParty/PSMTabBarControl

.gitignore

@@ -5,7 +5,6 @@ src/xxd/xxd
 src/auto/if_perl.c
 src/auto/gui_gtk_gresources.c
 src/auto/gui_gtk_gresources.h
-src/objects/.dirstamp
 src/tags
 
 # We do need src/auto/configure.
@@ -78,11 +77,9 @@ src/testdir/test.log
 src/testdir/dostmp/*
 src/testdir/messages
 src/testdir/viminfo
-src/testdir/opt_test.vim
 src/memfile_test
 src/json_test
 src/message_test
-src/kword_test
 
 # From MacVim
 .*.swp

.travis.yml

@@ -17,7 +17,7 @@ env:
     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_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.5/Python
     VIMCMD=src/MacVim/build/Release/MacVim.app/Contents/MacOS/Vim
     "CONFOPT='--with-features=huge --enable-multibyte --enable-netbeans --with-tlib=ncurses --enable-cscope --enable-perlinterp=dynamic --enable-pythoninterp=dynamic --enable-python3interp=dynamic --enable-rubyinterp=dynamic --enable-luainterp=dynamic --with-lua-prefix=/usr/local --enable-gui=macvim'"
 
@@ -36,19 +36,14 @@ script:
   - grep -q -- "-DDYNAMIC_PYTHON_DLL=\\\\\"$vi_cv_dll_name_python\\\\\"" src/auto/config.mk
   - grep -q -- "-DDYNAMIC_PYTHON3_DLL=\\\\\"$vi_cv_dll_name_python3\\\\\"" src/auto/config.mk
   - make -j$NPROC
-  - BINPATH=src/MacVim/build/Release/MacVim.app/Contents/bin
-  - mkdir -p $BINPATH
-  - sed -e 's/^# VIM_APP_DIR=.*/if [ -L $0 ]; then VIM_APP_DIR=`dirname "$(readlink $0)"`\/..\/..\/..; else VIM_APP_DIR=`dirname "$0"`\/..\/..\/..; fi/' src/MacVim/mvim > $BINPATH/mvim
-  - chmod 755 $BINPATH/mvim
-  - (cd $BINPATH; for f in vim vimdiff view gvim gvimdiff gview mvimdiff mview; do ln -s mvim $f; done)
   - rm -f result; $VIMCMD -g -f -c "redir>result" -c "lua print(\"Test\")" -c "redir END" -c q; cat result; echo; grep -q -w Test result
   - rm -f result; $VIMCMD -g -f -c "redir>result" -c "perl VIM::Msg(\"Test\")" -c "redir END" -c q; cat result; echo; grep -q -w Test result
   - rm -f result; $VIMCMD -g -f -c "redir>result" -c "py import sys; print(\"Test\")" -c "redir END" -c q; cat result; echo; grep -q -w Test result
   - rm -f result; $VIMCMD -g -f -c "redir>result" -c "py3 import sys; print(\"Test\")" -c "redir END" -c q; cat result; echo; grep -q -w Test result
   - rm -f result; $VIMCMD -g -f -c "redir>result" -c "ruby puts(\"Test\")" -c "redir END" -c q; cat result; echo; grep -q -w Test result
   - make test
-  #- make -C src/testdir clean
-  #- make -C src testgui
+  - make -C src/testdir clean
+  - make -C src testgui
 
 before_deploy:
   - make -C src macvim-dmg

Filelist

@@ -45,7 +45,6 @@ SRC_ALL =	\
 		src/hashtab.c \
 		src/json.c \
 		src/json_test.c \
-		src/kword_test.c \
 		src/list.c \
 		src/keymap.h \
 		src/macros.h \
@@ -97,7 +96,6 @@ SRC_ALL =	\
 		src/tee/tee.c \
 		src/xxd/xxd.c \
 		src/main.aap \
-		src/testdir/gen_opt_test.vim \
 		src/testdir/main.aap \
 		src/testdir/README.txt \
 		src/testdir/Make_all.mak \
@@ -106,11 +104,7 @@ SRC_ALL =	\
 		src/testdir/sautest/autoload/*.vim \
 		src/testdir/runtest.vim \
 		src/testdir/shared.vim \
-		src/testdir/view_util.vim \
 		src/testdir/setup.vim \
-		src/testdir/gui_init.vim \
-		src/testdir/setup_gui.vim \
-		src/testdir/gui_preinit.vim \
 		src/testdir/test[0-9]*.ok \
 		src/testdir/test[0-9]*a.ok \
 		src/testdir/test_[a-z]*.ok \
@@ -128,7 +122,6 @@ SRC_ALL =	\
 		src/testdir/pythonx/topmodule/submodule/subsubmodule/subsubsubmodule.py \
 		src/testdir/python_after/*.py \
 		src/testdir/python_before/*.py \
-		src/testdir/pyxfile/*.py \
 		src/testdir/bench*.in \
 		src/testdir/bench*.vim \
 		src/testdir/samples/*.txt \
@@ -214,7 +207,7 @@ SRC_UNIX =	\
 		src/config.mk.dist \
 		src/config.mk.in \
 		src/configure \
-		src/configure.ac \
+		src/configure.in \
 		src/gui_at_fs.c \
 		src/gui_at_sb.c \
 		src/gui_at_sb.h \

Makefile

@@ -120,9 +120,8 @@ MINOR = 0
 #
 # MS-Windows:
 # - Run make on Unix to update the ".mo" files.
-# - Get libintl-8.dll, libiconv-2.dll and libgcc_s_sjlj-1.dll. E.g. from
+# - Get libintl-8.dll and libiconv-2.dll. E.g. from
 #   https://mlocati.github.io/gettext-iconv-windows/ .
-#   Use the "shared-32.zip file and extract the archive to get the files.
 #   Put them in the top directory, "make dosrt" uses them.
 # - > make dossrc
 #   > make dosrt
@@ -469,7 +468,6 @@ dosrt_files: dist prepare no_title.vim
 	    done
 	cp libintl-8.dll dist/vim/$(VIMRTDIR)/
 	cp libiconv-2.dll dist/vim/$(VIMRTDIR)/
-	cp libgcc_s_sjlj-1.dll dist/vim/$(VIMRTDIR)/
 
 
 # Used before uploading.  Don't delete the AAPDIR/sign files!

READMEdir/README_mac.txt

@@ -1,13 +1,38 @@
 README_mac.txt for version 8.0 of Vim: Vi IMproved.
 
-How to install MacVim?
+This file explains the installation of MacVim.
+See "README.txt" for general information about Vim.
+See "src/MacVim/README" for an overview of the MacVim specific source code.
+
+MacVim uses the usual configure/make steps to build the binary but instead of
+"make install" you just drag the app bundle into the directory you wish to
+install in (usually `/Applications').
+
+
+How to build and install
 ========================
 
-Download MacVim.dmg from latest binary release page https://github.com/macvim-dev/macvim/releases/latest , open the dmg file, and copy MacVim.app to /Applications.
+Run `./configure` in the `src/` directory with the flags you want (call
+`./configure --help` to see a list of flags) e.g.:
 
+    $ cd src
+    $ ./configure --with-features=huge \
+                  --enable-rubyinterp \
+                  --enable-pythoninterp \
+                  --enable-perlinterp \
+                  --enable-cscope
 
-Questions?
-========================
+Now build the project using `make`:
 
-Please take a look at the home page http://macvim-dev.github.io/macvim/
+    $ make
 
+The resulting app bundle will reside under `MacVim/build/Release`.  To try it
+out quickly, type:
+
+    $ open MacVim/build/Release/MacVim.app
+
+To install MacVim, type
+
+    $ open MacVim/build/Release
+
+and drag the MacVim icon into your `Applications` folder.

nsis/gvim.nsi

@@ -385,7 +385,6 @@ SectionEnd
 		File ${VIMRT}\libintl-8.dll
 		File ${VIMRT}\libiconv-2.dll
 		File /nonfatal ${VIMRT}\libwinpthread-1.dll
-		File /nonfatal ${VIMRT}\libgcc_s_sjlj-1.dll
 	SectionEnd
 !endif
 

runtime/autoload/ada.vim

@@ -2,13 +2,12 @@
 "  Description: Perform Ada specific completion & tagging.
 "     Language: Ada (2005)
 "	   $Id: ada.vim 887 2008-07-08 14:29:01Z krischik $
-"   Maintainer: Mathias Brousset <mathiasb17@gmail.com>
-"		Martin Krischik <krischik@users.sourceforge.net>
+"   Maintainer: Martin Krischik <krischik@users.sourceforge.net>
 "		Taylor Venable <taylor@metasyntax.net>
 "		Neil Bird <neil@fnxweb.com>
 "		Ned Okie <nokie@radford.edu>
 "      $Author: krischik $
-"	 $Date: 2017-01-31 20:20:05 +0200 (Mon, 01 Jan 2017) $
+"	 $Date: 2008-07-08 16:29:01 +0200 (Di, 08 Jul 2008) $
 "      Version: 4.6
 "    $Revision: 887 $
 "     $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/autoload/ada.vim $
@@ -24,7 +23,6 @@
 "	        09.05.2007 MK Session just won't work no matter how much
 "			      tweaking is done
 "		19.09.2007 NO still some mapleader problems
-"		31.01.2017 MB fix more mapleader problems
 "    Help Page: ft-ada-functions
 "------------------------------------------------------------------------------
 
@@ -449,7 +447,7 @@ function ada#Switch_Session (New_Session)
 
       if a:New_Session != v:this_session
 	 "
-	 "  We actually got a new session - otherwise there
+	 "  We actualy got a new session - otherwise there
 	 "  is nothing to do.
 	 "
 	 if strlen (v:this_session) > 0
@@ -587,11 +585,11 @@ function ada#Map_Menu (Text, Keys, Command)
 	\ " :"	  . a:Command . "<CR>"
       execute
 	\ "nnoremap <buffer>" .
-	\ " <Leader>a" . a:Keys .
+	\ escape(l:leader . "a" . a:Keys , '\') .
 	\" :" . a:Command
       execute
 	\ "inoremap <buffer>" .
-	\ " <Learder>a" . a:Keys .
+	\ escape(l:leader . "a" . a:Keys , '\') .
 	\" <C-O>:" . a:Command
    endif
    return

runtime/autoload/context.vim

@@ -1,184 +0,0 @@
-" Language:           ConTeXt typesetting engine
-" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
-" Latest Revision:    2016 Oct 21
-
-let s:keepcpo= &cpo
-set cpo&vim
-
-" Helper functions {{{
-function! s:context_echo(message, mode)
-  redraw
-  echo "\r"
-  execute 'echohl' a:mode
-  echomsg '[ConTeXt]' a:message
-  echohl None
-endf
-
-function! s:sh()
-  return has('win32') || has('win64') || has('win16') || has('win95')
-        \ ? ['cmd.exe', '/C']
-        \ : ['/bin/sh', '-c']
-endfunction
-
-" For backward compatibility
-if exists('*win_getid')
-
-  function! s:win_getid()
-    return win_getid()
-  endf
-
-  function! s:win_id2win(winid)
-    return win_id2win(a:winid)
-  endf
-
-else
-
-  function! s:win_getid()
-    return winnr()
-  endf
-
-  function! s:win_id2win(winnr)
-    return a:winnr
-  endf
-
-endif
-" }}}
-
-" ConTeXt jobs {{{
-if has('job')
-
-  let g:context_jobs = []
-
-  " Print the status of ConTeXt jobs
-  function! context#job_status()
-    let l:jobs = filter(g:context_jobs, 'job_status(v:val) == "run"')
-    let l:n = len(l:jobs)
-    call s:context_echo(
-          \ 'There '.(l:n == 1 ? 'is' : 'are').' '.(l:n == 0 ? 'no' : l:n)
-          \ .' job'.(l:n == 1 ? '' : 's').' running'
-          \ .(l:n == 0 ? '.' : ' (' . join(l:jobs, ', ').').'),
-          \ 'ModeMsg')
-  endfunction
-
-  " Stop all ConTeXt jobs
-  function! context#stop_jobs()
-    let l:jobs = filter(g:context_jobs, 'job_status(v:val) == "run"')
-    for job in l:jobs
-      call job_stop(job)
-    endfor
-    sleep 1
-    let l:tmp = []
-    for job in l:jobs
-      if job_status(job) == "run"
-        call add(l:tmp, job)
-      endif
-    endfor
-    let g:context_jobs = l:tmp
-    if empty(g:context_jobs)
-      call s:context_echo('Done. No jobs running.', 'ModeMsg')
-    else
-      call s:context_echo('There are still some jobs running. Please try again.', 'WarningMsg')
-    endif
-  endfunction
-
-  function! context#callback(path, job, status)
-    if index(g:context_jobs, a:job) != -1 && job_status(a:job) != 'run' " just in case
-      call remove(g:context_jobs, index(g:context_jobs, a:job))
-    endif
-    call s:callback(a:path, a:job, a:status)
-  endfunction
-
-  function! context#close_cb(channel)
-    call job_status(ch_getjob(a:channel)) " Trigger exit_cb's callback for faster feedback
-  endfunction
-
-  function! s:typeset(path)
-    call add(g:context_jobs,
-          \ job_start(add(s:sh(), context#command() . ' ' . shellescape(fnamemodify(a:path, ":t"))), {
-          \   'close_cb' : 'context#close_cb',
-          \   'exit_cb'  : function(get(b:, 'context_callback', get(g:, 'context_callback', 'context#callback')),
-          \                         [a:path]),
-          \   'in_io'    : 'null'
-          \ }))
-  endfunction
-
-else " No jobs
-
-  function! context#job_status()
-    call s:context_echo('Not implemented', 'WarningMsg')
-  endfunction!
-
-  function! context#stop_jobs()
-    call s:context_echo('Not implemented', 'WarningMsg')
-  endfunction
-
-  function! context#callback(path, job, status)
-    call s:callback(a:path, a:job, a:status)
-  endfunction
-
-  function! s:typeset(path)
-    execute '!' . context#command() . ' ' . shellescape(fnamemodify(a:path, ":t"))
-    call call(get(b:, 'context_callback', get(g:, 'context_callback', 'context#callback')),
-          \ [a:path, 0, v:shell_error])
-  endfunction
-
-endif " has('job')
-
-function! s:callback(path, job, status) abort
-  if a:status < 0 " Assume the job was terminated
-    return
-  endif
-  " Get info about the current window
-  let l:winid = s:win_getid()             " Save window id
-  let l:efm = &l:errorformat              " Save local errorformat
-  let l:cwd = fnamemodify(getcwd(), ":p") " Save local working directory
-  " Set errorformat to parse ConTeXt errors
-  execute 'setl efm=' . escape(b:context_errorformat, ' ')
-  try " Set cwd to expand error file correctly
-    execute 'lcd' fnameescape(fnamemodify(a:path, ':h'))
-  catch /.*/
-    execute 'setl efm=' . escape(l:efm, ' ')
-    throw v:exception
-  endtry
-  try
-    execute 'cgetfile' fnameescape(fnamemodify(a:path, ':r') . '.log')
-    botright cwindow
-  finally " Restore cwd and errorformat
-    execute s:win_id2win(l:winid) . 'wincmd w'
-    execute 'lcd ' . fnameescape(l:cwd)
-    execute 'setl efm=' . escape(l:efm, ' ')
-  endtry
-  if a:status == 0
-    call s:context_echo('Success!', 'ModeMsg')
-  else
-    call s:context_echo('There are errors. ', 'ErrorMsg')
-  endif
-endfunction
-
-function! context#command()
-  return get(b:, 'context_mtxrun', get(g:, 'context_mtxrun', 'mtxrun'))
-        \ . ' --script context --autogenerate --nonstopmode'
-        \ . ' --synctex=' . (get(b:, 'context_synctex', get(g:, 'context_synctex', 0)) ? '1' : '0')
-        \ . ' ' . get(b:, 'context_extra_options', get(g:, 'context_extra_options', ''))
-endfunction
-
-" Accepts an optional path (useful for big projects, when the file you are
-" editing is not the project's root document). If no argument is given, uses
-" the path of the current buffer.
-function! context#typeset(...) abort
-  let l:path = fnamemodify(strlen(a:000[0]) > 0 ? a:1 : expand("%"), ":p")
-  let l:cwd = fnamemodify(getcwd(), ":p") " Save local working directory
-  call s:context_echo('Typesetting...',  'ModeMsg')
-  execute 'lcd' fnameescape(fnamemodify(l:path, ":h"))
-  try
-    call s:typeset(l:path)
-  finally " Restore local working directory
-    execute 'lcd ' . fnameescape(l:cwd)
-  endtry
-endfunction!
-"}}}
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
-
-" vim: sw=2 fdm=marker

runtime/autoload/contextcomplete.vim

@@ -1,25 +0,0 @@
-" Language:           ConTeXt typesetting engine
-" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
-" Latest Revision:    2016 Oct 15
-
-let s:keepcpo= &cpo
-set cpo&vim
-
-" Complete keywords in MetaPost blocks
-function! contextcomplete#Complete(findstart, base)
-  if a:findstart == 1
-    if len(synstack(line('.'), 1)) > 0 &&
-          \ synIDattr(synstack(line('.'), 1)[0], "name") ==# 'contextMPGraphic'
-      return syntaxcomplete#Complete(a:findstart, a:base)
-    else
-      return -3
-    endif
-  else
-    return syntaxcomplete#Complete(a:findstart, a:base)
-  endif
-endfunction
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
-
-" vim: sw=2 fdm=marker

runtime/autoload/gzip.vim

@@ -1,6 +1,6 @@
 " Vim autoload file for editing compressed files.
 " Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2016 Sep 28
+" Last Change: 2014 Nov 05
 
 " These functions are used by the gzip plugin.
 
@@ -63,9 +63,6 @@ fun gzip#read(cmd)
   " set 'modifiable'
   let ma_save = &ma
   setlocal ma
-  " set 'write'
-  let write_save = &write
-  set write
   " Reset 'foldenable', otherwise line numbers get adjusted.
   if has("folding")
     let fen_save = &fen
@@ -130,7 +127,6 @@ fun gzip#read(cmd)
   let &pm = pm_save
   let &cpo = cpo_save
   let &l:ma = ma_save
-  let &write = write_save
   if has("folding")
     let &l:fen = fen_save
   endif

runtime/autoload/javascriptcomplete.vim

@@ -1,7 +1,7 @@
 " Vim completion script
 " Language:	Java Script
 " Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
-" Last Change:	2017 Mar 04
+" Last Change:	2006 Apr 30
 
 function! javascriptcomplete#CompleteJS(findstart, base)
   if a:findstart
@@ -563,7 +563,7 @@ function! javascriptcomplete#CompleteJS(findstart, base)
 	for i in arguments
 		let g:ia = i
 		let f_elements = matchlist(i, 'function\s\+\(\k\+\)\s*(\(.\{-}\))')
-		if len(f_elements) >= 3
+		if len(f_elements) == 3
 			let b:js_menuinfo[f_elements[1].'('] = f_elements[2]
 		endif
 	endfor

runtime/autoload/phpcomplete.vim

@@ -3,7 +3,7 @@
 " Maintainer:	Dávid Szabó ( complex857 AT gmail DOT com )
 " Previous Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
 " URL: https://github.com/shawncplus/phpcomplete.vim
-" Last Change:  2016 Oct 10
+" Last Change:  2015 Jul 13
 "
 "	OPTIONS:
 "
@@ -195,8 +195,6 @@ function! phpcomplete#CompletePHP(findstart, base) " {{{
 			" }}}
 		elseif context =~? 'implements'
 			return phpcomplete#CompleteClassName(a:base, ['i'], current_namespace, imports)
-		elseif context =~? 'instanceof'
-			return phpcomplete#CompleteClassName(a:base, ['c', 'n'], current_namespace, imports)
 		elseif context =~? 'extends\s\+.\+$' && a:base == ''
 			return ['implements']
 		elseif context =~? 'extends'
@@ -789,8 +787,6 @@ function! phpcomplete#CompleteClassName(base, kinds, current_namespace, imports)
 
 	if kinds == ['c', 'i']
 		let filterstr = 'v:val =~? "\\(class\\|interface\\)\\s\\+[a-zA-Z_\\x7f-\\xff][a-zA-Z_0-9\\x7f-\\xff]*\\s*"'
-	elseif kinds == ['c', 'n']
-		let filterstr = 'v:val =~? "\\(class\\|namespace\\)\\s\\+[a-zA-Z_\\x7f-\\xff][a-zA-Z_0-9\\x7f-\\xff]*\\s*"'
 	elseif kinds == ['c']
 		let filterstr = 'v:val =~? "class\\s\\+[a-zA-Z_\\x7f-\\xff][a-zA-Z_0-9\\x7f-\\xff]*\\s*"'
 	elseif kinds == ['i']
@@ -1000,7 +996,7 @@ function! phpcomplete#CompleteUserClass(context, base, sccontent, visibility) "
 		let required_modifiers += ['static']
 	endif
 	let all_variable = filter(deepcopy(a:sccontent),
-					\ 'v:val =~ "\\(^\\s*\\(var\\s\\+\\|public\\s\\+\\|protected\\s\\+\\|private\\s\\+\\|final\\s\\+\\|abstract\\s\\+\\|static\\s\\+\\)\\+\\$\\|^\\s*\\(\\/\\|\\*\\)*\\s*@property\\s\\+\\S\\+\\s\\S\\{-}\\s*$\\)"')
+					\ 'v:val =~ "^\\s*\\(var\\s\\+\\|public\\s\\+\\|protected\\s\\+\\|private\\s\\+\\|final\\s\\+\\|abstract\\s\\+\\|static\\s\\+\\)\\+\\$"')
 
 	let variables = []
 	for i in all_variable
@@ -1164,14 +1160,6 @@ function! phpcomplete#GetTaglist(pattern) " {{{
 	endif
 
 	let tags = taglist(a:pattern)
-	for tag in tags
-		for prop in keys(tag)
-			if prop == 'cmd' || prop == 'static' || prop == 'kind' || prop == 'builtin'
-				continue
-			endif
-			let tag[prop] = substitute(tag[prop], '\\\\', '\\', 'g')
-		endfor
-	endfor
 	let s:cache_tags[a:pattern] = tags
 	let has_key = has_key(s:cache_tags, a:pattern)
 	let s:cache_tags_checksum = cache_checksum
@@ -1391,7 +1379,7 @@ function! phpcomplete#GetCallChainReturnType(classname_candidate, class_candidat
 			" Get Structured information of all classes and subclasses including namespace and includes
 			" try to find the method's return type in docblock comment
 			for classstructure in classcontents
-				let docblock_target_pattern = 'function\s\+&\?'.method.'\>\|\(public\|private\|protected\|var\).\+\$'.method.'\>\|@property.\+\$'.method.'\>'
+				let docblock_target_pattern = 'function\s\+&\?'.method.'\|\(public\|private\|protected\|var\).\+\$'.method
 				let doc_str = phpcomplete#GetDocBlock(split(classstructure.content, '\n'), docblock_target_pattern)
 				if doc_str != ''
 					break
@@ -1399,17 +1387,8 @@ function! phpcomplete#GetCallChainReturnType(classname_candidate, class_candidat
 			endfor
 			if doc_str != ''
 				let docblock = phpcomplete#ParseDocBlock(doc_str)
-				if has_key(docblock.return, 'type') || has_key(docblock.var, 'type') || len(docblock.properties) > 0
-					let type = has_key(docblock.return, 'type') ? docblock.return.type : has_key(docblock.var, 'type') ? docblock.var.type : ''
-
-					if type == ''
-						for property in docblock.properties
-							if property.description =~? method
-								let type = property.type
-								break
-							endif
-						endfor
-					endif
+				if has_key(docblock.return, 'type') || has_key(docblock.var, 'type')
+					let type = has_key(docblock.return, 'type') ? docblock.return.type : docblock.var.type
 
 					" there's a namespace in the type, threat the type as FQCN
 					if type =~ '\\'
@@ -1575,9 +1554,6 @@ function! phpcomplete#GetClassName(start_line, context, current_namespace, impor
 	elseif get(methodstack, 0) =~# function_invocation_pattern
 		let function_name = matchstr(methodstack[0], '^\s*\zs'.function_name_pattern)
 		let function_file = phpcomplete#GetFunctionLocation(function_name, a:current_namespace)
-		if function_file == ''
-			let function_file = phpcomplete#GetFunctionLocation(function_name, '\')
-		endif
 
 		if function_file == 'VIMPHP_BUILTINFUNCTION'
 			" built in function, grab the return type from the info string
@@ -1593,7 +1569,7 @@ function! phpcomplete#GetClassName(start_line, context, current_namespace, impor
 				let [class_candidate_namespace, function_imports] = phpcomplete#GetCurrentNameSpace(file_lines)
 				" try to expand the classname of the returned type with the context got from the function's source file
 
-				let [classname_candidate, class_candidate_namespace] = phpcomplete#ExpandClassName(classname_candidate, class_candidate_namespace, function_imports)
+				let [classname_candidate, unused] = phpcomplete#ExpandClassName(classname_candidate, class_candidate_namespace, function_imports)
 			endif
 		endif
 		if classname_candidate != ''
@@ -1674,10 +1650,9 @@ function! phpcomplete#GetClassName(start_line, context, current_namespace, impor
 					let sub_methodstack = phpcomplete#GetMethodStack(matchstr(line, '^\s*'.object.'\s*=&\?\s*\s\+\zs.*'))
 					let [classname_candidate, class_candidate_namespace] = phpcomplete#GetCallChainReturnType(
 						\ classname,
-						\ namespace_for_class,
+						\ a:current_namespace,
 						\ a:imports,
 						\ sub_methodstack)
-
 					return (class_candidate_namespace == '\' || class_candidate_namespace == '') ? classname_candidate : class_candidate_namespace.'\'.classname_candidate
 				endif
 			endif
@@ -1808,9 +1783,6 @@ function! phpcomplete#GetClassName(start_line, context, current_namespace, impor
 				let [function_name, function_namespace] = phpcomplete#ExpandClassName(function_name, a:current_namespace, a:imports)
 
 				let function_file = phpcomplete#GetFunctionLocation(function_name, function_namespace)
-				if function_file == ''
-					let function_file = phpcomplete#GetFunctionLocation(function_name, '\')
-				endif
 
 				if function_file == 'VIMPHP_BUILTINFUNCTION'
 					" built in function, grab the return type from the info string
@@ -1826,7 +1798,7 @@ function! phpcomplete#GetClassName(start_line, context, current_namespace, impor
 						let classname_candidate = docblock.return.type
 						let [class_candidate_namespace, function_imports] = phpcomplete#GetCurrentNameSpace(file_lines)
 						" try to expand the classname of the returned type with the context got from the function's source file
-						let [classname_candidate, class_candidate_namespace] = phpcomplete#ExpandClassName(classname_candidate, class_candidate_namespace, function_imports)
+						let [classname_candidate, unused] = phpcomplete#ExpandClassName(classname_candidate, class_candidate_namespace, function_imports)
 						break
 					endif
 				endif
@@ -1889,8 +1861,6 @@ function! phpcomplete#GetClassName(start_line, context, current_namespace, impor
 				for tag in tags
 					if tag.kind ==? 'v' && tag.cmd =~? '=\s*new\s\+\zs'.class_name_pattern.'\ze'
 						let classname = matchstr(tag.cmd, '=\s*new\s\+\zs'.class_name_pattern.'\ze')
-						" unescape the classname, it would have "\" doubled since it is an ex command
-						let classname = substitute(classname, '\\\(\_.\)', '\1', 'g')
 						return classname
 					endif
 				endfor
@@ -2107,19 +2077,6 @@ function! phpcomplete#GetClassContentsStructure(file_path, file_lines, class_nam
 	endif
 	call searchpair('{', '', '}', 'W')
 	let class_closing_bracket_line = line('.')
-
-	" Include class docblock
-	let doc_line = cfline - 1
-	if getline(doc_line) =~? '^\s*\*/'
-		while doc_line != 0
-			if getline(doc_line) =~? '^\s*/\*\*'
-				let cfline = doc_line
-				break
-			endif
-			let doc_line -= 1
-		endwhile
-	endif
-
 	let classcontent = join(getline(cfline, class_closing_bracket_line), "\n")
 
 	let used_traits = []
@@ -2284,19 +2241,8 @@ function! phpcomplete#GetDocBlock(sccontent, search) " {{{
 		let line = a:sccontent[i]
 		" search for a function declaration
 		if line =~? a:search
-			if line =~? '@property'
-				let doc_line = i
-				while doc_line != sccontent_len - 1
-					if a:sccontent[doc_line] =~? '^\s*\*/'
-						let l = doc_line
-						break
-					endif
-					let doc_line += 1
-				endwhile
-			else
-				let l = i - 1
-			endif
-			" start backward search for the comment block
+			let l = i - 1
+			" start backward serch for the comment block
 			while l != 0
 				let line = a:sccontent[l]
 				" if it's a one line docblock like comment and we can just return it right away
@@ -2317,7 +2263,7 @@ function! phpcomplete#GetDocBlock(sccontent, search) " {{{
 				return ''
 			end
 
-			while l >= 0
+			while l != 0
 				let line = a:sccontent[l]
 				if line =~? '^\s*/\*\*'
 					let comment_start = l
@@ -2351,10 +2297,9 @@ function! phpcomplete#ParseDocBlock(docblock) " {{{
 		\ 'return': {},
 		\ 'throws': [],
 		\ 'var': {},
-		\ 'properties': [],
 		\ }
 
-	let res.description = substitute(matchstr(a:docblock, '\zs\_.\{-}\ze\(@type\|@var\|@param\|@return\|$\)'), '\(^\_s*\|\_s*$\)', '', 'g')
+	let res.description = substitute(matchstr(a:docblock, '\zs\_.\{-}\ze\(@var\|@param\|@return\|$\)'), '\(^\_s*\|\_s*$\)', '', 'g')
 	let docblock_lines = split(a:docblock, "\n")
 
 	let param_lines = filter(copy(docblock_lines), 'v:val =~? "^@param"')
@@ -2389,26 +2334,15 @@ function! phpcomplete#ParseDocBlock(docblock) " {{{
 		endif
 	endfor
 
-	let var_line = filter(copy(docblock_lines), 'v:val =~? "^\\(@var\\|@type\\)"')
+	let var_line = filter(copy(docblock_lines), 'v:val =~? "^@var"')
 	if len(var_line) > 0
-		let var_parts = matchlist(var_line[0], '\(@var\|@type\)\s\+\(\S\+\)\s*\(.*\)')
+		let var_parts = matchlist(var_line[0], '@var\s\+\(\S\+\)\s*\(.*\)')
 		let res['var'] = {
 					\ 'line': var_parts[0],
-					\ 'type': phpcomplete#GetTypeFromDocBlockParam(get(var_parts, 2, '')),
-					\ 'description': get(var_parts, 3, '')}
+					\ 'type': phpcomplete#GetTypeFromDocBlockParam(get(var_parts, 1, '')),
+					\ 'description': get(var_parts, 2, '')}
 	endif
 
-	let property_lines = filter(copy(docblock_lines), 'v:val =~? "^@property"')
-	for property_line in property_lines
-		let parts = matchlist(property_line, '\(@property\)\s\+\(\S\+\)\s*\(.*\)')
-		if len(parts) > 0
-			call add(res.properties, {
-						\ 'line': parts[0],
-						\ 'type': phpcomplete#GetTypeFromDocBlockParam(get(parts, 2, '')),
-						\ 'description': get(parts, 3, '')})
-		endif
-	endfor
-
 	return res
 endfunction
 " }}}
@@ -2564,7 +2498,6 @@ function! phpcomplete#GetCurrentNameSpace(file_lines) " {{{
 						let	name = matchstr(name, '\\\zs[^\\]\+\ze$')
 					endif
 				endif
-
 				" leading slash is not required use imports are always absolute
 				let imports[name] = {'name': object, 'kind': ''}
 			endfor
@@ -2600,7 +2533,6 @@ function! phpcomplete#GetCurrentNameSpace(file_lines) " {{{
 								elseif !exists('no_namespace_candidate')
 									" save the first namespacless match to be used if no better
 									" candidate found later on
-									let tag.namespace = namespace_for_classes
 									let no_namespace_candidate = tag
 								endif
 							endif

runtime/autoload/rubycomplete.vim

@@ -196,7 +196,7 @@ function! rubycomplete#Complete(findstart, base)
             if c =~ '\w'
                 continue
             elseif ! c =~ '\.'
-                let idx = -1
+                idx = -1
                 break
             else
                 break

runtime/autoload/rust.vim

@@ -1,415 +0,0 @@
-" Author: Kevin Ballard
-" Description: Helper functions for Rust commands/mappings
-" Last Modified: May 27, 2014
-" For bugs, patches and license go to https://github.com/rust-lang/rust.vim
-
-" Jump {{{1
-
-function! rust#Jump(mode, function) range
-	let cnt = v:count1
-	normal! m'
-	if a:mode ==# 'v'
-		norm! gv
-	endif
-	let foldenable = &foldenable
-	set nofoldenable
-	while cnt > 0
-		execute "call <SID>Jump_" . a:function . "()"
-		let cnt = cnt - 1
-	endwhile
-	let &foldenable = foldenable
-endfunction
-
-function! s:Jump_Back()
-	call search('{', 'b')
-	keepjumps normal! w99[{
-endfunction
-
-function! s:Jump_Forward()
-	normal! j0
-	call search('{', 'b')
-	keepjumps normal! w99[{%
-	call search('{')
-endfunction
-
-" Run {{{1
-
-function! rust#Run(bang, args)
-	let args = s:ShellTokenize(a:args)
-	if a:bang
-		let idx = index(l:args, '--')
-		if idx != -1
-			let rustc_args = idx == 0 ? [] : l:args[:idx-1]
-			let args = l:args[idx+1:]
-		else
-			let rustc_args = l:args
-			let args = []
-		endif
-	else
-		let rustc_args = []
-	endif
-
-	let b:rust_last_rustc_args = l:rustc_args
-	let b:rust_last_args = l:args
-
-	call s:WithPath(function("s:Run"), rustc_args, args)
-endfunction
-
-function! s:Run(dict, rustc_args, args)
-	let exepath = a:dict.tmpdir.'/'.fnamemodify(a:dict.path, ':t:r')
-	if has('win32')
-		let exepath .= '.exe'
-	endif
-
-	let relpath = get(a:dict, 'tmpdir_relpath', a:dict.path)
-	let rustc_args = [relpath, '-o', exepath] + a:rustc_args
-
-	let rustc = exists("g:rustc_path") ? g:rustc_path : "rustc"
-
-	let pwd = a:dict.istemp ? a:dict.tmpdir : ''
-	let output = s:system(pwd, shellescape(rustc) . " " . join(map(rustc_args, 'shellescape(v:val)')))
-	if output != ''
-		echohl WarningMsg
-		echo output
-		echohl None
-	endif
-	if !v:shell_error
-		exe '!' . shellescape(exepath) . " " . join(map(a:args, 'shellescape(v:val)'))
-	endif
-endfunction
-
-" Expand {{{1
-
-function! rust#Expand(bang, args)
-	let args = s:ShellTokenize(a:args)
-	if a:bang && !empty(l:args)
-		let pretty = remove(l:args, 0)
-	else
-		let pretty = "expanded"
-	endif
-	call s:WithPath(function("s:Expand"), pretty, args)
-endfunction
-
-function! s:Expand(dict, pretty, args)
-	try
-		let rustc = exists("g:rustc_path") ? g:rustc_path : "rustc"
-
-		if a:pretty =~? '^\%(everybody_loops$\|flowgraph=\)'
-			let flag = '--xpretty'
-		else
-			let flag = '--pretty'
-		endif
-		let relpath = get(a:dict, 'tmpdir_relpath', a:dict.path)
-		let args = [relpath, '-Z', 'unstable-options', l:flag, a:pretty] + a:args
-		let pwd = a:dict.istemp ? a:dict.tmpdir : ''
-		let output = s:system(pwd, shellescape(rustc) . " " . join(map(args, 'shellescape(v:val)')))
-		if v:shell_error
-			echohl WarningMsg
-			echo output
-			echohl None
-		else
-			new
-			silent put =output
-			1
-			d
-			setl filetype=rust
-			setl buftype=nofile
-			setl bufhidden=hide
-			setl noswapfile
-			" give the buffer a nice name
-			let suffix = 1
-			let basename = fnamemodify(a:dict.path, ':t:r')
-			while 1
-				let bufname = basename
-				if suffix > 1 | let bufname .= ' ('.suffix.')' | endif
-				let bufname .= '.pretty.rs'
-				if bufexists(bufname)
-					let suffix += 1
-					continue
-				endif
-				exe 'silent noautocmd keepalt file' fnameescape(bufname)
-				break
-			endwhile
-		endif
-	endtry
-endfunction
-
-function! rust#CompleteExpand(lead, line, pos)
-	if a:line[: a:pos-1] =~ '^RustExpand!\s*\S*$'
-		" first argument and it has a !
-		let list = ["normal", "expanded", "typed", "expanded,identified", "flowgraph=", "everybody_loops"]
-		if !empty(a:lead)
-			call filter(list, "v:val[:len(a:lead)-1] == a:lead")
-		endif
-		return list
-	endif
-
-	return glob(escape(a:lead, "*?[") . '*', 0, 1)
-endfunction
-
-" Emit {{{1
-
-function! rust#Emit(type, args)
-	let args = s:ShellTokenize(a:args)
-	call s:WithPath(function("s:Emit"), a:type, args)
-endfunction
-
-function! s:Emit(dict, type, args)
-	try
-		let output_path = a:dict.tmpdir.'/output'
-
-		let rustc = exists("g:rustc_path") ? g:rustc_path : "rustc"
-
-		let relpath = get(a:dict, 'tmpdir_relpath', a:dict.path)
-		let args = [relpath, '--emit', a:type, '-o', output_path] + a:args
-		let pwd = a:dict.istemp ? a:dict.tmpdir : ''
-		let output = s:system(pwd, shellescape(rustc) . " " . join(map(args, 'shellescape(v:val)')))
-		if output != ''
-			echohl WarningMsg
-			echo output
-			echohl None
-		endif
-		if !v:shell_error
-			new
-			exe 'silent keepalt read' fnameescape(output_path)
-			1
-			d
-			if a:type == "llvm-ir"
-				setl filetype=llvm
-				let extension = 'll'
-			elseif a:type == "asm"
-				setl filetype=asm
-				let extension = 's'
-			endif
-			setl buftype=nofile
-			setl bufhidden=hide
-			setl noswapfile
-			if exists('l:extension')
-				" give the buffer a nice name
-				let suffix = 1
-				let basename = fnamemodify(a:dict.path, ':t:r')
-				while 1
-					let bufname = basename
-					if suffix > 1 | let bufname .= ' ('.suffix.')' | endif
-					let bufname .= '.'.extension
-					if bufexists(bufname)
-						let suffix += 1
-						continue
-					endif
-					exe 'silent noautocmd keepalt file' fnameescape(bufname)
-					break
-				endwhile
-			endif
-		endif
-	endtry
-endfunction
-
-" Utility functions {{{1
-
-" Invokes func(dict, ...)
-" Where {dict} is a dictionary with the following keys:
-"   'path' - The path to the file
-"   'tmpdir' - The path to a temporary directory that will be deleted when the
-"              function returns.
-"   'istemp' - 1 if the path is a file inside of {dict.tmpdir} or 0 otherwise.
-" If {istemp} is 1 then an additional key is provided:
-"   'tmpdir_relpath' - The {path} relative to the {tmpdir}.
-"
-" {dict.path} may be a path to a file inside of {dict.tmpdir} or it may be the
-" existing path of the current buffer. If the path is inside of {dict.tmpdir}
-" then it is guaranteed to have a '.rs' extension.
-function! s:WithPath(func, ...)
-	let buf = bufnr('')
-	let saved = {}
-	let dict = {}
-	try
-		let saved.write = &write
-		set write
-		let dict.path = expand('%')
-		let pathisempty = empty(dict.path)
-
-		" Always create a tmpdir in case the wrapped command wants it
-		let dict.tmpdir = tempname()
-		call mkdir(dict.tmpdir)
-
-		if pathisempty || !saved.write
-			let dict.istemp = 1
-			" if we're doing this because of nowrite, preserve the filename
-			if !pathisempty
-				let filename = expand('%:t:r').".rs"
-			else
-				let filename = 'unnamed.rs'
-			endif
-			let dict.tmpdir_relpath = filename
-			let dict.path = dict.tmpdir.'/'.filename
-
-			let saved.mod = &mod
-			set nomod
-
-			silent exe 'keepalt write! ' . fnameescape(dict.path)
-			if pathisempty
-				silent keepalt 0file
-			endif
-		else
-			let dict.istemp = 0
-			update
-		endif
-
-		call call(a:func, [dict] + a:000)
-	finally
-		if bufexists(buf)
-			for [opt, value] in items(saved)
-				silent call setbufvar(buf, '&'.opt, value)
-				unlet value " avoid variable type mismatches
-			endfor
-		endif
-		if has_key(dict, 'tmpdir') | silent call s:RmDir(dict.tmpdir) | endif
-	endtry
-endfunction
-
-function! rust#AppendCmdLine(text)
-	call setcmdpos(getcmdpos())
-	let cmd = getcmdline() . a:text
-	return cmd
-endfunction
-
-" Tokenize the string according to sh parsing rules
-function! s:ShellTokenize(text)
-	" states:
-	" 0: start of word
-	" 1: unquoted
-	" 2: unquoted backslash
-	" 3: double-quote
-	" 4: double-quoted backslash
-	" 5: single-quote
-	let l:state = 0
-	let l:current = ''
-	let l:args = []
-	for c in split(a:text, '\zs')
-		if l:state == 0 || l:state == 1 " unquoted
-			if l:c ==# ' '
-				if l:state == 0 | continue | endif
-				call add(l:args, l:current)
-				let l:current = ''
-				let l:state = 0
-			elseif l:c ==# '\'
-				let l:state = 2
-			elseif l:c ==# '"'
-				let l:state = 3
-			elseif l:c ==# "'"
-				let l:state = 5
-			else
-				let l:current .= l:c
-				let l:state = 1
-			endif
-		elseif l:state == 2 " unquoted backslash
-			if l:c !=# "\n" " can it even be \n?
-				let l:current .= l:c
-			endif
-			let l:state = 1
-		elseif l:state == 3 " double-quote
-			if l:c ==# '\'
-				let l:state = 4
-			elseif l:c ==# '"'
-				let l:state = 1
-			else
-				let l:current .= l:c
-			endif
-		elseif l:state == 4 " double-quoted backslash
-			if stridx('$`"\', l:c) >= 0
-				let l:current .= l:c
-			elseif l:c ==# "\n" " is this even possible?
-				" skip it
-			else
-				let l:current .= '\'.l:c
-			endif
-			let l:state = 3
-		elseif l:state == 5 " single-quoted
-			if l:c == "'"
-				let l:state = 1
-			else
-				let l:current .= l:c
-			endif
-		endif
-	endfor
-	if l:state != 0
-		call add(l:args, l:current)
-	endif
-	return l:args
-endfunction
-
-function! s:RmDir(path)
-	" sanity check; make sure it's not empty, /, or $HOME
-	if empty(a:path)
-		echoerr 'Attempted to delete empty path'
-		return 0
-	elseif a:path == '/' || a:path == $HOME
-		echoerr 'Attempted to delete protected path: ' . a:path
-		return 0
-	endif
-	return system("rm -rf " . shellescape(a:path))
-endfunction
-
-" Executes {cmd} with the cwd set to {pwd}, without changing Vim's cwd.
-" If {pwd} is the empty string then it doesn't change the cwd.
-function! s:system(pwd, cmd)
-	let cmd = a:cmd
-	if !empty(a:pwd)
-		let cmd = 'cd ' . shellescape(a:pwd) . ' && ' . cmd
-	endif
-	return system(cmd)
-endfunction
-
-" Playpen Support {{{1
-" Parts of gist.vim by Yasuhiro Matsumoto <mattn.jp@gmail.com> reused
-" gist.vim available under the BSD license, available at
-" http://github.com/mattn/gist-vim
-function! s:has_webapi()
-    if !exists("*webapi#http#post")
-	try
-	    call webapi#http#post()
-	catch
-	endtry
-    endif
-    return exists("*webapi#http#post")
-endfunction
-
-function! rust#Play(count, line1, line2, ...) abort
-    redraw
-
-    let l:rust_playpen_url = get(g:, 'rust_playpen_url', 'https://play.rust-lang.org/')
-    let l:rust_shortener_url = get(g:, 'rust_shortener_url', 'https://is.gd/')
-
-    if !s:has_webapi()
-	echohl ErrorMsg | echomsg ':RustPlay depends on webapi.vim (https://github.com/mattn/webapi-vim)' | echohl None
-	return
-    endif
-
-    let bufname = bufname('%')
-    if a:count < 1
-	let content = join(getline(a:line1, a:line2), "\n")
-    else
-	let save_regcont = @"
-	let save_regtype = getregtype('"')
-	silent! normal! gvy
-	let content = @"
-	call setreg('"', save_regcont, save_regtype)
-    endif
-
-    let body = l:rust_playpen_url."?code=".webapi#http#encodeURI(content)
-
-    if strlen(body) > 5000
-	echohl ErrorMsg | echomsg 'Buffer too large, max 5000 encoded characters ('.strlen(body).')' | echohl None
-	return
-    endif
-
-    let payload = "format=simple&url=".webapi#http#encodeURI(body)
-    let res = webapi#http#post(l:rust_shortener_url.'create.php', payload, {})
-    let url = res.content
-
-    redraw | echomsg 'Done: '.url
-endfunction
-
-" }}}1
-
-" vim: set noet sw=8 ts=8:

runtime/autoload/rustfmt.vim

@@ -1,107 +0,0 @@
-" Author: Stephen Sugden <stephen@stephensugden.com>
-"
-" Adapted from https://github.com/fatih/vim-go
-" For bugs, patches and license go to https://github.com/rust-lang/rust.vim
-
-if !exists("g:rustfmt_autosave")
-	let g:rustfmt_autosave = 0
-endif
-
-if !exists("g:rustfmt_command")
-	let g:rustfmt_command = "rustfmt"
-endif
-
-if !exists("g:rustfmt_options")
-	let g:rustfmt_options = ""
-endif
-
-if !exists("g:rustfmt_fail_silently")
-	let g:rustfmt_fail_silently = 0
-endif
-
-let s:got_fmt_error = 0
-
-function! s:RustfmtCommandRange(filename, line1, line2)
-	let l:arg = {"file": shellescape(a:filename), "range": [a:line1, a:line2]}
-	return printf("%s %s --write-mode=overwrite --file-lines '[%s]'", g:rustfmt_command, g:rustfmt_options, json_encode(l:arg))
-endfunction
-
-function! s:RustfmtCommand(filename)
-	return g:rustfmt_command . " --write-mode=overwrite " . g:rustfmt_options . " " . shellescape(a:filename)
-endfunction
-
-function! s:RunRustfmt(command, curw, tmpname)
-	if exists("*systemlist")
-		let out = systemlist(a:command)
-	else
-		let out = split(system(a:command), '\r\?\n')
-	endif
-
-	if v:shell_error == 0 || v:shell_error == 3
-		" remove undo point caused via BufWritePre
-		try | silent undojoin | catch | endtry
-
-		" Replace current file with temp file, then reload buffer
-		call rename(a:tmpname, expand('%'))
-		silent edit!
-		let &syntax = &syntax
-
-		" only clear location list if it was previously filled to prevent
-		" clobbering other additions
-		if s:got_fmt_error
-			let s:got_fmt_error = 0
-			call setloclist(0, [])
-			lwindow
-		endif
-	elseif g:rustfmt_fail_silently == 0
-		" otherwise get the errors and put them in the location list
-		let errors = []
-
-		for line in out
-			" src/lib.rs:13:5: 13:10 error: expected `,`, or `}`, found `value`
-			let tokens = matchlist(line, '^\(.\{-}\):\(\d\+\):\(\d\+\):\s*\(\d\+:\d\+\s*\)\?\s*error: \(.*\)')
-			if !empty(tokens)
-				call add(errors, {"filename": @%,
-						 \"lnum":     tokens[2],
-						 \"col":      tokens[3],
-						 \"text":     tokens[5]})
-			endif
-		endfor
-
-		if empty(errors)
-			% | " Couldn't detect rustfmt error format, output errors
-		endif
-
-		if !empty(errors)
-			call setloclist(0, errors, 'r')
-			echohl Error | echomsg "rustfmt returned error" | echohl None
-		endif
-
-		let s:got_fmt_error = 1
-		lwindow
-		" We didn't use the temp file, so clean up
-		call delete(a:tmpname)
-	endif
-
-	call winrestview(a:curw)
-endfunction
-
-function! rustfmt#FormatRange(line1, line2)
-	let l:curw = winsaveview()
-	let l:tmpname = expand("%:p:h") . "/." . expand("%:p:t") . ".rustfmt"
-	call writefile(getline(1, '$'), l:tmpname)
-
-	let command = s:RustfmtCommandRange(l:tmpname, a:line1, a:line2)
-
-	call s:RunRustfmt(command, l:curw, l:tmpname)
-endfunction
-
-function! rustfmt#Format()
-	let l:curw = winsaveview()
-	let l:tmpname = expand("%:p:h") . "/." . expand("%:p:t") . ".rustfmt"
-	call writefile(getline(1, '$'), l:tmpname)
-
-	let command = s:RustfmtCommand(l:tmpname)
-
-	call s:RunRustfmt(command, l:curw, l:tmpname)
-endfunction

runtime/colors/README.txt

@@ -41,16 +41,9 @@ this autocmd might be useful:
      autocmd SourcePre */colors/blue_sky.vim set background=dark
 Replace "blue_sky" with the name of the colorscheme.
 
-In case you want to tweak a colorscheme after it was loaded, check out the
+In case you want to tweak a colorscheme after it was loaded, check out that
 ColorScheme autocmd event.
 
-To customize a colorscheme use another name, e.g.  "~/.vim/colors/mine.vim",
-and use `:runtime` to load the original colorscheme:
-	" load the "evening" colorscheme
-	runtime colors/evening.vim
-	" change the color of statements
-	hi Statement ctermfg=Blue guifg=Blue
-
 To see which highlight group is used where, find the help for
 "highlight-groups" and "group-name".
 

runtime/colors/evening.vim

@@ -1,6 +1,6 @@
 " Vim color file
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2016 Oct 10
+" Last Change:	2006 Apr 14
 
 " This color scheme uses a dark grey background.
 
@@ -46,8 +46,8 @@ hi CursorColumn term=reverse ctermbg=Black guibg=grey40
 hi CursorLine term=underline cterm=underline guibg=grey40
 
 " Groups for syntax highlighting
-hi Constant term=underline ctermfg=Magenta guifg=#ffa0a0
-hi Special term=bold ctermfg=LightRed guifg=Orange
+hi Constant term=underline ctermfg=Magenta guifg=#ffa0a0 guibg=grey5
+hi Special term=bold ctermfg=LightRed guifg=Orange guibg=grey5
 if &t_Co > 8
   hi Statement term=bold cterm=bold ctermfg=Yellow guifg=#ffff60 gui=bold
 endif

runtime/compiler/bdf.vim

@@ -1,7 +1,7 @@
 " Vim compiler file
-" Compiler:             BDF to PCF Conversion
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2006-04-19
+" Compiler:         BDF to PCF Conversion
+" Maintainer:       Nikolai Weibull <now@bitwi.se>
+" Latest Revision:  2006-04-19
 
 if exists("current_compiler")
   finish

runtime/compiler/cargo.vim

@@ -1,35 +0,0 @@
-" Vim compiler file
-" Compiler:         Cargo Compiler
-" Maintainer:       Damien Radtke <damienradtke@gmail.com>
-" Latest Revision:  2014 Sep 24
-" For bugs, patches and license go to https://github.com/rust-lang/rust.vim
-
-if exists('current_compiler')
-	finish
-endif
-runtime compiler/rustc.vim
-let current_compiler = "cargo"
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-if exists(':CompilerSet') != 2
-	command -nargs=* CompilerSet setlocal <args>
-endif
-
-if exists('g:cargo_makeprg_params')
-	execute 'CompilerSet makeprg=cargo\ '.escape(g:cargo_makeprg_params, ' \|"').'\ $*'
-else
-	CompilerSet makeprg=cargo\ $*
-endif
-
-" Ignore general cargo progress messages
-CompilerSet errorformat+=
-			\%-G%\\s%#Downloading%.%#,
-			\%-G%\\s%#Compiling%.%#,
-			\%-G%\\s%#Finished%.%#,
-			\%-G%\\s%#error:\ Could\ not\ compile\ %.%#,
-			\%-G%\\s%#To\ learn\ more\\,%.%#
-
-let &cpo = s:save_cpo
-unlet s:save_cpo

runtime/compiler/context.vim

@@ -1,54 +0,0 @@
-" Vim compiler file
-" Compiler:     ConTeXt typesetting engine
-" Maintainer:   Nicola Vitacolonna <nvitacolonna@gmail.com>
-" Last Change:  2016 Oct 21
-
-if exists("current_compiler")
-  finish
-endif
-let s:keepcpo= &cpo
-set cpo&vim
-
-if exists(":CompilerSet") != 2    " older Vim always used :setlocal
-  command -nargs=* CompilerSet setlocal <args>
-endif
-
-" If makefile exists and we are not asked to ignore it, we use standard make
-" (do not redefine makeprg)
-if get(b:, 'context_ignore_makefile', get(g:, 'context_ignore_makefile', 0)) ||
-      \ (!filereadable('Makefile') && !filereadable('makefile'))
-  let current_compiler = 'context'
-  " The following assumes that the current working directory is set to the
-  " directory of the file to be typeset
-  let &l:makeprg = get(b:, 'context_mtxrun', get(g:, 'context_mtxrun', 'mtxrun'))
-        \ . ' --script context --autogenerate --nonstopmode --synctex='
-        \ . (get(b:, 'context_synctex', get(g:, 'context_synctex', 0)) ? '1' : '0')
-        \ . ' ' . get(b:, 'context_extra_options', get(g:, 'context_extra_options', ''))
-        \ . ' ' . shellescape(expand('%:p:t'))
-else
-  let current_compiler = 'make'
-endif
-
-let b:context_errorformat = ''
-      \ . '%-Popen source%.%#> %f,'
-      \ . '%-Qclose source%.%#> %f,'
-      \ . "%-Popen source%.%#name '%f',"
-      \ . "%-Qclose source%.%#name '%f',"
-      \ . '%Etex %trror%.%#mp error on line %l in file %f:%.%#,'
-      \ . 'tex %trror%.%#error on line %l in file %f: %m,'
-      \ . '%Elua %trror%.%#error on line %l in file %f:,'
-      \ . '%+Emetapost %#> error: %#,'
-      \ . '! error: %#%m,'
-      \ . '%-C %#,'
-      \ . '%C! %m,'
-      \ . '%Z[ctxlua]%m,'
-      \ . '%+C<*> %.%#,'
-      \ . '%-C%.%#,'
-      \ . '%Z...%m,'
-      \ . '%-Zno-error,'
-      \ . '%-G%.%#' " Skip remaining lines
-
-execute 'CompilerSet errorformat=' . escape(b:context_errorformat, ' ')
-
-let &cpo = s:keepcpo
-unlet s:keepcpo

runtime/compiler/csslint.vim

@@ -1,16 +0,0 @@
-" Vim compiler file
-" Compiler:	csslint for CSS
-" Maintainer: Daniel Moch <daniel@danielmoch.com>
-" Last Change: 2016 May 21
-
-if exists("current_compiler")
-  finish
-endif
-let current_compiler = "csslint"
-
-if exists(":CompilerSet") != 2		" older Vim always used :setlocal
-  command -nargs=* CompilerSet setlocal <args>
-endif
-
-CompilerSet makeprg=csslint\ --format=compact
-CompilerSet errorformat=%-G,%-G%f:\ lint\ free!,%f:\ line\ %l\\,\ col\ %c\\,\ %trror\ -\ %m,%f:\ line\ %l\\,\ col\ %c\\,\ %tarning\ -\ %m,%f:\ line\ %l\\,\ col\ %c\\,\ %m

runtime/compiler/gcc.vim

@@ -1,7 +1,7 @@
 " Vim compiler file
-" Compiler:             GNU C Compiler
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2010-10-14
+" Compiler:         GNU C Compiler
+" Maintainer:       Nikolai Weibull <now@bitwi.se>
+" Latest Revision:  2010-10-14
 " 			added line suggested by Anton Lindqvist 2016 Mar 31
 
 if exists("current_compiler")

runtime/compiler/ghc.vim

@@ -1,26 +0,0 @@
-" Vim compiler file
-" Compiler:         GHC Haskell Compiler
-" Maintainer:       Daniel Campoverde <alx@sillybytes.net>
-" Latest Revision:  2016-11-29
-
-if exists("current_compiler")
-  finish
-endif
-let current_compiler = "ghc"
-
-let s:cpo_save = &cpo
-set cpo&vim
-
-CompilerSet errorformat=
-    \%-G%.%#:\ build,
-    \%-G%.%#preprocessing\ library\ %.%#,
-    \%-G[%.%#]%.%#,
-    \%E%f:%l:%c:\ %m,
-    \%-G--%.%#
-
-if exists('g:compiler_ghc_ignore_unmatched_lines')
-  CompilerSet errorformat+=%-G%.%#
-endif
-
-let &cpo = s:cpo_save
-unlet s:cpo_save

runtime/compiler/pylint.vim

@@ -1,16 +0,0 @@
-" Vim compiler file
-" Compiler:	Pylint for Python
-" Maintainer: Daniel Moch <daniel@danielmoch.com>
-" Last Change: 2016 May 20
-
-if exists("current_compiler")
-  finish
-endif
-let current_compiler = "pylint"
-
-if exists(":CompilerSet") != 2		" older Vim always used :setlocal
-  command -nargs=* CompilerSet setlocal <args>
-endif
-
-CompilerSet makeprg=pylint\ --output-format=text\ --msg-template=\"{path}:{line}:{column}:{C}:\ [{symbol}]\ {msg}\"\ --reports=no
-CompilerSet errorformat=%A%f:%l:%c:%t:\ %m,%A%f:%l:\ %m,%A%f:(%l):\ %m,%-Z%p^%.%#,%-G%.%#

runtime/compiler/rst.vim

@@ -1,7 +1,7 @@
 " Vim compiler file
-" Compiler:             reStructuredText Documentation Format
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2006-04-19
+" Compiler:         reStructuredText Documentation Format
+" Maintainer:       Nikolai Weibull <now@bitwi.se>
+" Latest Revision:  2006-04-19
 
 if exists("current_compiler")
   finish

runtime/compiler/rustc.vim

@@ -1,46 +0,0 @@
-" Vim compiler file
-" Compiler:         Rust Compiler
-" Maintainer:       Chris Morgan <me@chrismorgan.info>
-" Latest Revision:  2013 Jul 12
-" For bugs, patches and license go to https://github.com/rust-lang/rust.vim
-
-if exists("current_compiler")
-	finish
-endif
-let current_compiler = "rustc"
-
-let s:cpo_save = &cpo
-set cpo&vim
-
-if exists(":CompilerSet") != 2
-	command -nargs=* CompilerSet setlocal <args>
-endif
-
-if exists("g:rustc_makeprg_no_percent") && g:rustc_makeprg_no_percent != 0
-	CompilerSet makeprg=rustc
-else
-	CompilerSet makeprg=rustc\ \%
-endif
-
-" Old errorformat (before nightly 2016/08/10)
-CompilerSet errorformat=
-			\%f:%l:%c:\ %t%*[^:]:\ %m,
-			\%f:%l:%c:\ %*\\d:%*\\d\ %t%*[^:]:\ %m,
-			\%-G%f:%l\ %s,
-			\%-G%*[\ ]^,
-			\%-G%*[\ ]^%*[~],
-			\%-G%*[\ ]...
-
-" New errorformat (after nightly 2016/08/10)
-CompilerSet errorformat+=
-			\%-G,
-			\%-Gerror:\ aborting\ %.%#,
-			\%-Gerror:\ Could\ not\ compile\ %.%#,
-			\%Eerror:\ %m,
-			\%Eerror[E%n]:\ %m,
-			\%Wwarning:\ %m,
-			\%Inote:\ %m,
-			\%C\ %#-->\ %f:%l:%c
-
-let &cpo = s:cpo_save
-unlet s:cpo_save

runtime/defaults.vim

@@ -1,7 +1,7 @@
 " The default vimrc file.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last change:	2017 Mar 08
+" Last change:	2016 Sep 02
 "
 " This is loaded if no vimrc file was found.
 " Except when Vim is run with "-u NONE" or "-C".
@@ -21,10 +21,7 @@ endif
 
 " Use Vim settings, rather than Vi settings (much better!).
 " This must be first, because it changes other options as a side effect.
-" Avoid side effects when it was already reset.
-if &compatible
-  set nocompatible
-endif
+set nocompatible
 
 " Allow backspacing over everything in insert mode.
 set backspace=indent,eol,start

runtime/doc/Makefile

@@ -30,7 +30,6 @@ DOCS = \
 	filetype.txt \
 	fold.txt \
 	ft_ada.txt \
-	ft_rust.txt \
 	ft_sql.txt \
 	gui.txt \
 	gui_w32.txt \
@@ -166,7 +165,6 @@ HTMLS = \
 	filetype.html \
 	fold.html \
 	ft_ada.html \
-	ft_rust.html \
 	ft_sql.html \
 	gui.html \
 	gui_w32.html \

runtime/doc/autocmd.txt

@@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 8.0.  Last change: 2017 Jan 14
+*autocmd.txt*   For Vim version 8.0.  Last change: 2016 Sep 21
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -33,7 +33,7 @@ files matching *.c.  You can also use autocommands to implement advanced
 features, such as editing compressed files (see |gzip-example|).  The usual
 place to put autocommands is in your .vimrc or .exrc file.
 
-					*E203* *E204* *E143* *E855* *E937*
+						*E203* *E204* *E143* *E855*
 WARNING: Using autocommands is very powerful, and may lead to unexpected side
 effects.  Be careful not to destroy your text.
 - It's a good idea to do some testing on an expendable copy of a file first.
@@ -79,15 +79,11 @@ exception is that "<sfile>" is expanded when the autocmd is defined.  Example:
 
 Here Vim expands <sfile> to the name of the file containing this line.
 
-`:autocmd` adds to the list of autocommands regardless of whether they are
-already present.  When your .vimrc file is sourced twice, the autocommands
-will appear twice.  To avoid this, define your autocommands in a group, so
-that you can easily clear them: >
+When your .vimrc file is sourced twice, the autocommands will appear twice.
+To avoid this, put this command in your .vimrc file, before defining
+autocommands: >
 
-	augroup vimrc
-	  autocmd!	" Remove all vimrc autocommands
-	  au BufNewFile,BufRead *.html so <sfile>:h/html.vim
-	augroup END
+	:autocmd!	" Remove ALL autocommands for the current group.
 
 If you don't want to remove all autocommands, you can instead use a variable
 to ensure that Vim includes the autocommands only once: >
@@ -134,13 +130,8 @@ prompt.  When one command outputs two messages this can happen anyway.
 
 :au[tocmd]! [group] {event}
 			Remove ALL autocommands for {event}.
-			Warning: You should not do this without a group for
-			|BufRead| and other common events, it can break
-			plugins, syntax highlighting, etc.
 
 :au[tocmd]! [group]	Remove ALL autocommands.
-			Warning: You should normally not do this without a
-			group, it breaks plugins, syntax highlighting, etc.
 
 When the [group] argument is not given, Vim uses the current group (as defined
 with ":augroup"); otherwise, Vim uses the group defined with [group].

runtime/doc/change.txt

@@ -1,4 +1,4 @@
-*change.txt*    For Vim version 8.0.  Last change: 2017 Feb 12
+*change.txt*    For Vim version 8.0.  Last change: 2016 Sep 11
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -635,14 +635,12 @@ For other systems the tmpnam() library function is used.
 			For the {pattern} see |pattern|.
 			{string} can be a literal string, or something
 			special; see |sub-replace-special|.
-							*E939*
 			When [range] and [count] are omitted, replace in the
-			current line only.  When [count] is given, replace in
-			[count] lines, starting with the last line in [range].
-			When [range] is omitted start in the current line.
-			[count] must be a positive number.  Also see
-			|cmdline-ranges|.
-
+			current line only.
+			When [count] is given, replace in [count] lines,
+			starting with the last line in [range].  When [range]
+			is omitted start in the current line.
+			Also see |cmdline-ranges|.
 			See |:s_flags| for [flags].
 
 :[range]s[ubstitute] [flags] [count]
@@ -686,7 +684,6 @@ g&			Synonym for `:%s//~/&` (repeat last substitute with
 							*:s_flags*
 The flags that you can use for the substitute commands:
 
-							*:&&*
 [&]	Must be the first one: Keep the flags from the previous substitute
 	command.  Examples: >
 		:&&
@@ -916,7 +913,8 @@ Exceptions:
 Substitute with an expression			*sub-replace-expression*
 						*sub-replace-\=* *s/\=*
 When the substitute string starts with "\=" the remainder is interpreted as an
-expression.
+expression.  This does not work recursively: a |substitute()| function inside
+the expression cannot use "\=" for the substitute string.
 
 The special meaning for characters as mentioned at |sub-replace-special| does
 not apply except for "<CR>".  A <NL> character is used as a line break, you

runtime/doc/channel.txt

@@ -1,4 +1,4 @@
-*channel.txt*      For Vim version 8.0.  Last change: 2016 Dec 02
+*channel.txt*      For Vim version 8.0.  Last change: 2016 Sep 20
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -155,13 +155,7 @@ Use |ch_status()| to see if the channel could be opened.
 	func MyCloseHandler(channel)
 <		Vim will invoke callbacks that handle data before invoking
 		close_cb, thus when this function is called no more data will
-		be passed to the callbacks.
-							*channel-drop*
-"drop"		Specifies when to drop messages:
-		    "auto"	When there is no callback to handle a message.
-				The "close_cb" is also considered for this.
-		    "never"	All messages will be kept.
-
+		be received.
 							*waittime*
 "waittime"	The time to wait for the connection to be made in
 		milliseconds.  A negative number waits forever.
@@ -375,7 +369,7 @@ Leave out the fourth argument if no response is to be sent:
 ==============================================================================
 6. Using a RAW or NL channel				*channel-raw*
 
-If mode is RAW or NL then a message can be sent like this: >
+If mode is RAW or NL then a message can be send like this: >
     let response = ch_evalraw(channel, {string})
 
 The {string} is sent as-is.  The response will be what can be read from the
@@ -424,11 +418,7 @@ This uses the channel timeout.  To read without a timeout, just get any
 message that is available: >
 	let output = ch_read(channel, {'timeout': 0})
 When no message was available then the result is v:none for a JSON or JS mode
-channels, an empty string for a RAW or NL channel.  You can use |ch_canread()|
-to check if there is something to read.
-
-Note that when there is no callback message are dropped.  To avoid that add a
-close callback to the channel.
+channels, an empty string for a RAW or NL channel.
 
 To read all output from a RAW channel that is available: >
 	let output = ch_readraw(channel)
@@ -475,11 +465,6 @@ it like this: >
 Without the handler you need to read the output with |ch_read()| or
 |ch_readraw()|. You can do this in the close callback, see |read-in-close-cb|.
 
-Note that if the job exits before you read the output, the output may be lost.
-This depends on the system (on Unix this happens because closing the write end
-of a pipe causes the read end to get EOF).  To avoid this make the job sleep
-for a short while before it exits.
-
 The handler defined for "out_cb" will not receive stderr.  If you want to
 handle that separately, add an "err_cb" handler: >
     let job = job_start(command, {"out_cb": "MyHandler",
@@ -531,7 +516,7 @@ If the job can take some time and you don't need intermediate results, you can
 add a close callback and read the output there: >
 
 	func! CloseHandler(channel)
-	  while ch_status(a:channel, {'part': 'out'}) == 'buffered'
+	  while ch_status(a:channel) == 'buffered'
 	    echomsg ch_read(a:channel)
 	  endwhile
 	endfunc
@@ -544,7 +529,7 @@ You will want to do something more useful than "echomsg".
 
 To start another process without creating a channel: >
     let job = job_start(command,
-	\ {"in_io": "null", "out_io": "null", "err_io": "null"})
+    	\ {"in_io": "null", "out_io": "null", "err_io": "null"})
 
 This starts {command} in the background, Vim does not wait for it to finish.
 
@@ -605,17 +590,12 @@ See |job_setoptions()| and |ch_setoptions()|.
 						*job-close_cb*
 "close_cb": handler	Callback for when the channel is closed.  Same as
 			"close_cb" on |ch_open()|, see |close_cb|.
-						*job-drop*
-"drop"			Specifies when to drop messages.  Same as "drop" on
-			|ch_open()|, see |channel-drop|.  For "auto" the
-			exit_cb is not considered.
 						*job-exit_cb*
 "exit_cb": handler	Callback for when the job ends.  The arguments are the
 			job and the exit status.
-			Vim checks up to 10 times per second for jobs that
-			ended.  The check can also be triggered by calling
-			|job_status()|, which may then invoke the exit_cb
-			handler.
+			Vim checks about every 10 seconds for jobs that ended.
+			The check also be triggered by calling |job_status()|,
+			which may then invoke the exit_cb handler.
 			Note that data can be buffered, callbacks may still be
 			called after the process ends.
 							*job-timeout*
@@ -643,7 +623,7 @@ See |job_setoptions()| and |ch_setoptions()|.
 "channel": {channel}	Use an existing channel instead of creating a new one.
 			The parts of the channel that get used for the new job
 			will be disconnected from what they were used before.
-			If the channel was still used by another job this may
+			If the channel was still use by another job this may
 			cause I/O errors.
 			Existing callbacks and other settings remain.
 
@@ -661,7 +641,7 @@ See |job_setoptions()| and |ch_setoptions()|.
 "out_io": "null"	disconnect stdout (goes to /dev/null)
 "out_io": "pipe"	stdout is connected to the channel (default)
 "out_io": "file"	stdout writes to a file
-"out_io": "buffer"	stdout appends to a buffer (see below)
+"out_io": "buffer" 	stdout appends to a buffer (see below)
 "out_name": "/path/file" the name of the file or buffer to write to
 "out_buf": number	the number of the buffer to write to
 "out_modifiable": 0	when writing to a buffer, 'modifiable' will be off
@@ -674,7 +654,7 @@ See |job_setoptions()| and |ch_setoptions()|.
 "err_io": "null"	disconnect stderr  (goes to /dev/null)
 "err_io": "pipe"	stderr is connected to the channel (default)
 "err_io": "file"	stderr writes to a file
-"err_io": "buffer"	stderr appends to a buffer (see below)
+"err_io": "buffer" 	stderr appends to a buffer (see below)
 "err_name": "/path/file" the name of the file or buffer to write to
 "err_buf": number	the number of the buffer to write to
 "err_modifiable": 0	when writing to a buffer, 'modifiable' will be off

runtime/doc/cmdline.txt

@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 8.0.  Last change: 2016 Sep 27
+*cmdline.txt*   For Vim version 8.0.  Last change: 2016 Aug 27
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -229,10 +229,9 @@ CTRL-Y		When there is a modeless selection, copy the selection into
 		the clipboard. |modeless-selection|
 		If there is no selection CTRL-Y is inserted as a character.
 
-CTRL-M or CTRL-J		*c_CTRL-M* *c_CTRL-J* *c_<NL>* *c_<CR>* *c_CR*
+CTRL-J					*c_CTRL-J* *c_<NL>* *c_<CR>* *c_CR*
 <CR> or <NL>	start entered command
-
-CTRL-[						*c_CTRL-[* *c_<Esc>* *c_Esc*
+							*c_<Esc>* *c_Esc*
 <Esc>		When typed and 'x' not present in 'cpoptions', quit
 		Command-line mode without executing.  In macros or when 'x'
 		present in 'cpoptions', start entered command.
@@ -359,11 +358,8 @@ terminals)
 		List entries 6 to 12 from the search history: >
 			:history / 6,12
 <
-		List the penultimate entry from all histories: >
-			:history all -2
-<
-		List the most recent two entries from all histories: >
-			:history all -2,
+		List the recent five entries from all histories: >
+			:history all -5,
 
 :keepp[atterns] {command}			*:keepp* *:keeppatterns*
 		Execute {command}, without adding anything to the search
@@ -1060,10 +1056,10 @@ There are several ways to leave the command-line window:
 		Insert and in Normal mode.
 CTRL-C		Continue in Command-line mode.  The command-line under the
 		cursor is used as the command-line.  Works both in Insert and
-		in Normal mode.  There is no redraw, thus the window will
-		remain visible.
+		in Normal mode.  ":close" also works.  There is no redraw,
+		thus the window will remain visible.
 :quit		Discard the command line and go back to Normal mode.
-		":close", ":exit", ":xit" and CTRL-\ CTRL-N also work.
+		":exit", ":xit" and CTRL-\ CTRL-N also work.
 :qall		Quit Vim, unless there are changes in some buffer.
 :qall!		Quit Vim, discarding changes to any buffer.
 

runtime/doc/develop.txt

@@ -1,4 +1,4 @@
-*develop.txt*   For Vim version 8.0.  Last change: 2017 Jan 05
+*develop.txt*   For Vim version 8.0.  Last change: 2016 Jan 31
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -177,7 +177,7 @@ The basic steps to make changes to the code:
 5. Make a patch with "git diff".  You can also create a pull request on
    github, but it's the diff that matters.
 6. Make a note about what changed, preferably mentioning the problem and the
-   solution.  Send an email to the |vim-dev| maillist with an explanation and
+   solution.  Send an email to the vim-dev maillist with an explanation and
    include the diff. Or create a pull request on github.
 
 

runtime/doc/diff.txt

@@ -1,4 +1,4 @@
-*diff.txt*      For Vim version 8.0.  Last change: 2017 Feb 03
+*diff.txt*      For Vim version 8.0.  Last change: 2016 Aug 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -131,8 +131,6 @@ file for a moment and come back to the same file and be in diff mode again.
 		related options only happens in a window that has 'diff' set,
 		if the current window does not have 'diff' set then no options
 		in it are changed.
-		Hidden buffers are also removed from the list of diff'ed
-		buffers.
 
 The `:diffoff` command resets the relevant options to the values they had when
 using `:diffsplit`, `:diffpatch` , `:diffthis`. or starting Vim in diff mode.
@@ -166,8 +164,7 @@ The alignment of text will go wrong when:
 
 All the buffers edited in a window where the 'diff' option is set will join in
 the diff.  This is also possible for hidden buffers.  They must have been
-edited in a window first for this to be possible.  To get rid of the hidden
-buffers use `:diffoff!`.
+edited in a window first for this to be possible.
 
 					*:DiffOrig* *diff-original-file*
 Since 'diff' is a window-local option, it's possible to view the same buffer

runtime/doc/digraph.txt

@@ -1,4 +1,4 @@
-*digraph.txt*   For Vim version 8.0.  Last change: 2016 Nov 04
+*digraph.txt*   For Vim version 8.0.  Last change: 2014 Jun 19
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -147,7 +147,7 @@ a standard meaning:
 	Two			2	Hook
 	Nine			9	Horn
 
-	Equals			=	Cyrillic (= used as second char)
+	Equals			=	Cyrillic (= used as second char) 
 	Asterisk		*	Greek
 	Percent sign		%	Greek/Cyrillic special
 	Plus			+	smalls: Arabic, capitals: Hebrew
@@ -926,7 +926,6 @@ char  digraph	hex	dec	official name ~
 †	/-	2020	8224	DAGGER
 ‡	/=	2021	8225	DOUBLE DAGGER
 ‥	..	2025	8229	TWO DOT LEADER
-…	,.	2026	8230	HORIZONTAL ELLIPSIS
 ‰	%0	2030	8240	PER MILLE SIGN
 ′	1'	2032	8242	PRIME
 ″	2'	2033	8243	DOUBLE PRIME

runtime/doc/editing.txt

@@ -1,4 +1,4 @@
-*editing.txt*   For Vim version 8.0.  Last change: 2016 Nov 24
+*editing.txt*   For Vim version 8.0.  Last change: 2016 Aug 06
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -181,8 +181,7 @@ start editing another file, Vim will refuse this.  In order to overrule this
 protection, add a '!' to the command.  The changes will then be lost.  For
 example: ":q" will not work if the buffer was changed, but ":q!" will.  To see
 whether the buffer was changed use the "CTRL-G" command.  The message includes
-the string "[Modified]" if the buffer has been changed, or "+" if the 'm' flag
-is in 'shortmess'.
+the string "[Modified]" if the buffer has been changed.
 
 If you want to automatically save the changes without asking, switch on the
 'autowriteall' option.  'autowrite' is the associated Vi-compatible option
@@ -276,7 +275,7 @@ If you want to keep the changed buffer without saving it, switch on the
 
 							*:vie* *:view*
 :vie[w][!] [++opt] [+cmd] file
-			When used in Ex mode: Leave |Ex-mode|, go back to
+			When used in Ex mode: Leave |Ex mode|, go back to
 			Normal mode.  Otherwise same as |:edit|, but set
 			'readonly' option for this buffer.  {not in Vi}
 
@@ -977,12 +976,12 @@ WRITING WITH MULTIPLE BUFFERS				*buffer-write*
 
 							*:wa* *:wall*
 :wa[ll]			Write all changed buffers.  Buffers without a file
-			name cause an error message.  Buffers which are
-			readonly are not written. {not in Vi}
+			name or which are readonly are not written. {not in
+			Vi}
 
 :wa[ll]!		Write all changed buffers, even the ones that are
 			readonly.  Buffers without a file name are not
-			written and cause an error message. {not in Vi}
+			written. {not in Vi}
 
 
 Vim will warn you if you try to overwrite a file that has been changed

runtime/doc/eval.txt

@@ -1,4 +1,4 @@
-*eval.txt*	For Vim version 8.0.  Last change: 2017 Mar 21
+*eval.txt*	For Vim version 8.0.  Last change: 2016 Sep 25
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1329,8 +1329,7 @@ b:changedtick	The total number of changes to the current buffer.  It is
 		    :	let my_changedtick = b:changedtick
 		    :	call My_Update()
 		    :endif
-<		You cannot change or delete the b:changedtick variable.
-
+<
 						*window-variable* *w:var* *w:*
 A variable name that is preceded with "w:" is local to the current window.  It
 is deleted when the window is closed.
@@ -1789,11 +1788,8 @@ v:progpath	Contains the command with which Vim was invoked, including the
 		|--remote-expr|.
 		To get the full path use: >
 			echo exepath(v:progpath)
-<		If the path is relative it will be expanded to the full path,
-		so that it still works after `:cd`. Thus starting "./vim"
-		results in "/home/user/path/to/vim/src/vim".
-		On MS-Windows the executable may be called "vim.exe", but the
-		".exe" is not added to v:progpath.
+<		NOTE: This does not work when the command is a relative path
+		and the current directory has changed.
 		Read-only.
 
 					*v:register* *register-variable*
@@ -1904,8 +1900,6 @@ v:termresponse	The escape sequence returned by the terminal for the |t_RV|
 
 					*v:testing* *testing-variable*
 v:testing	Must be set before using `test_garbagecollect_now()`.
-		Also, when set certain error messages won't be shown for 2
-		seconds. (e.g. "'dictionary' option is empty") 
 
 				*v:this_session* *this_session-variable*
 v:this_session	Full filename of the last loaded or saved session file.  See
@@ -1986,27 +1980,19 @@ 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_equal({exp}, {act} [, {msg}])
-				none	assert {exp} is equal to {act}
-assert_exception({error} [, {msg}])
-				none	assert {error} is in v:exception
-assert_fails({cmd} [, {error}])	none	assert {cmd} fails
-assert_false({actual} [, {msg}])
-				none	assert {actual} is false
+assert_equal({exp}, {act} [, {msg}])     none  assert {exp} is equal to {act}
+assert_exception({error} [, {msg}])      none  assert {error} is in v:exception
+assert_fails({cmd} [, {error}])          none  assert {cmd} fails
+assert_false({actual} [, {msg}])         none  assert {actual} is false
 assert_inrange({lower}, {upper}, {actual} [, {msg}])
 				none	assert {actual} is inside the range
-assert_match({pat}, {text} [, {msg}])
-				none	assert {pat} matches {text}
-assert_notequal({exp}, {act} [, {msg}])
-				none	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
+assert_match({pat}, {text} [, {msg}])    none  assert {pat} matches {text}
+assert_notequal({exp}, {act} [, {msg}])  none  assert {exp} is not equal {act}
+assert_notmatch({pat}, {text} [, {msg}]) none  assert {pat} not matches {text}
+assert_true({actual} [, {msg}])          none  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}
-balloon_show({msg})		none	show {msg} inside the balloon
 browse({save}, {title}, {initdir}, {default})
 				String	put up a file requester
 browsedir({title}, {initdir})	String	put up a directory requester
@@ -2023,7 +2009,6 @@ byteidxcomp({expr}, {nr})	Number	byte index of {nr}'th char in {expr}
 call({func}, {arglist} [, {dict}])
 				any	call {func} with arguments {arglist}
 ceil({expr})			Float	round {expr} up
-ch_canread({handle})		Number	check if there is something to read
 ch_close({handle})		none	close {handle}
 ch_close_in({handle})		none	close in part of {handle}
 ch_evalexpr({handle}, {expr} [, {options}])
@@ -2236,8 +2221,8 @@ matchstr({expr}, {pat}[, {start}[, {count}]])
 				String	{count}'th match of {pat} in {expr}
 matchstrpos({expr}, {pat}[, {start}[, {count}]])
 				List	{count}'th match of {pat} in {expr}
-max({expr})			Number	maximum value of items in {expr}
-min({expr})			Number	minimum value of items in {expr}
+max({list})			Number	maximum value of items in {list}
+min({list})			Number	minimum value of items in {list}
 mkdir({name} [, {path} [, {prot}]])
 				Number	create directory {name}
 mode([expr])			String	current editing mode
@@ -2253,7 +2238,6 @@ printf({fmt}, {expr1}...)	String	format text
 pumvisible()			Number	whether popup menu is visible
 pyeval({expr})			any	evaluate |Python| expression
 py3eval({expr})			any	evaluate |python3| expression
-pyxeval({expr})			any	evaluate |python_x| expression
 range({expr} [, {max} [, {stride}]])
 				List	items from {expr} to {max}
 readfile({fname} [, {binary} [, {max}]])
@@ -2261,17 +2245,14 @@ readfile({fname} [, {binary} [, {max}]])
 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
-remote_expr({server}, {string} [, {idvar} [, {timeout}]])
+remote_expr({server}, {string} [, {idvar}])
 				String	send expression
 remote_foreground({server})	Number	bring Vim server to the foreground
 remote_peek({serverid} [, {retvar}])
 				Number	check for reply string
-remote_read({serverid} [, {timeout}])
-				String	read reply string
+remote_read({serverid})		String	read reply string
 remote_send({server}, {string} [, {idvar}])
 				String	send key sequence
-remote_startserver({name})	none	become server {name}
-				String	send key sequence
 remove({list}, {idx} [, {end}])	any	remove items {idx}-{end} from {list}
 remove({dict}, {key})		any	remove entry {key} from {dict}
 rename({from}, {to})		Number	rename (move) file from {from} to {to}
@@ -2364,7 +2345,7 @@ systemlist({expr} [, {input}])	List	output of shell command/filter {expr}
 tabpagebuflist([{arg}])		List	list of buffer numbers in tab page
 tabpagenr([{arg}])		Number	number of current or last tab page
 tabpagewinnr({tabarg}[, {arg}]) Number	number of current window in tab page
-taglist({expr}[, {filename}])	List	list of tags matching {expr}
+taglist({expr})			List	list of tags matching {expr}
 tagfiles()			List	tags files used
 tan({expr})			Float	tangent of {expr}
 tanh({expr})			Float	hyperbolic tangent of {expr}
@@ -2372,15 +2353,14 @@ tempname()			String	name for a temporary file
 test_alloc_fail({id}, {countdown}, {repeat})
 				none	make memory allocation fail
 test_autochdir()		none	enable 'autochdir' during startup
+test_disable_char_avail({expr}) none	test without typeahead
 test_garbagecollect_now()	none	free memory right now for testing
-test_ignore_error({expr})	none	ignore a specific error
 test_null_channel()		Channel	null value for testing
 test_null_dict()		Dict	null value for testing
 test_null_job()			Job	null value for testing
 test_null_list()		List	null value for testing
 test_null_partial()		Funcref	null value for testing
 test_null_string()		String	null value for testing
-test_override({expr}, {val})    none	test with Vim internal overrides
 test_settime({expr})		none	set current time for testing
 timer_info([{id}])		List	information about timers
 timer_pause({id}, {pause})	none	pause or unpause a timer
@@ -2543,7 +2523,7 @@ 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.
-		When {error} is given it must match in |v:errmsg|.
+		When {error} is given it must match |v:errmsg|.
 
 assert_false({actual} [, {msg}])				*assert_false()*
 		When {actual} is not false an error message is added to
@@ -2591,10 +2571,7 @@ assert_notmatch({pattern}, {actual} [, {msg}])
 		The opposite of `assert_match()`: add an error message to
 		|v:errors| when {pattern} matches {actual}.
 
-assert_report({msg})					*assert_report()*
-		Report a test failure directly, using {msg}.
-
-assert_true({actual} [, {msg}])				*assert_true()*
+assert_true({actual} [, {msg}])					*assert_true()*
 		When {actual} is not true an error message is added to
 		|v:errors|, like with |assert_equal()|.
 		A value is TRUE when it is a non-zero number.  When {actual}
@@ -2638,28 +2615,6 @@ atan2({expr1}, {expr2})					*atan2()*
 <			2.356194
 		{only available when compiled with the |+float| feature}
 
-balloon_show({msg})					*balloon_show()*
-		Show {msg} inside the balloon.
-		Example: >
-			func GetBalloonContent()
-			   " initiate getting the content
-			   return ''
-			endfunc
-			set balloonexpr=GetBalloonContent()
-
-			func BalloonCallback(result)
-			  call balloon_show(a:result)
-			endfunc
-<
-		The intended use is that fetching the content of the balloon
-		is initiated from 'balloonexpr'.  It will invoke an
-		asynchronous method, in which a callback invokes
-		balloon_show().  The 'balloonexpr' itself can return an
-		empty string or a placeholder.
-
-		When showing a balloon is not possible nothing happens, no
-		error message.
-		{only available when compiled with the +balloon_eval feature}
 
 							*browse()*
 browse({save}, {title}, {initdir}, {default})
@@ -2855,195 +2810,6 @@ ceil({expr})							*ceil()*
 <			4.0
 		{only available when compiled with the |+float| feature}
 
-ch_canread({handle})						*ch_canread()*
-		Return non-zero when there is something to read from {handle}.
-		{handle} can be a Channel or a Job that has a Channel.
-
-		This is useful to read from a channel at a convenient time,
-		e.g. from a timer.
-
-		Note that messages are dropped when the channel does not have
-		a callback.  Add a close callback to avoid that.
-
-		{only available when compiled with the |+channel| feature}
-
-ch_close({handle})						*ch_close()*
-		Close {handle}.  See |channel-close|.
-		{handle} can be a Channel or a Job that has a Channel.
-		A close callback is not invoked.
-
-		{only available when compiled with the |+channel| feature}
-
-ch_close_in({handle})						*ch_close_in()*
-		Close the "in" part of {handle}.  See |channel-close-in|.
-		{handle} can be a Channel or a Job that has a Channel.
-		A close callback is not invoked.
-
-		{only available when compiled with the |+channel| feature}
-
-ch_evalexpr({handle}, {expr} [, {options}])			*ch_evalexpr()*
-		Send {expr} over {handle}.  The {expr} is encoded
-		according to the type of channel.  The function cannot be used
-		with a raw channel.  See |channel-use|.
-		{handle} can be a Channel or a Job that has a Channel.
-								*E917*
-		{options} must be a Dictionary.  It must not have a "callback"
-		entry.  It can have a "timeout" entry to specify the timeout
-		for this specific request.
-
-		ch_evalexpr() waits for a response and returns the decoded
-		expression.  When there is an error or timeout it returns an
-		empty string.
-
-		{only available when compiled with the |+channel| feature}
-
-ch_evalraw({handle}, {string} [, {options}])		*ch_evalraw()*
-		Send {string} over {handle}.
-		{handle} can be a Channel or a Job that has a Channel.
-
-		Works like |ch_evalexpr()|, but does not encode the request or
-		decode the response.  The caller is responsible for the
-		correct contents.  Also does not add a newline for a channel
-		in NL mode, the caller must do that.  The NL in the response
-		is removed.
-		See |channel-use|.
-
-		{only available when compiled with the |+channel| feature}
-
-ch_getbufnr({handle}, {what})				 *ch_getbufnr()*
-		Get the buffer number that {handle} is using for {what}.
-		{handle} can be a Channel or a Job that has a Channel.
-		{what} can be "err" for stderr, "out" for stdout or empty for
-		socket output.
-		Returns -1 when there is no buffer.
-		{only available when compiled with the |+channel| feature}
-
-ch_getjob({channel})						*ch_getjob()*
-		Get the Job associated with {channel}.
-		If there is no job calling |job_status()| on the returned Job
-		will result in "fail".
-
-		{only available when compiled with the |+channel| and
-		|+job| features}
-
-ch_info({handle})						*ch_info()*
-		Returns a Dictionary with information about {handle}.  The
-		items are:
-		   "id"		  number of the channel
-		   "status"	  "open", "buffered" or "closed", like
-				  ch_status()
-		When opened with ch_open():
-		   "hostname"	  the hostname of the address
-		   "port"	  the port of the address
-		   "sock_status"  "open" or "closed"
-		   "sock_mode"	  "NL", "RAW", "JSON" or "JS"
-		   "sock_io"	  "socket"
-		   "sock_timeout" timeout in msec
-		When opened with job_start():
-		   "out_status"	  "open", "buffered" or "closed"
-		   "out_mode"	  "NL", "RAW", "JSON" or "JS"
-		   "out_io"	  "null", "pipe", "file" or "buffer"
-		   "out_timeout"  timeout in msec
-		   "err_status"	  "open", "buffered" or "closed"
-		   "err_mode"	  "NL", "RAW", "JSON" or "JS"
-		   "err_io"	  "out", "null", "pipe", "file" or "buffer"
-		   "err_timeout"  timeout in msec
-		   "in_status"	  "open" or "closed"
-		   "in_mode"	  "NL", "RAW", "JSON" or "JS"
-		   "in_io"	  "null", "pipe", "file" or "buffer"
-		   "in_timeout"	  timeout in msec
-
-ch_log({msg} [, {handle}])					*ch_log()*
-		Write {msg} in the channel log file, if it was opened with
-		|ch_logfile()|.
-		When {handle} is passed the channel number is used for the
-		message.
-		{handle} can be a Channel or a Job that has a Channel.  The
-		Channel must be open for the channel number to be used.
-
-ch_logfile({fname} [, {mode}])					*ch_logfile()*
-		Start logging channel activity to {fname}.
-		When {fname} is an empty string: stop logging.
-
-		When {mode} is omitted or "a" append to the file.
-		When {mode} is "w" start with an empty file.
-
-		The file is flushed after every message, on Unix you can use
-		"tail -f" to see what is going on in real time.
-
-
-ch_open({address} [, {options}])				*ch_open()*
-		Open a channel to {address}.  See |channel|.
-		Returns a Channel.  Use |ch_status()| to check for failure.
-
-		{address} has the form "hostname:port", e.g.,
-		"localhost:8765".
-
-		If {options} is given it must be a |Dictionary|.
-		See |channel-open-options|.
-
-		{only available when compiled with the |+channel| feature}
-
-ch_read({handle} [, {options}])					*ch_read()*
-		Read from {handle} and return the received message.
-		{handle} can be a Channel or a Job that has a Channel.
-		See |channel-more|.
-		{only available when compiled with the |+channel| feature}
-
-ch_readraw({handle} [, {options}])			*ch_readraw()*
-		Like ch_read() but for a JS and JSON channel does not decode
-		the message.  See |channel-more|.
-		{only available when compiled with the |+channel| feature}
-
-ch_sendexpr({handle}, {expr} [, {options}])			*ch_sendexpr()*
-		Send {expr} over {handle}.  The {expr} is encoded
-		according to the type of channel.  The function cannot be used
-		with a raw channel.
-		See |channel-use|.				*E912*
-		{handle} can be a Channel or a Job that has a Channel.
-
-		{only available when compiled with the |+channel| feature}
-
-ch_sendraw({handle}, {string} [, {options}])		*ch_sendraw()*
-		Send {string} over {handle}.
-		Works like |ch_sendexpr()|, but does not encode the request or
-		decode the response.  The caller is responsible for the
-		correct contents.  Also does not add a newline for a channel
-		in NL mode, the caller must do that.  The NL in the response
-		is removed.
-		See |channel-use|.
-
-		{only available when compiled with the |+channel| feature}
-
-ch_setoptions({handle}, {options})			*ch_setoptions()*
-		Set options on {handle}:
-			"callback"	the channel callback
-			"timeout"	default read timeout in msec
-			"mode"		mode for the whole channel
-		See |ch_open()| for more explanation.
-		{handle} can be a Channel or a Job that has a Channel.
-
-		Note that changing the mode may cause queued messages to be
-		lost.
-
-		These options cannot be changed:
-			"waittime"	only applies to |ch_open()|
-
-ch_status({handle} [, {options}])				*ch_status()*
-		Return the status of {handle}:
-			"fail"		failed to open the channel
-			"open"		channel can be used
-			"buffered"	channel can be read, not written to
-			"closed"	channel can not be used
-		{handle} can be a Channel or a Job that has a Channel.
-		"buffered" is used when the channel was closed but there is
-		still data that can be obtained with |ch_read()|.
-
-		If {options} is given it can contain a "part" entry to specify
-		the part of the channel to return the status for: "out" or
-		"err".  For example, to get the error status: >
-			ch_status(job, {"part": "err"})
-<
 changenr()						*changenr()*
 		Return the number of the most recent change.  This is the same
 		number as what is displayed with |:undolist| and can be used
@@ -3214,6 +2980,183 @@ confirm({msg} [, {choices} [, {default} [, {type}]]])
 		don't fit, a vertical layout is used anyway.  For some systems
 		the horizontal layout is always used.
 
+ch_close({handle})						*ch_close()*
+		Close {handle}.  See |channel-close|.
+		{handle} can be Channel or a Job that has a Channel.
+		A close callback is not invoked.
+
+		{only available when compiled with the |+channel| feature}
+
+ch_close_in({handle})						*ch_close_in()*
+		Close the "in" part of {handle}.  See |channel-close-in|.
+		{handle} can be Channel or a Job that has a Channel.
+		A close callback is not invoked.
+
+		{only available when compiled with the |+channel| feature}
+
+ch_evalexpr({handle}, {expr} [, {options}])			*ch_evalexpr()*
+		Send {expr} over {handle}.  The {expr} is encoded
+		according to the type of channel.  The function cannot be used
+		with a raw channel.  See |channel-use|.
+		{handle} can be Channel or a Job that has a Channel.
+								*E917*
+		{options} must be a Dictionary.  It must not have a "callback"
+		entry.  It can have a "timeout" entry to specify the timeout
+		for this specific request.
+
+		ch_evalexpr() waits for a response and returns the decoded
+		expression.  When there is an error or timeout it returns an
+		empty string.
+
+		{only available when compiled with the |+channel| feature}
+
+ch_evalraw({handle}, {string} [, {options}])		*ch_evalraw()*
+		Send {string} over {handle}.
+		{handle} can be Channel or a Job that has a Channel.
+
+		Works like |ch_evalexpr()|, but does not encode the request or
+		decode the response.  The caller is responsible for the
+		correct contents.  Also does not add a newline for a channel
+		in NL mode, the caller must do that.  The NL in the response
+		is removed.
+		See |channel-use|.
+
+		{only available when compiled with the |+channel| feature}
+
+ch_getbufnr({handle}, {what})				 *ch_getbufnr()*
+		Get the buffer number that {handle} is using for {what}.
+		{handle} can be Channel or a Job that has a Channel.
+		{what} can be "err" for stderr, "out" for stdout or empty for
+		socket output.
+		Returns -1 when there is no buffer.
+		{only available when compiled with the |+channel| feature}
+
+ch_getjob({channel})						*ch_getjob()*
+		Get the Job associated with {channel}.
+		If there is no job calling |job_status()| on the returned Job
+		will result in "fail".
+
+		{only available when compiled with the |+channel| and
+		|+job| features}
+
+ch_info({handle})						*ch_info()*
+		Returns a Dictionary with information about {handle}.  The
+		items are:
+		   "id"		  number of the channel
+		   "status"	  "open", "buffered" or "closed", like
+				  ch_status()
+		When opened with ch_open():
+		   "hostname"	  the hostname of the address
+		   "port"	  the port of the address
+		   "sock_status"  "open" or "closed"
+		   "sock_mode"	  "NL", "RAW", "JSON" or "JS"
+		   "sock_io"	  "socket"
+		   "sock_timeout" timeout in msec
+		When opened with job_start():
+		   "out_status"	  "open", "buffered" or "closed"
+		   "out_mode"	  "NL", "RAW", "JSON" or "JS"
+		   "out_io"	  "null", "pipe", "file" or "buffer"
+		   "out_timeout"  timeout in msec
+		   "err_status"	  "open", "buffered" or "closed"
+		   "err_mode"	  "NL", "RAW", "JSON" or "JS"
+		   "err_io"	  "out", "null", "pipe", "file" or "buffer"
+		   "err_timeout"  timeout in msec
+		   "in_status"	  "open" or "closed"
+		   "in_mode"	  "NL", "RAW", "JSON" or "JS"
+		   "in_io"	  "null", "pipe", "file" or "buffer"
+		   "in_timeout"	  timeout in msec
+
+ch_log({msg} [, {handle}])					*ch_log()*
+		Write {msg} in the channel log file, if it was opened with
+		|ch_logfile()|.
+		When {handle} is passed the channel number is used for the
+		message.
+		{handle} can be Channel or a Job that has a Channel.  The
+		Channel must open.
+
+ch_logfile({fname} [, {mode}])					*ch_logfile()*
+		Start logging channel activity to {fname}.
+		When {fname} is an empty string: stop logging.
+
+		When {mode} is omitted or "a" append to the file.
+		When {mode} is "w" start with an empty file.
+
+		The file is flushed after every message, on Unix you can use
+		"tail -f" to see what is going on in real time.
+
+
+ch_open({address} [, {options}])				*ch_open()*
+		Open a channel to {address}.  See |channel|.
+		Returns a Channel.  Use |ch_status()| to check for failure.
+
+		{address} has the form "hostname:port", e.g.,
+		"localhost:8765".
+
+		If {options} is given it must be a |Dictionary|.
+		See |channel-open-options|.
+
+		{only available when compiled with the |+channel| feature}
+
+ch_read({handle} [, {options}])					*ch_read()*
+		Read from {handle} and return the received message.
+		{handle} can be Channel or a Job that has a Channel.
+		See |channel-more|.
+		{only available when compiled with the |+channel| feature}
+
+ch_readraw({handle} [, {options}])			*ch_readraw()*
+		Like ch_read() but for a JS and JSON channel does not decode
+		the message.  See |channel-more|.
+		{only available when compiled with the |+channel| feature}
+
+ch_sendexpr({handle}, {expr} [, {options}])			*ch_sendexpr()*
+		Send {expr} over {handle}.  The {expr} is encoded
+		according to the type of channel.  The function cannot be used
+		with a raw channel.
+		See |channel-use|.				*E912*
+		{handle} can be Channel or a Job that has a Channel.
+
+		{only available when compiled with the |+channel| feature}
+
+ch_sendraw({handle}, {string} [, {options}])		*ch_sendraw()*
+		Send {string} over {handle}.
+		Works like |ch_sendexpr()|, but does not encode the request or
+		decode the response.  The caller is responsible for the
+		correct contents.  Also does not add a newline for a channel
+		in NL mode, the caller must do that.  The NL in the response
+		is removed.
+		See |channel-use|.
+
+		{only available when compiled with the |+channel| feature}
+
+ch_setoptions({handle}, {options})			*ch_setoptions()*
+		Set options on {handle}:
+			"callback"	the channel callback
+			"timeout"	default read timeout in msec
+			"mode"		mode for the whole channel
+		See |ch_open()| for more explanation.
+		{handle} can be Channel or a Job that has a Channel.
+
+		Note that changing the mode may cause queued messages to be
+		lost.
+
+		These options cannot be changed:
+			"waittime"	only applies to |ch_open()|
+
+ch_status({handle} [, {options}])				*ch_status()*
+		Return the status of {handle}:
+			"fail"		failed to open the channel
+			"open"		channel can be used
+			"buffered"	channel can be read, not written to
+			"closed"	channel can not be used
+		{handle} can be Channel or a Job that has a Channel.
+		"buffered" is used when the channel was closed but there is
+		still data that can be obtained with |ch_read()|.
+
+		If {options} is given it can contain a "part" entry to specify
+		the part of the channel to return the status for: "out" or
+		"err".  For example, to get the error status: >
+			ch_status(job, {"part": "err"})
+<
 							*copy()*
 copy({expr})	Make a copy of {expr}.  For Numbers and Strings this isn't
 		different from using {expr} directly.
@@ -3470,7 +3413,7 @@ execute({command} [, {silent}])					*execute()*
 			""		no `:silent` used
 			"silent"	`:silent` used
 			"silent!"	`:silent!` used
-		The default is "silent".  Note that with "silent!", unlike
+		The default is 'silent'.  Note that with "silent!", unlike
 		`:redir`, error messages are dropped.  When using an external
 		command the screen may be messed up, use `system()` instead.
 							*E930*
@@ -3795,7 +3738,7 @@ filter({expr1}, {expr2})				*filter()*
 			call filter(myList, {idx, val -> idx * val <= 42})
 <		If you do not use "val" you can leave it out: >
 			call filter(myList, {idx -> idx % 2 == 1})
-<
+
 		The operation is done in-place.  If you want a |List| or
 		|Dictionary| to remain unmodified make a copy first: >
 			:let l = filter(copy(mylist), 'v:val =~ "KEEP"')
@@ -3936,14 +3879,11 @@ foldtext()	Returns a String, to be displayed for a closed fold.  This is
 		|v:foldstart|, |v:foldend| and |v:folddashes| variables.
 		The returned string looks like this: >
 			+-- 45 lines: abcdef
-<		The number of leading dashes depends on the foldlevel.  The
-		"45" is the number of lines in the fold.  "abcdef" is the text
-		in the first non-blank line of the fold.  Leading white space,
-		"//" or "/*" and the text from the 'foldmarker' and
-		'commentstring' options is removed.
-		When used to draw the actual foldtext, the rest of the line
-		will be filled with the fold char from the 'fillchars'
-		setting.
+<		The number of dashes depends on the foldlevel.  The "45" is
+		the number of lines in the fold.  "abcdef" is the text in the
+		first non-blank line of the fold.  Leading white space, "//"
+		or "/*" and the text from the 'foldmarker' and 'commentstring'
+		options is removed.
 		{not available when compiled without the |+folding| feature}
 
 foldtextresult({lnum})					*foldtextresult()*
@@ -4075,10 +4015,10 @@ get({dict}, {key} [, {default}])
 get({func}, {what})
 		Get an item with from Funcref {func}.  Possible values for
 		{what} are:
-			"name"	The function name
-			"func"	The function
-			"dict"	The dictionary
-			"args"	The list with arguments
+			'name'	The function name
+			'func'	The function
+			'dict'	The dictionary
+			'args'	The list with arguments
 
 							*getbufinfo()*
 getbufinfo([{expr}])
@@ -4218,10 +4158,6 @@ getchar([expr])						*getchar()*
 			  exe "normal " . v:mouse_col . "|"
 			endif
 <
-		When using bracketed paste only the first character is
-		returned, the rest of the pasted text is dropped.
-		|xterm-bracketed-paste|.
-
 		There is no prompt, you will somehow have to make clear to the
 		user that a character has to be typed.
 		There is no mapping for the character.
@@ -4351,9 +4287,7 @@ getcompletion({pat}, {type} [, {filtered}])		*getcompletion()*
 		locale		locale names (as output of locale -a)
 		mapping		mapping name
 		menu		menus
-		messages	|:messages| suboptions
 		option		options
-		packadd		optional package |pack-add| names
 		shellcmd	Shell command
 		sign		|:sign| suboptions
 		syntax		syntax file names |'syntax'|
@@ -4417,8 +4351,8 @@ getfontname([{name}])					*getfontname()*
 		Only works when the GUI is running, thus not in your vimrc or
 		gvimrc file.  Use the |GUIEnter| autocommand to use this
 		function just after the GUI has started.
-		Note that the GTK GUI accepts any font name, thus checking for
-		a valid name does not work.
+		Note that the GTK 2 GUI accepts any font name, thus checking
+		for a valid name does not work.
 
 getfperm({fname})					*getfperm()*
 		The result is a String, which is the read, write, and execute
@@ -4435,7 +4369,7 @@ getfperm({fname})					*getfperm()*
 <		This will hopefully (from a security point of view) display
 		the string "rw-r--r--" or even "rw-------".
 
-		For setting permissions use |setfperm()|.
+		For setting permissins use |setfperm()|.
 
 getftime({fname})					*getftime()*
 		The result is a Number, which is the last modification time of
@@ -5280,7 +5214,6 @@ join({list} [, {sep}])					*join()*
 js_decode({string})					*js_decode()*
 		This is similar to |json_decode()| with these differences:
 		- Object key names do not have to be in quotes.
-		- Strings can be in single quotes.
 		- Empty items in an array (between two commas) are allowed and
 		  result in v:none items.
 
@@ -5307,7 +5240,6 @@ json_decode({string})					*json_decode()*
 		- A trailing comma in an array and object is ignored.
 		- More floating point numbers are recognized, e.g. "1." for
 		  "1.0".
-		However, a duplicate key in an object is not allowed. *E938*
 		The result must be a valid Vim type:
 		- An empty object member name is not allowed.
 		- Duplicate object member names are not allowed.
@@ -5847,20 +5779,16 @@ matchstrpos({expr}, {pat}[, {start}[, {count}]])		*matchstrpos()*
 		The type isn't changed, it's not necessarily a String.
 
 							*max()*
-max({expr})	Return the maximum value of all items in {expr}.
-		{expr} can be a list or a dictionary.  For a dictionary,
-		it returns the maximum of all values in the dictionary.
-		If {expr} is neither a list nor a dictionary, or one of the
-		items in {expr} cannot be used as a Number this results in
-                an error.  An empty |List| or |Dictionary| results in zero.
+max({list})	Return the maximum value of all items in {list}.
+		If {list} is not a list or one of the items in {list} cannot
+		be used as a Number this results in an error.
+		An empty |List| results in zero.
 
 							*min()*
-min({expr})	Return the minimum value of all items in {expr}.
-		{expr} can be a list or a dictionary.  For a dictionary,
-		it returns the minimum of all values in the dictionary.
-		If {expr} is neither a list nor a dictionary, or one of the
-		items in {expr} cannot be used as a Number this results in
-                an error.  An empty |List| or |Dictionary| results in zero.
+min({list})	Return the minimum value of all items in {list}.
+		If {list} is not a list or one of the items in {list} cannot
+		be used as a Number this results in an error.
+		An empty |List| results in zero.
 
 							*mkdir()* *E739*
 mkdir({name} [, {path} [, {prot}]])
@@ -5894,13 +5822,9 @@ mode([expr])	Return a string that indicates the current mode.
 			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
+			c	Command-line
 			cv	Vim Ex mode |gQ|
 			ce	Normal Ex mode |Q|
 			r	Hit-enter prompt
@@ -6024,7 +5948,7 @@ printf({fmt}, {expr1} ...)				*printf()*
 		  %e	floating point number as 1.23e3, inf, -inf or nan
 		  %E	floating point number as 1.23E3, INF, -INF or NAN
 		  %g	floating point number, as %f or %e depending on value
-		  %G	floating point number, as %F or %E depending on value
+		  %G	floating point number, as %f or %E depending on value
 		  %%	the % character itself
 
 		Conversion specifications start with '%' and end with the
@@ -6222,14 +6146,6 @@ pyeval({expr})						*pyeval()*
 		non-string keys result in error.
 		{only available when compiled with the |+python| feature}
 
-pyxeval({expr})						*pyxeval()*
-		Evaluate Python expression {expr} and return its result
-		converted to Vim data structures.
-		Uses Python 2 or 3, see |python_x| and 'pyxversion'.
-		See also: |pyeval()|, |py3eval()|
-		{only available when compiled with the |+python| or the
-		|+python3| feature}
-
 							*E726* *E727*
 range({expr} [, {max} [, {stride}]])				*range()*
 		Returns a |List| with Numbers:
@@ -6252,9 +6168,9 @@ range({expr} [, {max} [, {stride}]])				*range()*
 							*readfile()*
 readfile({fname} [, {binary} [, {max}]])
 		Read file {fname} and return a |List|, each line of the file
-		as an item.  Lines are broken at NL characters.  Macintosh
-		files separated with CR will result in a single long line
-		(unless a NL appears somewhere).
+		as an item.  Lines broken at NL characters.  Macintosh files
+		separated with CR will result in a single long line (unless a
+		NL appears somewhere).
 		All NUL characters are replaced with a NL character.
 		When {binary} contains "b" binary mode is used:
 		- When the last line ends in a NL an extra empty list item is
@@ -6321,17 +6237,15 @@ reltimestr({time})				*reltimestr()*
 		{only available when compiled with the |+reltime| feature}
 
 							*remote_expr()* *E449*
-remote_expr({server}, {string} [, {idvar} [, {timeout}]])
+remote_expr({server}, {string} [, {idvar}])
 		Send the {string} to {server}.  The string is sent as an
 		expression and the result is returned after evaluation.
 		The result must be a String or a |List|.  A |List| is turned
 		into a String by joining the items with a line break in
 		between (not at the end), like with join(expr, "\n").
-		If {idvar} is present and not empty, it is taken as the name
-		of a variable and a {serverid} for later use with
+		If {idvar} is present, it is taken as the name of a
+		variable and a {serverid} for later use with
 		remote_read() is stored there.
-		If {timeout} is given the read times out after this many
-		seconds.  Otherwise a timeout of 600 seconds is used.
 		See also |clientserver| |RemoteReply|.
 		This function is not available in the |sandbox|.
 		{only available when compiled with the |+clientserver| feature}
@@ -6370,10 +6284,9 @@ remote_peek({serverid} [, {retvar}])		*remote_peek()*
 			:let repl = ""
 			:echo "PEEK: ".remote_peek(id, "repl").": ".repl
 
-remote_read({serverid}, [{timeout}])			*remote_read()*
+remote_read({serverid})				*remote_read()*
 		Return the oldest available reply from {serverid} and consume
-		it.  Unless a {timeout} in seconds is given, it blocks until a
-		reply is available.
+		it.  It blocks until a reply is available.
 		See also |clientserver|.
 		This function is not available in the |sandbox|.
 		{only available when compiled with the |+clientserver| feature}
@@ -6391,7 +6304,6 @@ remote_send({server}, {string} [, {idvar}])
 		See also |clientserver| |RemoteReply|.
 		This function is not available in the |sandbox|.
 		{only available when compiled with the |+clientserver| feature}
-
 		Note: Any errors will be reported in the server and may mess
 		up the display.
 		Examples: >
@@ -6403,12 +6315,6 @@ remote_send({server}, {string} [, {idvar}])
 		:echo remote_send("gvim", ":sleep 10 | echo ".
 		 \ 'server2client(expand("<client>"), "HELLO")<CR>')
 <
-					*remote_startserver()* *E941* *E942*
-remote_startserver({name})
-		Become the server {name}.  This fails if already running as a
-		server, when |v:servername| is not empty.
-		{only available when compiled with the |+clientserver| feature}
-
 remove({list}, {idx} [, {end}])				*remove()*
 		Without {end}: Remove the item at {idx} from |List| {list} and
 		return the item.
@@ -6866,12 +6772,10 @@ setpos({expr}, {list})
 		    [bufnum, lnum, col, off, curswant]
 
 		"bufnum" is the buffer number.  Zero can be used for the
-		current buffer.  When setting an uppercase mark "bufnum" is
-		used for the mark position.  For other marks it specifies the
-		buffer to set the mark in.  You can use the |bufnr()| function
-		to turn a file name into a buffer number.
-		For setting the cursor and the ' mark "bufnum" is ignored,
-		since these are associated with a window, not a buffer.
+		current buffer.  Setting the cursor is only possible for
+		the current buffer.  To set a mark in another buffer you can
+		use the |bufnr()| function to turn a file name into a buffer
+		number.
 		Does not change the jumplist.
 
 		"lnum" and "col" are the position in the buffer.  The first
@@ -7329,7 +7233,7 @@ strcharpart({src}, {start}[, {len}])			*strcharpart()*
 		Like |strpart()| but using character index and length instead
 		of byte index and length.
 		When a character index is used where a character does not
-		exist it is assumed to be one character.  For example: >
+		exist it is assumed to be one byte.  For example: >
 			strcharpart('abc', -1, 2)
 <		results in 'a'.
 
@@ -7486,9 +7390,6 @@ submatch({nr}[, {list}])			*submatch()* *E935*
 		|substitute()| this list will always contain one or zero
 		items, since there are no real line breaks.
 
-		When substitute() is used recursively only the submatches in
-		the current (deepest) call can be obtained.
-
 		Example: >
 			:s/\d\+/\=submatch(0) + 1/
 <		This finds the first number in the line and adds one to it.
@@ -7642,11 +7543,7 @@ system({expr} [, {input}])				*system()* *E677*
 		If {input} is given and is a |List| it is written to the file
 		in a way |writefile()| does with {binary} set to "b" (i.e.
 		with a newline between each list item with newlines inside
-		list items converted to NULs).
-		When {input} is given and is a number that is a valid id for
-		an existing buffer then the content of the buffer is written
-		to the file line by line, each line terminated by a NL and
-		NULs characters where the text has a NL.
+		list items converted to NULs).  
 
 		Pipes are not used, the 'shelltemp' option is not used.
 
@@ -7696,8 +7593,7 @@ systemlist({expr} [, {input}])				*systemlist()*
 		Same as |system()|, but returns a |List| with lines (parts of 
 		output separated by NL) with NULs transformed into NLs. Output 
 		is the same as |readfile()| will output with {binary} argument 
-		set to "b".  Note that on MS-Windows you may get trailing CR
-		characters.
+		set to "b".
 
 		Returns an empty string on error.
 
@@ -7742,13 +7638,8 @@ tagfiles()	Returns a |List| with the file names used to search for tags
 		for the current buffer.  This is the 'tags' option expanded.
 
 
-taglist({expr}[, {filename}])				*taglist()*
+taglist({expr})							*taglist()*
 		Returns a list of tags matching the regular expression {expr}.
-
-		If {filename} is passed it is used to prioritize the results
-		in the same way that |:tselect| does. See |tag-priority|.
-		{filename} should be the full path of the file.
-
 		Each list item is a dictionary with at least the following
 		entries:
 			name		Name of the tag.
@@ -7771,7 +7662,7 @@ taglist({expr}[, {filename}])				*taglist()*
 		may appear, they give the name of the entity the tag is
 		contained in.
 
-		The ex-command "cmd" can be either an ex search pattern, a
+		The ex-command 'cmd' can be either an ex search pattern, a
 		line number or a line number followed by a byte number.
 
 		If there are no matching tags, then an empty list is returned.
@@ -7830,21 +7721,20 @@ test_autochdir()					*test_autochdir()*
 		Set a flag to enable the effect of 'autochdir' before Vim
 		startup has finished.
 
+						*test_disable_char_avail()*
+test_disable_char_avail({expr})
+		When {expr} is 1 the internal char_avail() function will
+		return |FALSE|.  When {expr} is 0 the char_avail() function will
+		function normally.
+		Only use this for a test where typeahead causes the test not
+		to work.  E.g., to trigger the CursorMovedI autocommand event.
+
 test_garbagecollect_now()			 *test_garbagecollect_now()*
 		Like garbagecollect(), but executed right away.  This must
 		only be called directly to avoid any structure to exist
 		internally, and |v:testing| must have been set before calling
 		any function.
 
-test_ignore_error({expr})			 *test_ignore_error()*
-		Ignore any error containing {expr}.  A normal message is given
-		instead.
-		This is only meant to be used in tests, where catching the
-		error with try/catch cannot be used (because it skips over
-		following code).
-		{expr} is used literally, not as a pattern.
-		There is currently no way to revert this.
-
 test_null_channel()					*test_null_channel()*
 		Return a Channel that is null. Only useful for testing.
 		{only available when compiled with the +channel feature}
@@ -7865,24 +7755,10 @@ test_null_partial()					*test_null_partial()*
 test_null_string()					*test_null_string()*
 		Return a String that is null. Only useful for testing.
 
-test_override({name}, {val})				*test_override()*
-		Overrides certain parts of Vims internal processing to be able
-		to run tests. Only to be used for testing Vim!
-		The override is enabled when {val} is non-zero and removed
-		when {val} is zero.
-		Current supported values for name are: 
-
-		name	     effect when {val} is non-zero ~
-		redraw       disable the redrawing() function
-		char_avail   disable the char_avail() function
-		ALL	     clear all overrides ({val} is not used)
-
 test_settime({expr})					*test_settime()*
 		Set the time Vim uses internally.  Currently only used for
 		timestamps in the history, as they are used in viminfo, and
 		for undo.
-		Using a value of 1 makes Vim not sleep after a warning or
-		error message.
 		{expr} must evaluate to a number.  When the value is zero the
 		normal behavior is restored.
 
@@ -8234,7 +8110,7 @@ winnr([{arg}])	The result is a Number, which is the number of the current
 		is returned.
 		The number can be used with |CTRL-W_w| and ":wincmd w"
 		|:wincmd|.
-		Also see |tabpagewinnr()| and |win_getid()|.
+		Also see |tabpagewinnr()|.
 
 							*winrestcmd()*
 winrestcmd()	Returns a sequence of |:resize| commands that should restore
@@ -8333,7 +8209,7 @@ writefile({list}, {fname} [, {flags}])
 		end does cause the last line in the file to end in a NL.
 
 		When {flags} contains "a" then append mode is used, lines are
-		appended to the file: >
+		append to the file: >
 			:call writefile(["foo"], "event.log", "a")
 			:call writefile(["bar"], "event.log", "a")
 >
@@ -8504,7 +8380,6 @@ printer			Compiled with |:hardcopy| support.
 profile			Compiled with |:profile| support.
 python			Compiled with Python 2.x interface. |has-python|
 python3			Compiled with Python 3.x interface. |has-python|
-pythonx			Compiled with |python_x| interface. |has-pythonx|
 qnx			QNX version of Vim.
 quickfix		Compiled with |quickfix| support.
 reltime			Compiled with |reltime()| support.
@@ -8540,10 +8415,7 @@ timers			Compiled with |timer_start()| support.
 title			Compiled with window title support |'title'|.
 toolbar			Compiled with support for |gui-toolbar|.
 transparency            Compiled with 'transparency' support.
-ttyin			input is a terminal (tty)
-ttyout			output is a terminal (tty)
 unix			Unix version of Vim.
-unnamedplus		Compiled with support for "unnamedplus" in 'clipboard'
 user_commands		User-defined commands.
 vertsplit		Compiled with vertically split windows |:vsplit|.
 vim_starting		True while initial source'ing takes place. |startup|
@@ -9047,11 +8919,6 @@ This does NOT work: >
 			value and the global value are changed.
 			Example: >
 				:let &path = &path . ',/usr/local/include'
-<			This also works for terminal codes in the form t_xx.
-			But only for alphanumerical names.  Example: >
-				:let &t_k1 = "\<Esc>[234;"
-<			When the code does not exist yet it will be created as
-			a terminal key code, there is no error.
 
 :let &{option-name} .= {expr1}
 			For a string option: Append {expr1} to the value.
@@ -9159,12 +9026,9 @@ This does NOT work: >
 				:lockvar v
 				:let v = 'asdf'		" fails!
 				:unlet v
-<							*E741* *E940*
+<							*E741*
 			If you try to change a locked variable you get an
-			error message: "E741: Value is locked: {name}".
-			If you try to lock or unlock a built-in variable you
-			get an error message: "E940: Cannot lock or unlock
-			variable {name}".
+			error message: "E741: Value is locked: {name}"
 
 			[depth] is relevant when locking a |List| or
 			|Dictionary|.  It specifies how deep the locking goes:

runtime/doc/filetype.txt

@@ -1,4 +1,4 @@
-*filetype.txt*  For Vim version 8.0.  Last change: 2017 Mar 21
+*filetype.txt*  For Vim version 8.0.  Last change: 2016 Sep 09
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -573,8 +573,6 @@ Man {number} {name}
 
 Global mapping:
 <Leader>K	Displays the manual page for the word under the cursor.
-<Plug>ManPreGetPage  idem, allows for using a mapping: >
-			nmap <F1> <Plug>ManPreGetPage<CR>
 
 Local mappings:
 CTRL-]		Jump to the manual page for the word under the cursor.
@@ -663,12 +661,6 @@ Since the text for this plugin is rather long it has been put in a separate
 file: |pi_spec.txt|.
 
 
-RUST							*ft-rust*
-
-Since the text for this plugin is rather long it has been put in a separate
-file: |ft_rust.txt|.
-
-
 SQL							*ft-sql*
 
 Since the text for this plugin is rather long it has been put in a separate

runtime/doc/fold.txt

@@ -1,4 +1,4 @@
-*fold.txt*      For Vim version 8.0.  Last change: 2017 Mar 18
+*fold.txt*      For Vim version 8.0.  Last change: 2016 Jan 02
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -64,7 +64,7 @@ whichever is lower.  These are empty or white lines and lines starting
 with a character in 'foldignore'.  White space is skipped before checking for
 characters in 'foldignore'.  For C use "#" to ignore preprocessor lines.
 
-When you want to ignore lines in another way, use the "expr" method.  The
+When you want to ignore lines in another way, use the 'expr' method.  The
 |indent()| function can be used in 'foldexpr' to get the indent of a line.
 
 
@@ -79,7 +79,7 @@ This will call a function to compute the fold level: >
 	:set foldexpr=MyFoldLevel(v:lnum)
 This will make a fold out of paragraphs separated by blank lines: >
 	:set foldexpr=getline(v:lnum)=~'^\\s*$'&&getline(v:lnum+1)=~'\\S'?'<1':1
-This does the same: >
+this does the same: >
 	:set foldexpr=getline(v:lnum-1)=~'^\\s*$'&&getline(v:lnum)=~'\\S'?'>1':1
 
 Note that backslashes must be used to escape characters that ":set" handles
@@ -139,7 +139,7 @@ fold level.  But note that foldlevel() may return -1 if the level is not known
 yet.  And it returns the level at the start of the line, while a fold might
 end in that line.
 
-It may happen that folds are not updated properly.  You can use |zx| or |zX|
+It may happened that folds are not updated properly.  You can use |zx| or |zX|
 to force updating folds.
 
 
@@ -203,7 +203,7 @@ and the level given by the marker:
 1. If a marker with the same fold level is encountered, the previous fold
    ends and another fold with the same level starts.
 2. If a marker with a higher fold level is found, a nested fold is started.
-3. If a marker with a lower fold level is found, all folds up to and including
+3. if a marker with a lower fold level is found, all folds up to and including
    this level end and a fold with the specified level starts.
 
 The number indicates the fold level.  A zero cannot be used (a marker with

runtime/doc/ft_rust.txt

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

runtime/doc/gui_w32.txt

@@ -49,6 +49,10 @@ If you want Vim to start with a maximized window, add this command to your
 vimrc or gvimrc file: >
 	au GUIEnter * simalt ~x
 <
+								*gui-w32s*
+There is a specific version of gvim.exe that runs under the Win32s subsystem
+of Windows 3.1 or 3.11.  See |win32s|.
+
 
 Using Vim as a plugin					*gui-w32-windowid*
 
@@ -96,10 +100,9 @@ when you have got a new version):
 You can also install Vim in the "Send To" menu:
 1. Start a Windows Explorer
 2. Navigate to your sendto directory:
+   Windows 95: %windir%\sendto (e.g. "c:\windows\sendto")
    Windows NT: %windir%\profiles\%user%\sendto (e.g.
-	       "c:\winnt\profiles\mattha\sendto")
-   Windows XP: C:\Documents and Settings\%user%\SendTo
-   Windows Vista: C:\Users\%user%\AppData\Roaming\Microsoft\Windows\SendTo .
+	       "c:\winnt\profiles\mattha\sendto").
 3. Right-click in the file pane and select New->Shortcut
 4. Follow the shortcut wizard, using the full path to VIM/GVIM.
 
@@ -271,17 +274,35 @@ WARNING: If you close this window with the "X" button, and confirm the
 question if you really want to kill the application, Vim may be killed too!
 (This does not apply to commands run asynchronously with ":!start".)
 
-The window in which the commands are executed will be the default you have set
-up for "Console" in Control Panel.
+In Windows 95, the window in which the commands are executed is always 25x80
+characters, to be as DOS compatible as possible (this matters!).  The default
+system font is used.  On NT, the window will be the default you have set up for
+"Console" in Control Panel.  On Win32s, the properties of the DOS box are
+determined by _default.pif in the windows directory.
+
+							*msdos-mode*
+If you get a dialog that says "This program is set to run in MS-DOS mode..."
+when you run an external program, you can solve this by changing the
+properties of the associated shortcut:
+- Use a Windows Explorer to find the command.com that is used.  It can be
+  c:\command.com, c:\dos\command.com, c:\windows\command.com, etc.
+- With the right mouse button, select properties of this command.com.
+- In the Program tab select "Advanced".
+- Unselect "MS-DOS mode".
+- Click "OK" twice.
 
 							*win32-!start*
 Normally, Vim waits for a command to complete before continuing (this makes
 sense for most shell commands which produce output for Vim to use).  If you
 want Vim to start a program and return immediately, you can use the following
-syntax: >
+syntax on W95 & NT: >
 	:!start [/min] {command}
 The optional "/min" causes the window to be minimized.
 
+On Win32s, you will have to go to another window instead.  Don't forget that
+you must tell Windows 3.1x to keep executing a DOS command in the background
+while you switch back to Vim.
+
 ==============================================================================
 5. Special colors					*win32-colors*
 
@@ -290,7 +311,7 @@ On Win32, the normal DOS colors can be used.  See |dos-colors|.
 Additionally the system configured colors can also be used.  These are known
 by the names Sys_XXX, where XXX is the appropriate system color name, from the
 following list (see the Win32 documentation for full descriptions).  Case is
-ignored.
+ignored.  Note: On Win32s not all of these colors are supported.
 
 Sys_3DDKShadow		Sys_3DFace			Sys_BTNFace
 Sys_3DHilight		Sys_3DHighlight			Sys_BTNHilight

runtime/doc/hangulin.txt

@@ -81,8 +81,8 @@ And there should be no ':set guifont'.  If it exists, then Gvim ignores
 ':set guifontset'.  It means VIM runs without fontset supporting.
 So, you can see only English.  Hangul does not be correctly displayed.
 
-After "fontset" feature is enabled, VIM does not allow using english
-font only in "font" setting for syntax.
+After 'fontset' feature is enabled, VIM does not allow using english
+font only in 'font' setting for syntax.
 For example, if you use >
    :set guifontset=eng_font,your_font
 in your .gvimrc, then you should do for syntax >

runtime/doc/helphelp.txt

@@ -1,4 +1,4 @@
-*helphelp.txt*	For Vim version 8.0.  Last change: 2017 Mar 19
+*helphelp.txt*	For Vim version 8.0.  Last change: 2016 Apr 01
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -28,16 +28,10 @@ Help on help files					*helphelp*
 
 						*{subject}* *E149* *E661*
 :h[elp] {subject}	Like ":help", additionally jump to the tag {subject}.
-			For example:  >
-				:help options
-
-<			{subject} can include wildcards such as "*", "?" and
+			{subject} can include wildcards like "*", "?" and
 			"[a-z]":
 			   :help z?	jump to help for any "z" command
 			   :help z.	jump to the help for "z."
-			But when a tag exists it is taken literally:
-			   :help :?	jump to help for ":?"
-
 			If there is no full match for the pattern, or there
 			are several matches, the "best" match will be used.
 			A sophisticated algorithm is used to decide which
@@ -74,19 +68,18 @@ Help on help files					*helphelp*
 			example to find help for CTRL-V in Insert mode: >
 				:help i^V
 <
-			It is also possible to first do ":help" and then
+			To use a regexp |pattern|, first do ":help" and then
 			use ":tag {pattern}" in the help window.  The
 			":tnext" command can then be used to jump to other
 			matches, "tselect" to list matches and choose one. >
-				:help index
-				:tselect /.*mode
+				:help index| :tse z.
 
 <			When there is no argument you will see matches for
 			"help", to avoid listing all possible matches (that
 			would be very slow).
 			The number of matches displayed is limited to 300.
 
-			The `:help` command can be followed by '|' and another
+			This command can be followed by '|' and another
 			command, but you don't need to escape the '|' inside a
 			help command.  So these both work: >
 				:help |
@@ -142,8 +135,7 @@ Help on help files					*helphelp*
 			already opened, then the location list for that window
 			is used.  Otherwise, a new help window is opened and
 			the location list for that window is set.  The
-			location list for the current window is not changed
-			then.
+			location list for the current window is not changed.
 
 							*:exu* *:exusage*
 :exu[sage]		Show help on Ex commands.  Added to simulate the Nvi
@@ -315,7 +307,7 @@ the applicable Vim version.  The last field specifies the last modification
 date of the file.  Each field is separated by a tab.
 
 At the bottom of the help file, place a Vim modeline to set the 'textwidth'
-and 'tabstop' options and the 'filetype' to "help".  Never set a global option
+and 'tabstop' options and the 'filetype' to 'help'.  Never set a global option
 in such a modeline, that can have consequences undesired by whoever reads that
 help.
 

runtime/doc/if_mzsch.txt

@@ -249,7 +249,7 @@ Windows							    *mzscheme-window*
 5. mzeval() Vim function				    *mzscheme-mzeval*
 
 To facilitate bi-directional interface, you can use |mzeval()| function to
-evaluate MzScheme expressions and pass their values to Vim script.
+evaluate MzScheme expressions and pass their values to VimL.
 
 ==============================================================================
 6. Using Function references				    *mzscheme-funcref*

runtime/doc/if_pyth.txt

@@ -1,4 +1,4 @@
-*if_pyth.txt*   For Vim version 8.0.  Last change: 2017 Mar 09
+*if_pyth.txt*   For Vim version 8.0.  Last change: 2016 Sep 17
 
 
 		  VIM REFERENCE MANUAL    by Paul Moore
@@ -16,8 +16,6 @@ The Python Interface to Vim				*python* *Python*
 8. pyeval(), py3eval() Vim functions		|python-pyeval|
 9. Dynamic loading				|python-dynamic|
 10. Python 3					|python3|
-11. Python X					|python_x|
-12. Building with Python support		|python-building|
 
 {Vi does not have any of these commands}
 
@@ -175,8 +173,8 @@ vim.eval(str)						*python-eval*
 
 	    :py tagList = vim.eval('taglist("eval_expr")')
 <	The latter will return a python list of python dicts, for instance:
-	[{'cmd': '/^eval_expr(arg, nextcmd)$/', 'static': 0, 'name': ~
-	'eval_expr', 'kind': 'f', 'filename': './src/eval.c'}] ~
+	[{'cmd': '/^eval_expr(arg, nextcmd)$/', 'static': 0, 'name':
+	'eval_expr', 'kind': 'f', 'filename': './src/eval.c'}]
 
 vim.bindeval(str)					*python-bindeval*
 	Like |python-eval|, but returns special objects described in 
@@ -677,11 +675,11 @@ vim.Function object				*python-Function*
                      dictionary. Note that explicit `self` keyword used when 
                      calling resulting object overrides this attribute.
         auto_rebind  Boolean. True if partial created from this Python object 
-                     and stored in the Vim script dictionary should be
-                     automatically rebound to the dictionary it is stored in
-                     when this dictionary is indexed. Exposes Vim internal
-                     difference between `dict.func` (auto_rebind=True) and
-                     `function(dict.func,dict)` (auto_rebind=False). This
+                     and stored in the VimL dictionary should be automatically 
+                     rebound to the dictionary it is stored in when this 
+                     dictionary is indexed. Exposes Vim internal difference 
+                     between `dict.func` (auto_rebind=True) and 
+                     `function(dict.func,dict)` (auto_rebind=False). This 
                      attribute makes no sense if `self` attribute is `None`.
 
     Constructor additionally accepts `args`, `self` and `auto_rebind` 
@@ -712,8 +710,7 @@ vim.Function object				*python-Function*
 8. pyeval() and py3eval() Vim functions			*python-pyeval*
 
 To facilitate bi-directional interface, you can use |pyeval()| and |py3eval()| 
-functions to evaluate Python expressions and pass their values to Vim script.
-|pyxeval()| is also available.
+functions to evaluate Python expressions and pass their values to VimL.
 
 ==============================================================================
 9. Dynamic loading					*python-dynamic*
@@ -732,11 +729,9 @@ To use the Python interface the Python DLL must be in your search path.  In a
 console window type "path" to see what directories are used.  The 'pythondll'
 or 'pythonthreedll' option can be also used to specify the Python DLL.
 
-The name of the DLL should match the Python version Vim was compiled with.
-Currently the name for Python 2 is "python27.dll", that is for Python 2.7.
-That is the default value for 'pythondll'.  For Python 3 it is python35.dll
-(Python 3.5).  To know for sure edit "gvim.exe" and search for
-"python\d*.dll\c".
+The name of the DLL must match the Python version Vim was compiled with.
+Currently the name is "python24.dll".  That is for Python 2.4.  To know for
+sure edit "gvim.exe" and search for "python\d*.dll\c".
 
 
 Unix ~
@@ -816,91 +811,5 @@ dynamically, these has() calls will try to load them.  If only one can be
 loaded at a time, just checking if Python 2 or 3 are available will prevent
 the other one from being available.
 
-==============================================================================
-11. Python X						*python_x* *pythonx*
-
-Because most python code can be written so that it works with python 2.6+ and
-python 3 the pyx* functions and commands have been written.  They work exactly
-the same as the Python 2 and 3 variants, but select the Python version using
-the 'pyxversion' setting.
-
-You should set 'pyxversion' in your |.vimrc| to prefer Python 2 or Python 3
-for Python commands. If you change this setting at runtime you may risk that
-state of plugins (such as initialization) may be lost.
-
-If you want to use a module, you can put it in the {rtp}/pythonx directory.
-See |pythonx-directory|.
-
-							*:pyx* *:pythonx*
-The `:pyx` and `:pythonx` commands work similar to `:python`.  A simple check
-if the `:pyx` command is working: >
-	:pyx print("Hello")
-
-To see what version of Python is being used: >
-	:pyx import sys
-	:pyx print(sys.version)
-<
-					*:pyxfile* *python_x-special-comments*
-The `:pyxfile` command works similar to `:pyfile`.  However you can add one of
-these comments to force Vim using `:pyfile` or `:py3file`: >
-  #!/any string/python2		" Shebang. Must be the first line of the file.
-  #!/any string/python3		" Shebang. Must be the first line of the file.
-  # requires python 2.x		" Maximum lines depend on 'modelines'.
-  # requires python 3.x		" Maximum lines depend on 'modelines'.
-Unlike normal modelines, the bottom of the file is not checked.
-If none of them are found, the 'pyxversion' setting is used.
-							*W20* *W21*
-If Vim does not support the selected Python version a silent message will be
-printed.  Use `:messages` to read them.
-
-							*:pyxdo*
-The `:pyxdo` command works similar to `:pydo`.
-
-							*has-pythonx*
-You can test if pyx* commands are available with: >
-	if has('pythonx')
-	  echo 'pyx* commands are available. (Python ' . &pyx . ')'
-	endif
-
-When compiled with only one of |+python| or |+python3|, the has() returns 1.
-When compiled with both |+python| and |+python3|, the test depends on the
-'pyxversion' setting.  If 'pyxversion' is 0, it tests Python 3 first, and if
-it is not available then Python 2.  If 'pyxversion' is 2 or 3, it tests only
-Python 2 or 3 respectively.
-
-Note that for `has('pythonx')` to work it may try to dynamically load Python 3
-or 2.  This may have side effects, especially when Vim can only load one of
-the two.
-
-If a user prefers Python 2 and want to fallback to Python 3, he needs to set
-'pyxversion' explicitly in his |.vimrc|.  E.g.: >
-	if has('python')
-	  set pyx=2
-	elseif has('python3')
-	  set pyx=3
-	endif
-
-==============================================================================
-12. Building with Python support			*python-building*
-
-A few hints for building with Python 2 or 3 support.
-
-UNIX
-
-See src/Makefile for how to enable including the Python interface.
-
-On Ubuntu you will want to install these packages for Python 2:
-	python
-	python-dev
-For Python 3:
-	python3
-	pytyon3-dev
-For Python 3.6:
-	python3.6
-	pytyon3.6-dev
-
-If you have more than one version of Python 3, you need to link python3 to the
-one you prefer, before running configure.
-
 ==============================================================================
  vim:tw=78:ts=8:ft=help:norl:

runtime/doc/if_ruby.txt

@@ -72,7 +72,7 @@ To see what version of Ruby you have: >
 
 							*:rubyfile* *:rubyf*
 :rubyf[ile] {file}	Execute the Ruby script in {file}.  This is the same as
-			`:ruby load 'file'`, but allows file name completion.
+			":ruby load 'file'", but allows file name completion.
 
 Executing Ruby commands is not possible in the |sandbox|.
 
@@ -207,19 +207,21 @@ MS-Windows ~
 
 You need to install the right version of Ruby for this to work.  You can find
 the package to download from:
-http://rubyinstaller.org/downloads/
-Currently that is rubyinstaller-2.2.5.exe
+http://www.garbagecollect.jp/ruby/mswin32/en/download/release.html
+Currently that is ruby-1.9.2-p136-i386-mswin32.zip
 
 To use the Ruby interface the Ruby DLL must be in your search path.  In a
 console window type "path" to see what directories are used.  The 'rubydll'
 option can be also used to specify the Ruby DLL.
 
 The name of the DLL must match the Ruby version Vim was compiled with.
-Currently the name is "msvcrt-ruby220.dll".  That is for Ruby 2.2.X.  To know
+Currently the name is "msvcrt-ruby191.dll".  That is for Ruby 1.9.1.  To know
 for sure edit "gvim.exe" and search for "ruby\d*.dll\c".
 
-If you want to build Vim with RubyInstaller 1.9 or 2.X using MSVC, you need
-some tricks.  See the src/INSTALLpc.txt for detail.
+If you want to build Vim with Ruby 1.9.1, you need to edit the config.h file
+and comment-out the check for _MSC_VER.
+You may also need to rename the include directory name to match the version,
+strangely for Ruby 1.9.3 the directory is called 1.9.1.
 
 
 Unix ~

runtime/doc/indent.txt

@@ -324,21 +324,6 @@ The examples below assume a 'shiftwidth' of 4.
 		  {                          {
 		      void function();       void function();
 		  }                          }
-<
-							*cino-E*
-	EN    Indent inside C++ linkage specifications (extern "C" or
-	      extern "C++") N characters extra compared to a normal block.
-	      (default 0).
-
-		cino=			   cino=E-s >
-		  extern "C" {               extern "C" {
-		      void function();       void function();
-		  }                          }
-
-		  extern "C"                 extern "C"
-		  {                          {
-		      void function();       void function();
-		  }                          }
 <
 							*cino-p*
 	pN    Parameter declarations for K&R-style function declarations will
@@ -569,7 +554,7 @@ The examples below assume a 'shiftwidth' of 4.
 
 
 The defaults, spelled out in full, are:
-	cinoptions=>s,e0,n0,f0,{0,}0,^0,L-1,:s,=s,l0,b0,gs,hs,N0,E0,ps,ts,is,+s,
+	cinoptions=>s,e0,n0,f0,{0,}0,^0,L-1,:s,=s,l0,b0,gs,hs,N0,ps,ts,is,+s,
 			c3,C0,/0,(2s,us,U0,w0,W0,k0,m0,j0,J0,)20,*70,#0
 
 Vim puts a line in column 1 if:

runtime/doc/index.txt

@@ -1,4 +1,4 @@
-*index.txt*     For Vim version 8.0.  Last change: 2017 Feb 23
+*index.txt*     For Vim version 8.0.  Last change: 2016 Aug 27
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1002,14 +1002,12 @@ tag		command	      action in Command-line editing mode	~
 |c_CTRL-L|	CTRL-L		do completion on the pattern in front of the
 				cursor and insert the longest common part
 |c_<CR>|	<CR>		execute entered command
-|c_CTRL-M|	CTRL-M		same as <CR>
+|c_<CR>|	CTRL-M		same as <CR>
 |c_CTRL-N|	CTRL-N		after using 'wildchar' with multiple matches:
-				go to next match, otherwise: recall older
-				command-line from history.
+				go to next match, otherwise: same as <Down>
 		CTRL-O		not used
 |c_CTRL-P|	CTRL-P		after using 'wildchar' with multiple matches:
-				go to previous match, otherwise: recall older
-				command-line from history.
+				go to previous match, otherwise: same as <Up>
 |c_CTRL-Q|	CTRL-Q		same as CTRL-V, unless it's used for terminal
 				control flow
 |c_CTRL-R|	CTRL-R {0-9a-z"%#*:= CTRL-F CTRL-P CTRL-W CTRL-A}
@@ -1028,7 +1026,7 @@ tag		command	      action in Command-line editing mode	~
 		CTRL-Y		copy (yank) modeless selection
 		CTRL-Z		not used (reserved for suspend)
 |c_<Esc>|	<Esc>		abandon command-line without executing it
-|c_CTRL-[|	CTRL-[		same as <Esc>
+|c_<Esc>|	CTRL-[		same as <Esc>
 |c_CTRL-\_CTRL-N| CTRL-\ CTRL-N	go to Normal mode, abandon command-line
 |c_CTRL-\_CTRL-G| CTRL-\ CTRL-G	go to mode specified with 'insertmode',
 				abandon command-line
@@ -1444,10 +1442,6 @@ tag	      command	      action ~
 |:python|	:py[thon]	execute Python command
 |:pydo|		:pyd[o]		execute Python command for each line
 |:pyfile|	:pyf[ile]	execute Python script file
-|:pyx|		:pyx		execute |python_x| command
-|:pythonx|	:pythonx	same as :pyx
-|:pyxdo|	:pyxd[o]	execute |python_x| command for each line
-|:pyxfile|	:pyxf[ile]	execute |python_x| script file
 |:quit|		:q[uit]		quit current window (when one window quit Vim)
 |:quitall|	:quita[ll]	quit Vim
 |:qall|		:qa[ll]		quit Vim

runtime/doc/insert.txt

@@ -1103,7 +1103,7 @@ items:
 	empty		when non-zero this match will be added even when it is
 			an empty string
 
-All of these except "icase", "dup" and "empty" must be a string.  If an item
+All of these except 'icase', 'dup' and 'empty' must be a string.  If an item
 does not meet these requirements then an error message is given and further
 items in the list are not used.  You can mix string and Dictionary items in
 the returned list.

runtime/doc/intro.txt

@@ -96,18 +96,21 @@ mention that.
 
 						*mail-list* *maillist*
 There are several mailing lists for Vim:
-<vim@vim.org>					*vim-use* *vim_use*
+<vim@vim.org>
 	For discussions about using existing versions of Vim: Useful mappings,
 	questions, answers, where to get a specific version, etc.  There are
 	quite a few people watching this list and answering questions, also
 	for beginners.  Don't hesitate to ask your question here.
-<vim-dev@vim.org>				*vim-dev* *vim_dev* *vimdev*
+<vim-dev@vim.org>				*vim-dev* *vimdev*
 	For discussions about changing Vim: New features, porting, patches,
 	beta-test versions, etc.
-<vim-announce@vim.org>				*vim-announce* *vim_announce*
+<vim-announce@vim.org>				*vim-announce*
 	Announcements about new versions of Vim; also for beta-test versions
 	and ports to different systems.  This is a read-only list.
-<vim-mac@vim.org>				*vim-mac* *vim_mac*
+<vim-multibyte@vim.org>				*vim-multibyte*
+	For discussions about using and improving the multi-byte aspects of
+	Vim.
+<vim-mac@vim.org>				*vim-mac*
 	For discussions about using and improving the Macintosh version of
 	Vim.
 

runtime/doc/map.txt

@@ -1,4 +1,4 @@
-*map.txt*       For Vim version 8.0.  Last change: 2017 Mar 10
+*map.txt*       For Vim version 8.0.  Last change: 2016 Aug 26
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -584,8 +584,7 @@ Upper and lowercase differences are ignored.
 
 							*map-comments*
 It is not possible to put a comment after these commands, because the '"'
-character is considered to be part of the {lhs} or {rhs}. However, one can
-use |", since this starts a new, empty command with a comment.
+character is considered to be part of the {lhs} or {rhs}.
 
 							*map_bar* *map-bar*
 Since the '|' character is used to separate a map command from the next
@@ -1281,7 +1280,6 @@ completion can be enabled:
 	-complete=locale	locale names (as output of locale -a)
 	-complete=mapping	mapping name
 	-complete=menu		menus
-	-complete=messages	|:messages| suboptions
 	-complete=option	options
 	-complete=packadd	optional package |pack-add| names
 	-complete=shellcmd	Shell command

runtime/doc/message.txt

@@ -1,4 +1,4 @@
-*message.txt*   For Vim version 8.0.  Last change: 2017 Jan 02
+*message.txt*   For Vim version 8.0.  Last change: 2016 Sep 01
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -129,9 +129,8 @@ closed properly.  Mostly harmless.
   Command too recursive
 
 This happens when an Ex command executes an Ex command that executes an Ex
-command, etc.  The limit is 200 or the value of 'maxfuncdepth', whatever is
-larger.  When it's more there probably is an endless loop.  Probably a
-|:execute| or |:source| command is involved.
+command, etc.  This is only allowed 200 times.  When it's more there probably
+is an endless loop.  Probably a |:execute| or |:source| command is involved.
 
 							*E254*  >
   Cannot allocate color {name}

runtime/doc/mlang.txt

@@ -1,4 +1,4 @@
-*mlang.txt*     For Vim version 8.0.  Last change: 2017 Mar 04
+*mlang.txt*     For Vim version 8.0.  Last change: 2016 Jan 16
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -179,7 +179,6 @@ Send an e-mail to the Vim maintainer <maintainer@vim.org>.
 			special characters like "&" and "<Tab>" need to be
 			included.  Spaces and dots need to be escaped with a
 			backslash, just like in other |:menu| commands.
-			Case in {english} is ignored.
 
 See the $VIMRUNTIME/lang directory for examples.
 

runtime/doc/motion.txt

@@ -1,4 +1,4 @@
-*motion.txt*    For Vim version 8.0.  Last change: 2017 Mar 12
+*motion.txt*    For Vim version 8.0.  Last change: 2016 Jul 12
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -193,7 +193,7 @@ l		or					*l*
 
 							*$* *<End>* *<kEnd>*
 $  or <End>		To the end of the line.  When a count is given also go
-			[count - 1] lines downward. |inclusive| motion.
+			[count - 1] lines downward |inclusive|.
 			In Visual mode the cursor goes to just after the last
 			character in the line.
 			When 'virtualedit' is active, "$" may move the cursor
@@ -915,7 +915,6 @@ was made yet in the current file.
 			then the position can be near the end of what the
 			command changed.  For example when inserting a word,
 			the position will be on the last character.
-			To jump to older changes use |g;|.
 			{not in Vi}
 
 							*'(* *`(*

runtime/doc/options.txt

@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 8.0.  Last change: 2017 Mar 09
+*options.txt*	For Vim version 8.0.  Last change: 2016 Sep 16
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -10,7 +10,7 @@ Options							*options*
 2. Automatically setting options	|auto-setting|
 3. Options summary			|option-summary|
 
-For an overview of options see quickref.txt |option-list|.
+For an overview of options see help.txt |option-list|.
 
 Vim has a number of internal variables and switches which can be set to
 achieve special effects.  These options come in three forms:
@@ -242,7 +242,7 @@ opt+=val" the expansion is done before the adding or removing.
 Handling of local options			*local-options*
 
 Some of the options only apply to a window or buffer.  Each window or buffer
-has its own copy of this option, thus each can have its own value.  This
+has its own copy of this option, thus can each have their own value.  This
 allows you to set 'list' in one window but not in another.  And set
 'shiftwidth' to 3 in one buffer and 4 in another.
 
@@ -728,7 +728,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 	Setting this option in the Carbon version can sometimes cause problems
 	if 'guifont' is set to its default (empty string).
-	NOTE: This option is reset when 'compatible' is set.
 
 	Support for this option is not flawless in MacVim. In particular,
 	Monaco always seems to render not antialiased for point sizes up
@@ -766,7 +765,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	- Disable the use of 'keymap' (without changing its value).
 	Note that 'arabicshape' and 'delcombine' are not reset (it is a global
 	option).
-	NOTE: This option is reset when 'compatible' is set.
 	Also see |arabic.txt|.
 
 					*'arabicshape'* *'arshape'*
@@ -788,7 +786,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	form.
 	Arabic is a complex language which requires other settings, for
 	further details see |arabic.txt|.
-	NOTE: This option is set when 'compatible' is set.
 
 			*'autoindent'* *'ai'* *'noautoindent'* *'noai'*
 'autoindent' 'ai'	boolean	(default off)
@@ -1001,9 +998,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	the system may refuse to do this.  In that case the "auto" value will
 	again not rename the file.
 
-	NOTE: This option is set to the Vi default value when 'compatible' is
-	set and to the Vim default value when 'compatible' is reset.
-
 						*'backupdir'* *'bdir'*
 'backupdir' 'bdir'	string	(default for Amiga: ".,t:",
 				 for MS-DOS and Win32: ".,$TEMP,c:/tmp,c:/temp"
@@ -1131,9 +1125,6 @@ A jump table for the options with a short description can be found at |Q_op|.
     set bexpr=MyBalloonExpr()
     set ballooneval
 <
-	Also see |balloon_show()|, can be used if the content of the balloon
-	is to be fetched asynchronously.
-
 	NOTE: The balloon is displayed only if the cursor is on a text
 	character.  If the result of evaluating 'balloonexpr' is not empty,
 	Vim does not try to send a message to an external debugger (Netbeans
@@ -1150,7 +1141,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 <	When they are supported "\n" characters will start a new line.  If the
 	expression evaluates to a |List| this is equal to using each List item
 	as a string and putting "\n" in between them.
-	NOTE: This option is set to "" when 'compatible' is set.
 
 						*'belloff'* *'bo'*
 'belloff' 'bo'		string	(default "")
@@ -1188,8 +1178,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	wildmode    More matches in |cmdline-completion| available
 		    (depends on the 'wildmode' setting).
 
-	This is most useful to fine tune when in Insert mode the bell should
-	be rung. For Normal mode and Ex commands, the bell is often rung to
+	This is most useful, to fine tune when in insert mode the bell should
+	be rung. For normal mode and ex commands, the bell is often rung to
 	indicate that an error occurred. It can be silenced by adding the
 	"error" keyword.
 
@@ -1279,7 +1269,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Every wrapped line will continue visually indented (same amount of
 	space as the beginning of that line), thus preserving horizontal blocks
 	of text.
-	NOTE: This option is reset when 'compatible' is set.
 
 						*'breakindentopt'* *'briopt'*
 'breakindentopt' 'briopt' string (default empty)
@@ -1456,8 +1445,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 		:exe "set cedit=\<Esc>"
 <	|Nvi| also has this option, but it only uses the first character.
 	See |cmdwin|.
-	NOTE: This option is set to the Vim default value when 'compatible'
-	is reset.
 
 				*'charconvert'* *'ccv'* *E202* *E214* *E513*
 'charconvert' 'ccv'	string (default "")
@@ -1728,14 +1715,12 @@ A jump table for the options with a short description can be found at |Q_op|.
 			{not in Vi}
 	This option has the effect of making Vim either more Vi-compatible, or
 	make Vim behave in a more useful way.
-
 	This is a special kind of option, because when it's set or reset,
-	other options are also changed as a side effect.
-	NOTE: Setting or resetting this option can have a lot of unexpected
-	effects: Mappings are interpreted in another way, undo behaves
-	differently, etc.  If you set this option in your vimrc file, you
-	should probably put it at the very start.
-
+	other options are also changed as a side effect.  CAREFUL: Setting or
+	resetting this option can have a lot of unexpected effects: Mappings
+	are interpreted in another way, undo behaves differently, etc.  If you
+	set this option in your vimrc file, you should probably put it at the
+	very start.
 	By default this option is on and the Vi defaults are used for the
 	options.  This default was chosen for those people who want to use Vim
 	just like Vi, and don't even (want to) know about the 'compatible'
@@ -1750,98 +1735,69 @@ A jump table for the options with a short description can be found at |Q_op|.
 	|posix-compliance|.
 	You can also set this option with the "-C" argument, and reset it with
 	"-N".  See |-C| and |-N|.
-	See 'cpoptions' for more fine tuning of Vi compatibility.
+	Switching this option off makes the Vim defaults be used for options
+	that have a different Vi and Vim default value.  See the options
+	marked with a '+' below.  Other options are not modified.
+	At the moment this option is set, several other options will be set
+	or reset to make Vim as Vi-compatible as possible.  See the table
+	below.  This can be used if you want to revert to Vi compatible
+	editing.
+	See also 'cpoptions'.
 
-	When this option is set, numerous other options are set to make Vim as
-	Vi-compatible as possible.  When this option is unset, various options
-	are set to make Vim more useful.  The table below lists all the
-	options affected.
-	The {?} column indicates when the options are affected:
-	+  Means that the option is set to the value given in {set value} when
-	   'compatible' is set.
-	&  Means that the option is set to the value given in {set value} when
-	   'compatible' is set AND is set to its Vim default value when
-	   'compatible' is unset.
-	-  Means the option is NOT changed when setting 'compatible' but IS
-	   set to its Vim default when 'compatible' is unset.
-	The {effect} column summarises the change when 'compatible' is set.
+	option		+ set value	effect	~
 
-	option		? set value	effect ~
-
-	'allowrevins'	+ off		no CTRL-_ command
-	'antialias'	+ off		don't use antialiased fonts
-	'arabic'	+ off	 	reset arabic-related options
-	'arabicshape'	+ on		correct character shapes
-	'backspace'	+ ""		normal backspace
-	'backup'	+ off		no backup file
-	'backupcopy'	& Unix: "yes"	backup file is a copy
-			  else: "auto"	copy or rename backup file
-	'balloonexpr'	+ ""		text to show in evaluation balloon
-	'breakindent'	+ off		don't indent when wrapping lines
-	'cedit'		- {unchanged}	{set vim default only on resetting 'cp'}
-	'cindent'	+ off		no C code indentation
-	'compatible'	- {unchanged}	{set vim default only on resetting 'cp'}
-	'copyindent'	+ off		don't copy indent structure
-	'cpoptions'	& (all flags)	Vi-compatible flags
-	'cscopepathcomp'+ 0		don't show directories in tags list
-	'cscoperelative'+ off		
-	'cscopetag'	+ off		don't use cscope for ":tag"
-	'cscopetagorder'+ 0		see |cscopetagorder|
-	'cscopeverbose'	+ off		see |cscopeverbose|
-	'delcombine'	+ off		unicode: delete whole char combination
-	'digraph'	+ off		no digraphs
-	'esckeys'	& off		no <Esc>-keys in Insert mode
-	'expandtab'	+ off		tabs not expanded to spaces
-	'fileformats'	& ""		no automatic file format detection,
+	'allowrevins'	  off		no CTRL-_ command
+	'backupcopy'	  Unix: "yes"	  backup file is a copy
+			  others: "auto"  copy or rename backup file
+	'backspace'	  ""		normal backspace
+	'backup'	  off		no backup file
+	'cindent'	  off		no C code indentation
+	'cedit'		+ ""		no key to open the |cmdwin|
+	'cpoptions'	+ (all flags)	Vi-compatible flags
+	'cscopetag'	  off		don't use cscope for ":tag"
+	'cscopetagorder'  0		see |cscopetagorder|
+	'cscopeverbose'	  off		see |cscopeverbose|
+	'digraph'	  off		no digraphs
+	'esckeys'	+ off		no <Esc>-keys in Insert mode
+	'expandtab'	  off		tabs not expanded to spaces
+	'fileformats'	+ ""		no automatic file format detection,
 			  "dos,unix"	except for DOS, Windows and OS/2
-	'formatexpr'	+ ""		use 'formatprg' for auto-formatting
-	'formatoptions'	& "vt"		Vi compatible formatting
-	'gdefault'	+ off		no default 'g' flag for ":s"
-	'history'	& 0		no commandline history
-	'hkmap'		+ off		no Hebrew keyboard mapping
-	'hkmapp'	+ off		no phonetic Hebrew keyboard mapping
-	'hlsearch'	+ off		no highlighting of search matches
-	'incsearch'	+ off		no incremental searching
-	'indentexpr'	+ ""		no indenting by expression
-	'insertmode'	+ off		do not start in Insert mode
-	'iskeyword'	& "@,48-57,_"	keywords contain alphanumeric
+	'formatoptions'	+ "vt"		Vi compatible formatting
+	'gdefault'	  off		no default 'g' flag for ":s"
+	'history'	+ 0		no commandline history
+	'hkmap'		  off		no Hebrew keyboard mapping
+	'hkmapp'	  off		no phonetic Hebrew keyboard mapping
+	'hlsearch'	  off		no highlighting of search matches
+	'incsearch'	  off		no incremental searching
+	'indentexpr'	  ""		no indenting by expression
+	'insertmode'	  off		do not start in Insert mode
+	'iskeyword'	+ "@,48-57,_"	keywords contain alphanumeric
 						characters and '_'
-	'joinspaces'	+ on		insert 2 spaces after period
-	'modeline'	& off		no modelines
-	'more'		& off		no pauses in listings
-	'mzquantum'	- {unchanged}	{set vim default only on resetting 'cp'}
-	'numberwidth'	& 8		min number of columns for line number
-	'preserveindent'+ off		don't preserve current indent structure
-						when changing it
-	'revins'	+ off		no reverse insert
-	'ruler'		+ off		no ruler
-	'scrolljump'	+ 1		no jump scroll
-	'scrolloff'	+ 0		no scroll offset
-	'shelltemp'	- {unchanged}	{set vim default only on resetting 'cp'}
-	'shiftround'	+ off		indent not rounded to shiftwidth
-	'shortmess'	& ""		no shortening of messages
-	'showcmd'	& off		command characters not shown
-	'showmode'	& off		current mode not shown
-	'sidescrolloff'	+ 0		cursor moves to edge of screen in scroll
-	'smartcase'	+ off		no automatic ignore case switch
-	'smartindent'	+ off		no smart indentation
-	'smarttab'	+ off		no smart tab size
-	'softtabstop'	+ 0		tabs are always 'tabstop' positions
-	'startofline'	+ on		goto startofline with some commands
-	'tagcase'	& "followic"	'ignorecase' when searching tags file
-	'tagrelative'	& off		tag file names are not relative
-	'termguicolors'	+ off		don't use highlight-(guifg|guibg)
-	'textauto'	& off		no automatic textmode detection
-	'textwidth'	+ 0		no automatic line wrap
-	'tildeop'	+ off		tilde is not an operator
-	'ttimeout'	+ off		no terminal timeout
-	'undofile'	+ off		don't use an undo file
-	'viminfo'       - {unchanged}	{set Vim default only on resetting 'cp'}
-	'virtualedit'	+ ""		cursor can only be placed on characters
-	'whichwrap'	& ""		left-right movements don't wrap
-	'wildchar'	& CTRL-E	only when the current value is <Tab>
+	'joinspaces'	  on		insert 2 spaces after period
+	'modeline'	+ off		no modelines
+	'more'		+ off		no pauses in listings
+	'revins'	  off		no reverse insert
+	'ruler'		  off		no ruler
+	'scrolljump'	  1		no jump scroll
+	'scrolloff'	  0		no scroll offset
+	'shiftround'	  off		indent not rounded to shiftwidth
+	'shortmess'	+ ""		no shortening of messages
+	'showcmd'	+ off		command characters not shown
+	'showmode'	+ off		current mode not shown
+	'smartcase'	  off		no automatic ignore case switch
+	'smartindent'	  off		no smart indentation
+	'smarttab'	  off		no smart tab size
+	'softtabstop'	  0		tabs are always 'tabstop' positions
+	'startofline'	  on		goto startofline with some commands
+	'tagrelative'	+ off		tag file names are not relative
+	'textauto'	+ off		no automatic textmode detection
+	'textwidth'	  0		no automatic line wrap
+	'tildeop'	  off		tilde is not an operator
+	'ttimeout'	  off		no terminal timeout
+	'whichwrap'	+ ""		left-right movements don't wrap
+	'wildchar'	+ CTRL-E	only when the current value is <Tab>
 					use CTRL-E for cmdline completion
-	'writebackup'	+ on or off	depends on the |+writebackup| feature
+	'writebackup'	  on or off	depends on the |+writebackup| feature
 
 						*'complete'* *'cpt'* *E535*
 'complete' 'cpt'	string	(default: ".,w,b,u,t,i")
@@ -2016,7 +1972,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	existing line.  'expandtab' has no effect on these characters, a Tab
 	remains a Tab.  If the new indent is greater than on the existing
 	line, the remaining space is filled in the normal manner.
-	NOTE: This option is reset when 'compatible' is set.
+	NOTE: 'copyindent' is reset when 'compatible' is set.
 	Also see 'preserveindent'.
 
 						*'cpoptions'* *'cpo'* *cpo*
@@ -2377,7 +2333,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 			{not in Vi}
 	Determines how many components of the path to show in a list of tags.
 	See |cscopepathcomp|.
-	NOTE: This option is set to 0 when 'compatible' is set.
 
 						*'cscopeprg'* *'csprg'*
 'cscopeprg' 'csprg'	string	(default "cscope")
@@ -2407,7 +2362,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	In the absence of a prefix (-P) for cscope. setting this option enables
 	to use the basename of cscope.out path as the prefix.
 	See |cscoperelative|.
-	NOTE: This option is reset when 'compatible' is set.
 
 				*'cscopetag'* *'cst'* *'nocscopetag'* *'nocst'*
 'cscopetag' 'cst'	boolean (default off)
@@ -2527,7 +2481,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	This is useful for Arabic, Hebrew and many other languages where one
 	may have combining characters overtop of base characters, and want
 	to remove only the combining ones.
-	NOTE: This option is reset when 'compatible' is set.
 
 						*'dictionary'* *'dict'*
 'dictionary' 'dict'	string	(default "")
@@ -2743,7 +2696,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	This option cannot be set from a |modeline|.  It would most likely
 	corrupt the text.
 
-	NOTE: For MacVim and GTK+, it is highly recommended to set 'encoding'
+	NOTE: For MacVim and GTK+ 2 it is highly recommended to set 'encoding'
 	to "utf-8".  Although care has been taken to allow different values of
 	'encoding', "utf-8" is the natural choice for the environment and
 	avoids unnecessary conversion overhead.  "utf-8" has not been made
@@ -2942,8 +2895,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	done when writing the file.  For reading see below.
 	When 'fileencoding' is empty, the same value as 'encoding' will be
 	used (no conversion when reading or writing a file).
-	No error will be given when the value is set, only when it is used,
-	only when writing a file.
 	Conversion will also be done when 'encoding' and 'fileencoding' are
 	both a Unicode encoding and 'fileencoding' is not utf-8.  That's
 	because internally Unicode is always stored as utf-8.
@@ -3448,7 +3399,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	The expression will be evaluated in the |sandbox| when set from a
 	modeline, see |sandbox-option|.  That stops the option from working,
 	since changing the buffer text is not allowed.
-	NOTE: This option is set to "" when 'compatible' is set.
 
 					*'formatoptions'* *'fo'*
 'formatoptions' 'fo'	string (Vim default: "tcq", Vi default: "vt")
@@ -3479,7 +3429,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 						*'formatprg'* *'fp'*
 'formatprg' 'fp'	string (default "")
-			global or local to buffer |global-local|
+			global
 			{not in Vi}
 	The name of an external program that will be used to format the lines
 	selected with the |gq| operator.  The program must take the input on
@@ -3744,14 +3694,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	On systems where 'guifontset' is supported (X11) and 'guifontset' is
 	not empty, then 'guifont' is not used.
 
-	Note: As to the GTK GUIs, no error is given against any invalid names,
-	and the first element of the list is always picked up and made use of.
-	This is because, instead of identifying a given name with a font, the
-	GTK GUIs use it to construct a pattern and try to look up a font which
-	best matches the pattern among available fonts, and this way, the
-	matching never fails.  An invalid name doesn't matter because a number
-	of font properties other than name will do to get the matching done.
-
 	Spaces after a comma are ignored.  To include a comma in a font name
 	precede it with a backslash.  Setting an option requires an extra
 	backslash before a space and a backslash.  See also
@@ -3777,7 +3719,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	The font name depends on the GUI used.  See |setting-guifont| for a
 	way to set 'guifont' for various systems.
 
-	For the GTK+ 2 and 3 GUIs, the font name looks like this: >
+	For the GTK+ 2 GUI the font name looks like this: >
 	    :set guifont=Andale\ Mono\ 11
 <	That's all.  XLFDs are not used.  For Chinese this is reported to work
 	well: >
@@ -3786,9 +3728,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	      set guifontwide=Microsoft\ Yahei\ 12,WenQuanYi\ Zen\ Hei\ 12
 	    endif
 <
-        (Replace gui_gtk2 with gui_gtk3 for the GTK+ 3 GUI)
-
-	For Mac OSX you can use something like this: >
+	For Mac OS X you can use something like this: >
 	    :set guifont=Monaco:h10
 <	Also see 'macatsui', it can help fix display problems {not in MacVim}.
 	In MacVim, fonts with spaces are set like this: >
@@ -3796,7 +3736,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 <
 								*E236*
 	Note that the fonts must be mono-spaced (all characters have the same
-        width).  An exception is MacVim and GTK: all fonts are accepted, but
+        width).  An exception is MacVim and GTK 2: all fonts are accepted, but
 	mono-spaced fonts look best.
 
 	To preview a font on X11, you might be able to use the "xfontsel"
@@ -3835,7 +3775,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			{not in Vi}
 			{only available when compiled with GUI enabled and
 			with the |+xfontset| feature}
-			{not available in the GTK+ GUI}
+			{not available in the GTK+ 2 GUI}
 	When not empty, specifies two (or more) fonts to be used.  The first
 	one for normal English, the second one for your special language.  See
 	|xfontset|.
@@ -3864,7 +3804,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Note: The size of these fonts must be exactly twice as wide as the one
 	specified with 'guifont' and the same height.
 
-	All GUI versions but MacVim and GTK+:
+	All GUI versions but MacVim and GTK+ 2:
 
 	'guifontwide' is only used when 'encoding' is set to "utf-8" and
 	'guifontset' is empty or invalid.
@@ -3878,7 +3818,7 @@ A jump table for the options with a short description can be found at |Q_op|.
         that font will be used for all wide fonts.  However, if a glyph is
 	not available in the wide font, then font substitution is still used.
 
-	GTK+ GUI only:				*guifontwide_gtk2*
+	GTK+ 2 GUI only:			*guifontwide_gtk2*
 
 	If set and valid, 'guifontwide' is always used for double width
 	characters, even if 'encoding' is not set to "utf-8".
@@ -4043,8 +3983,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 	The format of this option is like that of 'statusline'.
 	'guitabtooltip' is used for the tooltip, see below.
-	The expression will be evaluated in the |sandbox| when set from a
-	modeline, see |sandbox-option|.
 
 	Only used when the GUI tab pages line is displayed.  'e' must be
 	present in 'guioptions'.  For the non-GUI tab pages line 'tabline' is
@@ -4208,6 +4146,31 @@ A jump table for the options with a short description can be found at |Q_op|.
 	define one.  The default uses a different group for each occasion.
 	See |highlight-default| for the default highlight groups.
 
+				 *'hlsearch'* *'hls'* *'nohlsearch'* *'nohls'*
+'hlsearch' 'hls'	boolean	(default off)
+			global
+			{not in Vi}
+			{not available when compiled without the
+			|+extra_search| feature}
+	When there is a previous search pattern, highlight all its matches.
+	The type of highlighting used can be set with the 'l' occasion in the
+	'highlight' option.  This uses the "Search" highlight group by
+	default.  Note that only the matching text is highlighted, any offsets
+	are not applied.
+	See also: 'incsearch' and |:match|.
+	When you get bored looking at the highlighted matches, you can turn it
+	off with |:nohlsearch|.  This does not change the option value, as
+	soon as you use a search command, the highlighting comes back.
+	'redrawtime' specifies the maximum time spent on finding matches.
+	When the search pattern can match an end-of-line, Vim will try to
+	highlight all of the matched text.  However, this depends on where the
+	search starts.  This will be the first line in the window or the first
+	line below a closed fold.  A match in a previous line which is not
+	drawn may not continue in a newly drawn line.
+	You can specify whether the highlight status is restored on startup
+	with the 'h' flag in 'viminfo' |viminfo-h|.
+	NOTE: This option is reset when 'compatible' is set.
+
 						*'history'* *'hi'*
 'history' 'hi'		number	(Vim default: 50, Vi default: 0,
 						 set to 200 in |defaults.vim|)
@@ -4240,31 +4203,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	When on, phonetic keyboard mapping is used.  'hkmap' must also be on.
 	This is useful if you have a non-Hebrew keyboard.
 	See |rileft.txt|.
-	NOTE: This option is reset when 'compatible' is set.
-
-				 *'hlsearch'* *'hls'* *'nohlsearch'* *'nohls'*
-'hlsearch' 'hls'	boolean	(default off)
-			global
-			{not in Vi}
-			{not available when compiled without the
-			|+extra_search| feature}
-	When there is a previous search pattern, highlight all its matches.
-	The type of highlighting used can be set with the 'l' occasion in the
-	'highlight' option.  This uses the "Search" highlight group by
-	default.  Note that only the matching text is highlighted, any offsets
-	are not applied.
-	See also: 'incsearch' and |:match|.
-	When you get bored looking at the highlighted matches, you can turn it
-	off with |:nohlsearch|.  This does not change the option value, as
-	soon as you use a search command, the highlighting comes back.
-	'redrawtime' specifies the maximum time spent on finding matches.
-	When the search pattern can match an end-of-line, Vim will try to
-	highlight all of the matched text.  However, this depends on where the
-	search starts.  This will be the first line in the window or the first
-	line below a closed fold.  A match in a previous line which is not
-	drawn may not continue in a newly drawn line.
-	You can specify whether the highlight status is restored on startup
-	with the 'h' flag in 'viminfo' |viminfo-h|.
 	NOTE: This option is reset when 'compatible' is set.
 
 						*'icon'* *'noicon'*
@@ -4502,8 +4440,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	original position when no match is found and when pressing <Esc>.  You
 	still need to finish the search command with <Enter> to move the
 	cursor to the match.
-	You can use the CTRL-G and CTRL-T keys to move to the next and
-	previous match. |c_CTRL-G| |c_CTRL-T|
+	You can use the CTRL-N and CTRL-P keys to move to the next and
+	previous match. |c_CTRL-N| |c_CTRL-P|
 	When compiled with the |+reltime| feature Vim only searches for about
 	half a second.  With a complicated pattern and/or a lot of text the
 	match may not be found.  This is to avoid that Vim hangs while you
@@ -4547,7 +4485,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 <	Error messages will be suppressed, unless the 'debug' option contains
 	"msg".
 	See |indent-expression|.
-	NOTE: This option is set to "" when 'compatible' is set.
+	NOTE: This option is made empty when 'compatible' is set.
 
 	The expression will be evaluated in the |sandbox| when set from a
 	modeline, see |sandbox-option|.
@@ -5160,25 +5098,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
 
-					*'makeencoding'* *'menc'*
-'makeencoding' 'menc'	string	(default "")
-			global or local to buffer |global-local|
-			{only available when compiled with the |+multi_byte|
-			feature}
-			{not in Vi}
-	Encoding used for reading the output of external commands.  When empty,
-	encoding is not converted.
-	This is used for `:make`, `:lmake`, `:grep`, `:lgrep`, `:grepadd`,
-	`:lgrepadd`, `:cfile`, `:cgetfile`, `:caddfile`, `:lfile`, `:lgetfile`,
-	and `:laddfile`.
-
-	This would be mostly useful when you use MS-Windows and set 'encoding'
-	to "utf-8".  If |+iconv| is enabled and GNU libiconv is used, setting
-	'makeencoding' to "char" has the same effect as setting to the system
-	locale encoding.  Example: >
-		:set encoding=utf-8
-		:set makeencoding=char	" system locale is used
-<
 						*'makeprg'* *'mp'*
 'makeprg' 'mp'		string	(default "make", VMS: "MMS")
 			global or local to buffer |global-local|
@@ -5251,8 +5170,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	catches endless recursion.  When using a recursive function with
 	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|.
 	See also |:function|.
 
 						*'maxmapdepth'* *'mmd'* *E223*
@@ -5374,7 +5291,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			{not in Vi}		*E21*
 	When off the buffer contents cannot be changed.  The 'fileformat' and
 	'fileencoding' options also can't be changed.
-	Can be reset on startup with the |-M| command line argument.
+	Can be reset with the |-M| command line argument.
 
 				*'modified'* *'mod'* *'nomodified'* *'nomod'*
 'modified' 'mod'	boolean	(default off)
@@ -5576,8 +5493,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 			feature}
 	The number of milliseconds between polls for MzScheme threads.
 	Negative or zero value means no thread scheduling.
-	NOTE: This option is set to the Vim default value when 'compatible'
-	is reset.
 
 							*'nrformats'* *'nf'*
 'nrformats' 'nf'	string	(default "bin,octal,hex",
@@ -5643,8 +5558,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	is set. Thus with the Vim default of 4 there is room for a line number
 	up to 999. When the buffer has 1000 lines five columns will be used.
 	The minimum value is 1, the maximum value is 10.
-	NOTE: This option is set to the Vi default value when 'compatible' is
-	set and to the Vim default value when 'compatible' is reset.
+	NOTE: 'numberwidth' is reset to 8 when 'compatible' is set.
 
 						*'omnifunc'* *'ofu'*
 'omnifunc' 'ofu'	string	(default: empty)
@@ -5884,7 +5798,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	a Tab.
 	NOTE: When using ">>" multiple times the resulting indent is a mix of
 	tabs and spaces.  You might not like this.
-	NOTE: This option is reset when 'compatible' is set.
+	NOTE: 'preserveindent' is reset when 'compatible' is set.
 	Also see 'copyindent'.
 	Use |:retab| to clean up white space.
 
@@ -5936,8 +5850,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 			and |+postscript| features}
 	Expression used to print the PostScript produced with |:hardcopy|.
 	See |pexpr-option|.
-	This option cannot be set from a |modeline| or in the |sandbox|, for
-	security reasons.
 
 						*'printfont'* *'pfn'*
 'printfont' 'pfn'	string	(default "courier")
@@ -6008,21 +5920,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	DYNAMIC_PYTHON_DLL, which was specified at compile time.
 	Environment variables are expanded |:set_env|.
 	This option cannot be set from a |modeline| or in the |sandbox|, for
-	security reasons.
-
-						*'pythonhome'*
-'pythonhome'		string	(default "")
-			global
-			{not in Vi}
-			{only available when compiled with the |+python/dyn|
-			feature}
-	Note: EXPERIMENTAL. It may be changed or removed in the future.
-	Specifies the name of the Python 2.x home directory. When 'pythonhome'
-	and the PYTHONHOME environment variable are not set, PYTHON_HOME,
-	which was specified at compile time, will be used for the Python 2.x
-	home directory.
-	Environment variables are expanded |:set_env|.
-	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
 
 						*'pythonthreedll'*
@@ -6034,50 +5931,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Specifies the name of the Python 3 shared library. The default is
 	DYNAMIC_PYTHON3_DLL, which was specified at compile time.
 	Environment variables are expanded |:set_env|.
-	This option cannot be set from a |modeline| or in the |sandbox|, for
-	security reasons.
-
-						*'pythonthreehome'*
-'pythonthreehome'	string	(default "")
-			global
-			{not in Vi}
-			{only available when compiled with the |+python3/dyn|
-			feature}
-	Note: EXPERIMENTAL. It may be changed or removed in the future.
-	Specifies the name of the Python 3 home directory. When
-	'pythonthreehome' and the PYTHONHOME environment variable are not set,
-	PYTHON3_HOME, which was specified at compile time, will be used for
-	the Python 3 home directory.
-	Environment variables are expanded |:set_env|.
-
-	This option cannot be set from a |modeline| or in the |sandbox|, for
-	security reasons.
-
-						*'pyxversion'* *'pyx'*
-'pyxversion' 'pyx'	number	(default depends on the build)
-			global
-			{not in Vi}
-			{only available when compiled with the |+python| or
-			the |+python3| feature}
-	Specifies the python version used for pyx* functions and commands
-	|python_x|.  The default value is as follows:
-
-		Compiled with		     Default ~
-		|+python| and |+python3|	0
-		only |+python|			2
-		only |+python3|			3
-
-	Available values are 0, 2 and 3.
-	If 'pyxversion' is 0, it is set to 2 or 3 after the first execution of
-	any python2/3 commands or functions.  E.g. `:py` sets to 2, and `:py3`
-	sets to 3. `:pyx` sets it to 3 if Python 3 is available, otherwise sets
-	to 2 if Python 2 is available.
-	See also: |has-pythonx|
-
-	If Vim is compiled with only |+python| or |+python3| setting
-	'pyxversion' has no effect.  The pyx* functions and commands are
-	always the same as the compiled version.
-
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
 
@@ -6101,7 +5954,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	buffer, unless the 'Z' flag is in 'cpoptions'.
 	{not in Vi:}  When using the ":view" command the 'readonly' option is
 	set for the newly edited buffer.
-	See 'modifiable' for disallowing changes to the buffer.
 
 						*'redrawtime'* *'rdt'*
 'redrawtime' 'rdt'	number	(default 2000)
@@ -6653,6 +6505,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	"-f" is not inside the quotes, because it is not part of the command
 	name.  And Vim automagically recognizes the backslashes that are path
 	separators.
+	For Dos 32 bits (DJGPP), you can set the $DJSYSFLAGS environment
+	variable to change the way external commands are executed.  See the
+	libc.inf file of DJGPP.
 	Under MS-Windows, when the executable ends in ".com" it must be
 	included.  Thus setting the shell to "command.com" or "4dos.com"
 	works, but "command" and "4dos" do not work for all commands (e.g.,
@@ -6792,8 +6647,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	'shelltemp' is off.
 	The `system()` function does not respect this option and always uses
 	temp files.
-	NOTE: This option is set to the Vim default value when 'compatible'
-	is reset.
 
 						*'shelltype'* *'st'*
 'shelltype' 'st'	number	(default 0)
@@ -7110,7 +6963,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	mapping: ":inoremap # X^H#", where ^H is entered with CTRL-V CTRL-H.
 	When using the ">>" command, lines starting with '#' are not shifted
 	right.
-	NOTE: This option is reset when 'compatible' is set.
+	NOTE: 'smartindent' is reset when 'compatible' is set.
 	This option is reset when 'paste' is set and restored when 'paste' is
 	reset.
 
@@ -7298,7 +7151,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			word.  The expression must evaluate to a List of
 			Lists, each with a suggestion and a score.
 			Example:
-				[['the', 33], ['that', 44]] ~
+				[['the', 33], ['that', 44]]
 			Set 'verbose' and use |z=| to see the scores that the
 			internal methods use.  A lower score is better.
 			This may invoke |spellsuggest()| if you temporarily
@@ -7765,8 +7618,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	   ignore	Ignore case
 	   match	Match case
 	   smart	Ignore case unless an upper case letter is used
-	NOTE: This option is set to the Vi default value when 'compatible' is
-	set and to the Vim default value when 'compatible' is reset.
 
 						*'taglength'* *'tl'*
 'taglength' 'tl'	number	(default 0)
@@ -7872,7 +7723,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 					*'termencoding'* *'tenc'*
 'termencoding' 'tenc'	string	(default ""
-				 with GTK+ and MacVim GUIs: "utf-8"
+				 with GTK+ 2 and MacVim GUIs: "utf-8"
 				 with Macintosh (Carbon) GUI: "macroman")
 			global
 			{only available when compiled with the |+multi_byte|
@@ -7886,7 +7737,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	In the Win32 console version the default value is the console codepage
 	when it differs from the ANSI codepage.
 								*E617*
-        Note: This does not apply to the GTK+ and MacVim GUIs.  After the
+        Note: This does not apply to the GTK+ 2 and MacVim GUIs.  After the
         GUI has been successfully initialized, 'termencoding' is forcibly set
         to "utf-8".  Any attempts to set a different value will be rejected,
 	and an error message is shown.
@@ -7916,7 +7767,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	compatible terminal.
 	If setting this option does not work (produces a colorless UI)
 	reading |xterm-true-color| might help.
-	NOTE: This option is reset when 'compatible' is set.
 
 						*'terse'* *'noterse'*
 'terse'			boolean	(default off)
@@ -8122,7 +7972,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Amiga console, Win32 console, all GUI versions and terminals with a
 	non-empty 't_ts' option).
 	When Vim was compiled with HAVE_X11 defined, the original title will
-	be restored if possible, see |X11|.
+	be restored if possible |X11|.
 	When this option contains printf-style '%' items, they will be
 	expanded according to the rules used for 'statusline'.
 	Example: >
@@ -8171,7 +8021,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 'toolbariconsize' 'tbis'	string	(default "small")
 				global
 				{not in Vi}
-				{only in the GTK+ and MacVim GUIs}
+				{only in the GTK+ 2 and MacVim GUIs}
 	Controls the size of toolbar icons.  The possible values are:
 		tiny		Use tiny icons.
 		small		Use small icons (default).
@@ -8281,9 +8131,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	"xterm", "xterm2", "urxvt" or "sgr" (because dec mouse codes conflict
 	with them).
 	This option is automatically set to "xterm", when the 'term' option is
-	set to a name that starts with "xterm", "mlterm", "screen", "tmux",
-	"st" (full match only), "st-" or "stterm", and 'ttymouse' is not set
-	already.
+	set to a name that starts with "xterm", "mlterm", "screen", "st" (full
+	match only), "st-" or "stterm", and 'ttymouse' is not set already.
 	Additionally, if vim is compiled with the |+termresponse| feature and
 	|t_RV| is set to the escape sequence to request the xterm version
 	number, more intelligent detection process runs.
@@ -8338,7 +8187,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	The undo file is not read when 'undoreload' causes the buffer from
 	before a reload to be saved for undo.
 	When 'undofile' is turned off the undo file is NOT deleted.
-	NOTE: This option is reset when 'compatible' is set.
 
 						*'undolevels'* *'ul'*
 'undolevels' 'ul'	number	(default 100, 1000 for Unix, VMS,
@@ -8594,8 +8442,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
-	NOTE: This option is set to the Vim default value when 'compatible'
-	is reset.
 
 					    *'virtualedit'* *'ve'*
 'virtualedit' 've'	string	(default "")
@@ -8624,7 +8470,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	The `g$` command will move to the end of the screen line.
 	It doesn't make sense to combine "all" with "onemore", but you will
 	not get a warning for it.
-	NOTE: This option is set to "" when 'compatible' is set.
 
 			*'visualbell'* *'vb'* *'novisualbell'* *'novb'* *beep*
 'visualbell' 'vb'	boolean	(default off)

runtime/doc/os_win32.txt

@@ -1,4 +1,4 @@
-*os_win32.txt*  For Vim version 8.0.  Last change: 2016 Oct 12
+*os_win32.txt*  For Vim version 8.0.  Last change: 2016 Aug 28
 
 
 		  VIM REFERENCE MANUAL    by George Reilly
@@ -7,18 +7,20 @@
 						*win32* *Win32* *MS-Windows*
 This file documents the idiosyncrasies of the Win32 version of Vim.
 
-The Win32 version of Vim works on Windows XP, Vista, 7, 8 and 10.  There are
-both console and GUI versions.
+The Win32 version of Vim works on Windows NT, 95, 98, ME, XP, Vista and
+Windows 7.  There are both console and GUI versions.
 
 The 32 bit version also runs on 64 bit MS-Windows systems.
 
+There is GUI version for use in the Win32s subsystem in Windows 3.1[1].  You
+can also use the 32-bit DOS version of Vim instead.  See |os_msdos.txt|.
+
 1. Known problems		|win32-problems|
 2. Startup			|win32-startup|
 3. Restore screen contents	|win32-restore|
 4. Using the mouse		|win32-mouse|
-5. Running under Windows 95	|win32-win95|
-6. Running under Windows 3.1	|win32-win3.1|
-7. Win32 mini FAQ		|win32-faq|
+5. Running under Windows 3.1	|win32-win3.1|
+6. Win32 mini FAQ		|win32-faq|
 
 Additionally, there are a number of common Win32 and DOS items:
 File locations			|dos-locations|
@@ -41,7 +43,20 @@ The GUI version was made by George V. Reilly and Robert Webb.
 For compiling see "src/INSTALLpc.txt".			*win32-compiling*
 
 ==============================================================================
-1. Known problems					*win32-problems*
+1. Known problems				*windows95* *win32-problems*
+
+There are a few known problems with running in a console on Windows 95.  As
+far as we know, this is the same in Windows 98 and Windows ME.
+
+Comments from somebody working at Microsoft: "Win95 console support has always
+been and will always be flaky".
+1.  Dead key support doesn't work.
+2.  Resizing the window with ":set columns=nn lines=nn" works, but executing
+    external commands MAY CAUSE THE SYSTEM TO HANG OR CRASH.
+3.  Screen updating is slow, unless you change 'columns' or 'lines' to a
+    non-DOS value.  But then the second problem applies!
+
+If this bothers you, use the 32 bit MS-DOS version or the Win32 GUI version.
 
 When doing file name completion, Vim also finds matches for the short file
 name.  But Vim will still find and use the corresponding long file name.  For
@@ -126,20 +141,60 @@ When the mouse doesn't work, try disabling the "Quick Edit Mode" feature of
 the console.
 
 ==============================================================================
-5. Running under Windows 95				*win32-win95*
-					*windows95* *windows98* *windowsme*
-Windows 95/98/ME support was removed in patch 8.0.0029  If you want to use it
-you will need to get a version older than that.
+5. Running under Windows 3.1				*win32-win3.1*
 
-==============================================================================
-6. Running under Windows 3.1				*win32-win3.1*
-
-					*win32s* *windows-3.1* *gui-w32s*
+						*win32s* *windows-3.1*
 There was a special version of Gvim that runs under Windows 3.1 and 3.11.
 Support was removed in patch 7.4.1363.
 
 ==============================================================================
-7. Win32 mini FAQ					*win32-faq*
+6. Win32 mini FAQ					*win32-faq*
+
+Q. Why does the Win32 version of Vim update the screen so slowly on Windows 95?
+A. The support for Win32 console mode applications is very buggy in Win95.
+   For some unknown reason, the screen updates very slowly when Vim is run at
+   one of the standard resolutions (80x25, 80x43, or 80x50) and the 16-bit DOS
+   version updates the screen much more quickly than the Win32 version.
+   However, if the screen is set to some other resolution, such as by ":set
+   columns=100" or ":set lines=40", screen updating becomes about as fast as
+   it is with the 16-bit version.
+
+   WARNING: Changing 'columns' may make Windows 95 crash while updating the
+   window (complaints --> Microsoft).  Since this mostly works, this has not
+   been disabled, but be careful with changing 'columns'.
+
+   Changing the screen resolution makes updates faster, but it brings
+   additional problems.  External commands (e.g., ":!dir") can cause Vim to
+   freeze when the screen is set to a non-standard resolution, particularly
+   when 'columns' is not equal to 80.  It is not possible for Vim to reliably
+   set the screen resolution back to the value it had upon startup before
+   running external commands, so if you change the number of 'lines' or
+   'columns', be very, very careful.  In fact, Vim will not allow you to
+   execute external commands when 'columns' is not equal to 80, because it is
+   so likely to freeze up afterwards.
+
+   None of the above applies on Windows NT.  Screen updates are fast, no
+   matter how many 'lines' or 'columns' the window has, and external commands
+   do not cause Vim to freeze.
+
+Q. So if the Win32 version updates the screen so slowly on Windows 95 and the
+   16-bit DOS version updates the screen quickly, why would I want to run the
+   Win32 version?
+A. Firstly, the Win32 version isn't that slow, especially when the screen is
+   set to some non-standard number of 'lines' or 'columns'.  Secondly, the
+   16-bit DOS version has some severe limitations: It can't do big changes and
+   it doesn't know about long file names.  The Win32 version doesn't have these
+   limitations and it's faster overall (the same is true for the 32-bit DJGPP
+   DOS version of Vim).  The Win32 version is smarter about handling the
+   screen, the mouse, and the keyboard than the DJGPP version is.
+
+Q. And what about the 16-bit DOS version versus the Win32 version on NT?
+A. There are no good reasons to run the 16-bit DOS version on NT.  The Win32
+   version updates the screen just as fast as the 16-bit version does when
+   running on NT.  All of the above disadvantages apply.  Finally, DOS
+   applications can take a long time to start up and will run more slowly.  On
+   non-Intel NT platforms, the DOS version is almost unusably slow, because it
+   runs on top of an 80x86 emulator.
 
 Q. How do I change the font?
 A. In the GUI version, you can use the 'guifont' option.  Example: >
@@ -147,6 +202,47 @@ A. In the GUI version, you can use the 'guifont' option.  Example: >
 <  In the console version, you need to set the font of the console itself.
    You cannot do this from within Vim.
 
+Q. When I change the size of the console window with ':set lines=xx' or
+   similar, the font changes! (Win95)
+A. You have the console font set to 'Auto' in Vim's (or your MS-DOS prompt's)
+   properties.  This makes W95 guess (badly!) what font is best.  Set an explicit
+   font instead.
+
+Q. Why can't I paste into Vim when running Windows 95?
+A. In the properties dialog box for the MS-DOS window, go to "MS-DOS
+   Prompt/Misc/Fast pasting" and make sure that it is NOT checked.  You should
+   also do ":set paste" in Vim to avoid unexpected effects.	|'paste'|
+
+Q. How do I type dead keys on Windows 95, in the console version?
+   (A dead key is an accent key, such as acute, grave, or umlaut, that doesn't
+   produce a character by itself, but when followed by another key, produces
+   an accented character, such as a-acute, e-grave, u-umlaut, n-tilde, and so
+   on.  Very useful for most European languages.  English-language keyboard
+   layouts don't use dead keys, as far as we know.)
+A. You don't.  The console mode input routines simply do not work correctly in
+   Windows 95, and I have not been able to work around them.  In the words
+   of a senior developer at Microsoft:
+	Win95 console support has always been and will always be flaky.
+
+	The flakiness is unavoidable because we are stuck between the world of
+	MS-DOS keyboard TSRs like KEYB (which wants to cook the data;
+	important for international) and the world of Win32.
+
+	So keys that don't "exist" in MS-DOS land (like dead keys) have a
+	very tenuous existence in Win32 console land.  Keys that act
+	differently between MS-DOS land and Win32 console land (like
+	capslock) will act flaky.
+
+	Don't even _mention_ the problems with multiple language keyboard
+	layouts...
+
+   You may be able to fashion some sort of workaround with the digraphs
+   mechanism.							|digraphs|
+
+   The best solution is to use the Win32 GUI version gvim.exe.  Alternatively,
+   you can try one of the DOS versions of Vim where dead keys reportedly do
+   work.
+
 Q. How do I type dead keys on Windows NT?
 A. Dead keys work on NT 3.51.  Just type them as you would in any other
    application.
@@ -212,19 +308,10 @@ A. You can't!  This is a limitation of the NT console.  NT 5.0 is reported to
    be able to set the blink rate for all console windows at the same time.
 
 							*:!start*
-Q. How can I asynchronously run an external command or program, or open a
-   document or URL with its default program?
-A. When using :! to run an external command, you can run it with "start". For
-   example, to run notepad: >
-	:!start notepad
-<   To open "image.jpg" with the default image viewer: >
-        :!start image.jpg
-<   To open the folder of the current file in Windows Explorer: >
-        :!start %:h
-<   To open the Vim home page with the default browser: >
-        :!start http://www.vim.org/
-<
-   Using "start" stops Vim switching to another screen, opening a new console,
+Q. How can I run an external command or program asynchronously?
+A. When using :! to run an external command, you can run it with "start": >
+	:!start winfile.exe<CR>
+<  Using "start" stops Vim switching to another screen, opening a new console,
    or waiting for the program to complete; it indicates that you are running a
    program that does not affect the files you are editing.  Programs begun
    with :!start do not get passed Vim's open file handles, which means they do
@@ -262,6 +349,28 @@ A. You have two possible solutions depending on what you want:
 <  The first command runs notepad minimized and the second one runs it
    normally.
 
+Q. I'm using Win32s, and when I try to run an external command like "make",
+   Vim doesn't wait for it to finish!  Help!
+A. The problem is that a 32-bit application (Vim) can't get notification from
+   Windows that a 16-bit application (your DOS session) has finished.  Vim
+   includes a work-around for this, but you must set up your DOS commands to
+   run in a window, not full-screen.  Unfortunately the default when you
+   install Windows is full-screen.  To change this:
+   1) Start PIF editor (in the Main program group).
+   2) Open the file "_DEFAULT.PIF" in your Windows directory.
+   3) Changes the display option from "Full Screen" to "Windowed".
+   4) Save and exit.
+
+   To test, start Vim and type >
+	:!dir C:\<CR>".
+<  You should see a DOS box window appear briefly with the directory listing.
+
+Q. I use Vim under Win32s and NT.  In NT, I can define the console to default to
+   50 lines, so that I get a 80x50 shell when I ':sh'.  Can I do the same in
+   W3.1x, or am I stuck with 80x25?
+A. Edit SYSTEM.INI and add 'ScreenLines=50' to the [NonWindowsApp] section.  DOS
+   prompts and external DOS commands will now run in a 50-line window.
+
 						*windows-icon*
 Q. I don't like the Vim icon, can I change it?
 A. Yes, place your favorite icon in bitmaps/vim.ico in a directory of

runtime/doc/pattern.txt

@@ -1,4 +1,4 @@
-*pattern.txt*   For Vim version 8.0.  Last change: 2017 Mar 05
+*pattern.txt*   For Vim version 8.0.  Last change: 2016 Sep 11
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -869,13 +869,10 @@ $	At end of pattern or in front of "\|", "\)" or "\n" ('magic' on):
 \%V	Match inside the Visual area.  When Visual mode has already been
 	stopped match in the area that |gv| would reselect.
 	This is a |/zero-width| match.  To make sure the whole pattern is
-	inside the Visual area put it at the start and just before the end of
-	the pattern, e.g.: >
-		/\%Vfoo.*ba\%Vr
-<	This also works if only "foo bar" was Visually selected. This: >
+	inside the Visual area put it at the start and end of the pattern,
+	e.g.: >
 		/\%Vfoo.*bar\%V
-<	would match "foo bar" if the Visual selection continues after the "r".
-	Only works for the current buffer.
+<	Only works for the current buffer.
 
 						*/\%#* *cursor-position*
 \%#	Matches with the cursor position.  Only works when matching in a

runtime/doc/pi_gzip.txt

@@ -1,4 +1,4 @@
-*pi_gzip.txt*   For Vim version 8.0.  Last change: 2016 Nov 06
+*pi_gzip.txt*   For Vim version 8.0.  Last change: 2012 Jul 19
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -27,8 +27,6 @@ with these extensions:
 	*.bz2		bzip2
 	*.lzma		lzma
 	*.xz		xz
-	*.lz		lzip
-	*.zst		zstd
 
 That's actually the only thing you need to know.  There are no options.
 

runtime/doc/pi_logipat.txt

@@ -1,4 +1,4 @@
-*pi_logipat.txt*	Logical Patterns			Jun 22, 2015
+*logiPat.txt*	Logical Patterns				Jun 22, 2015
 
 Author:  Charles E. Campbell  <NdrOchip@ScampbellPfamily.AbizM>
 Copyright: (c) 2004-2015 by Charles E. Campbell	*logiPat-copyright*

runtime/doc/quickfix.txt

@@ -1,4 +1,4 @@
-*quickfix.txt*  For Vim version 8.0.  Last change: 2017 Mar 06
+*quickfix.txt*  For Vim version 8.0.  Last change: 2016 Jul 17
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -45,13 +45,10 @@ The 'errorformat' option should be set to match the error messages from your
 compiler (see |errorformat| below).
 
 						*location-list* *E776*
-A location list is a window-local quickfix list. You get one after commands
-like `:lvimgrep`, `:lgrep`, `:lhelpgrep`, `:lmake`, etc., which create a
-location list instead of a quickfix list as the corresponding `:vimgrep`,
-`:grep`, `:helpgrep`, `:make` do.
-A location list is associated with a window and each window can have a
-separate location list.  A location list can be associated with only one
-window.  The location list is independent of the quickfix list.
+A location list is similar to a quickfix list and contains a list of positions
+in files.  A location list is associated with a window and each window can
+have a separate location list.  A location list can be associated with only
+one window.  The location list is independent of the quickfix list.
 
 When a window with a location list is split, the new window gets a copy of the
 location list.  When there are no longer any references to a location list,
@@ -167,9 +164,6 @@ processing a quickfix or location list command, it will be aborted.
 			keep Vim running while compiling.  If you give the
 			name of the errorfile, the 'errorfile' option will
 			be set to [errorfile].  See |:cc| for [!].
-			If the encoding of the error file differs from the
-			'encoding' option, you can use the 'makeencoding'
-			option to specify the encoding.
 
 							*:lf* *:lfile*
 :lf[ile][!] [errorfile]	Same as ":cfile", except the location list for the
@@ -181,9 +175,6 @@ processing a quickfix or location list command, it will be aborted.
 :cg[etfile] [errorfile]					*:cg* *:cgetfile*
 			Read the error file.  Just like ":cfile" but don't
 			jump to the first error.
-			If the encoding of the error file differs from the
-			'encoding' option, you can use the 'makeencoding'
-			option to specify the encoding.
 
 
 :lg[etfile] [errorfile]					*:lg* *:lgetfile*
@@ -194,9 +185,6 @@ processing a quickfix or location list command, it will be aborted.
 :caddf[ile] [errorfile]	Read the error file and add the errors from the
 			errorfile to the current quickfix list. If a quickfix
 			list is not present, then a new list is created.
-			If the encoding of the error file differs from the
-			'encoding' option, you can use the 'makeencoding'
-			option to specify the encoding.
 
 							*:laddf* *:laddfile*
 :laddf[ile] [errorfile]	Same as ":caddfile", except the location list for the
@@ -332,7 +320,6 @@ use this code: >
 	endfunction
 
 	au QuickfixCmdPost make call QfMakeConv()
-Another option is using 'makeencoding'.
 
 
 EXECUTE A COMMAND IN ALL THE BUFFERS IN QUICKFIX OR LOCATION LIST:
@@ -599,9 +586,6 @@ lists, use ":cnewer 99" first.
 			   like |:cnext| and |:cprevious|, see above.
 			This command does not accept a comment, any "
 			characters are considered part of the arguments.
-			If the encoding of the program output differs from the
-			'encoding' option, you can use the 'makeencoding'
-			option to specify the encoding.
 
 							*:lmak* *:lmake*
 :lmak[e][!] [arguments]
@@ -661,7 +645,6 @@ read the error messages: >
 	au QuickfixCmdPost make call QfMakeConv()
 
 (Example by Faque Cheng)
-Another option is using 'makeencoding'.
 
 ==============================================================================
 5. Using :vimgrep and :grep				*grep* *lid*
@@ -776,9 +759,6 @@ id-utils) in a similar way to its compiler integration (see |:make| above).
 			When 'grepprg' is "internal" this works like
 			|:vimgrep|.  Note that the pattern needs to be
 			enclosed in separator characters then.
-			If the encoding of the program output differs from the
-			'encoding' option, you can use the 'makeencoding'
-			option to specify the encoding.
 
 							    *:lgr* *:lgrep*
 :lgr[ep][!] [arguments]	Same as ":grep", except the location list for the
@@ -803,10 +783,6 @@ id-utils) in a similar way to its compiler integration (see |:make| above).
 				  \ | catch /E480:/
 				  \ | endtry"
 <
-			If the encoding of the program output differs from the
-			'encoding' option, you can use the 'makeencoding'
-			option to specify the encoding.
-
 							*:lgrepa* *:lgrepadd*
 :lgrepa[dd][!] [arguments]
 			Same as ":grepadd", except the location list for the
@@ -902,7 +878,7 @@ need to write down a "todo" list.
 
 
 The Vim plugins in the "compiler" directory will set options to use the
-selected compiler.  For `:compiler` local options are set, for `:compiler!`
+selected compiler.  For ":compiler" local options are set, for ":compiler!"
 global options.
 							*current_compiler*
 To support older Vim versions, the plugins always use "current_compiler" and
@@ -1423,7 +1399,7 @@ prints information about entering a directory in the form "Making all in dir".
    Making all in dir2		  ./dir1/dir2
 
    This can be solved by printing absolute directories in the "enter directory"
-   message or by printing "leave directory" messages.
+   message or by printing "leave directory" messages..
 
 To avoid this problem, ensure to print absolute directory names and "leave
 directory" messages.

runtime/doc/quickref.txt

@@ -1,4 +1,4 @@
-*quickref.txt*  For Vim version 8.0.  Last change: 2016 Dec 16
+*quickref.txt*  For Vim version 8.0.  Last change: 2016 Aug 21
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -788,7 +788,6 @@ Short explanation of each option:		*option-list*
 'macthinstrokes'	    render the text lighter by using thin strokes (MacVim GUI only)
 'magic'			    changes special characters in search patterns
 'makeef'	  'mef'     name of the errorfile for ":make"
-'makeencoding'	  'menc'    encoding of external make/grep commands
 'makeprg'	  'mp'	    program to use for the ":make" command
 'matchpairs'	  'mps'     pairs of characters that "%" can match
 'matchtime'	  'mat'     tenths of a second to show matching paren
@@ -841,10 +840,7 @@ Short explanation of each option:		*option-list*
 'prompt'	  'prompt'  enable prompt in Ex mode
 'pumheight'	  'ph'	    maximum height of the popup menu
 'pythondll'		    name of the Python 2 dynamic library
-'pythonhome'		    name of the Python 2 home directory
 'pythonthreedll'	    name of the Python 3 dynamic library
-'pythonthreehome'	    name of the Python 3 home directory
-'pyxversion'	  'pyx'	    Python version used for pyx* commands
 'quoteescape'	  'qe'	    escape characters used in a string
 'readonly'	  'ro'	    disallow writing the buffer
 'redrawtime'	  'rdt'     timeout for 'hlsearch' and |:match| highlighting
@@ -1078,8 +1074,6 @@ Short explanation of each option:		*option-list*
 |c_<Up>|	<Up>/<Down>	   recall older/newer command-line that starts
 				      with current command
 |c_<S-Up>|	<S-Up>/<S-Down>	   recall older/newer command-line from history
-|c_CTRL-G|	CTRL-G		   next match when 'incsearch' is active
-|c_CTRL-T|	CTRL-T		   previous match when 'incsearch' is active
 |:history|	:his[tory]	   show older command-lines
 
 Context-sensitive completion on the command-line:

runtime/doc/remote.txt

@@ -1,4 +1,4 @@
-*remote.txt*    For Vim version 8.0.  Last change: 2017 Mar 18
+*remote.txt*    For Vim version 8.0.  Last change: 2015 Mar 01
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -150,7 +150,6 @@ the description in |eval.txt| or use CTRL-] on the function name to jump to
 the full explanation.
 
     synopsis				     explanation ~
-    remote_startserver( name)		     run a server
     remote_expr( server, string, idvar)      send expression
     remote_send( server, string, idvar)      send key sequence
     serverlist()			     get a list of available servers

runtime/doc/repeat.txt

@@ -1,4 +1,4 @@
-*repeat.txt*    For Vim version 8.0.  Last change: 2017 Feb 06
+*repeat.txt*    For Vim version 8.0.  Last change: 2016 Sep 11
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -305,11 +305,6 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|.
 			Mark) in utf-8 format Vim will recognize it, no need
 			to use ":scriptencoding utf-8" then.
 
-			If you set the 'encoding' option in your |.vimrc|,
-			`:scriptencoding` must be placed after that. E.g.: >
-				set encoding=utf-8
-				scriptencoding utf-8
-<
 			When compiled without the |+multi_byte| feature this
 			command is ignored.
 			{not in Vi}

runtime/doc/scroll.txt

@@ -1,4 +1,4 @@
-*scroll.txt*    For Vim version 8.0.  Last change: 2016 Nov 10
+*scroll.txt*    For Vim version 8.0.  Last change: 2006 Aug 27
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -108,8 +108,7 @@ z^			Without [count]: Redraw with the line just above the
 3. Scrolling relative to cursor				*scroll-cursor*
 
 The following commands reposition the edit window (the part of the buffer that
-you see) while keeping the cursor on the same line.  Note that the 'scrolloff'
-option may cause context lines to show above and below the cursor.
+you see) while keeping the cursor on the same line:
 
 							*z<CR>*
 z<CR>			Redraw, line [count] at top of window (default
@@ -221,7 +220,7 @@ past its buffer's limits.
 However, if a 'scrollbind' window that has a relative offset that is past its
 buffer's limits is given the cursor focus, the other 'scrollbind' windows must
 jump to a location where the current window's relative offset is valid.  This
-behavior can be changed by clearing the "jump" flag from the 'scrollopt'
+behavior can be changed by clearing the 'jump' flag from the 'scrollopt'
 option.
 
 						*syncbind* *:syncbind* *:sync*

runtime/doc/starting.txt

@@ -1,4 +1,4 @@
-*starting.txt*  For Vim version 8.0.  Last change: 2017 Jan 15
+*starting.txt*  For Vim version 8.0.  Last change: 2016 Sep 09
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -230,7 +230,6 @@ a slash.  Thus "-R" means recovery and "-/R" readonly.
 		the executable "view" has the same effect as the -R argument.
 		The 'updatecount' option will be set to 10000, meaning that
 		the swap file will not be updated automatically very often.
-		See |-M| for disallowing modifications.
 
 							*-m*
 -m		Modifications not allowed to be written.  The 'write' option
@@ -422,10 +421,6 @@ a slash.  Thus "-R" means recovery and "-/R" readonly.
 		not connected to a terminal.  This will avoid the warning and
 		the two second delay that would happen. {not in Vi}
 
-							*--ttyfail*
---ttyfail	When the stdin or stdout is not a terminal (tty) then exit
-		right away.
-
 							*-d*
 -d		Start in diff mode, like |vimdiff|.
 		{not in Vi} {not available when compiled without the |+diff|
@@ -1221,7 +1216,7 @@ There are several ways to exit Vim:
 - Use `:cquit`.  Also when there are changes.
 
 When using `:cquit` or when there was an error message Vim exits with exit
-code 1.  Errors can be avoided by using `:silent!` or with `:catch`.
+code 1.  Errors can be avoided by using `:silent!`.
 
 ==============================================================================
 8. Saving settings					*save-settings*

runtime/doc/syntax.txt

@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 8.0.  Last change: 2017 Feb 06
+*syntax.txt*	For Vim version 8.0.  Last change: 2016 Sep 13
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1476,7 +1476,7 @@ algorithm should work in the vast majority of cases.  In some cases, such as a
 file that begins with 500 or more full-line comments, the script may
 incorrectly decide that the fortran code is in fixed form.  If that happens,
 just add a non-comment statement beginning anywhere in the first five columns
-of the first twenty-five lines, save (:w) and then reload (:e!) the file.
+of the first twenty five lines, save (:w) and then reload (:e!) the file.
 
 Tabs in fortran files ~
 Tabs are not recognized by the Fortran standards.  Tabs are not a good idea in
@@ -2646,9 +2646,9 @@ later, and part earlier) adds.
 
 RESTRUCTURED TEXT			*rst.vim* *ft-rst-syntax*
 
-You may set what syntax definitions should be used for code blocks via >
+You may set what syntax definitions should be used for code blocks via
 	let rst_syntax_code_list = ['vim', 'lisp', ...]
-<
+
 
 REXX						*rexx.vim* *ft-rexx-syntax*
 
@@ -2863,11 +2863,9 @@ vimrc file: >
 (Adapted from the html.vim help text by Claudio Fleiner <claudio@fleiner.com>)
 
 
-		*ft-posix-synax* *ft-dash-syntax*
-SH		*sh.vim*  *ft-sh-syntax*  *ft-bash-syntax*  *ft-ksh-syntax*
+SH		*sh.vim* *ft-sh-syntax* *ft-bash-syntax* *ft-ksh-syntax*
 
-This covers syntax highlighting for the older Unix (Bourne) sh, and newer
-shells such as bash, dash, posix, and the Korn shells.
+This covers the "normal" Unix (Bourne) sh, bash and the Korn shell.
 
 Vim attempts to determine which shell type is in use by specifying that
 various filenames are of specific types: >
@@ -2876,31 +2874,28 @@ various filenames are of specific types: >
     bash: .bashrc* bashrc bash.bashrc .bash_profile* *.bash
 <
 If none of these cases pertain, then the first line of the file is examined
-(ex. looking for /bin/sh  /bin/ksh  /bin/bash).  If the first line specifies a
-shelltype, then that shelltype is used.  However some files (ex. .profile) are
-known to be shell files but the type is not apparent.  Furthermore, on many
-systems sh is symbolically linked to "bash" (Linux, Windows+cygwin) or "ksh"
-(Posix).
+(ex. /bin/sh  /bin/ksh	/bin/bash).  If the first line specifies a shelltype,
+then that shelltype is used.  However some files (ex. .profile) are known to
+be shell files but the type is not apparent.  Furthermore, on many systems
+sh is symbolically linked to "bash" (Linux, Windows+cygwin) or "ksh" (Posix).
 
-One may specify a global default by instantiating one of the following
+One may specify a global default by instantiating one of the following three
 variables in your <.vimrc>:
 
-   ksh: >
+    ksh: >
 	let g:is_kornshell = 1
-<   posix:  (using this is the nearly the same as setting g:is_kornshell to 1) >
+<   posix: (using this is the same as setting is_kornshell to 1) >
 	let g:is_posix     = 1
 <   bash: >
 	let g:is_bash	   = 1
 <   sh: (default) Bourne shell >
 	let g:is_sh	   = 1
 
-<   (dash users should use posix)
-
 If there's no "#! ..." line, and the user hasn't availed himself/herself of a
 default sh.vim syntax setting as just shown, then syntax/sh.vim will assume
 the Bourne shell syntax.  No need to quote RFCs or market penetration
 statistics in error reports, please -- just select the default version of the
-sh your system uses and install the associated "let..." in your <.vimrc>.
+sh your system uses in your <.vimrc>.
 
 The syntax/sh.vim file provides several levels of syntax-based folding: >
 
@@ -2909,7 +2904,7 @@ The syntax/sh.vim file provides several levels of syntax-based folding: >
 	let g:sh_fold_enabled= 2     (enable heredoc folding)
 	let g:sh_fold_enabled= 4     (enable if/do/for folding)
 >
-then various syntax items (ie. HereDocuments and function bodies) become
+then various syntax items (HereDocuments and function bodies) become
 syntax-foldable (see |:syn-fold|).  You also may add these together
 to get multiple types of folding: >
 
@@ -2933,14 +2928,14 @@ reduce this, the "sh_maxlines" internal variable can be set.  Example: >
 The default is to use the twice sh_minlines.  Set it to a smaller number to
 speed up displaying.  The disadvantage is that highlight errors may appear.
 
-syntax/sh.vim tries to flag certain problems as errors; usually things like
-extra ']'s, 'done's, 'fi's, etc.  If you find the error handling problematic
-for your purposes, you may suppress such error highlighting by putting
-the following line in your .vimrc: >
-
-	let g:sh_no_error= 1
+						*g:sh_isk* *g:sh_noisk*
+The shell languages appear to let "." be part of words, commands, etc;
+consequently it should be in the isk for sh.vim.  As of v116 of syntax/sh.vim,
+syntax/sh.vim will append the "." to |'iskeyword'| by default; you may control
+this behavior with: >
+	let g:sh_isk  = '..whatever characters you want as part of iskeyword'
+	let g:sh_noisk= 1  " otherwise, if this exists, the isk will NOT chg
 <
-
 						*sh-embed*  *sh-awk*
  Sh: EMBEDDING LANGUAGES~
 
@@ -3242,11 +3237,11 @@ syntax highlighting script handles this with the following logic:
 	* If g:tex_stylish exists and is 1
 		then the file will be treated as a "sty" file, so the "_"
 		will be allowed as part of keywords
-		(regardless of g:tex_isk)
+		(irregardless of g:tex_isk)
 	* Else if the file's suffix is sty, cls, clo, dtx, or ltx,
 		then the file will be treated as a "sty" file, so the "_"
 		will be allowed as part of keywords
-		(regardless of g:tex_isk)
+		(irregardless of g:tex_isk)
 
 	* If g:tex_isk exists, then it will be used for the local 'iskeyword'
 	* Else the local 'iskeyword' will be set to 48-57,a-z,A-Z,192-255
@@ -3327,8 +3322,8 @@ Some folding is now supported with syntax/vim.vim: >
    g:vimsyn_folding =~ 't' : fold tcl      script
 <
 							*g:vimsyn_noerror*
-Not all error highlighting that syntax/vim.vim does may be correct; Vim script
-is a difficult language to highlight correctly.  A way to suppress error
+Not all error highlighting that syntax/vim.vim does may be correct; VimL is a
+difficult language to highlight correctly.  A way to suppress error
 highlighting is to put the following line in your |vimrc|: >
 
 	let g:vimsyn_noerror = 1
@@ -3486,8 +3481,6 @@ DEFINING CASE						*:syn-case* *E390*
 	"ignore".  Note that any items before this are not affected, and all
 	items until the next ":syntax case" command are affected.
 
-:sy[ntax] case
-	Show either "syntax case match" or "syntax case ignore" (translated).
 
 SPELL CHECKING						*:syn-spell*
 
@@ -3505,11 +3498,6 @@ SPELL CHECKING						*:syn-spell*
 
 	To activate spell checking the 'spell' option must be set.
 
-:sy[ntax] spell
-	Show either "syntax spell toplevel", "syntax spell notoplevel" or
-	"syntax spell default" (translated).
-
-
 SYNTAX ISKEYWORD SETTING				*:syn-iskeyword*
 
 :sy[ntax] iskeyword [clear | {option}]
@@ -3592,11 +3580,7 @@ DEFINING KEYWORDS					*:syn-keyword*
 
 DEFINING MATCHES					*:syn-match*
 
-:sy[ntax] match {group-name} [{options}]
-		[excludenl]
-		[keepend]
-		{pattern}
-		[{options}]
+:sy[ntax] match {group-name} [{options}] [excludenl] {pattern} [{options}]
 
 	This defines one match.
 
@@ -3605,9 +3589,6 @@ DEFINING MATCHES					*:syn-match*
 	[excludenl]		Don't make a pattern with the end-of-line "$"
 				extend a containing match or region.  Must be
 				given before the pattern. |:syn-excludenl|
-	keepend			Don't allow contained matches to go past a
-				match with the end pattern.  See
-				|:syn-keepend|.
 	{pattern}		The search pattern that defines the match.
 				See |:syn-pattern| below.
 				Note that the pattern may match more than one
@@ -4103,9 +4084,6 @@ IMPLICIT CONCEAL					*:syn-conceal-implicit*
 	off" returns to the normal state where the "conceal" flag must be
 	given explicitly.
 
-:sy[ntax] conceal
-	Show either "syntax conceal on" or "syntax conceal off" (translated).
-
 ==============================================================================
 7. Syntax patterns				*:syn-pattern* *E401* *E402*
 
@@ -4614,14 +4592,7 @@ in their own color.
 
 			Doesn't work recursively, thus you can't use
 			":colorscheme" in a color scheme script.
-
-			To customize a colorscheme use another name, e.g.
-			"~/.vim/colors/mine.vim", and use `:runtime` to load
-			the original colorscheme: >
-				runtime colors/evening.vim
-				hi Statement ctermfg=Blue guifg=Blue
-
-<			After the color scheme has been loaded the
+			After the color scheme has been loaded the
 			|ColorScheme| autocommand event is triggered.
 			For info about writing a colorscheme file: >
 				:edit $VIMRUNTIME/colors/README.txt

runtime/doc/tabpage.txt

@@ -1,4 +1,4 @@
-*tabpage.txt*   For Vim version 8.0.  Last change: 2016 Oct 20
+*tabpage.txt*   For Vim version 8.0.  Last change: 2016 Sep 09
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -58,8 +58,6 @@ clicking right of the labels.
 In the GUI tab pages line you can use the right mouse button to open menu.
 |tabline-menu|.
 
-For the related autocommands see |tabnew-autocmd|.
-
 :[count]tabe[dit]				*:tabe* *:tabedit* *:tabnew*
 :[count]tabnew
 		Open a new tab page with an empty window, after the current
@@ -139,10 +137,6 @@ something else.
 		    :+tabclose	    " close the next tab page
 		    :1tabclose	    " close the first tab page
 		    :$tabclose	    " close the last tab page
-		    :tabclose -2    " close the two previous tab page
-		    :tabclose +	    " close the next tab page
-		    :tabclose 3	    " close the third tab page
-		    :tabclose $	    " close the last tab page
 <
 							*:tabo* *:tabonly*
 :tabo[nly][!]	Close all other tab pages.
@@ -157,20 +151,13 @@ something else.
 				    " one
 
 :{count}tabo[nly][!]
-:tabo[nly][!] {count}
-		Close all tab pages except {count} one. >
+		Close all tab pages except the {count}th one. >
 		    :.tabonly	    " as above
 		    :-tabonly	    " close all tab pages except the previous
 				    " one
 		    :+tabonly	    " close all tab pages except the next one
 		    :1tabonly	    " close all tab pages except the first one
 		    :$tabonly	    " close all tab pages except the last one
-		    :tabonly -	    " close all tab pages except the previous
-				    " one
-		    :tabonly +2     " close all tab pages except the two next
-				    " one
-		    :tabonly 1	    " close all tab pages except the first one
-		    :tabonly $	    " close all tab pages except the last one
 
 
 SWITCHING TO ANOTHER TAB PAGE:
@@ -185,20 +172,7 @@ gt					*i_CTRL-<PageDown>* *i_<C-PageDown>*
 		Go to the next tab page.  Wraps around from the last to the
 		first one.
 
-:{count}tabn[ext]
 :tabn[ext] {count}
-		Go to tab page {count}.  The first tab page has number one. >
-		    :-tabnext	" go to the previous tab page
-		    :+tabnext	" go to the next tab page
-		    :+2tabnext	" go to the two next tab page
-		    :1tabnext	" go to the first tab page
-		    :$tabnext	" go to the last tab page
-		    :tabnext $	" as above
-		    :tabnext -	" go to the previous tab page
-		    :tabnext -1	" as above
-		    :tabnext +	" go to the next tab page
-		    :tabnext +1	" as above
-
 {count}<C-PageDown>
 {count}gt	Go to tab page {count}.  The first tab page has number one.
 
@@ -313,7 +287,6 @@ Variables local to a tab page start with "t:". |tabpage-variable|
 
 Currently there is only one option local to a tab page: 'cmdheight'.
 
-						*tabnew-autocmd*
 The TabLeave and TabEnter autocommand events can be used to do something when
 switching from one tab page to another.  The exact order depends on what you
 are doing.  When creating a new tab page this works as if you create a new

runtime/doc/tags

@@ -436,7 +436,6 @@ $VIM_POSIX	vi_diff.txt	/*$VIM_POSIX*
 'macthinstrokes'	options.txt	/*'macthinstrokes'*
 'magic'	options.txt	/*'magic'*
 'makeef'	options.txt	/*'makeef'*
-'makeencoding'	options.txt	/*'makeencoding'*
 'makeprg'	options.txt	/*'makeprg'*
 'mat'	options.txt	/*'mat'*
 'matchpairs'	options.txt	/*'matchpairs'*
@@ -449,7 +448,6 @@ $VIM_POSIX	vi_diff.txt	/*$VIM_POSIX*
 'maxmemtot'	options.txt	/*'maxmemtot'*
 'mco'	options.txt	/*'mco'*
 'mef'	options.txt	/*'mef'*
-'menc'	options.txt	/*'menc'*
 'menuitems'	options.txt	/*'menuitems'*
 'mesg'	vi_diff.txt	/*'mesg'*
 'mfd'	options.txt	/*'mfd'*
@@ -792,8 +790,6 @@ $VIM_POSIX	vi_diff.txt	/*$VIM_POSIX*
 'pvw'	options.txt	/*'pvw'*
 'pythondll'	options.txt	/*'pythondll'*
 'pythonthreedll'	options.txt	/*'pythonthreedll'*
-'pyx'	options.txt	/*'pyx'*
-'pyxversion'	options.txt	/*'pyxversion'*
 'qe'	options.txt	/*'qe'*
 'quote	motion.txt	/*'quote*
 'quoteescape'	options.txt	/*'quoteescape'*
@@ -943,8 +939,6 @@ $VIM_POSIX	vi_diff.txt	/*$VIM_POSIX*
 't_AB'	term.txt	/*'t_AB'*
 't_AF'	term.txt	/*'t_AF'*
 't_AL'	term.txt	/*'t_AL'*
-'t_BD'	term.txt	/*'t_BD'*
-'t_BE'	term.txt	/*'t_BE'*
 't_CS'	term.txt	/*'t_CS'*
 't_CV'	term.txt	/*'t_CV'*
 't_Ce'	term.txt	/*'t_Ce'*
@@ -983,8 +977,6 @@ $VIM_POSIX	vi_diff.txt	/*$VIM_POSIX*
 't_KJ'	term.txt	/*'t_KJ'*
 't_KK'	term.txt	/*'t_KK'*
 't_KL'	term.txt	/*'t_KL'*
-'t_PE'	term.txt	/*'t_PE'*
-'t_PS'	term.txt	/*'t_PS'*
 't_RB'	term.txt	/*'t_RB'*
 't_RI'	term.txt	/*'t_RI'*
 't_RV'	term.txt	/*'t_RV'*
@@ -1386,7 +1378,6 @@ $VIM_POSIX	vi_diff.txt	/*$VIM_POSIX*
 --servername	remote.txt	/*--servername*
 --socketid	starting.txt	/*--socketid*
 --startuptime	starting.txt	/*--startuptime*
---ttyfail	starting.txt	/*--ttyfail*
 --version	starting.txt	/*--version*
 --windowid	starting.txt	/*--windowid*
 -A	starting.txt	/*-A*
@@ -1874,7 +1865,6 @@ $VIM_POSIX	vi_diff.txt	/*$VIM_POSIX*
 :$	cmdline.txt	/*:$*
 :%	cmdline.txt	/*:%*
 :&	change.txt	/*:&*
-:&&	change.txt	/*:&&*
 :'	cmdline.txt	/*:'*
 :,	cmdline.txt	/*:,*
 :.	cmdline.txt	/*:.*
@@ -1948,13 +1938,6 @@ $VIM_POSIX	vi_diff.txt	/*$VIM_POSIX*
 :Print	various.txt	/*:Print*
 :Rexplore	pi_netrw.txt	/*:Rexplore*
 :RmVimball	pi_vimball.txt	/*:RmVimball*
-:RustEmitAsm	ft_rust.txt	/*:RustEmitAsm*
-:RustEmitIr	ft_rust.txt	/*:RustEmitIr*
-:RustExpand	ft_rust.txt	/*:RustExpand*
-:RustFmt	ft_rust.txt	/*:RustFmt*
-:RustFmtRange	ft_rust.txt	/*:RustFmtRange*
-:RustPlay	ft_rust.txt	/*:RustPlay*
-:RustRun	ft_rust.txt	/*:RustRun*
 :Sexplore	pi_netrw.txt	/*:Sexplore*
 :TOhtml	syntax.txt	/*:TOhtml*
 :TarDiff	pi_tar.txt	/*:TarDiff*
@@ -2762,10 +2745,6 @@ $VIM_POSIX	vi_diff.txt	/*$VIM_POSIX*
 :pyfile	if_pyth.txt	/*:pyfile*
 :python	if_pyth.txt	/*:python*
 :python3	if_pyth.txt	/*:python3*
-:pythonx	if_pyth.txt	/*:pythonx*
-:pyx	if_pyth.txt	/*:pyx*
-:pyxdo	if_pyth.txt	/*:pyxdo*
-:pyxfile	if_pyth.txt	/*:pyxfile*
 :q	editing.txt	/*:q*
 :qa	editing.txt	/*:qa*
 :qall	editing.txt	/*:qall*
@@ -4558,13 +4537,7 @@ E933	eval.txt	/*E933*
 E934	sign.txt	/*E934*
 E935	eval.txt	/*E935*
 E936	autocmd.txt	/*E936*
-E937	autocmd.txt	/*E937*
-E938	eval.txt	/*E938*
-E939	change.txt	/*E939*
 E94	windows.txt	/*E94*
-E940	eval.txt	/*E940*
-E941	eval.txt	/*E941*
-E942	eval.txt	/*E942*
 E95	message.txt	/*E95*
 E96	diff.txt	/*E96*
 E97	diff.txt	/*E97*
@@ -4846,8 +4819,6 @@ W16	message.txt	/*W16*
 W17	arabic.txt	/*W17*
 W18	syntax.txt	/*W18*
 W19	autocmd.txt	/*W19*
-W20	if_pyth.txt	/*W20*
-W21	if_pyth.txt	/*W21*
 WORD	motion.txt	/*WORD*
 WWW	intro.txt	/*WWW*
 Win32	os_win32.txt	/*Win32*
@@ -5076,7 +5047,6 @@ assert_inrange()	eval.txt	/*assert_inrange()*
 assert_match()	eval.txt	/*assert_match()*
 assert_notequal()	eval.txt	/*assert_notequal()*
 assert_notmatch()	eval.txt	/*assert_notmatch()*
-assert_report()	eval.txt	/*assert_report()*
 assert_true()	eval.txt	/*assert_true()*
 at	motion.txt	/*at*
 atan()	eval.txt	/*atan()*
@@ -5140,7 +5110,6 @@ backup-changed	version4.txt	/*backup-changed*
 backup-extension	version4.txt	/*backup-extension*
 backup-table	editing.txt	/*backup-table*
 balloon-eval	debugger.txt	/*balloon-eval*
-balloon_show()	eval.txt	/*balloon_show()*
 bar	motion.txt	/*bar*
 bars	help.txt	/*bars*
 base_font_name_list	mbyte.txt	/*base_font_name_list*
@@ -5269,7 +5238,6 @@ c_CTRL-I	cmdline.txt	/*c_CTRL-I*
 c_CTRL-J	cmdline.txt	/*c_CTRL-J*
 c_CTRL-K	cmdline.txt	/*c_CTRL-K*
 c_CTRL-L	cmdline.txt	/*c_CTRL-L*
-c_CTRL-M	cmdline.txt	/*c_CTRL-M*
 c_CTRL-N	cmdline.txt	/*c_CTRL-N*
 c_CTRL-P	cmdline.txt	/*c_CTRL-P*
 c_CTRL-Q	cmdline.txt	/*c_CTRL-Q*
@@ -5286,7 +5254,6 @@ c_CTRL-U	cmdline.txt	/*c_CTRL-U*
 c_CTRL-V	cmdline.txt	/*c_CTRL-V*
 c_CTRL-W	cmdline.txt	/*c_CTRL-W*
 c_CTRL-Y	cmdline.txt	/*c_CTRL-Y*
-c_CTRL-[	cmdline.txt	/*c_CTRL-[*
 c_CTRL-\_CTRL-G	intro.txt	/*c_CTRL-\\_CTRL-G*
 c_CTRL-\_CTRL-N	intro.txt	/*c_CTRL-\\_CTRL-N*
 c_CTRL-\_e	cmdline.txt	/*c_CTRL-\\_e*
@@ -5333,7 +5300,6 @@ catch-text	eval.txt	/*catch-text*
 cc	change.txt	/*cc*
 ceil()	eval.txt	/*ceil()*
 ch.vim	syntax.txt	/*ch.vim*
-ch_canread()	eval.txt	/*ch_canread()*
 ch_close()	eval.txt	/*ch_close()*
 ch_close_in()	eval.txt	/*ch_close_in()*
 ch_evalexpr()	eval.txt	/*ch_evalexpr()*
@@ -5381,7 +5347,6 @@ channel-close	channel.txt	/*channel-close*
 channel-close-in	channel.txt	/*channel-close-in*
 channel-commands	channel.txt	/*channel-commands*
 channel-demo	channel.txt	/*channel-demo*
-channel-drop	channel.txt	/*channel-drop*
 channel-functions	usr_41.txt	/*channel-functions*
 channel-mode	channel.txt	/*channel-mode*
 channel-more	channel.txt	/*channel-more*
@@ -5414,7 +5379,6 @@ cino-:	indent.txt	/*cino-:*
 cino-=	indent.txt	/*cino-=*
 cino->	indent.txt	/*cino->*
 cino-C	indent.txt	/*cino-C*
-cino-E	indent.txt	/*cino-E*
 cino-J	indent.txt	/*cino-J*
 cino-L	indent.txt	/*cino-L*
 cino-M	indent.txt	/*cino-M*
@@ -6119,7 +6083,6 @@ ft-csh-syntax	syntax.txt	/*ft-csh-syntax*
 ft-css-omni	insert.txt	/*ft-css-omni*
 ft-cweb-syntax	syntax.txt	/*ft-cweb-syntax*
 ft-cynlib-syntax	syntax.txt	/*ft-cynlib-syntax*
-ft-dash-syntax	syntax.txt	/*ft-dash-syntax*
 ft-desktop-syntax	syntax.txt	/*ft-desktop-syntax*
 ft-dircolors-syntax	syntax.txt	/*ft-dircolors-syntax*
 ft-docbk-syntax	syntax.txt	/*ft-docbk-syntax*
@@ -6180,7 +6143,6 @@ ft-php-syntax	syntax.txt	/*ft-php-syntax*
 ft-php3-syntax	syntax.txt	/*ft-php3-syntax*
 ft-phtml-syntax	syntax.txt	/*ft-phtml-syntax*
 ft-plaintex-syntax	syntax.txt	/*ft-plaintex-syntax*
-ft-posix-synax	syntax.txt	/*ft-posix-synax*
 ft-postscr-syntax	syntax.txt	/*ft-postscr-syntax*
 ft-ppwiz-syntax	syntax.txt	/*ft-ppwiz-syntax*
 ft-printcap-syntax	syntax.txt	/*ft-printcap-syntax*
@@ -6196,8 +6158,6 @@ ft-rexx-syntax	syntax.txt	/*ft-rexx-syntax*
 ft-rst-syntax	syntax.txt	/*ft-rst-syntax*
 ft-ruby-omni	insert.txt	/*ft-ruby-omni*
 ft-ruby-syntax	syntax.txt	/*ft-ruby-syntax*
-ft-rust	filetype.txt	/*ft-rust*
-ft-rust	ft_rust.txt	/*ft-rust*
 ft-scheme-syntax	syntax.txt	/*ft-scheme-syntax*
 ft-sdl-syntax	syntax.txt	/*ft-sdl-syntax*
 ft-sed-syntax	syntax.txt	/*ft-sed-syntax*
@@ -6230,7 +6190,6 @@ ft-xpm-syntax	syntax.txt	/*ft-xpm-syntax*
 ft-yaml-syntax	syntax.txt	/*ft-yaml-syntax*
 ft-zsh-syntax	syntax.txt	/*ft-zsh-syntax*
 ft_ada.txt	ft_ada.txt	/*ft_ada.txt*
-ft_rust.txt	ft_rust.txt	/*ft_rust.txt*
 ft_sql.txt	ft_sql.txt	/*ft_sql.txt*
 ftdetect	filetype.txt	/*ftdetect*
 ftp	pi_netrw.txt	/*ftp*
@@ -6308,7 +6267,6 @@ g:decada.Make_Command	ft_ada.txt	/*g:decada.Make_Command*
 g:decada.Unit_Name()	ft_ada.txt	/*g:decada.Unit_Name()*
 g:filetype_csh	syntax.txt	/*g:filetype_csh*
 g:filetype_r	syntax.txt	/*g:filetype_r*
-g:ftplugin_rust_source_path	ft_rust.txt	/*g:ftplugin_rust_source_path*
 g:gnat	ft_ada.txt	/*g:gnat*
 g:gnat.Error_Format	ft_ada.txt	/*g:gnat.Error_Format*
 g:gnat.Find()	ft_ada.txt	/*g:gnat.Find()*
@@ -6438,20 +6396,8 @@ g:netrw_win95ftp	pi_netrw.txt	/*g:netrw_win95ftp*
 g:netrw_winsize	pi_netrw.txt	/*g:netrw_winsize*
 g:netrw_wiw	pi_netrw.txt	/*g:netrw_wiw*
 g:netrw_xstrlen	pi_netrw.txt	/*g:netrw_xstrlen*
-g:rust_bang_comment_leader	ft_rust.txt	/*g:rust_bang_comment_leader*
-g:rust_conceal	ft_rust.txt	/*g:rust_conceal*
-g:rust_conceal_mod_path	ft_rust.txt	/*g:rust_conceal_mod_path*
-g:rust_conceal_pub	ft_rust.txt	/*g:rust_conceal_pub*
-g:rust_fold	ft_rust.txt	/*g:rust_fold*
-g:rust_playpen_url	ft_rust.txt	/*g:rust_playpen_url*
-g:rust_recommended_style	ft_rust.txt	/*g:rust_recommended_style*
-g:rust_shortener_url	ft_rust.txt	/*g:rust_shortener_url*
-g:rustc_makeprg_no_percent	ft_rust.txt	/*g:rustc_makeprg_no_percent*
-g:rustc_path	ft_rust.txt	/*g:rustc_path*
-g:rustfmt_autosave	ft_rust.txt	/*g:rustfmt_autosave*
-g:rustfmt_command	ft_rust.txt	/*g:rustfmt_command*
-g:rustfmt_fail_silently	ft_rust.txt	/*g:rustfmt_fail_silently*
-g:rustfmt_options	ft_rust.txt	/*g:rustfmt_options*
+g:sh_isk	syntax.txt	/*g:sh_isk*
+g:sh_noisk	syntax.txt	/*g:sh_noisk*
 g:syntax_on	syntax.txt	/*g:syntax_on*
 g:tar_browseoptions	pi_tar.txt	/*g:tar_browseoptions*
 g:tar_cmd	pi_tar.txt	/*g:tar_cmd*
@@ -6667,7 +6613,7 @@ gui-w32-printing	gui_w32.txt	/*gui-w32-printing*
 gui-w32-start	gui_w32.txt	/*gui-w32-start*
 gui-w32-various	gui_w32.txt	/*gui-w32-various*
 gui-w32-windowid	gui_w32.txt	/*gui-w32-windowid*
-gui-w32s	os_win32.txt	/*gui-w32s*
+gui-w32s	gui_w32.txt	/*gui-w32s*
 gui-win32-maximized	gui_w32.txt	/*gui-win32-maximized*
 gui-x11	gui_x11.txt	/*gui-x11*
 gui-x11-athena	gui_x11.txt	/*gui-x11-athena*
@@ -6684,7 +6630,7 @@ gui.txt	gui.txt	/*gui.txt*
 gui_mac.txt	gui_mac.txt	/*gui_mac.txt*
 gui_w32.txt	gui_w32.txt	/*gui_w32.txt*
 gui_x11.txt	gui_x11.txt	/*gui_x11.txt*
-guifontwide_gtk	options.txt	/*guifontwide_gtk*
+guifontwide_gtk2	options.txt	/*guifontwide_gtk2*
 guifontwide_macvim	options.txt	/*guifontwide_macvim*
 guifontwide_win_mbyte	options.txt	/*guifontwide_win_mbyte*
 guioptions_a	options.txt	/*guioptions_a*
@@ -6710,7 +6656,6 @@ hangulin.txt	hangulin.txt	/*hangulin.txt*
 has()	eval.txt	/*has()*
 has-patch	eval.txt	/*has-patch*
 has-python	if_pyth.txt	/*has-python*
-has-pythonx	if_pyth.txt	/*has-pythonx*
 has_key()	eval.txt	/*has_key()*
 haskell.vim	syntax.txt	/*haskell.vim*
 haslocaldir()	eval.txt	/*haslocaldir()*
@@ -7074,7 +7019,6 @@ job-callback	channel.txt	/*job-callback*
 job-channel-overview	channel.txt	/*job-channel-overview*
 job-close_cb	channel.txt	/*job-close_cb*
 job-control	channel.txt	/*job-control*
-job-drop	channel.txt	/*job-drop*
 job-err_cb	channel.txt	/*job-err_cb*
 job-err_io	channel.txt	/*job-err_io*
 job-exit_cb	channel.txt	/*job-exit_cb*
@@ -7210,6 +7154,7 @@ logiPat-man	pi_logipat.txt	/*logiPat-man*
 logiPat-manual	pi_logipat.txt	/*logiPat-manual*
 logiPat-operators	pi_logipat.txt	/*logiPat-operators*
 logiPat-pattern	pi_logipat.txt	/*logiPat-pattern*
+logiPat.txt	pi_logipat.txt	/*logiPat.txt*
 long-lines	version5.txt	/*long-lines*
 love	intro.txt	/*love*
 lowercase	change.txt	/*lowercase*
@@ -7408,6 +7353,7 @@ mouse_winid-variable	eval.txt	/*mouse_winid-variable*
 movement	intro.txt	/*movement*
 ms-dos	os_msdos.txt	/*ms-dos*
 msdos	os_msdos.txt	/*msdos*
+msdos-mode	gui_w32.txt	/*msdos-mode*
 msql.vim	syntax.txt	/*msql.vim*
 mswin.vim	gui_w32.txt	/*mswin.vim*
 multi-byte	mbyte.txt	/*multi-byte*
@@ -7926,7 +7872,6 @@ php3.vim	syntax.txt	/*php3.vim*
 phtml.vim	syntax.txt	/*phtml.vim*
 pi_getscript.txt	pi_getscript.txt	/*pi_getscript.txt*
 pi_gzip.txt	pi_gzip.txt	/*pi_gzip.txt*
-pi_logipat.txt	pi_logipat.txt	/*pi_logipat.txt*
 pi_netrw.txt	pi_netrw.txt	/*pi_netrw.txt*
 pi_paren.txt	pi_paren.txt	/*pi_paren.txt*
 pi_spec.txt	pi_spec.txt	/*pi_spec.txt*
@@ -8014,7 +7959,6 @@ python-bindeval	if_pyth.txt	/*python-bindeval*
 python-bindeval-objects	if_pyth.txt	/*python-bindeval-objects*
 python-buffer	if_pyth.txt	/*python-buffer*
 python-buffers	if_pyth.txt	/*python-buffers*
-python-building	if_pyth.txt	/*python-building*
 python-chdir	if_pyth.txt	/*python-chdir*
 python-command	if_pyth.txt	/*python-command*
 python-commands	if_pyth.txt	/*python-commands*
@@ -8045,11 +7989,7 @@ python.vim	syntax.txt	/*python.vim*
 python2-directory	if_pyth.txt	/*python2-directory*
 python3	if_pyth.txt	/*python3*
 python3-directory	if_pyth.txt	/*python3-directory*
-python_x	if_pyth.txt	/*python_x*
-python_x-special-comments	if_pyth.txt	/*python_x-special-comments*
-pythonx	if_pyth.txt	/*pythonx*
 pythonx-directory	if_pyth.txt	/*pythonx-directory*
-pyxeval()	eval.txt	/*pyxeval()*
 q	repeat.txt	/*q*
 q/	cmdline.txt	/*q\/*
 q:	cmdline.txt	/*q:*
@@ -8143,7 +8083,6 @@ remote_foreground()	eval.txt	/*remote_foreground()*
 remote_peek()	eval.txt	/*remote_peek()*
 remote_read()	eval.txt	/*remote_read()*
 remote_send()	eval.txt	/*remote_send()*
-remote_startserver()	eval.txt	/*remote_startserver()*
 remove()	eval.txt	/*remove()*
 remove-filetype	filetype.txt	/*remove-filetype*
 remove-option-flags	options.txt	/*remove-option-flags*
@@ -8199,13 +8138,6 @@ russian-issues	russian.txt	/*russian-issues*
 russian-keymap	russian.txt	/*russian-keymap*
 russian-l18n	russian.txt	/*russian-l18n*
 russian.txt	russian.txt	/*russian.txt*
-rust	ft_rust.txt	/*rust*
-rust-commands	ft_rust.txt	/*rust-commands*
-rust-intro	ft_rust.txt	/*rust-intro*
-rust-mappings	ft_rust.txt	/*rust-mappings*
-rust-settings	ft_rust.txt	/*rust-settings*
-rust_<D-R>	ft_rust.txt	/*rust_<D-R>*
-rust_<D-r>	ft_rust.txt	/*rust_<D-r>*
 rview	starting.txt	/*rview*
 rvim	starting.txt	/*rvim*
 rxvt	syntax.txt	/*rxvt*
@@ -8599,8 +8531,6 @@ t_@7	term.txt	/*t_@7*
 t_AB	term.txt	/*t_AB*
 t_AF	term.txt	/*t_AF*
 t_AL	term.txt	/*t_AL*
-t_BD	term.txt	/*t_BD*
-t_BE	term.txt	/*t_BE*
 t_CS	term.txt	/*t_CS*
 t_CV	term.txt	/*t_CV*
 t_Ce	term.txt	/*t_Ce*
@@ -8639,8 +8569,6 @@ t_KI	term.txt	/*t_KI*
 t_KJ	term.txt	/*t_KJ*
 t_KK	term.txt	/*t_KK*
 t_KL	term.txt	/*t_KL*
-t_PE	term.txt	/*t_PE*
-t_PS	term.txt	/*t_PS*
 t_RB	term.txt	/*t_RB*
 t_RI	term.txt	/*t_RI*
 t_RV	term.txt	/*t_RV*
@@ -8766,7 +8694,6 @@ tab-page-commands	tabpage.txt	/*tab-page-commands*
 tab-page-intro	tabpage.txt	/*tab-page-intro*
 tab-page-other	tabpage.txt	/*tab-page-other*
 tabline-menu	tabpage.txt	/*tabline-menu*
-tabnew-autocmd	tabpage.txt	/*tabnew-autocmd*
 tabpage	tabpage.txt	/*tabpage*
 tabpage-variable	eval.txt	/*tabpage-variable*
 tabpage.txt	tabpage.txt	/*tabpage.txt*
@@ -8872,23 +8799,20 @@ termcap-options	term.txt	/*termcap-options*
 termcap-title	term.txt	/*termcap-title*
 terminal-colors	os_unix.txt	/*terminal-colors*
 terminal-info	term.txt	/*terminal-info*
-terminal-key-codes	term.txt	/*terminal-key-codes*
 terminal-options	term.txt	/*terminal-options*
-terminal-output-codes	term.txt	/*terminal-output-codes*
 terminfo	term.txt	/*terminfo*
 termresponse-variable	eval.txt	/*termresponse-variable*
 test-functions	usr_41.txt	/*test-functions*
 test_alloc_fail()	eval.txt	/*test_alloc_fail()*
 test_autochdir()	eval.txt	/*test_autochdir()*
+test_disable_char_avail()	eval.txt	/*test_disable_char_avail()*
 test_garbagecollect_now()	eval.txt	/*test_garbagecollect_now()*
-test_ignore_error()	eval.txt	/*test_ignore_error()*
 test_null_channel()	eval.txt	/*test_null_channel()*
 test_null_dict()	eval.txt	/*test_null_dict()*
 test_null_job()	eval.txt	/*test_null_job()*
 test_null_list()	eval.txt	/*test_null_list()*
 test_null_partial()	eval.txt	/*test_null_partial()*
 test_null_string()	eval.txt	/*test_null_string()*
-test_override()	eval.txt	/*test_override()*
 test_settime()	eval.txt	/*test_settime()*
 testing	eval.txt	/*testing*
 testing-variable	eval.txt	/*testing-variable*
@@ -9289,19 +9213,16 @@ vim-dev	intro.txt	/*vim-dev*
 vim-mac	intro.txt	/*vim-mac*
 vim-modes	intro.txt	/*vim-modes*
 vim-modes-intro	intro.txt	/*vim-modes-intro*
+vim-multibyte	intro.txt	/*vim-multibyte*
 vim-script-intro	usr_41.txt	/*vim-script-intro*
-vim-use	intro.txt	/*vim-use*
 vim-variable	eval.txt	/*vim-variable*
 vim.vim	syntax.txt	/*vim.vim*
 vim7	version7.txt	/*vim7*
 vim8	version8.txt	/*vim8*
 vim:	options.txt	/*vim:*
-vim_announce	intro.txt	/*vim_announce*
-vim_dev	intro.txt	/*vim_dev*
 vim_did_enter-variable	eval.txt	/*vim_did_enter-variable*
 vim_mac	gui_mac.txt	/*vim_mac*
 vim_starting	eval.txt	/*vim_starting*
-vim_use	intro.txt	/*vim_use*
 vimball	pi_vimball.txt	/*vimball*
 vimball-contents	pi_vimball.txt	/*vimball-contents*
 vimball-extract	pi_vimball.txt	/*vimball-extract*
@@ -9406,7 +9327,6 @@ win32-startup	os_win32.txt	/*win32-startup*
 win32-term	os_win32.txt	/*win32-term*
 win32-vimrun	gui_w32.txt	/*win32-vimrun*
 win32-win3.1	os_win32.txt	/*win32-win3.1*
-win32-win95	os_win32.txt	/*win32-win95*
 win32s	os_win32.txt	/*win32s*
 win_findbuf()	eval.txt	/*win_findbuf()*
 win_getid()	eval.txt	/*win_getid()*
@@ -9436,8 +9356,6 @@ windows-intro	windows.txt	/*windows-intro*
 windows-starting	windows.txt	/*windows-starting*
 windows.txt	windows.txt	/*windows.txt*
 windows95	os_win32.txt	/*windows95*
-windows98	os_win32.txt	/*windows98*
-windowsme	os_win32.txt	/*windowsme*
 winheight()	eval.txt	/*winheight()*
 winid	windows.txt	/*winid*
 winline()	eval.txt	/*winline()*
@@ -9495,7 +9413,6 @@ xterm-8-bit	term.txt	/*xterm-8-bit*
 xterm-8bit	term.txt	/*xterm-8bit*
 xterm-blink	syntax.txt	/*xterm-blink*
 xterm-blinking-cursor	syntax.txt	/*xterm-blinking-cursor*
-xterm-bracketed-paste	term.txt	/*xterm-bracketed-paste*
 xterm-clipboard	term.txt	/*xterm-clipboard*
 xterm-codes	term.txt	/*xterm-codes*
 xterm-color	syntax.txt	/*xterm-color*

runtime/doc/term.txt

@@ -1,4 +1,4 @@
-*term.txt*      For Vim version 8.0.  Last change: 2017 Feb 02
+*term.txt*      For Vim version 8.0.  Last change: 2016 Sep 02
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -89,28 +89,6 @@ an external command (e.g., "!!"), the terminal will be put into Normal mode
 for a moment.  This means that you can stop the output to the screen by
 hitting a printing key.  Output resumes when you hit <BS>.
 
-						*xterm-bracketed-paste*
-When the 't_BE' option is set then 't_BE' will be sent to the
-terminal when entering "raw" mode and 't_BD' when leaving "raw" mode.  The
-terminal is then expected to put 't_PS' before pasted text and 't_PE' after
-pasted text.  This way Vim can separate text that is pasted from characters
-that are typed.  The pasted text is handled like when the middle mouse button
-is used, it is inserted literally and not interpreted as commands.
-
-When the cursor is in the first column, the pasted text will be inserted
-before it.  Otherwise the pasted text is appended after the cursor position.
-This means one cannot paste after the first column.  Unfortunately Vim does
-not have a way to tell where the mouse pointer was.
-
-Note that in some situations Vim will not recognize the bracketed paste and
-you will get the raw text.  In other situations Vim will only get the first
-pasted character and drop the rest, e.g. when using the "r" command.  If you
-have a problem with this, disable bracketed paste by putting this in your
-.vimrc: >
-	set t_BE=
-If this is done while Vim is running the 't_BD' will be sent to the terminal
-to disable bracketed paste.
-
 							*cs7-problem*
 Note: If the terminal settings are changed after running Vim, you might have
 an illegal combination of settings.  This has been reported on Solaris 2.5
@@ -252,7 +230,7 @@ But any non-empty string means that the flag is set.  An empty string means
 that the flag is not set.  't_CS' works like this too, but it isn't a termcap
 flag.
 
-OUTPUT CODES						*terminal-output-codes*
+OUTPUT CODES
 	option	meaning	~
 
 	t_AB	set background color (ANSI)			*t_AB* *'t_AB'*
@@ -328,12 +306,8 @@ Added by Vim (there are no standard codes for these):
 		|xterm-true-color|
 	t_8b	set background color (R, G, B)			*t_8b* *'t_8b'*
 		|xterm-true-color|
-	t_BE	enable bracketed paste mode			*t_BE* *'t_BE'*
-		|xterm-bracketed-paste|
-	t_BD	disable bracketed paste mode			*t_BD* *'t_BD'*
-		|xterm-bracketed-paste|
 
-KEY CODES						*terminal-key-codes*
+KEY CODES
 Note: Use the <> form if possible
 
 	option	name		meaning	~
@@ -424,9 +398,6 @@ Note: Use the <> form if possible
 	t_KK	<k8>		keypad 8		 *<k8>*	*t_KK* *'t_KK'*
 	t_KL	<k9>		keypad 9		 *<k9>*	*t_KL* *'t_KL'*
 		<Mouse>		leader of mouse code		*<Mouse>*
-								*t_PS* *'t_PS'*
-	t_PS	start of bracketed paste |xterm-bracketed-paste|
-	t_PE	end of bracketed paste |xterm-bracketed-paste|  *t_PE* *'t_PE'*
 
 Note about t_so and t_mr: When the termcap entry "so" is not present the
 entry for "mr" is used.  And vice versa.  The same is done for "se" and "me".

runtime/doc/usr_02.txt

@@ -1,4 +1,4 @@
-*usr_02.txt*	For Vim version 8.0.  Last change: 2017 Mar 14
+*usr_02.txt*	For Vim version 8.0.  Last change: 2016 Jan 16
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -554,7 +554,7 @@ Summary: 					*help-summary*  >
 8) Ex-commands always start with ":", so to go to the :s command help: >
 	:help :s
 
-9) Commands specifically for debugging start with ">".  To go to the help
+9) Commands specifically for debugging start with ">".  To go to to the help
    for the "cont" debug command: >
 	:help >cont
 
@@ -589,7 +589,7 @@ Summary: 					*help-summary*  >
     register: >
    	:help quote:
 
-13) Vim script is available at >
+13) Vim Script (VimL) is available at >
 	:help eval.txt
 <   Certain aspects of the language are available at :h expr-X where "X" is a
    single letter. E.g.  >
@@ -599,10 +599,10 @@ Summary: 					*help-summary*  >
    Also important is >
    	:help function-list
 <   to find a short description of all functions available.  Help topics for
-   Vim script functions always include the "()", so: >
+   VimL functions always include the "()", so: >
    	:help append()
-<   talks about the append Vim script function rather than how to append text
-   in the current buffer.
+<   talks about the append VimL function rather than how to append text in the
+   current buffer.
 
 14) Mappings are talked about in the help page :h |map.txt|. Use >
     	:help mapmode-i
@@ -663,7 +663,7 @@ Summary: 					*help-summary*  >
 22) Autocommand events can be found by their name: >
      	:help BufWinLeave
 <    To see all possible events: >
-	:help autocommand-events
+	:help autocommands-events
 
 23) Command-line switches always start with "-".  So for the help of the -f
     command switch of Vim use: >

runtime/doc/usr_03.txt

@@ -182,7 +182,7 @@ the following:
 
 This tells you that you might want to fix something on line 33.  So how do you
 find line 33?  One way is to do "9999k" to go to the top of the file and "32j"
-to go down thirty-two lines.  It is not a good way, but it works.  A much
+to go down thirty two lines.  It is not a good way, but it works.  A much
 better way of doing things is to use the "G" command.  With a count, this
 command positions you at the given line number.  For example, "33G" puts you
 on line 33.  (For a better way of going through a compiler's error list, see

runtime/doc/usr_22.txt

@@ -1,4 +1,4 @@
-*usr_22.txt*	For Vim version 8.0.  Last change: 2016 Dec 13
+*usr_22.txt*	For Vim version 8.0.  Last change: 2012 Nov 15
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -93,7 +93,7 @@ browser.  This is what you get: >
      	 o................Browsing with a Horizontal Split...........|netrw-o|
      	 p................Use Preview Window.........................|netrw-p|
      	 P................Edit in Previous Window....................|netrw-p|
-     	 q................Listing Bookmarks and History..............|netrw-qb|
+     	 q................Listing Bookmarks and History..............|netrw-q|
      	 r................Reversing Sorting Order....................|netrw-r|
 <    	(etc)
 

runtime/doc/usr_41.txt

@@ -1,4 +1,4 @@
-*usr_41.txt*	For Vim version 8.0.  Last change: 2017 Mar 18
+*usr_41.txt*	For Vim version 8.0.  Last change: 2016 Sep 01
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -95,7 +95,7 @@ Then there is the ":let i += 1" command.  This does the same thing as
 to the same variable.
 
 The example was given to explain the commands, but would you really want to
-make such a loop, it can be written much more compact: >
+make such a loop it can be written much more compact: >
 
 	:for i in range(1, 4)
 	:  echo "count is" i
@@ -693,7 +693,6 @@ Other computation:					*bitwise-function*
 Variables:						*var-functions*
 	type()			type of a variable
 	islocked()		check if a variable is locked
-	funcref()		get a Funcref for a function reference
 	function()		get a Funcref for a function name
 	getbufvar()		get a variable value from a specific buffer
 	setbufvar()		set a variable in a specific buffer
@@ -885,11 +884,9 @@ GUI:						*gui-functions*
 	getfontname()		get name of current font being used
 	getwinposx()		X position of the GUI Vim window
 	getwinposy()		Y position of the GUI Vim window
-	balloon_show()		set the balloon content
 
 Vim server:					*server-functions*
 	serverlist()		return the list of server names
-	remote_startserve()	run a server
 	remote_send()		send command characters to a Vim server
 	remote_expr()		evaluate an expression in a Vim server
 	server2client()		send a reply to a client of a Vim server
@@ -921,22 +918,18 @@ Testing:				    *test-functions*
 	assert_true()		assert that an expression is true
 	assert_exception()	assert that a command throws an exception
 	assert_fails()		assert that a function call fails
-	assert_report()		report a test failure
 	test_alloc_fail()	make memory allocation fail
 	test_autochdir()	enable 'autochdir' during startup
-	test_override()		test with Vim internal overrides
-	test_garbagecollect_now()   free memory right now
-	test_ignore_error()	ignore a specific error message
+	test_disable_char_avail()	test without typeahead
+	test_garbagecollect_now()	free memory right now
 	test_null_channel()	return a null Channel
 	test_null_dict()	return a null Dict
 	test_null_job()		return a null Job
 	test_null_list()	return a null List
 	test_null_partial()	return a null Partial function
 	test_null_string()	return a null String
-	test_settime()		set the time Vim uses internally
 
 Inter-process communication:		    *channel-functions*
-	ch_canread()		check if there is something to read
 	ch_open()		open a channel
 	ch_close()		close a channel
 	ch_close_in()		close the in part of a channel
@@ -1006,7 +999,6 @@ Various:					*various-functions*
 	perleval()		evaluate Perl expression (|+perl|)
 	py3eval()		evaluate Python expression (|+python3|)
 	pyeval()		evaluate Python expression (|+python|)
-	pyxeval()		evaluate |python_x| expression
 
 ==============================================================================
 *41.7*	Defining a function
@@ -1594,7 +1586,7 @@ WHITE SPACE
 Blank lines are allowed and ignored.
 
 Leading whitespace characters (blanks and TABs) are always ignored.  The
-whitespaces between parameters (e.g. between the "set" and the "cpoptions" in
+whitespaces between parameters (e.g. between the 'set' and the 'cpoptions' in
 the example below) are reduced to one blank character and plays the role of a
 separator, the whitespaces after the last (visible) character may or may not
 be ignored depending on the situation, see below.

runtime/doc/various.txt

@@ -1,4 +1,4 @@
-*various.txt*   For Vim version 8.0.  Last change: 2017 Feb 24
+*various.txt*   For Vim version 8.0.  Last change: 2016 Sep 06
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -530,14 +530,12 @@ N  *+X11*		Unix only: can restore window title |X11|
 :redi[r] END		End redirecting messages.  {not in Vi}
 
 							*:filt* *:filter*
-:filt[er][!] {pat} {command}
-:filt[er][!] /{pat}/ {command}
-			Restrict the output of {command} to lines matching
-			with {pat}.  For example, to list only xml files: >
+:filt[er] {pat} {command}
+:filt[er] /{pat}/ {command}
+			Restrict the output of {command} to matches with {pat}.
+			For example, to list only xml files: >
 				:filter /\.xml$/ oldfiles
-<			If the [!] is given, restrict the output of {command}
-			to lines that do NOT match {pat}.
-
+<
 			{pat} is a Vim search pattern.  Instead of enclosing
 			it in / any non-ID character (see |'isident'|) can be
 			used, so long as it does not appear in {pat}.  Without
@@ -639,7 +637,7 @@ K			Run a program to lookup the keyword under the
 			with the command >
 				:!{program} {keyword}
 <			There is an example of a program to use in the tools
-			directory of Vim.  It is called "ref" and does a
+			directory of Vim.  It is called 'ref' and does a
 			simple spelling check.
 			Special cases:
 			- If 'keywordprg' begins with ":" it is invoked as

runtime/doc/version6.txt

@@ -886,7 +886,7 @@ Adjusted test2 for this.
 Allow using a URL in 'path'.  Makes ":find index.html" work.
 
 GTK: Allow dropping a http:// and ftp:// URL on Vim.  The netrw plugin takes
-care of downloading the file. (Mikael Berthe)
+care of downloading the file. (MiKael Berthe)
 
 
 Window for command-line editing				*new-cmdwin*
@@ -5388,7 +5388,7 @@ Files:	    src/os_win32.c
 
 Patch 6.0.256 (extra)
 Problem:    Win32: ":highlight Comment guifg=asdf" does not give an error
-	    message. (Randall W. Morris)  Also for other systems.
+	    message. (Randall W.  Morris)  Also for other systems.
 Solution:   Add gui_get_color() to give one error message for all systems.
 Files:	    src/gui.c, src/gui_amiga.c, src/gui_athena.c, src/gui_motif.c,
 	    src/gui_riscos.c, src/gui_x11.c, src/gui_gtk_x11.c,
@@ -9955,7 +9955,7 @@ Use "copy /y" in Make_bc5.mak to avoid a prompt for overwriting.
 
 Patch 6.2.001
 Problem:    The ":stopinsert" command doesn't have a help tag.
-Solution:   Add the tag. (Antoine J. Mechelynck)
+Solution:   Add the tag. (Antoine J.  Mechelynck)
 Files:	    runtime/doc/insert.txt, runtime/doc/tags
 
 Patch 6.2.002

runtime/doc/version7.txt

@@ -1447,7 +1447,7 @@ g CTRL-G also shows the number of characters if it differs from the number of
 bytes.
 
 Completion for ":debug" and entering an expression for the '=' register.  Skip
-":" between range and command name. (Peter Winters)
+":" between range and command name. (Peter winters)
 
 CTRL-Q in Insert mode now works like CTRL-V by default.  Previously it was
 ignored.
@@ -3373,7 +3373,7 @@ Files:	    runtime/scripts.vim
 Patch 7.0.050
 Problem:    After using the netbeans interface close command a stale pointer
 	    may be used.
-Solution:   Clear the pointer to the closed buffer. (Xavier de Gaye)
+Solution:   Clear the pointer to the closed buffer. (Xaview de Gaye)
 Files:	    src/netbeans.c
 
 Patch 7.0.051 (after 7.0.44)
@@ -10204,7 +10204,7 @@ objects in place of `str()` ones avoiding possibility of UnicodeDecodeError.
 interfaces to some extent. Extent will be improved in the future.
 
 Added special |python-vars| objects also available for |python-buffer| and 
-|python-window|. They ease access to Vim script variables from Python.
+|python-window|. They ease access to VimL variables from Python.
 
 Now you no longer need to alter `sys.path` to import your module: special 
 hooks are responsible for importing from {rtp}/python2, {rtp}/python3 and 
@@ -16274,7 +16274,7 @@ Files:	    src/regexp_nfa.c, src/testdir/test64.in, src/testdir/test64.ok
 
 Patch 7.3.1026
 Problem:    New regexp: pattern that includes a new-line matches too early.
-	    (John McGowan)
+	    (john McGowan)
 Solution:   Do not start searching in the second line.
 Files:	    src/regexp_nfa.c, src/testdir/test64.in, src/testdir/test64.ok
 

runtime/doc/version8.txt

@@ -1,4 +1,4 @@
-*version8.txt*  For Vim version 8.0.  Last change: 2017 Mar 16
+*version8.txt*  For Vim version 8.0.  Last change: 2016 Sep 14
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -181,12 +181,6 @@ Insert mode commands: ~
 |i_CTRL-G_U|	CTRL-G U	don't break undo with next cursor movement
 
 
-Cmdline mode commands: ~
-
-|/_CTRL-G|	CTRL-G		move to the next match in 'incsearch' mode
-|/_CTRL-T|	CTRL-T		move to the previous match in 'incsearch' mode
-
-
 Options: ~
 
 'belloff'		do not ring the bell for these reasons
@@ -200,9 +194,9 @@ Options: ~
 'perldll'		name of the Perl dynamic library
 'pythondll'		name of the Python 2 dynamic library
 'pythonthreedll'	name of the Python 3 dynamic library
+'signcolumn'		when to display the sign column
 'renderoptions'		options for text rendering on Windows
 'rubydll'		name of the Ruby dynamic library
-'signcolumn'		when to display the sign column
 'tagcase'		how to handle case when searching in tags files
 'tcldll'		name of the Tcl dynamic library
 'termguicolors'		use GUI colors for the terminal
@@ -230,7 +224,6 @@ Ex commands: ~
 Ex command modifiers: ~
 
 |:keeppatterns|		following command keeps search pattern history
-|<mods>|		supply command modifiers to user defined commands
 
 
 New and extended functions: ~
@@ -296,7 +289,7 @@ New and extended functions: ~
 |systemlist()|		get the result of a shell command as a list
 |test_alloc_fail()|	make memory allocation fail
 |test_autochdir()|	test 'autochdir' functionality
-test_disable_char_avail() test without typeahead (removed later)
+|test_disable_char_avail()| test without typeahead
 |test_garbagecollect_now()| free memory right now
 |test_null_channel()|	return a null Channel
 |test_null_dict()|	return a null Dict
@@ -426,7 +419,7 @@ When no vimrc file is found, the |defaults.vim| script is loaded to set more
 useful default values for new users.  That includes setting 'nocompatible'.
 Thus Vim no longer starts up in Vi compatible mode.  If you do want that,
 either create a .vimrc file that does "set compatible" or start Vim with
-"vim -C".
+"Vim -C".
 
 
 Support removed ~
@@ -1866,7 +1859,7 @@ Files:	    runtime/doc/eval.txt, src/eval.c, src/testdir/test60.in,
 	    src/testdir/test60.ok
 
 Patch 7.4.237 (after 7.4.236)
-Problem:    When some patches were not included has("patch-7.4.123") may return
+Problem:    When some patches was not included has("patch-7.4.123") may return
 	    true falsely.
 Solution:   Check for the specific patch number.
 Files:	    runtime/doc/eval.txt, src/eval.c
@@ -3436,7 +3429,7 @@ Files:	    runtime/doc/options.txt, src/Makefile, src/regexp.c, src/regexp.h,
 Patch 7.4.498 (after 7.4.497)
 Problem:    Typo in DOS makefile.
 Solution:   Change exists to exist. (Ken Takata)
-Files:	    src/testdir/Make_dos.mak
+Files:	    src/testdirMake_dos.mak
 
 Patch 7.4.499
 Problem:    substitute() can be slow with long strings.
@@ -14514,420 +14507,4 @@ Problem:    Test runner misses a comma.
 Solution:   Add the comma.
 Files:      src/testdir/runtest.vim
 
-Patch 8.0.0001
-Problem:    Intro screen still mentions version7. (Paul)
-Solution:   Change it to version8.
-Files:	    src/version.c
-
-Patch 8.0.0002
-Problem:    The netrw plugin does not work.
-Solution:   Make it accept version 8.0.
-Files:      runtime/autoload/netrw.vim
-
-Patch 8.0.0003
-Problem:    getwinvar() returns wrong Value of boolean and number options,
-            especially non big endian systems. (James McCoy)
-Solution:   Cast the pointer to long or int. (closes #1060)
-Files:      src/option.c, src/testdir/test_bufwintabinfo.vim
-
-Patch 8.0.0004
-Problem:    A string argument for function() that is not a function name
-            results in an error message with NULL. (Christian Brabandt)
-Solution:   Use the argument for the error message.
-Files:      src/evalfunc.c, src/testdir/test_expr.vim
-
-Patch 8.0.0005
-Problem:    Netbeans test fails with Python 3. (Jonathonf)
-Solution:   Encode the string before sending it. (closes #1070)
-Files:      src/testdir/test_netbeans.py
-
-Patch 8.0.0006
-Problem:    ":lb" is interpreted as ":lbottom" while the documentation says it
-            means ":lbuffer".
-Solution:   Adjust the order of the commands. (haya14busa, closes #1093)
-Files:      src/ex_cmds.h
-
-Patch 8.0.0007
-Problem:    Vim 7.4 is still mentioned in a few places.
-Solution:   Update to Vim 8.  (Uncle Bill, closes #1094)
-Files:      src/INSTALLpc.txt, src/vimtutor, uninstal.txt
-
-Patch 8.0.0008
-Problem:    Popup complete test is disabled.
-Solution:   Enable the test and change the assert. (Hirohito Higashi)
-Files:      src/testdir/test_popup.vim
-
-Patch 8.0.0009
-Problem:    Unnecessary workaround for AppVeyor.
-Solution:   Revert patch 7.4.990. (Christian Brabandt)
-Files:      appveyor.yml
-
-Patch 8.0.0010
-Problem:    Crash when editing file that starts with crypt header. (igor2x)
-Solution:   Check for length of text. (Christian Brabandt) Add a test.
-Files:      src/fileio.c, src/testdir/test_crypt.vim, src/Makefile,
-            src/testdir/Make_all.mak
-
-Patch 8.0.0011
-Problem:    On OSX Test_pipe_through_sort_all() sometimes fails.
-Solution:   Add the test to the list of flaky tests.
-Files:      src/testdir/runtest.vim
-
-Patch 8.0.0012
-Problem:    Typos in comments.
-Solution:   Change "its" to "it's". (Matthew Brener, closes #1088)
-Files:      src/evalfunc.c, src/main.aap, src/nbdebug.c, src/netbeans.c,
-            src/quickfix.c, src/workshop.c, src/wsdebug.c
-
-Patch 8.0.0013 (after 8.0.0011)
-Problem:    Missing comma in list.
-Solution:   Add the comma.
-Files:      src/testdir/runtest.vim
-
-Patch 8.0.0014
-Problem:    Crypt tests are old style.
-Solution:   Convert to new style.
-Files:      src/testdir/test71.in, src/testdir/test71.ok,
-	    src/testdir/test71a.in, src/testdir/test_crypt.vim, src/Makefile,
-            src/testdir/Make_all.mak
-
-Patch 8.0.0015
-Problem:    Can't tell which part of a channel has "buffered" status.
-Solution:   Add an optional argument to ch_status().  Let ch_info() also
-            return "buffered" for out_status and err_status.
-Files:      src/evalfunc.c, src/channel.c, src/proto/channel.pro,
-            src/testdir/test_channel.vim, runtime/doc/eval.txt
-
-Patch 8.0.0016 (after 8.0.0015)
-Problem:    Build fails.
-Solution:   Include missing change.
-Files:      src/eval.c
-
-Patch 8.0.0017
-Problem:    Cannot get the number of the current quickfix or location list.
-Solution:   Use the current list if "nr" in "what" is zero. (Yegappan
-            Lakshmanan)  Remove debug command from test.
-Files:      src/quickfix.c, src/testdir/test_quickfix.vim,
-            runtime/doc/eval.txt
-
-Patch 8.0.0018
-Problem:    When using ":sleep" channel input is not handled.
-Solution:   When there is a channel check for input also when not in raw mode.
-            Check every 100 msec.
-Files:      src/channel.c, src/proto/channel.pro, src/ui.c, src/proto/ui.pro,
-            src/ex_docmd.c, src/os_amiga.c, src/proto/os_amiga.pro,
-            src/os_unix.c, src/proto/os_unix.pro, src/os_win32.c,
-            src/proto/os_win32.pro
-
-Patch 8.0.0019
-Problem:    Test_command_count is old style.
-Solution:   Turn it into a new style test. (Naruhiko Nishino)
-            Use more assert functions.
-Files:      src/Makefile, src/testdir/Make_all.mak, src/testdir/test_alot.vim,
-            src/testdir/test_autocmd.vim, src/testdir/test_command_count.in,
-            src/testdir/test_command_count.ok,
-            src/testdir/test_command_count.vim
-
-Patch 8.0.0020
-Problem:    The regexp engines are not reentrant.
-Solution:   Add regexec_T and save/restore the state when needed.
-Files:      src/regexp.c, src/regexp_nfa.c, src/testdir/test_expr.vim,
-            runtime/doc/eval.txt, runtime/doc/change.txt
-
-Patch 8.0.0021
-Problem:    In the GUI when redrawing the cursor it may be on the second half
-            of a double byte character.
-Solution:   Correct the cursor column. (Yasuhiro Matsumoto)
-Files:      src/screen.c
-
-Patch 8.0.0022
-Problem:    If a channel in NL mode is missing the NL at the end the remaining
-            characters are dropped.
-Solution:   When the channel is closed use the remaining text. (Ozaki Kiichi)
-Files:      src/channel.c, src/testdir/test_channel.vim
-
-Patch 8.0.0023
-Problem:    "gd" and "gD" may find a match in a comment or string.
-Solution:   Ignore matches in comments and strings. (Anton Lindqvist)
-Files:      src/normal.c, src/testdir/test_goto.vim
-
-Patch 8.0.0024
-Problem:    When the netbeans channel closes, "DETACH" is put in the output
-            part. (Ozaki Kiichi)
-Solution:   Write "DETACH" in the socket part.
-Files:      src/channel.c, src/testdir/test_netbeans.vim
-
-Patch 8.0.0025
-Problem:    Inconsistent use of spaces vs tabs in gd test.
-Solution:   Use tabs. (Anton Lindqvist)
-Files:      src/testdir/test_goto.vim
-
-Patch 8.0.0026
-Problem:    Error format with %W, %C and %Z does not work. (Gerd Wachsmuth)
-Solution:   Skip code when qf_multiignore is set. (Lcd)
-Files:      src/quickfix.c, src/testdir/test_quickfix.vim
-
-Patch 8.0.0027
-Problem:    A channel is closed when reading on stderr or stdout fails, but
-            there may still be something to read on another part.
-Solution:   Turn ch_to_be_closed into a bitfield. (Ozaki Kiichi)
-Files:      src/channel.c, src/eval.c, src/structs.h, src/proto/channel.pro,
-            src/testdir/test_channel.vim
-
-Patch 8.0.0028
-Problem:    Superfluous semicolons.
-Solution:   Remove them. (Ozaki Kiichi)
-Files:      src/ex_cmds2.c
-
-Patch 8.0.0029
-Problem:    Code for MS-Windows is complicated because of the exceptions for
-            old systems.
-Solution:   Drop support for MS-Windows older than Windows XP. (Ken Takata)
-Files:      runtime/doc/gui_w32.txt, runtime/doc/os_win32.txt,
-            runtime/doc/todo.txt, src/GvimExt/Makefile, src/Make_mvc.mak,
-            src/evalfunc.c, src/ex_cmds.c, src/ex_docmd.c, src/gui_w32.c,
-            src/if_cscope.c, src/misc1.c, src/misc2.c, src/option.c,
-            src/os_mswin.c, src/os_win32.c, src/os_win32.h,
-            src/proto/os_mswin.pro, src/proto/os_win32.pro, src/version.c
-
-Patch 8.0.0030
-Problem:    Mouse mode is not automatically detected for tmux.
-Solution:   Check for 'term' to be "tmux". (Michael Henry)
-Files:      src/os_unix.c
-
-Patch 8.0.0031
-Problem:    After ":bwipeout" 'fileformat' is not set to the right default.
-Solution:   Get the default from 'fileformats'. (Mike Williams)
-Files:      src/option.c, src/Makefile, src/testdir/test_fileformat.vim,
-            src/testdir/test_alot.vim
-
-Patch 8.0.0032
-Problem:    Tests may change the input file when something goes wrong.
-Solution:   Avoid writing the input file.
-Files:      src/testdir/test51.in, src/testdir/test67.in,
-            src/testdir/test97.in, src/testdir/test_tabpage.vim
-
-Patch 8.0.0033
-Problem:    Cannot use overlapping positions with matchaddpos().
-Solution:   Check end of match. (Ozaki Kiichi) Add a test (Hirohito Higashi)
-Files:      src/screen.c, src/testdir/test_match.vim
-
-Patch 8.0.0034
-Problem:    No completion for ":messages".
-Solution:   Complete "clear" argument. (Hirohito Higashi)
-Files:      src/ex_docmd.c, src/ex_getln.c, src/proto/ex_docmd.pro,
-            src/testdir/test_cmdline.vim, src/vim.h,
-            runtime/doc/eval.txt, runtime/doc/map.txt
-
-Patch 8.0.0035 (after 7.4.2013)
-Problem:    Order of matches for 'omnifunc' is messed up. (Danny Su)
-Solution:   Do not set compl_curr_match when called from complete_check().
-            (closes #1168)
-Files:      src/edit.c, src/evalfunc.c, src/proto/edit.pro, src/search.c,
-            src/spell.c, src/tag.c, src/testdir/test76.in,
-            src/testdir/test76.ok, src/testdir/test_popup.vim, src/Makefile,
-            src/testdir/Make_all.mak
-
-Patch 8.0.0036
-Problem:    Detecting that a job has finished may take a while.
-Solution:   Check for a finished job more often (Ozaki Kiichi)
-Files:      src/channel.c, src/os_unix.c, src/os_win32.c,
-            src/proto/os_unix.pro, src/proto/os_win32.pro,
-            src/testdir/test_channel.vim
-
-Patch 8.0.0037
-Problem:    Get E924 when switching tabs. ()
-Solution:   Use win_valid_any_tab() instead of win_valid(). (Martin Vuille,
-            closes #1167, closes #1171)
-Files:      src/quickfix.c, src/testdir/test_quickfix.vim
-
-Patch 8.0.0038
-Problem:    OPEN_CHR_FILES not defined for FreeBSD using Debian userland
-            files.
-Solution:   Check for __FreeBSD_kernel__. (James McCoy, closes #1166)
-Files:      src/vim.h
-
-Patch 8.0.0039
-Problem:    When Vim 8 reads an old viminfo and exits, the next time marks are
-            not read from viminfo. (Ned Batchelder)
-Solution:   Set a mark when it wasn't set before, even when the timestamp is
-            zero. (closes #1170)
-Files:      src/mark.c, src/testdir/test_viminfo.vim
-
-Patch 8.0.0040 (after 8.0.0033)
-Problem:    Whole line highlighting with matchaddpos() does not work.
-Solution:   Check for zero length. (Hirohito Higashi)
-Files:      src/screen.c, src/testdir/test_match.vim
-
-Patch 8.0.0041
-Problem:    When using Insert mode completion but not actually inserting
-            anything an undo item is still created. (Tommy Allen)
-Solution:   Do not call stop_arrow() when not inserting anything.
-Files:      src/edit.c, src/testdir/test_popup.vim
-
-Patch 8.0.0042 (after 8.0.0041)
-Problem:    When using Insert mode completion with 'completeopt' containing
-            "noinsert" change is not saved for undo.  (Tommy Allen)
-Solution:   Call stop_arrow() before inserting for pressing Enter.
-Files:      src/edit.c, src/testdir/test_popup.vim
-
-Patch 8.0.0043 (after 8.0.0041)
-Problem:    When using Insert mode completion with 'completeopt' containing
-            "noinsert" with CTRL-N the change is not saved for undo.  (Tommy
-            Allen)
-Solution:   Call stop_arrow() before inserting for any key.
-Files:      src/edit.c, src/testdir/test_popup.vim
-
-Patch 8.0.0044
-Problem:    In diff mode the cursor may end up below the last line, resulting
-            in an ml_get error.
-Solution:   Check the line to be valid.
-Files:      src/move.c, src/diff.c, src/proto/diff.pro,
-            src/testdir/test_diffmode.vim
-
-Patch 8.0.0045
-Problem:    Calling job_stop() right after job_start() does not work.
-Solution:   Block signals while fork is still busy. (Ozaki Kiichi, closes
-            #1155)
-Files:      src/auto/configure, src/config.h.in, src/configure.in,
-            src/os_unix.c, src/testdir/test_channel.vim
-
-Patch 8.0.0046
-Problem:    Using NUL instead of NULL.
-Solution:   Change to NULL. (Dominique Pelle)
-Files:      src/ex_cmds.c, src/json.c
-
-Patch 8.0.0047
-Problem:    Crash when using the preview window from an unnamed buffer.
-            (lifepillar)
-Solution:   Do not clear the wrong buffer. (closes #1200)
-Files:      src/popupmnu.c
-
-Patch 8.0.0048
-Problem:    On Windows job_stop() stops cmd.exe, not the processes it runs.
-            (Linwei)
-Solution:   Iterate over all processes and terminate the one where the parent
-            is the job process. (Yasuhiro Matsumoto, closes #1184)
-Files:      src/os_win32.c, src/structs.h
-
-Patch 8.0.0049
-Problem:    When a match ends in part of concealed text highlighting, it might
-            mess up concealing by resetting prev_syntax_id.
-Solution:   Do not reset prev_syntax_id and add a test to verify. (Christian
-            Brabandt, closes #1092)
-Files:      src/screen.c, src/testdir/test_matchadd_conceal.vim
-
-Patch 8.0.0050
-Problem:    An exiting job is detected with a large latency.
-Solution:   Check for pending job more often. (Ozaki Kiichi)  Change the
-            double loop in mch_inchar() into one.
-Files:      src/channel.c, src/os_unix.c, src/testdir/shared.vim,
-            src/testdir/test_channel.vim
-
-Patch 8.0.0051 (after 8.0.0048)
-Problem:    New code for job_stop() breaks channel test on AppVeyor.
-Solution:   Revert the change.
-Files:      src/os_win32.c, src/structs.h
-
-Patch 8.0.0052 (after 8.0.0049)
-Problem:    Conceal test passes even without the bug fix.
-Solution:   Add a redraw command. (Christian Brabandt)
-Files:      src/testdir/test_matchadd_conceal.vim
-
-Patch 8.0.0053 (after 8.0.0047)
-Problem:    No test for what 8.0.0047 fixes.
-Solution:   Add a test. (Hirohito Higashi)
-Files:      src/testdir/test_popup.vim
-
-Patch 8.0.0054 (after 8.0.0051)
-Problem:    On Windows job_stop() stops cmd.exe, not the processes it runs.
-            (Linwei)
-Solution:   Iterate over all processes and terminate the one where the parent
-            is the job process. Now only when there is no job object.
-            (Yasuhiro Matsumoto, closes #1203)
-Files:      src/os_win32.c
-
-Patch 8.0.0055
-Problem:    Minor comment and style deficiencies.
-Solution:   Update comments and fix style.
-Files:      src/buffer.c, src/misc2.c, src/os_unix.c
-
-Patch 8.0.0056
-Problem:    When setting 'filetype' there is no check for a valid name.
-Solution:   Only allow valid characters in 'filetype', 'syntax' and 'keymap'.
-Files:      src/option.c, src/testdir/test_options.vim
-
-Patch 8.0.0057 (after 8.0.0056)
-Problem:    Tests fail without the 'keymap' features.
-Solution:   Check for feature in test.
-Files:      src/testdir/test_options.vim
-
-Patch 8.0.0058
-Problem:    Positioning of the popup menu is not good.
-Solution:   Position it better. (Hirohito Higashi)
-Files:      src/popupmnu.c
-
-Patch 8.0.0059
-Problem:    Vim does not build on VMS systems.
-Solution:   Various changes for VMS. (Zoltan Arpadffy)
-Files:      src/json.c, src/macros.h, src/Make_vms.mms, src/os_unix.c,
-            src/os_unix.h, src/os_vms.c, src/os_vms_conf.h,
-            src/proto/os_vms.pro, src/testdir/Make_vms.mms
-
-Patch 8.0.0060
-Problem:    When using an Ex command for 'keywordprg' it is escaped as with a
-            shell command. (Romain Lafourcade)
-Solution:   Escape for an Ex command. (closes #1175)
-Files:      src/normal.c, src/testdir/test_normal.vim
-
-Patch 8.0.0061 (after 8.0.0058)
-Problem:    Compiler warning for unused variable.
-Solution:   Add #ifdef. (John Marriott)
-Files:      src/popupmnu.c
-
-Patch 8.0.0062
-Problem:    No digraph for HORIZONTAL ELLIPSIS.
-Solution:   Use ",.". (Hans Ginzel, closes #1226)
-Files:      src/digraph.c, runtime/doc/digraph.txt
-
-Patch 8.0.0063
-Problem:    Compiler warning for comparing with unsigned. (Zoltan Arpadffy)
-Solution:   Change <= to ==.
-Files:      src/undo.c
-
-Patch 8.0.0064 (after 8.0.0060)
-Problem:    Normal test fails on MS-Windows.
-Solution:   Don't try using an illegal file name.
-Files:      src/testdir/test_normal.vim
-
-Patch 8.0.0065 (after 8.0.0056)
-Problem:    Compiler warning for unused function in tiny build. (Tony
-            Mechelynck)
-Solution:   Add #ifdef.
-Files:      src/option.c
-
-Patch 8.0.0066
-Problem:    when calling an operator function when 'linebreak' is set, it is
-            internally reset before calling the operator function.
-Solution:   Restore 'linebreak' before calling op_function(). (Christian
-            Brabandt)
-Files:      src/normal.c, src/testdir/test_normal.vim
-
-Patch 8.0.0067
-Problem:    VMS has a problem with infinity.
-Solution:   Avoid an overflow. (Zoltan Arpadffy)
-Files:      src/json.c, src/macros.h
-
-Patch 8.0.0068
-Problem:    Checking did_throw after executing autocommands is wrong. (Daniel
-            Hahler)
-Solution:   Call aborting() instead, and only when autocommands were executed.
-Files:      src/quickfix.c, src/if_cscope.c, src/testdir/test_quickfix.vim
-
-Patch 8.0.0069
-Problem:    Compiler warning for self-comparison.
-Solution:   Define ONE_WINDOW and add #ifdef.
-Files:      src/globals.h, src/buffer.c, src/ex_docmd.c, src/move.c,
-            src/screen.c, src/quickfix.c, src/window.c
-
  vim:tw=78:ts=8:ft=help:norl:

runtime/doc/windows.txt

@@ -1,4 +1,4 @@
-*windows.txt*   For Vim version 8.0.  Last change: 2016 Dec 01
+*windows.txt*   For Vim version 8.0.  Last change: 2016 Aug 23
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -295,8 +295,8 @@ CTRL-W CTRL-Q						*CTRL-W_CTRL-Q*
 		    :1quit  " quit the first window
 		    :$quit  " quit the last window
 		    :9quit  " quit the last window
-			    " if there are fewer than 9 windows opened
-		    :-quit  " quit the previous window
+			     " if there are less than 9 windows opened
+		    :-quit  " quit the previews window
 		    :+quit  " quit the next window
 		    :+2quit " quit the second next window
 <
@@ -696,8 +696,6 @@ can also get to them with the buffer list commands, like ":bnext".
 		- If the file is not open in a window edit the file in the
 		  current window.  If the current buffer can't be |abandon|ed,
 		  the window is split first.
-		- Windows that are not in the argument list or are not full
-		  width will be closed if possible.
 		The |argument-list| is set, like with the |:next| command.
 		The purpose of this command is that it can be used from a
 		program that wants Vim to edit another file, e.g., a debugger.

runtime/filetype.vim

@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2017 Mar 13
+" Last Change:	2016 Sep 22
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -309,10 +309,7 @@ au BufNewFile,BufRead *.bl			setf blank
 au BufNewFile,BufRead */etc/blkid.tab,*/etc/blkid.tab.old   setf xml
 
 " Bazel (http://bazel.io)
-autocmd BufRead,BufNewFile *.bzl,WORKSPACE setfiletype bzl
-if has("fname_case")
-  autocmd BufRead,BufNewFile BUILD setfiletype bzl
-endif
+autocmd BufRead,BufNewFile *.bzl,BUILD,WORKSPACE setfiletype bzl
 
 " C or lpc
 au BufNewFile,BufRead *.c			call s:FTlpc()
@@ -676,14 +673,8 @@ au BufNewFile,BufRead *.dtd			setf dtd
 " DTS/DSTI (device tree files)
 au BufNewFile,BufRead *.dts,*.dtsi		setf dts
 
-" EDIF (*.edf,*.edif,*.edn,*.edo) or edn
-au BufNewFile,BufRead *.ed\(f\|if\|o\)		setf edif
-au BufNewFile,BufRead *.edn
-	\ if getline(1) =~ '^\s*(\s*edif\>' |
-	\   setf edif |
-	\ else |
-	\   setf clojure |
-	\ endif
+" EDIF (*.edf,*.edif,*.edn,*.edo)
+au BufNewFile,BufRead *.ed\(f\|if\|n\|o\)	setf edif
 
 " EditorConfig (close enough to dosini)
 au BufNewFile,BufRead .editorconfig		setf dosini
@@ -871,7 +862,7 @@ au BufNewFile,BufRead *.ht			setf haste
 au BufNewFile,BufRead *.htpp			setf hastepreproc
 
 " Hercules
-au BufNewFile,BufRead *.vc,*.ev,*.sum,*.errsum	setf hercules
+au BufNewFile,BufRead *.vc,*.ev,*.rs,*.sum,*.errsum	setf hercules
 
 " HEX (Intel)
 au BufNewFile,BufRead *.hex,*.h32		setf hex
@@ -1366,9 +1357,6 @@ endfunc
 " Not Quite C
 au BufNewFile,BufRead *.nqc			setf nqc
 
-" NSE - Nmap Script Engine - uses Lua syntax
-au BufNewFile,BufRead *.nse			setf lua
-
 " NSIS
 au BufNewFile,BufRead *.nsi,*.nsh		setf nsis
 
@@ -1772,9 +1760,6 @@ au BufNewFile,BufRead *.rb,*.rbw		setf ruby
 " RubyGems
 au BufNewFile,BufRead *.gemspec			setf ruby
 
-" Rust
-au BufNewFile,BufRead *.rs			setf rust
-
 " Rackup
 au BufNewFile,BufRead *.ru			setf ruby
 
@@ -2269,7 +2254,7 @@ func! s:FTtex()
 endfunc
 
 " ConTeXt
-au BufNewFile,BufRead tex/context/*/*.tex,*.mkii,*.mkiv,*.mkvi   setf context
+au BufNewFile,BufRead tex/context/*/*.tex,*.mkii,*.mkiv   setf context
 
 " Texinfo
 au BufNewFile,BufRead *.texinfo,*.texi,*.txi	setf texinfo
@@ -2283,9 +2268,6 @@ au BufNewFile,BufRead .tidyrc,tidyrc		setf tidy
 " TF mud client
 au BufNewFile,BufRead *.tf,.tfrc,tfrc		setf tf
 
-" tmux configuration
-au BufNewFile,BufRead {.,}tmux*.conf		setf tmux
-
 " TPP - Text Presentation Program
 au BufNewFile,BufReadPost *.tpp			setf tpp
 
@@ -2686,9 +2668,6 @@ au BufNewFile,BufRead mutt{ng,}rc*,Mutt{ng,}rc*		call s:StarSetf('muttrc')
 " Nroff macros
 au BufNewFile,BufRead tmac.*			call s:StarSetf('nroff')
 
-" OpenBSD hostname.if
-au BufNewFile,BufRead /etc/hostname.*		call s:StarSetf('config')
-
 " Pam conf
 au BufNewFile,BufRead */etc/pam.d/*		call s:StarSetf('pamconf')
 

runtime/ftplugin/a2ps.vim

@@ -1,7 +1,7 @@
 " Vim filetype plugin file
-" Language:             a2ps(1) configuration file
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2008-07-09
+" Language:         a2ps(1) configuration file
+" Maintainer:       Nikolai Weibull <now@bitwi.se>
+" Latest Revision:  2008-07-09
 
 if exists("b:did_ftplugin")
   finish

runtime/ftplugin/alsaconf.vim

@@ -1,7 +1,7 @@
 " Vim filetype plugin file
-" Language:             alsaconf(8) configuration file
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2008-07-09
+" Language:         alsaconf(8) configuration file
+" Maintainer:       Nikolai Weibull <now@bitwi.se>
+" Latest Revision:  2008-07-09
 
 if exists("b:did_ftplugin")
   finish

runtime/ftplugin/arch.vim

@@ -1,7 +1,7 @@
 " Vim filetype plugin file
-" Language:             GNU Arch inventory file
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2008-07-09
+" Language:         GNU Arch inventory file
+" Maintainer:       Nikolai Weibull <now@bitwi.se>
+" Latest Revision:  2008-07-09
 
 if exists("b:did_ftplugin")
   finish

runtime/ftplugin/automake.vim

@@ -1,7 +1,7 @@
 " Vim filetype plugin file
-" Language:             Automake
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2008-07-09
+" Language:         Automake
+" Maintainer:       Nikolai Weibull <now@bitwi.se>
+" Latest Revision:  2008-07-09
 
 if exists("b:did_ftplugin")
   finish

runtime/ftplugin/awk.vim

@@ -1,18 +0,0 @@
-" Vim filetype plugin
-" Language:	awk, nawk, gawk, mawk
-" Maintainer:	Antonio Colombo <azc100@gmail.com>
-" Last Change:	2017 Feb 17
-
-" This plugin was prepared by Mark Sikora
-
-" Only do this when not done yet for this buffer
-if exists("b:did_ftplugin")
-  finish
-endif
-
-" Don't load another plugin for this buffer
-let b:did_ftplugin = 1
-
-let b:undo_ftplugin = "setl commentstring<"
-
-setlocal commentstring=#\ %s

runtime/ftplugin/bdf.vim

@@ -1,7 +1,7 @@
 " Vim filetype plugin file
-" Language:             BDF font definition
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2008-07-09
+" Language:         BDF font definition
+" Maintainer:       Nikolai Weibull <now@bitwi.se>
+" Latest Revision:  2008-07-09
 
 if exists("b:did_ftplugin")
   finish

runtime/ftplugin/calendar.vim

@@ -1,7 +1,7 @@
 " Vim filetype plugin file
-" Language:             calendar(1) input file
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2008-07-09
+" Language:         calendar(1) input file
+" Maintainer:       Nikolai Weibull <now@bitwi.se>
+" Latest Revision:  2008-07-09
 
 if exists("b:did_ftplugin")
   finish

runtime/ftplugin/cdrdaoconf.vim

@@ -1,6 +1,6 @@
 " Vim filetype plugin file
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2007-12-04
+" Maintainer:       Nikolai Weibull <now@bitwi.se>
+" Latest Revision:  2007-12-04
 
 if exists("b:did_ftplugin")
   finish

runtime/ftplugin/conf.vim

@@ -1,7 +1,7 @@
 " Vim filetype plugin file
-" Language:             generic configuration file
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2008-07-09
+" Language:         generic configuration file
+" Maintainer:       Nikolai Weibull <now@bitwi.se>
+" Latest Revision:  2008-07-09
 
 if exists("b:did_ftplugin")
   finish

runtime/ftplugin/context.vim

@@ -1,8 +1,7 @@
 " Vim filetype plugin file
-" Language:           ConTeXt typesetting engine
-" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
-" Former Maintainers: Nikolai Weibull <now@bitwi.se>
-" Latest Revision:    2016 Oct 30
+" Language:         ConTeXt typesetting engine
+" Maintainer:       Nikolai Weibull <now@bitwi.se>
+" Latest Revision:  2008-07-09
 
 if exists("b:did_ftplugin")
   finish
@@ -12,26 +11,16 @@ let b:did_ftplugin = 1
 let s:cpo_save = &cpo
 set cpo&vim
 
-if !exists('current_compiler')
-  compiler context
-endif
+let b:undo_ftplugin = "setl com< cms< def< inc< sua< fo<"
 
-let b:undo_ftplugin = "setl com< cms< def< inc< sua< fo< ofu<"
-      \ . "| unlet! b:match_ignorecase b:match_words b:match_skip"
-
-setlocal comments=b:%D,b:%C,b:%M,:% commentstring=%\ %s formatoptions+=tjcroql2
-if get(b:, 'context_metapost', get(g:, 'context_metapost', 1))
-  setlocal omnifunc=contextcomplete#Complete
-  let g:omni_syntax_group_include_context = 'mf\w\+,mp\w\+'
-  let g:omni_syntax_group_exclude_context = 'mfTodoComment'
-endif
+setlocal comments=b:%D,b:%C,b:%M,:% commentstring=%\ %s formatoptions+=tcroql
 
 let &l:define='\\\%([egx]\|char\|mathchar\|count\|dimen\|muskip\|skip\|toks\)\='
         \ .     'def\|\\font\|\\\%(future\)\=let'
         \ . '\|\\new\%(count\|dimen\|skip\|muskip\|box\|toks\|read\|write'
         \ .     '\|fam\|insert\|if\)'
 
-let &l:include = '^\s*\\\%(input\|component\|product\|project\|environment\)'
+let &l:include = '^\s*\%(input\|component\)'
 
 setlocal suffixesadd=.tex
 
@@ -42,61 +31,5 @@ if exists("loaded_matchit")
         \ '\\start\(\a\+\):\\stop\1'
 endif
 
-let s:context_regex = {
-      \ 'beginsection' : '\\\%(start\)\=\%(\%(sub\)*section\|\%(sub\)*subject\|chapter\|part\|component\|product\|title\)\>',
-      \ 'endsection'   : '\\\%(stop\)\=\%(\%(sub\)*section\|\%(sub\)*subject\|chapter\|part\|component\|product\|title\)\>',
-      \ 'beginblock'   : '\\\%(start\|setup\|define\)',
-      \ 'endblock'     : '\\\%(stop\|setup\|define\)'
-      \ }
-
-function! s:move_around(count, what, flags, visual)
-  if a:visual
-    exe "normal! gv"
-  endif
-  call search(s:context_regex[a:what], a:flags.'s') " 's' sets previous context mark
-  call map(range(2, a:count), 'search(s:context_regex[a:what], a:flags)')
-endfunction
-
-" Move around macros.
-nnoremap <silent><buffer> [[ :<C-U>call <SID>move_around(v:count1, "beginsection", "bW", v:false) <CR>
-vnoremap <silent><buffer> [[ :<C-U>call <SID>move_around(v:count1, "beginsection", "bW", v:true)  <CR>
-nnoremap <silent><buffer> ]] :<C-U>call <SID>move_around(v:count1, "beginsection", "W",  v:false) <CR>
-vnoremap <silent><buffer> ]] :<C-U>call <SID>move_around(v:count1, "beginsection", "W",  v:true)  <CR>
-nnoremap <silent><buffer> [] :<C-U>call <SID>move_around(v:count1, "endsection",   "bW", v:false) <CR>
-vnoremap <silent><buffer> [] :<C-U>call <SID>move_around(v:count1, "endsection",   "bW", v:true)  <CR>
-nnoremap <silent><buffer> ][ :<C-U>call <SID>move_around(v:count1, "endsection",   "W",  v:false) <CR>
-vnoremap <silent><buffer> ][ :<C-U>call <SID>move_around(v:count1, "endsection",   "W",  v:true)  <CR>
-nnoremap <silent><buffer> [{ :<C-U>call <SID>move_around(v:count1, "beginblock",   "bW", v:false) <CR>
-vnoremap <silent><buffer> [{ :<C-U>call <SID>move_around(v:count1, "beginblock",   "bW", v:true)  <CR>
-nnoremap <silent><buffer> ]} :<C-U>call <SID>move_around(v:count1, "endblock",     "W",  v:false) <CR>
-vnoremap <silent><buffer> ]} :<C-U>call <SID>move_around(v:count1, "endblock",     "W",  v:true)  <CR>
-
-" Other useful mappings
-if get(g:, 'context_mappings', 1)
-  let s:tp_regex = '?^$\|^\s*\\\(item\|start\|stop\|blank\|\%(sub\)*section\|chapter\|\%(sub\)*subject\|title\|part\)'
-
-  fun! s:tp()
-    call cursor(search(s:tp_regex, 'bcW') + 1, 1)
-    normal! V
-    call cursor(search(s:tp_regex, 'W') - 1, 1)
-  endf
-
-  " Reflow paragraphs with commands like gqtp ("gq TeX paragraph")
-  onoremap <silent><buffer> tp :<c-u>call <sid>tp()<cr>
-  " Select TeX paragraph
-  vnoremap <silent><buffer> tp <esc>:<c-u>call <sid>tp()<cr>
-
-  " $...$ text object
-  onoremap <silent><buffer> i$ :<c-u>normal! T$vt$<cr>
-  onoremap <silent><buffer> a$ :<c-u>normal! F$vf$<cr>
-  vnoremap <buffer> i$ T$ot$
-  vnoremap <buffer> a$ F$of$
-endif
-
-" Commands for asynchronous typesetting
-command! -buffer -nargs=? -complete=file ConTeXt          call context#typeset(<q-args>)
-command!         -nargs=0                ConTeXtJobStatus call context#job_status()
-command!         -nargs=0                ConTeXtStopJobs  call context#stop_jobs()
-
 let &cpo = s:cpo_save
 unlet s:cpo_save

runtime/ftplugin/crm.vim

@@ -1,7 +1,7 @@
 " Vim filetype plugin file
-" Language:             CRM114
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2008-07-09
+" Language:         CRM114
+" Maintainer:       Nikolai Weibull <now@bitwi.se>
+" Latest Revision:  2008-07-09
 
 if exists("b:did_ftplugin")
   finish

runtime/ftplugin/css.vim

@@ -1,7 +1,7 @@
 " Vim filetype plugin file
-" Language:             CSS
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2008-07-09
+" Language:         CSS
+" Maintainer:       Nikolai Weibull <now@bitwi.se>
+" Latest Revision:  2008-07-09
 
 if exists("b:did_ftplugin")
   finish

runtime/ftplugin/cvsrc.vim

@@ -1,7 +1,7 @@
 " Vim filetype plugin file
-" Language:             cvs(1) RC file
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2008-07-09
+" Language:         cvs(1) RC file
+" Maintainer:       Nikolai Weibull <now@bitwi.se>
+" Latest Revision:  2008-07-09
 
 if exists("b:did_ftplugin")
   finish

runtime/ftplugin/denyhosts.vim

@@ -1,6 +1,6 @@
 " Vim filetype plugin file
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2007-12-04
+" Maintainer:       Nikolai Weibull <now@bitwi.se>
+" Latest Revision:  2007-12-04
 
 if exists("b:did_ftplugin")
   finish

runtime/ftplugin/dictconf.vim

@@ -1,7 +1,7 @@
 " Vim filetype plugin file
-" Language:             dict(1) configuration file
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2008-07-09
+" Language:         dict(1) configuration file
+" Maintainer:       Nikolai Weibull <now@bitwi.se>
+" Latest Revision:  2008-07-09
 
 if exists("b:did_ftplugin")
   finish

runtime/ftplugin/dictdconf.vim

@@ -1,7 +1,7 @@
 " Vim filetype plugin file
-" Language:             dictd(8) configuration file
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2008-07-09
+" Language:         dictd(8) configuration file
+" Maintainer:       Nikolai Weibull <now@bitwi.se>
+" Latest Revision:  2008-07-09
 
 if exists("b:did_ftplugin")
   finish

runtime/ftplugin/dircolors.vim

@@ -1,7 +1,7 @@
 " Vim filetype plugin file
-" Language:             dircolors(1) input file
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2008-07-09
+" Language:         dircolors(1) input file
+" Maintainer:       Nikolai Weibull <now@bitwi.se>
+" Latest Revision:  2008-07-09
 
 if exists("b:did_ftplugin")
   finish

runtime/ftplugin/dosini.vim

@@ -1,7 +1,7 @@
 " Vim filetype plugin file
-" Language:             Configuration File (ini file) for MSDOS/MS Windows
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2008-07-09
+" Language:         Configuration File (ini file) for MSDOS/MS Windows
+" Maintainer:       Nikolai Weibull <now@bitwi.se>
+" Latest Revision:  2008-07-09
 
 if exists("b:did_ftplugin")
   finish

runtime/ftplugin/elinks.vim

@@ -1,7 +1,7 @@
 " Vim filetype plugin file
-" Language:             elinks(1) configuration file
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2008-07-09
+" Language:         elinks(1) configuration file
+" Maintainer:       Nikolai Weibull <now@bitwi.se>
+" Latest Revision:  2008-07-09
 
 if exists("b:did_ftplugin")
   finish

runtime/ftplugin/eterm.vim

@@ -1,7 +1,7 @@
 " Vim filetype plugin file
-" Language:             eterm(1) configuration file
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2008-07-09
+" Language:         eterm(1) configuration file
+" Maintainer:       Nikolai Weibull <now@bitwi.se>
+" Latest Revision:  2008-07-09
 
 if exists("b:did_ftplugin")
   finish