mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
A few updated runtime files.
This commit is contained in:
Bram Moolenaar
parent
2c6f3dca4e
commit
bc488a76cc
@ -1,4 +1,4 @@
|
|||||||
*syntax.txt* For Vim version 7.3. Last change: 2013 Jun 28
|
*syntax.txt* For Vim version 7.3. Last change: 2013 Jul 05
|
||||||
|
|
||||||
|
|
||||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||||
@ -4384,7 +4384,7 @@ in their own color.
|
|||||||
feature it will output "unknown".
|
feature it will output "unknown".
|
||||||
|
|
||||||
:colo[rscheme] {name} Load color scheme {name}. This searches 'runtimepath'
|
:colo[rscheme] {name} Load color scheme {name}. This searches 'runtimepath'
|
||||||
for the file "colors/{name}.vim. The first one that
|
for the file "colors/{name}.vim". The first one that
|
||||||
is found is loaded.
|
is found is loaded.
|
||||||
To see the name of the currently active color scheme: >
|
To see the name of the currently active color scheme: >
|
||||||
:colo
|
:colo
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
*todo.txt* For Vim version 7.3. Last change: 2013 Jul 04
|
*todo.txt* For Vim version 7.3. Last change: 2013 Jul 05
|
||||||
|
|
||||||
|
|
||||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||||
@ -325,9 +325,11 @@ Jan 19)
|
|||||||
Win32: default for 'backupcopy' is wrong for a symbolic link. (mklink one
|
Win32: default for 'backupcopy' is wrong for a symbolic link. (mklink one
|
||||||
two). (Benjamin Fritz, 2012 Mar 15)
|
two). (Benjamin Fritz, 2012 Mar 15)
|
||||||
|
|
||||||
Need to escape $HOME on Windows? (ZyX, 2011 Jul 21)
|
Need to escape $HOME on Windows? (ZyX, 2011 Jul 21, discussion 2013 Jul 4)
|
||||||
|
Can't simply use a backslash, \$HOME has a different meaning already.
|
||||||
|
Would be possible to use $$HOME where $HOME is to be used.
|
||||||
|
|
||||||
"2" in 'formatopions' not working in comments. (Christian Corneliussen, 2011
|
"2" in 'formatoptions' not working in comments. (Christian Corneliussen, 2011
|
||||||
Oct 26)
|
Oct 26)
|
||||||
|
|
||||||
Bug in repeating Visual "u". (Lawrence Kesteloot, 2010 Dec 20)
|
Bug in repeating Visual "u". (Lawrence Kesteloot, 2010 Dec 20)
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
" Vim syntax file
|
" Vim syntax file
|
||||||
" Language: C
|
" Language: C
|
||||||
" Maintainer: Bram Moolenaar <Bram@vim.org>
|
" Maintainer: Bram Moolenaar <Bram@vim.org>
|
||||||
" Last Change: 2013 Jun 06
|
" Last Change: 2013 Jul 05
|
||||||
|
|
||||||
" Quit when a (custom) syntax file was already loaded
|
" Quit when a (custom) syntax file was already loaded
|
||||||
if exists("b:current_syntax")
|
if exists("b:current_syntax")
|
||||||
@ -11,6 +11,8 @@ endif
|
|||||||
let s:cpo_save = &cpo
|
let s:cpo_save = &cpo
|
||||||
set cpo&vim
|
set cpo&vim
|
||||||
|
|
||||||
|
let s:ft = matchstr(&ft, '^\([^.]\)\+')
|
||||||
|
|
||||||
" A bunch of useful C keywords
|
" A bunch of useful C keywords
|
||||||
syn keyword cStatement goto break return continue asm
|
syn keyword cStatement goto break return continue asm
|
||||||
syn keyword cLabel case default
|
syn keyword cLabel case default
|
||||||
@ -110,7 +112,7 @@ endif
|
|||||||
" But avoid matching <::.
|
" But avoid matching <::.
|
||||||
syn cluster cParenGroup contains=cParenError,cIncluded,cSpecial,cCommentSkip,cCommentString,cComment2String,@cCommentGroup,cCommentStartError,cUserLabel,cBitField,cOctalZero,@cCppOutInGroup,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom
|
syn cluster cParenGroup contains=cParenError,cIncluded,cSpecial,cCommentSkip,cCommentString,cComment2String,@cCommentGroup,cCommentStartError,cUserLabel,cBitField,cOctalZero,@cCppOutInGroup,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom
|
||||||
if exists("c_no_curly_error")
|
if exists("c_no_curly_error")
|
||||||
if &filetype ==# 'cpp' && !exists("cpp_no_cpp11")
|
if s:ft ==# 'cpp' && !exists("cpp_no_cpp11")
|
||||||
syn region cParen transparent start='(' end=')' contains=ALLBUT,@cParenGroup,cCppParen,cCppString,@Spell
|
syn region cParen transparent start='(' end=')' contains=ALLBUT,@cParenGroup,cCppParen,cCppString,@Spell
|
||||||
" cCppParen: same as cParen but ends at end-of-line; used in cDefine
|
" cCppParen: same as cParen but ends at end-of-line; used in cDefine
|
||||||
syn region cCppParen transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@cParenGroup,cParen,cString,@Spell
|
syn region cCppParen transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@cParenGroup,cParen,cString,@Spell
|
||||||
@ -124,7 +126,7 @@ if exists("c_no_curly_error")
|
|||||||
syn match cErrInParen display contained "^[{}]\|^<%\|^%>"
|
syn match cErrInParen display contained "^[{}]\|^<%\|^%>"
|
||||||
endif
|
endif
|
||||||
elseif exists("c_no_bracket_error")
|
elseif exists("c_no_bracket_error")
|
||||||
if &filetype ==# 'cpp' && !exists("cpp_no_cpp11")
|
if s:ft ==# 'cpp' && !exists("cpp_no_cpp11")
|
||||||
syn region cParen transparent start='(' end=')' contains=ALLBUT,@cParenGroup,cCppParen,cCppString,@Spell
|
syn region cParen transparent start='(' end=')' contains=ALLBUT,@cParenGroup,cCppParen,cCppString,@Spell
|
||||||
" cCppParen: same as cParen but ends at end-of-line; used in cDefine
|
" cCppParen: same as cParen but ends at end-of-line; used in cDefine
|
||||||
syn region cCppParen transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@cParenGroup,cParen,cString,@Spell
|
syn region cCppParen transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@cParenGroup,cParen,cString,@Spell
|
||||||
@ -138,7 +140,7 @@ elseif exists("c_no_bracket_error")
|
|||||||
syn match cErrInParen display contained "[{}]\|<%\|%>"
|
syn match cErrInParen display contained "[{}]\|<%\|%>"
|
||||||
endif
|
endif
|
||||||
else
|
else
|
||||||
if &filetype ==# 'cpp' && !exists("cpp_no_cpp11")
|
if s:ft ==# 'cpp' && !exists("cpp_no_cpp11")
|
||||||
syn region cParen transparent start='(' end=')' contains=ALLBUT,@cParenGroup,cCppParen,cErrInBracket,cCppBracket,cCppString,@Spell
|
syn region cParen transparent start='(' end=')' contains=ALLBUT,@cParenGroup,cCppParen,cErrInBracket,cCppBracket,cCppString,@Spell
|
||||||
" cCppParen: same as cParen but ends at end-of-line; used in cDefine
|
" cCppParen: same as cParen but ends at end-of-line; used in cDefine
|
||||||
syn region cCppParen transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@cParenGroup,cErrInBracket,cParen,cBracket,cString,@Spell
|
syn region cCppParen transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@cParenGroup,cErrInBracket,cParen,cBracket,cString,@Spell
|
||||||
@ -158,7 +160,7 @@ else
|
|||||||
syn match cErrInBracket display contained "[);{}]\|<%\|%>"
|
syn match cErrInBracket display contained "[);{}]\|<%\|%>"
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if &filetype ==# 'c' || exists("cpp_no_cpp11")
|
if s:ft ==# 'c' || exists("cpp_no_cpp11")
|
||||||
syn region cBadBlock keepend start="{" end="}" contained containedin=cParen,cBracket,cBadBlock transparent fold
|
syn region cBadBlock keepend start="{" end="}" contained containedin=cParen,cBracket,cBadBlock transparent fold
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@ -370,7 +372,7 @@ syn region cPreProc start="^\s*\(%:\|#\)\s*\(pragma\>\|line\>\|warning\>\|warn\>
|
|||||||
|
|
||||||
" Highlight User Labels
|
" Highlight User Labels
|
||||||
syn cluster cMultiGroup contains=cIncluded,cSpecial,cCommentSkip,cCommentString,cComment2String,@cCommentGroup,cCommentStartError,cUserCont,cUserLabel,cBitField,cOctalZero,cCppOutWrapper,cCppInWrapper,@cCppOutInGroup,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom,cCppParen,cCppBracket,cCppString
|
syn cluster cMultiGroup contains=cIncluded,cSpecial,cCommentSkip,cCommentString,cComment2String,@cCommentGroup,cCommentStartError,cUserCont,cUserLabel,cBitField,cOctalZero,cCppOutWrapper,cCppInWrapper,@cCppOutInGroup,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom,cCppParen,cCppBracket,cCppString
|
||||||
if &filetype ==# 'c' || exists("cpp_no_cpp11")
|
if s:ft ==# 'c' || exists("cpp_no_cpp11")
|
||||||
syn region cMulti transparent start='?' skip='::' end=':' contains=ALLBUT,@cMultiGroup,@Spell
|
syn region cMulti transparent start='?' skip='::' end=':' contains=ALLBUT,@cMultiGroup,@Spell
|
||||||
endif
|
endif
|
||||||
" Avoid matching foo::bar() in C++ by requiring that the next char is not ':'
|
" Avoid matching foo::bar() in C++ by requiring that the next char is not ':'
|
||||||
@ -457,6 +459,8 @@ hi def link cCppOut Comment
|
|||||||
|
|
||||||
let b:current_syntax = "c"
|
let b:current_syntax = "c"
|
||||||
|
|
||||||
|
unlet s:ft
|
||||||
|
|
||||||
let &cpo = s:cpo_save
|
let &cpo = s:cpo_save
|
||||||
unlet s:cpo_save
|
unlet s:cpo_save
|
||||||
" vim: ts=8
|
" vim: ts=8
|
||||||
|
|||||||
@ -2,8 +2,8 @@
|
|||||||
" Language: shell (sh) Korn shell (ksh) bash (sh)
|
" Language: shell (sh) Korn shell (ksh) bash (sh)
|
||||||
" Maintainer: Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
|
" Maintainer: Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
|
||||||
" Previous Maintainer: Lennart Schultz <Lennart.Schultz@ecmwf.int>
|
" Previous Maintainer: Lennart Schultz <Lennart.Schultz@ecmwf.int>
|
||||||
" Last Change: Mar 04, 2013
|
" Last Change: Jul 02, 2013
|
||||||
" Version: 129
|
" Version: 131
|
||||||
" URL: http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax
|
" URL: http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax
|
||||||
" For options and settings, please use: :help ft-sh-syntax
|
" For options and settings, please use: :help ft-sh-syntax
|
||||||
" This file includes many ideas from ?ric Brunet (eric.brunet@ens.fr)
|
" This file includes many ideas from ?ric Brunet (eric.brunet@ens.fr)
|
||||||
@ -30,19 +30,20 @@ endif
|
|||||||
" trying to answer the question: which shell is /bin/sh, really?
|
" trying to answer the question: which shell is /bin/sh, really?
|
||||||
" If the user has not specified any of g:is_kornshell, g:is_bash, g:is_posix, g:is_sh, then guess.
|
" If the user has not specified any of g:is_kornshell, g:is_bash, g:is_posix, g:is_sh, then guess.
|
||||||
if !exists("g:is_kornshell") && !exists("g:is_bash") && !exists("g:is_posix") && !exists("g:is_sh")
|
if !exists("g:is_kornshell") && !exists("g:is_bash") && !exists("g:is_posix") && !exists("g:is_sh")
|
||||||
|
let s:shell = ""
|
||||||
if executable("/bin/sh")
|
if executable("/bin/sh")
|
||||||
if resolve("/bin/sh") =~ 'bash$'
|
let s:shell = resolve("/bin/sh")
|
||||||
let g:is_bash= 1
|
|
||||||
elseif resolve("/bin/sh") =~ 'ksh$'
|
|
||||||
let g:is_ksh = 1
|
|
||||||
endif
|
|
||||||
elseif executable("/usr/bin/sh")
|
elseif executable("/usr/bin/sh")
|
||||||
if resolve("/usr/bin//sh") =~ 'bash$'
|
let s:shell = resolve("/usr/bin/sh")
|
||||||
let g:is_bash= 1
|
|
||||||
elseif resolve("/usr/bin//sh") =~ 'ksh$'
|
|
||||||
let g:is_ksh = 1
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
|
if s:shell =~ 'bash$'
|
||||||
|
let g:is_bash= 1
|
||||||
|
elseif s:shell =~ 'ksh$'
|
||||||
|
let g:is_kornshell = 1
|
||||||
|
elseif s:shell =~ 'dash$'
|
||||||
|
let g:is_posix = 1
|
||||||
|
endif
|
||||||
|
unlet s:shell
|
||||||
endif
|
endif
|
||||||
|
|
||||||
" handling /bin/sh with is_kornshell/is_sh {{{1
|
" handling /bin/sh with is_kornshell/is_sh {{{1
|
||||||
@ -124,7 +125,7 @@ endif
|
|||||||
syn cluster shHereBeginList contains=@shCommandSubList
|
syn cluster shHereBeginList contains=@shCommandSubList
|
||||||
syn cluster shHereList contains=shBeginHere,shHerePayload
|
syn cluster shHereList contains=shBeginHere,shHerePayload
|
||||||
syn cluster shHereListDQ contains=shBeginHere,@shDblQuoteList,shHerePayload
|
syn cluster shHereListDQ contains=shBeginHere,@shDblQuoteList,shHerePayload
|
||||||
syn cluster shIdList contains=shCommandSub,shWrapLineOperator,shSetOption,shDeref,shDerefSimple,shRedir,shExSingleQuote,shExDoubleQuote,shSingleQuote,shDoubleQuote,shExpr,shCtrlSeq,shStringSpecial
|
syn cluster shIdList contains=shCommandSub,shWrapLineOperator,shSetOption,shDeref,shDerefSimple,shRedir,shExSingleQuote,shExDoubleQuote,shSingleQuote,shDoubleQuote,shExpr,shCtrlSeq,shStringSpecial,shAtExpr
|
||||||
syn cluster shIfList contains=@shLoopList,shDblBrace,shDblParen,shFunctionKey,shFunctionOne,shFunctionTwo
|
syn cluster shIfList contains=@shLoopList,shDblBrace,shDblParen,shFunctionKey,shFunctionOne,shFunctionTwo
|
||||||
syn cluster shLoopList contains=@shCaseList,shTestOpr,shExpr,shDblBrace,shConditional,shCaseEsac,shTest,@shErrorList,shSet,shOption
|
syn cluster shLoopList contains=@shCaseList,shTestOpr,shExpr,shDblBrace,shConditional,shCaseEsac,shTest,@shErrorList,shSet,shOption
|
||||||
syn cluster shSubShList contains=@shCommandSubList,shCaseEsac,shColon,shCommandSub,shComment,shDo,shEcho,shExpr,shFor,shIf,shRedir,shSetList,shSource,shStatement,shVariable,shCtrlSeq,shOperator
|
syn cluster shSubShList contains=@shCommandSubList,shCaseEsac,shColon,shCommandSub,shComment,shDo,shEcho,shExpr,shFor,shIf,shRedir,shSetList,shSource,shStatement,shVariable,shCtrlSeq,shOperator
|
||||||
@ -132,8 +133,8 @@ syn cluster shTestList contains=shCharClass,shComment,shCommandSub,shDeref,shDer
|
|||||||
" Echo: {{{1
|
" Echo: {{{1
|
||||||
" ====
|
" ====
|
||||||
" This one is needed INSIDE a CommandSub, so that `echo bla` be correct
|
" This one is needed INSIDE a CommandSub, so that `echo bla` be correct
|
||||||
syn region shEcho matchgroup=shStatement start="\<echo\>" skip="\\$" matchgroup=shEchoDelim end="$" matchgroup=NONE end="[<>;&|()]"me=e-1 end="\d[<>]"me=e-2 end="\s#"me=e-2 contains=@shEchoList skipwhite nextgroup=shQuickComment
|
syn region shEcho matchgroup=shStatement start="\<echo\>" skip="\\$" matchgroup=shEchoDelim end="$" matchgroup=NONE end="[<>;&|()`]"me=e-1 end="\d[<>]"me=e-2 end="\s#"me=e-2 contains=@shEchoList skipwhite nextgroup=shQuickComment
|
||||||
syn region shEcho matchgroup=shStatement start="\<print\>" skip="\\$" matchgroup=shEchoDelim end="$" matchgroup=NONE end="[<>;&|()]"me=e-1 end="\d[<>]"me=e-2 end="\s#"me=e-2 contains=@shEchoList skipwhite nextgroup=shQuickComment
|
syn region shEcho matchgroup=shStatement start="\<print\>" skip="\\$" matchgroup=shEchoDelim end="$" matchgroup=NONE end="[<>;&|()`]"me=e-1 end="\d[<>]"me=e-2 end="\s#"me=e-2 contains=@shEchoList skipwhite nextgroup=shQuickComment
|
||||||
syn match shEchoQuote contained '\%(\\\\\)*\\["`'()]'
|
syn match shEchoQuote contained '\%(\\\\\)*\\["`'()]'
|
||||||
|
|
||||||
" This must be after the strings, so that ... \" will be correct
|
" This must be after the strings, so that ... \" will be correct
|
||||||
@ -167,7 +168,7 @@ endif
|
|||||||
" Options: {{{1
|
" Options: {{{1
|
||||||
" ====================
|
" ====================
|
||||||
syn match shOption "\s\zs[-+][-_a-zA-Z0-9#]\+"
|
syn match shOption "\s\zs[-+][-_a-zA-Z0-9#]\+"
|
||||||
syn match shOption "\s\zs--[^ \t$`'"|]\+"
|
syn match shOption "\s\zs--[^ \t$`'"|);]\+"
|
||||||
|
|
||||||
" File Redirection Highlighted As Operators: {{{1
|
" File Redirection Highlighted As Operators: {{{1
|
||||||
"===========================================
|
"===========================================
|
||||||
@ -263,7 +264,7 @@ endif
|
|||||||
"======
|
"======
|
||||||
syn match shWrapLineOperator "\\$"
|
syn match shWrapLineOperator "\\$"
|
||||||
syn region shCommandSub start="`" skip="\\\\\|\\." end="`" contains=@shCommandSubList
|
syn region shCommandSub start="`" skip="\\\\\|\\." end="`" contains=@shCommandSubList
|
||||||
syn match shEscape contained '\%(\\\\\)*\\.'
|
syn match shEscape contained '\%(^\)\@!\%(\\\\\)*\\.'
|
||||||
|
|
||||||
" $() and $(()): {{{1
|
" $() and $(()): {{{1
|
||||||
" $(..) is not supported by sh (Bourne shell). However, apparently
|
" $(..) is not supported by sh (Bourne shell). However, apparently
|
||||||
@ -339,42 +340,42 @@ syn match shQuickComment contained "#.*$"
|
|||||||
" Here Documents: {{{1
|
" Here Documents: {{{1
|
||||||
" =========================================
|
" =========================================
|
||||||
if version < 600
|
if version < 600
|
||||||
syn region shHereDoc matchgroup=shRedir start="<<\s*\**END[a-zA-Z_0-9]*\**" matchgroup=shRedir end="^END[a-zA-Z_0-9]*$" contains=@shDblQuoteList
|
syn region shHereDoc matchgroup=shRedir01 start="<<\s*\**END[a-zA-Z_0-9]*\**" matchgroup=shRedir01 end="^END[a-zA-Z_0-9]*$" contains=@shDblQuoteList
|
||||||
syn region shHereDoc matchgroup=shRedir start="<<-\s*\**END[a-zA-Z_0-9]*\**" matchgroup=shRedir end="^\s*END[a-zA-Z_0-9]*$" contains=@shDblQuoteList
|
syn region shHereDoc matchgroup=shRedir02 start="<<-\s*\**END[a-zA-Z_0-9]*\**" matchgroup=shRedir02 end="^\s*END[a-zA-Z_0-9]*$" contains=@shDblQuoteList
|
||||||
syn region shHereDoc matchgroup=shRedir start="<<\s*\**EOF\**" matchgroup=shRedir end="^EOF$" contains=@shDblQuoteList
|
syn region shHereDoc matchgroup=shRedir03 start="<<\s*\**EOF\**" matchgroup=shRedir03 end="^EOF$" contains=@shDblQuoteList
|
||||||
syn region shHereDoc matchgroup=shRedir start="<<-\s*\**EOF\**" matchgroup=shRedir end="^\s*EOF$" contains=@shDblQuoteList
|
syn region shHereDoc matchgroup=shRedir04 start="<<-\s*\**EOF\**" matchgroup=shRedir04 end="^\s*EOF$" contains=@shDblQuoteList
|
||||||
syn region shHereDoc matchgroup=shRedir start="<<\s*\**\.\**" matchgroup=shRedir end="^\.$" contains=@shDblQuoteList
|
syn region shHereDoc matchgroup=shRedir05 start="<<\s*\**\.\**" matchgroup=shRedir05 end="^\.$" contains=@shDblQuoteList
|
||||||
syn region shHereDoc matchgroup=shRedir start="<<-\s*\**\.\**" matchgroup=shRedir end="^\s*\.$" contains=@shDblQuoteList
|
syn region shHereDoc matchgroup=shRedir06 start="<<-\s*\**\.\**" matchgroup=shRedir06 end="^\s*\.$" contains=@shDblQuoteList
|
||||||
|
|
||||||
elseif s:sh_fold_heredoc
|
elseif s:sh_fold_heredoc
|
||||||
syn region shHereDoc matchgroup=shRedir fold start="<<\s*\z([^ \t|]*\)" matchgroup=shRedir end="^\z1\s*$" contains=@shDblQuoteList
|
syn region shHereDoc matchgroup=shRedir07 fold start="<<\s*\z([^ \t|]*\)" matchgroup=shRedir07 end="^\z1\s*$" contains=@shDblQuoteList
|
||||||
syn region shHereDoc matchgroup=shRedir fold start="<<\s*\"\z([^ \t|]*\)\"" matchgroup=shRedir end="^\z1\s*$"
|
syn region shHereDoc matchgroup=shRedir08 fold start="<<\s*\"\z([^ \t|]*\)\"" matchgroup=shRedir08 end="^\z1\s*$"
|
||||||
syn region shHereDoc matchgroup=shRedir fold start="<<\s*'\z([^ \t|]*\)'" matchgroup=shRedir end="^\z1\s*$"
|
syn region shHereDoc matchgroup=shRedir09 fold start="<<\s*'\z([^ \t|]*\)'" matchgroup=shRedir09 end="^\z1\s*$"
|
||||||
syn region shHereDoc matchgroup=shRedir fold start="<<-\s*\z([^ \t|]*\)" matchgroup=shRedir end="^\s*\z1\s*$" contains=@shDblQuoteList
|
syn region shHereDoc matchgroup=shRedir10 fold start="<<-\s*\z([^ \t|]*\)" matchgroup=shRedir10 end="^\s*\z1\s*$" contains=@shDblQuoteList
|
||||||
syn region shHereDoc matchgroup=shRedir fold start="<<-\s*\"\z([^ \t|]*\)\"" matchgroup=shRedir end="^\s*\z1\s*$"
|
syn region shHereDoc matchgroup=shRedir11 fold start="<<-\s*\"\z([^ \t|]*\)\"" matchgroup=shRedir11 end="^\s*\z1\s*$"
|
||||||
syn region shHereDoc matchgroup=shRedir fold start="<<-\s*'\z([^ \t|]*\)'" matchgroup=shRedir end="^\s*\z1\s*$"
|
syn region shHereDoc matchgroup=shRedir12 fold start="<<-\s*'\z([^ \t|]*\)'" matchgroup=shRedir12 end="^\s*\z1\s*$"
|
||||||
syn region shHereDoc matchgroup=shRedir fold start="<<\s*\\\_$\_s*\z([^ \t|]*\)" matchgroup=shRedir end="^\z1\s*$"
|
syn region shHereDoc matchgroup=shRedir13 fold start="<<\s*\\\_$\_s*\z([^ \t|]*\)" matchgroup=shRedir13 end="^\z1\s*$"
|
||||||
syn region shHereDoc matchgroup=shRedir fold start="<<\s*\\\_$\_s*\"\z([^ \t|]*\)\"" matchgroup=shRedir end="^\z1\s*$"
|
syn region shHereDoc matchgroup=shRedir14 fold start="<<\s*\\\_$\_s*\"\z([^ \t|]*\)\"" matchgroup=shRedir14 end="^\z1\s*$"
|
||||||
syn region shHereDoc matchgroup=shRedir fold start="<<-\s*\\\_$\_s*'\z([^ \t|]*\)'" matchgroup=shRedir end="^\s*\z1\s*$"
|
syn region shHereDoc matchgroup=shRedir15 fold start="<<-\s*\\\_$\_s*'\z([^ \t|]*\)'" matchgroup=shRedir15 end="^\s*\z1\s*$"
|
||||||
syn region shHereDoc matchgroup=shRedir fold start="<<-\s*\\\_$\_s*\z([^ \t|]*\)" matchgroup=shRedir end="^\s*\z1\s*$"
|
syn region shHereDoc matchgroup=shRedir16 fold start="<<-\s*\\\_$\_s*\z([^ \t|]*\)" matchgroup=shRedir16 end="^\s*\z1\s*$"
|
||||||
syn region shHereDoc matchgroup=shRedir fold start="<<-\s*\\\_$\_s*\"\z([^ \t|]*\)\"" matchgroup=shRedir end="^\s*\z1\s*$"
|
syn region shHereDoc matchgroup=shRedir17 fold start="<<-\s*\\\_$\_s*\"\z([^ \t|]*\)\"" matchgroup=shRedir17 end="^\s*\z1\s*$"
|
||||||
syn region shHereDoc matchgroup=shRedir fold start="<<\s*\\\_$\_s*'\z([^ \t|]*\)'" matchgroup=shRedir end="^\z1\s*$"
|
syn region shHereDoc matchgroup=shRedir18 fold start="<<\s*\\\_$\_s*'\z([^ \t|]*\)'" matchgroup=shRedir18 end="^\z1\s*$"
|
||||||
syn region shHereDoc matchgroup=shRedir fold start="<<\\\z([^ \t|]*\)" matchgroup=shRedir end="^\z1\s*$"
|
syn region shHereDoc matchgroup=shRedir19 fold start="<<\\\z([^ \t|]*\)" matchgroup=shRedir19 end="^\z1\s*$"
|
||||||
|
|
||||||
else
|
else
|
||||||
syn region shHereDoc matchgroup=shRedir start="<<\s*\\\=\z([^ \t|]*\)" matchgroup=shRedir end="^\z1\s*$" contains=@shDblQuoteList
|
syn region shHereDoc matchgroup=shRedir20 start="<<\s*\\\=\z([^ \t|]*\)" matchgroup=shRedir20 end="^\z1\s*$" contains=@shDblQuoteList
|
||||||
syn region shHereDoc matchgroup=shRedir start="<<\s*\"\z([^ \t|]*\)\"" matchgroup=shRedir end="^\z1\s*$"
|
syn region shHereDoc matchgroup=shRedir21 start="<<\s*\"\z([^ \t|]*\)\"" matchgroup=shRedir21 end="^\z1\s*$"
|
||||||
syn region shHereDoc matchgroup=shRedir start="<<-\s*\z([^ \t|]*\)" matchgroup=shRedir end="^\s*\z1\s*$" contains=@shDblQuoteList
|
syn region shHereDoc matchgroup=shRedir22 start="<<-\s*\z([^ \t|]*\)" matchgroup=shRedir22 end="^\s*\z1\s*$" contains=@shDblQuoteList
|
||||||
syn region shHereDoc matchgroup=shRedir start="<<-\s*'\z([^ \t|]*\)'" matchgroup=shRedir end="^\s*\z1\s*$"
|
syn region shHereDoc matchgroup=shRedir23 start="<<-\s*'\z([^ \t|]*\)'" matchgroup=shRedir23 end="^\s*\z1\s*$"
|
||||||
syn region shHereDoc matchgroup=shRedir start="<<\s*'\z([^ \t|]*\)'" matchgroup=shRedir end="^\z1\s*$"
|
syn region shHereDoc matchgroup=shRedir24 start="<<\s*'\z([^ \t|]*\)'" matchgroup=shRedir24 end="^\z1\s*$"
|
||||||
syn region shHereDoc matchgroup=shRedir start="<<-\s*\"\z([^ \t|]*\)\"" matchgroup=shRedir end="^\s*\z1\s*$"
|
syn region shHereDoc matchgroup=shRedir25 start="<<-\s*\"\z([^ \t|]*\)\"" matchgroup=shRedir25 end="^\s*\z1\s*$"
|
||||||
syn region shHereDoc matchgroup=shRedir start="<<\s*\\\_$\_s*\z([^ \t|]*\)" matchgroup=shRedir end="^\z1\s*$"
|
syn region shHereDoc matchgroup=shRedir26 start="<<\s*\\\_$\_s*\z([^ \t|]*\)" matchgroup=shRedir26 end="^\z1\s*$"
|
||||||
syn region shHereDoc matchgroup=shRedir start="<<-\s*\\\_$\_s*\z([^ \t|]*\)" matchgroup=shRedir end="^\s*\z1\s*$"
|
syn region shHereDoc matchgroup=shRedir27 start="<<-\s*\\\_$\_s*\z([^ \t|]*\)" matchgroup=shRedir27 end="^\s*\z1\s*$"
|
||||||
syn region shHereDoc matchgroup=shRedir start="<<-\s*\\\_$\_s*'\z([^ \t|]*\)'" matchgroup=shRedir end="^\s*\z1\s*$"
|
syn region shHereDoc matchgroup=shRedir28 start="<<-\s*\\\_$\_s*'\z([^ \t|]*\)'" matchgroup=shRedir28 end="^\s*\z1\s*$"
|
||||||
syn region shHereDoc matchgroup=shRedir start="<<\s*\\\_$\_s*'\z([^ \t|]*\)'" matchgroup=shRedir end="^\z1\s*$"
|
syn region shHereDoc matchgroup=shRedir29 start="<<\s*\\\_$\_s*'\z([^ \t|]*\)'" matchgroup=shRedir29 end="^\z1\s*$"
|
||||||
syn region shHereDoc matchgroup=shRedir start="<<\s*\\\_$\_s*\"\z([^ \t|]*\)\"" matchgroup=shRedir end="^\z1\s*$"
|
syn region shHereDoc matchgroup=shRedir30 start="<<\s*\\\_$\_s*\"\z([^ \t|]*\)\"" matchgroup=shRedir30 end="^\z1\s*$"
|
||||||
syn region shHereDoc matchgroup=shRedir start="<<-\s*\\\_$\_s*\"\z([^ \t|]*\)\"" matchgroup=shRedir end="^\s*\z1\s*$"
|
syn region shHereDoc matchgroup=shRedir31 start="<<-\s*\\\_$\_s*\"\z([^ \t|]*\)\"" matchgroup=shRedir31 end="^\s*\z1\s*$"
|
||||||
syn region shHereDoc matchgroup=shRedir start="<<\\\z([^ \t|]*\)" matchgroup=shRedir end="^\z1\s*$"
|
syn region shHereDoc matchgroup=shRedir32 start="<<\\\z([^ \t|]*\)" matchgroup=shRedir32 end="^\z1\s*$"
|
||||||
endif
|
endif
|
||||||
|
|
||||||
" Here Strings: {{{1
|
" Here Strings: {{{1
|
||||||
@ -389,14 +390,15 @@ endif
|
|||||||
syn match shSetOption "\s\zs[-+][a-zA-Z0-9]\+\>" contained
|
syn match shSetOption "\s\zs[-+][a-zA-Z0-9]\+\>" contained
|
||||||
syn match shVariable "\<\([bwglsav]:\)\=[a-zA-Z0-9.!@_%+,]*\ze=" nextgroup=shSetIdentifier
|
syn match shVariable "\<\([bwglsav]:\)\=[a-zA-Z0-9.!@_%+,]*\ze=" nextgroup=shSetIdentifier
|
||||||
syn match shSetIdentifier "=" contained nextgroup=shCmdParenRegion,shPattern,shDeref,shDerefSimple,shDoubleQuote,shExDoubleQuote,shSingleQuote,shExSingleQuote
|
syn match shSetIdentifier "=" contained nextgroup=shCmdParenRegion,shPattern,shDeref,shDerefSimple,shDoubleQuote,shExDoubleQuote,shSingleQuote,shExSingleQuote
|
||||||
|
syn region shAtExpr contained start="@(" end=")" contains=@shIdList
|
||||||
if exists("b:is_bash")
|
if exists("b:is_bash")
|
||||||
syn region shSetList oneline matchgroup=shSet start="\<\(declare\|typeset\|local\|export\|unset\)\>\ze[^/]" end="$" matchgroup=shSetListDelim end="\ze[}|);&]" matchgroup=NONE end="\ze\s\+#\|=" contains=@shIdList
|
syn region shSetList oneline matchgroup=shSet start="\<\(declare\|typeset\|local\|export\|unset\)\>\ze[^/]" end="$" matchgroup=shSetListDelim end="\ze[}|);&]" matchgroup=NONE end="\ze\s\+#\|=" contains=@shIdList
|
||||||
syn region shSetList oneline matchgroup=shSet start="\<set\>\ze[^/]" end="\ze[;|)]\|$" matchgroup=shSetListDelim end="\ze[}|);&]" matchgroup=NONE end="\ze\s\+=" contains=@shIdList
|
syn region shSetList oneline matchgroup=shSet start="\<set\>\ze[^/]" end="\ze[;|)]\|$" matchgroup=shSetListDelim end="\ze[}|);&]" matchgroup=NONE end="\ze\s\+=" contains=@shIdList
|
||||||
elseif exists("b:is_kornshell")
|
elseif exists("b:is_kornshell")
|
||||||
syn region shSetList oneline matchgroup=shSet start="\<\(typeset\|export\|unset\)\>\ze[^/]" end="$" matchgroup=shSetListDelim end="\ze[}|);&]" matchgroup=NONE end="\ze\s\+[#=]" contains=@shIdList
|
syn region shSetList oneline matchgroup=shSet start="\<\(typeset\|export\|unset\)\>\ze[^/]" end="$" matchgroup=shSetListDelim end="\ze[}|);&]" matchgroup=NONE end="\ze\s\+[#=]" contains=@shIdList
|
||||||
syn region shSetList oneline matchgroup=shSet start="\<set\>\ze[^/]" end="$" matchgroup=shSetListDelim end="\ze[}|);&]" matchgroup=NONE end="\ze\s\+[#=]" contains=@shIdList
|
syn region shSetList oneline matchgroup=shSet start="\<set\>\ze[^/]" end="$" matchgroup=shSetListDelim end="\ze[}|);&]" matchgroup=NONE end="\ze\s\+[#=]" contains=@shIdList
|
||||||
else
|
else
|
||||||
syn region shSetList oneline matchgroup=shSet start="\<\(set\|export\|unset\)\>\ze[^/]" end="$" matchgroup=shSetListDelim end="\ze[}|);&]" matchgroup=NONE end="\ze\s\+[#=]" contains=@shIdList
|
syn region shSetList oneline matchgroup=shSet start="\<\(set\|export\|unset\)\>\ze[^/]" end="$" matchgroup=shSetListDelim end="\ze[}|);&]" matchgroup=NONE end="\ze\s\+[#=]" contains=@shIdList
|
||||||
endif
|
endif
|
||||||
|
|
||||||
" Functions: {{{1
|
" Functions: {{{1
|
||||||
@ -497,7 +499,8 @@ if exists("b:is_bash")
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
" Arithmetic Parenthesized Expressions: {{{1
|
" Arithmetic Parenthesized Expressions: {{{1
|
||||||
syn region shParen matchgroup=shArithRegion start='[^$]\zs(\%(\ze[^(]\|$\)' end=')' contains=@shArithParenList
|
"syn region shParen matchgroup=shArithRegion start='[^$]\zs(\%(\ze[^(]\|$\)' end=')' contains=@shArithParenList
|
||||||
|
syn region shParen matchgroup=shArithRegion start='\$\@!(\%(\ze[^(]\|$\)' end=')' contains=@shArithParenList
|
||||||
|
|
||||||
" Useful sh Keywords: {{{1
|
" Useful sh Keywords: {{{1
|
||||||
" ===================
|
" ===================
|
||||||
@ -549,6 +552,7 @@ syn sync match shWhileSync grouphere shRepeat "\<while\>"
|
|||||||
" Default Highlighting: {{{1
|
" Default Highlighting: {{{1
|
||||||
" =====================
|
" =====================
|
||||||
hi def link shArithRegion shShellVariables
|
hi def link shArithRegion shShellVariables
|
||||||
|
hi def link shAtExpr shSetList
|
||||||
hi def link shBeginHere shRedir
|
hi def link shBeginHere shRedir
|
||||||
hi def link shCaseBar shConditional
|
hi def link shCaseBar shConditional
|
||||||
hi def link shCaseCommandSub shCommandSub
|
hi def link shCaseCommandSub shCommandSub
|
||||||
@ -655,6 +659,38 @@ hi def link shStatement Statement
|
|||||||
hi def link shString String
|
hi def link shString String
|
||||||
hi def link shTodo Todo
|
hi def link shTodo Todo
|
||||||
hi def link shAlias Identifier
|
hi def link shAlias Identifier
|
||||||
|
hi def link shRedir01 shRedir
|
||||||
|
hi def link shRedir02 shRedir
|
||||||
|
hi def link shRedir03 shRedir
|
||||||
|
hi def link shRedir04 shRedir
|
||||||
|
hi def link shRedir05 shRedir
|
||||||
|
hi def link shRedir06 shRedir
|
||||||
|
hi def link shRedir07 shRedir
|
||||||
|
hi def link shRedir08 shRedir
|
||||||
|
hi def link shRedir09 shRedir
|
||||||
|
hi def link shRedir10 shRedir
|
||||||
|
hi def link shRedir11 shRedir
|
||||||
|
hi def link shRedir12 shRedir
|
||||||
|
hi def link shRedir13 shRedir
|
||||||
|
hi def link shRedir14 shRedir
|
||||||
|
hi def link shRedir15 shRedir
|
||||||
|
hi def link shRedir16 shRedir
|
||||||
|
hi def link shRedir17 shRedir
|
||||||
|
hi def link shRedir18 shRedir
|
||||||
|
hi def link shRedir19 shRedir
|
||||||
|
hi def link shRedir20 shRedir
|
||||||
|
hi def link shRedir21 shRedir
|
||||||
|
hi def link shRedir22 shRedir
|
||||||
|
hi def link shRedir23 shRedir
|
||||||
|
hi def link shRedir24 shRedir
|
||||||
|
hi def link shRedir25 shRedir
|
||||||
|
hi def link shRedir26 shRedir
|
||||||
|
hi def link shRedir27 shRedir
|
||||||
|
hi def link shRedir28 shRedir
|
||||||
|
hi def link shRedir29 shRedir
|
||||||
|
hi def link shRedir30 shRedir
|
||||||
|
hi def link shRedir31 shRedir
|
||||||
|
hi def link shRedir32 shRedir
|
||||||
|
|
||||||
" Set Current Syntax: {{{1
|
" Set Current Syntax: {{{1
|
||||||
" ===================
|
" ===================
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
" Vim syntax file
|
" Vim syntax file
|
||||||
" Language: TeX
|
" Language: TeX
|
||||||
" Maintainer: Charles E. Campbell <NdrchipO@ScampbellPfamily.AbizM>
|
" Maintainer: Charles E. Campbell <NdrchipO@ScampbellPfamily.AbizM>
|
||||||
" Last Change: Mar 11, 2013
|
" Last Change: Jun 24, 2013
|
||||||
" Version: 78
|
" Version: 79
|
||||||
" URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_TEX
|
" URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_TEX
|
||||||
"
|
"
|
||||||
" Notes: {{{1
|
" Notes: {{{1
|
||||||
@ -74,7 +74,7 @@ endif
|
|||||||
" let user determine which classes of concealment will be supported
|
" let user determine which classes of concealment will be supported
|
||||||
" a=accents/ligatures d=delimiters m=math symbols g=Greek s=superscripts/subscripts
|
" a=accents/ligatures d=delimiters m=math symbols g=Greek s=superscripts/subscripts
|
||||||
if !exists("g:tex_conceal")
|
if !exists("g:tex_conceal")
|
||||||
let s:tex_conceal= 'abdmgs'
|
let s:tex_conceal= 'abdmgsS'
|
||||||
else
|
else
|
||||||
let s:tex_conceal= g:tex_conceal
|
let s:tex_conceal= g:tex_conceal
|
||||||
endif
|
endif
|
||||||
@ -529,6 +529,13 @@ if !exists("tex_no_math")
|
|||||||
syn match texOnlyMath "[_^]"
|
syn match texOnlyMath "[_^]"
|
||||||
endif
|
endif
|
||||||
syn match texSpecialChar "\^\^[0-9a-f]\{2}\|\^\^\S"
|
syn match texSpecialChar "\^\^[0-9a-f]\{2}\|\^\^\S"
|
||||||
|
if s:tex_conceal !~ 'S'
|
||||||
|
syn match texSpecialChar '\\glq\>' contained conceal cchar=‚
|
||||||
|
syn match texSpecialChar '\\grq\>' contained conceal cchar=‘
|
||||||
|
syn match texSpecialChar '\\glqq\>' contained conceal cchar=„
|
||||||
|
syn match texSpecialChar '\\grqq\>' contained conceal cchar=“
|
||||||
|
syn match texSpecialChar '\\hyp\>' contained conceal cchar=-
|
||||||
|
endif
|
||||||
|
|
||||||
" Comments: {{{1
|
" Comments: {{{1
|
||||||
" Normal TeX LaTeX : %....
|
" Normal TeX LaTeX : %....
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
" Vim syntax file
|
" Vim syntax file
|
||||||
" Language: Vim 7.3 script
|
" Language: Vim 7.3 script
|
||||||
" Maintainer: Dr. Charles E. Campbell, Jr. <NdrOchipS@PcampbellAfamily.Mbiz>
|
" Maintainer: Dr. Charles E. Campbell, Jr. <NdrOchipS@PcampbellAfamily.Mbiz>
|
||||||
" Last Change: May 29, 2013
|
" Last Change: Jul 05, 2013
|
||||||
" Version: 7.3-25
|
" Version: 7.3-26
|
||||||
" Automatically generated keyword lists: {{{1
|
" Automatically generated keyword lists: {{{1
|
||||||
|
|
||||||
" Quit when a syntax file was already loaded {{{2
|
" Quit when a syntax file was already loaded {{{2
|
||||||
@ -104,9 +104,9 @@ syn match vimNumber "#\x\{6}"
|
|||||||
" All vimCommands are contained by vimIsCommands. {{{2
|
" All vimCommands are contained by vimIsCommands. {{{2
|
||||||
syn match vimCmdSep "[:|]\+" skipwhite nextgroup=vimAddress,vimAutoCmd,vimCommand,vimExtCmd,vimFilter,vimLet,vimMap,vimMark,vimSet,vimSyntax,vimUserCmd
|
syn match vimCmdSep "[:|]\+" skipwhite nextgroup=vimAddress,vimAutoCmd,vimCommand,vimExtCmd,vimFilter,vimLet,vimMap,vimMark,vimSet,vimSyntax,vimUserCmd
|
||||||
syn match vimIsCommand "\<\h\w*\>" contains=vimCommand
|
syn match vimIsCommand "\<\h\w*\>" contains=vimCommand
|
||||||
syn match vimVar contained "\<\h\w*\>"
|
syn match vimVar contained "\<\h[a-zA-Z0-9#_]*\>"
|
||||||
syn match vimVar "\<[bwglsav]:\h\w*\>"
|
syn match vimVar "\<[bwglsav]:\h[a-zA-Z0-9#_]*\>"
|
||||||
syn match vimFBVar contained "\<[bwglsav]:\h\w*\>"
|
syn match vimFBVar contained "\<[bwglsav]:\h[a-zA-Z0-9#_]*\>"
|
||||||
syn keyword vimCommand contained in
|
syn keyword vimCommand contained in
|
||||||
|
|
||||||
" Insertions And Appends: insert append {{{2
|
" Insertions And Appends: insert append {{{2
|
||||||
@ -205,7 +205,7 @@ syn case ignore
|
|||||||
syn keyword vimUserAttrbKey contained bar ban[g] cou[nt] ra[nge] com[plete] n[args] re[gister]
|
syn keyword vimUserAttrbKey contained bar ban[g] cou[nt] ra[nge] com[plete] n[args] re[gister]
|
||||||
syn keyword vimUserAttrbCmplt contained augroup buffer color command compiler cscope dir environment event expression file file_in_path filetype function help highlight locale mapping menu option shellcmd sign syntax tag tag_listfiles var
|
syn keyword vimUserAttrbCmplt contained augroup buffer color command compiler cscope dir environment event expression file file_in_path filetype function help highlight locale mapping menu option shellcmd sign syntax tag tag_listfiles var
|
||||||
syn keyword vimUserAttrbCmplt contained custom customlist nextgroup=vimUserAttrbCmpltFunc,vimUserCmdError
|
syn keyword vimUserAttrbCmplt contained custom customlist nextgroup=vimUserAttrbCmpltFunc,vimUserCmdError
|
||||||
syn match vimUserAttrbCmpltFunc contained ",\%([sS]:\|<[sS][iI][dD]>\)\=\%(\h\w*\%(#\u\w*\)\+\|\u\w*\)"hs=s+1 nextgroup=vimUserCmdError
|
syn match vimUserAttrbCmpltFunc contained ",\%([sS]:\|<[sS][iI][dD]>\)\=\%(\h\w*\%(#\h\w*\)\+\|\h\w*\)"hs=s+1 nextgroup=vimUserCmdError
|
||||||
|
|
||||||
syn case match
|
syn case match
|
||||||
syn match vimUserAttrbCmplt contained "custom,\u\w*"
|
syn match vimUserAttrbCmplt contained "custom,\u\w*"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user