r497 - in trunk/vim: debian patches
James Vega
jamessan at costa.debian.org
Wed Feb 22 15:28:59 UTC 2006
Author: jamessan
Date: 2006-02-22 15:28:58 +0000 (Wed, 22 Feb 2006)
New Revision: 497
Added:
trunk/vim/patches/159_netrw.vim.diff
Modified:
trunk/vim/debian/changelog
trunk/vim/patches/series
Log:
Add a patch to fix #353076
Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog 2006-02-15 12:13:29 UTC (rev 496)
+++ trunk/vim/debian/changelog 2006-02-22 15:28:58 UTC (rev 497)
@@ -6,8 +6,11 @@
[ James Vega ]
* Add a missing quote in /etc/vim/vimrc's last-position-jump example.
(closes: #347597)
+ * Added patch 159_netrw.vim.diff which adds ';' to the characters
+ escape()'d when using netrw and escape()'s the tmpfile name.
+ (closes: #353076)
- -- James Vega <jamessan at debian.org> Wed, 15 Feb 2006 07:10:04 -0500
+ -- James Vega <jamessan at debian.org> Wed, 22 Feb 2006 10:13:12 -0500
vim (1:6.4-007+1) unstable; urgency=low
Added: trunk/vim/patches/159_netrw.vim.diff
===================================================================
--- trunk/vim/patches/159_netrw.vim.diff 2006-02-15 12:13:29 UTC (rev 496)
+++ trunk/vim/patches/159_netrw.vim.diff 2006-02-22 15:28:58 UTC (rev 497)
@@ -0,0 +1,103 @@
+Index: vim/runtime/plugin/netrw.vim
+===================================================================
+--- vim/runtime/plugin/netrw.vim.orig
++++ vim/runtime/plugin/netrw.vim
+@@ -306,8 +306,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_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_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
+
+@@ -388,11 +388,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_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_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_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_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
+@@ -407,8 +407,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_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_http_cmd." ".escape(tmpfile,' ?;&')." http://".g:netrw_machine.escape(b:netrw_fname,' ?;&')
+ let result = s:NetGetFile(readcmd, tmpfile, b:netrw_method)
+
+ else
+@@ -417,8 +417,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_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_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>"
+@@ -462,11 +462,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_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_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_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_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
+@@ -487,11 +487,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_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_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_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_fetch_cmd." ".escape(tmpfile,' ?;&')." ".netrw_option."://".g:netrw_machine."/".escape(b:netrw_fname,' ?;&')
+ endif
+
+ let result = s:NetGetFile(readcmd,tmpfile, b:netrw_method)
+@@ -503,12 +503,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_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_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
Modified: trunk/vim/patches/series
===================================================================
--- trunk/vim/patches/series 2006-02-15 12:13:29 UTC (rev 496)
+++ trunk/vim/patches/series 2006-02-22 15:28:58 UTC (rev 497)
@@ -54,3 +54,4 @@
304_memline.c.diff -p0
305_term.c.diff -p0
402_doc_editing.txt.diff -p0
+159_netrw.vim.diff -p0
More information about the pkg-vim-maintainers
mailing list