r1157 - in /trunk/packages/vim: debian/changelog patches/fstab.vim-syntax.diff patches/pushed-upstream.txt

jamessan at users.alioth.debian.org jamessan at users.alioth.debian.org
Wed Jan 16 15:24:52 UTC 2008 

Author: jamessan
Date: Wed Jan 16 15:24:51 2008
New Revision: 1157

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1157
Log:
* Updated patches:
  - fstab.vim-syntax.diff:
    + Added more sshfs support based on feedback from upstream.

Modified:
    trunk/packages/vim/debian/changelog
    trunk/packages/vim/patches/fstab.vim-syntax.diff
    trunk/packages/vim/patches/pushed-upstream.txt

Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=1157&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Wed Jan 16 15:24:51 2008
@@ -29,8 +29,11 @@
     - filetype.vim-udev.d.diff:
       + Detect /etc/udev.d/*.rules files as 'udevrules' instead of 'hog'
         filetype.  (Closes: #437434)
-
- -- James Vega <jamessan at debian.org>  Tue, 15 Jan 2008 02:31:56 -0500
+  * Updated patches:
+    - fstab.vim-syntax.diff:
+      + Added more sshfs support based on feedback from upstream.
+
+ -- James Vega <jamessan at debian.org>  Wed, 16 Jan 2008 10:23:09 -0500
 
 vim (1:7.1-175+2) unstable; urgency=low
 

Modified: trunk/packages/vim/patches/fstab.vim-syntax.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/fstab.vim-syntax.diff?rev=1157&op=diff
==============================================================================
--- trunk/packages/vim/patches/fstab.vim-syntax.diff (original)
+++ trunk/packages/vim/patches/fstab.vim-syntax.diff Wed Jan 16 15:24:51 2008
@@ -2,7 +2,24 @@
 ===================================================================
 --- vim/runtime/syntax/fstab.vim.orig
 +++ vim/runtime/syntax/fstab.vim
-@@ -23,7 +23,7 @@
+@@ -2,13 +2,14 @@
+ " Language: fstab file
+ " Maintaner: Radu Dineiu <radu.dineiu at gmail.com>
+ " URL: http://ld.yi.org/vim/fstab.vim
+-" Last Change: 2007 Apr 24
+-" Version: 0.91
++" Last Change: 2008 Jan 15
++" Version: 0.92
+ "
+ " Credits:
+ "   David Necas (Yeti) <yeti at physics.muni.cz>
+ "   Stefano Zacchiroli <zack at debian.org>
+ "   Georgi Georgiev <chutz at gg3.net>
++"   James Vega <jamessan at debian.org>
+ "
+ " Options:
+ "   let fstab_unknown_fs_errors = 1
+@@ -23,7 +24,7 @@
  " General
  syn cluster fsGeneralCluster contains=fsComment
  syn match fsComment /\s*#.*/
@@ -11,7 +28,7 @@
  
  " Device
  syn cluster fsDeviceCluster contains=fsOperator,fsDeviceKeyword,fsDeviceError
-@@ -31,9 +31,11 @@
+@@ -31,9 +32,11 @@
  syn keyword fsDeviceKeyword contained none proc linproc tmpfs devpts sysfs usbfs
  syn keyword fsDeviceKeyword contained LABEL nextgroup=fsDeviceLabel
  syn keyword fsDeviceKeyword contained UUID nextgroup=fsDeviceUUID
@@ -23,7 +40,7 @@
  
  " Mount Point
  syn cluster fsMountPointCluster contains=fsMountPointKeyword,fsMountPointError
-@@ -43,7 +45,7 @@
+@@ -43,7 +46,7 @@
  " Type
  syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeUnknown
  syn match fsTypeUnknown /\s\+\zs\w\+/ contained
@@ -32,21 +49,22 @@
  
  " Options
  " -------
-@@ -143,6 +145,13 @@
+@@ -143,6 +146,14 @@
  syn keyword fsOptionsReiserHash contained rupasov tea r5 detect
  syn keyword fsOptionsKeywords contained hashed_relocation noborder nolog notail no_unhashed_relocation replayonly
  
 +" Options: sshfs
-+syn match fsOptionsKeywords contained /\<\%(BatchMode\|ChallengeResponseAuthentication\|CheckHostIP\|ClearAllForwardings\|Compression\|EnableSSHKeysign\|ForwardAgent\|ForwardX11\|ForwardX11Trusted\|GatewayPorts\|GSSAPIAuthentication\|GSSAPIDelegateCredentials\|HashKnownHosts\|HostbasedAuthentication\|IdentitiesOnly\|NoHostAuthenticationForLocalhost\|PasswordAuthentication\|PubkeyAuthentication\|RhostsRSAAuthentication\|RSAAuthentication\|TCPKeepAlive\|UsePrivilegedPort\)=/ nextgroup=fsOptionsYesNo
++syn match fsOptionsKeywords contained /\<\%(BatchMode\|ChallengeResponseAuthentication\|CheckHostIP\|ClearAllForwardings\|Compression\|EnableSSHKeysign\|ForwardAgent\|ForwardX11\|ForwardX11Trusted\|GatewayPorts\|GSSAPIAuthentication\|GSSAPIDelegateCredentials\|HashKnownHosts\|HostbasedAuthentication\|IdentitiesOnly\|NoHostAuthenticationForLocalhost\|PasswordAuthentication\|PubkeyAuthentication\|RhostsRSAAuthentication\|RSAAuthentication\|TCPKeepAlive\|UsePrivilegedPort\|cache\)=/ nextgroup=fsOptionsYesNo
 +syn match fsOptionsKeywords contained /\<\%(ControlMaster\|StrictHostKeyChecking\|VerifyHostKeyDNS\)=/ nextgroup=fsOptionsSshYesNoAsk
