diff runtime/syntax/msql.vim @ 10048:43efa4f5a8ea

commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Aug 30 23:26:57 2016 +0200 Updated runtime files. Remove version checks for Vim older than 6.0.
author Christian Brabandt <cb@256bit.org>
date Tue, 30 Aug 2016 23:30:09 +0200
parents 3fc0f57ecb91
children 46763b01cd9a
line wrap: on
line diff
--- a/runtime/syntax/msql.vim
+++ b/runtime/syntax/msql.vim
@@ -8,11 +8,8 @@
 " Options	msql_sql_query = 1 for SQL syntax highligthing inside strings
 "		msql_minlines = x     to sync at least x lines backwards
 
-" 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
 
@@ -20,12 +17,8 @@ if !exists("main_syntax")
   let main_syntax = 'msql'
 endif
 
-if version < 600
-  so <sfile>:p:h/html.vim
-else
-  runtime! syntax/html.vim
-  unlet b:current_syntax
-endif
+runtime! syntax/html.vim
+unlet b:current_syntax
 
 syn cluster htmlPreproc add=msqlRegion
 
@@ -57,39 +50,31 @@ else
 endif
 
 " 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_msql_syn_inits")
-  if version < 508
-    let did_msql_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink msqlComment		Comment
-  HiLink msqlString		String
-  HiLink msqlNumber		Number
-  HiLink msqlFloat		Float
-  HiLink msqlIdentifier	Identifier
-  HiLink msqlGlobalIdentifier	Identifier
-  HiLink msqlIntVar		Identifier
-  HiLink msqlEnvVar		Identifier
-  HiLink msqlFunctions		Function
-  HiLink msqlRepeat		Repeat
-  HiLink msqlConditional	Conditional
-  HiLink msqlStatement		Statement
-  HiLink msqlType		Type
-  HiLink msqlInclude		Include
-  HiLink msqlDefine		Define
-  HiLink msqlSpecialChar	SpecialChar
-  HiLink msqlParentError	Error
-  HiLink msqlTodo		Todo
-  HiLink msqlOperator		Operator
-  HiLink msqlRelation		Operator
+HiLink msqlComment		Comment
+HiLink msqlString		String
+HiLink msqlNumber		Number
+HiLink msqlFloat		Float
+HiLink msqlIdentifier	Identifier
+HiLink msqlGlobalIdentifier	Identifier
+HiLink msqlIntVar		Identifier
+HiLink msqlEnvVar		Identifier
+HiLink msqlFunctions		Function
+HiLink msqlRepeat		Repeat
+HiLink msqlConditional	Conditional
+HiLink msqlStatement		Statement
+HiLink msqlType		Type
+HiLink msqlInclude		Include
+HiLink msqlDefine		Define
+HiLink msqlSpecialChar	SpecialChar
+HiLink msqlParentError	Error
+HiLink msqlTodo		Todo
+HiLink msqlOperator		Operator
+HiLink msqlRelation		Operator
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "msql"