Merge branch 'master' into luaviml'/lua

1 files changed, 19 insertions, 32 deletions

diff --git a/runtime/syntax/m4.vim b/runtime/syntax/m4.vim
index ba7a294d14..6f229ea1ab 100644
--- a/runtime/syntax/m4.vim
+++ b/runtime/syntax/m4.vim
@@ -8,15 +8,12 @@
 " capital letters and have at least one argument (i.e. the '('
 " must be there). Let me know if this is a problem.
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
+" quit when a syntax file was already loaded
 if !exists("main_syntax")
-  if version < 600
-    syntax clear
-  elseif exists("b:current_syntax")
-  finish
-endif
-" we define it here so that included files can test for it
+  if exists("b:current_syntax")
+	finish
+  endif
+  " we define it here so that included files can test for it
   let main_syntax='m4'
 endif
 
@@ -39,30 +36,20 @@ syn region m4String   start="`" end="'" contained contains=@m4Top,@m4StringConte
 syn cluster m4Top     contains=m4Comment,m4Constants,m4Special,m4Variable,m4String,m4Paren,m4Command,m4Statement,m4Function
 
 " 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_m4_syn_inits")
-  if version < 508
-    let did_m4_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-  HiLink m4Delimiter Delimiter
-  HiLink m4Comment   Comment
-  HiLink m4Function  Function
-  HiLink m4Keyword   Keyword
-  HiLink m4Special   Special
-  HiLink m4String    String
-  HiLink m4Statement Statement
-  HiLink m4Preproc   PreProc
-  HiLink m4Type      Type
-  HiLink m4Special   Special
-  HiLink m4Variable  Special
-  HiLink m4Constants Constant
-  HiLink m4Builtin   Statement
-  delcommand HiLink
-endif
+" Only when an item doesn't have highlighting yet
+hi def link m4Delimiter Delimiter
+hi def link m4Comment   Comment
+hi def link m4Function  Function
+hi def link m4Keyword   Keyword
+hi def link m4Special   Special
+hi def link m4String    String
+hi def link m4Statement Statement
+hi def link m4Preproc   PreProc
+hi def link m4Type      Type
+hi def link m4Special   Special
+hi def link m4Variable  Special
+hi def link m4Constants Constant
+hi def link m4Builtin   Statement
 
 let b:current_syntax = "m4"