vim: runtime/autoload/netrw.vim comparison

comparison runtime/autoload/netrw.vim @ 1668:0b796e045c42 v7.2b.000

updated for version 7.2b-000

author	vimboss
date	Sun, 13 Jul 2008 17:41:49 +0000
parents	82b5078be2dd
children	f4f8014d516e

comparison

equal deleted inserted replaced

-:131dbd3d2a4b
+:0b796e045c42
 " netrw.vim: Handles file transfer and remote directory listing across
 "            AUTOLOAD SECTION
-" Date:		Jun 12, 2008
+" Date:		Jul 12, 2008
-" Version:	125
+" Version:	127
 " Maintainer:	Charles E Campbell, Jr <NdrOchip@ScampbellPfamily.AbizM-NOSPAM>
 " GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim
 " Copyright:    Copyright (C) 1999-2008 Charles E. Campbell, Jr. {{{1
 "               Permission is hereby granted to use and distribute this code,
 "               with or without modifications, provided that this copyright
 if !exists("s:NOTE")
 let s:NOTE    = 0
 let s:WARNING = 1
 let s:ERROR   = 2
 endif
-let g:loaded_netrw = "v125"
+let g:loaded_netrw = "v127"
 " sanity checks
 if v:version < 700
 call netrw#ErrorMsg(s:WARNING,"you need vim version 7.0 or later for version ".g:loaded_netrw." of netrw",1)
 finish
-endif
-if !exists("*shellescape")
-call netrw#ErrorMsg(s:ERROR,"you need to upgade your vim so that it has shellescape()",64)
-endif
-if !exists("*fnameescape")
-call netrw#ErrorMsg(s:ERROR,"you need to upgade your vim so that it has fnameescape()",65)
 endif
 let s:keepcpo= &cpo
 setlocal cpo&vim
 "DechoTabOn
 endif
 if !exists("g:netrw_sort_by")
 " alternatives: date size
 let g:netrw_sort_by= "name"
 endif
+if !exists("g:netrw_sort_options")
+let g:netrw_sort_options= ""
+endif
 if !exists("g:netrw_sort_direction")
 " alternative: reverse  (z y x ...)
 let g:netrw_sort_direction= "normal"
 endif
 if !exists("g:netrw_sort_sequence")
 let {a:vt}netrw_repkeep   = &l:report
 let {a:vt}netrw_spellkeep = &l:spell
 let {a:vt}netrw_twkeep    = &l:tw           " textwidth
 let {a:vt}netrw_wigkeep   = &l:wig          " wildignore
 if has("win32") && !has("win95")
-let {a:vt}netrw_swfkeep= &l:swf            " swapfile
+let {a:vt}netrw_swfkeep  = &l:swf          " swapfile
 endif
 if &go =~ 'a' | silent! let {a:vt}netrw_regstar = @* | endif
 silent! let {a:vt}netrw_regslash= @/
 "  call Dret("s:NetrwOptionSave : win#".winnr()." buf#".bufnr("%"))
 " ------------------------------------------------------------------------
 " s:NetrwOptionRestore: restore options {{{2
 fun! s:NetrwOptionRestore(vt)
 "  call Dfunc("s:NetrwOptionRestore(vt<".a:vt.">) win#".winnr()." buf#".bufnr("%"))
 if !exists("{a:vt}netrw_optionsave")
-"   call Decho("ro=".&ro." ma=".&ma." mod=".&mod." wrap=".&wrap)
+"   call Decho("ro=".&l:ro." ma=".&l:ma." mod=".&l:mod." wrap=".&l:wrap)
 "   call Dret("s:NetrwOptionRestore : ".a:vt."netrw_optionsave doesn't exist")
 return
 endif
 unlet {a:vt}netrw_optionsave
 if exists("{a:vt}netrw_regstar") |silent! let @*= {a:vt}netrw_regstar |unlet {a:vt}netrw_regstar |endif
 if exists("{a:vt}netrw_regslash")|silent! let @/= {a:vt}netrw_regslash|unlet {a:vt}netrw_regslash|endif
 "  call Decho("g:netrw_keepdir=".g:netrw_keepdir.": getcwd<".getcwd()."> acd=".&acd)
 "  call Decho("fo=".&fo.(exists("&acd")? " acd=".&acd : " acd doesn't exist"))
-"  call Decho("ro=".&ro." ma=".&ma." mod=".&mod." wrap=".&wrap)
+"  call Decho("ro=".&l:ro." ma=".&l:ma." mod=".&l:mod." wrap=".&l:wrap)
 "  call Dret("s:NetrwOptionRestore : win#".winnr()." buf#".bufnr("%"))
 endfun
 " ---------------------------------------------------------------------
 " s:NetrwSafeOptions: sets options to help netrw do its job {{{2
 if choice == 1
 for dir in split(&rtp,',')
 if filereadable(dir."/plugin/netrwPlugin.vim")
 "     call Decho("removing netrw-related files from ".dir)
-if s:System("delete",dir."/plugin/netrwPlugin.vim")        |call netrw#ErrorMsg(1,"unable to remove ".dir."/plugin/netrwPlugin.vim",55)        |endif
+if s:NetrwDelete(dir."/plugin/netrwPlugin.vim")        |call netrw#ErrorMsg(1,"unable to remove ".dir."/plugin/netrwPlugin.vim",55)        |endif
-if s:System("delete",dir."/autoload/netrwFileHandlers.vim")|call netrw#ErrorMsg(1,"unable to remove ".dir."/autoload/netrwFileHandlers.vim",55)|endif
+if s:NetrwDelete(dir."/autoload/netrwFileHandlers.vim")|call netrw#ErrorMsg(1,"unable to remove ".dir."/autoload/netrwFileHandlers.vim",55)|endif
-if s:System("delete",dir."/autoload/netrwSettings.vim")    |call netrw#ErrorMsg(1,"unable to remove ".dir."/autoload/netrwSettings.vim",55)    |endif
+if s:NetrwDelete(dir."/autoload/netrwSettings.vim")    |call netrw#ErrorMsg(1,"unable to remove ".dir."/autoload/netrwSettings.vim",55)    |endif
-if s:System("delete",dir."/autoload/netrw.vim")            |call netrw#ErrorMsg(1,"unable to remove ".dir."/autoload/netrw.vim",55)            |endif
+if s:NetrwDelete(dir."/autoload/netrw.vim")            |call netrw#ErrorMsg(1,"unable to remove ".dir."/autoload/netrw.vim",55)            |endif
-if s:System("delete",dir."/syntax/netrw.vim")              |call netrw#ErrorMsg(1,"unable to remove ".dir."/syntax/netrw.vim",55)              |endif
+if s:NetrwDelete(dir."/syntax/netrw.vim")              |call netrw#ErrorMsg(1,"unable to remove ".dir."/syntax/netrw.vim",55)              |endif
-if s:System("delete",dir."/syntax/netrwlist.vim")          |call netrw#ErrorMsg(1,"unable to remove ".dir."/syntax/netrwlist.vim",55)          |endif
+if s:NetrwDelete(dir."/syntax/netrwlist.vim")          |call netrw#ErrorMsg(1,"unable to remove ".dir."/syntax/netrwlist.vim",55)          |endif
 let diddir= dir
 let diddel= diddel + 1
 if !a:sys|break|endif
 endif
 endfor
 let uid_machine = g:netrw_uid .'@'. g:netrw_machine
 else
 let uid_machine = g:netrw_machine
 endif
 endif
-"   call Decho("executing: !".g:netrw_rcp_cmd." ".s:netrw_rcpmode." ".shellescape(uid_machine.":".escape(b:netrw_fname,' ?&;')." ".tmpfile)
+"   call Decho("executing: !".g:netrw_rcp_cmd." ".s:netrw_rcpmode." ".shellescape(uid_machine.":".b:netrw_fname,1)." ".shellescape(tmpfile,1))
-exe s:netrw_silentxfer."!".g:netrw_rcp_cmd." ".s:netrw_rcpmode." ".shellescape(uid_machine.":".escape(b:netrw_fname,' ?&;')." ".tmpfile)
+exe s:netrw_silentxfer."!".g:netrw_rcp_cmd." ".s:netrw_rcpmode." ".shellescape(uid_machine.":".b:netrw_fname,1)." ".shellescape(tmpfile,1))
 let result           = s:NetrwGetFile(readcmd, tmpfile, b:netrw_method)
 let b:netrw_lastfile = choice
 ".........................................
 " ftp + <.netrc>:  NetRead Method #2 {{{3
 "      call Decho("filter input: ".getline('.'))
 endif
 exe "put ='".'get \"'.netrw_fname.'\" '.tmpfile."'"
 "     call Decho("filter input: ".getline('.'))
 if exists("g:netrw_port") && g:netrw_port != ""
-"      call Decho("executing: %!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port)
+"      call Decho("executing: %!".g:netrw_ftp_cmd." -i ".shellescape(g:netrw_machine." ".g:netrw_port,1))
-exe s:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port
+exe s:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".shellescape(g:netrw_machine." ".g:netrw_port,1)
 else
-"      call Decho("executing: %!".g:netrw_ftp_cmd." -i ".g:netrw_machine)
+"      call Decho("executing: %!".g:netrw_ftp_cmd." -i ".shellescape(g:netrw_machine,1))
-exe s:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".g:netrw_machine
+exe s:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".shellescape(g:netrw_machine,1)
 endif
 " If the result of the ftp operation isn't blank, show an error message (tnx to Doug Claar)
 if getline(1) !~ "^$" && !exists("g:netrw_quiet") && getline(1) !~ '^Trying '
-let debugkeep= &debug
+let debugkeep = &debug
 setlocal debug=msg
 call netrw#ErrorMsg(s:ERROR,getline(1),4)
-let &debug= debugkeep
+let &debug    = debugkeep
 endif
 call s:SaveBufVars()|bd!|call s:RestoreBufVars()
 let result           = s:NetrwGetFile(readcmd, tmpfile, b:netrw_method)
 let b:netrw_lastfile = choice
 if exists("g:netrw_port") && g:netrw_port != ""
 let useport= " ".g:netrw_scpport." ".g:netrw_port
 else
 let useport= ""
 endif
-"    call Decho("exe s:netrw_silentxfer.!".g:netrw_scp_cmd.useport." ".shellescape(g:netrw_machine.":".escape(b:netrw_fname,g:netrw_fname_escape))." ".tmpfile)
+"    call Decho("exe s:netrw_silentxfer.!".g:netrw_scp_cmd.useport." ".shellescape(g:netrw_machine.":".b:netrw_fname,1)." ".shellescape(tmpfile,1))
-exe s:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".shellescape(g:netrw_machine.":".escape(b:netrw_fname,g:netrw_fname_escape))." ".tmpfile
+exe s:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".shellescape(g:netrw_machine.":".b:netrw_fname,1)." ".shellescape(tmpfile,1)
 let result           = s:NetrwGetFile(readcmd, tmpfile, b:netrw_method)
 let b:netrw_lastfile = choice
 ".........................................
 " http: NetRead Method #5 (wget) {{{3
 endif
 "     call Dret("netrw#NetRead :4 getcwd<".getcwd().">")
 return
 endif
-let netrw_fname= escape(b:netrw_fname,g:netrw_fname_escape)
 if match(b:netrw_fname,"#") == -1
-" simple wget
+" using g:netrw_http_cmd (usually wget or curl)
-"     call Decho('using simple wget (# not in b:netrw_fname<'.b:netrw_fname.">)")
+"     call Decho('using '.g:netrw_http_cmd.' (# not in b:netrw_fname<'.b:netrw_fname.">)")
-"     call Decho("exe ".s:netrw_silentxfer."!".g:netrw_http_cmd." ".shellescape(tmpfile)." ".shellescape("http://".g:netrw_machine.netrw_fname))
+"     call Decho("exe ".s:netrw_silentxfer."!".g:netrw_http_cmd." ".shellescape(tmpfile,1)." ".shellescape("http://".g:netrw_machine.netrw_fname,1))
-exe s:netrw_silentxfer."!".g:netrw_http_cmd." ".shellescape(tmpfile)." ".shellescape("http://".g:netrw_machine.netrw_fname)
+exe s:netrw_silentxfer."!".g:netrw_http_cmd." ".shellescape(tmpfile,1)." ".shellescape("http://".g:netrw_machine.b:netrw_fname,1)
 let result = s:NetrwGetFile(readcmd, tmpfile, b:netrw_method)
 else
