mirror of
				https://github.com/neovim/neovim.git
				synced 2025-10-26 12:27:24 +00:00 
			
		
		
		
	vim-patch:681baaf
Update runtime files.
681baaf4a4
Ignore changes to
* doc/channel.txt, doc/eval.txt, doc/usr_41.txt: Channel related docs
* doc/tags: Generated at build time
* doc/todo.txt: Not relevant to Neovim
			
			
This commit is contained in:
		| @@ -1,4 +1,4 @@ | |||||||
| *eval.txt*	For Vim version 7.4.  Last change: 2016 Jan 24 | *eval.txt*	For Vim version 7.4.  Last change: 2016 Feb 04 | ||||||
|  |  | ||||||
|  |  | ||||||
| 		  VIM REFERENCE MANUAL	  by Bram Moolenaar | 		  VIM REFERENCE MANUAL	  by Bram Moolenaar | ||||||
|   | |||||||
| @@ -1,4 +1,4 @@ | |||||||
| *usr_41.txt*	For Vim version 7.4.  Last change: 2016 Jan 28 | *usr_41.txt*	For Vim version 7.4.  Last change: 2016 Feb 02 | ||||||
|  |  | ||||||
| 		     VIM USER MANUAL - by Bram Moolenaar | 		     VIM USER MANUAL - by Bram Moolenaar | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,4 +1,4 @@ | |||||||
| *windows.txt*   For Vim version 7.4.  Last change: 2015 Nov 14 | *windows.txt*   For Vim version 7.4.  Last change: 2016 Feb 01 | ||||||
|  |  | ||||||
|  |  | ||||||
| 		  VIM REFERENCE MANUAL    by Bram Moolenaar | 		  VIM REFERENCE MANUAL    by Bram Moolenaar | ||||||
| @@ -707,8 +707,8 @@ can also get to them with the buffer list commands, like ":bnext". | |||||||
| 							*:bufdo* | 							*:bufdo* | ||||||
| :[range]bufdo[!] {cmd}	Execute {cmd} in each buffer in the buffer list or if | :[range]bufdo[!] {cmd}	Execute {cmd} in each buffer in the buffer list or if | ||||||
| 			[range] is given only for buffers for which their | 			[range] is given only for buffers for which their | ||||||
| 			buffer name is in the [range]. It works like doing | 			buffer number is in the [range]. It works like doing | ||||||
|                         this: > | 			this: > | ||||||
| 				:bfirst | 				:bfirst | ||||||
| 				:{cmd} | 				:{cmd} | ||||||
| 				:bnext | 				:bnext | ||||||
|   | |||||||
| @@ -3,7 +3,7 @@ | |||||||
| " Maintainer:          Christian Brabandt <cb@256bit.org> | " Maintainer:          Christian Brabandt <cb@256bit.org> | ||||||
| " Previous Maintainer: Peter Aronoff <telemachus@arpinum.org> | " Previous Maintainer: Peter Aronoff <telemachus@arpinum.org> | ||||||
| " Original Author:     Nikolai Weibull <now@bitwi.se> | " Original Author:     Nikolai Weibull <now@bitwi.se> | ||||||
| " Latest Revision:     2015-12-15 | " Latest Revision:     2016-01-15 | ||||||
| " License:             Vim (see :h license) | " License:             Vim (see :h license) | ||||||
| " Repository:          https://github.com/chrisbra/vim-sh-indent | " Repository:          https://github.com/chrisbra/vim-sh-indent | ||||||
|  |  | ||||||
| @@ -28,7 +28,7 @@ let s:cpo_save = &cpo | |||||||
| set cpo&vim | set cpo&vim | ||||||
|  |  | ||||||
| function s:buffer_shiftwidth() | function s:buffer_shiftwidth() | ||||||
|   return &shiftwidth |   return shiftwidth() | ||||||
| endfunction | endfunction | ||||||
|  |  | ||||||
| let s:sh_indent_defaults = { | let s:sh_indent_defaults = { | ||||||
|   | |||||||
| @@ -1,9 +1,9 @@ | |||||||
| " Vim syntax file for the D programming language (version 1.076 and 2.063). | " Vim syntax file for the D programming language (version 1.076 and 2.069). | ||||||
| " | " | ||||||
| " Language:     D | " Language:     D | ||||||
| " Maintainer:   Jesse Phillips <Jesse.K.Phillips+D@gmail.com> | " Maintainer:   Jesse Phillips <Jesse.K.Phillips+D@gmail.com> | ||||||
| " Last Change:  2013 October 5 | " Last Change:  2016 Feb 2 | ||||||
| " Version:      0.26 | " Version:      0.28 | ||||||
| " | " | ||||||
| " Contributors: | " Contributors: | ||||||
| "   - Jason Mills: original Maintainer | "   - Jason Mills: original Maintainer | ||||||
| @@ -15,6 +15,7 @@ | |||||||
| "   - Steven N. Oliver | "   - Steven N. Oliver | ||||||
| "   - Sohgo Takeuchi | "   - Sohgo Takeuchi | ||||||
| "   - Robert Clipsham | "   - Robert Clipsham | ||||||
|  | "   - Petar Kirov | ||||||
| " | " | ||||||
| " Please submit bugs/comments/suggestions to the github repo:  | " Please submit bugs/comments/suggestions to the github repo:  | ||||||
| " https://github.com/JesseKPhillips/d.vim | " https://github.com/JesseKPhillips/d.vim | ||||||
| @@ -114,17 +115,19 @@ syn keyword dTraitsIdentifier      contained isIntegral isScalar isStaticArray | |||||||
| syn keyword dTraitsIdentifier      contained isUnsigned isVirtualFunction | syn keyword dTraitsIdentifier      contained isUnsigned isVirtualFunction | ||||||
| syn keyword dTraitsIdentifier      contained isVirtualMethod isAbstractFunction | syn keyword dTraitsIdentifier      contained isVirtualMethod isAbstractFunction | ||||||
| syn keyword dTraitsIdentifier      contained isFinalFunction isStaticFunction | syn keyword dTraitsIdentifier      contained isFinalFunction isStaticFunction | ||||||
|  | syn keyword dTraitsIdentifier      contained isOverrideFunction isTemplate | ||||||
| syn keyword dTraitsIdentifier      contained isRef isOut isLazy hasMember | syn keyword dTraitsIdentifier      contained isRef isOut isLazy hasMember | ||||||
| syn keyword dTraitsIdentifier      contained identifier getAttributes getMember | syn keyword dTraitsIdentifier      contained identifier getAliasThis | ||||||
| syn keyword dTraitsIdentifier      contained getOverloads getProtection | syn keyword dTraitsIdentifier      contained getAttributes getFunctionAttributes getMember | ||||||
| syn keyword dTraitsIdentifier      contained getVirtualFunctions | syn keyword dTraitsIdentifier      contained getOverloads getPointerBitmap getProtection | ||||||
| syn keyword dTraitsIdentifier      contained getVirtualMethods parent | syn keyword dTraitsIdentifier      contained getVirtualFunctions getVirtualIndex | ||||||
| syn keyword dTraitsIdentifier      contained classInstanceSize allMembers | syn keyword dTraitsIdentifier      contained getVirtualMethods getUnitTests | ||||||
|  | syn keyword dTraitsIdentifier      contained parent classInstanceSize allMembers | ||||||
| syn keyword dTraitsIdentifier      contained derivedMembers isSame compiles | syn keyword dTraitsIdentifier      contained derivedMembers isSame compiles | ||||||
| syn keyword dPragmaIdentifier      contained lib msg startaddress GNU_asm | syn keyword dPragmaIdentifier      contained inline lib mangle msg startaddress GNU_asm | ||||||
| syn keyword dExternIdentifier      contained Windows Pascal Java System D | syn keyword dExternIdentifier      contained C C++ D Windows Pascal System Objective-C | ||||||
| syn keyword dAttribute             contained safe trusted system | syn keyword dAttribute             contained safe trusted system | ||||||
| syn keyword dAttribute             contained property disable | syn keyword dAttribute             contained property disable nogc | ||||||
| syn keyword dVersionIdentifier     contained DigitalMars GNU LDC SDC D_NET | syn keyword dVersionIdentifier     contained DigitalMars GNU LDC SDC D_NET | ||||||
| syn keyword dVersionIdentifier     contained X86 X86_64 ARM PPC PPC64 IA64 MIPS MIPS64 Alpha | syn keyword dVersionIdentifier     contained X86 X86_64 ARM PPC PPC64 IA64 MIPS MIPS64 Alpha | ||||||
| syn keyword dVersionIdentifier     contained SPARC SPARC64 S390 S390X HPPA HPPA64 SH SH64 | syn keyword dVersionIdentifier     contained SPARC SPARC64 S390 S390X HPPA HPPA64 SH SH64 | ||||||
| @@ -134,7 +137,7 @@ syn keyword dVersionIdentifier     contained Cygwin MinGW | |||||||
| syn keyword dVersionIdentifier     contained LittleEndian BigEndian | syn keyword dVersionIdentifier     contained LittleEndian BigEndian | ||||||
| syn keyword dVersionIdentifier     contained D_InlineAsm_X86 D_InlineAsm_X86_64 | syn keyword dVersionIdentifier     contained D_InlineAsm_X86 D_InlineAsm_X86_64 | ||||||
| syn keyword dVersionIdentifier     contained D_Version2 D_Coverage D_Ddoc D_LP64 D_PIC | syn keyword dVersionIdentifier     contained D_Version2 D_Coverage D_Ddoc D_LP64 D_PIC | ||||||
| syn keyword dVersionIdentifier     contained unittest none all | syn keyword dVersionIdentifier     contained unittest assert none all | ||||||
|  |  | ||||||
| syn cluster dComment contains=dNestedComment,dBlockComment,dLineComment | syn cluster dComment contains=dNestedComment,dBlockComment,dLineComment | ||||||
|  |  | ||||||
| @@ -168,10 +171,10 @@ syn match dExternal     "\<extern\>" | |||||||
| syn match dExtern       "\<extern\s*([_a-zA-Z][_a-zA-Z0-9\+]*\>"he=s+6 contains=dExternIdentifier | syn match dExtern       "\<extern\s*([_a-zA-Z][_a-zA-Z0-9\+]*\>"he=s+6 contains=dExternIdentifier | ||||||
|  |  | ||||||
| " Make import a region to prevent highlighting keywords | " Make import a region to prevent highlighting keywords | ||||||
| syn region dImport start="import\_s" end=";" contains=dExternal,@dComment | syn region dImport start="\<import\_s" end=";" contains=dExternal,@dComment | ||||||
|  |  | ||||||
| " Make module a region to prevent highlighting keywords | " Make module a region to prevent highlighting keywords | ||||||
| syn region dImport start="module\_s" end=";" contains=dExternal,@dComment | syn region dImport start="\<module\_s" end=";" contains=dExternal,@dComment | ||||||
|  |  | ||||||
| " dTokens is used by the token string highlighting | " dTokens is used by the token string highlighting | ||||||
| syn cluster dTokens contains=dExternal,dConditional,dBranch,dRepeat,dBoolean | syn cluster dTokens contains=dExternal,dConditional,dBranch,dRepeat,dBoolean | ||||||
| @@ -246,13 +249,17 @@ syn match dUnicode "\\u\d\{4\}" | |||||||
|  |  | ||||||
| " String. | " String. | ||||||
| " | " | ||||||
| syn region dString	start=+"+ end=+"[cwd]\=+ skip=+\\\\\|\\"+ contains=dEscSequence,@Spell | syn match	dFormat		display "%\(\d\+\$\)\=[-+' #0*]*\(\d*\|\*\|\*\d\+\$\)\(\.\(\d*\|\*\|\*\d\+\$\)\)\=\([hlL]\|ll\)\=\([bdiuoxXDOUfeEgGcCsSpn]\|\[\^\=.[^]]*\]\)" contained | ||||||
|  | syn match	dFormat		display "%%" contained | ||||||
|  |  | ||||||
|  | syn region dString	start=+"+ end=+"[cwd]\=+ skip=+\\\\\|\\"+ contains=dFormat,dEscSequence,@Spell | ||||||
| syn region dRawString	start=+`+ end=+`[cwd]\=+ contains=@Spell | syn region dRawString	start=+`+ end=+`[cwd]\=+ contains=@Spell | ||||||
| syn region dRawString	start=+r"+ end=+"[cwd]\=+ contains=@Spell | syn region dRawString	start=+r"+ end=+"[cwd]\=+ contains=@Spell | ||||||
| syn region dHexString	start=+x"+ end=+"[cwd]\=+ contains=@Spell | syn region dHexString	start=+x"+ end=+"[cwd]\=+ contains=@Spell | ||||||
| syn region dDelimString	start=+q"\z(.\)+ end=+\z1"+ contains=@Spell | syn region dDelimString	start=+q"\z(.\)+ end=+\z1"+ contains=@Spell | ||||||
| syn region dHereString	start=+q"\z(\I\i*\)\n+ end=+^\z1"+ contains=@Spell | syn region dHereString	start=+q"\z(\I\i*\)\n+ end=+^\z1"+ contains=@Spell | ||||||
|  |  | ||||||
|  |  | ||||||
| " Nesting delimited string contents | " Nesting delimited string contents | ||||||
| " | " | ||||||
| syn region dNestParenString start=+(+ end=+)+ contained transparent contains=dNestParenString,@Spell | syn region dNestParenString start=+(+ end=+)+ contained transparent contains=dNestParenString,@Spell | ||||||
| @@ -276,8 +283,8 @@ syn cluster dTokens add=dString,dRawString,dHexString,dDelimString,dNestString | |||||||
|  |  | ||||||
| " Token strings | " Token strings | ||||||
| " | " | ||||||
| syn region dNestTokenString start=+{+ end=+}+ contained contains=dNestTokenString,@dTokens | syn region dNestTokenString start=+{+ end=+}+ contained contains=dNestTokenString,@dTokens,dFormat | ||||||
| syn region dTokenString matchgroup=dTokenStringBrack transparent start=+q{+ end=+}+ contains=dNestTokenString,@dTokens | syn region dTokenString matchgroup=dTokenStringBrack transparent start=+q{+ end=+}+ contains=dNestTokenString,@dTokens,dFormat | ||||||
|  |  | ||||||
| syn cluster dTokens add=dTokenString | syn cluster dTokens add=dTokenString | ||||||
|  |  | ||||||
| @@ -357,6 +364,7 @@ hi def link dString              String | |||||||
| hi def link dHexString           String | hi def link dHexString           String | ||||||
| hi def link dCharacter           Character | hi def link dCharacter           Character | ||||||
| hi def link dEscSequence         SpecialChar | hi def link dEscSequence         SpecialChar | ||||||
|  | hi def link dFormat              SpecialChar | ||||||
| hi def link dSpecialCharError    Error | hi def link dSpecialCharError    Error | ||||||
| hi def link dOctalError          Error | hi def link dOctalError          Error | ||||||
| hi def link dOperator            Operator | hi def link dOperator            Operator | ||||||
|   | |||||||
| @@ -2,7 +2,7 @@ | |||||||
| " Language:             Zsh shell script | " Language:             Zsh shell script | ||||||
| " Maintainer:           Christian Brabandt <cb@256bit.org> | " Maintainer:           Christian Brabandt <cb@256bit.org> | ||||||
| " Previous Maintainer:  Nikolai Weibull <now@bitwi.se> | " Previous Maintainer:  Nikolai Weibull <now@bitwi.se> | ||||||
| " Latest Revision:      2015-12-25 | " Latest Revision:      2016-01-25 | ||||||
| " License:              Vim (see :h license) | " License:              Vim (see :h license) | ||||||
| " Repository:		https://github.com/chrisbra/vim-zsh | " Repository:		https://github.com/chrisbra/vim-zsh | ||||||
|  |  | ||||||
| @@ -14,6 +14,7 @@ let s:cpo_save = &cpo | |||||||
| set cpo&vim | set cpo&vim | ||||||
|  |  | ||||||
| setlocal iskeyword+=- | setlocal iskeyword+=- | ||||||
|  | setlocal foldmethod=syntax | ||||||
|  |  | ||||||
| syn keyword zshTodo             contained TODO FIXME XXX NOTE | syn keyword zshTodo             contained TODO FIXME XXX NOTE | ||||||
|  |  | ||||||
| @@ -307,19 +308,19 @@ syn match   zshNumber           '[+-]\=\d\+\.\d\+\>' | |||||||
| " TODO: $[...] is the same as $((...)), so add that as well. | " TODO: $[...] is the same as $((...)), so add that as well. | ||||||
| syn cluster zshSubst            contains=zshSubst,zshOldSubst,zshMathSubst | syn cluster zshSubst            contains=zshSubst,zshOldSubst,zshMathSubst | ||||||
| syn region  zshSubst            matchgroup=zshSubstDelim transparent | syn region  zshSubst            matchgroup=zshSubstDelim transparent | ||||||
|                                 \ start='\$(' skip='\\)' end=')' contains=TOP |                                 \ start='\$(' skip='\\)' end=')' contains=TOP fold | ||||||
| syn region  zshParentheses      transparent start='(' skip='\\)' end=')' | syn region  zshParentheses      transparent start='(' skip='\\)' end=')' fold | ||||||
| syn region  zshMathSubst        matchgroup=zshSubstDelim transparent | syn region  zshMathSubst        matchgroup=zshSubstDelim transparent | ||||||
|                                 \ start='\$((' skip='\\)' |                                 \ start='\$((' skip='\\)' | ||||||
|                                 \ matchgroup=zshSubstDelim end='))' |                                 \ matchgroup=zshSubstDelim end='))' | ||||||
|                                 \ contains=zshParentheses,@zshSubst,zshNumber, |                                 \ contains=zshParentheses,@zshSubst,zshNumber, | ||||||
|                                 \ @zshDerefs,zshString keepend |                                 \ @zshDerefs,zshString keepend fold | ||||||
| syn region  zshBrackets         contained transparent start='{' skip='\\}' | syn region  zshBrackets         contained transparent start='{' skip='\\}' | ||||||
|                                 \ end='}' |                                 \ end='}' fold | ||||||
| syn region  zshSubst            matchgroup=zshSubstDelim start='\${' skip='\\}' | syn region  zshSubst            matchgroup=zshSubstDelim start='\${' skip='\\}' | ||||||
|                                 \ end='}' contains=@zshSubst,zshBrackets,zshQuoted,zshString |                                 \ end='}' contains=@zshSubst,zshBrackets,zshQuoted,zshString fold | ||||||
| syn region  zshOldSubst         matchgroup=zshSubstDelim start=+`+ skip=+\\`+ | syn region  zshOldSubst         matchgroup=zshSubstDelim start=+`+ skip=+\\`+ | ||||||
|                                 \ end=+`+ contains=TOP,zshOldSubst |                                 \ end=+`+ contains=TOP,zshOldSubst fold | ||||||
|  |  | ||||||
| syn sync    minlines=50 maxlines=90 | syn sync    minlines=50 maxlines=90 | ||||||
| syn sync    match zshHereDocSync    grouphere   NONE '<<-\=\s*\%(\\\=\S\+\|\(["']\)\S\+\1\)' | syn sync    match zshHereDocSync    grouphere   NONE '<<-\=\s*\%(\\\=\S\+\|\(["']\)\S\+\1\)' | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 James McCoy
					James McCoy