[SCM] Vim packaging branch, deb/runtime, updated. upstream/7.1.285-101-g0776628

[James Vega]

The following commit has been merged in the deb/runtime branch:
commit 7452b777a8441ca6a84261526f3b3ac60e63a607
Author: James Vega <jamessan at debian.org>
Date:   Mon Jun 16 14:26:25 2008 -0400

    Fix merge of netrw plugin from upstream-runtime.
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/runtime/autoload/netrw.vim b/runtime/autoload/netrw.vim
index df7ccdf..6064a65 100644
--- a/runtime/autoload/netrw.vim
+++ b/runtime/autoload/netrw.vim
@@ -4376,15 +4376,6 @@ fun! s:NetrwMarkFileRegexp(islocal)
    let @a  = areg
    let &ei = eikeep
   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
 
 "  call Dret("s:NetrwMarkFileRegexp")
 endfun
@@ -4846,9 +4837,6 @@ fun! netrw#NetrwObtain(islocal,fname,...)
      put ='user \"'.g:netrw_uid.'\" \"'.s:netrw_passwd.'\"'
 "     call Decho("filter input: ".getline('$'))
     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)
 
     if exists("g:netrw_ftpmode") && g:netrw_ftpmode != ""
      put =g:netrw_ftpmode
@@ -5548,36 +5536,16 @@ fun! s:NetrwTreeDisplay(dir,depth)
    endif
    call setline(line("$")+1,a:depth.shortdir)
   else
-"   call Decho("2match none")
-   2match none
+   let shortdir= substitute(a:dir,'^.*/','','e')
+   call setline(line("$")+1,a:depth.shortdir.'/')
   endif
+"  call Decho("setline#".line("$")." shortdir<".a:depth.shortdir.">")
 
-"  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()
+  " append a / to dir if its missing one
+  let dir= a:dir
+  if dir !~ '/$'
+   let dir= dir.'/'
   endif
-"  call Dret("s:NetrwRefreshDir")
-endfun
 
   " display subtrees (if any)
   let depth= "| ".a:depth
@@ -5593,8 +5561,8 @@ endfun
 "    call Decho("<".direntry."/> is a key in treedict - display subtree for it")
     call s:NetrwTreeDisplay(direntry.'/',depth)
    else
-    let seq     = seqlist
-    let seqlist = ""
+"    call Decho("<".entry."> is not a key in treedict (no subtree)")
+    call setline(line("$")+1,depth.entry)
    endif
   endfor
 "  call Dret("NetrwTreeDisplay")
@@ -5617,13 +5585,10 @@ fun! s:NetrwTreeListing(dirname)
     let w:netrw_treetop= a:dirname
 "    call Decho("w:netrw_treetop<".w:netrw_treetop."> (went up)")
    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
+   " 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
@@ -5638,10 +5603,7 @@ fun! s:NetrwTreeListing(dirname)
    if exists("w:netrw_bannercnt") && line(".") > w:netrw_bannercnt
     let fname= expand("<cword>")
    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'
+    let fname= ""
    endif
 "   call Decho("fname<".fname.">")
 
@@ -5861,12 +5823,6 @@ fun! s:PerformListing(islocal)
 "    call Decho('reverse the sorted listing')
     exe 'silent keepjumps '.w:netrw_bannercnt.'g/^/m '.w:netrw_bannercnt
    endif
-"   call Decho("fname<".fname.">")
-
-   " display from treetop on down
-   call s:NetrwTreeDisplay(w:netrw_treetop,"")
-
-"   call Dret("NetrwTreeListing : bufname<".expand("%").">")
   endif
 
   " convert to wide/tree listing {{{3
@@ -6102,21 +6058,6 @@ fun! s:NetrwRemoteListing()
     exe 'silent keepjumps '.w:netrw_bannercnt.',$s/^\(\%(\S\+\s\+\)\{7}\S\+\)\s\+\(\S.*\)$/\2\t\1/e'
     exe 'silent keepjumps '.w:netrw_bannercnt
    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
 
 "  if exists("w:netrw_bannercnt") && w:netrw_bannercnt <= line("$") " Decho
@@ -6629,7 +6570,6 @@ fun! s:LocalListing()
     let pfile= pfile."\t".fsz." ".strftime(g:netrw_timefmt,getftime(filename))
 "    call Decho("sz=".sz." fsz=".fsz)
    endif
-  endwhile
 
    if     g:netrw_sort_by =~ "^t"
     " sort by time (handles time up to 1 quintillion seconds, US)

-- 
Vim packaging