From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 8 Sep 2015 17:10:55 +0000 (+0200)
Subject: patch 7.4.859
X-Git-Tag: v7.4.859
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d8986fd91494642b3bab305406aa55268498f49c;p=vim

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

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 6bdedfdc9..923df6e2a 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 @@ func! s:FThtml()
       setf xhtml
       return
     endif
-    if getline(n) =~ '{%\s*\(extends\|block\|load\)\>'
+    if getline(n) =~ '{%\s*\(extends\|block\|load\)\>\|{#\s\+'
       setf htmldjango
       return
     endif
diff --git a/src/version.c b/src/version.c
index 0e2e51e2e..c1d51e045 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    859,
 /**/
     858,
 /**/