[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 20b54ca9e0846a638a4f02dc2a234a8cfb0b56c3
Merge: 1cc771da22a88ce3527c7386e8f4125ae9a67b0b fd764202792b39ab3f0dd499c434038c425e57d3
Author: James Vega <jamessan at debian.org>
Date:   Wed Jan 13 01:00:05 2010 -0500

    Merge branch 'upstream-runtime' into debian

diff --combined runtime/filetype.vim
index ec246f6,5665cc2..3f176f3
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@@ -1,7 -1,7 +1,7 @@@
  " Vim support file to detect file types
  "
  " Maintainer:	Bram Moolenaar <Bram at vim.org>
- " Last Change:	2009 Sep 18
+ " Last Change:	2009 Dec 24
  
  " Listen very carefully, I will say this only once
  if exists("did_load_filetypes")
@@@ -710,9 -710,9 +710,9 @@@ au BufNewFile,BufRead *.mo,*.gdmo		set
  au BufNewFile,BufRead *.ged,lltxxxxx.txt	setf gedcom
  
  " Git
- autocmd BufNewFile,BufRead *.git/COMMIT_EDITMSG    setf gitcommit
- autocmd BufNewFile,BufRead *.git/config,.gitconfig setf gitconfig
- autocmd BufNewFile,BufRead git-rebase-todo         setf gitrebase
+ autocmd BufNewFile,BufRead *.git/COMMIT_EDITMSG setf gitcommit
+ autocmd BufNewFile,BufRead *.git/config,.gitconfig,.gitmodules setf gitconfig
+ autocmd BufNewFile,BufRead git-rebase-todo      setf gitrebase
  autocmd BufNewFile,BufRead .msg.[0-9]*
        \ if getline(1) =~ '^From.*# This line is ignored.$' |
        \   setf gitsendemail |
@@@ -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
  
@@@ -1596,7 -1593,7 +1596,7 @@@ au BufNewFile,BufRead *.builder,*.rxml,
  " Rantfile and Rakefile is like Ruby
  au BufNewFile,BufRead [rR]antfile,*.rant,[rR]akefile,*.rake	setf ruby
  
- " S-lang (or shader language!)
+ " S-lang (or shader language, or SmallLisp)
  au BufNewFile,BufRead *.sl			setf slang
  
  " Samba config

-- 
Vim packaging