vim: runtime/autoload/netrw.vim comparison

comparison runtime/autoload/netrw.vim @ 2152:b9e314fe473f

Updated runtime files.

author	Bram Moolenaar <bram@zimbu.org>
date	Fri, 14 May 2010 23:24:24 +0200
parents	f63ace015c63
children	6de9efd58dc0

comparison

equal deleted inserted replaced

-:ae22c450546c
+:b9e314fe473f
 " netrw.vim: Handles file transfer and remote directory listing across
 "            AUTOLOAD SECTION
-" Date:		Dec 28, 2009
+" Date:		May 14, 2010
-" Version:	136
+" Version:	138
 " Maintainer:	Charles E Campbell, Jr <NdrOchip@ScampbellPfamily.AbizM-NOSPAM>
 " GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim
 " Copyright:    Copyright (C) 1999-2009 Charles E. Campbell, Jr. {{{1
 "               Permission is hereby granted to use and distribute this code,
 "               with or without modifications, provided that this copyright
 " =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 " Load Once: {{{1
 if &cp || exists("g:loaded_netrw")
 finish
 endif
-let g:loaded_netrw = "v136"
+let g:loaded_netrw = "v138"
 if v:version < 702
 echohl WarningMsg
 echo "***warning*** this version of netrw needs vim 7.2"
 echohl Normal
 finish
 call s:NetrwInit("g:netrw_rmdir_cmd"     , g:netrw_ssh_cmd." USEPORT HOSTNAME rmdir")
 call s:NetrwInit("g:netrw_rmf_cmd"       , g:netrw_ssh_cmd." USEPORT HOSTNAME rm -f")
 " Default values - s ---------- {{{3
 " g:netrw_sepchr: picking a character that doesn't appear in filenames that can be used to separate priority from filename
 call s:NetrwInit("g:netrw_sepchr"        , (&enc == "euc-jp")? "\<Char-0x01>" : "\<Char-0xff>")
-call s:NetrwInit("s:netrw_silentxfer"    , (exists("g:netrw_silent") && g:netrw_silent != 0)? "silent " : "")
+call s:NetrwInit("s:netrw_silentxfer"    , (exists("g:netrw_silent") && g:netrw_silent != 0)? "silent keepj " : "keepj ")
 call s:NetrwInit("g:netrw_sort_by"       , "name") " alternatives: date                                      , size
 call s:NetrwInit("g:netrw_sort_options"  , "")
 call s:NetrwInit("g:netrw_sort_direction", "normal") " alternative: reverse  (z y x ...)
 if !exists("g:netrw_sort_sequence")
 if has("unix")
 call s:NetrwInit("g:netrw_timefmt","%c")
 call s:NetrwInit("g:netrw_xstrlen",0)
 call s:NetrwInit("g:NetrwTopLvlMenu","Netrw.")
 call s:NetrwInit("g:netrw_use_errorwindow",1)
 call s:NetrwInit("g:netrw_win95ftp",1)
-call s:NetrwInit("g:netrw_winsize","")
+call s:NetrwInit("g:netrw_winsize",25)
 " ---------------------------------------------------------------------
 " Default values for netrw's script variables: {{{2
 call s:NetrwInit("g:netrw_fname_escape",' ?&;%')
-call s:NetrwInit("g:netrw_glob_escape",'[]*?`{~$')
+if has("win32") || has("win95") || has("win64") || has("win16")
+call s:NetrwInit("g:netrw_glob_escape",'[]*?`{$')
+else
+call s:NetrwInit("g:netrw_glob_escape",'[]*?`{~$\')
+endif
+call s:NetrwInit("g:netrw_menu_escape",'./&? \')
 call s:NetrwInit("g:netrw_tmpfile_escape",' &;')
 call s:NetrwInit("s:netrw_map_escape","<|\n\r\\\<C-V>\"")
 " BufEnter event ignored by decho when following variable is true
 "  Has a side effect that doau BufReadPost doesn't work, so
 if exists("&l:acd")
 let {a:vt}netrw_acdkeep  = &l:acd
 endif
 let {a:vt}netrw_aikeep    = &l:ai
 let {a:vt}netrw_awkeep    = &l:aw
+let {a:vt}netrw_bombkeep  = &l:bomb
 let {a:vt}netrw_cikeep    = &l:ci
 let {a:vt}netrw_cinkeep   = &l:cin
 let {a:vt}netrw_cinokeep  = &l:cino
 let {a:vt}netrw_comkeep   = &l:com
 let {a:vt}netrw_cpokeep   = &l:cpo
 let {a:vt}netrw_dirkeep  = getcwd()
 endif
 let {a:vt}netrw_fokeep    = &l:fo           " formatoptions
 let {a:vt}netrw_gdkeep    = &l:gd           " gdefault
 let {a:vt}netrw_hidkeep   = &l:hidden
+let {a:vt}netrw_imkeep    = &l:im
 let {a:vt}netrw_magickeep = &l:magic
 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
 unlet {a:vt}netrw_acdkeep
 if &l:acd
 "     call Decho("exe keepjumps lcd ".fnameescape(curdir))  " NOTE: was g:netrw_fname_escape for some reason
 try
 if !exists("&l:acd") && !&l:acd
-exe 'keepjumps lcd '.fnameescape(curdir)
+exe 'keepj lcd '.fnameescape(curdir)
 endif
 catch /^Vim\%((\a\+)\)\=:E472/
 call netrw#ErrorMsg(s:ERROR,"unable to change directory to <".curdir."> (permissions?)",61)
 endtry
 endif
 endif
 endif
 if exists("{a:vt}netrw_aikeep")   |let &l:ai     = {a:vt}netrw_aikeep      |unlet {a:vt}netrw_aikeep   |endif
 if exists("{a:vt}netrw_awkeep")   |let &l:aw     = {a:vt}netrw_awkeep      |unlet {a:vt}netrw_awkeep   |endif
+if exists("{a:vt}netrw_bombkeep") |let &l:bomb   = {a:vt}netrw_bombkeep    |unlet {a:vt}netrw_bombkeep |endif
 if exists("{a:vt}netrw_cikeep")   |let &l:ci     = {a:vt}netrw_cikeep      |unlet {a:vt}netrw_cikeep   |endif
 if exists("{a:vt}netrw_cinkeep")  |let &l:cin    = {a:vt}netrw_cinkeep     |unlet {a:vt}netrw_cinkeep  |endif
 if exists("{a:vt}netrw_cinokeep") |let &l:cino   = {a:vt}netrw_cinokeep    |unlet {a:vt}netrw_cinokeep |endif
 if exists("{a:vt}netrw_comkeep")  |let &l:com    = {a:vt}netrw_comkeep     |unlet {a:vt}netrw_comkeep  |endif
 if exists("{a:vt}netrw_cpokeep")  |let &l:cpo    = {a:vt}netrw_cpokeep     |unlet {a:vt}netrw_cpokeep  |endif
 if exists("{a:vt}netrw_dirkeep")  |exe "keepjumps lcd ".fnameescape(dirkeep)|unlet {a:vt}netrw_dirkeep  |endif
 endif
 if exists("{a:vt}netrw_fokeep")   |let &l:fo     = {a:vt}netrw_fokeep      |unlet {a:vt}netrw_fokeep   |endif
 if exists("{a:vt}netrw_gdkeep")   |let &l:gd     = {a:vt}netrw_gdkeep      |unlet {a:vt}netrw_gdkeep   |endif
 if exists("{a:vt}netrw_hidkeep")  |let &l:hidden = {a:vt}netrw_hidkeep     |unlet {a:vt}netrw_hidkeep  |endif
+if exists("{a:vt}netrw_imkeep")   |let &l:im     = {a:vt}netrw_imkeep      |unlet {a:vt}netrw_imkeep   |endif
 if exists("{a:vt}netrw_magic")    |let &l:magic  = {a:vt}netrw_magic       |unlet {a:vt}netrw_magic    |endif
 if exists("{a:vt}netrw_repkeep")  |let &l:report = {a:vt}netrw_repkeep     |unlet {a:vt}netrw_repkeep  |endif
 if exists("{a:vt}netrw_spellkeep")|let &l:spell  = {a:vt}netrw_spellkeep   |unlet {a:vt}netrw_spellkeep|endif
 if exists("{a:vt}netrw_twkeep")   |let &l:tw     = {a:vt}netrw_twkeep      |unlet {a:vt}netrw_twkeep   |endif
 if exists("{a:vt}netrw_wigkeep")  |let &l:wig    = {a:vt}netrw_wigkeep     |unlet {a:vt}netrw_wigkeep  |endif
 "  call Decho("win#".winnr()."'s ft=".&ft)
 setlocal cino=
 setlocal com=
 setlocal cpo-=aA
 if exists("&acd") | setlocal noacd | endif
-setlocal nocin noai noci magic nospell nohid wig= noaw
+setlocal nocin noai nobomb noci magic nospell nohid wig= noaw noim
 setlocal fo=nroql2
 setlocal tw=0
 setlocal report=10000
 setlocal isk+=@ isk+=* isk+=/
 if g:netrw_use_noswf && has("win32") && !has("win95")
 setlocal noswf
 endif
+call s:NetrwCursorline()
 " allow the user to override safe options
 if &ft == "netrw"
+"   call Decho("do any netrw FileType autocmds")
 silent keepalt keepjumps doau FileType netrw
 endif
 "  call Decho("fo=".&fo.(exists("&acd")? " acd=".&acd : " acd doesn't exist"))
 "  call Dret("s:NetrwSafeOptions")
 "  call Dfunc("netrw#NetRead(mode=".a:mode.",...) a:0=".a:0." ".g:loaded_netrw)
 " NetRead: save options {{{3
 call s:NetrwOptionSave("w:")
 call s:NetrwSafeOptions()
+call s:RestoreCursorline()
 " NetRead: interpret mode into a readcmd {{{3
 if     a:mode == 0 " read remote file before current line
 let readcmd = "0r"
 elseif a:mode == 1 " read file after current line
 " Check if NetrwBrowse() should be handling this request
 "   call Decho("checking if NetrwBrowse() should handle choice<".choice."> with netrw_list_cmd<".g:netrw_list_cmd.">")
 if choice =~ "^.*[\/]$" && b:netrw_method != 5 && choice !~ '^http://'
 "    call Decho("yes, choice matches '^.*[\/]$'")
-keepjumps call s:NetrwBrowse(0,choice)
+keepj call s:NetrwBrowse(0,choice)
 "    call Dret("netrw#NetRead :3 getcwd<".getcwd().">")
 return
 endif
 " ============
 "     call Decho("read via ftp+.netrc (method #2)")
 let netrw_fname= b:netrw_fname
 call s:SaveBufVars()|new|call s:RestoreBufVars()
 let filtbuf= bufnr("%")
 setlocal ff=unix
-put =g:netrw_ftpmode
+keepj put =g:netrw_ftpmode
 "     call Decho("filter input: ".getline(line("$")))
 if exists("g:netrw_ftpextracmd")
-put =g:netrw_ftpextracmd
+keepj put =g:netrw_ftpextracmd
 "      call Decho("filter input: ".getline(line("$")))
 endif
 call setline(line("$")+1,'get "'.netrw_fname.'" '.tmpfile)
 "     call Decho("filter input: ".getline(line("$")))
 if exists("g:netrw_port") && g:netrw_port != ""
 let netrw_fname= escape(b:netrw_fname,g:netrw_fname_escape)
 call s:SaveBufVars()|new|call s:RestoreBufVars()
 let filtbuf= bufnr("%")
 setlocal ff=unix
 if exists("g:netrw_port") && g:netrw_port != ""
-put ='open '.g:netrw_machine.' '.g:netrw_port
+keepj put ='open '.g:netrw_machine.' '.g:netrw_port
 "     call Decho("filter input: ".getline('.'))
 else
-put ='open '.g:netrw_machine
+keepj put ='open '.g:netrw_machine
 "     call Decho("filter input: ".getline('.'))
 endif
 if exists("g:netrw_ftp") && g:netrw_ftp == 1
-put =g:netrw_uid
+keepj put =g:netrw_uid
 "     call Decho("filter input: ".getline('.'))
-put ='\"'.s:netrw_passwd.'\"'
+keepj put ='\"'.s:netrw_passwd.'\"'
 "     call Decho("filter input: ".getline('.'))
 else
-put ='user \"'.g:netrw_uid.'\" \"'.s:netrw_passwd.'\"'
+keepj put ='user \"'.g:netrw_uid.'\" \"'.s:netrw_passwd.'\"'
 "     call Decho("filter input: ".getline('.'))
 endif
 if exists("g:netrw_ftpmode") && g:netrw_ftpmode != ""
-put =g:netrw_ftpmode
+keepj put =g:netrw_ftpmode
 "     call Decho("filter input: ".getline('.'))
 endif
 if exists("g:netrw_ftpextracmd")
 put =g:netrw_ftpextracmd
 "     call Decho("filter input: ".getline('.'))
 endif
-put ='get \"'.netrw_fname.'\" '.tmpfile
+keepj put ='get \"'.netrw_fname.'\" '.tmpfile
 "    call Decho("filter input: ".getline('.'))
 " perform ftp:
 " -i       : turns off interactive prompting from ftp
 " -n  unix : DON'T use <.netrc>, even though it exists
 " Construct execution string (four lines) which will be passed through filter
 let netrw_fname= escape(b:netrw_fname,g:netrw_fname_escape)
 new
 setlocal ff=unix
 if exists("g:netrw_port") && g:netrw_port != ""
-put ='open '.g:netrw_machine.' '.g:netrw_port
+keepj put ='open '.g:netrw_machine.' '.g:netrw_port
 else
-put ='open '.g:netrw_machine
+keepj put ='open '.g:netrw_machine
 endif
-put ='user '.g:netrw_uid.' '.s:netrw_passwd
+keepj put ='user '.g:netrw_uid.' '.s:netrw_passwd
-put ='get '.netrw_fname.' '.tmpfile
+keepj put ='get '.netrw_fname.' '.tmpfile
-put ='quit'
+keepj put ='quit'
 " perform cadaver operation:
-norm! 1Gdd
+keepj norm! 1Gdd
 "    call Decho("executing: %!".g:netrw_dav_cmd)
 exe s:netrw_silentxfer."%!".g:netrw_dav_cmd
 bd!
 endif
 let result           = s:NetrwGetFile(readcmd, tmpfile, b:netrw_method)
 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! ".fnameescape(v:cmdarg)." ".fnameescape(tmpfile))
-silent exe "w! ".fnameescape(v:cmdarg)." ".fnameescape(tmpfile)
+exe "silent keepj 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! ".fnameescape(v:cmdarg)." ".fnameescape(cygtmpfile))
-silent exe a:firstline."," . a:lastline . "w! ".fnameescape(v:cmdarg)." ".fnameescape(cygtmpfile)
+exe "sil keepj ".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! ".fnameescape(v:cmdarg)." ".fnameescape(tmpfile))
-silent exe a:firstline."," . a:lastline . "w! ".fnameescape(v:cmdarg)." ".fnameescape(tmpfile)
+exe "sil keepj ".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
 setlocal bh=hide
 enew
 "    call Decho("filter input window#".winnr())
 setlocal ff=unix
-put =g:netrw_ftpmode
+keepj put =g:netrw_ftpmode
 "    call Decho("filter input: ".getline('$'))
 if exists("g:netrw_ftpextracmd")
-put =g:netrw_ftpextracmd
+keepj put =g:netrw_ftpextracmd
 "     call Decho("filter input: ".getline("$"))
 endif
 call setline(line("$")+1,'put "'.tmpfile.'" "'.netrw_fname.'"')
 "    call Decho("filter input: ".getline("$"))
 if exists("g:netrw_port") && g:netrw_port != ""
 setlocal bh=hide
 enew
 setlocal ff=unix
 if exists("g:netrw_port") && g:netrw_port != ""
-put ='open '.g:netrw_machine.' '.g:netrw_port
+keepj put ='open '.g:netrw_machine.' '.g:netrw_port
 "     call Decho("filter input: ".getline('.'))
 else
-put ='open '.g:netrw_machine
+keepj put ='open '.g:netrw_machine
 "     call Decho("filter input: ".getline('.'))
 endif
 if exists("g:netrw_ftp") && g:netrw_ftp == 1
-put =g:netrw_uid
+keepj put =g:netrw_uid
 "     call Decho("filter input: ".getline('.'))
-put ='\"'.s:netrw_passwd.'\"'
+keepj put ='\"'.s:netrw_passwd.'\"'
 "     call Decho("filter input: ".getline('.'))
 else
-put ='user \"'.g:netrw_uid.'\" \"'.s:netrw_passwd.'\"'
+keepj put ='user \"'.g:netrw_uid.'\" \"'.s:netrw_passwd.'\"'
 "     call Decho("filter input: ".getline('.'))
 endif
-put =g:netrw_ftpmode
+keepj put =g:netrw_ftpmode
 "    call Decho("filter input: ".getline('$'))
 if exists("g:netrw_ftpextracmd")
-put =g:netrw_ftpextracmd
+keepj put =g:netrw_ftpextracmd
 "     call Decho("filter input: ".getline("$"))
 endif
-put ='put \"'.tmpfile.'\" \"'.netrw_fname.'\"'
+keepj put ='put \"'.tmpfile.'\" \"'.netrw_fname.'\"'
 "    call Decho("filter input: ".getline('.'))
 " save choice/id/password for future use
 let b:netrw_lastfile = choice
 " perform ftp:
 " -i       : turns off interactive prompting from ftp
 " -n  unix : DON'T use <.netrc>, even though it exists
 " -n  win32: quit being obnoxious about password
-norm! 1Gdd
+keepj norm! 1Gdd
 "    call Decho("executing: %!".g:netrw_ftp_cmd." -i -n")
 exe s:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i -n"
 " 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")
 setlocal bh=hide
 enew
 setlocal ff=unix
 if exists("g:netrw_port") && g:netrw_port != ""
-put ='open '.g:netrw_machine.' '.g:netrw_port
+keepj put ='open '.g:netrw_machine.' '.g:netrw_port
 else
-put ='open '.g:netrw_machine
+keepj put ='open '.g:netrw_machine
 endif
 if exists("g:netrw_uid") && exists("s:netrw_passwd")
-put ='user '.g:netrw_uid.' '.s:netrw_passwd
+keepj put ='user '.g:netrw_uid.' '.s:netrw_passwd
 endif
-put ='put '.tmpfile.' '.netrw_fname
+keepj put ='put '.tmpfile.' '.netrw_fname
 " perform cadaver operation:
-norm! 1Gdd
+keepj norm! 1Gdd
 "    call Decho("executing: %!".g:netrw_dav_cmd)
 exe s:netrw_silentxfer."%!".g:netrw_dav_cmd
 " remove enew buffer (quietly)
 let filtbuf= bufnr("%")
 e!
 endif
 " rename buffer back to remote filename
 "   call Decho("exe silent! keepalt file ".fnameescape(rfile))
-exe "silent! keepalt file ".fnameescape(rfile)
+exe "sil! keepalt file ".fnameescape(rfile)
 filetype detect
 "   call Dredir("renamed buffer back to remote filename<".rfile."> : expand(%)<".expand("%").">","ls!")
 let line1 = 1
 let line2 = line("$")
 endif
 if method == 3   " ftp (no <.netrc>)
 let fourblanklines= line2 - 3
 if fourblanklines >= line1
-exe "silent ".fourblanklines.",".line2."g/^\s*$/d"
+exe "sil keepj ".fourblanklines.",".line2."g/^\s*$/d"
 call histdel("/",-1)
 endif
 endif
 "   call Dret("NetReadFixup")
 if !exists("g:netrw_uid") || g:netrw_uid == ""
 " via prompt
 let g:netrw_uid= input('Enter username: ')
 endif
 else	" from command line
-"  call Dfunc("NetUserPass(a:1<".a:1.">) {")
+"  call Dfunc("NetUserPass(a:1<".a:1.">)")
 let g:netrw_uid= a:1
 endif
 " get password
 if a:0 <= 1 " via prompt
 nnoremap <buffer> <silent> u		:<c-u>call <SID>NetrwBookHistHandler(4,expand("%"))<cr>
 nnoremap <buffer> <silent> U		:<c-u>call <SID>NetrwBookHistHandler(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>
+inoremap <buffer> <silent> <cr>	<c-o>:call netrw#LocalBrowseCheck(<SID>NetrwBrowseChgDir(1,<SID>NetrwGetWord()))<cr>
+inoremap <buffer> <silent> -		<c-o>:exe "norm! 0"<bar>call netrw#LocalBrowseCheck(<SID>NetrwBrowseChgDir(1,'../'))<cr>
+inoremap <buffer> <silent> a		<c-o>:call <SID>NetrwHide(1)<cr>
+inoremap <buffer> <silent> mb	<c-o>:<c-u>call <SID>NetrwBookHistHandler(0,b:netrw_curdir)<cr>
+inoremap <buffer> <silent> mc	<c-o>:<c-u>call <SID>NetrwMarkFileCopy(1)<cr>
+inoremap <buffer> <silent> md	<c-o>:<c-u>call <SID>NetrwMarkFileDiff(1)<cr>
+inoremap <buffer> <silent> me	<c-o>:<c-u>call <SID>NetrwMarkFileEdit(1)<cr>
+inoremap <buffer> <silent> mf	<c-o>:<c-u>call <SID>NetrwMarkFile(1,<SID>NetrwGetWord())<cr>
+inoremap <buffer> <silent> mg	<c-o>:<c-u>call <SID>NetrwMarkFileGrep(1)<cr>
+inoremap <buffer> <silent> mh	<c-o>:<c-u>call <SID>NetrwMarkHideSfx(1)<cr>
+inoremap <buffer> <silent> mm	<c-o>:<c-u>call <SID>NetrwMarkFileMove(1)<cr>
+inoremap <buffer> <silent> mp	<c-o>:<c-u>call <SID>NetrwMarkFilePrint(1)<cr>
+inoremap <buffer> <silent> mr	<c-o>:<c-u>call <SID>NetrwMarkFileRegexp(1)<cr>
+inoremap <buffer> <silent> ms	<c-o>:<c-u>call <SID>NetrwMarkFileSource(1)<cr>
+inoremap <buffer> <silent> mT	<c-o>:<c-u>call <SID>NetrwMarkFileTag(1)<cr>
+inoremap <buffer> <silent> mt	<c-o>:<c-u>call <SID>NetrwMarkFileTgt(1)<cr>
+inoremap <buffer> <silent> mu	<c-o>:<c-u>call <SID>NetrwUnMarkFile(1)<cr>
+inoremap <buffer> <silent> mx	<c-o>:<c-u>call <SID>NetrwMarkFileExe(1)<cr>
+inoremap <buffer> <silent> mz	<c-o>:<c-u>call <SID>NetrwMarkFileCompress(1)<cr>
+inoremap <buffer> <silent> gb	<c-o>:<c-u>call <SID>NetrwBookHistHandler(1,b:netrw_curdir)<cr>
+inoremap <buffer> <silent> gh	<c-o>:<c-u>call <SID>NetrwHidden(1)<cr>
+inoremap <buffer> <silent> gp	<c-o>:<c-u>call <SID>NetrwChgPerm(1,b:netrw_curdir)<cr>
+inoremap <buffer> <silent> c		<c-o>:exe "keepjumps lcd ".fnameescape(b:netrw_curdir)<cr>
+inoremap <buffer> <silent> C		<c-o>:let g:netrw_chgwin= winnr()<cr>
+inoremap <buffer> <silent> d		<c-o>:call <SID>NetrwMakeDir("")<cr>
+inoremap <buffer> <silent> i		<c-o>:call <SID>NetrwListStyle(1)<cr>
+inoremap <buffer> <silent> I		<c-o>:call <SID>NetrwBannerCtrl(1)<cr>
+inoremap <buffer> <silent> o		<c-o>:call <SID>NetrwSplit(3)<cr>
+inoremap <buffer> <silent> O		<c-o>:call <SID>NetrwObtain(1)<cr>
+inoremap <buffer> <silent> p		<c-o>:call <SID>NetrwPreview(<SID>NetrwBrowseChgDir(1,<SID>NetrwGetWord(),1))<cr>
+inoremap <buffer> <silent> P		<c-o>:call <SID>NetrwPrevWinOpen(1)<cr>
+inoremap <buffer> <silent> qb	<c-o>:<c-u>call <SID>NetrwBookHistHandler(2,b:netrw_curdir)<cr>
+inoremap <buffer> <silent> mB	<c-o>:<c-u>call <SID>NetrwBookHistHandler(6,b:netrw_curdir)<cr>
+inoremap <buffer> <silent> qf	<c-o>:<c-u>call <SID>NetrwFileInfo(1,<SID>NetrwGetWord())<cr>
+inoremap <buffer> <silent> r		<c-o>:let g:netrw_sort_direction= (g:netrw_sort_direction =~ 'n')? 'r' : 'n'<bar>exe "norm! 0"<bar>call <SID>NetrwRefresh(1,<SID>NetrwBrowseChgDir(1,'./'))<cr>
+inoremap <buffer> <silent> s		<c-o>:call <SID>NetrwSortStyle(1)<cr>
+inoremap <buffer> <silent> S		<c-o>:call <SID>NetSortSequence(1)<cr>
+inoremap <buffer> <silent> t		<c-o>:call <SID>NetrwSplit(4)<cr>
+inoremap <buffer> <silent> T		<c-o>:call <SID>NetrwSplit(4)<bar>norm! gT<cr>
+inoremap <buffer> <silent> u		<c-o>:<c-u>call <SID>NetrwBookHistHandler(4,expand("%"))<cr>
+inoremap <buffer> <silent> U		<c-o>:<c-u>call <SID>NetrwBookHistHandler(5,expand("%"))<cr>
+inoremap <buffer> <silent> v		<c-o>:call <SID>NetrwSplit(5)<cr>
+inoremap <buffer> <silent> x		<c-o>:call netrw#NetrwBrowseX(<SID>NetrwBrowseChgDir(1,<SID>NetrwGetWord(),0),0)"<cr>
+inoremap <buffer> <silent> %		<c-o>:call <SID>NetrwOpenFile(1)<cr>
 if !hasmapto('<Plug>NetrwHideEdit')
 nmap <buffer> <unique> <c-h> <Plug>NetrwHideEdit
+imap <buffer> <unique> <c-h> <Plug>NetrwHideEdit
 endif
 nnoremap <buffer> <silent> <Plug>NetrwHideEdit	:call <SID>NetrwHideEdit(1)<cr>
 if !hasmapto('<Plug>NetrwRefresh')
 nmap <buffer> <unique> <c-l> <Plug>NetrwRefresh
+imap <buffer> <unique> <c-l> <Plug>NetrwRefresh
 endif
 nnoremap <buffer> <silent> <Plug>NetrwRefresh		:call <SID>NetrwRefresh(1,<SID>NetrwBrowseChgDir(1,'./'))<cr>
 if s:didstarstar || !mapcheck("<s-down>","n")
 nnoremap <buffer> <silent> <s-down>	:Nexplore<cr>
+inoremap <buffer> <silent> <s-down>	:Nexplore<cr>
 endif
 if s:didstarstar || !mapcheck("<s-up>","n")
 nnoremap <buffer> <silent> <s-up>	:Pexplore<cr>
+inoremap <buffer> <silent> <s-up>	:Pexplore<cr>
 endif
 let mapsafecurdir = escape(b:netrw_curdir, s:netrw_map_escape)
 if g:netrw_mousemaps == 1
 nnoremap <buffer> <silent> <leftmouse>   <leftmouse>:call <SID>NetrwLeftmouse(1)<cr>
 nnoremap <buffer> <silent> <middlemouse> <leftmouse>:call <SID>NetrwPrevWinOpen(1)<cr>
 nnoremap <buffer> <silent> <s-leftmouse> <leftmouse>:call <SID>NetrwMarkFile(1,<SID>NetrwGetWord())<cr>
 exe 'nnoremap <buffer> <silent> <rightmouse>  <leftmouse>:call <SID>NetrwLocalRm("'.mapsafecurdir.'")<cr>'
 exe 'vnoremap <buffer> <silent> <rightmouse>  <leftmouse>:call <SID>NetrwLocalRm("'.mapsafecurdir.'")<cr>'
+inoremap <buffer> <silent> <leftmouse>   <c-o><leftmouse><c-o>:call <SID>NetrwLeftmouse(1)<cr>
+inoremap <buffer> <silent> <middlemouse> <c-o><leftmouse><c-o>:call <SID>NetrwPrevWinOpen(1)<cr>
+inoremap <buffer> <silent> <s-leftmouse> <c-o><leftmouse><c-o>:call <SID>NetrwMarkFile(1,<SID>NetrwGetWord())<cr>
+exe 'inoremap <buffer> <silent> <rightmouse>  <c-o><leftmouse><c-o>:call <SID>NetrwLocalRm("'.mapsafecurdir.'")<cr>'
 endif
 exe 'nnoremap <buffer> <silent> <del>	:call <SID>NetrwLocalRm("'.mapsafecurdir.'")<cr>'
+exe 'nnoremap <buffer> <silent> D		:call <SID>NetrwLocalRm("'.mapsafecurdir.'")<cr>'
+exe 'nnoremap <buffer> <silent> R		:call <SID>NetrwLocalRename("'.mapsafecurdir.'")<cr>'
+exe 'nnoremap <buffer> <silent> <Leader>m	:call <SID>NetrwMakeDir("")<cr>'
 exe 'vnoremap <buffer> <silent> <del>	:call <SID>NetrwLocalRm("'.mapsafecurdir.'")<cr>'
-exe 'nnoremap <buffer> <silent> D		:call <SID>NetrwLocalRm("'.mapsafecurdir.'")<cr>'
 exe 'vnoremap <buffer> <silent> D		:call <SID>NetrwLocalRm("'.mapsafecurdir.'")<cr>'
-exe 'nnoremap <buffer> <silent> R		:call <SID>NetrwLocalRename("'.mapsafecurdir.'")<cr>'
 exe 'vnoremap <buffer> <silent> R		:call <SID>NetrwLocalRename("'.mapsafecurdir.'")<cr>'
-exe 'nnoremap <buffer> <silent> <Leader>m	:call <SID>NetrwMakeDir("")<cr>'
+exe 'inoremap <buffer> <silent> <del>	<c-o>:call <SID>NetrwLocalRm("'.mapsafecurdir.'")<cr>'
+exe 'inoremap <buffer> <silent> D		<c-o>:call <SID>NetrwLocalRm("'.mapsafecurdir.'")<cr>'
+exe 'inoremap <buffer> <silent> R		<c-o>:call <SID>NetrwLocalRename("'.mapsafecurdir.'")<cr>'
+exe 'inoremap <buffer> <silent> <Leader>m	<c-o>:call <SID>NetrwMakeDir("")<cr>'
 nnoremap <buffer> <F1>		:he netrw-quickhelp<cr>
 else " remote
 "   call Decho("make remote maps")
 call s:RemotePathAnalysis(b:netrw_curdir)
 nnoremap <buffer> <silent> u		:<c-u>call <SID>NetrwBookHistHandler(4,b:netrw_curdir)<cr>
 nnoremap <buffer> <silent> U		:<c-u>call <SID>NetrwBookHistHandler(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>
+inoremap <buffer> <silent> <cr>	<c-o>:call <SID>NetrwBrowse(0,<SID>NetrwBrowseChgDir(0,<SID>NetrwGetWord()))<cr>
+inoremap <buffer> <silent> <c-l>	<c-o>:call <SID>NetrwRefresh(0,<SID>NetrwBrowseChgDir(0,'./'))<cr>
+inoremap <buffer> <silent> -		<c-o>:exe "norm! 0"<bar>call <SID>NetrwBrowse(0,<SID>NetrwBrowseChgDir(0,'../'))<cr>
+inoremap <buffer> <silent> a		<c-o>:call <SID>NetrwHide(0)<cr>
+inoremap <buffer> <silent> mb	<c-o>:<c-u>call <SID>NetrwBookHistHandler(0,b:netrw_curdir)<cr>
+inoremap <buffer> <silent> mc	<c-o>:<c-u>call <SID>NetrwMarkFileCopy(0)<cr>
+inoremap <buffer> <silent> md	<c-o>:<c-u>call <SID>NetrwMarkFileDiff(0)<cr>
+inoremap <buffer> <silent> me	<c-o>:<c-u>call <SID>NetrwMarkFileEdit(0)<cr>
+inoremap <buffer> <silent> mf	<c-o>:<c-u>call <SID>NetrwMarkFile(0,<SID>NetrwGetWord())<cr>
+inoremap <buffer> <silent> mg	<c-o>:<c-u>call <SID>NetrwMarkFileGrep(0)<cr>
+inoremap <buffer> <silent> mh	<c-o>:<c-u>call <SID>NetrwMarkHideSfx(0)<cr>
+inoremap <buffer> <silent> mm	<c-o>:<c-u>call <SID>NetrwMarkFileMove(0)<cr>
+inoremap <buffer> <silent> mp	<c-o>:<c-u>call <SID>NetrwMarkFilePrint(0)<cr>
+inoremap <buffer> <silent> mr	<c-o>:<c-u>call <SID>NetrwMarkFileRegexp(0)<cr>
+inoremap <buffer> <silent> ms	<c-o>:<c-u>call <SID>NetrwMarkFileSource(0)<cr>
+inoremap <buffer> <silent> mT	<c-o>:<c-u>call <SID>NetrwMarkFileTag(0)<cr>
+inoremap <buffer> <silent> mt	<c-o>:<c-u>call <SID>NetrwMarkFileTgt(0)<cr>
+inoremap <buffer> <silent> mu	<c-o>:<c-u>call <SID>NetrwUnMarkFile(0)<cr>
+inoremap <buffer> <silent> mx	<c-o>:<c-u>call <SID>NetrwMarkFileExe(0)<cr>
+inoremap <buffer> <silent> mz	<c-o>:<c-u>call <SID>NetrwMarkFileCompress(0)<cr>
+inoremap <buffer> <silent> gb	<c-o>:<c-u>call <SID>NetrwBookHistHandler(1,b:netrw_cur)<cr>
+inoremap <buffer> <silent> gh	<c-o>:<c-u>call <SID>NetrwHidden(0)<cr>
+inoremap <buffer> <silent> gp	<c-o>:<c-u>call <SID>NetrwChgPerm(0,b:netrw_curdir)<cr>
+inoremap <buffer> <silent> C		<c-o>:let g:netrw_chgwin= winnr()<cr>
+inoremap <buffer> <silent> i		<c-o>:call <SID>NetrwListStyle(0)<cr>
+inoremap <buffer> <silent> I		<c-o>:call <SID>NetrwBannerCtrl(1)<cr>
+inoremap <buffer> <silent> o		<c-o>:call <SID>NetrwSplit(0)<cr>
+inoremap <buffer> <silent> O		<c-o>:call <SID>NetrwObtain(0)<cr>
+inoremap <buffer> <silent> p		<c-o>:call <SID>NetrwPreview(<SID>NetrwBrowseChgDir(1,<SID>NetrwGetWord(),1))<cr>
+inoremap <buffer> <silent> P		<c-o>:call <SID>NetrwPrevWinOpen(0)<cr>
+inoremap <buffer> <silent> qb	<c-o>:<c-u>call <SID>NetrwBookHistHandler(2,b:netrw_curdir)<cr>
+inoremap <buffer> <silent> mB	<c-o>:<c-u>call <SID>NetrwBookHistHandler(6,b:netrw_curdir)<cr>
+inoremap <buffer> <silent> qf	<c-o>:<c-u>call <SID>NetrwFileInfo(0,<SID>NetrwGetWord())<cr>
+inoremap <buffer> <silent> r		<c-o>:let g:netrw_sort_direction= (g:netrw_sort_direction =~ 'n')? 'r' : 'n'<bar>exe "norm! 0"<bar>call <SID>NetrwBrowse(0,<SID>NetrwBrowseChgDir(0,'./'))<cr>
+inoremap <buffer> <silent> s		<c-o>:call <SID>NetrwSortStyle(0)<cr>
+inoremap <buffer> <silent> S		<c-o>:call <SID>NetSortSequence(0)<cr>
+inoremap <buffer> <silent> t		<c-o>:call <SID>NetrwSplit(1)<cr>
+inoremap <buffer> <silent> T		<c-o>:call <SID>NetrwSplit(1)<bar>norm! gT<cr>
+inoremap <buffer> <silent> u		<c-o>:<c-u>call <SID>NetrwBookHistHandler(4,b:netrw_curdir)<cr>
+inoremap <buffer> <silent> U		<c-o>:<c-u>call <SID>NetrwBookHistHandler(5,b:netrw_curdir)<cr>
+inoremap <buffer> <silent> v		<c-o>:call <SID>NetrwSplit(2)<cr>
+inoremap <buffer> <silent> x		<c-o>:call netrw#NetrwBrowseX(<SID>NetrwBrowseChgDir(0,<SID>NetrwGetWord()),1)<cr>
+inoremap <buffer> <silent> %		<c-o>:call <SID>NetrwOpenFile(0)<cr>
 if !hasmapto('<Plug>NetrwHideEdit')
 nmap <buffer> <c-h> <Plug>NetrwHideEdit
+imap <buffer> <c-h> <Plug>NetrwHideEdit
 endif
 nnoremap <buffer> <silent> <Plug>NetrwHideEdit	:call <SID>NetrwHideEdit(0)<cr>
 if !hasmapto('<Plug>NetrwRefresh')
 nmap <buffer> <c-l> <Plug>NetrwRefresh
+imap <buffer> <c-l> <Plug>NetrwRefresh
 endif
 let mapsafepath     = escape(s:path, s:netrw_map_escape)
 let mapsafeusermach = escape(s:user.s:machine, s:netrw_map_escape)
 nnoremap <buffer> <silent> <leftmouse>   <leftmouse>:call <SID>NetrwLeftmouse(0)<cr>
 nnoremap <buffer> <silent> <middlemouse> <leftmouse>:call <SID>NetrwPrevWinOpen(0)<cr>
 nnoremap <buffer> <silent> <s-leftmouse> <leftmouse>:call <SID>NetrwMarkFile(0,<SID>NetrwGetWord())<cr>
 exe 'nnoremap <buffer> <silent> <rightmouse> <leftmouse>:call <SID>NetrwRemoteRm("'.mapsafeusermach.'","'.mapsafepath.'")<cr>'
 exe 'vnoremap <buffer> <silent> <rightmouse> <leftmouse>:call <SID>NetrwRemoteRm("'.mapsafeusermach.'","'.mapsafepath.'")<cr>'
+inoremap <buffer> <silent> <leftmouse>   <c-o><leftmouse><c-o>:call <SID>NetrwLeftmouse(0)<cr>
+inoremap <buffer> <silent> <middlemouse> <c-o><leftmouse><c-o>:call <SID>NetrwPrevWinOpen(0)<cr>
+inoremap <buffer> <silent> <s-leftmouse> <c-o><leftmouse><c-o>:call <SID>NetrwMarkFile(0,<SID>NetrwGetWord())<cr>
+exe 'inoremap <buffer> <silent> <rightmouse> <c-o><leftmouse><c-o>:call <SID>NetrwRemoteRm("'.mapsafeusermach.'","'.mapsafepath.'")<cr>'
 endif
 exe 'nnoremap <buffer> <silent> <del>	:call <SID>NetrwRemoteRm("'.mapsafeusermach.'","'.mapsafepath.'")<cr>'
+exe 'nnoremap <buffer> <silent> d		:call <SID>NetrwMakeDir("'.mapsafeusermach.'")<cr>'
+exe 'nnoremap <buffer> <silent> D		:call <SID>NetrwRemoteRm("'.mapsafeusermach.'","'.mapsafepath.'")<cr>'
+exe 'nnoremap <buffer> <silent> R		:call <SID>NetrwRemoteRename("'.mapsafeusermach.'","'.mapsafepath.'")<cr>'
 exe 'vnoremap <buffer> <silent> <del>	:call <SID>NetrwRemoteRm("'.mapsafeusermach.'","'.mapsafepath.'")<cr>'
-exe 'nnoremap <buffer> <silent> d	:call <SID>NetrwMakeDir("'.mapsafeusermach.'")<cr>'
+exe 'vnoremap <buffer> <silent> D		:call <SID>NetrwRemoteRm("'.mapsafeusermach.'","'.mapsafepath.'")<cr>'
-exe 'nnoremap <buffer> <silent> D	:call <SID>NetrwRemoteRm("'.mapsafeusermach.'","'.mapsafepath.'")<cr>'
+exe 'vnoremap <buffer> <silent> R		:call <SID>NetrwRemoteRename("'.mapsafeusermach.'","'.mapsafepath.'")<cr>'
-exe 'vnoremap <buffer> <silent> D	:call <SID>NetrwRemoteRm("'.mapsafeusermach.'","'.mapsafepath.'")<cr>'
+exe 'inoremap <buffer> <silent> <del>	<c-o>:call <SID>NetrwRemoteRm("'.mapsafeusermach.'","'.mapsafepath.'")<cr>'
-exe 'nnoremap <buffer> <silent> R	:call <SID>NetrwRemoteRename("'.mapsafeusermach.'","'.mapsafepath.'")<cr>'
+exe 'inoremap <buffer> <silent> d		<c-o>:call <SID>NetrwMakeDir("'.mapsafeusermach.'")<cr>'
-exe 'vnoremap <buffer> <silent> R	:call <SID>NetrwRemoteRename("'.mapsafeusermach.'","'.mapsafepath.'")<cr>'
+exe 'inoremap <buffer> <silent> D		<c-o>:call <SID>NetrwRemoteRm("'.mapsafeusermach.'","'.mapsafepath.'")<cr>'
+exe 'inoremap <buffer> <silent> R		<c-o>:call <SID>NetrwRemoteRename("'.mapsafeusermach.'","'.mapsafepath.'")<cr>'
 nnoremap <buffer> <F1>			:he netrw-quickhelp<cr>
+inoremap <buffer> <F1>			<c-o>:he netrw-quickhelp<cr>
 endif
 call s:SetRexDir(a:islocal,b:netrw_curdir)
 "  call Dret("s:BrowserMaps")
 endfun
 "    3: (browsing)     record current directory history
 "    4: (user: <u>)    go up   (previous) bookmark
 "    5: (user: <U>)    go down (next)     bookmark
 "    6: (user: <mB>)   delete bookmark
 fun! s:NetrwBookHistHandler(chg,curdir)
-"  call Dfunc("NetrwBookHistHandler(chg=".a:chg." curdir<".a:curdir.">) cnt=".v:count." histcnt=".g:netrw_dirhist_cnt." histmax=".g:netrw_dirhistmax)
+"  call Dfunc("s:NetrwBookHistHandler(chg=".a:chg." curdir<".a:curdir.">) cnt=".v:count." histcnt=".g:netrw_dirhist_cnt." histmax=".g:netrw_dirhistmax)
 if a:chg == 0
 " bookmark the current directory
 "   call Decho("(user: <b>) bookmark the current directory")
 if !exists("g:netrw_bookmarklist")
 if exists("g:netrw_dirhist_{g:netrw_dirhist_cnt}")
 "    call Decho("changedir u#".g:netrw_dirhist_cnt."<".g:netrw_dirhist_{g:netrw_dirhist_cnt}.">")
 if exists("w:netrw_liststyle") && w:netrw_liststyle == s:TREELIST && exists("b:netrw_curdir")
 setlocal ma noro
 "     call Decho("setlocal ma noro")
-%d
+keepj %d
 setlocal nomod
 "     call Decho("setlocal nomod")
 endif
 "    "    call Decho("exe e! ".fnameescape(g:netrw_dirhist_{g:netrw_dirhist_cnt}))
-exe "e! ".fnameescape(g:netrw_dirhist_{g:netrw_dirhist_cnt})
+exe "keepj 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
 if exists("g:netrw_dirhist_{g:netrw_dirhist_cnt}")
 "    call Decho("changedir U#".g:netrw_dirhist_cnt."<".g:netrw_dirhist_{g:netrw_dirhist_cnt}.">")
 if exists("w:netrw_liststyle") && w:netrw_liststyle == s:TREELIST && exists("b:netrw_curdir")
 setlocal ma noro
 "     call Decho("setlocal ma noro")
-%d
+keepj %d
 "     call Decho("removed all lines from buffer (%d)")
 setlocal nomod
 "     call Decho("setlocal nomod")
 endif
 "    call Decho("exe e! ".fnameescape(g:netrw_dirhist_{g:netrw_dirhist_cnt}))
-exe "e! ".fnameescape(g:netrw_dirhist_{g:netrw_dirhist_cnt})
+exe "keepj 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 delete(savefile)
 endif
 call remove(g:netrw_bookmarklist,v:count-1)
 endif
 call s:NetrwBookmarkMenu()
-"  call Dret("NetrwBookHistHandler")
+"  call Dret("s:NetrwBookHistHandler")
 endfun
 " ---------------------------------------------------------------------
 " s:NetrwBookHistRead: this function reads bookmarks and history {{{2
 "                      Sister function: s:NetrwBookHistSave()
 let cnt      = 1
 while cnt <= g:netrw_dirhist_cnt
 call setline((cnt+lastline),'let g:netrw_dirhist_'.cnt."='".g:netrw_dirhist_{cnt}."'")
 let cnt= cnt + 1
 endwhile
-exe "silent! w! ".savefile
+exe "sil! w! ".savefile
-silent %d
+sil keepj %d
 if exists("g:netrw_bookmarklist") && g:netrw_bookmarklist != []
 " merge and write .netrwbook
 let savefile= s:NetrwHome()."/.netrwbook"
 if filereadable(savefile)
 let booklist= deepcopy(g:netrw_bookmarklist)
-exe "silent so ".savefile
+exe "sil keepj so ".savefile
 for bdm in booklist
 if index(g:netrw_bookmarklist,bdm) == -1
 call add(g:netrw_bookmarklist,bdm)
 endif
 endfor
 call sort(g:netrw_bookmarklist)
-exe "silent! w! ".savefile
+exe "sil! w! ".savefile
 endif
 " construct and save .netrwbook
 call setline(1,"let g:netrw_bookmarklist= ".string(g:netrw_bookmarklist))
-exe "silent! w! ".savefile
+exe "sil! w! ".savefile
 endif
 let bgone= bufnr("%")
 q!
 exe bgone."bwipe!"
 "  list of the contents of a local or remote directory.  It is assumed that the
 "  g:netrw_list_cmd has a string, USEPORT HOSTNAME, that needs to be substituted
 "  with the requested remote hostname first.
 fun! s:NetrwBrowse(islocal,dirname)
 if !exists("w:netrw_liststyle")|let w:netrw_liststyle= g:netrw_liststyle|endif
-"  call Dfunc("s:NetrwBrowse(islocal=".a:islocal." dirname<".a:dirname.">) liststyle=".w:netrw_liststyle." ".g:loaded_netrw." buf#".bufnr("%")."<".bufname("%").">")
+"  call Dfunc("s:NetrwBrowse(islocal=".a:islocal." dirname<".a:dirname.">) liststyle=".w:netrw_liststyle." ".g:loaded_netrw." buf#".bufnr("%")."<".bufname("%")."> win#".winnr())
 "  call Decho("tab#".tabpagenr()." win#".winnr())
 "  call Dredir("ls!")
 if !exists("s:netrw_initbookhist")
 call s:NetrwBookHistRead()
 endif
 "  call FOTEST(7)
+"call Decho("COMBAK#01 buf(%)#".bufnr("%")."<".bufname("%")."> win#".winnr()." bufnr(win#1)=".winbufnr(1)."<".bufname(winbufnr(1))." bufnr(win#2)=".winbufnr(2)."<".bufname(winbufnr(2)).">")
 " simplify the dirname (especially for ".."s in dirnames)
 if a:dirname !~ '^\a\+://'
 let dirname= simplify(a:dirname)
 else
 let dirname= a:dirname
 endif
 "  call FOTEST(8)
+"call Decho("COMBAK#02 buf(%)#".bufnr("%")."<".bufname("%")."> win#".winnr()." bufnr(win#1)=".winbufnr(1)."<".bufname(winbufnr(1))." bufnr(win#2)=".winbufnr(2)."<".bufname(winbufnr(2)).">")
 if exists("s:netrw_skipbrowse")
 unlet s:netrw_skipbrowse
 "   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
 call s:NetrwOptionSave("w:")
 "  call FOTEST(9)
+"call Decho("COMBAK#03 buf(%)#".bufnr("%")."<".bufname("%")."> win#".winnr()." bufnr(win#1)=".winbufnr(1)."<".bufname(winbufnr(1))." bufnr(win#2)=".winbufnr(2)."<".bufname(winbufnr(2)).">")
 " re-instate any marked files
 if exists("s:netrwmarkfilelist_{bufnr('%')}")
 "   call Decho("clearing marked files")
 exe "2match netrwMarkFile /".s:netrwmarkfilemtch_{bufnr("%")}."/"
 endif
 "  call FOTEST(10)
+"call Decho("COMBAK#04 buf(%)#".bufnr("%")."<".bufname("%")."> win#".winnr()." bufnr(win#1)=".winbufnr(1)."<".bufname(winbufnr(1))." bufnr(win#2)=".winbufnr(2)."<".bufname(winbufnr(2)).">")
 if a:islocal && exists("w:netrw_acdkeep") && w:netrw_acdkeep
 "   call Decho("handle w:netrw_acdkeep:")
 "   call Decho("keepjumps lcd ".fnameescape(dirname)." (due to w:netrw_acdkeep=".w:netrw_acdkeep." - acd=".&acd.")")
-exe 'keepjumps lcd '.fnameescape(dirname)
+exe 'keepj lcd '.fnameescape(dirname)
 call s:NetrwSafeOptions()
 "   call Decho("getcwd<".getcwd().">")
 elseif !a:islocal && dirname !~ '[\/]$' && dirname !~ '^"'
 " looks like a regular file, attempt transfer
 let path= substitute(dirname,'[*=@|]\r\=$','','e')
 "   call Decho("new path<".path.">")
 call s:RemotePathAnalysis(dirname)
 " remote-read the requested file into current buffer {{{3
-mark '
+keepj mark '
 call s:NetrwEnew(dirname)
 call s:NetrwSafeOptions()
 setlocal ma noro
 "   call Decho("setlocal ma noro")
 let b:netrw_curdir= dirname
 "   call Decho("exe silent! keepalt file ".fnameescape(s:method."://".s:user.s:machine."/".s:path)." (bt=".&bt.")")
-exe "silent! keepalt file ".fnameescape(s:method."://".s:user.s:machine."/".s:path)
+exe "sil! keepalt file ".fnameescape(s:method."://".s:user.s:machine."/".s:path)
-exe "silent keepalt doau BufReadPre ".fnameescape(s:fname)
+exe "sil 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 ".fnameescape(s:fname)
+exe "sil keepalt doau BufReadPost ".fnameescape(s:fname)
 endif
 " save certain window-oriented variables into buffer-oriented variables {{{3
 call s:SetBufWinVars()
 call s:NetrwOptionRestore("w:")
 "   call Decho("ro=".&l:ro." ma=".&l:ma." mod=".&l:mod." wrap=".&l:wrap)
 "   call Dret("s:NetrwBrowse : file<".s:fname.">")
 return
 endif
 "  call FOTEST(11)
+"call Decho("COMBAK#05 buf(%)#".bufnr("%")."<".bufname("%")."> win#".winnr()." bufnr(win#1)=".winbufnr(1)."<".bufname(winbufnr(1))." bufnr(win#2)=".winbufnr(2)."<".bufname(winbufnr(2)).">")
 " use buffer-oriented WinVars if buffer ones exist but window ones don't {{{3
 call s:UseBufWinVars()
 " set up some variables {{{3
 let s:last_sort_by         = g:netrw_sort_by
 " set up menu {{{3
 call s:NetrwMenu(1)
 "  call FOTEST(12)
+"call Decho("COMBAK#06 buf(%)#".bufnr("%")."<".bufname("%")."> win#".winnr()." bufnr(win#1)=".winbufnr(1)."<".bufname(winbufnr(1))." bufnr(win#2)=".winbufnr(2)."<".bufname(winbufnr(2)).">")
 " set up buffer {{{3
 let reusing= s:NetrwGetBuffer(a:islocal,dirname)
 " maintain markfile highlighting
 if exists("s:netrwmarkfilemtch_{bufnr('%')}") && s:netrwmarkfilemtch_{bufnr("%")} != ""
 "   call Decho("ro=".&l:ro." ma=".&l:ma." mod=".&l:mod." wrap=".&l:wrap)
 "   call Dret("s:NetrwBrowse : re-using buffer")
 return
 endif
 ""  call FOTEST(13) " PROBLEM WITH LISTING
+"call Decho("COMBAK#07 buf(%)#".bufnr("%")."<".bufname("%")."> win#".winnr()." bufnr(win#1)=".winbufnr(1)."<".bufname(winbufnr(1))." bufnr(win#2)=".winbufnr(2)."<".bufname(winbufnr(2)).">")
 " set b:netrw_curdir to the new directory name {{{3
-"  call Decho("set b:netrw_curdir to the new directory name:")
+"  call Decho("set b:netrw_curdir to the new directory name:  (buf#".bufnr("%").")")
 let b:netrw_curdir= dirname
 if b:netrw_curdir =~ '[/\\]$'
 let b:netrw_curdir= substitute(b:netrw_curdir,'[/\\]$','','e')
 endif
 if b:netrw_curdir == ''
 if !a:islocal && b:netrw_curdir !~ '/$'
 let b:netrw_curdir= b:netrw_curdir.'/'
 endif
 "  call Decho("b:netrw_curdir<".b:netrw_curdir.">")
 ""  call FOTEST(14) " PROBLEM WITH LISTING
+"call Decho("COMBAK#08 buf(%)#".bufnr("%")."<".bufname("%")."> win#".winnr()." bufnr(win#1)=".winbufnr(1)."<".bufname(winbufnr(1))." bufnr(win#2)=".winbufnr(2)."<".bufname(winbufnr(2)).">")
 " ------------
 " (local only) {{{3
 " ------------
 if a:islocal
 "    call Decho("handle g:netrw_keepdir=".g:netrw_keepdir.": getcwd<".getcwd()."> acd=".&acd)
 "    call Decho("l:acd".(exists("&l:acd")? "=".&l:acd : " doesn't exist"))
 if !exists("&l:acd") || !&l:acd
 "     call Decho('exe keepjumps lcd '.fnameescape(b:netrw_curdir))
 try
-exe 'keepjumps lcd '.fnameescape(b:netrw_curdir)
+exe 'keepj lcd '.fnameescape(b:netrw_curdir)
 catch /^Vim\%((\a\+)\)\=:E472/
 call netrw#ErrorMsg(s:ERROR,"unable to change directory to <".b:netrw_curdir."> (permissions?)",61)
 if exists("w:netrw_prvdir")
 let b:netrw_curdir= w:netrw_prvdir
 else
 endif
 let b:netrw_curdir= dirname
 "   call Decho("b:netrw_curdir<".b:netrw_curdir."> (remote)")
 endif  " (additional remote handling)
 ""  call FOTEST(15) " PROBLEM WITH LISTING
+"call Decho("COMBAK#09 buf(%)#".bufnr("%")."<".bufname("%")."> win#".winnr()." bufnr(win#1)=".winbufnr(1)."<".bufname(winbufnr(1))." bufnr(win#2)=".winbufnr(2)."<".bufname(winbufnr(2)).">")
 " -----------------------
 " Directory Listing: {{{3
 " -----------------------
 call s:BrowserMaps(a:islocal)
 ""  call FOTEST(16) " PROBLEM WITH LISTING
 call s:PerformListing(a:islocal)
 "  call FOTEST(17)
+"call Decho("COMBAK#10 buf(%)#".bufnr("%")."<".bufname("%")."> win#".winnr()." bufnr(win#1)=".winbufnr(1)."<".bufname(winbufnr(1))." bufnr(win#2)=".winbufnr(2)."<".bufname(winbufnr(2)).">")
 " The s:LocalBrowseShellCmdRefresh() function is called by an autocmd
 " installed by s:LocalFastBrowser() when g:netrw_fastbrowse <= 1 (ie. slow, medium speed).
 " However, s:NetrwBrowse() causes the ShellCmdPost event itself to fire once; setting
 " the variable below avoids that second refresh of the screen.  The s:LocalBrowseShellCmdRefresh()
 if bufnum > 0 && bufname(bufnum) != dirname && bufname(bufnum) != '.'
 " handle approximate matches
 "    call Decho("  handling approx match: bufnum#".bufnum."<".bufname(bufnum)."> approx-dirname<".dirname.">")
 let ibuf    = 1
 let buflast = bufnr("$")
-"    call Decho("  findbuf2: buflast=".buflast)
+"    call Decho("  findbuf2: buflast=bufnr($)=".buflast)
 while ibuf <= buflast
 let bname= substitute(bufname(ibuf),'\\','/','g')
 let bname= substitute(bname,'.\zs/$','','')
-"     call Decho("  findbuf3: while [ibuf=",ibuf."]<=[buflast=".buflast."]: dirname<".dirname."> bufname(".ibuf.")<".bname.">")
+"     call Decho("  findbuf3: while [ibuf=",ibuf."]<=[buflast=".buflast."]: dirname<".dirname."> bname=bufname(".ibuf.")<".bname.">")
-if bname   != '' && dirname =~ '/'.bname.'/\=$' && dirname !~ '^/'
+if bname != '' && dirname =~ '/'.bname.'/\=$' && dirname !~ '^/'
-"      call Decho("  findbuf3: passes test 1 : dirname<".dirname.'> =~ /'.bname.'/\=$ && dirname !~ ^/')
+" bname is not empty
+" dirname ends with bname,
+" dirname doesn't start with /, so its not a absolute path
+"      call Decho("  findbuf3a: passes test 1 : dirname<".dirname.'> =~ /'.bname.'/\=$ && dirname !~ ^/')
 break
 endif
-if bname   =~ '^'.dirname.'/\=$'
+if bname =~ '^'.dirname.'/\=$'
-"      call Decho('  findbuf3: passes test 2 : bname<'.bname.'>=~^'.dirname.'/\=$')
+" bname begins with dirname
+"      call Decho('  findbuf3b: passes test 2 : bname<'.bname.'>=~^'.dirname.'/\=$')
 break
 endif
 if dirname =~ '^'.bname.'/$'
-"      call Decho('  findbuf3: passes test 3 : dirname<'.dirname.'>=~^'.bname.'/$')
+"      call Decho('  findbuf3c: passes test 3 : dirname<'.dirname.'>=~^'.bname.'/$')
+break
+endif
+if bname != '' && dirname =~ '/'.bname.'$' && bname == bufname("%") && line("$") == 1
+"      call Decho('  findbuf3d: passes test 4 : dirname<'.dirname.'>=~ /'.bname.'$')
 break
 endif
 let ibuf= ibuf + 1
 endwhile
 if ibuf > buflast
 "    call Decho("  findbuf4: bufnum=".bufnum." (ibuf=".ibuf." buflast=".buflast.")")
 endif
 endif
 " get enew buffer and name it -or- re-use buffer {{{3
-"  call Decho("--get enew buffer and name it OR re-use buffer-- (bufnum=".bufnum.")")
+keepj mark '
-mark '
 if bufnum < 0 || !bufexists(bufnum)
+"   call Decho("--get enew buffer and name it (bufexists([bufnum=".bufnum."])=".bufexists(bufnum).")")
 call s:NetrwEnew(dirname)
 "   call Decho("  got enew buffer#".bufnr("%")." (altbuf<".expand("#").">)")
 " name the buffer
 if exists("w:netrw_liststyle") && w:netrw_liststyle == s:TREELIST
 " Got enew buffer; transform into a NetrwTreeListing
 else
 let s:netrw_treelistnum= s:netrw_treelistnum + 1
 endif
 let w:netrw_treebufnr= bufnr("%")
 "    call Decho("  exe silent! keepalt file NetrwTreeListing ".fnameescape(s:netrw_treelistnum))
-exe 'silent! keepalt file NetrwTreeListing\ '.fnameescape(s:netrw_treelistnum)
+exe 'sil! keepalt file NetrwTreeListing\ '.fnameescape(s:netrw_treelistnum)
+set bt=nofile noswf
 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<".escdirname.">)=".bufnr(escdirname)." bufname()<".bufname(bufnr(escdirname)).">")
+"    call Decho('  exe silent! keepalt file '.escdirname)
+"    let v:errmsg= "" " Decho
+exe 'sil! keepalt file '.escdirname
 "    call Decho("  errmsg<".v:errmsg."> bufnr(".escdirname.")=".bufnr(escdirname)."<".bufname(bufnr(escdirname)).">")
-"    call Decho('  exe silent! keepalt file '.escdirname)
-exe 'silent! keepalt file '.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
-"   call Decho("--re-use buffer#".bufnum.": --")
+"   call Decho("--re-use buffer#".bufnum." (bufexists([bufnum=".bufnum."])=".bufexists(bufnum).")")
 let eikeep= &ei
 set ei=all
 if getline(2) =~ '^" Netrw Directory Listing'
 "    call Decho("  re-use buffer#".bufnum."<".((bufnum > 0)? bufname(bufnum) : "")."> using:  keepalt b ".bufnum)
 exe "keepalt b ".bufnum
 "    call Decho("  reusing buffer#".bufnum."<".((bufnum > 0)? bufname(bufnum) : "")."> using:  b ".bufnum)
 exe "b ".bufnum
 endif
 if bufname("%") == '.'
 "    call Decho("exe silent! keepalt file ".fnameescape(getcwd()))
-exe "silent! keepalt file ".fnameescape(getcwd())
+exe "sil! 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")
 return 0
 elseif exists("w:netrw_liststyle") && w:netrw_liststyle == s:TREELIST
 "    call Decho("--re-use tree listing--")
 "    call Decho("  clear buffer<".expand("%")."> with :%d")
-silent %d
+sil keepj %d
 call s:NetrwListSettings(a:islocal)
 "    call Dret("s:NetrwGetBuffer 0 : re-using buffer#".bufnr("%").", but treelist mode always needs a refresh")
 return 0
 else
 "    call Dret("s:NetrwGetBuffer 1 : buf#".bufnr("%"))
 " do netrw settings: make this buffer not-a-file, modifiable, not line-numbered, etc {{{3
 "     fastbrowse  Local  Remote   Hiding a buffer implies it may be re-used (fast)
 "  slow   0         D      D      Deleting a buffer implies it will not be re-used (slow)
 "  med    1         D      H
 "  fast   2         H      H
-"  call Decho("--do netrw settings: make this buffer not-a-file, modifiable, not line-numbered, etc--")
+"  call Decho("--do netrw settings: make this buffer#".bufnr("%")." not-a-file, modifiable, not line-numbered, etc--")
 let fname= expand("%")
 call s:NetrwListSettings(a:islocal)
 "  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
+sil! keepalt keepj %d
 "  call Dret("s:NetrwGetBuffer 0 : buf#".bufnr("%"))
 return 0
 endfun
 endif
 if exists("w:netrw_bannercnt") && line(".") < w:netrw_bannercnt
 " Active Banner support
 "   call Decho("active banner handling")
-norm! 0
+keepj norm! 0
 let dirname= "./"
 let curline= getline('.')
 if curline =~ '"\s*Sorted by\s'
-norm s
+keepj norm s
 let s:netrw_skipbrowse= 1
 echo 'Pressing "s" also works'
 elseif curline =~ '"\s*Sort sequence:'
 let s:netrw_skipbrowse= 1
 echo 'Press "S" to edit sorting sequence'
 elseif curline =~ '"\s*Quick Help:'
-norm ?
+keepj norm ?
 let s:netrw_skipbrowse= 1
 echo 'Pressing "?" also works'
 elseif curline =~ '"\s*\%(Hiding\|Showing\):'
-norm a
+keepj norm a
 let s:netrw_skipbrowse= 1
 echo 'Pressing "a" also works'
 elseif line("$") > w:netrw_bannercnt
-exe 'silent keepjumps '.w:netrw_bannercnt
+exe 'sil keepj '.w:netrw_bannercnt
 endif
 elseif w:netrw_liststyle == s:THINLIST
 "   call Decho("thin column handling")
-norm! 0
+keepj norm! 0
 let dirname= getline('.')
 elseif w:netrw_liststyle == s:LONGLIST
 "   call Decho("long column handling")
-norm! 0
+keepj norm! 0
 let dirname= substitute(getline('.'),'^\(\%(\S\+ \)*\S\+\).\{-}$','\1','e')
 elseif w:netrw_liststyle == s:TREELIST
 "   call Decho("treelist handling")
 let dirname= substitute(getline('.'),'^\(| \)*','','e')
 "   call Decho("buf#".bufnr("%")."<".bufname("%").">")
 let filestart = (virtcol(".")/b:netrw_cpf)*b:netrw_cpf
 "   call Decho("filestart= ([virtcol=".virtcol(".")."]/[b:netrw_cpf=".b:netrw_cpf."])*b:netrw_cpf=".filestart."  bannercnt=".w:netrw_bannercnt)
 "   call Decho("1: dirname<".dirname.">")
 if filestart == 0
-norm! 0ma
+keepj norm! 0ma
 else
 call cursor(line("."),filestart+1)
-norm! ma
+keepj norm! ma
 endif
 let rega= @a
 let eofname= filestart + b:netrw_cpf + 1
 if eofname <= col("$")
 call cursor(line("."),filestart+b:netrw_cpf+1)
-norm! "ay`a
+keepj norm! "ay`a
 else
-norm! "ay$
+keepj norm! "ay$
 endif
 let dirname = @a
 let @a      = rega
 "   call Decho("2: dirname<".dirname.">")
 let dirname= substitute(dirname,'\s\+$','','e')
 "  call Dret("s:NetrwGetWord <".dirname.">")
 return dirname
 endfun
 " ---------------------------------------------------------------------
-" s:NetrwListSettings: {{{2
+" s:NetrwListSettings: make standard settings for a netrw listing {{{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
 setlocal ma noro
 "  call Decho("setlocal ma noro")
 " clear buffer - this will cause NetrwBrowse/LocalBrowseCheck to do a refresh
 "  call Decho("clear buffer<".expand("%")."> with :%d")
-%d
+keepj %d
+" following prevents tree listing buffer from being marked "modified"
+setlocal nomod
+" refresh the listing
+"  call Decho("refresh the listing")
+let svpos= netrw#NetrwSavePosn()
+call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,'./'))
+call netrw#NetrwRestorePosn(svpos)
+call s:NetrwCursorline()
+" keep cursor on the filename
+sil keepj $
+let result= search('\%(^\%(|\+\s\)\=\|\s\{2,}\)\zs'.escape(fname,'.\[]*$^').'\%(\s\{2,}\|$\)','bc')
+"  call Decho("search result=".result." w:netrw_bannercnt=".(exists("w:netrw_bannercnt")? w:netrw_bannercnt : 'N/A'))
+if result <= 0 && exists("w:netrw_bannercnt")
+exe "keepj ".w:netrw_bannercnt
+endif
+"  call Dret("NetrwListStyle".(exists("w:netrw_liststyle")? ' : w:netrw_liststyle='.w:netrw_liststyle : ""))
+endfun
+" ---------------------------------------------------------------------
+" s:NetrwBannerCtrl: toggles the display of the banner {{{2
+fun! s:NetrwBannerCtrl(islocal)
+"  call Dfunc("s:NetrwBannerCtrl(islocal=".a:islocal.") g:netrw_banner=".g:netrw_banner)
+" toggle the banner (enable/suppress)
+let g:netrw_banner= !g:netrw_banner
 " refresh the listing
 let svpos= netrw#NetrwSavePosn()
 call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,'./'))
-call netrw#NetrwRestorePosn(svpos)
-if w:netrw_liststyle != s:WIDELIST
-if g:netrw_cursorline == 2
-setlocal cursorline
-let &cursorcolumn= s:netrw_usercuc
-elseif g:netrw_cursorline
-setlocal cursorline
-"    call Decho("setlocal cursorline")
-endif
-else
-if g:netrw_cursorline == 2
-setlocal cursorline cursorcolumn
-"    call Decho("setlocal cursorline cursorcolumn")
-elseif g:netrw_cursorline
-let &cursorline= s:netrw_usercul
-endif
-endif
 " keep cursor on the filename
-silent keepjumps $
+let fname= s:NetrwGetWord()
+sil keepj $
 let result= search('\%(^\%(|\+\s\)\=\|\s\{2,}\)\zs'.escape(fname,'.\[]*$^').'\%(\s\{2,}\|$\)','bc')
 "  call Decho("search result=".result." w:netrw_bannercnt=".(exists("w:netrw_bannercnt")? w:netrw_bannercnt : 'N/A'))
 if result <= 0 && exists("w:netrw_bannercnt")
-exe "keepjumps ".w:netrw_bannercnt
+exe "keepj ".w:netrw_bannercnt
-endif
-"  call Dret("NetrwListStyle".(exists("w:netrw_liststyle")? ' : w:netrw_liststyle='.w:netrw_liststyle : ""))
-endfun
-" ---------------------------------------------------------------------
-" s:NetrwBannerCtrl: toggles the display of the banner {{{2
-fun! s:NetrwBannerCtrl(islocal)
-"  call Dfunc("s:NetrwBannerCtrl(islocal=".a:islocal.") g:netrw_banner=".g:netrw_banner)
-" toggle the banner (enable/suppress)
-let g:netrw_banner= !g:netrw_banner
-" refresh the listing
-let svpos= netrw#NetrwSavePosn()
-call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,'./'))
-" keep cursor on the filename
-let fname= s:NetrwGetWord()
-silent keepjumps $
-let result= search('\%(^\%(|\+\s\)\=\|\s\{2,}\)\zs'.escape(fname,'.\[]*$^').'\%(\s\{2,}\|$\)','bc')
-"  call Decho("search result=".result." w:netrw_bannercnt=".(exists("w:netrw_bannercnt")? w:netrw_bannercnt : 'N/A'))
-if result <= 0 && exists("w:netrw_bannercnt")
-exe "keepjumps ".w:netrw_bannercnt
 endif
 "  call Dret("s:NetrwBannerCtrl : g:netrw_banner=".g:netrw_banner)
 endfun
 " ---------------------------------------------------------------------
 " the following test assures that gvim is running, has menus available, and has menus enabled.
 if has("gui") && has("menu") && has("gui_running") && &go =~ 'm' && g:netrw_menu
 if exists("g:NetrwTopLvlMenu")
 "    call Decho("removing ".g:NetrwTopLvlMenu."Bookmarks menu item(s)")
