updated for version 7.0113

4 files changed, 42 insertions, 23 deletions

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 307ceae252..a37fa54c04 100644
--- 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()* *E677*
 
 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
index 89c5cd5691..aac3c29e41 100644
--- 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 short description can be found at |Q_op|.
 			{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
index f43fcb96be..37bd11ac26 100644
--- 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 <Bram@vim.org>
-" 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 <SID>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
index 0653aabc2a..f1da4b072c 100644
--- a/runtime/plugin/netrw.vim
+++ b/runtime/plugin/netrw.vim
@@ -1839,12 +1839,8 @@ fun! <SID>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! <SID>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! <SID>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! <SID>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! <SID>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! <SID>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! <SID>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! <SID>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 <SID>LocalBrowse(<SID>LocalBrowseChgDir(b:netrw_curdir,'./'))
   exe curline