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/cabal.vim | 39 ++++++++++++++-------------------------
 1 file changed, 14 insertions(+), 25 deletions(-)

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

diff --git a/runtime/syntax/cabal.vim b/runtime/syntax/cabal.vim
index 4130bac894..0ba2704eba 100644
--- a/runtime/syntax/cabal.vim
+++ b/runtime/syntax/cabal.vim
@@ -18,11 +18,8 @@
 " v1.0: Cabal syntax in vimball format
 "       (thanks to Magnus Therning)
 
-" 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
 
@@ -105,27 +102,19 @@ syn match	cabalStatement	"\ctype"
 syn match	cabalStatement	"\cversion"
 
 " 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_cabal_syn_inits")
-  if version < 508
-    let did_cabal_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 cabalVersion       Number
-  HiLink cabalTruth         Boolean
-  HiLink cabalComment       Comment
-  HiLink cabalStatement     Statement
-  HiLink cabalCategory      Type
-  HiLink cabalFunction      Function
-  HiLink cabalConditional   Conditional
-  HiLink cabalOperator      Operator
-  HiLink cabalCompiler      Constant
-  delcommand HiLink
-endif
+HiLink cabalVersion       Number
+HiLink cabalTruth         Boolean
+HiLink cabalComment       Comment
+HiLink cabalStatement     Statement
+HiLink cabalCategory      Type
+HiLink cabalFunction      Function
+HiLink cabalConditional   Conditional
+HiLink cabalOperator      Operator
+HiLink cabalCompiler      Constant
+delcommand HiLink
 
 let b:current_syntax = "cabal"
 
-- 
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/cabal.vim | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

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

diff --git a/runtime/syntax/cabal.vim b/runtime/syntax/cabal.vim
index 0ba2704eba..6641294a31 100644
--- a/runtime/syntax/cabal.vim
+++ b/runtime/syntax/cabal.vim
@@ -103,18 +103,16 @@ syn match	cabalStatement	"\cversion"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink cabalVersion       Number
-HiLink cabalTruth         Boolean
-HiLink cabalComment       Comment
-HiLink cabalStatement     Statement
-HiLink cabalCategory      Type
-HiLink cabalFunction      Function
-HiLink cabalConditional   Conditional
-HiLink cabalOperator      Operator
-HiLink cabalCompiler      Constant
-delcommand HiLink
+hi def link cabalVersion       Number
+hi def link cabalTruth         Boolean
+hi def link cabalComment       Comment
+hi def link cabalStatement     Statement
+hi def link cabalCategory      Type
+hi def link cabalFunction      Function
+hi def link cabalConditional   Conditional
+hi def link cabalOperator      Operator
+hi def link cabalCompiler      Constant
 
 let b:current_syntax = "cabal"
 
-- 
cgit