[SCM] Vim packaging branch, deb/runtime, updated. upstream/7.2b.001-118-ga8807f7

James Vega jamessan at debian.org
Fri Jul 25 14:29:37 UTC 2008


The following commit has been merged in the deb/runtime branch:
commit 3505bd8d77f406548155ee7447fd8363fb6ef93e
Merge: a0d8d9e977411b8d1ef345d05379b3517bd59380 62210d0590c8b88aa5fa115da4c5b542057a72e8
Author: James Vega <jamessan at debian.org>
Date:   Wed Jul 23 20:51:51 2008 -0400

    Merge branch 'upstream-runtime' into deb/runtime

diff --combined runtime/filetype.vim
index e67d429,17f7a80..9fb5722
--- 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 Jul 08
+ " Last Change:	2008 Jul 17
  
  " Listen very carefully, I will say this only once
  if exists("did_load_filetypes")
@@@ -92,9 -92,9 +92,9 @@@ au BufNewFile,BufRead *.wrm			setf aced
  " Ada (83, 9X, 95)
  au BufNewFile,BufRead *.adb,*.ads,*.ada		setf ada
  if has("vms")
-   au BufNewFile,BufRead *.gpr,*.ada_m,*.adc 	setf ada
+   au BufNewFile,BufRead *.gpr,*.ada_m,*.adc	setf ada
  else
-   au BufNewFile,BufRead *.gpr 			setf ada
+   au BufNewFile,BufRead *.gpr			setf ada
  endif
  
  " AHDL
@@@ -291,6 -291,9 +291,9 @@@ endfun
  " Blank
  au BufNewFile,BufRead *.bl			setf blank
  
+ " Blkid cache file
+ au BufNewFile,BufRead /etc/blkid.tab,/etc/blkid.tab.old   setf xml
+ 
  " C or lpc
  au BufNewFile,BufRead *.c			call s:FTlpc()
  
@@@ -739,7 -742,7 +742,7 @@@ au BufNewFile,BufRead *.groovy			setf g
  au BufNewFile,BufRead *.gsp			setf gsp
  
  " Group file
- au BufNewFile,BufRead /etc/group,/etc/group-,/etc/group.edit,/etc/gshadow,/etc/gshadow-,/etc/gshadow.edit,/var/backups/group.bak,/var/backups/gshadow.bak		setf group
+ au BufNewFile,BufRead /etc/group,/etc/group-,/etc/group.edit,/etc/gshadow,/etc/gshadow-,/etc/gshadow.edit,/var/backups/group.bak,/var/backups/gshadow.bak  setf group
  
  " GTK RC
  au BufNewFile,BufRead .gtkrc,gtkrc		setf gtkrc
@@@ -800,6 -803,9 +803,9 @@@ au BufNewFile,BufRead *.tmpl			setf htm
  " Host config
  au BufNewFile,BufRead /etc/host.conf		setf hostconf
  
+ " Hosts access
+ au BufNewFile,BufRead /etc/hosts.allow,/etc/hosts.deny  setf hostsaccess
+ 
  " Hyper Builder
  au BufNewFile,BufRead *.hb			setf hb
  
@@@ -850,7 -856,7 +856,7 @@@ endfun
  
  
  " Indent RC
- au BufNewFile,BufRead indentrc			setf indentrc
+ au BufNewFile,BufRead indentrc			setf indent
  
  " Inform
  au BufNewFile,BufRead *.inf,*.INF		setf inform
@@@ -1564,6 -1570,9 +1570,9 @@@ au BufNewFile,BufRead *.rst			setf rs
  " RTF
  au BufNewFile,BufRead *.rtf			setf rtf
  
+ " Interactive Ruby shell
+ au BufNewFile,BufRead .irbrc,irbrc		setf ruby
+ 
  " Ruby
  au BufNewFile,BufRead *.rb,*.rbw,*.gem,*.gemspec	setf ruby
  
@@@ -1966,7 -1975,7 +1975,7 @@@ func! s:FTtex(
      call cursor(1,1)
      let firstNC = search('^\s*[^[:space:]%]', 'c', 1000)
      if firstNC " Check the next thousand lines for a LaTeX or ConTeXt keyword.
 -      let lpat = 'documentclass\>\|usepackage\>\|begin{\|newcommand\>\|renewcommand\>'
 +      let lpat = 'documentclass\>\|usepackage\>\|begin{\|newcommand\>\|renewcommand\>\|part\>\|chapter\>\|section\>\|subsection\>\|subsubsection\>\|paragraph\>\|subparagraph\>\|subsubparagraph'
        let cpat = 'start\a\+\|setup\a\+\|usemodule\|enablemode\|enableregime\|setvariables\|useencoding\|usesymbols\|stelle\a\+\|verwende\a\+\|stel\a\+\|gebruik\a\+\|usa\a\+\|imposta\a\+\|regle\a\+\|utilisemodule\>'
        let kwline = search('^\s*\\\%(' . lpat . '\)\|^\s*\\\(' . cpat . '\)',
  			      \ 'cnp', firstNC + 1000)

-- 
Vim packaging



More information about the pkg-vim-maintainers mailing list