updated for version 7.2-310

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index a8e6261e91a10e19f8dcaae395b671d34b759b31..c34510edb0450d3a13b3eef2b0b3bb4f3a193cbb 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -2400,6 +2400,12 @@ au BufNewFile,BufRead /etc/xinetd.d/*            call s:StarSetf('xinetd')
 au BufNewFile,BufRead zsh*,zlog*               call s:StarSetf('zsh')
 
 
+
+" Use the filetype detect plugins.  They may overrule any of the previously
+" detected filetypes.
+runtime! ftdetect/*.vim
+
+
 " Generic configuration file (check this last, it's just guessing!)
 au BufNewFile,BufRead,StdinReadPost *
        \ if !did_filetype() && expand("<amatch>") !~ g:ft_ignore_pat
@@ -2408,10 +2414,6 @@ au BufNewFile,BufRead,StdinReadPost *
        \   setf conf |
        \ endif
 
-" Use the plugin-filetype checks last, they may overrule any of the previously
-" detected filetypes.
-runtime! ftdetect/*.vim
-
 augroup END
 
 

diff --git a/src/version.c b/src/version.c
index 72f84c54ecde987a23871512b2600c115acf0eab..6ae83a421b3dd1a0ba7abc8798b7e9aad8d48581 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -681,6 +681,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    310,
 /**/
     309,
 /**/