From a53409b564458f7a94c8fcd0725d1953dee58dce Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 28 Apr 2017 21:06:44 +0200
Subject: vim-patch:89bcfda6834a

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

https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
---
 runtime/syntax/desktop.vim | 69 +++++++++++++++++++---------------------------
 1 file changed, 29 insertions(+), 40 deletions(-)

(limited to 'runtime/syntax/desktop.vim')

diff --git a/runtime/syntax/desktop.vim b/runtime/syntax/desktop.vim
index 27dac5c8ee..efab6d5f6f 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,33 @@ 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
+command -nargs=+ HiLink hi def link <args>
+
+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
 
 let b:current_syntax = "desktop"
 
-- 
cgit 


From 86b596dc7a49f1b148ef82a356b972b93ed0f6d4 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 28 Apr 2017 21:14:34 +0200
Subject: vim-patch:f37506f60f87

Updated runtime files.  Remove HiLink commands.

https://github.com/vim/vim/commit/f37506f60f87d52a9e8850e30067645e2b13783c
---
 runtime/syntax/desktop.vim | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

(limited to 'runtime/syntax/desktop.vim')

diff --git a/runtime/syntax/desktop.vim b/runtime/syntax/desktop.vim
index efab6d5f6f..915107887a 100644
--- a/runtime/syntax/desktop.vim
+++ b/runtime/syntax/desktop.vim
@@ -77,32 +77,30 @@ syn match   dtALocale /\[.\{-}\]\s*=\@=/ containedin=ALL
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink dtGroup		 Special
-HiLink dtComment	 Comment
-HiLink dtDelim		 String
+hi def link dtGroup		 Special
+hi def link dtComment	 Comment
+hi def link dtDelim		 String
 
-HiLink dtLocaleKey	 Type
-HiLink dtLocaleName	 Identifier
-HiLink dtXLocale	 Identifier
-HiLink dtALocale	 Identifier
+hi def link dtLocaleKey	 Type
+hi def link dtLocaleName	 Identifier
+hi def link dtXLocale	 Identifier
+hi def link dtALocale	 Identifier
 
-HiLink dtNumericKey	 Type
+hi def link dtNumericKey	 Type
 
-HiLink dtBooleanKey	 Type
-HiLink dtBooleanValue	 Constant
+hi def link dtBooleanKey	 Type
+hi def link dtBooleanValue	 Constant
 
-HiLink dtStringKey	 Type
+hi def link dtStringKey	 Type
 
-HiLink dtExecKey	 Type
-HiLink dtExecParam	 Special
-HiLink dtTypeKey	 Type
-HiLink dtTypeValue	 Constant
-HiLink dtNotStLabel	 Type
-HiLink dtXAddKey	 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
 
-delcommand HiLink
 
 let b:current_syntax = "desktop"
 
-- 
cgit