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/xdefaults.vim | 59 ++++++++++++++++++--------------------------
 1 file changed, 24 insertions(+), 35 deletions(-)

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

diff --git a/runtime/syntax/xdefaults.vim b/runtime/syntax/xdefaults.vim
index 5e38952a75..1dfcc34ae5 100644
--- a/runtime/syntax/xdefaults.vim
+++ b/runtime/syntax/xdefaults.vim
@@ -10,11 +10,8 @@
 "   xrdb manual page
 "   xrdb source: ftp://ftp.x.org/pub/R6.4/xc/programs/xrdb/xrdb.c
 
-" 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
 
@@ -109,36 +106,28 @@ syn keyword xdefaultsSymbol contained X_RESOLUTION
 syn keyword xdefaultsSymbol contained Y_RESOLUTION
 
 " 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_xdefaults_syntax_inits")
-  if version < 508
-    let did_xdefaults_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-  HiLink xdefaultsLabel		Type
-  HiLink xdefaultsValue		Constant
-  HiLink xdefaultsComment	Comment
-  HiLink xdefaultsCommentH	xdefaultsComment
-  HiLink xdefaultsPreProc	PreProc
-  HiLink xdefaultsInclude	xdefaultsPreProc
-  HiLink xdefaultsCppSkip	xdefaultsCppOut
-  HiLink xdefaultsCppOut2	xdefaultsCppOut
-  HiLink xdefaultsCppOut	Comment
-  HiLink xdefaultsIncluded	String
-  HiLink xdefaultsDefine	Macro
-  HiLink xdefaultsSymbol	Statement
-  HiLink xdefaultsSpecial	Statement
-  HiLink xdefaultsErrorLine	Error
-  HiLink xdefaultsCommentError	Error
-  HiLink xdefaultsPunct		Normal
-  HiLink xdefaultsLineEnd	Special
-  HiLink xdefaultsTodo		Todo
-
-  delcommand HiLink
-endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
+HiLink xdefaultsLabel		Type
+HiLink xdefaultsValue		Constant
+HiLink xdefaultsComment	Comment
+HiLink xdefaultsCommentH	xdefaultsComment
+HiLink xdefaultsPreProc	PreProc
+HiLink xdefaultsInclude	xdefaultsPreProc
+HiLink xdefaultsCppSkip	xdefaultsCppOut
+HiLink xdefaultsCppOut2	xdefaultsCppOut
+HiLink xdefaultsCppOut	Comment
+HiLink xdefaultsIncluded	String
+HiLink xdefaultsDefine	Macro
+HiLink xdefaultsSymbol	Statement
+HiLink xdefaultsSpecial	Statement
+HiLink xdefaultsErrorLine	Error
+HiLink xdefaultsCommentError	Error
+HiLink xdefaultsPunct		Normal
+HiLink xdefaultsLineEnd	Special
+HiLink xdefaultsTodo		Todo
+
+delcommand HiLink
 
 let b:current_syntax = "xdefaults"
 
-- 
cgit