vim-patch:ca63501

Update various runtime files.

ca63501fbc
This commit is contained in:
David Barnett 2016-04-18 09:15:13 -07:00
parent f3d6c443d9
commit 0d264abdd0
12 changed files with 126 additions and 56 deletions

View File

@ -1,7 +1,7 @@
"python3complete.vim - Omni Completion for python "python3complete.vim - Omni Completion for python
" Maintainer: Aaron Griffin <aaronmgriffin@gmail.com> " Maintainer: Aaron Griffin <aaronmgriffin@gmail.com>
" Version: 0.9 " Version: 0.9
" Last Updated: 18 Jun 2009 " Last Updated: 18 Jun 2009 (small fix 2015 Sep 14 from Debian)
" "
" Roland Puntaier: this file contains adaptations for python3 and is parallel to pythoncomplete.vim " Roland Puntaier: this file contains adaptations for python3 and is parallel to pythoncomplete.vim
" "
@ -359,6 +359,7 @@ class PyParser:
def __init__(self): def __init__(self):
self.top = Scope('global',0) self.top = Scope('global',0)
self.scope = self.top self.scope = self.top
self.parserline = 0
def _parsedotname(self,pre=None): def _parsedotname(self,pre=None):
#returns (dottedname, nexttoken) #returns (dottedname, nexttoken)

View File

@ -1,4 +1,4 @@
*cmdline.txt* For Vim version 7.4. Last change: 2015 Jul 28 *cmdline.txt* For Vim version 7.4. Last change: 2015 Sep 25
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -779,12 +779,12 @@ Note: these are typed literally, they are not special keys!
(for FileType, Syntax and SpellFileMissing events). (for FileType, Syntax and SpellFileMissing events).
<sfile> When executing a ":source" command, is replaced with the <sfile> When executing a ":source" command, is replaced with the
file name of the sourced file. *E498* file name of the sourced file. *E498*
When executing a function, is replaced with When executing a function, is replaced with:
"function {function-name}"; function call nesting is "function {function-name}[{lnum}]"
indicated like this: function call nesting is indicated like this:
"function {function-name1}..{function-name2}". Note that "function {function-name1}[{lnum}]..{function-name2}[{lnum}]"
filename-modifiers are useless when <sfile> is used inside Note that filename-modifiers are useless when <sfile> is
a function. used inside a function.
<slnum> When executing a ":source" command, is replaced with the <slnum> When executing a ":source" command, is replaced with the
line number. *E842* line number. *E842*
When executing a function it's the line number relative to When executing a function it's the line number relative to

View File

@ -1,4 +1,4 @@
*eval.txt* For Vim version 7.4. Last change: 2015 Sep 06 *eval.txt* For Vim version 7.4. Last change: 2015 Sep 19
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -6491,6 +6491,9 @@ synID({lnum}, {col}, {trans}) *synID()*
{col} is 1 for the leftmost column, {lnum} is 1 for the first {col} is 1 for the leftmost column, {lnum} is 1 for the first
line. 'synmaxcol' applies, in a longer line zero is returned. line. 'synmaxcol' applies, in a longer line zero is returned.
Note that when the position is after the last character,
that's where the cursor can be in Insert mode, synID() returns
zero.
When {trans} is non-zero, transparent items are reduced to the When {trans} is non-zero, transparent items are reduced to the
item that they reveal. This is useful when wanting to know item that they reveal. This is useful when wanting to know

View File

