From c044ea09094ebd50c48f4869473e31cb67fbedb0 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Fri, 6 Sep 2019 18:21:12 -0700 Subject: [PATCH] vim-patch:088e8e344352 Update runtime files. https://github.com/vim/vim/commit/088e8e3443520dec91a384081e66445a104810bb --- runtime/doc/cmdline.txt | 2 +- runtime/doc/eval.txt | 8 +++++--- runtime/doc/indent.txt | 2 +- runtime/doc/quickfix.txt | 3 +++ runtime/syntax/cs.vim | 26 +++++++++++++++++--------- runtime/syntax/{vuejs.vim => vue.vim} | 0 6 files changed, 27 insertions(+), 14 deletions(-) rename runtime/syntax/{vuejs.vim => vue.vim} (100%) diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt index 46248899a0..ee1f76e4e4 100644 --- a/runtime/doc/cmdline.txt +++ b/runtime/doc/cmdline.txt @@ -660,7 +660,7 @@ commands ":write" and ":global" have the whole file (1,$) as default. If more line specifiers are given than required for the command, the first one(s) will be ignored. -Line numbers may be specified with: *:range* *E14* *{address}* +Line numbers may be specified with: *:range* *{address}* {number} an absolute line number . the current line *:.* $ the last line in the file *:$* diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 93bc7f868d..5032dc16ee 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -3977,12 +3977,12 @@ function({name} [, {arglist}] [, {dict}]) the Funcref and will be used when the Funcref is called. The arguments are passed to the function in front of other - arguments. Example: > + arguments, but after any argument from |method|. Example: > func Callback(arg1, arg2, name) ... - let Func = function('Callback', ['one', 'two']) + let Partial = function('Callback', ['one', 'two']) ... - call Func('name') + call Partial('name') < Invokes the function as with: > call Callback('one', 'two', 'name') @@ -5650,6 +5650,8 @@ map({expr1}, {expr2}) *map()* call map(myDict, {key, val -> key . '-' . val}) < If you do not use "val" you can leave it out: > call map(myDict, {key -> 'item: ' . key}) +< If you do not use "key" you can use a short name: > + call map(myDict, {_, val -> 'item: ' . val}) < The operation is done in-place. If you want a |List| or |Dictionary| to remain unmodified make a copy first: > diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt index a99d84e969..1df0331239 100644 --- a/runtime/doc/indent.txt +++ b/runtime/doc/indent.txt @@ -827,7 +827,7 @@ PHP indenting can be altered in several ways by modifying the values of some global variables: *php-comment* *PHP_autoformatcomment* -To not enable auto-formating of comments by default (if you want to use your +To not enable auto-formatting of comments by default (if you want to use your own 'formatoptions'): > :let g:PHP_autoformatcomment = 0 diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt index 14a25c102d..3ae6d9461f 100644 --- a/runtime/doc/quickfix.txt +++ b/runtime/doc/quickfix.txt @@ -1215,6 +1215,9 @@ replaced with SOH (0x01). Note: By default the difference between upper and lowercase is ignored. If you want to match case, add "\C" to the pattern |/\C|. +Vim will read lines of any length, but only the first 4095 bytes are used, the +rest is ignored. Items can only be 1023 bytes long. + Basic items diff --git a/runtime/syntax/cs.vim b/runtime/syntax/cs.vim index 1652cb63c3..eeb990215d 100644 --- a/runtime/syntax/cs.vim +++ b/runtime/syntax/cs.vim @@ -3,7 +3,7 @@ " Maintainer: Nick Jensen " Former Maintainers: Anduin Withers " Johannes Zellner -" Last Change: 2018-11-26 +" Last Change: 2019-08-01 " Filenames: *.cs " License: Vim (see :h license) " Repository: https://github.com/nickspoons/vim-cs @@ -51,9 +51,11 @@ syn region csTypeOfStatement start="typeof(" end=")" contains=csType, csTypeOf " Punctuation syn match csBraces "[{}\[\]]" display syn match csParens "[()]" display -syn match csOpSymbols "[+\-=]\{1,2}" display -syn match csOpSymbols "[><]\{2}" display -syn match csOpSymbols "\s\zs[><]\ze\_s" display +syn match csOpSymbols "+\{1,2}" display +syn match csOpSymbols "-\{1,2}" display +syn match csOpSymbols "=\{1,2}" display +syn match csOpSymbols ">\{1,2}" display +syn match csOpSymbols "<\{1,2}" display syn match csOpSymbols "[!><+\-*/]=" display syn match csOpSymbols "[!*/^]" display syn match csOpSymbols "=>" display @@ -63,6 +65,9 @@ syn match csLogicSymbols "||" display syn match csLogicSymbols "?" display syn match csLogicSymbols ":" display +" Generics +syn region csGeneric matchgroup=csGenericBraces start="<" end=">" oneline contains=csType,csGeneric,csUserType,csUserIdentifier,csUserInterface,csUserMethod + " Comments " " PROVIDES: @csCommentHook @@ -87,8 +92,8 @@ syn keyword csXmlTag contained list listheader item term description altcomplian syn cluster xmlTagHook add=csXmlTag -syn match csXmlCommentLeader +\/\/\/+ contained -syn match csXmlComment +\/\/\/.*$+ contains=csXmlCommentLeader,@csXml,@Spell +syn match csXmlCommentLeader "///" contained +syn match csXmlComment "///.*$" contains=csXmlCommentLeader,@csXml,@Spell keepend syn include @csXml syntax/xml.vim hi def link xmlRegion Comment @@ -100,7 +105,8 @@ syn region csSummary start="^\s*///