# HG changeset patch
# User vimboss
# Date 1259752118 0
# Node ID 82885ffcad10aaf6d11170dc45d2721ee222c37c
# Parent  b99303b1483f26763f0c4b6c9d244763ad32d476
updated for version 7.2-310

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -2400,6 +2400,12 @@ au BufNewFile,BufRead /etc/xinetd.d/*		c
 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
--- a/src/version.c
+++ b/src/version.c
@@ -682,6 +682,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    310,
+/**/
     309,
 /**/
     308,