-exe 'silent! unmenu '.g:NetrwTopLvlMenu.'Bookmarks'
+exe 'sil! unmenu '.g:NetrwTopLvlMenu.'Bookmarks'
-exe 'silent! unmenu '.g:NetrwTopLvlMenu.'Bookmarks\ and\ History.Bookmark\ Delete'
+exe 'sil! unmenu '.g:NetrwTopLvlMenu.'Bookmarks\ and\ History.Bookmark\ Delete'
 endif
 if !exists("s:netrw_initbookhist")
 call s:NetrwBookHistRead()
 endif
 " show bookmarked places
 if exists("g:netrw_bookmarklist") && g:netrw_bookmarklist != []
 let cnt= 1
 for bmd in g:netrw_bookmarklist
 "     call Decho('silent! menu '.g:NetrwMenuPriority.".2.".cnt." ".g:NetrwTopLvlMenu.'Bookmark.'.bmd.'	:e '.bmd)
-let bmd= escape(bmd,'. ')
+let bmd= escape(bmd,g:netrw_menu_escape)
 " show bookmarks for goto menu
-exe 'silent! menu '.g:NetrwMenuPriority.".2.".cnt." ".g:NetrwTopLvlMenu.'Bookmarks.'.bmd.'	:e '.bmd."\<cr>"
+exe 'sil! menu '.g:NetrwMenuPriority.".2.".cnt." ".g:NetrwTopLvlMenu.'Bookmarks.'.bmd.'	:e '.bmd."\<cr>"
 " show bookmarks for deletion menu
