Merge branch 'master' into s-dash-stdin

1 files changed, 13 insertions, 26 deletions

diff --git a/runtime/syntax/bc.vim b/runtime/syntax/bc.vim
index 965afc35b1..4cd9d6388a 100644
--- a/runtime/syntax/bc.vim
+++ b/runtime/syntax/bc.vim
@@ -5,11 +5,8 @@
 " 		(Dominique Pelle added @Spell)
 " Available on:	www.gjh.sk/~vlado/bc.vim
 
-" 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
 
@@ -53,27 +50,17 @@ syn match bcParenError			")"
 syn case match
 
 " 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_bc_syntax_inits")
-  if version < 508
-    let did_bc_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-
-  HiLink bcKeyword		Statement
-  HiLink bcType		Type
-  HiLink bcConstant		Constant
-  HiLink bcNumber		Number
-  HiLink bcComment		Comment
-  HiLink bcString		String
-  HiLink bcSpecialChar		SpecialChar
-  HiLink bcParenError		Error
-
-  delcommand HiLink
-endif
+" Only when an item doesn't have highlighting yet
+
+hi def link bcKeyword		Statement
+hi def link bcType		Type
+hi def link bcConstant		Constant
+hi def link bcNumber		Number
+hi def link bcComment		Comment
+hi def link bcString		String
+hi def link bcSpecialChar		SpecialChar
+hi def link bcParenError		Error
+
 
 let b:current_syntax = "bc"
 " vim: ts=8