Merge pull request #4111 from nicdumz/vim-5a5f459

vim-patch:5a5f459

5 files changed, 52 insertions, 6 deletions

diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index 140a2f2e66..e17281821c 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 7.4.  Last change: 2014 Sep 23
+*autocmd.txt*   For Vim version 7.4.  Last change: 2015 Mar 21
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -973,6 +973,13 @@ WinLeave			Before leaving a window.  If the window to be
 ==============================================================================
 6. Patterns					*autocmd-patterns* *{pat}*
 
+The {pat} argument can be a comma separated list.  This works as if the
+command was given with each pattern separately.  Thus this command: >
+	:autocmd BufRead *.txt,*.info set et
+Is equivalent to: >
+	:autocmd BufRead *.txt set et
+	:autocmd BufRead *.info set et
+
 The file pattern {pat} is tested for a match against the file name in one of
 two ways:
 1. When there is no '/' in the pattern, Vim checks for a match against only
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index f0747dad1b..4b0450cfbd 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -524,7 +524,7 @@ Funcref to a Dictionary, but the "self" variable is not available then.
 To avoid the extra name for the function it can be defined and directly
 assigned to a Dictionary in this way: >
 	:let mydict = {'data': [0, 1, 2, 3]}
-	:function mydict.len() dict
+	:function mydict.len()
 	:   return len(self.data)
 	:endfunction
 	:echo mydict.len()
diff --git a/runtime/doc/help.txt b/runtime/doc/help.txt
index 766a440cb3..3d44ed83d7 100644
--- a/runtime/doc/help.txt
+++ b/runtime/doc/help.txt
@@ -1,4 +1,4 @@
-*help.txt*	For Vim version 7.4.  Last change: 2012 Dec 06
+*help.txt*	For Vim version 7.4.  Last change: 2015 Apr 11
 
 			VIM - main help file
 									 k
@@ -23,6 +23,7 @@ Get specific help:  It is possible to go directly to whatever you want help
 		      Command-line editing	  c_	   :help c_<Del>
 		      Vim command argument	  -	   :help -r
 		      Option			  '	   :help 'textwidth'
+		      Regular expression	  /	   :help /[
   Search for help:  Type ":help word", then hit CTRL-D to see matching
 		    help entries for "word".
 		    Or use ":helpgrep word". |:helpgrep|
@@ -170,6 +171,16 @@ Standard plugins ~
 |pi_zip.txt|       Zip archive explorer
 
 LOCAL ADDITIONS:				*local-additions*
+|Mines.txt|	The Mines Game 				Jul 30, 2009
+|Tabular.txt|   Configurable, flexible, intuitive text aligning
+|cecutil.txt|	DrChip's Utilities				Jun 11, 2004
+|example.txt|	Example for a locally added help file
+|matchit.txt|   Extended "%" matching
+|pi_netrw.txt|  For Vim version 7.4.  Last change: 2014 Jul 09
+|synchk.txt|	Syntax Checker    			May 15, 2013
+|test.txt|	Testing the hélp cömmånd nôw
+|typecorr.txt|	Plugin for correcting typing mistakes
+|helpp.txt|	Dummy line to avoid an error message
 
 ------------------------------------------------------------------------------
 *bars*		Bars example
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 6603d65645..6aed7441a0 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 7.4.  Last change: 2015 Mar 20
+*syntax.txt*	For Vim version 7.4.  Last change: 2015 Mar 29
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -3307,6 +3307,32 @@ must not click outside of the pixel strings, but feel free to improve it.
 It will look much better with a font in a quadratic cell size, e.g. for X: >
 	:set guifont=-*-clean-medium-r-*-*-8-*-*-*-*-80-*
 
+
+YAML						*yaml.vim* *ft-yaml-syntax*
+
+					*g:yaml_schema* *b:yaml_schema*
+A YAML schema is a combination of a set of tags and a mechanism for resolving 
+non-specific tags. For user this means that YAML parser may, depending on 
+plain scalar contents, treat plain scalar (which can actually be only string 
+and nothing else) as a value of the other type: null, boolean, floating-point, 
+integer. `g:yaml_schema` option determines according to which schema values 
+will be highlighted specially. Supported schemas are
+
+Schema		Description ~
+failsafe	No additional highlighting.
+json		Supports JSON-style numbers, booleans and null.
+core		Supports more number, boolean and null styles.
+pyyaml		In addition to core schema supports highlighting timestamps, 
+		but there are some differences in what is recognized as 
+		numbers and many additional boolean values not present in core 
+		schema.
+
+Default schema is `core`.
+
+Note that schemas are not actually limited to plain scalars, but this is the 
+only difference between schemas defined in YAML specification and the only 
+difference defined in the syntax file.
+
 ==============================================================================
 5. Defining a syntax					*:syn-define* *E410*
 
diff --git a/runtime/doc/usr_02.txt b/runtime/doc/usr_02.txt
index f81a4e3a2c..6a288f8965 100644
--- a/runtime/doc/usr_02.txt
+++ b/runtime/doc/usr_02.txt
@@ -1,4 +1,4 @@
-*usr_02.txt*	For Vim version 7.4.  Last change: 2010 Jul 20
+*usr_02.txt*	For Vim version 7.4.  Last change: 2015 Apr 12
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -516,9 +516,11 @@ Summary: 					*help-summary*  >
 	:help subject()
 <		Function "subject". >
 	:help -subject
-<		Command-line option "-subject". >
+<		Command-line argument "-subject". >
 	:help +subject
 <		Compile-time feature "+subject". >
+	:help /*
+<		Regular expression item "*" >
 	:help EventName
 <		Autocommand event "EventName". >
 	:help digraphs.txt