r510 - in trunk/vim7: debian patches

Stefano Zacchiroli zack at costa.debian.org
Mon Mar 13 22:10:44 UTC 2006


Author: zack
Date: 2006-03-13 22:10:44 +0000 (Mon, 13 Mar 2006)
New Revision: 510

Removed:
   trunk/vim7/patches/134_sshconfig.vim.diff
   trunk/vim7/patches/149_sshconfig.vim.diff
   trunk/vim7/patches/159_netrw.vim.diff
Modified:
   trunk/vim7/debian/rules
Log:
bringed debian package forward to vim-7.0222.zip


Modified: trunk/vim7/debian/rules
===================================================================
--- trunk/vim7/debian/rules	2006-03-01 16:49:28 UTC (rev 509)
+++ trunk/vim7/debian/rules	2006-03-13 22:10:44 UTC (rev 510)
@@ -160,7 +160,7 @@
 
 NAME=vim
 VERSION=7.0aa
-SNAPSHOT=0210
+SNAPSHOT=0222
 DEBVERSION=6.4+$(VERSION).$(SNAPSHOT)
 SRCDIR=$(NAME)$(subst .,,$(VERSION))
 VIMCUR=$(SRCDIR)

Deleted: trunk/vim7/patches/134_sshconfig.vim.diff
===================================================================
--- trunk/vim7/patches/134_sshconfig.vim.diff	2006-03-01 16:49:28 UTC (rev 509)
+++ trunk/vim7/patches/134_sshconfig.vim.diff	2006-03-13 22:10:44 UTC (rev 510)
@@ -1,13 +0,0 @@
-Index: vim/runtime/syntax/sshconfig.vim
-===================================================================
---- vim/runtime/syntax/sshconfig.vim.orig
-+++ vim/runtime/syntax/sshconfig.vim
-@@ -65,7 +65,7 @@
- syn keyword sshconfigKeyword RhostsAuthentication RhostsRSAAuthentication
- syn keyword sshconfigKeyword RSAAuthentication SmartcardDevice
- syn keyword sshconfigKeyword StrictHostKeyChecking UsePrivilegedPort User
--syn keyword sshconfigKeyword UserKnownHostsFile XAuthLocation
-+syn keyword sshconfigKeyword UserKnownHostsFile XAuthLocation HashKnownHosts
- 
- " Define the default highlighting
- if version >= 508 || !exists("did_sshconfig_syntax_inits")

