--- netrw.vim   2014-03-24 19:36:08.000000000 -0700
+++ netrw-fix.vim   2014-04-19 14:02:40.400250212 -0700
@@ -1589,21 +1589,22 @@
 "                     Use  s:NetrwOptionRestore() to restore user settings
 fun! s:NetrwSafeOptions()
 "  call Dfunc("s:NetrwSafeOptions() win#".winnr()." buf#".bufnr("%")."<".bufname(bufnr("%"))."> winnr($)=".winnr("$"))
 "  call Decho("win#".winnr()."'s ft=".&ft)
 "  call Decho("settings buf#".bufnr("%")."<".bufname("%").">: ".((&l:ma == 0)? "no" : "")."ma ".((&l:mod == 0)? "no" : "")."mod ".((&l:bl == 0)? "no" : "")."bl ".((&l:ro == 0)? "no" : "")."ro fo=".&l:fo)
   if exists("+acd") | setl noacd | endif
   setl noai
   setl noaw
   setl nobl
   setl nobomb
-  setl bt=nofile
+  " XXXXX-FIX: Not being able to save to remotely editing file.
+  "            Not set bt=nofile."
   setl noci
   setl nocin
   if g:netrw_liststyle == s:TREELIST
    setl bh=hide
   endif
   setl cino=
   setl com=
   setl cpo-=a
   setl cpo-=A
   setl fo=nroql2
@@ -10188,30 +10189,37 @@

 "  call Dret("s:RestoreBufVars")
 endfun

 " ---------------------------------------------------------------------
 " s:RemotePathAnalysis: {{{2
 fun! s:RemotePathAnalysis(dirname)
 "  call Dfunc("s:RemotePathAnalysis(a:dirname<".a:dirname.">)")

   "                method   ://    user  @      machine      :port            /path
-  let dirpat  = '^\(\w\{-}\)://\(\(\w\+\)@\)\=\([^/:#]\+\)\%([:#]\(\d\+\)\)\=/\(.*\)$'
+  " XXXXX-FIX: Error due to malformed hostname, while listing and editing.
+  "            (tabe scp://[email protected]/
+  "              => error: ssh ... gtdwiwo192.no-ip.info ...)
+  "
+  "            s:user should contains '@'.  All usages of s:user are
+  "            's:user.s:machine'.
+
+  let dirpat  = '^\(\w\{-}\)://\(\w\+@\)\=\([^/:#]\+\)\%([:#]\(\d\+\)\)\=/\(.*\)$'
   let s:method  = substitute(a:dirname,dirpat,'\1','')
-  let s:user    = substitute(a:dirname,dirpat,'\3','')
-  let s:machine = substitute(a:dirname,dirpat,'\4','')
-  let s:port    = substitute(a:dirname,dirpat,'\5','')
-  let s:path    = substitute(a:dirname,dirpat,'\6','')
+  let s:user    = substitute(a:dirname,dirpat,'\2','')
+  let s:machine = substitute(a:dirname,dirpat,'\3','')
+  let s:port    = substitute(a:dirname,dirpat,'\4','')
+  let s:path    = substitute(a:dirname,dirpat,'\5','')
   let s:fname   = substitute(a:dirname,'^.*/\ze.','','')
   if s:machine =~ '@'
-   let dirpat    = '^\(.*\)@\(.\{-}\)$'
-   let s:user    = s:user.'@'.substitute(s:machine,dirpat,'','')
+   let dirpat    = '^\(.*\@)\(.\{-}\)$'
+   let s:user    = s:user.substitute(s:machine,dirpat,'','')
    let s:machine = substitute(s:machine,dirpat,'\2','')
   endif

 "  call Decho("set up s:method <".s:method .">")
 "  call Decho("set up s:user   <".s:user   .">")
 "  call Decho("set up s:machine<".s:machine.">")
 "  call Decho("set up s:port   <".s:port.">")
 "  call Decho("set up s:path   <".s:path   .">")
 "  call Decho("set up s:fname  <".s:fname  .">")