-" wget plus a jump to an in-page marker (ie. http://abc/def.html#aMarker)
+" wget/curl plus a jump to an in-page marker (ie. http://abc/def.html#aMarker)
 "     call Decho(("wget/curl plus jump (# in b:netrw_fname<".b:netrw_fname.">)")
-let netrw_html= substitute(netrw_fname,"#.*$","","")
+let netrw_html= substitute(b:netrw_fname,"#.*$","","")
-let netrw_tag = substitute(netrw_fname,"^.*#","","")
+let netrw_tag = substitute(b:netrw_fname,"^.*#","","")
 "     call Decho("netrw_html<".netrw_html.">")
 "     call Decho("netrw_tag <".netrw_tag.">")
-"     call Decho("exe ".s:netrw_silentxfer."!".g:netrw_http_cmd." ".shellescape(tmpfile)." ".shellescape("http://".g:netrw_machine.netrw_html))
+"     call Decho("exe ".s:netrw_silentxfer."!".g:netrw_http_cmd." ".shellescape(tmpfile,1)." ".shellescape("http://".g:netrw_machine.netrw_html,1))
-exe s:netrw_silentxfer."!".g:netrw_http_cmd." ".shellescape(tmpfile)." ".shellescape("http://".g:netrw_machine.netrw_html)
+exe s:netrw_silentxfer."!".g:netrw_http_cmd." ".shellescape(tmpfile,1)." ".shellescape("http://".g:netrw_machine.netrw_html,1)
 let result = s:NetrwGetFile(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>"
 endif
 let b:netrw_lastfile = choice
 ".........................................
 " rsync: NetRead Method #7 {{{3
 elseif     b:netrw_method  == 7
 "    call Decho("read via rsync (method #7)")
-let netrw_fname= escape(b:netrw_fname,g:netrw_fname_escape)
+"    call Decho("exe ".s:netrw_silentxfer."!".g:netrw_rsync_cmd." ".shellescape(g:netrw_machine.":".b:netrw_fname,1)." ".shellescape(tmpfile,1))
-"    call Decho("exe ".s:netrw_silentxfer."!".g:netrw_rsync_cmd." ".shellescape(g:netrw_machine.":".netrw_fname)." ".tmpfile)
+exe s:netrw_silentxfer."!".g:netrw_rsync_cmd." ".shellescape(g:netrw_machine.":".b:netrw_fname,1)." ".shellescape(tmpfile,1)
-exe s:netrw_silentxfer."!".g:netrw_rsync_cmd." ".shellescape(g:netrw_machine.":".netrw_fname)." ".tmpfile
 let result		 = s:NetrwGetFile(readcmd,tmpfile, b:netrw_method)
 let b:netrw_lastfile = choice
 ".........................................
 " fetch: NetRead Method #8 {{{3
 "    fetch://[user@]host[:http]/path
 elseif     b:netrw_method  == 8
 "    call Decho("read via fetch (method #8)")
-let netrw_fname= escape(b:netrw_fname,g:netrw_fname_escape)
 if g:netrw_fetch_cmd == ""
 if !exists("g:netrw_quiet")
 call netrw#ErrorMsg(s:ERROR,"fetch command not available",7)
 endif
 "     call Dret("NetRead")
 let netrw_option= "ftp"
 endif
 "    call Decho("read via fetch for ".netrw_option)
 if exists("g:netrw_uid") && g:netrw_uid != "" && exists("s:netrw_passwd") && s:netrw_passwd != ""
-"     call Decho("exe ".s:netrw_silentxfer."!".g:netrw_fetch_cmd." ".tmpfile." ".shellescape(netrw_option."://".g:netrw_uid.':'.s:netrw_passwd.'@'.g:netrw_machine."/".netrw_fname))
+"     call Decho("exe ".s:netrw_silentxfer."!".g:netrw_fetch_cmd." ".shellescape(tmpfile,1)." ".shellescape(netrw_option."://".g:netrw_uid.':'.s:netrw_passwd.'@'.g:netrw_machine."/".b:netrw_fname,1))
-exe s:netrw_silentxfer."!".g:netrw_fetch_cmd." ".tmpfile." ".shellescape(netrw_option."://".g:netrw_uid.':'.s:netrw_passwd.'@'.g:netrw_machine."/".netrw_fname)
+exe s:netrw_silentxfer."!".g:netrw_fetch_cmd." ".shellescape(tmpfile,1)." ".shellescape(netrw_option."://".g:netrw_uid.':'.s:netrw_passwd.'@'.g:netrw_machine."/".b:netrw_fname,1)
 else
-"     call Decho("exe ".s:netrw_silentxfer."!".g:netrw_fetch_cmd." ".tmpfile." ".shellescape(netrw_option."://".g:netrw_machine."/".netrw_fname))
+"     call Decho("exe ".s:netrw_silentxfer."!".g:netrw_fetch_cmd." ".shellescape(tmpfile,1)." ".shellescape(netrw_option."://".g:netrw_machine."/".b:netrw_fname,1))
-exe s:netrw_silentxfer."!".g:netrw_fetch_cmd." ".tmpfile." ".shellescape(netrw_option."://".g:netrw_machine."/".netrw_fname)
+exe s:netrw_silentxfer."!".g:netrw_fetch_cmd." ".shellescape(tmpfile,1)." ".shellescape(netrw_option."://".g:netrw_machine."/".b:netrw_fname,1)
 endif
 let result		= s:NetrwGetFile(readcmd,tmpfile, b:netrw_method)
 let b:netrw_lastfile = choice
 setlocal ro
 ".........................................
 " sftp: NetRead Method #9 {{{3
 elseif     b:netrw_method  == 9
 "    call Decho("read via sftp (method #9)")
-let netrw_fname= escape(b:netrw_fname,g:netrw_fname_escape)
+"    call Decho("exe ".s:netrw_silentxfer."!".g:netrw_sftp_cmd." ".shellescape(g:netrw_machine.":".b:netrw_fname,1)." ".tmpfile)
-"    call Decho("exe ".s:netrw_silentxfer."!".g:netrw_sftp_cmd." ".shellescape(g:netrw_machine.":".netrw_fname)." ".tmpfile)
+exe s:netrw_silentxfer."!".g:netrw_sftp_cmd." ".shellescape(g:netrw_machine.":".b:netrw_fname,1)." ".tmpfile
-exe s:netrw_silentxfer."!".g:netrw_sftp_cmd." ".shellescape(g:netrw_machine.":".netrw_fname)." ".tmpfile
 let result		= s:NetrwGetFile(readcmd, tmpfile, b:netrw_method)
 let b:netrw_lastfile = choice
 ".........................................
 " Complain {{{3
 unlet b:netrw_method
 unlet b:netrw_fname
 endif
 if s:FileReadable(tmpfile) && tmpfile !~ '.tar.bz2$' && tmpfile !~ '.tar.gz$' && tmpfile !~ '.zip' && tmpfile !~ '.tar' && readcmd != 't'
 "   call Decho("cleanup by deleting tmpfile<".tmpfile.">")
-call s:System("delete",fnameescape(tmpfile))
+call s:NetrwDelete(fnameescape(tmpfile))
 endif
 call s:NetrwOptionRestore("w:")
 "  call Dret("netrw#NetRead :5 getcwd<".getcwd().">")
 endfun
 "  call Decho("curbufname<".curbufname.">")
 if &binary
 " For binary writes, always write entire file.
 " (line numbers don't really make sense for that).
 " Also supports the writing of tar and zip files.
-"   call Decho("(write entire file) silent exe w! ".v:cmdarg." ".tmpfile)
+"   call Decho("(write entire file) silent exe w! ".fnameescape(v:cmdarg)." ".fnameescape(tmpfile))
-silent exe "w! ".v:cmdarg." ".tmpfile
+silent exe "w! ".fnameescape(v:cmdarg)." ".fnameescape(tmpfile)
 elseif g:netrw_cygwin
 " write (selected portion of) file to temporary
 let cygtmpfile= substitute(tmpfile,'/cygdrive/\(.\)','\1:','')
-"   call Decho("(write selected portion) silent exe ".a:firstline."," . a:lastline . "w! ".v:cmdarg." ".cygtmpfile)
+"   call Decho("(write selected portion) silent exe ".a:firstline."," . a:lastline . "w! ".fnameescape(v:cmdarg)." ".fnameescape(cygtmpfile))
-silent exe a:firstline."," . a:lastline . "w! ".v:cmdarg." ".cygtmpfile
+silent exe a:firstline."," . a:lastline . "w! ".fnameescape(v:cmdarg)." ".fnameescape(cygtmpfile)
 else
 " write (selected portion of) file to temporary
-"   call Decho("(write selected portion) silent exe ".a:firstline."," . a:lastline . "w! ".v:cmdarg." ".tmpfile)
+"   call Decho("(write selected portion) silent exe ".a:firstline."," . a:lastline . "w! ".fnameescape(v:cmdarg)." ".fnameescape(tmpfile))
-silent exe a:firstline."," . a:lastline . "w! ".v:cmdarg." ".tmpfile
+silent exe a:firstline."," . a:lastline . "w! ".fnameescape(v:cmdarg)." ".fnameescape(tmpfile)
 endif
 if curbufname == ""
 " if the file is [No Name], and one attempts to Nwrite it, the buffer takes
 " on the temporary file's name.  Deletion of the temporary file during
 let uid_machine = g:netrw_uid .'@'. g:netrw_machine
 else
 let uid_machine = g:netrw_machine
 endif
 endif
-let netrw_fname= escape(b:netrw_fname,g:netrw_fname_escape)
+"    call Decho("executing: !".g:netrw_rcp_cmd." ".s:netrw_rcpmode." ".shellescape(tmpfile,1)." ".shellescape(uid_machine.":".b:netrw_fname,1))
-"    call Decho("executing: !".g:netrw_rcp_cmd." ".s:netrw_rcpmode." ".shellescape(tmpfile)." ".shellescape(uid_machine.":".netrw_fname))
+exe s:netrw_silentxfer."!".g:netrw_rcp_cmd." ".s:netrw_rcpmode." ".shellescape(tmpfile,1)." ".shellescape(uid_machine.":".b:netrw_fname,1)
-exe s:netrw_silentxfer."!".g:netrw_rcp_cmd." ".s:netrw_rcpmode." ".shellescape(tmpfile)." ".shellescape(uid_machine.":".netrw_fname)
 let b:netrw_lastfile = choice
 ".........................................
 " ftp + <.netrc>: NetWrite Method #2 {{{4
 elseif b:netrw_method == 2
 "     call Decho("filter input: ".getline('.'))
 endif
 exe "put ='".'put \"'.tmpfile.'\" \"'.netrw_fname.'\"'."'"
 "    call Decho("filter input: ".getline('.'))
 if exists("g:netrw_port") && g:netrw_port != ""
-"     call Decho("executing: %!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port)
+"     call Decho("executing: %!".g:netrw_ftp_cmd." -i ".shellescape(g:netrw_machine,1)." ".shellescape(g:netrw_port,1))
-exe s:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port
+exe s:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".shellescape(g:netrw_machine,1)." ".shellescape(g:netrw_port,1)
 else
 "     call Decho("filter input window#".winnr())
-"     call Decho("executing: %!".g:netrw_ftp_cmd." -i ".g:netrw_machine)
+"     call Decho("executing: %!".g:netrw_ftp_cmd." -i ".shellescape(g:netrw_machine,1))
-exe s:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".g:netrw_machine
+exe s:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".shellescape(g:netrw_machine,1)
 endif
 " If the result of the ftp operation isn't blank, show an error message (tnx to Doug Claar)
 if getline(1) !~ "^$"
 if !exists("g:netrw_quiet")
 call netrw#ErrorMsg(s:ERROR,getline(1),14)
 ".........................................
 " scp: NetWrite Method #4 {{{4
 elseif     b:netrw_method == 4
 "    call Decho("write via scp (method #4)")
-let netrw_fname= escape(b:netrw_fname,g:netrw_fname_escape)
 if exists("g:netrw_port") && g:netrw_port != ""
-let useport= " ".g:netrw_scpport." ".g:netrw_port
+let useport= " ".g:netrw_scpport." ".fnameescape(g:netrw_port)
 else
 let useport= ""
 endif
-"    call Decho("exe ".s:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".shellescape(tmpfile)." ".shellescape(g:netrw_machine.":".netrw_fname))
+"    call Decho("exe ".s:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".shellescape(tmpfile,1)." ".shellescape(g:netrw_machine.":".b:netrw_fname,1))
-exe s:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".shellescape(tmpfile)." ".shellescape(g:netrw_machine.":".netrw_fname)
+exe s:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".shellescape(tmpfile,1)." ".shellescape(g:netrw_machine.":".b:netrw_fname,1)
 let b:netrw_lastfile = choice
 ".........................................
 " http: NetWrite Method #5 {{{4
 elseif     b:netrw_method == 5
 ".........................................
 " rsync: NetWrite Method #7 {{{4
 elseif     b:netrw_method == 7
 "    call Decho("write via rsync (method #7)")
-let netrw_fname= escape(b:netrw_fname,g:netrw_fname_escape)
+"    call Decho("executing: !".g:netrw_rsync_cmd." ".shellescape(tmpfile,1)." ".shellescape(g:netrw_machine.":".b:netrw_fname,1))
-"    call Decho("executing: !".g:netrw_rsync_cmd." ".tmpfile." ".g:netrw_machine.":".netrw_fname)
+exe s:netrw_silentxfer."!".g:netrw_rsync_cmd." ".shellescape(tmpfile,1)." ".shellescape(g:netrw_machine.":".b:netrw_fname,1)
-exe s:netrw_silentxfer."!".g:netrw_rsync_cmd." ".tmpfile." ".g:netrw_machine.":".netrw_fname
 let b:netrw_lastfile = choice
 ".........................................
 " sftp: NetWrite Method #9 {{{4
 elseif     b:netrw_method == 9
 new
 setlocal ff=unix
 put ='put \"'.escape(tmpfile,'\').'\" '.netrw_fname
 "    call Decho("filter input: ".getline('.'))
 norm! 1Gdd
-"    call Decho("executing: %!".g:netrw_sftp_cmd.' '.uid_machine)
+"    call Decho("executing: %!".g:netrw_sftp_cmd.' '.shellescape(uid_machine,1))
-exe s:netrw_silentxfer."%!".g:netrw_sftp_cmd.' '.uid_machine
+exe s:netrw_silentxfer."%!".g:netrw_sftp_cmd.' '.shellescape(uid_machine,1)
 bd!
 let b:netrw_lastfile= choice
 ".........................................
 " Complain {{{4
 " Cleanup: {{{3
 "  call Decho("cleanup")
 if s:FileReadable(tmpfile)
 "   call Decho("tmpfile<".tmpfile."> readable, will now delete it")
-call s:System("delete",tmpfile)
+call s:NetrwDelete(tmpfile)
 endif
 call s:NetrwOptionRestore("w:")
 if a:firstline == 1 && a:lastline == line("$")
 " restore modifiability; usually equivalent to set nomod
 fun! s:NetrwGetFile(readcmd, tfile, method)
 "  call Dfunc("NetrwGetFile(readcmd<".a:readcmd.">,tfile<".a:tfile."> method<".a:method.">)")
 " readcmd=='t': simply do nothing
 if a:readcmd == 't'
-"   call Decho("ro=".&ro." ma=".&ma." mod=".&mod." wrap=".&wrap)
+"   call Decho("ro=".&l:ro." ma=".&l:ma." mod=".&l:mod." wrap=".&l:wrap)
 "   call Dret("NetrwGetFile : skip read of <".a:tfile.">")
 return
 endif
 " get name of remote filename (ie. url and all)
 if g:netrw_cygwin
 let tfile= substitute(a:tfile,'/cygdrive/\(.\)','\1:','')
 else
 let tfile= a:tfile
 endif
-"   "   call Decho("exe silent! keepalt file ".tfile)
+"   call Decho("exe silent! keepalt file ".fnameescape(tfile))
-exe "silent! keepalt file ".tfile
+exe "silent! keepalt file ".fnameescape(tfile)
 " edit temporary file (ie. read the temporary file in)
 if     rfile =~ '\.zip$'
 "    call Decho("handling remote zip file with zip#Browse(tfile<".tfile.">)")
 call zip#Browse(tfile)
 "    call Decho("edit temporary file")
 e!
 endif
 " rename buffer back to remote filename
-"   call Decho("exe silent! keepalt file ".escape(rfile,' '))
+"   call Decho("exe silent! keepalt file ".fnameescape(rfile))
-exe "silent! keepalt file ".escape(rfile,' ')
+exe "silent! keepalt file ".fnameescape(rfile)
 if a:method == 5
 set ft=html
 else
 filetype detect
 endif
 elseif s:FileReadable(a:tfile)
 " read file after current line
 "   call Decho("read file<".a:tfile."> after current line")
 let curline = line(".")
 let lastline= line("$")
-"   call Decho("exe<".a:readcmd." ".v:cmdarg." ".a:tfile.">  line#".curline)
+"   call Decho("exe<".a:readcmd." ".fnameescape(v:cmdarg)." ".fnameescape(a:tfile).">  line#".curline)
-exe a:readcmd." ".v:cmdarg." ".a:tfile
+exe a:readcmd." ".fnameescape(v:cmdarg)." ".fnameescape(a:tfile)
 let line1= curline + 1
 let line2= line("$") - lastline + 1
 else
 " not readable
-"   call Decho("ro=".&ro." ma=".&ma." mod=".&mod." wrap=".&wrap)
+"   call Decho("ro=".&l:ro." ma=".&l:ma." mod=".&l:mod." wrap=".&l:wrap)
 "   call Decho("tfile<".a:tfile."> not readable")
 call netrw#ErrorMsg(s:WARNING,"file <".a:tfile."> not readable",9)
 "   call Dret("NetrwGetFile : tfile<".a:tfile."> not readable")
 return
 endif
 "  call Decho("readcmd<".a:readcmd."> cmdarg<".v:cmdarg."> tfile<".a:tfile."> readable=".s:FileReadable(a:tfile))
 " make sure file is being displayed
 "  redraw!
-"  call Decho("ro=".&ro." ma=".&ma." mod=".&mod." wrap=".&wrap)
+"  call Decho("ro=".&l:ro." ma=".&l:ma." mod=".&l:mod." wrap=".&l:wrap)
 "  call Dret("NetrwGetFile")
 endfun
 " ------------------------------------------------------------------------
 " s:NetrwMethod:  determine method of transfer {{{2
 nnoremap <buffer> <silent> t		:call <SID>NetrwSplit(4)<cr>
 nnoremap <buffer> <silent> u		:<c-u>call <SID>NetrwBookmarkDir(4,expand("%"))<cr>
 nnoremap <buffer> <silent> U		:<c-u>call <SID>NetrwBookmarkDir(5,expand("%"))<cr>
 nnoremap <buffer> <silent> v		:call <SID>NetrwSplit(5)<cr>
 nnoremap <buffer> <silent> x		:call netrw#NetrwBrowseX(<SID>NetrwBrowseChgDir(1,<SID>NetrwGetWord(),0),0)"<cr>
+nnoremap <buffer> <silent> %		:call <SID>NetrwOpenFile(1)<cr>
 if !hasmapto('<Plug>NetrwHideEdit')
 nmap <buffer> <unique> <c-h> <Plug>NetrwHideEdit
 endif
 nnoremap <buffer> <silent> <Plug>NetrwHideEdit	:call <SID>NetrwHideEdit(1)<cr>
 if !hasmapto('<Plug>NetrwRefresh')
 nnoremap <buffer> <silent> t		:call <SID>NetrwSplit(1)<cr>
 nnoremap <buffer> <silent> u		:<c-u>call <SID>NetrwBookmarkDir(4,b:netrw_curdir)<cr>
 nnoremap <buffer> <silent> U		:<c-u>call <SID>NetrwBookmarkDir(5,b:netrw_curdir)<cr>
 nnoremap <buffer> <silent> v		:call <SID>NetrwSplit(2)<cr>
 nnoremap <buffer> <silent> x		:call netrw#NetrwBrowseX(<SID>NetrwBrowseChgDir(0,<SID>NetrwGetWord()),1)<cr>
+nnoremap <buffer> <silent> %		:call <SID>NetrwOpenFile(0)<cr>
 if !hasmapto('<Plug>NetrwHideEdit')
 nmap <buffer> <c-h> <Plug>NetrwHideEdit
 endif
 nnoremap <buffer> <silent> <Plug>NetrwHideEdit	:call <SID>NetrwHideEdit(0)<cr>
 if !hasmapto('<Plug>NetrwRefresh')
 exe 'nnoremap <buffer> <silent> d	:call <SID>NetrwMakeDir("'.s:user.s:machine.'")<cr>'
 exe 'nnoremap <buffer> <silent> D	:call <SID>NetrwRemoteRm("'.s:user.s:machine.'","'.s:path.'")<cr>'
 exe 'vnoremap <buffer> <silent> D	:call <SID>NetrwRemoteRm("'.s:user.s:machine.'","'.s:path.'")<cr>'
 exe 'nnoremap <buffer> <silent> R	:call <SID>NetrwRemoteRename("'.s:user.s:machine.'","'.s:path.'")<cr>'
 exe 'vnoremap <buffer> <silent> R	:call <SID>NetrwRemoteRename("'.s:user.s:machine.'","'.s:path.'")<cr>'
-nnoremap <buffer> <F1>			:he netrw-browse-cmds<cr>
+nnoremap <buffer> <F1>			:he netrw-quickhelp<cr>
 endif
 call s:SetRexDir(a:islocal,b:netrw_curdir)
 "  call Dret("s:BrowserMaps")
 endfun
 "     call Decho("setlocal ma noro")
 %d
 setlocal nomod
 "     call Decho("setlocal nomod")
 endif
-"    call Decho("exe e! ".g:NETRW_DIRHIST_{g:NETRW_DIRHIST_CNT})
+"    "    call Decho("exe e! ".fnameescape(g:NETRW_DIRHIST_{g:NETRW_DIRHIST_CNT}))
-exe "e! ".g:NETRW_DIRHIST_{g:NETRW_DIRHIST_CNT}
+exe "e! ".fnameescape(g:NETRW_DIRHIST_{g:NETRW_DIRHIST_CNT})
 else
 let g:NETRW_DIRHIST_CNT= ( g:NETRW_DIRHIST_CNT + 1 ) % g:netrw_dirhistmax
 echo "Sorry, no predecessor directory exists yet"
 endif
 %d
 "     call Decho("removed all lines from buffer (%d)")
 setlocal nomod
 "     call Decho("setlocal nomod")
 endif
-"    call Decho("exe e! ".g:NETRW_DIRHIST_{g:NETRW_DIRHIST_CNT})
+"    call Decho("exe e! ".fnameescape(g:NETRW_DIRHIST_{g:NETRW_DIRHIST_CNT}))
-exe "e! ".g:NETRW_DIRHIST_{g:NETRW_DIRHIST_CNT}
+exe "e! ".fnameescape(g:NETRW_DIRHIST_{g:NETRW_DIRHIST_CNT})
 else
 let g:NETRW_DIRHIST_CNT= ( g:NETRW_DIRHIST_CNT - 1 ) % g:netrw_dirhistmax
 if g:NETRW_DIRHIST_CNT < 0
 let g:NETRW_DIRHIST_CNT= g:NETRW_DIRHIST_CNT + g:netrw_dirhistmax
 endif
 "  call Decho("tab#".tabpagenr()." win#".winnr())
 "  call Dredir("ls!")
 if exists("s:netrw_skipbrowse")
 unlet s:netrw_skipbrowse
-"   call Decho("ro=".&ro." ma=".&ma." mod=".&mod." wrap=".&wrap)
+"   call Decho("ro=".&l:ro." ma=".&l:ma." mod=".&l:mod." wrap=".&l:wrap)
 "   call Dret("s:NetrwBrowse : s:netrw_skipbrowse=".s:netrw_skipbrowse)
 return
 endif
 if !exists("*shellescape")
 call netrw#ErrorMsg(s:ERROR,"netrw can't run -- your vim is missing shellescape()",69)
 mark '
 call s:NetrwEnew(a:dirname)
 setlocal ma noro
 "   call Decho("setlocal ma noro")
 let b:netrw_curdir= a:dirname
-"   call Decho("exe silent! keepalt file ".s:method."://".s:user.s:machine."/".fnameescape(s:path)." (bt=".&bt.")")
+"   call Decho("exe silent! keepalt file ".fnameescape(s:method."://".s:user.s:machine."/".s:path)." (bt=".&bt.")")
-exe "silent! keepalt file ".s:method."://".s:user.s:machine."/".fnameescape(s:path)
+exe "silent! keepalt file ".fnameescape(s:method."://".s:user.s:machine."/".s:path)
-exe "silent keepalt doau BufReadPre ".s:fname
+exe "silent keepalt doau BufReadPre ".fnameescape(s:fname)
 silent call netrw#NetRead(2,s:method."://".s:user.s:machine."/".s:path)
 if s:path !~ '.tar.bz2$' && s:path !~ '.tar.gz'
 " netrw.vim and tar.vim have already handled decompression of the tarball; avoiding gzip.vim error
-exe "silent keepalt doau BufReadPost ".s:fname
+exe "silent keepalt doau BufReadPost ".fnameescape(s:fname)
 endif
 " save certain window-oriented variables into buffer-oriented variables {{{3
 call s:SetBufWinVars()
 call s:NetrwOptionRestore("w:")
 setlocal ma nomod
-"   call Decho("ro=".&ro." ma=".&ma." mod=".&mod." wrap=".&wrap)
+"   call Decho("ro=".&l:ro." ma=".&l:ma." mod=".&l:mod." wrap=".&l:wrap)
 "   call Dret("s:NetrwBrowse : file<".s:fname.">")
 return
 endif
 " use buffer-oriented WinVars if buffer ones exist but window ones don't {{{3
 2match none
 endif
 if reusing
 call s:NetrwOptionRestore("w:")
 setlocal noma nomod nowrap
-"   call Decho("ro=".&ro." ma=".&ma." mod=".&mod." wrap=".&wrap)
+"   call Decho("ro=".&l:ro." ma=".&l:ma." mod=".&l:mod." wrap=".&l:wrap)
 "   call Dret("s:NetrwBrowse : re-using buffer")
 return
 endif
 " set b:netrw_curdir to the new directory name {{{3
 let b:netrw_curdir= w:netrw_prvdir
 else
 call s:NetrwOptionRestore("w:")
 setlocal noma nomod nowrap
 let b:netrw_curdir= dirname
-"       call Decho("ro=".&ro." ma=".&ma." mod=".&mod." wrap=".&wrap)
+"       call Decho("ro=".&l:ro." ma=".&l:ma." mod=".&l:mod." wrap=".&l:wrap)
 "       call Dret("s:NetrwBrowse : reusing buffer#".(exists("bufnum")? bufnum : 'N/A')."<".dirname."> getcwd<".getcwd().">")
 return
 endif
 endtry
 endif
 if !exists("g:netrw_quiet")
 call netrw#ErrorMsg(s:ERROR,"netrw doesn't understand your dirname<".dirname.">",20)
 endif
 call s:NetrwOptionRestore("w:")
 setlocal noma nomod nowrap
-"    call Decho("ro=".&ro." ma=".&ma." mod=".&mod." wrap=".&wrap)
+"    call Decho("ro=".&l:ro." ma=".&l:ma." mod=".&l:mod." wrap=".&l:wrap)
 "    call Dret("s:NetrwBrowse : badly formatted dirname<".dirname.">")
 return
 endif
 let b:netrw_curdir= dirname
 "   call Decho("b:netrw_curdir<".b:netrw_curdir."> (remote)")
 " Directory Listing: {{{3
 " -----------------------
 call s:BrowserMaps(a:islocal)
 call s:PerformListing(a:islocal)
-"  call Decho("ro=".&ro." ma=".&ma." mod=".&mod." wrap=".&wrap)
+"  call Decho("ro=".&l:ro." ma=".&l:ma." mod=".&l:mod." wrap=".&l:wrap)
 "  call Dret("s:NetrwBrowse : did PerformListing")
 return
 endfun
 " ---------------------------------------------------------------------
 "   call Decho("  findbuf1: bufnum=bufnr('".dirname."')=".bufnum." bufname(".bufnum.")<".bufname(bufnum)."> (initial)")
 " note: !~ was used just below, but that means using ../ to go back would match (ie. abc/def/  and abc/ matches)
 if bufnum > 0 && bufname(bufnum) != dirname && bufname(bufnum) != '.'
 " handle approximate matches
-"    call Decho("  handling approx match: bufnum#%d<".bufname(bufnum)."> approx= dirname<".dirname.">")
+"    call Decho("  handling approx match: bufnum#%d<".bufname(bufnum)."> approx=dirname<".dirname.">")
 let ibuf    = 1
 let buflast = bufnr("$")
 "    call Decho("  findbuf2: buflast=".buflast)
 while ibuf <= buflast
 let bname= substitute(bufname(ibuf),'\\','/','g')
+let bname= substitute(bname,'.\zs/$','','')
 "     call Decho("  findbuf3: dirname<".dirname."> bufname(".ibuf.")<".bname.">")
-if bname != '' && bname !~ '/' && dirname =~ '/'.bname.'/\=$' | break | endif
+if bname != '' && dirname =~ '/'.bname.'/\=$' | break | endif
 if bname   =~ '^'.dirname.'/\=$' | break | endif
 if dirname =~ '^'.bname.'/$'     | break | endif
 let ibuf= ibuf + 1
 endwhile
 if ibuf > buflast
 let s:netrw_treelistnum= 1
 else
 let s:netrw_treelistnum= s:netrw_treelistnum + 1
 endif
 let w:netrw_treebufnr= bufnr("%")
-"    call Decho("  exe silent! keepalt file NetrwTreeListing ".s:netrw_treelistnum)
+"    call Decho("  exe silent! keepalt file NetrwTreeListing ".fnameescape(s:netrw_treelistnum))
-exe 'silent! keepalt file NetrwTreeListing\ '.s:netrw_treelistnum
+exe 'silent! keepalt file NetrwTreeListing\ '.fnameescape(s:netrw_treelistnum)
 nnoremap <silent> <buffer> [	:silent call <SID>TreeListMove('[')<cr>
 nnoremap <silent> <buffer> ]	:silent call <SID>TreeListMove(']')<cr>
 nnoremap <silent> <buffer> [[       :silent call <SID>TreeListMove('[')<cr>
 nnoremap <silent> <buffer> ]]       :silent call <SID>TreeListMove(']')<cr>
 "    call Decho("  tree listing#".s:netrw_treelistnum." bufnr=".w:netrw_treebufnr)
 else
 "    let v:errmsg= "" " Decho
 let escdirname= fnameescape(dirname)
 "    call Decho("  errmsg<".v:errmsg."> bufnr(".escdirname.")=".bufnr(escdirname)."<".bufname(bufnr(escdirname)).">")
-"    call Decho('  exe silent! keepalt file '.escdirname)
+"    call Decho('  exe silent! keepalt file '.fnameescape(escdirname))
-exe 'silent! keepalt file '.escdirname
+exe 'silent! keepalt file '.fnameescape(escdirname)
 "    call Decho("  errmsg<".v:errmsg."> bufnr(".escdirname.")=".bufnr(escdirname)."<".bufname(bufnr(escdirname)).">")
 endif
 "   call Decho("  named enew buffer#".bufnr("%")."<".bufname("%").">")
 else " Re-use the buffer
 else
 "    call Decho("  reusing buffer#".bufnum."<".((bufnum > 0)? bufname(bufnum) : "")."> using:  b ".bufnum)
 exe "b ".bufnum
 endif
 if bufname("%") == '.'
-exe "silent! keepalt file ".escape(getcwd(),' ')
+"    call Decho("exe silent! keepalt file ".fnameescape(getcwd()))
+exe "silent! keepalt file ".fnameescape(getcwd())
 endif
 let &ei= eikeep
 if line("$") <= 1
 call s:NetrwListSettings(a:islocal)
 "    call Dret("s:NetrwGetBuffer 0 : re-using buffer#".bufnr("%").", but its empty, so refresh it")
 "  med    1         D      H
 "  fast   2         H      H
 "  call Decho("--do netrw settings: make this buffer not-a-file, modifiable, not line-numbered, etc--")
 let fname= expand("%")
 call s:NetrwListSettings(a:islocal)
-exe "keepalt file ".escape(fname,' ')
+"  call Decho("exe keepalt file ".fnameescape(fname))
+exe "keepalt file ".fnameescape(fname)
 " delete all lines from buffer {{{3
 "  call Decho("--delete all lines from buffer--")
 "  call Decho("  clear buffer<".expand("%")."> with :%d")
 keepalt silent! %d
 else
 call cursor(line("."),filestart+1)
 norm! ma
 endif
 let rega= @a
-call cursor(line("."),filestart+b:netrw_cpf+1)
+let eofname= filestart + b:netrw_cpf + 1
-norm! "ay`a
+if eofname <= col("$")
+call cursor(line("."),filestart+b:netrw_cpf+1)
+norm! "ay`a
+else
+norm! "ay$
+endif
 let dirname = @a
 let @a      = rega
 "   call Decho("2: dirname<".dirname.">")
 let dirname= substitute(dirname,'\s\+$','','e')
 "   call Decho("3: dirname<".dirname.">")
 " ---------------------------------------------------------------------
 " s:NetrwListSettings: {{{2
 fun! s:NetrwListSettings(islocal)
 "  call Dfunc("s:NetrwListSettings(islocal=".a:islocal.")")
 let fname= bufname("%")
+"  call Decho("setlocal bt=nofile nobl ma nonu nowrap noro")
 setlocal bt=nofile nobl ma nonu nowrap noro
-"  call Decho("setlocal bt=nofile nobl ma nonu nowrap noro")
+"  call Decho("exe keepalt file ".fnameescape(fname))
-exe "keepalt file ".escape(fname,' ')
+exe "keepalt file ".fnameescape(fname)
 if g:netrw_use_noswf
 setlocal noswf
 endif
 "  call Dredir("ls!")
 "  call Decho("exe setlocal ts=".g:netrw_maxfilenamelen)
 let histcnt = 0
 while ( first || cnt != g:NETRW_DIRHIST_CNT )
 let histcnt  = histcnt + 1
 let priority = g:NETRW_DIRHIST_CNT + histcnt
 if exists("g:NETRW_DIRHIST_{cnt}")
-let bmdir= escape(g:NETRW_DIRHIST_{cnt},'. ')
+let bmdir= escape(g:NETRW_DIRHIST_{cnt},'/&? ')
 "     call Decho('silent! menu '.g:NetrwMenuPriority.".3.".priority." ".g:NetrwTopLvlMenu.'History.'.bmdir.'	:e '.bmdir)
 exe 'silent! menu '.g:NetrwMenuPriority.".3.".priority." ".g:NetrwTopLvlMenu.'History.'.bmdir.'	:e '.bmdir."\<cr>"
 endif
 let first = 0
 let cnt   = ( cnt - 1 ) % g:netrw_dirhistmax
 let dirname= s:ComposePath(dirname,newdir)
 endif
 "   call Decho("handling a file: dirname<".dirname."> (a:0=".a:0.")")
 " this lets NetrwBrowseX avoid the edit
 if a:0 < 1
-"    call Decho("dirname<".dirname."> netrw_cd_escape<".g:netrw_cd_escape."> browse_split=".g:netrw_browse_split)
 "    call Decho("set up windows for editing<".fnameescape(dirname).">  didsplit=".(exists("s:didsplit")? s:didsplit : "doesn't exist"))
 call s:NetrwOptionRestore("s:")
 if !exists("s:didsplit")
 if     g:netrw_browse_split == 1
 new
 " (lower case the extension, make a local copy of a remote file)
 let exten= substitute(a:fname,'.*\.\(.\{-}\)','\1','e')
 if has("win32") || has("win95") || has("win64") || has("win16")
 let exten= substitute(exten,'^.*$','\L&\E','')
 endif
-let fname= escape(a:fname,"%#")
-"  call Decho("fname<".fname."> after escape()")
 " seems kde systems often have gnome-open due to dependencies, even though
 " gnome-open's subsidiary display tools are largely absent.  Kde systems
 " usually have "kdeinit" running, though...  (tnx Mikolaj Machowski)
 if !exists("s:haskdeinit")
 if has("unix")
-let s:haskdeinit= s:System("system",'ps -e') =~ 'kdeinit'
+let s:haskdeinit= system("ps -e") =~ 'kdeinit'
 if v:shell_error
 let s:haskdeinit = 0
 endif
 else
 let s:haskdeinit= 0
 endif
 if a:remote == 1
 " create a local copy
 let fname= fnamemodify(tempname(),":r").".".exten
-"   call Decho("a:remote=".a:remote.": create a local copy of <".a:fname."> as <".fname.">")
+"   call Decho("a:remote=".a:remote.": create a local copy of <".fname."> as <".fname.">")
-exe "silent keepjumps bot 1new ".a:fname
+exe "silent keepjumps bot 1new ".fnameescape(fname)
 setlocal bh=delete
-"   call Decho("read <".fname.">, now writing: exe w! ".fname)
+"   call Decho("read <".fnameescape(fname).">, now writing: exe w! ".fnameescape(fname))
-exe "silent! w! ".fname
+exe "silent! w! ".fnameescape(fname)
 q
+else
+let fname= a:fname
 endif
 "  call Decho("exten<".exten."> "."netrwFileHandlers#NFH_".exten."():exists=".exists("*netrwFileHandlers#NFH_".exten))
 " set up redirection
 if &srr =~ "%s"
 "   call Decho("g:netrw_browsex_viewer<".g:netrw_browsex_viewer.">")
 let ret= netrwFileHandlers#Invoke(exten,fname)
 elseif exists("g:netrw_browsex_viewer") && executable(viewer)
 "   call Decho("g:netrw_browsex_viewer<".g:netrw_browsex_viewer.">")
-"   call Decho("exe silent !".viewer." ".viewopt.shellescape(fname).redir)
+"   call Decho("exe silent !".viewer." ".viewopt.shellescape(fname,1).redir)
-exe "silent !".viewer." ".viewopt.shellescape(fname).redir
+exe "silent !".viewer." ".viewopt.shellescape(fname,1).redir
 let ret= v:shell_error
 elseif has("win32") || has("win64")
-"   call Decho('exe silent !start rundll32 url.dll,FileProtocolHandler '.shellescape(fname))
+"   call Decho('exe silent !start rundll32 url.dll,FileProtocolHandler '.shellescape(fname,1))
-exe 'silent !start rundll32 url.dll,FileProtocolHandler '.shellescape(fname)
+exe 'silent !start rundll32 url.dll,FileProtocolHandler '.shellescape(fname,1)
 call inputsave()|call input("Press <cr> to continue")|call inputrestore()
 let ret= v:shell_error
 elseif has("unix") && executable("gnome-open") && !s:haskdeinit
-"   call Decho("exe silent !gnome-open ".shellescape(fname)." ".redir)
+"   call Decho("exe silent !gnome-open ".shellescape(fname,1)." ".redir)
-exe "silent !gnome-open ".shellescape(fname).redir
+exe "silent !gnome-open ".shellescape(fname,1).redir
 let ret= v:shell_error
 elseif has("unix") && executable("kfmclient") && s:haskdeinit
-"   call Decho("exe silent !kfmclient exec ".shellescape(fname)." ".redir)
+"   call Decho("exe silent !kfmclient exec ".shellescape(fname,1)." ".redir)
-exe "silent !kfmclient exec ".shellescape(fname)." ".redir
+exe "silent !kfmclient exec ".shellescape(fname,1)." ".redir
 let ret= v:shell_error
 elseif has("macunix") && executable("open")
-"   call Decho("exe silent !open ".shellescape(fname)." ".redir)
+"   call Decho("exe silent !open ".shellescape(fname,1)." ".redir)
-exe "silent !open ".shellescape(fname)." ".redir
+exe "silent !open ".shellescape(fname,1)." ".redir
 let ret= v:shell_error
 else
 " netrwFileHandlers#Invoke() always returns 0
 let ret= netrwFileHandlers#Invoke(exten,fname)
 " if unsuccessful, attempt netrwFileHandlers#Invoke()
 if ret
 let ret= netrwFileHandlers#Invoke(exten,fname)
 endif
-"  redraw!
+" restoring redraw! after external file handlers
+redraw!
 " cleanup: remove temporary file,
 "          delete current buffer if success with handler,
 "          return to prior buffer (directory listing)
 "          Feb 12, 2008: had to de-activiate removal of
 "          temporary file because it wasn't getting seen.
 "  if a:remote == 1 && fname != a:fname
 "   call Decho("deleting temporary file<".fname.">")
-"   call s:System("delete",fname)
+"   call s:NetrwDelete(fname)
 "  endif
 if a:remote == 1
 setlocal bh=delete bt=nofile
 if g:netrw_use_noswf
 call mkdir(fullnewdir,"p")
 else
 let netrw_origdir= s:NetrwGetcwd(1)
 exe 'keepjumps lcd '.fnameescape(b:netrw_curdir)
 "    call Decho("netrw_origdir<".netrw_origdir.">: lcd b:netrw_curdir<".fnameescape(b:netrw_curdir).">")
-"    call Decho("exe silent! !".g:netrw_local_mkdir.' '.shellescape(newdirname))
+"    call Decho("exe silent! !".g:netrw_local_mkdir.' '.shellescape(newdirname,1))
-exe "silent! !".g:netrw_local_mkdir.' '.shellescape(newdirname)
+exe "silent! !".g:netrw_local_mkdir.' '.shellescape(newdirname,1)
 if !g:netrw_keepdir
 exe 'keepjumps lcd '.fnameescape(netrw_origdir)
 "     call Decho("netrw_keepdir=".g:netrw_keepdir.": keepjumps lcd ".fnameescape(netrw_origdir)." getcwd<".getcwd().">")
 endif
 endif
 elseif !exists("b:netrw_method") || b:netrw_method == 4
 " Remote mkdir:
 "   call Decho("remote mkdir")
 let mkdircmd  = s:MakeSshCmd(g:netrw_mkdir_cmd)
 let newdirname= substitute(b:netrw_curdir,'^\%(.\{-}/\)\{3}\(.*\)$','\1','').newdirname
-"   call Decho("exe silent! !".mkdircmd." ".shellescape(newdirname))
+"   call Decho("exe silent! !".mkdircmd." ".shellescape(newdirname,1))
-exe "silent! !".mkdircmd." ".shellescape(newdirname)
+exe "silent! !".mkdircmd." ".shellescape(newdirname,1)
 if v:shell_error == 0
 " refresh listing
 let svpos= netrw#NetrwSavePosn()
 call s:NetrwRefresh(0,s:NetrwBrowseChgDir(0,'./'))
 call netrw#NetrwRestorePosn(svpos)
 for fname in s:netrwmarkfilelist_{curbufnr}
 " for every filename in the marked list
 for sfx in sort(keys(g:netrw_decompress))
 if fname =~ '\'.sfx.'$'
 " fname has a suffix indicating that its compressed; apply associated decompression routine
-let exe= g:netrw_decompress[sfx]
+let exe= s:WinPath(g:netrw_decompress[sfx])
 "      call Decho("fname<".fname."> is compressed so decompress with <".exe.">")
 if a:islocal
 if g:netrw_keepdir
-let fname= s:ComposePath(curdir,fname)
+let fname= shellescape(s:ComposePath(curdir,fname))
 endif
 else
-let fname= b:netrw_curdir.fname
+let fname= shellescape(b:netrw_curdir.fname)
 endif
 if executable(exe)
 if a:islocal
 	call system(exe." ".fname)
 else
 endfor
 if exists("exe")
 unlet exe
 elseif a:islocal
 " fname not a compressed file, so compress it
-call system(g:netrw_compress." ".s:ComposePath(b:netrw_curdir,fname))
+call system(s:WinPath(g:netrw_compress)." ".shellescape(s:ComposePath(b:netrw_curdir,fname)))
 else
 " fname not a compressed file, so compress it
-call s:RemoteSystem(g:netrw_compress." ".fname)
+call s:RemoteSystem(s:WinPath(g:netrw_compress)." ".shellescape(fname))
 endif
 endfor
 call s:NetrwUnmarkList(curbufnr,curdir)
 call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,'./'))
 call netrw#NetrwRestorePosn(svpos)
 if      a:islocal &&  s:netrwmftgt_islocal
 " Copy marked files, local directory to local directory
 "   call Decho("copy from local to local")
 let args= join(map(copy(s:netrwmarkfilelist_{bufnr('%')}),"b:netrw_curdir.\"/\".shellescape(v:val)"))
 "   call Decho("system(".g:netrw_localcopycmd." ".args." ".shellescape(s:netrwmftgt).")")
-call system(g:netrw_localcopycmd." ".args." ".shellescape(s:netrwmftgt))
+call system(s:WinPath(g:netrw_localcopycmd)." ".args." ".shellescape(s:netrwmftgt))
 elseif  a:islocal && !s:netrwmftgt_islocal
 " Copy marked files, local directory to remote directory
 "   call Decho("copy from local to remote")
 call s:NetrwUpload(s:netrwmarkfilelist_{bufnr('%')},s:netrwmftgt)
 let tmpdir= curdir."/".tmpdir
 endif
 if exists("*mkdir")
 call mkdir(tmpdir)
 else
-exe "silent! !".g:netrw_local_mkdir.' '.shellescape(tmpdir)
+exe "silent! !".g:netrw_local_mkdir.' '.shellescape(tmpdir,1)
 endif
 if isdirectory(tmpdir)
 exe "keepjumps lcd ".fnameescape(tmpdir)
 call netrw#NetrwObtain(a:islocal,s:netrwmarkfilelist_{bufnr('%')},tmpdir)
 let localfiles= map(copy(s:netrwmarkfilelist_{bufnr('%')}),'substitute(v:val,"^.*/","","")')
 call s:NetrwUpload(localfiles,s:netrwmftgt)
 if getcwd() == tmpdir
 for fname in s:netrwmarkfilelist_{bufnr('%')}
-call s:System("delete",fname)
+call s:NetrwDelete(fname)
 endfor
 exe "keepjumps lcd ".fnameescape(curdir)
-exe "silent !".g:netrw_local_rmdir." ".fnameescape(tmpdir)
+exe "silent !".g:netrw_local_rmdir." ".shellescape(tmpdir,1)
 else
 exe "keepjumps lcd ".fnameescape(curdir)
 endif
 endif
 endif
 " apply command to marked files.  Substitute: filename -> %
 " If no %, then append a space and the filename to the command
 for fname in s:netrwmarkfilelist_{curbufnr}
 if a:islocal
 if g:netrw_keepdir
-let fname= s:ComposePath(curdir,fname)
+let fname= shellescape(s:WinPath(s:ComposePath(curdir,fname)))
 endif
 else
-let fname= b:netrw_curdir.fname
+let fname= shellescape(s:WinPath(b:netrw_curdir.fname))
 endif
 if cmd =~ '%'
 let xcmd= substitute(cmd,'%',fname,'g')
 else
 let xcmd= cmd.' '.fname
 endif
 else
 let fname= curdir.fname
 endif
 " the autocmds will handle sourcing both local and remote files
-"    call Decho("exe so ".escape(fname,' '))
+"    call Decho("exe so ".fnameescape(fname))
-exe "so ".escape(fname,' ')
+exe "so ".fnameescape(fname)
 endfor
 2match none
 endif
 "  call Dret("s:NetrwMarkFileSource")
 endfun
 call system(g:netrw_ctags." ".netrwmarkfilelist)
 else
 call netrw#ErrorMsg(s:ERROR,"g:netrw_ctags<".g:netrw_ctags."> is not executable!",51)
 endif
 else
-let cmd= s:RemoteSystem(g:netrw_ctags." ".netrwmarkfilelist)
+let cmd   = s:RemoteSystem(g:netrw_ctags." ".netrwmarkfilelist)
 call netrw#NetrwObtain(a:islocal,"tags")
 let curdir= b:netrw_curdir
 1split
 e tags
 let path= substitute(curdir,'^\(.*\)/[^/]*$','\1/','')
 if !hadtgt
 norm! j
 endif
 "  call Dret("s:NetrwMarkFileTgt : netrwmftgt<".(exists("s:netrwmftgt")? s:netrwmftgt : "").">")
+endfun
+" ---------------------------------------------------------------------
+" s:NetrwOpenFile: query user for a filename and open it {{{2
+fun! s:NetrwOpenFile(islocal)
+"  call Dfunc("s:NetrwOpenFile(islocal=".a:islocal.")")
+call inputsave()
+let fname= input("Enter filename: ")
+call inputrestore()
+if fname !~ '[/\\]'
+if exists("b:netrw_curdir")
+if exists("g:netrw_quiet")
+let netrw_quiet_keep = g:netrw_quiet
+endif
+let g:netrw_quiet    = 1
+if b:netrw_curdir =~ '/$'
+exe "e ".fnameescape(b:netrw_curdir.fname)
+else
+exe "e ".fnameescape(b:netrw_curdir."/".fname)
+endif
+if exists("netrw_quiet_keep")
+let g:netrw_quiet= netrw_quiet_keep
+else
+unlet g:netrw_quiet
+endif
+endif
+else
+exe "e ".fnameescape(fname)
+endif
+"  call Dret("s:NetrwOpenFile")
 endfun
 " ---------------------------------------------------------------------
 " s:NetrwUnmarkList: delete local marked file lists and remove their contents from the global marked-file list {{{2
 fun! s:NetrwUnmarkList(curbufnr,curdir)
 if exists("b:netrw_curdir") && getcwd() != b:netrw_curdir
 let topath= s:ComposePath(tgtdir,"")
 if (has("win32") || has("win95") || has("win64") || has("win16"))
 " transfer files one at time
 for fname in fnamelist
-"      call Decho("system(".g:netrw_localcopycmd." ".fname." ".shellescape(topath).")")
+"      call Decho("system(".g:netrw_localcopycmd." ".shellescape(fname)." ".shellescape(topath).")")
-call system(g:netrw_localcopycmd." ".fname." ".shellescape(topath))
+call system(g:netrw_localcopycmd." ".shellescape(fname)." ".shellescape(topath))
 endfor
 else
 " transfer files with one command
 let filelist= join(map(copy(fname),"shellescape(v:val)"))
 "     call Decho("system(".g:netrw_localcopycmd." ".filelist." ".shellescape(topath).")")
 if b:netrw_fname =~ '/'
 let path= substitute(b:netrw_fname,'^\(.*/\).\{-}$','\1','')
 else
 let path= ""
 endif
-let filelist= join(map(copy(fnamelist),'shellescape(g:netrw_machine.":".escape(path.v:val,g:netrw_fname_escape))'))
+let filelist= join(map(copy(fnamelist),'shellescape(g:netrw_machine.":".path.v:val,1))'))
-"    call Decho("exe ".s:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".filelist." ".shellescape(tgtdir))
+"    call Decho("exe ".s:netrw_silentxfer."!".g:netrw_scp_cmd.shellescape(useport,1)." ".filelist." ".shellescape(tgtdir,1))
-exe s:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".filelist." ".shellescape(tgtdir)
+exe s:netrw_silentxfer."!".g:netrw_scp_cmd.shellescape(useport,1)." ".filelist." ".shellescape(tgtdir,1)
 elseif b:netrw_method == 2
 " obtain file using ftp + .netrc
 "     call Decho("obtain via ftp+.netrc (method #2)")
 call s:SaveBufVars()|silent keepjumps new|call s:RestoreBufVars()
 for fname in fnamelist
 call setline(line("$")+1,'get "'.fname.'"')
 "      call Decho("filter input: ".getline('$'))
 endfor
 if exists("g:netrw_port") && g:netrw_port != ""
-"      call Decho("executing: %!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port)
+"      call Decho("executing: %!".g:netrw_ftp_cmd." -i ".shellescape(g:netrw_machine,1)." ".shellescape(g:netrw_port,1))
-exe s:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port
+exe s:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".shellescape(g:netrw_machine,1)." ".shellescape(g:netrw_port,1)
 else
-"      call Decho("executing: %!".g:netrw_ftp_cmd." -i ".g:netrw_machine)
+"      call Decho("executing: %!".g:netrw_ftp_cmd." -i ".shellescape(g:netrw_machine,1))
-exe s:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".g:netrw_machine
+exe s:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".shellescape(g:netrw_machine,1)
 endif
 " If the result of the ftp operation isn't blank, show an error message (tnx to Doug Claar)
 if getline(1) !~ "^$" && !exists("g:netrw_quiet") && getline(1) !~ '^Trying '
 let debugkeep= &debug
 setlocal debug=msg
 exe "e ".efname
 "   call Decho("now locally editing<".expand("%").">, has ".line("$")." lines")
 if a:tgt =~ '/$'
 let wfname= substitute(a:fname,'^.*/','','')
 let wfname= escape(a:tgt.wfname,g:netrw_fname_escape)
-"    call Decho("exe w! ".wfname)
+"    call Decho("exe w! ".fnameescape(wfname))
-exe "w! ".wfname
+exe "w! ".fnameescape(wfname)
 else
-let wfname= escape(a:tgt,g:netrw_fname_escape)
+"    call Decho("writing local->remote: exe w ".fnameescape(a:tgt))
-"    call Decho("writing local->remote: exe w ".wfname)
+exe "w ".fnameescape(a:tgt)
-exe "w ".wfname
 "    call Decho("done writing local->remote")
 endif
 q!
 elseif type(a:fname) == 3
 else
 let useport= ""
 endif
 let machine = substitute(a:tgt,'^scp://\([^/:]\+\).*$','\1','')
 let tgt     = substitute(a:tgt,'^scp://[^/]\+/\(.*\)$','\1','')
-"    call Decho("exe ".s:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".args." ".shellescape(machine.":".escape(tgt,g:netrw_fname_escape)))
+"    call Decho("exe ".s:netrw_silentxfer."!".g:netrw_scp_cmd.shellescape(useport,1)." ".args." ".shellescape(machine.":".tgt,1))
-exe s:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".args." ".shellescape(machine.":".escape(tgt,g:netrw_fname_escape))
+exe s:netrw_silentxfer."!".g:netrw_scp_cmd.shellescape(useport,1)." ".args." ".shellescape(machine.":".tgt,1)
 exe "keepjumps silent lcd ".fnameescape(curdir)
 elseif a:tgt =~ '^ftp:'
 call s:NetrwMethod(a:tgt)
 call setline(line("$")+1,'put "'.fname.'"')
 "      call Decho("filter input: ".getline('$'))
 endfor
 if exists("g:netrw_port") && g:netrw_port != ""
-"      call Decho("executing: ".s:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port)
+"      call Decho("executing: ".s:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".shellescape(g:netrw_machine,1)." ".shellescape(g:netrw_port,1))
-exe s:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port
+exe s:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".shellescape(g:netrw_machine,1)." ".shellescape(g:netrw_port,1)
 else
 "      call Decho("filter input window#".winnr())