-exe 'silent! menu '.g:NetrwMenuPriority.".8.2.".cnt." ".g:NetrwTopLvlMenu.'Bookmarks\ and\ History.Bookmark\ Delete.'.bmd.'	'.cnt."mB"
+exe 'sil! menu '.g:NetrwMenuPriority.".8.2.".cnt." ".g:NetrwTopLvlMenu.'Bookmarks\ and\ History.Bookmark\ Delete.'.bmd.'	'.cnt."mB"
 let cnt= cnt + 1
 endfor
 endif
 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 histdir= escape(g:netrw_dirhist_{cnt},'./&? ')
+let histdir= escape(g:netrw_dirhist_{cnt},g:netrw_menu_escape)
 "     call Decho('silent! menu '.g:NetrwMenuPriority.".3.".priority." ".g:NetrwTopLvlMenu.'History.'.histdir.'	:e '.histdir)
-exe 'silent! menu '.g:NetrwMenuPriority.".3.".priority." ".g:NetrwTopLvlMenu.'History.'.histdir.'	:e '.histdir."\<cr>"
+exe 'sil! menu '.g:NetrwMenuPriority.".3.".priority." ".g:NetrwTopLvlMenu.'History.'.histdir.'	:e '.histdir."\<cr>"
 endif
 let first = 0
 let cnt   = ( cnt - 1 ) % g:netrw_dirhistmax
 if cnt < 0
 let cnt= cnt + g:netrw_dirhistmax
 "   call Dredir("ls!")
 "   call Dret("s:NetrwBrowseChgDir")
 return
 endif
