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

1 files changed, 55 insertions, 66 deletions

diff --git a/runtime/syntax/chill.vim b/runtime/syntax/chill.vim
index ca00cd95e..d8ee9dbc2 100644
--- a/runtime/syntax/chill.vim
+++ b/runtime/syntax/chill.vim
@@ -11,11 +11,8 @@
 " & Communications LTd.)
 
 
-" 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
 
@@ -124,67 +121,59 @@ endif
 exec "syn sync ccomment chillComment minlines=" . chill_minlines
 
 " 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_ch_syntax_inits")
-  if version < 508
-    let did_ch_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-
-  HiLink chillLabel	Label
-  HiLink chillUserLabel	Label
-  HiLink chillConditional	Conditional
-  " hi chillConditional	term=bold ctermfg=red guifg=red gui=bold
-
-  HiLink chillRepeat	Repeat
-  HiLink chillProcess	Repeat
-  HiLink chillSignal	Repeat
-  HiLink chillCharacter	Character
-  HiLink chillSpecialCharacter chillSpecial
-  HiLink chillNumber	Number
-  HiLink chillFloat	Float
-  HiLink chillOctalError	chillError
-  HiLink chillParenError	chillError
-  HiLink chillInParen	chillError
-  HiLink chillCommentError	chillError
-  HiLink chillSpaceError	chillError
-  HiLink chillOperator	Operator
-  HiLink chillStructure	Structure
-  HiLink chillBlock	Operator
-  HiLink chillScope	Operator
-  "hi chillEDML     term=underline ctermfg=DarkRed guifg=Red
-  HiLink chillEDML	PreProc
-  "hi chillBoolConst	term=bold ctermfg=brown guifg=brown
-  HiLink chillBoolConst	Constant
-  "hi chillLogical	term=bold ctermfg=brown guifg=brown
-  HiLink chillLogical	Constant
-  HiLink chillStorageClass	StorageClass
-  HiLink chillInclude	Include
-  HiLink chillPreProc	PreProc
-  HiLink chillDefine	Macro
-  HiLink chillIncluded	chillString
-  HiLink chillError	Error
-  HiLink chillStatement	Statement
-  HiLink chillPreCondit	PreCondit
-  HiLink chillType	Type
-  HiLink chillCommentError	chillError
-  HiLink chillCommentString chillString
-  HiLink chillComment2String chillString
-  HiLink chillCommentSkip	chillComment
-  HiLink chillString	String
-  HiLink chillComment	Comment
-  " hi chillComment	term=None ctermfg=lightblue guifg=lightblue
-  HiLink chillSpecial	SpecialChar
-  HiLink chillTodo	Todo
-  HiLink chillBlock	Statement
-  "HiLink chillIdentifier	Identifier
-  HiLink chillBracket	Delimiter
-
-  delcommand HiLink
-endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
+
+HiLink chillLabel	Label
+HiLink chillUserLabel	Label
+HiLink chillConditional	Conditional
+" hi chillConditional	term=bold ctermfg=red guifg=red gui=bold
+
+HiLink chillRepeat	Repeat
+HiLink chillProcess	Repeat
+HiLink chillSignal	Repeat
+HiLink chillCharacter	Character
+HiLink chillSpecialCharacter chillSpecial
+HiLink chillNumber	Number
+HiLink chillFloat	Float
+HiLink chillOctalError	chillError
+HiLink chillParenError	chillError
+HiLink chillInParen	chillError
+HiLink chillCommentError	chillError
+HiLink chillSpaceError	chillError
+HiLink chillOperator	Operator
+HiLink chillStructure	Structure
+HiLink chillBlock	Operator
+HiLink chillScope	Operator
+"hi chillEDML     term=underline ctermfg=DarkRed guifg=Red
+HiLink chillEDML	PreProc
+"hi chillBoolConst	term=bold ctermfg=brown guifg=brown
+HiLink chillBoolConst	Constant
+"hi chillLogical	term=bold ctermfg=brown guifg=brown
+HiLink chillLogical	Constant
+HiLink chillStorageClass	StorageClass
+HiLink chillInclude	Include
+HiLink chillPreProc	PreProc
+HiLink chillDefine	Macro
+HiLink chillIncluded	chillString
+HiLink chillError	Error
+HiLink chillStatement	Statement
+HiLink chillPreCondit	PreCondit
+HiLink chillType	Type
+HiLink chillCommentError	chillError
+HiLink chillCommentString chillString
+HiLink chillComment2String chillString
+HiLink chillCommentSkip	chillComment
+HiLink chillString	String
+HiLink chillComment	Comment
+" hi chillComment	term=None ctermfg=lightblue guifg=lightblue
+HiLink chillSpecial	SpecialChar
+HiLink chillTodo	Todo
+HiLink chillBlock	Statement
+"HiLink chillIdentifier	Identifier
+HiLink chillBracket	Delimiter
+
+delcommand HiLink
 
 let b:current_syntax = "chill"