Mercurial > ec-dotfiles

changeset 589:7fbadf8bd22e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update vendor Change whatever available from official vim
author nanaya <me@myconan.net>
date Thu, 07 Jul 2016 15:59:06 +0900
parents 152c020d7d8e
children 756cfd9f5bc8
files update-vendor vendor/vim-autoload/pathogen.vim vendor/vim-syntax/blade.vim vendor/vim-syntax/json.vim vendor/vim-syntax/less.vim vendor/vim-syntax/slim.vim
diffstat 6 files changed, 170 insertions(+), 124 deletions(-) [+]
line wrap: on
line diff
--- a/update-vendor	Sun Jun 26 15:08:01 2016 +0900
+++ b/update-vendor	Thu Jul 07 15:59:06 2016 +0900
@@ -28,12 +28,12 @@
   cd "$(dirname "$0")/vendor/vim-syntax"
 
   rm -f *.vim
-  _get https://vim.googlecode.com/hg/runtime/syntax/ruby.vim
-  _get https://vim.googlecode.com/hg/runtime/syntax/eruby.vim
-  _get https://vim.googlecode.com/hg/runtime/syntax/scss.vim
+  _get https://bitbucket.org/vim-mirror/vim/raw/tip/runtime/syntax/eruby.vim
+  _get https://bitbucket.org/vim-mirror/vim/raw/tip/runtime/syntax/json.vim
+  _get https://bitbucket.org/vim-mirror/vim/raw/tip/runtime/syntax/less.vim
+  _get https://bitbucket.org/vim-mirror/vim/raw/tip/runtime/syntax/ruby.vim
+  _get https://bitbucket.org/vim-mirror/vim/raw/tip/runtime/syntax/scss.vim
   _get https://github.com/kchmck/vim-coffee-script/raw/master/syntax/coffee.vim
   _get https://github.com/slim-template/vim-slim/raw/master/syntax/slim.vim
-  _get https://github.com/elzr/vim-json/raw/master/syntax/json.vim
-  _get https://raw.githubusercontent.com/xsbeats/vim-blade/master/syntax/blade.vim
-  _get https://raw.githubusercontent.com/groenewege/vim-less/master/syntax/less.vim
+  _get https://raw.githubusercontent.com/jwalton512/vim-blade/master/syntax/blade.vim
 )
--- a/vendor/vim-autoload/pathogen.vim	Sun Jun 26 15:08:01 2016 +0900
+++ b/vendor/vim-autoload/pathogen.vim	Thu Jul 07 15:59:06 2016 +0900
@@ -1,6 +1,6 @@
 " pathogen.vim - path option manipulation
 " Maintainer:   Tim Pope <http://tpo.pe/>
-" Version:      2.3
+" Version:      2.4
 
 " Install in ~/.vim/autoload (or ~\vimfiles\autoload).
 "
@@ -90,27 +90,30 @@
 endfunction
 
 " Check if a bundle is disabled.  A bundle is considered disabled if its
-" basename or full name is included in the list g:pathogen_disabled.
+" basename or full name is included in the list g:pathogen_blacklist or the
+" comma delimited environment variable $VIMBLACKLIST.
 function! pathogen#is_disabled(path) abort
   if a:path =~# '\~$'
     return 1
   endif
   let sep = pathogen#slash()
-  let blacklist = map(
+  let blacklist =
         \ get(g:, 'pathogen_blacklist', get(g:, 'pathogen_disabled', [])) +
-        \ pathogen#split($VIMBLACKLIST),
-        \ 'substitute(v:val, "[\\/]$", "", "")')
+        \ pathogen#split($VIMBLACKLIST)
+  if !empty(blacklist)
+    call map(blacklist, 'substitute(v:val, "[\\/]$", "", "")')
+  endif
   return index(blacklist, fnamemodify(a:path, ':t')) != -1 || index(blacklist, a:path) != -1
-endfunction "}}}1
+endfunction
 
 " Prepend the given directory to the runtime path and append its corresponding
 " after directory.  Curly braces are expanded with pathogen#expand().
 function! pathogen#surround(path) abort
   let sep = pathogen#slash()
   let rtp = pathogen#split(&rtp)
