To: vim-dev@vim.org Subject: Patch 6.1.117 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.1.117 Problem: Small problem with editing a file over ftp: and with Cygwin. Solution: Remove a dot from a ":normal" command. Use "cygdrive" where appropriate. (Charles Campbell) Files: runtime/plugin/netrw.vim *** ../vim61.116/runtime/plugin/netrw.vim Wed May 15 20:48:19 2002 --- runtime/plugin/netrw.vim Wed Jun 12 16:22:12 2002 *************** *** 1,7 **** " netrw.vim: (global plugin) Handles file transfer across a network ! " Last Change: Apr 16, 2002 " Maintainer: Charles E. Campbell, Jr. PhD ! " Version: 22 " Credits: " Vim editor by Bram Moolenaar (Thanks, Bram!) --- 1,7 ---- " netrw.vim: (global plugin) Handles file transfer across a network ! " Last Change: Jun 12, 2002 " Maintainer: Charles E. Campbell, Jr. PhD ! " Version: 23 " Credits: " Vim editor by Bram Moolenaar (Thanks, Bram!) *************** *** 231,237 **** " ftp + <.netrc>: Method #2 elseif b:netrw_method == 2 " read with ftp + <.netrc> " Decho "DBG: read via ftp+.netrc (method #2)\n" ! exe "norm! mzo.".g:netrw_ftpmode."\get ".b:netrw_fname." ".tmpfile."\" exe "'z+1,.!ftp -i " . g:netrw_machine let result = s:NetGetFile(readcmd, tmpfile) let b:netrw_lastfile = choice --- 231,237 ---- " ftp + <.netrc>: Method #2 elseif b:netrw_method == 2 " read with ftp + <.netrc> " Decho "DBG: read via ftp+.netrc (method #2)\n" ! exe "norm! mzo".g:netrw_ftpmode."\get ".b:netrw_fname." ".tmpfile."\" exe "'z+1,.!ftp -i " . g:netrw_machine let result = s:NetGetFile(readcmd, tmpfile) let b:netrw_lastfile = choice *************** *** 284,290 **** elseif b:netrw_method == 4 " read with scp " Decho "DBG: read via scp (method #4)" if g:netrw_cygwin == 1 ! let cygtmpfile=substitute(tmpfile,'^\(\a\):','//\1/','e') exe "!scp " . g:netrw_machine . ":" . b:netrw_fname . " " . cygtmpfile else exe "!scp " . g:netrw_machine . ":" . b:netrw_fname . " " . tmpfile --- 284,290 ---- elseif b:netrw_method == 4 " read with scp " Decho "DBG: read via scp (method #4)" if g:netrw_cygwin == 1 ! let cygtmpfile=substitute(tmpfile,'^\(\a\):','/cygdrive/\1/','e') exe "!scp " . g:netrw_machine . ":" . b:netrw_fname . " " . cygtmpfile else exe "!scp " . g:netrw_machine . ":" . b:netrw_fname . " " . tmpfile *************** *** 295,308 **** elseif b:netrw_method == 5 " read with http (wget) " Decho "DBG: read via http (method #5)" if match(b:netrw_fname,"#") == -1 ! exe "!wget -O " . tmpfile . " http://" . g:netrw_machine . "/" . b:netrw_fname let result = s:NetGetFile(readcmd, tmpfile) else let netrw_html= substitute(b:netrw_fname,"#.*$","","") let netrw_tag = substitute(b:netrw_fname,"^.*#","","") ! exe "!wget -O " . tmpfile . " http://" . g:netrw_machine . "/" . netrw_html let result = s:NetGetFile(readcmd, tmpfile) ! exe 'norm! 1G/<\s*a\s*name=\s*"'.netrw_tag.'"' endif set ft=html redraw! --- 295,310 ---- elseif b:netrw_method == 5 " read with http (wget) " Decho "DBG: read via http (method #5)" if match(b:netrw_fname,"#") == -1 ! exe "!wget -O " . tmpfile . " http://" . g:netrw_machine . b:netrw_fname let result = s:NetGetFile(readcmd, tmpfile) else let netrw_html= substitute(b:netrw_fname,"#.*$","","") let netrw_tag = substitute(b:netrw_fname,"^.*#","","") ! " call Decho("DBG: netrw_html<".netrw_html.">") ! " call Decho("DBG: netrw_tag <".netrw_tag.">") ! exe "!wget -O " . tmpfile . " http://" . g:netrw_machine . netrw_html let result = s:NetGetFile(readcmd, tmpfile) ! exe 'norm! 1G/<\s*a\s\+name=\s*"'.netrw_tag.'"/\' endif set ft=html redraw! *************** *** 313,319 **** elseif b:netrw_method == 6 " read with cadaver " Decho "DBG: read via cadaver (method #6)" if g:netrw_cygwin == 1 ! let cygtmpfile=substitute(tmpfile,'^\(\a\):','//\1/','e') exe "!cadaver http://" . g:netrw_machine . "/" . b:netrw_fname . " " . cygtmpfile else " call Decho("DBG: !cadaver http://" . g:netrw_machine . "/" . b:netrw_fname . " " . tmpfile) --- 315,321 ---- elseif b:netrw_method == 6 " read with cadaver " Decho "DBG: read via cadaver (method #6)" if g:netrw_cygwin == 1 ! let cygtmpfile=substitute(tmpfile,'^\(\a\):','/cygdrive/\1/','e') exe "!cadaver http://" . g:netrw_machine . "/" . b:netrw_fname . " " . cygtmpfile else " call Decho("DBG: !cadaver http://" . g:netrw_machine . "/" . b:netrw_fname . " " . tmpfile) *************** *** 487,493 **** " scp: Method #4 elseif b:netrw_method == 4 " write with scp if g:netrw_cygwin == 1 ! let cygtmpfile=substitute(tmpfile,'^\(\a\):','//\1/','e') exe "!scp " . cygtmpfile . " " . g:netrw_machine . ":" . b:netrw_fname else exe "!scp " . tmpfile . " " . g:netrw_machine . ":" . b:netrw_fname --- 489,495 ---- " scp: Method #4 elseif b:netrw_method == 4 " write with scp if g:netrw_cygwin == 1 ! let cygtmpfile=substitute(tmpfile,'^\(\a\):','/cygdrive/\1/','e') exe "!scp " . cygtmpfile . " " . g:netrw_machine . ":" . b:netrw_fname else exe "!scp " . tmpfile . " " . g:netrw_machine . ":" . b:netrw_fname *************** *** 498,504 **** " dav: Method #6 elseif b:netrw_method == 6 " write with cadaver if g:netrw_cygwin == 1 ! let cygtmpfile=substitute(tmpfile,'^\(\a\):','//\1/','e') exe "!cadaver " . cygtmpfile . " http://" . g:netrw_machine . "/" . b:netrw_fname else exe "!cadaver " . tmpfile . " http://" . g:netrw_machine . "/" . b:netrw_fname --- 500,506 ---- " dav: Method #6 elseif b:netrw_method == 6 " write with cadaver if g:netrw_cygwin == 1 ! let cygtmpfile=substitute(tmpfile,'^\(\a\):','/cygdrive/\1/','e') exe "!cadaver " . cygtmpfile . " http://" . g:netrw_machine . "/" . b:netrw_fname else exe "!cadaver " . tmpfile . " http://" . g:netrw_machine . "/" . b:netrw_fname *** ../vim61.116/src/version.c Sat Jun 29 16:35:43 2002 --- src/version.c Sat Jun 29 16:47:53 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 117, /**/ -- With sufficient thrust, pigs fly just fine. -- RFC 1925 /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ /// Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim \\\ \\\ Project leader for A-A-P -- http://www.a-a-p.org /// \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org ///