[SCM] Vim packaging branch, debian, updated. upstream/7.2.245-1036-g31ec817

[James Vega]

The following commit has been merged in the debian branch:
commit 31ec81785334ddd9235cd79f161145e5922146b3
Merge: 87f3b00f6c8c826933aba155149c5743b8110956 60cbb45b25ad6986251ab04424623b0992e85dcf
Author: James Vega <jamessan at debian.org>
Date:   Wed Oct 28 23:17:54 2009 -0400

    Merge branch 'upstream-runtime' into debian
    
    Conflicts:
    	runtime/syntax/debchangelog.vim
    	runtime/syntax/debcontrol.vim
    	runtime/syntax/debsources.vim
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --combined runtime/filetype.vim
index b89a34a,576f20c..4258271
--- 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 Jul 09
+ " Last Change:	2009 Sep 18
  
  " Listen very carefully, I will say this only once
  if exists("did_load_filetypes")
@@@ -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
  
@@@ -1561,6 -1558,7 +1561,7 @@@ endfun
  
  " Remind
  au BufNewFile,BufRead .reminders*		call s:StarSetf('remind')
+ au BufNewFile,BufRead *.remind,*.rem		setf remind
  
  " Resolv.conf
  au BufNewFile,BufRead resolv.conf		setf resolv

-- 
Vim packaging