Merge pull request pallets#33 from razamatan/master

jinja.vim subsumes htmljinja.vim

ext/Vim/jinja.vim

@@ -12,13 +12,31 @@
 "
 "     2008 May 9:     Added support for Jinja2 changes (new keyword rules)
 
+" .vimrc variable to disable html highlighting
+if !exists('g:jinja_syntax_html')
+   let g:jinja_syntax_html=1
+endif
+
 " 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")
+if !exists("main_syntax")
+  if version < 600
+    syntax clear
+  elseif exists("b:current_syntax")
   finish
 endif
+  let main_syntax = 'jinja'
+endif
+
+" Pull in the HTML syntax.
+if g:jinja_syntax_html
+  if version < 600
+    so <sfile>:p:h/html.vim
+  else
+    runtime! syntax/html.vim
+    unlet b:current_syntax
+  endif
+endif
 
 syntax case match
 
@@ -111,3 +129,7 @@ if version >= 508 || !exists("did_jinja_syn_inits")
 endif
 
 let b:current_syntax = "jinja"
+
+if main_syntax == 'jinja'
+  unlet main_syntax
+endif