vim-patch:ade0d3946801

Update runtime files.
https://github.com/vim/vim/commit/ade0d39468014fd55d30f7647a1ac104baff4bc5

6 files changed, 37 insertions, 24 deletions

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 8c3ef7540c..c90c31acf1 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -411,10 +411,11 @@ Examples:
 
 The second form (this is compatible with some versions of Vi):
 
-	[text]{white}{vi:|vim:|Vim:|ex:}[white]se[t] {options}:[text]
+	[text{white}]{vi:|vim:|Vim:|ex:}[white]se[t] {options}:[text]
 
-[text]			any text or empty
-{white}			at least one blank character (<Space> or <Tab>)
+[text{white}]		empty or any text followed by at least one blank
+			character (<Space> or <Tab>); "ex:" always requires at
+			least one blank character
 {vi:|vim:|Vim:|ex:}	the string "vi:", "vim:", "Vim:" or "ex:"
 [white]			optional white space
 se[t]			the string "set " or "se " (note the space); When
@@ -5964,8 +5965,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 <	Beware that an expression is evaluated each and every time the status
 	line is displayed.
 				*stl-%{* *g:actual_curbuf* *g:actual_curwin*
-	While evaluationg %{} the current buffer and current window will be
-	set temporarily to that of the window (and buffer) whose statusline is
+	While evaluating %{} the current buffer and current window will be set
+	temporarily to that of the window (and buffer) whose statusline is
 	currently being drawn.  The expression will evaluate in this context.
 	The variable "g:actual_curbuf" is set to the `bufnr()` number of the
 	real current buffer and "g:actual_curwin" to the |window-ID| of the
diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index 4e5aaab3d6..1a08d6d51f 100644
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -225,8 +225,7 @@ processing a quickfix or location list command, it will be aborted.
 			e.g., a compiler will not compile the same file again,
 			`git commit` will abort the committing process, `fc`
 			(built-in for shells like bash and zsh) will not
-			execute the command, etc.  will not compile the same
-			file again.
+			execute the command, etc.
 			{N} can also be zero, in which case Vim exits
 			normally.
 			WARNING: All changes in files are lost.  It works like
@@ -1090,7 +1089,7 @@ id-utils) in a similar way to its compiler integration (see |:make| above).
 			allowed with |:bufdo|.
 			An example that uses the argument list and avoids
 			errors for files without matches: >
-                                :silent argdo try
+				:silent argdo try
 				  \ | grepadd! something %
 				  \ | catch /E480:/
 				  \ | endtry"
@@ -1266,7 +1265,7 @@ You can force the compiler to ignore makefiles by defining
 b:tex_ignore_makefile or g:tex_ignore_makefile variable (they are checked for
 existence only).
 
-If the compiler chose not to use make, it need to choose a right program for
+If the compiler chose not to use make, it needs to choose a right program for
 processing your input.  If b:tex_flavor or g:tex_flavor (in this precedence)
 variable exists, it defines TeX flavor for :make (actually, this is the name
 of executed command), and if both variables do not exist, it defaults to
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index fde7411f06..98a2830d3f 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -2283,7 +2283,7 @@ contain very long structures that Vim does not synchronize anymore.
 
 PAPP						*papp.vim* *ft-papp-syntax*
 
-The PApp syntax file handles .papp files and, to a lesser extend, .pxml
+The PApp syntax file handles .papp files and, to a lesser extent, .pxml
 and .pxsl files which are all a mixture of perl/xml/html/other using xml
 as the top-level file format.  By default everything inside phtml or pxml
 sections is treated as a string with embedded preprocessor commands.  If
@@ -2655,12 +2655,12 @@ Note: only existence of these options matter, not their value. You can replace
 
 QUAKE						*quake.vim* *ft-quake-syntax*
 
-The Quake syntax definition should work for most any FPS (First Person
-Shooter) based on one of the Quake engines.  However, the command names vary
-a bit between the three games (Quake, Quake 2, and Quake 3 Arena) so the
-syntax definition checks for the existence of three global variables to allow
-users to specify what commands are legal in their files.  The three variables
-can be set for the following effects:
+The Quake syntax definition should work for most FPS (First Person Shooter)
+based on one of the Quake engines.  However, the command names vary a bit
+between the three games (Quake, Quake 2, and Quake 3 Arena) so the syntax
+definition checks for the existence of three global variables to allow users
+to specify what commands are legal in their files.  The three variables can
+be set for the following effects:
 
 set to highlight commands only available in Quake: >
 	:let quake_is_quake1 = 1
@@ -2996,7 +2996,7 @@ variables in your vimrc:
 
    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 nearly the same as setting g:is_kornshell to 1) >
 	let g:is_posix     = 1
 <   bash: >
 	let g:is_bash	   = 1
diff --git a/runtime/doc/usr_11.txt b/runtime/doc/usr_11.txt
index c26f1e8f09..b4149c5438 100644
--- a/runtime/doc/usr_11.txt
+++ b/runtime/doc/usr_11.txt
@@ -211,8 +211,11 @@ will automatically delete it:
 - The flag that the file was modified is not set.
 - The process is not running.
 
+You can programatically deal with this situation with the |FileChangedShell|
+autocommand event.
 