-" check if the status bar was clicked on instead of a file/directory name
-call feedkeys("\<LeftMouse>")
-let c= getchar()
-let mouse_lnum = v:mouse_lnum
-let wlastline  = line('w$')
-let lastline   = line('$')
-"  call Decho("v:mouse_lnum=".mouse_lnum." line(w$)=".wlastline." line($)=".lastline)
-if mouse_lnum == wlastline + 1 || v:mouse_win != winnr()
-"   call Decho("appears to be a status bar leftmouse click")
-" appears to be a status bar leftmouse click
-return
-endif
 call s:NetrwOptionSave("s:")
 call s:NetrwSafeOptions()
 let nbcd_curpos                = netrw#NetrwSavePosn()
 let s:nbcd_curpos_{bufnr('%')} = nbcd_curpos
-let dirname                    = substitute(b:netrw_curdir,'\\','/','ge')
+if (has("win32") || has("win95") || has("win64") || has("win16"))
-let newdir                     = a:newdir
+let dirname                   = substitute(b:netrw_curdir,'\\','/','ge')
-let dolockout                  = 0
+else
+let dirname= b:netrw_curdir
+endif
+let newdir    = a:newdir
+let dolockout = 0
 " set up o/s-dependent directory recognition pattern
 if has("amiga")
 let dirpat= '[\/:]$'
 else
 if w:netrw_liststyle == s:TREELIST && exists("w:netrw_treedict")
 " force a refresh
 "    call Decho("clear buffer<".expand("%")."> with :%d")
 setlocal noro ma
 "    call Decho("setlocal noro ma")
-keepjumps %d
+keepj %d
 endif
 if has("amiga")
 " amiga
 "    call Decho('case "go up one directory": newdir == "../" and amiga')
 " force a refresh (for TREELIST, wait for NetrwTreeDir() to force the refresh)
 setlocal noro ma
 "   call Decho("setlocal noro ma")
 if !(exists("w:netrw_liststyle") && w:netrw_liststyle == s:TREELIST && exists("b:netrw_curdir"))
 "    call Decho("clear buffer<".expand("%")."> with :%d")
-keepjumps %d
+keepj %d
 endif
 let treedir      = s:NetrwTreeDir()
 let s:treecurpos = nbcd_curpos
 let haskey= 0
 "   call Decho("w:netrw_treedict<".string(w:netrw_treedict).">")
 " close tree listing for selected subdirectory
 "    call Decho("closing selected subdirectory<".dirname.">")
 call remove(w:netrw_treedict,treedir)
 "    call Decho("removed     entry<".treedir."> from treedict")
 "    call Decho("yielding treedict<".string(w:netrw_treedict).">")
-let dirname           = w:netrw_treetop
+let dirname= w:netrw_treetop
 else
 " go down one directory
 let dirname= substitute(treedir,'/*$','/','')
 "    call Decho("go down one dir: treedir<".treedir.">")
 endif
 " renaming failed
 let fname= s:netrw_tmpfile
 endif
 else
 let fname= a:fname
+" special ~ handler for local
+if fname =~ '^\~' && expand("$HOME") != ""
+"    call Decho('invoking special ~ handler')
+let fname= substitute(fname,'^\~',expand("$HOME"),'')
+endif
 endif
 "  call Decho("fname<".fname.">")
 "  call Decho("exten<".exten."> "."netrwFileHandlers#NFH_".exten."():exists=".exists("*netrwFileHandlers#NFH_".exten))
 " set up redirection
 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,1)." ".redir)
-exe "silent !gnome-open ".shellescape(fname,1).redir
+exe "sil !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,1)." ".redir)
-exe "silent !kfmclient exec ".shellescape(fname,1)." ".redir
+exe "sil !kfmclient exec ".shellescape(fname,1)." ".redir
 let ret= v:shell_error
 elseif has("macunix") && executable("open")
 "   call Decho("exe silent !open ".shellescape(fname,1)." ".redir)
-exe "silent !open ".shellescape(fname,1)." ".redir
+exe "sil !open ".shellescape(fname,1)." ".redir
 let ret= v:shell_error
 else
 " netrwFileHandlers#Invoke() always returns 0
 let ret= netrwFileHandlers#Invoke(exten,fname)
 if a:remote == 1
 setlocal bh=delete bt=nofile
 if g:netrw_use_noswf
 setlocal noswf
 endif
-exe "norm! \<c-o>"
+exe "keepj norm! \<c-o>"
 "   redraw!
 endif
 "  call Dret("NetrwBrowseX")
 endfun
 "  call Dfunc("netrw#Explore(indx=".a:indx." dosplit=".a:dosplit." style=".a:style.",a:1<".a:1.">) &modified=".&modified." a:0=".a:0)
 if !exists("b:netrw_curdir")
 let b:netrw_curdir= getcwd()
 "   call Decho("set b:netrw_curdir<".b:netrw_curdir."> (used getcwd)")
 endif
-let curdir     = b:netrw_curdir
+let curdir     = simplify(b:netrw_curdir)
 let curfiledir = substitute(expand("%:p"),'^\(.*[/\\]\)[^/\\]*$','\1','e')
 "  call Decho("curdir<".curdir.">  curfiledir<".curfiledir.">")
 "  call FOTEST(1)
 " save registers
-silent! let keepregstar = @*
+sil! let keepregstar = @*
-silent! let keepregplus = @+
+sil! let keepregplus = @+
-silent! let keepregslash= @/
+sil! let keepregslash= @/
 " if dosplit or file has been modified
 if a:dosplit || &modified || a:style == 6
-"   call Decho("case: dosplit=".a:dosplit." modified=".&modified." a:style=".a:style)
+"   call Decho("case dosplit=".a:dosplit." modified=".&modified." a:style=".a:style.": dosplit or file has been modified")
 call s:SaveWinVars()
 let winsize= g:netrw_winsize
 if a:indx > 0
 let winsize= a:indx
 endif
 "    call Decho("style  = 6: Texplore")
 tabnew
 call s:RestoreBufVars()
 endif
 call s:RestoreWinVars()
-endif
+"  else " Decho
-norm! 0
+"   call Decho("case a:dosplit=".a:dosplit." AND modified=".&modified." AND a:style=".a:style." is not 6")
+endif
+keepj norm! 0
 "  call FOTEST(2)
 if a:0 > 0
-"   call Decho("case [a:0=".a:0."]>0: a:1<".a:1.">")
+"   call Decho("case [a:0=".a:0."] > 0: a:1<".a:1.">")
 if a:1 =~ '^\~' && (has("unix") || (exists("g:netrw_cygwin") && g:netrw_cygwin))
-let dirname= substitute(a:1,'\~',expand("$HOME"),'')
+"    call Decho("case a:1: ~ and unix or cygwin")
+let dirname= simplify(substitute(a:1,'\~',expand("$HOME"),''))
 "    call Decho("using dirname<".dirname.">  (case: ~ && unix||cygwin)")
 elseif a:1 == '.'
-let dirname= exists("b:netrw_curdir")? b:netrw_curdir : getcwd()
+"    call Decho("case a:1: .")
+let dirname= simplify(exists("b:netrw_curdir")? b:netrw_curdir : getcwd())
 if dirname !~ '/$'
 let dirname= dirname."/"
 endif
 "    call Decho("using dirname<".dirname.">  (case: ".(exists("b:netrw_curdir")? "b:netrw_curdir" : "getcwd()").")")
 elseif a:1 =~ '\$'
-let dirname= expand(a:1)
+"    call Decho("case a:1: $")
+let dirname= simplify(expand(a:1))
 "    call Decho("using user-specified dirname<".dirname."> with $env-var")
+elseif a:1 !~ '^\*/'
+"    call Decho("case a:1: other, not pattern or filepattern")
+let dirname= simplify(a:1)
+"    call Decho("using user-specified dirname<".dirname.">")
 else
+"    call Decho("case a:1: pattern or filepattern")
 let dirname= a:1
-"    call Decho("using user-specified dirname<".dirname.">")
 endif
 else
 " clear explore
+"   call Decho("case a:0=".a:0.": clearing Explore list")
 call s:NetrwClearExplore()
 "   call Dret("netrw#Explore : cleared list")
 return
 endif
 "  call FOTEST(3)
+"  call Decho("dirname<".dirname.">")
+if dirname =~ '\.\./\=$'
+let dirname= simplify(fnamemodify(dirname,':p:h'))
+elseif dirname =~ '\.\.' || dirname == '.'
+let dirname= simplify(fnamemodify(dirname,':p'))
+endif
+"  call Decho("dirname<".dirname.">  (after simplify)")
 if dirname =~ '/\*\*/'
 " handle .../**/.../filepat
 "   call Decho("case Explore .../**/.../filepat")
 let prefixdir= substitute(dirname,'^\(.\{-}\)\*\*.*$','\1','')
 call netrw#LocalBrowseCheck(dirname)
 endif
 "   call Decho("curdir<".curdir.">")
 if has("win32") || has("win95") || has("win64") || has("win16")
-call search('\<'.substitute(curdir,'^.*[/\\]','','e').'\>','cW')
+keepj call search('\<'.substitute(curdir,'^.*[/\\]','','e').'\>','cW')
 else
-call search('\<'.substitute(curdir,'^.*/','','e').'\>','cW')
+keepj call search('\<'.substitute(curdir,'^.*/','','e').'\>','cW')
 endif
 " starpat=1: Explore *//pattern  (current directory only search for files containing pattern)
 " starpat=2: Explore **//pattern (recursive descent search for files containing pattern)
 " starpat=3: Explore */filepat   (search in current directory for filenames matching filepat)
 if indx == -1
 " Nexplore
 "     call Decho("case Nexplore with starpat=".starpat.": (indx=".indx.")")
 if !exists("w:netrw_explore_list") " sanity check
 call netrw#ErrorMsg(s:WARNING,"using Nexplore or <s-down> improperly; see help for netrw-starstar",40)
-silent! let @* = keepregstar
+sil! let @* = keepregstar
-silent! let @+ = keepregstar
+sil! let @+ = keepregstar
-silent! let @/ = keepregslash
+sil! let @/ = keepregslash
 "      call Dret("netrw#Explore")
 return
 endif
 let indx= w:netrw_explore_indx
 if indx < 0                        | let indx= 0                           | endif
 elseif indx == -2
 " Pexplore
 "     call Decho("case Pexplore with starpat=".starpat.": (indx=".indx.")")
 if !exists("w:netrw_explore_list") " sanity check
 call netrw#ErrorMsg(s:WARNING,"using Pexplore or <s-up> improperly; see help for netrw-starstar",41)