@ -1,4 +1,4 @@
*insert.txt* For Vim version 7.4. Last change: 2015 Sep 01 *insert.txt* For Vim version 7.4. Last change: 2015 Sep 15
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -148,7 +148,7 @@ CTRL-R CTRL-R {0-9a-z"%#*+/:.-=} *i_CTRL-R_CTRL-R*
CTRL-R a results in "ac". CTRL-R a results in "ac".
CTRL-R CTRL-R a results in "ab^Hc". CTRL-R CTRL-R a results in "ab^Hc".
< Options 'textwidth', 'formatoptions', etc. still apply. If < Options 'textwidth', 'formatoptions', etc. still apply. If
you also want to avoid these, use "<C-R><C-O>r", see below. you also want to avoid these, use CTRL-R CTRL-O, see below.
The '.' register (last inserted text) is still inserted as The '.' register (last inserted text) is still inserted as
typed. typed.

View File

@ -707,7 +707,8 @@ A jump table for the options with a short description can be found at |Q_op|.
line. line.
When 'smartindent' or 'cindent' is on the indent is changed in When 'smartindent' or 'cindent' is on the indent is changed in
a different way. a different way.
The 'autoindent' option is reset when the 'paste' option is set. The 'autoindent' option is reset when the 'paste' option is set and
restored when 'paste' is reset.
{small difference from Vi: After the indent is deleted when typing {small difference from Vi: After the indent is deleted when typing
<Esc> or <CR>, the cursor position when moving up or down is after the <Esc> or <CR>, the cursor position when moving up or down is after the
deleted indent; Vi puts the cursor somewhere in the deleted indent}. deleted indent; Vi puts the cursor somewhere in the deleted indent}.
@ -2276,6 +2277,8 @@ A jump table for the options with a short description can be found at |Q_op|.
<Tab>. Spaces are used in indents with the '>' and '<' commands and <Tab>. Spaces are used in indents with the '>' and '<' commands and
when 'autoindent' is on. To insert a real tab when 'expandtab' is when 'autoindent' is on. To insert a real tab when 'expandtab' is
on, use CTRL-V<Tab>. See also |:retab| and |ins-expandtab|. on, use CTRL-V<Tab>. See also |:retab| and |ins-expandtab|.
This option is reset when the 'paste' option is set and restored when
the 'paste' option is reset.
*'exrc'* *'ex'* *'noexrc'* *'noex'* *'exrc'* *'ex'* *'noexrc'* *'noex'*
'exrc' 'ex' boolean (default off) 'exrc' 'ex' boolean (default off)
@ -4520,19 +4523,21 @@ A jump table for the options with a short description can be found at |Q_op|.
When the 'paste' option is switched on (also when it was already on): When the 'paste' option is switched on (also when it was already on):
- mapping in Insert mode and Command-line mode is disabled - mapping in Insert mode and Command-line mode is disabled
- abbreviations are disabled - abbreviations are disabled
- 'textwidth' is set to 0
- 'wrapmargin' is set to 0
- 'autoindent' is reset - 'autoindent' is reset
- 'smartindent' is reset - 'expandtab' is reset
- 'softtabstop' is set to 0 - 'formatoptions' is used like it is empty
- 'revins' is reset - 'revins' is reset
- 'ruler' is reset - 'ruler' is reset
- 'showmatch' is reset - 'showmatch' is reset
- 'formatoptions' is used like it is empty - 'smartindent' is reset
- 'smarttab' is reset
- 'softtabstop' is set to 0
- 'textwidth' is set to 0
- 'wrapmargin' is set to 0
These options keep their value, but their effect is disabled: These options keep their value, but their effect is disabled:
- 'lisp'
- 'indentexpr'
- 'cindent' - 'cindent'
- 'indentexpr'
- 'lisp'
NOTE: When you start editing another file while the 'paste' option is NOTE: When you start editing another file while the 'paste' option is
on, settings from the modelines or autocommands may change the on, settings from the modelines or autocommands may change the
settings again, causing trouble when pasting text. You might want to settings again, causing trouble when pasting text. You might want to
@ -4855,7 +4860,8 @@ A jump table for the options with a short description can be found at |Q_op|.
Inserting characters in Insert mode will work backwards. See "typing Inserting characters in Insert mode will work backwards. See "typing
backwards" |ins-reverse|. This option can be toggled with the CTRL-_ backwards" |ins-reverse|. This option can be toggled with the CTRL-_
command in Insert mode, when 'allowrevins' is set. command in Insert mode, when 'allowrevins' is set.
NOTE: This option is reset when 'paste' is set. This option is reset when 'paste' is set and restored when 'paste' is
reset.
*'rightleft'* *'rl'* *'norightleft'* *'norl'* *'rightleft'* *'rl'* *'norightleft'* *'norl'*
'rightleft' 'rl' boolean (default off) 'rightleft' 'rl' boolean (default off)
@ -4904,7 +4910,8 @@ A jump table for the options with a short description can be found at |Q_op|.
separated with a dash. separated with a dash.
For an empty line "0-1" is shown. For an empty line "0-1" is shown.
For an empty buffer the line number will also be zero: "0,0-1". For an empty buffer the line number will also be zero: "0,0-1".
This option is reset when the 'paste' option is set. This option is reset when 'paste' is set and restored when 'paste' is
reset.
If you don't want to see the ruler all the time but want to know where If you don't want to see the ruler all the time but want to know where
you are, use "g CTRL-G" |g_CTRL-G|. you are, use "g CTRL-G" |g_CTRL-G|.
@ -5612,7 +5619,9 @@ A jump table for the options with a short description can be found at |Q_op|.
jump is only done if the match can be seen on the screen. The time to jump is only done if the match can be seen on the screen. The time to
show the match can be set with 'matchtime'. show the match can be set with 'matchtime'.
A Beep is given if there is no match (no matter if the match can be A Beep is given if there is no match (no matter if the match can be
seen or not). This option is reset when the 'paste' option is set. seen or not).
This option is reset when 'paste' is set and restored when 'paste' is
reset.
When the 'm' flag is not included in 'cpoptions', typing a character When the 'm' flag is not included in 'cpoptions', typing a character
will immediately move the cursor back to where it belongs. will immediately move the cursor back to where it belongs.
See the "sm" field in 'guicursor' for setting the cursor shape and See the "sm" field in 'guicursor' for setting the cursor shape and
@ -5711,7 +5720,8 @@ A jump table for the options with a short description can be found at |Q_op|.
mapping: ":inoremap # X^H#", where ^H is entered with CTRL-V CTRL-H. mapping: ":inoremap # X^H#", where ^H is entered with CTRL-V CTRL-H.
When using the ">>" command, lines starting with '#' are not shifted When using the ">>" command, lines starting with '#' are not shifted
right. right.
NOTE: When 'paste' is set smart indenting is disabled. This option is reset when 'paste' is set and restored when 'paste' is
reset.
*'smarttab'* *'sta'* *'nosmarttab'* *'nosta'* *'smarttab'* *'sta'* *'nosmarttab'* *'nosta'*
'smarttab' 'sta' boolean (default on) 'smarttab' 'sta' boolean (default on)
@ -5726,6 +5736,8 @@ A jump table for the options with a short description can be found at |Q_op|.
What gets inserted (a <Tab> or spaces) depends on the 'expandtab' What gets inserted (a <Tab> or spaces) depends on the 'expandtab'
option. Also see |ins-expandtab|. When 'expandtab' is not set, the option. Also see |ins-expandtab|. When 'expandtab' is not set, the
number of spaces is minimized by using <Tab>s. number of spaces is minimized by using <Tab>s.
This option is reset when 'paste' is set and restored when 'paste' is
reset.
*'softtabstop'* *'sts'* *'softtabstop'* *'sts'*
'softtabstop' 'sts' number (default 0) 'softtabstop' 'sts' number (default 0)
@ -5738,7 +5750,8 @@ A jump table for the options with a short description can be found at |Q_op|.
commands like "x" still work on the actual characters. commands like "x" still work on the actual characters.
When 'sts' is zero, this feature is off. When 'sts' is zero, this feature is off.
When 'sts' is negative, the value of 'shiftwidth' is used. When 'sts' is negative, the value of 'shiftwidth' is used.
'softtabstop' is set to 0 when the 'paste' option is set. 'softtabstop' is set to 0 when the 'paste' option is set and restored
when 'paste' is reset.
See also |ins-expandtab|. When 'expandtab' is not set, the number of See also |ins-expandtab|. When 'expandtab' is not set, the number of
spaces is minimized by using <Tab>s. spaces is minimized by using <Tab>s.
The 'L' flag in 'cpoptions' changes how tabs are used when 'list' is The 'L' flag in 'cpoptions' changes how tabs are used when 'list' is
@ -6407,8 +6420,10 @@ A jump table for the options with a short description can be found at |Q_op|.
local to buffer local to buffer
Maximum width of text that is being inserted. A longer line will be Maximum width of text that is being inserted. A longer line will be
broken after white space to get this width. A zero value disables broken after white space to get this width. A zero value disables
this. 'textwidth' is set to 0 when the 'paste' option is set. When this.
'textwidth' is zero, 'wrapmargin' may be used. See also 'textwidth' is set to 0 when the 'paste' option is set and restored
when 'paste' is reset.
When 'textwidth' is zero, 'wrapmargin' may be used. See also
'formatoptions' and |ins-textwidth|. 'formatoptions' and |ins-textwidth|.
When 'formatexpr' is set it will be used to break the line. When 'formatexpr' is set it will be used to break the line.

View File

@ -1,7 +1,7 @@
" Vim support file to detect file types " Vim support file to detect file types
" "
" Maintainer: Bram Moolenaar <Bram@vim.org> " Maintainer: Bram Moolenaar <Bram@vim.org>
" Last Change: 2015 Aug 11 " Last Change: 2015 Sep 22
" Listen very carefully, I will say this only once " Listen very carefully, I will say this only once
if exists("did_load_filetypes") if exists("did_load_filetypes")
@ -139,7 +139,7 @@ au BufNewFile,BufRead .arch-inventory,=tagging-method setf arch
au BufNewFile,BufRead *.art setf art au BufNewFile,BufRead *.art setf art
" AsciiDoc " AsciiDoc
au BufNewFile,BufRead *.asciidoc setf asciidoc au BufNewFile,BufRead *.asciidoc,*.adoc setf asciidoc
" ASN.1 " ASN.1
au BufNewFile,BufRead *.asn,*.asn1 setf asn au BufNewFile,BufRead *.asn,*.asn1 setf asn
@ -822,7 +822,7 @@ au BufNewFile,BufRead *.gs setf grads
au BufNewFile,BufRead *.gretl setf gretl au BufNewFile,BufRead *.gretl setf gretl
" Groovy " Groovy
au BufNewFile,BufRead *.groovy setf groovy au BufNewFile,BufRead *.gradle,*.groovy setf groovy
" GNU Server Pages " GNU Server Pages
au BufNewFile,BufRead *.gsp setf gsp au BufNewFile,BufRead *.gsp setf gsp

View File

@ -2,7 +2,7 @@
" Header: "{{{ " Header: "{{{
" Maintainer: Bram Moolenaar " Maintainer: Bram Moolenaar
" Original Author: Andy Wokula <anwoku@yahoo.de> " Original Author: Andy Wokula <anwoku@yahoo.de>
" Last Change: 2015 Jun 12 " Last Change: 2015 Sep 25
" Version: 1.0 " Version: 1.0
" Description: HTML indent script with cached state for faster indenting on a " Description: HTML indent script with cached state for faster indenting on a
" range of lines. " range of lines.
@ -178,13 +178,15 @@ let s:countonly = 0
" 3 "script" " 3 "script"
" 4 "style" " 4 "style"
" 5 comment start " 5 comment start
" 6 conditional comment start
" -1 closing tag " -1 closing tag
" -2 "/pre" " -2 "/pre"
" -3 "/script" " -3 "/script"
" -4 "/style" " -4 "/style"
" -5 comment end " -5 comment end
" -6 conditional comment end
let s:indent_tags = {} let s:indent_tags = {}
let s:endtags = [0,0,0,0,0,0] " long enough for the highest index let s:endtags = [0,0,0,0,0,0,0] " long enough for the highest index
"}}} "}}}
" Add a list of tag names for a pair of <tag> </tag> to "tags". " Add a list of tag names for a pair of <tag> </tag> to "tags".
@ -257,6 +259,7 @@ call s:AddBlockTag('pre', 2)
call s:AddBlockTag('script', 3) call s:AddBlockTag('script', 3)
call s:AddBlockTag('style', 4) call s:AddBlockTag('style', 4)
call s:AddBlockTag('<!--', 5, '-->') call s:AddBlockTag('<!--', 5, '-->')
call s:AddBlockTag('<!--[', 6, '![endif]-->')
"}}} "}}}
" Return non-zero when "tagname" is an opening tag, not being a block tag, for " Return non-zero when "tagname" is an opening tag, not being a block tag, for
@ -291,7 +294,7 @@ func! s:CountITags(text)
let s:nextrel = 0 " relative indent steps for next line [unit &sw]: let s:nextrel = 0 " relative indent steps for next line [unit &sw]:
let s:block = 0 " assume starting outside of a block let s:block = 0 " assume starting outside of a block
let s:countonly = 1 " don't change state let s:countonly = 1 " don't change state
call substitute(a:text, '<\zs/\=\w\+\(-\w\+\)*\>\|<!--\|-->', '\=s:CheckTag(submatch(0))', 'g') call substitute(a:text, '<\zs/\=\w\+\(-\w\+\)*\>\|<!--\[\|\[endif\]-->\|<!--\|-->', '\=s:CheckTag(submatch(0))', 'g')
let s:countonly = 0 let s:countonly = 0
endfunc "}}} endfunc "}}}
@ -303,7 +306,7 @@ func! s:CountTagsAndState(text)
let s:nextrel = 0 " relative indent steps for next line [unit &sw]: let s:nextrel = 0 " relative indent steps for next line [unit &sw]:
let s:block = b:hi_newstate.block let s:block = b:hi_newstate.block
let tmp = substitute(a:text, '<\zs/\=\w\+\(-\w\+\)*\>\|<!--\|-->', '\=s:CheckTag(submatch(0))', 'g') let tmp = substitute(a:text, '<\zs/\=\w\+\(-\w\+\)*\>\|<!--\[\|\[endif\]-->\|<!--\|-->', '\=s:CheckTag(submatch(0))', 'g')
if s:block == 3 if s:block == 3
let b:hi_newstate.scripttype = s:GetScriptType(matchstr(tmp, '\C.*<SCRIPT\>\zs[^>]*')) let b:hi_newstate.scripttype = s:GetScriptType(matchstr(tmp, '\C.*<SCRIPT\>\zs[^>]*'))
endif endif
@ -425,7 +428,7 @@ func! s:FreshState(lnum)
" State: " State:
" lnum last indented line == prevnonblank(a:lnum - 1) " lnum last indented line == prevnonblank(a:lnum - 1)
" block = 0 a:lnum located within special tag: 0:none, 2:<pre>, " block = 0 a:lnum located within special tag: 0:none, 2:<pre>,
" 3:<script>, 4:<style>, 5:<!-- " 3:<script>, 4:<style>, 5:<!--, 6:<!--[
" baseindent use this indent for line a:lnum as a start - kind of " baseindent use this indent for line a:lnum as a start - kind of
" autoindent (if block==0) " autoindent (if block==0)
" scripttype = '' type attribute of a script tag (if block==3) " scripttype = '' type attribute of a script tag (if block==3)
@ -464,10 +467,13 @@ func! s:FreshState(lnum)
" FI " FI
" look back for a blocktag " look back for a blocktag
call cursor(a:lnum, 1) let stopline2 = v:lnum + 1
let [stopline, stopcol] = searchpos('\c<\zs\/\=\%(pre\>\|script\>\|style\>\)', "bW") if has_key(b:hi_indent, 'block') && b:hi_indent.block > 5
if stopline > 0 let [stopline2, stopcol2] = searchpos('<!--', 'bnW')
" fugly ... why isn't there searchstr() endif
let [stopline, stopcol] = searchpos('\c<\zs\/\=\%(pre\>\|script\>\|style\>\)', "bnW")
if stopline > 0 && stopline < stopline2
" ugly ... why isn't there searchstr()
let tagline = tolower(getline(stopline)) let tagline = tolower(getline(stopline))
let blocktag = matchstr(tagline, '\/\=\%(pre\>\|script\>\|style\>\)', stopcol - 1) let blocktag = matchstr(tagline, '\/\=\%(pre\>\|script\>\|style\>\)', stopcol - 1)
if blocktag[0] != "/" if blocktag[0] != "/"
@ -487,23 +493,29 @@ func! s:FreshState(lnum)
" blocktag == "/..." " blocktag == "/..."
let swendtag = match(tagline, '^\s*</') >= 0 let swendtag = match(tagline, '^\s*</') >= 0
if !swendtag if !swendtag
let [bline, bcol] = searchpos('<'.blocktag[1:].'\>', "bW") let [bline, bcol] = searchpos('<'.blocktag[1:].'\>', "bnW")
call s:CountITags(tolower(getline(bline)[: bcol-2])) call s:CountITags(tolower(getline(bline)[: bcol-2]))
let state.baseindent = indent(bline) + (s:curind + s:nextrel) * s:ShiftWidth() let state.baseindent = indent(bline) + (s:curind + s:nextrel) * s:ShiftWidth()
return state return state
endif endif
endif endif
endif endif
if stopline > stopline2
let stopline = stopline2
let stopcol = stopcol2
endif
" else look back for comment " else look back for comment
call cursor(a:lnum, 1) let [comlnum, comcol, found] = searchpos('\(<!--\[\)\|\(<!--\)\|-->', 'bpnW', stopline)
let [comlnum, comcol, found] = searchpos('\(<!--\)\|-->', 'bpW', stopline) if found == 2 || found == 3
if found == 2
" comment opener found, assume a:lnum within comment " comment opener found, assume a:lnum within comment
let state.block = 5 let state.block = (found == 3 ? 5 : 6)
let state.blocklnr = comlnum let state.blocklnr = comlnum
" check preceding tags in the line: " check preceding tags in the line:
call s:CountITags(tolower(getline(comlnum)[: comcol-2])) call s:CountITags(tolower(getline(comlnum)[: comcol-2]))
if found == 2
let state.baseindent = b:hi_indent.baseindent
endif
let state.blocktagind = indent(comlnum) + (s:curind + s:nextrel) * s:ShiftWidth() let state.blocktagind = indent(comlnum) + (s:curind + s:nextrel) * s:ShiftWidth()
return state return state
endif endif
@ -819,6 +831,20 @@ func! s:Alien5()
return indent(prevlnum) return indent(prevlnum)
endfunc "}}} endfunc "}}}
" Return the indent for conditional comment: <!--[ ![endif]-->
func! s:Alien6()
"{{{
let curtext = getline(v:lnum)
if curtext =~ '\s*\zs<!\[endif\]-->'
" current line starts with end of comment, line up with comment start.
let lnum = search('<!--', 'bn')
if lnum > 0
return indent(lnum)
endif
endif
return b:hi_indent.baseindent + s:ShiftWidth()
endfunc "}}}
" When the "lnum" line ends in ">" find the line containing the matching "<". " When the "lnum" line ends in ">" find the line containing the matching "<".
func! HtmlIndent_FindTagStart(lnum) func! HtmlIndent_FindTagStart(lnum)
"{{{ "{{{

View File

@ -1,6 +1,7 @@
" Vim indent file " Vim indent file
" Language: YAML " Language: YAML
" Maintainer: Nikolai Pavlov <zyx.vim@gmail.com> " Maintainer: Nikolai Pavlov <zyx.vim@gmail.com>
" Last Change: 2015 Sep 25
" Only load this indent file when no other was loaded. " Only load this indent file when no other was loaded.
if exists('b:did_indent') if exists('b:did_indent')
@ -115,8 +116,13 @@ function GetYAMLIndent(lnum)
\ s:liststartregex)) \ s:liststartregex))
elseif line =~# s:mapkeyregex elseif line =~# s:mapkeyregex
" Same for line containing mapping key " Same for line containing mapping key
return indent(s:FindPrevLEIndentedLineMatchingRegex(a:lnum, let prevmapline = s:FindPrevLEIndentedLineMatchingRegex(a:lnum,
\ s:mapkeyregex)) \ s:mapkeyregex)
if getline(prevmapline) =~# '^\s*- '
return indent(prevmapline) + 2
else
return indent(prevmapline)
endif
elseif prevline =~# '^\s*- ' elseif prevline =~# '^\s*- '
" - List with " - List with
" multiline scalar " multiline scalar

