diff options
Diffstat (limited to 'runtime/syntax/django.vim')
-rw-r--r-- | runtime/syntax/django.vim | 43 |
1 files changed, 16 insertions, 27 deletions
diff --git a/runtime/syntax/django.vim b/runtime/syntax/django.vim index da315ac30..a7104d37e 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" |