-silent! let @* = keepregstar
+sil! let @* = keepregstar
-silent! let @+ = keepregstar
+sil! let @+ = keepregstar
-silent! let @/ = keepregslash
+sil! let @/ = keepregslash
 "      call Dret("netrw#Explore")
 return
 endif
 let indx= w:netrw_explore_indx
 if indx < 0                        | let indx= 0                           | endif
 if starpat == 1
 " starpat=1: Explore *//pattern  (current directory only search for files containing pattern)
 "      call Decho("starpat=".starpat.": build *//pattern list")
 "      call Decho("pattern<".pattern.">")
 try
-exe "noautocmd vimgrep /".pattern."/gj ".fnameescape(b:netrw_curdir)."/*"
+exe "keepj noautocmd vimgrep /".pattern."/gj ".fnameescape(b:netrw_curdir)."/*"
 catch /^Vim\%((\a\+)\)\=:E480/
 call netrw#ErrorMsg(s:WARNING,"no match with pattern<".pattern.">",76)
 "       call Dret("netrw#Explore : unable to find pattern<".pattern.">")
 return
 endtry
 elseif starpat == 2
 " starpat=2: Explore **//pattern (recursive descent search for files containing pattern)
 "      call Decho("starpat=".starpat.": build **//pattern list")
 try
-exe "silent noautocmd vimgrep /".pattern."/gj "."**/*"
+exe "sil keepj noautocmd vimgrep /".pattern."/gj "."**/*"
 catch /^Vim\%((\a\+)\)\=:E480/
 call netrw#ErrorMsg(s:WARNING,'no files matched pattern<'.pattern.'>',45)
 if &hls | let keepregslash= s:ExplorePatHls(pattern) | endif
 silent! let @* = keepregstar
 silent! let @+ = keepregstar
 "     call Decho("w:netrw_explore_list<".string(w:netrw_explore_list).">")
 "     call Decho("w:netrw_explore_listlen=".w:netrw_explore_listlen)
 if w:netrw_explore_listlen == 0 || (w:netrw_explore_listlen == 1 && w:netrw_explore_list[0] =~ '\*\*\/')
 call netrw#ErrorMsg(s:WARNING,"no files matched",42)
-silent! let @* = keepregstar
+sil! let @* = keepregstar
-silent! let @+ = keepregstar
+sil! let @+ = keepregstar
-silent! let @/ = keepregslash
+sil! let @/ = keepregslash
 "      call Dret("netrw#Explore : no files matched")
 return
 endif
 endif  " if indx ... endif
 call netrw#LocalBrowseCheck(newdir)
 if !exists("w:netrw_liststyle")
 let w:netrw_liststyle= g:netrw_liststyle
 endif
 if w:netrw_liststyle == s:THINLIST || w:netrw_liststyle == s:LONGLIST
-call search('^'.substitute(dirfile,"^.*/","","").'\>',"W")
+keepj call search('^'.substitute(dirfile,"^.*/","","").'\>',"W")
 else
-call search('\<'.substitute(dirfile,"^.*/","","").'\>',"w")
+keepj call search('\<'.substitute(dirfile,"^.*/","","").'\>',"w")
 endif
 let w:netrw_explore_mtchcnt = indx + 1
 let w:netrw_explore_bufnr   = bufnr("%")
 let w:netrw_explore_line    = line(".")
 call s:SetupNetrwStatusLine('%f %h%m%r%=%9*%{NetrwStatusLine()}')
 else
 "    call Decho("your vim does not have +path_extra")
 if !exists("g:netrw_quiet")
 call netrw#ErrorMsg(s:WARNING,"your vim needs the +path_extra feature for Exploring with **!",44)
 endif
-silent! let @* = keepregstar
+sil! let @* = keepregstar
-silent! let @+ = keepregstar
+sil! let @+ = keepregstar
-silent! let @/ = keepregslash
+sil! let @/ = keepregslash
 "    call Dret("netrw#Explore : missing +path_extra")
 return
 endif
 else
 "   call Decho("default case: Explore newdir<".dirname.">")
 if exists("w:netrw_liststyle") && w:netrw_liststyle == s:TREELIST && dirname =~ '/'
-silent! unlet w:netrw_treedict
+sil! unlet w:netrw_treedict
-silent! unlet w:netrw_treetop
+sil! unlet w:netrw_treetop
 endif
 let newdir= dirname
 if !exists("b:netrw_curdir")
 call netrw#LocalBrowseCheck(getcwd())
 else
 echo " "
 "   call Decho("cleared explore match list")
 endif
 "  call FOTEST(6)
-silent! let @* = keepregstar
+sil! let @* = keepregstar
-silent! let @+ = keepregstar
+sil! let @+ = keepregstar
-silent! let @/ = keepregslash
+sil! let @/ = keepregslash
 "  call Dret("netrw#Explore : @/<".@/.">")
 endfun
 " ---------------------------------------------------------------------
 " s:NetrwExploreListUniq: {{{2
 else
 " switch between show-all/show-not-hidden/show-hidden
 let g:netrw_hide=(g:netrw_hide+1)%3
-exe "norm! 0"
+exe "keepj norm! 0"
 if g:netrw_hide && g:netrw_list_hide == ""
 call netrw#ErrorMsg(s:WARNING,"your hiding list is empty!",49)
 "    call Dret("NetrwHide")
 return
 endif
 " ---------------------------------------------------------------------
 " s:NetrwLeftmouse: handles the <leftmouse> when in a netrw browsing window {{{2
 fun! s:NetrwLeftmouse(islocal)
 "  call Dfunc("s:NetrwLeftmouse(islocal=".a:islocal.")")
+" check if the status bar was clicked on instead of a file/directory name
+call feedkeys("\<LeftMouse>")
+let c= getchar()
+let mouse_lnum = v:mouse_lnum
+let wlastline  = line('w$')
+let lastline   = line('$')
+"  call Decho("v:mouse_lnum=".mouse_lnum." line(w$)=".wlastline." line($)=".lastline." v:mouse_win=".v:mouse_win." winnr#".winnr())
+"  call Decho("v:mouse_col =".v:mouse_col."     col=".col(".")."  wincol =".wincol()." winwidth   =".winwidth(0))
+if mouse_lnum >= wlastline + 1 || v:mouse_win != winnr()
+" appears to be a status bar leftmouse click
+"   call Dret("s:NetrwLeftmouse : detected a status bar leftmouse click")
+return
+endif
+if v:mouse_col != col('.')
+"   call Dret("s:NetrwLeftmouse : detected a vertical separator bar leftmouse click")
+return
+endif
 if a:islocal
 if exists("b:netrw_curdir")
 call netrw#LocalBrowseCheck(s:NetrwBrowseChgDir(1,s:NetrwGetWord()))
 endif
 else
 endif
 " Prune the list by hiding any files which match
 if g:netrw_hide == 1
 "    call Decho("hiding<".hide."> listhide<".listhide.">")
-exe 'silent keepjumps '.w:netrw_bannercnt.',$g'.sep.hide.sep.'d'
+exe 'sil keepj '.w:netrw_bannercnt.',$g'.sep.hide.sep.'d'
 elseif g:netrw_hide == 2
 "    call Decho("showing<".hide."> listhide<".listhide.">")
-exe 'silent keepjumps '.w:netrw_bannercnt.',$g'.sep.hide.sep.'s@^@ /-KEEP-/ @'
+exe 'sil keepj '.w:netrw_bannercnt.',$g'.sep.hide.sep.'s@^@ /-KEEP-/ @'
 endif
 endwhile
 if g:netrw_hide == 2
-exe 'silent keepjumps '.w:netrw_bannercnt.',$v@^ /-KEEP-/ @d'
+exe 'sil keepj '.w:netrw_bannercnt.',$v@^ /-KEEP-/ @d'
-exe 'silent keepjumps '.w:netrw_bannercnt.',$s@^\%( /-KEEP-/ \)\+@@e'
+exe 'sil keepj '.w:netrw_bannercnt.',$s@^\%( /-KEEP-/ \)\+@@e'
 endif
 "  call Dret("NetrwListHide")
 endfun
 call inputrestore()
 let g:netrw_list_hide= newhide
 "  call Decho("new g:netrw_list_hide<".g:netrw_list_hide.">")
 " refresh the listing
-silent call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,"./"))
+silent keepj call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,"./"))
 " restore cursor position
 call netrw#NetrwRestorePosn(svpos)
 "  call Dret("NetrwHideEdit")
 " directory, so make it!
 if exists("*mkdir")
 call mkdir(fullnewdir,"p")
 else
 let netrw_origdir= s:NetrwGetcwd(1)
-exe 'keepjumps lcd '.fnameescape(b:netrw_curdir)
+exe 'keepj 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,1))
-exe "silent! !".g:netrw_local_mkdir.' '.shellescape(newdirname,1)
+exe "sil! !".g:netrw_local_mkdir.' '.shellescape(newdirname,1)
 if !g:netrw_keepdir
-exe 'keepjumps lcd '.fnameescape(netrw_origdir)
+exe 'keepj lcd '.fnameescape(netrw_origdir)
 "     call Decho("netrw_keepdir=".g:netrw_keepdir.": keepjumps lcd ".fnameescape(netrw_origdir)." getcwd<".getcwd().">")
 endif
 endif
 if v:shell_error == 0
 " 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,1))
-exe "silent! !".mkdircmd." ".shellescape(newdirname,1)
+exe "sil! !".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)
 let tmpdir= curdir."/".tmpdir
 endif
 if exists("*mkdir")
 call mkdir(tmpdir)
 else
-exe "silent! !".g:netrw_local_mkdir.' '.shellescape(tmpdir,1)
+exe "sil! !".g:netrw_local_mkdir.' '.shellescape(tmpdir,1)
 endif
 if isdirectory(tmpdir)
-exe "keepjumps lcd ".fnameescape(tmpdir)
+exe "keepj lcd ".fnameescape(tmpdir)
 call netrw#NetrwObtain(a:islocal,s:netrwmarkfilelist_{bufnr('%')},tmpdir)
 let localfiles= map(deepcopy(s:netrwmarkfilelist_{bufnr('%')}),'substitute(v:val,"^.*/","","")')
 call s:NetrwUpload(localfiles,s:netrwmftgt)
 if getcwd() == tmpdir
 for fname in s:netrwmarkfilelist_{bufnr('%')}
 call s:NetrwDelete(fname)
 endfor
-exe "keepjumps lcd ".fnameescape(curdir)
+exe "keepj lcd ".fnameescape(curdir)
-exe "silent !".g:netrw_local_rmdir." ".shellescape(tmpdir,1)
+exe "sil !".g:netrw_local_rmdir." ".shellescape(tmpdir,1)
 else
-exe "keepjumps lcd ".fnameescape(curdir)
+exe "keepj lcd ".fnameescape(curdir)
 endif
 endif
 endif
 " -------
 endif
 " use vimgrep for both local and remote
 "   call Decho("exe vimgrep".pat." ".netrwmarkfilelist)
 try
-exe "noautocmd vimgrep".pat." ".netrwmarkfilelist
+exe "keepj noautocmd vimgrep".pat." ".netrwmarkfilelist
 catch /^Vim\%((\a\+)\)\=:E480/
 call netrw#ErrorMsg(s:WARNING,"no match with pattern<".pattern.">",76)
 "     call Dret("s:NetrwMarkFileGrep : unable to find pattern<".pattern.">")
 return
 endtry
 "   call Decho("handle remote regexp")
 " convert displayed listing into a filelist
 let eikeep = &ei
 let areg   = @a
-silent %y a
+sil keepj %y a
 set ei=all ma
 "   call Decho("set ei=all ma")
 1split
 call s:NetrwEnew()
 call s:NetrwSafeOptions()
-silent norm! "ap
+sil keepj norm! "ap
-2
+keepj 2
 let bannercnt= search('^" =====','W')
-exe "silent 1,".bannercnt."d"
+exe "sil keepj 1,".bannercnt."d"
 set bt=nofile
 if     g:netrw_liststyle == s:LONGLIST
-silent %s/\s\{2,}\S.*$//e
+sil keepj %s/\s\{2,}\S.*$//e
 call histdel("/",-1)
 elseif g:netrw_liststyle == s:WIDELIST
-silent %s/\s\{2,}/\r/ge
+sil keepj %s/\s\{2,}/\r/ge
 call histdel("/",-1)
 elseif g:netrw_liststyle == s:TREELIST
-silent %s/^| //e
+sil keepj %s/^| //e
-silent! g/^ .*$/d
+sil! keepj g/^ .*$/d
 call histdel("/",-1)
 call histdel("/",-1)
 endif
 " convert regexp into the more usual glob-style format
 let regexp= substitute(regexp,'\*','.*','g')
 "   call Decho("regexp<".regexp.">")
-exe "silent! v/".escape(regexp,'/')."/d"
+exe "sil! keepj v/".escape(regexp,'/')."/d"
 call histdel("/",-1)
 let filelist= getline(1,line("$"))
 q!
 for filename in filelist
 call s:NetrwMarkFile(a:islocal,substitute(filename,'^.*/','',''))
 let curdir= b:netrw_curdir
 1split
 e tags
 let path= substitute(curdir,'^\(.*\)/[^/]*$','\1/','')
 "    call Decho("curdir<".curdir."> path<".path.">")
-exe '%s/\t\(\S\+\)\t/\t'.escape(path,"/\n\r\\").'\1\t/e'
+exe 'keepj %s/\t\(\S\+\)\t/\t'.escape(path,"/\n\r\\").'\1\t/e'
 call histdel("/",-1)
 wq!
 endif
 2match none
 call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,'./'))
 call s:LocalBrowseShellCmdRefresh()
 endif
 call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,'./'))
 call netrw#NetrwRestorePosn(svpos)
 if !hadtgt
-norm! j
+sil! keepj norm! j
 endif
 "  call Dret("s:NetrwMarkFileTgt : netrwmftgt<".(exists("s:netrwmftgt")? s:netrwmftgt : "").">")
 endfun
 "   call Dfunc("NetrwMenu(domenu=".a:domenu.")")
 if !exists("s:netrw_menu_enabled") && a:domenu
 "    call Decho("initialize menu")
 let s:netrw_menu_enabled= 1
