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 6bdedfdc991ced0e54e8e7f0572b36585e407df6..923df6e2a6c19bfb25e136f5a8539c93ca5f0fd3 100644 (file)
--- 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 0e2e51e2edd218ba28bc0c5e354440abbcb08088..c1d51e045696c6f4b573fc2329f263475c3b5046 100644 (file)
--- 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,
 /**/