commit d8986fd91494642b3bab305406aa55268498f49c
author Bram Moolenaar <Bram@vim.org> Tue Sep 08 19:10:55 2015 +0200
committer Bram Moolenaar <Bram@vim.org> Tue Sep 08 19:10:55 2015 +0200
tree 2c40f287bc864aa2e39297fd060c8fc7ee690bdd
parent aa23b379421aa214e6543b06c974594a25799b09

patch 7.4.859
Problem:    Vim doesn't recognize all htmldjango files.
Solution:   Recognize a comment. (Daniel Hahler, PR #410)

runtime/filetype.vim

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 6bdedfd..923df6e 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2015 Aug 11
+" Last Change:	2015 Sep 08
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -872,7 +872,7 @@
       setf xhtml
       return
     endif
-    if getline(n) =~ '{%\s*\(extends\|block\|load\)\>'
+    if getline(n) =~ '{%\s*\(extends\|block\|load\)\>\|{#\s\+'
       setf htmldjango
       return
     endif

src/version.c

diff --git a/src/version.c b/src/version.c
index 0e2e51e..c1d51e0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    859,
+/**/
     858,
 /**/
     857,