[SCM] Vim packaging branch, debian, updated. upstream/7.2.130-313-g1baf458
James Vega
jamessan at debian.org
Sat Apr 18 00:48:18 UTC 2009
The following commit has been merged in the debian branch:
commit f776f0c7e168ad03d0c7e5023e30d590a397268e
Merge: eb7d7f291ecc8ce1f0e2e3fcc60944107c1a3485 ab97c3c453c7798f4053ef9986fcff4f377e3097
Author: James Vega <jamessan at debian.org>
Date: Fri Apr 17 17:05:41 2009 -0400
Merge branch 'upstream-runtime' into debian
Conflicts:
runtime/syntax/debchangelog.vim
runtime/syntax/debsources.vim
Signed-off-by: James Vega <jamessan at debian.org>
diff --combined runtime/filetype.vim
index f5b8384,6d30abf..31c98dc
--- 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 Aug 03
+ " Last Change: 2008 Dec 14
" Listen very carefully, I will say this only once
if exists("did_load_filetypes")
@@@ -116,6 -116,9 +116,9 @@@ au BufNewFile,BufRead httpd.conf*,srm.c
" XA65 MOS6510 cross assembler
au BufNewFile,BufRead *.a65 setf a65
+ " Applescript
+ au BufNewFile,BufRead *.scpt setf applescript
+
" Applix ELF
au BufNewFile,BufRead *.am
\ if expand("<afile>") !~? 'Makefile.am\>' | setf elf | endif
@@@ -350,10 -353,9 +353,9 @@@ au BufNewFile,BufRead *.cp
\ if exists("cynlib_syntax_for_cpp")|setf cynlib|else|setf cpp|endif
" C++
+ au BufNewFile,BufRead *.cxx,*.c++,*.hh,*.hxx,*.hpp,*.ipp,*.moc,*.tcc,*.inl setf cpp
if has("fname_case")
- au BufNewFile,BufRead *.cxx,*.c++,*.C,*.H,*.hh,*.hxx,*.hpp,*.moc,*.tcc,*.inl setf cpp
- else
- au BufNewFile,BufRead *.cxx,*.c++,*.hh,*.hxx,*.hpp,*.moc,*.tcc,*.inl setf cpp
+ au BufNewFile,BufRead *.C,*.H setf cpp
endif
" .h files can be C, Ch C++, ObjC or ObjC++.
@@@ -364,9 -366,9 +366,9 @@@ au BufNewFile,BufRead *.h call s:FThe
func! s:FTheader()
if match(getline(1, min([line("$"), 200])), '^@\(interface\|end\|class\)') > -1
setf objc
- elseif exists("c_syntax_for_h")
+ elseif exists("g:c_syntax_for_h")
setf c
- elseif exists("ch_syntax_for_h")
+ elseif exists("g:ch_syntax_for_h")
setf ch
else
setf cpp
@@@ -669,8 -671,9 +671,9 @@@ au BufNewFile,BufRead *.factor setf f
" Fetchmail RC file
au BufNewFile,BufRead .fetchmailrc setf fetchmail
- " FlexWiki
- au BufNewFile,BufRead *.wiki setf flexwiki
+ " FlexWiki - disabled, because it has side effects when a .wiki file
+ " is not actually FlexWiki
+ "au BufNewFile,BufRead *.wiki setf flexwiki
" Focus Executable
au BufNewFile,BufRead *.fex,*.focexec setf focexec
@@@ -704,7 -707,7 +707,7 @@@ au BufNewFile,BufRead .gdbinit setf g
au BufNewFile,BufRead *.mo,*.gdmo setf gdmo
" Gedcom
- au BufNewFile,BufRead *.ged setf gedcom
+ au BufNewFile,BufRead *.ged,lltxxxxx.txt setf gedcom
" Git
autocmd BufNewFile,BufRead *.git/COMMIT_EDITMSG setf gitcommit
@@@ -975,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
@@@ -1046,7 -1046,7 +1049,7 @@@ func! s:FTm(
let n = 1
while n < 10
let line = getline(n)
- if line =~ '^\s*\(#\s*\(include\|import\)\>\|/\*\)'
+ if line =~ '^\s*\(#\s*\(include\|import\)\>\|/\*\|//\)'
setf objc
return
endif
@@@ -1073,6 -1073,9 +1076,9 @@@ au BufNewFile,BufRead *.nb setf mm
" Maya Extension Language
au BufNewFile,BufRead *.mel setf mel
+ " Mercurial config (looks like generic config file)
+ au BufNewFile,BufRead *.hgrc,*hgrc setf cfg
+
" Messages
au BufNewFile,BufRead /var/log/messages,/var/log/messages.*[0-9] setf messages
@@@ -1263,7 -1266,7 +1269,7 @@@ if has("fname_case"
else
au BufNewFile,BufRead *.pl call s:FTpl()
endif
- au BufNewFile,BufRead *.plx setf perl
+ au BufNewFile,BufRead *.plx,*.al setf perl
func! s:FTpl()
if exists("g:filetype_pl")
@@@ -2082,8 -2085,13 +2088,13 @@@ au BufNewFile,BufRead *.vim,*.vba,.exrc
" Viminfo file
au BufNewFile,BufRead .viminfo,_viminfo setf viminfo
- " Virata Config Script File
- au BufRead,BufNewFile *.hw,*.module,*.pkg setf virata
+ " Virata Config Script File or Drupal module
+ au BufRead,BufNewFile *.hw,*.module,*.pkg
+ \ if getline(1) =~ '<?php' |
+ \ setf php |
+ \ else |
+ \ setf virata |
+ \ endif
" Visual Basic (also uses *.bas) or FORM
au BufNewFile,BufRead *.frm call s:FTVB("form")
@@@ -2328,6 -2336,9 +2339,9 @@@ au BufNewFile,BufRead *fvwm2rc
\| let b:fvwm_version = 2 | call s:StarSetf('fvwm')
\|endif
+ " Gedcom
+ au BufNewFile,BufRead /tmp/lltmp* call s:StarSetf('gedcom')
+
" GTK RC
au BufNewFile,BufRead .gtkrc*,gtkrc* call s:StarSetf('gtkrc')
diff --combined runtime/syntax/debchangelog.vim
index b411e1e,802d37d..a2b0b5c
--- a/runtime/syntax/debchangelog.vim
+++ b/runtime/syntax/debchangelog.vim
@@@ -3,7 -3,7 +3,7 @@@
" Maintainer: Debian Vim Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>
" Former Maintainers: Gerfried Fuchs <alfie at ist.org>
" Wichert Akkerman <wakkerma at debian.org>
- " Last Change: 2009-02-16
-" Last Change: 2009 Mar 09
++" Last Change: 2009 Feb 16
" URL: http://git.debian.org/?p=pkg-vim/vim.git;a=blob_plain;f=runtime/syntax/debchangelog.vim;hb=debian
" Standard syntax initialization
diff --combined runtime/syntax/debsources.vim
index 2274539,51a7c1a..7caa4ac
--- a/runtime/syntax/debsources.vim
+++ b/runtime/syntax/debsources.vim
@@@ -2,7 -2,7 +2,7 @@@
" Language: Debian sources.list
" Maintainer: Debian Vim Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>
" Former Maintainer: Matthijs Mohlmann <matthijs at cacholong.nl>
- " Last Change: 2009-04-16
-" Last Change: 2009 Mar 09
++" Last Change: 2009 Apr 16
" URL: http://git.debian.org/?p=pkg-vim/vim.git;a=blob_plain;f=runtime/syntax/debsources.vim;hb=debian
" Standard syntax initialization
@@@ -19,7 -19,7 +19,7 @@@ syn case matc
syn match debsourcesKeyword /\(deb-src\|deb\|main\|contrib\|non-free\|restricted\|universe\|multiverse\)/
" Match comments
-syn match debsourcesComment /#.*/
+syn match debsourcesComment /#.*/ contains=@Spell
" Match uri's
syn match debsourcesUri +\(http://\|ftp://\|[rs]sh://\|debtorrent://\|\(cdrom\|copy\|file\):\)[^' <>"]\++
--
Vim packaging
More information about the pkg-vim-maintainers
mailing list