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/django.vim | 43 ++++++++++++++++---------------------------
 1 file changed, 16 insertions(+), 27 deletions(-)

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

diff --git a/runtime/syntax/django.vim b/runtime/syntax/django.vim
index da315ac302..a7104d37ec 100644
--- a/runtime/syntax/django.vim
+++ b/runtime/syntax/django.vim
@@ -3,11 +3,8 @@
 " Maintainer:	Dave Hodder <dmh@dmh.org.uk>
 " Last Change:	2014 Jul 13
 
-" 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,29 +65,21 @@ syn region djangoComment start="{%\s*comment\(\s\+.\{-}\)\?%}" end="{%\s*endcomm
 syn region djangoComBlock start="{#" end="#}" contains=djangoTodo
 
 " 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_django_syn_inits")
-  if version < 508
-    let did_django_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 djangoTagBlock PreProc
-  HiLink djangoVarBlock PreProc
-  HiLink djangoStatement Statement
-  HiLink djangoFilter Identifier
-  HiLink djangoArgument Constant
-  HiLink djangoTagError Error
-  HiLink djangoVarError Error
-  HiLink djangoError Error
-  HiLink djangoComment Comment
-  HiLink djangoComBlock Comment
-  HiLink djangoTodo Todo
+HiLink djangoTagBlock PreProc
+HiLink djangoVarBlock PreProc
+HiLink djangoStatement Statement
+HiLink djangoFilter Identifier
+HiLink djangoArgument Constant
+HiLink djangoTagError Error
+HiLink djangoVarError Error
+HiLink djangoError Error
+HiLink djangoComment Comment
+HiLink djangoComBlock Comment
+HiLink djangoTodo Todo
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "django"
-- 
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/django.vim | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

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

diff --git a/runtime/syntax/django.vim b/runtime/syntax/django.vim
index a7104d37ec..d3ca4de0e2 100644
--- a/runtime/syntax/django.vim
+++ b/runtime/syntax/django.vim
@@ -66,20 +66,18 @@ syn region djangoComBlock start="{#" end="#}" contains=djangoTodo
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink djangoTagBlock PreProc
-HiLink djangoVarBlock PreProc
-HiLink djangoStatement Statement
-HiLink djangoFilter Identifier
-HiLink djangoArgument Constant
-HiLink djangoTagError Error
-HiLink djangoVarError Error
-HiLink djangoError Error
-HiLink djangoComment Comment
-HiLink djangoComBlock Comment
-HiLink djangoTodo Todo
+hi def link djangoTagBlock PreProc
+hi def link djangoVarBlock PreProc
+hi def link djangoStatement Statement
+hi def link djangoFilter Identifier
+hi def link djangoArgument Constant
+hi def link djangoTagError Error
+hi def link djangoVarError Error
+hi def link djangoError Error
+hi def link djangoComment Comment
+hi def link djangoComBlock Comment
+hi def link djangoTodo Todo
 
-delcommand HiLink
 
 let b:current_syntax = "django"
-- 
cgit