vim-patch:89bcfda6834a

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

https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5

1 files changed, 35 insertions, 46 deletions

diff --git a/runtime/syntax/vmasm.vim b/runtime/syntax/vmasm.vim
index 85d0441258..a4b71229ec 100644
--- a/runtime/syntax/vmasm.vim
+++ b/runtime/syntax/vmasm.vim
@@ -6,11 +6,8 @@
 " This is incomplete. Feel free to contribute...
 "
 
-" 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
 
@@ -196,55 +193,47 @@ syn match vmasmDirective	"\.\(signed_\)\=word\>"
 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_macro_syntax_inits")
-  if version < 508
-    let did_macro_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-
-  " The default methods for highlighting.  Can be overridden later
-  " Comment Constant Error Identifier PreProc Special Statement Todo Type
-  "
-  " Constant		Boolean Character Number String
-  " Identifier		Function
-  " PreProc		Define Include Macro PreCondit
-  " Special		Debug Delimiter SpecialChar SpecialComment Tag
-  " Statement		Conditional Exception Keyword Label Operator Repeat
-  " Type		StorageClass Structure Typedef
-
-  HiLink vmasmComment		Comment
-  HiLink vmasmTodo		Todo
-
-  HiLink vmasmhexNumber		Number		" Constant
-  HiLink vmasmoctNumber		Number		" Constant
-  HiLink vmasmbinNumber		Number		" Constant
-  HiLink vmasmdecNumber		Number		" Constant
-  HiLink vmasmfloatNumber	Number		" Constant
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
+
+" The default methods for highlighting.  Can be overridden later
+" Comment Constant Error Identifier PreProc Special Statement Todo Type
+"
+" Constant		Boolean Character Number String
+" Identifier		Function
+" PreProc		Define Include Macro PreCondit
+" Special		Debug Delimiter SpecialChar SpecialComment Tag
+" Statement		Conditional Exception Keyword Label Operator Repeat
+" Type		StorageClass Structure Typedef
+
+HiLink vmasmComment		Comment
+HiLink vmasmTodo		Todo
+
+HiLink vmasmhexNumber		Number		" Constant
+HiLink vmasmoctNumber		Number		" Constant
+HiLink vmasmbinNumber		Number		" Constant
+HiLink vmasmdecNumber		Number		" Constant
+HiLink vmasmfloatNumber	Number		" Constant
 
 "  HiLink vmasmString		String		" Constant
 
-  HiLink vmasmReg		Identifier
-  HiLink vmasmOperator		Identifier
+HiLink vmasmReg		Identifier
+HiLink vmasmOperator		Identifier
 
-  HiLink vmasmInclude		Include		" PreProc
-  HiLink vmasmMacro		Macro		" PreProc
-  " HiLink vmasmMacroParam	Keyword		" Statement
+HiLink vmasmInclude		Include		" PreProc
+HiLink vmasmMacro		Macro		" PreProc
+" HiLink vmasmMacroParam	Keyword		" Statement
 
-  HiLink vmasmDirective		Special
-  HiLink vmasmPreCond		Special
+HiLink vmasmDirective		Special
+HiLink vmasmPreCond		Special
 
 
-  HiLink vmasmOpcode		Statement
-  HiLink vmasmCond		Conditional	" Statement
-  HiLink vmasmRepeat		Repeat		" Statement
+HiLink vmasmOpcode		Statement
+HiLink vmasmCond		Conditional	" Statement
+HiLink vmasmRepeat		Repeat		" Statement
 
-  HiLink vmasmLabel		Type
-  delcommand HiLink
-endif
+HiLink vmasmLabel		Type
+delcommand HiLink
 
 let b:current_syntax = "vmasm"