[SCM] Vim packaging branch, deb/runtime, updated. upstream/7.1.285-87-g84fd55d
James Vega
jamessan at debian.org
Tue Jun 10 01:58:17 UTC 2008
The following commit has been merged in the deb/runtime branch:
commit 84fd55dd153e2b10b1229552b1c34a40d26c7664
Author: James Vega <jamessan at debian.org>
Date: Mon Jun 9 21:55:55 2008 -0400
Update NetRW to version 125n (pre-release).
Closes: #474609, #474980
Signed-off-by: James Vega <jamessan at debian.org>
diff --git a/runtime/autoload/netrw.vim b/runtime/autoload/netrw.vim
index f9d04d2..57bb519 100644
--- a/runtime/autoload/netrw.vim
+++ b/runtime/autoload/netrw.vim
@@ -1,21 +1,19 @@
" netrw.vim: Handles file transfer and remote directory listing across
" AUTOLOAD SECTION
-" Date: Jan 15, 2008
-" Version: 119
+" Date: Jun 06, 2008
+" Version: 125n ASTRO-ONLY
" Maintainer: Charles E Campbell, Jr <NdrOchip at ScampbellPfamily.AbizM-NOSPAM>
" GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim
-" Copyright: Copyright (C) 1999-2007 Charles E. Campbell, Jr. {{{1
+" Copyright: Copyright (C) 1999-2008 Charles E. Campbell, Jr. {{{1
" Permission is hereby granted to use and distribute this code,
" with or without modifications, provided that this copyright
" notice is copied with it. Like anything else that's free,
" netrw.vim, netrwPlugin.vim, and netrwSettings.vim are provided
-" *as is* and comes with no warranty of any kind, either
+" *as is* and come with no warranty of any kind, either
" expressed or implied. By using this plugin, you agree that
" in no event will the copyright holder be liable for any damages
" resulting from the use of this software.
-" of this software.
-" note: worked with tmpfile s:GetTempname() in NetRead() NetWrite()
-"redraw!|call inputsave()|call input("Press <cr> to continue")|call inputrestore()
+"redraw!|call DechoSep()|call inputsave()|call input("Press <cr> to continue")|call inputrestore()
"
" But be doers of the Word, and not only hearers, deluding your own selves {{{1
" (James 1:22 RSV)
@@ -29,11 +27,20 @@ if !exists("s:NOTE")
let s:WARNING = 1
let s:ERROR = 2
endif
-let g:loaded_netrw = "v119"
+let g:loaded_netrw = "v125n"
+
+" sanity checks
if v:version < 700
call netrw#ErrorMsg(s:WARNING,"you need vim version 7.0 or later for version ".g:loaded_netrw." of netrw",1)
finish
endif
+if !exists("*shellescape")
+ call netrw#ErrorMsg(s:ERROR,"you need to upgade your vim so that it has shellescape()",64)
+endif
+if !exists("*fnameescape")
+ call netrw#ErrorMsg(s:ERROR,"you need to upgade your vim so that it has fnameescape()",65)
+endif
+
let s:keepcpo= &cpo
setlocal cpo&vim
"DechoTabOn
@@ -142,7 +149,10 @@ endif
if !exists("g:netrw_compress")
let g:netrw_compress= "gzip"
endif
-" Default values - d-f ---------- {{{3
+if !exists("g:netrw_ctags")
+ let g:netrw_ctags= "ctags"
+endif
+" Default values - d-g ---------- {{{3
if !exists("g:NETRW_DIRHIST_CNT")
let g:NETRW_DIRHIST_CNT= 0
endif
@@ -152,6 +162,9 @@ endif
if !exists("g:netrw_dirhistmax")
let g:netrw_dirhistmax= 10
endif
+if !exists("g:netrw_fastbrowse")
+ let g:netrw_fastbrowse= 1
+endif
if !exists("g:netrw_ftp_browse_reject")
let g:netrw_ftp_browse_reject='^total\s\+\d\+$\|^Trying\s\+\d\+.*$\|^KERBEROS_V\d rejected\|^Security extensions not\|No such file\|: connect to address [0-9a-fA-F:]*: No route to host$'
endif
@@ -245,6 +258,9 @@ if g:netrw_liststyle == s:LONGLIST && g:netrw_scp_cmd !~ '^pscp'
let g:netrw_list_cmd= g:netrw_list_cmd." -l"
endif
" Default values - m-r ---------- {{{3
+if !exists("g:netrw_markfileesc")
+ let g:netrw_markfileesc= '*./[\~'
+endif
if !exists("g:netrw_maxfilenamelen")
let g:netrw_maxfilenamelen= 32
endif
@@ -286,29 +302,11 @@ if !exists("g:netrw_rmf_cmd")
let g:netrw_rmf_cmd = g:netrw_ssh_cmd." USEPORT HOSTNAME rm -f"
endif
" Default values - s ---------- {{{3
+ " set up shell quoting character
if exists("g:netrw_silent") && g:netrw_silent != 0
- let g:netrw_silentxfer= "silent "
+ let s:netrw_silentxfer= "silent "
else
- let g:netrw_silentxfer= ""
-endif
-if !exists("g:netrw_fastbrowse")
- let g:netrw_fastbrowse= 1
-endif
-if !exists("g:netrw_shq")
- if exists("&shq") && &shq != ""
- let g:netrw_shq= &shq
- elseif exists("&sxq") && &sxq != ""
- let g:netrw_shq= &sxq
- elseif has("win32") || has("win95") || has("win64") || has("win16")
- if g:netrw_cygwin
- let g:netrw_shq= "'"
- else
- let g:netrw_shq= '"'
- endif
- else
- let g:netrw_shq= "'"
- endif
-" call Decho("g:netrw_shq<".g:netrw_shq.">")
+ let s:netrw_silentxfer= ""
endif
if !exists("g:netrw_sort_by")
" alternatives: date size
@@ -319,7 +317,10 @@ if !exists("g:netrw_sort_direction")
let g:netrw_sort_direction= "normal"
endif
if !exists("g:netrw_sort_sequence")
- let g:netrw_sort_sequence= '[\/]$,\.h$,\.c$,\.cpp$,\.[a-np-z]$,*,\.info$,\.swp$,\.o$\.obj$,\.bak$'
+ let g:netrw_sort_sequence= '[\/]$,\.h$,\.c$,\.cpp$,*,\.o$,\.obj$,\.info$,\.swp$,\.bak$,\~$'
+endif
+if !exists("g:netrw_special_syntax")
+ let g:netrw_special_syntax= 0
endif
if !exists("g:netrw_ssh_browse_reject")
let g:netrw_ssh_browse_reject='^total\s\+\d\+$'
@@ -332,12 +333,12 @@ else
let g:netrw_use_noswf= 0
endif
" Default values - t-w ---------- {{{3
-if !exists("g:netrw_ctags")
- let g:netrw_ctags= "ctags"
-endif
if !exists("g:netrw_timefmt")
let g:netrw_timefmt= "%c"
endif
+if !exists("g:netrw_xstrlen")
+ let g:netrw_xstrlen= 1
+endif
if !exists("g:NetrwTopLvlMenu")
let g:NetrwTopLvlMenu= "Netrw."
endif
@@ -352,17 +353,14 @@ if !exists("g:netrw_winsize")
endif
" ---------------------------------------------------------------------
" Default values for netrw's script variables: {{{2
-if !exists("g:netrw_cd_escape")
- let g:netrw_cd_escape="[]#*$%'\" ?`!&();<>\\"
-endif
if !exists("g:netrw_fname_escape")
- let g:netrw_fname_escape= ' ?&;'
+ let g:netrw_fname_escape= ' ?&;%'
endif
-if !exists("g:netrw_tmpfile_escape")
- let g:netrw_tmpfile_escape= ' ?&;'
+if !exists("g:netrw_glob_escape")
+ let g:netrw_glob_escape= '[]*?`{~$'
endif
-if !exists("s:netrw_glob_escape")
- let s:netrw_glob_escape= '[]*?`{~$'
+if !exists("g:netrw_tmpfile_escape")
+ let g:netrw_tmpfile_escape= ' &;'
endif
" BufEnter event ignored by decho when following variable is true
@@ -375,68 +373,6 @@ endif
" ==============================
" ------------------------------------------------------------------------
-" netrw#NetrwSavePosn: saves position of cursor on screen {{{2
-fun! netrw#NetrwSavePosn()
-" call Dfunc("netrw#NetrwSavePosn()")
- " Save current line and column
- let w:netrw_winnr= winnr()
- let w:netrw_line = line(".")
- let w:netrw_col = virtcol(".")
-
- " Save top-of-screen line
- norm! H0
- let w:netrw_hline= line(".")
-
- " set up string holding position parameters
- let ret = "let w:netrw_winnr=".w:netrw_winnr."|let w:netrw_line=".w:netrw_line."|let w:netrw_col=".w:netrw_col."|let w:netrw_hline=".w:netrw_hline
-
- call netrw#NetrwRestorePosn()
-" call Dret("netrw#NetrwSavePosn : winnr=".w:netrw_winnr." line=".w:netrw_line." col=".w:netrw_col." hline=".w:netrw_hline)
- return ret
-endfun
-
-" ------------------------------------------------------------------------
-" netrw#NetrwRestorePosn: restores the cursor and file position as saved by NetrwSavePosn() {{{2
-fun! netrw#NetrwRestorePosn(...)
-" call Dfunc("netrw#NetrwRestorePosn() a:0=".a:0." winnr=".(exists("w:netrw_winnr")? w:netrw_winnr : -1)." line=".(exists("w:netrw_line")? w:netrw_line : -1)." col=".(exists("w:netrw_col")? w:netrw_col : -1)." hline=".(exists("w:netrw_hline")? w:netrw_hline : -1))
- let eikeep= &ei
- set ei=all
- if expand("%") == "NetrwMessage"
- exe s:winBeforeErr."wincmd w"
- endif
-
- if a:0 > 0
- exe a:1
- endif
-
- " restore window
- if exists("w:netrw_winnr")
-" call Decho("restore window: exe silent! ".w:netrw_winnr."wincmd w")
- exe "silent! ".w:netrw_winnr."wincmd w"
- endif
- if v:shell_error == 0
- " as suggested by Bram M: redraw on no error
- " allows protocol error messages to remain visible
- redraw!
- endif
-
- " restore top-of-screen line
- if exists("w:netrw_hline")
-" call Decho("restore topofscreen: exe norm! ".w:netrw_hline."G0z")
- exe "norm! ".w:netrw_hline."G0z\<CR>"
- endif
-
- " restore position
- if exists("w:netrw_line") && exists("w:netrw_col")
-" call Decho("restore posn: exe norm! ".w:netrw_line."G0".w:netrw_col."|")
- exe "norm! ".w:netrw_line."G0".w:netrw_col."\<bar>"
- endif
-
- let &ei= eikeep
-" call Dret("netrw#NetrwRestorePosn")
-endfun
-
-" ---------------------------------------------------------------------
" s:NetrwOptionSave: save options and set to "standard" form {{{2
" 06/08/07 : removed call to NetrwSafeOptions(), either placed
" immediately after NetrwOptionSave() calls in NetRead
@@ -444,7 +380,7 @@ endfun
" NetrwBrowse.
" vt: normally its "w:" or "s:" (a variable type)
fun! s:NetrwOptionSave(vt)
-" call Dfunc("s:NetrwOptionSave(vt<".a:vt.">) win#".winnr()." buf#".bufnr(".")."<".bufname(bufnr(".")).">")
+" call Dfunc("s:NetrwOptionSave(vt<".a:vt.">) win#".winnr()." buf#".bufnr("%")."<".bufname(bufnr("%")).">")
" call Decho(a:vt."netrw_optionsave".(exists("{a:vt}netrw_optionsave")? ("=".{a:vt}netrw_optionsave) : " doesn't exist"))
if !exists("{a:vt}netrw_optionsave")
@@ -484,14 +420,15 @@ fun! s:NetrwOptionSave(vt)
if &go =~ 'a' | silent! let {a:vt}netrw_regstar = @* | endif
silent! let {a:vt}netrw_regslash= @/
-" call Dret("s:NetrwOptionSave : win#".winnr()." buf#".bufnr("."))
+" call Dret("s:NetrwOptionSave : win#".winnr()." buf#".bufnr("%"))
endfun
" ------------------------------------------------------------------------
" s:NetrwOptionRestore: restore options {{{2
fun! s:NetrwOptionRestore(vt)
-" call Dfunc("s:NetrwOptionRestore(vt<".a:vt.">) win#".winnr()." buf#".bufnr("."))
+" call Dfunc("s:NetrwOptionRestore(vt<".a:vt.">) win#".winnr()." buf#".bufnr("%"))
if !exists("{a:vt}netrw_optionsave")
+" call Decho("ro=".&ro." ma=".&ma." mod=".&mod." wrap=".&wrap)
" call Dret("s:NetrwOptionRestore : ".a:vt."netrw_optionsave doesn't exist")
return
endif
@@ -504,8 +441,14 @@ fun! s:NetrwOptionRestore(vt)
let &l:acd = {a:vt}netrw_acdkeep
unlet {a:vt}netrw_acdkeep
if &l:acd
-" call Decho("exe cd ".escape(curdir,g:netrw_fname_escape))
- exe "cd ".escape(curdir,g:netrw_fname_escape)
+" call Decho("exe lcd ".fnameescape(curdir)) " NOTE: was g:netrw_fname_escape for some reason
+ try
+ if !exists("&l:acd") && !&l:acd
+ exe '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
@@ -518,8 +461,7 @@ fun! s:NetrwOptionRestore(vt)
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") && isdirectory({a:vt}netrw_dirkeep) && g:netrw_keepdir
let dirkeep = substitute({a:vt}netrw_dirkeep,'\\','/','g')
- let dirkeep = escape(dirkeep,g:netrw_cd_escape)
- if exists("{a:vt}netrw_dirkeep") |exe "lcd ".dirkeep|unlet {a:vt}netrw_dirkeep |endif
+ if exists("{a:vt}netrw_dirkeep") |exe "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
@@ -547,16 +489,17 @@ fun! s:NetrwOptionRestore(vt)
endif
if exists("{a:vt}netrw_regstar") |silent! let @*= {a:vt}netrw_regstar |unlet {a:vt}netrw_regstar |endif
if exists("{a:vt}netrw_regslash")|silent! let @/= {a:vt}netrw_regslash|unlet {a:vt}netrw_regslash|endif
-" call Decho("g:netrw_keepdir=".g:netrw_keepdir.": getcwd<".getcwd()."> acd=".&acd)
+" call Decho("g:netrw_keepdir=".g:netrw_keepdir.": getcwd<".getcwd()."> acd=".&acd)
" call Decho("fo=".&fo.(exists("&acd")? " acd=".&acd : " acd doesn't exist"))
-" call Dret("s:NetrwOptionRestore : win#".winnr()." buf#".bufnr("."))
+" call Decho("ro=".&ro." ma=".&ma." mod=".&mod." wrap=".&wrap)
+" call Dret("s:NetrwOptionRestore : win#".winnr()." buf#".bufnr("%"))
endfun
" ---------------------------------------------------------------------
" s:NetrwSafeOptions: sets options to help netrw do its job {{{2
fun! s:NetrwSafeOptions()
-" call Dfunc("s:NetrwSafeOptions() win#".winnr()." buf#".bufnr(".")."<".bufname(bufnr(".")).">")
+" call Dfunc("s:NetrwSafeOptions() win#".winnr()." buf#".bufnr("%")."<".bufname(bufnr("%")).">")
" call Decho("window's ft=".&ft)
setlocal cino=
setlocal com=
@@ -693,10 +636,10 @@ fun! netrw#NetRead(mode,...)
" call Decho("reconstructing choice")
if match(choice,'"$') != -1
" case "..."
- let choice=strpart(choice,1,s:Strlen(choice)-2)
+ let choice=strpart(choice,1,strlen(choice)-2)
else
" case "... ... ..."
- let choice = strpart(choice,1,s:Strlen(choice)-1)
+ let choice = strpart(choice,1,strlen(choice)-1)
let wholechoice = ""
while match(choice,'"$') == -1
@@ -711,7 +654,7 @@ fun! netrw#NetRead(mode,...)
endif
let choice= a:{ichoice}
endwhile
- let choice= strpart(wholechoice,1,s:Strlen(wholechoice)-1) . " " . strpart(choice,0,s:Strlen(choice)-1)
+ let choice= strpart(wholechoice,1,strlen(wholechoice)-1) . " " . strpart(choice,0,strlen(choice)-1)
endif
endif
endif
@@ -761,8 +704,8 @@ fun! netrw#NetRead(mode,...)
let uid_machine = g:netrw_machine
endif
endif
-" call Decho("executing: !".g:netrw_rcp_cmd." ".s:netrw_rcpmode." ".uid_machine.":".escape(b:netrw_fname,' ?&;')." ".tmpfile)
- exe g:netrw_silentxfer."!".g:netrw_rcp_cmd." ".s:netrw_rcpmode." ".uid_machine.":".escape(b:netrw_fname,' ?&;')." ".tmpfile
+" call Decho("executing: !".g:netrw_rcp_cmd." ".s:netrw_rcpmode." ".shellescape(uid_machine.":".escape(b:netrw_fname,' ?&;')." ".tmpfile)
+ exe s:netrw_silentxfer."!".g:netrw_rcp_cmd." ".s:netrw_rcpmode." ".shellescape(uid_machine.":".escape(b:netrw_fname,' ?&;')." ".tmpfile)
let result = s:NetrwGetFile(readcmd, tmpfile, b:netrw_method)
let b:netrw_lastfile = choice
@@ -774,19 +717,19 @@ fun! netrw#NetRead(mode,...)
call s:SaveBufVars()|new|call s:RestoreBufVars()
setlocal ff=unix
exe "put ='".g:netrw_ftpmode."'"
-" call Decho("filter input: ".getline("."))
+" call Decho("filter input: ".getline('.'))
if exists("g:netrw_ftpextracmd")
exe "put ='".g:netrw_ftpextracmd."'"
-" call Decho("filter input: ".getline("."))
+" call Decho("filter input: ".getline('.'))
endif
exe "put ='".'get \"'.netrw_fname.'\" '.tmpfile."'"
-" call Decho("filter input: ".getline("."))
+" call Decho("filter input: ".getline('.'))
if exists("g:netrw_port") && g:netrw_port != ""
" call Decho("executing: %!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port)
- exe g:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port
+ exe s:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port
else
" call Decho("executing: %!".g:netrw_ftp_cmd." -i ".g:netrw_machine)
- exe g:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".g:netrw_machine
+ exe s:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".g:netrw_machine
endif
" If the result of the ftp operation isn't blank, show an error message (tnx to Doug Claar)
if getline(1) !~ "^$" && !exists("g:netrw_quiet") && getline(1) !~ '^Trying '
@@ -809,32 +752,32 @@ fun! netrw#NetRead(mode,...)
setlocal ff=unix
if exists("g:netrw_port") && g:netrw_port != ""
put ='open '.g:netrw_machine.' '.g:netrw_port
-" call Decho("filter input: ".getline("."))
+" call Decho("filter input: ".getline('.'))
else
put ='open '.g:netrw_machine
-" call Decho("filter input: ".getline("."))
+" call Decho("filter input: ".getline('.'))
endif
if exists("g:netrw_ftp") && g:netrw_ftp == 1
put =g:netrw_uid
-" call Decho("filter input: ".getline("."))
+" call Decho("filter input: ".getline('.'))
put ='\"'.s:netrw_passwd.'\"'
-" call Decho("filter input: ".getline("."))
+" call Decho("filter input: ".getline('.'))
else
put ='user \"'.g:netrw_uid.'\" \"'.s:netrw_passwd.'\"'
-" call Decho("filter input: ".getline("."))
+" call Decho("filter input: ".getline('.'))
endif
if exists("g:netrw_ftpmode") && g:netrw_ftpmode != ""
put =g:netrw_ftpmode
-" call Decho("filter input: ".getline("."))
+" call Decho("filter input: ".getline('.'))
endif
if exists("g:netrw_ftpextracmd")
exe "put ='".g:netrw_ftpextracmd."'"
-" call Decho("filter input: ".getline("."))
+" call Decho("filter input: ".getline('.'))
endif
put ='get \"'.netrw_fname.'\" '.tmpfile
-" call Decho("filter input: ".getline("."))
+" call Decho("filter input: ".getline('.'))
" perform ftp:
" -i : turns off interactive prompting from ftp
@@ -842,7 +785,7 @@ fun! netrw#NetRead(mode,...)
" -n win32: quit being obnoxious about password
norm! 1Gdd
" call Decho("executing: %!".g:netrw_ftp_cmd." -i -n")
- exe g: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)
if getline(1) !~ "^$"
" call Decho("error<".getline(1).">")
@@ -863,8 +806,8 @@ fun! netrw#NetRead(mode,...)
else
let useport= ""
endif
-" call Decho("executing: !".g:netrw_scp_cmd.useport." '".g:netrw_machine.":".escape(b:netrw_fname,g:netrw_fname_escape)."' ".tmpfile)
- exe g:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".g:netrw_shq.g:netrw_machine.":".escape(b:netrw_fname,g:netrw_fname_escape).g:netrw_shq." ".tmpfile
+" call Decho("exe s:netrw_silentxfer.!".g:netrw_scp_cmd.useport." ".shellescape(g:netrw_machine.":".escape(b:netrw_fname,g:netrw_fname_escape))." ".tmpfile)
+ exe s:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".shellescape(g:netrw_machine.":".escape(b:netrw_fname,g:netrw_fname_escape))." ".tmpfile
let result = s:NetrwGetFile(readcmd, tmpfile, b:netrw_method)
let b:netrw_lastfile = choice
@@ -880,21 +823,23 @@ fun! netrw#NetRead(mode,...)
return
endif
+ let netrw_fname= escape(b:netrw_fname,g:netrw_fname_escape)
if match(b:netrw_fname,"#") == -1
" simple wget
- let netrw_fname= escape(b:netrw_fname,g:netrw_fname_escape)
-" call Decho("executing: !".g:netrw_http_cmd." ".tmpfile." http://".g:netrw_machine.netrw_fname)
- exe g:netrw_silentxfer."!".g:netrw_http_cmd." ".tmpfile." http://".g:netrw_machine.netrw_fname
+" call Decho('using simple wget (# not in b:netrw_fname<'.b:netrw_fname.">)")
+" call Decho("exe ".s:netrw_silentxfer."!".g:netrw_http_cmd." ".shellescape(tmpfile)." ".shellescape("http://".g:netrw_machine.netrw_fname))
+ exe s:netrw_silentxfer."!".g:netrw_http_cmd." ".shellescape(tmpfile)." ".shellescape("http://".g:netrw_machine.netrw_fname)
let result = s:NetrwGetFile(readcmd, tmpfile, b:netrw_method)
else
" wget plus a jump to an in-page marker (ie. http://abc/def.html#aMarker)
+" call Decho(("wget/curl plus jump (# in b:netrw_fname<".b:netrw_fname.">)")
let netrw_html= substitute(netrw_fname,"#.*$","","")
let netrw_tag = substitute(netrw_fname,"^.*#","","")
" call Decho("netrw_html<".netrw_html.">")
" call Decho("netrw_tag <".netrw_tag.">")
-" call Decho("executing: !".g:netrw_http_cmd." ".tmpfile." http://".g:netrw_machine.netrw_html)
- exe g:netrw_silentxfer."!".g:netrw_http_cmd." ".tmpfile." http://".g:netrw_machine.netrw_html
+" call Decho("exe ".s:netrw_silentxfer."!".g:netrw_http_cmd." ".shellescape(tmpfile)." ".shellescape("http://".g:netrw_machine.netrw_html))
+ exe s:netrw_silentxfer."!".g:netrw_http_cmd." ".shellescape(tmpfile)." ".shellescape("http://".g:netrw_machine.netrw_html)
let result = s:NetrwGetFile(readcmd, tmpfile, b:netrw_method)
" call Decho('<\s*a\s*name=\s*"'.netrw_tag.'"/')
exe 'norm! 1G/<\s*a\s*name=\s*"'.netrw_tag.'"/'."\<CR>"
@@ -923,7 +868,7 @@ fun! netrw#NetRead(mode,...)
" perform cadaver operation:
norm! 1Gdd
" call Decho("executing: %!".g:netrw_dav_cmd)
- exe g:netrw_silentxfer."%!".g:netrw_dav_cmd
+ exe s:netrw_silentxfer."%!".g:netrw_dav_cmd
bd!
let result = s:NetrwGetFile(readcmd, tmpfile, b:netrw_method)
let b:netrw_lastfile = choice
@@ -933,9 +878,9 @@ fun! netrw#NetRead(mode,...)
elseif b:netrw_method == 7
" call Decho("read via rsync (method #7)")
let netrw_fname= escape(b:netrw_fname,g:netrw_fname_escape)
-" call Decho("executing: !".g:netrw_rsync_cmd." ".g:netrw_machine.":".netrw_fname." ".tmpfile)
- exe g:netrw_silentxfer."!".g:netrw_rsync_cmd." ".g:netrw_machine.":".netrw_fname." ".tmpfile
- let result = s:NetrwGetFile(readcmd,tmpfile, b:netrw_method)
+" call Decho("exe ".s:netrw_silentxfer."!".g:netrw_rsync_cmd." ".shellescape(g:netrw_machine.":".netrw_fname)." ".tmpfile)
+ exe s:netrw_silentxfer."!".g:netrw_rsync_cmd." ".shellescape(g:netrw_machine.":".netrw_fname)." ".tmpfile
+ let result = s:NetrwGetFile(readcmd,tmpfile, b:netrw_method)
let b:netrw_lastfile = choice
".........................................
@@ -958,11 +903,11 @@ fun! netrw#NetRead(mode,...)
" call Decho("read via fetch for ".netrw_option)
if exists("g:netrw_uid") && g:netrw_uid != "" && exists("s:netrw_passwd") && s:netrw_passwd != ""
-" call Decho("executing: !".g:netrw_fetch_cmd." ".tmpfile." ".netrw_option."://".g:netrw_uid.':'.s:netrw_passwd.'@'.g:netrw_machine."/".netrw_fname)
- exe g:netrw_silentxfer."!".g:netrw_fetch_cmd." ".tmpfile." ".netrw_option."://".g:netrw_uid.':'.s:netrw_passwd.'@'.g:netrw_machine."/".netrw_fname
+" call Decho("exe ".s:netrw_silentxfer."!".g:netrw_fetch_cmd." ".tmpfile." ".shellescape(netrw_option."://".g:netrw_uid.':'.s:netrw_passwd.'@'.g:netrw_machine."/".netrw_fname))
+ exe s:netrw_silentxfer."!".g:netrw_fetch_cmd." ".tmpfile." ".shellescape(netrw_option."://".g:netrw_uid.':'.s:netrw_passwd.'@'.g:netrw_machine."/".netrw_fname)
else
-" call Decho("executing: !".g:netrw_fetch_cmd." ".tmpfile." ".netrw_option."://".g:netrw_machine."/".netrw_fname)
- exe g:netrw_silentxfer."!".g:netrw_fetch_cmd." ".tmpfile." ".netrw_option."://".g:netrw_machine."/".netrw_fname
+" call Decho("exe ".s:netrw_silentxfer."!".g:netrw_fetch_cmd." ".tmpfile." ".shellescape(netrw_option."://".g:netrw_machine."/".netrw_fname))
+ exe s:netrw_silentxfer."!".g:netrw_fetch_cmd." ".tmpfile." ".shellescape(netrw_option."://".g:netrw_machine."/".netrw_fname)
endif
let result = s:NetrwGetFile(readcmd,tmpfile, b:netrw_method)
@@ -974,8 +919,8 @@ fun! netrw#NetRead(mode,...)
elseif b:netrw_method == 9
" call Decho("read via sftp (method #9)")
let netrw_fname= escape(b:netrw_fname,g:netrw_fname_escape)
-" call Decho("executing: !".g:netrw_sftp_cmd." ".g:netrw_machine.":".netrw_fname." ".tmpfile)
- exe g:netrw_silentxfer."!".g:netrw_sftp_cmd." ".g:netrw_machine.":".netrw_fname." ".tmpfile
+" call Decho("exe ".s:netrw_silentxfer."!".g:netrw_sftp_cmd." ".shellescape(g:netrw_machine.":".netrw_fname)." ".tmpfile)
+ exe s:netrw_silentxfer."!".g:netrw_sftp_cmd." ".shellescape(g:netrw_machine.":".netrw_fname)." ".tmpfile
let result = s:NetrwGetFile(readcmd, tmpfile, b:netrw_method)
let b:netrw_lastfile = choice
@@ -994,7 +939,7 @@ fun! netrw#NetRead(mode,...)
endif
if s:FileReadable(tmpfile) && tmpfile !~ '.tar.bz2$' && tmpfile !~ '.tar.gz$' && tmpfile !~ '.zip' && tmpfile !~ '.tar' && readcmd != 't'
" call Decho("cleanup by deleting tmpfile<".tmpfile.">")
- call s:System("delete",tmpfile)
+ call s:System("delete",fnameescape(tmpfile))
endif
call s:NetrwOptionRestore("w:")
@@ -1081,10 +1026,10 @@ fun! netrw#NetWrite(...) range
elseif match(choice,"^\"") != -1
if match(choice,"\"$") != -1
" case "..."
- let choice=strpart(choice,1,s:Strlen(choice)-2)
+ let choice=strpart(choice,1,strlen(choice)-2)
else
" case "... ... ..."
- let choice = strpart(choice,1,s:Strlen(choice)-1)
+ let choice = strpart(choice,1,strlen(choice)-1)
let wholechoice = ""
while match(choice,"\"$") == -1
@@ -1099,7 +1044,7 @@ fun! netrw#NetWrite(...) range
endif
let choice= a:{ichoice}
endwhile
- let choice= strpart(wholechoice,1,s:Strlen(wholechoice)-1) . " " . strpart(choice,0,s:Strlen(choice)-1)
+ let choice= strpart(wholechoice,1,strlen(wholechoice)-1) . " " . strpart(choice,0,strlen(choice)-1)
endif
endif
endif
@@ -1114,6 +1059,7 @@ fun! netrw#NetWrite(...) range
" ============================
if exists("g:netrw_silent") && g:netrw_silent == 0 && &ch >= 1
echo "(netrw) Processing your write request..."
+" call Decho("(netrw) Processing your write request...")
endif
".........................................
@@ -1134,8 +1080,8 @@ fun! netrw#NetWrite(...) range
endif
endif
let netrw_fname= escape(b:netrw_fname,g:netrw_fname_escape)
-" call Decho("executing: !".g:netrw_rcp_cmd." ".s:netrw_rcpmode." ".g:netrw_shq.tmpfile.g:netrw_shq." ".uid_machine.":".netrw_fname)
- exe g:netrw_silentxfer."!".g:netrw_rcp_cmd." ".s:netrw_rcpmode." ".g:netrw_shq.tmpfile.g:netrw_shq." ".uid_machine.":".netrw_fname
+" call Decho("executing: !".g:netrw_rcp_cmd." ".s:netrw_rcpmode." ".shellescape(tmpfile)." ".shellescape(uid_machine.":".netrw_fname))
+ exe s:netrw_silentxfer."!".g:netrw_rcp_cmd." ".s:netrw_rcpmode." ".shellescape(tmpfile)." ".shellescape(uid_machine.":".netrw_fname)
let b:netrw_lastfile = choice
".........................................
@@ -1144,21 +1090,23 @@ fun! netrw#NetWrite(...) range
" call Decho("write via ftp+.netrc (method #2)")
let netrw_fname= b:netrw_fname
new
+" call Decho("filter input window#".winnr())
setlocal ff=unix
exe "put ='".g:netrw_ftpmode."'"
-" call Decho(" filter input: ".getline("."))
+" call Decho("filter input: ".getline('.'))
if exists("g:netrw_ftpextracmd")
exe "put ='".g:netrw_ftpextracmd."'"
-" call Decho("filter input: ".getline("."))
+" call Decho("filter input: ".getline('.'))
endif
exe "put ='".'put \"'.tmpfile.'\" \"'.netrw_fname.'\"'."'"
-" call Decho(" filter input: ".getline("."))
+" call Decho("filter input: ".getline('.'))
if exists("g:netrw_port") && g:netrw_port != ""
" call Decho("executing: %!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port)
- exe g:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port
+ exe s:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port
else
+" call Decho("filter input window#".winnr())
" call Decho("executing: %!".g:netrw_ftp_cmd." -i ".g:netrw_machine)
- exe g:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".g:netrw_machine
+ exe s:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".g:netrw_machine
endif
" If the result of the ftp operation isn't blank, show an error message (tnx to Doug Claar)
if getline(1) !~ "^$"
@@ -1180,22 +1128,22 @@ fun! netrw#NetWrite(...) range
setlocal ff=unix
if exists("g:netrw_port") && g:netrw_port != ""
put ='open '.g:netrw_machine.' '.g:netrw_port
-" call Decho("filter input: ".getline("."))
+" call Decho("filter input: ".getline('.'))
else
put ='open '.g:netrw_machine
-" call Decho("filter input: ".getline("."))
+" call Decho("filter input: ".getline('.'))
endif
if exists("g:netrw_ftp") && g:netrw_ftp == 1
put =g:netrw_uid
-" call Decho("filter input: ".getline("."))
+" call Decho("filter input: ".getline('.'))
put ='\"'.s:netrw_passwd.'\"'
-" call Decho("filter input: ".getline("."))
+" call Decho("filter input: ".getline('.'))
else
put ='user \"'.g:netrw_uid.'\" \"'.s:netrw_passwd.'\"'
-" call Decho("filter input: ".getline("."))
+" call Decho("filter input: ".getline('.'))
endif
put ='put \"'.tmpfile.'\" \"'.netrw_fname.'\"'
-" call Decho("filter input: ".getline("."))
+" call Decho("filter input: ".getline('.'))
" save choice/id/password for future use
let b:netrw_lastfile = choice
@@ -1205,7 +1153,7 @@ fun! netrw#NetWrite(...) range
" -n win32: quit being obnoxious about password
norm! 1Gdd
" call Decho("executing: %!".g:netrw_ftp_cmd." -i -n")
- exe g: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)
if getline(1) !~ "^$"
if !exists("g:netrw_quiet")
@@ -1225,8 +1173,8 @@ fun! netrw#NetWrite(...) range
else
let useport= ""
endif
-" call Decho("exe ".g:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".g:netrw_shq.tmpfile.g:netrw_shq." ".g:netrw_shq.g:netrw_machine.":".netrw_fname.g:netrw_shq)
- exe g:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".g:netrw_shq.tmpfile.g:netrw_shq." ".g:netrw_shq.g:netrw_machine.":".netrw_fname.g:netrw_shq
+" call Decho("exe ".s:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".shellescape(tmpfile)." ".shellescape(g:netrw_machine.":".netrw_fname))
+ exe s:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".shellescape(tmpfile)." ".shellescape(g:netrw_machine.":".netrw_fname)
let b:netrw_lastfile = choice
".........................................
@@ -1251,13 +1199,15 @@ fun! netrw#NetWrite(...) range
else
put ='open '.g:netrw_machine
endif
- put ='user '.g:netrw_uid.' '.s:netrw_passwd
+ if exists("g:netrw_uid") && exists("s:netrw_passwd")
+ put ='user '.g:netrw_uid.' '.s:netrw_passwd
+ endif
put ='put '.tmpfile.' '.netrw_fname
" perform cadaver operation:
norm! 1Gdd
" call Decho("executing: %!".g:netrw_dav_cmd)
- exe g:netrw_silentxfer."%!".g:netrw_dav_cmd
+ exe s:netrw_silentxfer."%!".g:netrw_dav_cmd
bd!
let b:netrw_lastfile = choice
@@ -1267,7 +1217,7 @@ fun! netrw#NetWrite(...) range
" call Decho("write via rsync (method #7)")
let netrw_fname= escape(b:netrw_fname,g:netrw_fname_escape)
" call Decho("executing: !".g:netrw_rsync_cmd." ".tmpfile." ".g:netrw_machine.":".netrw_fname)
- exe g:netrw_silentxfer."!".g:netrw_rsync_cmd." ".tmpfile." ".g:netrw_machine.":".netrw_fname
+ exe s:netrw_silentxfer."!".g:netrw_rsync_cmd." ".tmpfile." ".g:netrw_machine.":".netrw_fname
let b:netrw_lastfile = choice
".........................................
@@ -1283,10 +1233,10 @@ fun! netrw#NetWrite(...) range
new
setlocal ff=unix
put ='put \"'.escape(tmpfile,'\').'\" '.netrw_fname
-" call Decho("filter input: ".getline("."))
+" call Decho("filter input: ".getline('.'))
norm! 1Gdd
" call Decho("executing: %!".g:netrw_sftp_cmd.' '.uid_machine)
- exe g:netrw_silentxfer."%!".g:netrw_sftp_cmd.' '.uid_machine
+ exe s:netrw_silentxfer."%!".g:netrw_sftp_cmd.' '.uid_machine
bd!
let b:netrw_lastfile= choice
@@ -1362,6 +1312,7 @@ fun! s:NetrwGetFile(readcmd, tfile, method)
" readcmd=='t': simply do nothing
if a:readcmd == 't'
+" call Decho("ro=".&ro." ma=".&ma." mod=".&mod." wrap=".&wrap)
" call Dret("NetrwGetFile : skip read of <".a:tfile.">")
return
endif
@@ -1385,8 +1336,8 @@ fun! s:NetrwGetFile(readcmd, tfile, method)
else
let tfile= a:tfile
endif
-" call Decho("keepalt exe file ".tfile)
- keepalt exe "silent! keepalt file ".tfile
+" " call Decho("exe silent! keepalt file ".tfile)
+ exe "silent! keepalt file ".tfile
" edit temporary file (ie. read the temporary file in)
if rfile =~ '\.zip$'
@@ -1407,8 +1358,13 @@ fun! s:NetrwGetFile(readcmd, tfile, method)
endif
" rename buffer back to remote filename
+" call Decho("exe silent! keepalt file ".escape(rfile,' '))
exe "silent! keepalt file ".escape(rfile,' ')
- filetype detect
+ if a:method == 5
+ set ft=html
+ else
+ filetype detect
+ endif
" call Dredir("renamed buffer back to remote filename<".rfile."> : expand(%)<".expand("%").">","ls!")
let line1 = 1
let line2 = line("$")
@@ -1425,6 +1381,7 @@ fun! s:NetrwGetFile(readcmd, tfile, method)
else
" not readable
+" call Decho("ro=".&ro." ma=".&ma." mod=".&mod." wrap=".&wrap)
" call Decho("tfile<".a:tfile."> not readable")
call netrw#ErrorMsg(s:WARNING,"file <".a:tfile."> not readable",9)
" call Dret("NetrwGetFile : tfile<".a:tfile."> not readable")
@@ -1439,15 +1396,17 @@ fun! s:NetrwGetFile(readcmd, tfile, method)
" call Decho("NetReadFixup() not called, doesn't exist (line1=".line1." line2=".line2.")")
endif
- " update the Buffers menu
- if has("gui") && has("gui_running")
- silent! emenu Buffers.Refresh\ menu
+ if has("gui") && has("menu") && has("gui_running") && &go =~ 'm'
+ " update the Buffers menu
+ call s:UpdateBuffersMenu()
endif
" call Decho("readcmd<".a:readcmd."> cmdarg<".v:cmdarg."> tfile<".a:tfile."> readable=".s:FileReadable(a:tfile))
" make sure file is being displayed
- redraw!
+" redraw!
+
+" call Decho("ro=".&ro." ma=".&ma." mod=".&mod." wrap=".&wrap)
" call Dret("NetrwGetFile")
endfun
@@ -1480,7 +1439,7 @@ fun! s:NetrwMethod(choice) " globals: method machine id passwd fname
" rcphf : [user@]host:filename Use rcp
" scpurm : scp://[user@]host[[#:]port]/filename Use scp
" httpurm : http://[user@]host/filename Use wget
- " davurm : [s]dav://host[:port]/path Use cadaver
+ " davurm : dav[s]://host[:port]/path Use cadaver
" rsyncurm : rsync://host[:port]/path Use rsync
" fetchurm : fetch://[user@]host[:http]/filename Use fetch (defaults to ftp, override for http)
" sftpurm : sftp://[user@]host/filename Use scp
@@ -1491,7 +1450,7 @@ fun! s:NetrwMethod(choice) " globals: method machine id passwd fname
let rcphf = '^\(\(\h\w*\)@\)\=\(\h\w*\):\([^@]\+\)$'
let scpurm = '^scp://\([^/#:]\+\)\%([#:]\(\d\+\)\)\=/\(.*\)$'
let httpurm = '^http://\([^/]\{-}\)\(/.*\)\=$'
- let davurm = '^s\=dav://\([^/]\+\)/\(.*/\)\([-_.~[:alnum:]]\+\)$'
+ let davurm = '^davs\=://\([^/]\+\)/\(.*/\)\([-_.~[:alnum:]]\+\)$'
let rsyncurm = '^rsync://\([^/]\{-}\)/\(.*\)\=$'
let fetchurm = '^fetch://\(\([^/@]\{-}\)@\)\=\([^/#:]\{-}\)\(:http\)\=/\(.*\)$'
let sftpurm = '^sftp://\([^/]\{-}\)/\(.*\)\=$'
@@ -1609,10 +1568,10 @@ fun! s:NetrwMethod(choice) " globals: method machine id passwd fname
" Issue an rcp: hostname:filename" (this one should be last)
elseif match(a:choice,rcphf) == 0
" call Decho("(rcp) [user@]host:file) rcphf<".rcphf.">")
- let b:netrw_method = 1
- let userid = substitute(a:choice,rcphf,'\2',"")
- let g:netrw_machine= substitute(a:choice,rcphf,'\3',"")
- let b:netrw_fname = substitute(a:choice,rcphf,'\4',"")
+ let b:netrw_method = 1
+ let userid = substitute(a:choice,rcphf,'\2',"")
+ let g:netrw_machine = substitute(a:choice,rcphf,'\3',"")
+ let b:netrw_fname = substitute(a:choice,rcphf,'\4',"")
" call Decho('\1<'.substitute(a:choice,rcphf,'\1',"").">")
" call Decho('\2<'.substitute(a:choice,rcphf,'\2',"").">")
" call Decho('\3<'.substitute(a:choice,rcphf,'\3',"").">")
@@ -1713,23 +1672,30 @@ fun! s:BrowserMaps(islocal)
nnoremap <buffer> <silent> md :<c-u>call <SID>NetrwMarkFileDiff(1)<cr>
nnoremap <buffer> <silent> me :<c-u>call <SID>NetrwMarkFileEdit(1)<cr>
nnoremap <buffer> <silent> mf :<c-u>call <SID>NetrwMarkFile(1,<SID>NetrwGetWord())<cr>
+ nnoremap <buffer> <silent> mg :<c-u>call <SID>NetrwMarkFileGrep(1)<cr>
+ nnoremap <buffer> <silent> mh :<c-u>call <SID>NetrwMarkHideSfx(1)<cr>
nnoremap <buffer> <silent> mm :<c-u>call <SID>NetrwMarkFileMove(1)<cr>
nnoremap <buffer> <silent> mp :<c-u>call <SID>NetrwMarkFilePrint(1)<cr>
nnoremap <buffer> <silent> mr :<c-u>call <SID>NetrwMarkFileRegexp(1)<cr>
+ nnoremap <buffer> <silent> ms :<c-u>call <SID>NetrwMarkFileSource(1)<cr>
nnoremap <buffer> <silent> mT :<c-u>call <SID>NetrwMarkFileTag(1)<cr>
nnoremap <buffer> <silent> mt :<c-u>call <SID>NetrwMarkFileTgt(1)<cr>
+ nnoremap <buffer> <silent> mu :<c-u>call <SID>NetrwUnMarkFile(1)<cr>
nnoremap <buffer> <silent> mx :<c-u>call <SID>NetrwMarkFileExe(1)<cr>
nnoremap <buffer> <silent> mz :<c-u>call <SID>NetrwMarkFileCompress(1)<cr>
nnoremap <buffer> <silent> gb :<c-u>call <SID>NetrwBookmarkDir(1,b:netrw_curdir)<cr>
- nnoremap <buffer> <silent> c :exe "cd ".escape(b:netrw_curdir,g:netrw_cd_escape)<cr>
+ nnoremap <buffer> <silent> gh :<c-u>call <SID>NetrwHidden(1)<cr>
+ nnoremap <buffer> <silent> c :exe "lcd ".fnameescape(b:netrw_curdir)<cr>
nnoremap <buffer> <silent> C :let g:netrw_chgwin= winnr()<cr>
nnoremap <buffer> <silent> d :call <SID>NetrwMakeDir("")<cr>
nnoremap <buffer> <silent> i :call <SID>NetrwListStyle(1)<cr>
nnoremap <buffer> <silent> o :call <SID>NetrwSplit(3)<cr>
- nnoremap <buffer> <silent> O :call <SID>NetrwObtain(0)<cr>
+ nnoremap <buffer> <silent> O :call <SID>NetrwObtain(1)<cr>
nnoremap <buffer> <silent> p :call <SID>NetrwPreview(<SID>NetrwBrowseChgDir(1,<SID>NetrwGetWord(),1))<cr>
nnoremap <buffer> <silent> P :call <SID>NetrwPrevWinOpen(1)<cr>
- nnoremap <buffer> <silent> q :<c-u>call <SID>NetrwBookmarkDir(2,b:netrw_curdir)<cr>
+ nnoremap <buffer> <silent> qb :<c-u>call <SID>NetrwBookmarkDir(2,b:netrw_curdir)<cr>
+ nnoremap <buffer> <silent> mB :<c-u>call <SID>NetrwBookmarkDir(6,b:netrw_curdir)<cr>
+ nnoremap <buffer> <silent> qf :<c-u>call <SID>NetrwFileInfo(1,<SID>NetrwGetWord())<cr>
nnoremap <buffer> <silent> r :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>
nnoremap <buffer> <silent> s :call <SID>NetrwSortStyle(1)<cr>
nnoremap <buffer> <silent> S :call <SID>NetSortSequence(1)<cr>
@@ -1779,21 +1745,28 @@ fun! s:BrowserMaps(islocal)
nnoremap <buffer> <silent> md :<c-u>call <SID>NetrwMarkFileDiff(0)<cr>
nnoremap <buffer> <silent> me :<c-u>call <SID>NetrwMarkFileEdit(0)<cr>
nnoremap <buffer> <silent> mf :<c-u>call <SID>NetrwMarkFile(0,<SID>NetrwGetWord())<cr>
+ nnoremap <buffer> <silent> mg :<c-u>call <SID>NetrwMarkFileGrep(0)<cr>
+ nnoremap <buffer> <silent> mh :<c-u>call <SID>NetrwMarkHideSfx(0)<cr>
nnoremap <buffer> <silent> mm :<c-u>call <SID>NetrwMarkFileMove(0)<cr>
nnoremap <buffer> <silent> mp :<c-u>call <SID>NetrwMarkFilePrint(0)<cr>
nnoremap <buffer> <silent> mr :<c-u>call <SID>NetrwMarkFileRegexp(0)<cr>
+ nnoremap <buffer> <silent> ms :<c-u>call <SID>NetrwMarkFileSource(0)<cr>
nnoremap <buffer> <silent> mT :<c-u>call <SID>NetrwMarkFileTag(0)<cr>
nnoremap <buffer> <silent> mt :<c-u>call <SID>NetrwMarkFileTgt(0)<cr>
+ nnoremap <buffer> <silent> mu :<c-u>call <SID>NetrwUnMarkFile(0)<cr>
nnoremap <buffer> <silent> mx :<c-u>call <SID>NetrwMarkFileExe(0)<cr>
nnoremap <buffer> <silent> mz :<c-u>call <SID>NetrwMarkFileCompress(0)<cr>
nnoremap <buffer> <silent> gb :<c-u>call <SID>NetrwBookmarkDir(1,b:netrw_cur)<cr>
+ nnoremap <buffer> <silent> gh :<c-u>call <SID>NetrwHidden(0)<cr>
nnoremap <buffer> <silent> C :let g:netrw_chgwin= winnr()<cr>
nnoremap <buffer> <silent> i :call <SID>NetrwListStyle(0)<cr>
nnoremap <buffer> <silent> o :call <SID>NetrwSplit(0)<cr>
nnoremap <buffer> <silent> O :call <SID>NetrwObtain(0)<cr>
nnoremap <buffer> <silent> p :call <SID>NetrwPreview(<SID>NetrwBrowseChgDir(1,<SID>NetrwGetWord(),1))<cr>
nnoremap <buffer> <silent> P :call <SID>NetrwPrevWinOpen(0)<cr>
- nnoremap <buffer> <silent> q :<c-u>call <SID>NetrwBookmarkDir(2,b:netrw_curdir)<cr>
+ nnoremap <buffer> <silent> qb :<c-u>call <SID>NetrwBookmarkDir(2,b:netrw_curdir)<cr>
+ nnoremap <buffer> <silent> mB :<c-u>call <SID>NetrwBookmarkDir(6,b:netrw_curdir)<cr>
+ nnoremap <buffer> <silent> qf :<c-u>call <SID>NetrwFileInfo(0,<SID>NetrwGetWord())<cr>
nnoremap <buffer> <silent> r :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>
nnoremap <buffer> <silent> s :call <SID>NetrwSortStyle(0)<cr>
nnoremap <buffer> <silent> S :call <SID>NetSortSequence(0)<cr>
@@ -1831,36 +1804,228 @@ fun! s:BrowserMaps(islocal)
endfun
" ---------------------------------------------------------------------
+" s:ExplorePatHls: converts an Explore pattern into a regular expression search pattern {{{2
+fun! s:ExplorePatHls(pattern)
+" call Dfunc("s:ExplorePatHls(pattern<".a:pattern.">)")
+ let repat= substitute(a:pattern,'^**/\{1,2}','','')
+" call Decho("repat<".repat.">")
+ let repat= escape(repat,'][.\')
+" call Decho("repat<".repat.">")
+ let repat= '\<'.substitute(repat,'\*','\\(\\S\\+ \\)*\\S\\+','g').'\>'
+" call Dret("s:ExplorePatHls repat<".repat.">")
+ return repat
+endfun
+
+" ---------------------------------------------------------------------
+" s:NetrwBookmarkDir: {{{2
+" 0: (user: <mb>) bookmark current directory
+" 1: (user: <gb>) change to the bookmarked directory
+" 2: (user: <qb>) list bookmarks
+" 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:NetrwBookmarkDir(chg,curdir)
+" call Dfunc("NetrwBookmarkDir(chg=".a:chg." curdir<".a:curdir.">) cnt=".v:count." bookmarkcnt=".g:NETRW_BOOKMARKMAX." histcnt=".g:NETRW_DIRHIST_CNT." bookmax=".g:NETRW_BOOKMARKMAX." histmax=".g:netrw_dirhistmax)
+
+ if a:chg == 0
+ " bookmark the current directory
+" call Decho("(user: <b>) bookmark the current directory")
+ if v:count > 0
+ " handle bookmark# specified via the count
+ let g:NETRW_BOOKMARKDIR_{v:count}= a:curdir
+ if !exists("g:NETRW_BOOKMARKMAX")
+ let g:NETRW_BOOKMARKMAX= v:count
+ elseif v:count > g:NETRW_BOOKMARKMAX
+ let g:NETRW_BOOKMARKMAX= v:count
+ endif
+ else
+ " handle no count specified
+ let g:NETRW_BOOKMARKMAX = g:NETRW_BOOKMARKMAX + 1
+ let g:NETRW_BOOKMARKDIR_{g:NETRW_BOOKMARKMAX} = a:curdir
+ endif
+ echo "bookmarked the current directory"
+
+ elseif a:chg == 1
+ " change to the bookmarked directory
+" call Decho("(user: <B>) change to the bookmarked directory")
+ if exists("g:NETRW_BOOKMARKDIR_{v:count}")
+ exe "e ".g:NETRW_BOOKMARKDIR_{v:count}
+ else
+ echomsg "Sorry, bookmark#".v:count." doesn't exist!"
+ endif
+
+ elseif a:chg == 2
+" redraw!
+ let didwork= 0
+ " list user's bookmarks
+" call Decho("(user: <q>) list user's bookmarks")
+ if exists("g:NETRW_BOOKMARKMAX")
+" call Decho("list bookmarks [0,".g:NETRW_BOOKMARKMAX."]")
+ let cnt= 0
+ while cnt <= g:NETRW_BOOKMARKMAX
+ if exists("g:NETRW_BOOKMARKDIR_{cnt}")
+" call Decho("Netrw Bookmark#".cnt.": ".g:NETRW_BOOKMARKDIR_{cnt})
+ echo "Netrw Bookmark#".cnt.": ".g:NETRW_BOOKMARKDIR_{cnt}
+ let didwork= 1
+ endif
+ let cnt= cnt + 1
+ endwhile
+ endif
+
+ " list directory history
+ let cnt = g:NETRW_DIRHIST_CNT
+ let first = 1
+ let histcnt = 0
+ while ( first || cnt != g:NETRW_DIRHIST_CNT )
+" call Decho("first=".first." cnt=".cnt." dirhist_cnt=".g:NETRW_DIRHIST_CNT)
+ let histcnt= histcnt + 1
+ if exists("g:NETRW_DIRHIST_{cnt}")
+" call Decho("Netrw History#".histcnt.": ".g:NETRW_DIRHIST_{cnt})
+ echo "Netrw History#".histcnt.": ".g:NETRW_DIRHIST_{cnt}
+ let didwork= 1
+ endif
+ let first = 0
+ let cnt = ( cnt - 1 ) % g:netrw_dirhistmax
+ if cnt < 0
+ let cnt= cnt + g:netrw_dirhistmax
+ endif
+ endwhile
+ if didwork
+ call inputsave()|call input("Press <cr> to continue")|call inputrestore()
+ endif
+
+ elseif a:chg == 3
+ " saves most recently visited directories (when they differ)
+" call Decho("(browsing) record curdir history")
+ if !exists("g:NETRW_DIRHIST_0") || g:NETRW_DIRHIST_{g:NETRW_DIRHIST_CNT} != a:curdir
+ let g:NETRW_DIRHIST_CNT= ( g:NETRW_DIRHIST_CNT + 1 ) % g:netrw_dirhistmax
+" let g:NETRW_DIRHIST_{g:NETRW_DIRHIST_CNT}= substitute(a:curdir,'[/\\]$','','e')
+ let g:NETRW_DIRHIST_{g:NETRW_DIRHIST_CNT}= a:curdir
+" call Decho("save dirhist#".g:NETRW_DIRHIST_CNT."<".g:NETRW_DIRHIST_{g:NETRW_DIRHIST_CNT}.">")
+ endif
+
+ elseif a:chg == 4
+ " u: change to the previous directory stored on the history list
+" call Decho("(user: <u>) chg to prev dir from history")
+ 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
+ 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
+ setlocal nomod
+" call Decho("setlocal nomod")
+ endif
+" call Decho("exe e! ".g:NETRW_DIRHIST_{g:NETRW_DIRHIST_CNT})
+ exe "e! ".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
+
+ elseif a:chg == 5
+ " U: change to the subsequent directory stored on the history list
+" call Decho("(user: <U>) chg to next dir from history")
+ let g:NETRW_DIRHIST_CNT= ( g:NETRW_DIRHIST_CNT + 1 ) % g:netrw_dirhistmax
+ 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
+" call Decho("removed all lines from buffer (%d)")
+ setlocal nomod
+" call Decho("setlocal nomod")
+ endif
+" call Decho("exe e! ".g:NETRW_DIRHIST_{g:NETRW_DIRHIST_CNT})
+ exe "e! ".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
+ echo "Sorry, no successor directory exists yet"
+ endif
+
+ elseif a:chg == 6
+ if v:count > 0 && v:count == g:NETRW_BOOKMARKMAX
+ " delete the v:count'th bookmark
+" call Decho("delete bookmark#".v:count."<".g:NETRW_BOOKMARKDIR_{g:NETRW_BOOKMARKMAX}.">")
+ unlet g:NETRW_BOOKMARKDIR_{g:NETRW_BOOKMARKMAX}
+ let g:NETRW_BOOKMARKMAX= g:NETRW_BOOKMARKMAX - 1
+
+ elseif v:count > 0
+" call Decho("delete by shifting bookmark#".v:count."<".g:NETRW_BOOKMARKDIR_{v:count}.">")
+ let cnt= v:count
+ while cnt < g:NETRW_BOOKMARKMAX
+ let g:NETRW_BOOKMARKDIR_{cnt} = g:NETRW_BOOKMARKDIR_{(cnt+1)}
+ let cnt = cnt + 1
+ endwhile
+ unlet g:NETRW_BOOKMARKDIR_{g:NETRW_BOOKMARKMAX}
+ let g:NETRW_BOOKMARKMAX= g:NETRW_BOOKMARKMAX - 1
+
+ elseif exists("b:netrw_curdir")
+ " look for current directory amongst the bookmarks and remove that bookmark
+" call Decho("search for bookmark<".b:netrw_curdir.">")
+ let cnt= 1
+ while cnt <= g:NETRW_BOOKMARKMAX
+" call Decho("checking: g:NETRW_BOOKMARKDIR_".cnt."<".g:NETRW_BOOKMARKDIR_{cnt}.">")
+ if g:NETRW_BOOKMARKDIR_{cnt} == b:netrw_curdir
+ if cnt < g:NETRW_BOOKMARKMAX
+" call Decho("delete bookmark#".cnt."<".b:netrw_curdir.">")
+ while cnt < g:NETRW_BOOKMARMAX
+ let g:NETRW_BOOKMARKDIR_{cnt} = g:NETRW_BOOKMARKDIR_{(cnt+1)}
+ let cnt = cnt + 1
+ endwhile
+ endif
+ unlet g:NETRW_BOOKMARKDIR_{g:NETRW_BOOKMARKMAX}
+ let g:NETRW_BOOKMARKMAX= g:NETRW_BOOKMARKMAX - 1
+ endif
+ let cnt= cnt + 1
+ endwhile
+ endif
+
+ endif
+ call s:NetrwBookmarkMenu()
+" call Dret("NetrwBookmarkDir")
+endfun
+
+" ---------------------------------------------------------------------
" s:NetrwBrowse: This function uses the command in g:netrw_list_cmd to provide a {{{2
" 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("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("%").">")
+" call Decho("tab#".tabpagenr()." win#".winnr())
" call Dredir("ls!")
if exists("s:netrw_skipbrowse")
unlet s:netrw_skipbrowse
-" call Dret("NetrwBrowse : s:netrw_skipbrowse=".s:netrw_skipbrowse)
+" call Decho("ro=".&ro." ma=".&ma." mod=".&mod." wrap=".&wrap)
+" call Dret("s:NetrwBrowse : s:netrw_skipbrowse=".s:netrw_skipbrowse)
return
endif
call s:NetrwOptionSave("w:")
call s:NetrwSafeOptions()
- " clear any marked files
- if exists("s:netrwmarkfilelist")
+ " re-instate any marked files
+ if exists("s:netrwmarkfilelist_{bufnr('%')}")
" call Decho("clearing marked files")
- unlet s:netrwmarkfilelist
- unlet s:netrwmarkfilemtch
- 2match none
+ exe "2match netrwMarkFile /".s:netrwmarkfilemtch_{bufnr("%")}."/"
endif
if a:islocal && exists("w:netrw_acdkeep") && w:netrw_acdkeep
" call Decho("handle w:netrw_acdkeep:")
-" call Decho("cd ".escape(a:dirname,g:netrw_cd_escape)." (due to w:netrw_acdkeep=".w:netrw_acdkeep." - acd=".&acd.")")
- exe 'cd '.escape(a:dirname,g:netrw_cd_escape)
+" call Decho("keepjumps lcd ".fnameescape(a:dirname)." (due to w:netrw_acdkeep=".w:netrw_acdkeep." - acd=".&acd.")")
+ exe 'keepjumps lcd '.fnameescape(a:dirname)
" call Decho("getcwd<".getcwd().">")
elseif !a:islocal && a:dirname !~ '[\/]$' && a:dirname !~ '^"'
@@ -1878,9 +2043,10 @@ fun! s:NetrwBrowse(islocal,dirname)
mark '
call s:NetrwEnew(a:dirname)
setlocal ma noro
+" call Decho("setlocal ma noro")
let b:netrw_curdir= a:dirname
-" call Decho("exe silent! keepalt file ".s:method."://".s:user.s:machine."/".escape(s:path,g:netrw_cd_escape)." (bt=".&bt.")")
- exe "silent! keepalt file ".s:method."://".s:user.s:machine."/".escape(s:path,g:netrw_cd_escape)
+" call Decho("exe silent! keepalt file ".s:method."://".s:user.s:machine."/".fnameescape(s:path)." (bt=".&bt.")")
+ exe "silent! keepalt file ".s:method."://".s:user.s:machine."/".fnameescape(s:path)
exe "silent keepalt doau BufReadPre ".s:fname
silent call netrw#NetRead(2,s:method."://".s:user.s:machine."/".s:path)
if s:path !~ '.tar.bz2$' && s:path !~ '.tar.gz'
@@ -1891,9 +2057,10 @@ fun! s:NetrwBrowse(islocal,dirname)
" save certain window-oriented variables into buffer-oriented variables {{{3
call s:SetBufWinVars()
call s:NetrwOptionRestore("w:")
- setlocal noma nomod nowrap
+ setlocal ma nomod
-" call Dret("NetrwBrowse : file<".s:fname.">")
+" call Decho("ro=".&ro." ma=".&ma." mod=".&mod." wrap=".&wrap)
+" call Dret("s:NetrwBrowse : file<".s:fname.">")
return
endif
@@ -1905,11 +2072,25 @@ fun! s:NetrwBrowse(islocal,dirname)
let dirname = a:dirname
let s:last_sort_by = g:netrw_sort_by
- call s:NetrwMenu(1) " set up menu {{{3
- if s:NetrwGetBuffer(a:islocal,dirname) " set up buffer {{{3
+ " set up menu {{{3
+ call s:NetrwMenu(1)
+
+ " set up buffer {{{3
+ let reusing= s:NetrwGetBuffer(a:islocal,dirname)
+ " maintain markfile highlighting
+ if exists("s:netrwmarkfilemtch_{bufnr('%')}") && s:netrwmarkfilemtch_{bufnr("%")} != ""
+" call Decho("bufnr(%)=".bufnr('%'))
+" call Decho("exe 2match netrwMarkFile /".s:netrwmarkfilemtch_{bufnr("%")}."/")
+ exe "2match netrwMarkFile /".s:netrwmarkfilemtch_{bufnr("%")}."/"
+ else
+" call Decho("2match none")
+ 2match none
+ endif
+ if reusing
call s:NetrwOptionRestore("w:")
setlocal noma nomod nowrap
-" call Dret("NetrwBrowse : re-using buffer")
+" call Decho("ro=".&ro." ma=".&ma." mod=".&mod." wrap=".&wrap)
+" call Dret("s:NetrwBrowse : re-using buffer")
return
endif
@@ -1946,21 +2127,25 @@ fun! s:NetrwBrowse(islocal,dirname)
" handle g:netrw_keepdir: set vim's current directory to netrw's notion of the current directory {{{3
if !g:netrw_keepdir
" call Decho("handle g:netrw_keepdir=".g:netrw_keepdir.": getcwd<".getcwd()."> acd=".&acd)
-" call Decho('exe cd '.escape(b:netrw_curdir,g:netrw_cd_escape))
- try
- exe 'cd '.escape(b:netrw_curdir,g:netrw_cd_escape)
- catch /^Vim\%((\a\+)\)\=:E472/
- call netrw#ErrorMsg(s:ERROR,"unable to change directory to <".b:netrw_curdir."> (permissions?)",33)
- if exists("w:netrw_prvdir")
- let b:netrw_curdir= w:netrw_prvdir
- else
- call s:NetrwOptionRestore("w:")
- setlocal noma nomod nowrap
- let b:netrw_curdir= dirname
-" call Dret("NetrwBrowse : reusing buffer#".(exists("bufnum")? bufnum : 'N/A')."<".dirname."> getcwd<".getcwd().">")
- return
- endif
- endtry
+" call Decho("l:acd".(exists("&l:acd")? "=".&l:acd : " doesn't exist"))
+ if !exists("&l:acd") || !&l:acd
+" call Decho('exe lcd '.fnameescape(b:netrw_curdir))
+ try
+ exe '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
+ call s:NetrwOptionRestore("w:")
+ setlocal noma nomod nowrap
+ let b:netrw_curdir= dirname
+" call Decho("ro=".&ro." ma=".&ma." mod=".&mod." wrap=".&wrap)
+" call Dret("s:NetrwBrowse : reusing buffer#".(exists("bufnum")? bufnum : 'N/A')."<".dirname."> getcwd<".getcwd().">")
+ return
+ endif
+ endtry
+ endif
endif
" --------------------------------
@@ -1971,9 +2156,9 @@ fun! s:NetrwBrowse(islocal,dirname)
" analyze a:dirname and g:netrw_list_cmd {{{4
" call Decho("b:netrw_curdir<".(exists("b:netrw_curdir")? b:netrw_curdir : "doesn't exist")."> a:dirname<".a:dirname.">")
- if a:dirname == "NetrwTreeListing"
+ if a:dirname =~ "^NetrwTreeListing\>"
let dirname= b:netrw_curdir
-" call Decho("(dirname was NetrwTreeListing) dirname<".dirname.">")
+" call Decho("(dirname was ".a:dirname.") dirname<".dirname.">")
elseif exists("w:netrw_liststyle") && w:netrw_liststyle == s:TREELIST && exists("b:netrw_curdir")
let dirname= substitute(b:netrw_curdir,'\\','/','g')
if dirname !~ '/$'
@@ -1991,9 +2176,10 @@ fun! s:NetrwBrowse(islocal,dirname)
if !exists("g:netrw_quiet")
call netrw#ErrorMsg(s:ERROR,"netrw doesn't understand your dirname<".dirname.">",20)
endif
- call s:NetrwOptionRestore("w:")
- setlocal noma nomod nowrap
-" call Dret("NetrwBrowse : badly formatted dirname<".dirname.">")
+ call s:NetrwOptionRestore("w:")
+ setlocal noma nomod nowrap
+" call Decho("ro=".&ro." ma=".&ma." mod=".&mod." wrap=".&wrap)
+" call Dret("s:NetrwBrowse : badly formatted dirname<".dirname.">")
return
endif
let b:netrw_curdir= dirname
@@ -2006,65 +2192,113 @@ fun! s:NetrwBrowse(islocal,dirname)
call s:BrowserMaps(a:islocal)
call s:PerformListing(a:islocal)
-" call Dret("NetrwBrowse : did PerformListing")
+" call Decho("ro=".&ro." ma=".&ma." mod=".&mod." wrap=".&wrap)
+" call Dret("s:NetrwBrowse : did PerformListing")
return
endfun
" ---------------------------------------------------------------------
+" s:NetrwFileInfo: supports qf (query for file information) {{{2
+fun! s:NetrwFileInfo(islocal,fname)
+" call Dfunc("s:NetrwFileInfo(islocal=".a:islocal." fname<".a:fname.">)")
+ if a:islocal
+ if (has("unix") || has("macunix")) && executable("/bin/ls")
+ if exists("b:netrw_curdir")
+" call Decho('using ls with b:netrw_curdir<'.b:netrw_curdir.'>')
+ if b:netrw_curdir =~ '/$'
+ echo system("/bin/ls -lsad ".shellescape(b:netrw_curdir.a:fname))
+ else
+ echo system("/bin/ls -lsad ".shellescape(b:netrw_curdir."/".a:fname))
+ endif
+ else
+" call Decho('using ls '.a:fname." using cwd<".getcwd().">")
+ echo system("/bin/ls -lsad ".shellescape(a:fname))
+ endif
+ else
+ " use vim functions to return information about file below cursor
+" call Decho("using vim functions to query for file info")
+ if !isdirectory(a:fname) && !filereadable(a:fname) && a:fname =~ '[*@/]'
+ let fname= substitute(a:fname,".$","","")
+ else
+ let fname= a:fname
+ endif
+ let t = getftime(fname)
+ let sz = getfsize(fname)
+ echo a:fname.": ".sz." ".strftime(g:netrw_timefmt,getftime(fname))
+" call Decho(fname.": ".sz." ".strftime(g:netrw_timefmt,getftime(fname)))
+ endif
+ else
+ echo "sorry, \"qf\" not supported yet for remote files"
+ endif
+" call Dret("s:NetrwFileInfo")
+endfun
+
+" ---------------------------------------------------------------------
" s:NetrwGetBuffer: {{{2
" returns 0=cleared buffer
" 1=re-used buffer
fun! s:NetrwGetBuffer(islocal,dirname)
-" call Dfunc("s:NetrwGetBuffer(islocal=".a:islocal." dirname<".a:dirname.">)")
+" call Dfunc("s:NetrwGetBuffer(islocal=".a:islocal." dirname<".a:dirname.">) liststyle=".g:netrw_liststyle)
+ let dirname= a:dirname
" re-use buffer if possible {{{3
" call Decho("--re-use a buffer if possible--")
if exists("w:netrw_liststyle") && w:netrw_liststyle == s:TREELIST
" find NetrwTreeList buffer if there is one
-" call Decho("find NetrwTreeList buffer if there is one")
- let dirname= "NetrwTreeListing"
- let bufnum = bufnr('\<NetrwTreeListing\>')
- if bufnum != -1
+ if exists("w:netrw_treebufnr") && w:netrw_treebufnr > 0
+" call Decho(" re-use w:netrw_treebufnr=".w:netrw_treebufnr)
+ let eikeep= &ei
+ set ei=all
+ exe "b ".w:netrw_treebufnr
+ let &ei= eikeep
" call Dret("s:NetrwGetBuffer : bufnum#".bufnum."<NetrwTreeListing>")
return
endif
+ let bufnum= -1
+" call Decho(" liststyle=TREE but w:netrw_treebufnr doesn't exist")
else
" find buffer number of buffer named precisely the same as dirname {{{3
" call Decho("--find buffer numnber of buffer named precisely the same as dirname--")
" call Dredir("ls!")
- let dirname= a:dirname
-" call Decho("find buffer<".dirname.">'s number ")
- let bufnum= bufnr(escape(dirname,'\'))
-" call Decho("bufnr(dirname<".escape(dirname,'\').">)=".bufnum)
+
+ " get dirname and associated buffer number
+ let bufnum = bufnr(escape(dirname,'\'))
+" call Decho(" find buffer<".dirname.">'s number ")
+" call Decho(" bufnr(dirname<".escape(dirname,'\').">)=".bufnum)
+
if bufnum < 0 && dirname !~ '/$'
" trying appending a trailing /
-" call Decho("try appending a trailing / to dirname<".dirname.">")
+" call Decho(" try appending a trailing / to dirname<".dirname.">")
let bufnum= bufnr(escape(dirname.'/','\'))
if bufnum > 0
let dirname= dirname.'/'
endif
endif
+
if bufnum < 0 && dirname =~ '/$'
" trying removing a trailing /
-" call Decho("try removing a trailing / from dirname<".dirname.">")
+" call Decho(" try removing a trailing / from dirname<".dirname.">")
let bufnum= bufnr(escape(substitute(dirname,'/$','',''),'\'))
if bufnum > 0
let dirname= substitute(dirname,'/$','','')
endif
endif
-" call Decho("findbuf1: bufnum=bufnr('".dirname."')=".bufnum." bufname(".bufnum.")<".bufname(bufnum)."> (initial)")
- let ibuf= 1
+
+" call Decho(" findbuf1: bufnum=bufnr('".dirname."')=".bufnum." bufname(".bufnum.")<".bufname(bufnum)."> (initial)")
" note: !~ was used just below, but that means using ../ to go back would match (ie. abc/def/ and abc/ matches)
- if bufnum > 0 && bufname(bufnum) != dirname
+ if bufnum > 0 && bufname(bufnum) != dirname && bufname(bufnum) != '.'
+ " handle approximate matches
+" call Decho(" handling approx match: bufnum#%d<".bufname(bufnum)."> approx= dirname<".dirname.">")
+ let ibuf = 1
let buflast = bufnr("$")
-" call Decho("findbuf2: buflast=".buflast)
+" call Decho(" findbuf2: buflast=".buflast)
while ibuf <= buflast
let bname= substitute(bufname(ibuf),'\\','/','g')
-" call Decho("findbuf3: dirname<".dirname."> bufname(".ibuf.")<".bname.">")
- if bname != '' && bname !~ '/' && dirname =~ '/'.bname.'$' | break | endif
- if bname =~ '^'.dirname.'/\=$' | break | endif
- if dirname =~ '^'.bname.'/$' | break | endif
+" call Decho(" findbuf3: dirname<".dirname."> bufname(".ibuf.")<".bname.">")
+ if bname != '' && bname !~ '/' && dirname =~ '/'.bname.'/\=$' | break | endif
+ if bname =~ '^'.dirname.'/\=$' | break | endif
+ if dirname =~ '^'.bname.'/$' | break | endif
let ibuf= ibuf + 1
endwhile
if ibuf > buflast
@@ -2072,52 +2306,65 @@ fun! s:NetrwGetBuffer(islocal,dirname)
else
let bufnum= ibuf
endif
-" call Decho("findbuf4: bufnum=".bufnum)
+" 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 enewbuffer and name it -or- re-use buffer--")
+" call Decho("--get enew buffer and name it OR re-use buffer-- (bufnum=".bufnum.")")
mark '
if bufnum < 0 || !bufexists(bufnum)
-" call Decho("get enew buffer")
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
-" call Decho('silent! keepalt file NetrwTreeListing')
- silent! keepalt file NetrwTreeListing
+ " Got enew buffer; transform into a NetrwTreeListing
+" call Decho("--transform enew buffer#".bufnr("%")." into a NetrwTreeListing --")
+ if !exists("s:netrw_treelistnum")
+ let s:netrw_treelistnum= 1
+ else
+ let s:netrw_treelistnum= s:netrw_treelistnum + 1
+ endif
+ let w:netrw_treebufnr= bufnr("%")
+" call Decho(" exe silent! keepalt file NetrwTreeListing ".s:netrw_treelistnum)
+ exe 'silent! keepalt file NetrwTreeListing\ '.s:netrw_treelistnum
nnoremap <silent> <buffer> [ :silent call <SID>TreeListMove('[')<cr>
nnoremap <silent> <buffer> ] :silent call <SID>TreeListMove(']')<cr>
nnoremap <silent> <buffer> [[ :silent call <SID>TreeListMove('[')<cr>
nnoremap <silent> <buffer> ]] :silent call <SID>TreeListMove(']')<cr>
+" call Decho(" tree listing#".s:netrw_treelistnum." bufnr=".w:netrw_treebufnr)
else
-" call Decho('exe silent! keepalt file '.escape(dirname,g:netrw_cd_escape))
" let v:errmsg= "" " Decho
- let escdirname= escape(dirname,g:netrw_cd_escape)
+ let escdirname= fnameescape(dirname)
+" 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)).">")
+" call Decho(" errmsg<".v:errmsg."> bufnr(".escdirname.")=".bufnr(escdirname)."<".bufname(bufnr(escdirname)).">")
endif
-" call Decho("named enew buffer#".bufnr("%")."<".bufname("%").">")
+" call Decho(" named enew buffer#".bufnr("%")."<".bufname("%").">")
else " Re-use the buffer
-
-" call Decho("re-use buffer#".bufnum.":")
+" call Decho("--re-use buffer#".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)
+" call Decho(" re-use buffer#".bufnum."<".((bufnum > 0)? bufname(bufnum) : "")."> using: keepalt b ".bufnum)
exe "keepalt b ".bufnum
else
-" call Decho("reusing buffer#".bufnum."<".((bufnum > 0)? bufname(bufnum) : "")."> using: b ".bufnum)
+" call Decho(" reusing buffer#".bufnum."<".((bufnum > 0)? bufname(bufnum) : "")."> using: b ".bufnum)
exe "b ".bufnum
endif
+ if bufname("%") == '.'
+ exe "silent! keepalt file ".escape(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("clear buffer<".expand("%")."> with :%d")
+" call Decho("--re-use tree listing--")
+" call Decho(" clear buffer<".expand("%")."> with :%d")
silent %d
call s:NetrwListSettings(a:islocal)
" call Dret("s:NetrwGetBuffer 0 : re-using buffer#".bufnr("%").", but treelist mode always needs a refresh")
@@ -2136,11 +2383,11 @@ fun! s:NetrwGetBuffer(islocal,dirname)
" call Decho("--do netrw settings: make this buffer not-a-file, modifiable, not line-numbered, etc--")
let fname= expand("%")
call s:NetrwListSettings(a:islocal)
- exe "file ".escape(fname,' ')
+ exe "keepalt file ".escape(fname,' ')
" delete all lines from buffer {{{3
" call Decho("--delete all lines from buffer--")
-" call Decho("clear buffer<".expand("%")."> with :%d")
+" call Decho(" clear buffer<".expand("%")."> with :%d")
keepalt silent! %d
" call Dret("s:NetrwGetBuffer 0 : buf#".bufnr("%"))
@@ -2148,9 +2395,26 @@ fun! s:NetrwGetBuffer(islocal,dirname)
endfun
" ---------------------------------------------------------------------
-" s:NetrwGetWord: it gets the directory named under the cursor {{{2
+" s:NetrwGetcwd: get the current directory. {{{2
+" Change backslashes to forward slashes, if any.
+" If doesc is true, escape certain troublesome characters
+fun! s:NetrwGetcwd(doesc)
+" call Dfunc("NetrwGetcwd(doesc=".a:doesc.")")
+ let curdir= substitute(getcwd(),'\\','/','ge')
+ if curdir !~ '[\/]$'
+ let curdir= curdir.'/'
+ endif
+ if a:doesc
+ let curdir= fnameescape(curdir)
+ endif
+" call Dret("NetrwGetcwd <".curdir.">")
+ return curdir
+endfun
+
+" ---------------------------------------------------------------------
+" s:NetrwGetWord: it gets the directory/file named under the cursor {{{2
fun! s:NetrwGetWord()
-" call Dfunc("NetrwGetWord() line#".line(".")." liststyle=".g:netrw_liststyle." virtcol=".virtcol("."))
+" call Dfunc("s:NetrwGetWord() line#".line(".")." liststyle=".g:netrw_liststyle." virtcol=".virtcol("."))
call s:UseBufWinVars()
" insure that w:netrw_liststyle is set up
@@ -2168,7 +2432,7 @@ fun! s:NetrwGetWord()
" call Decho("active banner handling")
norm! 0
let dirname= "./"
- let curline= getline(".")
+ let curline= getline('.')
if curline =~ '"\s*Sorted by\s'
norm s
@@ -2196,43 +2460,54 @@ fun! s:NetrwGetWord()
elseif w:netrw_liststyle == s:THINLIST
" call Decho("thin column handling")
norm! 0
- let dirname= getline(".")
+ let dirname= getline('.')
elseif w:netrw_liststyle == s:LONGLIST
" call Decho("long column handling")
norm! 0
- let dirname= substitute(getline("."),'^\(\%(\S\+ \)*\S\+\).\{-}$','\1','e')
+ let dirname= substitute(getline('.'),'^\(\%(\S\+ \)*\S\+\).\{-}$','\1','e')
elseif w:netrw_liststyle == s:TREELIST
" call Decho("treelist handling")
- let dirname= substitute(getline("."),'^\(| \)*','','e')
+ let dirname= substitute(getline('.'),'^\(| \)*','','e')
else
" call Decho("obtain word from wide listing")
- let dirname= getline(".")
+ let dirname= getline('.')
if !exists("b:netrw_cpf")
let b:netrw_cpf= 0
exe 'silent keepjumps '.w:netrw_bannercnt.',$g/^./if virtcol("$") > b:netrw_cpf|let b:netrw_cpf= virtcol("$")|endif'
-" call Decho("computed cpf")
+" call Decho("computed cpf=".b:netrw_cpf)
endif
" 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|let dirname= substitute(dirname,'^.\{'.filestart.'}','','')|endif
+ if filestart == 0
+ norm! 0ma
+ else
+ call cursor(line("."),filestart+1)
+ norm! ma
+ endif
+ let rega= @a
+ call cursor(line("."),filestart+b:netrw_cpf+1)
+ norm! "ay`a
+ let dirname = @a
+ let @a = rega
" call Decho("2: dirname<".dirname.">")
- let dirname = substitute(dirname,'^\(.\{'.b:netrw_cpf.'}\).*$','\1','e')
+ let dirname= substitute(dirname,'\s\+$','','e')
" call Decho("3: dirname<".dirname.">")
- let dirname = substitute(dirname,'\s\+$','','e')
-" call Decho("4: dirname<".dirname.">")
endif
" symlinks are indicated by a trailing "@". Remove it before further processing.
let dirname= substitute(dirname,"@$","","")
-" call Dret("NetrwGetWord <".dirname.">")
+ " executables are indicated by a trailing "*". Remove it before further processing.
+ let dirname= substitute(dirname,"\*$","","")
+
+" call Dret("s:NetrwGetWord <".dirname.">")
return dirname
endfun
@@ -2242,7 +2517,8 @@ fun! s:NetrwListSettings(islocal)
" call Dfunc("s:NetrwListSettings(islocal=".a:islocal.")")
let fname= bufname("%")
setlocal bt=nofile nobl ma nonu nowrap noro
- exe "file ".escape(fname,' ')
+" call Decho("setlocal bt=nofile nobl ma nonu nowrap noro")
+ exe "keepalt file ".escape(fname,' ')
if g:netrw_use_noswf
setlocal noswf
endif
@@ -2259,184 +2535,115 @@ fun! s:NetrwListSettings(islocal)
endfun
" ---------------------------------------------------------------------
-" s:PerformListing: {{{2
-fun! s:PerformListing(islocal)
-" call Dfunc("s:PerformListing(islocal=".a:islocal.") buf(%)=".bufnr("%")."<".bufname("%").">")
-
- call s:NetrwSafeOptions()
- setlocal noro ma
-
-" if exists("g:netrw_silent") && g:netrw_silent == 0 && &ch >= 1 " Decho
-" call Decho("(netrw) Processing your browsing request...")
-" endif " Decho
+" s:NetrwListStyle: {{{2
+" islocal=0: remote browsing
+" =1: local browsing
+fun! s:NetrwListStyle(islocal)
+" call Dfunc("NetrwListStyle(islocal=".a:islocal.") w:netrw_liststyle=".w:netrw_liststyle)
+ let fname = s:NetrwGetWord()
+ if !exists("w:netrw_liststyle")|let w:netrw_liststyle= g:netrw_liststyle|endif
+ let w:netrw_liststyle = (w:netrw_liststyle + 1) % s:MAXLIST
+" call Decho("fname<".fname.">")
+" call Decho("chgd w:netrw_liststyle to ".w:netrw_liststyle)
+" call Decho("b:netrw_curdir<".(exists("b:netrw_curdir")? b:netrw_curdir : "doesn't exist").">")
-" 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
- endif
+ if w:netrw_liststyle == s:THINLIST
+ " use one column listing
+" call Decho("use one column list")
+ let g:netrw_list_cmd = substitute(g:netrw_list_cmd,' -l','','ge')
- " save current directory on directory history list
- call s:NetrwBookmarkDir(3,b:netrw_curdir)
+ elseif w:netrw_liststyle == s:LONGLIST
+ " use long list
+" call Decho("use long list")
+ let g:netrw_list_cmd = g:netrw_list_cmd." -l"
- " Set up the banner {{{3
-" call Decho("set up banner")
- keepjumps put ='\" ============================================================================'
- keepjumps put ='\" Netrw Directory Listing (netrw '.g:loaded_netrw.')'
- keepjumps put ='\" '.b:netrw_curdir
- keepjumps 1d
- let w:netrw_bannercnt= 3
- exe "keepjumps ".w:netrw_bannercnt
+ elseif w:netrw_liststyle == s:WIDELIST
+ " give wide list
+" call Decho("use wide list")
+ let g:netrw_list_cmd = substitute(g:netrw_list_cmd,' -l','','ge')
- let sortby= g:netrw_sort_by
- if g:netrw_sort_direction =~ "^r"
- let sortby= sortby." reversed"
- endif
+ elseif w:netrw_liststyle == s:TREELIST
+" call Decho("use tree list")
+ let g:netrw_list_cmd = substitute(g:netrw_list_cmd,' -l','','ge')
- " Sorted by... {{{3
-" 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
- keepjumps 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
- let w:netrw_bannercnt= w:netrw_bannercnt + 1
- endif
- exe "keepjumps ".w:netrw_bannercnt
-
- " show copy/move target, if any
- if exists("s:netrwmftgt") && exists("s:netrwmfloc")
-" call Decho("show copy/move target<".s:netrwmftgt."> netrwmfloc=".s:netrwmfloc)
- if s:netrwmfloc
- keepjumps put ='\" Copy/Move Tgt: '.s:netrwmftgt.' (local)'
- else
- keepjumps put ='\" Copy/Move Tgt: '.s:netrwmftgt.' (remote)'
- endif
- let w:netrw_bannercnt= w:netrw_bannercnt + 1
+ call netrw#ErrorMsg(s:WARNING,"bad value for g:netrw_liststyle (=".w:netrw_liststyle.")",46)
+ let g:netrw_liststyle = s:THINLIST
+ let w:netrw_liststyle = g:netrw_liststyle
+ let g:netrw_list_cmd = substitute(g:netrw_list_cmd,' -l','','ge')
endif
- exe "keepjumps ".w:netrw_bannercnt
+ setlocal ma noro
+" call Decho("setlocal ma noro")
- " Hiding... -or- Showing... {{{3
-" 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
- else
- keepjumps 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'
- keepjumps put ='\" ============================================================================'
- let w:netrw_bannercnt= w:netrw_bannercnt + 2
+ " clear buffer - this will cause NetrwBrowse/LocalBrowseCheck to do a refresh
+" call Decho("clear buffer<".expand("%")."> with :%d")
+ %d
- " bannercnt should index the line just after the banner
- let w:netrw_bannercnt= w:netrw_bannercnt + 1
- exe "keepjumps ".w:netrw_bannercnt
-" call Decho("bannercnt=".w:netrw_bannercnt." (should index line just after banner) line($)=".line("$"))
+ " refresh the listing
+ let svpos= netrw#NetrwSavePosn()
+ call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,'./'))
+ call netrw#NetrwRestorePosn(svpos)
- " set up syntax highlighting {{{3
-" call Decho("set up syntax highlighting")
- if has("syntax")
- setlocal ft=netrw
- if !exists("g:syntax_on") || !g:syntax_on
- setlocal ft=
- endif
+ " keep cursor on the filename
+ 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
- " get list of files
-" call Decho("Get list of files - islocal=".a:islocal)
- if a:islocal
- call s:LocalListing()
- else " remote
- call s:NetrwRemoteListing()
+" call Dret("NetrwListStyle".(exists("w:netrw_liststyle")? ' : w:netrw_liststyle='.w:netrw_liststyle : ""))
+endfun
+
+" ---------------------------------------------------------------------
+" s:NetrwBookmarkMenu: Uses menu priorities {{{2
+" .2.[cnt] for bookmarks, and
+" .3.[cnt] for history
+" (see s:NetrwMenu())
+fun! s:NetrwBookmarkMenu()
+ if !exists("s:netrw_menucnt")
+ return
endif
-" call Decho("w:netrw_bannercnt=".w:netrw_bannercnt." (banner complete)")
+" call Dfunc("NetrwBookmarkMenu() bookmarkcnt=".g:NETRW_BOOKMARKMAX." histcnt=".g:NETRW_DIRHIST_CNT." menucnt=".s:netrw_menucnt)
- " manipulate the directory listing (hide, sort) {{{3
- if line("$") >= w:netrw_bannercnt
-" call Decho("manipulate directory listing (hide)")
-" call Decho("g:netrw_hide=".g:netrw_hide." g:netrw_list_hide<".g:netrw_list_hide.">")
- if g:netrw_hide && g:netrw_list_hide != ""
- call s:NetrwListHide()
+ " 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'
endif
- if line("$") >= w:netrw_bannercnt
-" call Decho("manipulate directory listing (sort) : g:netrw_sort_by<".g:netrw_sort_by.">")
-
- if g:netrw_sort_by =~ "^n"
- " sort by name
- call s:SetSort()
-
- if w:netrw_bannercnt < line("$")
-" call Decho("g:netrw_sort_direction=".g:netrw_sort_direction." (bannercnt=".w:netrw_bannercnt.")")
- if g:netrw_sort_direction =~ 'n'
- " normal direction sorting
- exe 'silent keepjumps '.w:netrw_bannercnt.',$sort'
- else
- " reverse direction sorting
- exe 'silent keepjumps '.w:netrw_bannercnt.',$sort!'
- endif
- endif
- " remove priority pattern prefix
-" call Decho("remove priority pattern prefix")
- exe 'silent keepjumps '.w:netrw_bannercnt.',$s/^\d\{3}\///e'
- elseif a:islocal
- if w:netrw_bannercnt < line("$")
-" call Decho("g:netrw_sort_direction=".g:netrw_sort_direction)
- if g:netrw_sort_direction =~ 'n'
-" call Decho('exe silent keepjumps '.w:netrw_bannercnt.',$sort')
- exe 'silent keepjumps '.w:netrw_bannercnt.',$sort'
- else
-" call Decho('exe silent keepjumps '.w:netrw_bannercnt.',$sort!')
- exe 'silent keepjumps '.w:netrw_bannercnt.',$sort!'
- endif
- endif
- exe 'silent keepjumps '.w:netrw_bannercnt.',$s/^\d\{-}\///e'
+ " show bookmarked places
+ let cnt = 1
+ while cnt <= g:NETRW_BOOKMARKMAX
+ if exists("g:NETRW_BOOKMARKDIR_{cnt}")
+ let bmdir= escape(g:NETRW_BOOKMARKDIR_{cnt},'. ')
+" call Decho('silent! menu '.g:NetrwMenuPriority.".2.".cnt." ".g:NetrwTopLvlMenu.'Bookmark.'.bmdir.' :e '.bmdir)
+ exe 'silent! menu '.g:NetrwMenuPriority.".2.".cnt." ".g:NetrwTopLvlMenu.'Bookmarks.'.bmdir.' :e '.bmdir."\<cr>"
endif
+ let cnt= cnt + 1
+ endwhile
- elseif g:netrw_sort_direction =~ 'r'
-" call Decho('reverse the sorted listing')
- exe 'silent keepjumps '.w:netrw_bannercnt.'g/^/m '.w:netrw_bannercnt
- endif
- endif
-
- " convert to wide/tree listing {{{3
-" call Decho("modify display if wide/tree listing style")
- call s:NetrwWideListing()
- call s:NetrwTreeListing(b:netrw_curdir)
-
- if exists("w:netrw_bannercnt") && line("$") > w:netrw_bannercnt
- " 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
- norm! 0
- endif
-
- " record previous current directory
- let w:netrw_prvdir= b:netrw_curdir
-" call Decho("record netrw_prvdir<".w:netrw_prvdir.">")
-
- " save certain window-oriented variables into buffer-oriented variables {{{3
- call s:SetBufWinVars()
- call s:NetrwOptionRestore("w:")
-
- " set display to netrw display settings
-" call Decho("set display to netrw display settings (noma nomod etc)")
- setlocal noma nomod nonu nobl nowrap ro
- if exists("s:treecurpos")
- call setpos('.',s:treecurpos)
- unlet s:treecurpos
+ " show directory browsing history
+ let cnt = g:NETRW_DIRHIST_CNT
+ let first = 1
+ let histcnt = 0
+ while ( first || cnt != g:NETRW_DIRHIST_CNT )
+ let histcnt = histcnt + 1
+ let priority = g:NETRW_DIRHIST_CNT + histcnt
+ if exists("g:NETRW_DIRHIST_{cnt}")
+ let bmdir= escape(g:NETRW_DIRHIST_{cnt},'. ')
+" call Decho('silent! menu '.g:NetrwMenuPriority.".3.".priority." ".g:NetrwTopLvlMenu.'History.'.bmdir.' :e '.bmdir)
+ exe 'silent! menu '.g:NetrwMenuPriority.".3.".priority." ".g:NetrwTopLvlMenu.'History.'.bmdir.' :e '.bmdir."\<cr>"
+ endif
+ let first = 0
+ let cnt = ( cnt - 1 ) % g:netrw_dirhistmax
+ if cnt < 0
+ let cnt= cnt + g:netrw_dirhistmax
+ endif
+ endwhile
endif
-
-" call Dret("s:PerformListing : curpos<".string(getpos(".")).">")
+" call Dret("NetrwBookmarkMenu")
endfun
" ---------------------------------------------------------------------
@@ -2448,16 +2655,18 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...)
" call Dfunc("s:NetrwBrowseChgDir(islocal=".a:islocal."> newdir<".a:newdir.">) a:0=".a:0." curpos<".string(getpos("."))."> b:netrw_curdir<".(exists("b:netrw_curdir")? b:netrw_curdir : "").">")
if !exists("b:netrw_curdir")
+ " Don't try to change-directory: this can happen, for example, when netrw#ErrorMsg has been called
+ " and the current window is the NetrwMessage window.
" call Decho("(NetrwBrowseChgDir) b:netrw_curdir doesn't exist!")
- echoerr "(NetrwBrowseChgDir) b:netrw_curdir doesn't exist!"
+" call Decho("getcwd<".getcwd().">")
+" call Dredir("ls!")
" call Dret("s:NetrwBrowseChgDir")
return
endif
call s:NetrwOptionSave("s:")
call s:NetrwSafeOptions()
- call netrw#NetrwSavePosn()
- let nbcd_curpos = getpos('.')
+ let nbcd_curpos = netrw#NetrwSavePosn()
let dirname = substitute(b:netrw_curdir,'\\','/','ge')
let newdir = a:newdir
let dolockout = 0
@@ -2483,7 +2692,12 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...)
" ------------
" call Decho('case "handling a file": newdir<'.newdir.'> !~ dirpat<'.dirpat.">")
if exists("w:netrw_liststyle") && w:netrw_liststyle == s:TREELIST && exists("w:netrw_treedict") && newdir !~ '^\(/\|\a:\)'
- let dirname= s:NetrwTreeDir().newdir
+ let dirname= s:NetrwTreeDir()
+ if dirname =~ '/$'
+ let dirname= dirname.newdir
+ else
+ let dirname= s:NetrwTreeDir()."/".newdir
+ endif
" call Decho("tree listing")
elseif newdir =~ '^\(/\|\a:\)'
let dirname= newdir
@@ -2494,7 +2708,7 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...)
" this lets NetrwBrowseX avoid the edit
if a:0 < 1
" call Decho("dirname<".dirname."> netrw_cd_escape<".g:netrw_cd_escape."> browse_split=".g:netrw_browse_split)
-" call Decho("set up windows for editing<".escape(dirname,g:netrw_cd_escape)."> didsplit=".(exists("s:didsplit")? s:didsplit : "doesn't exist"))
+" call Decho("set up windows for editing<".fnameescape(dirname)."> didsplit=".(exists("s:didsplit")? s:didsplit : "doesn't exist"))
call s:NetrwOptionRestore("s:")
if !exists("s:didsplit")
if g:netrw_browse_split == 1
@@ -2523,13 +2737,12 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...)
" the point where netrw actually edits the (local) file
" if its local only: LocalBrowseCheck() doesn't edit a file, but NetrwBrowse() will
if a:islocal
-" call Decho("edit local file: exe e! ".escape(dirname,g:netrw_cd_escape))
- exe "e! ".escape(dirname,g:netrw_cd_escape)
- let dolockout= 1
+" call Decho("edit local file: exe e! ".fnameescape(dirname))
+ exe "e! ".fnameescape(dirname)
else
" call Decho("remote file: NetrwBrowse will edit it")
- let dolockout= 1
endif
+ let dolockout= 1
endif
elseif newdir =~ '^/'
@@ -2558,6 +2771,7 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...)
" force a refresh
" call Decho("clear buffer<".expand("%")."> with :%d")
setlocal noro ma
+" call Decho("setlocal noro ma")
keepjumps %d
endif
@@ -2591,6 +2805,7 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...)
" call Decho('case liststyle is TREELIST and w:netrw_treedict exists')
" 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
@@ -2655,6 +2870,7 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...)
if dolockout
" call Decho("doing modification lockout settings: ma nomod noro")
setlocal ma nomod noro
+" call Decho("setlocal ma nomod noro")
endif
" call Dret("s:NetrwBrowseChgDir <".dirname."> : curpos<".string(getpos(".")).">")
@@ -2662,6 +2878,546 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...)
endfun
" ---------------------------------------------------------------------
+" s:NetrwBrowseX: allows users to write custom functions to operate on {{{2
+" files given their extension. Passes 0=local, 1=remote
+fun! netrw#NetrwBrowseX(fname,remote)
+" call Dfunc("NetrwBrowseX(fname<".a:fname."> remote=".a:remote.")")
+
+ " set up the filename
+ " (lower case the extension, make a local copy of a remote file)
+ let exten= substitute(a:fname,'.*\.\(.\{-}\)','\1','e')
+ if has("win32") || has("win95") || has("win64") || has("win16")
+ let exten= substitute(exten,'^.*$','\L&\E','')
+ endif
+ let fname= escape(a:fname,"%#")
+" call Decho("fname<".fname."> after escape()")
+
+ " seems kde systems often have gnome-open due to dependencies, even though
+ " gnome-open's subsidiary display tools are largely absent. Kde systems
+ " usually have "kdeinit" running, though... (tnx Mikolaj Machowski)
+ if !exists("s:haskdeinit")
+ if has("unix")
+ let s:haskdeinit= s:System("system",'ps -e') =~ 'kdeinit'
+ if v:shell_error
+ let s:haskdeinit = 0
+ endif
+ else
+ let s:haskdeinit= 0
+ endif
+" call Decho("setting s:haskdeinit=".s:haskdeinit)
+ endif
+
+ if a:remote == 1
+ " create a local copy
+ let fname= fnamemodify(tempname(),":r").".".exten
+" call Decho("a:remote=".a:remote.": create a local copy of <".a:fname."> as <".fname.">")
+ exe "silent keepjumps bot 1new ".a:fname
+ setlocal bh=delete
+" call Decho("read <".fname.">, now writing: exe w! ".fname)
+ exe "silent! w! ".fname
+ q
+ endif
+" call Decho("exten<".exten."> "."netrwFileHandlers#NFH_".exten."():exists=".exists("*netrwFileHandlers#NFH_".exten))
+
+ " set up redirection
+ if &srr =~ "%s"
+ if (has("win32") || has("win95") || has("win64") || has("win16"))
+ let redir= substitute(&srr,"%s","nul","")
+ else
+ let redir= substitute(&srr,"%s","/dev/null","")
+ endif
+ elseif (has("win32") || has("win95") || has("win64") || has("win16"))
+ let redir= &srr . "nul"
+ else
+ let redir= &srr . "/dev/null"
+ endif
+" call Decho("redir{".redir."} srr{".&srr."}")
+
+ " extract any viewing options. Assumes that they're set apart by quotes.
+ if exists("g:netrw_browsex_viewer")
+ if g:netrw_browsex_viewer =~ '\s'
+ let viewer = substitute(g:netrw_browsex_viewer,'\s.*$','','')
+ let viewopt = substitute(g:netrw_browsex_viewer,'^\S\+\s*','','')." "
+ let oviewer = ''
+ let cnt = 1
+ while !executable(viewer) && viewer != oviewer
+ let viewer = substitute(g:netrw_browsex_viewer,'^\(\(^\S\+\s\+\)\{'.cnt.'}\S\+\)\(.*\)$','\1','')
+ let viewopt = substitute(g:netrw_browsex_viewer,'^\(\(^\S\+\s\+\)\{'.cnt.'}\S\+\)\(.*\)$','\3','')." "
+ let cnt = cnt + 1
+ let oviewer = viewer
+" call Decho("!exe: viewer<".viewer."> viewopt<".viewopt.">")
+ endwhile
+ else
+ let viewer = g:netrw_browsex_viewer
+ let viewopt = ""
+ endif
+" call Decho("viewer<".viewer."> viewopt<".viewopt.">")
+ endif
+
+ " execute the file handler
+ if exists("g:netrw_browsex_viewer") && g:netrw_browsex_viewer == '-'
+" call Decho("g:netrw_browsex_viewer<".g:netrw_browsex_viewer.">")
+ let ret= netrwFileHandlers#Invoke(exten,fname)
+
+ elseif exists("g:netrw_browsex_viewer") && executable(viewer)
+" call Decho("g:netrw_browsex_viewer<".g:netrw_browsex_viewer.">")
+" call Decho("exe silent !".viewer." ".viewopt.shellescape(fname).redir)
+ exe "silent !".viewer." ".viewopt.shellescape(fname).redir
+ let ret= v:shell_error
+
+ elseif has("win32") || has("win64")
+" call Decho('exe silent !start rundll32 url.dll,FileProtocolHandler '.shellescape(fname))
+ exe 'silent !start rundll32 url.dll,FileProtocolHandler '.shellescape(fname)
+ call inputsave()|call input("Press <cr> to continue")|call inputrestore()
+ let ret= v:shell_error
+
+ elseif has("unix") && executable("gnome-open") && !s:haskdeinit
+" call Decho("exe silent !gnome-open ".shellescape(fname)." ".redir)
+ exe "silent !gnome-open ".shellescape(fname).redir
+ let ret= v:shell_error
+
+ elseif has("unix") && executable("kfmclient") && s:haskdeinit
+" call Decho("exe silent !kfmclient exec ".shellescape(fname)." ".redir)
+ exe "silent !kfmclient exec ".shellescape(fname)." ".redir
+ let ret= v:shell_error
+
+ elseif has("macunix") && executable("open")
+" call Decho("exe silent !open ".shellescape(fname)." ".redir)
+ exe "silent !open ".shellescape(fname)." ".redir
+ let ret= v:shell_error
+
+ else
+ " netrwFileHandlers#Invoke() always returns 0
+ let ret= netrwFileHandlers#Invoke(exten,fname)
+ endif
+
+ " if unsuccessful, attempt netrwFileHandlers#Invoke()
+ if ret
+ let ret= netrwFileHandlers#Invoke(exten,fname)
+ endif
+
+" redraw!
+
+ " cleanup: remove temporary file,
+ " delete current buffer if success with handler,
+ " return to prior buffer (directory listing)
+ " Feb 12, 2008: had to de-activiate removal of
+ " temporary file because it wasn't getting seen.
+" if a:remote == 1 && fname != a:fname
+" call Decho("deleting temporary file<".fname.">")
+" call s:System("delete",fname)
+" endif
+
+ if a:remote == 1
+ setlocal bh=delete bt=nofile
+ if g:netrw_use_noswf
+ setlocal noswf
+ endif
+ exe "norm! \<c-o>"
+" redraw!
+ endif
+
+" call Dret("NetrwBrowseX")
+endfun
+
+" ---------------------------------------------------------------------
+" netrw#Explore: launch the local browser in the directory of the current file {{{2
+" dosplit==0: the window will be split iff the current file has
+" been modified
+" dosplit==1: the window will be split before running the local
+" browser
+fun! netrw#Explore(indx,dosplit,style,...)
+" 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 curfile= b:netrw_curdir
+" call Decho("curfile<".curfile.">")
+
+ " save registers
+ silent! let keepregstar = @*
+ silent! let keepregplus = @+
+ silent! 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 s:SaveWinVars()
+
+ if a:style == 0 " Explore, Sexplore
+" call Decho("style=0: Explore or Sexplore")
+ exe g:netrw_winsize."wincmd s"
+
+ elseif a:style == 1 "Explore!, Sexplore!
+" call Decho("style=1: Explore! or Sexplore!")
+ exe g:netrw_winsize."wincmd v"
+
+ elseif a:style == 2 " Hexplore
+" call Decho("style=2: Hexplore")
+ exe "bel ".g:netrw_winsize."wincmd s"
+
+ elseif a:style == 3 " Hexplore!
+" call Decho("style=3: Hexplore!")
+ exe "abo ".g:netrw_winsize."wincmd s"
+
+ elseif a:style == 4 " Vexplore
+" call Decho("style=4: Vexplore")
+ exe "lefta ".g:netrw_winsize."wincmd v"
+
+ elseif a:style == 5 " Vexplore!
+" call Decho("style=5: Vexplore!")
+ exe "rightb ".g:netrw_winsize."wincmd v"
+
+ elseif a:style == 6 " Texplore
+ call s:SaveBufVars()
+" call Decho("style = 6: Texplore")
+ tabnew
+ call s:RestoreBufVars()
+ endif
+ call s:RestoreWinVars()
+ endif
+ norm! 0
+
+ if a:0 > 0
+" 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("using dirname<".dirname."> (case: ~ && unix||cygwin)")
+ elseif a:1 == '.'
+ let dirname= 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)
+ else
+ let dirname= a:1
+" call Decho("using dirname<".dirname.">")
+ endif
+ else
+ " clear explore
+" call Decho("clearing explore variables")
+ 2match none
+ if exists("s:explore_match") |unlet s:explore_match |endif
+ if exists("s:explore_indx") |unlet s:explore_indx |endif
+ if exists("s:dirstarstar") |unlet s:dirstarstar |endif
+ if exists("s:dirstarstar") |unlet s:dirstarstar |endif
+ if exists("w:netrw_explore_indx") |unlet w:netrw_explore_indx |endif
+ if exists("w:netrw_explore_listlen")|unlet w:netrw_explore_listlen|endif
+ if exists("w:netrw_explore_list") |unlet w:netrw_explore_list |endif
+ if exists("w:netrw_explore_bufnr") |unlet w:netrw_explore_bufnr |endif
+" redraw!
+ echo " "
+ echo " "
+" call Dret("netrw#Explore : cleared list")
+ return
+ endif
+
+ if dirname =~ '/\*\*/'
+ " handle .../**/.../filepat
+" call Decho("case Explore .../**/.../filepat")
+ let prefixdir= substitute(dirname,'^\(.\{-}\)\*\*.*$','\1','')
+ if prefixdir =~ '^/' || (prefixdir =~ '^\a:/' && (has("win32") || has("win95") || has("win64") || has("win16")))
+ let b:netrw_curdir = prefixdir
+ else
+ let b:netrw_curdir= getcwd().'/'.prefixdir
+ endif
+ let dirname= substitute(dirname,'^.\{-}\(\*\*/.*\)$','\1','')
+ let starpat= 4;
+" call Decho("pwd<".getcwd()."> dirname<".dirname.">")
+" call Decho("case Explore ../**/../filepat (starpat=".starpat.")")
+
+ elseif dirname =~ '^\*//'
+ " starpat=1: Explore *//pattern (current directory only search for files containing pattern)
+" call Decho("case Explore *//pattern")
+ let pattern= substitute(dirname,'^\*//\(.*\)$','\1','')
+ let starpat= 1
+" call Decho("Explore *//pat: (starpat=".starpat.") dirname<".dirname."> -> pattern<".pattern.">")
+ if &hls | let keepregslash= s:ExplorePatHls(pattern) | endif
+
+ elseif dirname =~ '^\*\*//'
+ " starpat=2: Explore **//pattern (recursive descent search for files containing pattern)
+" call Decho("case Explore **//pattern")
+ let pattern= substitute(dirname,'^\*\*//','','')
+ let starpat= 2
+" call Decho("Explore **//pat: (starpat=".starpat.") dirname<".dirname."> -> pattern<".pattern.">")
+
+ elseif dirname =~ '^\*/'
+ " starpat=3: Explore */filepat (search in current directory for filenames matching filepat)
+ let starpat= 3
+" call Decho("case Explore */filepat (starpat=".starpat.")")
+
+ elseif dirname=~ '^\*\*/'
+ " starpat=4: Explore **/filepat (recursive descent search for filenames matching filepat)
+ let starpat= 4
+" call Decho("case Explore **/filepat (starpat=".starpat.")")
+ else
+ let starpat= 0
+ endif
+
+ if starpat == 0 && a:indx >= 0
+ " [Explore Hexplore Vexplore Sexplore] [dirname]
+" call Decho("case dirname<".dirname."> a:indx=".a:indx.": Explore Hexplore Vexplore Sexplore")
+ if dirname == ""
+ let dirname= substitute(expand("%:p"),'^\(.*[/\\]\)[^/\\]*$','\1','e')
+ endif
+ if dirname =~ '^scp:' || dirname =~ '^ftp:'
+" call Decho("calling NetrwBrowse(0,dirname<".dirname.">)")
+ call s:NetrwBrowse(0,dirname)
+ else
+ if dirname == ""|let dirname= getcwd()|endif
+" call Decho("calling LocalBrowseCheck(dirname<".dirname.">)")
+ call netrw#LocalBrowseCheck(dirname)
+ endif
+
+" call Decho("curfile<".curfile.">")
+ if has("win32") || has("win95") || has("win64") || has("win16")
+ call search('\<'.substitute(curfile,'^.*[/\\]','','e').'\>','cW')
+ else
+ call search('\<'.substitute(curfile,'^.*/','','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)
+ " starpat=4: Explore **/filepat (recursive descent search for filenames matching filepat)
+ elseif a:indx <= 0
+ " Nexplore, Pexplore, Explore: handle starpat
+" call Decho("case Nexplore, Pexplore, <s-down>, <s-up>: starpat=".starpat." a:indx=".a:indx)
+ if !mapcheck("<s-up>","n") && !mapcheck("<s-down>","n") && exists("b:netrw_curdir")
+" call Decho("set up <s-up> and <s-down> maps")
+ let s:didstarstar= 1
+ nnoremap <buffer> <silent> <s-up> :Pexplore<cr>
+ nnoremap <buffer> <silent> <s-down> :Nexplore<cr>
+ endif
+
+ if has("path_extra")
+" call Decho("starpat=".starpat.": has +path_extra")
+ if !exists("w:netrw_explore_indx")
+ let w:netrw_explore_indx= 0
+ endif
+ let indx = a:indx
+" call Decho("starpat=".starpat.": set indx= [a:indx=".indx."]")
+"
+ 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
+ silent! let @+ = keepregstar
+ silent! let @/ = keepregslash
+" call Dret("netrw#Explore")
+ return
+ endif
+ let indx= w:netrw_explore_indx
+ if indx < 0 | let indx= 0 | endif
+ if indx >= w:netrw_explore_listlen | let indx= w:netrw_explore_listlen - 1 | endif
+ let curfile= w:netrw_explore_list[indx]
+" call Decho("indx=".indx." curfile<".curfile.">")
+ while indx < w:netrw_explore_listlen && curfile == w:netrw_explore_list[indx]
+ let indx= indx + 1
+" call Decho("indx=".indx." (Nexplore while loop)")
+ endwhile
+ if indx >= w:netrw_explore_listlen | let indx= w:netrw_explore_listlen - 1 | endif
+" call Decho("Nexplore: indx= [w:netrw_explore_indx=".w:netrw_explore_indx."]=".indx)
+
+ 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
+ silent! let @+ = keepregstar
+ silent! let @/ = keepregslash
+" call Dret("netrw#Explore")
+ return
+ endif
+ let indx= w:netrw_explore_indx
+ if indx < 0 | let indx= 0 | endif
+ if indx >= w:netrw_explore_listlen | let indx= w:netrw_explore_listlen - 1 | endif
+ let curfile= w:netrw_explore_list[indx]
+" call Decho("indx=".indx." curfile<".curfile.">")
+ while indx >= 0 && curfile == w:netrw_explore_list[indx]
+ let indx= indx - 1
+" call Decho("indx=".indx." (Pexplore while loop)")
+ endwhile
+ if indx < 0 | let indx= 0 | endif
+" call Decho("Pexplore: indx= [w:netrw_explore_indx=".w:netrw_explore_indx."]=".indx)
+
+ else
+ " Explore -- initialize
+ " build list of files to Explore with Nexplore/Pexplore
+" call Decho("starpat=".starpat.": case Explore: initialize (indx=".indx.")")
+ let w:netrw_explore_indx= 0
+ if !exists("b:netrw_curdir")
+ let b:netrw_curdir= getcwd()
+ endif
+" call Decho("starpat=".starpat.": b:netrw_curdir<".b:netrw_curdir.">")
+
+ " switch on starpat to build the w:netrw_explore_list of files
+ if starpat == 1
+ " starpat=1: Explore *//pattern (current directory only search for files containing pattern)
+" call Decho("starpat=".starpat.": build *//pattern list")
+ exe "vimgrep /".pattern."/gj ".b:netrw_curdir."/*"
+ let w:netrw_explore_list = map(getqflist(),'bufname(v:val.bufnr)')
+ if &hls | let keepregslash= s:ExplorePatHls(pattern) | endif
+
+ elseif starpat == 2
+ " starpat=2: Explore **//pattern (recursive descent search for files containing pattern)
+" call Decho("starpat=".starpat.": build **//pattern list")
+ try
+ exe "silent 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
+ silent! let @/ = keepregslash
+" call Dret("netrw#Explore : no files matched pattern")
+ return
+ endtry
+ let s:netrw_curdir = b:netrw_curdir
+ let w:netrw_explore_list = getqflist()
+ let w:netrw_explore_list = map(w:netrw_explore_list,'s:netrw_curdir."/".bufname(v:val.bufnr)')
+
+ elseif starpat == 3
+ " starpat=3: Explore */filepat (search in current directory for filenames matching filepat)
+" call Decho("starpat=".starpat.": build */filepat list")
+ let dirname = substitute(dirname,'^\*/','','')
+ let w:netrw_explore_list= split(expand(b:netrw_curdir."/".dirname),'\n')
+ if &hls | let keepregslash= s:ExplorePatHls(dirname) | endif
+
+ elseif starpat == 4
+ " starpat=4: Explore **/filepat (recursive descent search for filenames matching filepat)
+" call Decho("starpat=".starpat.": build **/filepat list")
+ let w:netrw_explore_list= split(expand(b:netrw_curdir."/".dirname),'\n')
+ if &hls | let keepregslash= s:ExplorePatHls(dirname) | endif
+ endif " switch on starpat to build w:netrw_explore_list
+
+ let w:netrw_explore_listlen = len(w:netrw_explore_list)
+" 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
+ silent! let @+ = keepregstar
+ silent! let @/ = keepregslash
+" call Dret("netrw#Explore : no files matched")
+ return
+ endif
+ endif " if indx ... endif
+
+ " NetrwStatusLine support - for exploring support
+ let w:netrw_explore_indx= indx
+" call Decho("explorelist<".join(w:netrw_explore_list,',')."> len=".w:netrw_explore_listlen)
+
+ " wrap the indx around, but issue a note
+ if indx >= w:netrw_explore_listlen || indx < 0
+" call Decho("wrap indx (indx=".indx." listlen=".w:netrw_explore_listlen.")")
+ let indx = (indx < 0)? ( w:netrw_explore_listlen - 1 ) : 0
+ let w:netrw_explore_indx= indx
+ call netrw#ErrorMsg(s:NOTE,"no more files match Explore pattern",43)
+ sleep 1
+ endif
+
+ exe "let dirfile= w:netrw_explore_list[".indx."]"
+" call Decho("dirfile=w:netrw_explore_list[indx=".indx."]= <".dirfile.">")
+ let newdir= substitute(dirfile,'/[^/]*$','','e')
+" call Decho("newdir<".newdir.">")
+
+" call Decho("calling LocalBrowseCheck(newdir<".newdir.">)")
+ 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")
+ else
+ 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()}')
+" call Decho("explore: mtchcnt=".w:netrw_explore_mtchcnt." bufnr=".w:netrw_explore_bufnr." line#".w:netrw_explore_line)
+
+ 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
+ silent! let @+ = keepregstar
+ silent! let @/ = keepregslash
+" call Dret("netrw#Explore : missing +path_extra")
+ return
+ endif
+
+ else
+" call Decho("case Explore newdir<".dirname.">")
+ if exists("w:netrw_liststyle") && w:netrw_liststyle == s:TREELIST && dirname =~ '/'
+ silent! unlet w:netrw_treedict
+ silent! unlet w:netrw_treetop
+ endif
+ let newdir= dirname
+ if !exists("b:netrw_curdir")
+ call netrw#LocalBrowseCheck(getcwd())
+ else
+ call netrw#LocalBrowseCheck(s:NetrwBrowseChgDir(1,newdir))
+ endif
+ endif
+
+ " visual display of **/ **// */ Exploration files
+ if exists("w:netrw_explore_indx") && exists("b:netrw_curdir")
+ if !exists("s:explore_prvdir") || s:explore_prvdir != b:netrw_curdir
+ " only update match list if current directory isn't the same as before
+ let s:explore_prvdir = b:netrw_curdir
+ let s:explore_match = ""
+ let dirlen = strlen(b:netrw_curdir)
+ if b:netrw_curdir !~ '/$'
+ let dirlen= dirlen + 1
+ endif
+ let prvfname= ""
+ for fname in w:netrw_explore_list
+" call Decho("fname<".fname.">")
+ if fname =~ '^'.b:netrw_curdir
+ if s:explore_match == ""
+ let s:explore_match= '\<'.escape(strpart(fname,dirlen),g:netrw_markfileesc."'".g:netrw_markfileesc."'").'\>'
+ else
+ let s:explore_match= s:explore_match.'\|\<'.escape(strpart(fname,dirlen),g:netrw_markfileesc."'".g:netrw_markfileesc."'").'\>'
+ endif
+ elseif fname !~ '^/' && fname != prvfname
+ if s:explore_match == ""
+ let s:explore_match= '\<'.escape(fname,g:netrw_markfileesc."'".g:netrw_markfileesc."'").'\>'
+ else
+ let s:explore_match= s:explore_match.'\|\<'.escape(fname,g:netrw_markfileesc."'".g:netrw_markfileesc."'").'\>'
+ endif
+ endif
+ let prvfname= fname
+ endfor
+" call Decho("explore_match<".s:explore_match.">")
+ exe "2match netrwMarkFile /".s:explore_match."/"
+ endif
+ echo "<s-up>==Pexplore <s-down>==Nexplore"
+ else
+ 2match none
+ if exists("s:explore_match") | unlet s:explore_match | endif
+ if exists("s:explore_prvdir") | unlet s:explore_prvdir | endif
+ echo " "
+" call Decho("cleared explore match list")
+ endif
+
+ silent! let @* = keepregstar
+ silent! let @+ = keepregstar
+ silent! let @/ = keepregslash
+" call Dret("netrw#Explore : @/<".@/.">")
+endfun
+
+" ---------------------------------------------------------------------
" s:NetrwHide: this function is invoked by the "a" map for browsing {{{2
" and switches the hiding mode. The actual hiding is done by
" s:NetrwListHide().
@@ -2672,12 +3428,12 @@ fun! s:NetrwHide(islocal)
" call Dfunc("NetrwHide(islocal=".a:islocal.") g:netrw_hide=".g:netrw_hide)
let svpos= netrw#NetrwSavePosn()
- if exists("s:netrwmarkfilelist")
-" call Decho(((g:netrw_hide == 1)? "unhide" : "hide")." files in markfilelist<".string(s:netrwmarkfilelist).">")
+ if exists("s:netrwmarkfilelist_{bufnr('%')}")
+" call Decho(((g:netrw_hide == 1)? "unhide" : "hide")." files in markfilelist<".string(s:netrwmarkfilelist_{bufnr("%")}).">")
" call Decho("g:netrw_list_hide<".g:netrw_list_hide.">")
" hide the files in the markfile list
- for fname in s:netrwmarkfilelist
+ for fname in s:netrwmarkfilelist_{bufnr("%")}
" call Decho("match(g:netrw_list_hide<".g:netrw_list_hide.'> fname<\<'.fname.'\>>)='.match(g:netrw_list_hide,'\<'.fname.'\>')." isk=".&isk)
if match(g:netrw_list_hide,'\<'.fname.'\>') != -1
" remove fname from hiding list
@@ -2695,8 +3451,8 @@ fun! s:NetrwHide(islocal)
" call Decho("hide: g:netrw_list_hide<".g:netrw_list_hide.">")
endif
endfor
- unlet s:netrwmarkfilelist
- unlet s:netrwmarkfilemtch
+ unlet s:netrwmarkfilelist_{bufnr("%")}
+ unlet s:netrwmarkfilemtch_{bufnr("%")}
2match none
let g:netrw_hide= 1
@@ -2718,6 +3474,28 @@ fun! s:NetrwHide(islocal)
endfun
" ---------------------------------------------------------------------
+" s:NetrwHidden: invoked by "gh" {{{2
+fun! s:NetrwHidden(islocal)
+" call Dfunc("s:NetrwHidden()")
+ " save current position
+ let svpos= netrw#NetrwSavePosn()
+
+ if g:netrw_list_hide =~ '\(^\|,\)\\(^\\|\\s\\s\\)\\zs\\.\\S\\+'
+ " remove pattern from hiding list
+ let g:netrw_list_hide= substitute(g:netrw_list_hide,'\(^\|,\)\\(^\\|\\s\\s\\)\\zs\\.\\S\\+','','')
+ elseif strlen(g:netrw_list_hide) >= 1
+ let g:netrw_list_hide= g:netrw_list_hide . ',\(^\|\s\s\)\zs\.\S\+'
+ else
+ let g:netrw_list_hide= '\(^\|\s\s\)\zs\.\S\+'
+ endif
+
+ " refresh screen and return to saved position
+ call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,'./'))
+ call netrw#NetrwRestorePosn(svpos)
+" call Dret("s:NetrwHidden")
+endfun
+
+" ---------------------------------------------------------------------
" s:NetrwLeftmouse: handles the <leftmouse> when in a netrw browsing window {{{2
fun! s:NetrwLeftmouse(islocal)
" call Dfunc("s:NetrwLeftmouse(islocal=".a:islocal.")")
@@ -2816,6 +3594,101 @@ fun! s:NetSortSequence(islocal)
endfun
" ---------------------------------------------------------------------
+" s:NetrwMakeDir: this function makes a directory (both local and remote) {{{2
+fun! s:NetrwMakeDir(usrhost)
+" call Dfunc("NetrwMakeDir(usrhost<".a:usrhost.">)")
+
+ " get name of new directory from user. A bare <CR> will skip.
+ " if its currently a directory, also request will be skipped, but with
+ " a message.
+ call inputsave()
+ let newdirname= input("Please give directory name: ")
+ call inputrestore()
+" call Decho("newdirname<".newdirname.">")
+
+ if newdirname == ""
+" call Dret("NetrwMakeDir : user aborted with bare <cr>")
+ return
+ endif
+
+ if a:usrhost == ""
+" call Decho("local mkdir")
+
+ " Local mkdir:
+ " sanity checks
+ let fullnewdir= b:netrw_curdir.'/'.newdirname
+" call Decho("fullnewdir<".fullnewdir.">")
+ if isdirectory(fullnewdir)
+ if !exists("g:netrw_quiet")
+ call netrw#ErrorMsg(s:WARNING,"<".newdirname."> is already a directory!",24)
+ endif
+" call Dret("NetrwMakeDir : directory<".newdirname."> exists previously")
+ return
+ endif
+ if s:FileReadable(fullnewdir)
+ if !exists("g:netrw_quiet")
+ call netrw#ErrorMsg(s:WARNING,"<".newdirname."> is already a file!",25)
+ endif
+" call Dret("NetrwMakeDir : file<".newdirname."> exists previously")
+ return
+ endif
+
+ " requested new local directory is neither a pre-existing file or
+ " 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)
+" call Decho("netrw_origdir<".netrw_origdir.">: lcd b:netrw_curdir<".fnameescape(b:netrw_curdir).">")
+" call Decho("exe silent! !".g:netrw_local_mkdir.' '.shellescape(newdirname))
+ exe "silent! !".g:netrw_local_mkdir.' '.shellescape(newdirname)
+ if !g:netrw_keepdir
+ exe 'keepjumps lcd '.fnameescape(netrw_origdir)
+" call Decho("netrw_keepdir=".g:netrw_keepdir.": lcd ".fnameescape(netrw_origdir)." getcwd<".getcwd().">")
+ endif
+ endif
+
+ if v:shell_error == 0
+ " refresh listing
+" call Decho("refresh listing")
+ let svpos= netrw#NetrwSavePosn()
+ call s:NetrwRefresh(1,s:NetrwBrowseChgDir(1,'./'))
+ call netrw#NetrwRestorePosn(svpos)
+ elseif !exists("g:netrw_quiet")
+ call netrw#ErrorMsg(s:ERROR,"unable to make directory<".newdirname.">",26)
+ endif
+" redraw!
+
+ elseif !exists("b:netrw_method") || b:netrw_method == 4
+ " Remote mkdir:
+" call Decho("remote mkdir")
+ let mkdircmd = s:MakeSshCmd(g:netrw_mkdir_cmd)
+ let newdirname= substitute(b:netrw_curdir,'^\%(.\{-}/\)\{3}\(.*\)$','\1','').newdirname
+" call Decho("exe silent! !".mkdircmd." ".shellescape(newdirname))
+ exe "silent! !".mkdircmd." ".shellescape(newdirname)
+ if v:shell_error == 0
+ " refresh listing
+ let svpos= netrw#NetrwSavePosn()
+ call s:NetrwRefresh(0,s:NetrwBrowseChgDir(0,'./'))
+ call netrw#NetrwRestorePosn(svpos)
+ elseif !exists("g:netrw_quiet")
+ call netrw#ErrorMsg(s:ERROR,"unable to make directory<".newdirname.">",27)
+ endif
+" redraw!
+
+ elseif b:netrw_method == 2
+ " COMBAK -- future work
+ call netrw#ErrorMsg(s:ERROR,"making directories via ftp not currently supported",68)
+ elseif b:netrw_method == 3
+ " COMBAK -- future work
+ call netrw#ErrorMsg(s:ERROR,"making directories via ftp not currently supported",68)
+ endif
+
+" call Dret("NetrwMakeDir")
+endfun
+
+" ---------------------------------------------------------------------
" s:NetrwMarkFile: (invoked by mf) This function is used to both {{{2
" mark and unmark files. If a markfile list exists,
" then the rename and delete functions will use it instead
@@ -2824,59 +3697,94 @@ endfun
" shift-leftmouse may also be used to mark files.
fun! s:NetrwMarkFile(islocal,fname)
" call Dfunc("s:NetrwMarkFile(islocal=".a:islocal." fname<".a:fname.">)")
-" call Decho("b:netrw_curdir<".b:netrw_curdir.">")
- if a:islocal && exists("b:netrw_curdir")
- exe "cd ".b:netrw_curdir
- endif
+ let curbufnr= bufnr("%")
+ let curdir = b:netrw_curdir
+ if exists("s:netrwmarkfilelist_{curbufnr}")
+ " markfile list exists
+" call Decho("starting s:netrwmarkfilelist_{curbufnr}<".string(s:netrwmarkfilelist_{curbufnr}).">")
+" call Decho("starting s:netrwmarkfilemtch_{curbufnr}<".s:netrwmarkfilemtch_{curbufnr}.">")
+
+ if index(s:netrwmarkfilelist_{curbufnr},a:fname) == -1
+ " append filename to local-directory markfilelist
+" call Decho("append filename<".a:fname."> to local markfilelist_".curbufnr."<".string(s:netrwmarkfilelist_{curbufnr}).">")
+ call add(s:netrwmarkfilelist_{curbufnr},a:fname)
+ let s:netrwmarkfilemtch_{curbufnr}= s:netrwmarkfilemtch_{curbufnr}.'\|\<'.escape(a:fname,g:netrw_markfileesc."'".g:netrw_markfileesc."'").'\>'
- if exists("s:netrwmarkfilelist")
-" call Decho("starting s:netrwmarkfilelist<".string(s:netrwmarkfilelist).">")
-" call Decho("starting s:netrwmarkfilemtch<".s:netrwmarkfilemtch.">")
-
- if index(s:netrwmarkfilelist,a:fname) == -1
- " append filename to list
-" call Decho("append filename<".a:fname."> to markfilelist<".string(s:netrwmarkfilelist).">")
- call add(s:netrwmarkfilelist,a:fname)
- let s:netrwmarkfilemtch= s:netrwmarkfilemtch.'\|\<'.escape(a:fname,'*./[\').'\>'
else
- " remove filename from list
-" call Decho("remove filename<".a:fname."> from markfilelist<".string(s:netrwmarkfilelist).">")
- call filter(s:netrwmarkfilelist,'v:val != a:fname')
- if s:netrwmarkfilelist == []
- unlet s:netrwmarkfilelist
- unlet s:netrwmarkfilemtch
+ " remove filename from local markfilelist
+" call Decho("remove filename<".a:fname."> from local markfilelist_".curbufnr."<".string(s:netrwmarkfilelist_{curbufnr}).">")
+ call filter(s:netrwmarkfilelist_{curbufnr},'v:val != a:fname')
+ if s:netrwmarkfilelist_{curbufnr} == []
+ " local markfilelist is empty; remove it entirely
+" call Decho("markfile list now empty, unlet s:netrwmarkfilelist_".curbufnr." and ...mtch_".curbufnr)
+ call s:NetrwUnmarkList(curbufnr,curdir)
else
- let s:netrwmarkfilemtch= substitute(s:netrwmarkfilemtch,'\\<'.a:fname.'\\>','','')
- let s:netrwmarkfilemtch= substitute(s:netrwmarkfilemtch,'\\|\\|','\\|','g')
- let s:netrwmarkfilemtch= substitute(s:netrwmarkfilemtch,'^\\|\|\\|$','','')
-" call Decho("ending s:netrwmarkfilelist<".string(s:netrwmarkfilelist).">")
-" call Decho("ending s:netrwmarkfilemtch<".s:netrwmarkfilemtch.">")
+ " rebuild match list to display markings correctly
+" call Decho("rebuild s:netrwmarkfilemtch_".curbufnr)
+ let s:netrwmarkfilemtch_{curbufnr}= ""
+ let first = 1
+ for fname in s:netrwmarkfilelist_{curbufnr}
+ if first
+ let s:netrwmarkfilemtch_{curbufnr}= s:netrwmarkfilemtch_{curbufnr}.'\<'.escape(fname,g:netrw_markfileesc."'".g:netrw_markfileesc."'").'\>'
+ else
+ let s:netrwmarkfilemtch_{curbufnr}= s:netrwmarkfilemtch_{curbufnr}.'\|\<'.escape(fname,g:netrw_markfileesc."'".g:netrw_markfileesc."'").'\>'
+ endif
+ let first= 0
+ endfor
+" call Decho("ending s:netrwmarkfilelist_"curbufnr."<".string(s:netrwmarkfilelist_{curbufnr}).">")
+" call Decho("ending s:netrwmarkfilemtch_"curbufnr."<".s:netrwmarkfilemtch_{curbufnr}.">")
endif
endif
else
+ " initialize new markfilelist
-" call Decho("add fname<".a:fname."> to new markfilelist")
- let s:netrwmarkfilelist= []
- call add(s:netrwmarkfilelist,a:fname)
-" call Decho("ending s:netrwmarkfilelist<".string(s:netrwmarkfilelist).">")
+" call Decho("add fname<".a:fname."> to new markfilelist_".curbufnr)
+ let s:netrwmarkfilelist_{curbufnr}= []
+ call add(s:netrwmarkfilelist_{curbufnr},a:fname)
+" call Decho("ending s:netrwmarkfilelist_{curbufnr}<".string(s:netrwmarkfilelist_{curbufnr}).">")
+ " build initial markfile matching pattern
if a:fname =~ '/$'
- let s:netrwmarkfilemtch= '\<'.escape(a:fname,'*./[\')
+ let s:netrwmarkfilemtch_{curbufnr}= '\<'.escape(a:fname,g:netrw_markfileesc)
else
- let s:netrwmarkfilemtch= '\<'.escape(a:fname,'*./[\').'\>'
+ let s:netrwmarkfilemtch_{curbufnr}= '\<'.escape(a:fname,g:netrw_markfileesc).'\>'
endif
-" call Decho("ending s:netrwmarkfilemtch<".s:netrwmarkfilemtch.">")
+" call Decho("ending s:netrwmarkfilemtch_".curbufnr."<".s:netrwmarkfilemtch_{curbufnr}.">")
endif
- if exists("s:netrwmarkfilemtch") && s:netrwmarkfilemtch != ""
-" call Decho("exe 2match netrwMarkFile /".s:netrwmarkfilemtch."/")
- exe "2match netrwMarkFile /".s:netrwmarkfilemtch."/"
+ " handle global markfilelist
+ if exists("s:netrwmarkfilelist")
+ let dname= s:ComposePath(b:netrw_curdir,a:fname)
+ if index(s:netrwmarkfilelist,dname) == -1
+ " append new filename to global markfilelist
+ call add(s:netrwmarkfilelist,s:ComposePath(b:netrw_curdir,a:fname))
+" call Decho("append filename<".a:fname."> to global markfilelist<".string(s:netrwmarkfilelist).">")
+ else
+ " remove new filename from global markfilelist
+" call Decho("filter(".string(s:netrwmarkfilelist).",'v:val != '.".dname.")")
+ call filter(s:netrwmarkfilelist,'v:val != "'.dname.'"')
+" call Decho("ending s:netrwmarkfilelist <".string(s:netrwmarkfilelist).">")
+ if s:netrwmarkfilelist == []
+ unlet s:netrwmarkfilelist
+ endif
+ endif
+ else
+ " initialize new global-directory markfilelist
+ let s:netrwmarkfilelist= []
+ call add(s:netrwmarkfilelist,s:ComposePath(b:netrw_curdir,a:fname))
+" call Decho("init s:netrwmarkfilelist<".string(s:netrwmarkfilelist).">")
+ endif
+
+ " set up 2match'ing to netrwmarkfilemtch list
+ if exists("s:netrwmarkfilemtch_{curbufnr}") && s:netrwmarkfilemtch_{curbufnr} != ""
+" call Decho("exe 2match netrwMarkFile /".s:netrwmarkfilemtch_{curbufnr}."/")
+ exe "2match netrwMarkFile /".s:netrwmarkfilemtch_{curbufnr}."/"
else
" call Decho("2match none")
2match none
endif
-" call Dret("s:NetrwMarkFile : netrwmarkfilelist".(exists("s:netrwmarkfilelist")? string(s:netrwmarkfilelist) : " doesn't exist"))
+" call Dret("s:NetrwMarkFile : netrwmarkfilelist_".curbufnr."<".(exists("s:netrwmarkfilelist_{curbufnr}")? string(s:netrwmarkfilelist_{curbufnr}) : " doesn't exist").">")
endfun
" ---------------------------------------------------------------------
@@ -2889,22 +3797,28 @@ endfun
" g:netrw_decompress = { ".gz" : "gunzip" , ".bz2" : "bunzip2" , ".zip" : "unzip" , ".tar" : "tar -xf"}
fun! s:NetrwMarkFileCompress(islocal)
" call Dfunc("s:NetrwMarkFileCompress(islocal=".a:islocal.")")
- let svpos= netrw#NetrwSavePosn()
- if a:islocal && exists("b:netrw_curdir")
- exe "cd ".b:netrw_curdir
- endif
+ let svpos = netrw#NetrwSavePosn()
+ let curdir = b:netrw_curdir
+ let curbufnr = bufnr("%")
- if exists("s:netrwmarkfilelist") && exists("g:netrw_compress") && exists("g:netrw_decompress")
- for fname in s:netrwmarkfilelist
+ if exists("s:netrwmarkfilelist_{curbufnr}") && exists("g:netrw_compress") && exists("g:netrw_decompress")
+ for fname in s:netrwmarkfilelist_{curbufnr}
" for every filename in the marked list
for sfx in sort(keys(g:netrw_decompress))
if fname =~ '\'.sfx.'$'
" fname has a suffix indicating that its compressed; apply associated decompression routine
let exe= g:netrw_decompress[sfx]
" call Decho("fname<".fname."> is compressed so decompress with <".exe.">")
+ if a:islocal
+ if g:netrw_keepdir
+ let fname= s:ComposePath(curdir,fname)
+ endif
+ else
+ let fname= b:netrw_curdir.fname
+ endif
if executable(exe)
if a:islocal
- call system(exe." ".fname)
+ call system(exe." ".fname)
else
call s:RemoteSystem(exe." ".fname)
endif
@@ -2918,15 +3832,13 @@ fun! s:NetrwMarkFileCompress(islocal)
unlet exe
elseif a:islocal
" fname not a compressed file, so compress it
- call system(g:netrw_compress." ".fname)
+ call system(g:netrw_compress." ".s:ComposePath(b:netrw_curdir,fname))
else
" fname not a compressed file, so compress it
call s:RemoteSystem(g:netrw_compress." ".fname)
endif
endfor
- unlet s:netrwmarkfilelist
- unlet s:netrwmarkfilemtch
- 2match none
+ call s:NetrwUnmarkList(curbufnr,curdir)
call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,'./'))
call netrw#NetrwRestorePosn(svpos)
endif
@@ -2937,87 +3849,78 @@ endfun
" s:NetrwMarkFileCopy: (invoked by mc) copy marked files to target {{{2
" If no marked files, then set up directory as the
" target. Currently does not support copying entire
-" directories.
+" directories. Uses the local-buffer marked file list.
" Returns 1=success (used by NetrwMarkFileMove())
" 0=failure
fun! s:NetrwMarkFileCopy(islocal)
" call Dfunc("s:NetrwMarkFileCopy(islocal=".a:islocal.") target<".(exists("s:netrwmftgt")? s:netrwmftgt : '---').">")
- if a:islocal && exists("b:netrw_curdir")
- exe "cd ".b:netrw_curdir
- endif
-
- " s:netrwmarkfilelist: the List of marked files
- if exists("s:netrwmarkfilelist")
-" call Decho("s:netrwmarkfilelist<".string(s:netrwmarkfilelist).">")
-" call Decho("s:netrwmarkfilemtch<".string(s:netrwmarkfilemtch).">")
- let svpos= netrw#NetrwSavePosn()
- " s:netrwmftgt : name of directory to copy files to
- " s:netrwmfloc : =0 target directory is remote
- " =1 target directory is local
- if exists("s:netrwmftgt") && exists("s:netrwmfloc")
-" call Decho("s:netrwmftgt<".s:netrwmftgt.">")
-" call Decho("s:netrwmfloc=".s:netrwmfloc)
-
- for fname in s:netrwmarkfilelist
-" call Decho("s:NetrwMarkFileCopy: fname<".fname.">")
-
- " sanity check
- if (a:islocal && isdirectory(fname)) || (!a:islocal && fname =~ '/$')
- call netrw#ErrorMsg(s:ERROR,"currently netrw can't copy entire directories such as <".fname.">",58)
-" call Dret("s:NetrwMarkFileCopy 0 : currently netrw can't copy entire directories")
- return 0
- endif
-
- if a:islocal && s:netrwmfloc
- " local to local copy
-" call Decho("local to local copy: getcwd<".getcwd()."> b:netrw_curdir<".b:netrw_curdir.">")
- if executable(g:netrw_localcopycmd)
-" call Decho("let ret= system(".g:netrw_localcopycmd." ".fname." ".s:netrwmftgt.")")
- let ret= system(g:netrw_localcopycmd." ".fname." ".s:netrwmftgt)
- if v:shell_error < 0
- call netrw#ErrorMsg(s:ERROR,"command<".g:netrw_localcopycmd."> failed, aborting",54)
- break
- endif
- else
- call netrw#ErrorMsg(s:ERROR,"command<".g:netrw_localcopycmd."> is not executable!",57)
- break
- endif
-
- elseif !a:islocal && s:netrwmfloc
- " remote to local copy
-" call Decho("remote to local copy: getcwd<".getcwd()."> b:netrw_curdir<".b:netrw_curdir.">")
- call netrw#NetrwObtain(a:islocal,fname,s:netrwmftgt)
-
- elseif a:islocal && !s:netrwmfloc
- " local to remote copy
-" call Decho("local to remote copy: getcwd<".getcwd()."> b:netrw_curdir<".b:netrw_curdir.">")
- call s:NetrwUpload(fname,s:netrwmftgt)
-
- else
- " remote to remote copy
-" call Decho("remote to remote copy")
- call s:NetrwUpload(fname,s:netrwmftgt)
- endif
- endfor
-
- " unmark marked file list (although I expect s:NetrwUpload()
- " to do it, I'm just making sure)
- if exists("s:netrwmarkfilelist")
- unlet s:netrwmarkfilelist
- unlet s:netrwmarkfilemtch
- 2match none
- endif
+ " sanity checks
+ if !exists("s:netrwmarkfilelist_{bufnr('%')}") || empty(s:netrwmarkfilelist_{bufnr('%')})
+ call netrw#ErrorMsg(2,"there are no marked files in this window (:help netrw-mf)",66)
+" call Dret("s:NetrwMarkFileCopy 0")
+ return 0
+ endif
+" call Decho("sanity chk passed: s:netrwmarkfilelist_".bufnr('%')."<".string(s:netrwmarkfilelist_{bufnr('%')}))
+ if !exists("s:netrwmftgt")
+ call netrw#ErrorMsg(2,"your marked file target is empty! (:help netrw-mt)",67)
+" call Dret("s:NetrwMarkFileCopy 0")
+ return 0
+ endif
+" call Decho("sanity chk passed: s:netrwmftgt<".s:netrwmftgt.">")
+ let curdir = b:netrw_curdir
+ let curbufnr = bufnr("%")
+
+ if a:islocal && s:netrwmftgt_islocal
+ " Copy marked files, local directory to local directory
+" call Decho("copy from local to local")
+ let args= join(map(copy(s:netrwmarkfilelist_{bufnr('%')}),"b:netrw_curdir.\"/\".shellescape(v:val)"))
+" call Decho("system(".g:netrw_localcopycmd." ".args." ".shellescape(s:netrwmftgt).")")
+ call system(g:netrw_localcopycmd." ".args." ".shellescape(s:netrwmftgt))
+
+ elseif a:islocal && !s:netrwmftgt_islocal
+ " Copy marked files, local directory to remote directory
+" call Decho("copy from local to remote")
+ call s:NetrwUpload(s:netrwmarkfilelist_{bufnr('%')},s:netrwmftgt)
+
+ elseif !a:islocal && s:netrwmftgt_islocal
+" call Decho("copy from remote to local")
+ call netrw#NetrwObtain(a:islocal,s:netrwmarkfilelist_{bufnr('%')},s:netrwmftgt)
+
+ elseif !a:islocal && !s:netrwmftgt_islocal
+" call Decho("copy from remote to remote")
+ let curdir = getcwd()
+ let tmpdir = s:GetTempfile("")
+ if tmpdir !~ '/'
+ let tmpdir= curdir."/".tmpdir
+ endif
+ if exists("*mkdir")
+ call mkdir(tmpdir)
else
- call netrw#ErrorMsg(s:ERROR,"missing a markfile copy target! (see help for netrw-mt)",56)
+ exe "silent! !".g:netrw_local_mkdir.' '.shellescape(tmpdir)
+ endif
+ if isdirectory(tmpdir)
+ exe "keepjumps lcd ".fnameescape(tmpdir)
+ call netrw#NetrwObtain(a:islocal,s:netrwmarkfilelist_{bufnr('%')},tmpdir)
+ let localfiles= map(copy(s:netrwmarkfilelist_{bufnr('%')}),'substitute(v:val,"^.*/","","")')
+ call s:NetrwUpload(localfiles,s:netrwmftgt)
+ if getcwd() == tmpdir
+ for fname in s:netrwmarkfilelist_{bufnr('%')}
+ call s:System("delete",fname)
+ endfor
+ exe "keepjumps lcd ".fnameescape(curdir)
+ exe "silent !".g:netrw_local_rmdir." ".fnameescape(tmpdir)
+ else
+ exe "keepjumps lcd ".fnameescape(curdir)
+ endif
endif
-
- " refresh the listing
- call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,'./'))
- call netrw#NetrwRestorePosn(svpos)
- else
- call netrw#ErrorMsg(s:ERROR,"no files marked!",59)
endif
+
+ " remove markings from local buffer
+ call s:NetrwUnmarkList(curbufnr,curdir)
+
+ " refresh buffers
+ call s:NetrwRefreshDir(s:netrwmftgt_islocal,s:netrwmftgt)
" call Dret("s:NetrwMarkFileCopy 1")
return 1
@@ -3027,15 +3930,14 @@ endfun
" s:NetrwMarkFileDiff: (invoked by md) This function is used to {{{2
" invoke vim's diff mode on the marked files.
" Either two or three files can be so handled.
+" Uses the global marked file list.
fun! s:NetrwMarkFileDiff(islocal)
" call Dfunc("s:NetrwMarkFileDiff(islocal=".a:islocal.") b:netrw_curdir<".b:netrw_curdir.">")
- if a:islocal && exists("b:netrw_curdir")
- exe "cd ".b:netrw_curdir
- endif
- if exists("s:netrwmarkfilelist")
- let curdir= b:netrw_curdir
+ let curbufnr= bufnr("%")
+ if exists("s:netrwmarkfilelist_{curbufnr}")
- let cnt= 0
+ let cnt = 0
+ let curdir = b:netrw_curdir
for fname in s:netrwmarkfilelist
let cnt= cnt + 1
if !a:islocal
@@ -3055,28 +3957,35 @@ fun! s:NetrwMarkFileDiff(islocal)
break
endif
endfor
- unlet s:netrwmarkfilelist
- unlet s:netrwmarkfilemtch
- 2match none
+ call s:NetrwUnmarkList(curbufnr,curdir)
endif
" call Dret("s:NetrwMarkFileDiff")
endfun
" ---------------------------------------------------------------------
" s:NetrwMarkFileEdit: (invoked by me) put marked files on arg list and start editing them {{{2
+" Uses global markfilelist
fun! s:NetrwMarkFileEdit(islocal)
" call Dfunc("s:NetrwMarkFileEdit(islocal=".a:islocal.")")
- if a:islocal && exists("b:netrw_curdir")
- exe "cd ".b:netrw_curdir
- endif
- if exists("s:netrwmarkfilelist")
- call s:SetRexDir(a:islocal,b:netrw_curdir)
- let flist= substitute(escape(join(s:netrwmarkfilelist,"\t"),' '),"\t",' ','g')
- " unmark marked file list
- unlet s:netrwmarkfilelist
- unlet s:netrwmarkfilemtch
- 2match none
+ let curdir = b:netrw_curdir
+ let curbufnr = bufnr("%")
+ if exists("s:netrwmarkfilelist_{curbufnr}")
+ call s:SetRexDir(a:islocal,curdir)
+ if a:islocal && g:netrw_keepdir
+ " use complete paths if its local and keepdir enabled
+ let flist= ""
+ for fname in s:netrwmarkfilelist
+" let flist= flist." ".s:ComposePath(curdir,fname)
+ let flist= flist." ".fname
+ endfor
+ else
+" let flist= substitute(escape(join(s:netrwmarkfilelist_{curbufnr},"\t"),' '),"\t",' ','g')
+ let flist= substitute(escape(join(s:netrwmarkfilelist,"\t"),' '),"\t",' ','g')
+ endif
+ " unmark markedfile list
+" call s:NetrwUnmarkList(curbufnr,curdir)
+ call s:NetrwUnmarkAll()
" call Decho("exe silent args ".flist)
exe "silent args ".flist
endif
@@ -3086,14 +3995,14 @@ endfun
" ---------------------------------------------------------------------
" s:NetrwMarkFileExe: (invoked by mx) execute arbitrary command on marked files, one at a time {{{2
+" Uses the local marked-file list.
fun! s:NetrwMarkFileExe(islocal)
" call Dfunc("s:NetrwMarkFileExe(islocal=".a:islocal.")")
- let svpos= netrw#NetrwSavePosn()
- if a:islocal && exists("b:netrw_curdir")
- exe "cd ".b:netrw_curdir
- endif
+ let svpos = netrw#NetrwSavePosn()
+ let curdir = b:netrw_curdir
+ let curbufnr = bufnr("%")
- if exists("s:netrwmarkfilelist")
+ if exists("s:netrwmarkfilelist_{curbufnr}")
" get the command
call inputsave()
let cmd= input("Enter command: ","","file")
@@ -3102,7 +4011,14 @@ fun! s:NetrwMarkFileExe(islocal)
" apply command to marked files. Substitute: filename -> %
" If no %, then append a space and the filename to the command
- for fname in s:netrwmarkfilelist
+ for fname in s:netrwmarkfilelist_{curbufnr}
+ if a:islocal
+ if g:netrw_keepdir
+ let fname= s:ComposePath(curdir,fname)
+ endif
+ else
+ let fname= b:netrw_curdir.fname
+ endif
if cmd =~ '%'
let xcmd= substitute(cmd,'%',fname,'g')
else
@@ -3124,84 +4040,231 @@ fun! s:NetrwMarkFileExe(islocal)
endfor
" unmark marked file list
- unlet s:netrwmarkfilelist
- unlet s:netrwmarkfilemtch
- 2match none
+ call s:NetrwUnmarkList(curbufnr,curdir)
" refresh the listing
call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,'./'))
call netrw#NetrwRestorePosn(svpos)
+ else
+ call netrw#ErrorMsg(s:ERROR,"no files marked!",59)
endif
" call Dret("s:NetrwMarkFileExe")
endfun
" ---------------------------------------------------------------------
-" s:NetrwMarkFileMove: (invoked by mm) execute arbitrary command on marked files, one at a time {{{2
-fun! s:NetrwMarkFileMove(islocal)
-" call Dfunc("s:NetrwMarkFileMove(islocal=".a:islocal.")")
- if a:islocal && exists("b:netrw_curdir")
- exe "cd ".b:netrw_curdir
+" s:NetrwMarkHideSfx: (invoked by mh) (un)hide files having same suffix
+" as the marked file(s) (toggles suffix presence)
+" Uses the local marked file list.
+fun! s:NetrwMarkHideSfx(islocal)
+" call Dfunc("s:NetrwMarkHideSfx(islocal=".a:islocal.")")
+ let svpos = netrw#NetrwSavePosn()
+ let curbufnr = bufnr("%")
+
+ " s:netrwmarkfilelist_{curbufnr}: the List of marked files
+ if exists("s:netrwmarkfilelist_{curbufnr}")
+
+ for fname in s:netrwmarkfilelist_{curbufnr}
+" call Decho("s:NetrwMarkFileCopy: fname<".fname.">")
+ " construct suffix pattern
+ if fname =~ '\.'
+ let sfxpat= "^.*".substitute(fname,'^.*\(\.[^. ]\+\)$','\1','')
+ else
+ let sfxpat= '^\%(\%(\.\)\@!.\)*$'
+ endif
+ " determine if its in the hiding list or not
+ let inhidelist= 0
+ if g:netrw_list_hide != ""
+ let itemnum = 0
+ let hidelist= split(g:netrw_list_hide,',')
+ for hidepat in hidelist
+ if sfxpat == hidepat
+ let inhidelist= 1
+ break
+ endif
+ let itemnum= itemnum + 1
+ endfor
+ endif
+" call Decho("fname<".fname."> inhidelist=".inhidelist." sfxpat<".sfxpat.">")
+ if inhidelist
+ " remove sfxpat from list
+ call remove(hidelist,itemnum)
+ let g:netrw_list_hide= join(hidelist,",")
+ elseif g:netrw_list_hide != ""
+ " append sfxpat to non-empty list
+ let g:netrw_list_hide= g:netrw_list_hide.",".sfxpat
+ else
+ " set hiding list to sfxpat
+ let g:netrw_list_hide= sfxpat
+ endif
+ endfor
+
+ " refresh the listing
+ call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,'./'))
+ call netrw#NetrwRestorePosn(svpos)
+ else
+ call netrw#ErrorMsg(s:ERROR,"no files marked!",59)
endif
+" call Dret("s:NetrwMarkHideSfx")
+endfun
+
+" ---------------------------------------------------------------------
+" s:NetrwMarkFileGrep: (invoked by mg) This function applies vimgrep to marked files {{{2
+" Uses the global markfilelist
+fun! s:NetrwMarkFileGrep(islocal)
+" call Dfunc("s:NetrwMarkFileGrep(islocal=".a:islocal.")")
+ let svpos = netrw#NetrwSavePosn()
+ let curdir = b:netrw_curdir
+ let curbufnr = bufnr("%")
+
if exists("s:netrwmarkfilelist")
- let svpos= netrw#NetrwSavePosn()
- if exists("s:netrwmftgt") && exists("s:netrwmfloc")
-
- if a:islocal && s:netrwmfloc
- " local to local move
- if executable(g:netrw_localmovecmd)
-" call Decho("let ret= system(".g:netrw_localmovecmd." ".fname." ".s:netrwmftgt.")")
- let ret= system(g:netrw_localmovecmd." ".fname." ".s:netrwmftgt)
- if v:shell_error < 0
- call netrw#ErrorMsg(s:ERROR,"command<".g:netrw_localmovecmd."> failed, aborting",54)
- break
- endif
- else
- call netrw#ErrorMsg(s:ERROR,"command<".g:netrw_localmovecmd."> is not executable!",57)
- break
- endif
- else
- " remote to local move
- " local to remote move
- " remote to remote move
- let netrwmflist = s:netrwmflist
- let netrwmfmtch = s:netrwmfmtch
- if s:NetrwMarkFileCopy(islocal)
- let s:netrwmflist= netrwmflist
- let s:netrwmfmtch= netrwmfmtch
- if a:islocal
- call s:NetrwLocalRm("---")
- else
- call s:NetrwRemoteRm("---","---")
- endif
- endif
+" call Decho("s:netrwmarkfilelist".string(s:netrwmarkfilelist).">")
+ let netrwmarkfilelist= ""
+ for fname in s:netrwmarkfilelist
+" call Decho("fname<".fname.">")
+ let fname = escape(substitute(fname,"[\"']","","g")," ")
+ let netrwmarkfilelist = netrwmarkfilelist." ".fname
+ endfor
+ call s:NetrwUnmarkAll()
+
+ " ask user for pattern
+ call inputsave()
+ let pat= input("Enter pattern: ","")
+ call inputrestore()
+ if pat !~ '^\s'
+ if pat !~ '^/'
+ let pat= '/'.pat.'/'
endif
+ let pat= " ".pat
+ endif
- " First, do a copy, then (attempt to) do a delete
+ " use vimgrep for both local and remote
+" call Decho("exe vimgrep".pat." ".netrwmarkfilelist)
+ exe "vimgrep".pat." ".netrwmarkfilelist
+ 2match none
call netrw#NetrwRestorePosn(svpos)
endif
+
+" call Dret("s:NetrwMarkFileGrep")
+endfun
+
+" ---------------------------------------------------------------------
+" s:NetrwMarkFileMove: (invoked by mm) execute arbitrary command on marked files, one at a time {{{2
+" uses the global marked file list
+" s:netrwmfloc= 0: target directory is remote
+" = 1: target directory is local
+fun! s:NetrwMarkFileMove(islocal)
+" call Dfunc("s:NetrwMarkFileMove(islocal=".a:islocal.")")
+ let curdir = b:netrw_curdir
+ let curbufnr = bufnr("%")
+
+ " sanity check
+ if !exists("s:netrwmarkfilelist_{bufnr('%')}") || empty(s:netrwmarkfilelist_{bufnr('%')})
+ call netrw#ErrorMsg(2,"there are no marked files in this window (:help netrw-mf)",66)
+" call Dret("s:NetrwMarkFileMove")
+ return
+ endif
+" call Decho("sanity chk passed: s:netrwmarkfilelist_".bufnr('%')."<".string(s:netrwmarkfilelist_{bufnr('%')}))
+ if !exists("s:netrwmftgt")
+ call netrw#ErrorMsg(2,"your marked file target is empty! (:help netrw-mt)",67)
+" call Dret("s:NetrwMarkFileCopy 0")
+ return 0
+ endif
+" call Decho("sanity chk passed: s:netrwmftgt<".s:netrwmftgt.">")
+
+ if a:islocal && s:netrwmftgt_islocal
+ " move: local -> local
+" call Decho("move from local to local")
+" call Decho("(s:NetrwMarkFileMove) local to local move")
+ if executable(g:netrw_localmovecmd)
+ for fname in s:netrwmarkfilelist_{bufnr("%")}
+" call Decho("system(".g:netrw_localmovecmd." ".shellescape(fname)." ".shellescape(s:netrwmftgt).")")
+ let ret= system(g:netrw_localmovecmd." ".shellescape(fname)." ".shellescape(s:netrwmftgt))
+ if v:shell_error < 0
+ call netrw#ErrorMsg(s:ERROR,"command<".g:netrw_localmovecmd."> failed, aborting",54)
+ break
+ endif
+ endfor
+ else
+ call netrw#ErrorMsg(s:ERROR,"command<".g:netrw_localmovecmd."> is not executable!",57)
+ break
+ endif
+
+ elseif a:islocal && !s:netrwmftgt_islocal
+ " move: local -> remote
+" call Decho("move from local to remote")
+" call Decho("copy")
+ let mflist= s:netrwmarkfilelist_{bufnr("%")}
+ call s:NetrwMarkFileCopy(a:islocal)
+" call Decho("remove")
+ for fname in mflist
+ let barefname = substitute(fname,'^\(.*/\)\(.\{-}\)$','\2','')
+ let ok = s:NetrwLocalRmFile(b:netrw_curdir,barefname,1)
+ endfor
+ unlet mflist
+
+ elseif !a:islocal && s:netrwmftgt_islocal
+ " move: remote -> local
+" call Decho("move from remote to local")
+" call Decho("copy")
+ let mflist= s:netrwmarkfilelist_{bufnr("%")}
+ call s:NetrwMarkFileCopy(a:islocal)
+" call Decho("remove")
+ for fname in mflist
+ let path = substitute(fname,'^\(.*/\)\(.\{-}\)$','\1','')
+ let barefname = substitute(fname,'^\(.*/\)\(.\{-}\)$','\2','')
+ let ok = s:NetrwRemoteRmFile(path,barefname,1)
+ endfor
+ unlet mflist
+
+ elseif !a:islocal && !s:netrwmftgt_islocal
+ " move: remote -> remote
+" call Decho("move from remote to remote")
+" call Decho("copy")
+ let mflist= s:netrwmarkfilelist_{bufnr("%")}
+ call s:NetrwMarkFileCopy(a:islocal)
+" call Decho("remove")
+ for fname in mflist
+ let path = substitute(fname,'^\(.*/\)\(.\{-}\)$','\1','')
+ let barefname = substitute(fname,'^\(.*/\)\(.\{-}\)$','\2','')
+ let ok = s:NetrwRemoteRmFile(path,barefname,1)
+ endfor
+ unlet mflist
+ endif
+
+ " cleanup
+" call Decho("cleanup")
+ call s:NetrwUnmarkList(curbufnr,curdir) " remove markings from local buffer
+ call s:NetrwRefreshDir(s:netrwmftgt_islocal,s:netrwmftgt) " refresh buffers
" call Dret("s:NetrwMarkFileMove")
endfun
" ---------------------------------------------------------------------
" s:NetrwMarkFilePrint: (invoked by mp) This function prints marked files {{{2
-" using the hardcopy command
+" using the hardcopy command. Local marked-file list only.
fun! s:NetrwMarkFilePrint(islocal)
" call Dfunc("s:NetrwMarkFilePrint(islocal=".a:islocal.")")
- if a:islocal && exists("b:netrw_curdir")
- exe "cd ".b:netrw_curdir
- endif
- if exists("s:netrwmarkfilelist")
- let netrwmarkfilelist= s:netrwmarkfilelist
- unlet s:netrwmarkfilelist
- unlet s:netrwmarkfilemtch
+ let curbufnr= bufnr("%")
+ if exists("s:netrwmarkfilelist_{curbufnr}")
+ let netrwmarkfilelist = s:netrwmarkfilelist_{curbufnr}
+ let curdir = b:netrw_curdir
+ call s:NetrwUnmarkList(curbufnr,curdir)
for fname in netrwmarkfilelist
+ if a:islocal
+ if g:netrw_keepdir
+ let fname= s:ComposePath(curdir,fname)
+ endif
+ else
+ let fname= curdir.fname
+ endif
1split
- exe "silent e ".fname
-" call Decho("hardcopy ".fname)
+ " the autocmds will handle both local and remote files
+" call Decho("exe silent e ".escape(fname,' '))
+ exe "silent e ".escape(fname,' ')
+" call Decho("hardcopy")
hardcopy
q
endfor
@@ -3211,16 +4274,11 @@ fun! s:NetrwMarkFilePrint(islocal)
endfun
" ---------------------------------------------------------------------
-
-" ===========================================
" s:NetrwMarkFileRegexp: (invoked by mr) This function is used to mark {{{2
" files when given a regexp (for which a prompt is
" issued).
fun! s:NetrwMarkFileRegexp(islocal)
" call Dfunc("s:NetrwMarkFileRegexp(islocal=".a:islocal.")")
- if a:islocal && exists("b:netrw_curdir")
- exe "cd ".b:netrw_curdir
- endif
" get the regular expression
call inputsave()
@@ -3229,8 +4287,9 @@ fun! s:NetrwMarkFileRegexp(islocal)
if a:islocal
" get the matching list of files using local glob()
- let dirname = escape(b:netrw_curdir,s:netrw_glob_escape)
- let filelist = glob(s:ComposePath(dirname,regexp))
+" call Decho("handle local regexp")
+ let dirname = escape(b:netrw_curdir,g:netrw_glob_escape)
+ let filelist = glob(s:ComposePath(dirname,regexp))
if filelist != ""
let filelist= filelist."\n"
endif
@@ -3250,12 +4309,14 @@ fun! s:NetrwMarkFileRegexp(islocal)
endwhile
else
+" call Decho("handle remote regexp")
" convert displayed listing into a filelist
let eikeep = &ei
let areg = @a
silent %y a
set ei=all ma
+" call Decho("set ei=all ma")
1split
enew
silent norm! "ap
@@ -3271,6 +4332,9 @@ fun! s:NetrwMarkFileRegexp(islocal)
silent %s/^| //e
silent! g/^ .*$/d
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"
let filelist= getline(1,line("$"))
q!
@@ -3286,28 +4350,58 @@ fun! s:NetrwMarkFileRegexp(islocal)
endfun
" ---------------------------------------------------------------------
-" s:NetrwMarkFileTag: (invoked by mt) This function applies {{{2
-" g:netrw_ctags to marked files
+" s:NetrwMarkFileSource: (invoked by ms) This function sources marked files {{{2
+" Uses the local marked file list.
+fun! s:NetrwMarkFileSource(islocal)
+" call Dfunc("s:NetrwMarkFileSource(islocal=".a:islocal.")")
+ let curbufnr= bufnr("%")
+ if exists("s:netrwmarkfilelist_{curbufnr}")
+ let netrwmarkfilelist = s:netrwmarkfilelist_{bufnr("%")}
+ let curdir = b:netrw_curdir
+ call s:NetrwUnmarkList(curbufnr,curdir)
+ for fname in netrwmarkfilelist
+ if a:islocal
+ if g:netrw_keepdir
+ let fname= s:ComposePath(curdir,fname)
+ endif
+ else
+ let fname= curdir.fname
+ endif
+ " the autocmds will handle sourcing both local and remote files
+" call Decho("exe so ".escape(fname,' '))
+ exe "so ".escape(fname,' ')
+ endfor
+ 2match none
+ endif
+" call Dret("s:NetrwMarkFileSource")
+endfun
+
+" ---------------------------------------------------------------------
+" s:NetrwMarkFileTag: (invoked by mT) This function applies g:netrw_ctags to marked files {{{2
+" Uses the global markfilelist
fun! s:NetrwMarkFileTag(islocal)
" call Dfunc("s:NetrwMarkFileTag(islocal=".a:islocal.")")
- let svpos= netrw#NetrwSavePosn()
- if a:islocal && exists("b:netrw_curdir")
- exe "cd ".b:netrw_curdir
- endif
+ let svpos = netrw#NetrwSavePosn()
+ let curdir = b:netrw_curdir
+ let curbufnr = bufnr("%")
if exists("s:netrwmarkfilelist")
-" call Decho("s:netrwmarkfilelist<".string(s:netrwmarkfilelist).">")
- let netrwmarkfilelist= string(s:netrwmarkfilelist)
- unlet s:netrwmarkfilelist
- unlet s:netrwmarkfilemtch
- let netrwmarkfilelist= substitute(netrwmarkfilelist,'[[\],]','','g')
-" call Decho("netrwmarkfilelist<".netrwmarkfilelist.">")
+" call Decho("s:netrwmarkfilelist".string(s:netrwmarkfilelist).">")
+ if a:islocal && g:netrw_keepdir
+ let netrwmarkfilelist= ""
+ for fname in s:netrwmarkfilelist
+" let netrwmarkfilelist= netrwmarkfilelist." ".s:ComposePath(curdir,fname)
+ let netrwmarkfilelist= netrwmarkfilelist." ".fname
+ endfor
+ else
+ let netrwmarkfilelist= string(s:netrwmarkfilelist)
+ let netrwmarkfilelist= substitute(netrwmarkfilelist,'[[\],]','','g')
+ endif
+ call s:NetrwUnmarkAll()
if a:islocal
if executable(g:netrw_ctags)
- if g:netrw_shq != "'"
- let netrwmarkfilelist= substitute(netrwmarkfilelist,"'",g:netrw_shq,'g')
- endif
+ call map(netrwmarkfilelist,"shellescape(v:val)")
" call Decho("call system(".g:netrw_ctags." ".netrwmarkfilelist.")")
call system(g:netrw_ctags." ".netrwmarkfilelist)
else
@@ -3336,44 +4430,236 @@ endfun
" s:NetrwMarkFileTgt: (invoked by mt) This function sets up a marked file target {{{2
" Sets up two variables,
" s:netrwmftgt : holds the target directory
-" s:netrwmfloc : 0=target directory is remote
+" s:netrwmftgt_islocal : 0=target directory is remote
" 1=target directory is local
fun! s:NetrwMarkFileTgt(islocal)
" call Dfunc("s:NetrwMarkFileTgt(islocal=".a:islocal.")")
- let svpos= netrw#NetrwSavePosn()
- if a:islocal && exists("b:netrw_curdir")
- exe "cd ".b:netrw_curdir
+ let svpos = netrw#NetrwSavePosn()
+ let curdir = b:netrw_curdir
+ let hadtgt = exists("s:netrwmftgt")
+ if !exists("w:netrw_bannercnt")
+ let w:netrw_bannercnt= b:netrw_bannercnt
endif
- if exists("s:netrwmftgt") || exists("s:netrwmfloc")
-" call Decho("s:netrwmftgt<".s:netrwmftgt."> exists; removing it")
- silent! unlet s:netrwmftgt s:netrwmfloc
+ " set up target
+ if line(".") < w:netrw_bannercnt
+ " if cursor in banner region, use b:netrw_curdir for the target
+ let s:netrwmftgt= b:netrw_curdir
+" call Decho("inbanner: s:netrwmftgt<".s:netrwmftgt.">")
+
else
-" call Decho("s:netrwmftgt doesn't exist; setting it to <".b:netrw_curdir.">")
- let s:netrwmftgt = b:netrw_curdir
- let s:netrwmfloc = a:islocal
- if g:netrw_cygwin
- let s:netrwmftgt= substitute(system("cygpath ".b:netrw_curdir),'\n$','','')
+ " get word under cursor.
+ " * If directory, use it for the target.
+ " * If file, use b:netrw_curdir for the target
+ let curword= s:NetrwGetWord()
+ let tgtdir = s:ComposePath(curdir,curword)
+ if a:islocal && isdirectory(tgtdir)
+ let s:netrwmftgt = tgtdir
+" call Decho("local isdir: s:netrwmftgt<".s:netrwmftgt.">")
+ elseif !a:islocal && tgtdir =~ '/$'
+ let s:netrwmftgt = tgtdir
+" call Decho("remote isdir: s:netrwmftgt<".s:netrwmftgt.">")
+ else
+ let s:netrwmftgt = curdir
+" call Decho("isfile: s:netrwmftgt<".s:netrwmftgt.">")
endif
endif
+ if a:islocal
+ " simplify the target (eg. /abc/def/../ghi -> /abc/ghi)
+ let s:netrwmftgt= simplify(s:netrwmftgt)
+" call Decho("simplify: s:netrwmftgt<".s:netrwmftgt.">")
+ endif
+ if g:netrw_cygwin
+ let s:netrwmftgt= substitute(system("cygpath ".s:netrwmftgt),'\n$','','')
+ endif
+ let s:netrwmftgt_islocal= a:islocal
+ if g:netrw_fastbrowse > 0
+ call s:LocalBrowseShellCmdRefresh()
+ endif
call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,'./'))
call netrw#NetrwRestorePosn(svpos)
+ if !hadtgt
+ norm! j
+ endif
+
" call Dret("s:NetrwMarkFileTgt")
endfun
-" ===========================================
-" s:NetrwObtain: obtain file under cursor or from markfile list {{{2
-fun! s:NetrwObtain(islocal)
-" call Dfunc("NetrwObtain(islocal=".a:islocal.")")
+" ---------------------------------------------------------------------
+" s:NetrwUnmarkList: delete local marked file lists and remove their contents from the global marked-file list {{{2
+fun! s:NetrwUnmarkList(curbufnr,curdir)
+" call Dfunc("s:NetrwUnmarkList(curbufnr=".a:curbufnr." curdir<".a:curdir.">)")
+
+ " remove all files in local marked-file list from global list
+ if exists("s:netrwmarkfilelist_{a:curbufnr}")
+ for mfile in s:netrwmarkfilelist_{a:curbufnr}
+ let dfile = s:ComposePath(a:curdir,mfile) " prepend directory to mfile
+ let idx = index(s:netrwmarkfilelist,dfile) " get index in list of dfile
+ call remove(s:netrwmarkfilelist,idx) " remove from global list
+ endfor
+ if s:netrwmarkfilelist == []
+ unlet s:netrwmarkfilelist
+ endif
+
+ " getting rid of the local marked-file lists is easy
+ unlet s:netrwmarkfilelist_{a:curbufnr}
+ endif
+ if exists("s:netrwmarkfilemtch_{a:curbufnr}")
+ unlet s:netrwmarkfilemtch_{a:curbufnr}
+ endif
+ 2match none
+" call Dret("s:NetrwUnmarkList")
+endfun
+" ---------------------------------------------------------------------
+" s:NetrwUnmarkAll: remove the global marked file list and all local ones {{{2
+fun! s:NetrwUnmarkAll()
+" call Dfunc("s:NetrwUnmarkAll()")
if exists("s:netrwmarkfilelist")
- for fname in s:netrwmarkfilelist
- call netrw#NetrwObtain(a:islocal,fname)
- endfor
unlet s:netrwmarkfilelist
- unlet s:netrwmarkfilemtch
+ endif
+ silent call s:NetrwUnmarkAll2()
+ 2match none
+" call Dret("s:NetrwUnmarkAll")
+endfun
+
+" ---------------------------------------------------------------------
+" s:NetrwUnmarkAll2: {{{2
+fun! s:NetrwUnmarkAll2()
+" call Dfunc("s:NetrwUnmarkAll2()")
+ redir => netrwmarkfilelist_let
+ let
+ redir END
+ let netrwmarkfilelist_list= split(netrwmarkfilelist_let,'\n') " convert let string into a let list
+ call filter(netrwmarkfilelist_list,"v:val =~ '^s:netrwmarkfilelist_'") " retain only those vars that start as s:netrwmarkfilelist_
+ call map(netrwmarkfilelist_list,"substitute(v:val,'\\s.*$','','')") " remove what the entries are equal to
+ for flist in netrwmarkfilelist_list
+ let curbufnr= substitute(flist,'s:netrwmarkfilelist_','','')
+ unlet s:netrwmarkfilelist_{curbufnr}
+ unlet s:netrwmarkfilemtch_{curbufnr}
+ endfor
+" call Dret("s:NetrwUnmarkAll2")
+endfun
+
+" ---------------------------------------------------------------------
+" s:NetrwUnMarkFile: {{{2
+fun! s:NetrwUnMarkFile(islocal)
+" call Dfunc("s:NetrwUnMarkFile(islocal=".a:islocal.")")
+ let svpos = netrw#NetrwSavePosn()
+ let curbufnr = bufnr("%")
+
+ " unmark marked file list (although I expect s:NetrwUpload()
+ " to do it, I'm just making sure)
+ if exists("s:netrwmarkfilelist_{bufnr('%')}")
+" call Decho("unlet'ing: s:netrwmarkfile[list|mtch]_".bufnr("%"))
+ unlet s:netrwmarkfilelist
+ unlet s:netrwmarkfilelist_{curbufnr}
+ unlet s:netrwmarkfilemtch_{curbufnr}
2match none
+ endif
+
+" call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,'./'))
+ call netrw#NetrwRestorePosn(svpos)
+" call Dret("s:NetrwUnMarkFile")
+endfun
+
+" ---------------------------------------------------------------------
+" s:NetrwMenu: generates the menu for gvim and netrw {{{2
+fun! s:NetrwMenu(domenu)
+
+ if !exists("g:NetrwMenuPriority")
+ let g:NetrwMenuPriority= 80
+ endif
+
+ if has("menu") && has("gui_running") && &go =~ 'm' && g:netrw_menu
+" 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>'
+ call s:NetrwBookmarkMenu() " provide some history! uses priorities 2,3, reserves 4
+ exe 'silent! menu '.g:NetrwMenuPriority.'.5 '.g:NetrwTopLvlMenu.'-Sep1- :'
+ exe 'silent! 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 'silent! menu '.g:NetrwMenuPriority.'.8.1 '.g:NetrwTopLvlMenu.'Bookmarks\ and\ History.Bookmark\ Current\ Directory<tab>mb mb'
+ exe 'silent! menu '.g:NetrwMenuPriority.'.8.2 '.g:NetrwTopLvlMenu.'Bookmarks\ and\ History.Bookmark\ Delete<tab>mB mB'
+ exe 'silent! menu '.g:NetrwMenuPriority.'.8.3 '.g:NetrwTopLvlMenu.'Bookmarks\ and\ History.Goto\ Bookmark<tab>gb gb'
+ exe 'silent! 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 'silent! 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> \<Plug>NetrwHideEdit"
+ exe 'silent! 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 'silent! menu '.g:NetrwMenuPriority.'.9.4 '.g:NetrwTopLvlMenu.'Browsing\ Control.Refresh\ Listing<tab>'."<ctrl-l> \<Plug>NetrwRefresh"
+ exe 'silent! 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 'silent! 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 'silent! 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 'silent! 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 'silent! 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 'silent! menu '.g:NetrwMenuPriority.'.12.3 '.g:NetrwTopLvlMenu.'Explore.Files\ Containing\ Pattern\ (curdir\ only)<tab>:Explore\ *// :Explore *//'
+ exe 'silent! menu '.g:NetrwMenuPriority.'.12.4 '.g:NetrwTopLvlMenu.'Explore.Files\ Containing\ Pattern\ (+subdirs)<tab>:Explore\ **// :Explore **//'
+ exe 'silent! 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 'silent! 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 'silent! 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 'silent! 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 'silent! 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 'silent! 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 'silent! 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 'silent! 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 'silent! 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 'silent! 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 'silent! 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 'silent! 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 'silent! menu '.g:NetrwMenuPriority.'.18 '.g:NetrwTopLvlMenu.'Set\ Current\ Directory<tab>c c'
+ let s:netrw_menucnt= 28
+
+ elseif !a:domenu
+ let s:netrwcnt = 0
+ let curwin = winnr()
+ 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
+" call Decho('exe silent! unmenu '.g:NetrwTopLvlMenu.'*')
+ silent! unlet s:netrw_menu_enabled
+ endif
+ endif
+" call Dret("NetrwMenu")
+ endif
+
+endfun
+
+" ---------------------------------------------------------------------
+" s:NetrwObtain: obtain file under cursor or from markfile list {{{2
+" Used by the O maps (as <SID>NetrwObtain())
+fun! s:NetrwObtain(islocal)
+" call Dfunc("NetrwObtain(islocal=".a:islocal.")")
+
+ if exists("s:netrwmarkfilelist_{bufnr('%')}")
+ let islocal= s:netrwmarkfilelist_{bufnr("%")}[1] !~ '^\a\+://'
+ call netrw#NetrwObtain(islocal,s:netrwmarkfilelist_{bufnr("%")})
+ call s:NetrwUnmarkList(bufnr('%'),b:netrw_curdir)
else
call netrw#NetrwObtain(a:islocal,expand("<cWORD>"))
endif
@@ -3383,17 +4669,49 @@ endfun
" ---------------------------------------------------------------------
" netrw#NetrwObtain: {{{2
+" netrw#NetrwObtain(islocal,fname[,tgtdirectory])
+" islocal=0 obtain from remote source
+" =1 obtain from local source
+" fname : a filename or a list of filenames
+" tgtdir : optional place where files are to go (not present, uses getcwd())
fun! netrw#NetrwObtain(islocal,fname,...)
-" call Dfunc("netrw#NetrwObtain(islocal=".a:islocal." fname<".a:fname.">) a:0=".a:0)
+" call Dfunc("netrw#NetrwObtain(islocal=".a:islocal." fname<".((type(a:fname) == 1)? a:fname : string(a:fname)).">) a:0=".a:0)
" NetrwStatusLine support - for obtaining support
- if a:islocal
+ if type(a:fname) == 1
+ let fnamelist= [ a:fname ]
+ elseif type(a:fname) == 3
+ let fnamelist= a:fname
+ else
+ call netrw#ErrorMsg(s:ERROR,"attempting to use NetrwObtain on something not a filename or a list",62)
+" call Dret("netrw#NetrwObtain")
+ return
+ endif
+" call Decho("fnamelist<".string(fnamelist).">")
+ if a:0 > 0
+ let tgtdir= a:1
+ else
+ let tgtdir= getcwd()
+ endif
+" call Decho("tgtdir<".tgtdir.">")
- " obtain local file from getcwd() to b:netrw_curdir
+ if a:islocal
+ " obtain a file from b:netrw_curdir to getcwd()
+" call Decho("obtain a local file from ".b:netrw_curdir." to ".tgtdir
if exists("b:netrw_curdir") && getcwd() != b:netrw_curdir
- let fname= expand("<cWORD>")
- let fcopy= readfile(b:netrw_curdir."/".fname,"b")
- call writefile(fcopy,getcwd()."/".fname,"b")
+ let topath= s:ComposePath(tgtdir,"")
+ if (has("win32") || has("win95") || has("win64") || has("win16"))
+ " transfer files one at time
+ for fname in fnamelist
+" call Decho("system(".g:netrw_localcopycmd." ".fname." ".shellescape(topath).")")
+ call system(g:netrw_localcopycmd." ".fname." ".shellescape(topath))
+ endfor
+ else
+ " transfer files with one command
+ let filelist= join(map(copy(fname),"shellescape(v:val)"))
+" call Decho("system(".g:netrw_localcopycmd." ".filelist." ".shellescape(topath).")")
+ call system(g:netrw_localcopycmd." ".filelist." ".shellescape(topath))
+ endif
elseif !exists("b:netrw_curdir")
call netrw#ErrorMsg(s:ERROR,"local browsing directory doesn't exist!",36)
else
@@ -3401,173 +4719,423 @@ fun! netrw#NetrwObtain(islocal,fname,...)
endif
else
+" call Decho("obtain a remote file from ".b:netrw_curdir." to ".tgtdir)
+ if type(a:fname) == 1
+ call s:SetupNetrwStatusLine('%f %h%m%r%=%9*Obtaining '.a:fname)
+ endif
+ call s:NetrwMethod(b:netrw_curdir)
- " obtain a remote file to local directory (see tgtdir below)
- call s:SetupNetrwStatusLine('%f %h%m%r%=%9*Obtaining '.a:fname)
-
- " set up target directory (default is vim's idea of the current directory)
- if a:0 > 0
- let tgtdir= a:1
+ if b:netrw_method == 4
+ " obtain file using scp
+" call Decho("obtain via scp (method#4)")
+ if exists("g:netrw_port") && g:netrw_port != ""
+ let useport= " ".g:netrw_scpport." ".g:netrw_port
+ else
+ let useport= ""
+ endif
+ if b:netrw_fname =~ '/'
+ let path= substitute(b:netrw_fname,'^\(.*/\).\{-}$','\1','')
+ else
+ let path= ""
+ endif
+ let filelist= join(map(copy(fnamelist),'shellescape(g:netrw_machine.":".escape(path.v:val,g:netrw_fname_escape))'))
+" call Decho("exe ".s:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".filelist." ".shellescape(tgtdir))
+ exe s:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".filelist." ".shellescape(tgtdir)
+
+ elseif b:netrw_method == 2
+ " obtain file using ftp + .netrc
+" call Decho("obtain via ftp+.netrc (method #2)")
+ call s:SaveBufVars()|silent keepjumps new|call s:RestoreBufVars()
+ let tmpbufnr= bufnr("%")
+ setlocal ff=unix
+ if exists("g:netrw_ftpmode") && g:netrw_ftpmode != ""
+ exe "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")
+ exe "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('$'))
+ endfor
+ if exists("g:netrw_port") && g:netrw_port != ""
+" call Decho("executing: %!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port)
+ exe s:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port
+ else
+" call Decho("executing: %!".g:netrw_ftp_cmd." -i ".g:netrw_machine)
+ exe s:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".g:netrw_machine
+ endif
+ " If the result of the ftp operation isn't blank, show an error message (tnx to Doug Claar)
+ if getline(1) !~ "^$" && !exists("g:netrw_quiet") && getline(1) !~ '^Trying '
+ let debugkeep= &debug
+ setlocal debug=msg
+ call netrw#ErrorMsg(s:ERROR,getline(1),4)
+ let &debug= debugkeep
+ endif
+
+ elseif b:netrw_method == 3
+ " obtain with ftp + machine, id, passwd, and fname (ie. no .netrc)
+" call Decho("obtain via ftp+mipf (method #3)")
+ 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
+" call Decho("filter input: ".getline('$'))
+ else
+ put ='open '.g:netrw_machine
+" call Decho("filter input: ".getline('$'))
+ endif
+
+ if exists("g:netrw_ftp") && g:netrw_ftp == 1
+ put =g:netrw_uid
+" call Decho("filter input: ".getline('$'))
+ put ='\"'.s:netrw_passwd.'\"'
+" call Decho("filter input: ".getline('$'))
+ else
+ 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
+" 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")
+ exe "put ='".g:netrw_ftpextracmd."'"
+" call Decho("filter input: ".getline('$'))
+ endif
+
+ if exists("g:netrw_ftpextracmd")
+ exe "put ='".g:netrw_ftpextracmd."'"
+" call Decho("filter input: ".getline('$'))
+ endif
+ for fname in fnamelist
+ 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
+" 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).">")
+ if !exists("g:netrw_quiet")
+ call netrw#ErrorMsg(s:ERROR,getline(1),5)
+ endif
+ endif
+ endif
+
+ endif
+
+ " cleanup
+ if exists("tmpbufnr")
+ if bufnr("%") != tmpbufnr
+ exe tmpbufnr."bw!"
else
- let tgtdir= '.'
- endif
-" call Decho("tgtdir<".tgtdir.">")
- if exists("w:netrw_method") && w:netrw_method =~ '[235]'
-" call Decho("method=".w:netrw_method)
- if executable("ftp")
-" call Decho("ftp is executable, method=".w:netrw_method)
- let curdir = b:netrw_curdir
- let path = substitute(curdir,'ftp://[^/]\+/','','e')
- let curline= line(".")
- let endline= line("$")+1
- setlocal ma noro
- keepjumps $
-" call Decho("getcwd<".getcwd().">")
-" call Decho("curdir<".curdir.">")
-" call Decho("path<".path.">")
-" call Decho("curline=".curline)
-" call Decho("endline=".endline)
-
- ".........................................
- if w:netrw_method == 2
- " ftp + <.netrc>: Method #2
- setlocal ff=unix
- if path != ""
- put ='cd '.path
-" call Decho("ftp: cd ".path)
- endif
- if tgtdir != '.'
- put ='lcd '.tgtdir
+ q!
+ endif
+ endif
+
+" call Dret("netrw#NetrwObtain")
+endfun
+
+" ---------------------------------------------------------------------
+" s:NetrwPrevWinOpen: open file/directory in previous window. {{{2
+" If there's only one window, then the window will first be split.
+" Returns:
+" choice = 0 : didn't have to choose
+" choice = 1 : saved modified file in window first
+" choice = 2 : didn't save modified file, opened window
+" choice = 3 : cancel open
+fun! s:NetrwPrevWinOpen(islocal)
+" call Dfunc("NetrwPrevWinOpen(islocal=".a:islocal.")")
+
+ " grab a copy of the b:netrw_curdir to pass it along to newly split windows
+ let curdir = b:netrw_curdir
+
+ " get last window number and the word currently under the cursor
+ let lastwinnr = winnr("$")
+ let curword = s:NetrwGetWord()
+ let choice = 0
+" call Decho("lastwinnr=".lastwinnr." curword<".curword.">")
+
+ let didsplit = 0
+ if lastwinnr == 1
+ " if only one window, open a new one first
+" call Decho("only one window, so open a new one (g:netrw_alto=".g:netrw_alto.")")
+ if g:netrw_preview
+" call Decho("exe ".(g:netrw_alto? "top " : "bot ")."vert ".g:netrw_winsize."wincmd s")
+ exe (g:netrw_alto? "top " : "bot ")."vert ".g:netrw_winsize."wincmd s"
+ else
+" call Decho("exe ".(g:netrw_alto? "bel " : "abo ").g:netrw_winsize."wincmd s")
+ exe (g:netrw_alto? "bel " : "abo ").g:netrw_winsize."wincmd s"
+ endif
+ let didsplit = 1
+
+ else
+ call s:SaveBufVars()
+" call Decho("wincmd p")
+ wincmd p
+ call s:RestoreBufVars()
+ " if the previous window's buffer has been changed (is modified),
+ " and it doesn't appear in any other extant window, then ask the
+ " user if s/he wants to abandon modifications therein.
+ let bnr = winbufnr(0)
+ let bnrcnt = 0
+ if &mod
+" call Decho("detected: prev window's buffer has been modified: bnr=".bnr." winnr#".winnr())
+ let eikeep= &ei
+ set ei=all
+ windo if winbufnr(0) == bnr | let bnrcnt=bnrcnt+1 | endif
+ exe bnr."wincmd p"
+ let &ei= eikeep
+" call Decho("bnr=".bnr." bnrcnt=".bnrcnt." buftype=".&bt." winnr#".winnr())
+ if bnrcnt == 1
+ let bufname= bufname(winbufnr(winnr()))
+ let choice= confirm("Save modified file<".bufname.">?","&Yes\n&No\n&Cancel")
+" call Decho("bufname<".bufname."> choice=".choice." winnr#".winnr())
+
+ if choice == 1
+ " Yes -- write file & then browse
+ let v:errmsg= ""
+ silent w
+ if v:errmsg != ""
+ call netrw#ErrorMsg(s:ERROR,"unable to write <".bufname.">!",30)
+ if didsplit
+ q
+ else
+ wincmd p
+ endif
+" call Dret("NetrwPrevWinOpen ".choice." : unable to write <".bufname.">")
+ return choice
endif
- put ='get '.a:fname
-" call Decho("ftp: get ".a:fname)
- put ='quit'
-" call Decho("ftp: quit")
- if exists("g:netrw_port") && g:netrw_port != ""
-" call Decho("exe ".g:netrw_silentxfer.endline.",$!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port)
- exe g:netrw_silentxfer.endline.",$!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port
+
+ elseif choice == 2
+ " No -- don't worry about changed file, just browse anyway
+ setlocal nomod
+ call netrw#ErrorMsg(s:WARNING,bufname." changes to ".bufname." abandoned",31)
+ wincmd p
+
+ else
+ " Cancel -- don't do this
+ if didsplit
+ q
else
-" call Decho("exe ".g:netrw_silentxfer.endline.",$!".g:netrw_ftp_cmd." -i ".g:netrw_machine)
- exe g:netrw_silentxfer.endline.",$!".g:netrw_ftp_cmd." -i ".g:netrw_machine
+ wincmd p
endif
+" call Dret("NetrwPrevWinOpen ".choice." : cancelled")
+ return choice
+ endif
+ endif
+ endif
+ endif
+
+ " restore b:netrw_curdir (window split/enew may have lost it)
+ let b:netrw_curdir= curdir
+ if a:islocal < 2
+ if a:islocal
+ call netrw#LocalBrowseCheck(s:NetrwBrowseChgDir(a:islocal,curword))
+ else
+ call s:NetrwBrowse(a:islocal,s:NetrwBrowseChgDir(a:islocal,curword))
+ endif
+ endif
+" call Dret("NetrwPrevWinOpen ".choice)
+ return choice
+endfun
+
+" ---------------------------------------------------------------------
+" s:NetrwUpload: load fname to tgt (used by NetrwMarkFileCopy()) {{{2
+" Always assumed to be local -> remote
+" call s:NetrwUpload(filename, target)
+" call s:NetrwUpload(filename, target, fromdirectory)
+fun! s:NetrwUpload(fname,tgt,...)
+" call Dfunc("s:NetrwUpload(fname<".((type(a:fname) == 1)? a:fname : string(a:fname))."> tgt<".a:tgt.">) a:0=".a:0)
+
+ if a:tgt =~ '^\a\+://'
+ let tgtdir= substitute(a:tgt,'^\a\+://[^/]\+/\(.\{-}\)$','\1','')
+ else
+ let tgtdir= substitute(a:tgt,'^\(.*\)/[^/]*$','\1','')
+ endif
+" call Decho("tgtdir<".tgtdir.">")
+
+ if a:0 > 0
+ let fromdir= a:1
+ else
+ let fromdir= getcwd()
+ endif
+" call Decho("fromdir<".fromdir.">")
+
+ if type(a:fname) == 1
+ " handle uploading a single file using NetWrite
+" call Decho("handle uploading a single file via NetWrite")
+ 1split
+ let efname= escape(a:fname,g:netrw_fname_escape)
+" call Decho("exe e ".efname)
+ exe "e ".efname
+" call Decho("now locally editing<".expand("%").">, has ".line("$")." lines")
+ if a:tgt =~ '/$'
+ let wfname= substitute(a:fname,'^.*/','','')
+ let wfname= escape(a:tgt.wfname,g:netrw_fname_escape)
+" call Decho("exe w! ".wfname)
+ exe "w! ".wfname
+ else
+ let wfname= escape(a:tgt,g:netrw_fname_escape)
+" call Decho("writing local->remote: exe w ".wfname)
+ exe "w ".wfname
+" call Decho("done writing local->remote")
+ endif
+ q!
+
+ elseif type(a:fname) == 3
+ " handle uploading a list of files via scp
+" call Decho("handle uploading a list of files via scp")
+ let curdir= getcwd()
+ if a:tgt =~ '^scp:'
+ exe "keepjumps silent lcd ".fnameescape(fromdir)
+ let filelist= copy(s:netrwmarkfilelist_{bufnr('%')})
+ let args = join(map(filelist,"shellescape(v:val)"))
+ if exists("g:netrw_port") && g:netrw_port != ""
+ let useport= " ".g:netrw_scpport." ".g:netrw_port
+ else
+ let useport= ""
+ endif
+ let machine = substitute(a:tgt,'^scp://\([^/:]\+\).*$','\1','')
+ let tgt = substitute(a:tgt,'^scp://[^/]\+/\(.*\)$','\1','')
+" call Decho("exe ".s:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".args." ".shellescape(machine.":".escape(tgt,g:netrw_fname_escape)))
+ exe s:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".args." ".shellescape(machine.":".escape(tgt,g:netrw_fname_escape))
+ exe "keepjumps silent lcd ".fnameescape(curdir)
+
+ elseif a:tgt =~ '^ftp:'
+ 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
+" call Decho("filter input window#".winnr())
+
+ exe "put ='".g:netrw_ftpmode."'"
+" call Decho("filter input: ".getline('$'))
+
+ if exists("g:netrw_ftpextracmd")
+ exe "put ='".g:netrw_ftpextracmd."'"
+" call Decho("filter input: ".getline('$'))
+ endif
+
+ call setline(line("$")+1,'lcd "'.fromdir.'"')
+" call Decho("filter input: ".getline('$'))
+
+ call setline(line("$")+1,'cd "'.tgtdir.'"')
+" call Decho("filter input: ".getline('$'))
+
+ for fname in a:fname
+ call setline(line("$")+1,'put "'.fname.'"')
+" call Decho("filter input: ".getline('$'))
+ endfor
+
+ if exists("g:netrw_port") && g:netrw_port != ""
+" call Decho("executing: ".s:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port)
+ exe s:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port
+ else
+" call Decho("filter input window#".winnr())
+" call Decho("executing: ".s:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".g:netrw_machine)
+ exe s:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".g:netrw_machine
+ endif
+ " If the result of the ftp operation isn't blank, show an error message (tnx to Doug Claar)
+ silent g/Local directory now/d
+ if getline(1) !~ "^$" && !exists("g:netrw_quiet") && getline(1) !~ '^Trying '
+ call netrw#ErrorMsg(s:ERROR,getline(1),14)
+ else
+ bw!|q
+ endif
- ".........................................
- elseif w:netrw_method == 3
- " ftp + machine,id,passwd,filename: Method #3
+ elseif b:netrw_method == 3
+ " upload with ftp + machine, id, passwd, and fname (ie. no .netrc)
+ let netrw_fname= b:netrw_fname
+ 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
-" call Decho('ftp: open '.g:netrw_machine.' '.g:netrw_port)
+" call Decho("filter input: ".getline('$'))
else
put ='open '.g:netrw_machine
-" call Decho('ftp: open '.g:netrw_machine)
+" call Decho("filter input: ".getline('$'))
endif
if exists("g:netrw_ftp") && g:netrw_ftp == 1
put =g:netrw_uid
- put ='\"'.s:netrw_passwd.'\"'
-" call Decho('ftp: g:netrw_uid')
-" call Decho('ftp: s:netrw_passwd')
+" call Decho("filter input: ".getline('$'))
+ call setline(line("$")+1,'"'.s:netrw_passwd.'"')
+" call Decho("filter input: ".getline('$'))
else
put ='user \"'.g:netrw_uid.'\" \"'.s:netrw_passwd.'\"'
-" call Decho('user '.g:netrw_uid.' '.s:netrw_passwd)
+" call Decho("filter input: ".getline('$'))
endif
- if path != ""
- put ='cd '.path
-" call Decho('cd '.a:path)
- endif
- if tgtdir != '.'
- put ='lcd '.tgtdir
- endif
- put ='get '.a:fname
-" call Decho("ftp: get ".a:fname)
- put ='quit'
-" call Decho("ftp: quit")
+ 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.'"')
+" call Decho("filter input: ".getline('$'))
+ endif
+
+ if exists("g:netrw_ftpextracmd")
+ exe "put ='".g:netrw_ftpextracmd."'"
+" call Decho("filter input: ".getline('$'))
+ endif
+
+ for fname in a:fname
+ 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
-" call Decho("exe ".g:netrw_silentxfer.curline.",$!".g:netrw_ftp_cmd." -i -n")
- exe g:netrw_silentxfer.endline.",$!".g:netrw_ftp_cmd." -i -n"
-
- ".........................................
+ 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
+ if getline(1) !~ "^$" && !exists("g:netrw_quiet") && getline(1) !~ '^Trying '
+ let debugkeep= &debug
+ setlocal debug=msg
+ call netrw#ErrorMsg(s:ERROR,getline(1),15)
+ let &debug = debugkeep
+ let mod = 1
else
- call netrw#ErrorMsg(s:WARNING,"unable to comply with your request<" . choice . ">",28)
- endif
- " restore
- exe "silent! ".endline.",$d"
- exe "keepjumps ".curline
- setlocal noma nomod ro
- else
-" call Decho("ftp not executable")
- if !exists("g:netrw_quiet")
- call netrw#ErrorMsg(s:ERROR,"this system doesn't support ftp",29)
- endif
- " restore status line
- let &stl = s:netrw_users_stl
- let &laststatus = s:netrw_users_ls
- " restore NetrwMethod
- if exists("keep_netrw_method")
- call s:NetrwMethod(keep_netrw_choice)
- let w:netrw_method = keep_netrw_wmethod
+ bw!|q
endif
-" call Dret("NetrwObtain")
- return
endif
-
- ".........................................
else
- " scp: Method#4
-" call Decho("using scp")
- let curdir = b:netrw_curdir
- let path = substitute(curdir,'scp://[^/]\+/','','e')
-" call Decho("path<".path.">")
- if exists("g:netrw_port") && g:netrw_port != ""
- let useport= " ".g:netrw_scpport." ".g:netrw_port
- else
- let useport= ""
- endif
-" call Decho("pwd<".getcwd().">")
-" call Decho("executing: !".g:netrw_scp_cmd.useport." ".g:netrw_machine.":".path.escape(a:fname,' ?&')." ".tgtdir)
- exe g:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".g:netrw_machine.":".path.escape(a:fname,' ?&')." ".tgtdir
- endif
-
- " restore status line
- let &stl = s:netrw_users_stl
- let &laststatus = s:netrw_users_ls
- redraw!
-
- " restore NetrwMethod
- if exists("keep_netrw_method")
- call s:NetrwMethod(keep_netrw_choice)
- let w:netrw_method = keep_netrw_wmethod
- endif
+ call netrw#ErrorMsg(s:ERROR,"can't obtain files with protocol from<".a:tgt.">",63)
endif
-
-" call Dret("netrw#NetrwObtain")
-endfun
-
-" ---------------------------------------------------------------------
-" s:NetrwUpload: load fname to tgt (used by NetrwMarkFileCopy()) {{{2
-" fname may itself be a remote or local file
-" tgt is assumed to be remote, so NetWrite will be used
-" (indirectly an autocmd)
-fun! s:NetrwUpload(fname,tgt)
-" call Dfunc("s:NetrwUpload(fname<".a:fname."> tgt<".a:tgt.">)")
-
- 1split
-" call Decho("exe e ".a:fname)
- exe "e ".escape(a:fname,g:netrw_fname_escape)
- if a:tgt =~ '/$'
-" call Decho("exe w ".a:tgt.a:fname)
- exe "w ".escape(a:tgt.a:fname,g:netrw_fname_escape)
- else
-" call Decho("exe w ".a:tgt)
- exe "w ".escape(a:tgt,g:netrw_fname_escape)
endif
- q!
" call Dret("s:NetrwUpload")
endfun
@@ -3599,6 +5167,7 @@ fun! s:NetrwRefresh(islocal,dirname)
" 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
if a:islocal
@@ -3607,11 +5176,113 @@ fun! s:NetrwRefresh(islocal,dirname)
call s:NetrwBrowse(a:islocal,a:dirname)
endif
call netrw#NetrwRestorePosn()
- redraw!
+
+ " restore file marks
+ if exists("s:netrwmarkfilemtch_{bufnr('%')}") && s:netrwmarkfilemtch_{bufnr("%")} != ""
+" call Decho("exe 2match netrwMarkFile /".s:netrwmarkfilemtch_{bufnr("%")}."/")
+ exe "2match netrwMarkFile /".s:netrwmarkfilemtch_{bufnr("%")}."/"
+ else
+" call Decho("2match none")
+ 2match none
+ endif
+
+" redraw!
" call Dret("NetrwRefresh")
endfun
" ---------------------------------------------------------------------
+" s:NetrwRefreshDir: refreshes a directory by name {{{2
+" Called by NetrwMarkFileCopy()
+" Interfaces to s:NetrwRefresh() and s:LocalBrowseShellCmdRefresh()
+fun! s:NetrwRefreshDir(islocal,dirname)
+" call Dfunc("s:NetrwRefreshDir(islocal=".a:islocal." dirname<".a:dirname.">)")
+ if g:netrw_fastbrowse == 0
+ " slowest mode (keep buffers refreshed, local or remote)
+ let tgtwin= bufwinnr(a:dirname)
+ if tgtwin > 0
+ " tgtwin is being displayed, so refresh it
+ let curwin= winnr()
+ exe tgtwin."wincmd w"
+ call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,'./'))
+ exe curwin."wincmd w"
+ elseif bufnr(a:dirname) > 0
+ endif
+ elseif g:netrw_fastbrowse <= 1
+ call s:LocalBrowseShellCmdRefresh()
+ endif
+" call Dret("s:NetrwRefreshDir")
+endfun
+
+" ---------------------------------------------------------------------
+" s:NetrwSetSort: sets up the sort based on the g:netrw_sort_sequence {{{2
+" What this function does is to compute a priority for the patterns
+" in the g:netrw_sort_sequence. It applies a substitute to any
+" "files" that satisfy each pattern, putting the priority / in
+" front. An "*" pattern handles the default priority.
+fun! s:NetrwSetSort()
+" call Dfunc("SetSort() bannercnt=".w:netrw_bannercnt)
+ if w:netrw_liststyle == s:LONGLIST
+ let seqlist = substitute(g:netrw_sort_sequence,'\$','\\%(\t\\|\$\\)','ge')
+ else
+ let seqlist = g:netrw_sort_sequence
+ endif
+ " sanity check -- insure that * appears somewhere
+ if seqlist == ""
+ let seqlist= '*'
+ elseif seqlist !~ '\*'
+ let seqlist= seqlist.',*'
+ endif
+ let priority = 1
+ while seqlist != ""
+ if seqlist =~ ','
+ let seq = substitute(seqlist,',.*$','','e')
+ let seqlist = substitute(seqlist,'^.\{-},\(.*\)$','\1','e')
+ else
+ let seq = seqlist
+ let seqlist = ""
+ endif
+ let sepchr= "\<Char-0xff>"
+ if priority < 10
+ let spriority= "00".priority.sepchr
+ elseif priority < 100
+ let spriority= "0".priority.sepchr
+ else
+ let spriority= priority.sepchr
+ endif
+" call Decho("priority=".priority." spriority<".spriority."> seq<".seq."> seqlist<".seqlist.">")
+
+ " sanity check
+ if w:netrw_bannercnt > line("$")
+ " apparently no files were left after a Hiding pattern was used
+" call Dret("SetSort : no files left after hiding")
+ return
+ endif
+ if seq == '*'
+ let starpriority= spriority
+ else
+ exe 'silent keepjumps '.w:netrw_bannercnt.',$g/'.seq.'/s/^/'.spriority.'/'
+ " 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}'.sepchr.'\d\{3}\//s/^\d\{3}'.sepchr.'\(\d\{3}\/\).\@=/\1/e'
+ endif
+ let priority = priority + 1
+ endwhile
+ if exists("starpriority")
+ exe 'silent keepjumps '.w:netrw_bannercnt.',$v/^\d\{3}'.sepchr.'/s/^/'.starpriority.'/'
+ 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}'.sepchr.'\)\%(\d\{3}'.sepchr.'\)\+\ze./\1/e'
+
+" call Dret("SetSort")
+endfun
+
+" =====================================================================
" s:NetrwSortStyle: change sorting style (name - time - size) and refresh display {{{2
fun! s:NetrwSortStyle(islocal)
" call Dfunc("s:NetrwSortStyle(islocal=".a:islocal.") netrw_sort_by<".g:netrw_sort_by.">")
@@ -3635,12 +5306,13 @@ endfun
" =4 : local and t
" =5 : local and v
fun! s:NetrwSplit(mode)
-" call Dfunc("NetrwSplit(mode=".a:mode.") alto=".g:netrw_alto." altv=".g:netrw_altv)
+" call Dfunc("s:NetrwSplit(mode=".a:mode.") alto=".g:netrw_alto." altv=".g:netrw_altv)
call s:SaveWinVars()
if a:mode == 0
" remote and o
+" call Decho("exe ".(g:netrw_alto? "bel " : "abo ").g:netrw_winsize."wincmd s")
exe (g:netrw_alto? "bel " : "abo ").g:netrw_winsize."wincmd s"
let s:didsplit= 1
call s:RestoreWinVars()
@@ -3650,6 +5322,7 @@ fun! s:NetrwSplit(mode)
elseif a:mode == 1
" remote and t
let cursorword = s:NetrwGetWord()
+" call Decho("tabnew")
tabnew
let s:didsplit= 1
call s:RestoreWinVars()
@@ -3658,6 +5331,7 @@ fun! s:NetrwSplit(mode)
elseif a:mode == 2
" remote and v
+" call Decho("exe ".(g:netrw_altv? "rightb " : "lefta ").g:netrw_winsize."wincmd v")
exe (g:netrw_altv? "rightb " : "lefta ").g:netrw_winsize."wincmd v"
let s:didsplit= 1
call s:RestoreWinVars()
@@ -3666,6 +5340,7 @@ fun! s:NetrwSplit(mode)
elseif a:mode == 3
" local and o
+" call Decho("exe ".(g:netrw_alto? "bel " : "abo ").g:netrw_winsize."wincmd s")
exe (g:netrw_alto? "bel " : "abo ").g:netrw_winsize."wincmd s"
let s:didsplit= 1
call s:RestoreWinVars()
@@ -3676,6 +5351,7 @@ fun! s:NetrwSplit(mode)
" local and t
let netrw_curdir= b:netrw_curdir
let cursorword = s:NetrwGetWord()
+" call Decho("tabnew")
tabnew
let b:netrw_curdir= netrw_curdir
let s:didsplit= 1
@@ -3685,6 +5361,7 @@ fun! s:NetrwSplit(mode)
elseif a:mode == 5
" local and v
+" call Decho("exe ".(g:netrw_altv? "rightb " : "lefta ").g:netrw_winsize."wincmd v")
exe (g:netrw_altv? "rightb " : "lefta ").g:netrw_winsize."wincmd v"
let s:didsplit= 1
call s:RestoreWinVars()
@@ -3695,148 +5372,489 @@ fun! s:NetrwSplit(mode)
call netrw#ErrorMsg(s:ERROR,"(NetrwSplit) unsupported mode=".a:mode,45)
endif
-" call Dret("NetrwSplit")
+" call Dret("s:NetrwSplit")
endfun
" ---------------------------------------------------------------------
-" s:NetrwBrowseX: allows users to write custom functions to operate on {{{2
-" files given their extension. Passes 0=local, 1=remote
-fun! netrw#NetrwBrowseX(fname,remote)
-" call Dfunc("NetrwBrowseX(fname<".a:fname."> remote=".a:remote.")")
+" NetrwStatusLine: {{{2
+fun! NetrwStatusLine()
- " set up the filename
- " (lower case the extension, make a local copy of a remote file)
- let exten= substitute(a:fname,'.*\.\(.\{-}\)','\1','e')
- if has("win32") || has("win95") || has("win64") || has("win16")
- let exten= substitute(exten,'^.*$','\L&\E','')
+" vvv NetrwStatusLine() debugging vvv
+" let g:stlmsg=""
+" if !exists("w:netrw_explore_bufnr")
+" let g:stlmsg="!X<explore_bufnr>"
+" elseif w:netrw_explore_bufnr != bufnr("%")
+" let g:stlmsg="explore_bufnr!=".bufnr("%")
+" endif
+" if !exists("w:netrw_explore_line")
+" let g:stlmsg=" !X<explore_line>"
+" elseif w:netrw_explore_line != line(".")
+" let g:stlmsg=" explore_line!={line(.)<".line(".").">"
+" endif
+" if !exists("w:netrw_explore_list")
+" let g:stlmsg=" !X<explore_list>"
+" endif
+" ^^^ NetrwStatusLine() debugging ^^^
+
+ if !exists("w:netrw_explore_bufnr") || w:netrw_explore_bufnr != bufnr("%") || !exists("w:netrw_explore_line") || w:netrw_explore_line != line(".") || !exists("w:netrw_explore_list")
+ " restore user's status line
+ let &stl = s:netrw_users_stl
+ let &laststatus = s:netrw_users_ls
+ if exists("w:netrw_explore_bufnr")|unlet w:netrw_explore_bufnr|endif
+ if exists("w:netrw_explore_line") |unlet w:netrw_explore_line |endif
+ return ""
+ else
+ return "Match ".w:netrw_explore_mtchcnt." of ".w:netrw_explore_listlen
endif
- let fname= escape(a:fname,"%#")
-" call Decho("fname<".fname."> after escape()")
+endfun
- " seems kde systems often have gnome-open due to dependencies, even though
- " gnome-open's subsidiary display tools are largely absent. Kde systems
- " usually have "kdeinit" running, though... (tnx Mikolaj Machowski)
- if !exists("s:haskdeinit")
- if has("unix")
- let s:haskdeinit= s:System("system",'ps -e') =~ 'kdeinit'
- if v:shell_error
- let s:haskdeinit = 0
- endif
+" ---------------------------------------------------------------------
+" s:NetrwTreeDir: determine tree directory given current cursor position {{{2
+" (full path directory with trailing slash returned)
+fun! s:NetrwTreeDir()
+" call Dfunc("NetrwTreeDir() curline#".line(".")."<".getline('.')."> b:netrw_curdir<".b:netrw_curdir."> tab#".tabpagenr()." win#".winnr()." buf#".bufnr("%")."<".bufname("%").">")
+
+ let treedir= b:netrw_curdir
+" call Decho("set initial treedir<".treedir.">")
+ let s:treecurpos= netrw#NetrwSavePosn()
+
+ if w:netrw_liststyle == s:TREELIST
+" call Decho("w:netrrw_liststyle is TREELIST:")
+" call Decho("line#".line(".")." getline(.)<".getline('.')."> treecurpos<".string(s:treecurpos).">")
+ if getline('.') =~ '/$'
+ let treedir= substitute(getline('.'),'^\%(| \)*\([^|].\{-}\)$','\1','e')
else
- let s:haskdeinit= 0
+ let treedir= ""
endif
-" call Decho("setting s:haskdeinit=".s:haskdeinit)
- endif
- if a:remote == 1
- " create a local copy
- let fname= fnamemodify(tempname(),":t:r").".".exten
-" call Decho("a:remote=".a:remote.": create a local copy of <".a:fname."> as <".fname.">")
- exe "silent keepjumps bot 1new ".a:fname
- setlocal bh=delete
-" call Decho("exe w! ".fname)
- exe "w! ".fname
- q
+" call Decho("treedir<".treedir.">")
+
+ " 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
+" call Dret("NetrwTreeDir <".treedir."> : (side effect) s:treecurpos<".string(s:treecurpos).">")
+ return b:netrw_curdir
+ endif
+
+ " elide all non-depth information
+ let depth = substitute(getline('.'),'^\(\%(| \)*\)[^|].\{-}$','\1','e')
+" call Decho("depth<".depth."> 1st subst")
+
+ " elide first depth
+ let depth = substitute(depth,'^| ','','')
+" call Decho("depth<".depth."> 2nd subst")
+
+ " construct treedir by searching backwards at correct depth
+" call Decho("constructing treedir<".treedir."> depth<".depth.">")
+ while depth != "" && search('^'.depth.'[^|].\{-}/$','bW')
+ let dirname= substitute(getline('.'),'^\(| \)*','','e')
+ let treedir= dirname.treedir
+ let depth = substitute(depth,'^| ','','')
+" call Decho("constructing treedir<".treedir.">: dirname<".dirname."> while depth<".depth.">")
+ endwhile
+ if w:netrw_treetop =~ '/$'
+ let treedir= w:netrw_treetop.treedir
+ else
+ let treedir= w:netrw_treetop.'/'.treedir
+ endif
+" call Decho("bufnr(.)=".bufnr("%")." line($)=".line("$")." line(.)=".line("."))
endif
-" call Decho("exten<".exten."> "."netrwFileHandlers#NFH_".exten."():exists=".exists("*netrwFileHandlers#NFH_".exten))
+ let treedir= substitute(treedir,'//$','/','')
- " set up redirection
- if &srr =~ "%s"
- if (has("win32") || has("win95") || has("win64") || has("win16"))
- let redir= substitute(&srr,"%s","nul","")
+" " now force a refresh
+"" call DECHO("clear buffer<".expand("%")."> with :%d")
+" setlocal ma noro
+" keepjumps %d
+
+" call Dret("NetrwTreeDir <".treedir."> : (side effect) s:treecurpos<".string(s:treecurpos).">")
+ return treedir
+endfun
+
+" ---------------------------------------------------------------------
+" s:NetrwTreeDisplay: recursive tree display {{{2
+fun! s:NetrwTreeDisplay(dir,depth)
+" call Dfunc("NetrwTreeDisplay(dir<".a:dir."> depth<".a:depth.">)")
+
+ " insure that there are no folds
+ setlocal nofen
+
+ " install ../ and shortdir
+ if a:depth == ""
+ call setline(line("$")+1,'../')
+" call Decho("setline#".line("$")." ../ (depth is zero)")
+ endif
+ if a:dir =~ '^\a\+://'
+ if a:dir == w:netrw_treetop
+ let shortdir= a:dir
else
- let redir= substitute(&srr,"%s","/dev/null","")
+ let shortdir= substitute(a:dir,'^.*/\([^/]\+\)/$','\1/','e')
endif
- elseif (has("win32") || has("win95") || has("win64") || has("win16"))
- let redir= &srr . "nul"
+ call setline(line("$")+1,a:depth.shortdir)
else
- let redir= &srr . "/dev/null"
+ let shortdir= substitute(a:dir,'^.*/','','e')
+ call setline(line("$")+1,a:depth.shortdir.'/')
endif
-" call Decho("redir{".redir."} srr{".&srr."}")
+" call Decho("setline#".line("$")." shortdir<".a:depth.shortdir.">")
- " extract any viewing options. Assumes that they're set apart by quotes.
- if exists("g:netrw_browsex_viewer")
- if g:netrw_browsex_viewer =~ '\s'
- let viewer = substitute(g:netrw_browsex_viewer,'\s.*$','','')
- let viewopt = substitute(g:netrw_browsex_viewer,'^\S\+\s*','','')." "
- let oviewer = ''
- let cnt = 1
- while !executable(viewer) && viewer != oviewer
- let viewer = substitute(g:netrw_browsex_viewer,'^\(\(^\S\+\s\+\)\{'.cnt.'}\S\+\)\(.*\)$','\1','')
- let viewopt = substitute(g:netrw_browsex_viewer,'^\(\(^\S\+\s\+\)\{'.cnt.'}\S\+\)\(.*\)$','\3','')." "
- let cnt = cnt + 1
- let oviewer = viewer
-" call Decho("!exe: viewer<".viewer."> viewopt<".viewopt.">")
- endwhile
+ " append a / to dir if its missing one
+ let dir= a:dir
+ if dir !~ '/$'
+ let dir= dir.'/'
+ endif
+
+ " display subtrees (if any)
+ let depth= "| ".a:depth
+
+" call Decho("display subtrees with depth<".depth."> and current leaves")
+ for entry in w:netrw_treedict[a:dir]
+ let direntry= substitute(dir.entry,'/$','','e')
+" call Decho("dir<".dir."> entry<".entry."> direntry<".direntry.">")
+ if entry =~ '/$' && has_key(w:netrw_treedict,direntry)
+" call Decho("<".direntry."> is a key in treedict - display subtree for it")
+ call s:NetrwTreeDisplay(direntry,depth)
+ 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
- let viewer = g:netrw_browsex_viewer
- let viewopt = ""
+" call Decho("<".entry."> is not a key in treedict (no subtree)")
+ call setline(line("$")+1,depth.entry)
endif
-" call Decho("viewer<".viewer."> viewopt<".viewopt.">")
+ endfor
+" call Dret("NetrwTreeDisplay")
+endfun
+
+" ---------------------------------------------------------------------
+" s:NetrwTreeListing: displays tree listing from treetop on down, using NetrwTreeDisplay() {{{2
+fun! s:NetrwTreeListing(dirname)
+ if w:netrw_liststyle == s:TREELIST
+" call Dfunc("NetrwTreeListing() bufname<".expand("%").">")
+" call Decho("curdir<".a:dirname.">")
+" call Decho("win#".winnr().": w:netrw_treetop ".(exists("w:netrw_treetop")? "exists" : "doesn't exit")." w:netrw_treedict ".(exists("w:netrw_treedict")? "exists" : "doesn't exit"))
+
+ " update the treetop
+" call Decho("update the treetop")
+ if !exists("w:netrw_treetop")
+ let w:netrw_treetop= a:dirname
+" call Decho("w:netrw_treetop<".w:netrw_treetop."> (reusing)")
+ elseif (w:netrw_treetop =~ ('^'.a:dirname) && s:Strlen(a:dirname) < s:Strlen(w:netrw_treetop)) || a:dirname !~ ('^'.w:netrw_treetop)
+ let w:netrw_treetop= a:dirname
+" call Decho("w:netrw_treetop<".w:netrw_treetop."> (went up)")
+ endif
+
+ " insure that we have at least an empty treedict
+ if !exists("w:netrw_treedict")
+ let w:netrw_treedict= {}
+ endif
+
+ " 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])
+ 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>")
+ else
+ let fname= ""
+ endif
+" call Decho("fname<".fname.">")
+
+ " display from treetop on down
+ call s:NetrwTreeDisplay(w:netrw_treetop,"")
+
+" call Dret("NetrwTreeListing : bufname<".expand("%").">")
endif
+endfun
- " execute the file handler
- if exists("g:netrw_browsex_viewer") && g:netrw_browsex_viewer == '-'
-" call Decho("g:netrw_browsex_viewer<".g:netrw_browsex_viewer.">")
- let ret= netrwFileHandlers#Invoke(exten,fname)
+" ---------------------------------------------------------------------
+" s:NetrwWideListing: {{{2
+fun! s:NetrwWideListing()
- elseif exists("g:netrw_browsex_viewer") && executable(viewer)
-" call Decho("g:netrw_browsex_viewer<".g:netrw_browsex_viewer.">")
-" call Decho("exe silent !".viewer." ".viewopt.g:netrw_shq.escape(fname,'%#').g:netrw_shq.redir)
- exe "silent !".viewer." ".viewopt.g:netrw_shq.escape(fname,'%#').g:netrw_shq.redir
- let ret= v:shell_error
+ if w:netrw_liststyle == s:WIDELIST
+" call Dfunc("NetrwWideListing() w:netrw_liststyle=".w:netrw_liststyle.' fo='.&fo.' l:fo='.&l:fo)
+ " look for longest filename (cpf=characters per filename)
+ " cpf: characters per file
+ " fpl: files per line
+ " fpc: files 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'
+ else
+" call Dret("NetrwWideListing")
+ return
+ endif
+" call Decho("max file strlen+1=".b:netrw_cpf)
+ let b:netrw_cpf= b:netrw_cpf + 1
- elseif has("win32") || has("win64")
-" call Decho('exe silent !start rundll32 url.dll,FileProtocolHandler '.g:netrw_shq.escape(fname, '%#').g:netrw_shq)
- exe 'silent !start rundll32 url.dll,FileProtocolHandler '.g:netrw_shq.escape(fname, '%#').g:netrw_shq
- call inputsave()|call input("Press <cr> to continue")|call inputrestore()
- let ret= v:shell_error
+ " determine qty files per line (fpl)
+ let w:netrw_fpl= winwidth(0)/b:netrw_cpf
+ if w:netrw_fpl <= 0
+ let w:netrw_fpl= 1
+ endif
+" call Decho("fpl= ".winwidth(0)."/[b:netrw_cpf=".b:netrw_cpf.']='.w:netrw_fpl)
- elseif has("unix") && executable("gnome-open") && !s:haskdeinit
-" call Decho("exe silent !gnome-open ".g:netrw_shq.escape(fname,'%#').g:netrw_shq." ".redir)
- exe "silent !gnome-open ".g:netrw_shq.escape(fname,'%#').g:netrw_shq.redir
- let ret= v:shell_error
+ " make wide display
+ exe 'silent keepjumps '.w:netrw_bannercnt.',$s/^.*$/\=escape(printf("%-'.b:netrw_cpf.'s",submatch(0)),"\\")/'
+ 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."]")
+ silent! let keepregstar = @*
+ 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"
+ else
+ exe "silent keepjumps norm! 0\<c-v>".newcolqty.'j$hx'.w:netrw_bannercnt.'G$p'
+ endif
+ exe "silent keepjumps ".newcolstart.','.newcolend.'d'
+ exe 'silent keepjumps '.w:netrw_bannercnt
+ endwhile
+ silent! let @*= keepregstar
+ exe "silent keepjumps ".w:netrw_bannercnt.',$s/\s\+$//e'
+ setlocal noma nomod ro
+" call Dret("NetrwWideListing")
+ endif
- elseif has("unix") && executable("kfmclient") && s:haskdeinit
-" call Decho("exe silent !kfmclient exec ".g:netrw_shq.escape(fname,'%#').g:netrw_shq." ".redir)
- exe "silent !kfmclient exec ".g:netrw_shq.escape(fname,'%#').g:netrw_shq." ".redir
- let ret= v:shell_error
+endfun
- elseif has("macunix") && executable("open")
-" call Decho("exe silent !open '".escape(fname,'%#')."' ".redir)
- exe silent !open '".escape(fname,'%#')."' ".redir
- let ret= v:shell_error
+" ---------------------------------------------------------------------
+" s:PerformListing: {{{2
+fun! s:PerformListing(islocal)
+" call Dfunc("s:PerformListing(islocal=".a:islocal.") buf(%)=".bufnr("%")."<".bufname("%").">")
+
+ call s:NetrwSafeOptions()
+ setlocal noro ma
+" call Decho("setlocal noro ma")
+
+" if exists("g:netrw_silent") && g:netrw_silent == 0 && &ch >= 1 " Decho
+" call Decho("(netrw) Processing your browsing request...")
+" endif " Decho
+
+" 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
+ endif
+
+ " save current directory on directory history list
+ call s:NetrwBookmarkDir(3,b:netrw_curdir)
+
+ " Set up the banner {{{3
+" call Decho("set up banner")
+ keepjumps put ='\" ============================================================================'
+ keepjumps put ='\" Netrw Directory Listing (netrw '.g:loaded_netrw.')'
+ keepjumps put ='\" '.b:netrw_curdir
+ keepjumps 1d
+ let w:netrw_bannercnt= 3
+ exe "keepjumps ".w:netrw_bannercnt
+ let sortby= g:netrw_sort_by
+ if g:netrw_sort_direction =~ "^r"
+ let sortby= sortby." reversed"
+ endif
+
+ " Sorted by... {{{3
+" 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
+ keepjumps put ='\" Sort sequence: '.g:netrw_sort_sequence
+ let w:netrw_bannercnt= w:netrw_bannercnt + 2
else
- " netrwFileHandlers#Invoke() always returns 0
- let ret= netrwFileHandlers#Invoke(exten,fname)
+" call Decho("directories will be sorted by size or time")
+ " sorted by size or date
+ keepjumps put ='\" Sorted by '.sortby
+ let w:netrw_bannercnt= w:netrw_bannercnt + 1
endif
+ exe "keepjumps ".w:netrw_bannercnt
- " if unsuccessful, attempt netrwFileHandlers#Invoke()
- if ret
- let ret= netrwFileHandlers#Invoke(exten,fname)
+ " show copy/move target, if any
+ if exists("s:netrwmftgt") && exists("s:netrwmftgt_islocal")
+" call Decho("show copy/move target<".s:netrwmftgt.">")
+ if s:netrwmftgt_islocal
+ keepjumps put ='\" Copy/Move Tgt: '.s:netrwmftgt.' (local)'
+ else
+ keepjumps put ='\" 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
- redraw!
+ " Hiding... -or- Showing... {{{3
+" 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
+ else
+ keepjumps 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'
+ keepjumps put ='\" ============================================================================'
+ let w:netrw_bannercnt= w:netrw_bannercnt + 2
- " cleanup: remove temporary file,
- " delete current buffer if success with handler,
- " return to prior buffer (directory listing)
- if a:remote == 1 && fname != a:fname
-" call Decho("deleting temporary file<".fname.">")
- call s:System("delete",fname)
+ " bannercnt should index the line just after the banner
+ let w:netrw_bannercnt= w:netrw_bannercnt + 1
+ exe "keepjumps ".w:netrw_bannercnt
+" call Decho("bannercnt=".w:netrw_bannercnt." (should index line just after banner) line($)=".line("$"))
+
+ " set up syntax highlighting {{{3
+" call Decho("set up syntax highlighting")
+ if has("syntax")
+ setlocal ft=netrw
+ if !exists("g:syntax_on") || !g:syntax_on
+ setlocal ft=
+ endif
endif
- if a:remote == 1
- setlocal bh=delete bt=nofile
- if g:netrw_use_noswf
- setlocal noswf
+ " get list of files
+" call Decho("Get list of files - islocal=".a:islocal)
+ if a:islocal
+ call s:LocalListing()
+ else " remote
+ call s:NetrwRemoteListing()
+ endif
+" call Decho("w:netrw_bannercnt=".w:netrw_bannercnt." (banner complete)")
+
+ " manipulate the directory listing (hide, sort) {{{3
+ if line("$") >= w:netrw_bannercnt
+" call Decho("manipulate directory listing (hide)")
+" call Decho("g:netrw_hide=".g:netrw_hide." g:netrw_list_hide<".g:netrw_list_hide.">")
+ if g:netrw_hide && g:netrw_list_hide != ""
+ call s:NetrwListHide()
+ endif
+ if line("$") >= w:netrw_bannercnt
+" call Decho("manipulate directory listing (sort) : g:netrw_sort_by<".g:netrw_sort_by.">")
+
+ if g:netrw_sort_by =~ "^n"
+ " sort by name
+ call s:NetrwSetSort()
+
+ if w:netrw_bannercnt < line("$")
+" call Decho("g:netrw_sort_direction=".g:netrw_sort_direction." (bannercnt=".w:netrw_bannercnt.")")
+ if g:netrw_sort_direction =~ 'n'
+ " normal direction sorting
+ exe 'silent keepjumps '.w:netrw_bannercnt.',$sort'
+ else
+ " reverse direction sorting
+ exe 'silent keepjumps '.w:netrw_bannercnt.',$sort!'
+ endif
+ endif
+ " remove priority pattern prefix
+" call Decho("remove priority pattern prefix")
+ let sepchr= "\<Char-0xff>"
+ exe 'silent keepjumps '.w:netrw_bannercnt.',$s/^\d\{3}'.sepchr.'//e'
+
+ elseif a:islocal
+ if w:netrw_bannercnt < line("$")
+" call Decho("g:netrw_sort_direction=".g:netrw_sort_direction)
+ if g:netrw_sort_direction =~ 'n'
+" call Decho('exe silent keepjumps '.w:netrw_bannercnt.',$sort')
+ exe 'silent keepjumps '.w:netrw_bannercnt.',$sort'
+ else
+" call Decho('exe silent keepjumps '.w:netrw_bannercnt.',$sort!')
+ exe 'silent keepjumps '.w:netrw_bannercnt.',$sort!'
+ endif
+ endif
+ exe 'silent keepjumps '.w:netrw_bannercnt.',$s/^\d\{-}\///e'
+ endif
+
+ elseif g:netrw_sort_direction =~ 'r'
+" call Decho('reverse the sorted listing')
+ exe 'silent keepjumps '.w:netrw_bannercnt.'g/^/m '.w:netrw_bannercnt
endif
- exe "norm! \<c-o>"
- redraw!
endif
-" call Dret("NetrwBrowseX")
+ " convert to wide/tree listing {{{3
+" call Decho("modify display if wide/tree listing style")
+ call s:NetrwWideListing()
+ call s:NetrwTreeListing(b:netrw_curdir)
+
+ if exists("w:netrw_bannercnt") && line("$") > w:netrw_bannercnt
+ " 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
+ norm! 0
+ endif
+
+ " record previous current directory
+ let w:netrw_prvdir= b:netrw_curdir
+" call Decho("record netrw_prvdir<".w:netrw_prvdir.">")
+
+ " save certain window-oriented variables into buffer-oriented variables {{{3
+ call s:SetBufWinVars()
+ call s:NetrwOptionRestore("w:")
+
+ " set display to netrw display settings
+" call Decho("set display to netrw display settings (noma nomod etc)")
+ setlocal noma nomod nonu nobl nowrap ro
+ if exists("s:treecurpos")
+
+ call netrw#NetrwRestorePosn(s:treecurpos)
+ unlet s:treecurpos
+ endif
+
+" call Dret("s:PerformListing : curpos<".string(getpos(".")).">")
+endfun
+
+" ---------------------------------------------------------------------
+" s:SetupNetrwStatusLine: {{{2
+fun! s:SetupNetrwStatusLine(statline)
+" call Dfunc("SetupNetrwStatusLine(statline<".a:statline.">)")
+
+ if !exists("s:netrw_setup_statline")
+ let s:netrw_setup_statline= 1
+" call Decho("do first-time status line setup")
+
+ if !exists("s:netrw_users_stl")
+ let s:netrw_users_stl= &stl
+ endif
+ if !exists("s:netrw_users_ls")
+ let s:netrw_users_ls= &laststatus
+ endif
+
+ " set up User9 highlighting as needed
+ let keepa= @a
+ redir @a
+ try
+ hi User9
+ catch /^Vim\%((\a\+)\)\=:E411/
+ if &bg == "dark"
+ hi User9 ctermfg=yellow ctermbg=blue guifg=yellow guibg=blue
+ else
+ hi User9 ctermbg=yellow ctermfg=blue guibg=yellow guifg=blue
+ endif
+ endtry
+ redir END
+ let @a= keepa
+ endif
+
+ " set up status line (may use User9 highlighting)
+ " insure that windows have a statusline
+ " make sure statusline is displayed
+ let &stl=a:statline
+ setlocal laststatus=2
+" call Decho("stl=".&stl)
+ redraw
+
+" call Dret("SetupNetrwStatusLine : stl=".&stl)
endfun
" ---------------------------------------------------------------------
@@ -3932,12 +5950,12 @@ fun! s:NetrwRemoteListing()
else
" use ssh to get remote file listing {{{3
-" call Decho("use ssh to get remote file listing: s:netrw_shq<".g:netrw_shq."> s:path<".s:path."> g:netrw_cd_escape<".g:netrw_cd_escape.">")
+" call Decho("use ssh to get remote file listing: s:path<".s:path.">")
let listcmd= s:MakeSshCmd(g:netrw_list_cmd)
" call Decho("listcmd<".listcmd."> (using g:netrw_list_cmd)")
if g:netrw_scp_cmd =~ '^pscp'
-" call Decho("1: exe silent r! ".listcmd.g:netrw_shq.s:path.g:netrw_shq)
- exe "silent r! ".listcmd.g:netrw_shq.s:path.g:netrw_shq
+" call Decho("1: exe silent r! ".listcmd.shellescape(s:path))
+ exe "silent r! ".listcmd.shellescape(s:path)
" remove rubbish and adjust listing format of 'pscp' to 'ssh ls -FLa' like
g/^Listing directory/d
g/^d[-rwx][-rwx][-rwx]/s+$+/+e
@@ -3950,8 +5968,9 @@ fun! s:NetrwRemoteListing()
" call Decho("2: exe silent r! ".listcmd)
exe "silent r! ".listcmd
else
-" call Decho("3: exe silent r! ".listcmd." ".g:netrw_shq.s:path.g:netrw_shq)
- exe "silent r! ".listcmd." ".g:netrw_shq.s:path.g:netrw_shq
+" call Decho("3: exe silent r! ".listcmd.' "'.shellescape(s:path).'"')
+ exe "silent r! ".listcmd.' "'.shellescape(s:path).'"'
+" call Decho("listcmd<".listcmd."> path<".s:path.">")
endif
endif
@@ -3969,7 +5988,7 @@ fun! s:NetrwRemoteListing()
if s:method == "ftp"
" cleanup
exe "keepjumps ".w:netrw_bannercnt
- while getline(".") =~ g:netrw_ftp_browse_reject
+ while getline('.') =~ g:netrw_ftp_browse_reject
keepjumps d
endwhile
" if there's no ../ listed, then put ./ and ../ in
@@ -4012,9 +6031,9 @@ fun! s:NetrwRemoteRm(usrhost,path) range
let svpos= netrw#NetrwSavePosn()
let all= 0
- if exists("s:netrwmarkfilelist")
+ if exists("s:netrwmarkfilelist_{bufnr('%')}")
" remove all marked files
- for fname in s:netrwmarkfilelist
+ for fname in s:netrwmarkfilelist_{bufnr("%")}
let ok= s:NetrwRemoteRmFile(a:path,fname,all)
if ok =~ 'q\%[uit]'
break
@@ -4022,8 +6041,8 @@ fun! s:NetrwRemoteRm(usrhost,path) range
let all= 1
endif
endfor
- unlet s:netrwmarkfilelist
- unlet s:netrwmarkfilemtch
+ unlet s:netrwmarkfilelist_{bufnr("%")}
+ unlet s:netrwmarkfilemtch_{bufnr("%")}
2match none
else
@@ -4066,6 +6085,7 @@ fun! s:NetrwRemoteRmFile(path,rmfile,all)
" call Decho("attempt to remove file (all=".all.")")
if !all
echohl Statement
+" call Decho("case all=0:")
call inputsave()
let ok= input("Confirm deletion of file<".a:rmfile."> ","[{y(es)},n(o),a(ll),q(uit)] ")
call inputrestore()
@@ -4080,10 +6100,17 @@ fun! s:NetrwRemoteRmFile(path,rmfile,all)
endif
if all || ok =~ 'y\%[es]' || ok == ""
+" call Decho("case all=".all." or ok<".ok.">".(exists("w:netrw_method")? ': netrw_method='.w:netrw_method : ""))
if exists("w:netrw_method") && (w:netrw_method == 2 || w:netrw_method == 3)
+" call Decho("case ftp:")
+ let path= a:path
+ if path =~ '^\a\+://'
+ let path= substitute(path,'^\a\+://[^/]\+/','','')
+ endif
silent! keepjumps .,$d
- call s:NetrwRemoteFtpCmd(a:path,"delete ".a:rmfile)
+ call s:NetrwRemoteFtpCmd(path,"delete ".'"'.a:rmfile.'"')
else
+" call Decho("case ssh: g:netrw_rm_cmd<".g:netrw_rm_cmd.">")
let netrw_rm_cmd= s:MakeSshCmd(g:netrw_rm_cmd)
" call Decho("netrw_rm_cmd<".netrw_rm_cmd.">")
if !exists("b:netrw_curdir")
@@ -4095,9 +6122,9 @@ fun! s:NetrwRemoteRmFile(path,rmfile,all)
" call Decho("remotedir<".remotedir.">")
" call Decho("rmfile<".a:rmfile.">")
if remotedir != ""
- let netrw_rm_cmd= netrw_rm_cmd." ".remotedir.escape(a:rmfile,g:netrw_cd_escape)
+ let netrw_rm_cmd= netrw_rm_cmd." ".shellescape(fnameescape(remotedir.a:rmfile))
else
- let netrw_rm_cmd= netrw_rm_cmd." ".escape(a:rmfile,g:netrw_cd_escape)
+ let netrw_rm_cmd= netrw_rm_cmd." ".shellescape(fnameescape(a:rmfile))
endif
" call Decho("call system(".netrw_rm_cmd.")")
let ret= system(netrw_rm_cmd)
@@ -4108,6 +6135,7 @@ fun! s:NetrwRemoteRmFile(path,rmfile,all)
endif
endif
elseif ok =~ 'q\%[uit]'
+" call Decho("ok==".ok)
break
endif
@@ -4171,6 +6199,7 @@ fun! s:NetrwRemoteFtpCmd(path,listcmd)
" because WinXX ftp uses unix style input
let ffkeep= &ff
setlocal ma ff=unix noro
+" call Decho("setlocal ma ff=unix noro")
" clear off any older non-banner lines
" note that w:netrw_bannercnt indexes the line after the banner
@@ -4185,16 +6214,16 @@ fun! s:NetrwRemoteFtpCmd(path,listcmd)
endif
if exists("g:netrw_ftpextracmd")
exe "put ='".g:netrw_ftpextracmd."'"
-" call Decho("filter input: ".getline("."))
+" call Decho("filter input: ".getline('.'))
endif
- exe "put ='".a:listcmd."'"
+ call setline(lastline("$")+1,a:listcmd)
" exe "keepjumps ".w:netrw_bannercnt.',$g/^./call Decho("ftp#".line(".").": ".getline("."))'
if exists("g:netrw_port") && g:netrw_port != ""
-" call Decho("exe ".g:netrw_silentxfer.w:netrw_bannercnt.",$!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port)
- exe g:netrw_silentxfer." keepjumps ".w:netrw_bannercnt.",$!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port
+" call Decho("exe ".s:netrw_silentxfer.w:netrw_bannercnt.",$!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port)
+ exe s:netrw_silentxfer." keepjumps ".w:netrw_bannercnt.",$!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port
else
-" call Decho("exe ".g:netrw_silentxfer.w:netrw_bannercnt.",$!".g:netrw_ftp_cmd." -i ".g:netrw_machine)
- exe g:netrw_silentxfer." keepjumps ".w:netrw_bannercnt.",$!".g:netrw_ftp_cmd." -i ".g:netrw_machine
+" call Decho("exe ".s:netrw_silentxfer.w:netrw_bannercnt.",$!".g:netrw_ftp_cmd." -i ".g:netrw_machine)
+ exe s:netrw_silentxfer." keepjumps ".w:netrw_bannercnt.",$!".g:netrw_ftp_cmd." -i ".g:netrw_machine
endif
".........................................
@@ -4219,17 +6248,17 @@ fun! s:NetrwRemoteFtpCmd(path,listcmd)
endif
if exists("g:netrw_ftpextracmd")
exe "put ='".g:netrw_ftpextracmd."'"
-" call Decho("filter input: ".getline("."))
+" call Decho("filter input: ".getline('.'))
endif
- exe "put ='".a:listcmd."'"
+ 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
" exe w:netrw_bannercnt.',$g/^./call Decho("ftp#".line(".").": ".getline("."))'
-" call Decho("exe ".g:netrw_silentxfer.w:netrw_bannercnt.",$!".g:netrw_ftp_cmd." -i -n")
- exe g:netrw_silentxfer.w:netrw_bannercnt.",$!".g:netrw_ftp_cmd." -i -n"
+" call Decho("exe ".s:netrw_silentxfer.w:netrw_bannercnt.",$!".g:netrw_ftp_cmd." -i -n")
+ exe s:netrw_silentxfer.w:netrw_bannercnt.",$!".g:netrw_ftp_cmd." -i -n"
".........................................
else
@@ -4275,8 +6304,8 @@ fun! s:NetrwRemoteRename(usrhost,path) range
let rename_cmd = s:MakeSshCmd(g:netrw_rename_cmd)
" rename files given by the markfilelist
- if exists("s:netrwmarkfilelist")
- for oldname in s:netrwmarkfilelist
+ if exists("s:netrwmarkfilelist_{bufnr('%')}")
+ for oldname in s:netrwmarkfilelist_{bufnr("%")}
" call Decho("oldname<".oldname.">")
if exists("subfrom")
let newname= substitute(oldname,subfrom,subto,'')
@@ -4298,14 +6327,12 @@ fun! s:NetrwRemoteRename(usrhost,path) range
else
let oldname= a:path.oldname
let newname= a:path.newname
-" call Decho("system(rename_cmd".' "'.escape(oldname," ").'" "'.escape(newname,g:netrw_cd_escape).'"')
- let ret= s:System("system",rename_cmd.' "'.escape(oldname,g:netrw_cd_escape).'" "'.escape(newname,g:netrw_cd_escape).'"')
+" call Decho("system(rename_cmd".' "'.fnameescape(oldname," ").'" "'.escape(newname).'"')
+ let ret= s:System("system",rename_cmd.' "'.fnameescape(oldname).'" "'.fnameescape(newname).'"')
endif
endfor
- 2match none
- unlet s:netrwmarkfilelist
- unlet s:netrwmarkfilemtch
+ call s:NetrwUnMarkFile(1)
else
@@ -4325,8 +6352,8 @@ fun! s:NetrwRemoteRename(usrhost,path) range
else
let oldname= a:path.oldname
let newname= a:path.newname
-" call Decho("system(rename_cmd".' "'.escape(oldname," ").'" "'.escape(newname,g:netrw_cd_escape).'"')
- let ret= s:System("system",rename_cmd.' "'.escape(oldname,g:netrw_cd_escape).'" "'.escape(newname,g:netrw_cd_escape).'"')
+" call Decho("system(rename_cmd".' "'.fnameescape(oldname," ").'" "'.escape(newname).'"')
+ let ret= s:System("system",rename_cmd.' "'.fnameescape(oldname).'" "'.fnameescape(newname).'"')
endif
let ctr= ctr + 1
@@ -4341,760 +6368,6 @@ fun! s:NetrwRemoteRename(usrhost,path) range
endfun
" ---------------------------------------------------------------------
-" s:NetrwListStyle: {{{2
-" islocal=0: remote browsing
-" =1: local browsing
-fun! s:NetrwListStyle(islocal)
-" call Dfunc("NetrwListStyle(islocal=".a:islocal.") w:netrw_liststyle=".w:netrw_liststyle)
- let fname = s:NetrwGetWord()
- if !exists("w:netrw_liststyle")|let w:netrw_liststyle= g:netrw_liststyle|endif
- let w:netrw_liststyle = (w:netrw_liststyle + 1) % s:MAXLIST
-" call Decho("fname<".fname.">")
-" call Decho("chgd w:netrw_liststyle to ".w:netrw_liststyle)
-" call Decho("b:netrw_curdir<".(exists("b:netrw_curdir")? b:netrw_curdir : "doesn't exist").">")
-
- if w:netrw_liststyle == s:THINLIST
- " use one column listing
-" call Decho("use one column list")
- let g:netrw_list_cmd = substitute(g:netrw_list_cmd,' -l','','ge')
-
- elseif w:netrw_liststyle == s:LONGLIST
- " use long list
-" call Decho("use long list")
- let g:netrw_list_cmd = g:netrw_list_cmd." -l"
-
- elseif w:netrw_liststyle == s:WIDELIST
- " give wide list
-" call Decho("use wide list")
- let g:netrw_list_cmd = substitute(g:netrw_list_cmd,' -l','','ge')
-
- elseif w:netrw_liststyle == s:TREELIST
-" call Decho("use tree list")
- let g:netrw_list_cmd = substitute(g:netrw_list_cmd,' -l','','ge')
-
- else
- call netrw#ErrorMsg(s:WARNING,"bad value for g:netrw_liststyle (=".w:netrw_liststyle.")",46)
- let g:netrw_liststyle = s:THINLIST
- let w:netrw_liststyle = g:netrw_liststyle
- let g:netrw_list_cmd = substitute(g:netrw_list_cmd,' -l','','ge')
- endif
- setlocal ma noro
-
- " clear buffer - this will cause NetrwBrowse/LocalBrowseCheck to do a refresh
-" call Decho("clear buffer<".expand("%")."> with :%d")
- %d
-
- " refresh the listing
- let svpos= netrw#NetrwSavePosn()
- call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,'./'))
- call netrw#NetrwRestorePosn(svpos)
-
- " keep cursor on the filename
- 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("NetrwListStyle".(exists("w:netrw_liststyle")? ' : w:netrw_liststyle='.w:netrw_liststyle : ""))
-endfun
-
-" ---------------------------------------------------------------------
-" s:NetrwWideListing: {{{2
-fun! s:NetrwWideListing()
-
- if w:netrw_liststyle == s:WIDELIST
-" call Dfunc("NetrwWideListing() w:netrw_liststyle=".w:netrw_liststyle.' fo='.&fo.' l:fo='.&l:fo)
- " look for longest filename (cpf=characters per filename)
- " cpf: characters per file
- " fpl: files per line
- " fpc: files per column
- 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'
- else
-" call Dret("NetrwWideListing")
- return
- endif
-" call Decho("max file strlen+1=".b:netrw_cpf)
- let b:netrw_cpf= b:netrw_cpf + 1
-
- " determine qty files per line (fpl)
- let w:netrw_fpl= winwidth(0)/b:netrw_cpf
- if w:netrw_fpl <= 0
- let w:netrw_fpl= 1
- endif
-" call Decho("fpl= ".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)),"\\")/'
- 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."]")
- silent! let keepregstar = @*
- 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"
- else
- exe "silent keepjumps norm! 0\<c-v>".newcolqty.'j$hx'.w:netrw_bannercnt.'G$p'
- endif
- exe "silent keepjumps ".newcolstart.','.newcolend.'d'
- exe 'silent keepjumps '.w:netrw_bannercnt
- endwhile
- silent! let @*= keepregstar
- exe "silent keepjumps ".w:netrw_bannercnt.',$s/\s\+$//e'
- setlocal noma nomod ro
-" call Dret("NetrwWideListing")
- endif
-
-endfun
-
-" ---------------------------------------------------------------------
-" s:NetrwTreeDir: determine tree directory given current cursor position {{{2
-" (full path directory with trailing slash returned)
-fun! s:NetrwTreeDir()
-" call Dfunc("NetrwTreeDir() curline#".line(".")."<".getline(".")."> b:netrw_curdir<".b:netrw_curdir."> tab#".tabpagenr()." win#".winnr()." buf#".bufnr("%")."<".bufname("%").">")
-
- let treedir= b:netrw_curdir
-" call Decho("set initial treedir<".treedir.">")
- let s:treecurpos= getpos(".")
-
- if w:netrw_liststyle == s:TREELIST
-" call Decho("w:netrrw_liststyle is TREELIST:")
-" call Decho("line#".line(".")." getline(.)<".getline('.')."> treecurpos<".string(s:treecurpos).">")
- if getline('.') =~ '/$'
- let treedir= substitute(getline('.'),'^\%(| \)*\([^|].\{-}\)$','\1','e')
- else
- let treedir= ""
- endif
-
-" call Decho("treedir<".treedir.">")
-
- " 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
-" call Dret("NetrwTreeDir <".treedir."> : (side effect) s:treecurpos<".string(s:treecurpos).">")
- return b:netrw_curdir
- endif
-
- " elide all non-depth information
- let depth = substitute(getline('.'),'^\(\%(| \)*\)[^|].\{-}$','\1','e')
-" call Decho("depth<".depth."> 1st subst")
-
- " elide first depth
- let depth = substitute(depth,'^| ','','')
-" call Decho("depth<".depth."> 2nd subst")
-
- " construct treedir by searching backwards at correct depth
-" call Decho("constructing treedir<".treedir."> depth<".depth.">")
- while depth != "" && search('^'.depth.'[^|].\{-}/$','bW')
- let dirname= substitute(getline("."),'^\(| \)*','','e')
- let treedir= dirname.treedir
- let depth = substitute(depth,'^| ','','')
-" call Decho("constructing treedir<".treedir.">: dirname<".dirname."> while depth<".depth.">")
- endwhile
- if w:netrw_treetop =~ '/$'
- let treedir= w:netrw_treetop.treedir
- else
- let treedir= w:netrw_treetop.'/'.treedir
- endif
-" call Decho("bufnr(.)=".bufnr(".")." line($)=".line("$")." line(.)=".line("."))
- endif
- let treedir= substitute(treedir,'//$','/','')
-
-" " now force a refresh
-" call Decho("clear buffer<".expand("%")."> with :%d")
-" setlocal ma noro
-" keepjumps %d
-
-" call Dret("NetrwTreeDir <".treedir."> : (side effect) s:treecurpos<".string(s:treecurpos).">")
- return treedir
-endfun
-
-" ---------------------------------------------------------------------
-" s:NetrwTreeDisplay: recursive tree display {{{2
-fun! s:NetrwTreeDisplay(dir,depth)
-" call Dfunc("NetrwTreeDisplay(dir<".a:dir."> depth<".a:depth.">)")
-
- " insure that there are no folds
- setlocal nofen
-
- " install ../ and shortdir
- if a:depth == ""
- call setline(line("$")+1,'../')
-" call Decho("setline#".line("$")." ../ (depth is zero)")
- endif
- if a:dir =~ '^\a\+://'
- if a:dir == w:netrw_treetop
- let shortdir= a:dir
- else
- let shortdir= substitute(a:dir,'^.*/\([^/]\+\)/$','\1/','e')
- endif
- call setline(line("$")+1,a:depth.shortdir)
- else
- let shortdir= substitute(a:dir,'^.*/','','e')
- call setline(line("$")+1,a:depth.shortdir.'/')
- endif
-" call Decho("setline#".line("$")." shortdir<".a:depth.shortdir.">")
-
- " append a / to dir if its missing one
- let dir= a:dir
- if dir !~ '/$'
- let dir= dir.'/'
- endif
-
- " display subtrees (if any)
- let depth= "| ".a:depth
-" call Decho("display subtrees with depth<".depth."> and current leaves")
- for entry in w:netrw_treedict[a:dir]
- let direntry= substitute(dir.entry,'/$','','e')
-" call Decho("dir<".dir."> entry<".entry."> direntry<".direntry.">")
- if entry =~ '/$' && has_key(w:netrw_treedict,direntry)
-" call Decho("<".direntry."> is a key in treedict - display subtree for it")
- call s:NetrwTreeDisplay(direntry,depth)
- 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)
- endif
- endfor
-" call Dret("NetrwTreeDisplay")
-endfun
-
-" ---------------------------------------------------------------------
-" s:NetrwTreeListing: displays tree listing from treetop on down, using NetrwTreeDisplay() {{{2
-fun! s:NetrwTreeListing(dirname)
- if w:netrw_liststyle == s:TREELIST
-" call Dfunc("NetrwTreeListing() bufname<".expand("%").">")
-" call Decho("curdir<".a:dirname.">")
-
- " update the treetop
-" call Decho("update the treetop")
- if !exists("w:netrw_treetop")
- let w:netrw_treetop= a:dirname
-" call Decho("w:netrw_treetop<".w:netrw_treetop."> (reusing)")
- elseif (w:netrw_treetop =~ ('^'.a:dirname) && s:Strlen(a:dirname) < s:Strlen(w:netrw_treetop)) || a:dirname !~ ('^'.w:netrw_treetop)
- let w:netrw_treetop= a:dirname
-" call Decho("w:netrw_treetop<".w:netrw_treetop."> (went up)")
- endif
-
- " insure that we have at least an empty treedict
- if !exists("w:netrw_treedict")
- let w:netrw_treedict= {}
- endif
-
- " 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("treedict=".string(w:netrw_treedict))
- 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>")
- else
- let fname= ""
- endif
-
- " display from treetop on down
- call s:NetrwTreeDisplay(w:netrw_treetop,"")
-
- " place cursor
- if !exists("s:nbcd_curpos")
- if fname != ""
-" call Decho("(NetrwTreeListing) place cursor <".fname.">")
- call search('\<'.fname.'\>','cw')
- elseif exists("w:netrw_bannercnt")
- exe "keepjumps ".(w:netrw_bannercnt+1)
-" call Decho("(NetrwTreeListing) place cursor line#".(w:netrw_bannercnt+1))
- endif
- endif
-
-" call Dret("NetrwTreeListing : bufname<".expand("%").">")
- endif
-endfun
-
-" ---------------------------------------------------------------------
-" s:NetrwSaveWordPosn: used by the "s" command in both remote and local {{{2
-" browsing. Along with NetrwRestoreWordPosn(), it keeps the cursor on
-" the same word even though the sorting has changed its order of appearance.
-fun! s:NetrwSaveWordPosn()
-" call Dfunc("NetrwSaveWordPosn()")
- let s:netrw_saveword= '^'.escape(getline("."),g:netrw_cd_escape).'$'
-" call Dret("NetrwSaveWordPosn : saveword<".s:netrw_saveword.">")
-endfun
-
-" ---------------------------------------------------------------------
-" s:NetrwRestoreWordPosn: used by the "s" command; see NetrwSaveWordPosn() above {{{2
-fun! s:NetrwRestoreWordPosn()
-" call Dfunc("NetrwRestoreWordPosn()")
- silent! call search(s:netrw_saveword,'w')
-" call Dret("NetrwRestoreWordPosn")
-endfun
-
-" ---------------------------------------------------------------------
-" s:NetrwMakeDir: this function makes a directory (both local and remote) {{{2
-fun! s:NetrwMakeDir(usrhost)
-" call Dfunc("NetrwMakeDir(usrhost<".a:usrhost.">)")
-
- " get name of new directory from user. A bare <CR> will skip.
- " if its currently a directory, also request will be skipped, but with
- " a message.
- call inputsave()
- let newdirname= input("Please give directory name: ")
- call inputrestore()
-" call Decho("newdirname<".newdirname.">")
-
- if newdirname == ""
-" call Dret("NetrwMakeDir : user aborted with bare <cr>")
- return
- endif
-
- if a:usrhost == ""
-
- " Local mkdir:
- " sanity checks
- let fullnewdir= b:netrw_curdir.'/'.newdirname
-" call Decho("fullnewdir<".fullnewdir.">")
- if isdirectory(fullnewdir)
- if !exists("g:netrw_quiet")
- call netrw#ErrorMsg(s:WARNING,"<".newdirname."> is already a directory!",24)
- endif
-" call Dret("NetrwMakeDir : directory<".newdirname."> exists previously")
- return
- endif
- if s:FileReadable(fullnewdir)
- if !exists("g:netrw_quiet")
- call netrw#ErrorMsg(s:WARNING,"<".newdirname."> is already a file!",25)
- endif
-" call Dret("NetrwMakeDir : file<".newdirname."> exists previously")
- return
- endif
-
- " requested new local directory is neither a pre-existing file or
- " directory, so make it!
- if exists("*mkdir")
- call mkdir(fullnewdir,"p")
- else
- let netrw_origdir= s:NetrwGetcwd(1)
- exe 'keepjumps cd '.b:netrw_curdir
-" call Decho("netrw_origdir<".netrw_origdir.">: cd b:netrw_curdir<".b:netrw_curdir.">")
-" call Decho("exe silent! !".g:netrw_local_mkdir.' '.g:netrw_shq.newdirname.g:netrw_shq)
- exe "silent! !".g:netrw_local_mkdir.' '.g:netrw_shq.newdirname.g:netrw_shq
- if !g:netrw_keepdir
- exe 'keepjumps cd '.netrw_origdir
-" call Decho("netrw_keepdir=".g:netrw_keepdir.": cd ".netrw_origdir." getcwd<".getcwd().">")
- endif
- endif
-
- if v:shell_error == 0
- " refresh listing
-" call Decho("refresh listing")
- let svpos= netrw#NetrwSavePosn()
- call s:NetrwRefresh(1,s:NetrwBrowseChgDir(1,'./'))
- call netrw#NetrwRestorePosn(svpos)
- elseif !exists("g:netrw_quiet")
- call netrw#ErrorMsg(s:ERROR,"unable to make directory<".newdirname.">",26)
- endif
- redraw!
-
- else
- " Remote mkdir:
- let mkdircmd = s:MakeSshCmd(g:netrw_mkdir_cmd)
- let newdirname= substitute(b:netrw_curdir,'^\%(.\{-}/\)\{3}\(.*\)$','\1','').newdirname
-" call Decho("exe silent! !".mkdircmd." ".g:netrw_shq.newdirname.g:netrw_shq)
- exe "silent! !".mkdircmd." ".g:netrw_shq.newdirname.g:netrw_shq
- if v:shell_error == 0
- " refresh listing
- let svpos= netrw#NetrwSavePosn()
- call s:NetrwRefresh(0,s:NetrwBrowseChgDir(0,'./'))
- call netrw#NetrwRestorePosn(svpos)
- elseif !exists("g:netrw_quiet")
- call netrw#ErrorMsg(s:ERROR,"unable to make directory<".newdirname.">",27)
- endif
- redraw!
- endif
-
-" call Dret("NetrwMakeDir")
-endfun
-
-" ---------------------------------------------------------------------
-" s:NetrwBookmarkDir: {{{2
-" 0: (user: <b>) bookmark current directory
-" 1: (user: <B>) change to the bookmarked directory
-" 2: (user: <q>) list bookmarks
-" 3: (browsing) record current directory history
-" 4: (user: <u>) go up (previous) bookmark
-" 5: (user: <U>) go down (next) bookmark
-fun! s:NetrwBookmarkDir(chg,curdir)
-" call Dfunc("NetrwBookmarkDir(chg=".a:chg." curdir<".a:curdir.">) cnt=".v:count." bookmarkcnt=".g:NETRW_BOOKMARKMAX." histcnt=".g:NETRW_DIRHIST_CNT." bookmax=".g:NETRW_BOOKMARKMAX." histmax=".g:netrw_dirhistmax)
-
- if a:chg == 0
- " bookmark the current directory
-" call Decho("(user: <b>) bookmark the current directory")
- if v:count > 0
- " handle bookmark# specified via the count
- let g:NETRW_BOOKMARKDIR_{v:count}= a:curdir
- if !exists("g:NETRW_BOOKMARKMAX")
- let g:NETRW_BOOKMARKMAX= v:count
- elseif v:count > g:NETRW_BOOKMARKMAX
- let g:NETRW_BOOKMARKMAX= v:count
- endif
- else
- " handle no count specified
- let g:NETRW_BOOKMARKMAX = g:NETRW_BOOKMARKMAX + 1
- let g:NETRW_BOOKMARKDIR_{g:NETRW_BOOKMARKMAX} = a:curdir
- endif
- echo "bookmarked the current directory"
-
- elseif a:chg == 1
- " change to the bookmarked directory
-" call Decho("(user: <B>) change to the bookmarked directory")
- if exists("g:NETRW_BOOKMARKDIR_{v:count}")
- exe "e ".g:NETRW_BOOKMARKDIR_{v:count}
- else
- echomsg "Sorry, bookmark#".v:count." doesn't exist!"
- endif
-
- elseif a:chg == 2
- redraw!
- let didwork= 0
- " list user's bookmarks
-" call Decho("(user: <q>) list user's bookmarks")
- if exists("g:NETRW_BOOKMARKMAX")
-" call Decho("list bookmarks [0,".g:NETRW_BOOKMARKMAX."]")
- let cnt= 0
- while cnt <= g:NETRW_BOOKMARKMAX
- if exists("g:NETRW_BOOKMARKDIR_{cnt}")
-" call Decho("Netrw Bookmark#".cnt.": ".g:NETRW_BOOKMARKDIR_{cnt})
- echo "Netrw Bookmark#".cnt.": ".g:NETRW_BOOKMARKDIR_{cnt}
- let didwork= 1
- endif
- let cnt= cnt + 1
- endwhile
- endif
-
- " list directory history
- let cnt = g:NETRW_DIRHIST_CNT
- let first = 1
- let histcnt = 0
- while ( first || cnt != g:NETRW_DIRHIST_CNT )
-" call Decho("first=".first." cnt=".cnt." dirhist_cnt=".g:NETRW_DIRHIST_CNT)
- let histcnt= histcnt + 1
- if exists("g:NETRW_DIRHIST_{cnt}")
-" call Decho("Netrw History#".histcnt.": ".g:NETRW_DIRHIST_{cnt})
- echo "Netrw History#".histcnt.": ".g:NETRW_DIRHIST_{cnt}
- let didwork= 1
- endif
- let first = 0
- let cnt = ( cnt - 1 ) % g:netrw_dirhistmax
- if cnt < 0
- let cnt= cnt + g:netrw_dirhistmax
- endif
- endwhile
- if didwork
- call inputsave()|call input("Press <cr> to continue")|call inputrestore()
- endif
-
- elseif a:chg == 3
- " saves most recently visited directories (when they differ)
-" call Decho("(browsing) record curdir history")
- if !exists("g:NETRW_DIRHIST_0") || g:NETRW_DIRHIST_{g:NETRW_DIRHIST_CNT} != a:curdir
- let g:NETRW_DIRHIST_CNT= ( g:NETRW_DIRHIST_CNT + 1 ) % g:netrw_dirhistmax
-" let g:NETRW_DIRHIST_{g:NETRW_DIRHIST_CNT}= substitute(a:curdir,'[/\\]$','','e')
- let g:NETRW_DIRHIST_{g:NETRW_DIRHIST_CNT}= a:curdir
-" call Decho("save dirhist#".g:NETRW_DIRHIST_CNT."<".g:NETRW_DIRHIST_{g:NETRW_DIRHIST_CNT}.">")
- endif
-
- elseif a:chg == 4
- " u: change to the previous directory stored on the history list
-" call Decho("(user: <u>) chg to prev dir from history")
- 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
- 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
- %d
- setlocal nomod
- endif
-" call Decho("exe e! ".g:NETRW_DIRHIST_{g:NETRW_DIRHIST_CNT})
- exe "e! ".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
-
- elseif a:chg == 5
- " U: change to the subsequent directory stored on the history list
-" call Decho("(user: <U>) chg to next dir from history")
- let g:NETRW_DIRHIST_CNT= ( g:NETRW_DIRHIST_CNT + 1 ) % g:netrw_dirhistmax
- 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
- %d
- setlocal nomod
- endif
-" call Decho("exe e! ".g:NETRW_DIRHIST_{g:NETRW_DIRHIST_CNT})
- exe "e! ".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
- echo "Sorry, no successor directory exists yet"
- endif
- endif
- call s:NetrwBookmarkMenu()
-" call Dret("NetrwBookmarkDir")
-endfun
-
-" ---------------------------------------------------------------------
-" s:NetrwBookmarkMenu: Uses menu priorities {{{2
-" .2.[cnt] for bookmarks, and
-" .3.[cnt] for history
-" (see s:NetrwMenu())
-fun! s:NetrwBookmarkMenu()
- if !exists("s:netrw_menucnt")
- return
- endif
-" call Dfunc("NetrwBookmarkMenu() bookmarkcnt=".g:NETRW_BOOKMARKMAX." histcnt=".g:NETRW_DIRHIST_CNT." menucnt=".s:netrw_menucnt)
- if has("menu") && has("gui_running") && &go =~ 'm'
- if exists("g:NetrwTopLvlMenu")
- exe 'silent! unmenu '.g:NetrwTopLvlMenu.'Bookmark'
- endif
-
- " show bookmarked places
- let cnt = 0
- while cnt <= g:NETRW_BOOKMARKMAX
- if exists("g:NETRW_BOOKMARKDIR_{cnt}")
- let bmdir= escape(g:NETRW_BOOKMARKDIR_{cnt},'.')
-" call Decho('silent! menu '.g:NetrwMenuPriority.".2.".cnt." ".g:NetrwTopLvlMenu.'Bookmark.'.bmdir.' :e '.g:NETRW_BOOKMARKDIR_{cnt})
- exe 'silent! menu '.g:NetrwMenuPriority.".2.".cnt." ".g:NetrwTopLvlMenu.'Bookmarks.'.bmdir.' :e '.g:NETRW_BOOKMARKDIR_{cnt}."\<cr>"
- endif
- let cnt= cnt + 1
- endwhile
-
- " show directory browsing history
- let cnt = g:NETRW_DIRHIST_CNT
- let first = 1
- let histcnt = 0
- while ( first || cnt != g:NETRW_DIRHIST_CNT )
- let histcnt = histcnt + 1
- let priority = g:NETRW_DIRHIST_CNT + histcnt
- if exists("g:NETRW_DIRHIST_{cnt}")
- let bmdir= escape(g:NETRW_DIRHIST_{cnt},'.')
-" call Decho('silent! menu '.g:NetrwMenuPriority.".3.".priority." ".g:NetrwTopLvlMenu.'History.'.bmdir.' :e '.g:NETRW_DIRHIST_{cnt})
- exe 'silent! menu '.g:NetrwMenuPriority.".3.".priority." ".g:NetrwTopLvlMenu.'History.'.bmdir.' :e '.g:NETRW_DIRHIST_{cnt}."\<cr>"
- endif
- let first = 0
- let cnt = ( cnt - 1 ) % g:netrw_dirhistmax
- if cnt < 0
- let cnt= cnt + g:netrw_dirhistmax
- endif
- endwhile
- endif
-" call Dret("NetrwBookmarkMenu")
-endfun
-
-" ---------------------------------------------------------------------
-" s:NetrwPrevWinOpen: open file/directory in previous window. {{{2
-" If there's only one window, then the window will first be split.
-" Returns:
-" choice = 0 : didn't have to choose
-" choice = 1 : saved modified file in window first
-" choice = 2 : didn't save modified file, opened window
-" choice = 3 : cancel open
-fun! s:NetrwPrevWinOpen(islocal)
-" call Dfunc("NetrwPrevWinOpen(islocal=".a:islocal.")")
-
- " grab a copy of the b:netrw_curdir to pass it along to newly split windows
- let curdir = b:netrw_curdir
-
- " get last window number and the word currently under the cursor
- let lastwinnr = winnr("$")
- let curword = s:NetrwGetWord()
- let choice = 0
-" call Decho("lastwinnr=".lastwinnr." curword<".curword.">")
-
- let didsplit = 0
- if lastwinnr == 1
- " if only one window, open a new one first
-" call Decho("only one window, so open a new one (g:netrw_alto=".g:netrw_alto.")")
- if g:netrw_preview
-" call Decho("exe ".(g:netrw_alto? "top " : "bot ")."vert ".g:netrw_winsize."wincmd s")
- exe (g:netrw_alto? "top " : "bot ")."vert ".g:netrw_winsize."wincmd s"
- else
-" call Decho("exe ".(g:netrw_alto? "bel " : "abo ").g:netrw_winsize."wincmd s")
- exe (g:netrw_alto? "bel " : "abo ").g:netrw_winsize."wincmd s"
- endif
- let didsplit = 1
-
- else
- call s:SaveBufVars()
-" call Decho("wincmd p")
- wincmd p
- call s:RestoreBufVars()
- " if the previous window's buffer has been changed (is modified),
- " and it doesn't appear in any other extant window, then ask the
- " user if s/he wants to abandon modifications therein.
- let bnr = winbufnr(0)
- let bnrcnt = 0
- if &mod
-" call Decho("detected: prev window's buffer has been modified: bnr=".bnr." winnr#".winnr())
- let eikeep= &ei
- set ei=all
- windo if winbufnr(0) == bnr | let bnrcnt=bnrcnt+1 | endif
- exe bnr."wincmd p"
- let &ei= eikeep
-" call Decho("bnr=".bnr." bnrcnt=".bnrcnt." buftype=".&bt." winnr#".winnr())
- if bnrcnt == 1
- let bufname= bufname(winbufnr(winnr()))
- let choice= confirm("Save modified file<".bufname.">?","&Yes\n&No\n&Cancel")
-" call Decho("bufname<".bufname."> choice=".choice." winnr#".winnr())
-
- if choice == 1
- " Yes -- write file & then browse
- let v:errmsg= ""
- silent w
- if v:errmsg != ""
- call netrw#ErrorMsg(s:ERROR,"unable to write <".bufname.">!",30)
- if didsplit
- q
- else
- wincmd p
- endif
-" call Dret("NetrwPrevWinOpen ".choice." : unable to write <".bufname.">")
- return choice
- endif
-
- elseif choice == 2
- " No -- don't worry about changed file, just browse anyway
- setlocal nomod
- call netrw#ErrorMsg(s:WARNING,bufname." changes to ".bufname." abandoned",31)
- wincmd p
-
- else
- " Cancel -- don't do this
- if didsplit
- q
- else
- wincmd p
- endif
-" call Dret("NetrwPrevWinOpen ".choice." : cancelled")
- return choice
- endif
- endif
- endif
- endif
-
- " restore b:netrw_curdir (window split/enew may have lost it)
- let b:netrw_curdir= curdir
- if a:islocal < 2
- if a:islocal
- call netrw#LocalBrowseCheck(s:NetrwBrowseChgDir(a:islocal,curword))
- else
- call s:NetrwBrowse(a:islocal,s:NetrwBrowseChgDir(a:islocal,curword))
- endif
- endif
-" call Dret("NetrwPrevWinOpen ".choice)
- return choice
-endfun
-
-" ---------------------------------------------------------------------
-" s:NetrwMenu: generates the menu for gvim and netrw {{{2
-fun! s:NetrwMenu(domenu)
-
- if !exists("g:NetrwMenuPriority")
- let g:NetrwMenuPriority= 80
- endif
-
- if has("menu") && has("gui_running") && &go =~ 'm' && g:netrw_menu
-" 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>'
- call s:NetrwBookmarkMenu() " provide some history! uses priorities 2,3, reserves 4
- exe 'silent! menu '.g:NetrwMenuPriority.'.5 '.g:NetrwTopLvlMenu.'-Sep1- :'
- exe 'silent! 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 'silent! menu '.g:NetrwMenuPriority.'.8.1 '.g:NetrwTopLvlMenu.'Bookmarks\ and\ History.Bookmark\ Current\ Directory<tab>mb mb'
- exe 'silent! menu '.g:NetrwMenuPriority.'.8.2 '.g:NetrwTopLvlMenu.'Bookmarks\ and\ History.Goto\ Bookmark<tab>gb gb'
- exe 'silent! menu '.g:NetrwMenuPriority.'.8.3 '.g:NetrwTopLvlMenu.'Bookmarks\ and\ History.List<tab>q q'
- exe 'silent! menu '.g:NetrwMenuPriority.'.8.4 '.g:NetrwTopLvlMenu.'Bookmarks\ and\ History.Goto\ Prev\ Dir<tab>u u'
- exe 'silent! menu '.g:NetrwMenuPriority.'.8.5 '.g:NetrwTopLvlMenu.'Bookmarks\ and\ History.Goto\ Next\ Dir<tab>U U'
- exe 'silent! menu '.g:NetrwMenuPriority.'.9.1 '.g:NetrwTopLvlMenu.'Browsing\ Control.Edit\ File\ Hiding\ List<tab>'."<ctrl-h> \<Plug>NetrwHideEdit"
- exe 'silent! 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.Refresh\ Listing<tab>'."<ctrl-l> \<Plug>NetrwRefresh"
- exe 'silent! menu '.g:NetrwMenuPriority.'.9.4 '.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 'silent! 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 'silent! 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 'silent! menu '.g:NetrwMenuPriority.'.11.5 '.g:NetrwTopLvlMenu.'Edit\ File/Dir.In\ New\ Vertical\ Window<tab>v v'
- exe 'silent! menu '.g:NetrwMenuPriority.'.12 '.g:NetrwTopLvlMenu.'Make\ Subdirectory<tab>d d'
- exe 'silent! menu '.g:NetrwMenuPriority.'.13.1 '.g:NetrwTopLvlMenu.'Marked\ Files.Mark\ File<tab>mf mf'
- exe 'silent! menu '.g:NetrwMenuPriority.'.13.2 '.g:NetrwTopLvlMenu.'Marked\ Files.Mark\ Files\ by\ Regexp<tab>mr mr'
- exe 'silent! menu '.g:NetrwMenuPriority.'.13.3 '.g:NetrwTopLvlMenu.'Marked\ Files.Hide-Show-List\ Control<tab>a a'
- exe 'silent! menu '.g:NetrwMenuPriority.'.13.4 '.g:NetrwTopLvlMenu.'Marked\ Files.Copy\ To\ Target<tab>mc mc'
- exe 'silent! menu '.g:NetrwMenuPriority.'.13.5 '.g:NetrwTopLvlMenu.'Marked\ Files.Delete<tab>D D'
- exe 'silent! menu '.g:NetrwMenuPriority.'.13.6 '.g:NetrwTopLvlMenu.'Marked\ Files.Diff<tab>md md'
- exe 'silent! menu '.g:NetrwMenuPriority.'.13.7 '.g:NetrwTopLvlMenu.'Marked\ Files.Edit<tab>me me'
- exe 'silent! menu '.g:NetrwMenuPriority.'.13.8 '.g:NetrwTopLvlMenu.'Marked\ Files.Exe\ Cmd<tab>mx mx'
- exe 'silent! menu '.g:NetrwMenuPriority.'.13.9 '.g:NetrwTopLvlMenu.'Marked\ Files.Move\ To\ Target<tab>mm mm'
- exe 'silent! menu '.g:NetrwMenuPriority.'.13.10 '.g:NetrwTopLvlMenu.'Marked\ Files.Obtain<tab>O O'
- exe 'silent! menu '.g:NetrwMenuPriority.'.13.11 '.g:NetrwTopLvlMenu.'Marked\ Files.Print<tab>mp mp'
- exe 'silent! menu '.g:NetrwMenuPriority.'.13.12 '.g:NetrwTopLvlMenu.'Marked\ Files.Replace<tab>R R'
- exe 'silent! menu '.g:NetrwMenuPriority.'.13.13 '.g:NetrwTopLvlMenu.'Marked\ Files.Set\ Target<tab>mt mt'
- exe 'silent! menu '.g:NetrwMenuPriority.'.13.14 '.g:NetrwTopLvlMenu.'Marked\ Files.Tag<tab>mT mT'
- exe 'silent! menu '.g:NetrwMenuPriority.'.13.15 '.g:NetrwTopLvlMenu.'Marked\ Files.Zip/Unzip/Compress/Uncompress<tab>mz mz'
- exe 'silent! menu '.g:NetrwMenuPriority.'.14 '.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 'silent! 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 'silent! 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 'silent! menu '.g:NetrwMenuPriority.'.18 '.g:NetrwTopLvlMenu.'Set\ Current\ Directory<tab>c c'
- let s:netrw_menucnt= 28
-
- elseif !a:domenu
- let s:netrwcnt = 0
- let curwin = winnr()
- 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
-" call Decho('exe silent! unmenu '.g:NetrwTopLvlMenu.'*')
- silent! unlet s:netrw_menu_enabled
- endif
- endif
-" call Dret("NetrwMenu")
- endif
-
-endfun
-
-" ==========================================
" Local Directory Browsing Support: {{{1
" ==========================================
@@ -5108,8 +6381,7 @@ fun! netrw#LocalBrowseCheck(dirname)
" The &ft == "netrw" test was installed because the BufEnter event
" would hit when re-entering netrw windows, creating unexpected
" refreshes (and would do so in the middle of NetrwSaveOptions(), too)
-" call Dfunc("netrw#LocalBrowseCheck(dirname<".a:dirname.">")
-" call Decho("isdir=".isdirectory(a:dirname))
+" call Decho("netrw#LocalBrowseCheck: isdir<".a:dirname.">=".isdirectory(a:dirname))
if isdirectory(a:dirname)
" call Decho(" ft=".&ft." b:netrw_curdir<".(exists("b:netrw_curdir")? b:netrw_curdir : " doesn't exist")."> dirname<".a:dirname.">"." line($)=".line("$"))
if &ft != "netrw" || (exists("b:netrw_curdir") && b:netrw_curdir != a:dirname)
@@ -5118,7 +6390,6 @@ fun! netrw#LocalBrowseCheck(dirname)
silent! call s:NetrwBrowse(1,a:dirname)
endif
endif
-" call Dret("netrw#LocalBrowseCheck")
" not a directory, ignore it
endfun
@@ -5135,49 +6406,54 @@ fun! s:LocalListing()
" if exists("g:netrw_sort_by")|call Decho('g:netrw_sort_by<'.g:netrw_sort_by.">")|else|call Decho("g:netrw_sort_by doesn't exist")|endif
" get the list of files contained in the current directory
- let dirname = escape(b:netrw_curdir,s:netrw_glob_escape)
- let dirnamelen = s:Strlen(b:netrw_curdir)
+ let dirname = escape(b:netrw_curdir,g:netrw_glob_escape)
+ let dirnamelen = strlen(b:netrw_curdir)
let filelist = glob(s:ComposePath(dirname,"*"))
" call Decho("glob(dirname<".dirname."/*>)=".filelist)
if filelist != ""
let filelist= filelist."\n"
endif
let filelist= filelist.glob(s:ComposePath(dirname,".*"))
-" call Decho("glob(dirname<".dirname."/.*>)=".glob(dirname.".*"))
-
- " if the directory name includes a "$", and possibly other characters,
- " the glob() doesn't include "." and ".." entries.
- if filelist !~ '[\\/]\.[\\/]\=\(\n\|$\)'
-" call Decho("forcibly tacking on .")
- if filelist == ""
- let filelist= s:ComposePath(dirname,"./")
- else
- let filelist= filelist."\n".s:ComposePath(b:netrw_curdir,"./")
- endif
-" call Decho("filelist<".filelist.">")
+" call Decho("glob(dirname<".dirname."/.*>)=".filelist)
+
+ " Coding choice: either elide ./ if present
+ " or include ./ if not present
+ if filelist =~ '[\\/]\.[\\/]\=\(\n\|$\)'
+ " elide /path/. from glob() entries if present
+" call Decho("elide /path/. from glob entries if present")
+ let filelist = substitute(filelist,'\n','\t','g')
+ let filelist = substitute(filelist,'^[^\t]\+[/\\]\.\t','','')
+ let filelist = substitute(filelist,'[^\t]\+[/\\]\.$','','')
+ let filelist = substitute(filelist,'\t\zs[^\t]\+[/\\]\.\t','','')
+ let filelist = substitute(filelist,'\t','\n','g')
endif
+" call Decho("filelist<".filelist.">")
if filelist !~ '[\\/]\.\.[\\/]\=\(\n\|$\)'
+ " include ../ in the glob() entry if its missing
" call Decho("forcibly tacking on ..")
let filelist= filelist."\n".s:ComposePath(b:netrw_curdir,"../")
" call Decho("filelist<".filelist.">")
endif
if b:netrw_curdir == '/'
" remove .. from filelist when current directory is root directory
- let filelist= substitute(filelist,'/\.\.\n','','')
" call Decho("remove .. from filelist")
+ let filelist= substitute(filelist,'/\.\.\n','','')
endif
+ " remove multiple contiguous newlines
let filelist= substitute(filelist,'\n\{2,}','\n','ge')
if !g:netrw_cygwin && (has("win32") || has("win95") || has("win64") || has("win16"))
" change all \s to /s
+" call Decho('change all \s to /s')
let filelist= substitute(filelist,'\','/','g')
else
" escape all \s to \\
+" call Decho('escape all \s to \\')
let filelist= substitute(filelist,'\','\\','g')
endif
-" call Decho("dirname<".dirname.">")
-" call Decho("dirnamelen<".dirnamelen.">")
-" call Decho("filelist<".filelist.">")
+" call Decho("(before while) dirname<".dirname.">")
+" call Decho("(before while) dirnamelen<".dirnamelen.">")
+" call Decho("(before while) filelist<".filelist.">")
while filelist != ""
if filelist =~ '\n'
@@ -5187,18 +6463,61 @@ fun! s:LocalListing()
let filename = filelist
let filelist = ""
endif
- let pfile= filename
- if isdirectory(filename)
- let pfile= filename."/"
- elseif fnamemodify(filename,":p") != resolve(filename)
+" call Decho(" ")
+" call Decho("(while) filelist<".filelist.">")
+" call Decho("(while) filename<".filename.">")
+
+ if getftype(filename) == "link"
+ " indicate a symbolic link
+" call Decho("indicate <".filename."> is a symbolic link with trailing @")
let pfile= filename."@"
+
+ elseif getftype(filename) == "socket"
+ " indicate a socket
+" call Decho("indicate <".filename."> is a socket with trailing =")
+ let pfile= filename."="
+
+ elseif getftype(filename) == "fifo"
+ " indicate a fifo
+" call Decho("indicate <".filename."> is a fifo with trailing |")
+ let pfile= filename."|"
+
+ elseif isdirectory(filename)
+ " indicate a directory
+" call Decho("indicate <".filename."> is a directory with trailing /")
+ let pfile= filename."/"
+
+ elseif exists("b:netrw_curdir") && b:netrw_curdir !~ '^.*://' && !isdirectory(filename)
+ if (has("win32") || has("win95") || has("win64") || has("win16"))
+ if filename =~ '\.[eE][xX][eE]$' || filename =~ '\.[cC][oO][mM]$' || filename =~ '\.[bB][aA][tT]$'
+ " indicate an executable
+" call Decho("indicate <".filename."> is executable with trailing *")
+ let pfile= filename."*"
+ else
+ " normal file
+ let pfile= filename
+ endif
+ elseif executable(filename)
+ " indicate an executable
+" call Decho("indicate <".filename."> is executable with trailing *")
+ let pfile= filename."*"
+ else
+ " normal file
+ let pfile= filename
+ endif
+
+ else
+ " normal file
+ let pfile= filename
endif
+" call Decho("pfile<".pfile."> (after *@/ appending)")
+
if pfile =~ '//$'
let pfile= substitute(pfile,'//$','/','e')
+" call Decho("change // to /: pfile<".pfile.">")
endif
let pfile= strpart(pfile,dirnamelen)
let pfile= substitute(pfile,'^[/\\]','','e')
-" call Decho(" ")
" call Decho("filename<".filename.">")
" call Decho("pfile <".pfile.">")
@@ -5236,8 +6555,8 @@ fun! s:LocalListing()
" cleanup any windows mess at end-of-line
silent! keepjumps %s/\r$//e
- setlocal ts=32
-" call Decho("setlocal ts=32")
+ exe "setlocal ts=".g:netrw_maxfilenamelen
+" call Decho("setlocal ts=".g:netrw_maxfilenamelen)
" call Dret("s:LocalListing")
endfun
@@ -5248,16 +6567,25 @@ endfun
" buffers to be refreshed after a user has executed some shell command,
" on the chance that s/he removed/created a file/directory with it.
fun! s:LocalBrowseShellCmdRefresh()
-" call Dfunc("LocalBrowseShellCmdRefresh() browselist=".string(s:netrw_browselist))
+" call Dfunc("LocalBrowseShellCmdRefresh() browselist=".(exists("s:netrw_browselist")? string(s:netrw_browselist) : "empty")." ".tabpagenr("$")." tabs")
" determine which buffers currently reside in a tab
+ if !exists("s:netrw_browselist")
+" call Dret("LocalBrowseShellCmdRefresh : browselist is empty")
+ return
+ endif
+ if !exists("w:netrw_bannercnt")
+" call Dret("LocalBrowseShellCmdRefresh : don't refresh when focus not on netrw windwo")
+ return
+ endif
let itab = 1
let buftablist = []
while itab <= tabpagenr("$")
- let buftablist= buftablist + tabpagebuflist()
- let itab= itab + 1
+ let buftablist = buftablist + tabpagebuflist()
+ let itab = itab + 1
tabn
endwhile
" call Decho("buftablist".string(buftablist))
+" call Decho("s:netrw_browselist<".(exists("s:netrw_browselist")? string(s:netrw_browselist) : "").">")
" GO through all buffers on netrw_browselist (ie. just local-netrw buffers):
" | refresh any netrw window
" | wipe out any non-displaying netrw buffer
@@ -5266,12 +6594,14 @@ fun! s:LocalBrowseShellCmdRefresh()
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! bw ".ibuf
+ exe "silent! bd ".ibuf
call remove(s:netrw_browselist,ibl)
" call Decho("browselist=".string(s:netrw_browselist))
continue
elseif index(tabpagebuflist(),ibuf) != -1
+ " refresh any netrw buffer
" call Decho("refresh buf#".ibuf.'-> win#'.bufwinnr(ibuf))
exe bufwinnr(ibuf)."wincmd w"
call s:NetrwRefresh(1,s:NetrwBrowseChgDir(1,'./'))
@@ -5286,7 +6616,7 @@ endfun
" ---------------------------------------------------------------------
" s:NetrwLocalRm: {{{2
fun! s:NetrwLocalRm(path) range
-" call Dfunc("NetrwLocalRm(path<".a:path.">)")
+" call Dfunc("s:NetrwLocalRm(path<".a:path.">)")
" call Decho("firstline=".a:firstline." lastline=".a:lastline)
" preparation for removing multiple files/directories
@@ -5294,20 +6624,18 @@ fun! s:NetrwLocalRm(path) range
let all = 0
let svpos = netrw#NetrwSavePosn()
- if exists("s:netrwmarkfilelist")
+ if exists("s:netrwmarkfilelist_{bufnr('%')}")
" remove all marked files
" call Decho("remove all marked files")
- for fname in s:netrwmarkfilelist
+ for fname in s:netrwmarkfilelist_{bufnr("%")}
let ok= s:NetrwLocalRmFile(a:path,fname,all)
- if ok =~ 'q\%[uit]'
+ if ok =~ 'q\%[uit]' || ok == "no"
break
elseif ok =~ 'a\%[ll]'
let all= 1
endif
endfor
- unlet s:netrwmarkfilelist
- unlet s:netrwmarkfilemtch
- 2match none
+ call s:NetrwUnMarkFile(1)
else
" remove (multiple) files and directories
@@ -5328,7 +6656,7 @@ fun! s:NetrwLocalRm(path) range
continue
endif
let ok= s:NetrwLocalRmFile(a:path,curword,all)
- if ok =~ 'q\%[uit]'
+ if ok =~ 'q\%[uit]' || ok == "no"
break
elseif ok =~ 'a\%[ll]'
let all= 1
@@ -5338,10 +6666,13 @@ fun! s:NetrwLocalRm(path) range
endif
" refresh the directory
- call s:NetrwRefresh(1,s:NetrwBrowseChgDir(1,'./'))
- call netrw#NetrwRestorePosn(svpos)
+" call Decho("bufname<".bufname("%").">")
+ if bufname("%") != "NetrwMessage"
+ call s:NetrwRefresh(1,s:NetrwBrowseChgDir(1,'./'))
+ call netrw#NetrwRestorePosn(svpos)
+ endif
-" call Dret("NetrwLocalRm")
+" call Dret("s:NetrwLocalRm")
endfun
" ---------------------------------------------------------------------
@@ -5358,6 +6689,7 @@ fun! s:NetrwLocalRmFile(path,fname,all)
if rmfile !~ '^"' && (rmfile =~ '@$' || rmfile !~ '[\/]$')
" attempt to remove file
+" call Decho("attempt to remove file<".rmfile.">")
if !all
echohl Statement
call inputsave()
@@ -5367,9 +6699,9 @@ fun! s:NetrwLocalRmFile(path,fname,all)
if ok == ""
let ok="no"
endif
-" call Decho("response: ok<".ok.">")
+" call Decho("response: ok<".ok.">")
let ok= substitute(ok,'\[{y(es)},n(o),a(ll),q(uit)]\s*','','e')
-" call Decho("response: ok<".ok."> (after sub)")
+" call Decho("response: ok<".ok."> (after sub)")
if ok =~ 'a\%[ll]'
let all= 1
endif
@@ -5377,7 +6709,7 @@ fun! s:NetrwLocalRmFile(path,fname,all)
if all || ok =~ 'y\%[es]' || ok == ""
let ret= s:System("delete",rmfile)
-" call Decho("errcode=".v:shell_error." ret=".ret)
+" call Decho("errcode=".v:shell_error." ret=".ret)
endif
else
@@ -5398,24 +6730,26 @@ fun! s:NetrwLocalRmFile(path,fname,all)
let rmfile= substitute(rmfile,'[\/]$','','e')
if all || ok =~ 'y\%[es]' || ok == ""
-" call Decho("1st attempt: system(".g:netrw_local_rmdir.' "'.rmfile.'")')
- call s:System("system",g:netrw_local_rmdir.' "'.rmfile.'"')
-" call Decho("v:shell_error=".v:shell_error)
+" call Decho("1st attempt: system(".g:netrw_local_rmdir.' '.shellescape(rmfile).')')
+ call s:System("system",g:netrw_local_rmdir.' '.shellescape(rmfile))
+" call Decho("v:shell_error=".v:shell_error)
if v:shell_error != 0
-" call Decho("2nd attempt to remove directory<".rmfile.">")
+" call Decho("2nd attempt to remove directory<".rmfile.">")
let errcode= s:System("delete",rmfile)
-" call Decho("errcode=".errcode)
+" call Decho("errcode=".errcode)
if errcode != 0
if has("unix")
-" call Decho("3rd attempt to remove directory<".rmfile.">")
- call s:System("system","rm ".rmfile)
+" call Decho("3rd attempt to remove directory<".rmfile.">")
+ call s:System("system","rm ".shellescape(rmfile))
if v:shell_error != 0 && !exists("g:netrw_quiet")
- call netrw#ErrorMsg(s:ERROR,"unable to remove directory<".rmfile."> -- is it empty?",34)
+ call netrw#ErrorMsg(s:ERROR,"unable to remove directory<".rmfile."> -- is it empty?",34)
+ let ok="no"
endif
elseif !exists("g:netrw_quiet")
- call netrw#ErrorMsg(s:ERROR,"unable to remove directory<".rmfile."> -- is it empty?",35)
+ call netrw#ErrorMsg(s:ERROR,"unable to remove directory<".rmfile."> -- is it empty?",35)
+ let ok="no"
endif
endif
endif
@@ -5436,8 +6770,8 @@ fun! s:NetrwLocalRename(path) range
let svpos= netrw#NetrwSavePosn()
" rename files given by the markfilelist
- if exists("s:netrwmarkfilelist")
- for oldname in s:netrwmarkfilelist
+ if exists("s:netrwmarkfilelist_{bufnr('%')}")
+ for oldname in s:netrwmarkfilelist_{bufnr("%")}
" call Decho("oldname<".oldname.">")
if exists("subfrom")
let newname= substitute(oldname,subfrom,subto,'')
@@ -5456,8 +6790,8 @@ fun! s:NetrwLocalRename(path) range
let ret= rename(oldname,newname)
endfor
2match none
- unlet s:netrwmarkfilelist
- unlet s:netrwmarkfilemtch
+ unlet s:netrwmarkfilelist_{bufnr("%")}
+ unlet s:netrwmarkfilemtch_{bufnr("%")}
else
@@ -5502,11 +6836,15 @@ endfun
" ---------------------------------------------------------------------
" s:LocalFastBrowser: handles setting up/taking down fast browsing for the local browser {{{2
"
-" Directory Is
+" g:netrw_ Directory Is
" fastbrowse Local Remote
" slow 0 D D D=Deleting a buffer implies it will not be re-used (slow)
" med 1 D H H=Hiding a buffer implies it may be re-used (fast)
" fast 2 H H
+"
+" Deleting a buffer means that it will be re-loaded when examined, hence "slow".
+" Hiding a buffer means that it will be re-used when examined, hence "fast".
+" (re-using a buffer may not be as accurate)
fun! s:LocalFastBrowser()
" call Dfunc("LocalFastBrowser() g:netrw_fastbrowse=".g:netrw_fastbrowse)
@@ -5517,7 +6855,7 @@ fun! s:LocalFastBrowser()
endif
" append current buffer to fastbrowse list
- if g:netrw_fastbrowse <= 1 && (empty(s:netrw_browselist) || bufnr("%") > s:netrw_browselist[-1])
+ if empty(s:netrw_browselist) || bufnr("%") > s:netrw_browselist[-1]
" call Decho("appendng current buffer to browselist")
call add(s:netrw_browselist,bufnr("%"))
" call Decho("browselist=".string(s:netrw_browselist))
@@ -5550,515 +6888,96 @@ fun! s:LocalFastBrowser()
augroup! AuNetrwShellCmd
endif
-" call Dret("LocalFastBrowser")
-endfun
-
-" ---------------------------------------------------------------------
-" netrw#Explore: launch the local browser in the directory of the current file {{{2
-" dosplit==0: the window will be split iff the current file has
-" been modified
-" dosplit==1: the window will be split before running the local
-" browser
-fun! netrw#Explore(indx,dosplit,style,...)
-" 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 curfile= b:netrw_curdir
-" call Decho("curfile<".curfile.">")
-
- " save registers
- silent! let keepregstar = @*
- silent! let keepregplus = @+
- silent! 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 s:SaveWinVars()
-
- if a:style == 0 " Explore, Sexplore
-" call Decho("style=0: Explore or Sexplore")
- exe g:netrw_winsize."wincmd s"
-
- elseif a:style == 1 "Explore!, Sexplore!
-" call Decho("style=1: Explore! or Sexplore!")
- exe g:netrw_winsize."wincmd v"
-
- elseif a:style == 2 " Hexplore
-" call Decho("style=2: Hexplore")
- exe "bel ".g:netrw_winsize."wincmd s"
-
- elseif a:style == 3 " Hexplore!
-" call Decho("style=3: Hexplore!")
- exe "abo ".g:netrw_winsize."wincmd s"
-
- elseif a:style == 4 " Vexplore
-" call Decho("style=4: Vexplore")
- exe "lefta ".g:netrw_winsize."wincmd v"
-
- elseif a:style == 5 " Vexplore!
-" call Decho("style=5: Vexplore!")
- exe "rightb ".g:netrw_winsize."wincmd v"
-
- elseif a:style == 6 " Texplore
- call s:SaveBufVars()
-" call Decho("style = 6: Texplore")
- tabnew
- call s:RestoreBufVars()
- endif
- call s:RestoreWinVars()
- endif
- norm! 0
-
- if a:0 > 0
-" call Decho("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("using dirname<".dirname."> (case: ~ && unix||cygwin)")
- elseif a:1 == '.'
- let dirname= 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)
- else
- let dirname= a:1
-" call Decho("using dirname<".dirname.">")
- endif
- endif
-
- if dirname =~ '/\*\*/'
- " handle .../**/...
-" call Decho("case Explore .../**/...")
- let prefixdir = substitute(dirname,'^\(.\{-}\)\*\*.*$','\1','')
- if prefixdir =~ '^/' || (prefixdir =~ '^\a:/' && (has("win32") || has("win95") || has("win64") || has("win16")))
- let b:netrw_curdir = prefixdir
- else
- let b:netrw_curdir= getcwd().'/'.prefixdir
- endif
- let dirname = substitute(dirname,'^.\{-}\(\*\*/.*\)$','\1','')
-" call Decho("pwd<".getcwd()."> dirname<".dirname.">")
- endif
-
- if dirname =~ '^\*/'
- " Explore */pattern
-" call Decho("case Explore */pattern")
- let pattern= substitute(dirname,'^\*/\(.*\)$','\1','')
-" call Decho("Explore */pat: dirname<".dirname."> -> pattern<".pattern.">")
- if &hls | let keepregslash= s:ExplorePatHls(pattern) | endif
- elseif dirname =~ '^\*\*//'
- " Explore **//pattern
-" call Decho("case Explore **//pattern")
- let pattern = substitute(dirname,'^\*\*//','','')
- let starstarpat = 1
-" call Decho("Explore **//pat: dirname<".dirname."> -> pattern<".pattern.">")
- endif
-
- if dirname == "" && a:indx >= 0
- " Explore Hexplore Vexplore Sexplore
-" call Decho("case Explore Hexplore Vexplore Sexplore")
- let newdir= substitute(expand("%:p"),'^\(.*[/\\]\)[^/\\]*$','\1','e')
- if newdir =~ '^scp:' || newdir =~ '^ftp:'
-" call Decho("calling NetrwBrowse(0,newdir<".newdir.">)")
- call s:NetrwBrowse(0,newdir)
- else
- if newdir == ""|let newdir= getcwd()|endif
-" call Decho("calling LocalBrowseCheck(newdir<".newdir.">)")
- call netrw#LocalBrowseCheck(newdir)
- endif
-" call Decho("curfile<".curfile.">")
- if has("win32") || has("win95") || has("win64") || has("win16")
- call search('\<'.substitute(curfile,'^.*[/\\]','','e').'\>','cW')
- else
- call search('\<'.substitute(curfile,'^.*/','','e').'\>','cW')
- endif
-
- elseif dirname =~ '^\*\*/' || a:indx < 0 || dirname =~ '^\*/'
- " Nexplore, Pexplore, Explore **/... , or Explore */pattern
-" call Decho("case Nexplore, Pexplore, <s-down>, <s-up>, Explore dirname<".dirname.">")
- if !mapcheck("<s-up>","n") && !mapcheck("<s-down>","n") && exists("b:netrw_curdir")
-" call Decho("set up <s-up> and <s-down> maps")
- let s:didstarstar= 1
- nnoremap <buffer> <silent> <s-up> :Pexplore<cr>
- nnoremap <buffer> <silent> <s-down> :Nexplore<cr>
- endif
-
- if has("path_extra")
-" call Decho("has path_extra")
- if !exists("w:netrw_explore_indx")
- let w:netrw_explore_indx= 0
- endif
- let indx = a:indx
-" call Decho("set indx= [a:indx=".indx."]")
-"
- if indx == -1
- "Nexplore
-" call Decho("case Nexplore: (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
- silent! let @+ = keepregstar
- silent! let @/ = keepregslash
-" call Dret("netrw#Explore")
- return
- endif
- let indx= w:netrw_explore_indx
- if indx < 0 | let indx= 0 | endif
- if indx >= w:netrw_explore_listlen | let indx= w:netrw_explore_listlen - 1 | endif
- let curfile= w:netrw_explore_list[indx]
-" call Decho("indx=".indx." curfile<".curfile.">")
- while indx < w:netrw_explore_listlen && curfile == w:netrw_explore_list[indx]
- let indx= indx + 1
-" call Decho("indx=".indx." (Nexplore while loop)")
- endwhile
- if indx >= w:netrw_explore_listlen | let indx= w:netrw_explore_listlen - 1 | endif
-" call Decho("Nexplore: indx= [w:netrw_explore_indx=".w:netrw_explore_indx."]=".indx)
-
- elseif indx == -2
- "Pexplore
-" call Decho("case Pexplore: (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
- silent! let @+ = keepregstar
- silent! let @/ = keepregslash
-" call Dret("netrw#Explore")
- return
- endif
- let indx= w:netrw_explore_indx
- if indx < 0 | let indx= 0 | endif
- if indx >= w:netrw_explore_listlen | let indx= w:netrw_explore_listlen - 1 | endif
- let curfile= w:netrw_explore_list[indx]
-" call Decho("indx=".indx." curfile<".curfile.">")
- while indx >= 0 && curfile == w:netrw_explore_list[indx]
- let indx= indx - 1
-" call Decho("indx=".indx." (Pexplore while loop)")
- endwhile
- if indx < 0 | let indx= 0 | endif
-" call Decho("Pexplore: indx= [w:netrw_explore_indx=".w:netrw_explore_indx."]=".indx)
-
- else
- " Explore -- initialize
- " build list of files to Explore with Nexplore/Pexplore
-" call Decho("case Explore: initialize (indx=".indx.")")
- let w:netrw_explore_indx= 0
- if !exists("b:netrw_curdir")
- let b:netrw_curdir= getcwd()
- endif
-" call Decho("b:netrw_curdir<".b:netrw_curdir.">")
-
- if exists("pattern")
-" call Decho("pattern exists: building list pattern<".pattern."> cwd<".getcwd().">")
- if exists("starstarpat")
-" call Decho("starstarpat<".starstarpat.">")
- try
- exe "silent 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
- silent! let @/ = keepregslash
-" call Dret("netrw#Explore : no files matched pattern")
- return
- endtry
- let s:netrw_curdir = b:netrw_curdir
- let w:netrw_explore_list = getqflist()
- let w:netrw_explore_list = map(w:netrw_explore_list,'s:netrw_curdir."/".bufname(v:val.bufnr)')
- else
-" call Decho("no starstarpat")
- exe "vimgrep /".pattern."/gj ".b:netrw_curdir."/*"
- let w:netrw_explore_list = map(getqflist(),'bufname(v:val.bufnr)')
- if &hls | let keepregslash= s:ExplorePatHls(pattern) | endif
- endif
- else
-" call Decho("no pattern: building list based on ".b:netrw_curdir."/".dirname)
- let w:netrw_explore_list= split(expand(b:netrw_curdir."/".dirname),'\n')
- if &hls | let keepregslash= s:ExplorePatHls(dirname) | endif
- endif
-
- let w:netrw_explore_listlen = len(w:netrw_explore_list)
-" call Decho("w:netrw_explore_list<".string(w:netrw_explore_list)."> 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
- silent! let @+ = keepregstar
- silent! let @/ = keepregslash
-" call Dret("netrw#Explore : no files matched")
- return
- endif
- endif
-
- " NetrwStatusLine support - for exploring support
- let w:netrw_explore_indx= indx
-" call Decho("explorelist<".join(w:netrw_explore_list,',')."> len=".w:netrw_explore_listlen)
-
- " wrap the indx around, but issue a note
- if indx >= w:netrw_explore_listlen || indx < 0
-" call Decho("wrap indx (indx=".indx." listlen=".w:netrw_explore_listlen.")")
- let indx = (indx < 0)? ( w:netrw_explore_listlen - 1 ) : 0
- let w:netrw_explore_indx= indx
- call netrw#ErrorMsg(s:NOTE,"no more files match Explore pattern",43)
- sleep 1
- endif
-
- exe "let dirfile= w:netrw_explore_list[".indx."]"
-" call Decho("dirfile=w:netrw_explore_list[indx=".indx."]= <".dirfile.">")
- let newdir= substitute(dirfile,'/[^/]*$','','e')
-" call Decho("newdir<".newdir.">")
-
-" call Decho("calling LocalBrowseCheck(newdir<".newdir.">)")
- 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")
- else
- 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()}')
-" call Decho("explore: mtchcnt=".w:netrw_explore_mtchcnt." bufnr=".w:netrw_explore_bufnr." line#".w:netrw_explore_line)
-
- else
-" call Decho("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
- silent! let @+ = keepregstar
- silent! let @/ = keepregslash
-" call Dret("netrw#Explore : missing +path_extra")
- return
- endif
-
- else
-" call Decho("case Explore newdir<".dirname.">")
- if exists("w:netrw_liststyle") && w:netrw_liststyle == s:TREELIST && dirname =~ '/'
- silent! unlet w:netrw_treedict
- silent! unlet w:netrw_treetop
- endif
- let newdir= dirname
- if !exists("b:netrw_curdir")
- call netrw#LocalBrowseCheck(getcwd())
- else
- call netrw#LocalBrowseCheck(s:NetrwBrowseChgDir(1,newdir))
- endif
- endif
-
- silent! let @* = keepregstar
- silent! let @+ = keepregstar
- silent! let @/ = keepregslash
-" call Dret("netrw#Explore : @/<".@/.">")
+" call Dret("LocalFastBrowser : browselist<".string(s:netrw_browselist).">")
endfun
" ---------------------------------------------------------------------
-" s:ExplorePatHls: converts an Explore pattern into a regular expression search pattern {{{2
-fun! s:ExplorePatHls(pattern)
-" call Dfunc("s:ExplorePatHls(pattern<".a:pattern.">)")
- let repat= substitute(a:pattern,'^**/\{1,2}','','')
-" call Decho("repat<".repat.">")
- let repat= escape(repat,'][.\')
-" call Decho("repat<".repat.">")
- let repat= '\<'.substitute(repat,'\*','\\(\\S\\+ \\)*\\S\\+','g').'\>'
-" call Dret("s:ExplorePatHls repat<".repat.">")
- return repat
-endfun
+" Support Functions: {{{1
" ---------------------------------------------------------------------
-" s:SetupNetrwStatusLine: {{{2
-fun! s:SetupNetrwStatusLine(statline)
-" call Dfunc("SetupNetrwStatusLine(statline<".a:statline.">)")
-
- if !exists("s:netrw_setup_statline")
- let s:netrw_setup_statline= 1
-" call Decho("do first-time status line setup")
-
- if !exists("s:netrw_users_stl")
- let s:netrw_users_stl= &stl
- endif
- if !exists("s:netrw_users_ls")
- let s:netrw_users_ls= &laststatus
- endif
-
- " set up User9 highlighting as needed
- let keepa= @a
- redir @a
+" s:UpdateBuffersMenu: does emenu Buffers.Refresh (but due to locale, the menu item may not be called that) {{{2
+" The Buffers.Refresh menu calls s:BMShow(); unfortunately, that means that that function
+" can't be called except via emenu. But due to locale, that menu line may not be called
+" Buffers.Refresh; hence, s:NetrwBMShow() utilizes a "cheat" to call that function anyway.
+fun! s:UpdateBuffersMenu()
+" call Dfunc("s:UpdateBuffersMenu()")
+ if has("gui") && has("menu") && has("gui_running") && &go =~ 'm'
try
- hi User9
- catch /^Vim\%((\a\+)\)\=:E411/
- if &bg == "dark"
- hi User9 ctermfg=yellow ctermbg=blue guifg=yellow guibg=blue
- else
- hi User9 ctermbg=yellow ctermfg=blue guibg=yellow guifg=blue
- endif
+ silent emenu Buffers.Refresh\ menu
+ catch /^Vim\%((\a\+)\)\=:E/
+ let v:errmsg= ""
+ silent call s:NetrwBMShow()
endtry
- redir END
- let @a= keepa
- endif
-
- " set up status line (may use User9 highlighting)
- " insure that windows have a statusline
- " make sure statusline is displayed
- let &stl=a:statline
- setlocal laststatus=2
-" call Decho("stl=".&stl)
- redraw!
-
-" call Dret("SetupNetrwStatusLine : stl=".&stl)
-endfun
-
-" ---------------------------------------------------------------------
-" NetrwStatusLine: {{{2
-fun! NetrwStatusLine()
-
-" vvv NetrwStatusLine() debugging vvv
-" let g:stlmsg=""
-" if !exists("w:netrw_explore_bufnr")
-" let g:stlmsg="!X<explore_bufnr>"
-" elseif w:netrw_explore_bufnr != bufnr("%")
-" let g:stlmsg="explore_bufnr!=".bufnr("%")
-" endif
-" if !exists("w:netrw_explore_line")
-" let g:stlmsg=" !X<explore_line>"
-" elseif w:netrw_explore_line != line(".")
-" let g:stlmsg=" explore_line!={line(.)<".line(".").">"
-" endif
-" if !exists("w:netrw_explore_list")
-" let g:stlmsg=" !X<explore_list>"
-" endif
-" ^^^ NetrwStatusLine() debugging ^^^
-
- if !exists("w:netrw_explore_bufnr") || w:netrw_explore_bufnr != bufnr("%") || !exists("w:netrw_explore_line") || w:netrw_explore_line != line(".") || !exists("w:netrw_explore_list")
- " restore user's status line
- let &stl = s:netrw_users_stl
- let &laststatus = s:netrw_users_ls
- if exists("w:netrw_explore_bufnr")|unlet w:netrw_explore_bufnr|endif
- if exists("w:netrw_explore_line")|unlet w:netrw_explore_line|endif
- return ""
- else
- return "Match ".w:netrw_explore_mtchcnt." of ".w:netrw_explore_listlen
- endif
-endfun
-
-" ---------------------------------------------------------------------
-" s:NetrwGetcwd: get the current directory. {{{2
-" Change backslashes to forward slashes, if any.
-" If doesc is true, escape certain troublesome characters
-fun! s:NetrwGetcwd(doesc)
-" call Dfunc("NetrwGetcwd(doesc=".a:doesc.")")
- let curdir= substitute(getcwd(),'\\','/','ge')
- if curdir !~ '[\/]$'
- let curdir= curdir.'/'
- endif
- if a:doesc
- let curdir= escape(curdir,g:netrw_cd_escape)
endif
-" call Dret("NetrwGetcwd <".curdir.">")
- return curdir
+" call Dret("s:UpdateBuffersMenu")
endfun
" ---------------------------------------------------------------------
-" s:SetSort: sets up the sort based on the g:netrw_sort_sequence {{{2
-" What this function does is to compute a priority for the patterns
-" in the g:netrw_sort_sequence. It applies a substitute to any
-" "files" that satisfy each pattern, putting the priority / in
-" front. An "*" pattern handles the default priority.
-fun! s:SetSort()
-" call Dfunc("SetSort() bannercnt=".w:netrw_bannercnt)
- if w:netrw_liststyle == s:LONGLIST
- let seqlist = substitute(g:netrw_sort_sequence,'\$','\\%(\t\\|\$\\)','ge')
- else
- let seqlist = g:netrw_sort_sequence
- endif
- " sanity check -- insure that * appears somewhere
- if seqlist == ""
- let seqlist= '*'
- elseif seqlist !~ '\*'
- let seqlist= seqlist.',*'
- endif
- let priority = 1
- while seqlist != ""
- if seqlist =~ ','
- let seq = substitute(seqlist,',.*$','','e')
- let seqlist = substitute(seqlist,'^.\{-},\(.*\)$','\1','e')
- else
- let seq = seqlist
- let seqlist = ""
- endif
- let eseq= escape(seq,'/')
- if priority < 10
- let spriority= "00".priority.'\/'
- elseif priority < 100
- let spriority= "0".priority.'\/'
- else
- let spriority= priority.'\/'
- endif
-" call Decho("priority=".priority." spriority<".spriority."> seq<".seq."> seqlist<".seqlist.">")
-
- " sanity check
- if w:netrw_bannercnt > line("$")
- " apparently no files were left after a Hiding pattern was used
-" call Dret("SetSort : no files left after hiding")
- return
- endif
- if seq == '*'
- exe 'silent keepjumps '.w:netrw_bannercnt.',$v/^\d\{3}\//s/^/'.spriority.'/'
- else
- exe 'silent keepjumps '.w:netrw_bannercnt.',$g/'.eseq.'/s/^/'.spriority.'/'
+" s:NetrwBMShow: {{{2
+fun! s:NetrwBMShow()
+" call Dfunc("s:NetrwBMShow()")
+ redir => bmshowraw
+ menu
+ redir END
+ let bmshowlist = split(bmshowraw,'\n')
+ if bmshowlist != []
+ let bmshowfuncs= filter(bmshowlist,'v:val =~ "<SNR>\\d\\+_BMShow()"')
+ if bmshowfuncs != []
+ let bmshowfunc = substitute(bmshowfuncs[0],'^.*:\(call.*BMShow()\).*$','\1','')
+ if bmshowfunc =~ '^call.*BMShow()'
+ exe "silent! ".bmshowfunc
+ endif
endif
- let priority = priority + 1
- endwhile
-
- " 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}\/\)\%(\d\{3}\/\)\+\ze./\1/e'
-
-" call Dret("SetSort")
+ endif
+" call Dret("s:NetrwBMShow : bmshowfunc<".(exists("bmshowfunc")? bmshowfunc : 'n/a').">")
endfun
-" =====================================================================
-" Support Functions: {{{1
-
" ---------------------------------------------------------------------
" s:ComposePath: Appends a new part to a path taking different systems into consideration {{{2
fun! s:ComposePath(base,subdir)
" call Dfunc("s:ComposePath(base<".a:base."> subdir<".a:subdir.">)")
+
if(has("amiga"))
- let ec = a:base[s:Strlen(a:base)-1]
+" call Decho("amiga")
+ let ec = a:base[strlen(a:base)-1]
if ec != '/' && ec != ':'
let ret = a:base . "/" . a:subdir
else
let ret = a:base . a:subdir
endif
+
elseif a:subdir =~ '^\a:[/\\][^/\\]' && (has("win32") || has("win95") || has("win64") || has("win16"))
+" call Decho("windows")
let ret= a:subdir
+
elseif a:base =~ '^\a\+://'
+" call Decho("remote linux/macos")
let urlbase = substitute(a:base,'^\(\a\+://.\{-}/\)\(.*\)$','\1','')
let curpath = substitute(a:base,'^\(\a\+://.\{-}/\)\(.*\)$','\2','')
- let ret = urlbase.curpath.a:subdir
+ if a:subdir == '../'
+ if curpath =~ '[^/]/[^/]\+/$'
+ let curpath= substitute(curpath,'[^/]\+/$','','')
+ else
+ let curpath=""
+ endif
+ let ret= urlbase.curpath
+ else
+ let ret= urlbase.curpath.a:subdir
+ endif
" call Decho("urlbase<".urlbase.">")
" call Decho("curpath<".curpath.">")
" call Decho("ret<".ret.">")
+
else
+" call Decho("local linux/macos")
let ret = substitute(a:base."/".a:subdir,"//","/","g")
if a:base =~ '^//'
" keeping initial '//' for the benefit of network share listing support
let ret= '/'.ret
endif
+ let ret= simplify(ret)
endif
+
" call Dret("s:ComposePath ".ret)
return ret
endfun
@@ -6068,7 +6987,7 @@ endfun
" 0=note = s:NOTE
" 1=warning = s:WARNING
" 2=error = s:ERROR
-" Sep 17, 2007 : max errnum currently is 60
+" Jun 05, 2008 : max errnum currently is 68
fun! netrw#ErrorMsg(level,msg,errnum)
" call Dfunc("netrw#ErrorMsg(level=".a:level." msg<".a:msg."> errnum=".a:errnum.") g:netrw_use_errorwindow=".g:netrw_use_errorwindow)
@@ -6079,6 +6998,7 @@ fun! netrw#ErrorMsg(level,msg,errnum)
else
let level= "**note** (netrw) "
endif
+" call Decho("level=".level)
if g:netrw_use_errorwindow
" (default) netrw creates a one-line window to show error/warning
@@ -6086,21 +7006,28 @@ fun! netrw#ErrorMsg(level,msg,errnum)
" record current window number for NetrwRestorePosn()'s benefit
let s:winBeforeErr= winnr()
+" call Decho("s:winBeforeErr=".s:winBeforeErr)
" getting messages out reliably is just plain difficult!
" This attempt splits the current window, creating a one line window.
if bufexists("NetrwMessage") && bufwinnr("NetrwMessage") > 0
+" call Decho("write to NetrwMessage buffer")
exe bufwinnr("NetrwMessage")."wincmd w"
- set ma noro
+" call Decho("setlocal ma noro")
+ setlocal ma noro
call setline(line("$")+1,level.a:msg)
$
else
+" call Decho("create a NetrwMessage buffer window")
bo 1split
enew
setlocal bt=nofile
file NetrwMessage
+" call Decho("setlocal ma noro")
+ setlocal ma noro
call setline(line("$"),level.a:msg)
endif
+" call Decho("wrote msg<".level.a:msg."> to NetrwMessage win#".winnr())
if &fo !~ '[ta]'
syn clear
syn match netrwMesgNote "^\*\*note\*\*"
@@ -6114,7 +7041,7 @@ fun! netrw#ErrorMsg(level,msg,errnum)
else
" (optional) netrw will show messages using echomsg. Even if the
" message doesn't appear, at least it'll be recallable via :messages
- redraw!
+" redraw!
if a:level == s:WARNING
echohl WarningMsg
elseif a:level == s:ERROR
@@ -6169,6 +7096,7 @@ fun! s:GetTempfile(fname)
" sanity check -- does the temporary file's directory exist?
if !isdirectory(substitute(tmpfile,'[^/]\+$','','e'))
+" call Decho("ro=".&ro." ma=".&ma." mod=".&mod." wrap=".&wrap)
call netrw#ErrorMsg(s:ERROR,"your <".substitute(tmpfile,'[^/]\+$','','e')."> directory is missing!",2)
" call Dret("s:GetTempfile getcwd<".getcwd().">")
return ""
@@ -6215,6 +7143,7 @@ fun! s:GetTempfile(fname)
endif
endif
+" call Decho("ro=".&ro." ma=".&ma." mod=".&mod." wrap=".&wrap)
" call Dret("s:GetTempfile <".tmpfile.">")
return tmpfile
endfun
@@ -6223,7 +7152,7 @@ endfun
" s:MakeSshCmd: transforms input command using USEPORT HOSTNAME into {{{2
" a correct command
fun! s:MakeSshCmd(sshcmd)
-" call Dfunc("s:MakeSshCmd(sshcmd<".a:sshcmd.">)")
+" call Dfunc("s:MakeSshCmd(sshcmd<".a:sshcmd.">) user<".s:user."> machine<".s:machine.">")
let sshcmd = substitute(a:sshcmd,'\<HOSTNAME\>',s:user.s:machine,'')
if exists("g:netrw_port") && g:netrw_port != ""
let sshcmd= substitute(sshcmd,"USEPORT",g:netrw_sshport.' '.g:netrw_port,'')
@@ -6249,7 +7178,7 @@ fun! s:RemoteSystem(cmd)
let cmd = s:MakeSshCmd(g:netrw_ssh_cmd." USEPORT HOSTNAME")
let remotedir= substitute(b:netrw_curdir,'^.*//[^/]\+/\(.*\)$','\1','')
if remotedir != ""
- let cmd= cmd.' "cd '."'".remotedir."';"
+ let cmd= cmd.' "cd '.shellescape(remotedir).";"
else
let cmd= cmd.' "'
endif
@@ -6285,13 +7214,8 @@ fun! s:NetrwEnew(curdir)
if exists("b:netrw_prvdir") |let netrw_prvdir = b:netrw_prvdir |endif
call s:NetrwOptionRestore("w:")
- if getline(2) =~ '^" Netrw Directory Listing'
-" call Decho("generate a buffer with keepjumps keepalt enew! (1)")
- keepjumps keepalt enew!
- else
-" call Decho("generate a buffer with keepjumps enew! (2)")
- keepjumps enew!
- endif
+" call Decho("generate a buffer with keepjumps keepalt enew!")
+ keepjumps keepalt enew!
call s:NetrwOptionSave("w:")
" copy function-local-variables to buffer variable equivalents
@@ -6319,14 +7243,94 @@ fun! s:NetrwEnew(curdir)
nno <silent> <buffer> [ :silent call <SID>TreeListMove('[')<cr>
nno <silent> <buffer> ] :silent call <SID>TreeListMove(']')<cr>
else
- exe "silent! file ".b:netrw_curdir
+ exe "silent! keepalt file ".b:netrw_curdir
endif
endif
-" call Dret("s:NetrwEnew : buf#".bufnr("%")."<".bufname("%").">")
+" call Dret("s:NetrwEnew : buf#".bufnr("%")."<".bufname("%")."> expand(%)<".expand("%")."> expand(#)<".expand("#").">")
endfun
" ------------------------------------------------------------------------
+" netrw#NetrwSavePosn: saves position of cursor on screen {{{2
+fun! netrw#NetrwSavePosn()
+" call Dfunc("netrw#NetrwSavePosn()")
+ " Save current line and column
+ let w:netrw_winnr= winnr()
+ let w:netrw_line = line(".")
+ let w:netrw_col = virtcol(".")
+
+ " Save top-of-screen line
+ norm! H0
+ let w:netrw_hline= line(".")
+
+ " set up string holding position parameters
+ let ret = "let w:netrw_winnr=".w:netrw_winnr."|let w:netrw_line=".w:netrw_line."|let w:netrw_col=".w:netrw_col."|let w:netrw_hline=".w:netrw_hline
+
+ call netrw#NetrwRestorePosn()
+" call Dret("netrw#NetrwSavePosn : winnr=".w:netrw_winnr." line=".w:netrw_line." col=".w:netrw_col." hline=".w:netrw_hline)
+ return ret
+endfun
+
+" ------------------------------------------------------------------------
+" netrw#NetrwRestorePosn: restores the cursor and file position as saved by NetrwSavePosn() {{{2
+fun! netrw#NetrwRestorePosn(...)
+" call Dfunc("netrw#NetrwRestorePosn() a:0=".a:0." winnr=".(exists("w:netrw_winnr")? w:netrw_winnr : -1)." line=".(exists("w:netrw_line")? w:netrw_line : -1)." col=".(exists("w:netrw_col")? w:netrw_col : -1)." hline=".(exists("w:netrw_hline")? w:netrw_hline : -1))
+ let eikeep= &ei
+ set ei=all
+ if expand("%") == "NetrwMessage"
+ exe s:winBeforeErr."wincmd w"
+ endif
+
+ if a:0 > 0
+ exe a:1
+ endif
+
+ " restore window
+ if exists("w:netrw_winnr")
+" call Decho("restore window: exe silent! ".w:netrw_winnr."wincmd w")
+ exe "silent! ".w:netrw_winnr."wincmd w"
+ endif
+ if v:shell_error == 0
+ " as suggested by Bram M: redraw on no error
+ " allows protocol error messages to remain visible
+" redraw!
+ endif
+
+ " restore top-of-screen line
+ if exists("w:netrw_hline")
+" call Decho("restore topofscreen: exe norm! ".w:netrw_hline."G0z")
+ exe "norm! ".w:netrw_hline."G0z\<CR>"
+ endif
+
+ " restore position
+ if exists("w:netrw_line") && exists("w:netrw_col")
+" call Decho("restore posn: exe norm! ".w:netrw_line."G0".w:netrw_col."|")
+ exe "norm! ".w:netrw_line."G0".w:netrw_col."\<bar>"
+ endif
+
+ let &ei= eikeep
+" call Dret("netrw#NetrwRestorePosn")
+endfun
+
+" ---------------------------------------------------------------------
+" s:NetrwSaveWordPosn: used to keep cursor on same word after refresh, {{{2
+" changed sorting, etc. Also see s:NetrwRestoreWordPosn().
+fun! s:NetrwSaveWordPosn()
+" call Dfunc("NetrwSaveWordPosn()")
+ let s:netrw_saveword= '^'.fnameescape(getline('.')).'$'
+" call Dret("NetrwSaveWordPosn : saveword<".s:netrw_saveword.">")
+endfun
+
+" ---------------------------------------------------------------------
+" s:NetrwRestoreWordPosn: used to keep cursor on same word after refresh, {{{2
+" changed sorting, etc. Also see s:NetrwSaveWordPosn().
+fun! s:NetrwRestoreWordPosn()
+" call Dfunc("NetrwRestoreWordPosn()")
+ silent! call search(s:netrw_saveword,'w')
+" call Dret("NetrwRestoreWordPosn")
+endfun
+
+" ---------------------------------------------------------------------
" s:RemotePathAnalysis: {{{2
fun! s:RemotePathAnalysis(dirname)
" call Dfunc("s:RemotePathAnalysis()")
@@ -6457,7 +7461,7 @@ fun! s:SetRexDir(islocal,dirname)
" call Dfunc("s:SetRexDir(islocal=".a:islocal." dirname<".a:dirname.">)")
" set up Rex and leftmouse-double-click
if a:islocal
- exe 'com! Rexplore call netrw#LocalBrowseCheck("'.escape(a:dirname,g:netrw_cd_escape).'")'
+ exe 'com! Rexplore call netrw#LocalBrowseCheck("'.fnameescape(a:dirname).'")'
if g:netrw_retmap
silent! unmap <2-leftmouse>
if !hasmapto("<Plug>NetrwReturn")
@@ -6466,7 +7470,7 @@ fun! s:SetRexDir(islocal,dirname)
exe 'nnoremap <silent> <Plug>NetrwReturn :call netrw#LocalBrowseCheck("'.a:dirname.'")<cr>'
endif
else
- exe 'com! Rexplore call s:NetrwBrowse(0,"'.escape(a:dirname,g:netrw_cd_escape).'")'
+ exe 'com! Rexplore call s:NetrwBrowse(0,"'.fnameescape(a:dirname).'")'
if g:netrw_retmap
silent! unmap <2-leftmouse>
if !hasmapto("<Plug>NetrwReturn")
@@ -6479,13 +7483,40 @@ fun! s:SetRexDir(islocal,dirname)
endfun
" ---------------------------------------------------------------------
-" s:Strlen: this function returns the length of a string, even if its {{{1
-" using two-byte etc characters. Depends on virtcol().
+" s:Strlen: this function returns the length of a string, even if its {{{2
+" using two-byte etc characters.
" Currently, its only used if g:Align_xstrlen is set to a
-" nonzero value.
+" nonzero value. Solution from Nicolai Weibull, vim docs
+" (:help strlen()), Tony Mechelynck, and my own invention.
fun! s:Strlen(x)
" call Dfunc("s:Strlen(x<".a:x.">")
- let ret= strlen(substitute(a:x,'.','c','g'))
+ if g:netrw_xstrlen == 1
+ " number of codepoints (Latin a + combining circumflex is two codepoints)
+ " (comment from TM, solution from NW)
+ let ret= strlen(substitute(a:x,'.','c','g'))
+
+ elseif g:netrw_xstrlen == 2
+ " number of spacing codepoints (Latin a + combining circumflex is one spacing
+ " codepoint; a hard tab is one; wide and narrow CJK are one each; etc.)
+ " (comment from TM, solution from TM)
+ let ret=strlen(substitute(a:x, '.\Z', 'x', 'g'))
+
+ elseif g:netrw_xstrlen == 3
+ " 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>"
+ call setline(line("."),a:x)
+ let ret= virtcol("$") - 1
+ d
+ let &mod= modkeep
+
+ else
+ " at least give a decent default
+ ret= strlen(a:x)
+ endif
" call Dret("s:Strlen ".ret)
return ret
endfun
@@ -6493,8 +7524,11 @@ endfun
" ---------------------------------------------------------------------
" s:System: using Steve Hall's idea to insure that Windows paths stay {{{2
" acceptable. No effect on Unix paths.
-" Examples of use: let result= s:System("system",path)
+" Examples of use: let result= s:System("rm",path)
" let result= s:System("delete",path)
+fun! netrw#System(cmd,path)
+ echomsg s:System(a:cmd,a:path)
+endfun
fun! s:System(cmd,path)
" call Dfunc("s:System(cmd<".a:cmd."> path<".a:path.">)")
@@ -6513,9 +7547,11 @@ fun! s:System(cmd,path)
exe "let result= ".a:cmd."('".path."')"
let &shellslash = sskeep
else
- exe "let result= ".a:cmd."(".g:netrw_shq.path.g:netrw_shq.")"
+" call Decho("exe let result= ".a:cmd."('".path."')")
+ exe "let result= ".a:cmd."('".path."')"
endif
else
+" call Decho("exe let result= ".a:cmd."('".path."')")
exe "let result= ".a:cmd."('".path."')"
endif
@@ -6527,7 +7563,7 @@ endfun
" s:TreeListMove: {{{2
fun! s:TreeListMove(dir)
" call Dfunc("s:TreeListMove(dir<".a:dir.">)")
- let curline = getline(".")
+ let curline = getline('.')
let prvline = (line(".") > 1)? getline(line(".")-1) : ''
let nxtline = (line(".") < line("$"))? getline(line(".")+1) : ''
let curindent= substitute(curline,'^\([| ]*\).\{-}$','\1','')
diff --git a/runtime/autoload/netrwSettings.vim b/runtime/autoload/netrwSettings.vim
index 3b7ef27..d6a9362 100644
--- a/runtime/autoload/netrwSettings.vim
+++ b/runtime/autoload/netrwSettings.vim
@@ -1,5 +1,5 @@
" netrwSettings.vim: makes netrw settings simpler
-" Date: Jun 04, 2007
+" Date: Mar 11, 2008
" Maintainer: Charles E Campbell, Jr <drchipNOSPAM at campbellfamily dot biz>
" Version: 11
" Copyright: Copyright (C) 1999-2007 Charles E. Campbell, Jr. {{{1
@@ -108,10 +108,14 @@ fun! netrwSettings#NetrwSettings()
put ='let g:netrw_decompress...'
put = 'let g:netrw_dirhistmax = '.g:netrw_dirhistmax
put = 'let g:netrw_fastbrowse = '.g:netrw_fastbrowse
+ let fnameescline= line("$")
+ put = 'let g:netrw_fname_escape...'
put = 'let g:netrw_ftp_browse_reject = '.g:netrw_ftp_browse_reject
put = 'let g:netrw_ftp_list_cmd = '.g:netrw_ftp_list_cmd
put = 'let g:netrw_ftp_sizelist_cmd = '.g:netrw_ftp_sizelist_cmd
put = 'let g:netrw_ftp_timelist_cmd = '.g:netrw_ftp_timelist_cmd
+ let globescline= line("$")
+ put ='let g:netrw_glob_escape...'
put = 'let g:netrw_hide = '.g:netrw_hide
put = 'let g:netrw_keepdir = '.g:netrw_keepdir
put = 'let g:netrw_list_cmd = '.g:netrw_list_cmd
@@ -126,6 +130,7 @@ fun! netrwSettings#NetrwSettings()
put = 'let g:netrw_mkdir_cmd = '.g:netrw_mkdir_cmd
put = 'let g:netrw_preview = '.g:netrw_preview
put = 'let g:netrw_rename_cmd = '.g:netrw_rename_cmd
+ put = 'let g:netrw_retmap = '.g:netrw_retmap
put = 'let g:netrw_rm_cmd = '.g:netrw_rm_cmd
put = 'let g:netrw_rmdir_cmd = '.g:netrw_rmdir_cmd
put = 'let g:netrw_rmf_cmd = '.g:netrw_rmf_cmd
@@ -133,11 +138,15 @@ fun! netrwSettings#NetrwSettings()
put = 'let g:netrw_sort_by = '.g:netrw_sort_by
put = 'let g:netrw_sort_direction = '.g:netrw_sort_direction
put = 'let g:netrw_sort_sequence = '.g:netrw_sort_sequence
+ put = 'let g:netrw_special_syntax = '.g:netrw_special_syntax
put = 'let g:netrw_ssh_browse_reject = '.g:netrw_ssh_browse_reject
put = 'let g:netrw_scpport = '.g:netrw_scpport
put = 'let g:netrw_sshport = '.g:netrw_sshport
put = 'let g:netrw_timefmt = '.g:netrw_timefmt
+ let tmpfileescline= line("$")
+ put ='let g:netrw_tmpfile_escape...'
put = 'let g:netrw_use_noswf = '.g:netrw_use_noswf
+ put = 'let g:netrw_xstrlen = '.g:netrw_xstrlen
put = 'let g:netrw_winsize = '.g:netrw_winsize
put =''
@@ -153,12 +162,15 @@ fun! netrwSettings#NetrwSettings()
" Put in g:netrw_shq setting and g:netrw_cd_escape
" (deferred so as to avoid the quote manipulation just preceding)
if g:netrw_shq == "'"
- call setline(shqline,'let g:netrw_shq = "'.g:netrw_shq.'"')
+ call setline(shqline, 'let g:netrw_shq = "'.g:netrw_shq.'"')
else
- call setline(shqline,"let g:netrw_shq = '".g:netrw_shq."'")
+ call setline(shqline, "let g:netrw_shq = '".g:netrw_shq."'")
endif
- call setline(cdescline,"let g:netrw_cd_escape = ".'"'.escape(g:netrw_cd_escape,'\"').'"')
+ call setline(cdescline, "let g:netrw_cd_escape = ".'"'.escape(g:netrw_cd_escape,'\"').'"')
call setline(decompressline,"let g:netrw_decompress = ".substitute(string(g:netrw_decompress),"^'\\(.*\\)'$",'\1',''))
+ call setline(fnameescline, "let g:netrw_fname_escape = '".escape(g:netrw_fname_escape,"'")."'")
+ call setline(globescline, "let g:netrw_glob_escape = '".escape(g:netrw_glob_escape,"'")."'")
+ call setline(tmpfileescline,"let g:netrw_tmpfile_escape = '".escape(g:netrw_tmpfile_escape,"'")."'")
set nomod
diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt
index 44e1c4b..dc602d7 100644
--- a/runtime/doc/pi_netrw.txt
+++ b/runtime/doc/pi_netrw.txt
@@ -1,13 +1,13 @@
-*pi_netrw.txt* For Vim version 7.1. Last change: 2008 Jan 15
+*pi_netrw.txt* For Vim version 7.1. Last change: 2008 Jun 06
-----------------------------------------------------
NETRW REFERENCE MANUAL by Charles E. Campbell, Jr.
-----------------------------------------------------
-*dav* *http* *network* *Nwrite* *netrw-file*
-*fetch* *netrw* *Nread* *rcp* *scp*
-*ftp* *netrw.vim* *Nsource* *rsync* *sftp*
+*dav* *ftp* *netrw-file* *Nread* *rcp* *scp*
+*davs* *http* *netrw.vim* *Nsource* *rsync* *sftp*
+*fetch* *netrw* *network* *Nwrite*
==============================================================================
1. Contents *netrw-contents* {{{1
@@ -45,20 +45,31 @@
Customizing Browsing With A User Function..........|netrw-x|
Deleting Files Or Directories......................|netrw-D|
Directory Exploring Commands.......................|netrw-explore|
+ Exploring With Stars and Patterns..................|netrw-star|
+ Displaying Information About File..................|netrw-qf|
Edit File Or Directory Hiding List.................|netrw-ctrl-h|
Editing The Sorting Sequence.......................|netrw-S|
Going Up...........................................|netrw--|
Hiding Files Or Directories........................|netrw-a|
Improving Browsing.................................|netrw-ssh-hack|
- Listing Bookmarks And History......................|netrw-q|
+ Listing Bookmarks And History......................|netrw-qb|
Making A New Directory.............................|netrw-d|
Making The Browsing Directory The Current Directory|netrw-c|
+ Marking Files......................................|netrw-mf|
+ Marking Files By Regular Expression................|netrw-mr|
+ Marked Files: Arbitrary Command....................|netrw-mx|
Marked Files: Compression And Decompression........|netrw-mz|
+ Marked Files: Copying..............................|netrw-mc|
+ Marked Files: Diff.................................|netrw-md|
+ Marked Files: Editing..............................|netrw-me|
+ Marked Files: Grep.................................|netrw-mg|
+ Marked Files: Hiding and Unhiding by Suffix........|netrw-mh|
+ Marked Files: Moving...............................|netrw-mm|
Marked Files: Printing.............................|netrw-mp|
+ Marked Files: Sourcing.............................|netrw-ms|
Marked Files: Tagging..............................|netrw-mT|
+ Marked Files: Setting the Target Directory.........|netrw-mt|
Marked Files: Unmarking............................|netrw-mu|
- Marking Files......................................|netrw-mf|
- Marking Files By Regular Expression................|netrw-mr|
Netrw Browser Variables............................|netrw-browser-var|
Netrw Browsing And Option Incompatibilities........|netrw-incompatible|
Netrw Settings.....................................|netrw-settings|
@@ -139,6 +150,11 @@ You may do so by placing the following two lines in your <.vimrc>: >
==============================================================================
3. Netrw Reference *netrw-ref* {{{1
+ Netrw supports several protocols in addition to scp and ftp mentioned
+ in |netrw-start|. These include dav, fetch, http,... well, just look
+ at the list in |netrw-externapp|. Each protocol is associated with a
+ variable which holds the default command supporting that protocol.
+
EXTERNAL APPLICATIONS AND PROTOCOLS *netrw-externapp* {{{2
Protocol Variable Default Value
@@ -178,7 +194,7 @@ READING *netrw-read* *netrw-nread* {{{2
WRITING *netrw-write* *netrw-nwrite* {{{2
- Generally, one may just use the url notation with a normal file writing
+ One may just use the url notation with a normal file writing
command, such as >
:w ftp://[user@]machine/path
@@ -199,8 +215,8 @@ WRITING *netrw-write* *netrw-nwrite* {{{2
SOURCING *netrw-source* {{{2
- Generally, one may just use the url notation with the normal file
- sourcing command, such as >
+ One may just use the url notation with the normal file sourcing
+ command, such as >
:so ftp://[user@]machine/path
<
@@ -218,12 +234,16 @@ SOURCING *netrw-source* {{{2
DIRECTORY LISTING *netrw-dirlist* {{{2
- Generally, one may browse a directory to get a listing by simply
- attempting to edit the directory: >
+ One may browse a directory to get a listing by simply attempting to
+ edit the directory: >
:e scp://[user]@hostname/path/
:e ftp://[user]@hostname/path/
<
+ For remote directories (ie. those using scp or ftp), that trailing
+ "/" is necessary (it tells netrw that its to treat it as a directory
+ to browse instead of a file to download).
+
However, the Nread command can also be used to accomplish this:
:Nread [protocol]://[user]@hostname/path/
@@ -247,9 +267,14 @@ CHANGING USERID AND PASSWORD *netrw-chgup* *netrw-userpass* {{{2
:call NetUserPass("uid","password") -- sets global uid and password
NETRW VARIABLES AND SETTINGS *netrw-variables* {{{2
-
(also see: |netrw-browser-var| |netrw-protocol| |netrw-settings| |netrw-var|)
+Netrw provides a lot of variables which allow you to customize netrw to your
+preferences. One way to look at them is via the command :NetrwSettings (see
+|netrw-settings|) which will display your current netrw settings. Most such
+settings are described below, in |netrw-browser-options|, and in
+|netrw-externapp|:
+
*b:netrw_lastfile* last file Network-read/written retained on a per-buffer
basis (supports plain :Nw )
@@ -408,6 +433,10 @@ additional prompting.
| dav://host/path | | cadaver |
| :Nread dav://host/path | :Nwrite dav://host/path | cadaver |
+---------------------------------+----------------------------+------------+
+ | DAV + SSL: | | |
+ | davs://host/path | | cadaver |
+ | :Nread davs://host/path | :Nwrite davs://host/path | cadaver |
+ +---------------------------------+----------------------------+------------+
| FETCH: | | |
| fetch://[user@]host/path | | |
| fetch://[user@]host:http/path | Not Available | fetch |
@@ -763,6 +792,7 @@ itself:
*netrw-browser* *netrw-dir* *netrw-list*
INTRODUCTION TO BROWSING *netrw-browse-intro* {{{2
+ (Quick References: |netrw-quickmaps| |netrw-quickcoms|)
Netrw supports the browsing of directories on your local system and on remote
hosts; browsing includes listing files and directories, entering directories,
@@ -807,13 +837,16 @@ There are several things you can do to affect the browser's display of files:
* To change the listing style, press the "i" key (|netrw-i|).
Currently there are four styles: thin, long, wide, and tree.
+
* To hide files (don't want to see those xyz~ files anymore?) see
|netrw-ctrl-h|.
+
* Press s to sort files by name, time, or size.
-See |netrw-browse-cmds| for all the things you can do!
+See |netrw-browse-cmds| for all the things you can do with netrw!
+ *netrw-quickmap* *netrw-quickmaps*
QUICK REFERENCE: MAPS *netrw-browse-maps* {{{2
>
--- ----------------- ----
@@ -830,6 +863,8 @@ QUICK REFERENCE: MAPS *netrw-browse-maps* {{{2
d Make a directory |netrw-d|
D Attempt to remove the file(s)/directory(ies) |netrw-D|
gb Go to previous bookmarked directory |netrw-gb|
+ gh Quick hide/unhide of dot-files |netrw-gh|
+ gi Display information on file |netrw-qf|
<c-h> Edit file hiding list |netrw-ctrl-h|
i Cycle between thin, long, wide, and tree listings |netrw-i|
<c-l> Causes Netrw to refresh the directory listing |netrw-ctrl-l|
@@ -838,6 +873,7 @@ QUICK REFERENCE: MAPS *netrw-browse-maps* {{{2
md Apply diff to marked files (up to 3) |netrw-md|
me Place marked files on arg list and edit them |netrw-me|
mf Mark a file |netrw-mf|
+ mh Toggle marked file suffices' presence on hiding list |netrw-mh|
mm Move marked files to marked-file target directory |netrw-mm|
mp Print marked files |netrw-mp|
mr Mark files satisfying a |regexp| |netrw-mr|
@@ -851,7 +887,7 @@ QUICK REFERENCE: MAPS *netrw-browse-maps* {{{2
O Obtain a file specified by cursor |netrw-O|
p Preview the file |netrw-p|
P Browse in the previously used window |netrw-P|
- q List bookmarked directories and history |netrw-q|
+ q List bookmarked directories and history |netrw-qb|
r Reverse sorting order |netrw-r|
R Rename the designed file(s)/directory(ies) |netrw-R|
s Select sorting style: by name, time, or file size |netrw-s|
@@ -878,6 +914,7 @@ QUICK REFERENCE: MAPS *netrw-browse-maps* {{{2
to the netrw browser window.
<s-leftmouse> (gvim only) like mf, will mark files
+ *netrw-quickcom* *netrw-quickcoms*
QUICK REFERENCE: COMMANDS *netrw-explore-cmds* *netrw-browse-cmds* {{{2
:NetrwClean[!] ...........................................|netrw-clean|
:NetrwSettings ...........................................|netrw-settings|
@@ -895,9 +932,9 @@ One may easily "bookmark" a directory by using >
{cnt}mb
<
-Any count may be used. One may use viminfo's "!" option to retain bookmarks
-between vim sessions. See |netrw-gb| for how to return to a bookmark and
-|netrw-q| for how to list them.
+Any count may be used. One may use viminfo's "!" option (|'viminfo'|) to
+retain bookmarks between vim sessions. See |netrw-gb| for how to return
+to a bookmark and |netrw-qb| for how to list them.
BROWSING *netrw-cr* {{{2
@@ -1031,7 +1068,7 @@ To change directory back to a bookmarked directory, use
{cnt}gb
Any count may be used to reference any of the bookmarks. See |netrw-mb| on
-how to bookmark a directory and |netrw-q| on how to list bookmarks.
+how to bookmark a directory and |netrw-qb| on how to list bookmarks.
CHANGING TO A PREDECESSOR DIRECTORY *netrw-u* *netrw-updir* {{{2
@@ -1047,7 +1084,7 @@ CHANGING TO A SUCCESSOR DIRECTORY *netrw-U* *netrw-downdir* {{{2
With the "U" map, one can change to a later directory (successor).
This map is the opposite of the "u" map. (see |netrw-u|) Use the
-q map to list both the bookmarks and history. (see |netrw-q|)
+q map to list both the bookmarks and history. (see |netrw-qb|)
NETRW CLEAN *netrw-clean* *:NetrwClean*
@@ -1138,7 +1175,7 @@ Associated setting variable: |g:netrw_browsex_viewer|
*netrw-curdir*
DELETING FILES OR DIRECTORIES *netrw-delete* *netrw-D* *netrw-del* {{{2
-If files have not been marked with |netrw-mf|:
+If files have not been marked with |netrw-mf|: (local marked file list)
Deleting/removing files and directories involves moving the cursor to the
file/directory to be deleted and pressing "D". Directories must be empty
@@ -1148,14 +1185,14 @@ If files have not been marked with |netrw-mf|:
the removal(s). You may select a range of lines with the "V" command
(visual selection), and then pressing "D".
-If files have been marked with |netrw-mf|:
+If files have been marked with |netrw-mf|: (local marked file list)
Marked files (and empty directories) will be deleted; again, you'll be
asked to confirm the deletion before it actually takes place.
-The g:netrw_rm_cmd, g:netrw_rmf_cmd, and g:netrw_rmdir_cmd variables are used
-to control the attempts to remove files and directories. The g:netrw_rm_cmd
-is used with files, and its default value is:
+The |g:netrw_rm_cmd|, |g:netrw_rmf_cmd|, and |g:netrw_rmdir_cmd| variables are
+used to control the attempts to remove files and directories. The
+g:netrw_rm_cmd is used with files, and its default value is:
g:netrw_rm_cmd: ssh HOSTNAME rm
@@ -1217,32 +1254,41 @@ size Hexplore and Vexplore windows.
of <2-leftmouse> (which is only available under gvim and
cooperative terms).
- *netrw-starstar*
-When Explore, Sexplore, Hexplore, or Vexplore are used with a **/filepat,
-such as:
->
- :Explore **/filename_pattern
-<
-netrw will attempt to find a file in the current directory or any subdirectory
-which matches the filename pattern. Internally, it produces a list of files
-which match the pattern and their paths; to that extent it resembles the Unix
-operation:
->
- find $(pwd) -name "$1" -exec "echo" "{}" ";" 2> /dev/null
+
+*netrw-star* *netrw-starpat* *netrw-starstar* *netrw-starstarpat*
+EXPLORING WITH STARS AND PATTERNS
+
+When Explore, Sexplore, Hexplore, or Vexplore are used with one of the
+following four styles, Explore generates a list of files which satisfy
+the request. >
+
+ */filepat files in current directory which satisfy filepat
+ **/filepat files in current directory or below which satisfy the
+ file pattern
+ *//pattern files in the current directory which contain the
+ pattern (vimgrep is used)
+ **//pattern files in the current directory or below which contain
+ the pattern (vimgrep is used)
<
-The directory display is updated to show the subdirectory containing a
-matching file. One may then proceed to the next (or previous) matching files'
-directories by using Nexplore or Pexplore, respectively. If your console or
-gui produces recognizable shift-up or shift-down sequences, then you'll likely
-find using shift-downarrow and shift-uparrow convenient. They're mapped by
-netrw:
+The cursor will be placed on the first file in the list. One may then
+continue to go to subsequent files on that list via |:Nexplore| or to
+preceding files on that list with |:Pexplore|. Explore will update the
+directory and place the cursor appropriately.
+
+A plain >
+ :Explore
+will clear the explore list.
+
+If your console or gui produces recognizable shift-up or shift-down sequences,
+then you'll likely find using shift-downarrow and shift-uparrow convenient.
+They're mapped by netrw:
<s-down> == Nexplore, and
<s-up> == Pexplore.
As an example, consider
>
- :Explore **/*.c
+ :Explore */*.c
:Nexplore
:Nexplore
:Pexplore
@@ -1250,29 +1296,6 @@ As an example, consider
The status line will show, on the right hand side of the status line, a
message like "Match 3 of 20".
- *netrw-starpat*
-When Explore, Sexplore, Hexplore, or Vexplore are used with a */pattern,
-such as:
->
- :Explore */pattern
-<
-netrw will use |:vimgrep| to find files which contain the given pattern.
-Like what happens with |netrw-starstar|, a list of files which contain
-matches to the given pattern is generated. The cursor will then jump
-to the first file with the given pattern; |:Nexplore|, |:Pexplore|, and
-the shifted-down and -up arrows work with the list to move to the next
-or previous files in that list.
-
- *netrw-starstarpat*
-When Explore, Sexplore, Hexplore, or Vexplore are used with a **//pattern,
-such as:
->
- :Explore **//pattern
-<
-then Explore will use |:vimgrep| to find files like |netrw-starpat|;
-however, Explore will also search subdirectories as well as the current
-directory.
-
Associated setting variables: |g:netrw_keepdir| |g:netrw_browse_split|
|g:netrw_fastbrowse| |g:netrw_ftp_browse_reject|
|g:netrw_ftp_list_cmd| |g:netrw_ftp_sizelist_cmd|
@@ -1280,6 +1303,13 @@ Associated setting variables: |g:netrw_keepdir| |g:netrw_browse_split|
|g:netrw_liststyle|
+DISPLAYING INFORMATION ABOUT FILE *netrw-qf* {{{2
+
+With the cursor atop a filename, pressing "qf" will reveal the file's size
+and last modification timestamp. Currently this capability is only available
+for local files.
+
+
EDIT FILE OR DIRECTORY HIDING LIST *netrw-ctrl-h* *netrw-edithide* {{{2
The "<ctrl-h>" map brings up a requestor allowing the user to change the
@@ -1289,16 +1319,18 @@ either be hidden (ie. not shown) or be the only ones displayed (see
|netrw-a|).
Associated setting variable: |g:netrw_hide|
+Associated topics: |netrw-a| |netrw-gh| |netrw-mh|
-EDITING THE SORTING SEQUENCE *netrw-S* *netrw-sortsequence* {{{2
+EDITING THE SORTING SEQUENCE *netrw-S* *netrw-sortsequence* {{{2
When "Sorted by" is name, one may specify priority via the sorting sequence
(g:netrw_sort_sequence). The sorting sequence typically prioritizes the
name-listing by suffix, although any pattern will do. Patterns are delimited
-by commas. The default sorting sequence is:
+by commas. The default sorting sequence is (all one line):
>
- [\/]$,*,\.bak$,\.o$,\.h$,\.info$,\.swp$,\.obj$
+ '[\/]$,\.[a-np-z]$,\.h$,\.c$,\.cpp$,*,\.o$,\.obj$,\.info$,
+ \.swp$,\.bak$,\~$'
<
The lone * is where all filenames not covered by one of the other patterns
will end up. One may change the sorting sequence by modifying the
@@ -1309,7 +1341,7 @@ Related topics: |g:netrw-s| |g:netrw-S|
Associated setting variable: |g:netrw_sort_sequence|
-GOING UP *netrw--* {{{2
+GOING UP *netrw--* {{{2
To go up a directory, press "-" or press the <cr> when atop the ../ directory
entry in the listing.
@@ -1326,7 +1358,7 @@ preferred. The NetList function which implements remote browsing
expects that directories will be flagged by a trailing slash.
-HIDING FILES OR DIRECTORIES *netrw-a* *netrw-hiding* {{{2
+HIDING FILES OR DIRECTORIES *netrw-a* *netrw-hiding* {{{2
Netrw's browsing facility allows one to use the hiding list in one of three
ways: ignore it, hide files which match, and show only those files which
@@ -1365,9 +1397,15 @@ If files have been marked using |netrw-mf|, then this command will:
and showing only non-hidden files.
endif
+ *netrw-gh* *netrw-hide*
+As a quick shortcut, one may press >
+ gh
+to toggle between hiding files which begin with a period (dot) and not hiding
+them.
+
Associated setting variable: |g:netrw_list_hide|
+Associated topics: |netrw-a| |netrw-ctrl-h| |netrw-mh|
- *netrw-ctrl_h*
IMPROVING BROWSING *netrw-listhack* *netrw-ssh-hack* {{{2
Especially with the remote directory browser, constantly entering the password
@@ -1412,10 +1450,12 @@ passwords:
http://sial.org/howto/openssh/publickey-auth/
-LISTING BOOKMARKS AND HISTORY *netrw-q* *netrw-listbookmark* {{{2
+LISTING BOOKMARKS AND HISTORY *netrw-qb* *netrw-listbookmark* {{{2
-Pressing "q" will list the bookmarked directories and directory traversal
-history (query). (see |netrw-mb|, |netrw-gb|, |netrw-u|, and |netrw-U|)
+Pressing "qb" (query bookmarks) will list the bookmarked directories and
+directory traversal history (query).
+
+(see |netrw-mb|, |netrw-gb|, |netrw-u|, and |netrw-U|)
MAKING A NEW DIRECTORY *netrw-d* {{{2
@@ -1427,6 +1467,8 @@ directory's name. A bare <CR> at that point will abort the making of the
directory. Attempts to make a local directory that already exists (as either
a file or a directory) will be detected, reported on, and ignored.
+Currently, making a directory via ftp is not supported.
+
Associated setting variable: |g:netrw_local_mkdir| |g:netrw_mkdir_cmd|
@@ -1446,18 +1488,65 @@ directory.
Associated setting variable: |g:netrw_keepdir|
+MARKING FILES *netrw-mf* {{{2
+ (also see |netrw-mr|)
+
+One may mark files with the cursor atop a filename and then pressing "mf".
+With gvim, one may also mark files with <s-leftmouse>. The following netrw
+maps make use of marked files:
+
+ |netrw-a| Hide marked files/directories
+ |netrw-D| Delete marked files/directories
+ |netrw-mc| Copy marked files to target
+ |netrw-md| Apply vimdiff to marked files
+ |netrw-me| Edit marked files
+ |netrw-mg| Apply vimgrep to marked files
+ |netrw-mm| Move marked files
+ |netrw-mp| Print marked files
+ |netrw-mt| Set target for |netrw-mm| and |netrw-mc|
+ |netrw-mT| Generate tags using marked files
+ |netrw-mx| Apply shell command to marked files
+ |netrw-mz| Compress/Decompress marked files
+ |netrw-O| Obtain marked files
+ |netrw-R| Rename marked files
+
+One may unmark files one at a time the same way one marks them; ie. place
+the cursor atop a marked file and press "mf". This process also works
+with <s-leftmouse> using gvim. One may unmark all files by pressing
+"mu" (see |netrw-mu|).
+
+*markfilelist* *global_markfilelist* *local_markfilelist*
+All marked files are entered onto the global marked file list; there is only
+one such list. In addition, every netrw buffer also has its own local marked
+file list; since netrw buffers are associated with specific directories, this
+means that each directory has its own local marked file list. The various
+commands which operate on marked files use one or the other of the marked file
+lists.
+
+
+MARKING FILES BY REGULAR EXPRESSION *netrw-mr* {{{2
+ (also see |netrw-mf|)
+
+One may also mark files by pressing "mr"; netrw will then issue a prompt,
+"Enter regexp: ". You may then enter a regular expression such as \.c$ .
+All files in the current directory will then be marked. Note that the
+regular expressions are vim-style |regexp| ones, not shell ones. So
+entering *.c probably isn't what you want!
+
MARKED FILES: ARBITRARY COMMAND *netrw-mx* {{{2
- (See |netrw-mf| and |netrw-mr| for how to mark files)
+ (See |netrw-mf| and |netrw-mr| for how to mark files)
+ (uses the local marked-file list)
-Upon activation of the "mx" map, netrw will query the user for some command to
-be applied to all marked files. All %s in the command will be substituted
-with the name of a marked file. If no %s are in the command, then the command
-will be followed by a space and a marked filename.
+Upon activation of the "mx" map, netrw will query the user for some (external)
+command to be applied to all marked files. All "%"s in the command will be
+substituted with the name of each marked file in turn. If no "%"s are in the
+command, then the command will be followed by a space and a marked filename.
MARKED FILES: COMPRESSION AND DECOMPRESSION *netrw-mz* {{{2
- (See |netrw-mf| and |netrw-mr| for how to mark files)
+ (See |netrw-mf| and |netrw-mr| for how to mark files)
+ (uses the local marked file list)
If any marked files are compressed, then "mz" will decompress them.
If any marked files are decompressed, then "mz" will compress them
@@ -1469,44 +1558,79 @@ associated decompressing utilities; see |g:netrw_decompress|.
Associated setting variables: |g:netrw_compress| |g:netrw_decompress|
-MARKED FILES: COPYING *netrw-mc* {{{2
- (See |netrw-mf| and |netrw-mr| for how to mark files)
+MARKED FILES: COPYING *netrw-mc* {{{2
+ (See |netrw-mf| and |netrw-mr| for how to mark files)
+ (Uses the global marked file list)
Select a target directory with mt (|netrw-mt|). Then change directory,
select file(s) (see |netrw-mf|), and press "mc".
Associated setting variable: |g:netrw_localcopycmd| |g:netrw_ssh_cmd|
-MARKED FILES: DIFF *netrw-md* {{{2
- (See |netrw-mf| and |netrw-mr| for how to mark files)
+MARKED FILES: DIFF *netrw-md* {{{2
+ (See |netrw-mf| and |netrw-mr| for how to mark files)
+ (uses the global marked file list)
Use |vimdiff| to visualize difference between selected files (two or
-three may be selected for this).
+three may be selected for this). Uses the global marked file list.
-MARKED FILES: EDITING *netrw-me* {{{2
- (See |netrw-mf| and |netrw-mr| for how to mark files)
+MARKED FILES: EDITING *netrw-me* {{{2
+ (See |netrw-mf| and |netrw-mr| for how to mark files)
+ (uses the global marked file list)
This command will place the marked files on the |arglist| and commence
editing them. One may return the to explorer window with |:Rexplore|.
+MARKED FILES: GREP *netrw-mg* {{{2
+ (See |netrw-mf| and |netrw-mr| for how to mark files)
+ (uses the global marked file list)
+
+This command will apply |:vimgrep| to the marked files. The command will ask
+for the requested pattern; one may enter: >
+ /pattern/[g][j]
+ ! /pattern/[g][j]
+ pattern
+<
+MARKED FILES: HIDING AND UNHIDING BY SUFFIX *netrw-mh* {{{2
+ (See |netrw-mf| and |netrw-mr| for how to mark files)
+ (uses the local marked file list)
+
+This command extracts the suffices of the marked files and toggles their
+presence on the hiding list. Please note that marking the same suffix
+this way multiple times will result in the suffix's presence being toggled
+for each file (so an even quantity of marked files having the same suffix
+is the same as not having bothered to select them at all).
+
+Related topics: |netrw-a| |g:netrw_list_hide|
+
MARKED FILES: MOVING *netrw-mm* {{{2
- (See |netrw-mf| and |netrw-mr| for how to mark files)
+ (See |netrw-mf| and |netrw-mr| for how to mark files)
+ (uses the global marked file list)
Select a target directory with mT (|netrw-mt|). Then change directory,
select file(s) (see |netrw-mf|), and press "mm".
Associated setting variable: |g:netrw_localmovecmd| |g:netrw_ssh_cmd|
-MARKED FILES: PRINTING *netrw-mp* {{{2
- (See |netrw-mf| and |netrw-mr| for how to mark files)
+MARKED FILES: PRINTING *netrw-mp* {{{2
+ (See |netrw-mf| and |netrw-mr| for how to mark files)
+ (uses the local marked file list)
Netrw will apply the |:hardcopy| command to marked files. What it does
is open each file in a one-line window, execute hardcopy, then close the
one-line window.
-MARKED FILES: TAGGING *netrw-mT* {{{2
- (See |netrw-mf| and |netrw-mr| for how to mark files)
+MARKED FILES: SOURCING *netrw-ms* {{{2
+ (See |netrw-mf| and |netrw-mr| for how to mark files)
+ (uses the local marked file list)
+
+Netrw will source the marked files (using vim's |:source| command)
+
+
+MARKED FILES: TAGGING *netrw-mT* {{{2
+ (See |netrw-mf| and |netrw-mr| for how to mark files)
+ (uses the global marked file list)
The "mt" mapping will apply the command in |g:netrw_ctags| (by default, its
"ctags") to marked files. For remote browsing, in order to create a tags file
@@ -1530,45 +1654,28 @@ edit the desired file and go to the tag.
Associated setting variables: |g:netrw_ctags| |g:netrw_ssh_cmd|
-MARKED FILES: SETTING TARGET DIRECTORY *netrw-mt* {{{2
+MARKED FILES: SETTING THE TARGET DIRECTORY *netrw-mt* {{{2
(See |netrw-mf| and |netrw-mr| for how to mark files)
-Set the marked file move/copy target (see |netrw-mc| and |netrw-mm|).
-
-
-MARKED FILES: UNMARKING *netrw-mu* {{{2
- (See |netrw-mf| and |netrw-mr| for how to mark files)
-
-The "mu" mapping will unmark all currently marked files.
-
+Set the marked file copy/move-to target (see |netrw-mc| and |netrw-mm|):
-MARKING FILES *netrw-mf* {{{2
- (also see |netrw-mr|)
+ * if the cursor is atop a file name, then the netrw window's currently
+ displayed directory is used for the copy/move-to target.
-One may mark files with the cursor atop a filename and then pressing "mf".
-With gvim, one may also mark files with <s-leftmouse>. The following netrw
-maps make use of marked files:
+ * also, if the cursor is in the banner, then the netrw window's currently
+ displayed directory is used for the copy/move-to target.
- |netrw-a| |netrw-O| |netrw-mc| |netrw-me| |netrw-mp| |netrw-mx|
- |netrw-D| |netrw-R| |netrw-md| |netrw-mm| |netrw-mT| |netrw-mz|
+ * however, if the cursor is atop a directory name, then that directory is
+ used for the copy/move-to target
-One may unmark files one at a time the same way one marks them; ie. place
-the cursor atop a marked file and press "mf". This process also works
-with <s-leftmouse> using gvim. One may unmark all files by pressing
-"mu" (see |netrw-mu|).
-
-Two commands, |netrw-mc| and |netrw-mm|, copy/move marked files to a
-target directory (which can be set with |netrw-mt|).
+There is only one copy/move-to target per vim session; ie. the target is a
+script variable (see |s:var|) and is shared between all netrw windows (in an
+instance of vim).
+MARKED FILES: UNMARKING *netrw-mu* {{{2
+ (See |netrw-mf| and |netrw-mr| for how to mark files)
-MARKING FILES BY REGULAR EXPRESSION *netrw-mr* {{{2
- (also see |netrw-mf|)
-
-One may also mark files by pressing "mr"; netrw will then issue a prompt,
-"Enter regexp: ". You may then enter a regular expression such as \.c$ .
-All files in the current directory will then be marked. Note that the
-regular expressions are vim-style |regexp| ones, not shell ones. So
-entering *.c probably isn't what you want!
+The "mu" mapping will unmark all currently marked files.
NETRW BROWSER VARIABLES *netrw-browser-options* *netrw-browser-var* {{{2
@@ -1606,24 +1713,33 @@ your browsing preferences. (see also: |netrw-settings|)
a script/function to handle the given
extension. (see |netrw_filehandler|).
+ *g:netrw_cd_escape* ="[]#*$%'\" ?`!&();<>\\"
+ This option is used to escape directory names
+ before changing directory to them.
+
*g:netrw_compress* ="gzip"
Will compress marked files with this
command
+
*g:netrw_decompress* = { ".gz" : "gunzip" ,
".bz2" : "bunzip2" ,
".zip" : "unzip" ,
".tar" : "tar -xf"}
A dictionary mapping suffices to
decompression programs.
- *g:netrw_fastbrowse* =0: slow speed browsing, never re-use
- directory listings; always obtain
- directory listings.
- =1: medium speed browsing, re-use directory
- listings only when remote browsing.
+
+ *g:netrw_fastbrowse* =0: slow speed directory browsing;
+ never re-uses directory listings,
+ always obtains directory listings.
+ =1: medium speed directory browsing;
+ re-use directory listings only
+ when remote directory browsing.
(default value)
- =2: fast browsing, only obtains directory
- listings when the directory hasn't been
- seen before (or |netrw-ctrl-l| is used).
+ =2: fast directory browsing;
+ only obtains directory listings when the
+ directory hasn't been seen before
+ (or |netrw-ctrl-l| is used).
+
Fast browsing retains old directory listing
buffers so that they don't need to be
re-acquired. This feature is especially
@@ -1632,8 +1748,12 @@ your browsing preferences. (see also: |netrw-settings|)
such directories, the old directory buffer
becomes out-of-date. One may always refresh
such a directory listing with |netrw-ctrl-l|.
- This option gives the choice of the trade-off
- between accuracy and speed to the user.
+ This option gives the user the choice of
+ trading off accuracy (ie. up-to-date listing)
+ versus speed.
+
+ *g:netrw_fname_escape* =' ?&;%'
+ Used on filenames before remote reading/writing
*g:netrw_ftp_browse_reject* ftp can produce a number of errors and warnings
that can show up as "directories" and "files"
@@ -1666,6 +1786,10 @@ your browsing preferences. (see also: |netrw-settings|)
unix or g:netrw_cygwin set: : "ls -tlF"
otherwise "dir"
+ *g:netrw_glob_escape* ='[]*?`{~$'
+ These characters in directory names are
+ escaped before applying glob()
+
*g:netrw_hide* if true, the hiding list is used
default: =0
@@ -1744,6 +1868,28 @@ your browsing preferences. (see also: |netrw-settings|)
default: '[\/]$,*,\.bak$,\.o$,\.h$,
\.info$,\.swp$,\.obj$'
+ *g:netrw_special_syntax* If true, then certain files will be shown
+ in special syntax in the browser:
+
+ netrwBak : *.bak
+ netrwCompress: *.gz *.bz2 *.Z *.zip
+ netrwData : *.dat
+ netrwHdr : *.h
+ netrwLib : *.a *.so *.lib *.dll
+ netrwMakefile: [mM]akefile *.mak
+ netrwObj : *.o *.obj
+ netrwTags : tags ANmenu ANtags
+ netrwTilde : *~
+ netrwTmp : tmp* *tmp
+
+ These syntax highlighting groups are linked
+ to Folded or DiffChange by default
+ (see |hl-Folded| and |hl-DiffChange|), but
+ one may put lines like >
+ hi link netrwCompress Visual
+< into one's <.vimrc> to use one's own
+ preferences.
+
*g:netrw_ssh_cmd* One may specify an executable command
to use instead of ssh for remote actions
such as listing, file removal, etc.
@@ -1756,13 +1902,10 @@ your browsing preferences. (see also: |netrw-settings|)
messages. By default its value is:
'^total\s\+\d\+$'
- *g:netrw_use_noswf* netrw normally avoids writing swapfiles
- for browser buffers. However, under some
- systems this apparently is causing nasty
- ml_get errors to appear; if you're getting
- ml_get errors, try putting
- let g:netrw_use_noswf= 0
- in your .vimrc.
+
+ *g:netrw_tmpfile_escape* =' &;'
+ escape() is applied to all temporary files
+ to escape these characters.
*g:netrw_timefmt* specify format string to vim's strftime().
The default, "%c", is "the preferred date
@@ -1774,11 +1917,35 @@ your browsing preferences. (see also: |netrw-settings|)
" %a %Y-%m-%d %I-%M-%S %p"
default: "%c"
+ *g:netrw_use_noswf* netrw normally avoids writing swapfiles
+ for browser buffers. However, under some
+ systems this apparently is causing nasty
+ ml_get errors to appear; if you're getting
+ ml_get errors, try putting
+ let g:netrw_use_noswf= 0
+ in your .vimrc.
+
*g:netrw_winsize* specify initial size of new windows made with
"o" (see |netrw-o|), "v" (see |netrw-v|),
|:Hexplore| or |:Vexplore|.
default: ""
+ *g:netrw_xstrlen* Controls how netrw computes a string
+ including multi-byte characters' string
+ length. (thanks to N Weibull, T Mechelynck)
+ =0: uses Vim's built-in strlen()
+ =1: number of codepoints (Latin + a combining
+ circumflex is two codepoints) (DEFAULT)
+ =2: number of spacing codepoints (Latin a +
+ combining circumflex is one spacing
+ codepoint; a hard tab is one; wide and
+ narrow CJK are one each; etc.)
+ =3: virtual length (counting tabs as anything
+ between 1 and |'tabstop'|, wide CJJK as 2
+ rather than 1, Arabic alif as zero when
+ immediately preceded by lam, one
+ otherwise, etc)
+
*g:NetrwTopLvlMenu* This variable specifies the top level
menu name; by default, it's "Netrw.". If
you wish to change this, do so in your
@@ -1850,10 +2017,10 @@ splitting if one has set |g:netrw_preview| first.
PREVIOUS WINDOW *netrw-P* *netrw-prvwin* {{{2
-To edit a file or directory in the previously used window (see :he |CTRL-W_P|),
-press a "P". If there's only one window, then the one window will be
-horizontally split (above/below splitting is controlled by |g:netrw_alto|,
-and its initial size is controlled by |g:netrw_winsize|).
+To edit a file or directory in the previously used (last accessed) window (see
+:he |CTRL-W_p|), press a "P". If there's only one window, then the one window
+will be horizontally split (above/below splitting is controlled by
+|g:netrw_alto|, and its initial size is controlled by |g:netrw_winsize|).
If there's more than one window, the previous window will be re-used on
the selected file/directory. If the previous window's associated buffer
@@ -1884,6 +2051,12 @@ If there are marked files: (see |netrw-mf|)
Marked files will be renamed (moved). You will be queried as above in
order to specify where you want the file/directory to be moved.
+ WARNING:~
+
+ Note that moving files is a dangerous operation; copies are safer. That's
+ because a "move" for remote files is actually a copy + delete -- and if
+ the copy fails and the delete does not, you may lose the file.
+
The g:netrw_rename_cmd variable is used to implement renaming. By default its
value is:
@@ -2179,6 +2352,104 @@ which is loaded automatically at startup (assuming :set nocp).
==============================================================================
12. History *netrw-history* {{{1
+ v125: Apr 07, 2008 * (Cristian Rigamonti) CR provides a patch; he
+ noted that gx was failing since its call to
+ netrw#NetBrowseX() wasn't updated to
+ netrw#NetrwBrowseX().
+ * (Stanis Trendelenburg) ST provides a patch to
+ supports davs: (dav + ssl)
+ * (Rick Choi) noted that directory names comprised
+ of three digits were not being displayed by
+ the internal browser. Fixed.
+ * (Erik Falor) provided a patch to handle problems
+ with changing directory and |'acd'| option.
+ * (James Vega, Teemu Likonen) noted that netrw
+ wasn't handling multi-byte filenames/directories
+ correctly. Fixed.
+ * (Rick) found problem with g:netrw_maxfilenamelen
+ being overridden.
+ * (James Vega) pointed out that netrw was
+ misidentifying all files in a symbolically linked
+ directory as being symbolically linked
+ themselves. This particular problem was fixed;
+ however, there are now situations where
+ symbolically linked files will not be detected.
+ Really need an internal vim function to do this
+ identification.
+ Apr 17, 2008 * When g:netrw_keepdir==0, current directory
+ doesn't necessarily equal b:netrw_curdir
+ initially. Problem is due to the patch directly
+ above.
+ * Fixed qf to handle case where b:netrw_curdir
+ isn't the same as the current directory under
+ linux/macosx.
+ * New: |netrw-mg| (apply vimgrep to marked files)
+ May 05, 2008 * (Rick) pointed out that a "setlocal ts=32" was
+ interfering with g:netrw_maxfilenamelen
+ May 05, 2008 * (James Vega) a file inside a linked directory
+ was showing up as a symbolic link itself.
+ May 22, 2008 * symbolic links, fifos, and sockets are now
+ indicated by a trailing @, |, or =, respectively.
+ Jun 06, 2008 * Removed numerous bugs from the marked file
+ move and copy. Tested these changes under
+ Unix only thus far.
+ v124: Apr 02, 2008 * (Adrian Rollett) change the line supporting the
+ "x" action for mac to use g:netrw_shq
+ v123: Feb 27, 2008 * Marked files now keeps a "global" marked file
+ list. The global marked file list is used to
+ support tag processing and vimdiff'ing
+ (|netrw-md| |netrw-mt|)
+ * Been insuring that mm and mc works with various
+ combinations of local and remote directories
+ * (Stefan Bittner) http://.../ should always have
+ filetype "html" -- fixed.
+ * (Stefan Bittner) a "?" in a http://.../ request
+ wasn't being handled correctly. Fixed by
+ removing ? from default |g:netrw_tmpfile_escape|.
+ * (Nico Weber) % codes in http://.../ requests
+ weren't being handled correctly. Fixed by
+ including % in default |g:netrw_fname_escape|.
+ * (Stefan Bittner) attempts to update Buffers.Refresh
+ were failing because locale use changed the menu
+ names. I implemented a workaround.
+ v122: Feb 12, 2008 * bugfix - first sorting sequence match now has
+ priority
+ Feb 14, 2008 * bugfix - sorting sequence was effectively ignoring
+ sequencing priority of anything following '*'
+ * toggling a marked file was showing incorrect list
+ (list was correct, but displayed matches weren't)
+ * |g:netrw_special_syntax| implemented
+ v121: Feb 11, 2008 * Bram M reported that :e file ... :e . would not
+ retain the alternate file. Fixed -- I hope!
+ * bugfix -- apparently v120 broke an explicit
+ :Explore dirname
+ v120: Jan 21, 2008 * |netrw-mt| changed to allow for target selection
+ based on whether or not word under cursor is a
+ directory or file, or if cursor is in banner
+ area.
+ * |netrw-mh| included (hiding by marked-file suffix)
+ * functions moved about a bit (improved
+ categorization)
+ * executable files now displayed with trailing (*)
+ * symbolically linked files now displayed with
+ trailing (@)
+ * Somewhen, s:NetrwMarkFileMove() got damaged. Its
+ now restored (missing an endif, for example).
+ * |netrw-mu| implemented (unmarking marked files)
+ * many bugs have been removed from the marked file
+ system (tnx to Mark S. for feedback)
+ * |netrw-ms| implemented (sourcing marked files)
+ * fixed use of P with tree listing style
+ * multiple tree listing now supported
+ * ./ suppressed
+ * changed q -> qb (query bookmarks)
+ * implemented |netrw-qf|
+ * Explore now has four special list-generation
+ modes: */filepat **/filepat
+ *//pattern **//pattern
+ * gh (|netrw-gh|) is a shortcut for toggling the
+ hiding of files and directories beginning with a
+ dot
v119: Jan 10, 2008 * When g:netrw_keepdir is false,
NetrwOptionsRestore() had a problem
(Bill McCarthy)
diff --git a/runtime/plugin/netrwPlugin.vim b/runtime/plugin/netrwPlugin.vim
index 24f60f2..9d7a79a 100644
--- a/runtime/plugin/netrwPlugin.vim
+++ b/runtime/plugin/netrwPlugin.vim
@@ -1,6 +1,6 @@
" netrwPlugin.vim: Handles file transfer and remote directory listing across a network
" PLUGIN SECTION
-" Date: Aug 09, 2007
+" Date: Apr 07, 2008
" Maintainer: Charles E Campbell, Jr <NdrOchip at ScampbellPfamily.AbizM-NOSPAM>
" GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim
" Copyright: Copyright (C) 1999-2005 Charles E. Campbell, Jr. {{{1
@@ -22,7 +22,7 @@
if &cp || exists("g:loaded_netrwPlugin")
finish
endif
-let g:loaded_netrwPlugin = "v119"
+let g:loaded_netrwPlugin = "v125n"
let s:keepcpo = &cpo
if v:version < 700
echohl WarningMsg | echo "***netrw*** you need vim version 7.0 for this version of netrw" | echohl None
@@ -52,14 +52,14 @@ augroup Network
au BufReadCmd file://* exe "silent doau BufReadPre ".netrw#RFC2396(expand("<amatch>"))|exe 'e '.substitute(netrw#RFC2396(expand("<amatch>")),'file://\(.*\)','\1',"")|exe "bwipe ".expand("<amatch>")|exe "silent doau BufReadPost ".netrw#RFC2396(expand("<amatch>"))
au BufReadCmd file://localhost/* exe "silent doau BufReadPre ".netrw#RFC2396(expand("<amatch>"))|exe 'e '.substitute(netrw#RFC2396(expand("<amatch>")),'file://localhost/\(.*\)','\1',"")|exe "bwipe ".substitute(expand("<amatch>"),'file://\(\k\+@\)\=','','')|exe "silent doau BufReadPost ".netrw#RFC2396(expand("<amatch>"))
endif
- au BufReadCmd ftp://*,rcp://*,scp://*,http://*,dav://*,rsync://*,sftp://* exe "silent doau BufReadPre ".expand("<amatch>")|exe '2Nread "'.expand("<amatch>").'"'|exe "silent doau BufReadPost ".expand("<amatch>")
- au FileReadCmd ftp://*,rcp://*,scp://*,http://*,dav://*,rsync://*,sftp://* exe "silent doau FileReadPre ".expand("<amatch>")|exe 'Nread "' .expand("<amatch>").'"'|exe "silent doau FileReadPost ".expand("<amatch>")
- au BufWriteCmd ftp://*,rcp://*,scp://*,dav://*,rsync://*,sftp://* exe "silent doau BufWritePre ".expand("<amatch>")|exe 'Nwrite "' .expand("<amatch>").'"'|exe "silent doau BufWritePost ".expand("<amatch>")
- au FileWriteCmd ftp://*,rcp://*,scp://*,dav://*,rsync://*,sftp://* exe "silent doau FileWritePre ".expand("<amatch>")|exe "'[,']".'Nwrite "' .expand("<amatch>").'"'|exe "silent doau FileWritePost ".expand("<amatch>")
+ au BufReadCmd ftp://*,rcp://*,scp://*,http://*,dav://*,davs://*,rsync://*,sftp://* exe "silent doau BufReadPre ".expand("<amatch>")|exe '2Nread "'.expand("<amatch>").'"'|exe "silent doau BufReadPost ".expand("<amatch>")
+ au FileReadCmd ftp://*,rcp://*,scp://*,http://*,dav://*,davs://*,rsync://*,sftp://* exe "silent doau FileReadPre ".expand("<amatch>")|exe 'Nread "' .expand("<amatch>").'"'|exe "silent doau FileReadPost ".expand("<amatch>")
+ au BufWriteCmd ftp://*,rcp://*,scp://*,dav://*,davs://*,rsync://*,sftp://* exe "silent doau BufWritePre ".expand("<amatch>")|exe 'Nwrite "' .expand("<amatch>").'"'|exe "silent doau BufWritePost ".expand("<amatch>")
+ au FileWriteCmd ftp://*,rcp://*,scp://*,dav://*,davs://*,rsync://*,sftp://* exe "silent doau FileWritePre ".expand("<amatch>")|exe "'[,']".'Nwrite "' .expand("<amatch>").'"'|exe "silent doau FileWritePost ".expand("<amatch>")
try
- au SourceCmd ftp://*,rcp://*,scp://*,http://*,dav://*,rsync://*,sftp://* exe 'Nsource "'.expand("<amatch>").'"'
+ au SourceCmd ftp://*,rcp://*,scp://*,http://*,dav://*,davs://*,rsync://*,sftp://* exe 'Nsource "'.expand("<amatch>").'"'
catch /^Vim\%((\a\+)\)\=:E216/
- au SourcePre ftp://*,rcp://*,scp://*,http://*,dav://*,rsync://*,sftp://* exe 'Nsource "'.expand("<amatch>").'"'
+ au SourcePre ftp://*,rcp://*,scp://*,http://*,dav://*,davs://*,rsync://*,sftp://* exe 'Nsource "'.expand("<amatch>").'"'
endtry
augroup END
@@ -87,7 +87,7 @@ if !exists("g:netrw_nogx") && maparg('g','n') == ""
if !hasmapto('<Plug>NetrwBrowseX')
nmap <unique> gx <Plug>NetrwBrowseX
endif
- nno <silent> <Plug>NetrwBrowseX :call netrw#NetBrowseX(expand("<cWORD>"),0)<cr>
+ nno <silent> <Plug>NetrwBrowseX :call netrw#NetrwBrowseX(expand("<cWORD>"),0)<cr>
endif
" ---------------------------------------------------------------------
diff --git a/runtime/syntax/netrw.vim b/runtime/syntax/netrw.vim
index 3e3326d..62dab3f 100644
--- a/runtime/syntax/netrw.vim
+++ b/runtime/syntax/netrw.vim
@@ -1,7 +1,7 @@
" Language : Netrw Remote-Directory Listing Syntax
" Maintainer : Charles E. Campbell, Jr.
-" Last change: Aug 08, 2007
-" Version : 10
+" Last change: Feb 06, 2008
+" Version : 12
" ---------------------------------------------------------------------
" Syntax Clearing: {{{1
@@ -13,23 +13,24 @@ endif
" ---------------------------------------------------------------------
" Directory List Syntax Highlighting: {{{1
-syn cluster NetrwGroup contains=netrwHide,netrwSortBy,netrwSortSeq,netrwQuickHelp,netrwVersion,netrwCopyTgt
+syn cluster NetrwGroup contains=netrwHide,netrwSortBy,netrwSortSeq,netrwQuickHelp,netrwVersion,netrwCopyTgt
+syn cluster NetrwTreeGroup contains=netrwDir,netrwSymLink,netrwExe
-syn match netrwSpecial "\%(\S\+ \)*\S\+[*|=]\ze\%(\s\{2,}\|$\)" contains=netrwClassify
-syn match netrwDir "\.\{1,2}/" contains=netrwClassify
-syn match netrwDir "\%(\S\+ \)*\S\+/" contains=netrwClassify
-syn match netrwDir "^\S*/" contains=netrwClassify
-syn match netrwSizeDate "\<\d\+\s\d\{1,2}/\d\{1,2}/\d\{4}\s" contains=netrwDateSep skipwhite nextgroup=netrwTime
-syn match netrwSymLink "\%(\S\+ \)*\S\+@\ze\%(\s\{2,}\|$\)" contains=netrwClassify
-syn match netrwExe "\%(\S\+ \)*\S\+\*\ze\%(\s\{2,}\|$\)" contains=netrwClassify,netrwTreeIgnore
-syn match netrwTreeIgnore contained "^\%(| \)*"
+syn match netrwSpecial "\%(\S\+ \)*\S\+[*|=]\ze\%(\s\{2,}\|$\)" contains=netrwClassify
+syn match netrwDir "\.\{1,2}/" contains=netrwClassify
+syn match netrwDir "\%(\S\+ \)*\S\+/" contains=netrwClassify
+syn match netrwSizeDate "\<\d\+\s\d\{1,2}/\d\{1,2}/\d\{4}\s" contains=netrwDateSep skipwhite nextgroup=netrwTime
+syn match netrwSymLink "\%(\S\+ \)*\S\+@\ze\%(\s\{2,}\|$\)" contains=netrwClassify
+syn match netrwExe "\%(\S\+ \)*\S\+\*\ze\%(\s\{2,}\|$\)" contains=netrwClassify
+syn match netrwTreeBar "^\%(| \)*" contains=netrwTreeBarSpace nextgroup=@netrwTreeGroup
+syn match netrwTreeBarSpace " " contained
syn match netrwClassify "[*=|@/]\ze\%(\s\{2,}\|$\)" contained
syn match netrwDateSep "/" contained
-syn match netrwTime "\d\{1,2}:\d\{2}:\d\{2}" contained contains=netrwTimeSep
+syn match netrwTime "\d\{1,2}:\d\{2}:\d\{2}" contained contains=netrwTimeSep
syn match netrwTimeSep ":"
-syn match netrwComment '".*\%(\t\|$\)' contains=@NetrwGroup
+syn match netrwComment '".*\%(\t\|$\)' contains=@NetrwGroup
syn match netrwHide '^"\s*\(Hid\|Show\)ing:' skipwhite nextgroup=netrwHidePat
syn match netrwSlash "/" contained
syn match netrwHidePat "[^,]\+" contained skipwhite nextgroup=netrwHideSep
@@ -37,14 +38,31 @@ syn match netrwHideSep "," contained transparent skipwhite nextgroup=netrwH
syn match netrwSortBy "Sorted by" contained transparent skipwhite nextgroup=netrwList
syn match netrwSortSeq "Sort sequence:" contained transparent skipwhite nextgroup=netrwList
syn match netrwCopyTgt "Copy/Move Tgt:" contained transparent skipwhite nextgroup=netrwList
-syn match netrwList ".*$" contained contains=netrwComma
+syn match netrwList ".*$" contained contains=netrwComma
syn match netrwComma "," contained
-syn region netrwQuickHelp matchgroup=Comment start="Quick Help:\s\+" end="$" contains=netrwHelpCmd keepend contained
+syn region netrwQuickHelp matchgroup=Comment start="Quick Help:\s\+" end="$" contains=netrwHelpCmd keepend contained
syn match netrwHelpCmd "\S\ze:" contained skipwhite nextgroup=netrwCmdSep
syn match netrwCmdSep ":" contained nextgroup=netrwCmdNote
syn match netrwCmdNote ".\{-}\ze " contained
syn match netrwVersion "(netrw.*)" contained
+" -----------------------------
+" Special filetype highlighting {{{1
+" -----------------------------
+if exists("g:netrw_special_syntax") && netrw_special_syntax
+ syn match netrwBak "\(\S\+ \)*\S\+\.bak\>" contains=netrwTreeBar
+ syn match netrwCompress "\(\S\+ \)*\S\+\.\%(gz\|bz2\|Z\|zip\)\>" contains=netrwTreeBar
+ syn match netrwData "\(\S\+ \)*\S\+\.dat\>" contains=netrwTreeBar
+ syn match netrwHdr "\(\S\+ \)*\S\+\.h\>" contains=netrwTreeBar
+ syn match netrwLib "\(\S\+ \)*\S*\.\%(a\|so\|lib\|dll\)\>" contains=netrwTreeBar
+ syn match netrwMakeFile "\<[mM]akefile\>\|\(\S\+ \)*\S\+\.mak\>" contains=netrwTreeBar
+ syn match netrwObj "\(\S\+ \)*\S*\.\%(o\|obj\)\>" contains=netrwTreeBar
+ syn match netrwTags "\<tags\>" contains=netrwTreeBar
+ syn match netrwTags "\<\(ANmenu\|ANtags\)\>" contains=netrwTreeBar
+ syn match netrwTilde "\(\S\+ \)*\S\+\~\>" contains=netrwTreeBar
+ syn match netrwTmp "\<tmp\(\S\+ \)*\S\+\>\|\(\S\+ \)*\S*tmp\>" contains=netrwTreeBar
+endif
+
" ---------------------------------------------------------------------
" Highlighting Links: {{{1
if !exists("did_drchip_netrwlist_syntax")
@@ -61,10 +79,22 @@ if !exists("did_drchip_netrwlist_syntax")
hi link netrwExe PreProc
hi link netrwDateSep Delimiter
+ hi link netrwTreeBar Special
hi link netrwTimeSep netrwDateSep
hi link netrwComma netrwComment
hi link netrwHide netrwComment
hi link netrwMarkFile Identifier
+
+ " special syntax highlighting (see :he g:netrw_special_syntax)
+ hi link netrwBak NonText
+ hi link netrwCompress Folded
+ hi link netrwData DiffChange
+ hi link netrwLib DiffChange
+ hi link netrwMakefile DiffChange
+ hi link netrwObj Folded
+ hi link netrwTilde Folded
+ hi link netrwTmp Folded
+ hi link netrwTags Folded
endif
" Current Syntax: {{{1
--
Vim packaging
More information about the pkg-vim-maintainers
mailing list