View File

@ -4,7 +4,7 @@
" Language: CMake " Language: CMake
" Author: Andy Cedilnik <andy.cedilnik@kitware.com> " Author: Andy Cedilnik <andy.cedilnik@kitware.com>
" Maintainer: Karthik Krishnan <karthik.krishnan@kitware.com> " Maintainer: Karthik Krishnan <karthik.krishnan@kitware.com>
" Last Change: 2012 Jun 01 " Last Change: 2015 Sep 25
" (Dominique Pelle added @Spell) " (Dominique Pelle added @Spell)
" Version: $Revision: 1.10 $ " Version: $Revision: 1.10 $
" "
@ -31,9 +31,9 @@ syn region cmakeVariableValue start=/\${/ end=/}/
\ contained oneline contains=CONTAINED,cmakeTodo \ contained oneline contains=CONTAINED,cmakeTodo
syn region cmakeEnvironment start=/\$ENV{/ end=/}/ syn region cmakeEnvironment start=/\$ENV{/ end=/}/
\ contained oneline contains=CONTAINED,cmakeTodo \ contained oneline contains=CONTAINED,cmakeTodo
syn region cmakeString start=/"/ end=/"/ syn region cmakeString start=/"/ end=/"/
\ contains=CONTAINED,cmakeTodo,cmakeOperators \ contains=CONTAINED,cmakeTodo,cmakeOperators
syn region cmakeArguments start=/(/ end=/)/ syn region cmakeArguments start=/(/ end=/)/
\ contains=ALLBUT,cmakeArguments,cmakeTodo \ contains=ALLBUT,cmakeArguments,cmakeTodo
syn keyword cmakeSystemVariables syn keyword cmakeSystemVariables
\ WIN32 UNIX APPLE CYGWIN BORLAND MINGW MSVC MSVC_IDE MSVC60 MSVC70 MSVC71 MSVC80 MSVC90 \ WIN32 UNIX APPLE CYGWIN BORLAND MINGW MSVC MSVC_IDE MSVC60 MSVC70 MSVC71 MSVC80 MSVC90
@ -44,11 +44,11 @@ syn keyword cmakeDeprecated ABSTRACT_FILES BUILD_NAME SOURCE_FILES SOURCE_FILES_
\ nextgroup=cmakeArguments \ nextgroup=cmakeArguments
" The keywords are generated as: cmake --help-command-list | tr "\n" " " " The keywords are generated as: cmake --help-command-list | tr "\n" " "
syn keyword cmakeStatement syn keyword cmakeStatement
\ ADD_CUSTOM_COMMAND ADD_CUSTOM_TARGET ADD_DEFINITIONS ADD_DEPENDENCIES ADD_EXECUTABLE ADD_LIBRARY ADD_SUBDIRECTORY ADD_TEST AUX_SOURCE_DIRECTORY BUILD_COMMAND BUILD_NAME CMAKE_MINIMUM_REQUIRED CONFIGURE_FILE CREATE_TEST_SOURCELIST ELSE ELSEIF ENABLE_LANGUAGE ENABLE_TESTING ENDFOREACH ENDFUNCTION ENDIF ENDMACRO ENDWHILE EXEC_PROGRAM EXECUTE_PROCESS EXPORT_LIBRARY_DEPENDENCIES FILE FIND_FILE FIND_LIBRARY FIND_PACKAGE FIND_PATH FIND_PROGRAM FLTK_WRAP_UI FOREACH FUNCTION GET_CMAKE_PROPERTY GET_DIRECTORY_PROPERTY GET_FILENAME_COMPONENT GET_SOURCE_FILE_PROPERTY GET_TARGET_PROPERTY GET_TEST_PROPERTY IF INCLUDE INCLUDE_DIRECTORIES INCLUDE_EXTERNAL_MSPROJECT INCLUDE_REGULAR_EXPRESSION INSTALL INSTALL_FILES INSTALL_PROGRAMS INSTALL_TARGETS LINK_DIRECTORIES LINK_LIBRARIES LIST LOAD_CACHE LOAD_COMMAND MACRO MAKE_DIRECTORY MARK_AS_ADVANCED MATH MESSAGE OPTION OUTPUT_REQUIRED_FILES PROJECT QT_WRAP_CPP QT_WRAP_UI REMOVE REMOVE_DEFINITIONS SEPARATE_ARGUMENTS SET SET_DIRECTORY_PROPERTIES SET_SOURCE_FILES_PROPERTIES SET_TARGET_PROPERTIES SET_TESTS_PROPERTIES SITE_NAME SOURCE_GROUP STRING SUBDIR_DEPENDS SUBDIRS TARGET_LINK_LIBRARIES TRY_COMPILE TRY_RUN UNSET USE_MANGLED_MESA UTILITY_SOURCE VARIABLE_REQUIRES VTK_MAKE_INSTANTIATOR VTK_WRAP_JAVA VTK_WRAP_PYTHON VTK_WRAP_TCL WHILE WRITE_FILE \ ADD_CUSTOM_COMMAND ADD_CUSTOM_TARGET ADD_DEFINITIONS ADD_DEPENDENCIES ADD_EXECUTABLE ADD_LIBRARY ADD_SUBDIRECTORY ADD_TEST AUX_SOURCE_DIRECTORY BUILD_COMMAND BUILD_NAME CMAKE_MINIMUM_REQUIRED CONFIGURE_FILE CREATE_TEST_SOURCELIST ELSE ELSEIF ENABLE_LANGUAGE ENABLE_TESTING ENDFOREACH ENDFUNCTION ENDIF ENDMACRO ENDWHILE EXEC_PROGRAM EXECUTE_PROCESS EXPORT_LIBRARY_DEPENDENCIES FILE FIND_FILE FIND_LIBRARY FIND_PACKAGE FIND_PATH FIND_PROGRAM FLTK_WRAP_UI FOREACH FUNCTION GET_CMAKE_PROPERTY GET_DIRECTORY_PROPERTY GET_FILENAME_COMPONENT GET_SOURCE_FILE_PROPERTY GET_TARGET_PROPERTY GET_TEST_PROPERTY IF INCLUDE INCLUDE_DIRECTORIES INCLUDE_EXTERNAL_MSPROJECT INCLUDE_REGULAR_EXPRESSION INSTALL INSTALL_FILES INSTALL_PROGRAMS INSTALL_TARGETS LINK_DIRECTORIES LINK_LIBRARIES LIST LOAD_CACHE LOAD_COMMAND MACRO MAKE_DIRECTORY MARK_AS_ADVANCED MATH MESSAGE OPTION OUTPUT_REQUIRED_FILES PROJECT QT_WRAP_CPP QT_WRAP_UI REMOVE REMOVE_DEFINITIONS SEPARATE_ARGUMENTS SET SET_DIRECTORY_PROPERTIES SET_SOURCE_FILES_PROPERTIES SET_TARGET_PROPERTIES SET_TESTS_PROPERTIES SITE_NAME SOURCE_GROUP STRING SUBDIR_DEPENDS SUBDIRS TARGET_LINK_LIBRARIES TRY_COMPILE TRY_RUN UNSET USE_MANGLED_MESA UTILITY_SOURCE VARIABLE_REQUIRES VTK_MAKE_INSTANTIATOR VTK_WRAP_JAVA VTK_WRAP_PYTHON VTK_WRAP_TCL WHILE WRITE_FILE
\ nextgroup=cmakeArguments \ nextgroup=cmakeArguments
syn keyword cmakeTodo syn keyword cmakeTodo
\ TODO FIXME XXX \ TODO FIXME XXX
\ contained \ contained
" Define the default highlighting. " Define the default highlighting.

