From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 2 Dec 2009 11:08:38 +0000 (+0000)
Subject: updated for version 7.2-310
X-Git-Tag: v7.2.310
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=43b36a3bc6a32d5094844be0f06a4d40d89749bb;p=vim

updated for version 7.2-310
---

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index a8e6261e9..c34510edb 100644
--- 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 72f84c54e..6ae83a421 100644
--- 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,
 /**/