vim: runtime/autoload/netrw.vim comparison

comparison runtime/autoload/netrw.vim @ 523:a7ae7e043e43

updated for version 7.0146

author	vimboss
date	Tue, 13 Sep 2005 21:20:47 +0000
parents	d50452846776
children	7052f11a3dc9

comparison

equal deleted inserted replaced

-:530b30703db6
+:a7ae7e043e43
 " netrw.vim: Handles file transfer and remote directory listing across a network
 "            AUTOLOAD PORTION
-" Date:		Sep 09, 2005
+" Date:		Sep 12, 2005
-" Version:	69
+" Version:	70
 " Maintainer:	Charles E Campbell, Jr <drchipNOSPAM at campbellfamily dot biz>
 " GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim
 " Copyright:    Copyright (C) 1999-2005 Charles E. Campbell, Jr. {{{1
 "               Permission is hereby granted to use and distribute this code,
 "               with or without modifications, provided that this copyright
 endif
 if v:version < 700
 echohl WarningMsg | echo "***netrw*** you need vim version 7.0 or later for version ".g:loaded_netrw." of netrw" | echohl None
 finish
 endif
-let g:loaded_netrw = "v69"
+let g:loaded_netrw = "v70"
 let s:keepcpo      = &cpo
 set cpo&vim
 " call Decho("doing autoload/netrw.vim")
 " ---------------------------------------------------------------------
 silent call netrw#NetRead(method."://".user.machine."/".path)
 exe "silent doau BufReadPost ".fname
 keepjumps 1d
 " save certain window-oriented variables into buffer-oriented variables
-call s:BufWinVars()
+call s:SetBufWinVars()
 call s:NetOptionRestore()
 setlocal nomod
 "   call Dret("NetBrowse : file<".fname.">")
 return
 endfun
 " ---------------------------------------------------------------------
 " NetObtain: obtain file under cursor (for remote browsing support) {{{2
 fun! s:NetObtain()
-if !exists("s:netrw_users_stl")
-let s:netrw_users_stl= &stl
-endif
 let fname= expand("<cWORD>")
-exe 'set stl=%f\ %h%m%r%=Obtaining\ '.escape(fname,' ')
-redraw!
+" NetrwStatusLine support - for obtaining support
+call s:SetupNetrwStatusLine('%f %h%m%r%=%9*Obtaining '.fname)
 "  call Dfunc("NetObtain() method=".w:netrw_method)
 if exists("w:netrw_method") && w:netrw_method =~ '[235]'
 if executable("ftp")
 let curdir = expand("%")
 else
 if !exists("g:netrw_quiet")
 echohl Error | echo "***netrw*** this system doesn't support ftp" | echohl None
 call inputsave()|call input("Press <cr> to continue")|call inputrestore()
 endif
+let &stl        = s:netrw_users_stl
+let &laststatus = s:netrw_users_ls
 "    call Dret("NetObtain")
 return
 endif
 ".........................................
 exe g:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".g:netrw_machine.":".escape(fname,' ?&')." ."
 endif
 endif
 " restore status line
-let &stl= s:netrw_users_stl
+let &stl        = s:netrw_users_stl
+let &laststatus = s:netrw_users_ls
 redraw!
 "  call Dret("NetObtain")
 endfun
 " record previous current directory
 let w:netrw_prvdir= b:netrw_curdir
 " save certain window-oriented variables into buffer-oriented variables
-call s:BufWinVars()
+call s:SetBufWinVars()
 call s:NetOptionRestore()
 setlocal noma nomod nonu bh=hide nobl
 "  call Dret("DirBrowse : file<".expand("%:p")."> bufname<".bufname("%").">")
 endfun
 "      call Dret("Explore")
 return
 endif
 endif
-" NetrwStatusLine support
+" NetrwStatusLine support - for exploring support
 let w:netrw_explore_indx= indx