View File

@ -1,7 +1,7 @@
" Vim syntax file " Vim syntax file
" Language: Python " Language: Python
" Maintainer: Zvezdan Petkovic <zpetkovic@acm.org> " Maintainer: Zvezdan Petkovic <zpetkovic@acm.org>
" Last Change: 2015 Jul 14 " Last Change: 2015 Sep 15
" Credits: Neil Schemenauer <nas@python.ca> " Credits: Neil Schemenauer <nas@python.ca>
" Dmitry Vasiliev " Dmitry Vasiliev
" "
@ -70,6 +70,7 @@ set cpo&vim
" - 'nonlocal' is a keyword in Python 3 and will be highlighted. " - 'nonlocal' is a keyword in Python 3 and will be highlighted.
" - 'print' is a built-in in Python 3 and will be highlighted as " - 'print' is a built-in in Python 3 and will be highlighted as
" built-in below (use 'from __future__ import print_function' in 2) " built-in below (use 'from __future__ import print_function' in 2)
" - async and await were added in Python 3.5 and are soft keywords.
" "
syn keyword pythonStatement False, None, True syn keyword pythonStatement False, None, True
syn keyword pythonStatement as assert break continue del exec global syn keyword pythonStatement as assert break continue del exec global
@ -80,6 +81,7 @@ syn keyword pythonRepeat for while
syn keyword pythonOperator and in is not or syn keyword pythonOperator and in is not or
syn keyword pythonException except finally raise try syn keyword pythonException except finally raise try
syn keyword pythonInclude from import syn keyword pythonInclude from import
syn keyword pythonAsync async await
" Decorators (new in Python 2.4) " Decorators (new in Python 2.4)
syn match pythonDecorator "@" display nextgroup=pythonFunction skipwhite syn match pythonDecorator "@" display nextgroup=pythonFunction skipwhite
@ -230,6 +232,7 @@ if !exists("python_no_exception_highlight")
syn keyword pythonExceptions FileNotFoundError InterruptedError syn keyword pythonExceptions FileNotFoundError InterruptedError
syn keyword pythonExceptions IsADirectoryError NotADirectoryError syn keyword pythonExceptions IsADirectoryError NotADirectoryError
syn keyword pythonExceptions PermissionError ProcessLookupError syn keyword pythonExceptions PermissionError ProcessLookupError
syn keyword pythonExceptions RecursionError StopAsyncIteration
syn keyword pythonExceptions TimeoutError syn keyword pythonExceptions TimeoutError
" builtin exceptions deprecated/removed in Python 3 " builtin exceptions deprecated/removed in Python 3
syn keyword pythonExceptions IOError VMSError WindowsError syn keyword pythonExceptions IOError VMSError WindowsError
@ -286,6 +289,7 @@ if version >= 508 || !exists("did_python_syn_inits")
HiLink pythonOperator Operator HiLink pythonOperator Operator
HiLink pythonException Exception HiLink pythonException Exception
HiLink pythonInclude Include HiLink pythonInclude Include
HiLink pythonAsync Statement
HiLink pythonDecorator Define HiLink pythonDecorator Define
HiLink pythonFunction Function HiLink pythonFunction Function
HiLink pythonComment Comment HiLink pythonComment Comment