-+syn match fsOptionsKeywords contained /\<\%(AddressFamily\|BindAddress\|Cipher\|Ciphers\|ControlPath\|DynamicForward\|EscapeChar\|GlobalKnownHostsFile\|HostKeyAlgorithms\|HostKeyAlias\|HostName\|IdentityFile\|KbdInteractiveDevices\|LocalForward\|LogLevel\|MACs\|PreferredAuthentications\|Protocol\|ProxyCommand\|RemoteForward\|RhostsAuthentication\|SendEnv\|SmartcardDevice\|User\|UserKnownHostsFile\|XAuthLocation\)=/ nextgroup=fsOptionsString
-+syn match fsOptionsKeywords contained /\<\%(CompressionLevel\|ConnectionAttempts\|ConnectTimeout\|NumberOfPasswordPrompts\|Port\|ServerAliveCountMax\|ServerAliveInterval\)=/ nextgroup=fsOptionsNumber
++syn match fsOptionsKeywords contained /\<\%(AddressFamily\|BindAddress\|Cipher\|Ciphers\|ControlPath\|DynamicForward\|EscapeChar\|GlobalKnownHostsFile\|HostKeyAlgorithms\|HostKeyAlias\|HostName\|IdentityFile\|KbdInteractiveDevices\|LocalForward\|LogLevel\|MACs\|PreferredAuthentications\|Protocol\|ProxyCommand\|RemoteForward\|RhostsAuthentication\|SendEnv\|SmartcardDevice\|User\|UserKnownHostsFile\|XAuthLocation\|comment\|workaround\|idmap\|ssh_command\|sftp_server\|fsname\)=/ nextgroup=fsOptionsString
++syn match fsOptionsKeywords contained /\<\%(CompressionLevel\|ConnectionAttempts\|ConnectTimeout\|NumberOfPasswordPrompts\|Port\|ServerAliveCountMax\|ServerAliveInterval\|cache_timeout\|cache_X_timeout\|ssh_protocol\|directport\|max_read\|umask\|uid\|gid\|entry_timeout\|negative_timeout\|attr_timeout\)=/ nextgroup=fsOptionsNumber
++syn keyword fsOptionsKeywords contained reconnect sshfs_sync no_readahead sshfs_debug transform_symlinks allow_other allow_root nonempty default_permissions large_read hard_remove use_ino readdir_ino direct_io kernel_cache
 +syn keyword fsOptionsSshYesNoAsk contained yes no ask
 +
  " Options: subfs
  syn match fsOptionsKeywords contained /\<fs=/ nextgroup=fsOptionsString
  syn keyword fsOptionsKeywords contained procuid
-@@ -208,6 +217,7 @@
+@@ -208,11 +219,13 @@
  	HiLink fsDeviceKeyword Identifier
  	HiLink fsDeviceLabel String
  	HiLink fsDeviceUUID String
@@ -54,7 +72,13 @@
  	HiLink fsFreqPassNumber Number
  
  	if exists('fstab_unknown_fs_errors') && fstab_unknown_fs_errors == 1
-@@ -235,6 +245,7 @@
+ 		HiLink fsTypeUnknown Error
+ 	endif
++
+ 	HiLink fsDeviceError Error
+ 	HiLink fsMountPointError Error
+ 	HiLink fsMountPointKeyword Keyword
+@@ -235,6 +248,7 @@
  	HiLink fsOptionsHpfsCase String
  	HiLink fsOptionsIsoMap String
  	HiLink fsOptionsReiserHash String

Modified: trunk/packages/vim/patches/pushed-upstream.txt
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/pushed-upstream.txt?rev=1157&op=diff
==============================================================================
--- trunk/packages/vim/patches/pushed-upstream.txt (original)
+++ trunk/packages/vim/patches/pushed-upstream.txt Wed Jan 16 15:24:51 2008
@@ -9,12 +9,12 @@
 mysql.vim-syntax_comment.diff
 index.txt.diff
 spellfile.vim-doc.diff
+verilog.vim_ftplugin-cpoptions.diff
+fstab.vim-syntax.diff
 
 Patches pushed upstream:
 dosini.vim-hash_comment.diff
-fstab.vim-syntax.diff
 lhaskell.vim-syntax.diff
-verilog.vim_ftplugin-cpoptions.diff
 
 Debian-specific patches:
 filetype.vim-better_tex_vs_plaintex.diff

More information about the pkg-vim-maintainers mailing list