-"      call Decho("executing: ".s:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".g:netrw_machine)
+"      call Decho("executing: ".s:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".shellescape(g:netrw_machine,1))
-exe s:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".g:netrw_machine
+exe s:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".shellescape(g:netrw_machine,1)
 endif
 " If the result of the ftp operation isn't blank, show an error message (tnx to Doug Claar)
 silent g/Local directory now/d
 if getline(1) !~ "^$" && !exists("g:netrw_quiet") && getline(1) !~ '^Trying '
 call netrw#ErrorMsg(s:ERROR,getline(1),14)
 if w:netrw_bannercnt < line("$")
 "      call Decho("g:netrw_sort_direction=".g:netrw_sort_direction." (bannercnt=".w:netrw_bannercnt.")")
 if g:netrw_sort_direction =~ 'n'
 " normal direction sorting
-exe 'silent keepjumps '.w:netrw_bannercnt.',$sort'
+exe 'silent keepjumps '.w:netrw_bannercnt.',$sort'.' '.g:netrw_sort_options
 else
 " reverse direction sorting
-exe 'silent keepjumps '.w:netrw_bannercnt.',$sort!'
+exe 'silent keepjumps '.w:netrw_bannercnt.',$sort!'.' '.g:netrw_sort_options
 endif
 endif
 " remove priority pattern prefix
 "     call Decho("remove priority pattern prefix")
 let sepchr= "\<Char-0xff>"
 elseif a:islocal
 if w:netrw_bannercnt < line("$")
 "      call Decho("g:netrw_sort_direction=".g:netrw_sort_direction)
 if g:netrw_sort_direction =~ 'n'
 "       call Decho('exe silent keepjumps '.w:netrw_bannercnt.',$sort')
