From a53409b564458f7a94c8fcd0725d1953dee58dce Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 28 Apr 2017 21:06:44 +0200
Subject: vim-patch:89bcfda6834a

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

https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
---
 runtime/syntax/jsp.vim | 51 ++++++++++++++++++--------------------------------
 1 file changed, 18 insertions(+), 33 deletions(-)

(limited to 'runtime/syntax/jsp.vim')

diff --git a/runtime/syntax/jsp.vim b/runtime/syntax/jsp.vim
index 9766657596..812a81465b 100644
--- a/runtime/syntax/jsp.vim
+++ b/runtime/syntax/jsp.vim
@@ -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
-- 
cgit