vim-patch:89bcfda6834a

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

https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5

1 files changed, 34 insertions, 45 deletions

diff --git a/runtime/syntax/csp.vim b/runtime/syntax/csp.vim
index bd6213efd9..a5460cddbb 100644
--- a/runtime/syntax/csp.vim
+++ b/runtime/syntax/csp.vim
@@ -15,11 +15,8 @@
 "		- The additional syntax for the RT-Tester (pseudo-comments)
 "		  should be optional.
 
-" 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
 
@@ -149,46 +146,38 @@ syn match cspSdlRttComment	"pragma\s\+SDL_MATCH\s\+" nextgroup=cspRttPragmaSdlAr
 syn sync lines=250
 
 " 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_csp_syn_inits")
-  if version < 508
-    let did_csp_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-
-  " The default methods for highlighting.  Can be overridden later
-  " (For vim version <=5.7, the command groups are defined in
-  " $VIMRUNTIME/syntax/synload.vim )
-  HiLink cspComment			Comment
-  HiLink cspNumber			Number
-  HiLink cspConditional			Conditional
-  HiLink cspOperator			Delimiter
-  HiLink cspKeyword			Keyword
-  HiLink cspReserved			SpecialChar
-  HiLink cspInclude			Error
-  HiLink cspIncludeKeyword		Include
-  HiLink cspIncludeArg			Include
-  HiLink cspAssert			PreCondit
-  HiLink cspType			Type
-  HiLink cspProcess			Function
-  HiLink cspTodo			Todo
-  HiLink cspOldRttComment		Define
-  HiLink cspRttPragmaKeyword		Define
-  HiLink cspSdlRttComment		Define
-  HiLink cspRttPragmaArg		Define
-  HiLink cspRttPragmaSdlArg		Define
-  HiLink cspRttPragmaSdlName		Default
-  HiLink cspRttPragmaSdlTailArg		Define
-  HiLink cspRttPragmaSdlTransName	Default
-  HiLink cspRttPragmaSdlTransTailArg	Define
-  HiLink cspReservedIdentifier	Error
-  " (Currently unused vim method: Debug)
-
-  delcommand HiLink
-endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
+
+" The default methods for highlighting.  Can be overridden later
+" (For vim version <=5.7, the command groups are defined in
+" $VIMRUNTIME/syntax/synload.vim )
+HiLink cspComment			Comment
+HiLink cspNumber			Number
+HiLink cspConditional			Conditional
+HiLink cspOperator			Delimiter
+HiLink cspKeyword			Keyword
+HiLink cspReserved			SpecialChar
+HiLink cspInclude			Error
+HiLink cspIncludeKeyword		Include
+HiLink cspIncludeArg			Include
+HiLink cspAssert			PreCondit
+HiLink cspType			Type
+HiLink cspProcess			Function
+HiLink cspTodo			Todo
+HiLink cspOldRttComment		Define
+HiLink cspRttPragmaKeyword		Define
+HiLink cspSdlRttComment		Define
+HiLink cspRttPragmaArg		Define
+HiLink cspRttPragmaSdlArg		Define
+HiLink cspRttPragmaSdlName		Default
+HiLink cspRttPragmaSdlTailArg		Define
+HiLink cspRttPragmaSdlTransName	Default
+HiLink cspRttPragmaSdlTransTailArg	Define
+HiLink cspReservedIdentifier	Error
+" (Currently unused vim method: Debug)
+
+delcommand HiLink
 
 let b:current_syntax = "csp"