aboutsummaryrefslogtreecommitdiff
path: root/runtime/syntax/html.vim
diff options
context:
space:
mode:
authorrosston <ross.brandes@appropos.com>2015-10-09 17:42:05 -0400
committerJustin M. Keyes <justinkz@gmail.com>2015-10-11 18:07:58 -0400
commitd69f3bbb0d3a0549466ac0e36a1364d1890b4691 (patch)
treea7ee17fe865c63cccecee7cd514f96e08a0fdf38 /runtime/syntax/html.vim
parent57d3a2a52fea57874d08472d0f8ee8f1bcee87c1 (diff)
downloadrneovim-d69f3bbb0d3a0549466ac0e36a1364d1890b4691.tar.gz
rneovim-d69f3bbb0d3a0549466ac0e36a1364d1890b4691.tar.bz2
rneovim-d69f3bbb0d3a0549466ac0e36a1364d1890b4691.zip
vim-patch:8feef4f #3444
Update runtime files. https://github.com/vim/vim/commit/8feef4ff6253afb9dcc61c40082ed4fbb96b685c
Diffstat (limited to 'runtime/syntax/html.vim')
-rw-r--r--runtime/syntax/html.vim7
1 files changed, 4 insertions, 3 deletions
diff --git a/runtime/syntax/html.vim b/runtime/syntax/html.vim
index d59126dede..ab1f9b3c13 100644
--- a/runtime/syntax/html.vim
+++ b/runtime/syntax/html.vim
@@ -2,7 +2,8 @@
" Language: HTML
" Maintainer: Claudio Fleiner <claudio@fleiner.com>
" URL: http://www.fleiner.com/vim/syntax/html.vim
-" Last Change: 2012 Oct 05
+" Last Change: 2015 Jan 07
+" included patch from David Felix
" Please check :help html.vim for some comments and a description of the options
@@ -168,7 +169,7 @@ if main_syntax != 'java' || exists("java_javascript")
" JAVA SCRIPT
syn include @htmlJavaScript syntax/javascript.vim
unlet b:current_syntax
- syn region javaScript start=+<script\_[^>]*>+ keepend end=+</script>+me=s-1 contains=@htmlJavaScript,htmlCssStyleComment,htmlScriptTag,@htmlPreproc
+ syn region javaScript start=+<script\_[^>]*>+ keepend end=+</script\_[^>]*>+me=s-1 contains=@htmlJavaScript,htmlCssStyleComment,htmlScriptTag,@htmlPreproc
syn region htmlScriptTag contained start=+<script+ end=+>+ fold contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent
HtmlHiLink htmlScriptTag htmlTag
@@ -193,7 +194,7 @@ if main_syntax != 'java' || exists("java_vb")
" VB SCRIPT
syn include @htmlVbScript syntax/vb.vim
unlet b:current_syntax
- syn region javaScript start=+<script \_[^>]*language *=\_[^>]*vbscript\_[^>]*>+ keepend end=+</script>+me=s-1 contains=@htmlVbScript,htmlCssStyleComment,htmlScriptTag,@htmlPreproc
+ syn region javaScript start=+<script \_[^>]*language *=\_[^>]*vbscript\_[^>]*>+ keepend end=+</script\_[^>]*>+me=s-1 contains=@htmlVbScript,htmlCssStyleComment,htmlScriptTag,@htmlPreproc
endif
syn cluster htmlJavaScript add=@htmlPreproc