# HG changeset patch # User vimboss # Date 1122069135 0 # Node ID 59b7b7e99c95513671dc20c3b2754f21aa96907e # Parent 256118bd00f4e61eb49702aab85ace03543f7a5f updated for version 7.0113 diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 7.0aa. Last change: 2005 Jul 21 +*eval.txt* For Vim version 7.0aa. Last change: 2005 Jul 22 VIM REFERENCE MANUAL by Bram Moolenaar @@ -4091,7 +4091,8 @@ system({expr} [, {input}]) *system()* taglist({expr}) *taglist()* Returns a list of tags matching the regular expression {expr}. - Each list item is a dictionary with the following entries: + Each list item is a dictionary with at least the following + entries: name name of the tag. filename name of the file where the tag is defined. diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.0aa. Last change: 2005 Jul 21 +*options.txt* For Vim version 7.0aa. Last change: 2005 Jul 22 VIM REFERENCE MANUAL by Bram Moolenaar @@ -657,12 +657,14 @@ A jump table for the options with a shor {not in Vi} {only available when compiled with the |+netbeans_intg| or |+sun_workshop| feature} - When on, Vim will change its value for the current working directory - whenever you open a file, switch buffers, delete a buffer or - open/close a window. It will change to the directory containing the - file which was opened or selected. This option is provided for - backward compatibility with the Vim released with Sun ONE Studio 4 - Enterprise Edition. + When on, Vim will change the current working directory whenever you + open a file, switch buffers, delete a buffer or open/close a window. + It will change to the directory containing the file which was opened + or selected. + This option is provided for backward compatibility with the Vim + released with Sun ONE Studio 4 Enterprise Edition. + Note: When this option is on some plugins may not work. The directory + browser sets if off. *'arabic'* *'arab'* *'noarabic'* *'noarab'* 'arabic' 'arab' boolean (default off) diff --git a/runtime/menu.vim b/runtime/menu.vim --- a/runtime/menu.vim +++ b/runtime/menu.vim @@ -2,7 +2,7 @@ " You can also use this as a start for your own set of menus. " " Maintainer: Bram Moolenaar -" Last Change: 2005 Jul 21 +" Last Change: 2005 Jul 22 " Note that ":an" (short for ":anoremenu") is often used to make a menu work " in all modes and avoid side effects from mappings defined by the user. @@ -880,6 +880,9 @@ if has("spell") if exists("s:changeitem") && s:changeitem != '' call SpellDel() endif + if !&spell || &spelllang == '' + return + endif let curcol = col('.') let w = spellbadword() diff --git a/runtime/plugin/netrw.vim b/runtime/plugin/netrw.vim --- a/runtime/plugin/netrw.vim +++ b/runtime/plugin/netrw.vim @@ -1839,12 +1839,8 @@ fun! NetMakeDir(usrhost) " call Dret("NetMakeDir : file<".newdirname."> exists previously") return endif - let netrw_origdir= s:NetGetcwd(1) - exe 'cd '.b:netrw_curdir -" call Decho("netrw_origdir<".netrw_origdir."> b:netrw_curdir<".b:netrw_curdir.">") -" call Decho("exe silent! !".g:netrw_local_mkdir.' "'.newdirname.'"') - exe "silent! !".g:netrw_local_mkdir.' "'.newdirname.'"' - if g:netrw_keepdir | exe 'keepjumps cd '.netrw_origdir | endif +" call Decho("exe silent! !".g:netrw_local_mkdir.' "'.fullnewdir.'"') + exe "silent! !".g:netrw_local_mkdir.' "'.fullnewdir.'"' if v:shell_error == 0 " refresh listing @@ -2008,12 +2004,22 @@ fun! LocalBrowse(dirname) " record and change current directory let netrw_origdir= s:NetGetcwd(1) + try + cd - + let netrw_altdir= s:NetGetcwd(1) + cd - + catch + let netrw_altdir= '' + endtry exe 'cd '.escape(substitute(a:dirname,'\\','/','ge'),s:netrw_cd_escape) " call Decho("dirname<".a:dirname."> buf#".bufnr("%")." winnr=".winnr()) " make this buffer modifiable setlocal ma + " disable 'autochdir', it breaks things + set noautochdir + " --------------------------- " Perform Directory Listing: " call Decho("Perform directory listing...") @@ -2044,7 +2050,12 @@ fun! LocalBrowse(dirname) if a:dirname != "." && line("$") >= 5 && exists("b:netrw_curdir") if b:netrw_curdir == dirname " call Dret("LocalBrowse : buffer already exists with info, #".dirnamenr) - if g:netrw_keepdir | exe 'keepjumps cd '.netrw_origdir | endif + if g:netrw_keepdir + if netrw_altdir != '' + exe 'keepjumps cd '.netrw_altdir + endif + exe 'keepjumps cd '.netrw_origdir + endif return endif endif @@ -2056,7 +2067,6 @@ fun! LocalBrowse(dirname) if curdir != dirname " set standard browser options on buffer setlocal bt=nofile bh=hide nobl noswf - exe "setlocal ts=".g:netrw_maxfilenamelen exe 'silent file '.escape(dirname,s:netrw_cd_escape) " call Decho("errmsg1<".v:errmsg.">") " call Decho("renamed buffer to<".escape(dirname,s:netrw_cd_escape).">") @@ -2067,12 +2077,13 @@ fun! LocalBrowse(dirname) silent! enew! " set standard browser options on buffer setlocal bt=nofile bh=hide nobl noswf nonu - exe "setlocal ts=".g:netrw_maxfilenamelen exe 'silent file '.substitute(escape(dirname,s:netrw_cd_escape),'[\/]$','','e') " call Decho("errmsg2<".v:errmsg.">") " call Decho("renamed buffer to<".substitute(escape(dirname,s:netrw_cd_escape),'[\/]$','','e').">") " call Decho("yielding actual bufname<".bufname("%").">") endif + exe "setlocal ts=".g:netrw_maxfilenamelen + if bufname("#") == "" && bufnr("#") != -1 " the file command produces a lot of [No File] buffers " call Decho("wiping out nofile buffer#".bufnr("#")) @@ -2182,7 +2193,12 @@ fun! LocalBrowse(dirname) exe s:netrw_bannercnt setlocal noma nomod nonu - if g:netrw_keepdir | exe 'keepjumps cd '.netrw_origdir | endif + if g:netrw_keepdir + if netrw_altdir != '' + exe 'keepjumps cd '.netrw_altdir + endif + exe 'keepjumps cd '.netrw_origdir + endif " call Dret("LocalBrowse : file<".expand("%:p")."> bufname<".bufname("%").">") endfun @@ -2330,8 +2346,6 @@ fun! LocalBrowseRm(path) range " preparation for removing multiple files/directories let ctr = a:firstline let ret = 0 - let netrw_origdir = s:NetGetcwd(1) - exe 'cd '.b:netrw_curdir let all= 0 " remove multiple files and directories @@ -2423,7 +2437,6 @@ fun! LocalBrowseRm(path) range " refresh the directory let curline= line(".") - if g:netrw_keepdir | exe 'keepjumps cd '.netrw_origdir | endif " call Decho("refresh the directory") call LocalBrowse(LocalBrowseChgDir(b:netrw_curdir,'./')) exe curline diff --git a/src/auto/configure b/src/auto/configure --- a/src/auto/configure +++ b/src/auto/configure @@ -1029,7 +1029,7 @@ gives unlimited permission to copy, dist _ACEOF exit 0 fi -exec 5>auto/config.log +exec 5>config.log cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. @@ -16404,7 +16404,7 @@ exec 6>&1 # Open the log real soon, to keep \$[0] and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. Logging --version etc. is OK. -exec 5>>auto/config.log +exec 5>>config.log { echo sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX @@ -17244,7 +17244,7 @@ if test "$no_create" != yes; then ac_config_status_args="$ac_config_status_args --quiet" exec 5>/dev/null $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false - exec 5>>auto/config.log + exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. $ac_cs_success || { (exit 1); exit 1; } diff --git a/src/version.h b/src/version.h --- a/src/version.h +++ b/src/version.h @@ -36,5 +36,5 @@ #define VIM_VERSION_NODOT "vim70aa" #define VIM_VERSION_SHORT "7.0aa" #define VIM_VERSION_MEDIUM "7.0aa ALPHA" -#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Jul 21)" -#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Jul 21, compiled " +#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Jul 22)" +#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Jul 22, compiled "