updated for version 7.0e01

Contents

@@ -9,10 +9,10 @@ Vim		Vi IMproved.  A clone of the UNIX text editor Vi.  Very useful
 		messages, shows current file name in window title, on-line
 		help, rectangular cut/paste, etc., etc., etc...
 
-		Version 7.0d.  Also runs under UNIX, MSDOS and other systems.
-		vim70drt.tgz  contains the documentation and syntax files.
-		vim70dbin.tgz contains the binaries.
-		vim70dsrc.tgz contains the sources.
+		Version 7.0e.  Also runs under UNIX, MSDOS and other systems.
+		vim70ert.tgz  contains the documentation and syntax files.
+		vim70ebin.tgz contains the binaries.
+		vim70esrc.tgz contains the sources.
 		Author: Bram Moolenaar et al.
 
 

Filelist

@@ -505,6 +505,7 @@ RT_SCRIPTS =	\
 		runtime/makemenu.vim \
 		runtime/autoload/*.vim \
 		runtime/autoload/README.txt \
+		runtime/autoload/xml/*.vim \
 		runtime/colors/*.vim \
 		runtime/colors/README.txt \
 		runtime/compiler/*.vim \

Makefile

@@ -69,7 +69,7 @@ all install uninstall tools config configure proto depend lint tags types test t
 #    Before creating an archive first delete all backup files, *.orig, etc.
 
 MAJOR = 7
-MINOR = 0d
+MINOR = 0e
 
 # Uncomment this line if the Win32s version is to be included.
 DOSBIN_S =  dosbin_s
@@ -159,7 +159,7 @@ DOSBIN_S =  dosbin_s
 # - The produced uninstalw32.exe and vimrun.exe are used.
 # Create the archives:
 # - Copy all the "*.exe" files to where this Makefile is.
-# - Copy all the "*.pdb" files to the dist directory.
+# - Copy all the "*.pdb" files to where this Makefile is.
 # - "make dosbin".
 # - Run make on Unix to update the ".mo" files.
 # - "make doslang".

README.txt

@@ -1,13 +1,13 @@
-README.txt for version 7.0d of Vim: Vi IMproved.
+README.txt for version 7.0e of Vim: Vi IMproved.
 
 
 WHAT IS VIM
 
 Vim is an almost compatible version of the UNIX editor Vi.  Many new features
 have been added: multi-level undo, syntax highlighting, command line history,
-on-line help, filename completion, block operations, etc.  There is also a
-Graphical User Interface (GUI) available.  See "runtime/doc/vi_diff.txt" for
-differences with Vi.
+on-line help, spell checking, filename completion, block operations, etc.
+There is also a Graphical User Interface (GUI) available.  See
+"runtime/doc/vi_diff.txt" for differences with Vi.
 
 This editor is very useful for editing programs and other plain ASCII files.
 All commands are given with normal keyboard characters, so those who can type
@@ -56,15 +56,16 @@ distribute it.
 
 SPONSORING
 
-Fixing bugs and adding new features takes a lot of effort.  For a few years
-Bram has attempted to do this next to a full-time job.  During that time the
-todo list kept getting longer and longer.
+Fixing bugs and adding new features takes a lot of time and effort.  To show
+your appreciation for the work and motivate Bram and others to continue
+working on Vim please send a donation.
 
-In order for Bram to support Vim properly he needs your help.  Through your
-donations Bram will be able to have a part-time job and spend more time on
-fixing bugs and adding new features.
+Since Bram is back to a paid job the money will now be used to help children
+in Uganda.  See runtime/doc/uganda.txt.  But at the same time donations
+increase Bram's motivation to keep working on Vim!
 
 For the most recent information about sponsoring look on the Vim web site:
+
 	http://www.vim.org/sponsor/
 
 
@@ -132,6 +133,9 @@ MAIN AUTHOR
 Send any other comments, patches, pizza and suggestions to:
 
 	Bram Moolenaar		E-mail:	Bram@vim.org
-	Clematisstraat 30
-	5925 BE  Venlo		Tel: +31 77 387 2340
-	The Netherlands		Fax/voice-mail: +31 20 773 8272
+	Molenstraat 2
+	2161 HP  Lisse
+	The Netherlands
+
+This is the address of my parents, they will forward mail and eat the pizza.
+My actual address will change a couple of times in 2006.

README_ami.txt

@@ -1,4 +1,4 @@
-README_ami.txt for version 7.0d of Vim: Vi IMproved.
+README_ami.txt for version 7.0e of Vim: Vi IMproved.
 
 This file explains the installation of Vim on Amiga systems.
 See README.txt for general information about Vim.

README_amibin.txt

@@ -1,4 +1,4 @@
-README_amibin.txt for version 7.0d of Vim: Vi IMproved.
+README_amibin.txt for version 7.0e of Vim: Vi IMproved.
 
 See "README.txt" for general information about Vim.
 See "README_ami.txt" for installation instructions for the Amiga.

README_amisrc.txt

@@ -1,4 +1,4 @@
-README_amisrc.txt for version 7.0d of Vim: Vi IMproved.
+README_amisrc.txt for version 7.0e of Vim: Vi IMproved.
 
 See "README.txt" for general information about Vim.
 See "README_ami.txt" for installation instructions for the Amiga.

README_bindos.txt

@@ -1,4 +1,4 @@
-README_bindos.txt for version 7.0d of Vim: Vi IMproved.
+README_bindos.txt for version 7.0e of Vim: Vi IMproved.
 
 See "README.txt" for general information about Vim.
 See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows.

README_dos.txt

@@ -1,4 +1,4 @@
-README_dos.txt for version 7.0d of Vim: Vi IMproved.
+README_dos.txt for version 7.0e of Vim: Vi IMproved.
 
 This file explains the installation of Vim on MS-DOS and MS-Windows systems.
 See "README.txt" for general information about Vim.

README_extra.txt

@@ -1,4 +1,4 @@
-README_extra.txt for version 7.0d of Vim: Vi IMproved.
+README_extra.txt for version 7.0e of Vim: Vi IMproved.
 
 The extra archive of Vim is to be used in combination with the source archive
 (vim-6.0-src.tar.gz).  The extra archive is useless without it.

README_lang.txt

@@ -1,4 +1,4 @@
-README_lang.txt for version 7.0d of Vim: Vi IMproved.
+README_lang.txt for version 7.0e of Vim: Vi IMproved.
 
 This file contains files for non-English languages:
 - Translated messages.

README_mac.txt

@@ -1,4 +1,4 @@
-README_mac.txt for version 7.0d of Vim: Vi IMproved.
+README_mac.txt for version 7.0e of Vim: Vi IMproved.
 
 This file explains the installation of Vim on Macintosh systems.
 See "README.txt" for general information about Vim.

README_ole.txt

@@ -1,4 +1,4 @@
-README_ole.txt for version 7.0d of Vim: Vi IMproved.
+README_ole.txt for version 7.0e of Vim: Vi IMproved.
 
 This archive contains gvim.exe with OLE interface and VisVim.
 This version of gvim.exe can also load a number of interface dynamically (you

README_os2.txt

@@ -1,4 +1,4 @@
-README_os2.txt for version 7.0d of Vim: Vi IMproved.
+README_os2.txt for version 7.0e of Vim: Vi IMproved.
 
 This file explains the installation of Vim on OS/2 systems.
 See "README.txt" for general information about Vim.

README_os390.txt

@@ -1,4 +1,4 @@
-README_os_390.txt for version 7.0d of Vim: Vi IMproved.
+README_os_390.txt for version 7.0e of Vim: Vi IMproved.
 
 Welcome to the OS/390 Unix port of VIM.
 

README_src.txt

@@ -1,4 +1,4 @@
-README_src.txt for version 7.0d of Vim: Vi IMproved.
+README_src.txt for version 7.0e of Vim: Vi IMproved.
 
 The source archive contains the files needed to compile Vim on Unix systems.
 It is packed for Unix systems (NL line separator).  It is also used for other

README_srcdos.txt

@@ -1,4 +1,4 @@
-README_srcdos.txt for version 7.0d of Vim: Vi IMproved.
+README_srcdos.txt for version 7.0e of Vim: Vi IMproved.
 
 See "README.txt" for general information about Vim.
 See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows.

README_unix.txt

@@ -1,4 +1,4 @@
-README_unix.txt for version 7.0d of Vim: Vi IMproved.
+README_unix.txt for version 7.0e of Vim: Vi IMproved.
 
 This file explains the installation of Vim on Unix systems.
 See "README.txt" for general information about Vim.

README_vms.txt

@@ -1,4 +1,4 @@
-README_vms.txt for version 7.0d of Vim: Vi IMproved.
+README_vms.txt for version 7.0e of Vim: Vi IMproved.
 
 This file explains the installation of Vim on VMS systems.
 See "README.txt" in the runtime archive for information about Vim.

README_w32s.txt

@@ -1,4 +1,4 @@
-README_w32s.txt for version 7.0d of Vim: Vi IMproved.
+README_w32s.txt for version 7.0e of Vim: Vi IMproved.
 
 This archive contains the gvim.exe that was specifically compiled for use in
 the Win32s subsystem in MS-Windows 3.1 and 3.11.

nsis/gvim.nsi

@@ -22,7 +22,7 @@
 !define HAVE_NLS
 
 !define VER_MAJOR 7
-!define VER_MINOR 0d
+!define VER_MINOR 0e
 
 # ----------- No configurable settings below this line -----------
 
@@ -217,6 +217,9 @@ Section "Vim executables and runtime files"
 	SetOutPath $0\autoload
 	File ${VIMRT}\autoload\*.*
 
+	SetOutPath $0\autoload\xml
+	File ${VIMRT}\autoload\xml\*.*
+
 	SetOutPath $0\syntax
 	File ${VIMRT}\syntax\*.*
 

runtime/autoload/README.txt

@@ -16,6 +16,7 @@ csscomplete.vim		HTML / CSS
 htmlcomplete.vim	HTML
 javascriptcomplete.vim  Javascript
 phpcomplete.vim		PHP
-pycomplete.vim		Python
+pythoncomplete.vim	Python
+rubycomplete.vim	Ruby
 syntaxcomplete.vim	from syntax highlighting
 xmlcomplete.vim		XML (uses files in the xml directory)

runtime/autoload/netrw.vim

@@ -1,7 +1,7 @@
 " netrw.vim: Handles file transfer and remote directory listing across a network
 "            AUTOLOAD PORTION
-" Date:		Apr 06, 2006
-" Version:	86
+" Date:		Apr 14, 2006
+" Version:	88
 " 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
@@ -23,7 +23,7 @@
 if &cp || exists("g:loaded_netrw")
   finish
 endif
-let g:loaded_netrw = "v86"
+let g:loaded_netrw = "v88"
 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
@@ -929,7 +929,7 @@ fun! netrw#NetWrite(...) range
    ".........................................
    " ftp + <.netrc>: NetWrite Method #2 {{{3
    elseif b:netrw_method == 2
-    let netrw_fname= escape(b:netrw_fname,g:netrw_fname_escape)
+    let netrw_fname= b:netrw_fname
     new
     setlocal ff=unix
     exe "put ='".g:netrw_ftpmode."'"
@@ -957,7 +957,7 @@ fun! netrw#NetWrite(...) range
    ".........................................
    " ftp + machine, id, passwd, filename: NetWrite Method #3 {{{3
    elseif b:netrw_method == 3
-    let netrw_fname= escape(b:netrw_fname,g:netrw_fname_escape)
+    let netrw_fname= b:netrw_fname
     new
     setlocal ff=unix
     if exists("g:netrw_port") && g:netrw_port != ""
@@ -1155,7 +1155,7 @@ fun! s:NetBrowse(dirname)
 
   " set up menus
   let b:netrw_browser_active= 1
-  call s:NetMenu()
+  call s:NetMenu(1)
 
   " make this buffer modifiable
   setlocal ma nonu nowrap
@@ -1408,7 +1408,7 @@ fun! s:NetBrowse(dirname)
 
   " set up syntax highlighting
   if has("syntax")
-   setlocal ft=netrwlist
+   setlocal ft=netrw
    if !exists("g:syntax_on") || !g:syntax_on
     setlocal ft=
     " Ugly workaround -- when syntax highlighting is off and laststatus==2,
@@ -1460,6 +1460,7 @@ fun! s:NetBrowse(dirname)
      else
       exe 'silent keepjumps '.w:netrw_bannercnt.',$sort!'
      endif
+     " remove priority pattern prefix
      exe 'silent keepjumps '.w:netrw_bannercnt.',$s/^\d\{3}\///e'
     endif
     if w:netrw_longlist == 1
@@ -1494,14 +1495,17 @@ fun! s:NetBrowseChgDir(dirname,newdir)
   if newdir !~ '[\/]$'
    " handling a file
    let dirname= dirname.newdir
+   let didfile= 0
    if g:netrw_browse_split == 1
     new
     wincmd _
    elseif g:netrw_browse_split == 2
     rightb vert new
     wincmd |
+   else
+    " handling a file, didn't split, so possibly remove menu
+    call s:NetMenu(0)
    endif
-   call s:NetMenu()
 "   call Decho("handling a file: dirname<".dirname.">")
 
   elseif newdir == './'
@@ -1919,8 +1923,8 @@ endfun
 "  This function assumes that a long listing will be received.  Size, time,
 "  and reverse sorts will be requested of the server but not otherwise
 "  enforced here.
-fun! s:NetBrowseFtpCmd(path,cmd)
-"  call Dfunc("NetBrowseFtpCmd(path<".a:path."> cmd<".a:cmd.">) netrw_method=".w:netrw_method)
+fun! s:NetBrowseFtpCmd(path,listcmd)
+"  call Dfunc("NetBrowseFtpCmd(path<".a:path."> listcmd<".a:listcmd.">) netrw_method=".w:netrw_method)
 
   " because WinXX ftp uses unix style input
   " curline is one more than the bannercnt in order to account
@@ -1938,7 +1942,7 @@ fun! s:NetBrowseFtpCmd(path,cmd)
     put ='cd \"'.a:path.'\"'
 "    call Decho('ftp:  '.getline("."))
    endif
-   exe "put ='".a:cmd."'"
+   exe "put ='".a:listcmd."'"
 "   call Decho("ftp:  ".getline("."))
 "    redraw!|call inputsave()|call input("Pausing...")|call inputrestore()
    if exists("g:netrw_port") && g:netrw_port != ""
@@ -1969,7 +1973,7 @@ fun! s:NetBrowseFtpCmd(path,cmd)
    if a:path != ""
     put ='cd \"'.a:path.'\"'
    endif
-   exe "put ='".a:cmd."'"
+   exe "put ='".a:listcmd."'"
 
     " perform ftp:
     " -i       : turns off interactive prompting from ftp
@@ -1987,7 +1991,7 @@ fun! s:NetBrowseFtpCmd(path,cmd)
   if has("win32") || has("win95") || has("win64") || has("win16")
    silent! keepjumps! %s/\r$//e
   endif
-  if a:cmd == "dir"
+  if a:listcmd == "dir"
    " infer directory/link based on the file permission string
    silent! keepjumps g/d\%([-r][-w][-x]\)\{3}/s@$@/@
    silent! keepjumps g/l\%([-r][-w][-x]\)\{3}/s/$/@/
@@ -2133,9 +2137,9 @@ endfun
 " ---------------------------------------------------------------------
 " NetrwWideListing: {{{2
 fun! s:NetrwWideListing()
-"  call Dfunc("NetrwWideListing() w:netrw_longlist=".w:netrw_longlist)
 
   if w:netrw_longlist == 2
+"   call Dfunc("NetrwWideListing() w:netrw_longlist=".w:netrw_longlist)
    " look for longest filename (cpf=characters per filename)
    " cpf: characters per file
    " fpl: files per line
@@ -2178,9 +2182,9 @@ fun! s:NetrwWideListing()
    endwhile
    exe "silent keepjumps ".w:netrw_bannercnt.',$s/\s\+$//e'
    setlocal noma nomod
+"   call Dret("NetrwWideListing")
   endif
 
-"  call Dret("NetrwWideListing")
 endfun
 
 " ---------------------------------------------------------------------
@@ -2567,7 +2571,7 @@ fun! netrw#NetObtain(...)
 endfun
 
 " ---------------------------------------------------------------------
-" NetPrevWinOpen: opoen file/directory in previous window.  {{{2
+" NetPrevWinOpen: open file/directory in previous window.  {{{2
 "   If there's only one window, then the window will first be split.
 fun! s:NetPrevWinOpen(islocal)
 "  call Dfunc("NetPrevWinOpen(islocal=".a:islocal.")")
@@ -2644,69 +2648,85 @@ endfun
 
 " ---------------------------------------------------------------------
 " NetMenu: generates the menu for gvim and netrw {{{2
-fun! s:NetMenu()
+fun! s:NetMenu(domenu)
+
+  if !exists("g:NetrwMenuPriority")
+   let g:NetrwMenuPriority= 80
+  endif
 
   if has("menu") && has("gui_running") && &go =~ 'm'
-"   call Dfunc("NetMenu()")
-   if !exists("s:netrw_menu_enabled")
+"   call Dfunc("NetMenu(domenu=".a:domenu.")")
+   if !exists("s:netrw_menu_enabled") && a:domenu
+"    call Decho("initialize menu")
     let s:netrw_menu_enabled= 1
-    if !exists("g:DrChipTopLvlMenu")
-     let g:DrChipTopLvlMenu= "DrChip."
+    if !exists("g:NetrwTopLvlMenu")
+     let g:NetrwTopLvlMenu= "Netrw."
+    endif
+    exe 'silent! '.g:NetrwMenuPriority.'menu '.g:NetrwTopLvlMenu.'Help<tab><F1>	<F1>'
+    exe 'silent! '.g:NetrwMenuPriority.'menu '.g:NetrwTopLvlMenu.'Apply\ Special\ Viewer<tab>x	x'
+    exe 'silent! '.g:NetrwMenuPriority.'menu '.g:NetrwTopLvlMenu.'Bookmark\ Current\ Directory<tab>b	Nb'
+    exe 'silent! '.g:NetrwMenuPriority.'menu '.g:NetrwTopLvlMenu.'Go\ Up\ Directory<tab>-	-'
+    exe 'silent! '.g:NetrwMenuPriority.'menu '.g:NetrwTopLvlMenu.'Goto\ Bookmarked\ Directory<tab>B	NB'
+    exe 'silent! '.g:NetrwMenuPriority.'menu '.g:NetrwTopLvlMenu.'Change\ To\ Recently\ Used\ Directory<tab>u	u'
+    exe 'silent! '.g:NetrwMenuPriority.'menu '.g:NetrwTopLvlMenu.'Change\ To\ Subsequently\ Used\ Directory<tab>U	U'
+    exe 'silent! '.g:NetrwMenuPriority.'menu '.g:NetrwTopLvlMenu.'Delete\ File/Directory<tab>D	D'
+    exe 'silent! '.g:NetrwMenuPriority.'menu '.g:NetrwTopLvlMenu.'Edit\ File\ Hiding\ List<tab>'."<ctrl-h>	\<c-h>"
+    exe 'silent! '.g:NetrwMenuPriority.'menu '.g:NetrwTopLvlMenu.'Edit\ File/Directory<tab><cr>	'."\<cr>"
+    exe 'silent! '.g:NetrwMenuPriority.'menu '.g:NetrwTopLvlMenu.'Edit\ File/Directory,\ New\ Window<tab>o	o'
+    exe 'silent! '.g:NetrwMenuPriority.'menu '.g:NetrwTopLvlMenu.'Edit\ File/Directory,\ New\ Vertical\ Window<tab>v	v'
+    exe 'silent! '.g:NetrwMenuPriority.'menu '.g:NetrwTopLvlMenu.'List\ Bookmarks\ and\ History<tab>q	q'
+    exe 'silent! '.g:NetrwMenuPriority.'menu '.g:NetrwTopLvlMenu.'Listing\ Style\ (thin-long-wide)<tab>i	i'
+    exe 'silent! '.g:NetrwMenuPriority.'menu '.g:NetrwTopLvlMenu.'Make\ Subdirectory<tab>d	d'
+    exe 'silent! '.g:NetrwMenuPriority.'menu '.g:NetrwTopLvlMenu.'Normal-Hide-Show<tab>a	a'
+    exe 'silent! '.g:NetrwMenuPriority.'menu '.g:NetrwTopLvlMenu.'Obtain\ File<tab>O	O'
+    exe 'silent! '.g:NetrwMenuPriority.'menu '.g:NetrwTopLvlMenu.'Preview\ File/Directory<tab>p	p'
+    exe 'silent! '.g:NetrwMenuPriority.'menu '.g:NetrwTopLvlMenu.'Previous\ Window\ Browser<tab>P	P'
+    exe 'silent! '.g:NetrwMenuPriority.'menu '.g:NetrwTopLvlMenu.'Refresh\ Listing<tab>'."<ctrl-l>	\<c-l>"
+    exe 'silent! '.g:NetrwMenuPriority.'menu '.g:NetrwTopLvlMenu.'Rename\ File/Directory<tab>R	R'
+    exe 'silent! '.g:NetrwMenuPriority.'menu '.g:NetrwTopLvlMenu.'Reverse\ Sorting\ Order<tab>'."r	r"
+    exe 'silent! '.g:NetrwMenuPriority.'menu '.g:NetrwTopLvlMenu.'Select\ Sorting\ Style<tab>s	s'
+    exe 'silent! '.g:NetrwMenuPriority.'menu '.g:NetrwTopLvlMenu.'Sorting\ Sequence\ Edit<tab>S	S'
+    exe 'silent! '.g:NetrwMenuPriority.'menu '.g:NetrwTopLvlMenu.'Set\ Current\ Directory<tab>c	c'
+    exe 'silent! '.g:NetrwMenuPriority.'menu '.g:NetrwTopLvlMenu.'Settings/Options<tab>:NetrwSettings	'.":NetrwSettings\<cr>"
+   elseif !a:domenu
+    let s:netrwcnt = 0
+    let curwin     = winnr()
+    windo if getline(2) =~ "Netrw" | let s:netrwcnt= s:netrwcnt + 1 | endif
+    exe curwin."wincmd w"
+    
+    if s:netrwcnt <= 1
+"     call Decho("clear menus")
+     exe 'silent! unmenu '.g:NetrwTopLvlMenu.'Help'
+     exe 'silent! unmenu '.g:NetrwTopLvlMenu.'Apply\ Special\ Viewer'
+     exe 'silent! unmenu '.g:NetrwTopLvlMenu.'Bookmark\ Current\ Directory'
+     exe 'silent! unmenu '.g:NetrwTopLvlMenu.'Go\ Up\ Directory'
+     exe 'silent! unmenu '.g:NetrwTopLvlMenu.'Goto\ Bookmarked\ Directory'
+     exe 'silent! unmenu '.g:NetrwTopLvlMenu.'Change\ To\ Recently\ Used\ Directory'
+     exe 'silent! unmenu '.g:NetrwTopLvlMenu.'Change\ To\ Subsequently\ Used\ Directory'
+     exe 'silent! unmenu '.g:NetrwTopLvlMenu.'Delete\ File/Directory'
+     exe 'silent! unmenu '.g:NetrwTopLvlMenu.'Edit\ File/Directory'
+     exe 'silent! unmenu '.g:NetrwTopLvlMenu.'Edit\ File/Directory,\ New\ Window'
+     exe 'silent! unmenu '.g:NetrwTopLvlMenu.'Edit\ File/Directory,\ New\ Vertical\ Window'
+     exe 'silent! unmenu '.g:NetrwTopLvlMenu.'Edit\ File\ Hiding\ List'
+     exe 'silent! unmenu '.g:NetrwTopLvlMenu.'Edit\ File'
+     exe 'silent! unmenu '.g:NetrwTopLvlMenu.'Enter\ File/Directory'
+     exe 'silent! unmenu '.g:NetrwTopLvlMenu.'Enter\ File/Directory\ (vertical\ split)'
+     exe 'silent! unmenu '.g:NetrwTopLvlMenu.'List\ Bookmarks\ and\ History'
+     exe 'silent! unmenu '.g:NetrwTopLvlMenu.'Listing\ Style\ (thin-long-wide)'
+     exe 'silent! unmenu '.g:NetrwTopLvlMenu.'Make\ Subdirectory'
+     exe 'silent! unmenu '.g:NetrwTopLvlMenu.'Normal-Hide-Show'
+     exe 'silent! unmenu '.g:NetrwTopLvlMenu.'Obtain\ File'
+     exe 'silent! unmenu '.g:NetrwTopLvlMenu.'Preview\ File/Directory'
+     exe 'silent! unmenu '.g:NetrwTopLvlMenu.'Previous\ Window\ Browser'
+     exe 'silent! unmenu '.g:NetrwTopLvlMenu.'Refresh\ Listing'
+     exe 'silent! unmenu '.g:NetrwTopLvlMenu.'Rename\ File/Directory'
+     exe 'silent! unmenu '.g:NetrwTopLvlMenu.'Reverse\ Sorting\ Order'
+     exe 'silent! unmenu '.g:NetrwTopLvlMenu.'Select\ Sorting\ Style'
+     exe 'silent! unmenu '.g:NetrwTopLvlMenu.'Sorting\ Sequence\ Edit'
+     exe 'silent! unmenu '.g:NetrwTopLvlMenu.'Set\ Current\ Directory'
+     exe 'silent! unmenu '.g:NetrwTopLvlMenu.'Settings/Options'
+     unlet s:netrw_menu_enabled
     endif
-    exe 'silent! menu '.g:DrChipTopLvlMenu.'Netrw.Help<tab>?	?'
-    exe 'silent! menu '.g:DrChipTopLvlMenu.'Netrw.Apply\ Special\ Viewer<tab>x	x'
-    exe 'silent! menu '.g:DrChipTopLvlMenu.'Netrw.Bookmark\ Current\ Directory<tab>b	Nb'
-    exe 'silent! menu '.g:DrChipTopLvlMenu.'Netrw.Go\ Up\ Directory<tab>-	-'
-    exe 'silent! menu '.g:DrChipTopLvlMenu.'Netrw.Goto\ Bookmarked\ Directory<tab>B	NB'
-    exe 'silent! menu '.g:DrChipTopLvlMenu.'Netrw.Change\ To\ Recently\ Used\ Directory<tab>u	u'
-    exe 'silent! menu '.g:DrChipTopLvlMenu.'Netrw.Change\ To\ Subsequently\ Used\ Directory<tab>U	U'
-    exe 'silent! menu '.g:DrChipTopLvlMenu.'Netrw.Delete\ File/Directory<tab>D	D'
-    exe 'silent! menu '.g:DrChipTopLvlMenu.'Netrw.Edit\ File\ Hiding\ List<tab>'."<ctrl-h>	\<c-h>"
-    exe 'silent! menu '.g:DrChipTopLvlMenu.'Netrw.Edit\ File/Directory<tab><cr>	'."\<cr>"
-    exe 'silent! menu '.g:DrChipTopLvlMenu.'Netrw.Edit\ File/Directory,\ New\ Window<tab>o	o'
-    exe 'silent! menu '.g:DrChipTopLvlMenu.'Netrw.Edit\ File/Directory,\ New\ Vertical\ Window\ <tab>v	v'
-    exe 'silent! menu '.g:DrChipTopLvlMenu.'Netrw.List\ Bookmarks\ and\ History<tab>q	q'
-    exe 'silent! menu '.g:DrChipTopLvlMenu.'Netrw.Listing\ Style\ (thin-long-wide)<tab>i	i'
-    exe 'silent! menu '.g:DrChipTopLvlMenu.'Netrw.Make\ Subdirectory<tab>d	d'
-    exe 'silent! menu '.g:DrChipTopLvlMenu.'Netrw.Normal-Hide-Show<tab>a	a'
-    exe 'silent! menu '.g:DrChipTopLvlMenu.'Netrw.Obtain\ File<tab>O	O'
-    exe 'silent! menu '.g:DrChipTopLvlMenu.'Netrw.Preview\ File/Directory<tab>p	p'
-    exe 'silent! menu '.g:DrChipTopLvlMenu.'Netrw.Previous\ Window\ Browser<tab>P	P'
-    exe 'silent! menu '.g:DrChipTopLvlMenu.'Netrw.Refresh\ Listing<tab>'."<ctrl-l>	\<c-l>"
-    exe 'silent! menu '.g:DrChipTopLvlMenu.'Netrw.Rename\ File/Directory<tab>R	R'
-    exe 'silent! menu '.g:DrChipTopLvlMenu.'Netrw.Reverse\ Sorting\ Order<tab>'."r	r"
-    exe 'silent! menu '.g:DrChipTopLvlMenu.'Netrw.Select\ Sorting\ Style<tab>s	s'
-    exe 'silent! menu '.g:DrChipTopLvlMenu.'Netrw.Sorting\ Sequence\ Edit<tab>S	S'
-    exe 'silent! menu '.g:DrChipTopLvlMenu.'Netrw.Set\ Current\ Directory<tab>c	c'
-    exe 'silent! menu '.g:DrChipTopLvlMenu.'Netrw.Settings/Options<tab>:NetrwSettings	'.":NetrwSettings\<cr>"
-   else
-"    call Decho("clear menus")
-    exe 'silent! unmenu '.g:DrChipTopLvlMenu.'Netrw.Help'
-    exe 'silent! unmenu '.g:DrChipTopLvlMenu.'Netrw.Apply\ Special\ Viewer'
-    exe 'silent! unmenu '.g:DrChipTopLvlMenu.'Netrw.Bookmark\ Current\ Directory'
-    exe 'silent! unmenu '.g:DrChipTopLvlMenu.'Netrw.Go\ Up\ Directory'
-    exe 'silent! unmenu '.g:DrChipTopLvlMenu.'Netrw.Goto\ Bookmarked\ Directory'
-    exe 'silent! unmenu '.g:DrChipTopLvlMenu.'Netrw.Change\ To\ Recently\ Used\ Directory'
-    exe 'silent! unmenu '.g:DrChipTopLvlMenu.'Netrw.Change\ To\ Subsequently\ Used\ Directory'
-    exe 'silent! unmenu '.g:DrChipTopLvlMenu.'Netrw.Delete\ File/Directory'
-    exe 'silent! unmenu '.g:DrChipTopLvlMenu.'Netrw.Edit\ File\ Hiding\ List'
-    exe 'silent! unmenu '.g:DrChipTopLvlMenu.'Netrw.Edit\ File'
-    exe 'silent! unmenu '.g:DrChipTopLvlMenu.'Netrw.Enter\ File/Directory'
-    exe 'silent! unmenu '.g:DrChipTopLvlMenu.'Netrw.Enter\ File/Directory\ (vertical\ split)'
-    exe 'silent! unmenu '.g:DrChipTopLvlMenu.'Netrw.List\ Bookmarks\ and\ History'
-    exe 'silent! unmenu '.g:DrChipTopLvlMenu.'Netrw.Listing\ Style\ (thin-long-wide)'
-    exe 'silent! unmenu '.g:DrChipTopLvlMenu.'Netrw.Make\ Subdirectory'
-    exe 'silent! unmenu '.g:DrChipTopLvlMenu.'Netrw.Normal-Hide-Show'
-    exe 'silent! unmenu '.g:DrChipTopLvlMenu.'Netrw.Obtain\ File'
-    exe 'silent! unmenu '.g:DrChipTopLvlMenu.'Netrw.Preview\ File'
-    exe 'silent! unmenu '.g:DrChipTopLvlMenu.'Netrw.Previous\ Window\ Browser'
-    exe 'silent! unmenu '.g:DrChipTopLvlMenu.'Netrw.Refresh\ Listing'
-    exe 'silent! unmenu '.g:DrChipTopLvlMenu.'Netrw.Rename\ File/Directory'
-    exe 'silent! unmenu '.g:DrChipTopLvlMenu.'Netrw.Reverse\ Sorting\ Order'
-    exe 'silent! unmenu '.g:DrChipTopLvlMenu.'Netrw.Select\ Sorting\ Style'
-    exe 'silent! unmenu '.g:DrChipTopLvlMenu.'Netrw.Sorting\ Sequence\ Edit'
-    exe 'silent! unmenu '.g:DrChipTopLvlMenu.'Netrw.Set\ Current\ Directory'
-    exe 'silent! unmenu '.g:DrChipTopLvlMenu.'Netrw.Settings/Options'
    endif
 "   call Dret("NetMenu")
   endif
@@ -2766,7 +2786,7 @@ fun! netrw#DirBrowse(dirname)
 
   " set up menus
   let b:netrw_browser_active= 1
-  call s:NetMenu()
+  call s:NetMenu(1)
 
   " find buffer number of buffer named precisely the same as a:dirname
   let bufnum= bufnr(escape(a:dirname,'\'))
@@ -2793,7 +2813,7 @@ fun! netrw#DirBrowse(dirname)
   else
    exe "keepalt b ".bufnum
    if exists("s:last_sort_by") && g:netrw_sort_by == s:last_sort_by
-    if getline(2) =~ '^" Directory Listing '
+    if getline(2) =~ '^" Netrw Directory Listing '
      if !g:netrw_keepdir
 "      call Decho("change directory: cd ".b:netrw_curdir)
       exe 'cd '.escape(b:netrw_curdir,s:netrw_cd_escape)
@@ -2911,7 +2931,7 @@ fun! netrw#DirBrowse(dirname)
 "  call Decho("set up banner")
   keepjumps put ='\" ============================================================================'
   keepjumps 1d
-  keepjumps put ='\" Directory Listing                                              (netrw '.g:loaded_netrw.')'
+  keepjumps put ='\" Netrw Directory Listing                                        (netrw '.g:loaded_netrw.')'
   keepjumps put ='\"   '.b:netrw_curdir
   let w:netrw_bannercnt= 3
 
@@ -2956,7 +2976,7 @@ fun! netrw#DirBrowse(dirname)
 
   " set up syntax highlighting
   if has("syntax")
-   setlocal ft=netrwlist
+   setlocal ft=netrw
    if !exists("g:syntax_on") || !g:syntax_on
     setlocal ft=
    endif
@@ -2979,6 +2999,7 @@ fun! netrw#DirBrowse(dirname)
        exe 'silent keepjumps '.w:netrw_bannercnt.',$sort!'
       endif
      endif
+     " remove priority pattern prefix
      exe 'silent keepjumps '.w:netrw_bannercnt.',$s/^\d\{3}\///e'
 
     else
@@ -3025,12 +3046,12 @@ fun! s:LocalBrowseList()
   let dirname    = escape(b:netrw_curdir,s:netrw_glob_escape)
   let dirnamelen = strlen(b:netrw_curdir)
   let filelist   = glob(dirname."/*")
-"  call Decho("glob(dirname<".dirname.">,*)=".filelist)
+"  call Decho("glob(dirname<".dirname."/.*>)=".filelist)
   if filelist != ""
    let filelist= filelist."\n"
   endif
   let filelist= filelist.glob(dirname."/.*")
-"  call Decho("glob(dirname<".dirname.">,.*)=".glob(dirname.".*"))
+"  call Decho("glob(dirname<".dirname."/.*>)=".glob(dirname.".*"))
 
   " if the directory name includes a "$", and possibly other characters,
   " the glob() doesn't include "." and ".." entries.
@@ -3145,9 +3166,11 @@ fun! s:LocalBrowseChgDir(dirname,newdir,...)
     elseif g:netrw_browse_split == 2
      rightb vert new
      wincmd |
+    else
+     " handling a file, didn't split, so possibly remove menu
+     call s:NetMenu(0)
     endif
     exe "e! ".escape(dirname,s:netrw_cd_escape)
-    call s:NetMenu()
     set ma nomod
    endif
 
@@ -3177,8 +3200,9 @@ endfun
 " on the chance that s/he removed/created a file/directory with it.
 fun! s:LocalBrowseShellCmdRefresh()
 "  call Dfunc("LocalBrowseShellCmdRefresh() browselist=".string(s:netrw_browselist))
-  "  go through all buffers,
-  "  including unlisted (which is why I can't use bufdo)
+  "  GO through all buffers on netrw_browselist (ie. just local-netrw buffers):
+  "   | refresh any netrw window
+  "   | wipe out any non-displaying netrw buffer
   let curwin = winnr()
   let ibl    = 0
   for ibuf in s:netrw_browselist
@@ -4098,11 +4122,12 @@ fun! s:SetSort()
    let priority = priority + 1
   endwhile
 
-  " I'm afraid that I don't remember why the following line was present.  It
-  " has something to do with priority -- items that satisfy a two or more
-  " priority patterns get preceded by two or more priority patterns: ###/
-  " So, I want to remove priority patterns, but not ###/ directory names.
-  " Following pattern retains just one priority pattern.
+  " Following line associated with priority -- items that satisfy a priority
+  " pattern get prefixed by ###/ which permits easy sorting by priority.
+  " Sometimes files can satisfy multiple priority patterns -- only the latest
+  " priority pattern needs to be retained.  So, at this point, these excess
+  " priority prefixes need to be removed, but not directories that happen to
+  " be just digits themselves.
   exe 'silent keepjumps '.w:netrw_bannercnt.',$s/^\(\d\{3}\/\)\%(\d\{3}\/\)\+\ze./\1/e'
 
 "  call Dret("SetSort")

runtime/autoload/phpcomplete.vim

@@ -1,15 +1,14 @@
 " Vim completion script
 " Language:	PHP
 " Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
-" Last Change:	2006 Apr 05
+" Last Change:	2006 Apr 15
 "
 "   TODO:
 "   - Class aware completion:
-"      a) additional analize of tags file(s)
-"      b) "live" parsing of data, maybe with caching
+"      a) caching?
 "   - Switching to HTML (XML?) completion (SQL) inside of phpStrings
-"   - allow also for XML completion
-"   - better 'info', 'menu'
+"   - allow also for XML completion <- better do html_flavor for HTML
+"     completion
 "   - outside of <?php?> getting parent tag may cause problems. Heh, even in
 "     perfect conditions GetLastOpenTag doesn't cooperate... Inside of
 "     phpStrings this can be even a bonus but outside of <?php?> it is not the
@@ -563,12 +562,13 @@ function! phpcomplete#GetClassName(scontext) " {{{
 	exe 'silent! vimgrep /^'.object.'.*\$'.object.'.*=\s*new\s\+.*\tv\(\t\|$\)/j '.fnames
 	let qflist = getqflist()
 	if len(qflist) == 0
-		return []
+		return ''
+	else
+		" In all properly managed projects it should be one item list, even if it
+		" *is* longer we cannot solve conflicts, assume it is first element
+		let classname = matchstr(qflist[0]['text'], '=\s*new\s\+\zs[a-zA-Z_0-9\x7f-\xff]\+\ze')
+		return classname
 	endif
-	" In all properly managed projects it should be one item list, even if it
-	" *is* longer we cannot solve conflicts, assume it is first element
-	let classname = matchstr(qflist[0]['text'], '=\s*new\s\+\zs[a-zA-Z_0-9\x7f-\xff]\+\ze')
-	return classname
 
 endfunction
 " }}}
@@ -577,7 +577,7 @@ function! phpcomplete#GetClassLocation(classname) " {{{
 	for fname in tagfiles()
 		let fhead = fnamemodify(fname, ":h")
 		if fhead != ''
-			let psep = '/'
+			let psep = '/' " Note: slash is potential problem!
 			let fhead .= psep
 		endif
 		let fname = escape(fname, " \\")
@@ -587,9 +587,10 @@ function! phpcomplete#GetClassLocation(classname) " {{{
 		let classlocation = matchstr(qflist[0]['text'], '\t\zs\f\+\ze\t')
 		" And only one class location
 		if classlocation != ''
-			let pset = '/' " Note: slash is potential problem!
 			let classlocation = fhead.classlocation
 			return classlocation
+		else
+			return ''
 		endif
 	endfor
 

runtime/autoload/pythoncomplete.vim

@@ -1,4 +1,4 @@
-"pycomplete.vim - Omni Completion for python
+"pythoncomplete.vim - Omni Completion for python
 " Maintainer: Aaron Griffin
 " Version: 0.3
 " Last Updated: 23 January 2006
@@ -21,7 +21,7 @@ if !has('python')
     finish
 endif
 
-function! pycomplete#Complete(findstart, base)
+function! pythoncomplete#Complete(findstart, base)
     "findstart = 1 when we need to get the text length
     if a:findstart
         let line = getline('.')
@@ -43,7 +43,7 @@ function! pycomplete#Complete(findstart, base)
     "findstart = 0 when we need to return the list of completions
     else
         execute "python get_completions('" . a:base . "')"
-        return g:pycomplete_completions
+        return g:pythoncomplete_completions
     endif
 endfunction
 
@@ -64,7 +64,7 @@ LOCALDEFS = \
 def dbg(level,msg):
     debug_level = 1
     try:
-        debug_level = vim.eval("g:pycomplete_debug_level")
+        debug_level = vim.eval("g:pythoncomplete_debug_level")
     except:
         pass
     if level <= debug_level: print(msg)
@@ -119,9 +119,9 @@ def get_completions(base):
         else:
             completions.append(all)
         #dbg(10,"all completions: %s" % completions)
-        vim.command("let g:pycomplete_completions = %s" % completions)
+        vim.command("let g:pythoncomplete_completions = %s" % completions)
     except:
-        vim.command("let g:pycomplete_completions = []")
+        vim.command("let g:pythoncomplete_completions = []")
         #dbg(1,"exception: %s" % sys.exc_info()[1])
     clean_up()
 
@@ -346,6 +346,6 @@ sys.path.extend(['.','..'])
 PYTHONEOF
 endfunction
 
-let g:pycomplete_debug_level = 0
+let g:pythoncomplete_debug_level = 0
 call s:DefPython()
 " vim: set et ts=4:

runtime/autoload/rubycomplete.vim

@@ -0,0 +1,308 @@
+" Vim completion script
+" Language:				Ruby
+" Maintainer:			Mark Guzman ( segfault AT hasno DOT info )
+" Info:					$Id$
+" URL:					http://vim-ruby.rubyforge.org
+" Anon CVS:				See above site
+" Release Coordinator:	Doug Kearns <dougkearns@gmail.com>
+" ----------------------------------------------------------------------------
+"
+" Ruby IRB/Complete author: Keiju ISHITSUKA(keiju@ishitsuka.com)
+" ----------------------------------------------------------------------------
+
+if !has('ruby')
+    echo "Error: Required vim compiled with +ruby"
+    finish
+endif
+
+if version < 700
+    echo "Error: Required vim >= 7.0"
+    finish
+endif
+
+func! GetRubyVarType(v)
+	let stopline = 1
+	let vtp = ''
+	let pos = getpos('.')
+	let [lnum,lcol] = searchpos('^\s*#\s*@var\s*'.a:v.'\>\s\+[^ \t]\+\s*$','nb',stopline)
+	if lnum != 0 && lcol != 0
+		call setpos('.',pos)
+		let str = getline(lnum)
+		let vtp = substitute(str,'^\s*#\s*@var\s*'.a:v.'\>\s\+\([^ \t]\+\)\s*$','\1','')
+		return vtp
+	endif
+	call setpos('.',pos)
+	let [lnum,lcol] = searchpos(''.a:v.'\>\s*[+\-*/]*=\s*\([^ \t]\+.\(now\|new\|open\|get_instance\)\>\|[\[{"'']\)','nb',stopline)
+	if lnum != 0 && lcol != 0
+		let str = matchstr(getline(lnum),'=\s*\([^ \t]\+.\(now\|new\|open\|get_instance\)\>\|[\[{"'']\)',lcol)
+		let str = substitute(str,'^=\s*','','')
+		call setpos('.',pos)
+		if str == '"' || str == ''''
+			return 'String'
+		elseif str == '['
+			return 'Array'
+		elseif str == '{'
+			return 'Hash'
+		elseif strlen(str) > 4
+            let l = stridx(str,'.')
+			return str[0:l-1]
+		end
+		return ''
+	endif
+	call setpos('.',pos)
+    return ''
+endf
+
+function! rubycomplete#Complete(findstart, base)
+     "findstart = 1 when we need to get the text length
+    if a:findstart
+        let line = getline('.')
+        let idx = col('.')
+        while idx > 0
+            let idx -= 1
+            let c = line[idx-1]
+            if c =~ '\w'
+                continue
+            elseif ! c =~ '\.'
+                idx = -1
+                break
+            else
+                break
+            endif
+        endwhile
+
+        return idx
+    "findstart = 0 when we need to return the list of completions
+    else
+        execute "ruby get_completions('" . a:base . "')"
+        return g:rbcomplete_completions
+    endif
+endfunction
+
+
+function! s:DefRuby()
+ruby << RUBYEOF
+ReservedWords = [
+      "BEGIN", "END",
+      "alias", "and",
+      "begin", "break",
+      "case", "class",
+      "def", "defined", "do",
+      "else", "elsif", "end", "ensure",
+      "false", "for",
+      "if", "in",
+      "module",
+      "next", "nil", "not",
+      "or",
+      "redo", "rescue", "retry", "return",
+      "self", "super",
+      "then", "true",
+      "undef", "unless", "until",
+      "when", "while",
+      "yield",
+    ]
+
+Operators = [ "%", "&", "*", "**", "+",  "-",  "/",
+      "<", "<<", "<=", "<=>", "==", "===", "=~", ">", ">=", ">>",
+      "[]", "[]=", "^", ]
+
+def identify_type(var)
+    @buf = VIM::Buffer.current
+    enum = @buf.line_number
+    snum = (enum-10).abs
+    nums = Range.new( snum, enum )
+    regxs = '/.*(%s)\s*=(.*)/' % var
+    regx = Regexp.new( regxs )
+    nums.each do |x|
+        ln = @buf[x]
+        #print $~ if regx.match( ln )
+    end
+end
+
+def load_requires
+    @buf = VIM::Buffer.current
+    enum = @buf.line_number
+    nums = Range.new( 1, enum )
+    nums.each do |x|
+        ln = @buf[x]
+        begin
+            eval( "require %s" % $1 ) if /.*require\s*(.*)$/.match( ln )
+        rescue Exception
+            #ignore?
+        end
+    end
+end
+
+def get_completions(base)
+    load_requires
+    input = VIM::evaluate('expand("<cWORD>")')
+    input += base
+    message = nil
+
+
+    case input
+      when /^(\/[^\/]*\/)\.([^.]*)$/
+        # Regexp
+        receiver = $1
+        message = Regexp.quote($2)
+
+        candidates = Regexp.instance_methods(true)
+        select_message(receiver, message, candidates)
+
+      when /^([^\]]*\])\.([^.]*)$/
+        # Array
+        receiver = $1
+        message = Regexp.quote($2)
+
+        candidates = Array.instance_methods(true)
+        select_message(receiver, message, candidates)
+
+      when /^([^\}]*\})\.([^.]*)$/
+        # Proc or Hash
+        receiver = $1
+        message = Regexp.quote($2)
+
+        candidates = Proc.instance_methods(true) | Hash.instance_methods(true)
+        select_message(receiver, message, candidates)
+
+      when /^(:[^:.]*)$/
+        # Symbol
+        if Symbol.respond_to?(:all_symbols)
+          sym = $1
+          candidates = Symbol.all_symbols.collect{|s| ":" + s.id2name}
+          candidates.grep(/^#{sym}/)
+        else
+          []
+        end
+
+      when /^::([A-Z][^:\.\(]*)$/
+        # Absolute Constant or class methods
+        receiver = $1
+        candidates = Object.constants
+        candidates.grep(/^#{receiver}/).collect{|e| "::" + e}
+
+      when /^(((::)?[A-Z][^:.\(]*)+)::?([^:.]*)$/
+        # Constant or class methods
+        receiver = $1
+        message = Regexp.quote($4)
+        begin
+          candidates = eval("#{receiver}.constants | #{receiver}.methods")
+        rescue Exception
+          candidates = []
+        end
+        candidates.grep(/^#{message}/).collect{|e| receiver + "::" + e}
+
+      when /^(:[^:.]+)\.([^.]*)$/
+        # Symbol
+        receiver = $1
+        message = Regexp.quote($2)
+
+        candidates = Symbol.instance_methods(true)
+        select_message(receiver, message, candidates)
+
+      when /^([0-9_]+(\.[0-9_]+)?(e[0-9]+)?)\.([^.]*)$/
+        # Numeric
+        receiver = $1
+        message = Regexp.quote($4)
+
+        begin
+          candidates = eval(receiver).methods
+        rescue Exception
+          candidates
+        end
+        select_message(receiver, message, candidates)
+
+      when /^(\$[^.]*)$/
+	      candidates = global_variables.grep(Regexp.new(Regexp.quote($1)))
+
+#      when /^(\$?(\.?[^.]+)+)\.([^.]*)$/
+      when /^((\.?[^.]+)+)\.([^.]*)$/
+        # variable
+        receiver = $1
+        message = Regexp.quote($3)
+
+        cv = eval("self.class.constants")
+
+        vartype = VIM::evaluate("GetRubyVarType('%s')" % receiver)
+        if vartype != ''
+          candidates = eval("#{vartype}.instance_methods")
+        elsif (cv).include?(receiver)
+          # foo.func and foo is local var.
+          candidates = eval("#{receiver}.methods")
+        elsif /^[A-Z]/ =~ receiver and /\./ !~ receiver
+          # Foo::Bar.func
+          begin
+            candidates = eval("#{receiver}.methods")
+          rescue Exception
+            candidates = []
+          end
+        else
+          # func1.func2
+          candidates = []
+          ObjectSpace.each_object(Module){|m|
+            next if m.name != "IRB::Context" and
+              /^(IRB|SLex|RubyLex|RubyToken)/ =~ m.name
+            candidates.concat m.instance_methods(false)
+          }
+          candidates.sort!
+          candidates.uniq!
+        end
+        #identify_type( receiver )
+        select_message(receiver, message, candidates)
+
+    #when /^((\.?[^.]+)+)\.([^.]*)\(\s*\)*$/
+        #function call
+        #obj = $1
+        #func = $3
+
+      when /^\.([^.]*)$/
+	# unknown(maybe String)
+
+        receiver = ""
+        message = Regexp.quote($1)
+
+        candidates = String.instance_methods(true)
+        select_message(receiver, message, candidates)
+
+    else
+      candidates = eval("self.class.constants")
+
+      (candidates|ReservedWords).grep(/^#{Regexp.quote(input)}/)
+    end
+
+    #print candidates
+    if message != nil && message.length > 0
+        rexp = '^%s' % message.downcase
+        candidates.delete_if do |c|
+            c.downcase.match( rexp )
+            $~ == nil
+        end
+    end
+
+    outp = ""
+    #    tags = VIM::evaluate("taglist('^%s$')" %
+    (candidates-Object.instance_methods).each { |c| outp += "{'word':'%s','item':'%s'}," % [ c, c ] }
+    outp.sub!(/,$/, '')
+    VIM::command("let g:rbcomplete_completions = [%s]" % outp)
+end
+
+
+def select_message(receiver, message, candidates)
+  candidates.grep(/^#{message}/).collect do |e|
+    case e
+      when /^[a-zA-Z_]/
+        receiver + "." + e
+      when /^[0-9]/
+      when *Operators
+        #receiver + " " + e
+    end
+  end
+  candidates.delete_if { |x| x == nil }
+  candidates.uniq!
+  candidates.sort!
+end
+RUBYEOF
+endfunction
+
+call s:DefRuby()
+" vim: set et ts=4:

runtime/autoload/xml/xsl.vim

@@ -0,0 +1,37 @@
+let g:xmldata_xsl = {
+	\ 'apply-imports' : [[], {}],
+    \ 'apply-templates' : [['sort', 'with-param'], {'select' : [], 'mode' : []}],
+    \ 'attribute' : [[], {'name' : [], 'namespace' : []}],
+    \ 'attribute-set' : [['attribute'], {'name' : [], 'use-attribute-sets' : []}],
+    \ 'call-template' : [['with-param'], {'name' : []}],
+    \ 'choose' : [['when', 'otherwise'], {}],
+    \ 'comment' : [[], {}],
+    \ 'copy' : [[], {'use-attribute-sets' : []}],
+    \ 'copy-of' : [[], {'select' : []}],
+    \ 'decimal-format' : [[], {'name' : [], 'decimal-separator' : [], 'grouping-separator' : [], 'infinity' : [], 'minus-sign' : [], 'NaN' : [], 'percent' : [], 'per-mille' : [], 'zero-digit' : [], 'digit' : [], 'pattern-separator' : []}],
+    \ 'element' : [[], {'name' : [], 'namespace' : [], 'use-attribute-sets' : []}],
+    \ 'fallback' : [[], {}],
+    \ 'for-each' : [['sort'], {'select' : []}],
+    \ 'if' : [[], {'test' : []}],
+    \ 'import' : [[], {'href' : []}],
+    \ 'include' : [[], {'href' : []}],
+    \ 'key' : [[], {'name' : [], 'match' : [], 'use' : []}],
+    \ 'message' : [[], {'terminate' : ['yes', 'no']}],
+    \ 'namespace-alias' : [[], {'stylesheet-prefix' : ['#default'], 'result-prefix' : ['#default']}],
+    \ 'number' : [[], {'level' : ['single', 'multiple', 'any'], 'count' : [], 'from' : [], 'value' : [], 'format' : [], 'lang' : [], 'letter-value' : ['alphabetic', 'traditional'], 'grouping-separator' : [], 'grouping-size' : []}],
+    \ 'otherwise' : [[], {}],
+    \ 'output' : [[], {'method' : ['xml', 'html', 'text'], 'version' : [], 'encoding' : [], 'omit-xml-declaration' : ['yes', 'no'], 'standalone' : ['yes', 'no'], 'doctype-public' : [], 'doctype-system' : [], 'cdata-section-elements' : [], 'indent' : ['yes', 'no'], 'media-type' : []}],
+    \ 'param' : [[], {'name' : [], 'select' : []}],
+    \ 'preserve-space' : [[], {'elements' : []}],
+    \ 'processing-instruction' : [[], {'name' : []}],
+    \ 'sort' : [[], {'select' : [], 'lang' : [], 'data-type' : ['text', 'number'], 'order' : ['ascending', 'descending'], 'case-order' : ['upper-first', 'lower-first']}],
+    \ 'strip-space' : [[], {'elements' : []}],
+    \ 'stylesheet' : [['import', 'attribute-set', 'decimal-format', 'include', 'key', 'namespace-alias', 'output', 'param', 'preserve-space', 'strip-space', 'template'], {'id' : [], 'extension-element-prefixes' : [], 'version' : []}],
+    \ 'template' : [['param'], {'match' : [], 'name' : [], 'priority' : [], 'mode' : []}],
+    \ 'text' : [[], {'disable-output-escaping' : ['yes', 'no']}],
+    \ 'transform' : [['import', 'attribute-set', 'decimal-format', 'include', 'key', 'namespace-alias', 'output', 'param', 'preserve-space', 'strip-space', 'template'], {'id' : [], 'extension-element-prefixes' : [], 'exclude-result-prefixes' : [], 'version' : []}],
+    \ 'value-of' : [[], {'select' : [], 'disable-output-escaping' : ['yes', 'no']}],
+    \ 'variable' : [[], {'name' : [], 'select' : []}],
+    \ 'when' : [[], {'test' : []}],
+    \ 'with-param' : [[], {'name' : [], 'select' : []}]}
+

runtime/autoload/xmlcomplete.vim

@@ -1,7 +1,7 @@
 " Vim completion script
 " Language:	XML
 " Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
-" Last Change:	2006 Mar 31
+" Last Change:	2006 Apr 12
 
 " This function will create Dictionary with users namespace strings and values
 " canonical (system) names of data files.  Names should be lowercase,
@@ -11,7 +11,7 @@
 " Currently supported canonicals are:
 " xhtml10s - XHTML 1.0 Strict
 " xsl      - XSL
-function! xmlcomplete#CreateConnection(canonical, ...)
+function! xmlcomplete#CreateConnection(canonical, ...) " {{{
 
 	" When only one argument provided treat name as default namespace (without
 	" 'prefix:').
@@ -42,14 +42,16 @@ function! xmlcomplete#CreateConnection(canonical, ...)
 	let g:xmldata_connection[users] = a:canonical
 
 endfunction
+" }}}
 
-function! xmlcomplete#CreateEntConnection(...)
+function! xmlcomplete#CreateEntConnection(...) " {{{
 	if a:0 > 0
 		let g:xmldata_entconnect = a:1
 	else
 		let g:xmldata_entconnect = 'DEFAULT'
 	endif
 endfunction
+" }}}
 
 function! xmlcomplete#CompleteTags(findstart, base)
   if a:findstart
@@ -104,7 +106,7 @@ function! xmlcomplete#CompleteTags(findstart, base)
     return start
 
   else
-	" There is no connction of namespace and data file. Abandon action
+	" There is no connection of namespace and data file. Abandon action
 	if !exists("g:xmldata_connection") || g:xmldata_connection == {}
 		return []
 	endif
@@ -305,7 +307,6 @@ function! xmlcomplete#CompleteTags(findstart, base)
 	endif
 
 	" Complete text declaration
-	let g:co = context
 	if context =~ '^?'
 		let tags = ['?xml']
 
@@ -329,7 +330,7 @@ function! xmlcomplete#CompleteTags(findstart, base)
 	    let tags = keys(g:xmldata{'_'.g:xmldata_connection[b:xml_namespace]})
 		call filter(tags, 'v:val !~ "^vimxml"')
 	else
-		if !has_key(g:xmldata{'_'.g:xmldata_connection[b:xml_namespace]}, tag)
+		if !has_key(g:xmldata{'_'.g:xmldata_connection[b:xml_namespace]}, opentag)
 			" Abandon when data file isn't complete
 			return []
 		endif
@@ -346,6 +347,11 @@ function! xmlcomplete#CompleteTags(findstart, base)
 		endif
 	endfor
 	let menu = res + res2
+	if b:xml_namespace == 'DEFAULT'
+		let xml_namespace = ''
+	else
+		let xml_namespace = b:xml_namespace.':'
+	endif
 	if has_key(g:xmldata{'_'.g:xmldata_connection[b:xml_namespace]}, 'vimxmltaginfo')
 		let final_menu = []
 		for i in range(len(menu))
@@ -357,22 +363,18 @@ function! xmlcomplete#CompleteTags(findstart, base)
 				let m_menu = ''
 				let m_info = ''
 			endif
-			if b:xml_namespace == 'DEFAULT'
-				let xml_namespace = ''
-			else
-				let xml_namespace = b:xml_namespace.':'
-			endif
 			let final_menu += [{'word':xml_namespace.item, 'menu':m_menu, 'info':m_info}]
 		endfor
 	else
-		let final_menu = menu
+		let final_menu = map(menu, 'xml_namespace.v:val')
 	endif
+
 	return final_menu
 
   endif
 endfunction
 
-" MM: This is greatly reduced closetag.vim used with kind permission of Steven
+" MM: This is severely reduced closetag.vim used with kind permission of Steven
 "     Mueller
 "     Changes: strip all comments; delete error messages; add checking for
 "     namespace
@@ -510,3 +512,4 @@ endfunction
 function! s:Clearstack(sname)
 	exe 'let '.a:sname."=''"
 endfunction
+" vim:set foldmethod=marker:

runtime/autoload/zip.vim

@@ -1,7 +1,7 @@
 " zip.vim: Handles browsing zipfiles
 "            AUTOLOAD PORTION
-" Date:			Mar 22, 2006
-" Version:		7
+" Date:			Apr 10, 2006
+" Version:		8
 " Maintainer:	Charles E Campbell, Jr <drchipNOSPAM at campbellfamily dot biz>
 " License:		Vim License  (see vim's :help license)
 " Copyright:    Copyright (C) 2005 Charles E. Campbell, Jr. {{{1
@@ -22,7 +22,7 @@ if exists("g:loaded_zip")
  finish
 endif
 
-let g:loaded_zip     = "v7"
+let g:loaded_zip     = "v8"
 let s:zipfile_escape = ' ?&;\'
 
 " ----------------
@@ -83,7 +83,9 @@ fun! zip#Browse(zipfile)
   4,$g/^\s*----/d
   4,$g/^\s*\a/d
   $d
-  exe 'silent 4,$s/^.*\%'.namecol.'c//'
+  if namecol > 0
+   exe 'silent 4,$s/^.*\%'.namecol.'c//'
+  endif
 
   setlocal noma nomod ro
   noremap <silent> <buffer> <cr> :call <SID>ZipBrowseSelect()<cr>

runtime/colors/delek.vim

@@ -1,57 +1,51 @@
 " Vim color file
 " Maintainer:	David Schweikert <dws@ee.ethz.ch>
-" Last Change:	2004 May 16
+" Last Change:	2006 Apr 14
 
-" First remove all existing highlighting.
 hi clear
 
 let colors_name = "delek"
 
-hi Normal guifg=Black guibg=white
+" Normal should come first
+hi Normal     guifg=Black  guibg=White
+hi Cursor     guifg=bg     guibg=fg
+hi lCursor    guifg=NONE   guibg=Cyan
 
-" Groups used in the 'highlight' and 'guicursor' options default value.
-hi ErrorMsg term=standout ctermbg=DarkRed ctermfg=White guibg=Red guifg=White
-hi IncSearch term=reverse cterm=reverse gui=reverse
-hi ModeMsg term=bold cterm=bold gui=bold
-hi VertSplit term=reverse cterm=reverse gui=reverse
-hi Visual term=reverse cterm=reverse gui=reverse guifg=Grey guibg=fg
-hi VisualNOS term=underline,bold cterm=underline,bold gui=underline,bold
-hi DiffText term=reverse cterm=bold ctermbg=Red gui=bold guibg=Red
-hi Cursor guibg=Green guifg=NONE
-hi lCursor guibg=Cyan guifg=NONE
-hi Directory term=bold ctermfg=DarkBlue guifg=Blue
-hi LineNr term=underline ctermfg=Brown guifg=Brown
-hi MoreMsg term=bold ctermfg=DarkGreen gui=bold guifg=SeaGreen
-hi Question term=standout ctermfg=DarkGreen gui=bold guifg=SeaGreen
-hi Search term=reverse ctermbg=Yellow ctermfg=NONE guibg=Yellow guifg=NONE
-hi SpecialKey term=bold ctermfg=DarkBlue guifg=Blue
-hi Title term=bold ctermfg=DarkMagenta gui=bold guifg=Magenta
-hi WarningMsg term=standout ctermfg=DarkRed guifg=Red
-hi WildMenu term=standout ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black
-hi Folded term=standout ctermbg=Grey ctermfg=DarkBlue guibg=LightGrey guifg=DarkBlue
-hi FoldColumn term=standout ctermbg=Grey ctermfg=DarkBlue guibg=Grey guifg=DarkBlue
-hi DiffAdd term=bold ctermbg=LightBlue guibg=LightBlue
-hi DiffChange term=bold ctermbg=LightMagenta guibg=LightMagenta
-hi DiffDelete term=bold ctermfg=Blue ctermbg=LightCyan gui=bold guifg=Blue guibg=LightCyan
-
-hi StatusLine	cterm=bold ctermbg=blue ctermfg=yellow guibg=gold guifg=blue
-hi StatusLineNC	cterm=bold ctermbg=blue ctermfg=black  guibg=gold guifg=blue
-hi NonText term=bold ctermfg=Blue gui=bold guifg=gray guibg=white
-hi Cursor guibg=fg guifg=bg
+" Note: we never set 'term' because the defaults for B&W terminals are OK
+hi DiffAdd    ctermbg=LightBlue    guibg=LightBlue
+hi DiffChange ctermbg=LightMagenta guibg=LightMagenta
+hi DiffDelete ctermfg=Blue         ctermbg=LightCyan gui=bold guifg=Blue guibg=LightCyan
+hi DiffText   ctermbg=Red          cterm=bold gui=bold guibg=Red
+hi Directory  ctermfg=DarkBlue     guifg=Blue
+hi ErrorMsg   ctermfg=White        ctermbg=DarkRed  guibg=Red       guifg=White
+hi FoldColumn ctermfg=DarkBlue     ctermbg=Grey     guibg=Grey      guifg=DarkBlue
+hi Folded     ctermbg=Grey         ctermfg=DarkBlue guibg=LightGrey guifg=DarkBlue
+hi IncSearch  cterm=reverse        gui=reverse
+hi LineNr     ctermfg=Brown        guifg=Brown
+hi ModeMsg    cterm=bold           gui=bold
+hi MoreMsg    ctermfg=DarkGreen    gui=bold guifg=SeaGreen
+hi NonText    ctermfg=Blue         gui=bold guifg=gray guibg=white
+hi Pmenu      guibg=LightBlue
+hi PmenuSel   ctermfg=White        ctermbg=DarkBlue  guifg=White  guibg=DarkBlue
+hi Question   ctermfg=DarkGreen    gui=bold guifg=SeaGreen
+hi Search     ctermfg=NONE         ctermbg=Yellow guibg=Yellow guifg=NONE
+hi SpecialKey ctermfg=DarkBlue     guifg=Blue
+hi StatusLine cterm=bold           ctermbg=blue ctermfg=yellow guibg=gold guifg=blue
+hi StatusLineNC	cterm=bold         ctermbg=blue ctermfg=black  guibg=gold guifg=blue
+hi Title      ctermfg=DarkMagenta  gui=bold guifg=Magenta
+hi VertSplit  cterm=reverse        gui=reverse
+hi Visual     ctermbg=NONE         cterm=reverse gui=reverse guifg=Grey guibg=fg
+hi VisualNOS  cterm=underline,bold gui=underline,bold
+hi WarningMsg ctermfg=DarkRed      guifg=Red
+hi WildMenu   ctermfg=Black        ctermbg=Yellow    guibg=Yellow guifg=Black
 
 " syntax highlighting
-hi PreProc    term=underline cterm=NONE ctermfg=darkmagenta  gui=NONE guifg=magenta3
-hi Identifier term=underline cterm=NONE ctermfg=darkcyan     gui=NONE guifg=cyan4
-hi Comment    term=NONE      cterm=NONE ctermfg=darkred      gui=NONE guifg=red2
-hi Constant   term=underline cterm=NONE ctermfg=darkgreen    gui=NONE guifg=green3
-hi Special    term=bold      cterm=NONE ctermfg=lightred     gui=NONE guifg=deeppink
-hi Statement  term=bold      cterm=bold ctermfg=blue	     gui=bold guifg=blue
-hi Type	      term=underline cterm=NONE ctermfg=blue	     gui=bold guifg=blue
-
-if exists("syntax_on")
-  let syntax_cmd = "enable"
-  runtime syntax/syncolor.vim
-  unlet syntax_cmd
-endif
+hi Comment    cterm=NONE ctermfg=DarkRed     gui=NONE guifg=red2
+hi Constant   cterm=NONE ctermfg=DarkGreen   gui=NONE guifg=green3
+hi Identifier cterm=NONE ctermfg=DarkCyan    gui=NONE guifg=cyan4
+hi PreProc    cterm=NONE ctermfg=DarkMagenta gui=NONE guifg=magenta3
+hi Special    cterm=NONE ctermfg=LightRed    gui=NONE guifg=deeppink
+hi Statement  cterm=bold ctermfg=Blue	     gui=bold guifg=blue
+hi Type	      cterm=NONE ctermfg=Blue	     gui=bold guifg=blue
 
 " vim: sw=2

runtime/colors/evening.vim

@@ -1,6 +1,6 @@
 " Vim color file
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2001 May 21
+" Last Change:	2006 Apr 14
 
 " This color scheme uses a dark grey background.
 
@@ -22,7 +22,7 @@ hi ModeMsg term=bold cterm=bold gui=bold
 hi StatusLine term=reverse,bold cterm=reverse,bold gui=reverse,bold
 hi StatusLineNC term=reverse cterm=reverse gui=reverse
 hi VertSplit term=reverse cterm=reverse gui=reverse
-hi Visual term=reverse cterm=reverse gui=reverse guifg=Grey guibg=fg
+hi Visual term=reverse ctermbg=black guibg=grey60
 hi VisualNOS term=underline,bold cterm=underline,bold gui=underline,bold
 hi DiffText term=reverse cterm=bold ctermbg=Red gui=bold guibg=Red
 hi Cursor guibg=Green guifg=Black
@@ -42,6 +42,8 @@ hi FoldColumn term=standout ctermbg=LightGrey ctermfg=DarkBlue guibg=Grey guifg=
 hi DiffAdd term=bold ctermbg=DarkBlue guibg=DarkBlue
 hi DiffChange term=bold ctermbg=DarkMagenta guibg=DarkMagenta
 hi DiffDelete term=bold ctermfg=Blue ctermbg=DarkCyan gui=bold guifg=Blue guibg=DarkCyan
+hi CursorColumn term=reverse ctermbg=Black guibg=grey40
+hi CursorLine term=underline cterm=underline guibg=grey40
 
 " Groups for syntax highlighting
 hi Constant term=underline ctermfg=Magenta guifg=#ffa0a0 guibg=grey5

runtime/colors/morning.vim

@@ -1,6 +1,6 @@
 " Vim color file
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2001 May 21
+" Last Change:	2006 Apr 15
 
 " This color scheme uses a light grey background.
 
@@ -22,7 +22,7 @@ hi ModeMsg term=bold cterm=bold gui=bold
 hi StatusLine term=reverse,bold cterm=reverse,bold gui=reverse,bold
 hi StatusLineNC term=reverse cterm=reverse gui=reverse
 hi VertSplit term=reverse cterm=reverse gui=reverse
-hi Visual term=reverse cterm=reverse gui=reverse guifg=Grey guibg=fg
+hi Visual term=reverse ctermbg=grey guibg=grey80
 hi VisualNOS term=underline,bold cterm=underline,bold gui=underline,bold
 hi DiffText term=reverse cterm=bold ctermbg=Red gui=bold guibg=Red
 hi Cursor guibg=Green guifg=NONE
@@ -42,6 +42,8 @@ hi FoldColumn term=standout ctermbg=Grey ctermfg=DarkBlue guibg=Grey guifg=DarkB
 hi DiffAdd term=bold ctermbg=LightBlue guibg=LightBlue
 hi DiffChange term=bold ctermbg=LightMagenta guibg=LightMagenta
 hi DiffDelete term=bold ctermfg=Blue ctermbg=LightCyan gui=bold guifg=Blue guibg=LightCyan
+hi CursorLine term=underline cterm=underline guibg=grey80
+hi CursorColumn term=reverse ctermbg=grey guibg=grey80
 
 " Colors for syntax highlighting
 hi Constant term=underline ctermfg=DarkRed guifg=Magenta guibg=grey95

runtime/colors/slate.vim

@@ -28,7 +28,7 @@ endif
 :hi Visual gui=none guifg=khaki guibg=olivedrab cterm=reverse
 :hi WarningMsg guifg=salmon ctermfg=1
 :hi String guifg=SkyBlue ctermfg=darkcyan
-:hi Comment term=bold ctermfg=11 guifg=#80a0ff
+:hi Comment term=bold ctermfg=11 guifg=grey40
 :hi Constant guifg=#ffa0a0 ctermfg=brown
 :hi Special guifg=green ctermfg=brown
 :hi Identifier guifg=salmon ctermfg=red

runtime/compiler/eruby.vim

@@ -1,10 +1,10 @@
 " Vim compiler file
-" Language:	eRuby
-" Maintainer:	Doug Kearns <djkea2 at gus.gscit.monash.edu.au>
-" Info:		$Id$
-" URL:		http://vim-ruby.rubyforge.org
-" Anon CVS:	See above site
-" ----------------------------------------------------------------------------
+" Language:		eRuby
+" Maintainer:		Doug Kearns <dougkearns@gmail.com>
+" Info:			$Id$
+" URL:			http://vim-ruby.rubyforge.org
+" Anon CVS:		See above site
+" Release Coordinator:	Doug Kearns <dougkearns@gmail.com>
 
 if exists("current_compiler")
   finish

runtime/compiler/ruby.vim

@@ -1,10 +1,11 @@
 " Vim compiler file
-" Language:	Ruby
-" Function:	Syntax check and/or error reporting
-" Maintainer:	Tim Hammerquist <timh at rubyforge.org>
-" Info:		$Id$
-" URL:		http://vim-ruby.rubyforge.org
-" Anon CVS:	See above site
+" Language:		Ruby
+" Function:		Syntax check and/or error reporting
+" Maintainer:		Tim Hammerquist <timh at rubyforge.org>
+" Info:			$Id$
+" URL:			http://vim-ruby.rubyforge.org
+" Anon CVS:		See above site
+" Release Coordinator:	Doug Kearns <dougkearns@gmail.com>
 " ----------------------------------------------------------------------------
 "
 " Changelog:

runtime/compiler/rubyunit.vim

@@ -1,10 +1,10 @@
 " Vim compiler file
-" Language:	Test::Unit - Ruby Unit Testing Framework
-" Maintainer:	Doug Kearns <djkea2 at gus.gscit.monash.edu.au>
-" Info:		$Id$
-" URL:		http://vim-ruby.rubyforge.org
-" Anon CVS:	See above site
-" ----------------------------------------------------------------------------
+" Language:		Test::Unit - Ruby Unit Testing Framework
+" Maintainer:		Doug Kearns <dougkearns@gmail.com>
+" Info:			$Id$
+" URL:			http://vim-ruby.rubyforge.org
+" Anon CVS:		See above site
+" Release Coordinator:	Doug Kearns <dougkearns@gmail.com>
 
 if exists("current_compiler")
   finish

runtime/doc/arabic.txt

@@ -1,4 +1,4 @@
-*arabic.txt*	For Vim version 7.0d.  Last change: 2005 Mar 29
+*arabic.txt*	For Vim version 7.0e.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL	  by Nadim Shaikli

runtime/doc/autocmd.txt

@@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 7.0d.  Last change: 2006 Apr 07
+*autocmd.txt*   For Vim version 7.0e.  Last change: 2006 Apr 07
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/change.txt

@@ -1,4 +1,4 @@
-*change.txt*    For Vim version 7.0d.  Last change: 2006 Apr 09
+*change.txt*    For Vim version 7.0e.  Last change: 2006 Apr 11
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1508,7 +1508,7 @@ Vim has a sorting function and a sorting command.  The sorting function can be
 found here: |sort()|.
 
 							*:sor* *:sort*
-:[range]sor[t][!] [i][u][n][x][o] [/{pattern}/]
+:[range]sor[t][!] [i][u][r][n][x][o] [/{pattern}/]
 			Sort lines in [range].  When no range is given all
 			lines are sorted.
 
@@ -1517,24 +1517,25 @@ found here: |sort()|.
 			With [i] case is ignored.
 
 			With [n] sorting is done on the first decimal number
-			in the line (after a {pattern} match).
+			in the line (after or inside a {pattern} match).
 
 			With [x] sorting is done on the first hexadecimal
-			number in the line (after a {pattern} match).  A
-			leading "0x" or "0X" is ignored.
+			number in the line (after or inside a {pattern}
+			match).  A leading "0x" or "0X" is ignored.
 
 			With [o] sorting is done on the first octal number in
-			the line (after a {pattern} match).
+			the line (after or inside a {pattern} match).
 
 			With [u] only keep the first of a sequence of
 			identical lines (ignoring case when [i] is used).
+			Without this flag, a sequence of identical lines
+			will be kept in their original order.
 			Note that leading and trailing white space may cause
 			lines to be different.
 
-			When /{pattern}/ is specified the text matched with
-			{pattern} is skipped, so that you sort on what comes
-			after the match.  For lines without a match sorting
-			starts in the first column (e.g., for empty lines).
+			When /{pattern}/ is specified and there is no [r] flag
+			the text matched with {pattern} is skipped, so that
+			you sort on what comes after the match.
 			Instead of the slash any non-letter can be used.
 			For example, to sort on the second comma-separated
 			field: >
@@ -1545,7 +1546,21 @@ found here: |sort()|.
 <			To sort on the first number in the line, no matter
 			what is in front of it: >
 				:sort /.*\ze\d/
-<
+
+<			With [r] sorting is done on the matching {pattern}
+			instead of skipping past it as described above.
+			For example, to sort on only the first three letters
+			of each line: >
+				:sort /\a\a\a/ r
+
+<			If a {pattern} is used, any lines which don't have a
+			match for {pattern} are kept in their current order,
+			but separate from the lines which do match {pattern}.
+			If you sorted in reverse, they will be in reverse
+			order after the sorted lines, otherwise they will be
+			in their original order, right before the sorted
+			lines.
+
 Note that using ":sort" with ":global" doesn't sort the matching lines, it's
 quite useless.
 
@@ -1553,8 +1568,8 @@ The details about sorting depend on the library function used.  There is no
 guarantee that sorting is "stable" or obeys the current locale.  You will have
 to try it out.
 
-The sorting itself cannot be interrupted, because of using a system library
-function.  You can interrupt the preparation (for undo) and putting the sorted
-lines into the buffer.  In the last case you may end up with duplicated lines.
+The sorting can be interrupted, but if you interrupt it too late in the
+process you may end up with duplicated lines.  This also depends on the system
+library function used.
 
  vim:tw=78:ts=8:ft=help:norl:

runtime/doc/cmdline.txt

@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 7.0d.  Last change: 2006 Mar 16
+*cmdline.txt*   For Vim version 7.0e.  Last change: 2006 Mar 16
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/debug.txt

@@ -1,4 +1,4 @@
-*debug.txt*     For Vim version 7.0d.  Last change: 2005 Dec 17
+*debug.txt*     For Vim version 7.0e.  Last change: 2005 Dec 17
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/debugger.txt

@@ -1,4 +1,4 @@
-*debugger.txt*  For Vim version 7.0d.  Last change: 2005 Mar 29
+*debugger.txt*  For Vim version 7.0e.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Gordon Prieur

runtime/doc/develop.txt

@@ -1,4 +1,4 @@
-*develop.txt*   For Vim version 7.0d.  Last change: 2006 Mar 09
+*develop.txt*   For Vim version 7.0e.  Last change: 2006 Mar 09
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/diff.txt

@@ -1,4 +1,4 @@
-*diff.txt*      For Vim version 7.0d.  Last change: 2006 Apr 04
+*diff.txt*      For Vim version 7.0e.  Last change: 2006 Apr 14
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -206,7 +206,8 @@ The diffs are highlighted with these groups:
 				(searching from the end of the line).  The
 				text in between is highlighted.  This means
 				that parts in the middle that are still the
-				same are highlighted anyway.
+				same are highlighted anyway.  Only "iwhite" of
+				'diffopt' is used here.
 |hl-DiffDelete| DiffDelete	Deleted lines.  Also called filler lines,
 				because they don't really exist in this
 				buffer.

runtime/doc/digraph.txt

@@ -1,4 +1,4 @@
-*digraph.txt*   For Vim version 7.0d.  Last change: 2005 Sep 11
+*digraph.txt*   For Vim version 7.0e.  Last change: 2005 Sep 11
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/editing.txt

@@ -1,4 +1,4 @@
-*editing.txt*   For Vim version 7.0d.  Last change: 2006 Apr 06
+*editing.txt*   For Vim version 7.0e.  Last change: 2006 Apr 17
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1213,7 +1213,7 @@ also makes a difference for executing external commands, e.g. ":!ls".
 Changing directory fails when the current buffer is modified, the '.' flag is
 present in 'cpoptions' and "!" is not used in the command.
 
-							*:cd* *E472*
+							*:cd* *E747* *E472*
 :cd[!]			On non-Unix systems: Print the current directory
 			name.  On Unix systems: Change the current directory
 			to the home directory.  Use |:pwd| to print the

runtime/doc/eval.txt

@@ -1,4 +1,4 @@
-*eval.txt*      For Vim version 7.0d.  Last change: 2006 Apr 09
+*eval.txt*      For Vim version 7.0e.  Last change: 2006 Apr 15
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -198,6 +198,11 @@ available. >
 	:let shortlist = mylist[2:2]	" List with one item: [3]
 	:let otherlist = mylist[:]	" make a copy of the List
 
+If the second index is equal to or greater than the length of the list there
+is no error and the length minus one is used: >
+	:let mylist = [0, 1, 2, 3]
+	:echo mylist[2:8]		" result: [2, 3]
+
 The second index can be just before the first index.  In that case the result
 is an empty list.  If the second index is lower, this results in an error. >
 	:echo mylist[2:1]		" result: []
@@ -1592,6 +1597,8 @@ getpos( {expr})			List	position of cursor, mark, etc.
 getqflist()			List	list of quickfix items
 getreg( [{regname} [, 1]])	String	contents of register
 getregtype( [{regname}])	String	type of register
+gettabwinvar( {tabnr}, {winnr}, {name})
+				any	{name} in {winnr} in tab page {tabnr}
 getwinposx()			Number	X coord in pixels of GUI Vim window
 getwinposy()			Number	Y coord in pixels of GUI Vim window
 getwinvar( {nr}, {varname})	any	variable {varname} in window {nr}
@@ -1697,6 +1704,8 @@ setloclist( {nr}, {list}[, {action}])
 setpos( {expr}, {list})		none	set the {expr} position to {list}
 setqflist( {list}[, {action}])	Number	modify quickfix list using {list}
 setreg( {n}, {v}[, {opt}])	Number	set register to value and type
+settabwinvar( {tabnr}, {winnr}, {varname}, {val})    set {varname} in window
+					{winnr} in tab page {tabnr} to {val}
 setwinvar( {nr}, {varname}, {val})	set {varname} in window {nr} to {val}
 simplify( {filename})		String	simplify filename as much as possible
 sort( {list} [, {func}])	List	sort {list}, using {func} to compare
@@ -2860,6 +2869,20 @@ getregtype([{regname}])					*getregtype()*
 		<CTRL-V> is one character with value 0x16.
 		If {regname} is not specified, |v:register| is used.
 
+gettabwinvar({tabnr}, {winnr}, {varname})		*gettabwinvar()*
+		Get the value of an option or local window variable {varname}
+		in window {winnr} in tab page {tabnr}.
+		Tabs are numbered starting with one.  For the current tabpage
+		use |getwinvar()|.
+		When {winnr} is zero the current window is used.
+		This also works for a global option, buffer-local option and
+		window-local option, but it doesn't work for a global variable
+		or buffer-local variable.
+		Note that the name without "w:" must be used.
+		Examples: >
+			:let list_is_on = gettabwinvar(1, 2, '&list')
+			:echo "myvar = " . gettabwinvar(3, 1, 'myvar')
+
 							*getwinposx()*
 getwinposx()	The result is a Number, which is the X coordinate in pixels of
 		the left hand side of the GUI Vim window.  The result will be
@@ -2870,14 +2893,8 @@ getwinposy()	The result is a Number, which is the Y coordinate in pixels of
 		the top of the GUI Vim window.  The result will be -1 if the
 		information is not available.
 
-getwinvar({nr}, {varname})				*getwinvar()*
-		The result is the value of option or local window variable
-		{varname} in window {nr}.  When {nr} is zero the current
-		window is used.
-		This also works for a global option, buffer-local option and
-		window-local option, but it doesn't work for a global variable
-		or buffer-local variable.
-		Note that the name without "w:" must be used.
+getwinvar({winnr}, {varname})				*getwinvar()*
+		Like |gettabwinvar()| for the current tabpage.
 		Examples: >
 			:let list_is_on = getwinvar(2, '&list')
 			:echo "myvar = " . getwinvar(1, 'myvar')
@@ -4354,17 +4371,28 @@ setreg({regname}, {value} [,{options}])
 		nothing: >
 			:call setreg('a', '', 'al')
 
-setwinvar({nr}, {varname}, {val})			*setwinvar()*
-		Set option or local variable {varname} in window {nr} to
-		{val}.  When {nr} is zero the current window is used.
+settabwinvar({tabnr}, {winnr}, {varname}, {val})	*settabwinvar()*
+		Set option or local variable {varname} in window {winnr} to
+		{val}.
+		Tabs are numbered starting with one.  For the current tabpage
+		use |setwinvar()|.
+		When {winnr} is zero the current window is used.
 		This also works for a global or local buffer option, but it
 		doesn't work for a global or local buffer variable.
 		For a local buffer option the global value is unchanged.
 		Note that the variable name without "w:" must be used.
+		Vim briefly goes to the tab page {tabnr}, this may trigger
+		TabLeave and TabEnter autocommands.
+		Examples: >
+			:call settabwinvar(1, 1, "&list", 0)
+			:call settabwinvar(3, 2, "myvar", "foobar")
+<		This function is not available in the |sandbox|.
+
+setwinvar({nr}, {varname}, {val})			*setwinvar()*
+		Like |settabwinvar()| for the current tab page.
 		Examples: >
 			:call setwinvar(1, "&list", 0)
 			:call setwinvar(2, "myvar", "foobar")
-<		This function is not available in the |sandbox|.
 
 simplify({filename})					*simplify()*
 		Simplify the file name as much as possible without changing

runtime/doc/farsi.txt

@@ -1,4 +1,4 @@
-*farsi.txt*     For Vim version 7.0d.  Last change: 2005 Mar 29
+*farsi.txt*     For Vim version 7.0e.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Mortaza Ghassab Shiran

runtime/doc/filetype.txt

@@ -1,4 +1,4 @@
-*filetype.txt*  For Vim version 7.0d.  Last change: 2006 Mar 24
+*filetype.txt*  For Vim version 7.0e.  Last change: 2006 Mar 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/fold.txt

@@ -1,4 +1,4 @@
-*fold.txt*      For Vim version 7.0d.  Last change: 2006 Mar 29
+*fold.txt*      For Vim version 7.0e.  Last change: 2006 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/getscript.txt

@@ -1,4 +1,4 @@
-*getscript.txt*	For Vim version 7.0d.  Last change: 2006 Mar 24
+*getscript.txt*	For Vim version 7.0e.  Last change: 2006 Mar 24
 
 		Get the Latest VimScripts
 

runtime/doc/gui.txt

@@ -1,4 +1,4 @@
-*gui.txt*       For Vim version 7.0d.  Last change: 2006 Apr 02
+*gui.txt*       For Vim version 7.0e.  Last change: 2006 Apr 02
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/gui_w16.txt

@@ -1,4 +1,4 @@
-*gui_w16.txt*   For Vim version 7.0d.  Last change: 2005 Mar 29
+*gui_w16.txt*   For Vim version 7.0e.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/gui_w32.txt

@@ -1,4 +1,4 @@
-*gui_w32.txt*   For Vim version 7.0d.  Last change: 2005 Mar 29
+*gui_w32.txt*   For Vim version 7.0e.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/gui_x11.txt

@@ -1,4 +1,4 @@
-*gui_x11.txt*   For Vim version 7.0d.  Last change: 2005 Dec 06
+*gui_x11.txt*   For Vim version 7.0e.  Last change: 2005 Dec 06
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/hangulin.txt

@@ -1,4 +1,4 @@
-*hangulin.txt*  For Vim version 7.0d.  Last change: 2006 Apr 02
+*hangulin.txt*  For Vim version 7.0e.  Last change: 2006 Apr 02
 
 
 		  VIM REFERENCE MANUAL    by Chi-Deok Hwang and Sung-Hyun Nam

runtime/doc/hebrew.txt

@@ -1,4 +1,4 @@
-*hebrew.txt*    For Vim version 7.0d.  Last change: 2003 May 11
+*hebrew.txt*    For Vim version 7.0e.  Last change: 2003 May 11
 
 
 	   VIM REFERENCE MANUAL    by Ron Aaron (and Avner Lottem)

runtime/doc/help.txt

@@ -1,4 +1,4 @@
-*help.txt*	For Vim version 7.0d.  Last change: 2006 Apr 02
+*help.txt*	For Vim version 7.0e.  Last change: 2006 Apr 02
 
 			VIM - main help file
 									 k

runtime/doc/howto.txt

@@ -1,4 +1,4 @@
-*howto.txt*	For Vim version 7.0d.  Last change: 2006 Apr 02
+*howto.txt*	For Vim version 7.0e.  Last change: 2006 Apr 02
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar

runtime/doc/if_cscop.txt

@@ -1,4 +1,4 @@
-*if_cscop.txt*  For Vim version 7.0d.  Last change: 2005 Mar 29
+*if_cscop.txt*  For Vim version 7.0e.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Andy Kahn

runtime/doc/if_mzsch.txt

@@ -1,4 +1,4 @@
-*if_mzsch.txt*  For Vim version 7.0d.  Last change: 2006 Mar 06
+*if_mzsch.txt*  For Vim version 7.0e.  Last change: 2006 Mar 06
 
 
 		  VIM REFERENCE MANUAL    by Sergey Khorev

runtime/doc/if_ole.txt

@@ -1,4 +1,4 @@
-*if_ole.txt*    For Vim version 7.0d.  Last change: 2006 Mar 06
+*if_ole.txt*    For Vim version 7.0e.  Last change: 2006 Mar 06
 
 
 		  VIM REFERENCE MANUAL    by Paul Moore

runtime/doc/if_perl.txt

@@ -1,4 +1,4 @@
-*if_perl.txt*   For Vim version 7.0d.  Last change: 2006 Mar 06
+*if_perl.txt*   For Vim version 7.0e.  Last change: 2006 Mar 06
 
 
 		  VIM REFERENCE MANUAL    by Sven Verdoolaege

runtime/doc/if_pyth.txt

@@ -1,4 +1,4 @@
-*if_pyth.txt*   For Vim version 7.0d.  Last change: 2006 Jan 20
+*if_pyth.txt*   For Vim version 7.0e.  Last change: 2006 Jan 20
 
 
 		  VIM REFERENCE MANUAL    by Paul Moore

runtime/doc/if_ruby.txt

@@ -1,4 +1,4 @@
-*if_ruby.txt*   For Vim version 7.0d.  Last change: 2006 Mar 26
+*if_ruby.txt*   For Vim version 7.0e.  Last change: 2006 Mar 26
 
 
 		  VIM REFERENCE MANUAL    by Shugo Maeda

runtime/doc/if_sniff.txt

@@ -1,4 +1,4 @@
-*if_sniff.txt*	For Vim version 7.0d.  Last change: 2005 Mar 29
+*if_sniff.txt*	For Vim version 7.0e.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL

runtime/doc/if_tcl.txt

@@ -1,4 +1,4 @@
-*if_tcl.txt*    For Vim version 7.0d.  Last change: 2006 Mar 06
+*if_tcl.txt*    For Vim version 7.0e.  Last change: 2006 Mar 06
 
 
 		  VIM REFERENCE MANUAL    by Ingo Wilken

runtime/doc/indent.txt

@@ -1,4 +1,4 @@
-*indent.txt*    For Vim version 7.0d.  Last change: 2006 Mar 29
+*indent.txt*    For Vim version 7.0e.  Last change: 2006 Apr 16
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -33,7 +33,9 @@ There are in fact four methods available for indentation:
 The rest of this section describes the 'cindent' option.
 
 Note that 'cindent' indenting does not work for every code scenario.  Vim
-is not a C compiler: it does not recognize all syntax.
+is not a C compiler: it does not recognize all syntax.  One requirement is
+that toplevel functions have a '{' in the first column.  Otherwise they are
+easily confused with declarations.
 
 These four options control C program indenting:
 'cindent'	Enables Vim to perform C program indenting automatically.
@@ -403,6 +405,15 @@ assume a 'shiftwidth' of 4.
 		      c1 && c2			c1 && c2
 		     )			    )
 		      foo;			foo;
+<
+	MN    When N is non-zero, line up a line starting with a closing
+	      parentheses with the first character of the previous line.
+	      (default 0).
+
+		cino=			  cino=M1 >
+		  if (cond1 &&		    if (cond1 &&
+		         cond2			   cond2
+		     )			    	   )
 <
 					*java-cinoptions* *java-indenting*
 	jN    Indent java anonymous classes correctly.  The value 'N' is

runtime/doc/index.txt

@@ -1,4 +1,4 @@
-*index.txt*     For Vim version 7.0d.  Last change: 2006 Apr 06
+*index.txt*     For Vim version 7.0e.  Last change: 2006 Apr 10
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -529,6 +529,7 @@ tag		command		   action in Normal mode	~
 |CTRL-W_P|	CTRL-W P	   go to preview window
 |CTRL-W_R|	CTRL-W R	   rotate windows upwards N times
 |CTRL-W_S|	CTRL-W S	   same as "CTRL-W s"
+|CTRL-W_T|	CTRL-W T	   move current window to a new tab page
 |CTRL-W_W|	CTRL-W W	   go to N previous window (wrap around)
 |CTRL-W_]|	CTRL-W ]	   split window and jump to tag under cursor
 |CTRL-W_^|	CTRL-W ^	   split current window and edit alternate

runtime/doc/insert.txt

@@ -1,4 +1,4 @@
-*insert.txt*    For Vim version 7.0d.  Last change: 2006 Apr 10
+*insert.txt*    For Vim version 7.0e.  Last change: 2006 Apr 14
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -602,6 +602,9 @@ accept the currently selected entry.  The CTRL-Y is not inserted.  Typing a
 space, Enter, or some other unprintable character will leave completion mode
 and insert that typed character.
 
+When the popup menu is displayed there are a few more special keys, see
+|popupmenu-keys|.
+
 Note: The keys that are valid in CTRL-X mode are not mapped.  This allows for
 ":map ^F ^X^F" to work (where ^F is CTRL-F and ^X is CTRL-X).  The key that
 ends CTRL-X mode (any key that is not a valid CTRL-X mode command) is mapped.
@@ -1419,8 +1422,8 @@ Features are:
   a tag)
 - when attribute has limited number of possible values help to complete
   them
-- complete names of entities (defined in |xml-omni-datafile| and in current file
-  with "<!ENTITY" declarations
+- complete names of entities (defined in |xml-omni-datafile| and in current
+  file with "<!ENTITY" declarations
 - when used after "</" CTRL-X CTRL-O will close the last opened tag
 
 Format of XML data file					*xml-omni-datafile*

runtime/doc/intro.txt

@@ -1,4 +1,4 @@
-*intro.txt*     For Vim version 7.0d.  Last change: 2006 Apr 09
+*intro.txt*     For Vim version 7.0e.  Last change: 2006 Apr 09
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/map.txt

@@ -1,4 +1,4 @@
-*map.txt*       For Vim version 7.0d.  Last change: 2006 Mar 20
+*map.txt*       For Vim version 7.0e.  Last change: 2006 Apr 11
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -265,6 +265,7 @@ Overview of which map command works in which mode:
 :vmap  :vnoremap  :vunmap  :vmapclear     -         yes             -
 :omap  :onoremap  :ounmap  :omapclear     -          -             yes
 
+:nunmap can also be used outside of a monastery.
                                                 *mapmode-x* *mapmode-s*
 Some commands work both in Visual and Select mode, some in only one.  Note
 that quite often "Visual" is mentioned where both Visual and Select mode

runtime/doc/mbyte.txt

@@ -1,4 +1,4 @@
-*mbyte.txt*     For Vim version 7.0d.  Last change: 2006 Apr 02
+*mbyte.txt*     For Vim version 7.0e.  Last change: 2006 Apr 02
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar et al.

runtime/doc/message.txt

@@ -1,4 +1,4 @@
-*message.txt*   For Vim version 7.0d.  Last change: 2006 Mar 01
+*message.txt*   For Vim version 7.0e.  Last change: 2006 Apr 11
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -413,7 +413,10 @@ device and it isn't present.  You can ignore this error.
 
 You have used an ":unmap" command with an argument which is not an existing
 mapping.  All variations of this command give the same message: ":cunmap",
-":unmap!", etc.  Check for trailing white space.
+":unmap!", etc.  A few hints:
+- Check for trailing white space.
+- If the mapping is buffer-local you need to use ":unmap <buffer>".
+  |:map-<buffer>|
 
 							*E37* *E89*  >
   No write since last change (use ! to override)

runtime/doc/mlang.txt

@@ -1,4 +1,4 @@
-*mlang.txt*     For Vim version 7.0d.  Last change: 2004 Feb 24
+*mlang.txt*     For Vim version 7.0e.  Last change: 2004 Feb 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/motion.txt

@@ -1,4 +1,4 @@
-*motion.txt*    For Vim version 7.0d.  Last change: 2006 Jan 02
+*motion.txt*    For Vim version 7.0e.  Last change: 2006 Jan 02
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/netbeans.txt

@@ -1,4 +1,4 @@
-*netbeans.txt*  For Vim version 7.0d.  Last change: 2006 Mar 09
+*netbeans.txt*  For Vim version 7.0e.  Last change: 2006 Mar 09
 
 
 		  VIM REFERENCE MANUAL    by Gordon Prieur

runtime/doc/options.txt

@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.0d.  Last change: 2006 Apr 10
+*options.txt*	For Vim version 7.0e.  Last change: 2006 Apr 12
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -2068,6 +2068,11 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Highlight the screen column of the cursor with CursorColumn
 	|hl-CursorColumn|.  Useful to align text.  Will make screen redrawing
 	slower.
+	If you only want the highlighting in the current window you can use
+	these autocommands: >
+		au WinLeave * set nocursorline nocursorcolumn
+		au WinEnter * set cursorline cursorcolumn
+<
 
 			*'cursorline'* *'cul'* *'nocursorline'* *'nocul'*
 'cursorline' 'cul'	boolean	(default off)
@@ -5434,7 +5439,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 						*'sessionoptions'* *'ssop'*
 'sessionoptions' 'ssop'	string	(default: "blank,buffers,curdir,folds,
-							help,options,winsize")
+					       help,options,tabpages,winsize")
 			global
 			{not in Vi}
 			{not available when compiled without the +mksession
@@ -5463,6 +5468,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 			systems)
 	   slash	backslashes in file names replaced with forward
 			slashes
+	   tabpages	all tab pages; without this only the current tab page
+			is restored, so that you can make a session for each
+			tab page separately
 	   unix		with Unix end-of-line format (single <NL>), even when
 			on Windows or DOS
 	   winpos	position of the whole Vim window

runtime/doc/os_390.txt

@@ -1,4 +1,4 @@
-*os_390.txt*    For Vim version 7.0d.  Last change: 2005 Mar 29
+*os_390.txt*    For Vim version 7.0e.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL	  by Ralf Schandl

runtime/doc/os_amiga.txt

@@ -1,4 +1,4 @@
-*os_amiga.txt*  For Vim version 7.0d.  Last change: 2005 Mar 29
+*os_amiga.txt*  For Vim version 7.0e.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/os_beos.txt

@@ -1,4 +1,4 @@
-*os_beos.txt*	For Vim version 7.0d.  Last change: 2005 Mar 29
+*os_beos.txt*	For Vim version 7.0e.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/os_dos.txt

@@ -1,4 +1,4 @@
-*os_dos.txt*    For Vim version 7.0d.  Last change: 2006 Mar 30
+*os_dos.txt*    For Vim version 7.0e.  Last change: 2006 Mar 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/os_mac.txt

@@ -1,4 +1,4 @@
-*os_mac.txt*    For Vim version 7.0d.  Last change: 2006 Mar 29
+*os_mac.txt*    For Vim version 7.0e.  Last change: 2006 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar et al.

runtime/doc/os_mint.txt

@@ -1,4 +1,4 @@
-*os_mint.txt*   For Vim version 7.0d.  Last change: 2005 Mar 29
+*os_mint.txt*   For Vim version 7.0e.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Jens M. Felderhoff

runtime/doc/os_msdos.txt

@@ -1,4 +1,4 @@
-*os_msdos.txt*  For Vim version 7.0d.  Last change: 2005 Mar 29
+*os_msdos.txt*  For Vim version 7.0e.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/os_os2.txt

@@ -1,4 +1,4 @@
-*os_os2.txt*    For Vim version 7.0d.  Last change: 2005 Mar 29
+*os_os2.txt*    For Vim version 7.0e.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Paul Slootman

runtime/doc/os_qnx.txt

@@ -1,4 +1,4 @@
-*os_qnx.txt*    For Vim version 7.0d.  Last change: 2005 Mar 29
+*os_qnx.txt*    For Vim version 7.0e.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Julian Kinraid

runtime/doc/os_risc.txt

@@ -1,4 +1,4 @@
-*os_risc.txt*   For Vim version 7.0d.  Last change: 2005 Mar 29
+*os_risc.txt*   For Vim version 7.0e.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Thomas Leonard

runtime/doc/os_unix.txt

@@ -1,4 +1,4 @@
-*os_unix.txt*   For Vim version 7.0d.  Last change: 2005 Mar 29
+*os_unix.txt*   For Vim version 7.0e.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/os_vms.txt

@@ -1,4 +1,4 @@
-*os_vms.txt*    For Vim version 7.0d.  Last change: 2006 Mar 02
+*os_vms.txt*    For Vim version 7.0e.  Last change: 2006 Mar 02
 
 
 		  VIM REFERENCE MANUAL

runtime/doc/os_win32.txt

@@ -1,4 +1,4 @@
-*os_win32.txt*  For Vim version 7.0d.  Last change: 2006 Apr 02
+*os_win32.txt*  For Vim version 7.0e.  Last change: 2006 Apr 02
 
 
 		  VIM REFERENCE MANUAL    by George Reilly

runtime/doc/pattern.txt

@@ -1,4 +1,4 @@
-*pattern.txt*   For Vim version 7.0d.  Last change: 2006 Apr 02
+*pattern.txt*   For Vim version 7.0e.  Last change: 2006 Apr 02
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/pi_gzip.txt

@@ -1,4 +1,4 @@
-*pi_gzip.txt*   For Vim version 7.0d.  Last change: 2002 Oct 29
+*pi_gzip.txt*   For Vim version 7.0e.  Last change: 2002 Oct 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/pi_netrw.txt

@@ -1,4 +1,4 @@
-*pi_netrw.txt*  For Vim version 7.0d.  Last change: Apr 06, 2006
+*pi_netrw.txt*  For Vim version 7.0e.  Last change: Apr 12, 2006
 
 		VIM REFERENCE MANUAL    by Charles E. Campbell, Jr.
 
@@ -847,11 +847,10 @@ NETRW BROWSER VARIABLES					*netrw-browse-var*
   *g:netrw_winsize*		specify initial size of new o/v windows
 				 default: ""
 
-  *g:DrChipTopLvlMenu*		This variable specifies the top level
-				submenu name; by default, its "DrChip.".
-				If you wish to change this, do so in your
-				.vimrc.  It affects all of my plugins which
-				have menus.
+  *g:NetrwTopLvlMenu*		This variable specifies the top level
+				menu name; by default, its "Netrw.".  If
+				you wish to change this, do so in your
+				.vimrc.
 
 INTRODUCTION TO DIRECTORY BROWSING			*netrw-browse-intro*
 
@@ -1448,6 +1447,11 @@ which is loaded automatically at startup (assuming :set nocp).
 ==============================================================================
 11. History						*netrw-history* {{{1
 
+	v88: * moved DrChip.Netrw menu to Netrw.  Now has priority 80 by
+	       default.  g:NetrwTopLvlMenu == "Netrw" and can be changed
+	       by the user to suit.  The priority is g:NetrwMenuPriority.
+	     * Changed filetype for browser displays from netrwlist to netrw.
+	v87: * bug fix -- menus were partially disappearing
 	v85: * bug fix -- missing an endif
 	     * bug fix -- handles spaces in names and directories when using
 	       ftp-based browsing

runtime/doc/pi_paren.txt

@@ -1,4 +1,4 @@
-*pi_paren.txt*  For Vim version 7.0d.  Last change: 2006 Apr 03
+*pi_paren.txt*  For Vim version 7.0e.  Last change: 2006 Apr 03
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/pi_spec.txt

@@ -1,4 +1,4 @@
-*pi_spec.txt*   For Vim version 7.0d.  Last change: 2005 Oct 03
+*pi_spec.txt*   For Vim version 7.0e.  Last change: 2005 Oct 03
 
 by Gustavo Niemeyer ~
 

runtime/doc/pi_tar.txt

@@ -1,4 +1,4 @@
-*tar.txt*	For Vim version 7.0d.  Last change: 2006 Mar 24
+*tar.txt*	For Vim version 7.0e.  Last change: 2006 Mar 24
 
        	       	       +====================+
        	       	       | Tar File Interface |

runtime/doc/pi_zip.txt

@@ -1,4 +1,4 @@
-*zip.txt*	For Vim version 7.0d.  Last change: 2006 Apr 03
+*zip.txt*	For Vim version 7.0e.  Last change: 2006 Apr 10
 
 				+====================+
 				| Zip File Interface |
@@ -33,6 +33,11 @@ Copyright: Copyright (C) 2005,2006 Charles E Campbell, Jr {{{1 *zip-copyright*
 
 ==============================================================================
 3. History					*zip-history*
+   v8 Apr 10, 2006 * Bram Moolenaar reported that he received an error message
+                     due to "Pattern not found: ^.*\%0c"; this was caused by
+		     stridx finding a Name... at the beginning of the line;
+		     zip.vim tried 4,$s/^.*\%0c//, but that doesn't work.
+		     Fixed.
    v7 Mar 22, 2006 * escaped some characters that can cause filename handling
                      problems.
    v6 Dec 21, 2005 * writing to files not in directories caused problems -