vim-patch:ba3ff539303c

Update runtime files
ba3ff53930
This commit is contained in:
Justin M. Keyes 2019-07-29 01:58:17 +02:00
parent f64486b6b6
commit 80dda68926
14 changed files with 143 additions and 16 deletions

View File

@ -126,7 +126,7 @@ endfunc
" This function checks if one of the first ten lines start with a '@'. In
" that case it is probably a change file.
" If the first line starts with # or ! it's probably a ch file.
" If a line has "main", "include", "//" ir "/*" it's probably ch.
" If a line has "main", "include", "//" or "/*" it's probably ch.
" Otherwise CHILL is assumed.
func dist#ft#FTchange()
let lnum = 1

View File

@ -800,7 +800,7 @@ the |substitute()| function with the following exceptions:
- magic is always set without regard to 'magic'.
- A ~ inserts a tilde literally.
- <CR> and \r inserts a carriage-return (CTRL-M).
- \<CR> does not have a special meaning. it's just one of \x.
- \<CR> does not have a special meaning. It's just one of \x.
Examples: >
:s/a\|b/xxx\0xxx/g modifies "a b" to "xxxaxxx xxxbxxx"

View File

@ -499,7 +499,6 @@ that see the '"' as part of their argument:
:autocmd
:bufdo
:cexpr (and the like)
:call
:cdo (and the like)
:command
:cscope (and the like)

View File

@ -147,10 +147,10 @@ function() or funcref(). When calling the function the Dictionary and/or
arguments will be passed to the function. Example: >
let Cb = function('Callback', ['foo'], myDict)
call Cb()
call Cb('bar')
This will invoke the function as if using: >
call myDict.Callback('foo')
call myDict.Callback('foo', 'bar')
Note that binding a function to a Dictionary also happens when the function is
a member of the Dictionary: >
@ -8819,7 +8819,7 @@ win_getid([{win} [, {tab}]]) *win_getid()*
Get the |window-ID| for the specified window.
When {win} is missing use the current window.
With {win} this is the window number. The top window has
number 1. Use `win_getid(winnr())` for the current window.
number 1.
Without {tab} use the current tab, otherwise the tab with
number {tab}. The first tab has number one.
Return zero if the window cannot be found.

View File

@ -585,8 +585,9 @@ The basics for using flexible indenting are explained in section |30.3| of the
user manual.
If you want to write your own indent file, it must set the 'indentexpr'
option. Setting the 'indentkeys' option is often useful. See the
$VIMRUNTIME/indent directory for examples.
option. Setting the 'indentkeys' option is often useful.
See the $VIMRUNTIME/indent/README.txt file for hints.
See the $VIMRUNTIME/indent directory for examples.
REMARKS ABOUT SPECIFIC INDENT FILES ~

View File

@ -889,7 +889,7 @@ commands can be combined to create a NewGrep command: >
'smartcase' is not used.
If {pattern} is empty (e.g. // is specified), the last
used search pattern is used. |last-pattern|
:{count}vim[grep] ...
When a number is put before the command this is used
as the maximum number of matches to find. Use
":1vimgrep pattern file" to find only the first.

View File

@ -917,6 +917,9 @@ to the respective variable. Example: >
To disable them use ":unlet". Example: >
:unlet c_comment_strings
An alternative is to switch to the C++ highlighting: >
:set filetype=cpp
Variable Highlight ~
*c_gnu* GNU gcc specific items
*c_comment_strings* strings and numbers inside a comment

View File

@ -64,6 +64,10 @@ will not change within a Vim session. The |win_getid()| and |win_id2tabwin()|
functions can be used to convert between the window/tab number and the
identifier. There is also the window number, which may change whenever
windows are opened or closed, see |winnr()|.
The window number is only valid in one specific tab. The window ID is valid
across tabs. For most functions that take a window ID or a window number, the
window number only applies to the current tab, while the window ID can refer
to a window in any tab.
Each buffer has a unique number and the number will not change within a Vim
session. The |bufnr()| and |bufname()| functions can be used to convert

View File

@ -625,7 +625,7 @@ func! s:CSSIndent()
return eval(b:hi_css1indent)
endif
" If the current line starts with "}" align with it's match.
" If the current line starts with "}" align with its match.
if curtext =~ '^\s*}'
call cursor(v:lnum, 1)
try

12
runtime/indent/raml.vim Normal file
View File

@ -0,0 +1,12 @@
" Vim indent file
" Language: RAML (RESTful API Modeling Language)
" Maintainer: mucheng <leisurelicht@gmail.com>
" License: VIM LICENSE
" Latest Revision: 2018-11-03
if exists("b:did_indent")
finish
endif
" Same as yaml indenting.
runtime! indent/yaml.vim

