# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1441732504 -7200
# Node ID 66137191901a980105d408717e782084ae9b8024
# Parent  503f4e8f86c44ce213db19294cd8b4e4c2bdf782
commit https://github.com/vim/vim/commit/d8986fd91494642b3bab305406aa55268498f49c
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue Sep 8 19:10:55 2015 +0200

    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
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    859,
+/**/
     858,
 /**/
     857,