- updated to 7.1

Changed files:
    021_all_vim-7.0-fstab-bogus-errors.patch -> 1.3
    vim-syntax-fstab.patch -> 1.5
    vim-vimrc.patch -> 1.3

diff --git a/021_all_vim-7.0-fstab-bogus-errors.patch b/021_all_vim-7.0-fstab-bogus-errors.patch
index 525086dadae36f58e7f6a33cdabbf85c0502ef96..62c110b341a0730b8f8d570c691cb27bc957a9a6 100644 (file)
--- a/021_all_vim-7.0-fstab-bogus-errors.patch
+++ b/021_all_vim-7.0-fstab-bogus-errors.patch
@@ -1,19 +1,20 @@
---- vim-7.0/runtime/syntax/fstab.vim~  2006-04-18 15:19:57.000000000 +0200
-+++ vim-7.0/runtime/syntax/fstab.vim   2006-04-18 15:21:28.990442500 +0200
-@@ -23,14 +23,14 @@
+--- vim71/runtime/syntax/fstab.vim~    2007-05-13 10:06:54.941399738 +0200
++++ vim71/runtime/syntax/fstab.vim     2007-05-13 10:16:31.814544999 +0200
+@@ -27,7 +27,7 @@
  
  " Device
  syn cluster fsDeviceCluster contains=fsOperator,fsDeviceKeyword,fsDeviceError
--syn match fsDeviceError /\%([^a-zA-Z0-9_\/#@:]\|^\w\{-}\ze\W\)/ contained
-+syn match fsDeviceError /\%([^a-zA-Z0-9_\/#@\-:]\)/ contained
+-syn match fsDeviceError /\%([^a-zA-Z0-9_\/#@:\.-]\|^\w\{-}\ze\W\)/ contained
++syn match fsDeviceError /\%([^a-zA-Z0-9_\/#@:\.-]\)/ contained
  syn keyword fsDeviceKeyword contained none proc linproc tmpfs devpts sysfs usbfs
  syn keyword fsDeviceKeyword contained LABEL nextgroup=fsDeviceLabel
- syn match fsDeviceLabel contained /=[^ \t]\+/hs=s+1 contains=fsOperator
+ syn keyword fsDeviceKeyword contained UUID nextgroup=fsDeviceUUID
+@@ -37,7 +37,7 @@
  
  " Mount Point
  syn cluster fsMountPointCluster contains=fsMountPointKeyword,fsMountPointError
--syn match fsMountPointError /\%([^ \ta-zA-Z0-9_\/#@]\|\s\+\zs\w\{-}\ze\s\)/ contained
-+syn match fsMountPointError /\%([^ \ta-zA-Z0-9_\/#@\-]\)/ contained
+-syn match fsMountPointError /\%([^ \ta-zA-Z0-9_\/#@\.-]\|\s\+\zs\w\{-}\ze\s\)/ contained
++syn match fsMountPointError /\%([^ \ta-zA-Z0-9_\/#@\.-]\)/ contained
  syn keyword fsMountPointKeyword contained none swap
  
  " Type

diff --git a/vim-syntax-fstab.patch b/vim-syntax-fstab.patch
index 7b712d9ab33f4b28a069ad17b515679bc01fd651..f12431957c2cff771d0d411e966ac44e74040637 100644 (file)
--- a/vim-syntax-fstab.patch
+++ b/vim-syntax-fstab.patch
@@ -1,20 +1,11 @@
---- 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 @@
+--- vim71/runtime/syntax/fstab.vim~    2007-05-13 08:59:42.255604785 +0200
++++ vim71/runtime/syntax/fstab.vim     2007-05-13 10:01:25.786883411 +0200
+@@ -43,7 +43,7 @@
  " Type
  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
+-syn keyword fsTypeKeyword contained adfs ados affs atfs audiofs auto autofs befs bfs cd9660 cfs cifs coda cramfs devfs devpts e2compr efs ext2 ext2fs ext3 fdesc ffs filecore hfs hpfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix msdos ncpfs nfs none ntfs null nwfs overlay ovlfs portal proc procfs ptyfs 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 ados affs atfs audiofs auto autofs befs bfs cd9660 cfs cifs coda cpuset cramfs devfs devpts e2compr efs ext2 ext2fs ext3 fdesc ffs filecore hfs hpfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix msdos ncpfs nfs none ntfs null nwfs overlay ovlfs portal proc procfs ptyfs 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
  " -------
-@@ -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 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

diff --git a/vim-vimrc.patch b/vim-vimrc.patch
index 165e8fe1e778c700576ed1f6067b109095b72a9a..15ff6919e93ab1efc2696311e0cf962c7940c4cb 100644 (file)
--- a/vim-vimrc.patch
+++ b/vim-vimrc.patch
@@ -1,10 +1,9 @@
-diff -urN vim61/runtime/vimrc_example.vim vim61.pld/runtime/vimrc_example.vim
---- vim61/runtime/vimrc_example.vim    Wed Jul 18 21:59:50 2001
-+++ vim61.pld/runtime/vimrc_example.vim        Wed Sep  4 17:36:28 2002
-@@ -73,3 +73,8 @@
-     \ endif
- 
- endif " has("autocmd")
+--- vim71/runtime/vimrc_example.vim~   2007-05-13 08:47:25.040494112 +0200
++++ vim71/runtime/vimrc_example.vim    2007-05-13 08:49:53.405346643 +0200
+@@ -83,3 +83,8 @@
+ " file it was loaded from, thus the changes you made.
+ command DiffOrig vert new | set bt=nofile | r # | 0d_ | diffthis
+               \ | wincmd p | diffthis
 +
 +" ADDED BY PLD.
 +" USE :help colorscheme FOR INFO