adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated runtime files. Remove version checks for Vim older than 6.0.

Browse Source
This commit is contained in:
Bram Moolenaar
2016-08-30 23:26:57 +02:00
parent 4792255eff
commit 89bcfda683
427 changed files with 9298 additions and 12948 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
runtime/syntax/jsp.vim
View File

@ -6,11 +6,8 @@
" Credits : Patch by Darren Greaves (recognizes <jsp:...> tags)
" Patch by Thomas Kimpton (recognizes jspExpr inside HTML tags)
" For version 5.x: Clear all syntax items
" For version 6.x: Quit when a syntax file was already loaded
if version < 600
syntax clear
elseif exists("b:current_syntax")
" quit when a syntax file was already loaded
if exists("b:current_syntax")
finish
endif
@ -19,11 +16,7 @@ if !exists("main_syntax")
endif
" Source HTML syntax
if version < 600
source <sfile>:p:h/html.vim
else
runtime! syntax/html.vim
endif
runtime! syntax/html.vim
unlet b:current_syntax
" Next syntax items are case-sensitive
@ -52,29 +45,21 @@ 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
" For version 5.8 and later: only when an item doesn't have highlighting yet
if version >= 508 || !exists("did_jsp_syn_inits")
if version < 508
let did_jsp_syn_inits = 1
command -nargs=+ HiLink hi link <args>
else
command -nargs=+ HiLink hi def link <args>
endif
" java.vim has redefined htmlComment highlighting
HiLink htmlComment Comment
HiLink htmlCommentPart Comment
" Be consistent with html highlight settings
HiLink jspComment htmlComment
HiLink jspTag htmlTag
HiLink jspDirective jspTag
HiLink jspDirName htmlTagName
HiLink jspDirArg htmlArg
HiLink jspCommand jspTag
HiLink jspCommandName htmlTagName
HiLink jspCommandArg htmlArg
delcommand HiLink
endif
" Only when an item doesn't have highlighting yet
command -nargs=+ HiLink hi def link <args>
" java.vim has redefined htmlComment highlighting
HiLink htmlComment Comment
HiLink htmlCommentPart Comment
" Be consistent with html highlight settings
HiLink jspComment htmlComment
HiLink jspTag htmlTag
HiLink jspDirective jspTag
HiLink jspDirName htmlTagName
HiLink jspDirArg htmlArg
HiLink jspCommand jspTag
HiLink jspCommandName htmlTagName
HiLink jspCommandArg htmlArg
delcommand HiLink
if main_syntax == 'jsp'
unlet main_syntax