From 1514667a24c00c247d8527e9a2e12dba97ca9d85 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 20 Oct 2011 22:22:38 +0200 Subject: Updated runtime files. --- runtime/syntax/gitolite.vim | 80 +++++++++++++++++++++++++++++++++++++++++++++ runtime/syntax/netrw.vim | 4 +-- runtime/syntax/php.vim | 10 +++++- runtime/syntax/rhelp.vim | 8 ++--- runtime/syntax/sqr.vim | 12 +++---- runtime/syntax/tex.vim | 10 ++++-- 6 files changed, 108 insertions(+), 16 deletions(-) create mode 100644 runtime/syntax/gitolite.vim (limited to 'runtime/syntax') diff --git a/runtime/syntax/gitolite.vim b/runtime/syntax/gitolite.vim new file mode 100644 index 0000000000..7d93c967ee --- /dev/null +++ b/runtime/syntax/gitolite.vim @@ -0,0 +1,80 @@ +" Vim syntax file +" Language: gitolite configuration +" URL: https://github.com/tmatilai/gitolite.vim +" Maintainer: Teemu Matilainen +" Last Change: 2011-10-05 + +if exists("b:current_syntax") + finish +endif + +" Comment +syn match gitoliteComment "\(^\|\s\)#.*" contains=gitoliteTodo +syn keyword gitoliteTodo TODO FIXME XXX NOT contained + +" Groups, users and repos +syn match gitoliteGroupDef "\(^\s*\)\@<=@[^=]\{-1,}\(\s*=\)\@=" contains=gitoliteSpaceError,gitoliteUserError nextgroup=gitoliteGroupDefSep +syn match gitoliteGroupDefSep "\s*=" contained nextgroup=gitoliteRepoLine +syn match gitoliteRepoDef "^\s*repo\s" nextgroup=gitoliteRepoLine + +syn match gitoliteRepoLine ".*" contained transparent contains=gitoliteGroup,gitoliteWildRepo,gitoliteCreator,gitoliteExtCmdHelper,gitoliteRepoError,gitoliteComment +syn match gitoliteUserLine ".*" contained transparent contains=gitoliteGroup,gitolitePreProc,gitoliteUserError,gitoliteComment + +syn match gitoliteWildRepo "[ \t=]\@<=[^ \t]*[\\^$|()[\]*?{}][^ \t]*" contained contains=gitoliteCreator,gitoliteRepoError +syn match gitoliteGroup "[ \t=]\@<=@[^ \t]\+" contained contains=gitoliteUserError + +syn keyword gitoliteCreator CREATER CREATOR contained +syn keyword gitolitePreProc CREATER CREATOR READERS WRITERS contained + +syn match gitoliteExtCmdHelper "[ \t=]\@<=EXTCMD/" contained nextgroup=gitoliteExtCmd +syn match gitoliteExtCmd "rsync\(\s\|$\)" contained + +" Illegal characters +syn match gitoliteRepoError "[^ \t0-9a-zA-Z._@+/\\^$|()[\]*?{}-]\+" contained +syn match gitoliteUserError "[^ \t0-9a-zA-Z._@+-]\+" contained +syn match gitoliteSpaceError "\s\+" contained + +" Permission +syn match gitoliteKeyword "^\s*\(C\|R\|RW\|RW+\|RWC\|RW+C\|RWD\|RW+D\|RWCD\|RW+CD\)[ \t=]\@=" nextgroup=gitoliteRefex +syn match gitoliteKeyword "^\s*-[ \t=]\@=" nextgroup=gitoliteDenyRefex +syn match gitoliteRefex "[^=]*="he=e-1 contained contains=gitoliteSpecialRefex,gitoliteGroup nextgroup=gitoliteUserLine +syn match gitoliteDenyRefex "[^=]*="he=e-1 contained contains=gitoliteSpecialRefex,gitoliteGroup nextgroup=gitoliteDenyUsers +syn match gitoliteSpecialRefex "\sNAME/"he=e-1 contained +syn match gitoliteSpecialRefex "/USER/"hs=s+1,he=e-1 contained +syn match gitoliteDenyUsers ".*" contained contains=gitoliteUserError,gitoliteComment + +" Configuration +syn match gitoliteKeyword "^\s*config\s\+" nextgroup=gitoliteConfVariable +syn match gitoliteConfVariable "[^=]*" contained + +" Include +syn match gitoliteInclude "^\s*\(include\|subconf\)\s" + +" String +syn region gitoliteString start=+"+ end=+"+ oneline + +" Define the default highlighting +hi def link gitoliteComment Comment +hi def link gitoliteTodo Todo +hi def link gitoliteGroupDef gitoliteGroup +hi def link gitoliteGroup Identifier +hi def link gitoliteWildRepo Special +hi def link gitoliteRepoError gitoliteError +hi def link gitoliteUserError gitoliteError +hi def link gitoliteSpaceError gitoliteError +hi def link gitoliteError Error +hi def link gitoliteCreator gitolitePreProc +hi def link gitolitePreProc PreProc +hi def link gitoliteExtCmdHelper PreProc +hi def link gitoliteExtCmd Special +hi def link gitoliteRepoDef Type +hi def link gitoliteKeyword Keyword +hi def link gitoliteRefex String +hi def link gitoliteDenyRefex gitoliteRefex +hi def link gitoliteSpecialRefex PreProc +hi def link gitoliteDenyUsers WarningMsg +hi def link gitoliteConfVariable Identifier +hi def link gitoliteInclude Include +hi def link gitoliteString String + +let b:current_syntax = "gitolite" diff --git a/runtime/syntax/netrw.vim b/runtime/syntax/netrw.vim index 59c65d79a0..d4d266c391 100644 --- a/runtime/syntax/netrw.vim +++ b/runtime/syntax/netrw.vim @@ -22,7 +22,7 @@ syn match netrwDir "\.\{1,2}/" contains=netrwClassify,@NoSpell syn match netrwDir "\%(\S\+ \)*\S\+/" contains=netrwClassify,@NoSpell syn match netrwSizeDate "\<\d\+\s\d\{1,2}/\d\{1,2}/\d\{4}\s" skipwhite contains=netrwDateSep,@NoSpell nextgroup=netrwTime syn match netrwSymLink "\%(\S\+ \)*\S\+@\ze\%(\s\{2,}\|$\)" contains=netrwClassify,@NoSpell -syn match netrwExe "\%(\S\+ \)*\S\+\*\ze\%(\s\{2,}\|$\)" contains=netrwClassify,@NoSpell +syn match netrwExe "\%(\S\+ \)*\S*[^~]\*\ze\%(\s\{2,}\|$\)" contains=netrwClassify,@NoSpell syn match netrwTreeBar "^\%([-+|] \)\+" contains=netrwTreeBarSpace nextgroup=@netrwTreeGroup syn match netrwTreeBarSpace " " contained @@ -63,7 +63,7 @@ if exists("g:netrw_special_syntax") && netrw_special_syntax syn match netrwObj "\(\S\+ \)*\S*\.\%(o\|obj\)\>" contains=netrwTreeBar,@NoSpell syn match netrwTags "\" contains=netrwTreeBar,@NoSpell syn match netrwTags "\<\(ANmenu\|ANtags\)\>" contains=netrwTreeBar,@NoSpell - syn match netrwTilde "\(\S\+ \)*\S\+\~\>" contains=netrwTreeBar,@NoSpell + syn match netrwTilde "\(\S\+ \)*\S\+\~\*\=\>" contains=netrwTreeBar,@NoSpell syn match netrwTmp "\\|\(\S\+ \)*\S*tmp\>" contains=netrwTreeBar,@NoSpell endif diff --git a/runtime/syntax/php.vim b/runtime/syntax/php.vim index 2c49c64ddc..956197d147 100644 --- a/runtime/syntax/php.vim +++ b/runtime/syntax/php.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: php PHP 3/4/5 " Maintainer: Jason Woofenden -" Last Change: July 29, 2011 +" Last Change: Oct 20, 2011 " URL: https://gitorious.org/jasonwoof/vim-syntax/blobs/master/php.vim " Former Maintainers: Peter Hodge " Debian VIM Maintainers @@ -110,6 +110,10 @@ if exists( "php_htmlInStrings") syn cluster phpAddStrings add=@htmlTop endif +" make sure we can use \ at the begining of the line to do a continuation +let s:cpo_save = &cpo +set cpo&vim + syn case match " Env Variables @@ -691,4 +695,8 @@ if main_syntax == 'php' unlet main_syntax endif +" put cpoptions back the way we found it +let &cpo = s:cpo_save +unlet s:cpo_save + " vim: ts=8 sts=2 sw=2 expandtab diff --git a/runtime/syntax/rhelp.vim b/runtime/syntax/rhelp.vim index 9120d756b5..0c07861d94 100644 --- a/runtime/syntax/rhelp.vim +++ b/runtime/syntax/rhelp.vim @@ -2,7 +2,7 @@ " Language: R Help File " Maintainer: Jakson Aquino " Former Maintainer: Johannes Ranke -" Last Change: Sat Feb 19, 2011 02:13PM +" Last Change: Fri Oct 14, 2011 09:54PM " Version: 0.7.4 " SVN: $Id: rhelp.vim 90 2010-11-22 10:58:11Z ranke $ " Remarks: - Includes R syntax highlighting in the appropriate @@ -192,9 +192,9 @@ syn match rhelpDelimiter "{\|\[\|(\|)\|\]\|}" syn match rhelpComment /%.*$/ " Error {{{1 -syn region rhelpRegion matchgroup=Delimiter start=/(/ matchgroup=Delimiter end=/)/ transparent contains=ALLBUT,rhelpError,rhelpBraceError,rhelpCurlyError -syn region rhelpRegion matchgroup=Delimiter start=/{/ matchgroup=Delimiter end=/}/ transparent contains=ALLBUT,rhelpError,rhelpBraceError,rhelpParenError -syn region rhelpRegion matchgroup=Delimiter start=/\[/ matchgroup=Delimiter end=/]/ transparent contains=ALLBUT,rhelpError,rhelpCurlyError,rhelpParenError +syn region rhelpRegion matchgroup=Delimiter start=/(/ matchgroup=Delimiter end=/)/ contains=@Spell,rhelpCodeSpecial,rhelpComment,rhelpDelimiter,rhelpDots,rhelpFreesec,rhelpFreesubsec,rhelpIdentifier,rhelpKeyword,rhelpLink,rhelpPreProc,rhelpRComment,rhelpRcode,rhelpRegion,rhelpS4method,rhelpSection,rhelpSexpr,rhelpSpecialChar,rhelpString,rhelpType,rhelpVerbatim +syn region rhelpRegion matchgroup=Delimiter start=/{/ matchgroup=Delimiter end=/}/ contains=@Spell,rhelpCodeSpecial,rhelpComment,rhelpDelimiter,rhelpDots,rhelpFreesec,rhelpFreesubsec,rhelpIdentifier,rhelpKeyword,rhelpLink,rhelpPreProc,rhelpRComment,rhelpRcode,rhelpRegion,rhelpS4method,rhelpSection,rhelpSexpr,rhelpSpecialChar,rhelpString,rhelpType,rhelpVerbatim +syn region rhelpRegion matchgroup=Delimiter start=/\[/ matchgroup=Delimiter end=/]/ contains=@Spell,rhelpCodeSpecial,rhelpComment,rhelpDelimiter,rhelpDots,rhelpFreesec,rhelpFreesubsec,rhelpIdentifier,rhelpKeyword,rhelpLink,rhelpPreProc,rhelpRComment,rhelpRcode,rhelpRegion,rhelpS4method,rhelpSection,rhelpSexpr,rhelpSpecialChar,rhelpString,rhelpType,rhelpVerbatim syn match rhelpError /[)\]}]/ syn match rhelpBraceError /[)}]/ contained syn match rhelpCurlyError /[)\]]/ contained diff --git a/runtime/syntax/sqr.vim b/runtime/syntax/sqr.vim index 8749447792..8c9e7b49e4 100644 --- a/runtime/syntax/sqr.vim +++ b/runtime/syntax/sqr.vim @@ -43,11 +43,11 @@ syn keyword sqrSection begin-program begin-report begin-setup syn keyword sqrSection end-footing end-heading end-procedure syn keyword sqrSection end-program end-report end-setup -syn keyword sqrParagraph alter-color-map alter-conection +syn keyword sqrParagraph alter-color-map alter-connection syn keyword sqrParagraph alter-locale alter-printer alter-report syn keyword sqrParagraph begin-document begin-execute begin-select syn keyword sqrParagraph begin-sql declare-chart declare-image -syn keyword sqrParagraph declare-color-map declare-conection +syn keyword sqrParagraph declare-color-map declare-connection syn keyword sqrParagraph declare-layout declare-printer syn keyword sqrParagraph declare-report declare-procedure syn keyword sqrParagraph declare-toc declare-variable end-declare @@ -224,16 +224,16 @@ if version >= 600 " See also the sqrString section above for handling of ! characters " inside of strings. (Those patterns override the ones below.) syn match sqrComment /!\@= 508 || !exists("did_sqr_syn_inits") if version < 508 let did_sqr_syn_inits = 1 diff --git a/runtime/syntax/tex.vim b/runtime/syntax/tex.vim index b8756a88fc..a2b98251b7 100644 --- a/runtime/syntax/tex.vim +++ b/runtime/syntax/tex.vim @@ -1,8 +1,8 @@ " Vim syntax file " Language: TeX " Maintainer: Dr. Charles E. Campbell, Jr. -" Last Change: Aug 22, 2011 -" Version: 68 +" Last Change: Oct 12, 2011 +" Version: 69 " URL: http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax " " Notes: {{{1 @@ -37,6 +37,8 @@ if version < 600 elseif exists("b:current_syntax") finish endif +let s:keepcpo= &cpo +set cpo&vim scriptencoding utf-8 " Define the default highlighting. {{{1 @@ -1217,7 +1219,9 @@ if did_tex_syntax_inits == 1 delcommand HiLink endif -" Current Syntax: {{{1 +" Cleanup: {{{1 unlet s:extfname let b:current_syntax = "tex" +let &cpo = s:keepcpo +unlet s:keepcpo " vim: ts=8 fdm=marker -- cgit v1.2.3