vim-patch:7.4.859 neovim#4238

Problem: Vim doesn't recognize all htmldjango files. Solution: Recognize a comment. (Daniel Hahler, PR neovim#410) vim/vim@d8986fd
mengtanhzc · Feb 17, 2016 · bd7de9d · bd7de9d
1 parent e4e5815
commit bd7de9d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
@@ -868,7 +868,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/nvim/version.c b/src/nvim/version.c
@@ -429,7 +429,7 @@ static int included_patches[] = {
   // 862 NA
   // 861 NA
   // 860 NA
-  // 859,
+  859,
   858,
   // 857,
   856,
-Original file line number
+Diff line change
@@ Expand Up / @@ -429,7 +429,7 @@ static int included_patches[] = { @@
       // 862 NA
       // 861 NA
       // 860 NA
-      // 859,
+,
 ,
       // 857,
 ,
@@ Expand Down @@