diff options
Diffstat (limited to 'runtime/syntax')
| -rw-r--r-- | runtime/syntax/dircolors.vim | 4 | ||||
| -rw-r--r-- | runtime/syntax/help.vim | 4 | ||||
| -rw-r--r-- | runtime/syntax/readline.vim | 4 | ||||
| -rw-r--r-- | runtime/syntax/sas.vim | 15 | ||||
| -rw-r--r-- | runtime/syntax/svn.vim | 13 | ||||
| -rw-r--r-- | runtime/syntax/tex.vim | 66 |
6 files changed, 57 insertions, 49 deletions
diff --git a/runtime/syntax/dircolors.vim b/runtime/syntax/dircolors.vim index 7a0b1e8ff..fe1fcaec5 100644 --- a/runtime/syntax/dircolors.vim +++ b/runtime/syntax/dircolors.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: dircolors(1) input file " Maintainer: Nikolai Weibull <now@bitwi.se> -" Latest Revision: 2006-06-23 +" Latest Revision: 2012-04-25 if exists("b:current_syntax") finish @@ -17,6 +17,8 @@ syn region dircolorsComment start='#' end='$' contains=dircolorsTodo,@Spell syn keyword dircolorsKeyword TERM LEFT LEFTCODE RIGHT RIGHTCODE END ENDCODE syn keyword dircolorsKeyword NORMAL NORM FILE DIR LNK LINK SYMLINK ORPHAN + \ RESET MULTIHARDLINK CAPABILITY SETUID SETGID + \ STICKY STICKY_OTHER_WRITABLE OTHER_WRITABLE \ MISSING FIFO PIPE SOCK BLK BLOCK CHR CHAR \ DOOR EXEC \ nextgroup=@dircolorsColors skipwhite diff --git a/runtime/syntax/help.vim b/runtime/syntax/help.vim index 6bd8dd09b..ddaad8962 100644 --- a/runtime/syntax/help.vim +++ b/runtime/syntax/help.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: Vim help file " Maintainer: Bram Moolenaar (Bram@vim.org) -" Last Change: 2012 Jan 08 +" Last Change: 2012 Apr 25 " Quit when a (custom) syntax file was already loaded if exists("b:current_syntax") @@ -38,6 +38,7 @@ syn match helpVim "Vim version [0-9.a-z]\+" syn match helpVim "VIM REFERENCE.*" syn match helpOption "'[a-z]\{2,\}'" syn match helpOption "'t_..'" +syn match helpCommand "`[^` ]*`"hs=s+1,he=e-1 syn match helpHeader "\s*\zs.\{-}\ze\s\=\~$" nextgroup=helpIgnore syn match helpGraphic ".* \ze`$" nextgroup=helpIgnore if has("conceal") @@ -155,6 +156,7 @@ hi def link helpHeadline Statement hi def link helpHeader PreProc hi def link helpSectionDelim PreProc hi def link helpVim Identifier +hi def link helpCommand Comment hi def link helpExample Comment hi def link helpOption Type hi def link helpNotVi Special diff --git a/runtime/syntax/readline.vim b/runtime/syntax/readline.vim index 06306d513..091722e5e 100644 --- a/runtime/syntax/readline.vim +++ b/runtime/syntax/readline.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: readline(3) configuration file " Maintainer: Nikolai Weibull <now@bitwi.se> -" Latest Revision: 2011-05-02 +" Latest Revision: 2012-04-25 " readline_has_bash - if defined add support for bash specific " settings/functions @@ -256,7 +256,7 @@ syn keyword readlineFunction contained \ possible-completions \ insert-completions \ menu-complete - \ menu-complete-or-backward + \ menu-complete-backward \ delete-char-or-list \ \ start-kbd-macro diff --git a/runtime/syntax/sas.vim b/runtime/syntax/sas.vim index 976dca26f..dc70e1fd9 100644 --- a/runtime/syntax/sas.vim +++ b/runtime/syntax/sas.vim @@ -1,7 +1,9 @@ " Vim syntax file " Language: SAS " Maintainer: James Kidd <james.kidd@covance.com> -" Last Change: 18 Jul 2008 by Paulo Tanimoto <ptanimoto@gmail.com> +" Last Change: 2012 Apr 20 +" Corrected bug causing some keywords to appear as strings instead +" 18 Jul 2008 by Paulo Tanimoto <ptanimoto@gmail.com> " Fixed comments with * taking multiple lines. " Fixed highlighting of macro keywords. " Added words to cases that didn't fit anywhere. @@ -211,16 +213,7 @@ syn keyword sasTodo TODO TBD FIXME contained " These don't fit anywhere else (Bob Heckel). " Added others that were missing. -syn match sasUnderscore "_ALL_" -syn match sasUnderscore "_AUTOMATIC_" -syn match sasUnderscore "_CHARACTER_" -syn match sasUnderscore "_INFILE_" -syn match sasUnderscore "_N_" -syn match sasUnderscore "_NAME_" -syn match sasUnderscore "_NULL_" -syn match sasUnderscore "_NUMERIC_" -syn match sasUnderscore "_USER_" -syn match sasUnderscore "_WEBOUT_" +syn keyword sasUnderscore _ALL_ _AUTOMATIC_ _CHARACTER_ _INFILE_ _N_ _NAME_ _NULL_ _NUMERIC_ _USER_ _WEBOUT_ " End of SAS Functions diff --git a/runtime/syntax/svn.vim b/runtime/syntax/svn.vim index c649430ed..fc0e211c1 100644 --- a/runtime/syntax/svn.vim +++ b/runtime/syntax/svn.vim @@ -2,13 +2,14 @@ " Language: Subversion (svn) commit file " Maintainer: Dmitry Vasiliev <dima at hlabs dot org> " URL: https://github.com/hdima/vim-scripts/blob/master/syntax/svn.vim -" Last Change: 2012-02-11 +" Last Change: 2012-04-15 " Filenames: svn-commit*.tmp -" Version: 1.7 +" Version: 1.8 " Contributors: " Stefano Zacchiroli " A. S. Budden +" Myk Taylor " For version 5.x: Clear all syntax items. " For version 6.x: Quit when a syntax file was already loaded. @@ -20,9 +21,10 @@ endif syn region svnRegion start="^--.*--$" end="\%$" contains=ALL contains=@NoSpell syn match svnRemoved "^D .*$" contained -syn match svnAdded "^A[ M] .*$" contained -syn match svnModified "^M[ M] .*$" contained -syn match svnProperty "^_M .*$" contained +syn match svnRenamed "^R[ M][ U][ +] .*$" contained +syn match svnAdded "^A[ M][ U][ +] .*$" contained +syn match svnModified "^M[ M][ U] .*$" contained +syn match svnProperty "^_M[ U] .*$" contained " Synchronization. syn sync clear @@ -44,6 +46,7 @@ if version >= 508 || !exists("did_svn_syn_inits") HiLink svnAdded Identifier HiLink svnModified Special HiLink svnProperty Special + HiLink svnRenamed Special delcommand HiLink endif diff --git a/runtime/syntax/tex.vim b/runtime/syntax/tex.vim index a324304f9..0eeff6f59 100644 --- a/runtime/syntax/tex.vim +++ b/runtime/syntax/tex.vim @@ -1,8 +1,8 @@ " Vim syntax file " Language: TeX " Maintainer: Dr. Charles E. Campbell, Jr. <NdrchipO@ScampbellPfamily.AbizM> -" Last Change: Jan 10, 2012 -" Version: 72 +" Last Change: Apr 24, 2012 +" Version: 73 " URL: http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax " " Notes: {{{1 @@ -59,7 +59,7 @@ endif " let user determine which classes of concealment will be supported " a=accents/ligatures d=delimiters m=math symbols g=Greek s=superscripts/subscripts if !exists("g:tex_conceal") - let s:tex_conceal= 'admgs' + let s:tex_conceal= 'abdmgs' else let s:tex_conceal= g:tex_conceal endif @@ -109,12 +109,14 @@ endif " Clusters: {{{1 " -------- -syn cluster texCmdGroup contains=texCmdBody,texComment,texDefParm,texDelimiter,texDocType,texInput,texLength,texLigature,texMathDelim,texMathOper,texNewCmd,texNewEnv,texRefZone,texSection,texSectionMarker,texSectionName,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle +syn cluster texCmdGroup contains=texCmdBody,texComment,texDefParm,texDelimiter,texDocType,texInput,texLength,texLigature,texMathDelim,texMathOper,texNewCmd,texNewEnv,texRefZone,texSection,texBeginEnd,texBeginEndName,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle if !exists("g:tex_no_error") syn cluster texCmdGroup add=texMathError endif syn cluster texEnvGroup contains=texMatcher,texMathDelim,texSpecialChar,texStatement -syn cluster texFoldGroup contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texInputFile,texLength,texLigature,texMatcher,texMathZoneV,texMathZoneW,texMathZoneX,texMathZoneY,texMathZoneZ,texNewCmd,texNewEnv,texOnlyMath,texOption,texParen,texRefZone,texSection,texSectionMarker,texSectionZone,texSpaceCode,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,@texMathZones,texTitle,texAbstract +syn cluster texFoldGroup contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texInputFile,texLength,texLigature,texMatcher,texMathZoneV,texMathZoneW,texMathZoneX,texMathZoneY,texMathZoneZ,texNewCmd,texNewEnv,texOnlyMath,texOption,texParen,texRefZone,texSection,texBeginEnd,texSectionZone,texSpaceCode,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,@texMathZones,texTitle,texAbstract,texBoldStyle,texItalStyle,texNoSpell +syn cluster texBoldGroup contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texInputFile,texLength,texLigature,texMatcher,texMathZoneV,texMathZoneW,texMathZoneX,texMathZoneY,texMathZoneZ,texNewCmd,texNewEnv,texOnlyMath,texOption,texParen,texRefZone,texSection,texBeginEnd,texSectionZone,texSpaceCode,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,@texMathZones,texTitle,texAbstract,texBoldStyle,texBoldItalStyle,texNoSpell +syn cluster texItalGroup contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texInputFile,texLength,texLigature,texMatcher,texMathZoneV,texMathZoneW,texMathZoneX,texMathZoneY,texMathZoneZ,texNewCmd,texNewEnv,texOnlyMath,texOption,texParen,texRefZone,texSection,texBeginEnd,texSectionZone,texSpaceCode,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,@texMathZones,texTitle,texAbstract,texItalStyle,texItalBoldStyle,texNoSpell if !exists("g:tex_nospell") || !g:tex_nospell syn cluster texMatchGroup contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texMatcher,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,texInputFile,texOption,@Spell syn cluster texStyleGroup contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,texInputFile,texOption,texStyleStatement,@Spell,texStyleMatcher @@ -122,6 +124,7 @@ else syn cluster texMatchGroup contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texMatcher,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,texInputFile,texOption syn cluster texStyleGroup contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,texInputFile,texOption,texStyleStatement,texStyleMatcher endif +syn cluster texPreambleMatchGroup contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texMatcher,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,texInputFile,texOption syn cluster texRefGroup contains=texMatcher,texComment,texDelimiter if !exists("tex_no_math") syn cluster texMathZones contains=texMathZoneV,texMathZoneW,texMathZoneX,texMathZoneY,texMathZoneZ @@ -170,7 +173,6 @@ if !exists("tex_no_math") syn match texMathError "}" contained endif syn region texMathMatcher matchgroup=Delimiter start="{" skip="\\\\\|\\}" end="}" end="%stopzone\>" contained contains=@texMathMatchGroup -" syn region texMathMatcher matchgroup=Unique start="[^\\]\zs{" skip="\\\\\|\\[{}]" end="}" end="%stopzone\>" contained contains=@texMathMatchGroup endif " TeX/LaTeX keywords: {{{1 @@ -191,7 +193,7 @@ syn match texDelimiter "\\\\" syn match texDelimiter "[{}]" " Tex/Latex Options: {{{1 -syn match texOption "[^\\]\zs#\d\+\|^#\d\+" +syn match texOption "[^\\]\zs#\d\+\|^#\d\+" " texAccent (tnx to Karim Belabas) avoids annoying highlighting for accents: {{{1 if b:tex_stylish @@ -207,17 +209,17 @@ syn match texAccent +\\['=t'.c^ud"vb~Hr]{\a}+ syn match texLigature "\\\([ijolL]\|ae\|oe\|ss\|AA\|AE\|OE\)$" " \begin{}/\end{} section markers: {{{1 -syn match texSectionMarker "\\begin\>\|\\end\>" nextgroup=texSectionName -syn region texSectionName matchgroup=Delimiter start="{" end="}" contained nextgroup=texSectionModifier contains=texComment -syn region texSectionModifier matchgroup=Delimiter start="\[" end="]" contained contains=texComment +syn match texBeginEnd "\\begin\>\|\\end\>" nextgroup=texBeginEndName +syn region texBeginEndName matchgroup=Delimiter start="{" end="}" contained nextgroup=texBeginEndModifier contains=texComment +syn region texBeginEndModifier matchgroup=Delimiter start="\[" end="]" contained contains=texComment,@NoSpell " \documentclass, \documentstyle, \usepackage: {{{1 -syn match texDocType "\\documentclass\>\|\\documentstyle\>\|\\usepackage\>" nextgroup=texSectionName,texDocTypeArgs -syn region texDocTypeArgs matchgroup=Delimiter start="\[" end="]" contained nextgroup=texSectionName contains=texComment +syn match texDocType "\\documentclass\>\|\\documentstyle\>\|\\usepackage\>" nextgroup=texBeginEndName,texDocTypeArgs +syn region texDocTypeArgs matchgroup=Delimiter start="\[" end="]" contained nextgroup=texBeginEndName contains=texComment,@NoSpell " Preamble syntax-based folding support: {{{1 if g:tex_fold_enabled && has("folding") - syn region texPreamble transparent fold start='\zs\\documentclass\>' end='\ze\\begin{document}' contains=texStyle,@texMatchGroup + syn region texPreamble transparent fold start='\zs\\documentclass\>' end='\ze\\begin{document}' contains=texStyle,@texPreambleMatchGroup endif " TeX input: {{{1 @@ -238,8 +240,10 @@ syn match texTypeStyle "\\sc\>" syn match texTypeStyle "\\tt\>" " Type Styles: attributes, commands, families, etc (LaTeX2E): {{{1 -syn match texTypeStyle "\\textbf\>" -syn match texTypeStyle "\\textit\>" +if s:tex_conceal !~ 'b' + syn match texTypeStyle "\\textbf\>" + syn match texTypeStyle "\\textit\>" +endif syn match texTypeStyle "\\textmd\>" syn match texTypeStyle "\\textrm\>" syn match texTypeStyle "\\textsc\>" @@ -339,6 +343,14 @@ else endif endif +" particular support for bold and italic {{{1 +if s:tex_conceal =~ 'b' + syn region texBoldStyle matchgroup=texTypeStyle start="\\textbf\s*{" end="}" concealends contains=@texBoldGroup + syn region texBoldItalStyle matchgroup=texTypeStyle start="\\textit\s*{" end="}" concealends contains=@texItalGroup + syn region texItalStyle matchgroup=texTypeStyle start="\\textit\s*{" end="}" concealends contains=@texItalGroup + syn region texItalBoldStyle matchgroup=texTypeStyle start="\\textbf\s*{" end="}" concealends contains=@texBoldGroup +endif + " Bad Math (mismatched): {{{1 if !exists("tex_no_math") syn match texBadMath "\\end\s*{\s*\(array\|gathered\|bBpvV]matrix\|split\|subequations\|smallmatrix\|xxalignat\)\s*}" @@ -499,10 +511,12 @@ else if g:tex_fold_enabled " allows syntax-folding of 2 or more contiguous comment lines " single-line comments are not folded - syn match texComment "%.*$" contains=@texCommentGroup + syn match texComment "%.*$" contains=@texCommentGroup syn region texComment start="^\zs\s*%.*\_s*%" skip="^\s*%" end='^\ze\s*[^%]' fold + syn region texNoSpell contained fold matchgroup=texComment start="%\s*nospell\s*{" end="%\s*nospell\s*}" contains=@texFoldGroup,@NoSpell else - syn match texComment "%.*$" contains=@texCommentGroup + syn match texComment "%.*$" contains=@texCommentGroup + syn region texNoSpell contained matchgroup=texComment start="%\s*nospell\s*{" end="%\s*nospell\s*}" contains=@texFoldGroup,@NoSpell endif endif @@ -513,10 +527,6 @@ if exists("g:tex_verbspell") && g:tex_verbspell syn region texZone start="\\begin{[vV]erbatim}" end="\\end{[vV]erbatim}\|%stopzone\>" contains=@Spell " listings package: syn region texZone start="\\begin{lstlisting}" end="\\end{lstlisting}\|%stopzone\>" contains=@Spell - " moreverb package: - syn region texZone start="\\begin{verbatimtab}" end="\\end{verbatimtab}\|%stopzone\>" contains=@Spell - syn region texZone start="\\begin{verbatimwrite}" end="\\end{verbatimwrite}\|%stopzone\>" contains=@Spell - syn region texZone start="\\begin{boxedverbatim}" end="\\end{boxedverbatim}\|%stopzone\>" contains=@Spell if version < 600 syn region texZone start="\\verb\*\=`" end="`\|%stopzone\>" contains=@Spell syn region texZone start="\\verb\*\=#" end="#\|%stopzone\>" contains=@Spell @@ -529,12 +539,6 @@ if exists("g:tex_verbspell") && g:tex_verbspell endif else syn region texZone start="\\begin{[vV]erbatim}" end="\\end{[vV]erbatim}\|%stopzone\>" - " listings package: - syn region texZone start="\\begin{lstlisting}" end="\\end{lstlisting}\|%stopzone\>" - " moreverb package: - syn region texZone start="\\begin{verbatimtab}" end="\\end{verbatimtab}\|%stopzone\>" - syn region texZone start="\\begin{verbatimwrite}" end="\\end{verbatimwrite}\|%stopzone\>" - syn region texZone start="\\begin{boxedverbatim}" end="\\end{boxedverbatim}\|%stopzone\>" if version < 600 syn region texZone start="\\verb\*\=`" end="`\|%stopzone\>" syn region texZone start="\\verb\*\=#" end="#\|%stopzone\>" @@ -1188,6 +1192,10 @@ if did_tex_syntax_inits == 1 HiLink texError Error endif + hi texBoldStyle gui=bold cterm=bold + hi texItalStyle gui=italic cterm=italic + hi texBoldItalStyle gui=bold,italic cterm=bold,italic + hi texItalBoldStyle gui=bold,italic cterm=bold,italic HiLink texCite texRefZone HiLink texDefCmd texDef HiLink texDefName texDef @@ -1215,8 +1223,8 @@ if did_tex_syntax_inits == 1 HiLink texMathZoneV texMath HiLink texMathZoneZ texMath endif - HiLink texSectionMarker texCmdName - HiLink texSectionName texSection + HiLink texBeginEnd texCmdName + HiLink texBeginEndName texSection HiLink texSpaceCode texStatement HiLink texStyleStatement texStatement HiLink texTypeSize texType |