Karsten Hopp e7082c
To: vim_dev@googlegroups.com
Karsten Hopp e7082c
Subject: Patch 7.4.859
Karsten Hopp e7082c
Fcc: outbox
Karsten Hopp e7082c
From: Bram Moolenaar <Bram@moolenaar.net>
Karsten Hopp e7082c
Mime-Version: 1.0
Karsten Hopp e7082c
Content-Type: text/plain; charset=UTF-8
Karsten Hopp e7082c
Content-Transfer-Encoding: 8bit
Karsten Hopp e7082c
------------
Karsten Hopp e7082c
Karsten Hopp e7082c
Patch 7.4.859
Karsten Hopp e7082c
Problem:    Vim doesn't recognize all htmldjango files.
Karsten Hopp e7082c
Solution:   Recognize a comment. (Daniel Hahler, PR #410)
Karsten Hopp e7082c
Files:      runtime/filetype.vim
Karsten Hopp e7082c
Karsten Hopp e7082c
Karsten Hopp e7082c
*** ../vim-7.4.858/runtime/filetype.vim	2013-08-03 17:50:05.000000000 +0200
Karsten Hopp e7082c
--- runtime/filetype.vim	2015-09-08 19:08:38.039364393 +0200
Karsten Hopp e7082c
***************
Karsten Hopp e7082c
*** 843,849 ****
Karsten Hopp e7082c
        setf xhtml
Karsten Hopp e7082c
        return
Karsten Hopp e7082c
      endif
Karsten Hopp e7082c
!     if getline(n) =~ '{%\s*\(extends\|block\)\>'
Karsten Hopp e7082c
        setf htmldjango
Karsten Hopp e7082c
        return
Karsten Hopp e7082c
      endif
Karsten Hopp e7082c
--- 872,878 ----
Karsten Hopp e7082c
        setf xhtml
Karsten Hopp e7082c
        return
Karsten Hopp e7082c
      endif
Karsten Hopp e7082c
!     if getline(n) =~ '{%\s*\(extends\|block\|load\)\>\|{#\s\+'
Karsten Hopp e7082c
        setf htmldjango
Karsten Hopp e7082c
        return
Karsten Hopp e7082c
      endif
Karsten Hopp e7082c
*** ../vim-7.4.858/src/version.c	2015-09-08 18:46:04.349233550 +0200
Karsten Hopp e7082c
--- src/version.c	2015-09-08 19:07:39.943960712 +0200
Karsten Hopp e7082c
***************
Karsten Hopp e7082c
*** 743,744 ****
Karsten Hopp e7082c
--- 743,746 ----
Karsten Hopp e7082c
  {   /* Add new patch number below this line */
Karsten Hopp e7082c
+ /**/
Karsten Hopp e7082c
+     859,
Karsten Hopp e7082c
  /**/
Karsten Hopp e7082c
Karsten Hopp e7082c
-- 
Karsten Hopp e7082c
LARGE MAN:   Who's that then?
Karsten Hopp e7082c
CART DRIVER: (Grudgingly) I dunno, Must be a king.
Karsten Hopp e7082c
LARGE MAN:   Why?
Karsten Hopp e7082c
CART DRIVER: He hasn't got shit all over him.
Karsten Hopp e7082c
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
Karsten Hopp e7082c
Karsten Hopp e7082c
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
Karsten Hopp e7082c
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
Karsten Hopp e7082c
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
Karsten Hopp e7082c
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///