-exe 'silent keepjumps '.w:netrw_bannercnt.',$sort'
+exe 'silent keepjumps '.w:netrw_bannercnt.',$sort'.' '.g:netrw_sort_options
 else
 "       call Decho('exe silent keepjumps '.w:netrw_bannercnt.',$sort!')
-exe 'silent keepjumps '.w:netrw_bannercnt.',$sort!'
+exe 'silent keepjumps '.w:netrw_bannercnt.',$sort!'.' '.g:netrw_sort_options
 endif
 endif
 exe 'silent keepjumps '.w:netrw_bannercnt.',$s/^\d\{-}\///e'
 endif
 " use ssh to get remote file listing {{{3
 "   call Decho("use ssh to get remote file listing: s:path<".s:path.">")
 let listcmd= s:MakeSshCmd(g:netrw_list_cmd)
 "   call Decho("listcmd<".listcmd."> (using g:netrw_list_cmd)")
 if g:netrw_scp_cmd =~ '^pscp'
-"    call Decho("1: exe silent r! ".listcmd.shellescape(s:path))
+"    call Decho("1: exe silent r! ".listcmd.s:path)
-exe "silent r! ".listcmd.shellescape(s:path)
+exe "silent r! ".listcmd.s:path
 " remove rubbish and adjust listing format of 'pscp' to 'ssh ls -FLa' like
 g/^Listing directory/d
 g/^d[-rwx][-rwx][-rwx]/s+$+/+e
 silent g/^l[-rwx][-rwx][-rwx]/s+$+@+e
 if g:netrw_liststyle != s:LONGLIST
 else
 if s:path == ""
 "     call Decho("2: exe silent r! ".listcmd)
 exe "silent r! ".listcmd
 else
