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/make.vim | 65 ++++++++++++++++++++-----------------------------
 1 file changed, 27 insertions(+), 38 deletions(-)

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

diff --git a/runtime/syntax/make.vim b/runtime/syntax/make.vim
index 35b09341a6..f022a4e9ac 100644
--- a/runtime/syntax/make.vim
+++ b/runtime/syntax/make.vim
@@ -4,11 +4,8 @@
 " URL:		http://www.fleiner.com/vim/syntax/make.vim
 " Last Change:	2015 Feb 28
 
-" 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
 
@@ -101,40 +98,32 @@ syn sync match makeCommandSync groupthere makeCommands "^[A-Za-z0-9_./$()%-][A-Z
 syn sync match makeCommandSync groupthere makeCommands "^[A-Za-z0-9_./$()%-][A-Za-z0-9_./\t $()%-]*:\{1,2}\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_make_syn_inits")
-  if version < 508
-    let did_make_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-
-  HiLink makeNextLine		makeSpecial
-  HiLink makeCmdNextLine	makeSpecial
-  HiLink makeSpecTarget		Statement
-  if !exists("make_no_commands")
-    HiLink makeCommands		Number
-  endif
-  HiLink makeImplicit		Function
-  HiLink makeTarget		Function
-  HiLink makeInclude		Include
-  HiLink makePreCondit		PreCondit
-  HiLink makeStatement		Statement
-  HiLink makeIdent		Identifier
-  HiLink makeSpecial		Special
-  HiLink makeComment		Comment
-  HiLink makeDString		String
-  HiLink makeSString		String
-  HiLink makeBString		Function
-  HiLink makeError		Error
-  HiLink makeTodo		Todo
-  HiLink makeDefine		Define
-  HiLink makeCommandError	Error
-  HiLink makeConfig		PreCondit
-  delcommand HiLink
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
+
+HiLink makeNextLine		makeSpecial
+HiLink makeCmdNextLine	makeSpecial
+HiLink makeSpecTarget		Statement
+if !exists("make_no_commands")
+HiLink makeCommands		Number
 endif
+HiLink makeImplicit		Function
+HiLink makeTarget		Function
+HiLink makeInclude		Include
+HiLink makePreCondit		PreCondit
+HiLink makeStatement		Statement
+HiLink makeIdent		Identifier
+HiLink makeSpecial		Special
+HiLink makeComment		Comment
+HiLink makeDString		String
+HiLink makeSString		String
+HiLink makeBString		Function
+HiLink makeError		Error
+HiLink makeTodo		Todo
+HiLink makeDefine		Define
+HiLink makeCommandError	Error
+HiLink makeConfig		PreCondit
+delcommand HiLink
 
 let b:current_syntax = "make"
 
-- 
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/make.vim | 42 ++++++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

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

diff --git a/runtime/syntax/make.vim b/runtime/syntax/make.vim
index f022a4e9ac..7072bab988 100644
--- a/runtime/syntax/make.vim
+++ b/runtime/syntax/make.vim
@@ -99,31 +99,29 @@ syn sync match makeCommandSync groupthere makeCommands "^[A-Za-z0-9_./$()%-][A-Z
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink makeNextLine		makeSpecial
-HiLink makeCmdNextLine	makeSpecial
-HiLink makeSpecTarget		Statement
+hi def link makeNextLine		makeSpecial
+hi def link makeCmdNextLine	makeSpecial
+hi def link makeSpecTarget		Statement
 if !exists("make_no_commands")
-HiLink makeCommands		Number
+hi def link makeCommands		Number
 endif
-HiLink makeImplicit		Function
-HiLink makeTarget		Function
-HiLink makeInclude		Include
-HiLink makePreCondit		PreCondit
-HiLink makeStatement		Statement
-HiLink makeIdent		Identifier
-HiLink makeSpecial		Special
-HiLink makeComment		Comment
-HiLink makeDString		String
-HiLink makeSString		String
-HiLink makeBString		Function
-HiLink makeError		Error
-HiLink makeTodo		Todo
-HiLink makeDefine		Define
-HiLink makeCommandError	Error
-HiLink makeConfig		PreCondit
-delcommand HiLink
+hi def link makeImplicit		Function
+hi def link makeTarget		Function
+hi def link makeInclude		Include
+hi def link makePreCondit		PreCondit
+hi def link makeStatement		Statement
+hi def link makeIdent		Identifier
+hi def link makeSpecial		Special
+hi def link makeComment		Comment
+hi def link makeDString		String
+hi def link makeSString		String
+hi def link makeBString		Function
+hi def link makeError		Error
+hi def link makeTodo		Todo
+hi def link makeDefine		Define
+hi def link makeCommandError	Error
+hi def link makeConfig		PreCondit
 
 let b:current_syntax = "make"
 
-- 
cgit