diff -u -r --new-file runtime/syntax.orig/2html.vim runtime/syntax/2html.vim --- runtime/syntax.orig/2html.vim 2010-08-12 14:57:26.000000000 -0500 +++ runtime/syntax/2html.vim 2011-01-08 08:36:35.000000000 -0600 @@ -1,6 +1,6 @@ " Vim syntax support file " Maintainer: Ben Fritz -" Last Change: 2010 Aug 12 +" Last Change: 2011 Jan 06 " " Additional contributors: " @@ -124,7 +124,18 @@ let l:style_name = a:style_name . (a:diff_style_name == '' ? '' : ' ') . a:diff_style_name " Replace the reserved html characters - let formatted = substitute(substitute(substitute(substitute(substitute(formatted, '&', '\&', 'g'), '<', '\<', 'g'), '>', '\>', 'g'), '"', '\"', 'g'), "\x0c", '
', 'g') + let formatted = substitute(formatted, '&', '\&', 'g') + let formatted = substitute(formatted, '<', '\<', 'g') + let formatted = substitute(formatted, '>', '\>', 'g') + let formatted = substitute(formatted, '"', '\"', 'g') + " TODO: Use ' for "'"? + + " Replace a "form feed" character with HTML to do a page break + let formatted = substitute(formatted, "\x0c", '
', 'g') + + " Mangle modelines so Vim doesn't try to use HTML text as a modeline if + " editing this file in the future + let formatted = substitute(formatted, '\v(\s+%(vim?|ex)):', '\1\:', 'g') " Replace double spaces, leading spaces, and trailing spaces if needed if ' ' != s:HtmlSpace @@ -265,6 +276,19 @@ let s:old_magic = &magic set magic +" set the fileencoding to match the charset we'll be using +let &l:fileencoding=s:settings.vim_encoding + +" According to http://www.w3.org/TR/html4/charset.html#doc-char-set, the byte +" order mark is highly recommend on the web when using multibyte encodings. But, +" it is not a good idea to include it on UTF-8 files. Otherwise, let Vim +" determine when it is actually inserted. +if s:settings.vim_encoding == 'utf-8' + setlocal nobomb +else + setlocal bomb +endif + let s:lines = [] if s:settings.use_xhtml @@ -545,9 +569,6 @@ " level, so subtract 2 from index of first non-dash after the dashes " in order to get the fold level of the current fold let s:level = match(foldtextresult(s:lnum), '+-*\zs[^-]') - 2 - if s:level+1 > s:foldcolumn - let s:foldcolumn = s:level+1 - endif " store fold info for later use let s:newfold = {'firstline': s:lnum, 'lastline': foldclosedend(s:lnum), 'level': s:level,'type': "closed-fold"} call add(s:allfolds, s:newfold) @@ -577,9 +598,6 @@ " level, so subtract 2 from index of first non-dash after the dashes " in order to get the fold level of the current fold let s:level = match(foldtextresult(s:lnum), '+-*\zs[^-]') - 2 - if s:level+1 > s:foldcolumn - let s:foldcolumn = s:level+1 - endif let s:newfold = {'firstline': s:lnum, 'lastline': foldclosedend(s:lnum), 'level': s:level,'type': "closed-fold"} " only add the fold if we don't already have it if empty(s:allfolds) || index(s:allfolds, s:newfold) == -1 @@ -609,6 +627,48 @@ " close all folds again so we can get the fold text as we go silent! %foldclose! + + for afold in s:allfolds + let removed = 0 + if exists("g:html_start_line") && exists("g:html_end_line") + if afold.firstline < g:html_start_line + if afold.lastline < g:html_end_line && afold.lastline > g:html_start_line + " if a fold starts before the range to convert but stops within the + " range, we need to include it. Make it start on the first converted + " line. + let afold.firstline = g:html_start_line + else + " if the fold lies outside the range or the start and stop enclose + " the entire range, don't bother parsing it + call remove(s:allfolds, index(s:allfolds, afold)) + let removed = 1 + endif + elseif afold.firstline > g:html_end_line + " If the entire fold lies outside the range we need to remove it. + call remove(s:allfolds, index(s:allfolds, afold)) + let removed = 1 + endif + elseif exists("g:html_start_line") + if afold.firstline < g:html_start_line + " if there is no last line, but there is a first line, the end of the + " fold will always lie within the region of interest, so keep it + let afold.firstline = g:html_start_line + endif + elseif exists("g:html_end_line") + " if there is no first line we default to the first line in the buffer so + " the fold start will always be included if the fold itself is included. + " If however the entire fold lies outside the range we need to remove it. + if afold.firstline > g:html_end_line + call remove(s:allfolds, index(s:allfolds, afold)) + let removed = 1 + endif + endif + if !removed + if afold.level+1 > s:foldcolumn + let s:foldcolumn = afold.level+1 + endif + endif + endfor endif " Now loop over all lines in the original text to convert to html. @@ -656,6 +716,13 @@ let s:foldId = 0 +if !s:settings.expand_tabs + " If keeping tabs, add them to printable characters so we keep them when + " formatting text (strtrans() doesn't replace printable chars) + let s:old_isprint = &isprint + setlocal isprint+=9 +endif + while s:lnum <= s:end " If there are filler lines for diff mode, show these above the line. @@ -734,7 +801,7 @@ call remove(s:foldstack, 0) endwhile - " Now insert an opening any new folds that start on this line + " Now insert an opening for any new folds that start on this line let s:firstfold = 1 while !empty(s:allfolds) && get(s:allfolds,0).firstline == s:lnum let s:foldId = s:foldId + 1 @@ -871,30 +938,32 @@ endif if s:settings.ignore_conceal || !s:concealinfo[0] - " Expand tabs + " Expand tabs if needed let s:expandedtab = strpart(s:line, s:startcol - 1, s:col - s:startcol) - let s:offset = 0 - let s:idx = stridx(s:expandedtab, "\t") - while s:idx >= 0 - if has("multi_byte_encoding") - if s:startcol + s:idx == 1 - let s:i = &ts - else - if s:idx == 0 - let s:prevc = matchstr(s:line, '.\%' . (s:startcol + s:idx + s:offset) . 'c') + if s:settings.expand_tabs + let s:offset = 0 + let s:idx = stridx(s:expandedtab, "\t") + while s:idx >= 0 + if has("multi_byte_encoding") + if s:startcol + s:idx == 1 + let s:i = &ts else - let s:prevc = matchstr(s:expandedtab, '.\%' . (s:idx + 1) . 'c') + if s:idx == 0 + let s:prevc = matchstr(s:line, '.\%' . (s:startcol + s:idx + s:offset) . 'c') + else + let s:prevc = matchstr(s:expandedtab, '.\%' . (s:idx + 1) . 'c') + endif + let s:vcol = virtcol([s:lnum, s:startcol + s:idx + s:offset - len(s:prevc)]) + let s:i = &ts - (s:vcol % &ts) endif - let s:vcol = virtcol([s:lnum, s:startcol + s:idx + s:offset - len(s:prevc)]) - let s:i = &ts - (s:vcol % &ts) + let s:offset -= s:i - 1 + else + let s:i = &ts - ((s:idx + s:startcol - 1) % &ts) endif - let s:offset -= s:i - 1 - else - let s:i = &ts - ((s:idx + s:startcol - 1) % &ts) - endif - let s:expandedtab = substitute(s:expandedtab, '\t', repeat(' ', s:i), '') - let s:idx = stridx(s:expandedtab, "\t") - endwhile + let s:expandedtab = substitute(s:expandedtab, '\t', repeat(' ', s:i), '') + let s:idx = stridx(s:expandedtab, "\t") + endwhile + end " get the highlight group name to use let s:id = synIDtrans(s:id) @@ -1060,7 +1129,7 @@ " Cleanup %s:\s\+$::e -" Restore old settings +" Restore old settings (new window first) let &l:foldenable = s:old_fen let &l:foldmethod = s:old_fdm let &report = s:old_report @@ -1070,21 +1139,31 @@ let &magic = s:old_magic let @/ = s:old_search let &more = s:old_more + +" switch to original window to restore those settings exe s:orgwin . "wincmd w" + +if !s:settings.expand_tabs + let &l:isprint = s:old_isprint +endif +let &l:stl = s:origwin_stl let &l:et = s:old_et let &l:scrollbind = s:old_bind + +" and back to the new window again to end there exe s:newwin . "wincmd w" + +let &l:stl = s:newwin_stl exec 'resize' s:old_winheight let &l:winfixheight = s:old_winfixheight -call setwinvar(s:orgwin,'&stl', s:origwin_stl) -call setwinvar(s:newwin,'&stl', s:newwin_stl) let &ls=s:ls " Save a little bit of memory (worth doing?) unlet s:htmlfont unlet s:old_et s:old_paste s:old_icon s:old_report s:old_title s:old_search unlet s:old_magic s:old_more s:old_fdm s:old_fen s:old_winheight +unlet! s:old_isprint unlet s:whatterm s:idlist s:lnum s:end s:margin s:fgc s:bgc s:old_winfixheight unlet! s:col s:id s:attr s:len s:line s:new s:expandedtab s:concealinfo unlet! s:orgwin s:newwin s:orgbufnr s:idx s:i s:offset s:ls s:origwin_stl diff -u -r --new-file runtime/syntax.orig/d.vim runtime/syntax/d.vim --- runtime/syntax.orig/d.vim 2010-05-15 06:03:56.000000000 -0500 +++ runtime/syntax/d.vim 2010-09-22 15:54:05.000000000 -0500 @@ -1,16 +1,19 @@ -" Vim syntax file for the D programming language (version 1.053 and 2.039). +" Vim syntax file for the D programming language (version 1.053 and 2.047). " -" Language: D -" Maintainer: Jason Mills -" Last Change: 2010 Jan 07 -" Version: 0.18 +" Language: D +" Maintainer: Jesse Phillips +" Last Change: 2010 Sep 21 +" Version: 0.22 " " Contributors: +" - Jason Mills : original Maintainer " - Kirk McDonald: version 0.17 updates, with minor modifications " (http://paste.dprogramming.com/dplmb7qx?view=hidelines) -" - Jesse K. Phillips: patch for some keywords and attributes (annotations), with modifications " - Tim Keating: patch to fix a bug in highlighting the `\` literal " - Frank Benoit: Fixed a bug that caused some identifiers and numbers to highlight as octal number errors. +" - Shougo Matsushita : updates for latest 2.047 highlighting +" - Ellery Newcomer: Fixed some highlighting bugs. +" - Steven N. Oliver: #! highlighting " " Please email me with bugs, comments, and suggestions. " @@ -47,52 +50,89 @@ " Keyword definitions " -syn keyword dExternal import package module extern -syn keyword dConditional if else switch -syn keyword dBranch goto break continue -syn keyword dRepeat while for do foreach foreach_reverse -syn keyword dBoolean true false -syn keyword dConstant null -syn keyword dConstant __FILE__ __LINE__ __EOF__ __VERSION__ -syn keyword dConstant __DATE__ __TIME__ __TIMESTAMP__ __VENDOR__ - -syn keyword dTypedef alias typedef -syn keyword dStructure template interface class struct union -syn keyword dEnum enum -syn keyword dOperator new delete typeof typeid cast align is -syn keyword dOperator this super +syn keyword dExternal import package module extern +syn keyword dConditional if else switch +syn keyword dBranch goto break continue +syn keyword dRepeat while for do foreach foreach_reverse +syn keyword dBoolean true false +syn keyword dConstant null +syn keyword dConstant __FILE__ __LINE__ __EOF__ __VERSION__ +syn keyword dConstant __DATE__ __TIME__ __TIMESTAMP__ __VENDOR__ +syn keyword dTypedef alias typedef +syn keyword dStructure template interface class struct union +syn keyword dEnum enum +syn keyword dOperator new delete typeof typeid cast align is +syn keyword dOperator this super if exists("d_hl_operator_overload") - syn keyword dOpOverload opNeg opCom opPostInc opPostDec opCast opAdd opSub opSub_r - syn keyword dOpOverload opMul opDiv opDiv_r opMod opMod_r opAnd opOr opXor - syn keyword dOpOverload opShl opShl_r opShr opShr_r opUShr opUShr_r opCat - syn keyword dOpOverload opCat_r opEquals opEquals opCmp - syn keyword dOpOverload opAssign opAddAssign opSubAssign opMulAssign opDivAssign - syn keyword dOpOverload opModAssign opAndAssign opOrAssign opXorAssign - syn keyword dOpOverload opShlAssign opShrAssign opUShrAssign opCatAssign - syn keyword dOpOverload opIndex opIndexAssign opCall opSlice opSliceAssign opPos - syn keyword dOpOverload opAdd_r opMul_r opAnd_r opOr_r opXor_r opIn opIn_r - syn keyword dOpOverload opPow opDispatch opStar opDot opApply opApplyReverse + syn keyword dOpOverload opNeg opCom opPostInc opPostDec opCast opAdd + syn keyword dOpOverload opSub opSub_r opMul opDiv opDiv_r opMod + syn keyword dOpOverload opMod_r opAnd opOr opXor opShl opShl_r opShr + syn keyword dOpOverload opShr_r opUShr opUShr_r opCat + syn keyword dOpOverload opCat_r opEquals opEquals opCmp + syn keyword dOpOverload opAssign opAddAssign opSubAssign opMulAssign + syn keyword dOpOverload opDivAssign opModAssign opAndAssign + syn keyword dOpOverload opOrAssign opXorAssign opShlAssign + syn keyword dOpOverload opShrAssign opUShrAssign opCatAssign + syn keyword dOpOverload opIndex opIndexAssign opIndexOpAssign + syn keyword dOpOverload opCall opSlice opSliceAssign opSliceOpAssign + syn keyword dOpOverload opPos opAdd_r opMul_r opAnd_r opOr_r opXor_r + syn keyword dOpOverload opIn opIn_r opPow opDispatch opStar opDot + syn keyword dOpOverload opApply opApplyReverse + syn keyword dOpOverload opUnary opIndexUnary opSliceUnary + syn keyword dOpOverload opBinary opBinaryRight endif -syn keyword dType ushort int uint long ulong float -syn keyword dType void byte ubyte double bit char wchar ucent cent -syn keyword dType short bool dchar string wstring dstring -syn keyword dType real ireal ifloat idouble creal cfloat cdouble -syn keyword dDebug deprecated unittest -syn keyword dExceptions throw try catch finally -syn keyword dScopeDecl public protected private export -syn keyword dStatement version debug return with -syn keyword dStatement function delegate __traits asm mixin macro -syn keyword dStorageClass in out inout ref lazy scope body -syn keyword dStorageClass pure nothrow -syn keyword dStorageClass auto static override final abstract volatile __gshared __thread -syn keyword dStorageClass synchronized immutable shared const invariant lazy -syn keyword dPragma pragma + +syn keyword dType void ushort int uint long ulong float +syn keyword dType byte ubyte double bit char wchar ucent cent +syn keyword dType short bool dchar wstring dstring +syn keyword dType real ireal ifloat idouble +syn keyword dType creal cfloat cdouble +syn keyword dDebug deprecated unittest invariant +syn keyword dExceptions throw try catch finally +syn keyword dScopeDecl public protected private export +syn keyword dStatement debug return with +syn keyword dStatement function delegate __traits mixin macro +syn keyword dStorageClass in out inout ref lazy body +syn keyword dStorageClass pure nothrow +syn keyword dStorageClass auto static override final abstract volatile +syn keyword dStorageClass __gshared __thread +syn keyword dStorageClass synchronized shared immutable const lazy +syn keyword dPragma pragma +syn keyword dIdentifier _arguments _argptr __vptr __monitor _ctor _dtor +syn keyword dScopeIdentifier contained exit success failure +syn keyword dAttribute contained safe trusted system +syn keyword dAttribute contained property disable +syn keyword dVersionIdentifier contained DigitalMars GNU LDC LLVM +syn keyword dVersionIdentifier contained X86 X86_64 Windows Win32 Win64 +syn keyword dVersionIdentifier contained linux Posix OSX FreeBSD +syn keyword dVersionIdentifier contained LittleEndian BigEndian D_Coverage +syn keyword dVersionIdentifier contained D_Ddoc D_InlineAsm_X86 +syn keyword dVersionIdentifier contained D_InlineAsm_X86_64 D_LP64 D_PIC +syn keyword dVersionIdentifier contained unittest D_Version2 none all + +" Highlight the sharpbang +syn match dSharpBang "\%^#!.*" display " Attributes/annotations -syn match dAnnotation "@[_$a-zA-Z][_$a-zA-Z0-9_]*\>" +syn match dAnnotation "@[_$a-zA-Z][_$a-zA-Z0-9_]*\>" contains=dAttribute + +" Version Identifiers +syn match dVersion "[^.]version" nextgroup=dVersionInside +syn match dVersion "^version" nextgroup=dVersionInside +syn match dVersionInside "([_a-zA-Z][_a-zA-Z0-9]*\>" transparent contained contains=dVersionIdentifier + +" Scope StorageClass +syn match dStorageClass "scope" + +" Scope Identifiers +syn match dScope "scope\s*([_a-zA-Z][_a-zA-Z0-9]*\>"he=s+5 contains=dScopeIdentifier + +" String is a statement and a module name. +syn match dType "^string" +syn match dType "[^.]\s*\"ms=s+1 " Assert is a statement and a module name. -syn match dAssert "^assert\>" +syn match dAssert "^assert" syn match dAssert "[^.]\s*\"ms=s+1 " dTokens is used by the token string highlighting @@ -101,26 +141,18 @@ syn cluster dTokens add=dType,dDebug,dExceptions,dScopeDecl,dStatement syn cluster dTokens add=dStorageClass,dPragma,dAssert,dAnnotation -" Marks contents of the asm statment body as special -" -" TODO -"syn match dAsmStatement "\" -"syn region dAsmBody start="asm[\n]*\s*{"hs=e+1 end="}"he=e-1 contains=dAsmStatement -" -"hi def link dAsmBody dUnicode -"hi def link dAsmStatement dStatement " Labels " " We contain dScopeDecl so public: private: etc. are not highlighted like labels syn match dUserLabel "^\s*[_$a-zA-Z][_$a-zA-Z0-9_]*\s*:"he=e-1 contains=dLabel,dScopeDecl,dEnum -syn keyword dLabel case default +syn keyword dLabel case default syn cluster dTokens add=dUserLabel,dLabel " Comments " -syn keyword dTodo contained TODO FIXME TEMP REFACTOR REVIEW HACK BUG XXX +syn keyword dTodo contained TODO FIXME TEMP REFACTOR REVIEW HACK BUG XXX syn match dCommentStar contained "^\s*\*[^/]"me=e-1 syn match dCommentStar contained "^\s*\*$" syn match dCommentPlus contained "^\s*+[^/]"me=e-1 @@ -251,51 +283,184 @@ " The default highlighting. " -hi def link dBinary Number -hi def link dDec Number -hi def link dHex Number -hi def link dOctal Number -hi def link dFloat Float -hi def link dHexFloat Float -hi def link dDebug Debug -hi def link dBranch Conditional -hi def link dConditional Conditional -hi def link dLabel Label -hi def link dUserLabel Label -hi def link dRepeat Repeat -hi def link dExceptions Exception -hi def link dAssert Statement -hi def link dStatement Statement -hi def link dScopeDecl dStorageClass -hi def link dStorageClass StorageClass -hi def link dBoolean Boolean -hi def link dUnicode Special -hi def link dTokenStringBrack String -hi def link dHereString String -hi def link dNestString String -hi def link dDelimString String -hi def link dRawString String -hi def link dString String -hi def link dHexString String -hi def link dCharacter Character -hi def link dEscSequence SpecialChar -hi def link dSpecialCharError Error -hi def link dOctalError Error -hi def link dOperator Operator -hi def link dOpOverload Identifier -hi def link dConstant Constant -hi def link dTypedef Typedef -hi def link dEnum Structure -hi def link dStructure Structure -hi def link dTodo Todo -hi def link dType Type -hi def link dLineComment Comment -hi def link dBlockComment Comment -hi def link dNestedComment Comment -hi def link dExternal Include -hi def link dPragma PreProc -hi def link dAnnotation PreProc +hi def link dBinary Number +hi def link dDec Number +hi def link dHex Number +hi def link dOctal Number +hi def link dFloat Float +hi def link dHexFloat Float +hi def link dDebug Debug +hi def link dBranch Conditional +hi def link dConditional Conditional +hi def link dLabel Label +hi def link dUserLabel Label +hi def link dRepeat Repeat +hi def link dExceptions Exception +hi def link dAssert Statement +hi def link dStatement Statement +hi def link dScopeDecl dStorageClass +hi def link dStorageClass StorageClass +hi def link dBoolean Boolean +hi def link dUnicode Special +hi def link dTokenStringBrack String +hi def link dHereString String +hi def link dNestString String +hi def link dDelimString String +hi def link dRawString String +hi def link dString String +hi def link dHexString String +hi def link dCharacter Character +hi def link dEscSequence SpecialChar +hi def link dSpecialCharError Error +hi def link dOctalError Error +hi def link dOperator Operator +hi def link dOpOverload Identifier +hi def link dConstant Constant +hi def link dTypedef Typedef +hi def link dEnum Structure +hi def link dStructure Structure +hi def link dTodo Todo +hi def link dType Type +hi def link dLineComment Comment +hi def link dBlockComment Comment +hi def link dNestedComment Comment +hi def link dExternal Include +hi def link dPragma PreProc +hi def link dAnnotation PreProc +hi def link dSharpBang PreProc +hi def link dAttribute StorageClass +hi def link dIdentifier Identifier +hi def link dVersionIdentifier Identifier +hi def link dVersion dStatement +hi def link dScopeIdentifier dStatement +hi def link dScope dStorageClass let b:current_syntax = "d" -" vim: ts=8 noet +" Marks contents of the asm statment body as special + +syn match dAsmStatement "\" +syn region dAsmBody start="asm[\n]*\s*{"hs=e+1 end="}"he=e-1 contains=dAsmStatement,dAsmOpCode + +hi def link dAsmBody dUnicode +hi def link dAsmStatement dStatement +hi def link dAsmOpCode Identifier + +syn keyword dAsmOpCode contained aaa aad aam aas adc +syn keyword dAsmOpCode contained add addpd addps addsd addss +syn keyword dAsmOpCode contained and andnpd andnps andpd andps +syn keyword dAsmOpCode contained arpl bound bsf bsr bswap +syn keyword dAsmOpCode contained bt btc btr bts call +syn keyword dAsmOpCode contained cbw cdq clc cld clflush +syn keyword dAsmOpCode contained cli clts cmc cmova cmovae +syn keyword dAsmOpCode contained cmovb cmovbe cmovc cmove cmovg +syn keyword dAsmOpCode contained cmovge cmovl cmovle cmovna cmovnae +syn keyword dAsmOpCode contained cmovnb cmovnbe cmovnc cmovne cmovng +syn keyword dAsmOpCode contained cmovnge cmovnl cmovnle cmovno cmovnp +syn keyword dAsmOpCode contained cmovns cmovnz cmovo cmovp cmovpe +syn keyword dAsmOpCode contained cmovpo cmovs cmovz cmp cmppd +syn keyword dAsmOpCode contained cmpps cmps cmpsb cmpsd cmpss +syn keyword dAsmOpCode contained cmpsw cmpxch8b cmpxchg comisd comiss +syn keyword dAsmOpCode contained cpuid cvtdq2pd cvtdq2ps cvtpd2dq cvtpd2pi +syn keyword dAsmOpCode contained cvtpd2ps cvtpi2pd cvtpi2ps cvtps2dq cvtps2pd +syn keyword dAsmOpCode contained cvtps2pi cvtsd2si cvtsd2ss cvtsi2sd cvtsi2ss +syn keyword dAsmOpCode contained cvtss2sd cvtss2si cvttpd2dq cvttpd2pi cvttps2dq +syn keyword dAsmOpCode contained cvttps2pi cvttsd2si cvttss2si cwd cwde +syn keyword dAsmOpCode contained da daa das db dd +syn keyword dAsmOpCode contained de dec df di div +syn keyword dAsmOpCode contained divpd divps divsd divss dl +syn keyword dAsmOpCode contained dq ds dt dw emms +syn keyword dAsmOpCode contained enter f2xm1 fabs fadd faddp +syn keyword dAsmOpCode contained fbld fbstp fchs fclex fcmovb +syn keyword dAsmOpCode contained fcmovbe fcmove fcmovnb fcmovnbe fcmovne +syn keyword dAsmOpCode contained fcmovnu fcmovu fcom fcomi fcomip +syn keyword dAsmOpCode contained fcomp fcompp fcos fdecstp fdisi +syn keyword dAsmOpCode contained fdiv fdivp fdivr fdivrp feni +syn keyword dAsmOpCode contained ffree fiadd ficom ficomp fidiv +syn keyword dAsmOpCode contained fidivr fild fimul fincstp finit +syn keyword dAsmOpCode contained fist fistp fisub fisubr fld +syn keyword dAsmOpCode contained fld1 fldcw fldenv fldl2e fldl2t +syn keyword dAsmOpCode contained fldlg2 fldln2 fldpi fldz fmul +syn keyword dAsmOpCode contained fmulp fnclex fndisi fneni fninit +syn keyword dAsmOpCode contained fnop fnsave fnstcw fnstenv fnstsw +syn keyword dAsmOpCode contained fpatan fprem fprem1 fptan frndint +syn keyword dAsmOpCode contained frstor fsave fscale fsetpm fsin +syn keyword dAsmOpCode contained fsincos fsqrt fst fstcw fstenv +syn keyword dAsmOpCode contained fstp fstsw fsub fsubp fsubr +syn keyword dAsmOpCode contained fsubrp ftst fucom fucomi fucomip +syn keyword dAsmOpCode contained fucomp fucompp fwait fxam fxch +syn keyword dAsmOpCode contained fxrstor fxsave fxtract fyl2x fyl2xp1 +syn keyword dAsmOpCode contained hlt idiv imul in inc +syn keyword dAsmOpCode contained ins insb insd insw int +syn keyword dAsmOpCode contained into invd invlpg iret iretd +syn keyword dAsmOpCode contained ja jae jb jbe jc +syn keyword dAsmOpCode contained jcxz je jecxz jg jge +syn keyword dAsmOpCode contained jl jle jmp jna jnae +syn keyword dAsmOpCode contained jnb jnbe jnc jne jng +syn keyword dAsmOpCode contained jnge jnl jnle jno jnp +syn keyword dAsmOpCode contained jns jnz jo jp jpe +syn keyword dAsmOpCode contained jpo js jz lahf lar +syn keyword dAsmOpCode contained ldmxcsr lds lea leave les +syn keyword dAsmOpCode contained lfence lfs lgdt lgs lidt +syn keyword dAsmOpCode contained lldt lmsw lock lods lodsb +syn keyword dAsmOpCode contained lodsd lodsw loop loope loopne +syn keyword dAsmOpCode contained loopnz loopz lsl lss ltr +syn keyword dAsmOpCode contained maskmovdqu maskmovq maxpd maxps maxsd +syn keyword dAsmOpCode contained maxss mfence minpd minps minsd +syn keyword dAsmOpCode contained minss mov movapd movaps movd +syn keyword dAsmOpCode contained movdq2q movdqa movdqu movhlps movhpd +syn keyword dAsmOpCode contained movhps movlhps movlpd movlps movmskpd +syn keyword dAsmOpCode contained movmskps movntdq movnti movntpd movntps +syn keyword dAsmOpCode contained movntq movq movq2dq movs movsb +syn keyword dAsmOpCode contained movsd movss movsw movsx movupd +syn keyword dAsmOpCode contained movups movzx mul mulpd mulps +syn keyword dAsmOpCode contained mulsd mulss neg nop not +syn keyword dAsmOpCode contained or orpd orps out outs +syn keyword dAsmOpCode contained outsb outsd outsw packssdw packsswb +syn keyword dAsmOpCode contained packuswb paddb paddd paddq paddsb +syn keyword dAsmOpCode contained paddsw paddusb paddusw paddw pand +syn keyword dAsmOpCode contained pandn pavgb pavgw pcmpeqb pcmpeqd +syn keyword dAsmOpCode contained pcmpeqw pcmpgtb pcmpgtd pcmpgtw pextrw +syn keyword dAsmOpCode contained pinsrw pmaddwd pmaxsw pmaxub pminsw +syn keyword dAsmOpCode contained pminub pmovmskb pmulhuw pmulhw pmullw +syn keyword dAsmOpCode contained pmuludq pop popa popad popf +syn keyword dAsmOpCode contained popfd por prefetchnta prefetcht0 prefetcht1 +syn keyword dAsmOpCode contained prefetcht2 psadbw pshufd pshufhw pshuflw +syn keyword dAsmOpCode contained pshufw pslld pslldq psllq psllw +syn keyword dAsmOpCode contained psrad psraw psrld psrldq psrlq +syn keyword dAsmOpCode contained psrlw psubb psubd psubq psubsb +syn keyword dAsmOpCode contained psubsw psubusb psubusw psubw punpckhbw +syn keyword dAsmOpCode contained punpckhdq punpckhqdq punpckhwd punpcklbw punpckldq +syn keyword dAsmOpCode contained punpcklqdq punpcklwd push pusha pushad +syn keyword dAsmOpCode contained pushf pushfd pxor rcl rcpps +syn keyword dAsmOpCode contained rcpss rcr rdmsr rdpmc rdtsc +syn keyword dAsmOpCode contained rep repe repne repnz repz +syn keyword dAsmOpCode contained ret retf rol ror rsm +syn keyword dAsmOpCode contained rsqrtps rsqrtss sahf sal sar +syn keyword dAsmOpCode contained sbb scas scasb scasd scasw +syn keyword dAsmOpCode contained seta setae setb setbe setc +syn keyword dAsmOpCode contained sete setg setge setl setle +syn keyword dAsmOpCode contained setna setnae setnb setnbe setnc +syn keyword dAsmOpCode contained setne setng setnge setnl setnle +syn keyword dAsmOpCode contained setno setnp setns setnz seto +syn keyword dAsmOpCode contained setp setpe setpo sets setz +syn keyword dAsmOpCode contained sfence sgdt shl shld shr +syn keyword dAsmOpCode contained shrd shufpd shufps sidt sldt +syn keyword dAsmOpCode contained smsw sqrtpd sqrtps sqrtsd sqrtss +syn keyword dAsmOpCode contained stc std sti stmxcsr stos +syn keyword dAsmOpCode contained stosb stosd stosw str sub +syn keyword dAsmOpCode contained subpd subps subsd subss sysenter +syn keyword dAsmOpCode contained sysexit test ucomisd ucomiss ud2 +syn keyword dAsmOpCode contained unpckhpd unpckhps unpcklpd unpcklps verr +syn keyword dAsmOpCode contained verw wait wbinvd wrmsr xadd +syn keyword dAsmOpCode contained xchg xlat xlatb xor xorpd +syn keyword dAsmOpCode contained xorps +syn keyword dAsmOpCode contained addsubpd addsubps fisttp haddpd haddps +syn keyword dAsmOpCode contained hsubpd hsubps lddqu monitor movddup +syn keyword dAsmOpCode contained movshdup movsldup mwait +syn keyword dAsmOpCode contained pavgusb pf2id pfacc pfadd pfcmpeq +syn keyword dAsmOpCode contained pfcmpge pfcmpgt pfmax pfmin pfmul +syn keyword dAsmOpCode contained pfnacc pfpnacc pfrcp pfrcpit1 pfrcpit2 +syn keyword dAsmOpCode contained pfrsqit1 pfrsqrt pfsub pfsubr pi2fd +syn keyword dAsmOpCode contained pmulhrw pswapd + diff -u -r --new-file runtime/syntax.orig/debchangelog.vim runtime/syntax/debchangelog.vim --- runtime/syntax.orig/debchangelog.vim 2010-05-15 06:03:56.000000000 -0500 +++ runtime/syntax/debchangelog.vim 2011-01-08 08:32:57.000000000 -0600 @@ -3,8 +3,8 @@ " Maintainer: Debian Vim Maintainers " Former Maintainers: Gerfried Fuchs " Wichert Akkerman -" Last Change: 2010 May 06 -" URL: http://hg.debian.org/hg/pkg-vim/vim/raw-file/tip/runtime/syntax/debchangelog.vim +" Last Change: 2010 Oct 21 +" URL: http://hg.debian.org/hg/pkg-vim/vim/raw-file/unstable/runtime/syntax/debchangelog.vim " Standard syntax initialization if version < 600 @@ -19,7 +19,7 @@ " Define some common expressions we can use later on syn match debchangelogName contained "^[[:alnum:]][[:alnum:].+-]\+ " syn match debchangelogUrgency contained "; urgency=\(low\|medium\|high\|critical\|emergency\)\( \S.*\)\=" -syn match debchangelogTarget contained "\v %(frozen|unstable|%(testing|%(old)=stable)%(-proposed-updates|-security)=|experimental|%(etch|lenny)-%(backports|volatile)|%(dapper|hardy|jaunty|karmic|lucid|maverick)%(-%(security|proposed|updates|backports|commercial|partner))=)+" +syn match debchangelogTarget contained "\v %(frozen|unstable|%(testing|%(old)=stable)%(-proposed-updates|-security)=|experimental|%(lenny|squeeze)-%(backports%(-sloppy)=|volatile)|%(dapper|hardy|jaunty|karmic|lucid|maverick|natty)%(-%(security|proposed|updates|backports|commercial|partner))=)+" syn match debchangelogVersion contained "(.\{-})" syn match debchangelogCloses contained "closes:\_s*\(bug\)\=#\=\_s\=\d\+\(,\_s*\(bug\)\=#\=\_s\=\d\+\)*" syn match debchangelogLP contained "\clp:\s\+#\d\+\(,\s*#\d\+\)*" diff -u -r --new-file runtime/syntax.orig/debcontrol.vim runtime/syntax/debcontrol.vim --- runtime/syntax.orig/debcontrol.vim 2010-05-15 06:03:57.000000000 -0500 +++ runtime/syntax/debcontrol.vim 2011-01-08 08:40:13.000000000 -0600 @@ -3,8 +3,8 @@ " Maintainer: Debian Vim Maintainers " Former Maintainers: Gerfried Fuchs " Wichert Akkerman -" Last Change: 2009 Aug 17 -" URL: http://hg.debian.org/hg/pkg-vim/vim/raw-file/tip/runtime/syntax/debcontrol.vim +" Last Change: 2010 Oct 21 +" URL: http://hg.debian.org/hg/pkg-vim/vim/raw-file/unstable/runtime/syntax/debcontrol.vim " Standard syntax initialization if version < 600 @@ -27,7 +27,7 @@ syn match debcontrolArchitecture contained "\%(all\|any\|alpha\|amd64\|arm\%(e[bl]\)\=\|avr32\|hppa\|i386\|ia64\|lpia\|m32r\|m68k\|mips\%(el\)\=\|powerpc\|ppc64\|s390x\=\|sh[34]\(eb\)\=\|sh\|sparc\%(64\)\=\|hurd-i386\|kfreebsd-\%(i386\|amd64\|gnu\)\|knetbsd-i386\|kopensolaris-i386\|netbsd-\%(alpha\|i386\)\)" syn match debcontrolName contained "[a-z0-9][a-z0-9+.-]\+" syn match debcontrolPriority contained "\(extra\|important\|optional\|required\|standard\)" -syn match debcontrolSection contained "\v((contrib|non-free|non-US/main|non-US/contrib|non-US/non-free|restricted|universe|multiverse)/)?(admin|cli-mono|comm|database|debian-installer|debug|devel|doc|editors|electronics|embedded|fonts|games|gnome|gnustep|gnu-r|graphics|hamradio|haskell|httpd|interpreters|java|kde|kernel|libs|libdevel|lisp|localization|mail|math|misc|net|news|ocaml|oldlibs|otherosfs|perl|php|python|ruby|science|shells|sound|text|tex|utils|vcs|video|web|x11|xfce|zope)" +syn match debcontrolSection contained "\v((contrib|non-free|non-US/main|non-US/contrib|non-US/non-free|restricted|universe|multiverse)/)?(admin|cli-mono|comm|database|debian-installer|debug|devel|doc|editors|electronics|embedded|fonts|games|gnome|gnustep|gnu-r|graphics|hamradio|haskell|httpd|interpreters|java|kde|kernel|libs|libdevel|lisp|localization|mail|math|metapackages|misc|net|news|ocaml|oldlibs|otherosfs|perl|php|python|ruby|science|shells|sound|text|tex|utils|vcs|video|web|x11|xfce|zope)" syn match debcontrolPackageType contained "u\?deb" syn match debcontrolVariable contained "\${.\{-}}" syn match debcontrolDmUpload contained "\cyes" diff -u -r --new-file runtime/syntax.orig/debsources.vim runtime/syntax/debsources.vim --- runtime/syntax.orig/debsources.vim 2010-05-15 06:03:57.000000000 -0500 +++ runtime/syntax/debsources.vim 2011-01-08 08:35:02.000000000 -0600 @@ -2,8 +2,8 @@ " Language: Debian sources.list " Maintainer: Debian Vim Maintainers " Former Maintainer: Matthijs Mohlmann -" Last Change: 2010 May 06 -" URL: http://hg.debian.org/hg/pkg-vim/vim/raw-file/tip/runtime/syntax/debsources.vim +" Last Change: 2010 Oct 21 +" URL: http://hg.debian.org/hg/pkg-vim/vim/raw-file/unstable/runtime/syntax/debsources.vim " Standard syntax initialization if version < 600 @@ -23,7 +23,7 @@ " Match uri's syn match debsourcesUri +\(http://\|ftp://\|[rs]sh://\|debtorrent://\|\(cdrom\|copy\|file\):\)[^' <>"]\++ -syn match debsourcesDistrKeyword +\([[:alnum:]_./]*\)\(etch\|lenny\|squeeze\|\(old\)\=stable\|testing\|unstable\|sid\|rc-buggy\|experimental\|dapper\|hardy\|jaunty\|karmic\|lucid\|maverick\)\([-[:alnum:]_./]*\)+ +syn match debsourcesDistrKeyword +\([[:alnum:]_./]*\)\(lenny\|squeeze\|\(old\)\=stable\|testing\|unstable\|sid\|rc-buggy\|experimental\|dapper\|hardy\|jaunty\|karmic\|lucid\|maverick\|natty\)\([-[:alnum:]_./]*\)+ " Associate our matches and regions with pretty colours hi def link debsourcesLine Error diff -u -r --new-file runtime/syntax.orig/falcon.vim runtime/syntax/falcon.vim --- runtime/syntax.orig/falcon.vim 1969-12-31 18:00:00.000000000 -0600 +++ runtime/syntax/falcon.vim 2011-01-08 08:23:05.000000000 -0600 @@ -0,0 +1,155 @@ +" Vim syntax file +" Language: Falcon +" Maintainer: Steven Oliver +" Website: http://github.com/steveno/vim-files/blob/master/syntax/falcon.vim +" Credits: Thanks the ruby.vim authors, I borrowed a lot! +" ------------------------------------------------------------------------------- +" GetLatestVimScripts: 2745 1 :AutoInstall: falcon.vim + +" When wanted, highlight the trailing whitespace. +if exists("c_space_errors") + if !exists("c_no_trail_space_error") + syn match falconSpaceError "\s\+$" + endif + + if !exists("c_no_tab_space_error") + syn match falconSpaceError " \+\t"me=e-1 + endif +endif + +" Symbols +syn match falconSymbol "\(;\|,\|\.\)" +syn match falconSymbolOther "\(#\|@\)" display + +" Operators +syn match falconOperator "\(+\|-\|\*\|/\|=\|<\|>\|\*\*\|!=\|\~=\)" +syn match falconOperator "\(<=\|>=\|=>\|\.\.\|<<\|>>\|\"\)" + +" Clusters +syn region falconSymbol start="[]})\"':]\@" +syn match falconOctal contained "\<0\o\+\>" +syn match falconIntLiteral contained "[+-]\" +syn match falconFloatLiteral contained "[+-]\=\d\+\.\d*" +syn match falconFloatLiteral contained "[+-]\=\d*\.\d*" + +" Includes +syn keyword falconInclude load import + +" Expression Substitution and Backslash Notation +syn match falconStringEscape "\\\\\|\\[abefnrstv]\|\\\o\{1,3}\|\\x\x\{1,2}" contained display +syn match falconStringEscape "\%(\\M-\\C-\|\\C-\\M-\|\\M-\\c\|\\c\\M-\|\\c\|\\C-\|\\M-\)\%(\\\o\{1,3}\|\\x\x\{1,2}\|\\\=\S\)" contained display +syn region falconSymbol start="[]})\"':]\@" skip="\\\\\|\\>" fold contains=falconDelimEscape +syn region falconString matchgroup=falconStringDelimiter start="%[qw]\[" end="\]" skip="\\\\\|\\\]" fold contains=falconDelimEscape +syn region falconString matchgroup=falconStringDelimiter start="%[qw](" end=")" skip="\\\\\|\\)" fold contains=falconDelimEscape +syn region falconSymbol matchgroup=falconSymbolDelimiter start="%[s]\z([~`!@#$%^&*_\-+=|\:;"',.?/]\)" end="\z1" skip="\\\\\|\\\z1" fold +syn region falconSymbol matchgroup=falconSymbolDelimiter start="%[s]{" end="}" skip="\\\\\|\\}" fold contains=falconDelimEscape +syn region falconSymbol matchgroup=falconSymbolDelimiter start="%[s]<" end=">" skip="\\\\\|\\>" fold contains=falconDelimEscape +syn region falconSymbol matchgroup=falconSymbolDelimiter start="%[s]\[" end="\]" skip="\\\\\|\\\]" fold contains=falconDelimEscape +syn region falconSymbol matchgroup=falconSymbolDelimiter start="%[s](" end=")" skip="\\\\\|\\)" fold contains=falconDelimEscape + +" Generalized Double Quoted String and Array of Strings and Shell Command Output +syn region falconString matchgroup=falconStringDelimiter start="%\z([~`!@#$%^&*_\-+|\:;"',.?/]\)" end="\z1" skip="\\\\\|\\\z1" contains=falconStringEscape fold +syn region falconString matchgroup=falconStringDelimiter start="%[QWx]\z([~`!@#$%^&*_\-+=|\:;"',.?/]\)" end="\z1" skip="\\\\\|\\\z1" contains=falconStringEscape fold +syn region falconString matchgroup=falconStringDelimiter start="%[QWx]\={" end="}" skip="\\\\\|\\}" contains=falconStringEscape,falconDelimEscape fold +syn region falconString matchgroup=falconStringDelimiter start="%[QWx]\=<" end=">" skip="\\\\\|\\>" contains=falconStringEscape,falconDelimEscape fold +syn region falconString matchgroup=falconStringDelimiter start="%[QWx]\=\[" end="\]" skip="\\\\\|\\\]" contains=falconStringEscape,falconDelimEscape fold +syn region falconString matchgroup=falconStringDelimiter start="%[QWx]\=(" end=")" skip="\\\\\|\\)" contains=falconStringEscape,falconDelimEscape fold + +syn region falconString start=+\%(\%(class\s*\|\%([]})"'.]\|::\)\)\_s*\|\w\)\@ + + HiLink falconKeyword Keyword + HiLink falconCommentString String + HiLink falconTodo Todo + HiLink falconConditional Keyword + HiLink falconRepeat Repeat + HiLink falconcommentSkip Comment + HiLink falconComment Comment + HiLink falconCommentL Comment + HiLink falconConst Constant + HiLink falconOperator Operator + HiLink falconSymbol Normal + HiLink falconSpaceError Error + HiLink falconHexadecimal Number + HiLink falconOctal Number + HiLink falconIntLiteral Number + HiLink falconFloatLiteral Float + HiLink falconStringEscape Special + HiLink falconStringDelimiter Delimiter + HiLink falconString String + HiLink falconBool Constant + HiLink falconSharpBang PreProc + HiLink falconInclude Include + HiLink falconSymbol Constant + HiLink falconSymbolOther Delimiter + delcommand HiLink +endif + +let b:current_syntax = "falcon" + +" vim: set sw=4 sts=4 et tw=80 : diff -u -r --new-file runtime/syntax.orig/gpg.vim runtime/syntax/gpg.vim --- runtime/syntax.orig/gpg.vim 2010-05-15 06:03:56.000000000 -0500 +++ runtime/syntax/gpg.vim 2011-01-08 08:36:35.000000000 -0600 @@ -1,7 +1,7 @@ " Vim syntax file " Language: gpg(1) configuration file " Maintainer: Nikolai Weibull -" Latest Revision: 2007-06-17 +" Latest Revision: 2010-10-14 if exists("b:current_syntax") finish @@ -54,7 +54,7 @@ \ personal-digest-preferences photo-viewer \ recipient s2k-cipher-algo s2k-digest-algo s2k-mode \ secret-keyring set-filename set-policy-url status-fd - \ trusted-key verify-options + \ trusted-key verify-options keyid-format list-options syn keyword gpgOption contained skipwhite nextgroup=gpgArgError \ allow-freeform-uid allow-non-selfsigned-uid \ allow-secret-key-import always-trust diff -u -r --new-file runtime/syntax.orig/groovy.vim runtime/syntax/groovy.vim --- runtime/syntax.orig/groovy.vim 2010-05-15 06:03:56.000000000 -0500 +++ runtime/syntax/groovy.vim 2011-01-08 08:36:35.000000000 -0600 @@ -1,10 +1,13 @@ " Vim syntax file " Language: Groovy -" Maintainer: Alessio Pace -" Version: 0.1.9b +" Original Author: Alessio Pace +" Maintainer: Tobias Rapp +" Version: 0.1.10 " URL: http://www.vim.org/scripts/script.php?script_id=945 -" Last Change: 6/4/2004 +" Last Change: 2010 Nov 29 +" THE ORIGINAL AUTHOR'S NOTES: +" " This is my very first vim script, I hope to have " done it the right way. " @@ -16,8 +19,7 @@ " For version 5.x: Clear all syntax items " For version 6.x: Quit when a syntax file was already loaded " -" HOWTO USE IT (INSTALL): -" [groovy is still not recognized by vim! :-( ] +" HOWTO USE IT (INSTALL) when not part of the distribution: " " 1) copy the file in the (global or user's $HOME/.vim/syntax/) syntax folder " @@ -247,7 +249,9 @@ syn match groovySpecialCharError contained "[^']" syn match groovySpecialChar contained "\\\([4-9]\d\|[0-3]\d\d\|[\"\\'ntbrf]\|u\x\{4\}\)" syn region groovyString start=+"+ end=+"+ end=+$+ contains=groovySpecialChar,groovySpecialError,@Spell,groovyELExpr -syn region groovyString start=+'+ end=+'+ end=+$+ contains=groovySpecialChar,groovySpecialError,@Spell,groovyELExpr +syn region groovyString start=+'+ end=+'+ end=+$+ contains=groovySpecialChar,groovySpecialError,@Spell +syn region groovyString start=+"""+ end=+"""+ contains=groovySpecialChar,groovySpecialError,@Spell,groovyELExpr +syn region groovyString start=+'''+ end=+'''+ contains=groovySpecialChar,groovySpecialError,@Spell " syn region groovyELExpr start=+${+ end=+}+ keepend contained syn match groovyELExpr /\${.\{-}}/ contained GroovyHiLink groovyELExpr Identifier diff -u -r --new-file runtime/syntax.orig/help.vim runtime/syntax/help.vim --- runtime/syntax.orig/help.vim 2010-07-18 16:18:04.000000000 -0500 +++ runtime/syntax/help.vim 2011-01-08 08:40:13.000000000 -0600 @@ -1,7 +1,7 @@ " Vim syntax file " Language: Vim help file " Maintainer: Bram Moolenaar (Bram@vim.org) -" Last Change: 2009 May 18 +" Last Change: 2010 Nov 03 " Quit when a (custom) syntax file was already loaded if exists("b:current_syntax") @@ -30,6 +30,7 @@ syn match helpOption "'[a-z]\{2,\}'" syn match helpOption "'t_..'" syn match helpHeader "\s*\zs.\{-}\ze\s\=\~$" nextgroup=helpIgnore +syn match helpGraphic ".* \ze`$" nextgroup=helpIgnore syn match helpIgnore "." contained conceal syn keyword helpNote note Note NOTE note: Note: NOTE: Notes Notes: syn match helpSpecial "\" diff -u -r --new-file runtime/syntax.orig/lex.vim runtime/syntax/lex.vim --- runtime/syntax.orig/lex.vim 2010-05-15 06:03:56.000000000 -0500 +++ runtime/syntax/lex.vim 2011-01-08 08:40:13.000000000 -0600 @@ -1,8 +1,8 @@ " Vim syntax file " Language: Lex " Maintainer: Charles E. Campbell, Jr. -" Last Change: Sep 11, 2009 -" Version: 10 +" Last Change: Nov 01, 2010 +" Version: 12 " URL: http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax " " Option: @@ -36,6 +36,9 @@ " --- Lex stuff --- " --- ========= --- +" Options Section +syn match lexOptions '^%\s*option\>.*$' contains=lexPatString + "I'd prefer to use lex.* , but vim doesn't handle forward definitions yet syn cluster lexListGroup contains=lexAbbrvBlock,lexAbbrv,lexAbbrv,lexAbbrvRegExp,lexInclude,lexPatBlock,lexPat,lexBrace,lexPatString,lexPatTag,lexPatTag,lexPatComment,lexPatCodeLine,lexMorePat,lexPatSep,lexSlashQuote,lexPatCode,cInParen,cUserLabel,cOctalZero,cCppSkip,cErrInBracket,cErrInParen,cOctalError,cCppOut2,cCommentStartError,cParenError syn cluster lexListPatCodeGroup contains=lexAbbrvBlock,lexAbbrv,lexAbbrv,lexAbbrvRegExp,lexInclude,lexPatBlock,lexPat,lexBrace,lexPatTag,lexPatTag,lexPatTagZoneStart,lexPatComment,lexPatCodeLine,lexMorePat,lexPatSep,lexSlashQuote,cInParen,cUserLabel,cOctalZero,cCppSkip,cErrInBracket,cErrInParen,cOctalError,cCppOut2,cCommentStartError,cParenError @@ -61,13 +64,15 @@ "%% : Patterns {Actions} if has("folding") - syn region lexPatBlock fold matchgroup=Todo start="^%%$" matchgroup=Todo end="^%%$" skipnl skipwhite contains=lexPatTag,lexPatTagZone,lexPatComment,lexPat + syn region lexPatBlock fold matchgroup=Todo start="^%%$" matchgroup=Todo end="^%%$" skipnl skipwhite contains=lexPatTag,lexPatTagZone,lexPatComment,lexPat,lexPatInclude syn region lexPat fold start=+\S+ skip="\\\\\|\\." end="\s"me=e-1 contained nextgroup=lexMorePat,lexPatSep contains=lexPatTag,lexPatString,lexSlashQuote,lexBrace + syn region lexPatInclude fold matchgroup=lexSep start="^%{" end="%}" contained contains=lexPatCode syn region lexBrace fold start="\[" skip=+\\\\\|\\+ end="]" contained syn region lexPatString fold matchgroup=String start=+"+ skip=+\\\\\|\\"+ matchgroup=String end=+"+ contained else - syn region lexPatBlock matchgroup=Todo start="^%%$" matchgroup=Todo end="^%%$" skipnl skipwhite contains=lexPatTag,lexPatTagZone,lexPatComment,lexPat + syn region lexPatBlock matchgroup=Todo start="^%%$" matchgroup=Todo end="^%%$" skipnl skipwhite contains=lexPatTag,lexPatTagZone,lexPatComment,lexPat,lexPatInclude syn region lexPat start=+\S+ skip="\\\\\|\\." end="\s"me=e-1 contained nextgroup=lexMorePat,lexPatSep contains=lexPatTag,lexPatString,lexSlashQuote,lexBrace + syn region lexPatInclude matchgroup=lexSep start="^%{" end="%}" contained contains=lexPatCode syn region lexBrace start="\[" skip=+\\\\\|\\+ end="]" contained syn region lexPatString matchgroup=String start=+"+ skip=+\\\\\|\\"+ matchgroup=String end=+"+ contained endif @@ -117,6 +122,7 @@ hi def link lexAbbrv SpecialChar hi def link lexCFunctions Function hi def link lexMorePat SpecialChar +hi def link lexOptions PreProc hi def link lexPatComment Comment hi def link lexPat Function hi def link lexPatString Function diff -u -r --new-file runtime/syntax.orig/lisp.vim runtime/syntax/lisp.vim --- runtime/syntax.orig/lisp.vim 2010-05-15 06:03:56.000000000 -0500 +++ runtime/syntax/lisp.vim 2011-01-08 08:32:58.000000000 -0600 @@ -1,8 +1,8 @@ " Vim syntax file " Language: Lisp " Maintainer: Dr. Charles E. Campbell, Jr. -" Last Change: Mar 05, 2009 -" Version: 21 +" Last Change: Nov 16, 2010 +" Version: 22 " URL: http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax " " Thanks to F Xavier Noria for a list of 978 Common Lisp symbols @@ -32,7 +32,7 @@ " --------------------------------------------------------------------- " Clusters: {{{1 syn cluster lispAtomCluster contains=lispAtomBarSymbol,lispAtomList,lispAtomNmbr0,lispComment,lispDecl,lispFunc,lispLeadWhite -syn cluster lispBaseListCluster contains=lispAtom,lispAtomBarSymbol,lispAtomMark,lispBQList,lispBarSymbol,lispComment,lispConcat,lispDecl,lispFunc,lispKey,lispList,lispNumber,lispSpecial,lispSymbol,lispVar,lispLeadWhite +syn cluster lispBaseListCluster contains=lispAtom,lispAtomBarSymbol,lispAtomMark,lispBQList,lispBarSymbol,lispComment,lispConcat,lispDecl,lispFunc,lispKey,lispList,lispNumber,lispEscapeSpecial,lispSymbol,lispVar,lispLeadWhite if exists("g:lisp_instring") syn cluster lispListCluster contains=@lispBaseListCluster,lispString,lispInString,lispInStringString else @@ -68,7 +68,7 @@ syn match lispAtom "'[^ \t()]\+" contains=lispAtomMark syn match lispAtomBarSymbol !'|..\{-}|! contains=lispAtomMark syn region lispAtom start=+'"+ skip=+\\"+ end=+"+ -syn region lispAtomList contained matchgroup=Special start="(" skip="|.\{-}|" matchgroup=Special end=")" contains=@lispAtomCluster,lispString,lispSpecial +syn region lispAtomList contained matchgroup=Special start="(" skip="|.\{-}|" matchgroup=Special end=")" contains=@lispAtomCluster,lispString,lispEscapeSpecial syn match lispAtomNmbr contained "\<\d\+" syn match lispLeadWhite contained "^\s\+" @@ -537,16 +537,16 @@ syn match lispNumber "-\=\(\.\d\+\|\d\+\(\.\d*\)\=\)\([dDeEfFlL][-+]\=\d\+\)\=" syn match lispNumber "-\=\(\d\+/\d\+\)" -syn match lispSpecial "\*\w[a-z_0-9-]*\*" -syn match lispSpecial !#|[^()'`,"; \t]\+|#! -syn match lispSpecial !#x\x\+! -syn match lispSpecial !#o\o\+! -syn match lispSpecial !#b[01]\+! -syn match lispSpecial !#\\[ -}\~]! -syn match lispSpecial !#[':][^()'`,"; \t]\+! -syn match lispSpecial !#([^()'`,"; \t]\+)! -syn match lispSpecial !#\\\%(Space\|Newline\|Tab\|Page\|Rubout\|Linefeed\|Return\|Backspace\)! -syn match lispSpecial "\<+[a-zA-Z_][a-zA-Z_0-9-]*+\>" +syn match lispEscapeSpecial "\*\w[a-z_0-9-]*\*" +syn match lispEscapeSpecial !#|[^()'`,"; \t]\+|#! +syn match lispEscapeSpecial !#x\x\+! +syn match lispEscapeSpecial !#o\o\+! +syn match lispEscapeSpecial !#b[01]\+! +syn match lispEscapeSpecial !#\\[ -}\~]! +syn match lispEscapeSpecial !#[':][^()'`,"; \t]\+! +syn match lispEscapeSpecial !#([^()'`,"; \t]\+)! +syn match lispEscapeSpecial !#\\\%(Space\|Newline\|Tab\|Page\|Rubout\|Linefeed\|Return\|Backspace\)! +syn match lispEscapeSpecial "\<+[a-zA-Z_][a-zA-Z_0-9-]*+\>" syn match lispConcat "\s\.\s" syn match lispParenError ")" @@ -585,7 +585,7 @@ HiLink lispMark Delimiter HiLink lispNumber Number HiLink lispParenError Error - HiLink lispSpecial Type + HiLink lispEscapeSpecial Type HiLink lispString String HiLink lispTodo Todo HiLink lispVar Statement diff -u -r --new-file runtime/syntax.orig/logindefs.vim runtime/syntax/logindefs.vim --- runtime/syntax.orig/logindefs.vim 2010-05-15 06:03:57.000000000 -0500 +++ runtime/syntax/logindefs.vim 2011-01-08 08:36:35.000000000 -0600 @@ -1,7 +1,7 @@ " Vim syntax file " Language: login.defs(5) configuration file " Maintainer: Nikolai Weibull -" Latest Revision: 2006-04-19 +" Latest Revision: 2010-11-29 if exists("b:current_syntax") finish @@ -10,83 +10,163 @@ let s:cpo_save = &cpo set cpo&vim -syn keyword logindefsTodo contained TODO FIXME XXX NOTE - -syn region logindefsComment display oneline start='^\s*#' end='$' - \ contains=logindefsTodo,@Spell - -syn match logindefsString contained '[[:graph:]]\+' - -syn match logindefsPath contained '[[:graph:]]\+' - -syn match logindefsPaths contained '[[:graph:]]\+' - \ nextgroup=logindefsPathDelim - -syn match logindefsPathDelim contained ':' nextgroup=logindefsPaths - -syn keyword logindefsBoolean contained yes no - -syn match logindefsDecimal contained '\<\d\+\>' - -syn match logindefsOctal contained display '\<0\o\+\>' - \ contains=logindefsOctalZero -syn match logindefsOctalZero contained display '\<0' -syn match logindefsOctalError contained display '\<0\o*[89]\d*\>' - -syn match logindefsHex contained display '\<0x\x\+\>' - -syn cluster logindefsNumber contains=logindefsDecimal,logindefsOctal, - \ logindefsOctalError,logindefsHex - -syn match logindefsBegin display '^' - \ nextgroup=logindefsKeyword,logindefsComment - \ skipwhite - -syn keyword logindefsKeyword contained CHFN_AUTH CLOSE_SESSIONS CREATE_HOME - \ DEFAULT_HOME FAILLOG_ENAB LASTLOG_ENAB - \ LOG_OK_LOGINS LOG_UNKFAIL_ENAB MAIL_CHECK_ENAB - \ MD5_CRYPT_ENAB OBSCURE_CHECKS_ENAB - \ PASS_ALWAYS_WARN PORTTIME_CHECKS_ENAB - \ QUOTAS_ENAB SU_WHEEL_ONLY SYSLOG_SG_ENAB - \ SYSLOG_SU_ENAB USERGROUPS_ENAB - \ nextgroup=logindefsBoolean skipwhite - -syn keyword logindefsKeyword contained CHFN_RESTRICT CONSOLE CONSOLE_GROUPS - \ ENV_TZ ENV_HZ FAKE_SHELL SU_NAME LOGIN_STRING - \ NOLOGIN_STR TTYGROUP USERDEL_CMD - \ nextgroup=logindefsString skipwhite - -syn keyword logindefsKeyword contained ENVIRON_FILE FTMP_FILE HUSHLOGIN_FILE - \ ISSUE_FILE MAIL_DIR MAIL_FILE NOLOGINS_FILE - \ NOLOGINS_FILE TTYTYPE_FILE QMAIL_DIR - \ SULOG_FILE - \ nextgroup=logindefsPath skipwhite - -syn keyword logindefsKeyword contained CRACKLIB_DICTPATH ENV_PATH - \ ENV_ROOTPATH ENV_SUPATH MOTD_FILE - \ nextgroup=logindefsPaths skipwhite - -syn keyword logindefsKeyword contained ERASECHAR FAIL_DELAY GETPASS_ASTERISKS - \ GID_MAX GID_MIN KILLCHAR LOGIN_RETRIES - \ LOGIN_TIMEOUT PASS_CHANGE_TRIES PASS_MAX_DAYS - \ PASS_MAX_LEN PASS_MIN_DAYS PASS_MIN_LEN - \ PASS_WARN_AGE TTYPERM UID_MAX UID_MIN ULIMIT - \ UMASK - \ nextgroup=@logindefsNumber skipwhite - -hi def link logindefsTodo Todo -hi def link logindefsComment Comment -hi def link logindefsString String -hi def link logindefsPath String -hi def link logindefsPaths logindefsPath -hi def link logindefsPathDelim Delimiter -hi def link logindefsBoolean Boolean -hi def link logindefsDecimal Number -hi def link logindefsOctal Number -hi def link logindefsOctalZero PreProc -hi def link logindefsOctalError Error -hi def link logindefsHex Number -hi def link logindefsKeyword Keyword +syn match logindefsBegin display '^' + \ nextgroup= + \ logindefsComment, + \ @logindefsKeyword + \ skipwhite + +syn region logindefsComment display oneline start='^\s*#' end='$' + \ contains=logindefsTodo,@Spell + +syn keyword logindefsTodo contained TODO FIXME XXX NOTE + +syn cluster logindefsKeyword contains= + \ logindefsBooleanKeyword, + \ logindefsEncryptKeyword, + \ logindefsNumberKeyword, + \ logindefsPathKeyword, + \ logindefsPathsKeyword, + \ logindefsStringKeyword + +syn keyword logindefsBooleanKeyword contained + \ CHFN_AUTH + \ CHSH_AUTH + \ CREATE_HOME + \ DEFAULT_HOME + \ FAILLOG_ENAB + \ LASTLOG_ENAB + \ LOG_OK_LOGINS + \ LOG_UNKFAIL_ENAB + \ MAIL_CHECK_ENAB + \ MD5_CRYPT_ENAB + \ OBSCURE_CHECKS_ENAB + \ PASS_ALWAYS_WARN + \ PORTTIME_CHECKS_ENAB + \ QUOTAS_ENAB + \ SU_WHEEL_ONLY + \ SYSLOG_SG_ENAB + \ SYSLOG_SU_ENAB + \ USERGROUPS_ENAB + \ nextgroup=logindefsBoolean skipwhite + +syn keyword logindefsBoolean contained yes no + +syn keyword logindefsEncryptKeyword contained + \ ENCRYPT_METHOD + \ nextgroup=logindefsEncryptMethod skipwhite + +syn keyword logindefsEncryptMethod contained + \ DES + \ MD5 + \ SHA256 + \ SHA512 + +syn keyword logindefsNumberKeyword contained + \ ERASECHAR + \ FAIL_DELAY + \ GID_MAX + \ GID_MIN + \ KILLCHAR + \ LOGIN_RETRIES + \ LOGIN_TIMEOUT + \ MAX_MEMBERS_PER_GROUP + \ PASS_CHANGE_TRIES + \ PASS_MAX_DAYS + \ PASS_MIN_DAYS + \ PASS_WARN_AGE + \ PASS_MAX_LEN + \ PASS_MIN_LEN + \ SHA_CRYPT_MAX_ROUNDS + \ SHA_CRYPT_MIN_ROUNDS + \ SYS_GID_MAX + \ SYS_GID_MIN + \ SYS_UID_MAX + \ SYS_UID_MIN + \ UID_MAX + \ UID_MIN + \ ULIMIT + \ UMASK + \ nextgroup=@logindefsNumber skipwhite + +syn cluster logindefsNumber contains= + \ logindefsDecimal, + \ logindefsHex, + \ logindefsOctal, + \ logindefsOctalError + +syn match logindefsDecimal contained '\<\d\+\>' + +syn match logindefsHex contained display '\<0x\x\+\>' + +syn match logindefsOctal contained display '\<0\o\+\>' + \ contains=logindefsOctalZero +syn match logindefsOctalZero contained display '\<0' + +syn match logindefsOctalError contained display '\<0\o*[89]\d*\>' + +syn keyword logindefsPathKeyword contained + \ ENVIRON_FILE + \ FAKE_SHELL + \ FTMP_FILE + \ HUSHLOGIN_FILE + \ ISSUE_FILE + \ MAIL_DIR + \ MAIL_FILE + \ NOLOGINS_FILE + \ SULOG_FILE + \ TTYTYPE_FILE + \ nextgroup=logindefsPath skipwhite + +syn match logindefsPath contained '[[:graph:]]\+' + +syn keyword logindefsPathsKeyword contained + \ CONSOLE + \ ENV_PATH + \ ENV_SUPATH + \ MOTD_FILE + \ nextgroup=logindefsPaths skipwhite + +syn match logindefsPaths contained '[^:]\+' + \ nextgroup=logindefsPathDelim + +syn match logindefsPathDelim contained ':' nextgroup=logindefsPaths + +syn keyword logindefsStringKeyword contained + \ CHFN_RESTRICT + \ CONSOLE_GROUPS + \ ENV_HZ + \ ENV_TZ + \ LOGIN_STRING + \ SU_NAME + \ TTYGROUP + \ TTYPERM + \ USERDEL_CMD + \ nextgroup=logindefsString skipwhite + +syn match logindefsString contained '[[:graph:]]\+' + +hi def link logindefsComment Comment +hi def link logindefsTodo Todo +hi def link logindefsKeyword Keyword +hi def link logindefsBooleanKeyword logindefsKeyword +hi def link logindefsEncryptKeyword logindefsKeyword +hi def link logindefsNumberKeyword logindefsKeyword +hi def link logindefsPathKeyword logindefsKeyword +hi def link logindefsPathsKeyword logindefsKeyword +hi def link logindefsStringKeyword logindefsKeyword +hi def link logindefsBoolean Boolean +hi def link logindefsEncryptMethod Type +hi def link logindefsNumber Number +hi def link logindefsDecimal logindefsNumber +hi def link logindefsHex logindefsNumber +hi def link logindefsOctal logindefsNumber +hi def link logindefsOctalZero PreProc +hi def link logindefsOctalError Error +hi def link logindefsPath String +hi def link logindefsPaths logindefsPath +hi def link logindefsPathDelim Delimiter +hi def link logindefsString String let b:current_syntax = "logindefs" diff -u -r --new-file runtime/syntax.orig/nasm.vim runtime/syntax/nasm.vim --- runtime/syntax.orig/nasm.vim 2010-05-15 06:03:56.000000000 -0500 +++ runtime/syntax/nasm.vim 2011-01-08 08:27:46.000000000 -0600 @@ -1,9 +1,10 @@ " Vim syntax file " Language: NASM - The Netwide Assembler (v0.98) -" Maintainer: Manuel M.H. Stol -" Last Change: 2003 May 11 -" Vim URL: http://www.vim.org/lang.html -" NASM Home: http://www.cryogen.com/Nasm/ +" Maintainer: Andriy Sokolov +" Original Author: Manuel M.H. Stol +" Former Maintainer: Manuel M.H. Stol +" Last Change: 2010 Sep 24 +" NASM Home: http://www.nasm.us/ @@ -160,6 +161,7 @@ "syn region nasmInMacStrucDef contained transparent matchgroup=nasmStructure keepend start="^\s*UNION\>"hs=e-4 end="^\s*ENDUNION\>"re=e-8 contains=@nasmGrpCntnMacro "syn region nasmInMacStrucDef contained transparent matchgroup=nasmStructure keepend start="\" end="\" contains=@nasmGrpCntnMacro,nasmInStructure syn region nasmInMacPreConDef contained transparent matchgroup=nasmInMacPreCondit start="^\s*%ifnidni\>"hs=e-7 start="^\s*%if\(idni\|n\(ctx\|def\|idn\|num\|str\)\)\>"hs=e-6 start="^\s*%if\(ctx\|def\|idn\|nid\|num\|str\)\>"hs=e-5 start="^\s*%ifid\>"hs=e-4 start="^\s*%if\>"hs=e-2 end="%endif\>" contains=@nasmGrpCntnMacro,nasmInMacPreCondit,nasmInPreCondit +" Todo: allow STRUC/ISTRUC to be used inside preprocessor conditional block syn match nasmInMacPreCondit contained transparent "ctx\s"lc=3 skipwhite nextgroup=@nasmGrpNxtCtx syn match nasmInMacPreCondit contained "^\s*%elifctx\>"hs=e-7 skipwhite nextgroup=@nasmGrpNxtCtx syn match nasmInMacPreCondit contained "^\s*%elifnctx\>"hs=e-8 skipwhite nextgroup=@nasmGrpNxtCtx @@ -210,15 +212,17 @@ syn cluster nasmGrpPreCondits contains=nasmPreConditDef,@nasmGrpInPreCondits,nasmCtxPreProc,nasmCtxLocLabel " Other pre-processor statements -syn match nasmPreProc "^\s*%rep\>"hs=e-3 +syn match nasmPreProc "^\s*%\(rep\|use\)\>"hs=e-3 syn match nasmPreProc "^\s*%line\>"hs=e-4 -syn match nasmPreProc "^\s*%\(clear\|error\)\>"hs=e-5 -syn match nasmPreProc "^\s*%endrep\>"hs=e-6 -syn match nasmPreProc "^\s*%exitrep\>"hs=e-7 +syn match nasmPreProc "^\s*%\(clear\|error\|fatal\)\>"hs=e-5 +syn match nasmPreProc "^\s*%\(endrep\|strlen\|substr\)\>"hs=e-6 +syn match nasmPreProc "^\s*%\(exitrep\|warning\)\>"hs=e-7 syn match nasmDefine "^\s*%undef\>"hs=e-5 syn match nasmDefine "^\s*%\(assign\|define\)\>"hs=e-6 syn match nasmDefine "^\s*%i\(assign\|define\)\>"hs=e-7 +syn match nasmDefine "^\s*%unmacro\>"hs=e-7 syn match nasmInclude "^\s*%include\>"hs=e-7 +" Todo: Treat the line tail after %fatal, %error, %warning as text " Multiple pre-processor instructions on single line detection (obsolete) "syn match nasmPreProcError +^\s*\([^\t "%';][^"%';]*\|[^\t "';][^"%';]\+\)%\a\+\>+ @@ -231,6 +235,7 @@ syn match nasmGen08Register "\<[A-D][HL]\>" syn match nasmGen16Register "\<\([A-D]X\|[DS]I\|[BS]P\)\>" syn match nasmGen32Register "\" +syn match nasmGen64Register "\" syn match nasmSegRegister "\<[C-GS]S\>" syn match nasmSpcRegister "\" syn match nasmFpuRegister "\" @@ -298,20 +303,21 @@ syn match nasmStdInstruction "\" syn keyword nasmStdInstruction AAA AAD AAM AAS ADC ADD AND syn keyword nasmStdInstruction BOUND BSF BSR BSWAP BT[C] BTR BTS -syn keyword nasmStdInstruction CALL CBW CDQ CLC CLD CMC CMP CMPSB CMPSD CMPSW -syn keyword nasmStdInstruction CMPXCHG CMPXCHG8B CPUID CWD[E] +syn keyword nasmStdInstruction CALL CBW CDQ CLC CLD CMC CMP CMPSB CMPSD CMPSW CMPSQ +syn keyword nasmStdInstruction CMPXCHG CMPXCHG8B CPUID CWD[E] CQO syn keyword nasmStdInstruction DAA DAS DEC DIV ENTER -syn keyword nasmStdInstruction IDIV IMUL INC INT[O] IRET[D] IRETW +syn keyword nasmStdInstruction IDIV IMUL INC INT[O] IRET[D] IRETW IRETQ syn keyword nasmStdInstruction JCXZ JECXZ JMP -syn keyword nasmStdInstruction LAHF LDS LEA LEAVE LES LFS LGS LODSB LODSD +syn keyword nasmStdInstruction LAHF LDS LEA LEAVE LES LFS LGS LODSB LODSD LODSQ syn keyword nasmStdInstruction LODSW LOOP[E] LOOPNE LOOPNZ LOOPZ LSS -syn keyword nasmStdInstruction MOVSB MOVSD MOVSW MOVSX MOVZX MUL NEG NOP NOT -syn keyword nasmStdInstruction OR POPA[D] POPAW POPF[D] POPFW -syn keyword nasmStdInstruction PUSH[AD] PUSHAW PUSHF[D] PUSHFW +syn keyword nasmStdInstruction MOVSB MOVSD MOVSW MOVSX MOVSQ MOVZX MUL NEG NOP NOT +syn keyword nasmStdInstruction OR POPA[D] POPAW POPF[D] POPFW POPFQ +syn keyword nasmStdInstruction PUSH[AD] PUSHAW PUSHF[D] PUSHFW PUSHFQ syn keyword nasmStdInstruction RCL RCR RETF RET[N] ROL ROR syn keyword nasmStdInstruction SAHF SAL SAR SBB SCASB SCASD SCASW -syn keyword nasmStdInstruction SHL[D] SHR[D] STC STD STOSB STOSD STOSW SUB +syn keyword nasmStdInstruction SHL[D] SHR[D] STC STD STOSB STOSD STOSW STOSQ SUB syn keyword nasmStdInstruction TEST XADD XCHG XLATB XOR +syn keyword nasmStdInstruction LFENCE MFENCE SFENCE " System Instructions: (usually privileged) diff -u -r --new-file runtime/syntax.orig/po.vim runtime/syntax/po.vim --- runtime/syntax.orig/po.vim 2010-05-15 06:03:57.000000000 -0500 +++ runtime/syntax/po.vim 2010-09-22 15:54:05.000000000 -0500 @@ -1,10 +1,10 @@ " Vim syntax file " Language: po (gettext) " Maintainer: Dwayne Bailey -" Last Change: 2008 Sep 17 +" Last Change: 2010 Sep 21 " Contributors: Dwayne Bailey (Most advanced syntax highlighting) " Leonardo Fontenelle (Spell checking) -" SungHyun Nam (Original maintainer) +" Nam SungHyun (Original maintainer) " For version 5.x: Clear all syntax items " For version 6.x: Quit when a syntax file was already loaded @@ -39,7 +39,7 @@ \ contains=@Spell,poSpecial,poFormat,poHeaderItem,poCommentKDEError,poHeaderUndefined,poPluralKDEError,poMsguniqError,poKDEdesktopFile,poHtml,poAcceleratorStr,poHtmlNot,poVariable " Header and Copyright -syn match poHeaderItem "\(Project-Id-Version\|Report-Msgid-Bugs-To\|POT-Creation-Date\|PO-Revision-Date\|Last-Translator\|Language-Team\|MIME-Version\|Content-Type\|Content-Transfer-Encoding\|Plural-Forms\|X-Generator\): " contained +syn match poHeaderItem "\(Project-Id-Version\|Report-Msgid-Bugs-To\|POT-Creation-Date\|PO-Revision-Date\|Last-Translator\|Language-Team\|Language\|MIME-Version\|Content-Type\|Content-Transfer-Encoding\|Plural-Forms\|X-Generator\): " contained syn match poHeaderUndefined "\(PACKAGE VERSION\|YEAR-MO-DA HO:MI+ZONE\|FULL NAME \|LANGUAGE \|CHARSET\|ENCODING\|INTEGER\|EXPRESSION\)" contained syn match poCopyrightUnset "SOME DESCRIPTIVE TITLE\|FIRST AUTHOR , YEAR\|Copyright (C) YEAR Free Software Foundation, Inc\|YEAR THE PACKAGE\'S COPYRIGHT HOLDER\|PACKAGE" contained diff -u -r --new-file runtime/syntax.orig/python.vim runtime/syntax/python.vim --- runtime/syntax.orig/python.vim 2010-05-15 06:03:57.000000000 -0500 +++ runtime/syntax/python.vim 2010-09-22 15:49:19.000000000 -0500 @@ -1,7 +1,7 @@ " Vim syntax file " Language: Python " Maintainer: Neil Schemenauer -" Last Change: 2009-10-13 +" Last Change: 2010 Sep 21 " Credits: Zvezdan Petkovic " Neil Schemenauer " Dmitry Vasiliev @@ -45,6 +45,11 @@ finish endif +" We need nocompatible mode in order to continue lines with backslashes. +" Original setting will be restored. +let s:cpo_save = &cpo +set cpo&vim + " Keep Python keywords in alphabetical order inside groups for easy " comparison with the table in the 'Python Language Reference' " http://docs.python.org/reference/lexical_analysis.html#keywords. @@ -292,4 +297,7 @@ let b:current_syntax = "python" +let &cpo = s:cpo_save +unlet s:cpo_save + " vim:set sw=2 sts=2 ts=8 noet: diff -u -r --new-file runtime/syntax.orig/r.vim runtime/syntax/r.vim --- runtime/syntax.orig/r.vim 2010-05-15 06:03:56.000000000 -0500 +++ runtime/syntax/r.vim 2011-01-08 08:45:55.000000000 -0600 @@ -1,111 +1,137 @@ " Vim syntax file -" Language: R (GNU S) -" Maintainer: Vaidotas Zemlys -" Last Change: 2006 Apr 30 -" Filenames: *.R *.Rout *.r *.Rhistory *.Rt *.Rout.save *.Rout.fail -" URL: http://uosis.mif.vu.lt/~zemlys/vim-syntax/r.vim - -" First maintainer Tom Payne -" Modified to make syntax less colourful and added the highlighting of -" R assignment arrow - -" For version 5.x: Clear all syntax items -" For version 6.x: Quit when a syntax file was already loaded -if version < 600 - syntax clear -elseif exists("b:current_syntax") +" Language: R (GNU S) +" Maintainer: Jakson Aquino +" Former Maintainers: Vaidotas Zemlys +" Tom Payne +" Last Change: Wed Sep 29, 2010 09:31AM +" Filenames: *.R *.r *.Rhistory *.Rt +" +" NOTE: The highlighting of R functions is defined in the +" r-plugin/functions.vim, which is part of vim-r-plugin2: +" http://www.vim.org/scripts/script.php?script_id=2628 +" +" Some lines of code were borrowed from Zhuojun Chen. + +if exists("b:current_syntax") finish endif -if version >= 600 - setlocal iskeyword=@,48-57,_,. -else - set iskeyword=@,48-57,_,. -endif +setlocal iskeyword=@,48-57,_,. syn case match " Comment -syn match rComment /\#.*/ +syn match rComment contains=@Spell "\#.*" -" Constant " string enclosed in double quotes -syn region rString start=/"/ skip=/\\\\\|\\"/ end=/"/ +syn region rString contains=rSpecial,rStrError,@Spell start=/"/ skip=/\\\\\|\\"/ end=/"/ " string enclosed in single quotes -syn region rString start=/'/ skip=/\\\\\|\\'/ end=/'/ -" number with no fractional part or exponent -syn match rNumber /\d\+/ -" floating point number with integer and fractional parts and optional exponent -syn match rFloat /\d\+\.\d*\([Ee][-+]\=\d\+\)\=/ -" floating point number with no integer part and optional exponent -syn match rFloat /\.\d\+\([Ee][-+]\=\d\+\)\=/ -" floating point number with no fractional part and optional exponent -syn match rFloat /\d\+[Ee][-+]\=\d\+/ +syn region rString contains=rSpecial,rStrError,@Spell start=/'/ skip=/\\\\\|\\'/ end=/'/ -" Identifier -" identifier with leading letter and optional following keyword characters -syn match rIdentifier /\a\k*/ -" identifier with leading period, one or more digits, and at least one non-digit keyword character -syn match rIdentifier /\.\d*\K\k*/ +syn match rStrError display contained "\\." + +" New line, carriage return, tab, backspace, bell, feed, vertical tab, backslash +syn match rSpecial display contained "\\\(n\|r\|t\|b\|a\|f\|v\|'\|\"\)\|\\\\" + +" Hexadecimal and Octal digits +syn match rSpecial display contained "\\\(x\x\{1,2}\|[0-8]\{1,3}\)" + +" Unicode characters +syn match rSpecial display contained "\\u\x\{1,4}" +syn match rSpecial display contained "\\U\x\{1,8}" +syn match rSpecial display contained "\\u{\x\{1,4}}" +syn match rSpecial display contained "\\U{\x\{1,8}}" + + +syn match rDollar "\$" " Statement syn keyword rStatement break next return syn keyword rConditional if else syn keyword rRepeat for in repeat while +" Constant (not really) +syn keyword rConstant T F LETTERS letters month.ab month.name pi +syn keyword rConstant R.version.string + " Constant -syn keyword rConstant LETTERS letters month.ab month.name pi syn keyword rConstant NULL syn keyword rBoolean FALSE TRUE -syn keyword rNumber NA -syn match rArrow /<\{1,2}-/ +syn keyword rNumber NA NA_integer_ NA_real_ NA_complex_ NA_character_ +syn keyword rNumber Inf NaN -" Type -syn keyword rType array category character complex double function integer list logical matrix numeric vector data.frame +" integer +syn match rInteger "\<\d\+L" +syn match rInteger "\<0x\([0-9]\|[a-f]\|[A-F]\)\+L" +syn match rInteger "\<\d\+[Ee]+\=\d\+L" + +syn match rOperator "[\*\!\&\+\-\<\>\=\^\|\~\`/:@]" +syn match rOperator "%\{2}\|%\*%\|%\/%\|%in%\|%o%\|%x%" + +syn match rComplex "\<\d\+i" +syn match rComplex "\<0x\([0-9]\|[a-f]\|[A-F]\)\+i" +syn match rComplex "\<\d\+\.\d*\([Ee][-+]\=\d\+\)\=i" +syn match rComplex "\<\.\d\+\([Ee][-+]\=\d\+\)\=i" +syn match rComplex "\<\d\+[Ee][-+]\=\d\+i" + +" number with no fractional part or exponent +syn match rNumber "\<\d\+\>" +" hexadecimal number +syn match rNumber "\<0x\([0-9]\|[a-f]\|[A-F]\)\+" + +" floating point number with integer and fractional parts and optional exponent +syn match rFloat "\<\d\+\.\d*\([Ee][-+]\=\d\+\)\=" +" floating point number with no integer part and optional exponent +syn match rFloat "\<\.\d\+\([Ee][-+]\=\d\+\)\=" +" floating point number with no fractional part and optional exponent +syn match rFloat "\<\d\+[Ee][-+]\=\d\+" + +syn match rArrow "<\{1,2}-" +syn match rArrow "->\{1,2}" " Special -syn match rDelimiter /[,;:]/ +syn match rDelimiter "[,;:]" " Error syn region rRegion matchgroup=Delimiter start=/(/ matchgroup=Delimiter end=/)/ transparent contains=ALLBUT,rError,rBraceError,rCurlyError syn region rRegion matchgroup=Delimiter start=/{/ matchgroup=Delimiter end=/}/ transparent contains=ALLBUT,rError,rBraceError,rParenError syn region rRegion matchgroup=Delimiter start=/\[/ matchgroup=Delimiter end=/]/ transparent contains=ALLBUT,rError,rCurlyError,rParenError -syn match rError /[)\]}]/ -syn match rBraceError /[)}]/ contained -syn match rCurlyError /[)\]]/ contained -syn match rParenError /[\]}]/ contained +syn match rError "[)\]}]" +syn match rBraceError "[)}]" contained +syn match rCurlyError "[)\]]" contained +syn match rParenError "[\]}]" contained + +" Functions that may add new objects +syn keyword rPreProc library require attach detach source + +" Type +syn keyword rType array category character complex double function integer list logical matrix numeric vector data.frame " Define the default highlighting. -" For version 5.7 and earlier: only when not done already -" For version 5.8 and later: only when an item doesn't have highlighting yet -if version >= 508 || !exists("did_r_syn_inits") - if version < 508 - let did_r_syn_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - HiLink rComment Comment - HiLink rConstant Constant - HiLink rString String - HiLink rNumber Number - HiLink rBoolean Boolean - HiLink rFloat Float - HiLink rStatement Statement - HiLink rConditional Conditional - HiLink rRepeat Repeat - HiLink rIdentifier Normal - HiLink rArrow Statement - HiLink rType Type - HiLink rDelimiter Delimiter - HiLink rError Error - HiLink rBraceError Error - HiLink rCurlyError Error - HiLink rParenError Error - delcommand HiLink -endif +hi def link rArrow Statement +hi def link rBoolean Boolean +hi def link rBraceError Error +hi def link rComment Comment +hi def link rComplex Number +hi def link rConditional Conditional +hi def link rConstant Constant +hi def link rCurlyError Error +hi def link rDelimiter Delimiter +hi def link rDollar SpecialChar +hi def link rError Error +hi def link rFloat Float +hi def link rInteger Number +hi def link rNumber Number +hi def link rOperator Operator +hi def link rParenError Error +hi def link rPreProc PreProc +hi def link rRepeat Repeat +hi def link rSpecial SpecialChar +hi def link rStatement Statement +hi def link rString String +hi def link rStrError Error +hi def link rType Type let b:current_syntax="r" " vim: ts=8 sw=2 - diff -u -r --new-file runtime/syntax.orig/rhelp.vim runtime/syntax/rhelp.vim --- runtime/syntax.orig/rhelp.vim 2010-05-15 06:03:56.000000000 -0500 +++ runtime/syntax/rhelp.vim 2011-01-08 08:36:35.000000000 -0600 @@ -1,10 +1,10 @@ " Vim syntax file " Language: R Help File " Maintainer: Johannes Ranke -" Last Change: 2010 Apr 22 -" Version: 0.7.3 -" SVN: $Id: rhelp.vim 88 2010-04-22 19:37:09Z ranke $ -" Remarks: - Now includes R syntax highlighting in the appropriate +" Last Change: 2010 Nov 22 +" Version: 0.7.4 +" SVN: $Id: rhelp.vim 90 2010-11-22 10:58:11Z ranke $ +" Remarks: - Includes R syntax highlighting in the appropriate " sections if an r.vim file is in the same directory or in the " default debian location. " - There is no Latex markup in equations @@ -28,19 +28,19 @@ syn region rhelpIdentifier matchgroup=rhelpSection start="\\name{" end="}" syn region rhelpIdentifier matchgroup=rhelpSection start="\\alias{" end="}" syn region rhelpIdentifier matchgroup=rhelpSection start="\\pkg{" end="}" -syn region rhelpIdentifier matchgroup=rhelpSection start="\\item{" end="}" contained contains=rhelpDots -syn region rhelpIdentifier matchgroup=rhelpSection start="\\method{" end=/}/ contained +syn region rhelpIdentifier matchgroup=rhelpSection start="\\method{" end="}" contained +syn region rhelpIdentifier matchgroup=rhelpSection start="\\Rdversion{" end="}" " Highlighting of R code using an existing r.vim syntax file if available {{{1 syn include @R syntax/r.vim syn match rhelpDots "\\dots" containedin=@R -syn region rhelpRcode matchgroup=Delimiter start="\\examples{" matchgroup=Delimiter transparent end=/}/ contains=@R,rhelpSection -syn region rhelpRcode matchgroup=Delimiter start="\\usage{" matchgroup=Delimiter transparent end=/}/ contains=@R,rhelpIdentifier,rhelpS4method -syn region rhelpRcode matchgroup=Delimiter start="\\synopsis{" matchgroup=Delimiter transparent end=/}/ contains=@R -syn region rhelpRcode matchgroup=Delimiter start="\\special{" matchgroup=Delimiter transparent end=/}/ contains=@R contained -syn region rhelpRcode matchgroup=Delimiter start="\\code{" matchgroup=Delimiter transparent end=/}/ contains=@R,rhelpLink contained -syn region rhelpS4method matchgroup=Delimiter start="\\S4method{.*}(" matchgroup=Delimiter transparent end=/)/ contains=@R,rhelpDots contained -syn region rhelpSexpr matchgroup=Delimiter start="\\Sexpr{" matchgroup=Delimiter transparent end=/}/ contains=@R +syn region rhelpRcode matchgroup=Delimiter start="\\examples{" matchgroup=Delimiter transparent end="}" contains=@R,rhelpSection +syn region rhelpRcode matchgroup=Delimiter start="\\usage{" matchgroup=Delimiter transparent end="}" contains=@R,rhelpIdentifier,rhelpS4method +syn region rhelpRcode matchgroup=Delimiter start="\\synopsis{" matchgroup=Delimiter transparent end="}" contains=@R +syn region rhelpRcode matchgroup=Delimiter start="\\special{" matchgroup=Delimiter transparent end="}" contains=@R contained +syn region rhelpRcode matchgroup=Delimiter start="\\code{" matchgroup=Delimiter transparent end="}" contains=@R,rhelpLink contained +syn region rhelpS4method matchgroup=Delimiter start="\\S4method{.*}(" matchgroup=Delimiter transparent end=")" contains=@R,rhelpDots contained +syn region rhelpSexpr matchgroup=Delimiter start="\\Sexpr{" matchgroup=Delimiter transparent end="}" contains=@R " Strings {{{1 syn region rhelpString start=/"/ end=/"/ @@ -53,7 +53,7 @@ syn match rhelpDelimiter "\\tab " " Keywords {{{1 -syn match rhelpKeyword "\\R" +syn match rhelpKeyword "\\R" contained syn match rhelpKeyword "\\ldots" syn match rhelpKeyword "--" syn match rhelpKeyword "---" @@ -129,10 +129,13 @@ syn match rhelpType "\\file\>" syn match rhelpType "\\email\>" syn match rhelpType "\\url\>" +syn match rhelpType "\\href\>" syn match rhelpType "\\var\>" syn match rhelpType "\\env\>" syn match rhelpType "\\option\>" syn match rhelpType "\\command\>" +syn match rhelpType "\\newcommand\>" +syn match rhelpType "\\renewcommand\>" syn match rhelpType "\\dfn\>" syn match rhelpType "\\cite\>" syn match rhelpType "\\acronym\>" @@ -140,6 +143,7 @@ " rhelp sections {{{1 syn match rhelpSection "\\encoding\>" syn match rhelpSection "\\title\>" +syn match rhelpSection "\\item\>" syn match rhelpSection "\\description\>" syn match rhelpSection "\\concept\>" syn match rhelpSection "\\arguments\>" @@ -153,11 +157,11 @@ syn match rhelpSection "\\docType\>" syn match rhelpSection "\\format\>" syn match rhelpSection "\\source\>" -syn match rhelpSection "\\itemize\>" -syn match rhelpSection "\\describe\>" -syn match rhelpSection "\\enumerate\>" -syn match rhelpSection "\\item " -syn match rhelpSection "\\item$" +syn match rhelpSection "\\itemize\>" +syn match rhelpSection "\\describe\>" +syn match rhelpSection "\\enumerate\>" +syn match rhelpSection "\\item " +syn match rhelpSection "\\item$" syn match rhelpSection "\\tabular{[lcr]*}" syn match rhelpSection "\\dontrun\>" syn match rhelpSection "\\dontshow\>" @@ -165,11 +169,11 @@ syn match rhelpSection "\\donttest\>" " Freely named Sections {{{1 -syn region rhelpFreesec matchgroup=Delimiter start="\\section{" matchgroup=Delimiter transparent end=/}/ -syn region rhelpFreesubsec matchgroup=Delimiter start="\\subsection{" matchgroup=Delimiter transparent end=/}/ +syn region rhelpFreesec matchgroup=Delimiter start="\\section{" matchgroup=Delimiter transparent end="}" +syn region rhelpFreesubsec matchgroup=Delimiter start="\\subsection{" matchgroup=Delimiter transparent end="}" " R help file comments {{{1 -syn match rhelpComment /%.*$/ contained +syn match rhelpComment /%.*$/ " Error {{{1 syn region rhelpRegion matchgroup=Delimiter start=/(/ matchgroup=Delimiter end=/)/ transparent contains=ALLBUT,rhelpError,rhelpBraceError,rhelpCurlyError diff -u -r --new-file runtime/syntax.orig/tex.vim runtime/syntax/tex.vim --- runtime/syntax.orig/tex.vim 2010-08-13 06:58:36.000000000 -0500 +++ runtime/syntax/tex.vim 2011-01-08 08:36:35.000000000 -0600 @@ -1,8 +1,8 @@ " Vim syntax file " Language: TeX " Maintainer: Dr. Charles E. Campbell, Jr. -" Last Change: Aug 12, 2010 -" Version: 57 +" Last Change: Sep 17, 2010 +" Version: 60 " URL: http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax " " Notes: {{{1 @@ -67,11 +67,11 @@ " g:tex_stylish to 1 (for "*.sty" mode) " or to 0 else (normal "*.tex" mode) " or on a buffer-by-buffer basis with b:tex_stylish -let b:extfname=expand("%:e") +let s:extfname=expand("%:e") if exists("g:tex_stylish") let b:tex_stylish= g:tex_stylish elseif !exists("b:tex_stylish") - if b:extfname == "sty" || b:extfname == "cls" || b:extfname == "clo" || b:extfname == "dtx" || b:extfname == "ltx" + if s:extfname == "sty" || s:extfname == "cls" || s:extfname == "clo" || s:extfname == "dtx" || s:extfname == "ltx" let b:tex_stylish= 1 else let b:tex_stylish= 0 @@ -92,12 +92,12 @@ " (La)TeX keywords: only use the letters a-zA-Z {{{1 " but _ is the only one that causes problems. if version < 600 - set isk-=_ + set isk=a-z,A-Z if b:tex_stylish set isk+=@ endif else - setlocal isk-=_ + setlocal isk=a-z,A-Z if b:tex_stylish setlocal isk+=@ endif @@ -300,7 +300,7 @@ " Bad Math (mismatched): {{{1 if !exists("tex_no_math") - syn match texBadMath "\\end\s*{\s*\(array\|gathered\|bBpvV]matrix\|split\|subequations\|smallmatrix\|xxalignat\)\s*}" + syn match texBadMath "\\end\s*{\s*\(array\|gathered\|bBpvV]matrix\|split\|smallmatrix\|xxalignat\)\s*}" syn match texBadMath "\\end\s*{\s*\(align\|alignat\|displaymath\|displaymath\|eqnarray\|equation\|flalign\|gather\|math\|multline\|xalignat\)\*\=\s*}" syn match texBadMath "\\[\])]" endif @@ -345,7 +345,6 @@ call TexNewMathZone("G","gather",1) call TexNewMathZone("H","math",1) call TexNewMathZone("I","multline",1) - call TexNewMathZone("J","subequations",0) call TexNewMathZone("K","xalignat",1) call TexNewMathZone("L","xxalignat",0) @@ -412,7 +411,7 @@ syn case ignore syn keyword texTodo contained combak fixme todo xxx syn case match -if b:extfname == "dtx" +if s:extfname == "dtx" syn match texComment "\^\^A.*$" contains=@texCommentGroup syn match texComment "^%\+" contains=@texCommentGroup else @@ -468,15 +467,16 @@ endif " Tex Reference Zones: {{{1 -syn region texZone matchgroup=texStatement start="@samp{" end="}\|%stopzone\>" contains=@texRefGroup -syn region texRefZone matchgroup=texStatement start="\\nocite{" end="}\|%stopzone\>" contains=@texRefGroup -syn region texRefZone matchgroup=texStatement start="\\bibliography{" end="}\|%stopzone\>" contains=@texRefGroup -syn region texRefZone matchgroup=texStatement start="\\label{" end="}\|%stopzone\>" contains=@texRefGroup -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,texRefZone nextgroup=texRefOption,texCite -syn region texCite contained matchgroup=Delimiter start='{' end='}' contains=@texRefGroup,texRefZone,texCite +syn match texRefZone '\\@samp\>' skipwhite nextgroup=texRefLabel +syn match texRefZone '\\nocite\>' skipwhite nextgroup=texRefLabel +syn match texRefZone '\\bibliography\>' skipwhite nextgroup=texRefLabel +syn match texRefZone '\\label\>' skipwhite nextgroup=texRefLabel +syn match texRefZone '\\\(page\|eq\)ref\>' skipwhite nextgroup=texRefLabel +syn match texRefZone '\\v\=ref' skipwhite nextgroup=texRefLabel +syn match texRefZone '\\cite\%([tp]\*\=\)\=' skipwhite nextgroup=texCiteOption,texCite +syn region texRefLabel contained matchgroup=Delimiter start='{' end='}' contains=@texRefGroup +syn region texCiteOption contained matchgroup=Delimiter start='\[' end=']' contains=@Spell,@texRefGroup,@texMathZones,texRefZone nextgroup=texCiteOption,texCite +syn region texCite contained matchgroup=Delimiter start='{' end='}' contains=@texRefGroup,texCite " Handle newcommand, newenvironment : {{{1 syn match texNewCmd "\\newcommand\>" nextgroup=texCmdName skipwhite skipnl @@ -753,7 +753,11 @@ \ ['wedge' , '∧'], \ ['wr' , '≀']] for texmath in s:texMathList - exe "syn match texMathSymbol '\\\\".texmath[0]."\\>' contained conceal cchar=".texmath[1] + if texmath[0] =~ '\w$' + exe "syn match texMathSymbol '\\\\".texmath[0]."\\>' contained conceal cchar=".texmath[1] + else + exe "syn match texMathSymbol '\\\\".texmath[0]."' contained conceal cchar=".texmath[1] + endif endfor if &ambw == "double" @@ -1027,7 +1031,6 @@ HiLink texError Error endif - HiLink texCite texRefZone HiLink texDefCmd texDef HiLink texDefName texDef HiLink texDocType texCmdName @@ -1052,6 +1055,7 @@ HiLink texMathZoneV texMath HiLink texMathZoneZ texMath endif + HiLink texRefZone Identifier HiLink texSectionMarker texCmdName HiLink texSectionName texSection HiLink texSpaceCode texStatement @@ -1060,6 +1064,7 @@ HiLink texTypeStyle texType " Basic TeX highlighting groups + HiLink texCite Special HiLink texCmdArgs Number HiLink texCmdName Statement HiLink texComment Comment @@ -1075,7 +1080,7 @@ HiLink texNewCmd Statement HiLink texNewEnv Statement HiLink texOption Number - HiLink texRefZone Special + HiLink texRefLabel Special HiLink texSection PreCondit HiLink texSpaceCodeChar Special HiLink texSpecialChar SpecialChar @@ -1089,6 +1094,6 @@ endif " Current Syntax: {{{1 -unlet b:extfname +unlet s:extfname let b:current_syntax = "tex" " vim: ts=8 fdm=marker diff -u -r --new-file runtime/syntax.orig/vim.vim runtime/syntax/vim.vim --- runtime/syntax.orig/vim.vim 2010-08-04 15:21:21.000000000 -0500 +++ runtime/syntax/vim.vim 2011-01-08 08:32:58.000000000 -0600 @@ -1,8 +1,8 @@ " Vim syntax file " Language: Vim 7.3 script " Maintainer: Dr. Charles E. Campbell, Jr. -" Last Change: August 04, 2010 -" Version: 7.3-04 +" Last Change: August 20, 2010 +" Version: 7.3-05 " Automatically generated keyword lists: {{{1 " Quit when a syntax file was already loaded {{{2 @@ -16,12 +16,14 @@ syn cluster vimCommentGroup contains=vimTodo,@Spell " regular vim commands {{{2 -syn keyword vimCommand contained abc[lear] argdo argu[ment] bel[owright] bN[ext] breakd[el] b[uffer] caddb[uffer] cb[uffer] cex[pr] cg[etfile] checkt[ime] cnew[er] col[der] con[tinue] cq[uit] delc[ommand] diffoff diffu[pdate] dr[op] echom[sg] em[enu] endt[ry] exi[t] fina[lly] fix[del] foldd[oopen] go[to] hid[e] ij[ump] isp[lit] k laddb[uffer] la[st] lch[dir] lex[pr] lgete[xpr] l[ist] lmak[e] lN[ext] loc[kmarks] lpf[ile] lt[ag] lv[imgrep] ma[rk] mk[exrc] mkv[imrc] mz[scheme] new noh[lsearch] on[ly] ped[it] popu prev[ious] prof[ile] pta[g] ptn[ext] pts[elect] py[thon] r[ead] redr[aw] ret[ab] rightb[elow] rundo san[dbox] sbf[irst] sbN[ext] scripte[ncoding] setg[lobal] sh[ell] sla[st] sme sni[ff] sor[t] spelli[nfo] sp[lit] startg[replace] st[op] sunme syncbind tabd[o] tabl[ast] tabN[ext] tabs tcld[o] th[row] tm[enu] tp[revious] tu undoj[oin] uns[ilent] vert[ical] vi[sual] wa[ll] winp[os] wp[revious] ws[verb] xa[ll] xmenu xnoremenu -syn keyword vimCommand contained abo[veleft] arge[dit] as[cii] bf[irst] bo[tright] breakl[ist] buffers cad[dexpr] cc cf[ile] c[hange] cla[st] cn[ext] colo[rscheme] cope[n] cr[ewind] d[elete] diffpatch dig[raphs] ds[earch] echon emenu* endw[hile] f[ile] fin[d] fo[ld] foldo[pen] gr[ep] his[tory] il[ist] iuna[bbrev] keepalt lad[dexpr] later lcl[ose] lf[ile] lg[etfile] ll lmapc[lear] lnf[ile] lockv[ar] lp[revious] lua lvimgrepa[dd] marks mks[ession] mod[e] nbc[lose] n[ext] nu[mber] o[pen] pe[rl] popu[p] p[rint] promptf[ind] ptf[irst] ptN[ext] pu[t] qa[ll] rec[over] redraws[tatus] retu[rn] rub[y] ru[ntime] sa[rgument] sbl[ast] sbp[revious] scrip[tnames] setl[ocal] sign sl[eep] smenu sno[magic] so[urce] spellr[epall] spr[evious] star[tinsert] stopi[nsert] sunmenu t tabe[dit] tabm[ove] tabo[nly] ta[g] tclf[ile] tj[ump] tn[ext] tr[ewind] tu[nmenu] undol[ist] up[date] vie[w] vmapc[lear] wh[ile] win[size] wq wundo x[it] XMLent xunme -syn keyword vimCommand contained al[l] argg[lobal] bad[d] bl[ast] bp[revious] br[ewind] bun[load] caddf[ile] ccl[ose] cfir[st] changes cl[ist] cN[ext] comc[lear] co[py] cuna[bbrev] delf[unction] diffpu[t] di[splay] dsp[lit] e[dit] endfo[r] ene[w] files fini[sh] foldc[lose] for grepa[dd] iabc[lear] imapc[lear] j[oin] keepj[umps] laddf[ile] lb[uffer] le[ft] lfir[st] lgr[ep] lla[st] lnew[er] lNf[ile] lol[der] lr[ewind] luado lw[indow] mat[ch] mksp[ell] m[ove] nb[key] N[ext] ol[dfiles] opt[ions] perld[o] pp[op] P[rint] promptr[epl] ptj[ump] ptp[revious] pw[d] q[uit] redi[r] reg[isters] rew[ind] rubyd[o] rv[iminfo] sav[eas] sbm[odified] sbr[ewind] se[t] sf[ind] sil[ent] sm[agic] sn[ext] snoreme spelld[ump] spellu[ndo] sre[wind] startr[eplace] sts[elect] sus[pend] tab tabf[ind] tabnew tabp[revious] tags te[aroff] tl[ast] tN[ext] try una[bbreviate] unh[ide] verb[ose] vim[grep] vne[w] winc[md] wn[ext] wqa[ll] wv[iminfo] xmapc[lear] XMLns xunmenu -syn keyword vimCommand contained arga[dd] argl[ocal] ba[ll] bm[odified] brea[k] bro[wse] bw[ipeout] cal[l] cd cgetb[uffer] chd[ir] clo[se] cnf[ile] comp[iler] cpf[ile] cw[indow] delm[arks] diffsplit dj[ump] earlier el[se] endf[unction] ex filetype fir[st] folddoc[losed] fu[nction] ha[rdcopy] if is[earch] ju[mps] kee[pmarks] lan[guage] lc[d] lefta[bove] lgetb[uffer] lgrepa[dd] lli[st] lne[xt] lo[adview] lop[en] ls luafile mak[e] menut[ranslate] mkvie[w] mzf[ile] nbs[tart] nmapc[lear] omapc[lear] pc[lose] po[p] pre[serve] profd[el] ps[earch] ptl[ast] ptr[ewind] pyf[ile] quita[ll] red[o] res[ize] ri[ght] rubyf[ile] sal[l] sba[ll] sbn[ext] sb[uffer] setf[iletype] sfir[st] sim[alt] sm[ap] sN[ext] snoremenu spe[llgood] spellw[rong] sta[g] stj[ump] sun[hide] sv[iew] tabc[lose] tabfir[st] tabn[ext] tabr[ewind] tc[l] tf[irst] tm to[pleft] ts[elect] u[ndo] unlo[ckvar] ve[rsion] vimgrepa[dd] vs[plit] windo wN[ext] w[rite] X xme xnoreme y[ank] -syn keyword vimCommand contained argd[elete] ar[gs] bd[elete] bn[ext] breaka[dd] bufdo cabc[lear] cat[ch] ce[nter] cgete[xpr] che[ckpath] cmapc[lear] cNf[ile] conf[irm] cp[revious] debugg[reedy] diffg[et] diffthis dl[ist] echoe[rr] elsei[f] en[dif] -syn match vimCommand contained "\!\=\ze\s*[^(]" skipwhite nextgroup=vimMapMod,vimMapLhs syn keyword vimMap cm[ap] cno[remap] im[ap] ino[remap] lm[ap] ln[oremap] nm[ap] nn[oremap] no[remap] om[ap] ono[remap] smap snor[emap] vm[ap] vn[oremap] xm[ap] xn[oremap] skipwhite nextgroup=vimMapBang,vimMapMod,vimMapLhs -syn keyword vimMap mapc[lear] +syn keyword vimMap mapc[lear] smapc[lear] syn keyword vimUnmap cu[nmap] iu[nmap] lu[nmap] nun[map] ou[nmap] sunm[ap] unm[ap] unm[ap] vu[nmap] xu[nmap] skipwhite nextgroup=vimMapBang,vimMapMod,vimMapLhs syn match vimMapLhs contained "\S\+" contains=vimNotation,vimCtrlChar skipwhite nextgroup=vimMapRhs syn match vimMapBang contained "!" skipwhite nextgroup=vimMapMod,vimMapLhs @@ -552,7 +554,7 @@ if !filereadable(s:luapath) let s:luapath= globpath(&rtp,"syntax/lua.vim") endif -if (g:vimsyn_embed =~ 'p' && has("lua")) && filereadable(s:luapath) +if (g:vimsyn_embed =~ 'l' && has("lua")) && filereadable(s:luapath) unlet! b:current_syntax exe "syn include @vimLuaScript ".s:luapath if exists("g:vimsyn_folding") && g:vimsyn_folding =~ 'l' diff -u -r --new-file runtime/syntax.orig/xf86conf.vim runtime/syntax/xf86conf.vim --- runtime/syntax.orig/xf86conf.vim 2010-05-15 06:03:56.000000000 -0500 +++ runtime/syntax/xf86conf.vim 2011-01-08 08:35:02.000000000 -0600 @@ -1,8 +1,8 @@ " Vim syntax file " This is a GENERATED FILE. Please always refer to source file at the URI below. " Language: XF86Config (XFree86 configuration file) -" Maintainer: David Ne\v{c}as (Yeti) -" Last Change: 2005 Jul 12 +" Former Maintainer: David Ne\v{c}as (Yeti) +" Last Change: 2010 Nov 01 " URL: http://trific.ath.cx/Ftp/vim/syntax/xf86conf.vim " Required Vim Version: 6.0 " @@ -63,7 +63,7 @@ " Sections and subsections if b:xf86conf_xfree86_version >= 4 - syn region xf86confSection matchgroup=xf86confSectionDelim start="^\s*Section\s\+\"\(Files\|Server[_ ]*Flags\|Input[_ ]*Device\|Device\|Video[_ ]*Adaptor\|Server[_ ]*Layout\|DRI\|Extensions\|Vendor\|Keyboard\|Pointer\)\"" end="^\s*EndSection\>" skip="#.*$\|\"[^\"]*\"" contains=xf86confComment,xf86confOption,xf86confKeyword,xf86confSectionError + syn region xf86confSection matchgroup=xf86confSectionDelim start="^\s*Section\s\+\"\(Files\|Server[_ ]*Flags\|Input[_ ]*Device\|Device\|Video[_ ]*Adaptor\|Server[_ ]*Layout\|DRI\|Extensions\|Vendor\|Keyboard\|Pointer\|InputClass\)\"" end="^\s*EndSection\>" skip="#.*$\|\"[^\"]*\"" contains=xf86confComment,xf86confOption,xf86confKeyword,xf86confSectionError syn region xf86confSectionModule matchgroup=xf86confSectionDelim start="^\s*Section\s\+\"Module\"" end="^\s*EndSection\>" skip="#.*$\|\"[^\"]*\"" contains=xf86confSubsectionAny,xf86confComment,xf86confOption,xf86confKeyword syn region xf86confSectionMonitor matchgroup=xf86confSectionDelim start="^\s*Section\s\+\"Monitor\"" end="^\s*EndSection\>" skip="#.*$\|\"[^\"]*\"" contains=xf86confSubsectionMode,xf86confModeLine,xf86confComment,xf86confOption,xf86confKeyword syn region xf86confSectionModes matchgroup=xf86confSectionDelim start="^\s*Section\s\+\"Modes\"" end="^\s*EndSection\>" skip="#.*$\|\"[^\"]*\"" contains=xf86confSubsectionMode,xf86confModeLine,xf86confComment @@ -165,7 +165,7 @@ " Synchronization if b:xf86conf_xfree86_version >= 4 - syn sync match xf86confSyncSection grouphere xf86confSection "^\s*Section\s\+\"\(Files\|Server[_ ]*Flags\|Input[_ ]*Device\|Device\|Video[_ ]*Adaptor\|Server[_ ]*Layout\|DRI\|Extensions\|Vendor\|Keyboard\|Pointer\)\"" + syn sync match xf86confSyncSection grouphere xf86confSection "^\s*Section\s\+\"\(Files\|Server[_ ]*Flags\|Input[_ ]*Device\|Device\|Video[_ ]*Adaptor\|Server[_ ]*Layout\|DRI\|Extensions\|Vendor\|Keyboard\|Pointer\|InputClass\)\"" syn sync match xf86confSyncSectionModule grouphere xf86confSectionModule "^\s*Section\s\+\"Module\"" syn sync match xf86confSyncSectionModes groupthere xf86confSectionModes "^\s*Section\s\+\"Modes\"" else diff -u -r --new-file runtime/syntax.orig/xquery.vim runtime/syntax/xquery.vim --- runtime/syntax.orig/xquery.vim 2010-05-15 06:03:56.000000000 -0500 +++ runtime/syntax/xquery.vim 2011-01-08 08:23:05.000000000 -0600 @@ -1,10 +1,11 @@ " Vim syntax file " Language: XQuery -" Author: Jean-Marc Vanel -" Last Change: mar jui 12 18:04:05 CEST 2005 +" Author: René Neumann +" Author: Steve Spigarelli +" Original Author: Jean-Marc Vanel +" Last Change: December 11, 2010 " Filenames: *.xq " URL: http://jmvanel.free.fr/vim/xquery.vim -" $Id: xquery.vim,v 1.1 2005/07/18 21:44:56 vimboss Exp $ " REFERENCES: " [1] http://www.w3.org/TR/xquery/ @@ -14,22 +15,26 @@ finish endif +" - is allowed in keywords +setlocal iskeyword+=- + runtime syntax/xml.vim syn case match " From XQuery grammar: -syn keyword xqueryStatement ancestor ancestor-or-self and as ascending at attribute base-uri by case cast castable child collation construction declare default descendant descendant-or-self descending div document element else empty encoding eq every except external following following-sibling for function ge greatest gt idiv if import in inherit-namespaces instance intersect is le least let lt mod module namespace ne no of or order ordered ordering parent preceding preceding-sibling preserve return satisfies schema self some stable strip then to treat typeswitch union unordered validate variable version where xmlspace xquery yes +syn keyword xqStatement ancestor ancestor-or-self and as ascending at attribute base-uri boundary-space by case cast castable child collation construction declare default descendant descendant-or-self descending div document element else empty encoding eq every except external following following-sibling for function ge greatest gt idiv if import in inherit-namespaces instance intersect is le least let lt mod module namespace ne no of or order ordered ordering parent preceding preceding-sibling preserve return satisfies schema self some stable strip then to treat typeswitch union unordered validate variable version where xmlspace xquery yes " TODO contains clashes with vim keyword -syn keyword xqueryFunction abs adjust-date-to-timezone adjust-date-to-timezone adjust-dateTime-to-timezone adjust-dateTime-to-timezone adjust-time-to-timezone adjust-time-to-timezone avg base-uri base-uri boolean ceiling codepoint-equal codepoints-to-string collection collection compare concat count current-date current-dateTime current-time data dateTime day-from-date day-from-dateTime days-from-duration deep-equal deep-equal default-collation distinct-values distinct-values doc doc-available document-uri empty ends-with ends-with error error error error escape-uri exactly-one exists false floor hours-from-dateTime hours-from-duration hours-from-time id id idref idref implicit-timezone in-scope-prefixes index-of index-of insert-before lang lang last local-name local-name local-name-from-QName lower-case matches matches max max min min minutes-from-dateTime minutes-from-duration minutes-from-time month-from-date month-from-dateTime months-from-duration name name namespace-uri namespace-uri namespace-uri-for-prefix namespace-uri-from-QName nilled node-name normalize-space normalize-space normalize-unicode normalize-unicode not number number one-or-more position prefix-from-QName QName remove replace replace resolve-QName resolve-uri resolve-uri reverse root root round round-half-to-even round-half-to-even seconds-from-dateTime seconds-from-duration seconds-from-time starts-with starts-with static-base-uri string string string-join string-length string-length string-to-codepoints subsequence subsequence substring substring substring-after substring-after substring-before substring-before sum sum timezone-from-date timezone-from-dateTime timezone-from-time tokenize tokenize trace translate true unordered upper-case year-from-date year-from-dateTime years-from-duration zero-or-one +syn keyword xqFunction abs adjust-date-to-timezone adjust-date-to-timezone adjust-dateTime-to-timezone adjust-dateTime-to-timezone adjust-time-to-timezone adjust-time-to-timezone avg base-uri base-uri boolean ceiling codepoint-equal codepoints-to-string collection collection compare concat count current-date current-dateTime current-time data dateTime day-from-date day-from-dateTime days-from-duration deep-equal deep-equal default-collation distinct-values distinct-values doc doc-available document-uri empty ends-with ends-with error error error error escape-uri exactly-one exists false floor hours-from-dateTime hours-from-duration hours-from-time id id idref idref implicit-timezone in-scope-prefixes index-of index-of insert-before lang lang last local-name local-name local-name-from-QName lower-case matches matches max max min min minutes-from-dateTime minutes-from-duration minutes-from-time month-from-date month-from-dateTime months-from-duration name name namespace-uri namespace-uri namespace-uri-for-prefix namespace-uri-from-QName nilled node-name normalize-space normalize-space normalize-unicode normalize-unicode not number number one-or-more position prefix-from-QName QName remove replace replace resolve-QName resolve-uri resolve-uri reverse root root round round-half-to-even round-half-to-even seconds-from-dateTime seconds-from-duration seconds-from-time starts-with starts-with static-base-uri string string string-join string-length string-length string-to-codepoints subsequence subsequence substring substring substring-after substring-after substring-before substring-before sum sum timezone-from-date timezone-from-dateTime timezone-from-time tokenize tokenize trace translate true unordered upper-case year-from-date year-from-dateTime years-from-duration zero-or-one + +syn keyword xqOperator add-dayTimeDuration-to-date add-dayTimeDuration-to-dateTime add-dayTimeDuration-to-time add-dayTimeDurations add-yearMonthDuration-to-date add-yearMonthDuration-to-dateTime add-yearMonthDurations base64Binary-equal boolean-equal boolean-greater-than boolean-less-than concatenate date-equal date-greater-than date-less-than dateTime-equal dateTime-greater-than dateTime-less-than dayTimeDuration-equal dayTimeDuration-greater-than dayTimeDuration-less-than divide-dayTimeDuration divide-dayTimeDuration-by-dayTimeDuration divide-yearMonthDuration divide-yearMonthDuration-by-yearMonthDuration except gDay-equal gMonth-equal gMonthDay-equal gYear-equal gYearMonth-equal hexBinary-equal intersect is-same-node multiply-dayTimeDuration multiply-yearMonthDuration node-after node-before NOTATION-equal numeric-add numeric-divide numeric-equal numeric-greater-than numeric-integer-divide numeric-less-than numeric-mod numeric-multiply numeric-subtract numeric-unary-minus numeric-unary-plus QName-equal subtract-dates-yielding-dayTimeDuration subtract-dateTimes-yielding-dayTimeDuration subtract-dayTimeDuration-from-date subtract-dayTimeDuration-from-dateTime subtract-dayTimeDuration-from-time subtract-dayTimeDurations subtract-times subtract-yearMonthDuration-from-date subtract-yearMonthDuration-from-dateTime subtract-yearMonthDurations time-equal time-greater-than time-less-than to union yearMonthDuration-equal yearMonthDuration-greater-than yearMonthDuration-less-than -syn keyword xqueryOperator add-dayTimeDuration-to-date add-dayTimeDuration-to-dateTime add-dayTimeDuration-to-time add-dayTimeDurations add-yearMonthDuration-to-date add-yearMonthDuration-to-dateTime add-yearMonthDurations base64Binary-equal boolean-equal boolean-greater-than boolean-less-than concatenate date-equal date-greater-than date-less-than dateTime-equal dateTime-greater-than dateTime-less-than dayTimeDuration-equal dayTimeDuration-greater-than dayTimeDuration-less-than divide-dayTimeDuration divide-dayTimeDuration-by-dayTimeDuration divide-yearMonthDuration divide-yearMonthDuration-by-yearMonthDuration except gDay-equal gMonth-equal gMonthDay-equal gYear-equal gYearMonth-equal hexBinary-equal intersect is-same-node multiply-dayTimeDuration multiply-yearMonthDuration node-after node-before NOTATION-equal numeric-add numeric-divide numeric-equal numeric-greater-than numeric-integer-divide numeric-less-than numeric-mod numeric-multiply numeric-subtract numeric-unary-minus numeric-unary-plus QName-equal subtract-dates-yielding-dayTimeDuration subtract-dateTimes-yielding-dayTimeDuration subtract-dayTimeDuration-from-date subtract-dayTimeDuration-from-dateTime subtract-dayTimeDuration-from-time subtract-dayTimeDurations subtract-times subtract-yearMonthDuration-from-date subtract-yearMonthDuration-from-dateTime subtract-yearMonthDurations time-equal time-greater-than time-less-than to union yearMonthDuration-equal yearMonthDuration-greater-than yearMonthDuration-less-than +syn match xqType "xs:\(\|Datatype\|primitive\|string\|boolean\|float\|double\|decimal\|duration\|dateTime\|time\|date\|gYearMonth\|gYear\|gMonthDay\|gDay\|gMonth\|hexBinary\|base64Binary\|anyURI\|QName\|NOTATION\|\|normalizedString\|token\|language\|IDREFS\|ENTITIES\|NMTOKEN\|NMTOKENS\|Name\|NCName\|ID\|IDREF\|ENTITY\|integer\|nonPositiveInteger\|negativeInteger\|long\|int\|short\|byte\|nonNegativeInteger\|unsignedLong\|unsignedInt\|unsignedShort\|unsignedByte\|positiveInteger\)" -syn match xqueryType "xs:\(\|Datatype\|primitive\|string\|boolean\|float\|double\|decimal\|duration\|dateTime\|time\|date\|gYearMonth\|gYear\|gMonthDay\|gDay\|gMonth\|hexBinary\|base64Binary\|anyURI\|QName\|NOTATION\|\|normalizedString\|token\|language\|IDREFS\|ENTITIES\|NMTOKEN\|NMTOKENS\|Name\|NCName\|ID\|IDREF\|ENTITY\|integer\|nonPositiveInteger\|negativeInteger\|long\|int\|short\|byte\|nonNegativeInteger\|unsignedLong\|unsignedInt\|unsignedShort\|unsignedByte\|positiveInteger\)" " From XPath grammar: -syn keyword xqueryXPath some every in in satisfies if then else to div idiv mod union intersect except instance of treat castable cast eq ne lt le gt ge is child descendant attribute self descendant-or-self following-sibling following namespace parent ancestor preceding-sibling preceding ancestor-or-self void item node document-node text comment processing-instruction attribute schema-attribute schema-element +syn keyword xqXPath some every in in satisfies if then else to div idiv mod union intersect except instance of treat castable cast eq ne lt le gt ge is child descendant attribute self descendant-or-self following-sibling following namespace parent ancestor preceding-sibling preceding ancestor-or-self void item node document-node text comment processing-instruction attribute schema-attribute schema-element " eXist extensions syn match xqExist "&=" @@ -37,44 +42,41 @@ " XQdoc syn match XQdoc contained "@\(param\|return\|author\)\>" -highlight def link xqueryStatement Statement -highlight def link xqueryFunction Function -highlight def link xqueryOperator Operator -highlight def link xqueryType Type -highlight def link xqueryXPath Operator -highlight def link XQdoc Special -highlight def link xqExist Operator - - -"floating point number, with dot, optional exponent -syn match cFloat "\d\+\.\d*\(e[-+]\=\d\+\)\=[fl]\=" -"floating point number, starting with a dot, optional exponent -syn match cFloat "\.\d\+\(e[-+]\=\d\+\)\=[fl]\=\>" -"floating point number, without dot, with exponent -syn match cFloat "\d\+e[-+]\=\d\+[fl]\=\>" -syn match cNumber "0x\x\+\(u\=l\{0,2}\|ll\=u\)\>" -syn match cNumber "\<\d\+\>" -highlight def link cNumber Number -highlight def link cFloat Number - -syn region xqComment start='(:' excludenl end=':)' contains=XQdoc -highlight def link xqComment Comment -" syntax match xqVariable "$\w\+" -syntax match xqVariable +$\<[a-zA-Z:_][-.0-9a-zA-Z0-9:_]*\>+ -highlight def link xqVariable Identifier - -" Redefine the default XML highlighting: -highlight def link xmlTag Structure -highlight def link xmlTagName Structure -highlight def link xmlEndTag Structure - -syntax match xqSeparator ",\|;" -highlight link xqSeparator Operator - -syn region xqCode transparent contained start='{' excludenl end='}' contains=xmlRegionBis,xqComment,xqueryStatement,xmlString,xqSeparator,cNumber,xqVariable keepend extend +" floating point number, with dot, optional exponent +syn match xqFloat "\d\+\.\d*\(e[-+]\=\d\+\)\=[fl]\=" +" floating point number, starting with a dot, optional exponent +syn match xqFloat "\.\d\+\(e[-+]\=\d\+\)\=[fl]\=\>" +" floating point number, without dot, with exponent +syn match xqFloat "\d\+e[-+]\=\d\+[fl]\=\>" +syn match xqNumber "0x\x\+\(u\=l\{0,2}\|ll\=u\)\>" +syn match xqNumber "\<\d\+\>" + +syn region xqString start=+"+ end=+"+ +syn region xqComment start='(:' excludenl end=':)' contains=XQdoc + +syn match xqVariable "$\<[a-zA-Z:_][-.0-9a-zA-Z0-9:_]*\>" +syn match xqSeparator ",\|;" +syn region xqCode transparent contained start='{' excludenl end='}' contains=xqFunction,xqCode,xmlRegionBis,xqComment,xqStatement,xmlString,xqSeparator,xqNumber,xqVariable,xqString keepend extend syn region xmlRegionBis start=+<\z([^ /!?<>"']\+\)+ skip=++ end=++ end=+/>+ fold contains=xmlTag,xmlEndTag,xmlCdata,xmlRegionBis,xmlComment,xmlEntity,xmlProcessing,xqCode keepend extend -syn region List transparent start='(' excludenl end=')' contains=xqCode,xmlRegion,xqComment,xqSeparator,xqueryStatement,xqVariable,xqueryType keepend extend - +hi def link xqNumber Number +hi def link xqFloat Number +hi def link xqString String +hi def link xqVariable Identifier +hi def link xqComment Comment +hi def link xqSeparator Operator +hi def link xqStatement Statement +hi def link xqFunction Function +hi def link xqOperator Operator +hi def link xqType Type +hi def link xqXPath Operator +hi def link XQdoc Special +hi def link xqExist Operator + +" override the xml highlighting +"hi link xmlTag Structure +"hi link xmlTagName Structure +"hi link xmlEndTag Structure +let b:current_syntax = "xquery" diff -u -r --new-file runtime/syntax.orig/yacc.vim runtime/syntax/yacc.vim --- runtime/syntax.orig/yacc.vim 2010-08-02 10:40:18.000000000 -0500 +++ runtime/syntax/yacc.vim 2011-01-08 08:23:05.000000000 -0600 @@ -1,12 +1,22 @@ " Vim syntax file " Language: Yacc " Maintainer: Charles E. Campbell, Jr. -" Last Change: Aug 2, 2010 -" Version: 8 +" Last Change: Aug 12, 2010 +" Version: 9 " URL: http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax " " Options: {{{1 " g:yacc_uses_cpp : if this variable exists, then C++ is loaded rather than C +" +" Overall layout of a bison/yacc grammer: +" %{ +" Prolog +" %} +" Bison/Yacc Declarations +" %% +" Grammar Rules +" %% +" Epilogue " --------------------------------------------------------------------- " this version of syntax/yacc.vim requires 6.0 or later @@ -35,7 +45,7 @@ " --------------------------------------------------------------------- " Yacc Clusters: {{{1 -syn cluster yaccInitCluster contains=yaccKey,yaccKeyActn,yaccBrkt,yaccType,yaccString,yaccUnionStart,yaccHeader2,yaccComment,yaccDefines,yaccParseParam +syn cluster yaccInitCluster contains=yaccKey,yaccKeyActn,yaccBrkt,yaccType,yaccString,yaccUnionStart,yaccHeader2,yaccComment,yaccDefines,yaccParseParam,yaccParseOption syn cluster yaccRulesCluster contains=yaccNonterminal,yaccString " --------------------------------------------------------------------- @@ -50,7 +60,8 @@ " --------------------------------------------------------------------- " Yacc Commands: {{{1 syn match yaccDefines '^%define\s\+.*$' -syn match yaccParseParam '%parse-param\>' skipwhite nextgroup=yaccParseParamStr +syn match yaccParseParam '%\(parse\|lex\)-param\>' skipwhite nextgroup=yaccParseParamStr +syn match yaccParseOption '%\%(api\.pure\|pure-parser\|locations\|error-verbose\)\>' syn region yaccParseParamStr contained matchgroup=Delimiter start='{' end='}' contains=cStructure syn match yaccDelim "[:|]" contained @@ -96,7 +107,8 @@ HiLink yaccCurly Delimiter HiLink yaccCurlyError Error HiLink yaccDefines cDefine - HiLink yaccParseParam cDefine + HiLink yaccParseParam yaccParseOption + HiLink yaccParseOption cDefine HiLink yaccNonterminal Function HiLink yaccDelim Delimiter HiLink yaccKeyActn Special diff -u -r --new-file runtime/syntax.orig/yaml.vim runtime/syntax/yaml.vim --- runtime/syntax.orig/yaml.vim 2010-08-13 07:54:35.000000000 -0500 +++ runtime/syntax/yaml.vim 2011-01-08 08:40:13.000000000 -0600 @@ -1,86 +1,186 @@ " Vim syntax file -" Language: YAML (YAML Ain't Markup Language) -" Maintainer: Nikolai Weibull -" Latest Revision: 2010-08-12 +" Language: YAML (YAML Ain't Markup Language) 1.2 +" Maintainer: Nikolai Pavlov +" First author: Nikolai Weibull +" Latest Revision: 2010-10-08 -if exists("b:current_syntax") - finish +if exists('b:current_syntax') + finish endif let s:cpo_save = &cpo set cpo&vim -syn keyword yamlTodo contained TODO FIXME XXX NOTE +let s:ns_char = '\%(\%([\n\r\uFEFF \t]\)\@!\p\)' +let s:ns_word_char = '\%(\w\|-\)' +let s:ns_uri_char = '\%(%\x\x\|'.s:ns_word_char.'\|[#/;?:@&=+$,.!~*''()\[\]]\)' +let s:ns_tag_char = '\%(%\x\x\|'.s:ns_word_char.'\|[#/;?:@&=+$.~*''()]\)' +let s:c_ns_anchor_char = '\%(\%([\n\r\uFEFF \t,\[\]{}]\)\@!\p\)' +let s:c_indicator = '[\-?:,\[\]{}#&*!|>''"%@`]' +let s:c_flow_indicator = '[,\[\]{}]' + +let s:c_verbatim_tag = '!<'.s:ns_uri_char.'\+>' +let s:c_named_tag_handle = '!'.s:ns_word_char.'\+!' +let s:c_secondary_tag_handle = '!!' +let s:c_primary_tag_handle = '!' +let s:c_tag_handle = '\%('.s:c_named_tag_handle. + \ '\|'.s:c_secondary_tag_handle. + \ '\|'.s:c_primary_tag_handle.'\)' +let s:c_ns_shorthand_tag = s:c_tag_handle . s:ns_tag_char.'\+' +let s:c_non_specific_tag = '!' +let s:c_ns_tag_property = s:c_verbatim_tag. + \ '\|'.s:c_ns_shorthand_tag. + \ '\|'.s:c_non_specific_tag + +let s:c_ns_anchor_name = s:c_ns_anchor_char.'\+' +let s:c_ns_anchor_property = '&'.s:c_ns_anchor_name +let s:c_ns_alias_node = '\*'.s:c_ns_anchor_name + +let s:ns_directive_name = s:ns_char.'\+' + +let s:ns_local_tag_prefix = '!'.s:ns_uri_char.'*' +let s:ns_global_tag_prefix = s:ns_tag_char.s:ns_uri_char.'*' +let s:ns_tag_prefix = s:ns_local_tag_prefix. + \ '\|'.s:ns_global_tag_prefix + +let s:ns_plain_safe_out = s:ns_char +let s:ns_plain_safe_in = '\%('.s:c_flow_indicator.'\@!'.s:ns_char.'\)' + +let s:ns_plain_first_in = '\%('.s:c_indicator.'\@!'.s:ns_char.'\|[?:\-]\%('.s:ns_plain_safe_in.'\)\@=\)' +let s:ns_plain_first_out = '\%('.s:c_indicator.'\@!'.s:ns_char.'\|[?:\-]\%('.s:ns_plain_safe_out.'\)\@=\)' + +let s:ns_plain_char_in = '\%('.s:ns_char.'#\|:'.s:ns_plain_safe_in.'\|[:#]\@!'.s:ns_plain_safe_in.'\)' +let s:ns_plain_char_out = '\%('.s:ns_char.'#\|:'.s:ns_plain_safe_out.'\|[:#]\@!'.s:ns_plain_safe_out.'\)' -syn region yamlComment display oneline start='\%(^\|\s\)#' end='$' - \ contains=yamlTodo,@Spell +let s:ns_plain_out = s:ns_plain_first_out . s:ns_plain_char_out.'*' +let s:ns_plain_in = s:ns_plain_first_in . s:ns_plain_char_in.'*' -syn match yamlNodeProperty '!\%(![^\\^% ]\+\|[^!][^:/ ]*\)' -syn match yamlAnchor '&.\+' +syn keyword yamlTodo contained TODO FIXME XXX NOTE -syn match yamlAlias '\*.\+' +syn region yamlComment display oneline start='\%\(^\|\s\)#' end='$' + \ contains=yamlTodo -syn match yamlDelimiter '[-,:]' -syn match yamlBlock '[\[\]{}>|]' -syn match yamlOperator '[?+-]' -syn match yamlKey '\w\+\(\s\+\w\+\)*\ze\s*:' - -syn region yamlString matchgroup=yamlStringDelimiter - \ start=+"+ skip=+\\"+ end=+"+ - \ contains=yamlEscape -syn region yamlString matchgroup=yamlStringDelimiter - \ start=+'+ skip=+''+ end=+'+ - \ contains=yamlSingleEscape -syn match yamlEscape contained display +\\[\\"abefnrtv^0_ NLP]+ -syn match yamlEscape contained display '\\x\x\{2}' -syn match yamlEscape contained display '\\u\x\{4}' -syn match yamlEscape contained display '\\U\x\{8}' -" TODO: how do we get 0x85, 0x2028, and 0x2029 into this? -syn match yamlEscape display '\\\%(\r\n\|[\r\n]\)' -syn match yamlSingleEscape contained +''+ - -" TODO: sexagecimal and fixed (20:30.15 and 1,230.15) -syn match yamlNumber display - \ '\<[+-]\=\d\+\%(\.\d\+\%([eE][+-]\=\d\+\)\=\)\=' -syn match yamlNumber display '0\o\+' -syn match yamlNumber display '0x\x\+' -syn match yamlNumber display '([+-]\=[iI]nf)' -syn match yamlNumber display '(NaN)' - -syn match yamlConstant '\<[~yn]\>' -syn keyword yamlConstant true True TRUE false False FALSE -syn keyword yamlConstant yes Yes on ON no No off OFF -syn keyword yamlConstant null Null NULL nil Nil NIL - -syn match yamlTimestamp '\d\d\d\d-\%(1[0-2]\|\d\)-\%(3[0-2]\|2\d\|1\d\|\d\)\%( \%([01]\d\|2[0-3]\):[0-5]\d:[0-5]\d.\d\d [+-]\%([01]\d\|2[0-3]\):[0-5]\d\|t\%([01]\d\|2[0-3]\):[0-5]\d:[0-5]\d.\d\d[+-]\%([01]\d\|2[0-3]\):[0-5]\d\|T\%([01]\d\|2[0-3]\):[0-5]\d:[0-5]\d.\dZ\)\=' - -syn region yamlDocumentHeader start='---' end='$' contains=yamlDirective -syn match yamlDocumentEnd '\.\.\.' - -syn match yamlDirective contained '%[^:]\+:.\+' - -hi def link yamlTodo Todo -hi def link yamlComment Comment -hi def link yamlDocumentHeader PreProc -hi def link yamlDocumentEnd PreProc -hi def link yamlDirective Keyword -hi def link yamlNodeProperty Type -hi def link yamlAnchor Type -hi def link yamlAlias Type -hi def link yamlDelimiter Delimiter -hi def link yamlBlock Operator -hi def link yamlOperator Operator -hi def link yamlKey Identifier -hi def link yamlString String -hi def link yamlStringDelimiter yamlString -hi def link yamlEscape SpecialChar -hi def link yamlSingleEscape SpecialChar -hi def link yamlNumber Number -hi def link yamlConstant Constant -hi def link yamlTimestamp Number +execute 'syn region yamlDirective oneline start='.string('^\ze%'.s:ns_directive_name.'\s\+').' '. + \ 'end="$" '. + \ 'contains=yamlTAGDirective,'. + \ 'yamlYAMLDirective,'. + \ 'yamlReservedDirective '. + \ 'keepend' + +syn match yamlTAGDirective '%TAG\s\+' contained nextgroup=yamlTagHandle +execute 'syn match yamlTagHandle contained nextgroup=yamlTagPrefix '.string(s:c_tag_handle.'\s\+') +execute 'syn match yamlTagPrefix contained nextgroup=yamlComment ' . string(s:ns_tag_prefix) + +syn match yamlYAMLDirective '%YAML\s\+' contained nextgroup=yamlYAMLVersion +syn match yamlYAMLVersion '\d\+\.\d\+' contained nextgroup=yamlComment + +execute 'syn match yamlReservedDirective contained nextgroup=yamlComment '. + \string('%\%(\%(TAG\|YAML\)\s\)\@!'.s:ns_directive_name) + +syn region yamlFlowString matchgroup=yamlFlowStringDelimiter start='"' skip='\\"' end='"' + \ contains=yamlEscape + \ nextgroup=yamlKeyValueDelimiter +syn region yamlFlowString matchgroup=yamlFlowStringDelimiter start="'" skip="''" end="'" + \ contains=yamlSingleEscape + \ nextgroup=yamlKeyValueDelimiter +syn match yamlEscape contained '\\\%([\\"abefnrtv\^0_ NLP\n]\|x\x\x\|u\x\{4}\|U\x\{8}\)' +syn match yamlSingleEscape contained "''" + +syn match yamlBlockScalarHeader contained '\s\+\zs[|>]\%([+-]\=[1-9]\|[1-9]\=[+-]\)\=' + +syn cluster yamlFlow contains=yamlFlowString,yamlFlowMapping,yamlFlowCollection +syn cluster yamlFlow add=yamlFlowMappingKey,yamlFlowMappingMerge +syn cluster yamlFlow add=yamlConstant,yamlPlainScalar,yamlFloat +syn cluster yamlFlow add=yamlTimestamp,yamlInteger,yamlMappingKeyStart +syn cluster yamlFlow add=yamlComment +syn region yamlFlowMapping matchgroup=yamlFlowIndicator start='{' end='}' contains=@yamlFlow +syn region yamlFlowCollection matchgroup=yamlFlowIndicator start='\[' end='\]' contains=@yamlFlow + +execute 'syn match yamlPlainScalar /'.s:ns_plain_out.'/' +execute 'syn match yamlPlainScalar contained /'.s:ns_plain_in.'/' + +syn match yamlMappingKeyStart '?\ze\s' +syn match yamlMappingKeyStart '?' contained + +execute 'syn match yamlFlowMappingKey /'.s:ns_plain_in.'\ze\s*:/ contained '. + \'nextgroup=yamlKeyValueDelimiter' +syn match yamlFlowMappingMerge /<<\ze\s*:/ contained nextgroup=yamlKeyValueDelimiter + +syn match yamlBlockCollectionItemStart '^\s*\zs-\%(\s\+-\)*\s' nextgroup=yamlBlockMappingKey,yamlBlockMappingMerge +execute 'syn match yamlBlockMappingKey /^\s*\zs'.s:ns_plain_out.'\ze\s*:\%(\s\|$\)/ '. + \'nextgroup=yamlKeyValueDelimiter' +execute 'syn match yamlBlockMappingKey /\s*\zs'.s:ns_plain_out.'\ze\s*:\%(\s\|$\)/ contained '. + \'nextgroup=yamlKeyValueDelimiter' +syn match yamlBlockMappingMerge /^\s*\zs<<\ze:\%(\s\|$\)/ nextgroup=yamlKeyValueDelimiter +syn match yamlBlockMappingMerge /<<\ze\s*:\%(\s\|$\)/ nextgroup=yamlKeyValueDelimiter contained + +syn match yamlKeyValueDelimiter /\s*:/ contained +syn match yamlKeyValueDelimiter /\s*:/ contained + +syn keyword yamlConstant true True TRUE false False FALSE +syn keyword yamlConstant null Null NULL +syn match yamlConstant '\<\~\>' + +syn match yamlTimestamp /\%([\[\]{}, \t]\@!\p\)\@