Mercurial > vim
changeset 2494:ed997d0ceb26 vim73
Updated syntax files. (Charles Campbell)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Wed, 04 Aug 2010 23:03:17 +0200 |
| parents | 892c7366db35 |
| children | a847363bf06e |
| files | runtime/doc/syntax.txt runtime/syntax/tex.vim runtime/syntax/vim.vim |
| diffstat | 3 files changed, 173 insertions(+), 47 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -1,4 +1,4 @@ -*syntax.txt* For Vim version 7.3e. Last change: 2010 Jul 28 +*syntax.txt* For Vim version 7.3e. Last change: 2010 Aug 04 VIM REFERENCE MANUAL by Bram Moolenaar @@ -2628,6 +2628,14 @@ prefer that spell checking be disabled i this, put the following in your <.vimrc>: > let g:tex_comment_nospell= 1 < + *tex-verb* +Want Spell Checking in Verbatim Zones?~ + +Often verbatim regions are used for things like source code; seldom does +one want source code spell-checked. However, for those of you who do +want your verbatim zones spell-checked, put the following in your <.vimrc>: > + let g:tex_verbspell= 1 + *tex-runon* Run-on Comments/Math? ~
--- a/runtime/syntax/tex.vim +++ b/runtime/syntax/tex.vim @@ -1,8 +1,8 @@ " Vim syntax file " Language: TeX " Maintainer: Dr. Charles E. Campbell, Jr. <NdrchipO@ScampbellPfamily.AbizM> -" Last Change: Aug 03, 2010 -" Version: 54 +" Last Change: Aug 04, 2010 +" Version: 55 " URL: http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax " " Notes: {{{1 @@ -119,7 +119,7 @@ if !exists("tex_no_math") syn cluster texMatchGroup add=@texMathZones syn cluster texMathDelimGroup contains=texMathDelimBad,texMathDelimKey,texMathDelimSet1,texMathDelimSet2 syn cluster texMathMatchGroup contains=@texMathZones,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texMathDelim,texMathMatcher,texMathOper,texNewCmd,texNewEnv,texRefZone,texSection,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone - syn cluster texMathZoneGroup contains=texComment,texDelimiter,texLength,texMathDelim,texMathMatcher,texMathOper,texMathSymbol,texRefZone,texSpecialChar,texStatement,texTypeSize,texTypeStyle + syn cluster texMathZoneGroup contains=texComment,texDelimiter,texLength,texMathDelim,texMathMatcher,texMathOper,texMathSymbol,texMathText,texRefZone,texSpecialChar,texStatement,texTypeSize,texTypeStyle if !exists("g:tex_no_error") syn cluster texMathMatchGroup add=texMathError syn cluster texMathZoneGroup add=texMathError @@ -365,6 +365,9 @@ if !exists("tex_no_math") syn match texMathOper "[_^=]" contained + " Text Inside Math Zones: {{{2 + syn region texMathText matchgroup=texStatement start='\\\(\(inter\)\=text\|mbox\)\s*{' end='}' contains=@texFoldGroup,@Spell + " \left..something.. and \right..something.. support: {{{2 syn match texMathDelimBad contained "\S" if has("conceal") && &enc == 'utf-8' && s:tex_conceal =~ 'm' @@ -424,24 +427,44 @@ else endif " Separate lines used for verb` and verb# so that the end conditions {{{1 -" will appropriately terminate. Ideally vim would let me save a -" character from the start pattern and re-use it in the end-pattern. -syn region texZone start="\\begin{[vV]erbatim}" end="\\end{[vV]erbatim}\|%stopzone\>" contains=@Spell -" listings package: -syn region texZone start="\\begin{lstlisting}" end="\\end{lstlisting}\|%stopzone\>" contains=@Spell -" moreverb package: -syn region texZone start="\\begin{verbatimtab}" end="\\end{verbatimtab}\|%stopzone\>" contains=@Spell -syn region texZone start="\\begin{verbatimwrite}" end="\\end{verbatimwrite}\|%stopzone\>" contains=@Spell -syn region texZone start="\\begin{boxedverbatim}" end="\\end{boxedverbatim}\|%stopzone\>" contains=@Spell -if version < 600 - syn region texZone start="\\verb\*\=`" end="`\|%stopzone\>" - syn region texZone start="\\verb\*\=#" end="#\|%stopzone\>" +" will appropriately terminate. +" If g:tex_verbspell exists, then verbatim texZones will permit spellchecking there. +if exists("g:tex_verbspell") && g:tex_verbspell + syn region texZone start="\\begin{[vV]erbatim}" end="\\end{[vV]erbatim}\|%stopzone\>" contains=@Spell + " listings package: + syn region texZone start="\\begin{lstlisting}" end="\\end{lstlisting}\|%stopzone\>" contains=@Spell + " moreverb package: + syn region texZone start="\\begin{verbatimtab}" end="\\end{verbatimtab}\|%stopzone\>" contains=@Spell + syn region texZone start="\\begin{verbatimwrite}" end="\\end{verbatimwrite}\|%stopzone\>" contains=@Spell + syn region texZone start="\\begin{boxedverbatim}" end="\\end{boxedverbatim}\|%stopzone\>" contains=@Spell + if version < 600 + syn region texZone start="\\verb\*\=`" end="`\|%stopzone\>" contains=@Spell + syn region texZone start="\\verb\*\=#" end="#\|%stopzone\>" contains=@Spell + else + if b:tex_stylish + syn region texZone start="\\verb\*\=\z([^\ta-zA-Z@]\)" end="\z1\|%stopzone\>" contains=@Spell + else + syn region texZone start="\\verb\*\=\z([^\ta-zA-Z]\)" end="\z1\|%stopzone\>" contains=@Spell + endif + endif else - if b:tex_stylish - syn region texZone start="\\verb\*\=\z([^\ta-zA-Z@]\)" end="\z1\|%stopzone\>" - else - syn region texZone start="\\verb\*\=\z([^\ta-zA-Z]\)" end="\z1\|%stopzone\>" - endif + syn region texZone start="\\begin{[vV]erbatim}" end="\\end{[vV]erbatim}\|%stopzone\>" + " listings package: + syn region texZone start="\\begin{lstlisting}" end="\\end{lstlisting}\|%stopzone\>" + " moreverb package: + syn region texZone start="\\begin{verbatimtab}" end="\\end{verbatimtab}\|%stopzone\>" + syn region texZone start="\\begin{verbatimwrite}" end="\\end{verbatimwrite}\|%stopzone\>" + syn region texZone start="\\begin{boxedverbatim}" end="\\end{boxedverbatim}\|%stopzone\>" + if version < 600 + syn region texZone start="\\verb\*\=`" end="`\|%stopzone\>" + syn region texZone start="\\verb\*\=#" end="#\|%stopzone\>" + else + if b:tex_stylish + syn region texZone start="\\verb\*\=\z([^\ta-zA-Z@]\)" end="\z1\|%stopzone\>" + else + syn region texZone start="\\verb\*\=\z([^\ta-zA-Z]\)" end="\z1\|%stopzone\>" + endif + endif endif " Tex Reference Zones: {{{1 @@ -452,8 +475,8 @@ syn region texRefZone matchgroup=texSta syn region texRefZone matchgroup=texStatement start="\\\(page\|eq\)ref{" end="}\|%stopzone\>" contains=@texRefGroup syn region texRefZone matchgroup=texStatement start="\\v\=ref{" end="}\|%stopzone\>" contains=@texRefGroup syn match texRefZone '\\cite\%([tp]\*\=\)\=' nextgroup=texRefOption,texCite -syn region texRefOption contained matchgroup=Delimiter start='\[' end=']' contains=@texRefGroup nextgroup=texRefOption,texCite -syn region texCite contained matchgroup=Delimiter start='{' end='}' contains=@texRefGroup +syn region texRefOption contained matchgroup=Delimiter start='\[' end=']' contains=@texRefGroup,texRefZone nextgroup=texRefOption,texCite +syn region texCite contained matchgroup=Delimiter start='{' end='}' contains=@texRefGroup,texRefZone,texCite " Handle newcommand, newenvironment : {{{1 syn match texNewCmd "\\newcommand\>" nextgroup=texCmdName skipwhite skipnl @@ -496,9 +519,15 @@ if has("conceal") && &enc == 'utf-8' " Math Symbols {{{2 if s:tex_conceal =~ 'm' + syn match texMathSymbol '\\angle\>' contained conceal cchar=∠ syn match texMathSymbol '\\approx\>' contained conceal cchar=≈ syn match texMathSymbol '\\ast\>' contained conceal cchar=∗ + syn match texMathSymbol '\\asymp\>' contained conceal cchar=≍ + syn match texMathSymbol '\\backepsilon\>' contained conceal cchar=∍ + syn match texMathSymbol '\\backsimeq\>' contained conceal cchar=≃ + syn match texMathSymbol '\\barwedge\>' contained conceal cchar=⊼ syn match texMathSymbol '\\because\>' contained conceal cchar=∵ + syn match texMathSymbol '\\between\>' contained conceal cchar=≬ syn match texMathSymbol '\\bigcap\>' contained conceal cchar=∩ syn match texMathSymbol '\\bigcup\>' contained conceal cchar=∪ syn match texMathSymbol '\\bigodot\>' contained conceal cchar=⊙ @@ -510,34 +539,58 @@ if has("conceal") && &enc == 'utf-8' syn match texMathSymbol '\\bigwedge\>' contained conceal cchar=⋀ syn match texMathSymbol '\\blacksquare\>' contained conceal cchar=∎ syn match texMathSymbol '\\bot\>' contained conceal cchar=⊥ + syn match texMathSymbol '\\boxdot\>' contained conceal cchar=⊡ + syn match texMathSymbol '\\boxminus\>' contained conceal cchar=⊟ + syn match texMathSymbol '\\boxplus\>' contained conceal cchar=⊞ + syn match texMathSymbol '\\boxtimes\>' contained conceal cchar=⊠ + syn match texMathSymbol '\\bumpeq\>' contained conceal cchar=≏ + syn match texMathSymbol '\\Bumpeq\>' contained conceal cchar=≎ syn match texMathSymbol '\\cap\>' contained conceal cchar=∩ + syn match texMathSymbol '\\Cap\>' contained conceal cchar=⋒ syn match texMathSymbol '\\cdot\>' contained conceal cchar=· syn match texMathSymbol '\\cdots\>' contained conceal cchar=⋯ syn match texMathSymbol '\\circ\>' contained conceal cchar=∘ + syn match texMathSymbol '\\circeq\>' contained conceal cchar=≗ + syn match texMathSymbol '\\circledast\>' contained conceal cchar=⊛ syn match texMathSymbol '\\circledcirc\>' contained conceal cchar=⊚ + syn match texMathSymbol '\\complement\>' contained conceal cchar=∁ syn match texMathSymbol '\\cong\>' contained conceal cchar=≅ syn match texMathSymbol '\\coprod\>' contained conceal cchar=∐ syn match texMathSymbol '\\cup\>' contained conceal cchar=∪ + syn match texMathSymbol '\\Cup\>' contained conceal cchar=⋓ + syn match texMathSymbol '\\curlyeqprec\>' contained conceal cchar=⋞ + syn match texMathSymbol '\\curlyeqsucc\>' contained conceal cchar=⋟ + syn match texMathSymbol '\\curlyvee\>' contained conceal cchar=⋎ + syn match texMathSymbol '\\curlywedge\>' contained conceal cchar=⋏ + syn match texMathSymbol '\\dashv\>' contained conceal cchar=⊣ syn match texMathSymbol '\\diamond\>' contained conceal cchar=⋄ syn match texMathSymbol '\\div\>' contained conceal cchar=÷ syn match texMathSymbol '\\doteq\>' contained conceal cchar=≐ + syn match texMathSymbol '\\doteqdot\>' contained conceal cchar=≑ + syn match texMathSymbol '\\dotplus\>' contained conceal cchar=∔ syn match texMathSymbol '\\dotsb\>' contained conceal cchar=⋯ syn match texMathSymbol '\\dotsc\>' contained conceal cchar=… syn match texMathSymbol '\\dots\>' contained conceal cchar=… syn match texMathSymbol '\\dotsi\>' contained conceal cchar=⋯ syn match texMathSymbol '\\dotso\>' contained conceal cchar=… + syn match texMathSymbol '\\doublebarwedge\>' contained conceal cchar=⩞ syn match texMathSymbol '\\emptyset\>' contained conceal cchar=∅ + syn match texMathSymbol '\\eqcirc\>' contained conceal cchar=≖ + syn match texMathSymbol '\\eqsim\>' contained conceal cchar=≂ + syn match texMathSymbol '\\eqslantgtr\>' contained conceal cchar=⪖ + syn match texMathSymbol '\\eqslantless\>' contained conceal cchar=⪕ syn match texMathSymbol '\\equiv\>' contained conceal cchar=≡ syn match texMathSymbol '\\exists\>' contained conceal cchar=∃ + syn match texMathSymbol '\\fallingdotseq\>' contained conceal cchar=≒ syn match texMathSymbol '\\forall\>' contained conceal cchar=∀ + syn match texMathSymbol '\\ge\>' contained conceal cchar=≥ syn match texMathSymbol '\\geq\>' contained conceal cchar=≥ - if &ambw == "double" - syn match texMathSymbol '\\gg\>' contained conceal cchar=≫ - else - syn match texMathSymbol '\\gg\>' contained conceal cchar=⟫ - endif + syn match texMathSymbol '\\geqq\>' contained conceal cchar=≧ + syn match texMathSymbol '\\gneqq\>' contained conceal cchar=≩ + syn match texMathSymbol '\\gtrdot\>' contained conceal cchar=⋗ syn match texMathSymbol '\\gtreqless\>' contained conceal cchar=⋛ syn match texMathSymbol '\\gtrless\>' contained conceal cchar=≷ + syn match texMathSymbol '\\gtrsim\>' contained conceal cchar=≳ syn match texMathSymbol '\\iiint\>' contained conceal cchar=∭ syn match texMathSymbol '\\iint\>' contained conceal cchar=∬ syn match texMathSymbol '\\Im\>' contained conceal cchar=ℑ @@ -546,42 +599,68 @@ if has("conceal") && &enc == 'utf-8' syn match texMathSymbol '\\int\>' contained conceal cchar=∫ syn match texMathSymbol '\\lceil\>' contained conceal cchar=⌈ syn match texMathSymbol '\\ldots\>' contained conceal cchar=… + syn match texMathSymbol '\\le\>' contained conceal cchar=≤ syn match texMathSymbol '\\leftarrow\>' contained conceal cchar=⟵ syn match texMathSymbol '\\Leftarrow\>' contained conceal cchar=⟸ syn match texMathSymbol '\\left(' contained conceal cchar=( syn match texMathSymbol '\\left\[' contained conceal cchar=[ syn match texMathSymbol '\\left\\{' contained conceal cchar={ - syn match texMathSymbol '\\leq\>' contained conceal cchar=≤ + syn match texMathSymbol '\\leftthreetimes\>' contained conceal cchar=⋋ syn match texMathSymbol '\\leq\>' contained conceal cchar=≤ + syn match texMathSymbol '\\leqq\>' contained conceal cchar=≦ + syn match texMathSymbol '\\lessdot\>' contained conceal cchar=⋖ syn match texMathSymbol '\\lesseqgtr\>' contained conceal cchar=⋚ + syn match texMathSymbol '\\lesssim\>' contained conceal cchar=≲ syn match texMathSymbol '\\lfloor\>' contained conceal cchar=⌊ - if &ambw == "double" - syn match texMathSymbol '\\ll\>' contained conceal cchar=≪ - else - syn match texMathSymbol '\\ll\>' contained conceal cchar=⟪ - endif + syn match texMathSymbol '\\lneqq\>' contained conceal cchar=≨ + syn match texMathSymbol '\\ltimes\>' contained conceal cchar=⋉ syn match texMathSymbol '\\mapsto\>' contained conceal cchar=↦ + syn match texMathSymbol '\\measuredangle\>' contained conceal cchar=∡ syn match texMathSymbol '\\mid\>' contained conceal cchar=∣ syn match texMathSymbol '\\mp\>' contained conceal cchar=∓ syn match texMathSymbol '\\nabla\>' contained conceal cchar=∇ + syn match texMathSymbol '\\ncong\>' contained conceal cchar=≇ + syn match texMathSymbol '\\ne\>' contained conceal cchar=≠ + syn match texMathSymbol '\\neg\>' contained conceal cchar=¬ syn match texMathSymbol '\\neq\>' contained conceal cchar=≠ syn match texMathSymbol '\\nexists\>' contained conceal cchar=∄ syn match texMathSymbol '\\ngeq\>' contained conceal cchar=≱ + syn match texMathSymbol '\\ngeqq\>' contained conceal cchar=≱ syn match texMathSymbol '\\ngtr\>' contained conceal cchar=≯ + syn match texMathSymbol '\\ni\>' contained conceal cchar=∋ syn match texMathSymbol '\\nleq\>' contained conceal cchar=≰ + syn match texMathSymbol '\\nleqq\>' contained conceal cchar=≰ syn match texMathSymbol '\\nless\>' contained conceal cchar=≮ syn match texMathSymbol '\\nmid\>' contained conceal cchar=∤ syn match texMathSymbol '\\notin\>' contained conceal cchar=∉ + syn match texMathSymbol '\\nprec\>' contained conceal cchar=⊀ syn match texMathSymbol '\\nsim\>' contained conceal cchar=≁ + syn match texMathSymbol '\\nsucc\>' contained conceal cchar=⊁ + syn match texMathSymbol '\\ntriangleleft\>' contained conceal cchar=⋪ + syn match texMathSymbol '\\ntrianglelefteq\>' contained conceal cchar=⋬ + syn match texMathSymbol '\\ntriangleright\>' contained conceal cchar=⋫ + syn match texMathSymbol '\\ntrianglerighteq\>' contained conceal cchar=⋭ + syn match texMathSymbol '\\nvdash\>' contained conceal cchar=⊬ + syn match texMathSymbol '\\nvDash\>' contained conceal cchar=⊭ + syn match texMathSymbol '\\nVdash\>' contained conceal cchar=⊮ syn match texMathSymbol '\\odot\>' contained conceal cchar=⊙ syn match texMathSymbol '\\oint\>' contained conceal cchar=∮ + syn match texMathSymbol '\\ominus\>' contained conceal cchar=⊖ syn match texMathSymbol '\\oplus\>' contained conceal cchar=⊕ syn match texMathSymbol '\\oslash\>' contained conceal cchar=⊘ syn match texMathSymbol '\\otimes\>' contained conceal cchar=⊗ + syn match texMathSymbol '\\owns\>' contained conceal cchar=∋ syn match texMathSymbol '\\partial\>' contained conceal cchar=∂ syn match texMathSymbol '\\perp\>' contained conceal cchar=⊥ + syn match texMathSymbol '\\pitchfork\>' contained conceal cchar=⋔ syn match texMathSymbol '\\pm\>' contained conceal cchar=± + syn match texMathSymbol '\\precapprox\>' contained conceal cchar=⪷ syn match texMathSymbol '\\prec\>' contained conceal cchar=≺ + syn match texMathSymbol '\\preccurlyeq\>' contained conceal cchar=≼ + syn match texMathSymbol '\\preceq\>' contained conceal cchar=⪯ + syn match texMathSymbol '\\precnapprox\>' contained conceal cchar=⪹ + syn match texMathSymbol '\\precneqq\>' contained conceal cchar=⪵ + syn match texMathSymbol '\\precsim\>' contained conceal cchar=≾ syn match texMathSymbol '\\prod\>' contained conceal cchar=∏ syn match texMathSymbol '\\propto\>' contained conceal cchar=∝ syn match texMathSymbol '\\rceil\>' contained conceal cchar=⌉ @@ -592,27 +671,66 @@ if has("conceal") && &enc == 'utf-8' syn match texMathSymbol '\\right)' contained conceal cchar=) syn match texMathSymbol '\\right]' contained conceal cchar=] syn match texMathSymbol '\\right\\}' contained conceal cchar=} + syn match texMathSymbol '\\rightthreetimes\>' contained conceal cchar=⋌ + syn match texMathSymbol '\\risingdotseq\>' contained conceal cchar=≓ + syn match texMathSymbol '\\rtimes\>' contained conceal cchar=⋊ syn match texMathSymbol '\\setminus\>' contained conceal cchar=∖ syn match texMathSymbol '\\sim\>' contained conceal cchar=∼ + syn match texMathSymbol '\\sphericalangle\>' contained conceal cchar=∢ syn match texMathSymbol '\\sqcap\>' contained conceal cchar=⊓ syn match texMathSymbol '\\sqcup\>' contained conceal cchar=⊔ + syn match texMathSymbol '\\sqsubset\>' contained conceal cchar=⊏ + syn match texMathSymbol '\\sqsubseteq\>' contained conceal cchar=⊑ + syn match texMathSymbol '\\sqsupset\>' contained conceal cchar=⊐ + syn match texMathSymbol '\\sqsupseteq\>' contained conceal cchar=⊒ syn match texMathSymbol '\\subset\>' contained conceal cchar=⊂ + syn match texMathSymbol '\\Subset\>' contained conceal cchar=⋐ syn match texMathSymbol '\\subseteq\>' contained conceal cchar=⊆ + syn match texMathSymbol '\\subseteqq\>' contained conceal cchar=⫅ syn match texMathSymbol '\\subsetneq\>' contained conceal cchar=⊊ + syn match texMathSymbol '\\subsetneqq\>' contained conceal cchar=⫋ + syn match texMathSymbol '\\succapprox\>' contained conceal cchar=⪸ syn match texMathSymbol '\\succ\>' contained conceal cchar=≻ + syn match texMathSymbol '\\succcurlyeq\>' contained conceal cchar=≽ + syn match texMathSymbol '\\succeq\>' contained conceal cchar=⪰ + syn match texMathSymbol '\\succnapprox\>' contained conceal cchar=⪺ + syn match texMathSymbol '\\succneqq\>' contained conceal cchar=⪶ + syn match texMathSymbol '\\succsim\>' contained conceal cchar=≿ syn match texMathSymbol '\\sum\>' contained conceal cchar=∑ + syn match texMathSymbol '\\Supset\>' contained conceal cchar=⋑ syn match texMathSymbol '\\supseteq\>' contained conceal cchar=⊇ + syn match texMathSymbol '\\supseteqq\>' contained conceal cchar=⫆ syn match texMathSymbol '\\supsetneq\>' contained conceal cchar=⊋ + syn match texMathSymbol '\\supsetneqq\>' contained conceal cchar=⫌ syn match texMathSymbol '\\surd\>' contained conceal cchar=√ syn match texMathSymbol '\\therefore\>' contained conceal cchar=∴ syn match texMathSymbol '\\times\>' contained conceal cchar=× syn match texMathSymbol '\\to\>' contained conceal cchar=→ + syn match texMathSymbol '\\top\>' contained conceal cchar=⊤ + syn match texMathSymbol '\\triangleleft\>' contained conceal cchar=⊲ syn match texMathSymbol '\\trianglelefteq\>' contained conceal cchar=⊴ + syn match texMathSymbol '\\triangleq\>' contained conceal cchar=≜ + syn match texMathSymbol '\\triangleright\>' contained conceal cchar=⊳ syn match texMathSymbol '\\trianglerighteq\>' contained conceal cchar=⊵ + syn match texMathSymbol '\\varnothing\>' contained conceal cchar=∅ syn match texMathSymbol '\\vartriangle\>' contained conceal cchar=∆ + syn match texMathSymbol '\\vdash\>' contained conceal cchar=⊢ + syn match texMathSymbol '\\vDash\>' contained conceal cchar=⊨ + syn match texMathSymbol '\\Vdash\>' contained conceal cchar=⊩ syn match texMathSymbol '\\vdots\>' contained conceal cchar=⋮ + syn match texMathSymbol '\\veebar\>' contained conceal cchar=⊻ syn match texMathSymbol '\\vee\>' contained conceal cchar=∨ + syn match texMathSymbol '\\Vvdash\>' contained conceal cchar=⊪ syn match texMathSymbol '\\wedge\>' contained conceal cchar=∧ + syn match texMathSymbol '\\wr\>' contained conceal cchar=≀ + + if &ambw == "double" + syn match texMathSymbol '\\gg\>' contained conceal cchar=≫ + syn match texMathSymbol '\\ll\>' contained conceal cchar=≪ + else + syn match texMathSymbol '\\gg\>' contained conceal cchar=⟫ + syn match texMathSymbol '\\ll\>' contained conceal cchar=⟪ + endif endif " Greek {{{2
--- a/runtime/syntax/vim.vim +++ b/runtime/syntax/vim.vim @@ -1,8 +1,8 @@ " Vim syntax file " Language: Vim 7.3 script " Maintainer: Dr. Charles E. Campbell, Jr. <NdrOchipS@PcampbellAfamily.Mbiz> -" Last Change: Jul 28, 2010 -" Version: 7.3-03 +" Last Change: August 04, 2010 +" Version: 7.3-04 " Automatically generated keyword lists: {{{1 " Quit when a syntax file was already loaded {{{2 @@ -24,13 +24,13 @@ syn keyword vimCommand contained argd[el syn match vimCommand contained "\<z[-+^.=]" " vimOptions are caught only when contained in a vimSet {{{2 -syn keyword vimOption contained acd ambiwidth arabicshape autowriteall backupdir bdlay binary breakat bufhidden cd ci cinw co complete conskey crb cscopeverbose cuc deco dictionary directory ed encoding errorfile exrc fdls fencs fileformats fmr foldlevel foldtext fsync gfs gtl guioptions hf hk hlsearch imak ims indentexpr is isp keywordprg lazyredraw lispwords ls makeef maxmapdepth mfd mmd modified mousemodel msm numberwidth operatorfunc pastetoggle pexpr pmbfn printexpr pt readonly ri rs sb scrollbind secure shcf shelltemp shortname shq sm so spellfile spr ssop stl suffixesadd switchbuf ta taglength tbi termbidi tf title to ts tty ttytype ul ut verbosefile virtualedit wb wfw wildcharm winaltkeys winminwidth wmnu write -syn keyword vimOption contained ai ambw ari aw backupext beval biosk brk buflisted cdpath cin cinwords colorcolumn completefunc copyindent cryptmethod cspc cul def diff display edcompatible endofline errorformat fcl fdm fex filetype fo foldlevelstart formatexpr ft gfw gtt guipty hh hkmap ic imc imsearch indentkeys isf isprint km lbr list lsp makeprg maxmem mh mmp more mouses mzq nuw opfunc patchexpr pfn popt printfont pumheight redrawtime rightleft rtp sbo scrolljump sel shell shelltype showbreak si smartcase softtabstop spelllang sps st stmp sw sws tabline tagrelative tbidi termencoding tgst titlelen toolbar tsl ttybuiltin tw undodir vb vfile visualbell wc wh wildignore window winwidth wmw writeany -syn keyword vimOption contained akm anti arshape awa backupskip bex bioskey browsedir buftype cedit cindent clipboard columns completeopt cot cscopepathcomp csprg cursorbind define diffexpr dy ef eol esckeys fcs fdn ff fillchars foldclose foldmarker formatlistpat gcr ghr guicursor guitablabel hi hkmapp icon imcmdline inc indk isfname joinspaces kmp lcs listchars lw mat maxmempattern mis mmt mouse mouseshape mzquantum odev osfiletype patchmode ph preserveindent printheader pvh relativenumber rightleftcmd ru sbr scrolloff selection shellcmdflag shellxquote showcmd sidescroll smartindent sol spellsuggest sr sta sts swapfile sxq tabpagemax tags tbis terse thesaurus titleold toolbariconsize tsr ttyfast tx undofile vbs vi vop wcm whichwrap wildmenu winfixheight wiv wop writebackup -syn keyword vimOption contained al antialias autochdir background balloondelay bexpr bk bs casemap cf cink cmdheight com conc cp cscopeprg csqf cursorcolumn delcombine diffopt ea efm ep et fdc fdo ffs fk foldcolumn foldmethod formatoptions gd go guifont guitabtooltip hid hkp iconstring imd include inex isi js kp linebreak lm lz matchpairs maxmemtot mkspellmem mod mousef mouset nf oft pa path pheader previewheight printmbcharset pvw remap rl ruf sc scrollopt selectmode shellpipe shiftround showfulltag sidescrolloff smarttab sp spf srr stal su swapsync syn tabstop tagstack tbs textauto tildeop titlestring top ttimeout ttym uc undolevels vdir viewdir wa wd wi wildmode winfixwidth wiw wrap writedelay -syn keyword vimOption contained aleph ar autoindent backspace ballooneval bg bkc bsdir cb cfu cinkeys cmdwinheight comments conceallevel cpo cscopequickfix cst cursorline dex digraph ead ei equalalways eventignore fde fdt fileencoding fkmap foldenable foldminlines formatprg gdefault gp guifontset helpfile hidden hl ignorecase imdisable includeexpr inf isident key langmap lines lmap ma matchtime mco ml modeline mousefocus mousetime nrformats ofu para pdev pi previewwindow printmbfont qe report rlc ruler scb scs sessionoptions shellquote shiftwidth showmatch siso smc spc spl ss startofline sua swb synmaxcol tag tal tenc textmode timeout tl tpm ttimeoutlen ttymouse udf updatecount ve viewoptions wak weirdinvert wig wildoptions winheight wm wrapmargin ws -syn keyword vimOption contained allowrevins arab autoread backup balloonexpr bh bl bsk cc ch cino cmp commentstring confirm cpoptions cscopetag csto cwh dg dip eadirection ek equalprg ex fdi fen fileencodings flp foldexpr foldnestmax fp gfm grepformat guifontwide helpheight highlight hlg im imi incsearch infercase isk keymap langmenu linespace loadplugins macatsui maxcombine mef mls modelines mousehide mp nu omnifunc paragraphs penc pm printdevice printoptions quoteescape restorescreen rnu rulerformat scr sect sft shellredir shm showmode sj smd spell splitbelow ssl statusline suffixes swf syntax tagbsearch tb term textwidth timeoutlen tm tr ttm ttyscroll udir updatetime verbose viminfo warn wfh wildchar wim winminheight wmh wrapscan ww -syn keyword vimOption contained altkeymap arabic autowrite backupcopy bdir bin bomb bt ccv charconvert cinoptions cms compatible consk cpt cscopetagorder csverb debug dict dir eb enc errorbells expandtab fdl fenc fileformat fml foldignore foldopen fs gfn grepprg guiheadroom helplang history hls imactivatekey iminsert inde insertmode iskeyword keymodel laststatus lisp lpl magic maxfuncdepth menuitems mm modifiable mousem mps number opendevice paste pex pmbcs printencoding prompt rdt revins ro runtimepath scroll sections sh shellslash shortmess showtabline slm sn spellcapcheck splitright +syn keyword vimOption contained acd ambiwidth arabicshape autowriteall backupdir bdlay binary breakat bufhidden cd ci cinw co commentstring confirm cpoptions cscopetag csto cwh dg dip eadirection ek equalprg ex fdi fen fileencodings flp foldexpr foldnestmax fp gfm grepformat guifontwide helpheight highlight hlg im imi incsearch infercase isk keymap langmenu linespace loadplugins macatsui maxcombine mef mls modelines mousehide mp nu omnifunc paragraphs penc pm printdevice printoptions quoteescape restorescreen rnu rulerformat scr sect sft shellredir shm showmode sj smd spell splitbelow ssl stl sw sxq tabpagemax tags tbis terse thesaurus titleold toolbariconsize tsr ttyfast tx undofile ut verbosefile virtualedit wb wfw wildcharm winaltkeys winminwidth wmnu write +syn keyword vimOption contained ai ambw ari aw backupext beval biosk brk buflisted cdpath cin cinwords cocu compatible consk cpt cscopetagorder csverb debug dict dir eb enc errorbells expandtab fdl fenc fileformat fml foldignore foldopen fs gfn grepprg guiheadroom helplang history hls imactivatekey iminsert inde insertmode iskeyword keymodel laststatus lisp lpl magic maxfuncdepth menuitems mm modifiable mousem mps number opendevice paste pex pmbcs printencoding prompt rdt revins ro runtimepath scroll sections sh shellslash shortmess showtabline slm sn spellcapcheck splitright ssop stmp swapfile syn tabstop tagstack tbs textauto tildeop titlestring top ttimeout ttym uc undolevels vb vfile visualbell wc wh wildignore window winwidth wmw writeany +syn keyword vimOption contained akm anti arshape awa backupskip bex bioskey browsedir buftype cedit cindent clipboard cole complete conskey crb cscopeverbose cuc deco dictionary directory ed encoding errorfile exrc fdls fencs fileformats fmr foldlevel foldtext fsync gfs gtl guioptions hf hk hlsearch imak ims indentexpr is isp keywordprg lazyredraw lispwords ls makeef maxmapdepth mfd mmd modified mousemodel msm numberwidth operatorfunc pastetoggle pexpr pmbfn printexpr pt readonly ri rs sb scrollbind secure shcf shelltemp shortname shq sm so spellfile spr st sts swapsync synmaxcol tag tal tenc textmode timeout tl tpm ttimeoutlen ttymouse udf undoreload vbs vi vop wcm whichwrap wildmenu winfixheight wiv wop writebackup +syn keyword vimOption contained al antialias autochdir background balloondelay bexpr bk bs casemap cf cink cmdheight colorcolumn completefunc copyindent cryptmethod cspc cul def diff display edcompatible endofline errorformat fcl fdm fex filetype fo foldlevelstart formatexpr ft gfw gtt guipty hh hkmap ic imc imsearch indentkeys isf isprint km lbr list lsp makeprg maxmem mh mmp more mouses mzq nuw opfunc patchexpr pfn popt printfont pumheight redrawtime rightleft rtp sbo scrolljump sel shell shelltype showbreak si smartcase softtabstop spelllang sps sta su swb syntax tagbsearch tb term textwidth timeoutlen tm tr ttm ttyscroll udir updatecount vdir viewdir wa wd wi wildmode winfixwidth wiw wrap writedelay +syn keyword vimOption contained aleph ar autoindent backspace ballooneval bg bkc bsdir cb cfu cinkeys cmdwinheight columns completeopt cot cscopepathcomp csprg cursorbind define diffexpr dy ef eol esckeys fcs fdn ff fillchars foldclose foldmarker formatlistpat gcr ghr guicursor guitablabel hi hkmapp icon imcmdline inc indk isfname joinspaces kmp lcs listchars lw mat maxmempattern mis mmt mouse mouseshape mzquantum odev osfiletype patchmode ph preserveindent printheader pvh relativenumber rightleftcmd ru sbr scrolloff selection shellcmdflag shellxquote showcmd sidescroll smartindent sol spellsuggest sr stal sua swf ta taglength tbi termbidi tf title to ts tty ttytype ul updatetime ve viewoptions wak weirdinvert wig wildoptions winheight wm wrapmargin ws +syn keyword vimOption contained allowrevins arab autoread backup balloonexpr bh bl bsk cc ch cino cmp com concealcursor cp cscopeprg csqf cursorcolumn delcombine diffopt ea efm ep et fdc fdo ffs fk foldcolumn foldmethod formatoptions gd go guifont guitabtooltip hid hkp iconstring imd include inex isi js kp linebreak lm lz matchpairs maxmemtot mkspellmem mod mousef mouset nf oft pa path pheader previewheight printmbcharset pvw remap rl ruf sc scrollopt selectmode shellpipe shiftround showfulltag sidescrolloff smarttab sp spf srr startofline suffixes switchbuf tabline tagrelative tbidi termencoding tgst titlelen toolbar tsl ttybuiltin tw undodir ur verbose viminfo warn wfh wildchar wim winminheight wmh wrapscan ww +syn keyword vimOption contained altkeymap arabic autowrite backupcopy bdir bin bomb bt ccv charconvert cinoptions cms comments conceallevel cpo cscopequickfix cst cursorline dex digraph ead ei equalalways eventignore fde fdt fileencoding fkmap foldenable foldminlines formatprg gdefault gp guifontset helpfile hidden hl ignorecase imdisable includeexpr inf isident key langmap lines lmap ma matchtime mco ml modeline mousefocus mousetime nrformats ofu para pdev pi previewwindow printmbfont qe report rlc ruler scb scs sessionoptions shellquote shiftwidth showmatch siso smc spc spl ss statusline suffixesadd sws " vimOptions: These are the turn-off setting variants {{{2 syn keyword vimOption contained noacd noallowrevins noantialias noarabic noarshape noautoread noaw noballooneval nobinary nobk nobuflisted nocin noconfirm nocopyindent nocscopetag nocsverb nocursorbind nodeco nodiff noeb noek noeol noerrorbells noet noexpandtab nofen nofkmap nogd noguipty nohidden nohkmap nohkp nohlsearch noicon noim noimcmdline noimdisable noinf noinsertmode nojoinspaces nolazyredraw nolinebreak nolist nolpl noma nomagic noml nomodeline nomodified nomousef nomousehide nonumber noopendevice nopi nopreviewwindow nopvw norelativenumber norestorescreen nori norl noro noru nosb noscb noscs nosft noshelltemp noshortname noshowfulltag noshowmode nosm nosmartindent nosmd nosol nosplitbelow nospr nossl nostartofline noswapfile nota notagrelative notbi notbs noterse notextmode notgst notimeout noto notr nottybuiltin notx novisualbell nowarn noweirdinvert nowfw nowinfixheight nowiv nowrap nowrite nowritebackup @@ -70,9 +70,9 @@ syn match vimHLGroup contained "Conceal" syn case match " Function Names {{{2 -syn keyword vimFuncName contained abs append argv atan2 bufexists bufname byte2line ceil cindent complete confirm cosh cursor did_filetype empty eventhandler exp extend filewritable findfile fmod foldclosed foldtext function getbufline getcharmod getcmdtype getfperm getftype getmatches getqflist gettabvar getwinposy globpath haslocaldir histdel hlexists iconv input inputrestore insert items len line localtime map match matchdelete matchlist max mkdir mzeval nr2char pow printf range reltime remote_expr remote_peek remote_send rename resolve round searchdecl searchpairpos server2client setbufvar setline setmatches setqflist settabvar setwinvar simplify sinh soundfold spellsuggest sqrt str2nr strdisplaywidth stridx strlen strridx strwidth substitute synIDattr synstack tabpagebuflist tabpagewinnr taglist tanh tolower tr type undotree virtcol winbufnr winheight winnr winrestview winwidth -syn keyword vimFuncName contained acos argc asin browse buflisted bufnr byteidx changenr clearmatches complete_add copy count deepcopy diff_filler escape executable expand feedkeys filter float2nr fnameescape foldclosedend foldtextresult garbagecollect getbufvar getcmdline getcwd getfsize getline getpid getreg gettabwinvar getwinvar has hasmapto histget hlID indent inputdialog inputsave isdirectory join libcall line2byte log maparg matchadd matchend matchstr min mode nextnonblank pathshorten prevnonblank pumvisible readfile reltimestr remote_foreground remote_read remove repeat reverse search searchpair searchpos serverlist setcmdpos setloclist setpos setreg settabwinvar shellescape sin sort spellbadword split str2float strchars strftime string strpart strtrans submatch synID synIDtrans system tabpagenr tagfiles tan tempname toupper trunc undofile values visualmode wincol winline winrestcmd winsaveview writefile -syn keyword vimFuncName contained add argidx atan browsedir bufloaded bufwinnr call char2nr col complete_check cos cscope_connection delete diff_hlID eval exists expr8 filereadable finddir floor fnamemodify foldlevel foreground get getchar getcmdpos getfontname getftime getloclist getpos getregtype getwinposx glob has_key histadd histnr hostname index inputlist inputsecret islocked keys libcallnr lispindent log10 mapcheck matcharg +syn keyword vimFuncName contained abs append argv atan2 bufexists bufname byte2line ceil cindent complete confirm cosh cursor did_filetype empty eventhandler exp extend filewritable findfile fmod foldclosed foldtext function getbufline getcharmod getcmdtype getfperm getftype getmatches getqflist gettabvar getwinposy globpath haslocaldir histdel hlexists iconv input inputrestore insert items len line localtime map match matchdelete matchstr min mode nextnonblank pathshorten prevnonblank pumvisible readfile reltimestr remote_foreground remote_read remove repeat reverse search searchpair searchpos serverlist setcmdpos setloclist setpos setreg settabwinvar shellescape sin sort spellbadword split str2float strchars strftime string strpart strtrans submatch synconcealed synIDattr synstack tabpagebuflist tabpagewinnr taglist tanh tolower tr type undotree virtcol winbufnr winheight winnr winrestview winwidth +syn keyword vimFuncName contained acos argc asin browse buflisted bufnr byteidx changenr clearmatches complete_add copy count deepcopy diff_filler escape executable expand feedkeys filter float2nr fnameescape foldclosedend foldtextresult garbagecollect getbufvar getcmdline getcwd getfsize getline getpid getreg gettabwinvar getwinvar has hasmapto histget hlID indent inputdialog inputsave isdirectory join libcall line2byte log maparg matchadd matchend max mkdir mzeval nr2char pow printf range reltime remote_expr remote_peek remote_send rename resolve round searchdecl searchpairpos server2client setbufvar setline setmatches setqflist settabvar setwinvar simplify sinh soundfold spellsuggest sqrt str2nr strdisplaywidth stridx strlen strridx strwidth substitute synID synIDtrans system tabpagenr tagfiles tan tempname toupper trunc undofile values visualmode wincol winline winrestcmd winsaveview writefile +syn keyword vimFuncName contained add argidx atan browsedir bufloaded bufwinnr call char2nr col complete_check cos cscope_connection delete diff_hlID eval exists expr8 filereadable finddir floor fnamemodify foldlevel foreground get getchar getcmdpos getfontname getftime getloclist getpos getregtype getwinposx glob has_key histadd histnr hostname index inputlist inputsecret islocked keys libcallnr lispindent log10 mapcheck matcharg matchlist "--- syntax above generated by mkvimvim --- " Special Vim Highlighting (not automatic) {{{1 @@ -284,7 +284,7 @@ syn match vimCmplxRepeat '[^a-zA-Z_/\\() syn match vimCmplxRepeat '@[0-9a-z".=@:]\ze\($\|[^a-zA-Z]\)' " Set command and associated set-options (vimOptions) with comment {{{2 -syn region vimSet matchgroup=vimCommand start="\<\%(setl\%[ocal]\|setg\%[lobal]\|set\)\>" skip="\%(\\\\\)*\\." end="$" matchgroup=vimNotation end="<[cC][rR]>" keepend oneline contains=vimSetEqual,vimOption,vimErrSetting,vimComment,vimSetString,vimSetMod +syn region vimSet matchgroup=vimCommand start="\<\%(setl\%[ocal]\|setg\%[lobal]\|se\%[t]\)\>" skip="\%(\\\\\)*\\." end="$" matchgroup=vimNotation end="<[cC][rR]>" keepend oneline contains=vimSetEqual,vimOption,vimErrSetting,vimComment,vimSetString,vimSetMod syn region vimSetEqual contained start="[=:]\|[-+^]=" skip="\\\\\|\\\s" end="[| \t]\|$"me=e-1 contains=vimCtrlChar,vimSetSep,vimNotation oneline syn region vimSetString contained start=+="+hs=s+1 skip=+\\\\\|\\"+ end=+"+ contains=vimCtrlChar syn match vimSetSep contained "[,:]"