updated for version 7.3.430

Problem:    When a custom filetype detection uses "augroup END" the conf
            fileytpe detection does not have the filetypedetect group.
Solution:   Always end the group and include filetypedetect in the conf
            autocommand. (Lech Lorens)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 26a435b4807f6a10397bfc2af1c6b232658d092f..a3ae34a4dd05a04e0f2eb40d43862c34ac0abfc6 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -2545,17 +2545,19 @@ au BufNewFile,BufRead *.txt,*.text              setf text
 " detected filetypes.
 runtime! ftdetect/*.vim
 
+" NOTE: The above command could have ended the filetypedetect autocmd group
+" and started another one. Let's make sure it has ended to get to a consistant
+" state.
+augroup END
 
 " Generic configuration file (check this last, it's just guessing!)
-au BufNewFile,BufRead,StdinReadPost *
+au filetypedetect BufNewFile,BufRead,StdinReadPost *
        \ if !did_filetype() && expand("<amatch>") !~ g:ft_ignore_pat
        \    && (getline(1) =~ '^#' || getline(2) =~ '^#' || getline(3) =~ '^#'
        \       || getline(4) =~ '^#' || getline(5) =~ '^#') |
        \   setf conf |
        \ endif
 
-augroup END
-
 
 " If the GUI is already running, may still need to install the Syntax menu.
 " Don't do it when the 'M' flag is included in 'guioptions'.

diff --git a/src/version.c b/src/version.c
index 03bdab2627e2466922c142347206c7b9b20c8ac3..88bb6e0aee62a9871067fdca485ca9e64a52e4d8 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    430,
 /**/
     429,
 /**/