diff options
Diffstat (limited to 'runtime/plugin')
| -rw-r--r-- | runtime/plugin/NetrwFileHandlers.vim | 118 | ||||
| -rw-r--r-- | runtime/plugin/explorer.vim | 1326 | ||||
| -rw-r--r-- | runtime/plugin/netrw.vim | 647 |
3 files changed, 690 insertions, 1401 deletions
diff --git a/runtime/plugin/NetrwFileHandlers.vim b/runtime/plugin/NetrwFileHandlers.vim index 401fc58b1..addba4ece 100644 --- a/runtime/plugin/NetrwFileHandlers.vim +++ b/runtime/plugin/NetrwFileHandlers.vim @@ -1,33 +1,125 @@ " NetrwFileHandlers: contains various extension-based file handlers for -" netrw's browser +" netrw's browsers' x command " Author: Charles E. Campbell, Jr. -" Date: Jul 02, 2004 -" Version: 2 +" Date: Jul 06, 2004 +" Version: 3 " --------------------------------------------------------------------- " NetrwFileHandler_html: handles html when the user hits "x" when the " cursor is atop a *.html file -fun! NetrwFileHandler_html(webpage) -" call Dfunc("NetrwFileHandler_html(".a:webpage.")") +fun! NetrwFileHandler_html(pagefile) +" call Dfunc("NetrwFileHandler_html(".a:pagefile.")") - let host= substitute(a:webpage,'^\w\+://\%(\w*@\)\=\(\w\+\)/.*$','\1','e') -" call Decho("host<".host.">") + let page= substitute(a:pagefile,'^','file://','') - if host == hostname() || host == substitute(hostname(),'\..*$','','e') - let page= substitute(a:webpage,'^\w\+://\%(\w*@\)\=\(\w\+\)/','file://\1/'.expand("$HOME").'/','e') + if executable("mozilla") +" call Decho("executing !mozilla ".page) + exe "!mozilla ".page + elseif executable("netscape") +" call Decho("executing !netscape ".page) + exe "!netscape ".page else - let page= substitute(a:webpage,'^\w\+://\%(\w*@\)\=\(\w\+\)/','http://\1/','e') +" call Dret("NetrwFileHandler_html 0") + return 0 endif +" call Dret("NetrwFileHandler_html 1") + return 1 +endfun + +" --------------------------------------------------------------------- +" NetrwFileHandler_htm: handles html when the user hits "x" when the +" cursor is atop a *.htm file +fun! NetrwFileHandler_htm(pagefile) +" call Dfunc("NetrwFileHandler_htm(".a:pagefile.")") + + let page= substitute(a:pagefile,'^','file://','') + if executable("mozilla") -" call Decho("executing !mozilla ".page) +" call Decho("executing !mozilla ".page) exe "!mozilla ".page elseif executable("netscape") -" call Decho("executing !netscape ".page) +" call Decho("executing !netscape ".page) exe "!netscape ".page + else +" call Dret("NetrwFileHandler_htm 0") + return 0 + endif + +" call Dret("NetrwFileHandler_htm 1") + return 1 +endfun + +" --------------------------------------------------------------------- +" NetrwFileHandler_jpg: +fun! NetrwFileHandler_jpg(jpgfile) +" call Dfunc("NetrwFileHandler_jpg(jpgfile<".a:jpgfile.">)") + + if executable("gimp") + exe "silent! !gimp -s ".a:jpgfile + elseif executable(expand("$SystemRoot")."/SYSTEM32/MSPAINT.EXE") + exe "silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT ".a:jpgfile + else +" call Dret("NetrwFileHandler_jpg 0") + return 0 + endif + +" call Dret("NetrwFileHandler_jpg 1") + return 1 +endfun + +" --------------------------------------------------------------------- +" NetrwFileHandler_gif: +fun! NetrwFileHandler_gif(giffile) +" call Dfunc("NetrwFileHandler_gif(giffile<".a:giffile.">)") + + if executable("gimp") + exe "silent! !gimp -s ".a:giffile + elseif executable(expand("$SystemRoot")."/SYSTEM32/MSPAINT.EXE") + exe "silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT ".a:giffile + else +" call Dret("NetrwFileHandler_gif 0") + return 0 + endif + +" call Dret("NetrwFileHandler_gif 1") + return 1 +endfun + +" --------------------------------------------------------------------- +" NetrwFileHandler_pnm: +fun! NetrwFileHandler_pnm(pnmfile) +" call Dfunc("NetrwFileHandler_pnm(pnmfile<".a:pnmfile.">)") + + if executable("gimp") + exe "silent! !gimp -s ".a:pnmfile + elseif executable(expand("$SystemRoot")."/SYSTEM32/MSPAINT.EXE") + exe "silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT ".a:pnmfile + else +" call Dret("NetrwFileHandler_pnm 0") + return 0 + endif + +" call Dret("NetrwFileHandler_pnm 1") + return 1 +endfun + +" --------------------------------------------------------------------- +" NetrwFileHandler_bmp: +fun! NetrwFileHandler_bmp(bmpfile) +" call Dfunc("NetrwFileHandler_bmp(bmpfile<".a:bmpfile.">)") + + if executable("gimp") + exe "silent! !gimp -s ".a:bmpfile + elseif executable(expand("$SystemRoot")."/SYSTEM32/MSPAINT.EXE") + exe "silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT ".a:bmpfile + else +" call Dret("NetrwFileHandler_bmp 0") + return 0 endif -" call Dret("NetrwFileHandler_html") +" call Dret("NetrwFileHandler_bmp 1") + return 1 endfun " --------------------------------------------------------------------- diff --git a/runtime/plugin/explorer.vim b/runtime/plugin/explorer.vim deleted file mode 100644 index e0fcb3349..000000000 --- a/runtime/plugin/explorer.vim +++ /dev/null @@ -1,1326 +0,0 @@ -"============================================================================= -" File: explorer.vim -" Author: M A Aziz Ahmed (aziz@acorn-networks.com - doesn't work) -" Last Change: 2004 Jun 22 -" Version: 2.5 + changes -" Additions by Mark Waggoner (waggoner@aracnet.com) et al. -"----------------------------------------------------------------------------- -" This file implements a file explorer. -"----------------------------------------------------------------------------- -" Normally, this file will reside in the plugins directory and be -" automatically sourced. If not, you must manually source this file -" using :source explorer.vim -" -" To use it, just edit a directory (vi dirname) or type :Explore to -" launch the file explorer in the current window, or :Sexplore to split -" the current window and launch explorer there. -" -" If the current buffer is modified, the window is always split. -" -" It is also possible to delete files and rename files within explorer. -" See :help file-explorer for more details -" -"----------------------------------------------------------------------------- -" Update history removed, it's not very interesting. -" Contributors were: Doug Potts, Bram Moolenaar, Thomas Köhler -"============================================================================= - -" Has this already been loaded? -if exists("loaded_explorer") - finish -endif -let loaded_explorer=1 - -" Line continuation used here -let s:cpo_save = &cpo -set cpo&vim - -"--- -" Default settings for global configuration variables - -" Split vertically instead of horizontally? -if !exists("g:explVertical") - let g:explVertical=0 -endif - -" How big to make the window? Set to "" to avoid resizing -if !exists("g:explWinSize") - let g:explWinSize=15 -endif - -" When opening a new file/directory, split below current window (or -" above)? 1 = below, 0 = to above -if !exists("g:explSplitBelow") - let g:explSplitBelow = &splitbelow -endif - -" Split to right of current window (or to left)? -" 1 = to right, 0 = to left -if !exists("g:explSplitRight") - let g:explSplitRight = &splitright -endif - -" Start the first explorer window... -" Defaults to be the same as explSplitBelow -if !exists("g:explStartBelow") - let g:explStartBelow = g:explSplitBelow -endif - -" Start the first explorer window... -" Defaults to be the same as explSplitRight -if !exists("g:explStartRight") - let g:explStartRight = g:explSplitRight -endif - -" Show detailed help? -if !exists("g:explDetailedHelp") - let g:explDetailedHelp=0 -endif - -" Show file size and dates? -if !exists("g:explDetailedList") - let g:explDetailedList=0 -endif - -" Format for the date -if !exists("g:explDateFormat") - let g:explDateFormat="%d %b %Y %H:%M" -endif - -" Files to hide -if !exists("g:explHideFiles") - let g:explHideFiles='' -endif - -" Field to sort by -if !exists("g:explSortBy") - let g:explSortBy='name' -endif - -" Segregate directories? 1, 0, or -1 -if !exists("g:explDirsFirst") - let g:explDirsFirst=1 -endif - -" Segregate items in suffixes option? 1, 0, or -1 -if !exists("g:explSuffixesLast") - let g:explSuffixesLast=1 -endif - -" Include separator lines between directories, files, and suffixes? -if !exists("g:explUseSeparators") - let g:explUseSeparators=0 -endif - -" Execute file handler -if !exists("g:explFileHandler") - if has("win32") - " for Win32 use rundll32 - function! s:explFileHandlerWin32(fn) - exec 'silent !start rundll32 url.dll,FileProtocolHandler "' - \ . escape(a:fn, '%#') . '"' - endfunction - let g:explFileHandler = "<SID>explFileHandlerWin32" - - elseif has("unix") - " for KDE use kfmclient, for GNUME use gnome-open - if executable("kfmclient") - let g:explFileHandlerCmd = "kfmclient exec" - elseif executable("gnome-open") - let g:explFileHandlerCmd = "gnome-open" - else - let g:explFileHandlerCmd = "" - endif - if g:explFileHandlerCmd != "" - function! s:explFileHandlerUnix(fn) - if &shellredir =~ "%s" - let redir = substitute(&shellredir, "%s", "/dev/null", "") - else - let redir = &shellredir . "/dev/null" - endif - " Need to escape % and # but not spaces. - exec "silent !" . g:explFileHandlerCmd . " '" . escape(a:fn, '%#') . "'" . redir - endfunction - let g:explFileHandler = "<SID>explFileHandlerUnix" - endif - endif -endif - -"--- -" script variables - these are the same across all -" explorer windows - -" characters that must be escaped for a regular expression -let s:escregexp = '/*^$.~\' - -" characters that must be escaped for filenames -if has("dos16") || has("dos32") || has("win16") || has("win32") || has("os2") - let s:escfilename = ' %#' -else - let s:escfilename = ' \%#[]' -endif - - -" A line to use for separating sections -let s:separator='"---------------------------------------------------' - -"--- -" Create commands - -if !exists(':Explore') - command -n=? -complete=dir Explore :call s:StartExplorer(0, '<a>') -endif -if !exists(':Sexplore') - command -n=? -complete=dir Sexplore :call s:StartExplorer(1, '<a>') -endif - -"--- -" Start the explorer using the preferences from the global variables -" -function! s:StartExplorer(split, start_dir) - let startcmd = "edit" - if a:start_dir != "" - let fname=a:start_dir - else - let fname = expand("%:p:h") - endif - if fname == "" - let fname = getcwd() - endif - - " Create a variable to use if splitting vertically - let splitMode = "" - if g:explVertical == 1 - let splitMode = "vertical" - endif - - " Save the user's settings for splitbelow and splitright - let savesplitbelow = &splitbelow - let savesplitright = &splitright - - if a:split || &modified - let startcmd = splitMode . " " . g:explWinSize . "new " . fname - let &splitbelow = g:explStartBelow - let &splitright = g:explStartRight - else - let startcmd = "edit " . fname - endif - silent execute startcmd - let &splitbelow = savesplitbelow - let &splitright = savesplitright -endfunction - -"--- -" This is the main entry for 'editing' a directory -" -function! s:EditDir() - " Get out of here right away if this isn't a directory! - let name = expand("%") - if name == "" - let name = expand("%:p") - endif - if !isdirectory(name) - return - endif - - " Turn off the swapfile, set the buffer type so that it won't get - " written, and so that it will get deleted when it gets hidden. - setlocal noreadonly modifiable - setlocal noswapfile - setlocal buftype=nowrite - setlocal bufhidden=delete - " Don't wrap around long lines - setlocal nowrap - - " No need for any insertmode abbreviations, since we don't allow - " insertions anyway! - iabc <buffer> - - " Long or short listing? Use the global variable the first time - " explorer is called, after that use the script variable as set by - " the interactive user. - if exists("s:longlist") - let w:longlist = s:longlist - else - let w:longlist = g:explDetailedList - endif - - " Show keyboard shortcuts? - if exists("s:longhelp") - let w:longhelp = s:longhelp - else - let w:longhelp = g:explDetailedHelp - endif - - " Set the sort based on the global variables the first time. If you - " later change the sort order, it will be retained in the s:sortby - " variable for the next time you open explorer - let w:sortdirection=1 - let w:sortdirlabel = "" - let w:sorttype = "" - if exists("s:sortby") - let sortby=s:sortby - else - let sortby=g:explSortBy - endif - if sortby =~ "reverse" - let w:sortdirection=-1 - let w:sortdirlabel = "reverse " - endif - if sortby =~ "date" - let w:sorttype = "date" - elseif sortby =~ "size" - let w:sorttype = "size" - else - let w:sorttype = "name" - endif - call s:SetSuffixesLast() - - " If directory is already loaded, don't open it again! - if line('$') > 1 - setlocal readonly nomodifiable - return - endif - - " Get the complete path to the directory to look at with a slash at - " the end. This also removes "/../" and "/./" things. - let b:completePath = s:Path(expand("%:p")) - - " Add a slash at the end - if b:completePath !~ '/$' - let b:completePath = b:completePath . '/' - endif - - " escape special characters for exec commands - let b:completePathEsc = escape(b:completePath, s:escfilename) - let b:parentDirEsc = substitute(b:completePathEsc, '/[^/]*/$', '/', 'g') - - " Set up syntax highlighting - " Something wrong with the evaluation of the conditional though... - if has("syntax") && exists("g:syntax_on") && !has("syntax_items") - syn match browseSynopsis "^\"[ -].*" - syn match browseDirectory "[^\"].*/ " - syn match browseDirectory "[^\"].*/$" - syn match browseCurDir "^\"= .*$" - syn match browseSortBy "^\" Sorted by .*$" contains=browseSuffixInfo - syn match browseSuffixInfo "(.*)$" contained - syn match browseFilter "^\" Not Showing:.*$" - syn match browseFiletime "««\d\+$" - exec('syn match browseSuffixes "' . b:suffixesHighlight . '"') - - "hi def link browseSynopsis PreProc - hi def link browseSynopsis Special - hi def link browseDirectory Directory - hi def link browseCurDir Statement - hi def link browseSortBy String - hi def link browseSuffixInfo Type - hi def link browseFilter String - hi def link browseFiletime Ignore - hi def link browseSuffixes Type - endif - - " Set filter for hiding files - let b:filterFormula=substitute(g:explHideFiles, '\([^\\]\),', '\1\\|', 'g') - if b:filterFormula != '' - let b:filtering="\nNot showing: " . b:filterFormula - else - let b:filtering="" - endif - - " Show the files - call s:ShowDirectory() - - " Set up mappings for this buffer - let cpo_save = &cpo - set cpo&vim - nnoremap <buffer> <cr> :call <SID>EditEntry("","edit")<cr> - nnoremap <buffer> - :exec ("silent e " . b:parentDirEsc)<cr> - if exists("g:explFileHandler") - nnoremap <buffer> x :call <SID>ExecuteEntry()<cr> - endif - nnoremap <buffer> o :call <SID>OpenEntry()<cr> - nnoremap <buffer> O :call <SID>OpenEntryPrevWindow()<cr> - nnoremap <buffer> p :call <SID>EditEntry("","pedit")<cr> - nnoremap <buffer> ? :call <SID>ToggleHelp()<cr> - nnoremap <buffer> a :call <SID>ShowAllFiles()<cr> - nnoremap <buffer> R :call <SID>RenameFile()<cr> - nnoremap <buffer> D :. call <SID>DeleteFile()<cr> - vnoremap <buffer> D :call <SID>DeleteFile()<cr> - nnoremap <buffer> i :call <SID>ToggleLongList()<cr> - nnoremap <buffer> s :call <SID>SortSelect()<cr> - nnoremap <buffer> r :call <SID>SortReverse()<cr> - nnoremap <buffer> c :exec "cd ".b:completePathEsc<cr> - nnoremap <buffer> <2-leftmouse> :call <SID>DoubleClick()<cr> - if exists("*ExplorerCustomMap") - call ExplorerCustomMap() - endif - let &cpo = cpo_save - - " prevent the buffer from being modified - setlocal readonly nomodifiable -endfunction - -"--- -" Determine the number of windows open to this buffer number. -" Care of Yegappan Lakshman. Thanks! -fun! s:BufInWindows(bnum) - let cnt = 0 - let winnum = 1 - while 1 - let bufnum = winbufnr(winnum) - if bufnum < 0 - break - endif - if bufnum == a:bnum - let cnt = cnt + 1 - endif - let winnum = winnum + 1 - endwhile - - return cnt -endfunction - -" If this is the only window, open file in a new window -" Otherwise, open file in the most recently visited window -" -function! s:OpenEntryPrevWindow() - " Figure out if there are any other windows - let n = winnr() - wincmd p - " No other window? Then open a new one - if n == winnr() - call s:OpenEntry() - " Other windows exist - else - " Check if the previous buffer is modified - ask if they want to save! - " Was it modified, and is it the only window open to this file - if &modified && s:BufInWindows(winbufnr(winnr())) < 2 - let bufname = bufname(winbufnr(winnr())) - - let action=confirm("Save Changes in " . bufname . "?","&Yes\n&No\n&Cancel") - " Yes - try to save - if there is an error, cancel - if action == 1 - let v:errmsg = "" - silent w - if v:errmsg != "" - echoerr "Unable to write buffer!" - wincmd p - return - endif - " No, abandon changes - elseif action == 2 - set nomodified - echomsg "Warning, abandoning changes in " . bufname - " Cancel (or any other result), don't do the open - else - wincmd p - return - endif - endif - wincmd p - call s:EditEntry("wincmd p","edit") - endif -endfunction - - -"--- -" Open a file or directory in a new window. -" Use g:explSplitBelow and g:explSplitRight to decide where to put the -" split window, and resize the original explorer window if it is -" larger than g:explWinSize -" -function! s:OpenEntry() - " Are we on a line with a file name? - let l = getline(".") - if l =~ '^"' - return - endif - - " Copy window settings to script settings - let s:sortby=w:sortdirlabel . w:sorttype - let s:longhelp = w:longhelp - let s:longlist = w:longlist - - " Get the window number of the explorer window - let n = winnr() - - " Save the user's settings for splitbelow and splitright - let savesplitbelow=&splitbelow - let savesplitright=&splitright - - " Figure out how to do the split based on the user's preferences. - " We want to split to the (left,right,top,bottom) of the explorer - " window, but we want to extract the screen real-estate from the - " window next to the explorer if possible. - " - " 'there' will be set to a command to move from the split window - " back to the explorer window - " - " 'back' will be set to a command to move from the explorer window - " back to the newly split window - " - " 'right' and 'below' will be set to the settings needed for - " splitbelow and splitright IF the explorer is the only window. - " - if g:explVertical - if g:explSplitRight - let there="wincmd h" - let back ="wincmd l" - let right=1 - let below=0 - else - let there="wincmd l" - let back ="wincmd h" - let right=0 - let below=0 - endif - else - if g:explSplitBelow - let there="wincmd k" - let back ="wincmd j" - let right=0 - let below=1 - else - let there="wincmd j" - let back ="wincmd k" - let right=0 - let below=0 - endif - endif - - " Get the file name - let fn=s:GetFullFileName() - - " Attempt to go to adjacent window - exec(back) - " If no adjacent window, set splitright and splitbelow appropriately - if n == winnr() - let &splitright=right - let &splitbelow=below - else - " found adjacent window - invert split direction - let &splitright=!right - let &splitbelow=!below - endif - - " Create a variable to use if splitting vertically - let splitMode = "" - if g:explVertical == 1 - let splitMode = "vertical" - endif - - " Is it a directory? If so, get a real path to it instead of - " relative path. This also removes "/../" and "/./" things. - if isdirectory(fn) - let fn = fnamemodify(fn, ":p") - endif - - " Open the new window - exec("silent " . splitMode." sp " . escape(fn,s:escfilename)) - - " resize the explorer window if it is larger than the requested size - exec(there) - if g:explWinSize =~ '[0-9]\+' && winheight("") > g:explWinSize - exec("silent ".splitMode." resize ".g:explWinSize) - endif - exec(back) - - " Restore splitmode settings - let &splitbelow=savesplitbelow - let &splitright=savesplitright - -endfunction - -function! s:ExecuteEntry() - " Are we on a line with a file name? - let l = getline(".") - if l =~ '^"' - return - endif - - " Get the file name - let fn = s:GetFullFileName() - if has("win32") && fn =~ '^//' - let fn = substitute(fn, '/', '\\', 'g') - endif - exec "call " . g:explFileHandler . "(fn)" -endfunction - -"--- -" Double click with the mouse -" -function s:DoubleClick() - if expand("<cfile>") =~ '[\\/]$' - call s:EditEntry("","edit") " directory: open in this window - else - call s:OpenEntryPrevWindow() " file: open in another window - endif -endfun - -"--- -" Open file or directory in the same window as the explorer is -" currently in -" -function! s:EditEntry(movefirst,editcmd) - " Are we on a line with a file name? - let l = getline(".") - if l =~ '^"' - return - endif - - " Copy window settings to script settings - let s:sortby=w:sortdirlabel . w:sorttype - let s:longhelp = w:longhelp - let s:longlist = w:longlist - - " Get the file name - let fn = s:GetFullFileName() - if isdirectory(fn) - " This removes "/../" and "/./" things. - let fn = fnamemodify(fn, ":p") - endif - - " Move to desired window if needed - exec(a:movefirst) - " Edit the file/dir - exec(a:editcmd . " " . escape(fn,s:escfilename)) -endfunction - - -"--- -" Create a regular expression out of the suffixes option for sorting -" and set a string to indicate whether we are sorting with the -" suffixes at the end (or the beginning) -" -function! s:SetSuffixesLast() - let b:suffixesRegexp = '\(' . substitute(escape(&suffixes,s:escregexp),',','\\|','g') . '\)$' - let b:suffixesHighlight = '^[^"].*\(' . substitute(escape(&suffixes,s:escregexp),',','\\|','g') . '\)\( \|$\)' - if has("fname_case") - let b:suffixesRegexp = '\C' . b:suffixesRegexp - let b:suffixesHighlight = '\C' . b:suffixesHighlight - else - let b:suffixesRegexp = '\c' . b:suffixesRegexp - let b:suffixesHighlight = '\c' . b:suffixesHighlight - endif - if g:explSuffixesLast > 0 && &suffixes != "" - let b:suffixeslast=" (" . &suffixes . " at end of list)" - elseif g:explSuffixesLast < 0 && &suffixes != "" - let b:suffixeslast=" (" . &suffixes . " at start of list)" - else - let b:suffixeslast=" ('suffixes' mixed with files)" - endif -endfunction - -"--- -" Show the header and contents of the directory -" -function! s:ShowDirectory() - "Delete all lines - 1,$d _ - " Prevent a report of our actions from showing up - let oldRep=&report - let save_sc = &sc - set report=10000 nosc - - " Add the header - call s:AddHeader() - $d _ - - " Display the files - - " Get a list of all the files - let files = s:Path(glob(b:completePathEsc . "*")) - if files != "" && files !~ "\n$" - let files = files . "\n" - endif - - " Add the dot files now, making sure "." is not included! - let files = files . substitute(s:Path(glob(b:completePathEsc . ".*")), "[^\n]*/./\\=\n", '' , '') - if files != "" && files !~ "\n$" - let files = files . "\n" - endif - - " Are there any files left after filtering? - if files != "" - normal! mt - put =files - let b:maxFileLen = 0 - 0 - /^"=/+1,$g/^/call s:MarkDirs() - keepjumps normal! `t - call s:AddFileInfo() - endif - - normal! zz - - " Move to first directory in the listing - 0 - /^"=/+1 - - " Do the sort - call s:SortListing("Loaded contents of ".b:completePath.". ") - - " Move to first directory in the listing - 0 - /^"=/+1 - - let &report=oldRep - let &sc = save_sc - -endfunction - -"--- -" Mark which items are directories - called once for each file name -" must be used only when size/date is not displayed -" -function! s:MarkDirs() - let oldRep=&report - set report=1000 - "Remove slashes if added - s;/$;;e - "Removes all the leading slashes and adds slashes at the end of directories - s;^.*\\\([^\\]*\)$;\1;e - s;^.*/\([^/]*\)$;\1;e - "normal! ^ - let currLine=getline(".") - if isdirectory(b:completePath . currLine) - s;$;/; - let fileLen=strlen(currLine)+1 - else - let fileLen=strlen(currLine) - if (b:filterFormula!="") && (currLine =~ b:filterFormula) - " Don't show the file if it is to be filtered. - d _ - endif - endif - if fileLen > b:maxFileLen - let b:maxFileLen=fileLen - endif - let &report=oldRep -endfunction - -"--- -" Make sure a path has proper form -" -function! s:Path(p) - if has("dos16") || has("dos32") || has("win16") || has("win32") || has("os2") - return substitute(a:p,'\\','/','g') - else - return a:p - endif -endfunction - -"--- -" Extract the file name from a line in several different forms -" -function! s:GetFullFileNameEsc() - return s:EscapeFilename(s:GetFullFileName()) -endfunction - -function! s:GetFileNameEsc() - return s:EscapeFilename(s:GetFileName()) -endfunction - -function! s:EscapeFilename(name) - return escape(a:name,s:escfilename) -endfunction - - -function! s:GetFullFileName() - return s:ExtractFullFileName(getline(".")) -endfunction - -function! s:GetFileName() - return s:ExtractFileName(getline(".")) -endfunction - -function! s:ExtractFullFileName(line) - let fn=s:ExtractFileName(a:line) - if fn == '/' - return b:completePath - else - return b:completePath . s:ExtractFileName(a:line) - endif -endfunction - -function! s:ExtractFileName(line) - return substitute(strpart(a:line,0,b:maxFileLen),'\s\+$','','') -endfunction - -"--- -" Get the size of the file -function! s:ExtractFileSize(line) - if (w:longlist==0) - return getfsize(s:ExtractFileName(a:line)) - else - return strpart(a:line,b:maxFileLen+2,b:maxFileSizeLen) - endif -endfunction - -"--- -" Get the date of the file as a number -function! s:ExtractFileDate(line) - if w:longlist==0 - return getftime(s:ExtractFileName(a:line)) - else - return strpart(matchstr(strpart(a:line,b:maxFileLen+b:maxFileSizeLen+4),"««.*"),2) + 0 - endif -endfunction - - -"--- -" Add the header with help information -" -function! s:AddHeader() - let save_f=@f - 1 - if w:longhelp==1 - let @f="\" <enter> : open file or directory\n" - \."\" o : open new window for file/directory\n" - \."\" O : open file in previously visited window\n" - \."\" p : preview the file\n" - if exists("g:explFileHandler") - let @f=@f."\" x : execute file or directory\n" - endif - let @f=@f - \."\" i : toggle size/date listing\n" - \."\" s : select sort field r : reverse sort\n" - \."\" - : go up one level c : cd to this dir\n" - \."\" R : rename file D : delete file\n" - \."\" :help file-explorer for detailed help\n" - else - let @f="\" Press ? for keyboard shortcuts\n" - endif - let @f=@f."\" Sorted by ".w:sortdirlabel.w:sorttype.b:suffixeslast.b:filtering."\n" - let @f=@f."\"= ".b:completePath."\n" - put! f - let @f=save_f -endfunction - - -"--- -" Show the size and date for each file -" -function! s:AddFileInfo() - let save_sc = &sc - set nosc - - " Mark our starting point - normal! mt - - call s:RemoveSeparators() - - " Remove all info - 0 - /^"=/+1,$g/^/call setline(line("."),s:GetFileName()) - - " Add info if requested - if w:longlist==1 - " Add file size and calculate maximum length of file size field - let b:maxFileSizeLen = 0 - 0 - /^"=/+1,$g/^/let fn=s:GetFullFileName() | - \let fileSize=getfsize(fn) | - \let fileSizeLen=strlen(fileSize) | - \if fileSizeLen > b:maxFileSizeLen | - \ let b:maxFileSizeLen = fileSizeLen | - \endif | - \exec "normal! ".(b:maxFileLen-strlen(getline("."))+2)."A \<esc>" | - \exec 's/$/'.fileSize.'/' - - " Right justify the file sizes and - " add file modification date - 0 - /^"=/+1,$g/^/let fn=s:GetFullFileName() | - \exec "normal! A \<esc>$b".(b:maxFileLen+b:maxFileSizeLen-strlen(getline("."))+3)."i \<esc>\"_x" | - \exec 's/$/ '.escape(s:FileModDate(fn), '/').'/' - setlocal nomodified - endif - - call s:AddSeparators() - - " return to start - keepjumps normal! `t - - let &sc = save_sc -endfunction - - -"---- -" Get the modification time for a file -" -function! s:FileModDate(name) - let filetime=getftime(a:name) - if filetime > 0 - return strftime(g:explDateFormat,filetime) . " ««" . filetime - else - return "" - endif -endfunction - -"--- -" Delete a file or files -" -function! s:DeleteFile() range - let oldRep = &report - let &report = 1000 - - let filesDeleted = 0 - let stopDel = 0 - let delAll = 0 - let currLine = a:firstline - let lastLine = a:lastline - setlocal noreadonly modifiable - - while ((currLine <= lastLine) && (stopDel==0)) - exec(currLine) - let fileName=s:GetFullFileName() - if isdirectory(fileName) - echo fileName." : Directory deletion not supported yet" - let currLine = currLine + 1 - else - if delAll == 0 - let sure=input("Delete ".fileName." (y/n/a/q)? ") - if sure=="a" - let delAll = 1 - endif - endif - if (sure=="y") || (sure=="a") - let success=delete(fileName) - if success!=0 - exec (" ") - echo "\nCannot delete ".fileName - let currLine = currLine + 1 - else - d _ - let filesDeleted = filesDeleted + 1 - let lastLine = lastLine - 1 - endif - elseif sure=="q" - let stopDel = 1 - elseif sure=="n" - let currLine = currLine + 1 - endif - endif - endwhile - echo "\n".filesDeleted." files deleted" - let &report = oldRep - setlocal nomodified - setlocal readonly nomodifiable -endfunction - -"--- -" Rename a file -" -function! s:RenameFile() - let fileName=s:GetFullFileName() - setlocal noreadonly modifiable - if isdirectory(fileName) - echo "Directory renaming not supported yet" - elseif filereadable(fileName) - let altName=input("Rename ".fileName." to : ") - echo " " - if altName=="" - setlocal readonly nomodifiable - return - endif - let success=rename(fileName, b:completePath.altName) - if success!=0 - echo "Cannot rename ".fileName. " to ".altName - else - echo "Renamed ".fileName." to ".altName - let oldRep=&report - set report=1000 - e! - let &report=oldRep - endif - endif - setlocal nomodified - setlocal readonly nomodifiable -endfunction - -"--- -" Toggle between short and long help -" -function! s:ToggleHelp() - if exists("w:longhelp") && w:longhelp==0 - let w:longhelp=1 - let s:longhelp=1 - else - let w:longhelp=0 - let s:longhelp=0 - endif - " Allow modification - setlocal noreadonly modifiable - call s:UpdateHeader() - " Disallow modification - setlocal readonly nomodifiable -endfunction - -"--- -" Update the header -" -function! s:UpdateHeader() - let oldRep=&report - set report=10000 - " Save position - normal! mt - " Remove old header - 0 - 1,/^"=/ d _ - " Add new header - call s:AddHeader() - " Go back where we came from if possible - 0 - if line("'t") != 0 - keepjumps normal! `t - endif - - let &report=oldRep - setlocal nomodified -endfunction - -"--- -" Toggle long vs. short listing -" -function! s:ToggleLongList() - setlocal noreadonly modifiable - if exists("w:longlist") && w:longlist==1 - let w:longlist=0 - let s:longlist=0 - else - let w:longlist=1 - let s:longlist=1 - endif - call s:AddFileInfo() - setlocal readonly nomodifiable -endfunction - -"--- -" Show all files - remove filtering -" -function! s:ShowAllFiles() - setlocal noreadonly modifiable - let b:filterFormula="" - let b:filtering="" - call s:ShowDirectory() - setlocal readonly nomodifiable -endfunction - -"--- -" Figure out what section we are in -" -function! s:GetSection() - let fn=s:GetFileName() - let section="file" - if fn =~ '/$' - let section="directory" - elseif fn =~ b:suffixesRegexp - let section="suffixes" - endif - return section -endfunction - -"--- -" Remove section separators -" -function! s:RemoveSeparators() - if !g:explUseSeparators - return - endif - 0 - silent! exec '/^"=/+1,$g/^' . s:separator . "/d _" -endfunction - -"--- -" Add section separators -" between directories and files if they are separated -" between files and 'suffixes' files if they are separated -function! s:AddSeparators() - if !g:explUseSeparators - return - endif - 0 - /^"=/+1 - let lastsec=s:GetSection() - +1 - .,$g/^/let sec=s:GetSection() | - \if g:explDirsFirst != 0 && sec != lastsec && - \ (lastsec == "directory" || sec == "directory") | - \ exec "normal! I" . s:separator . "\n\<esc>" | - \elseif g:explSuffixesLast != 0 && sec != lastsec && - \ (lastsec == "suffixes" || sec == "suffixes") | - \ exec "normal! I" . s:separator . "\n\<esc>" | - \endif | - \let lastsec=sec -endfunction - -"--- -" General string comparison function -" -function! s:StrCmp(line1, line2, direction) - if a:line1 < a:line2 - return -a:direction - elseif a:line1 > a:line2 - return a:direction - else - return 0 - endif -endfunction - -"--- -" Function for use with Sort(), to compare the file names -" Default sort is to put in alphabetical order, but with all directory -" names before all file names -" -function! s:FileNameCmp(line1, line2, direction) - let f1=s:ExtractFileName(a:line1) - let f2=s:ExtractFileName(a:line2) - - " Put directory names before file names - if (g:explDirsFirst != 0) && (f1 =~ '\/$') && (f2 !~ '\/$') - return -g:explDirsFirst - elseif (g:explDirsFirst != 0) && (f1 !~ '\/$') && (f2 =~ '\/$') - return g:explDirsFirst - elseif (g:explSuffixesLast != 0) && (f1 =~ b:suffixesRegexp) && (f2 !~ b:suffixesRegexp) - return g:explSuffixesLast - elseif (g:explSuffixesLast != 0) && (f1 !~ b:suffixesRegexp) && (f2 =~ b:suffixesRegexp) - return -g:explSuffixesLast - else - return s:StrCmp(substitute(f1, "/$", "", ""), substitute(f2, "/$", "", ""), a:direction) - endif - -endfunction - -"--- -" Function for use with Sort(), to compare the file modification dates -" Default sort is to put NEWEST files first. Reverse will put oldest -" files first -" -function! s:FileDateCmp(line1, line2, direction) - let f1=s:ExtractFileName(a:line1) - let f2=s:ExtractFileName(a:line2) - let t1=s:ExtractFileDate(a:line1) - let t2=s:ExtractFileDate(a:line2) - - " Put directory names before file names - if (g:explDirsFirst != 0) && (f1 =~ '\/$') && (f2 !~ '\/$') - return -g:explDirsFirst - elseif (g:explDirsFirst != 0) && (f1 !~ '\/$') && (f2 =~ '\/$') - return g:explDirsFirst - elseif (g:explSuffixesLast != 0) && (f1 =~ b:suffixesRegexp) && (f2 !~ b:suffixesRegexp) - return g:explSuffixesLast - elseif (g:explSuffixesLast != 0) && (f1 !~ b:suffixesRegexp) && (f2 =~ b:suffixesRegexp) - return -g:explSuffixesLast - elseif t1 > t2 - return -a:direction - elseif t1 < t2 - return a:direction - else - return s:StrCmp(substitute(f1, "/$", "", ""), substitute(f2, "/$", "", ""), 1) - endif -endfunction - -"--- -" Function for use with Sort(), to compare the file sizes -" Default sort is to put largest files first. Reverse will put -" smallest files first -" -function! s:FileSizeCmp(line1, line2, direction) - let f1=s:ExtractFileName(a:line1) - let f2=s:ExtractFileName(a:line2) - let s1=s:ExtractFileSize(a:line1) - let s2=s:ExtractFileSize(a:line2) - - if (g:explDirsFirst != 0) && (f1 =~ '\/$') && (f2 !~ '\/$') - return -g:explDirsFirst - elseif (g:explDirsFirst != 0) && (f1 !~ '\/$') && (f2 =~ '\/$') - return g:explDirsFirst - elseif (g:explSuffixesLast != 0) && (f1 =~ b:suffixesRegexp) && (f2 !~ b:suffixesRegexp) - return g:explSuffixesLast - elseif (g:explSuffixesLast != 0) && (f1 !~ b:suffixesRegexp) && (f2 =~ b:suffixesRegexp) - return -g:explSuffixesLast - elseif s1 > s2 - return -a:direction - elseif s1 < s2 - return a:direction - else - return s:StrCmp(substitute(f1, "/$", "", ""), substitute(f2, "/$", "", ""), 1) - endif -endfunction - -"--- -" Sort lines. SortR() is called recursively. -" -function! s:SortR(start, end, cmp, direction) - - " Bottom of the recursion if start reaches end - if a:start >= a:end - return - endif - " - let partition = a:start - 1 - let middle = partition - let partStr = getline((a:start + a:end) / 2) - let i = a:start - while (i <= a:end) - let str = getline(i) - exec "let result = " . a:cmp . "(str, partStr, " . a:direction . ")" - if result <= 0 - " Need to put it before the partition. Swap lines i and partition. - let partition = partition + 1 - if result == 0 - let middle = partition - endif - if i != partition - let str2 = getline(partition) - call setline(i, str2) - call setline(partition, str) - endif - endif - let i = i + 1 - endwhile - - " Now we have a pointer to the "middle" element, as far as partitioning - " goes, which could be anywhere before the partition. Make sure it is at - " the end of the partition. - if middle != partition - let str = getline(middle) - let str2 = getline(partition) - call setline(middle, str2) - call setline(partition, str) - endif - call s:SortR(a:start, partition - 1, a:cmp,a:direction) - call s:SortR(partition + 1, a:end, a:cmp,a:direction) -endfunction - -"--- -" To Sort a range of lines, pass the range to Sort() along with the name of a -" function that will compare two lines. -" -function! s:Sort(cmp,direction) range - call s:SortR(a:firstline, a:lastline, a:cmp, a:direction) -endfunction - -"--- -" Reverse the current sort order -" -function! s:SortReverse() - if exists("w:sortdirection") && w:sortdirection == -1 - let w:sortdirection = 1 - let w:sortdirlabel = "" - else - let w:sortdirection = -1 - let w:sortdirlabel = "reverse " - endif - let s:sortby=w:sortdirlabel . w:sorttype - call s:SortListing("") -endfunction - -"--- -" Toggle through the different sort orders -" -function! s:SortSelect() - " Select the next sort option - if !exists("w:sorttype") - let w:sorttype="name" - elseif w:sorttype == "name" - let w:sorttype="size" - elseif w:sorttype == "size" - let w:sorttype="date" - else - let w:sorttype="name" - endif - let s:sortby=w:sortdirlabel . w:sorttype - call s:SortListing("") -endfunction - -"--- -" Sort the file listing -" -function! s:SortListing(msg) - " Save the line we start on so we can go back there when done - " sorting - let startline = getline(".") - let col=col(".") - let lin=line(".") - - " Allow modification - setlocal noreadonly modifiable - - " Send a message about what we're doing - " Don't really need this - it can cause hit return prompts -" echo a:msg . "Sorting by" . w:sortdirlabel . w:sorttype - - " Create a regular expression out of the suffixes option in case - " we need it. - call s:SetSuffixesLast() - - " Remove section separators - call s:RemoveSeparators() - - " Do the sort - 0 - if w:sorttype == "size" - /^"=/+1,$call s:Sort("s:FileSizeCmp",w:sortdirection) - elseif w:sorttype == "date" - /^"=/+1,$call s:Sort("s:FileDateCmp",w:sortdirection) - else - /^"=/+1,$call s:Sort("s:FileNameCmp",w:sortdirection) - endif - - " Replace the header with updated information - call s:UpdateHeader() - - " Restore section separators - call s:AddSeparators() - - " Return to the position we started on - 0 - if search('\m^'.escape(startline,s:escregexp),'W') <= 0 - execute lin - endif - execute "normal!" col . "|" - - " Disallow modification - setlocal nomodified - setlocal readonly nomodifiable - -endfunction - -"--- -" Setup for editing directories after starting up by going to each window. -" Required for "vim -o filename dirname" -" -function! s:EditAll() - if winbufnr(2) == -1 - return - endif - let cmd = winrestcmd() - let curwin = winnr() - while 1 - wincmd w - if winnr() == curwin - break - endif - call s:EditDir() - endwhile - exe cmd -endfunction - -"--- -" Set up the autocommand to allow directories to be edited -" -augroup fileExplorer - au! - " Fill the window when entering the buffer; ":edit dir". - au BufEnter * call s:EditDir() - " Set the window variables after a split; ":split". - au WinEnter * if !exists("w:sortdirection") | call s:EditDir() | endif - " Fill the windows after Vim has started up. - au VimEnter * call s:EditAll() -augroup end - -" restore 'cpo' -let &cpo = s:cpo_save -unlet s:cpo_save diff --git a/runtime/plugin/netrw.vim b/runtime/plugin/netrw.vim index 9f4f91b5a..e6af41b17 100644 --- a/runtime/plugin/netrw.vim +++ b/runtime/plugin/netrw.vim @@ -1,7 +1,7 @@ " netrw.vim: Handles file transfer and remote directory listing across a network -" Last Change: Jun 30, 2004 +" Last Change: Jul 08, 2004 " Maintainer: Charles E. Campbell, Jr. PhD <drchipNOSPAM at campbellfamily.biz> -" Version: 47g ASTRO-ONLY +" Version: 47l ASTRO-ONLY " License: Vim License (see vim's :help license) " " But be doers of the word, and not only hearers, deluding your own selves @@ -12,8 +12,9 @@ if exists("loaded_netrw") || &cp finish endif -let loaded_netrw = "v47g ASTRO-ONLY" -let s:save_cpo = &cpo +let loaded_netrw = "v47l ASTRO-ONLY" +let s:save_cpo = &cpo +let loaded_explorer = 1 set cpo&vim " --------------------------------------------------------------------- @@ -74,6 +75,36 @@ if !exists("g:netrw_sort_direction") " alternative: reverse (z y x ...) let g:netrw_sort_direction= "normal" endif +if !exists("g:netrw_longlist") || g:netrw_longlist == 0 + let g:netrw_longlist= 0 +else + let g:netrw_longlist= 1 + let g:netrw_list_cmd= "ssh HOSTNAME ls -FLa -l" +endif +if !exists("g:netrw_timefmt") + let g:netrw_timefmt= "%c" +endif +if !exists("g:netrw_local_rmdir") + let g:netrw_local_rmdir= "rmdir" +endif +if !exists("g:netrw_local_rename") + if has("win32") + let g:netrw_local_rename= "ren" + elseif has("unix") + let g:netrw_local_rename= "mv" + endif +endif +if !exists("g:netrw_local_mkdir") + let g:netrw_local_mkdir= "mkdir" +endif +if !exists("g:netrw_mkdir_cmd") + let g:netrw_mkdir_cmd= "ssh HOSTNAME mkdir" +endif + +" BufEnter event ignored by decho when following variable is true +" Has a side effect that doau BufReadPost doesn't work, so +" files read by network transfer aren't appropriately highlighted. +"let g:decho_bufenter = 1 "Decho " --------------------------------------------------------------------- " Default values for global protocol variables {{{1 @@ -125,11 +156,13 @@ endif " --------------------------------------------------------------------- " Transparency Support: {{{1 -" Auto-detection for ftp://*, rcp://*, scp://*, sftp://*, http://*, dav://*, -" and rsync://* -" Should make file transfers across networks transparent. Currently I haven't -" supported appends. Hey, gotta leave something for a future <netrw.vim>! + " File Explorer: {{{2 if version >= 600 + augroup FileExplorer + au! + au BufEnter * call <SID>LocalBrowse(expand("<afile>")) + augroup END + " Network Handler: {{{2 augroup Network au! if has("win32") @@ -328,7 +361,7 @@ fun! s:NetRead(...) " call Decho("read via ftp+.netrc (method #2)") let netrw_fname= b:netrw_fname new - set ff=unix + setlocal ff=unix exe "put ='".g:netrw_ftpmode."'" exe "put ='get ".netrw_fname." ".tmpfile."'" if exists("g:netrw_port") && g:netrw_port != "" @@ -353,7 +386,7 @@ fun! s:NetRead(...) " call Decho("read via ftp+mipf (method #3)") let netrw_fname= b:netrw_fname new - set ff=unix + setlocal ff=unix if exists("g:netrw_port") && g:netrw_port != "" put ='open '.g:netrw_machine.' '.g:netrw_port else @@ -444,7 +477,7 @@ fun! s:NetRead(...) " Construct execution string (four lines) which will be passed through filter let netrw_fname= b:netrw_fname new - set ff=unix + setlocal ff=unix if exists("g:netrw_port") && g:netrw_port != "" put ='open '.g:netrw_machine.' '.g:netrw_port else @@ -538,7 +571,7 @@ fun! s:NetRead(...) unlet b:netrw_fname endif call s:NetOptionRestore() - + " call Dret("NetRead") endfun " end of NetRead @@ -614,7 +647,7 @@ fun! s:NetGetFile(readcmd, fname, method) exe bufnr("#")."bwipe!" else let oldul= &ul - set ul=-1 + setlocal ul=-1 exe a:readcmd." ".v:cmdarg." ".fname if delline > 0 " wipe out last line, which should be a blank line anyway @@ -641,6 +674,11 @@ fun! s:NetGetFile(readcmd, fname, method) " call Decho("calling NetReadFixup(method<".a:method."> line1=".line1." line2=".line2.")") call NetReadFixup(a:method, line1, line2) endif + + " update the Buffers menu + if has("gui") && has("gui_running") + silent! emenu Buffers.Refresh\ menu + endif " call Decho("readcmd<".a:readcmd."> cmdarg<".v:cmdarg."> fname<".a:fname."> readable=".filereadable(a:fname)) @@ -763,7 +801,7 @@ fun! s:NetWrite(...) range elseif b:netrw_method == 2 " write with ftp + <.netrc> let netrw_fname = b:netrw_fname new - set ff=unix + setlocal ff=unix exe "put ='".g:netrw_ftpmode."'" " call Decho(" NetWrite: put ='".g:netrw_ftpmode."'") exe "put ='put ".tmpfile." ".netrw_fname."'" @@ -788,7 +826,7 @@ fun! s:NetWrite(...) range elseif b:netrw_method == 3 " write with ftp + machine, id, passwd, and fname let netrw_fname= b:netrw_fname new - set ff=unix + setlocal ff=unix if exists("g:netrw_port") && g:netrw_port != "" put ='open '.g:netrw_machine.' '.g:netrw_port else @@ -850,7 +888,7 @@ fun! s:NetWrite(...) range " Construct execution string (four lines) which will be passed through filter let netrw_fname= b:netrw_fname new - set ff=unix + setlocal ff=unix if exists("g:netrw_port") && g:netrw_port != "" put ='open '.g:netrw_machine.' '.g:netrw_port else @@ -895,7 +933,7 @@ fun! s:NetWrite(...) range let uid_machine = g:netrw_machine endif new - set ff=unix + setlocal ff=unix put ='put '.tmpfile.' '.netrw_fname norm 1Gdd " call Decho("executing: %!".g:netrw_sftp_cmd.' '.uid_machine) @@ -959,18 +997,18 @@ fun! <SID>NetBrowse(dirname) " call Decho("set up path <".path .">") " call Decho("set up fname <".fname .">") - let listcmd = substitute(g:netrw_list_cmd,'\<HOSTNAME\>',user.machine,'') + let listcmd = substitute(g:netrw_list_cmd,'\<HOSTNAME\>',user.machine,'') - " optionally sort by time (-t) or by size (-S) - if g:netrw_sort_by =~ "^t" - let listcmd= listcmd."t" - elseif g:netrw_sort_by =~ "^s" - let listcmd= listcmd."S" - endif - " optionally sort in reverse - if g:netrw_sort_direction =~ "^r" - let listcmd= listcmd."r" - endif + " optionally sort by time (-t) or by size (-S) + if g:netrw_sort_by =~ "^t" + let listcmd= listcmd."t" + elseif g:netrw_sort_by =~ "^s" + let listcmd= listcmd."S" + endif + " optionally sort in reverse + if g:netrw_sort_direction =~ "^r" + let listcmd= listcmd."r" + endif " call Decho("set up listcmd<".listcmd.">") @@ -993,12 +1031,12 @@ fun! <SID>NetBrowse(dirname) " remote-read the requested file into current buffer enew! - exe "file ".method."://".user.machine."/".path + exe "file ".method."://".user.machine."/".escape(path,' ') exe "silent doau BufReadPre ".fname silent call s:NetRead(method."://".user.machine."/".path) exe "silent doau BufReadPost ".fname - 1d - set nomod + keepjumps 1d + setlocal nomod " call Dret("NetBrowse 0 : file<".fname.">") return 0 @@ -1021,26 +1059,28 @@ fun! <SID>NetBrowse(dirname) else enew! endif - setlocal bt=nofile bh=wipe nobl - exe 'file '.bufname - set bt=nowrite bh=hide nobl - nnoremap <buffer> <silent> <cr> :exe "norm! 0"<bar>call <SID>NetBrowse(<SID>NetBrowseChgDir(expand("%"),expand("<cWORD>")))<cr> + setlocal ts=32 bt=nofile bh=wipe nobl + exe 'file '.escape(bufname,' ') + setlocal bt=nowrite bh=hide nobl + nnoremap <buffer> <silent> <cr> :exe "norm! 0"<bar>call <SID>NetBrowse(<SID>NetBrowseChgDir(expand("%"),<SID>NetGetDir()))<cr> nnoremap <buffer> <silent> <c-l> :exe "norm! 0"<bar>call <SID>NetBrowse(<SID>NetBrowseChgDir(expand("%"),'./'))<cr> nnoremap <buffer> <silent> - :exe "norm! 0"<bar>call <SID>NetBrowse(<SID>NetBrowseChgDir(expand("%"),'../'))<cr> nnoremap <buffer> <silent> a :let g:netrw_list_showall=1<bar>exe "norm! 0"<bar>call <SID>NetBrowse(<SID>NetBrowseChgDir(expand("%"),'./'))<cr> - nnoremap <buffer> <silent> h :call <SID>NetHideEdit()<cr> - nnoremap <buffer> <silent> o :exe g:netrw_winsize."wincmd s"<bar>exe "norm! 0"<bar>call <SID>NetBrowse(<SID>NetBrowseChgDir(expand("%"),expand("<cWORD>")))<cr> - nnoremap <buffer> <silent> r :let g:netrw_sort_direction= (g:netrw_sort_direction =~ 'n')? 'r' : 'n'<bar>exe "norm! 0"<bar>call <SID>NetBrowse(<SID>NetBrowseChgDir(expand("%"),expand("<cWORD>")))<cr> + nnoremap <buffer> <silent> <Leader>H :call <SID>NetHideEdit(0)<cr> + nnoremap <buffer> <silent> i :call <SID>NetLongList(0)<cr> + nnoremap <buffer> <silent> o :exe g:netrw_winsize."wincmd s"<bar>exe "norm! 0"<bar>call <SID>NetBrowse(<SID>NetBrowseChgDir(expand("%"),<SID>NetGetDir()))<cr> + nnoremap <buffer> <silent> r :let g:netrw_sort_direction= (g:netrw_sort_direction =~ 'n')? 'r' : 'n'<bar>exe "norm! 0"<bar>call <SID>NetBrowse(<SID>NetBrowseChgDir(expand("%"),<SID>NetGetDir()))<cr> nnoremap <buffer> <silent> s :let g:netrw_sort_by= (g:netrw_sort_by =~ 'n')? 'time' : (g:netrw_sort_by =~ 't')? 'size' : 'name'<bar>exe "norm! 0"<bar>call <SID>NetBrowse(<SID>NetBrowseChgDir(expand("%"),'./'))<cr> - nnoremap <buffer> <silent> v :exe g:netrw_winsize."wincmd v"<bar>exe "norm! 0"<bar>call <SID>NetBrowse(<SID>NetBrowseChgDir(expand("%"),expand("<cWORD>")))<cr> - nnoremap <buffer> <silent> x :exe "norm! 0"<bar>call <SID>NetBrowseX(<SID>NetBrowseChgDir(expand("%"),expand("<cWORD>")))<cr> - nnoremap <buffer> <silent> <2-leftmouse> :exe "norm! 0"<bar>call <SID>NetBrowse(<SID>NetBrowseChgDir(expand("%"),expand("<cWORD>")))<cr> + nnoremap <buffer> <silent> v :exe g:netrw_winsize."wincmd v"<bar>exe "norm! 0"<bar>call <SID>NetBrowse(<SID>NetBrowseChgDir(expand("%"),<SID>NetGetDir()))<cr> + nnoremap <buffer> <silent> x :exe "norm! 0"<bar>call <SID>NetBrowseX(<SID>NetBrowseChgDir(expand("%"),<SID>NetGetDir()),1)<cr> + nnoremap <buffer> <silent> <2-leftmouse> :exe "norm! 0"<bar>call <SID>NetBrowse(<SID>NetBrowseChgDir(expand("%"),<SID>NetGetDir()))<cr> exe 'nnoremap <buffer> <silent> <del> :exe "norm! 0"<bar>call <SID>NetBrowseRm("'.user.machine.'","'.path.'")<cr>' exe 'vnoremap <buffer> <silent> <del> :call <SID>NetBrowseRm("'.user.machine.'","'.path.'")<cr>' exe 'nnoremap <buffer> <silent> D :exe "norm! 0"<bar>call <SID>NetBrowseRm("'.user.machine.'","'.path.'")<cr>' exe 'vnoremap <buffer> <silent> D :call <SID>NetBrowseRm("'.user.machine.'","'.path.'")<cr>' exe 'nnoremap <buffer> <silent> R :exe "norm! 0"<bar>call <SID>NetBrowseRename("'.user.machine.'","'.path.'")<cr>' - nnoremap <buffer> ? :he netrw-dir<cr> + exe 'nnoremap <buffer> <silent> <Leader>M :call <SID>NetMakeDir("'.user.machine.'")<cr>' + nnoremap <buffer> ? :he netrw-browse-cmds<cr> setlocal ma " Set up the banner @@ -1069,7 +1109,7 @@ fun! <SID>NetBrowse(dirname) keepjumps 1d " manipulate the directory listing (hide, sort) - set ft=netrwlist + setlocal ft=netrwlist if line("$") >= g:netrw_bannercnt if !exists("g:netrw_list_showall") if g:netrw_list_hide != "" @@ -1078,6 +1118,13 @@ fun! <SID>NetBrowse(dirname) else unlet g:netrw_list_showall endif + if g:netrw_longlist + " do a long listing; these substitutions need to be done prior to sorting + keepjumps silent /^total\s*\d\+$/d + exe 'keepjumps silent '.g:netrw_bannercnt.',$s/ -> .*$//e' + exe 'keepjumps silent '.g:netrw_bannercnt.',$s/\(\S\+\s\+\S\+\s\+\S\+\s\+\S\+\s\+\S\+\s\+\S\+\s\+\S\+\s\+\S\+\)\s\+\(\S\+\)$/\2\t\1/e' + exe g:netrw_bannercnt + endif if g:netrw_sort_by =~ "^n" call s:SetSort() exe 'keepjumps silent '.g:netrw_bannercnt.',$call s:NetSort()' @@ -1111,7 +1158,7 @@ fun! <SID>NetBrowseChgDir(dirname,newdir) elseif newdir == './' " refresh the directory list " call Decho("refresh directory listing") - set ma + setlocal ma %d elseif newdir == '../' @@ -1139,6 +1186,18 @@ fun! <SID>NetBrowseChgDir(dirname,newdir) endfun " --------------------------------------------------------------------- +" NetGetDir: it gets the directory named under the cursor +fun! <SID>NetGetDir() +" call Dfunc("NetGetDir()") + let dirname= getline(".") + if dirname =~ '\t' + let dirname= substitute(dirname,'\t.*$','','e') + endif +" call Dret("NetGetDir <".dirname.">") + return dirname +endfun + +" --------------------------------------------------------------------- " NetBrowseRm: remove a remote file or directory {{{2 fun! <SID>NetBrowseRm(usrhost,path) range " call Dfunc("NetBrowseRm(usrhost<".a:usrhost."> path<".a:path.">)") @@ -1215,7 +1274,7 @@ fun! <SID>NetBrowseRename(usrhost,path) " attempt to rename files/directories while ctr <= a:lastline - exe ctr + exe "keepjumps ".ctr norm! 0 let oldname= a:path.expand("<cWORD>") @@ -1234,21 +1293,52 @@ fun! <SID>NetBrowseRename(usrhost,path) " refresh the directory let curline= line(".") call <SID>NetBrowse(<SID>NetBrowseChgDir(expand("%"),'./')) - exe curline + exe "keepjumps ".curline " call Dret("NetBrowseRename") endfun " --------------------------------------------------------------------- " NetBrowseX: allows users to write custom functions to operate on {{{2 -" files given their extension -fun! <SID>NetBrowseX(fname) -" call Dfunc("NetBrowseX(".a:fname.")") +" files given their extension. Passes 0=local, 1=remote +fun! <SID>NetBrowseX(fname,remote) +" call Dfunc("NetBrowseX(".a:fname." remote=".a:remote.")") let exten= substitute(a:fname,'.*\.\(.\{-}\)','\1','e') " call Decho("exten<".exten."> "."NetrwFileHandler_".exten."():exists=".exists("*NetrwFileHandler_".exten)) if exten != "" && exists("*NetrwFileHandler_".exten) - exe "call NetrwFileHandler_".exten.'("'.a:fname.'")' + + let fname= a:fname + if a:remote == 1 + " create a local copy + let fname= tempname().".".exten +" call Decho("create a local copy of <".a:fname."> as <".fname.">") + exe "keepjumps silent bot 1new ".a:fname + let eikeep= &ei + set ei=all bh=delete + exe "w! ".fname + let &ei= eikeep + q + endif + + exe "let ret= NetrwFileHandler_".exten.'("'.fname.'")' + redraw! + + " 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 delete(fname) + endif + if ret != 0 + let eikeep= &ei + set ei=all bh=delete bt=nofile + exe "norm! \<c-o>" + let &ei= eikeep + redraw! + endif endif + " call Dret("NetBrowseX") endfun @@ -1276,8 +1366,8 @@ endfun " --------------------------------------------------------------------- " NetHideEdit: allows user to edit the file/directory hiding list -fun! <SID>NetHideEdit() -" call Dfunc("NetHideEdit()") +fun! <SID>NetHideEdit(mode) +" call Dfunc("NetHideEdit(mode=".a:mode.")") call inputsave() let newhide= input("Edit Hiding List: ",g:netrw_list_hide) @@ -1285,12 +1375,427 @@ fun! <SID>NetHideEdit() " refresh the listing let g:netrw_list_hide= newhide - silent call s:NetBrowse(s:NetBrowseChgDir(expand("%"),'./')) + if a:mode == 0 + silent call s:NetBrowse(s:NetBrowseChgDir(expand("%"),'./')) + else + silent call s:LocalBrowse(s:NetBrowseChgDir(expand("%"),'./')) + endif " call Dret("NetHideEdit") endfun -" ------------------------------------------------------------------------ +" --------------------------------------------------------------------- +" NetLongList: {{{2 +fun! <SID>NetLongList(mode) +" call Dfunc("NetLongList(mode=".a:mode.") netrw_longlist=".g:netrw_longlist) + + if g:netrw_longlist != 0 + " turn long listing off + let g:netrw_longlist = 0 + let g:netrw_list_cmd = substitute(g:netrw_list_cmd,' -l','','ge') + + else + " turn long listing on + let g:netrw_longlist = 1 + let g:netrw_list_cmd = g:netrw_list_cmd." -l" + endif + + " refresh the listing + if a:mode == 0 + silent call <SID>NetBrowse(<SID>NetBrowseChgDir(expand("%"),"./")) + else + silent call <SID>LocalBrowse(<SID>LocalBrowseChgDir(expand("%"),"./")) + endif + +" call Dret("NetLongList : g:netrw_longlist=".g:netrw_longlist) +endfun + +" --------------------------------------------------------------------- +" NetMakeDir: this function makes a directory (both local and remote) +fun! <SID>NetMakeDir(usrhost) +" call Dfunc("NetMakeDir(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() + + if newdirname == "" +" call Dret("NetMakeDir : user aborted with bare <cr>") + return + endif + + if a:usrhost == "" + + " Local mkdir: + " sanity checks + if isdirectory(newdirname) + echoerr "***warning*** <".newdirname."> is already a directory!" +" call Dret("NetMakeDir : directory<".newdirname."> exists previously") + return + endif + if filereadable(newdirname) + echoerr "***warning*** <".newdirname."> is already a file!" +" call Dret("NetMakeDir : file<".newdirname."> exists previously") + return + endif + exe "silent! !".g:netrw_local_mkdir." ".newdirname + if v:shell_error == 0 + " refresh listing + call s:LocalBrowse(".") + else + echoerr "***warning*** unable to make directory<".newdirname.">" + endif + redraw! + + else + " Remote mkdir: + let mkdircmd = substitute(g:netrw_mkdir_cmd,'\<HOSTNAME\>',a:usrhost,'') + let newdirname= substitute(expand("%"),'^\%(.\{-}/\)\{3}\(.*\)$','\1','').newdirname +" call Decho("exe silent! !".mkdircmd." ".newdirname) + exe "silent! !".mkdircmd." ".newdirname + if v:shell_error == 0 + " refresh listing + call s:NetBrowse(s:NetBrowseChgDir(expand("%"),'./')) + else + echoerr "***warning*** unable to make directory<".newdirname.">" + endif + redraw! + endif + +" call Dret("NetMakeDir") +endfun + +" --------------------------------------------------------------------- +" Browsing Support For Local Directories And Files: {{{1 + +" --------------------------------------------------------------------- +" LocalBrowse: supports local file/directory browsing {{{2 +fun! <SID>LocalBrowse(dirname) + +" let dirname= (a:dirname == "")? expand("%:p") : a:dirname + if !isdirectory(a:dirname) + " not a directory, ignore it + return + endif + +" " unfortunate interaction -- when putting Dfunc/Dret above + " one can no longer enter the DBG buffer. +" call Dfunc("LocalBrowse(dirname<".a:dirname.">)") + + exe 'cd '.escape(a:dirname,' ') + let dirname= getcwd()."/" +" call Decho("dirname<".dirname.">") + + " make this buffer modifiable + setlocal ma + + " --------------------------------------------------------------------- + " Perform Directory Listing: +" call Decho("Perform directory listing...") + " set up new buffer and map + let dirnamenr = bufnr(dirname) + if dirnamenr != -1 && bufname(dirnamenr) != dirname + " try removing the trailing "/" + let dirnamenr= bufnr(substitute(dirname,'/$','','e')) + endif +" call Decho("bufnr(dirname<".dirname.">)=".dirnamenr) + + if dirnamenr != -1 && bufexists(dirname) + " buffer already exists (hidden), so switch to it! + exe "b ".dirnamenr + exe 'cd '.escape(dirname,' ') +" call Decho("changed directory to<".dirname.">") + if a:dirname != "." && line("$") >= 5 +" call Dret("LocalBrowse : buffer already exists with info") + return + endif +" call Decho("buffer already exists, but needs listing (buf#".dirnamenr.")") + keepjumps %d + else +" call Dredir("ls!") +" call Decho("generate new buffer named<".dirname.">") + silent! enew! + exe 'silent! file '.escape(dirname,' ') + endif + " set standard browser options on buffer + setlocal ts=32 bt=nowrite bh=hide nobl + + " set up all the maps + nnoremap <buffer> <silent> <cr> :exe "norm! 0"<bar>call <SID>LocalBrowse(<SID>LocalBrowseChgDir(expand("%:p"),<SID>NetGetDir()))<cr> + nnoremap <buffer> <silent> <c-l> :exe "norm! 0"<bar>call <SID>LocalBrowse(<SID>LocalBrowseChgDir(expand("%:p"),'./'))<cr> + nnoremap <buffer> <silent> - :exe "norm! 0"<bar>call <SID>LocalBrowse(<SID>LocalBrowseChgDir(expand("%:p"),'../'))<cr> + nnoremap <buffer> <silent> a :let g:netrw_list_showall=1<bar>exe "norm! 0"<bar>call <SID>LocalBrowse(<SID>LocalBrowseChgDir(expand("%:p"),'./'))<cr> + nnoremap <buffer> <silent> <Leader>H :call <SID>NetHideEdit(1)<cr> + nnoremap <buffer> <silent> <Leader>M :call <SID>NetMakeDir("")<cr> + nnoremap <buffer> <silent> i :call <SID>NetLongList(1)<cr> + nnoremap <buffer> <silent> o :exe g:netrw_winsize."wincmd s"<bar>exe "norm! 0"<bar>call <SID>LocalBrowse(<SID>LocalBrowseChgDir(expand("%:p"),<SID>NetGetDir()))<cr> + nnoremap <buffer> <silent> r :let g:netrw_sort_direction= (g:netrw_sort_direction =~ 'n')? 'r' : 'n'<bar>exe "norm! 0"<bar>call <SID>LocalBrowse(<SID>LocalBrowseChgDir(expand("%:p"),<SID>NetGetDir()))<cr> + nnoremap <buffer> <silent> s :let g:netrw_sort_by= (g:netrw_sort_by =~ 'n')? 'time' : (g:netrw_sort_by =~ 't')? 'size' : 'name'<bar>exe "norm! 0"<bar>call <SID>LocalBrowse(<SID>LocalBrowseChgDir(expand("%:p"),'./'))<cr> + nnoremap <buffer> <silent> v :exe g:netrw_winsize."wincmd v"<bar>exe "norm! 0"<bar>call <SID>LocalBrowse(<SID>LocalBrowseChgDir(expand("%:p"),<SID>NetGetDir()))<cr> + nnoremap <buffer> <silent> x :exe "norm! 0"<bar>call <SID>NetBrowseX(<SID>LocalBrowseChgDir(expand("%:p"),<SID>NetGetDir()),0)<cr> + nnoremap <buffer> <silent> <2-leftmouse> :exe "norm! 0"<bar>call <SID>LocalBrowse(<SID>LocalBrowseChgDir(expand("%:p"),<SID>NetGetDir()))<cr> + exe 'nnoremap <buffer> <silent> <del> :exe "norm! 0"<bar>call <SID>LocalBrowseRm("'.expand("%:p").<SID>NetGetDir().'")<cr>' + exe 'vnoremap <buffer> <silent> <del> :call <SID>LocalBrowseRm("'.expand("%:p").<SID>NetGetDir().'")<cr>' + exe 'nnoremap <buffer> <silent> D :exe "norm! 0"<bar>call <SID>LocalBrowseRm("'.expand("%:p").<SID>NetGetDir().'")<cr>' + exe 'vnoremap <buffer> <silent> D :call <SID>LocalBrowseRm("'.expand("%:p").<SID>NetGetDir().'")<cr>' + exe 'nnoremap <buffer> <silent> R :exe "norm! 0"<bar>call <SID>LocalBrowseRename("'.expand("%:p").<SID>NetGetDir().'")<cr>' + nnoremap <buffer> ? :he netrw-dir<cr> + + " Set up the banner + keepjumps put ='\" =================' + keepjumps 1d + keepjumps put ='\" Directory Listing' + keepjumps put ='\" '.dirname + let g:netrw_bannercnt= 6 + if g:netrw_sort_by =~ "^n" + " sorted by name + let g:netrw_bannercnt= g:netrw_bannercnt + 1 + keepjumps put ='\" Sorted by '.g:netrw_sort_by + keepjumps put ='\" Sort sequence: '.g:netrw_sort_sequence + else + " sorted by size or date + keepjumps put ='\" Sorted by '.g:netrw_sort_by + endif + if g:netrw_list_hide != "" && !exists("g:netrw_list_showall") + keepjumps put ='\" Hiding: '.g:netrw_list_hide + let g:netrw_bannercnt= g:netrw_bannercnt + 1 + endif + keepjumps put ='\" =================' + + " generate the requested directory listing + call LocalBrowseList(dirname) + + " manipulate the directory listing (hide, sort) + setlocal ft=netrwlist + if line("$") >= g:netrw_bannercnt + if !exists("g:netrw_list_showall") + if g:netrw_list_hide != "" + call s:NetrwListHide() + endif + else + unlet g:netrw_list_showall + endif + if g:netrw_sort_by =~ "^n" + call s:SetSort() + exe 'keepjumps silent '.g:netrw_bannercnt.',$call s:NetSort()' + exe 'keepjumps silent '.g:netrw_bannercnt.',$s/^\d\{3}\///e' + else + exe 'keepjumps silent '.g:netrw_bannercnt.',$call s:NetSort()' + exe 'keepjumps silent '.g:netrw_bannercnt.',$s/^\d\{-}\///e' + endif + endif + exe g:netrw_bannercnt + try + exe 'cd '.escape(substitute(dirname,'/$','','e'),' ') +" call Decho("changed directory to<".dirname.">") + catch + echoerr "Not a directory: <".dirname.">" + endtry + + setlocal noma nomod + +" call Dret("LocalBrowse") +endfun + +" --------------------------------------------------------------------- +" LocalBrowseList: does the job of "ls" for local directories {{{2 +fun! LocalBrowseList(dirname) +" call Dfunc("LocalBrowseList(dirname<".a:dirname.">)") + + let dirnamelen = strlen(a:dirname) + let filelist = glob(a:dirname."*")."\n".glob(a:dirname.".*") +" call Decho("filelist<".filelist.">") + + while filelist != "" + if filelist =~ '\n' + let file = substitute(filelist,'\n.*$','','e') + let filelist = substitute(filelist,'^.\{-}\n\(.*\)$','\1','e') + else + let file = filelist + let filelist= "" + endif + let pfile= file + if isdirectory(file) + let pfile= file."/" + endif + let pfile= strpart(pfile,dirnamelen) + if g:netrw_longlist + let pfile= pfile."\t".getfsize(file)."\t".strftime(g:netrw_timefmt,getftime(file)) + endif + if g:netrw_sort_by =~ "^t" + " sort by time (handles time up to 1 quintillion seconds, US) +" call Decho("getftime(".file.")=".getftime(file)) + let t = getftime(file) + let ft = strpart("000000000000000000",1,18-strlen(t)).t +" call Decho("exe keepjumps put ='".ft.'/'.file."'") + exe "keepjumps put ='".ft.'/'.pfile."'" + elseif g:netrw_sort_by =~ "^s" + " sort by size (handles file sizes up to 1 quintillion bytes, US) +" call Decho("getfsize(".file.")=".getfsize(file)) + let sz = getfsize(file) + let fsz = strpart("000000000000000000",1,18-strlen(sz)).sz +" call Decho("exe keepjumps put ='".fsz.'/'.file."'") + exe "keepjumps put ='".fsz.'/'.pfile."'" + else + " sort by name +" call Decho("exe keepjumps put ='".file."'") + exe "keepjumps put ='".pfile."'" + endif + endwhile + +" call Dret("LocalBrowseList") +endfun + +" --------------------------------------------------------------------- +" LocalBrowseChgDir: constructs a new directory based on the current {{{2 +" directory and a new directory name +fun! <SID>LocalBrowseChgDir(dirname,newdir) +" call Dfunc("LocalBrowseChgDir(dirname<".a:dirname."> newdir<".a:newdir.">)") + + let dirname= a:dirname + let newdir = a:newdir + + if dirname !~ '/$' + " apparently vim is "recognizing" that it is in the home directory and + " is removing the "/". Bad idea, so I have to put it back. + let dirname= dirname.'/' +" call Decho("adjusting dirname<".dirname.">") + endif + + if newdir !~ '/$' + " handling a file + let dirname= dirname.newdir +" call Decho("handling a file: dirname<".dirname.">") + exe "e ".dirname + + elseif newdir == './' + " refresh the directory list +" call Decho("refresh directory listing") + setlocal ma + %d + + elseif newdir == '../' + " go up one directory + let dirname= substitute(dirname,'^\(.*/\)\([^/]\+/$\)','\1','e') +" call Decho("go up one dir: dirname<".dirname.">") + + else + " go down one directory + let dirname= dirname.newdir +" call Decho("go down one dir: dirname<".dirname."> newdir<".newdir.">") + endif + +" call Dret("LocalBrowseChgDir <".dirname.">") + return dirname +endfun + +" --------------------------------------------------------------------- +" LocalBrowseRm: +fun! <SID>LocalBrowseRm(path) range +" call Dfunc("LocalBrowseRm(path<".a:path.">)") +" call Decho("firstline=".a:firstline." lastline=".a:lastline) + + " preparation for removing multiple files/directories + let ctr= a:firstline + + " remove multiple files and directories + while ctr <= a:lastline + exe ctr + + norm! 0 + let rmfile= a:path.expand("<cWORD>") +" call Decho("rmfile<".rmfile.">") + + if rmfile !~ '^"' && (rmfile =~ '@$' || rmfile !~ '/$') + " attempt to remove file + call inputsave() + let ok= input("Confirm deletion of file<".rmfile."> ","y") + call inputrestore() + if ok == "y" + call delete(rmfile) +" call Decho("errcode=".v:shell_error) + endif + + else + " attempt to remove directory + call inputsave() + let ok= input("Confirm deletion of directory<".rmfile."> ","y") + call inputrestore() + let rmfile= substitute(rmfile,'/$','','e') + + if ok == "y" + call system(g:netrw_local_rmdir." ".rmfile) +" call Decho("v:shell_error=".v:shell_error) + + if v:shell_error != 0 +" call Decho("2nd attempt to remove directory<".rmfile.">") + let errcode= delete(rmfile) +" call Decho("errcode=".errcode) + + if errcode != 0 + if has("unix") +" call Decho("3rd attempt to remove directory<".rmfile.">") + call system("rm ".rmfile) + if v:shell_error != 0 + echoerr "unable to remove directory<".rmfile."> -- is it empty?" + endif + else + echoerr "unable to remove directory<".rmfile."> -- is it empty?" + endif + endif + endif + endif + endif + + let ctr= ctr + 1 + endwhile + + " refresh the directory + let curline= line(".")-1 +" call Decho("refresh the directory") + call <SID>LocalBrowse(<SID>LocalBrowseChgDir(expand("%"),'./')) + exe curline + +" call Dret("LocalBrowseRm") +endfun + +" --------------------------------------------------------------------- +" LocalBrowseRename: rename a remote file or directory {{{2 +fun! <SID>LocalBrowseRename(path) +" call Dfunc("LocalBrowseRename(path<".a:path.">)") + + " preparation for removing multiple files/directories + let ctr= a:firstline + + " attempt to rename files/directories + while ctr <= a:lastline + exe "keepjumps ".ctr + + norm! 0 + let oldname= a:path.expand("<cWORD>") +" call Decho("oldname<".oldname.">") + + call inputsave() + let newname= input("Moving ".oldname." to : ",oldname) + call inputrestore() + + let ret= system(g:netrw_local_rename." ".oldname." ".newname) +" call Decho("executing system(".g:netrw_local_rename." ".oldname." ".newname) + + let ctr= ctr + 1 + endwhile + + " refresh the directory + let curline= line(".") + call <SID>LocalBrowse(<SID>LocalBrowseChgDir(expand("%"),'./')) + exe "keepjumps ".curline +" call Dret("LocalBrowseRename") +endfun + +" --------------------------------------------------------------------- " NetMethod: determine method of transfer {{{1 " method == 1: rcp " 2: ftp + <.netrc> @@ -1531,14 +2036,14 @@ fun!s:NetOptionSave() let s:dirkeep = getcwd() let s:gdkeep = &gd let s:twkeep = &tw - set cino = - set com = - set cpo -=aA - set nocin noai - set tw =0 + setlocal cino = + setlocal com = + setlocal cpo -=aA + setlocal nocin noai + setlocal tw =0 if has("win32") && !has("win95") let s:swfkeep= &swf - set noswf + setlocal noswf " call Decho("setting s:swfkeep to <".&swf.">") endif @@ -1595,6 +2100,8 @@ endif " --------------------------------------------------------------------- " NetSort: Piet Delport's BISort2() function, modified to take a range {{{1 fun! <SID>NetSort() range +" call Dfunc("NetSort()") + let i = a:firstline + 1 while i <= a:lastline " find insertion point via binary search @@ -1629,13 +2136,29 @@ fun! <SID>NetSort() range endif let i = i + 1 endwhile + +" call Dret("NetSort") endfun " --------------------------------------------------------------------- -" SetSort: sets up the sort based on the g:netrw_sort_sequence +" SetSort: sets up the sort based on the g:netrw_sort_sequence {{{1 +" 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! <SID>SetSort() " call Dfunc("SetSort() bannercnt=".g:netrw_bannercnt) - let seqlist = g:netrw_sort_sequence + if g:netrw_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 =~ ',' |