- updated to vim 7.0

Changed files:
    vim-apache.patch -> 1.6
    vim-syntax-fstab.patch -> 1.4

diff --git a/vim-apache.patch b/vim-apache.patch
index ced660d85f30071ab606f003de11e9893933fa8e..64ad8ded64cf8ee9e7f2d21eab57a0cd6248f20c 100644 (file)
--- a/vim-apache.patch
+++ b/vim-apache.patch
@@ -1,11 +1,11 @@
---- ./runtime/filetype.vim     2005-12-18 15:58:56.000000000 +0200
-+++ /usr/share/vim/vim64/filetype.vim  2005-12-18 15:03:14.000000000 +0200
-@@ -88,6 +88,8 @@
- au BufNewFile,BufRead proftpd.conf*           setf apachestyle
+--- vim70/runtime/filetype.vim~        2006-05-13 15:24:24.000000000 +0200
++++ vim70/runtime/filetype.vim 2006-05-15 10:02:34.491964500 +0200
+@@ -102,6 +102,8 @@
+ au BufNewFile,BufRead /etc/ftpd/conf.d/*.conf,proftpd*.conf*          call s:StarSetf('apachestyle')
  
  " Apache config file
 +au BufNewFile,BufRead */etc/httpd/*.conf,apache-*.conf,*-apache.conf  let apache_version="2.2" | setf apache
 +au BufNewFile,BufRead */etc/apache/*.conf,apache1-*.conf,*-apache1.conf       let apache_version="1.3" | setf apache
- au BufNewFile,BufRead httpd.conf*,srm.conf*,access.conf*,.htaccess,apache.conf* setf apache
+ 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')
  
- " XA65 MOS6510 cross assembler

diff --git a/vim-syntax-fstab.patch b/vim-syntax-fstab.patch
index 242a53d11781986987ed254046bbccfc87dfd613..7b712d9ab33f4b28a069ad17b515679bc01fd651 100644 (file)
--- a/vim-syntax-fstab.patch
+++ b/vim-syntax-fstab.patch
@@ -1,52 +1,20 @@
---- vim63/runtime/syntax/fstab.vim~    2003-04-30 15:36:32.000000000 +0200
-+++ vim63/runtime/syntax/fstab.vim     2005-08-09 19:09:15.996162056 +0200
-@@ -32,7 +32,7 @@
+--- vim70/runtime/syntax/fstab.vim~    2006-04-16 18:01:27.000000000 +0200
++++ vim70/runtime/syntax/fstab.vim     2006-05-15 10:10:46.774730250 +0200
+@@ -36,7 +36,7 @@
  " Type
- syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeError
- syn match fsTypeError /\s\+\zs\w\+/ contained
--syn keyword fsTypeKeyword contained adfs affs auto autofs cd9660 coda cramfs devfs devpts efs ext2 ext3 fdesc hfs hpfs iso9660 kernfs linprocfs mfs minix msdos ncpfs nfs ntfs nwfs null portal proc procfs qnx4 reiserfs romfs smbfs std sysv swap tmpfs udf ufs umap umsdos union vfat xfs
-+syn keyword fsTypeKeyword contained adfs affs auto autofs cd9660 coda cramfs devfs devpts efs ext2 ext3 fdesc hfs hpfs iso9660 kernfs linprocfs mfs minix msdos ncpfs nfs ntfs nwfs null portal proc procfs qnx4 reiserfs romfs smbfs std sysv swap tmpfs udf ufs umap umsdos union vfat xfs sysfs usbfs cpuset none
+ syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeUnknown
+ syn match fsTypeUnknown /\s\+\zs\w\+/ contained
+-syn keyword fsTypeKeyword contained adfs affs atfs audiofs auto autofs befs bfs cd9660 cfs cifs coda cramfs devfs devpts e2compr efs ext2 ext3 fdesc hfs hpfs iso9660 jffs jffs2 jfs kernfs linprocfs mfs minix msdos ncpfs nfs none none ntfs null nwfs ovlfs portal proc procfs qnx4 reiserfs romfs shm smbfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xfs zisofs
++syn keyword fsTypeKeyword contained adfs affs atfs audiofs auto autofs befs bfs cd9660 cfs cifs coda cpuset cramfs devfs devpts e2compr efs ext2 ext3 fdesc hfs hpfs iso9660 jffs jffs2 jfs kernfs linprocfs mfs minix msdos ncpfs nfs none none ntfs null nwfs ovlfs portal proc procfs qnx4 reiserfs romfs shm smbfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xfs zisofs
  
  " Options
  " -------
-@@ -44,7 +44,7 @@
+@@ -48,7 +48,7 @@
  syn keyword fsOptionsYesNo yes no
  syn cluster fsOptionsCheckCluster contains=fsOptionsExt2Check,fsOptionsFatCheck
  syn keyword fsOptionsSize 512 1024 2048
--syn keyword fsOptionsGeneral async atime auto current defaults dev exec force fstab noatime noauto noclusterr noclusterw nodev noexec nosuid nosymfollow nouser owner ro rdonly rw rq sw xx suid suiddir sync kudzu union update user supermount
-+syn keyword fsOptionsGeneral async atime auto current defaults dev exec force fstab noatime noauto noclusterr noclusterw nodev noexec nosuid nosymfollow nouser owner ro rdonly rw rq sw xx suid suiddir sync kudzu union update user supermount bind tagxid
+-syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devuid dirsync exec force fstab kudzu loop mand move noatime noauto noclusterr noclusterw nodev nodiratime noexec nomand nosuid nosymfollow nouser owner rbind rdonly remount ro rq rw suid suiddir supermount sw sync union update user[s] xx
++syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devuid dirsync exec force fstab kudzu loop mand move noatime noauto noclusterr noclusterw nodev nodiratime noexec nomand nosuid nosymfollow nouser owner rbind rdonly remount ro rq rw suid suiddir supermount sw sync tagxid union update user[s] xx
  syn match fsOptionsGeneral /_netdev/
  
  " Options: adfs
---- vim64/runtime/syntax/fstab.vim     2005-12-04 22:37:13.000000000 +0200
-+++ /tmp/fstab.vim     2005-12-04 22:35:12.000000000 +0200
-@@ -44,7 +44,7 @@
- syn keyword fsOptionsYesNo yes no
- syn cluster fsOptionsCheckCluster contains=fsOptionsExt2Check,fsOptionsFatCheck
- syn keyword fsOptionsSize 512 1024 2048
--syn keyword fsOptionsGeneral async atime auto current defaults dev exec force fstab noatime noauto noclusterr noclusterw nodev noexec nosuid nosymfollow nouser owner ro rdonly rw rq sw xx suid suiddir sync kudzu union update user supermount bind tagxid
-+syn keyword fsOptionsGeneral async atime auto current defaults dev exec force fstab noatime noauto noclusterr noclusterw nodev noexec nosuid nosymfollow nouser owner ro rdonly rw rq sw xx suid suiddir sync kudzu union update user users supermount bind tagxid
- syn match fsOptionsGeneral /_netdev/
- 
- " Options: adfs
-@@ -134,6 +134,10 @@
- syn match fsOptionsUfsType contained /nextstep-cd/
- syn keyword fsOptionsUfsError contained panic lock umount repair
- 
-+" Options: usbfs
-+syn match fsOptionsKeywords contained /devmode=/ nextgroup=fsOptionsNumberOctal
-+syn match fsOptionsKeywords contained /devgid=/ nextgroup=fsOptionsNumber
-+
- " Options: vfat
- syn keyword fsOptionsKeywords contained nonumtail posix utf8
- syn match fsOptionsKeywords contained /shortname=/ nextgroup=fsOptionsVfatShortname
-@@ -143,6 +147,9 @@
- syn match fsOptionsKeywords contained /\%(biosize\|logbufs\|logbsize\|logdev\|rtdev\|sunit\|swidth\)=/ nextgroup=fsOptionsString
- syn keyword fsOptionsKeywords contained dmapi xdsm noalign noatime norecovery osyncisdsync quota usrquota uquoenforce grpquota gquoenforce
- 
-+" Options: swap
-+syn match fsOptionsKeywords contained /pri=/ nextgroup=fsOptionsNumber
-+
- " Frequency / Pass No.
- syn cluster fsFreqPassCluster contains=fsFreqPassNumber,fsFreqPassError
- syn match fsFreqPassError /\s\+\zs\%(\D.*\|\S.*\|\d\+\s\+[^012]\)\ze/ contained