diff options
author | Bram Moolenaar <Bram@vim.org> | 2011-04-01 18:03:16 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2011-04-01 18:03:16 +0200 |
commit | adc2182c40228d3eaef90779fd18d65715e29203 (patch) | |
tree | ed1aabd346892e932361901dbeb7e5309d6df04e /runtime/syntax | |
parent | 337ae06ff9fe42c871564947aa32e4fe6b08fba9 (diff) | |
download | vim-adc2182c40228d3eaef90779fd18d65715e29203.zip |
Updated runtime files.
Diffstat (limited to 'runtime/syntax')
-rw-r--r-- | runtime/syntax/netrw.vim | 2 | ||||
-rw-r--r-- | runtime/syntax/sh.vim | 10 | ||||
-rw-r--r-- | runtime/syntax/tex.vim | 77 | ||||
-rw-r--r-- | runtime/syntax/vim.vim | 28 |
4 files changed, 80 insertions, 37 deletions
diff --git a/runtime/syntax/netrw.vim b/runtime/syntax/netrw.vim index f6fd66c22..1796fc119 100644 --- a/runtime/syntax/netrw.vim +++ b/runtime/syntax/netrw.vim @@ -88,7 +88,7 @@ if !exists("did_drchip_netrwlist_syntax") hi default link netrwTimeSep netrwDateSep hi default link netrwComma netrwComment hi default link netrwHide netrwComment - hi default link netrwMarkFile Identifier + hi default link netrwMarkFile DiffChange " special syntax highlighting (see :he g:netrw_special_syntax) hi default link netrwBak NonText diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim index 26df32d49..4370d6788 100644 --- a/runtime/syntax/sh.vim +++ b/runtime/syntax/sh.vim @@ -2,8 +2,8 @@ " Language: shell (sh) Korn shell (ksh) bash (sh) " Maintainer: Dr. Charles E. Campbell, Jr. <NdrOchipS@PcampbellAfamily.Mbiz> " Previous Maintainer: Lennart Schultz <Lennart.Schultz@ecmwf.int> -" Last Change: Aug 04, 2010 -" Version: 114 +" Last Change: Feb 11, 2011 +" Version: 115 " URL: http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax " For options and settings, please use: :help ft-sh-syntax " This file includes many ideas from ?ric Brunet (eric.brunet@ens.fr) @@ -410,6 +410,10 @@ syn region shDerefVarArray contained matchgroup=shDeref start="\[" end="]" co " ksh bash : ${parameter##pattern} remove large left pattern " ksh bash : ${parameter%pattern} remove small right pattern " ksh bash : ${parameter%%pattern} remove large right pattern +" ksh bash : ${parameter^pattern} Case modification +" ksh bash : ${parameter^^pattern} Case modification +" ksh bash : ${parameter,pattern} Case modification +" ksh bash : ${parameter,,pattern} Case modification syn cluster shDerefPatternList contains=shDerefPattern,shDerefString syn match shDerefOpError contained ":[[:punct:]]" syn match shDerefOp contained ":\=[-=?]" nextgroup=@shDerefPatternList @@ -417,6 +421,8 @@ syn match shDerefOp contained ":\=+" nextgroup=@shDerefPatternList if exists("b:is_bash") || exists("b:is_kornshell") syn match shDerefOp contained "#\{1,2}" nextgroup=@shDerefPatternList syn match shDerefOp contained "%\{1,2}" nextgroup=@shDerefPatternList + syn match shDerefOp contained "\^\{1,2}" nextgroup=@shDerefPatternList + syn match shDerefOp contained ",\{1,2}" nextgroup=@shDerefPatternList syn match shDerefPattern contained "[^{}]\+" contains=shDeref,shDerefSimple,shDerefPattern,shDerefString,shCommandSub,shDerefEscape nextgroup=shDerefPattern syn region shDerefPattern contained start="{" end="}" contains=shDeref,shDerefSimple,shDerefString,shCommandSub nextgroup=shDerefPattern syn match shDerefEscape contained '\%(\\\\\)*\\.' diff --git a/runtime/syntax/tex.vim b/runtime/syntax/tex.vim index 95bfc057d..365acf496 100644 --- 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: Sep 17, 2010 -" Version: 60 +" Last Change: Dec 07, 2010 +" Version: 64 " URL: http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax " " Notes: {{{1 @@ -89,18 +89,17 @@ if g:tex_fold_enabled && &fdm == "manual" setl fdm=syntax endif -" (La)TeX keywords: only use the letters a-zA-Z {{{1 +" (La)TeX keywords: uses the characters 0-9,a-z,A-Z,192-255 only... {{{1 " but _ is the only one that causes problems. -if version < 600 - set isk=a-z,A-Z - if b:tex_stylish - set isk+=@ - endif +" One may override this iskeyword setting by providing +" g:tex_isk +if exists("g:tex_isk") + exe "setlocal isk=".g:tex_isk else - setlocal isk=a-z,A-Z - if b:tex_stylish - setlocal isk+=@ - endif + setlocal isk=48-57,a-z,A-Z,192-255 +endif +if b:tex_stylish + setlocal isk+=@-@ endif " Clusters: {{{1 @@ -372,19 +371,54 @@ if !exists("tex_no_math") if has("conceal") && &enc == 'utf-8' && s:tex_conceal =~ 'm' syn match texMathDelim contained "\\left\\{\>" skipwhite nextgroup=texMathDelimSet1,texMathDelimSet2,texMathDelimBad contains=texMathSymbol cchar={ syn match texMathDelim contained "\\right\\}\>" skipwhite nextgroup=texMathDelimSet1,texMathDelimSet2,texMathDelimBad contains=texMathSymbol cchar=} + let s:texMathDelimList=[ + \ ['<' , '<'] , + \ ['>' , '>'] , + \ ['(' , '('] , + \ [')' , ')'] , + \ ['\[' , '['] , + \ [']' , ']'] , + \ ['\\{' , '{'] , + \ ['\\}' , '}'] , + \ ['|' , '|'] , + \ ['\\|' , '‖'] , + \ ['\\backslash' , '\'] , + \ ['\\downarrow' , '↓'] , + \ ['\\Downarrow' , '⇓'] , + \ ['\\langle' , '<'] , + \ ['\\lbrace' , '['] , + \ ['\\lceil' , '⌈'] , + \ ['\\lfloor' , '⌊'] , + \ ['\\lgroup' , '⌊'] , + \ ['\\lmoustache' , '⎛'] , + \ ['\\rangle' , '>'] , + \ ['\\rbrace' , ']'] , + \ ['\\rceil' , '⌉'] , + \ ['\\rfloor' , '⌋'] , + \ ['\\rgroup' , '⌋'] , + \ ['\\rmoustache' , '⎞'] , + \ ['\\uparrow' , '↑'] , + \ ['\\Uparrow' , '↑'] , + \ ['\\updownarrow', '↕'] , + \ ['\\Updownarrow', '⇕']] + syn match texMathDelim '\\[bB]igg\=[lr]' contained nextgroup=texMathDelimBad + for texmath in s:texMathDelimList + exe "syn match texMathDelim '\\\\[bB]igg\\=[lr]\\=".texmath[0]."' contained conceal cchar=".texmath[1] + endfor + else syn match texMathDelim contained "\\\(left\|right\)\>" skipwhite nextgroup=texMathDelimSet1,texMathDelimSet2,texMathDelimBad + syn match texMathDelim contained "\\[bB]igg\=[lr]\=\>" skipwhite nextgroup=texMathDelimSet1,texMathDelimSet2,texMathDelimBad + syn match texMathDelimSet2 contained "\\" nextgroup=texMathDelimKey,texMathDelimBad + syn match texMathDelimSet1 contained "[<>()[\]|/.]\|\\[{}|]" + syn keyword texMathDelimKey contained backslash lceil lVert rgroup uparrow + syn keyword texMathDelimKey contained downarrow lfloor rangle rmoustache Uparrow + syn keyword texMathDelimKey contained Downarrow lgroup rbrace rvert updownarrow + syn keyword texMathDelimKey contained langle lmoustache rceil rVert Updownarrow + syn keyword texMathDelimKey contained lbrace lvert rfloor endif - syn match texMathDelim contained "\\\([bB]igg\=[lr]\)\>" skipwhite nextgroup=texMathDelimSet1,texMathDelimSet2,texMathDelimBad syn match texMathDelim contained "\\\(left\|right\)arrow\>\|\<\([aA]rrow\|brace\)\=vert\>" syn match texMathDelim contained "\\lefteqn\>" - syn match texMathDelimSet2 contained "\\" nextgroup=texMathDelimKey,texMathDelimBad - syn match texMathDelimSet1 contained "[<>()[\]|/.]\|\\[{}|]" - syn keyword texMathDelimKey contained backslash lceil lVert rgroup uparrow - syn keyword texMathDelimKey contained downarrow lfloor rangle rmoustache Uparrow - syn keyword texMathDelimKey contained Downarrow lgroup rbrace rvert updownarrow - syn keyword texMathDelimKey contained langle lmoustache rceil rVert Updownarrow - syn keyword texMathDelimKey contained lbrace lvert rfloor endif " Special TeX characters ( \$ \& \% \# \{ \} \_ \S \P ) : {{{1 @@ -521,6 +555,7 @@ if has("conceal") && &enc == 'utf-8' " (many of these symbols were contributed by Björn Winckler) if s:tex_conceal =~ 'm' let s:texMathList=[ + \ ['|' , '‖'], \ ['angle' , '∠'], \ ['approx' , '≈'], \ ['ast' , '∗'], @@ -624,6 +659,7 @@ if has("conceal") && &enc == 'utf-8' \ ['lesseqgtr' , '⋚'], \ ['lesssim' , '≲'], \ ['lfloor' , '⌊'], + \ ['lmoustache' , '╭'], \ ['lneqq' , '≨'], \ ['ltimes' , '⋉'], \ ['mapsto' , '↦'], @@ -694,6 +730,7 @@ if has("conceal") && &enc == 'utf-8' \ ['rightsquigarrow', '↝'], \ ['rightthreetimes', '⋌'], \ ['risingdotseq' , '≓'], + \ ['rmoustache' , '╮'], \ ['rtimes' , '⋊'], \ ['searrow' , '↘'], \ ['setminus' , '∖'], diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim index a6f6e3664..46b3919f7 100644 --- 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: August 20, 2010 -" Version: 7.3-05 +" Last Change: Jan 10, 2011 +" Version: 7.3-07 " Automatically generated keyword lists: {{{1 " Quit when a syntax file was already loaded {{{2 @@ -550,9 +550,9 @@ if !exists("g:vimsyn_embed") endif " [-- lua --] {{{3 -let s:luapath= expand("<sfile>:p:h")."/lua.vim" +let s:luapath= fnameescape(expand("<sfile>:p:h")."/lua.vim") if !filereadable(s:luapath) - let s:luapath= globpath(&rtp,"syntax/lua.vim") + let s:luapath= fnameescape(globpath(&rtp,"syntax/lua.vim")) endif if (g:vimsyn_embed =~ 'l' && has("lua")) && filereadable(s:luapath) unlet! b:current_syntax @@ -572,9 +572,9 @@ endif unlet s:luapath " [-- perl --] {{{3 -let s:perlpath= expand("<sfile>:p:h")."/perl.vim" +let s:perlpath= fnameescape(expand("<sfile>:p:h")."/perl.vim") if !filereadable(s:perlpath) - let s:perlpath= globpath(&rtp,"syntax/perl.vim") + let s:perlpath= fnameescape(globpath(&rtp,"syntax/perl.vim")) endif if (g:vimsyn_embed =~ 'p' && has("perl")) && filereadable(s:perlpath) unlet! b:current_syntax @@ -594,9 +594,9 @@ endif unlet s:perlpath " [-- ruby --] {{{3 -let s:rubypath= expand("<sfile>:p:h")."/ruby.vim" +let s:rubypath= fnameescape(expand("<sfile>:p:h")."/ruby.vim") if !filereadable(s:rubypath) - let s:rubypath= globpath(&rtp,"syntax/ruby.vim") + let s:rubypath= fnameescape(globpath(&rtp,"syntax/ruby.vim")) endif if (g:vimsyn_embed =~ 'r' && has("ruby")) && filereadable(s:rubypath) unlet! b:current_syntax @@ -615,9 +615,9 @@ endif unlet s:rubypath " [-- python --] {{{3 -let s:pythonpath= expand("<sfile>:p:h")."/python.vim" +let s:pythonpath= fnameescape(expand("<sfile>:p:h")."/python.vim") if !filereadable(s:pythonpath) - let s:pythonpath= globpath(&rtp,"syntax/python.vim") + let s:pythonpath= fnameescape(globpath(&rtp,"syntax/python.vim")) endif if (g:vimsyn_embed =~ 'P' && has("python")) && filereadable(s:pythonpath) unlet! b:current_syntax @@ -644,9 +644,9 @@ else let s:trytcl= 1 endif if s:trytcl - let s:tclpath= expand("<sfile>:p:h")."/tcl.vim" + let s:tclpath= fnameescape(expand("<sfile>:p:h")."/tcl.vim") if !filereadable(s:tclpath) - let s:tclpath= globpath(&rtp,"syntax/tcl.vim") + let s:tclpath= fnameescape(globpath(&rtp,"syntax/tcl.vim")) endif if (g:vimsyn_embed =~ 't' && has("tcl")) && filereadable(s:tclpath) unlet! b:current_syntax @@ -671,9 +671,9 @@ endif unlet s:trytcl " [-- mzscheme --] {{{3 -let s:mzschemepath= expand("<sfile>:p:h")."/scheme.vim" +let s:mzschemepath= fnameescape(expand("<sfile>:p:h")."/scheme.vim") if !filereadable(s:mzschemepath) - let s:mzschemepath= globpath(&rtp,"syntax/scheme.vim") + let s:mzschemepath= fnameescape(globpath(&rtp,"syntax/scheme.vim")) endif if (g:vimsyn_embed =~ 'm' && has("mzscheme")) && filereadable(s:mzschemepath) unlet! b:current_syntax |