Merge #6613 from justinmk/vim-patches

1 files changed, 13 insertions, 26 deletions

diff --git a/runtime/syntax/winbatch.vim b/runtime/syntax/winbatch.vim
index aea2cdebcb..15ea0fc77b 100644
--- a/runtime/syntax/winbatch.vim
+++ b/runtime/syntax/winbatch.vim
@@ -4,11 +4,8 @@
 " URL:		http://www.mggen.com/vim/syntax/winbatch.zip
 " Last change:	2001 May 10
 
-" 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
 
@@ -158,29 +155,19 @@ syn keyword winbatchImplicit xgetchildhwnd xgetelapsed xhex xmemcompact xmessage
 syn keyword winbatchImplicit xsendmessage xverifyccard yield
 
 " 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_winbatch_syntax_inits")
-  if version < 508
-    let did_winbatch_syntax_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
 
-  HiLink winbatchLabel		PreProc
-  HiLink winbatchCtl		Operator
-  HiLink winbatchStatement	Statement
-  HiLink winbatchTodo		Todo
-  HiLink winbatchString		String
-  HiLink winbatchVar		Type
-  HiLink winbatchComment	Comment
-  HiLink winbatchImplicit	Special
-  HiLink winbatchNumber		Number
-  HiLink winbatchConstant	StorageClass
+hi def link winbatchLabel		PreProc
+hi def link winbatchCtl		Operator
+hi def link winbatchStatement	Statement
+hi def link winbatchTodo		Todo
+hi def link winbatchString		String
+hi def link winbatchVar		Type
+hi def link winbatchComment	Comment
+hi def link winbatchImplicit	Special
+hi def link winbatchNumber		Number
+hi def link winbatchConstant	StorageClass
 
-  delcommand HiLink
-endif
 
 let b:current_syntax = "winbatch"