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/hex.vim | 51 ++++++++++++++++++++------------------------------
 1 file changed, 20 insertions(+), 31 deletions(-)

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

diff --git a/runtime/syntax/hex.vim b/runtime/syntax/hex.vim
index 40f7f0dd10..d2637eaaea 100644
--- a/runtime/syntax/hex.vim
+++ b/runtime/syntax/hex.vim
@@ -25,11 +25,8 @@
 " States in parentheses in the upper format description indicate that they
 " should not appear in a valid file.
 
-" 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
 
@@ -68,34 +65,26 @@ syn match hexChecksum "[0-9a-fA-F]\{2}$" contained
 syn region hexExtAdrBlock start="^:[0-9a-fA-F]\{7}[24]" skip="^:[0-9a-fA-F]\{7}0" end="^:"me=s-1 fold transparent
 
 " 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_hex_syntax_inits")
-  if version < 508
-    let did_hex_syntax_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>
 
-  " The default methods for highlighting. Can be overridden later
-  HiLink hexRecStart            hexRecType
-  HiLink hexDataByteCount       Constant
-  hi def hexAddressFieldUnknown term=italic cterm=italic gui=italic
-  HiLink hexDataAddress         Comment
-  HiLink hexNoAddress           DiffAdd
-  HiLink hexRecTypeUnknown      hexRecType
-  HiLink hexRecType             WarningMsg
-  hi def hexDataFieldUnknown    term=italic cterm=italic gui=italic
-  hi def hexDataOdd             term=bold cterm=bold gui=bold
-  hi def hexDataEven            term=NONE cterm=NONE gui=NONE
-  HiLink hexDataUnexpected      Error
-  HiLink hexExtendedAddress     hexDataAddress
-  HiLink hexStartAddress        hexDataAddress
-  HiLink hexChecksum            DiffChange
+" The default methods for highlighting. Can be overridden later
+HiLink hexRecStart            hexRecType
+HiLink hexDataByteCount       Constant
+hi def hexAddressFieldUnknown term=italic cterm=italic gui=italic
+HiLink hexDataAddress         Comment
+HiLink hexNoAddress           DiffAdd
+HiLink hexRecTypeUnknown      hexRecType
+HiLink hexRecType             WarningMsg
+hi def hexDataFieldUnknown    term=italic cterm=italic gui=italic
+hi def hexDataOdd             term=bold cterm=bold gui=bold
+hi def hexDataEven            term=NONE cterm=NONE gui=NONE
+HiLink hexDataUnexpected      Error
+HiLink hexExtendedAddress     hexDataAddress
+HiLink hexStartAddress        hexDataAddress
+HiLink hexChecksum            DiffChange
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "hex"
 
-- 
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/hex.vim | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

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

diff --git a/runtime/syntax/hex.vim b/runtime/syntax/hex.vim
index d2637eaaea..35edf08e9f 100644
--- a/runtime/syntax/hex.vim
+++ b/runtime/syntax/hex.vim
@@ -66,25 +66,23 @@ syn region hexExtAdrBlock start="^:[0-9a-fA-F]\{7}[24]" skip="^:[0-9a-fA-F]\{7}0
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting. Can be overridden later
-HiLink hexRecStart            hexRecType
-HiLink hexDataByteCount       Constant
+hi def link hexRecStart            hexRecType
+hi def link hexDataByteCount       Constant
 hi def hexAddressFieldUnknown term=italic cterm=italic gui=italic
-HiLink hexDataAddress         Comment
-HiLink hexNoAddress           DiffAdd
-HiLink hexRecTypeUnknown      hexRecType
-HiLink hexRecType             WarningMsg
+hi def link hexDataAddress         Comment
+hi def link hexNoAddress           DiffAdd
+hi def link hexRecTypeUnknown      hexRecType
+hi def link hexRecType             WarningMsg
 hi def hexDataFieldUnknown    term=italic cterm=italic gui=italic
 hi def hexDataOdd             term=bold cterm=bold gui=bold
 hi def hexDataEven            term=NONE cterm=NONE gui=NONE
-HiLink hexDataUnexpected      Error
-HiLink hexExtendedAddress     hexDataAddress
-HiLink hexStartAddress        hexDataAddress
-HiLink hexChecksum            DiffChange
+hi def link hexDataUnexpected      Error
+hi def link hexExtendedAddress     hexDataAddress
+hi def link hexStartAddress        hexDataAddress
+hi def link hexChecksum            DiffChange
 
-delcommand HiLink
 
 let b:current_syntax = "hex"
 
-- 
cgit