-"     call Decho("3: exe silent r! ".listcmd.' "'.shellescape(s:path).'"')
+"     call Decho("3: exe silent r! ".listcmd.' '.shellescape(s:path,1))
-exe "silent r! ".listcmd.' "'.shellescape(s:path).'"'
+exe "silent r! ".listcmd.' '.shellescape(s:path,1)
 "     call Decho("listcmd<".listcmd."> path<".s:path.">")
 endif
 endif
 " cleanup
 if all || ok =~ 'y\%[es]' || ok == ""
 if exists("w:netrw_method") && (w:netrw_method == 2 || w:netrw_method == 3)
 call s:NetrwRemoteFtpCmd(a:path,"rmdir ".a:rmfile)
 else
 let rmfile          = substitute(a:path.a:rmfile,'/$','','')
-let netrw_rmdir_cmd = s:MakeSshCmd(g:netrw_rmdir_cmd).' '.rmfile
+let netrw_rmdir_cmd = s:MakeSshCmd(s:WinPath(g:netrw_rmdir_cmd)).' '.shellescape(s:WinPath(rmfile))
 "      call Decho("attempt to remove dir: system(".netrw_rmdir_cmd.")")
-let ret= s:System("system",netrw_rmdir_cmd)
+let ret= system(netrw_rmdir_cmd)
 "      call Decho("returned=".ret." errcode=".v:shell_error)
 if v:shell_error != 0