View File

@ -2,7 +2,9 @@
" Repository: https://github.com/chrisbra/vim-xml-ftplugin
" Maintainer: Christian Brabandt <cb@256bit.org>
" Previous Maintainer: Johannes Zellner <johannes@zellner.org>
" Last Change: 20180724 - Correctly indent xml comments https://github.com/vim/vim/issues/3200
" Last Change: 20181022 - Do not overwrite indentkeys setting
" https://github.com/chrisbra/vim-xml-ftplugin/issues/1
" 20180724 - Correctly indent xml comments https://github.com/vim/vim/issues/3200
" Notes: 1) does not indent pure non-xml code (e.g. embedded scripts)
" 2) will be confused by unbalanced tags in comments
" or CDATA sections.
@ -19,7 +21,7 @@ set cpo&vim
" [-- local settings (must come before aborting the script) --]
setlocal indentexpr=XmlIndentGet(v:lnum,1)
setlocal indentkeys=o,O,*<Return>,<>>,<<>,/,{,}
setlocal indentkeys=o,O,*<Return>,<>>,<<>,/,{,},!^F
if !exists('b:xml_indent_open')
let b:xml_indent_open = '.\{-}<\a'

View File

@ -3,7 +3,7 @@
" Maintainer: Debian Vim Maintainers
" Former Maintainers: Gerfried Fuchs <alfie@ist.org>
" Wichert Akkerman <wakkerma@debian.org>
" Last Change: 2018 May 03
" Last Change: 2018 Oct 30
" URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debchangelog.vim
" Standard syntax initialization
@ -21,7 +21,7 @@ let s:binNMU='binary-only=yes'
syn match debchangelogName contained "^[[:alnum:]][[:alnum:].+-]\+ "
exe 'syn match debchangelogFirstKV contained "; \('.s:urgency.'\|'.s:binNMU.'\)"'
exe 'syn match debchangelogOtherKV contained ", \('.s:urgency.'\|'.s:binNMU.'\)"'
syn match debchangelogTarget contained "\v %(frozen|unstable|sid|%(testing|%(old)=stable)%(-proposed-updates|-security)=|experimental|squeeze-%(backports%(-sloppy)=|volatile|lts|security)|%(wheezy|jessie)%(-backports%(-sloppy)=|-security)=|stretch%(-backports|-security)=|%(devel|precise|trusty|vivid|wily|xenial|yakkety|zesty|artful|bionic|cosmic)%(-%(security|proposed|updates|backports|commercial|partner))=)+"
syn match debchangelogTarget contained "\v %(frozen|unstable|sid|%(testing|%(old)=stable)%(-proposed-updates|-security)=|experimental|squeeze-%(backports%(-sloppy)=|volatile|lts|security)|%(wheezy|jessie)%(-backports%(-sloppy)=|-security)=|stretch%(-backports|-security)=|%(devel|precise|trusty|vivid|wily|xenial|yakkety|zesty|artful|bionic|cosmic|disco)%(-%(security|proposed|updates|backports|commercial|partner))=)+"
syn match debchangelogVersion contained "(.\{-})"
syn match debchangelogCloses contained "closes:\_s*\(bug\)\=#\=\_s\=\d\+\(,\_s*\(bug\)\=#\=\_s\=\d\+\)*"
syn match debchangelogLP contained "\clp:\s\+#\d\+\(,\s*#\d\+\)*"

View File

