[SCM] Vim packaging branch, debian, updated. upstream/7.2.148-1040-ge94f7e2

[James Vega]

The following commit has been merged in the debian branch:
commit e94f7e23709603be0f601deda0d619ddf76094b0
Merge: 2c61e9aec3d1661e7fe6fef9f7be668bcdb3d8e8 aa2acc4452f3f12878994047920925a52928108a
Author: James Vega <jamessan at debian.org>
Date:   Tue Jun 16 23:40:29 2009 -0400

    Merge branch 'upstream-runtime' into debian

diff --combined runtime/filetype.vim
index 31c98dc,49bc5f8..7036cc6
--- 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:	2008 Dec 14
+ " Last Change:	2009 Jun 13
  
  " Listen very carefully, I will say this only once
  if exists("did_load_filetypes")
@@@ -110,8 -110,8 +110,8 @@@ au BufNewFile,BufRead build.xml			setf 
  au BufNewFile,BufRead proftpd.conf*		call s:StarSetf('apachestyle')
  
  " Apache config file
- au BufNewFile,BufRead .htaccess			 setf apache
- au BufNewFile,BufRead httpd.conf*,srm.conf*,access.conf*,apache.conf*,apache2.conf*,/etc/apache2/*.conf* call s:StarSetf('apache')
+ au BufNewFile,BufRead .htaccess,/etc/httpd/*.conf		 setf apache
+ au BufNewFile,BufRead httpd.conf*,srm.conf*,access.conf*,apache.conf*,apache2.conf*,/etc/apache2/*.conf*,/etc/httpd/conf.d/*.conf* call s:StarSetf('apache')
  
  " XA65 MOS6510 cross assembler
  au BufNewFile,BufRead *.a65			setf a65
@@@ -899,7 -899,7 +899,7 @@@ au BufNewFile,BufRead *.java,*.jav		set
  au BufNewFile,BufRead *.jj,*.jjt		setf javacc
  
  " JavaScript, ECMAScript
- au BufNewFile,BufRead *.js,*.javascript,*.es	setf javascript
+ au BufNewFile,BufRead *.js,*.javascript,*.es,*.jsx	setf javascript
  
  " Java Server Pages
  au BufNewFile,BufRead *.jsp			setf jsp
@@@ -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
  
@@@ -1694,7 -1691,15 +1694,15 @@@ func! SetFileTypeSH(name
    if expand("<amatch>") =~ g:ft_ignore_pat
      return
    endif
-   if a:name =~ '\<ksh\>'
+   if a:name =~ '\<csh\>'
+     " Some .sh scripts contain #!/bin/csh.
+     call SetFileTypeShell("csh")
+     return
+   elseif a:name =~ '\<tcsh\>'
+     " Some .sh scripts contain #!/bin/tcsh.
+     call SetFileTypeShell("tcsh")
+     return
+   elseif a:name =~ '\<ksh\>'
      let b:is_kornshell = 1
      if exists("b:is_bash")
        unlet b:is_bash
@@@ -1832,10 -1837,15 +1840,15 @@@ au BufNewFile,BufRead *.rules			call s:
  
  let s:ft_rules_udev_rules_pattern = '^\s*\cudev_rules\s*=\s*"\([^"]\{-1,}\)/*".*'
  func! s:FTRules()
-   if expand('<amatch>:p') =~ '^/etc/udev/\%(rules\.d/\)\=.*\.rules$'
+   let path = expand('<amatch>:p')
+   if path =~ '^/etc/udev/\%(rules\.d/\)\=.*\.rules$'
      setf udevrules
      return
    endif
+   if path =~ '^/etc/ufw/'
+     setf conf  " Better than hog
+     return
+   endif
    try
      let config_lines = readfile('/etc/udev/udev.conf')
    catch /^Vim\%((\a\+)\)\=:E484/
@@@ -1918,6 -1928,9 +1931,9 @@@ au BufNewFile,BufRead *.cm			setf vosc
  " Sysctl
  au BufNewFile,BufRead /etc/sysctl.conf		setf sysctl
  
+ " Synopsys Design Constraints
+ au BufNewFile,BufRead *.sdc			setf sdc
+ 
  " Sudoers
  au BufNewFile,BufRead /etc/sudoers,sudoers.tmp	setf sudoers
  

-- 
Vim packaging