diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-07-28 12:52:27 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-07-28 12:52:27 +0200 |
| commit | 59c0395e6b49e916fca339f63291c56151decc6b (patch) | |
| tree | 0cc38edaa0843c390de0e49e64954f14f20e4d57 /runtime/syntax | |
| parent | 5ac3b1aae2bdcf9f02ac0ebf97836ae3c709c2dc (diff) | |
| download | vim-59c0395e6b49e916fca339f63291c56151decc6b.zip | |
Minor runtime file updates.
Diffstat (limited to 'runtime/syntax')
| -rw-r--r-- | runtime/syntax/css.vim | 8 | ||||
| -rw-r--r-- | runtime/syntax/sass.vim | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/runtime/syntax/css.vim b/runtime/syntax/css.vim index a73836a92..c569213d0 100644 --- a/runtime/syntax/css.vim +++ b/runtime/syntax/css.vim @@ -2,7 +2,7 @@ " Language: Cascading Style Sheets " Maintainer: Claudio Fleiner <claudio@fleiner.com> " URL: http://www.fleiner.com/vim/syntax/css.vim -" Last Change: 2007 Nov 06 +" Last Change: 2010 Jul 28 " CSS2 by Nikolai Weibull " Full CSS2, HTML4 support by Yeti @@ -87,9 +87,9 @@ syn keyword cssCommonAttr contained auto none inherit syn keyword cssCommonAttr contained top bottom syn keyword cssCommonAttr contained medium normal -syn match cssFontProp contained "\<font\>\(-\(family\|style\|variant\|weight\|size\(-adjust\)\=\|stretch\)\>\)\=" +syn match cssFontProp contained "\<font\(-\(family\|style\|variant\|weight\|size\(-adjust\)\=\|stretch\)\)\=\>" syn match cssFontAttr contained "\<\(sans-\)\=\<serif\>" -syn match cssFontAttr contained "\<small\>\(-\(caps\|caption\)\>\)\=" +syn match cssFontAttr contained "\<small\(-\(caps\|caption\)\)\=\>" syn match cssFontAttr contained "\<x\{1,2\}-\(large\|small\)\>" syn match cssFontAttr contained "\<message-box\>" syn match cssFontAttr contained "\<status-bar\>" @@ -102,7 +102,7 @@ syn keyword cssFontAttr contained large smaller larger syn keyword cssFontAttr contained narrower wider syn keyword cssColorProp contained color -syn match cssColorProp contained "\<background\(-\(color\|image\|attachment\|position\)\)\=" +syn match cssColorProp contained "\<background\(-\(color\|image\|attachment\|position\)\)\=\>" syn keyword cssColorAttr contained center scroll fixed syn match cssColorAttr contained "\<repeat\(-[xy]\)\=\>" syn match cssColorAttr contained "\<no-repeat\>" diff --git a/runtime/syntax/sass.vim b/runtime/syntax/sass.vim index 082ae71bd..879ff87e8 100644 --- a/runtime/syntax/sass.vim +++ b/runtime/syntax/sass.vim @@ -2,7 +2,7 @@ " Language: Sass " Maintainer: Tim Pope <vimNOSPAM@tpope.org> " Filenames: *.sass -" Last Change: 2010 Jul 26 +" Last Change: 2010 Jul 28 if exists("b:current_syntax") finish @@ -17,8 +17,8 @@ syn cluster sassCssAttributes contains=css.*Attr,scssComment,cssValue.*,cssColor syn region sassDefinition matchgroup=cssBraces start="{" end="}" contains=TOP -syn match sassProperty "\%([{};]\s*\|^\)\@<=[[:alnum:]-]\+:" contains=css.*Prop skipwhite nextgroup=sassCssAttribute contained containedin=sassDefinition -syn match sassProperty "^\s*\zs\s\%([[:alnum:]-]\+:\|:[[:alnum:]-]\+\)"hs=s+1 contains=css.*Prop skipwhite nextgroup=sassCssAttribute +syn match sassProperty "\%([{};]\s*\|^\)\@<=\%([[:alnum:]-]\|#{[^{}]*}\)\+:" contains=css.*Prop skipwhite nextgroup=sassCssAttribute contained containedin=sassDefinition +syn match sassProperty "^\s*\zs\s\%(\%([[:alnum:]-]\|#{[^{}]*}\)\+:\|:[[:alnum:]-]\+\)"hs=s+1 contains=css.*Prop skipwhite nextgroup=sassCssAttribute syn match sassProperty "^\s*\zs\s\%(:\=[[:alnum:]-]\+\s*=\)"hs=s+1 contains=css.*Prop skipwhite nextgroup=sassCssAttribute syn match sassCssAttribute +\%("\%([^"]\|\\"\)*"\|'\%([^']\|\\'\)*'\|[^{};]\)*+ contained contains=@sassCssAttributes,sassVariable,sassFunction syn match sassDefault "!default\>" contained @@ -34,7 +34,7 @@ syn match sassFunction "\<\%(unquote\|quote\)\>(\@=" contained syn match sassFunction "\<\%(percentage\|round\|ceil\|floor\|abs\)\>(\@=" contained syn match sassFunction "\<\%(type-of\|unit\|unitless\|comparable\)\>(\@=" contained -syn region sassInterpolation matchgroup=sassInterpolationDelimiter start="#{" end="}" contains=@sassCssAttributes,sassVariable,sassFunction containedin=cssStringQ,cssStringQQ +syn region sassInterpolation matchgroup=sassInterpolationDelimiter start="#{" end="}" contains=@sassCssAttributes,sassVariable,sassFunction containedin=cssStringQ,cssStringQQ,sassCssAttribute,sassProperty syn match sassMixinName "[[:alnum:]_-]\+" contained nextgroup=sassCssAttribute syn match sassMixin "^=" nextgroup=sassMixinName |