diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2017-04-29 01:41:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-29 01:41:29 +0200 |
commit | 9f6d693e263b617cd1a1772e42911cd5a0b1675b (patch) | |
tree | 593d3c9d968be92bc1ed8a445e6856079ef546ed /runtime/syntax/htmldjango.vim | |
parent | 59be0b42806c39131f76f89c554f0a24e82514a8 (diff) | |
parent | 53419673154a98b705cfa80590099a247cc9df49 (diff) | |
download | rneovim-9f6d693e263b617cd1a1772e42911cd5a0b1675b.tar.gz rneovim-9f6d693e263b617cd1a1772e42911cd5a0b1675b.tar.bz2 rneovim-9f6d693e263b617cd1a1772e42911cd5a0b1675b.zip |
Merge #6613 from justinmk/vim-patches
Diffstat (limited to 'runtime/syntax/htmldjango.vim')
-rw-r--r-- | runtime/syntax/htmldjango.vim | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/runtime/syntax/htmldjango.vim b/runtime/syntax/htmldjango.vim index 58afd1b62d..07b1c375e8 100644 --- a/runtime/syntax/htmldjango.vim +++ b/runtime/syntax/htmldjango.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 @@ -15,14 +12,9 @@ if !exists("main_syntax") let main_syntax = 'html' endif -if version < 600 - so <sfile>:p:h/django.vim - so <sfile>:p:h/html.vim -else - runtime! syntax/django.vim - runtime! syntax/html.vim - unlet b:current_syntax -endif +runtime! syntax/django.vim +runtime! syntax/html.vim +unlet b:current_syntax syn cluster djangoBlocks add=djangoTagBlock,djangoVarBlock,djangoComment,djangoComBlock |