diff options
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/autoload/netrw.vim | 166 | ||||
| -rw-r--r-- | runtime/doc/change.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/mbyte.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/pi_netrw.txt | 62 | ||||
| -rw-r--r-- | runtime/doc/usr_toc.txt | 2 | ||||
| -rw-r--r-- | runtime/indent/xinetd.vim | 3 |
6 files changed, 157 insertions, 80 deletions
diff --git a/runtime/autoload/netrw.vim b/runtime/autoload/netrw.vim index 6e80a6926..b4753c27f 100644 --- a/runtime/autoload/netrw.vim +++ b/runtime/autoload/netrw.vim @@ -1,7 +1,7 @@ " netrw.vim: Handles file transfer and remote directory listing across " AUTOLOAD SECTION -" Date: Mar 21, 2007 -" Version: 108 +" Date: May 05, 2007 +" Version: 109 " Maintainer: Charles E Campbell, Jr <NdrOchip@ScampbellPfamily.AbizM-NOSPAM> " GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim " Copyright: Copyright (C) 1999-2007 Charles E. Campbell, Jr. {{{1 @@ -30,7 +30,7 @@ if !exists("s:NOTE") let s:WARNING = 1 let s:ERROR = 2 endif -let g:loaded_netrw = "v108" +let g:loaded_netrw = "v109" 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 @@ -224,6 +224,12 @@ endif if !exists("g:netrw_mkdir_cmd") let g:netrw_mkdir_cmd= g:netrw_ssh_cmd." USEPORT HOSTNAME mkdir" endif +if !exists("g:netrw_scpport") + let g:netrw_scpport= "-P" +endif +if !exists("g:netrw_sshport") + let g:netrw_sshport= "-p" +endif if !exists("g:netrw_rename_cmd") let g:netrw_rename_cmd= g:netrw_ssh_cmd." USEPORT HOSTNAME mv" endif @@ -287,6 +293,9 @@ endif if !exists("g:NetrwTopLvlMenu") let g:NetrwTopLvlMenu= "Netrw." endif +if !exists("g:netrw_use_errorwindow") + let g:netrw_use_errorwindow= 1 +endif if !exists("g:netrw_win95ftp") let g:netrw_win95ftp= 1 endif @@ -373,8 +382,9 @@ endfun " =============================== " NetOptionSave: save options and set to "standard" form {{{2 +"DechoTabOn fun! s:NetOptionSave() -" call Dfunc("s:NetOptionSave()") +" call Dfunc("s:NetOptionSave() win#".winnr()." buf#".bufnr(".")) if !exists("w:netrw_optionsave") let w:netrw_optionsave= 1 else @@ -413,12 +423,13 @@ fun! s:NetOptionSave() silent! let w:netrw_regslash= @/ " call Dret("s:NetOptionSave") +" call Dret("s:NetOptionSave : win#".winnr()." buf#".bufnr(".")) endfun " ------------------------------------------------------------------------ " NetOptionRestore: restore options {{{2 fun! s:NetOptionRestore() -" call Dfunc("s:NetOptionRestore()") +" call Dfunc("s:NetOptionRestore() win#".winnr()." buf#".bufnr(".")) if !exists("w:netrw_optionsave") " call Dret("s:NetOptionRestore : w:netrw_optionsave doesn't exist") return @@ -463,7 +474,7 @@ fun! s:NetOptionRestore() if exists("w:netrw_regstar") |silent! let @*= w:netrw_regstar |unlet w:netrw_regstar |endif if exists("w:netrw_regslash")|silent! let @/= w:netrw_regslash|unlet w:netrw_regslash|endif -" call Dret("s:NetOptionRestore : restored user options") +" call Dret("s:NetOptionRestore : win#".winnr()." buf#".bufnr(".")) endfun " --------------------------------------------------------------------- @@ -727,7 +738,7 @@ fun! netrw#NetRead(mode,...) elseif b:netrw_method == 4 " read with scp " call Decho("read via scp (method #4)") if exists("g:netrw_port") && g:netrw_port != "" - let useport= " -P ".g:netrw_port + let useport= " ".g:netrw_scpport." ".g:netrw_port else let useport= "" endif @@ -1088,7 +1099,7 @@ fun! netrw#NetWrite(...) range " call Decho("write via scp (method #4)") let netrw_fname= escape(b:netrw_fname,g:netrw_fname_escape) if exists("g:netrw_port") && g:netrw_port != "" - let useport= " -P ".g:netrw_port + let useport= " ".g:netrw_scpport." ".g:netrw_port else let useport= "" endif @@ -1661,7 +1672,7 @@ endfun " with the requested remote hostname first. fun! s:NetBrowse(islocal,dirname) if !exists("w:netrw_liststyle")|let w:netrw_liststyle= g:netrw_liststyle|endif -" call Dfunc("NetBrowse(islocal=".a:islocal." dirname<".a:dirname.">) liststyle=".w:netrw_liststyle." ".g:loaded_netrw." buf#".bufnr("%")) +" call Dfunc("NetBrowse(islocal=".a:islocal." dirname<".a:dirname.">) liststyle=".w:netrw_liststyle." ".g:loaded_netrw." buf#".bufnr("%")."<".bufname("%").">") " call Dredir("ls!") if exists("s:netrw_skipbrowse") @@ -1756,7 +1767,7 @@ fun! s:NetBrowse(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 keepdir:") +" call Decho("handle keepdir: (g:netrw_keepdir=".g:netrw_keepdir.")") " call Decho('exe cd '.escape(b:netrw_curdir,s:netrw_cd_escape)) try exe 'cd '.escape(b:netrw_curdir,s:netrw_cd_escape) @@ -1839,17 +1850,18 @@ fun! s:NetGetBuffer(islocal,dirname) else " find buffer number of buffer named precisely the same as dirname {{{3 +" call Dredir("ls!") let dirname= a:dirname " call Decho("find buffer<".dirname.">'s number ") let bufnum= bufnr(escape(dirname,'\')) -" call Decho("findbuf: bufnum=bufnr('".escape(dirname,'\')."')=".bufnum." (initial)") +" call Decho("findbuf1: bufnum=bufnr('".escape(dirname,'\')."')=".bufnum." (initial)") let ibuf= 1 if bufnum > 0 && bufname(bufnum) != dirname let buflast = bufnr("$") -" call Decho("findbuf: buflast=".buflast) +" call Decho("findbuf2: buflast=".buflast) while ibuf <= buflast let bname= bufname(ibuf) -" call Decho("findbuf: ibuf=".ibuf. " bufname<".bufname(ibuf)."> dirname<".dirname.">") +" call Decho("findbuf3: dirname<".dirname."> bufname(".ibuf.")<".bname.">") if bname != '' && bname !~ '/' && dirname =~ '/'.bname.'$' | break | endif if bname =~ '^'.dirname.'\=$' | break | endif let ibuf= ibuf + 1 @@ -1859,7 +1871,7 @@ fun! s:NetGetBuffer(islocal,dirname) else let bufnum= ibuf endif -" call Decho("findbuf: bufnum=".bufnum." (final)") +" call Decho("findbuf4: bufnum=".bufnum) endif endif @@ -1871,11 +1883,16 @@ fun! s:NetGetBuffer(islocal,dirname) call s:NetrwSafeOptions() " name the buffer if exists("w:netrw_liststyle") && w:netrw_liststyle == s:TREELIST +" call Decho('silent! keepalt file NetrwTreeListing') silent! keepalt file NetrwTreeListing else - exe 'silent! keepalt file '.escape(dirname,s:netrw_cd_escape) +" call Decho('exe silent! keepalt file '.escape(dirname,s:netrw_cd_escape)) +" let v:errmsg= "" " Decho + let escdirname= escape(dirname,s:netrw_cd_escape) + exe 'silent! keepalt file '.escdirname +" call Decho("errmsg<".v:errmsg."> bufnr(".escdirname.")=".bufnr(escdirname)."<".bufname(bufnr(escdirname)).">") endif -" call Decho("named enew buffer<".expand("%").">") +" call Decho("named enew buffer#".bufnr("%")."<".bufname("%").">") else " Re-use the buffer @@ -1933,7 +1950,7 @@ fun! s:NetrwListSettings(islocal) if g:netrw_use_noswf setlocal noswf endif -"call Dredir("ls!") +" call Dredir("ls!") " call Decho("exe setlocal ts=".g:netrw_maxfilenamelen) exe "setlocal ts=".g:netrw_maxfilenamelen if g:netrw_fastbrowse > a:islocal @@ -1947,7 +1964,7 @@ endfun " --------------------------------------------------------------------- " s:PerformListing: {{{2 fun! s:PerformListing(islocal) -" call Dfunc("s:PerformListing(islocal=".a:islocal.")") +" call Dfunc("s:PerformListing(islocal=".a:islocal.") buf(%)=".bufnr("%")."<".bufname("%").">") " if exists("g:netrw_silent") && g:netrw_silent == 0 && &ch >= 1 " Decho " call Decho("(netrw) Processing your browsing request...") @@ -1956,7 +1973,7 @@ fun! s:PerformListing(islocal) " 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("clear buffer<".expand("%")."> with :%d") +" call Decho("force refresh for treelisting: clear buffer<".expand("%")."> with :%d") setlocal ma noro keepjumps %d endif @@ -3248,7 +3265,7 @@ endfun " NetTreeDir: determine tree directory given current cursor position {{{2 " (full path directory with trailing slash returned) fun! s:NetTreeDir() -" call Dfunc("NetTreeDir() curline#".line(".")."<".getline(".")."> b:netrw_curdir<".b:netrw_curdir."> tab#".tabpagenr()." win#".winnr()." buf#".bufnr("%")) +" call Dfunc("NetTreeDir() 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.">") @@ -3848,7 +3865,7 @@ fun! netrw#NetObtain(vismode,...) range let path = substitute(curdir,'scp://[^/]\+/','','e') " call Decho("path<".path.">") if exists("g:netrw_port") && g:netrw_port != "" - let useport= " -P ".g:netrw_port + let useport= " ".g:netrw_scpport." ".g:netrw_port else let useport= "" endif @@ -4056,7 +4073,7 @@ endfun " --------------------------------------------------------------------- " LocalListing: does the job of "ls" for local directories {{{2 fun! s:LocalListing() -" call Dfunc("LocalListing() &ma=".&ma." &mod=".&mod." &ro=".&ro) +" call Dfunc("LocalListing() &ma=".&ma." &mod=".&mod." &ro=".&ro." buf(%)=".buf("%")) " if exists("b:netrw_curdir") |call Decho('b:netrw_curdir<'.b:netrw_curdir.">") |else|call Decho("b:netrw_curdir doesn't exist") |endif " 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 @@ -4438,11 +4455,12 @@ endfun " 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) +" 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 + let curfile= b:netrw_curdir " call Decho("curfile<".curfile.">") " save registers @@ -4489,19 +4507,23 @@ fun! netrw#Explore(indx,dosplit,style,...) endif norm! 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."/" + 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 -" call Decho("using dirname<".dirname."> (case: ".(exists("b:netrw_curdir")? "b:netrw_curdir" : "getcwd()").")") - else - let dirname= a:1 -" call Decho("using dirname<".dirname.">") endif if dirname =~ '^\*/' @@ -4919,32 +4941,60 @@ endfun " 2=error = s:ERROR " Mar 19, 2007 : max errnum currently is 49 fun! netrw#ErrorMsg(level,msg,errnum) -" call Dfunc("netrw#ErrorMsg(level=".a:level." msg<".a:msg."> errnum=".a:errnum.")") +" call Dfunc("netrw#ErrorMsg(level=".a:level." msg<".a:msg."> errnum=".a:errnum.") g:netrw_use_errorwindow=".g:netrw_use_errorwindow) - " record current window number for NetRestorePosn()'s benefit - let s:winBeforeErr= winnr() + if a:level == 1 + let level= "**warning** (netrw) " + elseif a:level == 2 + let level= "**error** (netrw) " + else + let level= "**note** (netrw) " + endif - " getting messages out reliably is just plain difficult! - " This attempt splits the current window, creating a one line window. - let errbufnum= bufnr("NetrwMessage") + if g:netrw_use_errorwindow + " (default) netrw creates a one-line window to show error/warning + " messages (reliably displayed) - bo 1split - enew - setlocal bt=nofile - file NetrwMessage + " record current window number for NetRestorePosn()'s benefit + let s:winBeforeErr= winnr() + + " 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 + exe bufwinnr("NetrwMessage")."wincmd w" + set ma noro + call setline(line("$")+1,level.a:msg) + $ + else + bo 1split + enew + setlocal bt=nofile + file NetrwMessage + call setline(line("$"),level.a:msg) + endif + if &fo !~ '[ta]' + syn clear + syn match netrwMesgNote "^\*\*note\*\*" + syn match netrwMesgWarning "^\*\*warning\*\*" + syn match netrwMesgError "^\*\*error\*\*" + hi link netrwMesgWarning WarningMsg + hi link netrwMesgError Error + endif + setlocal noma ro bh=wipe - put ='***netrw*** '.a:msg - if &fo !~ '[ta]' - syn clear - syn match netrwMesg "^\*\*\*netrw\*\*\*" + else + " (optional) netrw will show messages using echomsg. Even if the + " message doesn't appear, at least it'll be recallable via :messages + redraw! if a:level == s:WARNING - hi link netrwMesg WarningMsg + echohl WarningMsg elseif a:level == s:ERROR - hi link netrwMesg Error + echohl Error endif + echomsg level.a:msg +" call Decho("echomsg ***netrw*** ".a:msg) + echohl None endif - 1d - setlocal noma ro bh=wipe " call Dret("netrw#ErrorMsg") endfun @@ -5045,9 +5095,9 @@ fun! s:MakeSshCmd(sshcmd) " call Dfunc("s:MakeSshCmd(sshcmd<".a:sshcmd.">)") let sshcmd = substitute(a:sshcmd,'\<HOSTNAME\>',s:user.s:machine,'') if exists("g:netrw_port") && g:netrw_port != "" - let sshcmd= substitute(sshcmd,"USEPORT",'-P '.g:netrw_port,'') + let sshcmd= substitute(sshcmd,"USEPORT",g:netrw_sshport.' '.g:netrw_port,'') elseif exists("s:port") && s:port != "" - let sshcmd= substitute(sshcmd,"USEPORT",'-P '.s:port,'') + let sshcmd= substitute(sshcmd,"USEPORT",g:netrw_sshport.' '.s:port,'') else let sshcmd= substitute(sshcmd,"USEPORT ",'','') endif @@ -5058,7 +5108,7 @@ endfun " --------------------------------------------------------------------- " s:NetrwEnew: opens a new buffer, passes netrw buffer variables through {{{2 fun! s:NetrwEnew(curdir) -" call Dfunc("s:NetrwEnew(curdir<".a:curdir.">) expand(%)<".expand("%").">") +" call Dfunc("s:NetrwEnew(curdir<".a:curdir.">) buf#".bufnr("%")."<".bufname("%").">") " grab a function-local copy of buffer variables if exists("b:netrw_bannercnt") |let netrw_bannercnt = b:netrw_bannercnt |endif @@ -5113,7 +5163,7 @@ fun! s:NetrwEnew(curdir) endif endif -" call Dret("s:NetrwEnew : buf#".bufnr("%")) +" call Dret("s:NetrwEnew : buf#".bufnr("%")."<".bufname("%").">") endfun " ------------------------------------------------------------------------ diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt index f0ae4133c..e97be4d6d 100644 --- a/runtime/doc/change.txt +++ b/runtime/doc/change.txt @@ -1,4 +1,4 @@ -*change.txt* For Vim version 7.1a. Last change: 2007 Jan 07 +*change.txt* For Vim version 7.1b. Last change: 2007 Jan 07 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt index 9a24736cb..f355201fd 100644 --- a/runtime/doc/mbyte.txt +++ b/runtime/doc/mbyte.txt @@ -1,4 +1,4 @@ -*mbyte.txt* For Vim version 7.1a. Last change: 2006 Aug 11 +*mbyte.txt* For Vim version 7.1b. Last change: 2006 Aug 11 VIM REFERENCE MANUAL by Bram Moolenaar et al. diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt index d5821de11..0f32bee5b 100644 --- a/runtime/doc/pi_netrw.txt +++ b/runtime/doc/pi_netrw.txt @@ -1,4 +1,4 @@ -*pi_netrw.txt* For Vim version 7.1a. Last change: 2007 May 05 +*pi_netrw.txt* For Vim version 7.1b. Last change: 2007 May 08 ----------------------------------------------------- NETRW REFERENCE MANUAL by Charles E. Campbell, Jr. @@ -195,10 +195,16 @@ DIRECTORY LISTING *netrw-dirlist* *netrw-login* *netrw-password* CHANGING USERID AND PASSWORD *netrw-chgup* *netrw-userpass* + Attempts to use ftp will prompt you for a user-id and a password. - These will be saved in g:netrw_uid and g:netrw_passwd Subsequent uses - of ftp will re-use those. If you need to use a different user id - and/or password, you'll want to call NetUserPass() first. + These will be saved in global variables g:netrw_uid and + g:netrw_passwd; subsequent uses of ftp will re-use those two items to + simplify the further use of ftp. However, if you need to use a + different user id and/or password, you'll want to call NetUserPass() + first. To work around the need to enter passwords, check if your ftp + supports a <.netrc> file in your home directory. Also see + |netrw-passwd| (and if you're using ssh/scp hoping to figure out how + to not need to use passwords, look at |netrw-listhack|). :NetUserPass [uid [password]] -- prompts as needed :call NetUserPass() -- prompts for uid and password @@ -207,7 +213,7 @@ DIRECTORY LISTING *netrw-dirlist* VARIABLES *netrw-variables* -(see also: |netrw-browse-var| |netrw-protocol| |netrw-settings| |netrw-var|) +(also see: |netrw-browse-var| |netrw-protocol| |netrw-settings| |netrw-var|) *b:netrw_lastfile* last file Network-read/written retained on a per-buffer basis (supports plain :Nw ) @@ -249,6 +255,16 @@ VARIABLES *netrw-variables* Controls the quoting character used during scp and ftp commands. + *g:netrw_scpport* = "-P" : option to use to set port for scp + *g:netrw_sshport* = "-p" : option to use to set port for ssh + + *g:netrw_use_errorwindow* =1 : messages from netrw will use a separate one + line window. This window provides reliable + delivery of messages. (default) + =0 : messages from netrw will use echoerr ; + messages don't always seem to show up this + way, but one doesn't have to quit the window. + *g:netrw_win95ftp* =1 if using Win95, will remove four trailing blank lines that o/s's ftp "provides" on transfers =0 force normal ftp behavior (no trailing line removal) @@ -518,8 +534,8 @@ below, a {netfile} is an url to a remote file. The <netrw.vim> script provides several variables which act as options to ffect <netrw.vim>'s behavior. These variables typically may be set in the user's <.vimrc> file: -(see also: |netrw-settings| |netrw-browse-var| |netrw-protocol| -|netrw-settings|) > +(also see: +|netrw-settings| |netrw-browse-var| |netrw-protocol| |netrw-settings|) > ------------- Netrw Options @@ -1463,8 +1479,8 @@ Especially with the remote directory browser, constantly entering the password is tedious. For Linux/Unix systems, the book "Linux Server Hacks - 100 industrial strength -tips & tools" by Rob Flickenger (O'Reilly, ISBN 0-596-00461-3), gives a tip -for setting up no-password ssh and scp, plus discusses associated security +tips & tools" by Rob Flickenger (O'Reilly, ISBN 0-596-00461-3) gives a tip +for setting up no-password ssh and scp and discusses associated security issues. It used to be available at http://hacks.oreilly.com/pub/h/66 , but apparently that address is now being redirected to some "hackzine". I'll attempt a summary: @@ -1496,7 +1512,7 @@ settings. You may change any of their values; when you save the file, the settings therein will be used. One may also press "?" on any of the lines for help on what each of the variables do. -(see also: |netrw-browse-var| |netrw-protocol| |netrw-var| |netrw-variables|) +(also see: |netrw-browse-var| |netrw-protocol| |netrw-var| |netrw-variables|) ============================================================================== @@ -1729,6 +1745,16 @@ which is loaded automatically at startup (assuming :set nocp). ============================================================================== 12. History *netrw-history* {{{1 + v109: Mar 26, 2007 * if a directory name includes a "$" character, + Explore() will use expand() in an attempt to + decipher the name. + May 07, 2007 * g:netrw_use_errorwindow now allows one to + have error messages go to a reliable window + or to use a less reliable but recallable + echoerr method + May 07, 2007 * g:netrw_scpport and g:netrw_sshport support + use of -P and -p, respectively, to set port + for scp/ssh. v108: Jan 03, 2007 * included preview map (|netrw-p|), supporting remote browsing * netrw can now source remote files @@ -1738,14 +1764,14 @@ which is loaded automatically at startup (assuming :set nocp). to apply to all remote browsing commands via ssh. (list, remove/delete, rename) Jan 31, 2007 * Luis Florit reported that @* was an invalid - register. The @* register is now only saved and - restored if 'guioptions' contains "a". + register. The @* register is now only saved and + restored if |'guioptions'| contains "a". Feb 02, 2007 * Fixed a bug that cropped up when writing files via scp using cygwin Feb 08, 2007 * tree listing mode managed to stop working again; fixed again! Feb 15, 2007 * Guido Van Hoecke reported that netrw didn't - handle browsing well with M$ ftp servers. He even + handle browsing well with M$ ftp servers. He even set up a temporary account for me to test with (thanks!). Netrw now can browse M$ ftp servers. v107: Oct 12, 2006 * bypassed the autowrite option @@ -1836,7 +1862,7 @@ which is loaded automatically at startup (assuming :set nocp). was preventing use of the "x" key with browsing. Jun 05, 2006 * g:netrw_nogx available to prevent making the gx map (see |g:netrw_nogx|) - * bugfix, Explore woulnd't change directory + * bugfix, Explore wouldn't change directory properly (vim ., :Explore subdirname) Jun 06, 2006 * moved history to 2nd line in Netrw menu * fixed delete for unix-based systems @@ -1857,7 +1883,7 @@ which is loaded automatically at startup (assuming :set nocp). now bypassed only when it is v95: * bugfix - Hiding mode worked correctly (don't show any file matching any of the g:netrw_hide patterns), but - but showing mode was showing only those files that didn't + showing mode was showing only those files that didn't match any of the g:netrw_hide patterns. Instead, it now shows all files that match any of the g:netrw_hide patterns (the difference between a logical and and logical or). @@ -1892,7 +1918,7 @@ which is loaded automatically at startup (assuming :set nocp). v81: * FocusGained also used to refresh/wipe local browser directory buffers * (bugfix) netrw was leaving [Scratch] buffers behind when the - the user had the "hidden" option set. The 'hidden' option is + user had the "hidden" option set. The 'hidden' option is now bypassed. v80: * ShellCmdPost event used in conjunction with g:netrw_fastbrowse to refresh/wipe local browser directory buffers. @@ -2123,12 +2149,12 @@ which is loaded automatically at startup (assuming :set nocp). Jérôme Augé -- also using new buffer method with ftp+.netrc Bram Moolenaar -- obviously vim itself, :e and v:cmdarg use, - fetch,... + fetch,... Yasuhiro Matsumoto -- pointing out undo+0r problem and a solution Erik Warendorph -- for several suggestions (g:netrw_..._cmd variables, rsync etc) Doug Claar -- modifications to test for success with ftp - operation + operation ============================================================================== vim:tw=78:ts=8:ft=help:norl:fdm=marker diff --git a/runtime/doc/usr_toc.txt b/runtime/doc/usr_toc.txt index ff42aa96a..f36d85924 100644 --- a/runtime/doc/usr_toc.txt +++ b/runtime/doc/usr_toc.txt @@ -1,4 +1,4 @@ -*usr_toc.txt* For Vim version 7.1a. Last change: 2006 Apr 24 +*usr_toc.txt* For Vim version 7.1b. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/indent/xinetd.vim b/runtime/indent/xinetd.vim index 398e05af9..f7a534144 100644 --- a/runtime/indent/xinetd.vim +++ b/runtime/indent/xinetd.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: xinetd.conf(5) configuration file " Maintainer: Nikolai Weibull <now@bitwi.se> -" Latest Revision: 2006-04-19 +" Latest Revision: 2006-12-20 if exists("b:did_indent") finish @@ -10,6 +10,7 @@ let b:did_indent = 1 setlocal indentexpr=GetXinetdIndent() setlocal indentkeys=0{,0},!^F,o,O +setlocal nosmartindent if exists("*GetXinetdIndent") finish |