-UNREADABLE SWAP FILE
+
+UNREADABLE SWAP FILE ~
 
 Sometimes the line
 
diff --git a/runtime/syntax/make.vim b/runtime/syntax/make.vim
index 62a591a821..0e057d2eb8 100644
--- a/runtime/syntax/make.vim
+++ b/runtime/syntax/make.vim
@@ -1,9 +1,9 @@
 " Vim syntax file
 " Language:	Makefile
-" Maintainer:	Roland Hieber <rohieb+vim-iR0jGdkV@rohieb.name>
+" Maintainer:	Roland Hieber <rohieb+vim-iR0jGdkV@rohieb.name>, <https://github.com/rohieb>
 " Previous Maintainer:	Claudio Fleiner <claudio@fleiner.com>
-" URL:		https://github.com/vim/vim/syntax/make.vim
-" Last Change:	2019 Dec 04
+" URL:		https://github.com/vim/vim/blob/master/runtime/syntax/make.vim
+" Last Change:	2020 Jan 15
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -42,6 +42,7 @@ syn region makeIdent	start="\${" skip="\\}\|\\\\" end="}" contains=makeStatement
 syn match makeIdent	"\$\$\w*"
 syn match makeIdent	"\$[^({]"
 syn match makeIdent	"^ *[^:#= \t]*\s*[:+?!*]="me=e-2
+syn match makeIdent	"^ *[^:#= \t]*\s*::="me=e-3
 syn match makeIdent	"^ *[^:#= \t]*\s*="me=e-1
 syn match makeIdent	"%"
 
diff --git a/runtime/syntax/xslt.vim b/runtime/syntax/xslt.vim
index 3e0df6acff..900b8ca049 100644
--- a/runtime/syntax/xslt.vim
+++ b/runtime/syntax/xslt.vim
@@ -1,13 +1,14 @@
 " Vim syntax file
 " Language:	XSLT
-" Maintainer:	Johannes Zellner <johannes@zellner.org>
-" Last Change:	Sun, 28 Oct 2001 21:22:24 +0100
+" Maintainer:   Bogdan Barbu <l4b.bogdan.barbu@gmail.com>
+" Previous Maintainer:	Johannes Zellner <johannes@zellner.org>
+" Last Change:	Fri, 17 Jan 2020 07:15:37 +0200
 " Filenames:	*.xsl
 " $Id: xslt.vim,v 1.1 2004/06/13 15:52:10 vimboss Exp $
 
 " REFERENCES:
 "   [1] http://www.w3.org/TR/xslt
-"
+"   [2] http://www.w3.org/TR/xslt20
 
 " Quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -19,11 +20,13 @@ runtime syntax/xml.vim
 syn cluster xmlTagHook add=xslElement
 syn case match
 
+syn match xslElement '\%(xsl:\)\@<=analyze-string'
 syn match xslElement '\%(xsl:\)\@<=apply-imports'
 syn match xslElement '\%(xsl:\)\@<=apply-templates'
 syn match xslElement '\%(xsl:\)\@<=attribute'
 syn match xslElement '\%(xsl:\)\@<=attribute-set'
 syn match xslElement '\%(xsl:\)\@<=call-template'
+syn match xslElement '\%(xsl:\)\@<=character-map'
 syn match xslElement '\%(xsl:\)\@<=choose'
 syn match xslElement '\%(xsl:\)\@<=comment'
 syn match xslElement '\%(xsl:\)\@<=copy'
@@ -33,19 +36,25 @@ syn match xslElement '\%(xsl:\)\@<=document'
 syn match xslElement '\%(xsl:\)\@<=element'
 syn match xslElement '\%(xsl:\)\@<=fallback'
 syn match xslElement '\%(xsl:\)\@<=for-each'
+syn match xslElement '\%(xsl:\)\@<=for-each-group'
+syn match xslElement '\%(xsl:\)\@<=function'
 syn match xslElement '\%(xsl:\)\@<=if'
 syn match xslElement '\%(xsl:\)\@<=include'
 syn match xslElement '\%(xsl:\)\@<=import'
+syn match xslElement '\%(xsl:\)\@<=import-schema'
 syn match xslElement '\%(xsl:\)\@<=key'
 syn match xslElement '\%(xsl:\)\@<=message'
+syn match xslElement '\%(xsl:\)\@<=namespace'
 syn match xslElement '\%(xsl:\)\@<=namespace-alias'
 syn match xslElement '\%(xsl:\)\@<=number'
 syn match xslElement '\%(xsl:\)\@<=otherwise'
 syn match xslElement '\%(xsl:\)\@<=output'
 syn match xslElement '\%(xsl:\)\@<=param'
+syn match xslElement '\%(xsl:\)\@<=perform-sort'
 syn match xslElement '\%(xsl:\)\@<=processing-instruction'
 syn match xslElement '\%(xsl:\)\@<=preserve-space'
 syn match xslElement '\%(xsl:\)\@<=script'
+syn match xslElement '\%(xsl:\)\@<=sequence'
 syn match xslElement '\%(xsl:\)\@<=sort'
 syn match xslElement '\%(xsl:\)\@<=strip-space'
 syn match xslElement '\%(xsl:\)\@<=stylesheet'