summaryrefslogtreecommitdiffstats
path: root/after
diff options
context:
space:
mode:
authorAdam Stankiewicz <sheerun@sher.pl>2014-08-27 18:16:33 +0200
committerAdam Stankiewicz <sheerun@sher.pl>2014-08-27 18:16:33 +0200
commitbd35da8e9ca0bddd95539bef0c8f4857dc4cc746 (patch)
tree2eda075ecdbeb5a05a536c3a91272559ee936989 /after
parent91da1ec2a5e8fb926535160ef4644ff879d3ee08 (diff)
downloadvim-polyglot-1.10.1.tar.gz
vim-polyglot-1.10.1.zip
Updatev1.10.1
Diffstat (limited to 'after')
-rw-r--r--after/syntax/html.vim22
-rw-r--r--after/syntax/rust.vim2
2 files changed, 22 insertions, 2 deletions
diff --git a/after/syntax/html.vim b/after/syntax/html.vim
index 104642c2..8c8e7381 100644
--- a/after/syntax/html.vim
+++ b/after/syntax/html.vim
@@ -9,6 +9,28 @@ syn region coffeeScript start=#<script [^>]*type="text/coffeescript"[^>]*>#
\ end=#</script>#me=s-1 keepend
\ contains=@htmlCoffeeScript,htmlScriptTag,@htmlPreproc
\ containedin=htmlHead
+if !exists("g:less_html_style_tags")
+ let g:less_html_style_tags = 1
+endif
+
+if !g:less_html_style_tags
+ finish
+endif
+
+" Unset (but preserve) so that less will run.
+let s:pre_less_cur_syn = b:current_syntax
+unlet b:current_syntax
+
+" Inspired by code from github.com/kchmck/vim-coffee-script
+" and the html syntax file included with vim 7.4.
+
+syn include @htmlLess syntax/less.vim
+
+" We have to explicitly add to htmlHead (containedin) as that region specifies 'contains'.
+syn region lessStyle start=+<style [^>]*type *=[^>]*text/less[^>]*>+ keepend end=+</style>+ contains=@htmlLess,htmlTag,htmlEndTag,htmlCssStyleComment,@htmlPreproc containedin=htmlHead
+
+" Reset since 'less' isn't really the current_syntax.
+let b:current_syntax = s:pre_less_cur_syn
" Language: Colorful CSS Color Preview
" Author: Aristotle Pagaltzis <pagaltzis@gmx.de>
diff --git a/after/syntax/rust.vim b/after/syntax/rust.vim
index 1ab8394e..735c1e15 100644
--- a/after/syntax/rust.vim
+++ b/after/syntax/rust.vim
@@ -29,5 +29,3 @@ hi link rustNiceOperator Operator
if !exists('g:rust_conceal_mod_path')
hi! link Conceal Operator
endif
-
-setlocal conceallevel=2