Deleted: trunk/vim7/patches/149_sshconfig.vim.diff
===================================================================
--- trunk/vim7/patches/149_sshconfig.vim.diff	2006-03-01 16:49:28 UTC (rev 509)
+++ trunk/vim7/patches/149_sshconfig.vim.diff	2006-03-13 22:10:44 UTC (rev 510)
@@ -1,327 +0,0 @@
-Index: vim/runtime/syntax/sshconfig.vim
-===================================================================
---- vim/runtime/syntax/sshconfig.vim.orig
-+++ vim/runtime/syntax/sshconfig.vim
-@@ -1,34 +1,38 @@
- " Vim syntax file
--" This is a GENERATED FILE. Please always refer to source file at the URI below.
- " Language: OpenSSH server configuration file (ssh_config)
- " Maintainer: David Ne\v{c}as (Yeti) <yeti at physics.muni.cz>
--" Last Change: 2003-05-06
-+" Last Change: 2005-01-23
- " URL: http://trific.ath.cx/Ftp/vim/syntax/sshconfig.vim
- 
--" Setup
-+" Setup {{{
-+" React to possibly already-defined syntax.
-+" For version 5.x: Clear all syntax items unconditionally
-+" For version 6.x: Quit when a syntax file was already loaded
- if version >= 600
--	if exists("b:current_syntax")
--		finish
--	endif
-+  if exists("b:current_syntax")
-+    finish
-+  endif
- else
--	syntax clear
-+  syntax clear
- endif
- 
- if version >= 600
--	setlocal iskeyword=_,-,a-z,A-Z,48-57
-+  setlocal iskeyword=_,-,a-z,A-Z,48-57
- else
--	set iskeyword=_,-,a-z,A-Z,48-57
-+  set iskeyword=_,-,a-z,A-Z,48-57
- endif
- 
- syn case ignore
--
--" Comments
-+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" }}}
-+" Comments {{{
- syn match sshconfigComment "#.*$" contains=sshconfigTodo
- syn keyword sshconfigTodo TODO FIXME NOT contained
--
--" Constants
-+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" }}}
-+" Constants {{{
- syn keyword sshconfigYesNo yes no ask
-+" protocol v1
- syn keyword sshconfigCipher blowfish des 3des
-+" protocol v2
- syn keyword sshconfigCipher aes128-cbc 3des-cbc blowfish-cbc cast128-cbc
- syn keyword sshconfigCipher arcfour aes192-cbc aes256-cbc
- syn keyword sshconfigMAC hmac-md5 hmac-sha1 hmac-ripemd160 hmac-sha1-96
-@@ -44,56 +48,63 @@
- syn match sshconfigNumber "\d\+"
- syn match sshconfigHostPort "\<\(\d\{1,3}\.\)\{3}\d\{1,3}\(:\d\+\)\?\>"
- syn match sshconfigHostPort "\<\([-a-zA-Z0-9]\+\.\)\+[-a-zA-Z0-9]\{2,}\(:\d\+\)\?\>"
-+" FIXME: this matches quite a few things which are NOT valid IPv6 addresses
- syn match sshconfigHostPort "\<\(\x\{,4}:\)\+\x\{,4}[:/]\d\+\>"
--
--" Keywords
-+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" }}}
-+" Keywords {{{
- syn keyword sshconfigHostSect Host
--syn keyword sshconfigKeyword AFSTokenPassing BatchMode BindAddress
-+syn keyword sshconfigKeyword AddressFamily BatchMode BindAddress
- syn keyword sshconfigKeyword ChallengeResponseAuthentication CheckHostIP
--syn keyword sshconfigKeyword Cipher Ciphers ClearAllForwardings Compression
--syn keyword sshconfigKeyword CompressionLevel ConnectionAttempts
--syn keyword sshconfigKeyword DynamicForward EscapeChar ForwardAgent ForwardX11
--syn keyword sshconfigKeyword GatewayPorts GlobalKnownHostsFile
--syn keyword sshconfigKeyword HostbasedAuthentication HostKeyAlgorithms
--syn keyword sshconfigKeyword HostKeyAlias HostName IdentityFile KeepAlive
--syn keyword sshconfigKeyword KerberosAuthentication KerberosTgtPassing
--syn keyword sshconfigKeyword LocalForward LogLevel MACs
--syn keyword sshconfigKeyword NoHostAuthenticationForLocalhost
-+syn keyword sshconfigKeyword Cipher Ciphers ClearAllForwardings
-+syn keyword sshconfigKeyword Compression CompressionLevel ConnectTimeout
-+syn keyword sshconfigKeyword ConnectionAttempts ControlMaster
-+syn keyword sshconfigKeyword ControlPath DynamicForward EnableSSHKeysign
-+syn keyword sshconfigKeyword EscapeChar ForwardAgent ForwardX11
-+syn keyword sshconfigKeyword ForwardX11Trusted GSSAPIAuthentication
-+syn keyword sshconfigKeyword GSSAPIDelegateCredentials GatewayPorts
-+syn keyword sshconfigKeyword GlobalKnownHostsFile HostKeyAlgorithms
-+syn keyword sshconfigKeyword HostKeyAlias HostName HostbasedAuthentication
-+syn keyword sshconfigKeyword IdentitiesOnly IdentityFile LocalForward
-+syn keyword sshconfigKeyword LogLevel MACs NoHostAuthenticationForLocalhost
- syn keyword sshconfigKeyword NumberOfPasswordPrompts PasswordAuthentication
- syn keyword sshconfigKeyword Port PreferredAuthentications Protocol
--syn keyword sshconfigKeyword ProxyCommand PubkeyAuthentication RemoteForward
-+syn keyword sshconfigKeyword ProxyCommand PubkeyAuthentication
-+syn keyword sshconfigKeyword RSAAuthentication RemoteForward SetupTimeOut
- syn keyword sshconfigKeyword RhostsAuthentication RhostsRSAAuthentication
--syn keyword sshconfigKeyword RSAAuthentication SmartcardDevice
--syn keyword sshconfigKeyword StrictHostKeyChecking UsePrivilegedPort User
--syn keyword sshconfigKeyword UserKnownHostsFile XAuthLocation HashKnownHosts
--
--" Define the default highlighting
-+syn keyword sshconfigKeyword SendEnv ServerAliveCountMax ServerAliveInterval
-+syn keyword sshconfigKeyword SmartcardDevice StrictHostKeyChecking
-+syn keyword sshconfigKeyword TCPKeepAlive UsePrivilegedPort User
-+syn keyword sshconfigKeyword UserKnownHostsFile VerifyHostKeyDNS XAuthLocation
-+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" }}}
-+" Define the default highlighting {{{
-+" For version 5.7 and earlier: Only when not done already
-+" For version 5.8 and later: Only when an item doesn't have highlighting yet
- if version >= 508 || !exists("did_sshconfig_syntax_inits")
--	if version < 508
--		let did_sshconfig_syntax_inits = 1
--		command -nargs=+ HiLink hi link <args>
--	else
--		command -nargs=+ HiLink hi def link <args>
--	endif
--
--	HiLink sshconfigComment Comment
--	HiLink sshconfigTodo Todo
--	HiLink sshconfigHostPort sshconfigConstant
--	HiLink sshconfigNumber sshconfigConstant
--	HiLink sshconfigConstant Constant
--	HiLink sshconfigYesNo sshconfigEnum
--	HiLink sshconfigCipher sshconfigEnum
--	HiLink sshconfigMAC sshconfigEnum
--	HiLink sshconfigHostKeyAlg sshconfigEnum
--	HiLink sshconfigLogLevel sshconfigEnum
--	HiLink sshconfigSysLogFacility sshconfigEnum
--	HiLink sshconfigPreferredAuth sshconfigEnum
--	HiLink sshconfigEnum Function
--	HiLink sshconfigSpecial Special
--	HiLink sshconfigKeyword Keyword
--	HiLink sshconfigHostSect Type
--	delcommand HiLink
-+  if version < 508
-+    let did_sshconfig_syntax_inits = 1
-+    command -nargs=+ HiLink hi link <args>
-+  else
-+    command -nargs=+ HiLink hi def link <args>
-+  endif
-+
-+  HiLink sshconfigComment           Comment
-+  HiLink sshconfigTodo              Todo
-+  HiLink sshconfigHostPort          sshconfigConstant
-+  HiLink sshconfigNumber            sshconfigConstant
-+  HiLink sshconfigConstant          Constant
-+  HiLink sshconfigYesNo             sshconfigEnum
-+  HiLink sshconfigCipher            sshconfigEnum
-+  HiLink sshconfigMAC               sshconfigEnum
-+  HiLink sshconfigHostKeyAlg        sshconfigEnum
-+  HiLink sshconfigLogLevel          sshconfigEnum
-+  HiLink sshconfigSysLogFacility    sshconfigEnum
-+  HiLink sshconfigPreferredAuth     sshconfigEnum
-+  HiLink sshconfigEnum              Function
-+  HiLink sshconfigSpecial           Special
-+  HiLink sshconfigKeyword           Keyword
-+  HiLink sshconfigHostSect          Type
-+  delcommand HiLink
- endif
--
-+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" }}}
- let b:current_syntax = "sshconfig"
- 
-Index: vim/runtime/syntax/sshdconfig.vim
-===================================================================
---- vim/runtime/syntax/sshdconfig.vim.orig
-+++ vim/runtime/syntax/sshdconfig.vim
-@@ -1,32 +1,34 @@
- " Vim syntax file
--" This is a GENERATED FILE. Please always refer to source file at the URI below.
- " Language: OpenSSH server configuration file (sshd_config)
- " Maintainer: David Ne\v{c}as (Yeti) <yeti at physics.muni.cz>
--" Last Change: 2003-05-06
-+" Last Change: 2005-01-23
- " URL: http://trific.ath.cx/Ftp/vim/syntax/sshdconfig.vim
- 
--" Setup
-+" Setup {{{
-+" React to possibly already-defined syntax.
-+" For version 5.x: Clear all syntax items unconditionally
-+" For version 6.x: Quit when a syntax file was already loaded
- if version >= 600
--	if exists("b:current_syntax")
--		finish
--	endif
-+  if exists("b:current_syntax")
-+    finish
-+  endif
- else
--	syntax clear
-+  syntax clear
- endif
- 
- if version >= 600
--	setlocal iskeyword=_,-,a-z,A-Z,48-57
-+  setlocal iskeyword=_,-,a-z,A-Z,48-57
- else
--	set iskeyword=_,-,a-z,A-Z,48-57
-+  set iskeyword=_,-,a-z,A-Z,48-57
- endif
- 
- syn case ignore
--
--" Comments
-+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" }}}
-+" Comments {{{
- syn match sshdconfigComment "#.*$" contains=sshdconfigTodo
- syn keyword sshdconfigTodo TODO FIXME NOT contained
--
--" Constants
-+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" }}}
-+" Constants {{{
- syn keyword sshdconfigYesNo yes no
- syn keyword sshdconfigCipher aes128-cbc 3des-cbc blowfish-cbc cast128-cbc
- syn keyword sshdconfigCipher aes192-cbc aes256-cbc
-@@ -42,57 +44,67 @@
- syn match sshdconfigNumber "\d\+"
- syn match sshdconfigHostPort "\<\(\d\{1,3}\.\)\{3}\d\{1,3}\(:\d\+\)\?\>"
- syn match sshdconfigHostPort "\<\([-a-zA-Z0-9]\+\.\)\+[-a-zA-Z0-9]\{2,}\(:\d\+\)\?\>"
-+" FIXME: this matches quite a few things which are NOT valid IPv6 addresses
- syn match sshdconfigHostPort "\<\(\x\{,4}:\)\+\x\{,4}:\d\+\>"
- syn match sshdconfigTime "\<\(\d\+[sSmMhHdDwW]\)\+\>"
--
--" Keywords
--syn keyword sshdconfigKeyword AFSTokenPassing AllowGroups AllowTcpForwarding
-+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" }}}
-+" Keywords {{{
-+syn keyword sshdconfigKeyword AFSTokenPassing AcceptEnv
-+syn keyword sshdconfigKeyword AllowGroups AllowTcpForwarding
- syn keyword sshdconfigKeyword AllowUsers AuthorizedKeysFile Banner
--syn keyword sshdconfigKeyword ChallengeResponseAuthentication Ciphers
--syn keyword sshdconfigKeyword ClientAliveInterval ClientAliveCountMax
--syn keyword sshdconfigKeyword Compression DenyGroups DenyUsers GatewayPorts
--syn keyword sshdconfigKeyword HostbasedAuthentication HostKey IgnoreRhosts
--syn keyword sshdconfigKeyword IgnoreUserKnownHosts KeepAlive
-+syn keyword sshdconfigKeyword ChallengeResponseAuthentication
-+syn keyword sshdconfigKeyword Ciphers ClientAliveCountMax
-+syn keyword sshdconfigKeyword ClientAliveInterval Compression
-+syn keyword sshdconfigKeyword DenyGroups DenyUsers GSSAPIAuthentication
-+syn keyword sshdconfigKeyword GSSAPICleanupCredentials GatewayPorts
-+syn keyword sshdconfigKeyword HostKey HostbasedAuthentication
-+syn keyword sshdconfigKeyword IgnoreRhosts IgnoreUserKnownHosts
- syn keyword sshdconfigKeyword KerberosAuthentication KerberosOrLocalPasswd
- syn keyword sshdconfigKeyword KerberosTgtPassing KerberosTicketCleanup
- syn keyword sshdconfigKeyword KeyRegenerationInterval ListenAddress
--syn keyword sshdconfigKeyword LoginGraceTime LogLevel MACs MaxStartups
--syn keyword sshdconfigKeyword PAMAuthenticationViaKbdInt
--syn keyword sshdconfigKeyword PasswordAuthentication PermitEmptyPasswords
--syn keyword sshdconfigKeyword PermitRootLogin PermitUserEnvironment PidFile
--syn keyword sshdconfigKeyword Port PrintLastLog PrintMotd Protocol
--syn keyword sshdconfigKeyword PubkeyAuthentication RhostsAuthentication
--syn keyword sshdconfigKeyword RhostsRSAAuthentication RSAAuthentication
-+syn keyword sshdconfigKeyword LogLevel LoginGraceTime MACs MaxAuthTries
-+syn keyword sshdconfigKeyword MaxStartups PasswordAuthentication
-+syn keyword sshdconfigKeyword PermitEmptyPasswords PermitRootLogin
-+syn keyword sshdconfigKeyword PermitUserEnvironment PidFile Port
-+syn keyword sshdconfigKeyword PrintLastLog PrintMotd Protocol
-+syn keyword sshdconfigKeyword PubkeyAuthentication RSAAuthentication
-+syn keyword sshdconfigKeyword RhostsAuthentication RhostsRSAAuthentication
- syn keyword sshdconfigKeyword ServerKeyBits StrictModes Subsystem
--syn keyword sshdconfigKeyword SyslogFacility UseLogin UsePrivilegeSeparation
--syn keyword sshdconfigKeyword VerifyReverseMapping X11DisplayOffset
--syn keyword sshdconfigKeyword X11Forwarding X11UseLocalhost XAuthLocation
--
--" Define the default highlighting
-+syn keyword sshdconfigKeyword SyslogFacility TCPKeepAlive UseDNS
-+syn keyword sshdconfigKeyword UseLogin UsePAM UsePrivilegeSeparation
-+syn keyword sshdconfigKeyword X11DisplayOffset X11Forwarding
-+syn keyword sshdconfigKeyword X11UseLocalhost XAuthLocation
-+syn keyword sshdconfigKeyword GSSAPINoMICAuthentication GssapiAuthentication
-+syn keyword sshdconfigKeyword GssapiKeyExchange GssapiUseSessionCredCache
-+syn keyword sshdconfigKeyword KerberosGetAFSToken
-+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" }}}
-+" Define the default highlighting {{{
-+" For version 5.7 and earlier: Only when not done already
-+" For version 5.8 and later: Only when an item doesn't have highlighting yet
- if version >= 508 || !exists("did_sshdconfig_syntax_inits")
--	if version < 508
--		let did_sshdconfig_syntax_inits = 1
--		command -nargs=+ HiLink hi link <args>
--	else
--		command -nargs=+ HiLink hi def link <args>
--	endif
--
--	HiLink sshdconfigComment Comment
--	HiLink sshdconfigTodo Todo
--	HiLink sshdconfigHostPort sshdconfigConstant
--	HiLink sshdconfigTime sshdconfigConstant
--	HiLink sshdconfigNumber sshdconfigConstant
--	HiLink sshdconfigConstant Constant
--	HiLink sshdconfigYesNo sshdconfigEnum
--	HiLink sshdconfigCipher sshdconfigEnum
--	HiLink sshdconfigMAC sshdconfigEnum
--	HiLink sshdconfigRootLogin sshdconfigEnum
--	HiLink sshdconfigLogLevel sshdconfigEnum
--	HiLink sshdconfigSysLogFacility sshdconfigEnum
--	HiLink sshdconfigEnum Function
--	HiLink sshdconfigSpecial Special
--	HiLink sshdconfigKeyword Keyword
--	delcommand HiLink
-+  if version < 508
-+    let did_sshdconfig_syntax_inits = 1
-+    command -nargs=+ HiLink hi link <args>
-+  else
-+    command -nargs=+ HiLink hi def link <args>
-+  endif
-+
-+  HiLink sshdconfigComment           Comment
-+  HiLink sshdconfigTodo              Todo
-+  HiLink sshdconfigHostPort          sshdconfigConstant
-+  HiLink sshdconfigTime              sshdconfigConstant
-+  HiLink sshdconfigNumber            sshdconfigConstant
-+  HiLink sshdconfigConstant          Constant
-+  HiLink sshdconfigYesNo             sshdconfigEnum
-+  HiLink sshdconfigCipher            sshdconfigEnum
-+  HiLink sshdconfigMAC               sshdconfigEnum
-+  HiLink sshdconfigRootLogin         sshdconfigEnum
-+  HiLink sshdconfigLogLevel          sshdconfigEnum
-+  HiLink sshdconfigSysLogFacility    sshdconfigEnum
-+  HiLink sshdconfigEnum              Function
-+  HiLink sshdconfigSpecial           Special
-+  HiLink sshdconfigKeyword           Keyword
-+  delcommand HiLink
- endif
--
-+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" }}}
- let b:current_syntax = "sshdconfig"

