Merge branch 'master' into luaviml'/lua

1 files changed, 32 insertions, 44 deletions

diff --git a/runtime/syntax/wsml.vim b/runtime/syntax/wsml.vim
index 2a92a0d548..d01294caac 100644
--- a/runtime/syntax/wsml.vim
+++ b/runtime/syntax/wsml.vim
@@ -4,10 +4,8 @@
 " URL:		none
 " Last Change:  2006 Apr 30
 
-" 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
 
@@ -78,47 +76,37 @@ syn match   wsmlSpecial "\\u\d\{4\}"
 syn cluster wsmlTop add=wsmlString,wsmlCharacter,wsmlNumber,wsmlSpecial,wsmlStringError
 
 " 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_wsml_syn_inits")
-   if version < 508
-       let did_wsml_syn_inits = 1
-       command -nargs=+ HiLink hi link <args>
-   else
-       command -nargs=+ HiLink hi def link <args>
-   endif              
-   HiLink wsmlHeader			TypeDef
-   HiLink wsmlNamespace			TypeDef
-   HiLink wsmlOntology			Statement
-   HiLink wsmlAxiom			TypeDef
-   HiLink wsmlService			TypeDef
-   HiLink wsmlNFP			TypeDef
-   HiLink wsmlTopLevel			TypeDef
-   HiLink wsmlMediation			TypeDef 
-   HiLink wsmlBehavioral		TypeDef
-   HiLink wsmlChoreographyPri		TypeDef
-   HiLink wsmlChoreographySec		Operator
-   HiLink wsmlChoreographyTer		Special
-   HiLink wsmlString			String
-   HiLink wsmlIdentifier		Normal 
-   HiLink wsmlSqName                     Normal
-   HiLink wsmlVariable			Define
-   HiLink wsmlKeywordsInsideLEs		Operator
-   HiLink wsmlOperator			Operator
-   HiLink wsmlBrace			Operator
-   HiLink wsmlCharacter			Character
-   HiLink wsmlNumber			Number
-   HiLink wsmlDataTypes			Special
-   HiLink wsmlComment			Comment
-   HiLink wsmlDocComment		Comment
-   HiLink wsmlLineComment		Comment
-   HiLink wsmlTodo			Todo
-   HiLink wsmlFixMe			Error
-   HiLink wsmlCommentTitle		SpecialComment
-   HiLink wsmlCommentStar		wsmlComment
- endif
+" Only when an item doesn't have highlighting yet
+hi def link wsmlHeader			TypeDef
+hi def link wsmlNamespace			TypeDef
+hi def link wsmlOntology			Statement
+hi def link wsmlAxiom			TypeDef
+hi def link wsmlService			TypeDef
+hi def link wsmlNFP			TypeDef
+hi def link wsmlTopLevel			TypeDef
+hi def link wsmlMediation			TypeDef 
+hi def link wsmlBehavioral		TypeDef
+hi def link wsmlChoreographyPri		TypeDef
+hi def link wsmlChoreographySec		Operator
+hi def link wsmlChoreographyTer		Special
+hi def link wsmlString			String
+hi def link wsmlIdentifier		Normal 
+hi def link wsmlSqName                     Normal
+hi def link wsmlVariable			Define
+hi def link wsmlKeywordsInsideLEs		Operator
+hi def link wsmlOperator			Operator
+hi def link wsmlBrace			Operator
+hi def link wsmlCharacter			Character
+hi def link wsmlNumber			Number
+hi def link wsmlDataTypes			Special
+hi def link wsmlComment			Comment
+hi def link wsmlDocComment		Comment
+hi def link wsmlLineComment		Comment
+hi def link wsmlTodo			Todo
+hi def link wsmlFixMe			Error
+hi def link wsmlCommentTitle		SpecialComment
+hi def link wsmlCommentStar		wsmlComment
 
-delcommand HiLink
 
 let b:current_syntax = "wsml"
 let b:spell_options="contained"