-exe 'silent! menu '.g:NetrwMenuPriority.'.1     '.g:NetrwTopLvlMenu.'Help<tab><F1>	<F1>'
+exe 'sil! menu '.g:NetrwMenuPriority.'.1     '.g:NetrwTopLvlMenu.'Help<tab><F1>	<F1>'
-exe 'silent! menu '.g:NetrwMenuPriority.'.5     '.g:NetrwTopLvlMenu.'-Sep1-	:'
+exe 'sil! menu '.g:NetrwMenuPriority.'.5     '.g:NetrwTopLvlMenu.'-Sep1-	:'
-exe 'silent! menu '.g:NetrwMenuPriority.'.6     '.g:NetrwTopLvlMenu.'Go\ Up\ Directory<tab>-	-'
+exe 'sil! menu '.g:NetrwMenuPriority.'.6     '.g:NetrwTopLvlMenu.'Go\ Up\ Directory<tab>-	-'
-exe 'silent! menu '.g:NetrwMenuPriority.'.7     '.g:NetrwTopLvlMenu.'Apply\ Special\ Viewer<tab>x	x'
+exe 'sil! menu '.g:NetrwMenuPriority.'.7     '.g:NetrwTopLvlMenu.'Apply\ Special\ Viewer<tab>x	x'
-exe 'silent! menu '.g:NetrwMenuPriority.'.8.1   '.g:NetrwTopLvlMenu.'Bookmarks\ and\ History.Bookmark\ Current\ Directory<tab>mb	mb'
+exe 'sil! menu '.g:NetrwMenuPriority.'.8.1   '.g:NetrwTopLvlMenu.'Bookmarks\ and\ History.Bookmark\ Current\ Directory<tab>mb	mb'
-exe 'silent! menu '.g:NetrwMenuPriority.'.8.4   '.g:NetrwTopLvlMenu.'Bookmarks\ and\ History.Goto\ Prev\ Dir\ (History)<tab>u	u'
+exe 'sil! menu '.g:NetrwMenuPriority.'.8.4   '.g:NetrwTopLvlMenu.'Bookmarks\ and\ History.Goto\ Prev\ Dir\ (History)<tab>u	u'
-exe 'silent! menu '.g:NetrwMenuPriority.'.8.5   '.g:NetrwTopLvlMenu.'Bookmarks\ and\ History.Goto\ Next\ Dir\ (History)<tab>U	U'
+exe 'sil! menu '.g:NetrwMenuPriority.'.8.5   '.g:NetrwTopLvlMenu.'Bookmarks\ and\ History.Goto\ Next\ Dir\ (History)<tab>U	U'
-exe 'silent! menu '.g:NetrwMenuPriority.'.8.6   '.g:NetrwTopLvlMenu.'Bookmarks\ and\ History.List<tab>qb	qb'
+exe 'sil! menu '.g:NetrwMenuPriority.'.8.6   '.g:NetrwTopLvlMenu.'Bookmarks\ and\ History.List<tab>qb	qb'
-exe 'silent! menu '.g:NetrwMenuPriority.'.9.1   '.g:NetrwTopLvlMenu.'Browsing\ Control.Edit\ File\ Hiding\ List<tab><ctrl-h>'."	\<c-h>'"
+exe 'sil! menu '.g:NetrwMenuPriority.'.9.1   '.g:NetrwTopLvlMenu.'Browsing\ Control.Edit\ File\ Hiding\ List<tab><ctrl-h>'."	\<c-h>'"
-exe 'silent! menu '.g:NetrwMenuPriority.'.9.2   '.g:NetrwTopLvlMenu.'Browsing\ Control.Edit\ Sorting\ Sequence<tab>S	S'
+exe 'sil! menu '.g:NetrwMenuPriority.'.9.2   '.g:NetrwTopLvlMenu.'Browsing\ Control.Edit\ Sorting\ Sequence<tab>S	S'
-exe 'silent! menu '.g:NetrwMenuPriority.'.9.3   '.g:NetrwTopLvlMenu.'Browsing\ Control.Quick\ Hide/Unhide\ Dot\ Files<tab>'."gh	gh"
+exe 'sil! menu '.g:NetrwMenuPriority.'.9.3   '.g:NetrwTopLvlMenu.'Browsing\ Control.Quick\ Hide/Unhide\ Dot\ Files<tab>'."gh	gh"
-exe 'silent! menu '.g:NetrwMenuPriority.'.9.4   '.g:NetrwTopLvlMenu.'Browsing\ Control.Refresh\ Listing<tab>'."<ctrl-l>	\<c-l>"
+exe 'sil! menu '.g:NetrwMenuPriority.'.9.4   '.g:NetrwTopLvlMenu.'Browsing\ Control.Refresh\ Listing<tab>'."<ctrl-l>	\<c-l>"
-exe 'silent! menu '.g:NetrwMenuPriority.'.9.5   '.g:NetrwTopLvlMenu.'Browsing\ Control.Settings/Options<tab>:NetrwSettings	'.":NetrwSettings\<cr>"
+exe 'sil! menu '.g:NetrwMenuPriority.'.9.5   '.g:NetrwTopLvlMenu.'Browsing\ Control.Settings/Options<tab>:NetrwSettings	'.":NetrwSettings\<cr>"
-exe 'silent! menu '.g:NetrwMenuPriority.'.10    '.g:NetrwTopLvlMenu.'Delete\ File/Directory<tab>D	D'
+exe 'sil! menu '.g:NetrwMenuPriority.'.10    '.g:NetrwTopLvlMenu.'Delete\ File/Directory<tab>D	D'
-exe 'silent! menu '.g:NetrwMenuPriority.'.11.1  '.g:NetrwTopLvlMenu.'Edit\ File/Dir.In\ Current\ Window<tab><cr>	'."\<cr>"
+exe 'sil! menu '.g:NetrwMenuPriority.'.11.1  '.g:NetrwTopLvlMenu.'Edit\ File/Dir.In\ Current\ Window<tab><cr>	'."\<cr>"
-exe 'silent! menu '.g:NetrwMenuPriority.'.11.2  '.g:NetrwTopLvlMenu.'Edit\ File/Dir.Preview\ File/Directory<tab>p	p'
+exe 'sil! menu '.g:NetrwMenuPriority.'.11.2  '.g:NetrwTopLvlMenu.'Edit\ File/Dir.Preview\ File/Directory<tab>p	p'
-exe 'silent! menu '.g:NetrwMenuPriority.'.11.3  '.g:NetrwTopLvlMenu.'Edit\ File/Dir.In\ Previous\ Window<tab>P	P'
+exe 'sil! menu '.g:NetrwMenuPriority.'.11.3  '.g:NetrwTopLvlMenu.'Edit\ File/Dir.In\ Previous\ Window<tab>P	P'
-exe 'silent! menu '.g:NetrwMenuPriority.'.11.4  '.g:NetrwTopLvlMenu.'Edit\ File/Dir.In\ New\ Window<tab>o	o'
+exe 'sil! menu '.g:NetrwMenuPriority.'.11.4  '.g:NetrwTopLvlMenu.'Edit\ File/Dir.In\ New\ Window<tab>o	o'
-exe 'silent! menu '.g:NetrwMenuPriority.'.11.5  '.g:NetrwTopLvlMenu.'Edit\ File/Dir.In\ New\ Vertical\ Window<tab>v	v'
+exe 'sil! menu '.g:NetrwMenuPriority.'.11.5  '.g:NetrwTopLvlMenu.'Edit\ File/Dir.In\ New\ Vertical\ Window<tab>v	v'
-exe 'silent! menu '.g:NetrwMenuPriority.'.12.1  '.g:NetrwTopLvlMenu.'Explore.Directory\ Name	:Explore '
+exe 'sil! menu '.g:NetrwMenuPriority.'.12.1  '.g:NetrwTopLvlMenu.'Explore.Directory\ Name	:Explore '
-exe 'silent! menu '.g:NetrwMenuPriority.'.12.2  '.g:NetrwTopLvlMenu.'Explore.Filenames\ Matching\ Pattern\ (curdir\ only)<tab>:Explore\ */	:Explore */'
+exe 'sil! menu '.g:NetrwMenuPriority.'.12.2  '.g:NetrwTopLvlMenu.'Explore.Filenames\ Matching\ Pattern\ (curdir\ only)<tab>:Explore\ */	:Explore */'
-exe 'silent! menu '.g:NetrwMenuPriority.'.12.2  '.g:NetrwTopLvlMenu.'Explore.Filenames\ Matching\ Pattern\ (+subdirs)<tab>:Explore\ **/	:Explore **/'
+exe 'sil! menu '.g:NetrwMenuPriority.'.12.2  '.g:NetrwTopLvlMenu.'Explore.Filenames\ Matching\ Pattern\ (+subdirs)<tab>:Explore\ **/	:Explore **/'
-exe 'silent! menu '.g:NetrwMenuPriority.'.12.3  '.g:NetrwTopLvlMenu.'Explore.Files\ Containing\ String\ Pattern\ (curdir\ only)<tab>:Explore\ *//	:Explore *//'
+exe 'sil! menu '.g:NetrwMenuPriority.'.12.3  '.g:NetrwTopLvlMenu.'Explore.Files\ Containing\ String\ Pattern\ (curdir\ only)<tab>:Explore\ *//	:Explore *//'
-exe 'silent! menu '.g:NetrwMenuPriority.'.12.4  '.g:NetrwTopLvlMenu.'Explore.Files\ Containing\ String\ Pattern\ (+subdirs)<tab>:Explore\ **//	:Explore **//'
+exe 'sil! menu '.g:NetrwMenuPriority.'.12.4  '.g:NetrwTopLvlMenu.'Explore.Files\ Containing\ String\ Pattern\ (+subdirs)<tab>:Explore\ **//	:Explore **//'
-exe 'silent! menu '.g:NetrwMenuPriority.'.12.4  '.g:NetrwTopLvlMenu.'Explore.Next\ Match<tab>:Nexplore	:Nexplore<cr>'
+exe 'sil! menu '.g:NetrwMenuPriority.'.12.4  '.g:NetrwTopLvlMenu.'Explore.Next\ Match<tab>:Nexplore	:Nexplore<cr>'
-exe 'silent! menu '.g:NetrwMenuPriority.'.12.4  '.g:NetrwTopLvlMenu.'Explore.Prev\ Match<tab>:Pexplore	:Pexplore<cr>'
+exe 'sil! menu '.g:NetrwMenuPriority.'.12.4  '.g:NetrwTopLvlMenu.'Explore.Prev\ Match<tab>:Pexplore	:Pexplore<cr>'
-exe 'silent! menu '.g:NetrwMenuPriority.'.13    '.g:NetrwTopLvlMenu.'Make\ Subdirectory<tab>d	d'
+exe 'sil! menu '.g:NetrwMenuPriority.'.13    '.g:NetrwTopLvlMenu.'Make\ Subdirectory<tab>d	d'
-exe 'silent! menu '.g:NetrwMenuPriority.'.14.1  '.g:NetrwTopLvlMenu.'Marked\ Files.Mark\ File<tab>mf	mf'
+exe 'sil! menu '.g:NetrwMenuPriority.'.14.1  '.g:NetrwTopLvlMenu.'Marked\ Files.Mark\ File<tab>mf	mf'
-exe 'silent! menu '.g:NetrwMenuPriority.'.14.2  '.g:NetrwTopLvlMenu.'Marked\ Files.Mark\ Files\ by\ Regexp<tab>mr	mr'
+exe 'sil! menu '.g:NetrwMenuPriority.'.14.2  '.g:NetrwTopLvlMenu.'Marked\ Files.Mark\ Files\ by\ Regexp<tab>mr	mr'
-exe 'silent! menu '.g:NetrwMenuPriority.'.14.3  '.g:NetrwTopLvlMenu.'Marked\ Files.Hide-Show-List\ Control<tab>a	a'
+exe 'sil! menu '.g:NetrwMenuPriority.'.14.3  '.g:NetrwTopLvlMenu.'Marked\ Files.Hide-Show-List\ Control<tab>a	a'
-exe 'silent! menu '.g:NetrwMenuPriority.'.14.4  '.g:NetrwTopLvlMenu.'Marked\ Files.Copy\ To\ Target<tab>mc	mc'
+exe 'sil! menu '.g:NetrwMenuPriority.'.14.4  '.g:NetrwTopLvlMenu.'Marked\ Files.Copy\ To\ Target<tab>mc	mc'
-exe 'silent! menu '.g:NetrwMenuPriority.'.14.5  '.g:NetrwTopLvlMenu.'Marked\ Files.Delete<tab>D	D'
+exe 'sil! menu '.g:NetrwMenuPriority.'.14.5  '.g:NetrwTopLvlMenu.'Marked\ Files.Delete<tab>D	D'
-exe 'silent! menu '.g:NetrwMenuPriority.'.14.6  '.g:NetrwTopLvlMenu.'Marked\ Files.Diff<tab>md	md'
+exe 'sil! menu '.g:NetrwMenuPriority.'.14.6  '.g:NetrwTopLvlMenu.'Marked\ Files.Diff<tab>md	md'
-exe 'silent! menu '.g:NetrwMenuPriority.'.14.7  '.g:NetrwTopLvlMenu.'Marked\ Files.Edit<tab>me	me'
+exe 'sil! menu '.g:NetrwMenuPriority.'.14.7  '.g:NetrwTopLvlMenu.'Marked\ Files.Edit<tab>me	me'
-exe 'silent! menu '.g:NetrwMenuPriority.'.14.8  '.g:NetrwTopLvlMenu.'Marked\ Files.Exe\ Cmd<tab>mx	mx'
+exe 'sil! menu '.g:NetrwMenuPriority.'.14.8  '.g:NetrwTopLvlMenu.'Marked\ Files.Exe\ Cmd<tab>mx	mx'
-exe 'silent! menu '.g:NetrwMenuPriority.'.14.9  '.g:NetrwTopLvlMenu.'Marked\ Files.Move\ To\ Target<tab>mm	mm'
+exe 'sil! menu '.g:NetrwMenuPriority.'.14.9  '.g:NetrwTopLvlMenu.'Marked\ Files.Move\ To\ Target<tab>mm	mm'
-exe 'silent! menu '.g:NetrwMenuPriority.'.14.10 '.g:NetrwTopLvlMenu.'Marked\ Files.Obtain<tab>O	O'
+exe 'sil! menu '.g:NetrwMenuPriority.'.14.10 '.g:NetrwTopLvlMenu.'Marked\ Files.Obtain<tab>O	O'
-exe 'silent! menu '.g:NetrwMenuPriority.'.14.11 '.g:NetrwTopLvlMenu.'Marked\ Files.Print<tab>mp	mp'
+exe 'sil! menu '.g:NetrwMenuPriority.'.14.11 '.g:NetrwTopLvlMenu.'Marked\ Files.Print<tab>mp	mp'
-exe 'silent! menu '.g:NetrwMenuPriority.'.14.12 '.g:NetrwTopLvlMenu.'Marked\ Files.Replace<tab>R	R'
+exe 'sil! menu '.g:NetrwMenuPriority.'.14.12 '.g:NetrwTopLvlMenu.'Marked\ Files.Replace<tab>R	R'
-exe 'silent! menu '.g:NetrwMenuPriority.'.14.13 '.g:NetrwTopLvlMenu.'Marked\ Files.Set\ Target<tab>mt	mt'
+exe 'sil! menu '.g:NetrwMenuPriority.'.14.13 '.g:NetrwTopLvlMenu.'Marked\ Files.Set\ Target<tab>mt	mt'
-exe 'silent! menu '.g:NetrwMenuPriority.'.14.14 '.g:NetrwTopLvlMenu.'Marked\ Files.Tag<tab>mT	mT'
+exe 'sil! menu '.g:NetrwMenuPriority.'.14.14 '.g:NetrwTopLvlMenu.'Marked\ Files.Tag<tab>mT	mT'
-exe 'silent! menu '.g:NetrwMenuPriority.'.14.15 '.g:NetrwTopLvlMenu.'Marked\ Files.Zip/Unzip/Compress/Uncompress<tab>mz	mz'
+exe 'sil! menu '.g:NetrwMenuPriority.'.14.15 '.g:NetrwTopLvlMenu.'Marked\ Files.Zip/Unzip/Compress/Uncompress<tab>mz	mz'
-exe 'silent! menu '.g:NetrwMenuPriority.'.15    '.g:NetrwTopLvlMenu.'Obtain\ File<tab>O	O'
+exe 'sil! menu '.g:NetrwMenuPriority.'.15    '.g:NetrwTopLvlMenu.'Obtain\ File<tab>O	O'
-exe 'silent! menu '.g:NetrwMenuPriority.'.16.1  '.g:NetrwTopLvlMenu.'Style.Listing\ Style\ (thin-long-wide-tree)<tab>i	i'
+exe 'sil! menu '.g:NetrwMenuPriority.'.16.1  '.g:NetrwTopLvlMenu.'Style.Listing\ Style\ (thin-long-wide-tree)<tab>i	i'
-exe 'silent! menu '.g:NetrwMenuPriority.'.16.2  '.g:NetrwTopLvlMenu.'Style.Normal-Hide-Show<tab>a	a'
+exe 'sil! menu '.g:NetrwMenuPriority.'.16.2  '.g:NetrwTopLvlMenu.'Style.Normal-Hide-Show<tab>a	a'
-exe 'silent! menu '.g:NetrwMenuPriority.'.16.3  '.g:NetrwTopLvlMenu.'Style.Reverse\ Sorting\ Order<tab>'."r	r"
+exe 'sil! menu '.g:NetrwMenuPriority.'.16.3  '.g:NetrwTopLvlMenu.'Style.Reverse\ Sorting\ Order<tab>'."r	r"
-exe 'silent! menu '.g:NetrwMenuPriority.'.16.4  '.g:NetrwTopLvlMenu.'Style.Sorting\ Method\ (name-time-size)<tab>s	s'
+exe 'sil! menu '.g:NetrwMenuPriority.'.16.4  '.g:NetrwTopLvlMenu.'Style.Sorting\ Method\ (name-time-size)<tab>s	s'
-exe 'silent! menu '.g:NetrwMenuPriority.'.17    '.g:NetrwTopLvlMenu.'Rename\ File/Directory<tab>R	R'
+exe 'sil! menu '.g:NetrwMenuPriority.'.17    '.g:NetrwTopLvlMenu.'Rename\ File/Directory<tab>R	R'
-exe 'silent! menu '.g:NetrwMenuPriority.'.18    '.g:NetrwTopLvlMenu.'Set\ Current\ Directory<tab>c	c'
+exe 'sil! menu '.g:NetrwMenuPriority.'.18    '.g:NetrwTopLvlMenu.'Set\ Current\ Directory<tab>c	c'
 call s:NetrwBookmarkMenu() " provide some history!  uses priorities 2,3, reserves 4, 8.2.x
 let s:netrw_menucnt= 28
 elseif !a:domenu
 let s:netrwcnt = 0
 windo if getline(2) =~ "Netrw" | let s:netrwcnt= s:netrwcnt + 1 | endif
 exe curwin."wincmd w"
 if s:netrwcnt <= 1
 "     call Decho("clear menus")
-exe 'silent! unmenu '.g:NetrwTopLvlMenu
+exe 'sil! unmenu '.g:NetrwTopLvlMenu
 "     call Decho('exe silent! unmenu '.g:NetrwTopLvlMenu.'*')
-silent! unlet s:netrw_menu_enabled
+sil! unlet s:netrw_menu_enabled
 endif
 endif
 "   call Dret("NetrwMenu")
 endif
 "     call Decho("obtain via ftp+.netrc (method #2)")
 call s:SaveBufVars()|silent keepjumps new|call s:RestoreBufVars()
 let tmpbufnr= bufnr("%")
 setlocal ff=unix
 if exists("g:netrw_ftpmode") && g:netrw_ftpmode != ""
-put =g:netrw_ftpmode
+keepj put =g:netrw_ftpmode
 "      call Decho("filter input: ".getline('$'))
 endif
 if exists("b:netrw_fname") && b:netrw_fname != ""
 call setline(line("$")+1,'cd "'.b:netrw_fname.'"')
 "      call Decho("filter input: ".getline('$'))
 endif
 if exists("g:netrw_ftpextracmd")
-put =g:netrw_ftpextracmd
+keepj put =g:netrw_ftpextracmd
 "      call Decho("filter input: ".getline('$'))
 endif
 for fname in fnamelist
 call setline(line("$")+1,'get "'.fname.'"')
 "      call Decho("filter input: ".getline('$'))
 call s:SaveBufVars()|silent keepjumps new|call s:RestoreBufVars()
 let tmpbufnr= bufnr("%")
 setlocal ff=unix
 if exists("g:netrw_port") && g:netrw_port != ""
-put ='open '.g:netrw_machine.' '.g:netrw_port
+keepj put ='open '.g:netrw_machine.' '.g:netrw_port
 "     call Decho("filter input: ".getline('$'))
 else
-put ='open '.g:netrw_machine
+keepj put ='open '.g:netrw_machine
 "     call Decho("filter input: ".getline('$'))
 endif
 if exists("g:netrw_ftp") && g:netrw_ftp == 1
-put =g:netrw_uid
+keepj put =g:netrw_uid
 "     call Decho("filter input: ".getline('$'))
-put ='\"'.s:netrw_passwd.'\"'
+keepj put ='\"'.s:netrw_passwd.'\"'
 "     call Decho("filter input: ".getline('$'))
 else
-put ='user \"'.g:netrw_uid.'\" \"'.s:netrw_passwd.'\"'
+keepj put ='user \"'.g:netrw_uid.'\" \"'.s:netrw_passwd.'\"'
 "     call Decho("filter input: ".getline('$'))
 endif
 if exists("g:netrw_ftpmode") && g:netrw_ftpmode != ""
-put =g:netrw_ftpmode
+keepj put =g:netrw_ftpmode
 "     call Decho("filter input: ".getline('$'))
 endif
 if exists("b:netrw_fname") && b:netrw_fname != ""
-call setline(line("$")+1,'cd "'.b:netrw_fname.'"')
+keepj call setline(line("$")+1,'cd "'.b:netrw_fname.'"')
 "     call Decho("filter input: ".getline('$'))
 endif
 if exists("g:netrw_ftpextracmd")
-put =g:netrw_ftpextracmd
+keepj put =g:netrw_ftpextracmd
 "     call Decho("filter input: ".getline('$'))
 endif
 if exists("g:netrw_ftpextracmd")
-put =g:netrw_ftpextracmd
+keepj put =g:netrw_ftpextracmd
 "     call Decho("filter input: ".getline('$'))
 endif
 for fname in fnamelist
-call setline(line("$")+1,'get "'.fname.'"')
+keepj call setline(line("$")+1,'get "'.fname.'"')
 endfor
 "    call Decho("filter input: ".getline('$'))
 " perform ftp:
 " -i       : turns off interactive prompting from ftp
 " -n  unix : DON'T use <.netrc>, even though it exists
 " -n  win32: quit being obnoxious about password
-norm! 1Gdd
+keepj norm! 1Gdd
 "    call Decho("executing: %!".g:netrw_ftp_cmd." -i -n")
 exe s:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i -n"
 " If the result of the ftp operation isn't blank, show an error message (tnx to Doug Claar)
 if getline(1) !~ "^$"
 "     call Decho("error<".getline(1).">")
 call s:NetrwMethod(a:tgt)
 if b:netrw_method == 2
 " handle uploading a list of files via ftp+.netrc
 let netrw_fname = b:netrw_fname
-silent keepjumps new
+sil keepj new
 "     call Decho("filter input window#".winnr())
-put =g:netrw_ftpmode
+keepj put =g:netrw_ftpmode
 "     call Decho("filter input: ".getline('$'))
 if exists("g:netrw_ftpextracmd")
-put =g:netrw_ftpextracmd
+keepj put =g:netrw_ftpextracmd
 "      call Decho("filter input: ".getline('$'))
 endif
-call setline(line("$")+1,'lcd "'.fromdir.'"')
+keepj call setline(line("$")+1,'lcd "'.fromdir.'"')
 "     call Decho("filter input: ".getline('$'))
-call setline(line("$")+1,'cd "'.tgtdir.'"')
+keepj call setline(line("$")+1,'cd "'.tgtdir.'"')
 "     call Decho("filter input: ".getline('$'))
 for fname in a:fname
-call setline(line("$")+1,'put "'.fname.'"')
+keepj 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 ".shellescape(g:netrw_machine,1)." ".shellescape(g:netrw_port,1))
 "      call Decho("filter input window#".winnr())
 "      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 ".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
+sil keepj g/Local directory now/d
 call histdel("/",-1)
 if getline(1) !~ "^$" && !exists("g:netrw_quiet") && getline(1) !~ '^Trying '
 call netrw#ErrorMsg(s:ERROR,getline(1),14)
 else
 bw!|q
 call s:SaveBufVars()|silent keepjumps new|call s:RestoreBufVars()
 let tmpbufnr= bufnr("%")
 setlocal ff=unix
 if exists("g:netrw_port") && g:netrw_port != ""
-put ='open '.g:netrw_machine.' '.g:netrw_port
+keepj put ='open '.g:netrw_machine.' '.g:netrw_port
 "      call Decho("filter input: ".getline('$'))
 else
-put ='open '.g:netrw_machine
+keepj put ='open '.g:netrw_machine
 "      call Decho("filter input: ".getline('$'))
 endif
 if exists("g:netrw_ftp") && g:netrw_ftp == 1
-put =g:netrw_uid
+keepj put =g:netrw_uid
 "      call Decho("filter input: ".getline('$'))
-call setline(line("$")+1,'"'.s:netrw_passwd.'"')
+keepj call setline(line("$")+1,'"'.s:netrw_passwd.'"')
 "      call Decho("filter input: ".getline('$'))
 else
-put ='user \"'.g:netrw_uid.'\" \"'.s:netrw_passwd.'\"'
+keepj put ='user \"'.g:netrw_uid.'\" \"'.s:netrw_passwd.'\"'
 "      call Decho("filter input: ".getline('$'))
 endif
-call setline(line("$")+1,'lcd "'.fromdir.'"')
+keepj call setline(line("$")+1,'lcd "'.fromdir.'"')
 "     call Decho("filter input: ".getline('$'))
 if exists("b:netrw_fname") && b:netrw_fname != ""
-call setline(line("$")+1,'cd "'.b:netrw_fname.'"')
+keepj call setline(line("$")+1,'cd "'.b:netrw_fname.'"')
 "      call Decho("filter input: ".getline('$'))
 endif
 if exists("g:netrw_ftpextracmd")
-put =g:netrw_ftpextracmd
+keepj put =g:netrw_ftpextracmd
 "      call Decho("filter input: ".getline('$'))
 endif
 for fname in a:fname
-call setline(line("$")+1,'put "'.fname.'"')
+keepj call setline(line("$")+1,'put "'.fname.'"')
 "      call Decho("filter input: ".getline('$'))
 endfor
 " perform ftp:
 " -i       : turns off interactive prompting from ftp
 " -n  unix : DON'T use <.netrc>, even though it exists
 " -n  win32: quit being obnoxious about password
-norm! 1Gdd
+keepj norm! 1Gdd
 "     call Decho("executing: ".s:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i -n")
 exe s:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i -n"
 " If the result of the ftp operation isn't blank, show an error message (tnx to Doug Claar)
-silent g/Local directory now/d
+sil keepj g/Local directory now/d
 call histdel("/",-1)
 if getline(1) !~ "^$" && !exists("g:netrw_quiet") && getline(1) !~ '^Trying '
 let debugkeep= &debug
 setlocal debug=msg
 call netrw#ErrorMsg(s:ERROR,getline(1),15)
 "  call Dfunc("NetrwPreview(path<".a:path.">)")
 call s:NetrwOptionSave("s:")
 call s:NetrwSafeOptions()
 if has("quickfix")
 if !isdirectory(a:path)