-"       call Decho("v:shell_error not 0")
+"      call Decho("v:shell_error not 0")
-let netrw_rmf_cmd= s:MakeSshCmd(g:netrw_rmf_cmd).' '.substitute(rmfile,'[\/]$','','e')
+let netrw_rmf_cmd= s:MakeSshCmd(s:WinPath(g:netrw_rmf_cmd)).' '.shellescape(s:WinPath(substitute(rmfile,'[\/]$','','e')))
-"       call Decho("2nd attempt to remove dir: system(".netrw_rmf_cmd.")")
+"      call Decho("2nd attempt to remove dir: system(".netrw_rmf_cmd.")")
-let ret= s:System("system",netrw_rmf_cmd)
+let ret= system(netrw_rmf_cmd)
-"       call Decho("returned=".ret." errcode=".v:shell_error)
+"      call Decho("returned=".ret." errcode=".v:shell_error)
 if v:shell_error != 0 && !exists("g:netrw_quiet")
 	call netrw#ErrorMsg(s:ERROR,"unable to remove directory<".rmfile."> -- is it empty?",22)
 endif
 endif
 "    call Decho("filter input: ".getline('.'))
 endif
 call setline(line("$")+1,a:listcmd)
 "   exe "keepjumps ".w:netrw_bannercnt.',$g/^./call Decho("ftp#".line(".").": ".getline("."))'
 if exists("g:netrw_port") && g:netrw_port != ""
-"    call Decho("exe ".s:netrw_silentxfer.w:netrw_bannercnt.",$!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port)
+"    call Decho("exe ".s:netrw_silentxfer.w:netrw_bannercnt.",$!".g:netrw_ftp_cmd." -i ".shellescape(g:netrw_machine,1)." ".shellescape(g:netrw_port,1))
-exe s:netrw_silentxfer." keepjumps ".w:netrw_bannercnt.",$!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port
+exe s:netrw_silentxfer." keepjumps ".w:netrw_bannercnt.",$!".g:netrw_ftp_cmd." -i ".shellescape(g:netrw_machine,1)." ".shellescape(g:netrw_port,1)
 else
-"    call Decho("exe ".s:netrw_silentxfer.w:netrw_bannercnt.",$!".g:netrw_ftp_cmd." -i ".g:netrw_machine)
+"    call Decho("exe ".s:netrw_silentxfer.w:netrw_bannercnt.",$!".g:netrw_ftp_cmd." -i ".shellescape(g:netrw_machine,1))
-exe s:netrw_silentxfer." keepjumps ".w:netrw_bannercnt.",$!".g:netrw_ftp_cmd." -i ".g:netrw_machine
+exe s:netrw_silentxfer." keepjumps ".w:netrw_bannercnt.",$!".g:netrw_ftp_cmd." -i ".shellescape(g:netrw_machine,1)
 endif
 ".........................................
 elseif w:netrw_method == 3
 " ftp + machine,id,passwd,filename:  Method #3
 endif
 if exists("w:netrw_method") && (w:netrw_method == 2 || w:netrw_method == 3)
 call s:NetrwRemoteFtpCmd(a:path,"rename ".oldname." ".newname)
 else
