From bd7de9dac9183bea61e53758721e523495839142 Mon Sep 17 00:00:00 2001
From: Jurica Bradaric <jbradaric@gmail.com>
Date: Thu, 11 Feb 2016 22:23:07 +0100
Subject: [PATCH] vim-patch:7.4.859 #4238

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

https://github.com/vim/vim/commit/d8986fd91494642b3bab305406aa55268498f49c
---
 runtime/filetype.vim | 2 +-
 src/nvim/version.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index c5b01f0c40..d60ab65ce7 100644
--- 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
index f43755b48d..de936c989a 100644
--- 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,