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/cvs.vim | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

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

diff --git a/runtime/syntax/cvs.vim b/runtime/syntax/cvs.vim
index 94b2a809eb..4a01c2b8a8 100644
--- a/runtime/syntax/cvs.vim
+++ b/runtime/syntax/cvs.vim
@@ -4,11 +4,8 @@
 " URL:		http://www.zotikos.com/downloads/cvs.vim
 " Last Change:	Sat Nov 24 23:25:11 CET 2001
 
-" 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
 
@@ -20,24 +17,16 @@ syn region cvsCom start="Committing in" end="$" contains=cvsDir contained extend
 syn match cvsDir   contained "\S\+$"
 
 " 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_cvs_syn_inits")
-	if version < 508
-		let did_cvs_syn_inits = 1
-		command -nargs=+ HiLink hi link <args>
-	else
-		command -nargs=+ HiLink hi def link <args>
-	endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-	HiLink cvsLine		Comment
-	HiLink cvsDir		cvsFile
-	HiLink cvsFile		Constant
-	HiLink cvsFiles		cvsCom
-	HiLink cvsTag		cvsCom
-	HiLink cvsCom		Statement
+HiLink cvsLine		Comment
+HiLink cvsDir		cvsFile
+HiLink cvsFile		Constant
+HiLink cvsFiles		cvsCom
+HiLink cvsTag		cvsCom
+HiLink cvsCom		Statement
 
-	delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "cvs"
-- 
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/cvs.vim | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

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

diff --git a/runtime/syntax/cvs.vim b/runtime/syntax/cvs.vim
index 4a01c2b8a8..3eac191637 100644
--- a/runtime/syntax/cvs.vim
+++ b/runtime/syntax/cvs.vim
@@ -18,15 +18,13 @@ syn match cvsDir   contained "\S\+$"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink cvsLine		Comment
-HiLink cvsDir		cvsFile
-HiLink cvsFile		Constant
-HiLink cvsFiles		cvsCom
-HiLink cvsTag		cvsCom
-HiLink cvsCom		Statement
+hi def link cvsLine		Comment
+hi def link cvsDir		cvsFile
+hi def link cvsFile		Constant
+hi def link cvsFiles		cvsCom
+hi def link cvsTag		cvsCom
+hi def link cvsCom		Statement
 
-delcommand HiLink
 
 let b:current_syntax = "cvs"
-- 
cgit