View File

@ -1,7 +1,8 @@
" Vim syntax file " Vim syntax file
" Language: screen(1) configuration file " Language: screen(1) configuration file
" Maintainer: Nikolai Weibull <now@bitwi.se> " Maintainer: Dmitri Vereshchagin <dmitri.vereshchagin@gmail.com>
" Latest Revision: 2010-01-03 " Previous Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2015-09-24
if exists("b:current_syntax") if exists("b:current_syntax")
finish finish
@ -76,12 +77,16 @@ syn keyword screenCommands
\ break \ break
\ breaktype \ breaktype
\ bufferfile \ bufferfile
\ bumpleft
\ bumpright
\ c1 \ c1
\ caption \ caption
\ chacl \ chacl
\ charset \ charset
\ chdir \ chdir
\ cjkwidth
\ clear \ clear
\ collapse
\ colon \ colon
\ command \ command
\ compacthist \ compacthist
@ -104,6 +109,7 @@ syn keyword screenCommands
\ deflogin \ deflogin
\ defmode \ defmode
\ defmonitor \ defmonitor
\ defmousetrack
\ defnonblock \ defnonblock
\ defobuflimit \ defobuflimit
\ defscrollback \ defscrollback
@ -113,6 +119,7 @@ syn keyword screenCommands
\ defutf8 \ defutf8
\ defwrap \ defwrap
\ defwritelock \ defwritelock
\ defzombie
\ detach \ detach
\ digraph \ digraph
\ dinfo \ dinfo
@ -126,7 +133,9 @@ syn keyword screenCommands
\ fit \ fit
\ flow \ flow
\ focus \ focus
\ focusminsize
\ gr \ gr
\ group
\ hardcopy \ hardcopy
\ hardcopy_append \ hardcopy_append
\ hardcopydir \ hardcopydir
@ -155,6 +164,7 @@ syn keyword screenCommands
\ maxwin \ maxwin
\ meta \ meta
\ monitor \ monitor
\ mousetrack
\ msgminwait \ msgminwait
\ msgwait \ msgwait
\ multiuser \ multiuser
@ -182,6 +192,7 @@ syn keyword screenCommands
\ register \ register
\ remove \ remove
\ removebuf \ removebuf
\ rendition
\ reset \ reset
\ resize \ resize
\ screen \ screen
@ -197,6 +208,7 @@ syn keyword screenCommands
\ sleep \ sleep
\ slowpaste \ slowpaste
\ sorendition \ sorendition
\ sort
\ source \ source
\ split \ split
\ startup_message \ startup_message
@ -210,6 +222,7 @@ syn keyword screenCommands
\ time \ time
\ title \ title
\ umask \ umask
\ unbindall
\ unsetenv \ unsetenv
\ utf8 \ utf8
\ vbell \ vbell
@ -228,6 +241,7 @@ syn keyword screenCommands
\ xon \ xon
\ zmodem \ zmodem
\ zombie \ zombie
\ zombie_timeout
hi def link screenEscape Special hi def link screenEscape Special
hi def link screenComment Comment hi def link screenComment Comment

View File

@ -4276,7 +4276,8 @@ msgstr ""
"&Abrir para lectura únicamente\n" "&Abrir para lectura únicamente\n"
"&Editar de todas formas\n" "&Editar de todas formas\n"
"&Recuperar\n" "&Recuperar\n"
"&Borrar&Salir\n" "&Borrar\n"
"&Salir\n"
"&Abortar" "&Abortar"
#. #.