@ -2,7 +2,7 @@
" Language: Debian sources.list
" Maintainer: Debian Vim Maintainers
" Former Maintainer: Matthijs Mohlmann <matthijs@cacholong.nl>
" Last Change: 2018 Aug 11
" Last Change: 2018 Oct 30
" URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debsources.vim
" Standard syntax initialization
@ -25,7 +25,7 @@ let s:supported = [
\ 'oldstable', 'stable', 'testing', 'unstable', 'experimental',
\ 'wheezy', 'jessie', 'stretch', 'sid', 'rc-buggy',
\
\ 'trusty', 'xenial', 'bionic', 'cosmic', 'devel'
\ 'trusty', 'xenial', 'bionic', 'cosmic', 'disco', 'devel'
\ ]
let s:unsupported = [
\ 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato',

106
runtime/syntax/raml.vim Normal file
View File

@ -0,0 +1,106 @@
" Vim syntax file
" Language: RAML (RESTful API Modeling Language)
" Maintainer: Eric Hopkins <eric.on.tech@gmail.com>
" URL: https://github.com/in3d/vim-raml
" License: Same as Vim
" Last Change: 2018-11-03
if exists("b:current_syntax")
finish
endif
let s:cpo_save = &cpo
set cpo&vim
syn keyword ramlTodo contained TODO FIXME XXX NOTE
syn region ramlComment display oneline start='\%(^\|\s\)#' end='$'
\ contains=ramlTodo,@Spell
syn region ramlVersion display oneline start='#%RAML' end='$'
syn match ramlNodeProperty '!\%(![^\\^% ]\+\|[^!][^:/ ]*\)'
syn match ramlAnchor '&.\+'
syn match ramlAlias '\*.\+'
syn match ramlDelimiter '[-,:]'
syn match ramlBlock '[\[\]{}>|]'
syn match ramlOperator '[?+-]'
syn match ramlKey '\h\+\(?\)\?\ze\s*:'
syn match ramlKey '\w\+\(\s\+\w\+\)*\(?\)\?\ze\s*:'
syn match routeKey '\/\w\+\(\s\+\w\+\)*\ze\s*:'
syn match routeKey 'application\/\w\+\ze\s*:'
syn match routeParamKey '\/{\w\+}*\ze\s*:'
syn region ramlString matchgroup=ramlStringDelimiter
\ start=+\s"+ skip=+\\"+ end=+"+
\ contains=ramlEscape
syn region ramlString matchgroup=ramlStringDelimiter
\ start=+\s'+ skip=+''+ end=+'+
\ contains=ramlStringEscape
syn region ramlParameter matchgroup=ramlParameterDelimiter
\ start=+<<+ skip=+''+ end=+>>+
syn match ramlEscape contained display +\\[\\"abefnrtv^0_ NLP]+
syn match ramlEscape contained display '\\x\x\{2}'
syn match ramlEscape contained display '\\u\x\{4}'
syn match ramlEscape contained display '\\U\x\{8}'
syn match ramlEscape display '\\\%(\r\n\|[\r\n]\)'
syn match ramlStringEscape contained +''+
syn match ramlNumber display
\ '\<[+-]\=\d\+\%(\.\d\+\%([eE][+-]\=\d\+\)\=\)\='
syn match ramlNumber display '0\o\+'
syn match ramlNumber display '0x\x\+'
syn match ramlNumber display '([+-]\=[iI]nf)'
syn match ramlNumber display '(NaN)'
syn match ramlConstant '\<[~yn]\>'
syn keyword ramlConstant true True TRUE false False FALSE
syn keyword ramlConstant yes Yes on ON no No off OFF
syn keyword ramlConstant null Null NULL nil Nil NIL
syn keyword httpVerbs get post put delete head patch options
syn keyword ramlTypes string number integer date boolean file
syn match ramlTimestamp '\d\d\d\d-\%(1[0-2]\|\d\)-\%(3[0-2]\|2\d\|1\d\|\d\)\%( \%([01]\d\|2[0-3]\):[0-5]\d:[0-5]\d.\d\d [+-]\%([01]\d\|2[0-3]\):[0-5]\d\|t\%([01]\d\|2[0-3]\):[0-5]\d:[0-5]\d.\d\d[+-]\%([01]\d\|2[0-3]\):[0-5]\d\|T\%([01]\d\|2[0-3]\):[0-5]\d:[0-5]\d.\dZ\)\='
syn region ramlDocumentHeader start='---' end='$' contains=ramlDirective
syn match ramlDocumentEnd '\.\.\.'
syn match ramlDirective contained '%[^:]\+:.\+'
hi def link ramlVersion String
hi def link routeInterpolation String
hi def link ramlInterpolation Constant
hi def link ramlTodo Todo
hi def link ramlComment Comment
hi def link ramlDocumentHeader PreProc
hi def link ramlDocumentEnd PreProc
hi def link ramlDirective Keyword
hi def link ramlNodeProperty Type
hi def link ramlAnchor Type
hi def link ramlAlias Type
hi def link ramlBlock Operator
hi def link ramlOperator Operator
hi def link routeParamKey SpecialChar
hi def link ramlKey Identifier
hi def link routeKey SpecialChar
hi def link ramlParameterDelimiter Type
hi def link ramlParameter Type
hi def link ramlString String
hi def link ramlStringDelimiter ramlString
hi def link ramlEscape SpecialChar
hi def link ramlStringEscape SpecialChar
hi def link ramlNumber Number
hi def link ramlConstant Constant
hi def link ramlTimestamp Number
hi def link httpVerbs Statement
hi def link ramlTypes Type
hi def link ramlDelimiter Delimiter
let b:current_syntax = "raml"
let &cpo = s:cpo_save
unlet s:cpo_save