Deleted: trunk/vim7/patches/159_netrw.vim.diff
===================================================================
--- trunk/vim7/patches/159_netrw.vim.diff	2006-03-01 16:49:28 UTC (rev 509)
+++ trunk/vim7/patches/159_netrw.vim.diff	2006-03-13 22:10:44 UTC (rev 510)
@@ -1,146 +0,0 @@
-Index: vim/runtime/autoload/netrw.vim
-===================================================================
---- vim/runtime/autoload/netrw.vim.orig
-+++ vim/runtime/autoload/netrw.vim
-@@ -439,8 +439,8 @@
-      let uid_machine = g:netrw_machine
-     endif
-    endif
--"   call Decho("executing: !".g:netrw_rcp_cmd." ".s:netrw_rcpmode." ".uid_machine.":".escape(b:netrw_fname,' ?&')." ".tmpfile)
--   exe g:netrw_silentxfer."!".g:netrw_rcp_cmd." ".s:netrw_rcpmode." ".uid_machine.":".escape(b:netrw_fname,' ?&')." ".tmpfile
-+"   call Decho("executing: !".g:netrw_rcp_cmd." ".s:netrw_rcpmode." ".uid_machine.":".escape(b:netrw_fname,' ?;&')." ".escape(tmpfile,' ?;&'))
-+   exe g:netrw_silentxfer."!".g:netrw_rcp_cmd." ".s:netrw_rcpmode." ".uid_machine.":".escape(b:netrw_fname,' ?;&')." ".escape(tmpfile,' ?;&')
-    let result           = s:NetGetFile(readcmd, tmpfile, b:netrw_method)
-    let b:netrw_lastfile = choice
-  
-@@ -537,11 +537,11 @@
-     endif
-     if g:netrw_cygwin == 1
-      let cygtmpfile=substitute(tmpfile,'^\(\a\):','/cygdrive/\1/','e')
--"     call  Decho("executing: !".g:netrw_scp_cmd.useport." '".g:netrw_machine.":".escape(b:netrw_fname,' ?&')."' ".cygtmpfile)
--     exe g:netrw_silentxfer."!".g:netrw_scp_cmd.useport." '".g:netrw_machine.":".escape(b:netrw_fname,' ?&')."' ".cygtmpfile
-+"     call  Decho("executing: !".g:netrw_scp_cmd.useport." '".g:netrw_machine.":".escape(b:netrw_fname,' ?;&')."' ".escape(cygtmpfile,' ?;&'))
-+     exe g:netrw_silentxfer."!".g:netrw_scp_cmd.useport." '".g:netrw_machine.":".escape(b:netrw_fname,' ?;&')."' ".escape(cygtmpfile,' ?;&')
-     else
--"     call  Decho("executing: !".g:netrw_scp_cmd.useport." '".g:netrw_machine.":".escape(b:netrw_fname,' ?&')."' ".tmpfile)
--     exe g:netrw_silentxfer."!".g:netrw_scp_cmd.useport." '".g:netrw_machine.":".escape(b:netrw_fname,' ?&')."' ".tmpfile
-+"     call  Decho("executing: !".g:netrw_scp_cmd.useport." '".g:netrw_machine.":".escape(b:netrw_fname,' ?;&')."' ".escape(tmpfile,' ?;&'))
-+     exe g:netrw_silentxfer."!".g:netrw_scp_cmd.useport." '".g:netrw_machine.":".escape(b:netrw_fname,' ?;&')."' ".escape(tmpfile,' ?;&')
-     endif
-     let result           = s:NetGetFile(readcmd, tmpfile, b:netrw_method)
-     let b:netrw_lastfile = choice
-@@ -561,8 +561,8 @@
-  
-     if match(b:netrw_fname,"#") == -1
-      " simple wget
--"     call Decho("executing: !".g:netrw_http_cmd." ".tmpfile." http://".g:netrw_machine.escape(b:netrw_fname,' ?&'))
--     exe g:netrw_silentxfer."!".g:netrw_http_cmd." ".tmpfile." http://".g:netrw_machine.escape(b:netrw_fname,' ?&')
-+"     call Decho("executing: !".g:netrw_http_cmd." ".escape(tmpfile,' ?;&')." http://".g:netrw_machine.escape(b:netrw_fname,' ?;&'))
-+     exe g:netrw_silentxfer."!".g:netrw_http_cmd." ".escape(tmpfile,' ?;&')." http://".g:netrw_machine.escape(b:netrw_fname,' ?;&')
-      let result = s:NetGetFile(readcmd, tmpfile, b:netrw_method)
-  
-     else
-@@ -571,8 +571,8 @@
-      let netrw_tag = substitute(b:netrw_fname,"^.*#","","")
- "     call Decho("netrw_html<".netrw_html.">")
- "     call Decho("netrw_tag <".netrw_tag.">")
--"     call Decho("executing: !".g:netrw_http_cmd." ".tmpfile." http://".g:netrw_machine.netrw_html)
--     exe g:netrw_silentxfer."!".g:netrw_http_cmd." ".tmpfile." http://".g:netrw_machine.netrw_html
-+"     call Decho("executing: !".g:netrw_http_cmd." ".escape(tmpfile,' ?;&')." http://".g:netrw_machine.escape(netrw_html,' ?;&'))
-+     exe g:netrw_silentxfer."!".g:netrw_http_cmd." ".escape(tmpfile,' ?;&')." http://".g:netrw_machine.escape(netrw_html,' ?;&')
-      let result = s:NetGetFile(readcmd, tmpfile, b:netrw_method)
- "     call Decho('<\s*a\s*name=\s*"'.netrw_tag.'"/')
-      exe 'norm! 1G/<\s*a\s*name=\s*"'.netrw_tag.'"/'."\<CR>"
-@@ -617,11 +617,11 @@
- "    call Decho("read via rsync (method #7)")
-     if g:netrw_cygwin == 1
-      let cygtmpfile=substitute(tmpfile,'^\(\a\):','/cygdrive/\1/','e')
--"     call Decho("executing: !".g:netrw_rsync_cmd." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".cygtmpfile)
--     exe g:netrw_silentxfer."!".g:netrw_rsync_cmd." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".cygtmpfile
-+"     call Decho("executing: !".g:netrw_rsync_cmd." ".g:netrw_machine.":".escape(b:netrw_fname,' ?;&')." ".escape(cygtmpfile,' ?;&'))
-+     exe g:netrw_silentxfer."!".g:netrw_rsync_cmd." ".g:netrw_machine.":".escape(b:netrw_fname,' ?;&')." ".escape(cygtmpfile,' ?;&')
-     else
--"     call Decho("executing: !".g:netrw_rsync_cmd." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".tmpfile)
--     exe g:netrw_silentxfer."!".g:netrw_rsync_cmd." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".tmpfile
-+"     call Decho("executing: !".g:netrw_rsync_cmd." ".g:netrw_machine.":".escape(b:netrw_fname,' ?;&')." ".escape(tmpfile,' ?;&'))
-+     exe g:netrw_silentxfer."!".g:netrw_rsync_cmd." ".g:netrw_machine.":".escape(b:netrw_fname,' ?;&')." ".escape(tmpfile,' ?;&')
-     endif
-     let result		= s:NetGetFile(readcmd,tmpfile, b:netrw_method)
-     let b:netrw_lastfile = choice
-@@ -645,11 +645,11 @@
- "    call Decho("read via fetch for ".netrw_option)
-  
-     if exists("g:netrw_uid") && g:netrw_uid != "" && exists("g:netrw_passwd") && g:netrw_passwd != ""
--"     call Decho("executing: !".g:netrw_fetch_cmd." ".tmpfile." ".netrw_option."://".g:netrw_uid.':'.g:netrw_passwd.'@'.g:netrw_machine."/".escape(b:netrw_fname,' ?&'))
--     exe g:netrw_silentxfer."!".g:netrw_fetch_cmd." ".tmpfile." ".netrw_option."://".g:netrw_uid.':'.g:netrw_passwd.'@'.g:netrw_machine."/".escape(b:netrw_fname,' ?&')
-+"     call Decho("executing: !".g:netrw_fetch_cmd." ".escape(tmpfile,' ?;&')." ".netrw_option."://".g:netrw_uid.':'.g:netrw_passwd.'@'.g:netrw_machine."/".escape(b:netrw_fname,' ?;&'))
-+     exe g:netrw_silentxfer."!".g:netrw_fetch_cmd." ".escape(tmpfile,' ?;&')." ".netrw_option."://".g:netrw_uid.':'.g:netrw_passwd.'@'.g:netrw_machine."/".escape(b:netrw_fname,' ?;&')
-     else
--"     call Decho("executing: !".g:netrw_fetch_cmd." ".tmpfile." ".netrw_option."://".g:netrw_machine."/".escape(b:netrw_fname,' ?&'))
--     exe g:netrw_silentxfer."!".g:netrw_fetch_cmd." ".tmpfile." ".netrw_option."://".g:netrw_machine."/".escape(b:netrw_fname,' ?&')
-+"     call Decho("executing: !".g:netrw_fetch_cmd." ".escape(tmpfile,' ?;&')." ".netrw_option."://".g:netrw_machine."/".escape(b:netrw_fname,' ?;&'))
-+     exe g:netrw_silentxfer."!".g:netrw_fetch_cmd." ".escape(tmpfile,' ?;&')." ".netrw_option."://".g:netrw_machine."/".escape(b:netrw_fname,' ?;&')
-     endif
-  
-     let result		= s:NetGetFile(readcmd,tmpfile, b:netrw_method)
-@@ -661,12 +661,12 @@
- "    call Decho("read via sftp (method #4)")
-     if g:netrw_cygwin == 1
-      let cygtmpfile=substitute(tmpfile,'^\(\a\):','/cygdrive/\1/','e')
--"     call Decho("!".g:netrw_sftp_cmd." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".cygtmpfile)
--"     call Decho("executing: !".g:netrw_sftp_cmd." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".cygtmpfile)
--     exe "!".g:netrw_sftp_cmd." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".cygtmpfile
-+"     call Decho("!".g:netrw_sftp_cmd." ".g:netrw_machine.":".escape(b:netrw_fname,' ?;&')." ".escape(cygtmpfile,' ?;&'))
-+"     call Decho("executing: !".g:netrw_sftp_cmd." ".g:netrw_machine.":".escape(b:netrw_fname,' ?;&')." ".escape(cygtmpfile,' ?;&'))
-+     exe "!".g:netrw_sftp_cmd." ".g:netrw_machine.":".escape(b:netrw_fname,' ?;&')." ".escape(cygtmpfile,' ?;&')
-     else
--"     call Decho("executing: !".g:netrw_sftp_cmd." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".tmpfile)
--     exe g:netrw_silentxfer."!".g:netrw_sftp_cmd." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".tmpfile
-+"     call Decho("executing: !".g:netrw_sftp_cmd." ".g:netrw_machine.":".escape(b:netrw_fname,' ?;&')." ".escape(tmpfile,' ?;&'))
-+     exe g:netrw_silentxfer."!".g:netrw_sftp_cmd." ".g:netrw_machine.":".escape(b:netrw_fname,' ?;&')." ".escape(tmpfile,' ?;&')
-     endif
-     let result		= s:NetGetFile(readcmd, tmpfile, b:netrw_method)
-     let b:netrw_lastfile = choice
-@@ -906,8 +906,8 @@
-       let uid_machine = g:netrw_machine
-      endif
-     endif
--"    call Decho("executing: !".g:netrw_rcp_cmd." ".s:netrw_rcpmode." ".tmpfile." ".uid_machine.":".escape(b:netrw_fname,' ?&'))
--    exe g:netrw_silentxfer."!".g:netrw_rcp_cmd." ".s:netrw_rcpmode." ".tmpfile." ".uid_machine.":".escape(b:netrw_fname,' ?&')
-+"    call Decho("executing: !".g:netrw_rcp_cmd." ".s:netrw_rcpmode." ".escape(tmpfile,' ?;&')." ".uid_machine.":".escape(b:netrw_fname,' ?;&'))
-+    exe g:netrw_silentxfer."!".g:netrw_rcp_cmd." ".s:netrw_rcpmode." ".escape(tmpfile,' ?;&')." ".uid_machine.":".escape(b:netrw_fname,' ?;&')
-     let b:netrw_lastfile = choice
-  
-    ".........................................
-@@ -992,11 +992,11 @@
-     endif
-     if g:netrw_cygwin == 1
-      let cygtmpfile=substitute(tmpfile,'^\(\a\):','/cygdrive/\1/','e')
--"     call  Decho("executing: !".g:netrw_scp_cmd.useport." ".cygtmpfile." '".g:netrw_machine.":".escape(b:netrw_fname,' ?&')."'")
--     exe g:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".cygtmpfile." '".g:netrw_machine.":".escape(b:netrw_fname,' ?&')."'"
-+"     call  Decho("executing: !".g:netrw_scp_cmd.useport." ".escape(cygtmpfile,' ?;&')." '".g:netrw_machine.":".escape(b:netrw_fname,' ?;&')."'")
-+     exe g:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".escape(cygtmpfile,' ?;&')." '".g:netrw_machine.":".escape(b:netrw_fname,' ?;&')."'"
-     else
--"     call  Decho("executing: !".g:netrw_scp_cmd.useport." ".tmpfile." '".g:netrw_machine.":".escape(b:netrw_fname,' ?&')."'")
--     exe g:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".tmpfile." '".g:netrw_machine.":".escape(b:netrw_fname,' ?&')."'"
-+"     call  Decho("executing: !".g:netrw_scp_cmd.useport." ".escape(tmpfile,' ?;&')." '".g:netrw_machine.":".escape(b:netrw_fname,' ?;&')."'")
-+     exe g:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".escape(tmpfile,' ?;&')." '".g:netrw_machine.":".escape(b:netrw_fname,' ?;&')."'"
-     endif
-     let b:netrw_lastfile = choice
-  
-@@ -1043,11 +1043,11 @@
-    elseif     b:netrw_method == 7
-     if g:netrw_cygwin == 1
-      let cygtmpfile=substitute(tmpfile,'^\(\a\):','/cygdrive/\1/','e')
--"     call Decho("executing: !".g:netrw_rsync_cmd." ".cygtmpfile." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&'))
--     exe g:netrw_silentxfer."!".g:netrw_rsync_cmd." ".cygtmpfile." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')
-+"     call Decho("executing: !".g:netrw_rsync_cmd." ".escape(cygtmpfile,' ?;&')." ".g:netrw_machine.":".escape(b:netrw_fname,' ?;&'))
-+     exe g:netrw_silentxfer."!".g:netrw_rsync_cmd." ".escape(cygtmpfile,' ?;&')." ".g:netrw_machine.":".escape(b:netrw_fname,' ?;&')
-     else
--"     call Decho("executing: !".g:netrw_rsync_cmd." ".tmpfile." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&'))
--     exe g:netrw_silentxfer."!".g:netrw_rsync_cmd." ".tmpfile." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')
-+"     call Decho("executing: !".g:netrw_rsync_cmd." ".escape(tmpfile,' ?;&')." ".g:netrw_machine.":".escape(b:netrw_fname,' ?;&'))
-+     exe g:netrw_silentxfer."!".g:netrw_rsync_cmd." ".escape(tmpfile,' ?;&')." ".g:netrw_machine.":".escape(b:netrw_fname,' ?;&')
-     endif
-     let b:netrw_lastfile = choice
-  




More information about the pkg-vim-maintainers mailing list