-exe (g:netrw_preview? "vert " : "")."pedit ".fnameescape(a:path)
+if g:netrw_preview && !g:netrw_alto
+let pvhkeep= &pvh
+let &pvh   = winwidth(0) - g:netrw_winsize
+endif
+exe (g:netrw_alto? "top " : "bot ").(g:netrw_preview? "vert " : "")."pedit ".fnameescape(a:path)
+if exists("pvhkeep")
+let &pvh= pvhkeep
+endif
 elseif !exists("g:netrw_quiet")
 call netrw#ErrorMsg(s:WARNING,"sorry, cannot preview a directory such as <".a:path.">",38)
 endif
 elseif !exists("g:netrw_quiet")
 call netrw#ErrorMsg(s:WARNING,"sorry, to preview your vim needs the quickfix feature compiled in",39)
 " NetrwBrowseChgDir() may clear the display; hence a NetrwSavePosn() may not work if its placed here.
 " Also, NetrwBrowseChgDir() now does a NetrwSavePosn() itself.
 setlocal ma noro
 "  call Decho("setlocal ma noro")
 "  call Decho("clear buffer<".expand("%")."> with :%d")
-%d
+keepj %d
 if a:islocal
 call netrw#LocalBrowseCheck(a:dirname)
 else
 call s:NetrwBrowse(a:islocal,a:dirname)
 endif
 return
 endif
 if seq == '*'
 let starpriority= spriority
 else
-exe 'silent keepjumps '.w:netrw_bannercnt.',$g/'.seq.'/s/^/'.spriority.'/'
+exe 'sil keepj '.w:netrw_bannercnt.',$g/'.seq.'/s/^/'.spriority.'/'
 call histdel("/",-1)
 " sometimes multiple sorting patterns will match the same file or directory.
 " The following substitute is intended to remove the excess matches.
-exe 'silent keepjumps '.w:netrw_bannercnt.',$g/^\d\{3}'.g:netrw_sepchr.'\d\{3}\//s/^\d\{3}'.g:netrw_sepchr.'\(\d\{3}\/\).\@=/\1/e'
+exe 'sil keepj '.w:netrw_bannercnt.',$g/^\d\{3}'.g:netrw_sepchr.'\d\{3}\//s/^\d\{3}'.g:netrw_sepchr.'\(\d\{3}\/\).\@=/\1/e'
 call histdel("/",-1)
 endif
 let priority = priority + 1
 endwhile
 if exists("starpriority")
-exe 'silent keepjumps '.w:netrw_bannercnt.',$v/^\d\{3}'.g:netrw_sepchr.'/s/^/'.starpriority.'/'
+exe 'sil keepj '.w:netrw_bannercnt.',$v/^\d\{3}'.g:netrw_sepchr.'/s/^/'.starpriority.'/'
 call histdel("/",-1)
 endif
 " Following line associated with priority -- items that satisfy a priority
 " pattern get prefixed by ###/ which permits easy sorting by priority.
 " Sometimes files can satisfy multiple priority patterns -- only the latest
 " priority pattern needs to be retained.  So, at this point, these excess
 " priority prefixes need to be removed, but not directories that happen to
 " be just digits themselves.
-exe 'silent keepjumps '.w:netrw_bannercnt.',$s/^\(\d\{3}'.g:netrw_sepchr.'\)\%(\d\{3}'.g:netrw_sepchr.'\)\+\ze./\1/e'
+exe 'sil keepj '.w:netrw_bannercnt.',$s/^\(\d\{3}'.g:netrw_sepchr.'\)\%(\d\{3}'.g:netrw_sepchr.'\)\+\ze./\1/e'
 call histdel("/",-1)
 "  call Dret("SetSort")
 endfun
 "  call Dfunc("s:NetrwSortStyle(islocal=".a:islocal.") netrw_sort_by<".g:netrw_sort_by.">")
 call s:NetrwSaveWordPosn()
 let svpos= netrw#NetrwSavePosn()
 let g:netrw_sort_by= (g:netrw_sort_by =~ 'n')? 'time' : (g:netrw_sort_by =~ 't')? 'size' : 'name'
-norm! 0
+keepj norm! 0
 call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,'./'))
 call netrw#NetrwRestorePosn(svpos)
 "  call Dret("s:NetrwSortStyle : netrw_sort_by<".g:netrw_sort_by.">")
 endfun
 " detect user attempting to close treeroot
 if getline('.') !~ '|' && getline('.') != '..'
 "    call Decho("user attempted to close treeroot")
 " now force a refresh
 "    call Decho("clear buffer<".expand("%")."> with :%d")
-keepjumps %d
+keepj %d
 "    call Dret("NetrwTreeDir <".treedir."> : (side effect) s:treecurpos<".string(s:treecurpos).">")
 return b:netrw_curdir
 endif
 " elide all non-depth information
 elseif entry =~ '/$' && has_key(w:netrw_treedict,direntry.'/')
 "    call Decho("<".direntry."/> is a key in treedict - display subtree for it")
 call s:NetrwTreeDisplay(direntry.'/',depth)
 else
 "    call Decho("<".entry."> is not a key in treedict (no subtree)")
-call setline(line("$")+1,depth.entry)
+keepj call setline(line("$")+1,depth.entry)
 endif
 endfor
 "  call Dret("NetrwTreeDisplay")
 endfun
 " update the directory listing for the current directory
 "   call Decho("updating dictionary with ".a:dirname.":[..directory listing..]")
 "   call Decho("bannercnt=".w:netrw_bannercnt." line($)=".line("$"))
 exe "silent! keepjumps ".w:netrw_bannercnt.',$g@^\.\.\=/$@d'
 let w:netrw_treedict[a:dirname]= getline(w:netrw_bannercnt,line("$"))
-"   call Decho("w:treedict[".a:dirname."]= ".w:netrw_treedict[a:dirname])
+"   call Decho("w:treedict[".a:dirname."]= ".string(w:netrw_treedict[a:dirname]))
 exe "silent! keepjumps ".w:netrw_bannercnt.",$d"
 " if past banner, record word
 if exists("w:netrw_bannercnt") && line(".") > w:netrw_bannercnt
 let fname= expand("<cword>")
 " fpc: filenames per column
 setlocal ma noro
 "   call Decho("setlocal ma noro")
 let b:netrw_cpf= 0
 if line("$") >= w:netrw_bannercnt
