[SCM] Vim packaging branch, debian, updated. upstream/7.2.284-1068-g20b54ca

[James Vega]

The following commit has been merged in the debian branch:
commit 1cc771da22a88ce3527c7386e8f4125ae9a67b0b
Merge: 34a85b652e7ddf4467f70797843f1f561fabf075 4c6f903dadab102c500a8acac0fde3e22ff08fed
Author: James Vega <jamessan at debian.org>
Date:   Wed Jan 13 00:58:02 2010 -0500

    Merge branch 'upstream-runtime' into debian

diff --combined runtime/filetype.vim
index 4258271,21f7d87..ec246f6
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@@ -978,9 -978,6 +978,9 @@@ au BufNewFile,BufRead *.lite,*.lt		set
  " LiteStep RC files
  au BufNewFile,BufRead */LiteStep/*/*.rc		setf litestep
  
 +" Logcheck files
 +au BufNewFile,BufRead /etc/logcheck/*.d/*	setf logcheck
 +
  " Login access
  au BufNewFile,BufRead /etc/login.access		setf loginaccess
  
@@@ -2438,6 -2435,12 +2438,12 @@@ au BufNewFile,BufRead /etc/xinetd.d/*		
  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
@@@ -2446,10 -2449,6 +2452,6 @@@
  	\   setf conf |
  	\ endif
  
- " Use the plugin-filetype checks last, they may overrule any of the previously
- " detected filetypes.
- runtime! ftdetect/*.vim
- 
  augroup END
  
  

-- 
Vim packaging