drop vim 5.x compatibility junk (6.0 is 10 years old ferchrissake)

2 files changed, 46 insertions, 83 deletions

diff --git a/syntax/kickstart.vim b/syntax/kickstart.vim
index 73b0316..c7c3cf3 100644
--- a/syntax/kickstart.vim
+++ b/syntax/kickstart.vim
@@ -4,11 +4,7 @@
 " Maintainer:  Will Woods <wwoods@redhat.com>
 " Last Change: Wed Mar  9 15:01:02 EST 2011
 
-" 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")
+if exists("b:current_syntax")
   finish
 endif
 
@@ -65,32 +61,19 @@ syntax sync match ksSync grouphere NONE "^\s*%\(pre\|post\|packages\|traceback\)
 syntax sync match ksSync groupthere NONE "^\s*%end"
 
 " 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_kickstart_syntax_inits")
-  if version < 508
-    let did_kickstart_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-  HiLink ksComment              Comment
-  HiLink ksTodo                 Todo
-  HiLink ksCommands             Statement
-  HiLink ksDeprecatedCommands   Special
-  HiLink ksUnknownCommand       Error
-  HiLink ksIncludes             Include
-  HiLink ksSectionMarker        Structure
-  HiLink ksScriptFlag           ksFlag
-  HiLink ksPackagesFlag         ksFlag
-  HiLink ksFlag                 Identifier
-  HiLink ksUnknownFlag          Error
-  HiLink ksPackageMinus         Special
-  HiLink ksPackageGroup         Include
-  HiLink ksPackageGlob          Operator
-  delcommand HiLink
-endif
+hi def link ksComment              Comment
+hi def link ksTodo                 Todo
+hi def link ksCommands             Statement
+hi def link ksDeprecatedCommands   Special
+hi def link ksUnknownCommand       Error
+hi def link ksIncludes             Include
+hi def link ksSectionMarker        Structure
+hi def link ksScriptFlag           ksFlag
+hi def link ksPackagesFlag         ksFlag
+hi def link ksFlag                 Identifier
+hi def link ksUnknownFlag          Error
+hi def link ksPackageMinus         Special
+hi def link ksPackageGroup         Include
+hi def link ksPackageGlob          Operator
 
 let b:current_syntax = "kickstart"
-
-" vim: ts=8
diff --git a/syntax/spec.vim b/syntax/spec.vim
index 86172ce..57a390d 100644
--- a/syntax/spec.vim
+++ b/syntax/spec.vim
@@ -4,11 +4,7 @@
 " Maintainer:  Will Woods <wwoods@redhat.com>
 " Last Change: Tue Mar 29 11:38:02 EDT 2011
 
-" 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")
+if exists("b:current_syntax")
   finish
 endif
 
@@ -99,53 +95,37 @@ syn match specBugID contained '\%([Bb]ug\|\a*[Bb][Zz]\)[ #]*\d\+'
 "####################################
 
 " 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_spec_syntax_inits")
-  if version < 508
-    let did_spec_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-
-  "main types color definitions
-  HiLink specComment			Comment
-  HiLink specTodo                       Todo
-  HiLink specRPMHeader                  Statement
-  HiLink specDefine        		PreProc
-  HiLink specControl    		Identifier
-  HiLink specMacroCommands              Macro
-  HiLink specIdentifier                 Identifier
-  HiLink specMacroSym                   Special
-  HiLink specMacroMod                   Operator
-  HiLink specSectionMarker              Structure
-  HiLink specURL			PreProc
-  HiLink specEmail                      PreProc
-  HiLink specVersion                    Constant
-  HiLink specBugID                      Constant
-  HiLink specPRCOOperator               Operator
-  HiLink specContinue                   Operator
-  HiLink specDate			String
-  HiLink specLicense			String
-
-  "yes, it's ugly, but white is sooo cool
-  if &background == "dark"
-    hi def specMacroNames		ctermfg=white
-  else
-    HiLink specMacroNames		Identifier
-  endif
+hi def link specComment             Comment
+hi def link specTodo                Todo
+hi def link specRPMHeader           Statement
+hi def link specDefine              PreProc
+hi def link specControl             Identifier
+hi def link specMacroCommands       Macro
+hi def link specIdentifier          Identifier
+hi def link specMacroSym            Special
+hi def link specMacroMod            Operator
+hi def link specSectionMarker       Structure
+hi def link specURL                 PreProc
+hi def link specEmail               PreProc
+hi def link specVersion             Constant
+hi def link specBugID               Constant
+hi def link specPRCOOperator        Operator
+hi def link specContinue            Operator
+hi def link specDate                String
+hi def link specLicense             String
+
+" yes, it's ugly, but white is sooo cool
+if &background == "dark"
+  hi def specMacroNames             ctermfg=white
+else
+  hi def link specMacroNames        Identifier
+endif
 
   "colors mapped onto other things
-  HiLink specRPMHeaderSimple            specRPMHeader
-  HiLink specRPMHeaderVersion           specRPMHeader
-  HiLink specMacroBuiltin               specMacroNames
-  HiLink specWeekday			specDate
-  HiLink specMonth			specDate
-
-  delcommand HiLink
-endif
+hi def link specRPMHeaderSimple     specRPMHeader
+hi def link specRPMHeaderVersion    specRPMHeader
+hi def link specMacroBuiltin        specMacroNames
+hi def link specWeekday             specDate
+hi def link specMonth               specDate
 
 let b:current_syntax = "spec"
-
-" vim: ts=8