-exe 'silent keepjumps '.w:netrw_bannercnt.',$g/^./if virtcol("$") > b:netrw_cpf|let b:netrw_cpf= virtcol("$")|endif'
+exe 'sil keepj '.w:netrw_bannercnt.',$g/^./if virtcol("$") > b:netrw_cpf|let b:netrw_cpf= virtcol("$")|endif'
 call histdel("/",-1)
 else
 "    call Dret("NetrwWideListing")
 return
 endif
 let w:netrw_fpl= 1
 endif
 "   call Decho("fpl= [winwidth=".winwidth(0)."]/[b:netrw_cpf=".b:netrw_cpf.']='.w:netrw_fpl)
 " make wide display
-exe 'silent keepjumps '.w:netrw_bannercnt.',$s/^.*$/\=escape(printf("%-'.b:netrw_cpf.'s",submatch(0)),"\\")/'
+exe 'sil keepj '.w:netrw_bannercnt.',$s/^.*$/\=escape(printf("%-'.b:netrw_cpf.'s",submatch(0)),"\\")/'
 call histdel("/",-1)
 let fpc         = (line("$") - w:netrw_bannercnt + w:netrw_fpl)/w:netrw_fpl
 let newcolstart = w:netrw_bannercnt + fpc
 let newcolend   = newcolstart + fpc - 1
 "   call Decho("bannercnt=".w:netrw_bannercnt." fpl=".w:netrw_fpl." fpc=".fpc." newcol[".newcolstart.",".newcolend."]")
 while line("$") >= newcolstart
 if newcolend > line("$") | let newcolend= line("$") | endif
 let newcolqty= newcolend - newcolstart
 exe newcolstart
 if newcolqty == 0
-exe "silent keepjumps norm! 0\<c-v>$hx".w:netrw_bannercnt."G$p"
+exe "sil keepj norm! 0\<c-v>$hx".w:netrw_bannercnt."G$p"
 else
-exe "silent keepjumps norm! 0\<c-v>".newcolqty.'j$hx'.w:netrw_bannercnt.'G$p'
+exe "sil keepj norm! 0\<c-v>".newcolqty.'j$hx'.w:netrw_bannercnt.'G$p'
 endif
-exe "silent keepjumps ".newcolstart.','.newcolend.'d'
+exe "sil keepj ".newcolstart.','.newcolend.'d'
-exe 'silent keepjumps '.w:netrw_bannercnt
+exe 'sil keepj '.w:netrw_bannercnt
 endwhile
 silent! let @*= keepregstar
-exe "silent keepjumps ".w:netrw_bannercnt.',$s/\s\+$//e'
+exe "sil keepj ".w:netrw_bannercnt.',$s/\s\+$//e'
 call histdel("/",-1)
 setlocal noma nomod ro
 "   call Dret("NetrwWideListing")
 endif
 endfun
 " ---------------------------------------------------------------------
 " s:PerformListing: {{{2
 fun! s:PerformListing(islocal)
-"  call Dfunc("s:PerformListing(islocal=".a:islocal.") buf(%)=".bufnr("%")."<".bufname("%").">")
+"  call Dfunc("s:PerformListing(islocal=".a:islocal.") bufnr(%)=".bufnr("%")."<".bufname("%").">")
 call s:NetrwSafeOptions()
 setlocal noro ma
 "  call Decho("setlocal noro ma")
 "  call Decho('w:netrw_liststyle='.(exists("w:netrw_liststyle")? w:netrw_liststyle : 'n/a'))
 if exists("w:netrw_liststyle") && w:netrw_liststyle == s:TREELIST && exists("w:netrw_treedict")
 " force a refresh for tree listings
 "   call Decho("force refresh for treelisting: clear buffer<".expand("%")."> with :%d")
-keepjumps %d
+keepj %d
 endif
 " save current directory on directory history list
 call s:NetrwBookHistHandler(3,b:netrw_curdir)
 " Set up the banner {{{3
 if g:netrw_banner
 "   call Decho("set up banner")
-keepjumps put ='\" ============================================================================'
+keepj put ='\" ============================================================================'
-keepjumps put ='\" Netrw Directory Listing                                        (netrw '.g:loaded_netrw.')'
+keepj put ='\" Netrw Directory Listing                                        (netrw '.g:loaded_netrw.')'
-keepjumps put ='\"   '.b:netrw_curdir
+keepj put ='\"   '.b:netrw_curdir
-keepjumps 1d
+keepj 1d
 let w:netrw_bannercnt= 3
-exe "keepjumps ".w:netrw_bannercnt
+exe "keepj ".w:netrw_bannercnt
 else
-keepjumps 1
+keepj 1
 let w:netrw_bannercnt= 1
 endif
 let sortby= g:netrw_sort_by
 if g:netrw_sort_direction =~ "^r"
 if g:netrw_banner
 "   call Decho("handle specified sorting: g:netrw_sort_by<".g:netrw_sort_by.">")
 if g:netrw_sort_by =~ "^n"
 "   call Decho("directories will be sorted by name")
 " sorted by name
-keepjumps put ='\"   Sorted by      '.sortby
+keepj put ='\"   Sorted by      '.sortby
-keepjumps put ='\"   Sort sequence: '.g:netrw_sort_sequence
+keepj put ='\"   Sort sequence: '.g:netrw_sort_sequence
 let w:netrw_bannercnt= w:netrw_bannercnt + 2
 else
 "   call Decho("directories will be sorted by size or time")
 " sorted by size or date
-keepjumps put ='\"   Sorted by '.sortby
+keepj put ='\"   Sorted by '.sortby
 let w:netrw_bannercnt= w:netrw_bannercnt + 1
 endif
-exe "keepjumps ".w:netrw_bannercnt
+exe "keepj ".w:netrw_bannercnt
 endif
 " show copy/move target, if any
 if g:netrw_banner
 if exists("s:netrwmftgt") && exists("s:netrwmftgt_islocal")
 "    call Decho("show copy/move target<".s:netrwmftgt.">")
-keepjumps put =''
+keepj put =''
 if s:netrwmftgt_islocal
-call setline(line("."),'"   Copy/Move Tgt: '.s:netrwmftgt.' (local)')
+keepj call setline(line("."),'"   Copy/Move Tgt: '.s:netrwmftgt.' (local)')
 else
-call setline(line("."),'"   Copy/Move Tgt: '.s:netrwmftgt.' (remote)')
+keepj call setline(line("."),'"   Copy/Move Tgt: '.s:netrwmftgt.' (remote)')
 endif
 let w:netrw_bannercnt= w:netrw_bannercnt + 1
 else
 "    call Decho("s:netrwmftgt does not exist, don't make Copy/Move Tgt")
 endif
-exe "keepjumps ".w:netrw_bannercnt
+exe "keepj ".w:netrw_bannercnt
 endif
 " Hiding...  -or-  Showing... {{{3
 if g:netrw_banner
 "   call Decho("handle hiding/showing (g:netrw_hide=".g:netrw_list_hide." g:netrw_list_hide<".g:netrw_list_hide.">)")
 if g:netrw_list_hide != "" && g:netrw_hide
 if g:netrw_hide == 1
-keepjumps put ='\"   Hiding:        '.g:netrw_list_hide
+keepj put ='\"   Hiding:        '.g:netrw_list_hide
 else
-keepjumps put ='\"   Showing:       '.g:netrw_list_hide
+keepj put ='\"   Showing:       '.g:netrw_list_hide
 endif
 let w:netrw_bannercnt= w:netrw_bannercnt + 1
 endif
 exe "keepjumps ".w:netrw_bannercnt
-keepjumps put ='\"   Quick Help: <F1>:help  -:go up dir  D:delete  R:rename  s:sort-by  x:exec'
+keepj put ='\"   Quick Help: <F1>:help  -:go up dir  D:delete  R:rename  s:sort-by  x:exec'
-keepjumps put ='\" ============================================================================'
+keepj put ='\" ============================================================================'
 let w:netrw_bannercnt= w:netrw_bannercnt + 2
 endif
 " bannercnt should index the line just after the banner
 if g:netrw_banner
 let w:netrw_bannercnt= w:netrw_bannercnt + 1
-exe "keepjumps ".w:netrw_bannercnt
+exe "keepj ".w:netrw_bannercnt
 "   call Decho("bannercnt=".w:netrw_bannercnt." (should index line just after banner) line($)=".line("$"))
 endif
 " set up syntax highlighting {{{3
 "  call Decho("set up syntax highlighting")
 if !g:netrw_banner || 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'.' '.g:netrw_sort_options
+exe 'sil keepj '.w:netrw_bannercnt.',$sort'.' '.g:netrw_sort_options
 else
 " reverse direction sorting
-exe 'silent keepjumps '.w:netrw_bannercnt.',$sort!'.' '.g:netrw_sort_options
+exe 'sil keepj '.w:netrw_bannercnt.',$sort!'.' '.g:netrw_sort_options
 endif
 endif
 " remove priority pattern prefix
 "     call Decho("remove priority pattern prefix")
-exe 'silent keepjumps '.w:netrw_bannercnt.',$s/^\d\{3}'.g:netrw_sepchr.'//e'
+exe 'sil keepj '.w:netrw_bannercnt.',$s/^\d\{3}'.g:netrw_sepchr.'//e'
 call histdel("/",-1)
 elseif a:islocal
 if !g:netrw_banner || 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'.' '.g:netrw_sort_options
+exe 'sil keepj '.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!'.' '.g:netrw_sort_options
+exe 'sil keepj '.w:netrw_bannercnt.',$sort!'.' '.g:netrw_sort_options
 endif
-exe 'silent keepjumps '.w:netrw_bannercnt.',$s/^\d\{-}\///e'
+exe 'sil keepj '.w:netrw_bannercnt.',$s/^\d\{-}\///e'
 call histdel("/",-1)
 endif
 endif
 elseif g:netrw_sort_direction =~ 'r'
 "    call Decho('reverse the sorted listing')
 if !g:netrw_banner || w:netrw_bannercnt < line('$')
-exe 'silent keepjumps '.w:netrw_bannercnt.',$g/^/m '.w:netrw_bannercnt
+exe 'sil keepj '.w:netrw_bannercnt.',$g/^/m '.w:netrw_bannercnt
 call histdel("/",-1)
 endif
 endif
 endif
 call s:NetrwTreeListing(b:netrw_curdir)
 if exists("w:netrw_bannercnt") && (line("$") > w:netrw_bannercnt || !g:netrw_banner)
 " place cursor on the top-left corner of the file listing
 "   call Decho("place cursor on top-left corner of file listing")
-exe 'silent keepjumps '.w:netrw_bannercnt
+exe 'sil keepj '.w:netrw_bannercnt
-norm! 0
+keepj norm! 0
 endif
 " record previous current directory
 let w:netrw_prvdir= b:netrw_curdir
 "  call Decho("record netrw_prvdir<".w:netrw_prvdir.">")
 elseif g:netrw_sort_by =~ '^s'
 let listcmd= g:netrw_ftp_sizelist_cmd
 endif
 "   call Decho("listcmd<".listcmd."> (using g:netrw_ftp_list_cmd)")
 call s:NetrwRemoteFtpCmd(s:path,listcmd)
-"   exe "keepjumps ".w:netrw_bannercnt.',$g/^./call Decho("raw listing: ".getline("."))'
+"   exe "keepj ".w:netrw_bannercnt.',$g/^./call Decho("raw listing: ".getline("."))'
 if w:netrw_liststyle == s:THINLIST || w:netrw_liststyle == s:WIDELIST || w:netrw_liststyle == s:TREELIST
 " shorten the listing
 "    call Decho("generate short listing")
-exe "keepjumps ".w:netrw_bannercnt
+exe "keepj ".w:netrw_bannercnt
 " cleanup
 if g:netrw_ftp_browse_reject != ""
-exe "silent! g/".g:netrw_ftp_browse_reject."/keepjumps d"
+exe "sil! keepj g/".g:netrw_ftp_browse_reject."/keepj d"
 call histdel("/",-1)
 endif
-silent! keepjumps %s/\r$//e
+sil! keepj %s/\r$//e
 call histdel("/",-1)
 " if there's no ../ listed, then put ./ and ../ in
 let line1= line(".")
-exe "keepjumps ".w:netrw_bannercnt
+exe "keepj ".w:netrw_bannercnt
 let line2= search('^\.\.\/\%(\s\|$\)','cnW')
 if line2 == 0
 "     call Decho("netrw is putting ./ and ../ into listing")
-keepjumps put='../'
+keepj put='../'
-keepjumps put='./'
+keepj put='./'
 endif
-exe "keepjumps ".line1
+exe "keepj ".line1
 keepjumps norm! 0
 "    call Decho("line1=".line1." line2=".line2." line(.)=".line("."))
 if search('^\d\{2}-\d\{2}-\d\{2}\s','n') " M$ ftp site cleanup
 "     call Decho("M$ ftp cleanup")
-exe 'silent! keepjumps '.w:netrw_bannercnt.',$s/^\d\{2}-\d\{2}-\d\{2}\s\+\d\+:\d\+[AaPp][Mm]\s\+\%(<DIR>\|\d\+\)\s\+//'
+exe 'sil! keepj '.w:netrw_bannercnt.',$s/^\d\{2}-\d\{2}-\d\{2}\s\+\d\+:\d\+[AaPp][Mm]\s\+\%(<DIR>\|\d\+\)\s\+//'
 call histdel("/",-1)
 else " normal ftp cleanup
 "     call Decho("normal ftp cleanup")
-exe 'silent! keepjumps '.w:netrw_bannercnt.',$s/^\(\%(\S\+\s\+\)\{7}\S\+\)\s\+\(\S.*\)$/\2/e'
+exe 'sil! keepj '.w:netrw_bannercnt.',$s/^\(\%(\S\+\s\+\)\{7}\S\+\)\s\+\(\S.*\)$/\2/e'
-exe "silent! keepjumps ".w:netrw_bannercnt.',$g/ -> /s# -> .*/$#/#e'
+exe "sil! keepj ".w:netrw_bannercnt.',$g/ -> /s# -> .*/$#/#e'
-exe "silent! keepjumps ".w:netrw_bannercnt.',$g/ -> /s# -> .*$#/#e'
+exe "sil! keepj ".w:netrw_bannercnt.',$g/ -> /s# -> .*$#/#e'
 call histdel("/",-1)
 call histdel("/",-1)
 call histdel("/",-1)
 endif
 endif
 "   call Decho("listcmd<".listcmd."> (using g:netrw_list_cmd)")
 if g:netrw_scp_cmd =~ '^pscp'
 "    call Decho("1: exe silent r! ".shellescape(listcmd.s:path, 1))
 exe "silent r! ".listcmd.shellescape(s:path, 1)
 " remove rubbish and adjust listing format of 'pscp' to 'ssh ls -FLa' like
-g/^Listing directory/d
+keepj g/^Listing directory/keepj d
-g/^d[-rwx][-rwx][-rwx]/s+$+/+e
+keepj g/^d[-rwx][-rwx][-rwx]/keepj s+$+/+e
-silent g/^l[-rwx][-rwx][-rwx]/s+$+@+e
+sil keepj g/^l[-rwx][-rwx][-rwx]/keepj s+$+@+e
 call histdel("/",-1)
 call histdel("/",-1)
 call histdel("/",-1)
 if g:netrw_liststyle != s:LONGLIST
-g/^[dlsp-][-rwx][-rwx][-rwx]/s/^.*\s\(\S\+\)$/\1/e
+keepj g/^[dlsp-][-rwx][-rwx][-rwx]/keepj s/^.*\s\(\S\+\)$/\1/e
 call histdel("/",-1)
 endif
 else
 if s:path == ""
 "     call Decho("2: exe silent r! ".listcmd)
-exe "silent r! ".listcmd
+exe "sil r! ".listcmd
 else
 "     call Decho("3: exe silent r! ".listcmd.' '.shellescape(s:path,1))
-exe "silent r! ".listcmd.' '.shellescape(s:path,1)
+exe "sil r! ".listcmd.' '.shellescape(s:path,1)
 "     call Decho("listcmd<".listcmd."> path<".s:path.">")
 endif
 endif
 " cleanup
 if g:netrw_ftp_browse_reject != ""
 "    call Decho("(cleanup) exe silent! g/".g:netrw_ssh_browse_reject."/keepjumps d")
-exe "silent! g/".g:netrw_ssh_browse_reject."/keepjumps d"
+exe "sil! g/".g:netrw_ssh_browse_reject."/keepjumps d"
 call histdel("/",-1)
 endif
 endif
 if w:netrw_liststyle == s:LONGLIST
 " do a long listing; these substitutions need to be done prior to sorting {{{3
 "   call Decho("fix long listing:")
 if s:method == "ftp"
 " cleanup
-exe "keepjumps ".w:netrw_bannercnt
+exe "keepj ".w:netrw_bannercnt
 while getline('.') =~ g:netrw_ftp_browse_reject
-keepjumps d
+keepj d
 endwhile
 " if there's no ../ listed, then put ./ and ../ in
 let line1= line(".")
-keepjumps 1
+keepj 1
-silent keepjumps call search('^\.\.\/\%(\s\|$\)','W')
+sil keepj call search('^\.\.\/\%(\s\|$\)','W')
 let line2= line(".")
 if line2 == 0
-exe 'keepjumps '.w:netrw_bannercnt."put='./'"
+exe 'keepj '.w:netrw_bannercnt."put='./'"
 if b:netrw_curdir != '/'
-exe 'keepjumps '.w:netrw_bannercnt."put='../'"
+exe 'keepj '.w:netrw_bannercnt."put='../'"
 endif
 endif
-exe "keepjumps ".line1
+exe "keepj ".line1
 keepjumps norm! 0
 endif
 if search('^\d\{2}-\d\{2}-\d\{2}\s','n') " M$ ftp site cleanup
 "    call Decho("M$ ftp site listing cleanup")
-exe 'silent! keepjumps '.w:netrw_bannercnt.',$s/^\(\d\{2}-\d\{2}-\d\{2}\s\+\d\+:\d\+[AaPp][Mm]\s\+\%(<DIR>\|\d\+\)\s\+\)\(\w.*\)$/\2\t\1/'
+exe 'sil! keepj '.w:netrw_bannercnt.',$s/^\(\d\{2}-\d\{2}-\d\{2}\s\+\d\+:\d\+[AaPp][Mm]\s\+\%(<DIR>\|\d\+\)\s\+\)\(\w.*\)$/\2\t\1/'
 elseif exists("w:netrw_bannercnt") && w:netrw_bannercnt <= line("$")
 "    call Decho("normal ftp site listing cleanup: bannercnt=".w:netrw_bannercnt." line($)=".line("$"))
-exe 'silent keepjumps '.w:netrw_bannercnt.',$s/ -> .*$//e'
+exe 'sil keepj '.w:netrw_bannercnt.',$s/ -> .*$//e'
-exe 'silent keepjumps '.w:netrw_bannercnt.',$s/^\(\%(\S\+\s\+\)\{7}\S\+\)\s\+\(\S.*\)$/\2\t\1/e'
+exe 'sil keepj '.w:netrw_bannercnt.',$s/^\(\%(\S\+\s\+\)\{7}\S\+\)\s\+\(\S.*\)$/\2\t\1/e'
-exe 'silent keepjumps '.w:netrw_bannercnt
+exe 'sil keepj '.w:netrw_bannercnt
 call histdel("/",-1)
 call histdel("/",-1)
 call histdel("/",-1)
 endif
 endif
 "  if exists("w:netrw_bannercnt") && w:netrw_bannercnt <= line("$") " Decho
-"   exe "keepjumps ".w:netrw_bannercnt.',$g/^./call Decho("listing: ".getline("."))'
+"   exe "keepj ".w:netrw_bannercnt.',$g/^./call Decho("listing: ".getline("."))'
 "  endif " Decho
 "  call Dret("s:NetrwRemoteListing")
 endfun
 " ---------------------------------------------------------------------
 ".........................................
 if w:netrw_method == 2 || w:netrw_method == 5
 " ftp + <.netrc>:  Method #2
 if a:path != ""
-put ='cd \"'.a:path.'\"'
+keepj put ='cd \"'.a:path.'\"'
 endif
 if exists("g:netrw_ftpextracmd")
-put =g:netrw_ftpextracmd
+keepj put =g:netrw_ftpextracmd
 "    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 != ""
 ".........................................
 elseif w:netrw_method == 3
 " ftp + machine,id,passwd,filename:  Method #3
 setlocal ff=unix
 if exists("g:netrw_port") && g:netrw_port != ""
-put ='open '.g:netrw_machine.' '.g:netrw_port
+keepj put ='open '.g:netrw_machine.' '.g:netrw_port
 else
-put ='open '.g:netrw_machine
+keepj put ='open '.g:netrw_machine
 endif
 if exists("g:netrw_ftp") && g:netrw_ftp == 1
-put =g:netrw_uid
+keepj put =g:netrw_uid
-put ='\"'.s:netrw_passwd.'\"'
+keepj put ='\"'.s:netrw_passwd.'\"'
 else
-put ='user \"'.g:netrw_uid.'\" \"'.s:netrw_passwd.'\"'
+keepj put ='user \"'.g:netrw_uid.'\" \"'.s:netrw_passwd.'\"'
 endif
 if a:path != ""
-put ='cd \"'.a:path.'\"'
+keepj put ='cd \"'.a:path.'\"'
 endif
 if exists("g:netrw_ftpextracmd")
-put =g:netrw_ftpextracmd
+keepj put =g:netrw_ftpextracmd
 "    call Decho("filter input: ".getline('.'))
 endif
-call setline(line("$")+1,a:listcmd)
+keepj call setline(line("$")+1,a:listcmd)
 " perform ftp:
 " -i       : turns off interactive prompting from ftp
 " -n  unix : DON'T use <.netrc>, even though it exists
 " -n  win32: quit being obnoxious about password
 call netrw#ErrorMsg(s:WARNING,"unable to comply with your request<" . choice . ">",23)
 endif
 " cleanup for Windows
 if has("win32") || has("win95") || has("win64") || has("win16")
-silent! keepjumps %s/\r$//e
+sil! keepj %s/\r$//e
 call histdel("/",-1)
 endif
 if a:listcmd == "dir"
 " infer directory/link based on the file permission string
-silent! keepjumps g/d\%([-r][-w][-x]\)\{3}/s@$@/@
+sil! keepj g/d\%([-r][-w][-x]\)\{3}/keepj s@$@/@
-silent! keepjumps g/l\%([-r][-w][-x]\)\{3}/s/$/@/
+sil! keepj g/l\%([-r][-w][-x]\)\{3}/keepj s/$/@/
 call histdel("/",-1)
 call histdel("/",-1)
 if w:netrw_liststyle == s:THINLIST || w:netrw_liststyle == s:WIDELIST || w:netrw_liststyle == s:TREELIST
-exe "silent! keepjumps ".w:netrw_bannercnt.',$s/^\%(\S\+\s\+\)\{8}//e'
+exe "sil! keepj ".w:netrw_bannercnt.',$s/^\%(\S\+\s\+\)\{8}//e'
 call histdel("/",-1)
 endif
 endif
 " ftp's listing doesn't seem to include ./ or ../
 if !search('^\.\/$\|\s\.\/$','wn')
-exe 'keepjumps '.w:netrw_bannercnt
+exe 'keepj '.w:netrw_bannercnt
-put ='./'
+keepj put ='./'
 endif
 if !search('^\.\.\/$\|\s\.\.\/$','wn')
-exe 'keepjumps '.w:netrw_bannercnt
+exe 'keepj '.w:netrw_bannercnt
-put ='../'
+keepj put ='../'
 endif
 " restore settings
 let &ff= ffkeep
 "  call Dret("NetrwRemoteFtpCmd")
 else
 " attempt to rename files/directories
 while ctr <= a:lastline
-exe "keepjumps ".ctr
+exe "keepj ".ctr
 let oldname= s:NetrwGetWord()
 "   call Decho("oldname<".oldname.">")
 call inputsave()
 "    call Decho("getftime(".filename.")=".getftime(filename))
 let t  = getftime(filename)
 let ft = strpart("000000000000000000",1,18-strlen(t)).t
 "    call Decho("exe keepjumps put ='".ft.'/'.filename."'")
 let ftpfile= ft.'/'.pfile
-keepjumps silent! put=ftpfile
+sil! keepj put=ftpfile
 elseif g:netrw_sort_by =~ "^s"
 " sort by size (handles file sizes up to 1 quintillion bytes, US)
 "    call Decho("getfsize(".filename.")=".getfsize(filename))
 let sz   = getfsize(filename)
 let fsz  = strpart("000000000000000000",1,18-strlen(sz)).sz
 "    call Decho("exe keepjumps put ='".fsz.'/'.filename."'")
 let fszpfile= fsz.'/'.pfile
-keepjumps silent! put =fszpfile
+sil! keepj put =fszpfile
 else
 " sort by name
 "    call Decho("exe keepjumps put ='".pfile."'")
-keepjumps silent! put=pfile
+sil! keepj put=pfile
 endif
 endwhile
 " cleanup any windows mess at end-of-line
-silent! keepjumps g/^$/d
+sil! keepj g/^$/d
-silent! keepjumps %s/\r$//e
+sil! keepj %s/\r$//e
 call histdel("/",-1)
 exe "setlocal ts=".g:netrw_maxfilenamelen
 "  call Decho("setlocal ts=".g:netrw_maxfilenamelen)
 "  call Dret("s:LocalListing")
 for ibuf in s:netrw_browselist
 "   call Decho("bufwinnr(".ibuf.") index(buftablist,".ibuf.")=".index(buftablist,ibuf))
 if bufwinnr(ibuf) == -1 && index(buftablist,ibuf) == -1
 " wipe out any non-displaying netrw buffer
 "    call Decho("wiping  buf#".ibuf,"<".bufname(ibuf).">")
-exe "silent! bd ".fnameescape(ibuf)
+exe "sil! bd ".fnameescape(ibuf)
 call remove(s:netrw_browselist,ibl)
 "    call Decho("browselist=".string(s:netrw_browselist))
 continue
 elseif index(tabpagebuflist(),ibuf) != -1
 " refresh any netrw buffer
 " remove (multiple) files and directories
 "   call Decho("remove files in range [".a:firstline.",".a:lastline."]")
 let ctr = a:firstline
 while ctr <= a:lastline
-exe "keepjumps ".ctr
+exe "keepj ".ctr
 " sanity checks
 if line(".") < w:netrw_bannercnt
 let ctr= ctr + 1
 continue
 fun! s:NetrwLocalRmFile(path,fname,all)
 "  call Dfunc("s:NetrwLocalRmFile(path<".a:path."> fname<".a:fname."> all=".a:all)
 let all= a:all
 let ok = ""
-norm! 0
+keepj norm! 0
 let rmfile= s:ComposePath(a:path,a:fname)
 "  call Decho("rmfile<".rmfile.">")
 if rmfile !~ '^"' && (rmfile =~ '@$' || rmfile !~ '[\/]$')
 " attempt to remove file
 else
 " attempt to rename files/directories
 while ctr <= a:lastline
-exe "keepjumps ".ctr
+exe "keepj ".ctr
 " sanity checks
 if line(".") < w:netrw_bannercnt
 let ctr= ctr + 1
 continue
 if curword == "./" || curword == "../"
 let ctr= ctr + 1
 continue
 endif
-norm! 0
+keepj norm! 0
 let oldname= s:ComposePath(a:path,curword)
 "   call Decho("oldname<".oldname.">")
 call inputsave()
 let newname= input("Moving ".oldname." to : ",substitute(oldname,'/*$','','e'))
 "    call Decho("write to NetrwMessage buffer")
 exe bufwinnr("NetrwMessage")."wincmd w"
 "    call Decho("setlocal ma noro")
 setlocal ma noro
 call setline(line("$")+1,level.a:msg)
-$
+keepj $
 else
 "    call Decho("create a NetrwMessage buffer window")
 bo 1split
 call s:NetrwEnew()
 call s:NetrwSafeOptions()
 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"
+exe "sil! ".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>"
+exe "keepj 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>"
+exe "keepj norm! ".w:netrw_line."G0".w:netrw_col."\<bar>"
 endif
 let &ei= eikeep
 "  call Dret("netrw#NetrwRestorePosn")
 endfun
 let w:netrw_line = line(".")
 let w:netrw_col  = virtcol(".")
 "  call Decho("currently, win#".w:netrw_winnr." line#".w:netrw_line." col#".w:netrw_col)
 " Save top-of-screen line
-norm! H0
+keepj 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
 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
+exe "sil! ".bmshowfunc
 endif
 endif
 endif
 "  call Dret("s:NetrwBMShow : bmshowfunc<".(exists("bmshowfunc")? bmshowfunc : 'n/a').">")
+endfun
+" ---------------------------------------------------------------------
+" s:NetrwCursorline: {{{2
+fun! s:NetrwCursorline()
+if !exists("w:netrw_liststyle")
+let w:netrw_liststyle= g:netrw_liststyle
+endif
+"  call Dfunc("s:NetrwCursorline() liststyle=".w:netrw_liststyle." g:netrw_cursorline=".g:netrw_cursorline." s:netrw_usercuc=".s:netrw_usercuc." s:netrw_usercul=".s:netrw_usercul)
+"
+if w:netrw_liststyle != s:WIDELIST
+" thin-long-tree listings
+if g:netrw_cursorline == 2
+setlocal cursorline
+let &l:cursorcolumn= s:netrw_usercuc
+"    call Decho("setlocal cursorline  (cursorcolumn is ".((s:netrw_usercuc)? "on" : "off").")")
+elseif g:netrw_cursorline
+setlocal cursorline
+"    call Decho("setlocal cursorline")
+endif
+else
+" wide listings
+if g:netrw_cursorline == 2
+setlocal cursorline cursorcolumn
+"    call Decho("setlocal cursorline cursorcolumn")
+elseif g:netrw_cursorline
+let &l:cursorline= s:netrw_usercul
+"    call Decho("cursorline is ".((s:netrw_usercul)? "on" : "off").")")
+endif
+endif
+"  call Dret("s:NetrwCursorline : l:cursorline=".&l:cursorline." l:cursorcolumn=".&l:cursorcolumn)
+endfun
+" ---------------------------------------------------------------------
+" s:RestoreCursorline: restores cursorline/cursorcolumn to original user settings {{{2
+fun! s:RestoreCursorline()
+"  call Dfunc("s:RestoreCursorline() currently, cul=".&l:cursorline." cuc=".&l:cursorcolumn." win#".winnr()." buf#".bufnr("%"))
+let &l:cursorline   = s:netrw_usercul
+let &l:cursorcolumn = s:netrw_usercuc
+"  call Dret("s:RestoreCursorline : restored cul=".&l:cursorline." cuc=".&l:cursorcolumn)
 endfun
 " ---------------------------------------------------------------------
 " s:NetrwDelete: Deletes a file. {{{2
 "           Uses Steve Hall's idea to insure that Windows paths stay
 endfun
 " ---------------------------------------------------------------------
 " s:NetrwEnew: opens a new buffer, passes netrw buffer variables through {{{2
 fun! s:NetrwEnew(...)
-"  call Dfunc("s:NetrwEnew() a:0=".a:0)
+"  call Dfunc("s:NetrwEnew() a:0=".a:0." bufnr($)=".bufnr("$"))
 "  call Decho("curdir<".((a:0>0)? a:1 : "")."> buf#".bufnr("%")."<".bufname("%").">")
 " grab a function-local-variable copy of buffer variables
+"  call Decho("make function-local copy of netrw variables")
 if exists("b:netrw_bannercnt")      |let netrw_bannercnt       = b:netrw_bannercnt      |endif
 if exists("b:netrw_browser_active") |let netrw_browser_active  = b:netrw_browser_active |endif
 if exists("b:netrw_cpf")            |let netrw_cpf             = b:netrw_cpf            |endif
 if exists("b:netrw_curdir")         |let netrw_curdir          = b:netrw_curdir         |endif
 if exists("b:netrw_explore_bufnr")  |let netrw_explore_bufnr   = b:netrw_explore_bufnr  |endif
 if exists("b:netrw_option")         |let netrw_option          = b:netrw_option         |endif
 if exists("b:netrw_prvdir")         |let netrw_prvdir          = b:netrw_prvdir         |endif
 call s:NetrwOptionRestore("w:")
 "  call Decho("generate a buffer with keepjumps keepalt enew!")
-keepjumps keepalt enew!
+keepj keepalt enew!
+"  call Decho("bufnr($)=".bufnr("$"))
 call s:NetrwOptionSave("w:")
 " copy function-local-variables to buffer variable equivalents
+"  call Decho("copy function-local variables back to buffer netrw variables")
 if exists("netrw_bannercnt")      |let b:netrw_bannercnt       = netrw_bannercnt      |endif
 if exists("netrw_browser_active") |let b:netrw_browser_active  = netrw_browser_active |endif
 if exists("netrw_cpf")            |let b:netrw_cpf             = netrw_cpf            |endif
 if exists("netrw_curdir")         |let b:netrw_curdir          = netrw_curdir         |endif
 if exists("netrw_explore_bufnr")  |let b:netrw_explore_bufnr   = netrw_explore_bufnr  |endif
 if a:0 > 0
 let b:netrw_curdir= a:1
 if b:netrw_curdir =~ '/$'
 if exists("w:netrw_liststyle") && w:netrw_liststyle == s:TREELIST
 file NetrwTreeListing
+set bt=nowrite noswf
 nno <silent> <buffer> [	:silent call <SID>TreeListMove('[')<cr>
 nno <silent> <buffer> ]	:silent call <SID>TreeListMove(']')<cr>
 else
-exe "silent! keepalt file ".fnameescape(b:netrw_curdir)
+exe "sil! keepalt file ".fnameescape(b:netrw_curdir)
 endif
 endif
 endif
 "  call Dret("s:NetrwEnew : buf#".bufnr("%")."<".bufname("%")."> expand(%)<".expand("%")."> expand(#)<".expand("#").">")
 " virtual length (counting, for instance, tabs as anything between 1 and
 " 'tabstop', wide CJK as 2 rather than 1, Arabic alif as zero when immediately
 " preceded by lam, one otherwise, etc.)
 " (comment from TM, solution from me)
 let modkeep= &mod
-exe "norm! o\<esc>"
+exe "keepj norm! o\<esc>"
 call setline(line("."),a:x)
 let ret= virtcol("$") - 1
-d
+keepj d
 let &mod= modkeep
 else
 " at least give a decent default
 let ret= strlen(a:x)
 "  call Decho("indentm1 <".indentm1.">")
 if curline !~ '/$'
 "   call Decho('regfile')
 if     a:dir == '[' && prvline != ''
-norm! 0
+keepj norm! 0
 let nl = search('^'.indentm1.'[^|]','bWe')    " search backwards from regular file
 "    call Decho("regfile srch back: ".nl)
 elseif a:dir == ']' && nxtline != ''
-norm! $
+keepj norm! $
 let nl = search('^'.indentm1.'[^|]','We')     " search forwards from regular file
 "    call Decho("regfile srch fwd: ".nl)
 endif
 elseif a:dir == '[' && prvline != ''
-norm! 0
+keepj norm! 0
 let curline= line(".")
 let nl     = search('^'.curindent.'[^|]','bWe') " search backwards From directory, same indentation
 "   call Decho("dir srch back ind: ".nl)
 if nl != 0
 if line(".") == curline-1
 "     call Decho("dir srch back ind-1: ".nl)
 endif
 endif
 elseif a:dir == ']' && nxtline != ''
-norm! $
+keepj norm! $
 let curline = line(".")
 let nl      = search('^'.curindent.'[^|]','We') " search forwards from directory, same indentation
 "   call Decho("dir srch fwd ind: ".nl)
 if nl != 0
 if line(".") == curline+1

Mercurial > vim

comparison runtime/autoload/netrw.vim @ 2152:b9e314fe473f