-  let path = fnamemodify(a:path, ':p:?[\\/]\=$??')
+  let path = fnamemodify(a:path, ':s?[\\/]\=$??')
   let before = filter(pathogen#expand(path), '!pathogen#is_disabled(v:val)')
-  let after = filter(reverse(pathogen#expand(path.sep.'after')), '!pathogen#is_disabled(v:val[0:-7])')
+  let after = filter(reverse(pathogen#expand(path, sep.'after')), '!pathogen#is_disabled(v:val[0:-7])')
   call filter(rtp, 'index(before + after, v:val) == -1')
   let &rtp = pathogen#join(before, rtp, after)
   return &rtp
@@ -128,7 +131,7 @@
   let list = []
   for dir in pathogen#split(&rtp)
     if dir =~# '\<after$'
-      let list += reverse(filter(pathogen#expand(dir[0:-6].name.sep.'after'), '!pathogen#is_disabled(v:val[0:-7])')) + [dir]
+      let list += reverse(filter(pathogen#expand(dir[0:-6].name, sep.'after'), '!pathogen#is_disabled(v:val[0:-7])')) + [dir]
     else
       let list += [dir] + filter(pathogen#expand(dir.sep.name), '!pathogen#is_disabled(v:val)')
     endif
@@ -171,7 +174,8 @@
 " alternatives of that string.  pathogen#expand('/{a,b}/{c,d}') yields
 " ['/a/c', '/a/d', '/b/c', '/b/d'].  Empty braces are treated as a wildcard
 " and globbed.  Actual globs are preserved.
-function! pathogen#expand(pattern) abort
+function! pathogen#expand(pattern, ...) abort
+  let after = a:0 ? a:1 : ''
   if a:pattern =~# '{[^{}]\+}'
     let [pre, pat, post] = split(substitute(a:pattern, '\(.\{-\}\){\([^{}]\+\)}\(.*\)', "\\1\001\\2\001\\3", ''), "\001", 1)
     let found = map(split(pat, ',', 1), 'pre.v:val.post')
@@ -179,14 +183,16 @@
     for pattern in found
       call extend(results, pathogen#expand(pattern))
     endfor
-    return results
   elseif a:pattern =~# '{}'
     let pat = matchstr(a:pattern, '^.*{}[^*]*\%($\|[\\/]\)')
     let post = a:pattern[strlen(pat) : -1]
-    return map(split(glob(substitute(pat, '{}', '*', 'g')), "\n"), 'v:val.post')
+    let results = map(split(glob(substitute(pat, '{}', '*', 'g')), "\n"), 'v:val.post')
   else
-    return [a:pattern]
+    let results = [a:pattern]
   endif
+  let vf = pathogen#slash() . 'vimfiles'
+  call map(results, 'v:val =~# "\\*" ? v:val.after : isdirectory(v:val.vf.after) ? v:val.vf.after : isdirectory(v:val.after) ? v:val.after : ""')
+  return filter(results, '!empty(v:val)')
 endfunction
 
 " \ on Windows unless shellslash is set, / everywhere else.
@@ -202,12 +208,12 @@
 function! pathogen#glob(pattern) abort
   let files = split(glob(a:pattern),"\n")
   return map(files,'substitute(v:val,"[".pathogen#slash()."/]$","","")')
-endfunction "}}}1
+endfunction
 
 " Like pathogen#glob(), only limit the results to directories.
 function! pathogen#glob_directories(pattern) abort
   return filter(pathogen#glob(a:pattern),'isdirectory(v:val)')
-endfunction "}}}1
+endfunction
 
 " Remove duplicates from a list.
 function! pathogen#uniq(list) abort
@@ -239,7 +245,7 @@
 endfunction
 
 " Like findfile(), but hardcoded to use the runtimepath.
-function! pathogen#runtime_findfile(file,count) abort "{{{1
+function! pathogen#runtime_findfile(file,count) abort
   let rtp = pathogen#join(1,pathogen#split(&rtp))
   let file = findfile(a:file,rtp,a:count)
   if file ==# ''
--- a/vendor/vim-syntax/blade.vim	Sun Jun 26 15:08:01 2016 +0900
+++ b/vendor/vim-syntax/blade.vim	Thu Jul 07 15:59:06 2016 +0900
@@ -1,41 +1,53 @@
-" Language:     Blade
+" Vim syntax file
+" Language:     Blade (Laravel)
 " Maintainer:   Jason Walton <jwalton512@gmail.com>
-" URL:          https://github.com/xsbeats/vim-blade
-" License:      DBAD
+" Filenames:    *.blade.php
 
-" Check if our syntax is already loaded
-if exists('b:current_syntax') && b:current_syntax == 'blade'
+if exists('b:current_syntax')
     finish
 endif
 
-" Include PHP
+if !exists("main_syntax")
+    let main_syntax = 'blade'
+endif
+
+runtime! syntax/html.vim
+unlet! b:current_syntax
 runtime! syntax/php.vim
-silent! unlet b:current_syntax
+unlet! b:current_syntax
 
-" Echos
-syn region bladeUnescapedEcho matchgroup=bladeEchoDelim start=/@\@<!\s*{!!/ end=/!!}\s*/ contains=@phpClTop containedin=ALLBUT,bladeComment
-syn region bladeEscapedEcho matchgroup=bladeEchoDelim start=/@\@<!\s*{{{\@!/ end=/}}\s*/ contains=@phpClTop containedin=ALLBUT,bladeComment
-syn region bladeEscapedEcho matchgroup=bladeEchoDelim start=/@\@<!\s*{{{{\@!/ end=/}}}/ contains=@phpClTop containedin=ALLBUT,bladeComment
+syn case match
+syn clear htmlError
 
-" Structures
-syn match bladeStructure /\s*@\(else\|empty\|endfor\|endforeach\|endforelse\|endif\|endpush\|endsection\|endunless\|endwhile\|overwrite\|show\|stop\)\>/
-syn match bladeStructure /\s*@\(append\|choice\|each\|elseif\|extends\|for\|foreach\|forelse\|if\|include\|lang\|push\|section\|stack\|unless\|while\|yield\|\)\>\s*/ nextgroup=bladeParens
-syn region bladeParens matchgroup=bladeParen start=/(/ end=/)/ contained contains=@bladeAll,@phpClTop
+if has('patch-7.4.1142')
+    syn iskeyword @,48-57,_,192-255,@-@
+else
+    setlocal iskeyword+=@-@
+endif
+
+syn region  bladeEcho       matchgroup=bladeDelimiter start="@\@<!{{" end="}}"  contains=@bladePhp,bladePhpParenBlock  containedin=ALLBUT,@bladeExempt keepend
+syn region  bladeEcho       matchgroup=bladeDelimiter start="{!!" end="!!}"  contains=@bladePhp,bladePhpParenBlock  containedin=ALLBUT,@bladeExempt keepend
+syn region  bladeComment    matchgroup=bladeDelimiter start="{{--" end="--}}"  contains=bladeTodo  containedin=ALLBUT,@bladeExempt keepend
 
-" Comments
-syn region bladeComments start=/\s*{{--/ end=/--}}/ contains=bladeComment keepend
-syn match bladeComment /.*/ contained containedin=bladeComments
+syn keyword bladeKeyword    @if @elseif @foreach @forelse @for @while @can @include @each @inject @extends @section @stack @push @unless @yield @parent @hasSection nextgroup=bladePhpParenBlock skipwhite containedin=ALLBUT,@bladeExempt
+syn keyword bladeKeyword    @else @endif @endunless @endfor @endforeach @empty @endforelse @endwhile @endcan @stop @append @endsection @endpush @show containedin=ALLBUT,@bladeExempt
+
+syn region  bladePhpParenBlock  matchgroup=bladeDelimiter start="\s*(" end=")" contains=@bladePhp,bladePhpParenBlock skipwhite contained
 
-" Clusters
-syn cluster bladeAll contains=bladeStructure,bladeParens
+syn cluster bladePhp contains=@phpClTop
+syn cluster bladeExempt contains=bladeComment,@htmlTop
 
-" Highlighting
+syn cluster htmlPreproc add=bladeEcho,bladeComment
+
+syn keyword bladeTodo todo fixme xxx  contained
+
+hi def link bladeDelimiter      PreProc
 hi def link bladeComment        Comment
-hi def link bladeEchoDelim      Delimiter
-hi def link bladeParen          Delimiter
-hi def link bladeStructure      Keyword
+hi def link bladeTodo           Todo
+hi def link bladeKeyword        Statement
 
+let b:current_syntax = 'blade'
 
-if !exists('b:current_syntax')
-    let b:current_syntax = 'blade'
+if exists('main_syntax') && main_syntax == 'blade'
+    unlet main_syntax
 endif
--- a/vendor/vim-syntax/json.vim	Sun Jun 26 15:08:01 2016 +0900
+++ b/vendor/vim-syntax/json.vim	Thu Jul 07 15:59:06 2016 +0900
@@ -1,11 +1,8 @@
 " Vim syntax file
 " Language:	JSON
-" Maintainer:	Eli Parra <eli@elzr.com> https://github.com/elzr/vim-json
-" Last Change:	2014-12-20 Load ftplugin/json.vim
-
-" Reload the definition of g:vim_json_syntax_conceal
-" see https://github.com/elzr/vim-json/issues/42
-runtime! ftplugin/json.vim
+" Maintainer:	Eli Parra <eli@elzr.com>
+" Last Change:	2014 Aug 23
+" Version:      0.12
 
 if !exists("main_syntax")
   if version < 600
@@ -23,7 +20,7 @@
 " Syntax: Strings
 " Separated into a match and region because a region by itself is always greedy
 syn match  jsonStringMatch /"\([^"]\|\\\"\)\+"\ze[[:blank:]\r\n]*[,}\]]/ contains=jsonString
-if has('conceal') && g:vim_json_syntax_conceal == 1
+if has('conceal')
 	syn region  jsonString oneline matchgroup=jsonQuote start=/"/  skip=/\\\\\|\\"/  end=/"/ concealends contains=jsonEscape contained
 else
 	syn region  jsonString oneline matchgroup=jsonQuote start=/"/  skip=/\\\\\|\\"/  end=/"/ contains=jsonEscape contained
@@ -35,10 +32,10 @@
 " Syntax: JSON Keywords
 " Separated into a match and region because a region by itself is always greedy
 syn match  jsonKeywordMatch /"\([^"]\|\\\"\)\+"[[:blank:]\r\n]*\:/ contains=jsonKeyword
-if has('conceal') && g:vim_json_syntax_conceal == 1
-   syn region  jsonKeyword matchgroup=jsonQuote start=/"/  end=/"\ze[[:blank:]\r\n]*\:/ concealends contains=jsonEscape contained
+if has('conceal')
+   syn region  jsonKeyword matchgroup=jsonQuote start=/"/  end=/"\ze[[:blank:]\r\n]*\:/ concealends contained
 else
-   syn region  jsonKeyword matchgroup=jsonQuote start=/"/  end=/"\ze[[:blank:]\r\n]*\:/ contains=jsonEscape contained
+   syn region  jsonKeyword matchgroup=jsonQuote start=/"/  end=/"\ze[[:blank:]\r\n]*\:/ contained
 endif
 
 " Syntax: Escape sequences
@@ -96,29 +93,38 @@
 syn region  jsonFold matchgroup=jsonBraces start="\[" end=/]\(\_s\+\ze"\)\@!/ transparent fold
 
 " 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_json_syn_inits")
-  hi def link jsonPadding		Operator
-  hi def link jsonString		String
-  hi def link jsonTest			Label
-  hi def link jsonEscape		Special
-  hi def link jsonNumber		Delimiter
-  hi def link jsonBraces		Delimiter
-  hi def link jsonNull			Function
-  hi def link jsonBoolean		Delimiter
-  hi def link jsonKeyword		Label
+  if version < 508
+    let did_json_syn_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+  HiLink jsonPadding         Operator
+  HiLink jsonString          String
+  HiLink jsonTest          Label
+  HiLink jsonEscape          Special
+  HiLink jsonNumber          Number
+  HiLink jsonBraces          Delimiter
+  HiLink jsonNull            Function
+  HiLink jsonBoolean         Boolean
+  HiLink jsonKeyword         Label
 
 	if (!exists("g:vim_json_warnings") || g:vim_json_warnings==1)
-		hi def link jsonNumError					Error
-		hi def link jsonCommentError				Error
-		hi def link jsonSemicolonError			Error
-		hi def link jsonTrailingCommaError		Error
-		hi def link jsonMissingCommaError		Error
-		hi def link jsonStringSQError				Error
-		hi def link jsonNoQuotesError				Error
-		hi def link jsonTripleQuotesError		Error
+	  HiLink jsonNumError        Error
+	  HiLink jsonCommentError    Error
+	  HiLink jsonSemicolonError  Error
+	  HiLink jsonTrailingCommaError     Error
+	  HiLink jsonMissingCommaError      Error
+	  HiLink jsonStringSQError        	Error
+	  HiLink jsonNoQuotesError        	Error
+	  HiLink jsonTripleQuotesError     	Error
   endif
-  hi def link jsonQuote			Quote
-  hi def link jsonNoise			Noise
+  HiLink jsonQuote           Quote
+  HiLink jsonNoise           Noise
+  delcommand HiLink
 endif
 
 let b:current_syntax = "json"
--- a/vendor/vim-syntax/less.vim	Sun Jun 26 15:08:01 2016 +0900
+++ b/vendor/vim-syntax/less.vim	Thu Jul 07 15:59:06 2016 +0900
@@ -1,64 +1,79 @@
+" Vim syntax file
+" Language:	less
+" Maintainer:	Alessandro Vioni <jenoma@gmail.com>
+" URL: https://github.com/genoma/vim-less
+" Last Change:	2014 November 24
+
 if exists("b:current_syntax")
   finish
 endif
 
 runtime! syntax/css.vim
 runtime! after/syntax/css.vim
-" load files from vim-css3-syntax plugin (https://github.com/hail2u/vim-css3-syntax)
-runtime! after/syntax/css/*.vim
 
 syn case ignore
 
-syn region lessDefinition transparent matchgroup=cssBraces start='{' end='}' contains=css.*Attr,css.*Prop,cssComment,cssValue.*,cssColor,cssTagName,cssPseudoClass,cssUrl,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,lessDefinition,lessComment,lessClassChar,lessVariable,lessMixinChar,lessAmpersandChar,lessFunction,lessNestedSelector,@cssColors fold
+syn cluster lessCssProperties contains=cssFontProp,cssFontDescriptorProp,cssColorProp,cssTextProp,cssBoxProp,cssGeneratedContentProp,cssPagingProp,cssUIProp,cssRenderProp,cssAuralProp,cssTableProp
+syn cluster lessCssAttributes contains=css.*Attr,lessEndOfLineComment,lessComment,cssValue.*,cssColor,cssURL,lessDefault,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssRenderProp
+
+syn region lessDefinition matchgroup=cssBraces start="{" end="}" contains=TOP
 
-syn match lessVariable "@[[:alnum:]_-]\+" contained
-syn match lessVariable "@[[:alnum:]_-]\+" nextgroup=lessVariableAssignment skipwhite
-syn match lessVariableAssignment ":" contained nextgroup=lessVariableValue skipwhite
-syn match lessVariableValue ".*;"me=e-1 contained contains=lessVariable,lessOperator,lessDefault,cssValue.*,@cssColors "me=e-1 means that the last char of the pattern is not highlighted
+syn match lessProperty "\%([{};]\s*\|^\)\@<=\%([[:alnum:]-]\|#{[^{}]*}\)\+\s*:" contains=css.*Prop skipwhite nextgroup=lessCssAttribute contained containedin=lessDefinition
+syn match lessProperty "^\s*\zs\s\%(\%([[:alnum:]-]\|#{[^{}]*}\)\+\s*:\|:[[:alnum:]-]\+\)"hs=s+1 contains=css.*Prop skipwhite nextgroup=lessCssAttribute
+syn match lessProperty "^\s*\zs\s\%(:\=[[:alnum:]-]\+\s*=\)"hs=s+1 contains=css.*Prop skipwhite nextgroup=lessCssAttribute
+syn match lessCssAttribute +\%("\%([^"]\|\\"\)*"\|'\%([^']\|\\'\)*'\|#{[^{}]*}\|[^{};]\)*+ contained contains=@lessCssAttributes,lessVariable,lessFunction,lessInterpolation
+syn match lessDefault "!default\>" contained
 
-syn match lessOperator "+" contained
-syn match lessOperator "-" contained
-syn match lessOperator "/" contained
-syn match lessOperator "*" contained
-
-syn match lessNestedSelector "[^/]* {"me=e-1 contained contains=cssTagName,cssAttributeSelector,lessAmpersandChar,lessVariable,lessMixinChar,lessFunction,lessNestedProperty
-syn match lessNestedProperty "[[:alnum:]]\+:"me=e-1 contained
+" less variables and media queries
+syn match lessVariable "@[[:alnum:]_-]\+" nextgroup=lessCssAttribute skipwhite
+syn match lessMedia "@media" nextgroup=lessCssAttribute skipwhite
 
-syn match lessDefault "!default" contained
+" Less functions
+syn match lessFunction "\<\%(escape\|e\|unit\)\>(\@=" contained
+syn match lessFunction "\<\%(ceil\|floor\|percentage\|round\|sqrt\|abs\|sin\|asin\|cos\|acos\|tan\|atan\|pi\|pow\|min\|max\)\>(\@=" contained
+syn match lessFunction "\<\%(rgb\|rgba\|argb\|argb\|hsl\|hsla\|hsv\|hsva\)\>(\@=" contained
+syn match lessFunction "\<\%(hue\|saturation\|lightness\|red\|green\|blue\|alpha\|luma\)\>(\@=" contained
+syn match lessFunction "\<\%(saturate\|desaturate\|lighten\|darken\|fadein\|fadeout\|fade\|spin\|mix\|greyscale\|contrast\)\>(\@=" contained
+syn match lessFunction "\<\%(multiply\|screen\|overlay\|softlight\|hardlight\|difference\|exclusion\|average\|negation\)\>(\@=" contained
 
-syn match lessMixinChar "\.[[:alnum:]_-]\@=" contained nextgroup=lessClass
-syn match lessAmpersandChar "&" contained nextgroup=lessClass,cssPseudoClass
-syn match lessClass "[[:alnum:]_-]\+" contained
-
-" functions {{{
+" Less id class visualization
+syn match lessIdChar     "#[[:alnum:]_-]\@=" nextgroup=lessId,lessClassIdCall
+syn match lessId         "[[:alnum:]_-]\+" contained
+syn match lessClassIdCall  "[[:alnum:]_-]\+()" contained
 
-" string functions
-syn keyword lessFunction escape e % containedin=cssDefinition contained
-" misc functions
-syn keyword lessFunction unit containedin=cssDefinition contained
-" math functions
-syn keyword lessFunction ceil floor percentage round containedin=cssDefinition contained
-" color definition
-syn keyword lessFunction rgb rgba argb hsl hsla hsv hsva containedin=cssDefinition contained
-" color channel information
-syn keyword lessFunction hue saturation lightness red green blue alpha luma containedin=cssDefinition contained
-" color operations
-syn keyword lessFunction saturate desaturate lighten darken fadein fadeout fade spin mix greyscale contrast containedin=cssDefinition contained
-" color blending
-syn keyword lessFunction multiply screen overlay softlight hardlight difference exclusion average negation containedin=cssDefinition contained
+syn match lessClassChar  "\.[[:alnum:]_-]\@=" nextgroup=lessClass,lessClassCall
+syn match lessClass      "[[:alnum:]_-]\+" contained
+syn match lessClassCall  "[[:alnum:]_-]\+()" contained
+
+syn match lessAmpersand  "&" contains=lessIdChar,lessClassChar
+
+syn region lessInclude start="@import" end=";\|$" contains=lessComment,cssURL,cssUnicodeEscape,cssMediaType,cssStringQ,cssStringQQ
+
+syn keyword lessTodo        FIXME NOTE TODO OPTIMIZE XXX contained
+syn region  lessComment     start="^\z(\s*\)//"  end="^\%(\z1 \)\@!" contains=lessTodo,@Spell
+syn region  lessCssComment  start="^\z(\s*\)/\*" end="^\%(\z1 \)\@!" contains=lessTodo,@Spell
+syn match   lessEndOfLineComment "//.*" contains=lessComment,lessTodo,@Spell
 
-" }}}
-
-syn match lessComment "//.*$" contains=@Spell
-
-hi def link lessVariable Special
-hi def link lessVariableValue Constant
-hi def link lessDefault Special
-hi def link lessComment Comment
-hi def link lessFunction Function
-hi def link lessMixinChar Special
-hi def link lessAmpersandChar Special
-hi def link lessNestedProperty Type
-hi def link lessClass PreProc
+hi def link lessEndOfLineComment        lessComment
+hi def link lessCssComment              lessComment
+hi def link lessComment                 Comment
+hi def link lessDefault                 cssImportant
+hi def link lessVariable                Identifier
+hi def link lessFunction                PreProc
+hi def link lessTodo                    Todo
+hi def link lessInclude                 Include
+hi def link lessIdChar                  Special
+hi def link lessClassChar               Special
+hi def link lessAmpersand               Character
+hi def link lessId                      Identifier
+hi def link lessClass                   Type
+hi def link lessCssAttribute            PreProc
+hi def link lessClassCall               Type
+hi def link lessClassIdCall             Type
+hi def link lessTagName                 cssTagName
+hi def link lessDeprecated              cssDeprecated
+hi def link lessMedia                   cssMedia
 
 let b:current_syntax = "less"
+
+" vim:set sw=2:
--- a/vendor/vim-syntax/slim.vim	Sun Jun 26 15:08:01 2016 +0900
+++ b/vendor/vim-syntax/slim.vim	Thu Jul 07 15:59:06 2016 +0900
@@ -66,6 +66,12 @@
 syn region slimInterpolation matchgroup=slimInterpolationDelimiter start="#{{" end="}}" contains=@hamlRubyTop containedin=javascriptStringS,javascriptStringD,slimWrappedAttrs
 syn match  slimInterpolationEscape "\\\@<!\%(\\\\\)*\\\%(\\\ze#{\|#\ze{\)"
 
+syn region slimPlainFilter      matchgroup=slimFilter start="^\z(\s*\)\%(rdoc\|textile\|markdown\|wiki\):\s*$" end="^\%(\z1 \| *$\)\@!"
+syn region slimJavascriptFilter matchgroup=slimFilter start="^\z(\s*\)javascript:\s*$" end="^\%(\z1 \| *$\)\@!" contains=@htmlJavaScript,slimInterpolation keepend
+syn region slimCoffeeFilter matchgroup=slimFilter start="^\z(\s*\)coffee:\s*$" end="^\%(\z1 \| *$\)\@!" contains=@coffeeAll,slimInterpolation keepend
+syn region slimCSSFilter matchgroup=slimFilter start="^\z(\s*\)css:\s*$" end="^\%(\z1 \| *$\)\@!" contains=@htmlCss,slimInterpolation keepend
+syn region slimSassFilter matchgroup=slimFilter start="^\z(\s*\)sass:\s*$" end="^\%(\z1 \| *$\)\@!" contains=@hamlSassTop
+
 syn region slimRuby matchgroup=slimRubyOutputChar start="\s*[=]\==[']\=" skip="\%\(,\s*\|\\\)$" end="$" contained contains=@slimRubyTop keepend
 syn region slimRuby matchgroup=slimRubyChar       start="\s*-"           skip="\%\(,\s*\|\\\)$" end="$" contained contains=@slimRubyTop keepend
 
@@ -98,5 +104,6 @@
 hi def link slimWrappedAttrValueDelimiter Delimiter
 hi def link slimWrappedAttrsDelimiter     Delimiter
 hi def link slimInlineTagChar             Delimiter
+hi def link slimFilter                    PreProc
 
 let b:current_syntax = "slim"