Merge branch 'master' into luaviml'/lua

1 files changed, 27 insertions, 40 deletions

diff --git a/runtime/syntax/desktop.vim b/runtime/syntax/desktop.vim
index 27dac5c8ee..915107887a 100644
--- a/runtime/syntax/desktop.vim
+++ b/runtime/syntax/desktop.vim
@@ -7,11 +7,8 @@
 " 		(added "Keywords")
 " Version Info: desktop.vim 0.9.4-1.2
 
-" 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
 
@@ -79,41 +76,31 @@ syn match   dtALocale /\[.\{-}\]\s*=\@=/ containedin=ALL
 
 
 " 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_desktop_syntax_inits")
-	if version < 508
-		let did_dosini_syntax_inits = 1
-		command -nargs=+ HiLink hi link <args>
-	else
-		command -nargs=+ HiLink hi def link <args>
-	endif
-
-	HiLink dtGroup		 Special
-	HiLink dtComment	 Comment
-	HiLink dtDelim		 String
-
-	HiLink dtLocaleKey	 Type
-	HiLink dtLocaleName	 Identifier
-	HiLink dtXLocale	 Identifier
-	HiLink dtALocale	 Identifier
-
-	HiLink dtNumericKey	 Type
-
-	HiLink dtBooleanKey	 Type
-	HiLink dtBooleanValue	 Constant
-
-	HiLink dtStringKey	 Type
-
-	HiLink dtExecKey	 Type
-	HiLink dtExecParam	 Special
-	HiLink dtTypeKey	 Type
-	HiLink dtTypeValue	 Constant
-	HiLink dtNotStLabel	 Type
-	HiLink dtXAddKey	 Type
-
-	delcommand HiLink
-endif
+" Only when an item doesn't have highlighting yet
+
+hi def link dtGroup		 Special
+hi def link dtComment	 Comment
+hi def link dtDelim		 String
+
+hi def link dtLocaleKey	 Type
+hi def link dtLocaleName	 Identifier
+hi def link dtXLocale	 Identifier
+hi def link dtALocale	 Identifier
+
+hi def link dtNumericKey	 Type
+
+hi def link dtBooleanKey	 Type
+hi def link dtBooleanValue	 Constant
+
+hi def link dtStringKey	 Type
+
+hi def link dtExecKey	 Type
+hi def link dtExecParam	 Special
+hi def link dtTypeKey	 Type
+hi def link dtTypeValue	 Constant
+hi def link dtNotStLabel	 Type
+hi def link dtXAddKey	 Type
+
 
 let b:current_syntax = "desktop"