-let oldname= a:path.oldname
+let oldname= shellescape(a:path.oldname)
-let newname= a:path.newname
+let newname= shellescape(a:path.newname)
-"     call Decho("system(rename_cmd".' "'.fnameescape(oldname," ").'" "'.escape(newname).'"')
+"     call Decho("system(s:WinPath(".rename_cmd.") ".oldname.' '.newname.")")
-let ret= s:System("system",rename_cmd.' "'.fnameescape(oldname).'" "'.fnameescape(newname).'"')
+let ret    = system(s:WinPath(rename_cmd).' '.oldname.' '.newname)
 endif
 endfor
 call s:NetrwUnMarkFile(1)
 call inputrestore()
 if exists("w:netrw_method") && (w:netrw_method == 2 || w:netrw_method == 3)
 call s:NetrwRemoteFtpCmd(a:path,"rename ".oldname." ".newname)
 else
-let oldname= a:path.oldname
+let oldname= shellescape(a:path.oldname)
-let newname= a:path.newname
+let newname= shellescape(a:path.newname)
-"    call Decho("system(rename_cmd".' "'.fnameescape(oldname," ").'" "'.escape(newname).'"')
+"     call Decho("system(s:WinPath(".rename_cmd.") ".oldname.' '.newname.")")
-let ret= s:System("system",rename_cmd.' "'.fnameescape(oldname).'" "'.fnameescape(newname).'"')
+let ret    = system(s:WinPath(rename_cmd).' '.oldname.' '.newname)
 endif
 let ctr= ctr + 1
 endwhile
 endif
 let all= 1
 endif
 endif
 if all || ok =~ 'y\%[es]' || ok == ""
-let ret= s:System("delete",rmfile)
+let ret= s:NetrwDelete(rmfile)
 "    call Decho("errcode=".v:shell_error." ret=".ret)
 endif
 else
 " attempt to remove directory
 endif
 endif
 let rmfile= substitute(rmfile,'[\/]$','','e')
 if all || ok =~ 'y\%[es]' || ok == ""
-"    call Decho("1st attempt: system(".g:netrw_local_rmdir.' '.shellescape(rmfile).')')
+"    call Decho("1st attempt: system(s:WinPath(".g:netrw_local_rmdir.') '.shellescape(rmfile).')')
-call s:System("system",g:netrw_local_rmdir.' '.shellescape(rmfile))
+call system(s:WinPath(g:netrw_local_rmdir).' '.shellescape(rmfile))
 "    call Decho("v:shell_error=".v:shell_error)
 if v:shell_error != 0
 "     call Decho("2nd attempt to remove directory<".rmfile.">")
-let errcode= s:System("delete",rmfile)
+let errcode= s:NetrwDelete(rmfile)
 "     call Decho("errcode=".errcode)
 if errcode != 0
 if has("unix")
 "       call Decho("3rd attempt to remove directory<".rmfile.">")
-call s:System("system","rm ".shellescape(rmfile))
+call system("rm ".shellescape(rmfile))
 if v:shell_error != 0 && !exists("g:netrw_quiet")
 call netrw#ErrorMsg(s:ERROR,"unable to remove directory<".rmfile."> -- is it empty?",34)
 	let ok="no"
 endif
 elseif !exists("g:netrw_quiet")
 " ---------------------------------------------------------------------
 " Support Functions: {{{1
 " ---------------------------------------------------------------------
-" s:UpdateBuffersMenu: does emenu Buffers.Refresh (but due to locale, the menu item may not be called that) {{{2
-"                      The Buffers.Refresh menu calls s:BMShow(); unfortunately, that means that that function
-"                      can't be called except via emenu.  But due to locale, that menu line may not be called
-"                      Buffers.Refresh; hence, s:NetrwBMShow() utilizes a "cheat" to call that function anyway.
-fun! s:UpdateBuffersMenu()
-"  call Dfunc("s:UpdateBuffersMenu()")
-if has("gui") && has("menu") && has("gui_running") && &go =~ 'm'
-try
-silent emenu Buffers.Refresh\ menu
-catch /^Vim\%((\a\+)\)\=:E/
-let v:errmsg= ""
-silent call s:NetrwBMShow()
-endtry
-endif
-"  call Dret("s:UpdateBuffersMenu")
-endfun
-" ---------------------------------------------------------------------
-" s:NetrwBMShow: {{{2
-fun! s:NetrwBMShow()
-"  call Dfunc("s:NetrwBMShow()")
-redir => bmshowraw
-menu
-redir END
-let bmshowlist = split(bmshowraw,'\n')
-if bmshowlist != []
-let bmshowfuncs= filter(bmshowlist,'v:val =~ "<SNR>\\d\\+_BMShow()"')
-if bmshowfuncs != []
-let bmshowfunc = substitute(bmshowfuncs[0],'^.*:\(call.*BMShow()\).*$','\1','')
-if bmshowfunc =~ '^call.*BMShow()'
-exe "silent! ".bmshowfunc
-endif
-endif
-endif
-"  call Dret("s:NetrwBMShow : bmshowfunc<".(exists("bmshowfunc")? bmshowfunc : 'n/a').">")
-endfun
-" ---------------------------------------------------------------------
-"  s:ComposePath: Appends a new part to a path taking different systems into consideration {{{2
-fun! s:ComposePath(base,subdir)
-"  call Dfunc("s:ComposePath(base<".a:base."> subdir<".a:subdir.">)")
-if(has("amiga"))
-"   call Decho("amiga")
-let ec = a:base[strlen(a:base)-1]
-if ec != '/' && ec != ':'
-let ret = a:base . "/" . a:subdir
-else
-let ret = a:base . a:subdir
-endif
-elseif a:subdir =~ '^\a:[/\\][^/\\]' && (has("win32") || has("win95") || has("win64") || has("win16"))
-"   call Decho("windows")
-let ret= a:subdir
-elseif a:base =~ '^\a\+://'
-"   call Decho("remote linux/macos")
-let urlbase = substitute(a:base,'^\(\a\+://.\{-}/\)\(.*\)$','\1','')
-let curpath = substitute(a:base,'^\(\a\+://.\{-}/\)\(.*\)$','\2','')
-if a:subdir == '../'
-if curpath =~ '[^/]/[^/]\+/$'
-let curpath= substitute(curpath,'[^/]\+/$','','')
-else
-let curpath=""
-endif
-let ret= urlbase.curpath
-else
-let ret= urlbase.curpath.a:subdir
-endif
-"   call Decho("urlbase<".urlbase.">")
-"   call Decho("curpath<".curpath.">")
-"   call Decho("ret<".ret.">")
-else
-"   call Decho("local linux/macos")
-let ret = substitute(a:base."/".a:subdir,"//","/","g")
-if a:base =~ '^//'
-" keeping initial '//' for the benefit of network share listing support
-let ret= '/'.ret
-endif
-let ret= simplify(ret)
-endif
-"  call Dret("s:ComposePath ".ret)
-return ret
-endfun
-" ---------------------------------------------------------------------
 " netrw#ErrorMsg: {{{2
 "   0=note     = s:NOTE
 "   1=warning  = s:WARNING
 "   2=error    = s:ERROR
-"  Jun 11, 2008 : max errnum currently is 70
+"  Jul 08, 2008 : max errnum currently is 71
 fun! netrw#ErrorMsg(level,msg,errnum)
 "  call Dfunc("netrw#ErrorMsg(level=".a:level." msg<".a:msg."> errnum=".a:errnum.") g:netrw_use_errorwindow=".g:netrw_use_errorwindow)
 if a:level == 1
 let level= "**warning** (netrw) "
 "  call Dret("netrw#ErrorMsg")
 endfun
 " ---------------------------------------------------------------------
+" netrw#NetrwRestorePosn: restores the cursor and file position as saved by NetrwSavePosn() {{{2
+fun! netrw#NetrwRestorePosn(...)
+"  call Dfunc("netrw#NetrwRestorePosn() a:0=".a:0." winnr=".(exists("w:netrw_winnr")? w:netrw_winnr : -1)." line=".(exists("w:netrw_line")? w:netrw_line : -1)." col=".(exists("w:netrw_col")? w:netrw_col : -1)." hline=".(exists("w:netrw_hline")? w:netrw_hline : -1))
+let eikeep= &ei
+set ei=all
+if expand("%") == "NetrwMessage"
+exe s:winBeforeErr."wincmd w"
+endif
+if a:0 > 0
+exe a:1
+endif
+" restore window
+if exists("w:netrw_winnr")
+"   call Decho("restore window: exe silent! ".w:netrw_winnr."wincmd w")
+exe "silent! ".w:netrw_winnr."wincmd w"
+endif
+if v:shell_error == 0
+" as suggested by Bram M: redraw on no error
+" allows protocol error messages to remain visible
+"   redraw!
+endif
+" restore top-of-screen line
+if exists("w:netrw_hline")
+"   call Decho("restore topofscreen: exe norm! ".w:netrw_hline."G0z")
+exe "norm! ".w:netrw_hline."G0z\<CR>"
+endif
+" restore position
+if exists("w:netrw_line") && exists("w:netrw_col")
+"   call Decho("restore posn: exe norm! ".w:netrw_line."G0".w:netrw_col."|")
+exe "norm! ".w:netrw_line."G0".w:netrw_col."\<bar>"
+endif
+let &ei= eikeep
+"  call Dret("netrw#NetrwRestorePosn")
+endfun
+" ---------------------------------------------------------------------
+" netrw#NetrwSavePosn: saves position of cursor on screen {{{2
+fun! netrw#NetrwSavePosn()
+"  call Dfunc("netrw#NetrwSavePosn()")
+" Save current line and column
+let w:netrw_winnr= winnr()
+let w:netrw_line = line(".")
+let w:netrw_col  = virtcol(".")
+" Save top-of-screen line
+norm! H0
+let w:netrw_hline= line(".")
+" set up string holding position parameters
+let ret          = "let w:netrw_winnr=".w:netrw_winnr."|let w:netrw_line=".w:netrw_line."|let w:netrw_col=".w:netrw_col."|let w:netrw_hline=".w:netrw_hline
+call netrw#NetrwRestorePosn()
+"  call Dret("netrw#NetrwSavePosn : winnr=".w:netrw_winnr." line=".w:netrw_line." col=".w:netrw_col." hline=".w:netrw_hline)
+return ret
+endfun
+" ------------------------------------------------------------------------
 "  netrw#RFC2396: converts %xx into characters {{{2
 fun! netrw#RFC2396(fname)
 "  call Dfunc("netrw#RFC2396(fname<".a:fname.">)")
 let fname = escape(substitute(a:fname,'%\(\x\x\)','\=nr2char("0x".submatch(1))','ge')," \t")
 "  call Dret("netrw#RFC2396 ".fname)
 return fname
 endfun
 " ---------------------------------------------------------------------
+"  s:ComposePath: Appends a new part to a path taking different systems into consideration {{{2
+fun! s:ComposePath(base,subdir)
+"  call Dfunc("s:ComposePath(base<".a:base."> subdir<".a:subdir.">)")
+if(has("amiga"))
+"   call Decho("amiga")
+let ec = a:base[strlen(a:base)-1]
+if ec != '/' && ec != ':'
+let ret = a:base . "/" . a:subdir
+else
+let ret = a:base . a:subdir
+endif
+elseif a:subdir =~ '^\a:[/\\][^/\\]' && (has("win32") || has("win95") || has("win64") || has("win16"))
+"   call Decho("windows")
+let ret= a:subdir
+elseif a:base =~ '^\a\+://'
+"   call Decho("remote linux/macos")
+let urlbase = substitute(a:base,'^\(\a\+://.\{-}/\)\(.*\)$','\1','')
+let curpath = substitute(a:base,'^\(\a\+://.\{-}/\)\(.*\)$','\2','')
+if a:subdir == '../'
+if curpath =~ '[^/]/[^/]\+/$'
+let curpath= substitute(curpath,'[^/]\+/$','','')
+else
+let curpath=""
+endif
+let ret= urlbase.curpath
+else
+let ret= urlbase.curpath.a:subdir
+endif
+"   call Decho("urlbase<".urlbase.">")
+"   call Decho("curpath<".curpath.">")
+"   call Decho("ret<".ret.">")
+else
+"   call Decho("local linux/macos")
+let ret = substitute(a:base."/".a:subdir,"//","/","g")
+if a:base =~ '^//'
+" keeping initial '//' for the benefit of network share listing support
+let ret= '/'.ret
+endif
+let ret= simplify(ret)
+endif
+"  call Dret("s:ComposePath ".ret)
+return ret
+endfun
+" ---------------------------------------------------------------------
 " s:FileReadable: o/s independent filereadable {{{2
 fun! s:FileReadable(fname)
 "  call Dfunc("s:FileReadable(fname<".a:fname.">)")
 if g:netrw_cygwin
 if !exists("b:netrw_tmpfile")
 " get a brand new temporary filename
 let tmpfile= tempname()
 "   call Decho("tmpfile<".tmpfile."> : from tempname()")
-let tmpfile= escape(substitute(tmpfile,'\','/','ge'),g:netrw_tmpfile_escape)
+let tmpfile= substitute(tmpfile,'\','/','ge')
 "   call Decho("tmpfile<".tmpfile."> : chgd any \\ -> /")
 " sanity check -- does the temporary file's directory exist?
 if !isdirectory(substitute(tmpfile,'[^/]\+$','','e'))
-"    call Decho("ro=".&ro." ma=".&ma." mod=".&mod." wrap=".&wrap)
+"    call Decho("ro=".&l:ro." ma=".&l:ma." mod=".&l:mod." wrap=".&l:wrap)
 call netrw#ErrorMsg(s:ERROR,"your <".substitute(tmpfile,'[^/]\+$','','e')."> directory is missing!",2)
 "    call Dret("s:GetTempfile getcwd<".getcwd().">")
 return ""
 endif
 if a:fname =~ '.tar.gz' || a:fname =~ '.tar.bz2'
 let suffix = ".tar".substitute(a:fname,'^.*\(\.[^./]\+\)$','\1','e')
 else
 let suffix = substitute(a:fname,'^.*\(\.[^./]\+\)$','\1','e')
 endif
-let suffix = escape(suffix,g:netrw_tmpfile_escape)
 "    call Decho("suffix<".suffix.">")
 let tmpfile= substitute(tmpfile,'\.tmp$','','e')
 "    call Decho("chgd tmpfile<".tmpfile."> (removed any .tmp suffix)")
 let tmpfile .= suffix
 "    call Decho("chgd tmpfile<".tmpfile."> (added ".suffix." suffix) netrw_fname<".b:netrw_fname.">")
 let s:netrw_tmpfile= tmpfile " supports netrw#NetSource()
 endif
 endif
-"  call Decho("ro=".&ro." ma=".&ma." mod=".&mod." wrap=".&wrap)
+"  call Decho("ro=".&l:ro." ma=".&l:ma." mod=".&l:mod." wrap=".&l:wrap)
 "  call Dret("s:GetTempfile <".tmpfile.">")
 return tmpfile
 endfun
 " ---------------------------------------------------------------------
 " s:MakeSshCmd: transforms input command using USEPORT HOSTNAME into {{{2
-"               a correct command
+"               a correct command for use with a system() call
 fun! s:MakeSshCmd(sshcmd)
 "  call Dfunc("s:MakeSshCmd(sshcmd<".a:sshcmd.">) user<".s:user."> machine<".s:machine.">")
 let sshcmd = substitute(a:sshcmd,'\<HOSTNAME\>',s:user.s:machine,'')
 if exists("g:netrw_port") && g:netrw_port != ""
 let sshcmd= substitute(sshcmd,"USEPORT",g:netrw_sshport.' '.g:netrw_port,'')
 "  call Dret("s:MakeSshCmd <".sshcmd.">")
 return sshcmd
 endfun
 " ---------------------------------------------------------------------
-" s:RemoteSystem: runs a command on a remote host using ssh {{{2
+" s:NetrwBMShow: {{{2
-"                 Returns status
+fun! s:NetrwBMShow()
-fun! s:RemoteSystem(cmd)
+"  call Dfunc("s:NetrwBMShow()")
-"  call Dfunc("s:RemoteSystem(cmd<".a:cmd.">)")
+redir => bmshowraw
-if !executable(g:netrw_ssh_cmd)
+menu
-call netrw#ErrorMsg(s:ERROR,"g:netrw_ssh_cmd<".g:netrw_ssh_cmd."> is not executable!",52)
+redir END
-elseif !exists("b:netrw_curdir")
+let bmshowlist = split(bmshowraw,'\n')
-call netrw#ErrorMsg(s:ERROR,"for some reason b:netrw_curdir doesn't exist!",53)
+if bmshowlist != []
+let bmshowfuncs= filter(bmshowlist,'v:val =~ "<SNR>\\d\\+_BMShow()"')
+if bmshowfuncs != []
+let bmshowfunc = substitute(bmshowfuncs[0],'^.*:\(call.*BMShow()\).*$','\1','')
+if bmshowfunc =~ '^call.*BMShow()'
+exe "silent! ".bmshowfunc
+endif
+endif
+endif
+"  call Dret("s:NetrwBMShow : bmshowfunc<".(exists("bmshowfunc")? bmshowfunc : 'n/a').">")
+endfun
+" ---------------------------------------------------------------------
+" s:NetrwDelete: Deletes a file. {{{2
+"           Uses Steve Hall's idea to insure that Windows paths stay
+"           acceptable.  No effect on Unix paths.
+"  Examples of use:  let result= s:NetrwDelete(path)
+fun! s:NetrwDelete(path)
+"  call Dfunc("s:NetrwDelete(path<".a:path.">)")
+let path = s:WinPath(a:path)
+if !g:netrw_cygwin && (has("win32") || has("win95") || has("win64") || has("win16"))
+if exists("+shellslash")
+let sskeep= &shellslash
+setlocal noshellslash
+let result      = delete(path)
+let &shellslash = sskeep
+else
+"    call Decho("exe let result= ".a:cmd."('".path."')")
+let result= delete(path)
+endif
 else
-let cmd      = s:MakeSshCmd(g:netrw_ssh_cmd." USEPORT HOSTNAME")
+"   call Decho("let result= delete(".path.")")
-let remotedir= substitute(b:netrw_curdir,'^.*//[^/]\+/\(.*\)$','\1','')
+let result= delete(path)
-if remotedir != ""
+endif
-let cmd= cmd.' "cd '.shellescape(remotedir).";"
+if result < 0
-else
+call Netrw#ErrorMsg(s:WARNING,"delete(".path.") failed!",71)
-let cmd= cmd.' "'
+endif
-endif
-let cmd= cmd.a:cmd.'"'
+"  call Dret("s:NetrwDelete ".result)
-"   call Decho("call system(".cmd.")")
+return result
-let ret= system(cmd)
-endif
-"  call Dret("s:RemoteSystem ".ret)
-return ret
 endfun
 " ---------------------------------------------------------------------
 " s:NetrwEnew: opens a new buffer, passes netrw buffer variables through {{{2
 fun! s:NetrwEnew(curdir)
 if exists("w:netrw_liststyle") && w:netrw_liststyle == s:TREELIST
 file NetrwTreeListing
 nno <silent> <buffer> [	:silent call <SID>TreeListMove('[')<cr>
 nno <silent> <buffer> ]	:silent call <SID>TreeListMove(']')<cr>
 else
-exe "silent! keepalt file ".b:netrw_curdir
+exe "silent! keepalt file ".fnameescape(b:netrw_curdir)
 endif
 endif
 "  call Dret("s:NetrwEnew : buf#".bufnr("%")."<".bufname("%")."> expand(%)<".expand("%")."> expand(#)<".expand("#").">")
 endfun
 " ------------------------------------------------------------------------
-" netrw#NetrwSavePosn: saves position of cursor on screen {{{2
-fun! netrw#NetrwSavePosn()
-"  call Dfunc("netrw#NetrwSavePosn()")
-" Save current line and column
-let w:netrw_winnr= winnr()
-let w:netrw_line = line(".")
-let w:netrw_col  = virtcol(".")
-" Save top-of-screen line
-norm! H0
-let w:netrw_hline= line(".")
-" set up string holding position parameters
-let ret          = "let w:netrw_winnr=".w:netrw_winnr."|let w:netrw_line=".w:netrw_line."|let w:netrw_col=".w:netrw_col."|let w:netrw_hline=".w:netrw_hline
-call netrw#NetrwRestorePosn()
-"  call Dret("netrw#NetrwSavePosn : winnr=".w:netrw_winnr." line=".w:netrw_line." col=".w:netrw_col." hline=".w:netrw_hline)
-return ret
-endfun
-" ------------------------------------------------------------------------
-" netrw#NetrwRestorePosn: restores the cursor and file position as saved by NetrwSavePosn() {{{2
-fun! netrw#NetrwRestorePosn(...)
-"  call Dfunc("netrw#NetrwRestorePosn() a:0=".a:0." winnr=".(exists("w:netrw_winnr")? w:netrw_winnr : -1)." line=".(exists("w:netrw_line")? w:netrw_line : -1)." col=".(exists("w:netrw_col")? w:netrw_col : -1)." hline=".(exists("w:netrw_hline")? w:netrw_hline : -1))
-let eikeep= &ei
-set ei=all
-if expand("%") == "NetrwMessage"
-exe s:winBeforeErr."wincmd w"
-endif
-if a:0 > 0
-exe a:1
-endif
-" restore window
-if exists("w:netrw_winnr")
-"   call Decho("restore window: exe silent! ".w:netrw_winnr."wincmd w")
-exe "silent! ".w:netrw_winnr."wincmd w"
-endif
-if v:shell_error == 0
-" as suggested by Bram M: redraw on no error
-" allows protocol error messages to remain visible
-"   redraw!
-endif
-" restore top-of-screen line
-if exists("w:netrw_hline")
-"   call Decho("restore topofscreen: exe norm! ".w:netrw_hline."G0z")
-exe "norm! ".w:netrw_hline."G0z\<CR>"
-endif
-" restore position
-if exists("w:netrw_line") && exists("w:netrw_col")
-"   call Decho("restore posn: exe norm! ".w:netrw_line."G0".w:netrw_col."|")
-exe "norm! ".w:netrw_line."G0".w:netrw_col."\<bar>"
-endif
-let &ei= eikeep
-"  call Dret("netrw#NetrwRestorePosn")
-endfun
-" ---------------------------------------------------------------------
 " s:NetrwSaveWordPosn: used to keep cursor on same word after refresh, {{{2
 " changed sorting, etc.  Also see s:NetrwRestoreWordPosn().
 fun! s:NetrwSaveWordPosn()
 "  call Dfunc("NetrwSaveWordPosn()")
 let s:netrw_saveword= '^'.fnameescape(getline('.')).'$'
 "  changed sorting, etc.  Also see s:NetrwSaveWordPosn().
 fun! s:NetrwRestoreWordPosn()
 "  call Dfunc("NetrwRestoreWordPosn()")
 silent! call search(s:netrw_saveword,'w')
 "  call Dret("NetrwRestoreWordPosn")
+endfun
+" ---------------------------------------------------------------------
+" s:RestoreBufVars: {{{2
+fun! s:RestoreBufVars()
+"  call Dfunc("s:RestoreBufVars()")
+if exists("s:netrw_curdir")        |let b:netrw_curdir         = s:netrw_curdir        |endif
+if exists("s:netrw_lastfile")      |let b:netrw_lastfile       = s:netrw_lastfile      |endif
+if exists("s:netrw_method")        |let b:netrw_method         = s:netrw_method        |endif
+if exists("s:netrw_fname")         |let b:netrw_fname          = s:netrw_fname         |endif
+if exists("s:netrw_machine")       |let b:netrw_machine        = s:netrw_machine       |endif
+if exists("s:netrw_browser_active")|let b:netrw_browser_active = s:netrw_browser_active|endif
+"  call Dret("s:RestoreBufVars")
 endfun
 " ---------------------------------------------------------------------
 " s:RemotePathAnalysis: {{{2
 fun! s:RemotePathAnalysis(dirname)
 "  call Dret("s:RemotePathAnalysis")
 endfun
 " ---------------------------------------------------------------------
-" s:RestoreBufVars: {{{2
+" s:RemoteSystem: runs a command on a remote host using ssh {{{2
-fun! s:RestoreBufVars()
+"                 Returns status
-"  call Dfunc("s:RestoreBufVars()")
+" Runs system() on
+"    [cd REMOTEDIRPATH;] a:cmd
-if exists("s:netrw_curdir")        |let b:netrw_curdir         = s:netrw_curdir        |endif
+" Note that it doesn't do shellescape(a:cmd)!
-if exists("s:netrw_lastfile")      |let b:netrw_lastfile       = s:netrw_lastfile      |endif
+fun! s:RemoteSystem(cmd)
-if exists("s:netrw_method")        |let b:netrw_method         = s:netrw_method        |endif
+"  call Dfunc("s:RemoteSystem(cmd<".a:cmd.">)")
-if exists("s:netrw_fname")         |let b:netrw_fname          = s:netrw_fname         |endif
+if !executable(g:netrw_ssh_cmd)
-if exists("s:netrw_machine")       |let b:netrw_machine        = s:netrw_machine       |endif
+call netrw#ErrorMsg(s:ERROR,"g:netrw_ssh_cmd<".g:netrw_ssh_cmd."> is not executable!",52)
-if exists("s:netrw_browser_active")|let b:netrw_browser_active = s:netrw_browser_active|endif
+elseif !exists("b:netrw_curdir")
+call netrw#ErrorMsg(s:ERROR,"for some reason b:netrw_curdir doesn't exist!",53)
-"  call Dret("s:RestoreBufVars")
+else
+let cmd      = s:MakeSshCmd(g:netrw_ssh_cmd." USEPORT HOSTNAME")
+let remotedir= substitute(b:netrw_curdir,'^.*//[^/]\+/\(.*\)$','\1','')
+if remotedir != ""
+let cmd= cmd.' cd '.shellescape(remotedir).";"
+else
+let cmd= cmd.' '
+endif
+let cmd= cmd.a:cmd
+"   call Decho("call system(".cmd.")")
+let ret= system(cmd)
+endif
+"  call Dret("s:RemoteSystem ".ret)
+return ret
 endfun
 " ---------------------------------------------------------------------
 " s:RestoreWinVars: (used by Explore() and NetrwSplit()) {{{2
 fun! s:RestoreWinVars()
 "  call Dret("s:Strlen ".ret)
 return ret
 endfun
 " ---------------------------------------------------------------------
-" s:System: using Steve Hall's idea to insure that Windows paths stay {{{2
-"              acceptable.  No effect on Unix paths.
-"  Examples of use:  let result= s:System("rm",path)
-"                    let result= s:System("delete",path)
-fun! netrw#System(cmd,path)
-echomsg s:System(a:cmd,a:path)
-endfun
-fun! s:System(cmd,path)
-"  call Dfunc("s:System(cmd<".a:cmd."> path<".a:path.">)")
-let path = a:path
-if !g:netrw_cygwin && (has("win32") || has("win95") || has("win64") || has("win16"))
-" system call prep
-" remove trailing slash (Win95)
-let path = substitute(path, '\(\\\|/\)$', '', 'g')
-" remove escaped spaces
-let path = substitute(path, '\ ', ' ', 'g')
-" convert slashes to backslashes
-let path = substitute(path, '/', '\', 'g')
-if exists("+shellslash")
-let sskeep= &shellslash
-setlocal noshellslash
-exe "let result= ".a:cmd."('".path."')"
-let &shellslash = sskeep
-else
-"    call Decho("exe let result= ".a:cmd."('".path."')")
-exe "let result= ".a:cmd."('".path."')"
-endif
-else
-"   call Decho("exe let result= ".a:cmd."('".path."')")
-exe "let result= ".a:cmd."('".path."')"
-endif
-"  call Dret("s:System result<".result.">")
-return result
-endfun
-" ---------------------------------------------------------------------
 " s:TreeListMove: {{{2
 fun! s:TreeListMove(dir)
 "  call Dfunc("s:TreeListMove(dir<".a:dir.">)")
 let curline  = getline('.')
 let prvline  = (line(".") > 1)?         getline(line(".")-1) : ''
 endif
 endif
 "  call Dret("s:TreeListMove")
+endfun
+" ---------------------------------------------------------------------
+" s:UpdateBuffersMenu: does emenu Buffers.Refresh (but due to locale, the menu item may not be called that) {{{2
+"                      The Buffers.Refresh menu calls s:BMShow(); unfortunately, that means that that function
+"                      can't be called except via emenu.  But due to locale, that menu line may not be called
+"                      Buffers.Refresh; hence, s:NetrwBMShow() utilizes a "cheat" to call that function anyway.
+fun! s:UpdateBuffersMenu()
+"  call Dfunc("s:UpdateBuffersMenu()")
+if has("gui") && has("menu") && has("gui_running") && &go =~ 'm'
+try
+silent emenu Buffers.Refresh\ menu
+catch /^Vim\%((\a\+)\)\=:E/
+let v:errmsg= ""
+silent call s:NetrwBMShow()
+endtry
+endif
+"  call Dret("s:UpdateBuffersMenu")
 endfun
 " ---------------------------------------------------------------------
 " s:UseBufWinVars: (used by NetrwBrowse() and LocalBrowseCheck() {{{2
 "              Matching function to BufferWinVars()
 if exists("b:netrw_explore_list")    && !exists("w:netrw_explore_list")   |let w:netrw_explore_list    = b:netrw_explore_list   |endif
 "  call Dret("s:UseBufWinVars")
 endfun
 " ---------------------------------------------------------------------
+" s:WinPath: {{{2
+fun! s:WinPath(path)
+"  call Dfunc("s:WinPath(path<".a:path.">)")
+if !g:netrw_cygwin && (has("win32") || has("win95") || has("win64") || has("win16"))
+" remove trailing slash (Win95)
+let path = substitute(a:path, '\(\\\|/\)$', '', 'g')
+" remove escaped spaces
+let path = substitute(path, '\ ', ' ', 'g')
+" convert slashes to backslashes
+let path = substitute(path, '/', '\', 'g')
+else
+let path= a:path
+endif
+"  call Dret("s:WinPath <".path.">")
+return path
+endfun
+" ---------------------------------------------------------------------
 " Settings Restoration: {{{2
 let &cpo= s:keepcpo
 unlet s:keepcpo
 " ------------------------------------------------------------------------

Mercurial > vim

comparison runtime/autoload/netrw.vim @ 1668:0b796e045c42 v7.2b.000