summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2010-08-07 13:46:23 +0200
committerBram Moolenaar <Bram@vim.org>2010-08-07 13:46:23 +0200
commit311dc17d960689b72fd0d2bcda12b728531557f6 (patch)
tree63a8e40418d64e9d185e5ab939691cbbb70a8e0b
parentd3dd26658cce73110c7d24e7a9ca2d5d42e30b77 (diff)
downloadvim-311dc17d960689b72fd0d2bcda12b728531557f6.zip
Update for jsp syntax file.
-rw-r--r--runtime/syntax/jsp.vim5
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/syntax/jsp.vim b/runtime/syntax/jsp.vim
index 523c8e31e..976665759 100644
--- a/runtime/syntax/jsp.vim
+++ b/runtime/syntax/jsp.vim
@@ -30,7 +30,7 @@ unlet b:current_syntax
syn case match
" Include Java syntax
-syn include @jspJava <sfile>:p:h/java.vim
+syn include @jspJava syntax/java.vim
syn region jspScriptlet matchgroup=jspTag start=/<%/ keepend end=/%>/ contains=@jspJava
syn region jspComment start=/<%--/ end=/--%>/
@@ -48,7 +48,8 @@ syn keyword jspCommandArg contained code codebase name archive align height
syn keyword jspCommandArg contained width hspace vspace jreversion nspluginurl iepluginurl
" Redefine htmlTag so that it can contain jspExpr
-syn region htmlTag start=+<[^/%]+ end=+>+ contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent,htmlCssDefinition,@htmlPreproc,@htmlArgCluster,jspExpr
+syn clear htmlTag
+syn region htmlTag start=+<[^/%]+ end=+>+ contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent,htmlCssDefinition,@htmlPreproc,@htmlArgCluster,jspExpr,javaScript
" Define the default highlighting.
" For version 5.7 and earlier: only when not done already