Merge branch 'master' into s-dash-stdin

1 files changed, 41 insertions, 54 deletions

diff --git a/runtime/syntax/tads.vim b/runtime/syntax/tads.vim
index 260ff360f7..23a65b99ec 100644
--- a/runtime/syntax/tads.vim
+++ b/runtime/syntax/tads.vim
@@ -13,11 +13,8 @@
 " Actually, should cvtstr etc. be functions?! (change tadsFunction)
 " Make global etc. into Identifiers, since we don't have regular variables?
 
-" 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
 
@@ -122,57 +119,47 @@ endif
 execute "syn sync maxlines=" . tads_sync_dist
 
 " 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_tads_syn_inits")
-  if version < 508
-    let did_tads_syn_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
-  HiLink tadsFunctionDef Function
-  HiLink tadsFunction  Structure
-  HiLink tadsClass     Structure
-  HiLink tadsClassDef  Identifier
-  HiLink tadsObjectDef Identifier
+" Only when an item doesn't have highlighting yet
+
+" The default methods for highlighting.  Can be overridden later
+hi def link tadsFunctionDef Function
+hi def link tadsFunction  Structure
+hi def link tadsClass     Structure
+hi def link tadsClassDef  Identifier
+hi def link tadsObjectDef Identifier
 " no highlight for tadsEmbedded, so it prints as normal text w/in the string
 
-  HiLink tadsOperator	Operator
-  HiLink tadsStructure	Structure
-  HiLink tadsTodo	Todo
-  HiLink tadsLabel	Label
-  HiLink tadsConditional	Conditional
-  HiLink tadsRepeat	Repeat
-  HiLink tadsException	Exception
-  HiLink tadsStatement	Statement
-  HiLink tadsStorageClass	StorageClass
-  HiLink tadsKeyWord   Keyword
-  HiLink tadsSpecial	SpecialChar
-  HiLink tadsNumber	Number
-  HiLink tadsBoolean	Boolean
-  HiLink tadsDoubleString	tadsString
-  HiLink tadsSingleString	tadsString
-
-  HiLink tadsOctalError	tadsError
-  HiLink tadsCommentError	tadsError
-  HiLink tadsBraceError	tadsError
-  HiLink tadsInBrace	tadsError
-  HiLink tadsError	Error
-
-  HiLink tadsInclude	Include
-  HiLink tadsPreProc	PreProc
-  HiLink tadsDefine	Macro
-  HiLink tadsIncluded	tadsString
-  HiLink tadsPreCondit	PreCondit
-
-  HiLink tadsString	String
-  HiLink tadsComment	Comment
-
-  delcommand HiLink
-endif
+hi def link tadsOperator	Operator
+hi def link tadsStructure	Structure
+hi def link tadsTodo	Todo
+hi def link tadsLabel	Label
+hi def link tadsConditional	Conditional
+hi def link tadsRepeat	Repeat
+hi def link tadsException	Exception
+hi def link tadsStatement	Statement
+hi def link tadsStorageClass	StorageClass
+hi def link tadsKeyWord   Keyword
+hi def link tadsSpecial	SpecialChar
+hi def link tadsNumber	Number
+hi def link tadsBoolean	Boolean
+hi def link tadsDoubleString	tadsString
+hi def link tadsSingleString	tadsString
+
+hi def link tadsOctalError	tadsError
+hi def link tadsCommentError	tadsError
+hi def link tadsBraceError	tadsError
+hi def link tadsInBrace	tadsError
+hi def link tadsError	Error
+
+hi def link tadsInclude	Include
+hi def link tadsPreProc	PreProc
+hi def link tadsDefine	Macro
+hi def link tadsIncluded	tadsString
+hi def link tadsPreCondit	PreCondit
+
+hi def link tadsString	String
+hi def link tadsComment	Comment
+
 
 
 let b:current_syntax = "tads"