-if !exists("s:netrw_users_stl")
-let s:netrw_users_stl= &stl
-endif
-set stl=%f\ %h%m%r%=%{NetrwStatusLine()}
 "    call Decho("explorelist<".join(w:netrw_explore_list,',')."> len=".w:netrw_explore_listlen)
 " sanity check
 if indx >= w:netrw_explore_listlen || indx < 0
 let indx= (indx < 0)? 0 : ( w:netrw_explore_listlen - 1 )
 "     call Dret("Explore")
 return
 endif
 exe "let dirfile= w:netrw_explore_list[".indx."]"
-"    call Decho("dirfile<".dirfile."> indx=".indx)
+"    call Decho("dirfile=w:netrw_explore_list[indx=".indx."]= <".dirfile.">")
 let newdir= substitute(dirfile,'/[^/]*$','','e')
 "    call Decho("newdir<".newdir.">")
 "    call Decho("calling LocalBrowse(newdir<".newdir.">)")
 call s:LocalBrowse(newdir)
-call search(substitute(dirfile,"^.*/","",""),"W")
+if w:netrw_longlist == 0 || w:netrw_longlist == 1
+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
 if !exists("g:netrw_quiet")
 echohl WarningMsg | echo "***netrw*** your vim needs the +path_extra feature for Exploring with **!" | echohl None | echohl None
 "  call Dret("Explore")
 endfun
 " ---------------------------------------------------------------------
+" 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
+set laststatus=2
+"  call Decho("stl=".&stl)
+redraw!
+"  call Dret("SetupNetrwStatusLine : stl=".&stl)
+endfun
+" ---------------------------------------------------------------------
 " NetrwStatusLine: {{{2
 fun! NetrwStatusLine()
-"  let g:stlmsg= "Xbufnr=".w:netrw_explore_bufnr." bufnr=".bufnr(".")." Xline#".w:netrw_explore_line." line#".line(".")
+" 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 &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
 if exists("s:explore_list")   |let w:netrw_explore_list    = s:explore_list   |unlet s:explore_list   |endif
 "  call Dret("CopyWinVars")
 endfun
 " ---------------------------------------------------------------------
-" BufWinVars: (used by NetBrowse() and LocalBrowse()) {{{1
+" SetBufWinVars: (used by NetBrowse() and LocalBrowse()) {{{1
 "   To allow separate windows to have their own activities, such as
 "   Explore **/pattern, several variables have been made window-oriented.
 "   However, when the user splits a browser window (ex: ctrl-w s), these
-"   variables are not inherited by the new window.  BufWinVars() and
+"   variables are not inherited by the new window.  SetBufWinVars() and
 "   UseBufWinVars() get around that.
-fun! s:BufWinVars()
+fun! s:SetBufWinVars()
-"  call Dfunc("BufWinVars()")
+"  call Dfunc("SetBufWinVars()")
 if exists("w:netrw_longlist")       |let b:netrw_longlist        = w:netrw_longlist       |endif
 if exists("w:netrw_bannercnt")      |let b:netrw_bannercnt       = w:netrw_bannercnt      |endif
 if exists("w:netrw_method")         |let b:netrw_method          = w:netrw_method         |endif
 if exists("w:netrw_prvdir")         |let b:netrw_prvdir          = w:netrw_prvdir         |endif
 if exists("w:netrw_explore_indx")   |let b:netrw_explore_indx    = w:netrw_explore_indx   |endif
 if exists("w:netrw_explore_listlen")|let b:netrw_explore_listlen = w:netrw_explore_listlen|endif
 if exists("w:netrw_explore_mtchcnt")|let b:netrw_explore_mtchcnt = w:netrw_explore_mtchcnt|endif
 if exists("w:netrw_explore_bufnr")  |let b:netrw_explore_bufnr   = w:netrw_explore_bufnr  |endif
 if exists("w:netrw_explore_line")   |let b:netrw_explore_line    = w:netrw_explore_line   |endif
 if exists("w:netrw_explore_list")   |let b:netrw_explore_list    = w:netrw_explore_list   |endif
-"  call Dret("BufWinVars")
+"  call Dret("SetBufWinVars")
 endfun
 " ---------------------------------------------------------------------
 " UseBufWinVars: (used by NetBrowse() and LocalBrowse() {{{1
 "              Matching function to BufferWinVars()

Mercurial > vim

comparison runtime/autoload/netrw.vim @ 523:a7ae7e043e43