updated for version 7.0-031

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.0f.  Also runs under UNIX, MSDOS and other systems.
-		vim70frt.tgz  contains the documentation and syntax files.
-		vim70fbin.tgz contains the binaries.
-		vim70fsrc.tgz contains the sources.
+		Version 7.0.  Also runs under UNIX, MSDOS and other systems.
+		vim70rt.tgz  contains the documentation and syntax files.
+		vim70bin.tgz contains the binaries.
+		vim70src.tgz contains the sources.
 		Author: Bram Moolenaar et al.
 
 

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 = 0f
+MINOR = 0
 
 # Uncomment this line if the Win32s version is to be included.
 DOSBIN_S =  dosbin_s

README.txt

@@ -1,4 +1,4 @@
-README.txt for version 7.0f of Vim: Vi IMproved.
+README.txt for version 7.0 of Vim: Vi IMproved.
 
 
 WHAT IS VIM

README_ami.txt

@@ -1,4 +1,4 @@
-README_ami.txt for version 7.0f of Vim: Vi IMproved.
+README_ami.txt for version 7.0 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.0f of Vim: Vi IMproved.
+README_amibin.txt for version 7.0 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.0f of Vim: Vi IMproved.
+README_amisrc.txt for version 7.0 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,19 +1,19 @@
-README_bindos.txt for version 7.0f of Vim: Vi IMproved.
+README_bindos.txt for version 7.0 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.
-These files are in the runtime archive (vim60rt.zip).
+These files are in the runtime archive (vim70rt.zip).
 
 
 There are several binary distributions of Vim for the PC.  You would normally
 pick only one of them, but it's also possible to install several.
 These ones are available (the version number may differ):
-	vim60d16.zip	16 bit DOS version
-	vim60d32.zip	32 bit DOS version
-	vim60w32.zip	Windows 95/98/NT/etc. console version
-	gvim60.zip	Windows 95/98/NT/etc. GUI version
-	gvim60ole.zip	Windows 95/98/NT/etc. GUI version with OLE
-	gvim60_s.zip	Windows 3.1 GUI version
+	vim70d16.zip	16 bit DOS version
+	vim70d32.zip	32 bit DOS version
+	vim70w32.zip	Windows 95/98/NT/etc. console version
+	gvim70.zip	Windows 95/98/NT/etc. GUI version
+	gvim70ole.zip	Windows 95/98/NT/etc. GUI version with OLE
+	gvim70_s.zip	Windows 3.1 GUI version
 
-You MUST also get the runtime archive (vim60rt.zip).
-The sources are also available (vim60src.zip).
+You MUST also get the runtime archive (vim70rt.zip).
+The sources are also available (vim70src.zip).

README_dos.txt

@@ -1,4 +1,4 @@
-README_dos.txt for version 7.0f of Vim: Vi IMproved.
+README_dos.txt for version 7.0 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.
@@ -47,13 +47,13 @@ These are the normal steps to install Vim from the .zip archives:
    Binary and runtime Vim archives are normally unpacked in the same location,
    on top of each other.
 
-2. Unpack the zip archives.  This will create a new directory "vim\vim60",
+2. Unpack the zip archives.  This will create a new directory "vim\vim70",
    in which all the distributed Vim files are placed.  Since the directory
    name includes the version number, it is unlikely that you overwrite
    existing files.
    Examples:
-	pkunzip -d gvim60.zip
-	unzip vim60w32.zip
+	pkunzip -d gvim70.zip
+	unzip vim70w32.zip
 
    You need to unpack the runtime archive and at least one of the binary
    archives.  When using more than one binary version, be careful not to
@@ -69,7 +69,7 @@ These are the normal steps to install Vim from the .zip archives:
    archive and follow the instructions in the documentation.
 
 3. Change to the new directory:
-	cd vim\vim60
+	cd vim\vim70
    Run the "install.exe" program.  It will ask you a number of questions about
    how you would like to have your Vim setup.  Among these are:
    - You can tell it to write a "_vimrc" file with your preferences in the
@@ -80,8 +80,8 @@ These are the normal steps to install Vim from the .zip archives:
      console or in a shell.  You can select one of the directories in your
      $PATH.  If you skip this, you can add Vim to the search path manually:
      The simplest is to add a line to your autoexec.bat.  Examples:
-	set path=%path%;C:\vim\vim60
-	set path=%path%;D:\editors\vim\vim60
+	set path=%path%;C:\vim\vim70
+	set path=%path%;D:\editors\vim\vim70
    - Create entries for Vim on the desktop and in the Start menu.
 
 That's it!
@@ -94,7 +94,7 @@ Remarks:
   point to the top directory of your Vim files.  Example:
     set VIM=C:\editors\vim
   Vim version 6.0 will look for your vimrc file in $VIM, and for the runtime
-  files in $VIM/vim60.  See ":help $VIM" for more information.
+  files in $VIM/vim70.  See ":help $VIM" for more information.
 
 - To avoid confusion between distributed files of different versions and your
   own modified vim scripts, it is recommended to use this directory layout:
@@ -105,14 +105,14 @@ Remarks:
 	C:\vim\vimfiles\ftplugin\*.vim	Filetype plugins
 	C:\vim\...			Other files you made.
   Distributed files:
-	C:\vim\vim60\vim.exe		The Vim version 6.0 executable.
-	C:\vim\vim60\doc\*.txt		The version 6.0 documentation files.
-	C:\vim\vim60\bugreport.vim	A Vim version 6.0 script.
-	C:\vim\vim60\...		Other version 6.0 distributed files.
+	C:\vim\vim70\vim.exe		The Vim version 6.0 executable.
+	C:\vim\vim70\doc\*.txt		The version 6.0 documentation files.
+	C:\vim\vim70\bugreport.vim	A Vim version 6.0 script.
+	C:\vim\vim70\...		Other version 6.0 distributed files.
   In this case the $VIM environment variable would be set like this:
 	set VIM=C:\vim
-  Then $VIMRUNTIME will automatically be set to "$VIM\vim60".  Don't add
-  "vim60" to $VIM, that won't work.
+  Then $VIMRUNTIME will automatically be set to "$VIM\vim70".  Don't add
+  "vim70" to $VIM, that won't work.
 
 - You can put your Vim executable anywhere else.  If the executable is not
   with the other Vim files, you should set $VIM. The simplest is to add a line
@@ -136,8 +136,8 @@ Remarks:
      Select Properties.
   5. In the Program tab, change the "Cmdline" to add "/c" and the name of the
      Vim executable.  Examples:
-	C:\command.com /c C:\vim\vim60\vim.exe
-	C:\command.com /c D:\editors\vim\vim60\vim.exe
+	C:\command.com /c C:\vim\vim70\vim.exe
+	C:\command.com /c D:\editors\vim\vim70\vim.exe
   6. Select the font, window size, etc. that you like.  If this isn't
      possible, select "Advanced" in the Program tab, and deselect "MS-DOS
      mode".

README_extra.txt

@@ -1,17 +1,17 @@
-README_extra.txt for version 7.0f of Vim: Vi IMproved.
+README_extra.txt for version 7.0 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.
+(vim-7.0-src.tar.gz).  The extra archive is useless without it.
 
 For more information, see the "README.txt" file that comes with the runtime
-archive (vim-6.0-rt.tar.gz).  To be able to run Vim you MUST get the runtime
+archive (vim-7.0-rt.tar.gz).  To be able to run Vim you MUST get the runtime
 archive too!
 
 The extra archive plus the source and runtime achives make up the complete
 sources of Vim for all systems.
 
 
-The extra archive contains:
+Some of the things that the extra archive contains:
 
 Farsi		Files for the Farsi (persian) language.  If you don't know
 		what Farsi is, this is not for you.
@@ -19,7 +19,6 @@ Farsi		Files for the Farsi (persian) language.  If you don't know
 if_sniff	Interface to SNiFF.  If you don't know what SNiFF is, this is
 		not for you.
 
-gui_amiga
 os_amiga	Files for the Amiga port.
 
 gui_riscos
@@ -45,7 +44,8 @@ os_w32
 os_win32	Files for the Win32 port.
 
 gui_w32		Files for the Win32 GUI.
-Gvim_vc.mak	MS Visual C++ makefile for the Win32 GUI.
+gui_w48		Files for the Win32 and Win16 GUI.
+Make_mvc.mak	MS Visual C++ makefile for the Win32 GUI.
 rgb.txt		File with color definitions for the Win32 GUI.
 
 if_ole		OLE automation interface, for MS Windows 95 and NT.

README_lang.txt

@@ -1,4 +1,4 @@
-README_lang.txt for version 7.0f of Vim: Vi IMproved.
+README_lang.txt for version 7.0 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.0f of Vim: Vi IMproved.
+README_mac.txt for version 7.0 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.0f of Vim: Vi IMproved.
+README_ole.txt for version 7.0 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.0f of Vim: Vi IMproved.
+README_os2.txt for version 7.0 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.0f of Vim: Vi IMproved.
+README_os_390.txt for version 7.0 of Vim: Vi IMproved.
 
 Welcome to the OS/390 Unix port of VIM.
 

README_src.txt

@@ -1,10 +1,10 @@
-README_src.txt for version 7.0f of Vim: Vi IMproved.
+README_src.txt for version 7.0 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
-systems in combination with the extra archive (vim-6.0-extra.tar.gz, in the
+systems in combination with the extra archive (vim-7.0-extra.tar.gz, in the
 "extra" directory of ftp.vim.org).
 
 For more information, see the README.txt file that comes with the runtime
-archive (vim-6.0-rt.tar.gz).  To be able to run Vim you MUST get the runtime
+archive (vim-7.0-rt.tar.gz).  To be able to run Vim you MUST get the runtime
 archive too!

README_srcdos.txt

@@ -1,8 +1,8 @@
-README_srcdos.txt for version 7.0f of Vim: Vi IMproved.
+README_srcdos.txt for version 7.0 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.
-These files are in the runtime archive (vim60rt.zip).
+These files are in the runtime archive (vim70rt.zip).
 
 
 The DOS source archive contains the files needed to compile Vim on MS-DOS or

README_unix.txt

@@ -1,4 +1,4 @@
-README_unix.txt for version 7.0f of Vim: Vi IMproved.
+README_unix.txt for version 7.0 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.0f of Vim: Vi IMproved.
+README_vms.txt for version 7.0 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.0f of Vim: Vi IMproved.
+README_w32s.txt for version 7.0 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 0f
+!define VER_MINOR 0
 
 # ----------- No configurable settings below this line -----------
 
@@ -391,6 +391,7 @@ Section Uninstall
 	ClearErrors
 	# Remove everything but *.dll files.  Avoids that
 	# a lot remains when gvimext.dll cannot be deleted.
+	RMDir /r $0\autoload
 	RMDir /r $0\colors
 	RMDir /r $0\compiler
 	RMDir /r $0\doc
@@ -398,6 +399,7 @@ Section Uninstall
 	RMDir /r $0\indent
 	RMDir /r $0\macros
 	RMDir /r $0\plugin
+	RMDir /r $0\spell
 	RMDir /r $0\syntax
 	RMDir /r $0\tools
 	RMDir /r $0\tutor

runtime/autoload/ccomplete.vim

@@ -1,7 +1,7 @@
 " Vim completion script
 " Language:	C
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2006 Mar 24
+" Last Change:	2006 May 08
 
 
 " This function is used for the 'omnifunc' option.
@@ -379,7 +379,9 @@ function! s:Nextitem(lead, items, depth, all)
     endif
 
     " Recognize "struct foobar" and "union foobar".
-    if (tokens[tidx] == 'struct' || tokens[tidx] == 'union') && tidx + 1 < len(tokens)
+    " Also do "class foobar" when it's C++ after all (doesn't work very well
+    " though).
+    if (tokens[tidx] == 'struct' || tokens[tidx] == 'union' || tokens[tidx] == 'class') && tidx + 1 < len(tokens)
       let res = s:StructMembers(tokens[tidx] . ':' . tokens[tidx + 1], a:items, a:all)
       break
     endif
@@ -421,7 +423,7 @@ function! s:Nextitem(lead, items, depth, all)
       if ei > 1
 	let cmdtokens = split(strpart(cmd, ei), '\s\+\|\<')
 	if len(cmdtokens) > 1
-	  if cmdtokens[0] == 'struct' || cmdtokens[0] == 'union'
+	  if cmdtokens[0] == 'struct' || cmdtokens[0] == 'union' || cmdtokens[0] == 'class'
 	    let name = ''
 	    " Use the first identifier after the "struct" or "union"
 	    for ti in range(len(cmdtokens) - 1)
@@ -456,7 +458,7 @@ endfunction
 " member.
 function! s:StructMembers(typename, items, all)
   " Todo: What about local structures?
-  let fnames = join(map(tagfiles(), 'escape(v:val, " \\")'))
+  let fnames = join(map(tagfiles(), 'escape(v:val, " \\#%")'))
   if fnames == ''
     return []
   endif

runtime/autoload/csscomplete.vim

@@ -1,7 +1,7 @@
 " Vim completion script
 " Language:	CSS 2.1
 " Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
-" Last Change:	2005 Oct 12
+" Last Change:	2006 Apr 30
 
 function! csscomplete#CompleteCSS(findstart, base)
 if a:findstart

runtime/autoload/htmlcomplete.vim

@@ -1,7 +1,7 @@
 " Vim completion script
 " Language:	HTML and XHTML
 " Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
-" Last Change:	2006 Apr 24
+" Last Change:	2006 Apr 30
 
 function! htmlcomplete#CompleteTags(findstart, base)
   if a:findstart

runtime/autoload/javascriptcomplete.vim

@@ -1,7 +1,7 @@
 " Vim completion script
 " Language:	Java Script
 " Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
-" Last Change:	2006 Feb 6
+" Last Change:	2006 Apr 30
 
 function! javascriptcomplete#CompleteJS(findstart, base)
   if a:findstart

runtime/autoload/netrw.vim

@@ -1,7 +1,7 @@
 " netrw.vim: Handles file transfer and remote directory listing across a network
 "            AUTOLOAD PORTION
-" Date:		Apr 26, 2006
-" Version:	94
+" Date:		May 02, 2006
+" Version:	98
 " 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 = "v94"
+let g:loaded_netrw = "v98"
 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
@@ -322,11 +322,13 @@ fun! netrw#NetRead(mode,...)
 
   " get name of a temporary file and set up shell-quoting character {{{3
   let tmpfile= tempname()
+"  call Decho("tmpfile<".tmpfile.">")
   let tmpfile= escape(substitute(tmpfile,'\','/','ge'),g:netrw_tmpfile_escape)
+"  call Decho("tmpfile<".tmpfile.">")
   if !isdirectory(substitute(tmpfile,'[^/]\+$','','e'))
    echohl Error | echo "***netrw*** your <".substitute(tmpfile,'[^/]\+$','','e')."> directory is missing!" | echohl None
    call inputsave()|call input("Press <cr> to continue")|call inputrestore()
-"   call Dret("NetRead")
+"   call Dret("NetRead :1 getcwd<".getcwd().">")
    return
   endif
 "  call Decho("tmpfile<".tmpfile.">")
@@ -378,7 +380,7 @@ fun! netrw#NetRead(mode,...)
          echohl Error | echo "***netrw*** Unbalanced string in filename '". wholechoice ."'" | echohl None
          call inputsave()|call input("Press <cr> to continue")|call inputrestore()
 	endif
-"        call Dret("NetRead")
+"        call Dret("NetRead :2 getcwd<".getcwd().">")
         return
        endif
        let choice= a:{ichoice}
@@ -396,7 +398,9 @@ fun! netrw#NetRead(mode,...)
     let choice = substitute(choice,'\\','/','ge')
 "    call Decho("fixing up windows url to <".choice."> tmpfile<".tmpfile)
 
-    exe 'cd ' . fnamemodify(tmpfile,':h')
+    if !g:netrw_keepdir
+     exe 'lcd ' . fnamemodify(tmpfile,':h')
+    endif
     let tmpfile = fnamemodify(tmpfile,':t')
    endif
 
@@ -408,7 +412,7 @@ fun! netrw#NetRead(mode,...)
    if choice =~ "^.*[\/]$"
 "    call Decho("yes, choice matches '^.*[\/]$'")
     keepjumps call s:NetBrowse(choice)
-"    call Dret("NetRead")
+"    call Dret("NetRead :3 getcwd<".getcwd().">")
     return
    endif
 
@@ -430,7 +434,7 @@ fun! netrw#NetRead(mode,...)
    " rcp:  NetRead Method #1 {{{3
    if  b:netrw_method == 1 " read with rcp
 "    call Decho("read via rcp (method #1)")
-   " ER: noting done with g:netrw_uid yet?
+   " ER: nothing done with g:netrw_uid yet?
    " ER: on Win2K" rcp machine[.user]:file tmpfile
    " ER: if machine contains '.' adding .user is required (use $USERNAME)
    " ER: the tmpfile is full path: rcp sees C:\... as host C
@@ -564,7 +568,7 @@ fun! netrw#NetRead(mode,...)
       echohl Error | echo "***netrw*** neither wget nor fetch command is available" | echohl None
       call inputsave()|call input("Press <cr> to continue")|call inputrestore()
      endif
-"     call Dret("NetRead")
+"     call Dret("NetRead :4 getcwd<".getcwd().">")
      return
     endif
 
@@ -699,7 +703,7 @@ fun! netrw#NetRead(mode,...)
   endif
   call s:NetOptionRestore()
 
-"  call Dret("NetRead")
+"  call Dret("NetRead :5 getcwd<".getcwd().">")
 endfun
 
 " ------------------------------------------------------------------------
@@ -806,9 +810,12 @@ fun! netrw#NetWrite(...) range
   call s:NetOptionSave()
 
   " Get Temporary Filename {{{3
-  let tmpfile= escape(tempname(),g:netrw_tmpfile_escape)
+  let tmpfile= tempname()
+"  call Decho("tmpfile<".tmpfile."> (raw)")
+  let tmpfile= escape(substitute(tmpfile,'\','/','ge'),g:netrw_tmpfile_escape)
+"  call Decho("tmpfile<".tmpfile."> (escaped)")
   if !isdirectory(substitute(tmpfile,'[^/]\+$','','e'))
-   echohl Error | echo "***netrw*** your ".substitute(tmpfile,'[^/]\+$','','e')." directory is missing!"
+   echohl Error | echo "***netrw*** your <".substitute(tmpfile,'[^/]\+$','','e')."> directory is missing!"
    call inputsave()|call input("Press <cr> to continue")|call inputrestore()
 "   call Dret("NetWrite")
    return
@@ -889,8 +896,9 @@ fun! netrw#NetWrite(...) range
    " fix up windows urls
    if has("win32") || has("win95") || has("win64") || has("win16")
     let choice= substitute(choice,'\\','/','ge')
-    "ER: see NetRead()
-    exe 'cd ' . fnamemodify(tmpfile,':h')
+    if !g:netrw_keepdir
+     exe 'lcd ' . fnamemodify(tmpfile,':h')
+    endif
     let tmpfile = fnamemodify(tmpfile,':t')
    endif
 
@@ -1207,6 +1215,7 @@ fun! s:NetBrowse(dirname)
    elseif g:netrw_sort_by =~ "^s"
     let listcmd= listcmd."S"
    endif
+
    " optionally sort in reverse
    if g:netrw_sort_direction =~ "^r" && listcmd == "dir"
     let listcmd= listcmd."r"
@@ -2023,7 +2032,12 @@ endfun
 fun! s:NetrwListHide()
 "  call Dfunc("NetrwListHide() hide=".g:netrw_hide." listhide<".g:netrw_list_hide.">")
 
+  " find a character not in the "hide" string to used as a separator
+  " for :g and :v commands
   let listhide= g:netrw_list_hide
+  let sep     = strpart(substitute('~!@#$%^&*{};:,<.>/?|abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890','['.escape(listhide,'-]^\').']','','ge'),1,1)
+"  call Decho("sep=".sep)
+
   while listhide != ""
    if listhide =~ ','
     let hide     = substitute(listhide,',.*$','','e')
@@ -2036,14 +2050,16 @@ fun! s:NetrwListHide()
    " Prune the list by hiding any files which match
    if g:netrw_hide == 1
 "    call Decho("hiding<".hide."> listhide<".listhide.">")
-"    call Decho('exe silent keepjumps '.w:netrw_bannercnt.',$g~'.hide.'~d')
-    exe 'silent keepjumps '.w:netrw_bannercnt.',$g~'.hide.'~d'
+    exe 'silent keepjumps '.w:netrw_bannercnt.',$g'.sep.hide.sep.'d'
    elseif g:netrw_hide == 2
 "    call Decho("showing<".hide."> listhide<".listhide.">")
-"    call Decho('exe silent keepjumps '.w:netrw_bannercnt.',$v~'.hide.'~d')
-    exe 'silent keepjumps '.w:netrw_bannercnt.',$v~'.hide.'~d'
+    exe 'silent keepjumps '.w:netrw_bannercnt.',$g'.sep.hide.sep.'s@^@ /-KEEP-/ @'
    endif
   endwhile
+  if g:netrw_hide == 2
+   exe 'silent keepjumps '.w:netrw_bannercnt.',$v@^ /-KEEP-/ @d'
+   exe 'silent keepjumps '.w:netrw_bannercnt.',$s@^\%( /-KEEP-/ \)\+@@e'
+  endif
 
 "  call Dret("NetrwListHide")
 endfun
@@ -2452,15 +2468,21 @@ fun! netrw#NetObtain(...)
   " NetrwStatusLine support - for obtaining support
   call s:SetupNetrwStatusLine('%f %h%m%r%=%9*Obtaining '.fname)
 
-"  call Decho("method=".w:netrw_method)
   if exists("w:netrw_method") && w:netrw_method =~ '[235]'
+"   call Decho("method=".w:netrw_method)
    if executable("ftp")
+"    call Decho("ftp is executable, method=".w:netrw_method)
     let curdir = expand("%")
     let path   = substitute(curdir,'ftp://[^/]\+/','','e')
     let curline= line(".")
     let endline= line("$")+1
     set ma
     keepjumps $
+"    call Decho("getcwd<".getcwd().">")
+"    call Decho("curdir<".curdir.">")
+"    call Decho("path<".path.">")
+"    call Decho("curline=".curline)
+"    call Decho("endline=".endline)
 
     ".........................................
     if w:netrw_method == 2
@@ -2472,6 +2494,8 @@ fun! netrw#NetObtain(...)
      endif
      put ='get '.fname
 "     call Decho("ftp:  get ".fname)
+     put ='quit'
+"     call Decho("ftp:  quit")
      if exists("g:netrw_port") && g:netrw_port != ""
 "      call Decho("exe ".g:netrw_silentxfer.endline.",$!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port)
       exe g:netrw_silentxfer.endline.",$!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port
@@ -2525,6 +2549,7 @@ fun! netrw#NetObtain(...)
     exe "keepjumps ".curline
     setlocal noma nomod
    else
+"    call Decho("ftp not executable")
     if !exists("g:netrw_quiet")
      echohl Error | echo "***netrw*** this system doesn't support ftp" | echohl None
      call inputsave()|call input("Press <cr> to continue")|call inputrestore()
@@ -2544,6 +2569,7 @@ fun! netrw#NetObtain(...)
   ".........................................
   else
    " scp: Method#4
+"   call Decho("using scp")
    let curdir = expand("%")
    let path   = substitute(curdir,'scp://[^/]\+/','','e')
 "   call Decho("path<".path.">")
@@ -2759,7 +2785,7 @@ endfun
 " DirBrowse: supports local file/directory browsing {{{2
 fun! netrw#DirBrowse(dirname)
   if !exists("w:netrw_longlist")|let w:netrw_longlist= g:netrw_longlist|endif
-"  call Dfunc("DirBrowse(dirname<".a:dirname.">) buf#".bufnr("%")." winnr=".winnr()." sortby=".g:netrw_sort_by)
+"  call Dfunc("DirBrowse(dirname<".a:dirname.">) buf#".bufnr("%")." winnr=".winnr()." sortby=".g:netrw_sort_by." hide=".g:netrw_hide)
 "  call Dredir("ls!")
 
   if exists("s:netrw_skipbrowse")
@@ -2776,7 +2802,7 @@ fun! netrw#DirBrowse(dirname)
   endif
 
   call s:NetOptionSave()
-  if w:acdkeep
+  if exists("w:acdkeep") && w:acdkeep
    exe 'cd '.escape(a:dirname,s:netrw_cd_escape)
 "   call Decho("cd ".escape(a:dirname,s:netrw_cd_escape))
 "   call Decho("getcwd<".getcwd().">")
@@ -3474,7 +3500,7 @@ fun! s:LocalPreview(path) range
 "  call Dfunc("LocalPreview(path<".a:path.">)")
   if has("quickfix")
    if !isdirectory(a:path)
-    exe "pedit ".a:path
+    exe "pedit ".escape(a:path,g:netrw_fname_escape)
    elseif !exists("g:netrw_quiet")
     echohl WarningMsg | echo "***netrw*** sorry, cannot preview a directory such as <".a:path.">" | echohl None
     call inputsave()|call input("Press <cr> to continue")|call inputrestore()
@@ -4021,7 +4047,9 @@ fun! s:NetOptionSave()
   endif
 
   " Get Temporary Filename
+  if exists("&acd")
    let w:acdkeep  = &acd
+  endif
   let w:aikeep    = &ai
   let w:fokeep    = &fo
   let w:cikeep    = &ci
@@ -4031,6 +4059,9 @@ fun! s:NetOptionSave()
   let w:cpokeep   = &cpo
   let w:hidkeep   = &hidden
   let w:magickeep = &magic
+  if !g:netrw_keepdir
+   let w:dirkeep  = getcwd()
+  endif
   let w:gdkeep    = &gd
   let w:repkeep   = &report
   let w:spellkeep = &spell
@@ -4038,7 +4069,11 @@ fun! s:NetOptionSave()
   setlocal cino =
   setlocal com  =
   setlocal cpo -=aA
+  if exists("&acd")
    setlocal noacd nocin noai noci magic nospell fo=nroql2 nohid
+  else
+   setlocal nocin noai noci magic nospell fo=nroql2 nohid
+  endif
   setlocal tw   =0
   setlocal report=10000
   if has("win32") && !has("win95")
@@ -4060,13 +4095,16 @@ fun! s:NetOptionRestore()
   endif
   unlet w:netoptionsave
 
+  if exists("&acd")
    if exists("w:acdkeep") |let &acd    = w:acdkeep     |unlet w:acdkeep  |endif
+  endif
   if exists("w:aikeep")   |let &ai     = w:aikeep      |unlet w:aikeep   |endif
   if exists("w:cikeep")   |let &ci     = w:cikeep      |unlet w:cikeep   |endif
   if exists("w:cinkeep")  |let &cin    = w:cinkeep     |unlet w:cinkeep  |endif
   if exists("w:cinokeep") |let &cino   = w:cinokeep    |unlet w:cinokeep |endif
   if exists("w:comkeep")  |let &com    = w:comkeep     |unlet w:comkeep  |endif
   if exists("w:cpokeep")  |let &cpo    = w:cpokeep     |unlet w:cpokeep  |endif
+  if exists("w:dirkeep")  |exe "lcd ".w:dirkeep        |unlet w:dirkeep  |endif
   if exists("w:fokeep")   |let &fo     = w:fokeep      |unlet w:fokeep   |endif
   if exists("w:gdkeep")   |let &gd     = w:gdkeep      |unlet w:gdkeep   |endif
   if exists("w:hidkeep")  |let &hidden = w:hidkeep     |unlet w:hidkeep  |endif

runtime/autoload/netrwFileHandlers.vim

@@ -1,7 +1,7 @@
 " netrwFileHandlers: contains various extension-based file handlers for
 "                    netrw's browsers' x command ("eXecute launcher")
 " Author:	Charles E. Campbell, Jr.
-" Date:		Mar 22, 2006
+" Date:		May 01, 2006
 " Version:	8
 " Copyright:    Copyright (C) 1999-2005 Charles E. Campbell, Jr. {{{1
 "               Permission is hereby granted to use and distribute this code,
@@ -25,7 +25,7 @@ set cpo&vim
 let g:loaded_netrwFileHandlers= "v8"
 
 " ---------------------------------------------------------------------
-" netrwFileHandlers#Invoke: {{{2
+" netrwFileHandlers#Invoke: {{{1
 fun! netrwFileHandlers#Invoke(exten,fname)
 "  call Dfunc("netrwFileHandlers#Invoke(exten<".a:exten."> fname<".a:fname.">)")
 

runtime/autoload/phpcomplete.vim

@@ -1,7 +1,7 @@
 " Vim completion script
 " Language:	PHP
 " Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
-" Last Change:	2006 Apr 15
+" Last Change:	2006 Apr 30
 "
 "   TODO:
 "   - Class aware completion:

runtime/autoload/rubycomplete.vim

@@ -96,9 +96,9 @@ function! GetRubyVarType(v)
         let ctors = '\(now\|new\|open\|get_instance\)'
     endif
 
-    let [lnum,lcol] = searchpos(''.a:v.'\>\s*[+\-*/]*=\s*\([^ \t]\+.' . ctors .'\>\|[\[{"''/]\|%r{\)','nb',stopline)
+    let [lnum,lcol] = searchpos(''.a:v.'\>\s*[+\-*/]*=\s*\([^ \t]\+.' . ctors .'\>\|[\[{"''/]\|%r{\|[A-Za-z0-9@:\-()]\+...\?\)','nb',stopline)
     if lnum != 0 && lcol != 0
-        let str = matchstr(getline(lnum),'=\s*\([^ \t]\+.' . ctors . '\>\|[\[{"''/]\|%r{\)',lcol)
+        let str = matchstr(getline(lnum),'=\s*\([^ \t]\+.' . ctors . '\>\|[\[{"''/]\|%r{\|[A-Za-z0-9@:\-()]\+...\?\)',lcol)
         let str = substitute(str,'^=\s*','','')
         call setpos('.',pos)
         if str == '"' || str == ''''
@@ -109,6 +109,8 @@ function! GetRubyVarType(v)
             return 'Hash'
         elseif str == '/' || str == '%r{'
             return 'Regexp'
+        elseif strlen(str) >= 4 && stridx(str,'..') != -1
+            return 'Range'
         elseif strlen(str) > 4
             let l = stridx(str,'.')
             return str[0:l-1]
@@ -217,6 +219,7 @@ def load_buffer_module(name)
 end
 
 def get_buffer_entity(name, vimfun)
+  return nil if /(\"|\')+/.match( name )
   buf = VIM::Buffer.current
   nums = eval( VIM::evaluate( vimfun % name ) )
   return nil if nums == nil
@@ -234,6 +237,14 @@ def get_buffer_entity(name, vimfun)
   return classdef
 end
 
+def get_var_type( receiver )
+  if /(\"|\')+/.match( receiver )
+    "String"
+  else
+    VIM::evaluate("GetRubyVarType('%s')" % receiver)
+  end
+end
+
 def get_buffer_classes()
   # this will be a little expensive.
   allow_aggressive_load = VIM::evaluate('g:rubycomplete_classes_in_global')
@@ -300,64 +311,55 @@ def get_completions(base)
   load_requires
   load_rails
 
-  input = VIM::evaluate('expand("<cWORD>")')
-  input += base
-  input.lstrip!
-  if input.length == 0
   input = VIM::Buffer.current.line
-    input.strip!
-  end
-  message = nil
+  cpos = VIM::Window.current.cursor[1] - 1
+  input = input[0..cpos] if cpos != 0
+  input += base
 
+  rip = input.rindex(/\s/,cpos)
+  if rip
+    input = input[rip..input.length]
+  end
+
+  asn = /^.*(\+|\-|\*|=|\(|\[)=?(\s*[A-Za-z0-9_:@.-]*)(\s*(\{|\+|\-|\*|\%|\/)?\s*).*/
+  if asn.match(input)
+    input = $2
+  end
+
+  input.strip!
+  message = nil
+  receiver = nil
+  candidates = []
 
   case input
-    when /^(\/[^\/]*\/)\.([^.]*)$/
-      # Regexp
+    when /^(\/[^\/]*\/)\.([^.]*)$/ # Regexp
       receiver = $1
       message = Regexp.quote($2)
-
       candidates = Regexp.instance_methods(true)
-      select_message(receiver, message, candidates)
 
-    when /^([^\]]*\])\.([^.]*)$/
-      # Array
+    when /^([^\]]*\])\.([^.]*)$/ # Array
       receiver = $1
       message = Regexp.quote($2)
-
       candidates = Array.instance_methods(true)
-      select_message(receiver, message, candidates)
 
-    when /^([^\}]*\})\.([^.]*)$/
-      # Proc or Hash
+    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
+    when /^(:[^:.]*)$/ # Symbol
       if Symbol.respond_to?(:all_symbols)
-        sym = $1
-        candidates = Symbol.all_symbols.collect{|s| ":" + s.id2name}
-        candidates.grep(/^#{sym}/)
-        candidates.delete_if do |c|
-            c.match( /'/ )
-        end
-        candidates.uniq!
-        candidates.sort!
-      else
-        []
+        receiver = $1
+        candidates = Symbol.all_symbols.collect{|s| s.id2name}
+        candidates.delete_if { |c| c.match( /'/ ) }
       end
 
-    when /^::([A-Z][^:\.\(]*)$/
-      # Absolute Constant or class methods
+    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
+    when /^(((::)?[A-Z][^:.\(]*)+)::?([^:.]*)$/ # Constant or class methods
       receiver = $1
       message = Regexp.quote($4)
       begin
@@ -367,39 +369,30 @@ def get_completions(base)
       end
       candidates.grep(/^#{message}/).collect{|e| receiver + "::" + e}
 
-    when /^(:[^:.]+)\.([^.]*)$/
-      # Symbol
+    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
+    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 /^(\$[^.]*)$/
+    when /^(\$[^.]*)$/ #global
       candidates = global_variables.grep(Regexp.new(Regexp.quote($1)))
 
-#   when /^(\$?(\.?[^.]+)+)\.([^.]*)$/
-    when /^((\.?[^.]+)+)\.([^.]*)$/
-      # variable
+    when /^((\.?[^.]+)+)\.([^.]*)$/ # variable
       receiver = $1
       message = Regexp.quote($3)
       load_buffer_class( receiver )
 
       cv = eval("self.class.constants")
-
-      vartype = VIM::evaluate("GetRubyVarType('%s')" % receiver)
+      vartype = get_var_type( receiver )
       if vartype != ''
         load_buffer_class( vartype )
 
@@ -426,25 +419,19 @@ def get_completions(base)
             /^(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 /^\(?\s*[A-Za-z0-9:^@.%\/+*\(\)]+\.\.\.?[A-Za-z0-9:^@.%\/+*\(\)]+\s*\)?\.([^.]*)/
+      message = $1
+      candidates = Range.instance_methods(true)
 
-    when /^\.([^.]*)$/
-	# unknown(maybe String)
+    when /^\[(\s*[A-Za-z0-9:^@.%\/+*\(\)\[\]\{\}.\'\"],?)*\].([^.]*)/
+      message = $2
+      candidates = Array.instance_methods(true)
 
-      receiver = ""
+    when /^\.([^.]*)$/ # unknown(maybe String)
       message = Regexp.quote($1)
-
       candidates = String.instance_methods(true)
-      select_message(receiver, message, candidates)
 
   else
     inclass = eval( VIM::evaluate("IsInClassDef()") )
@@ -460,7 +447,6 @@ def get_completions(base)
         begin
           candidates = eval( "#{receiver}.instance_methods" )
           candidates += get_rails_helpers
-          select_message(receiver, message, candidates)
         rescue Exception
           found = nil
         end
@@ -470,24 +456,16 @@ def get_completions(base)
     if inclass == nil || found == nil
       candidates = eval("self.class.constants")
       candidates += get_buffer_classes
+      message = receiver = input
+    end
+  end
+
+  candidates.delete_if { |x| x == nil }
   candidates.uniq!
   candidates.sort!
-      (candidates|ReservedWords).grep(/^#{Regexp.quote(input)}/)
-    end
-  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
+  candidates = candidates.grep(/^#{Regexp.quote(message)}/) if message != nil
 
   outp = ""
-
-  #    tags = VIM::evaluate("taglist('^%s$')" %
   valid = (candidates-Object.instance_methods)
 
   rg = 0..valid.length
@@ -502,24 +480,6 @@ def get_completions(base)
   end
 end
 
-
-def select_message(receiver, message, candidates)
-  #tags = VIM::evaluate("taglist('%s')" % receiver)
-  #print tags
-  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
-
 # }}} ruby completion
 RUBYEOF
 endfunction
@@ -527,4 +487,4 @@ endfunction
 let g:rubycomplete_rails_loaded = 0
 
 call s:DefRuby()
-" vim:tw=78:sw=4:ts=8:ft=vim:norl:
+" vim:tw=78:sw=4:ts=8:et:ft=vim:norl:

runtime/autoload/spellfile.vim

@@ -1,9 +1,9 @@
 " Vim script to download a missing spell file
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2006 Feb 01
+" Last Change:	2006 May 10
 
 if !exists('g:spellfile_URL')
-  let g:spellfile_URL = 'ftp://ftp.vim.org/pub/vim/unstable/runtime/spell'
+  let g:spellfile_URL = 'ftp://ftp.vim.org/pub/vim/runtime/spell'
 endif
 let s:spellfile_URL = ''    " Start with nothing so that s:donedict is reset.
 
@@ -61,13 +61,13 @@ function! spellfile#LoadFile(lang)
     new
     setlocal bin
     echo 'Downloading ' . fname . '...'
-    exe 'Nread ' g:spellfile_URL . '/' . fname
+    call spellfile#Nread(fname)
     if getline(2) !~ 'VIMspell'
       " Didn't work, perhaps there is an ASCII one.
       g/^/d
       let fname = a:lang . '.ascii.spl'
       echo 'Could not find it, trying ' . fname . '...'
-      exe 'Nread ' g:spellfile_URL . '/' . fname
+      call spellfile#Nread(fname)
       if getline(2) !~ 'VIMspell'
 	echo 'Sorry, downloading failed'
 	bwipe!
@@ -95,7 +95,7 @@ function! spellfile#LoadFile(lang)
 	g/^/d
 	let fname = substitute(fname, '\.spl$', '.sug', '')
 	echo 'Downloading ' . fname . '...'
-	exe 'Nread ' g:spellfile_URL . '/' . fname
+	call spellfile#Nread(fname)
 	if getline(2) !~ 'VIMsug'
 	  echo 'Sorry, downloading failed'
 	else
@@ -109,3 +109,10 @@ function! spellfile#LoadFile(lang)
     bwipe
   endif
 endfunc
+
+" Read "fname" from the ftp server.
+function! spellfile#Nread(fname)
+  let machine = substitute(g:spellfile_URL, 'ftp://\([^/]*\).*', '\1', '')
+  let dir = substitute(g:spellfile_URL, 'ftp://[^/]*/\(.*\)', '\1', '')
+  exe 'Nread "' . machine . ' anonymous vim7user ' . dir . '/' . a:fname . '"'
+endfunc

runtime/autoload/syntaxcomplete.vim

@@ -1,8 +1,9 @@
 " Vim completion script
 " Language:    All languages, uses existing syntax highlighting rules
 " Maintainer:  David Fishburn <fishburn@ianywhere.com>
-" Version:     1.3
-" Last Change: Mon Mar 27 2006 9:29:35 PM
+" Version:     2.0
+" Last Change: Fri May 05 2006 10:34:57 PM
+" Usage:       For detailed help, ":help ft-syntax-omni" 
 
 " Set completion with CTRL-X CTRL-O to autoloaded function.
 " This check is in place in case this script is
@@ -18,11 +19,15 @@ endif
 if exists('g:loaded_syntax_completion')
     finish 
 endif
-let g:loaded_syntax_completion = 1
+let g:loaded_syntax_completion = 20
+
+" Set ignorecase to the ftplugin standard
+if !exists('g:omni_syntax_ignorecase')
+    let g:omni_syntax_ignorecase = &ignorecase
+endif
 
 " This script will build a completion list based on the syntax
 " elements defined by the files in $VIMRUNTIME/syntax.
-
 let s:syn_remove_words = 'match,matchgroup=,contains,'.
             \ 'links to,start=,end=,nextgroup='
 
@@ -65,12 +70,13 @@ function! syntaxcomplete#Complete(findstart, base)
 
     let base = s:prepended . a:base
 
-    let list_idx = index(s:cache_name, &filetype, 0, &ignorecase)
+    let filetype = substitute(&filetype, '\.', '_', 'g')
+    let list_idx = index(s:cache_name, filetype, 0, &ignorecase)
     if list_idx > -1
         let compl_list = s:cache_list[list_idx]
     else
         let compl_list   = OmniSyntaxList()
-        let s:cache_name  = add( s:cache_name,  &filetype )
+        let s:cache_name = add( s:cache_name,  filetype )
         let s:cache_list = add( s:cache_list,  compl_list )
     endif
 
@@ -78,7 +84,8 @@ function! syntaxcomplete#Complete(findstart, base)
 
     if base =~ '\w'
         let compstr    = join(compl_list, ' ')
-        let compstr = substitute(compstr, '\<\%('.base.'\)\@!\w\+\s*', '', 'g')
+        let expr       = (g:omni_syntax_ignorecase==0?'\C':'').'\<\%('.base.'\)\@!\w\+\s*'
+        let compstr    = substitute(compstr, expr, '', 'g')
         let compl_list = split(compstr, '\s\+')
     endif
 
@@ -86,6 +93,13 @@ function! syntaxcomplete#Complete(findstart, base)
 endfunc
 
 function! OmniSyntaxList()
+    " Default to returning a dictionary, if use_dictionary is set to 0
+    " a list will be returned.
+    " let use_dictionary = 1
+    " if a:0 > 0 && a:1 != ''
+    "     let use_dictionary = a:1
+    " endif
+
     let saveL = @l
     
     " Loop through all the syntax groupnames, and build a
@@ -109,47 +123,58 @@ function! OmniSyntaxList()
         return []
     endif
 
+    let filetype = substitute(&filetype, '\.', '_', 'g')
+
     " Default the include group to include the requested syntax group
-    let syntax_group_include_{&filetype} = ''
+    let syntax_group_include_{filetype} = ''
     " Check if there are any overrides specified for this filetype
-    if exists('g:omni_syntax_group_include_'.&filetype)
-        let syntax_group_include_{&filetype} =
-                    \ substitute( g:omni_syntax_group_include_{&filetype},'\s\+','','g') 
-        if syntax_group_include_{&filetype} =~ '\w'
-            let syntax_group_include_{&filetype} = 
-                        \ substitute( syntax_group_include_{&filetype}, 
+    if exists('g:omni_syntax_group_include_'.filetype)
+        let syntax_group_include_{filetype} =
+                    \ substitute( g:omni_syntax_group_include_{filetype},'\s\+','','g') 
+        if syntax_group_include_{filetype} =~ '\w'
+            let syntax_group_include_{filetype} = 
+                        \ substitute( syntax_group_include_{filetype}, 
                         \ '\s*,\s*', '\\|', 'g'
                         \ )
         endif
     endif
 
     " Default the exclude group to nothing
-    let syntax_group_exclude_{&filetype} = ''
+    let syntax_group_exclude_{filetype} = ''
     " Check if there are any overrides specified for this filetype
-    if exists('g:omni_syntax_group_exclude_'.&filetype)
-        let syntax_group_exclude_{&filetype} =
-                    \ substitute( g:omni_syntax_group_exclude_{&filetype},'\s\+','','g') 
-        if syntax_group_exclude_{&filetype} =~ '\w' 
-            let syntax_group_exclude_{&filetype} = 
-                        \ substitute( syntax_group_exclude_{&filetype}, 
+    if exists('g:omni_syntax_group_exclude_'.filetype)
+        let syntax_group_exclude_{filetype} =
+                    \ substitute( g:omni_syntax_group_exclude_{filetype},'\s\+','','g') 
+        if syntax_group_exclude_{filetype} =~ '\w' 
+            let syntax_group_exclude_{filetype} = 
+                        \ substitute( syntax_group_exclude_{filetype}, 
                         \ '\s*,\s*', '\\|', 'g'
                         \ )
         endif
     endif
 
+    " Sometimes filetypes can be composite names, like c.doxygen
+    " Loop through each individual part looking for the syntax
+    " items specific to each individual filetype.
+    let syn_list = ''
+    let ftindex  = 0
+    let ftindex  = match(&filetype, '\w\+', ftindex)
+
+    while ftindex > -1
+        let ft_part_name = matchstr( &filetype, '\w\+', ftindex )
+
         " Syntax rules can contain items for more than just the current 
         " filetype.  They can contain additional items added by the user
         " via autocmds or their vimrc.
         " Some syntax files can be combined (html, php, jsp).
         " We want only items that begin with the filetype we are interested in.
         let next_group_regex = '\n' .
-                \ '\zs'.&filetype.'\w\+\ze'.
+                    \ '\zs'.ft_part_name.'\w\+\ze'.
                     \ '\s\+xxx\s\+' 
-    let syn_list = ''
         let index    = 0
         let index    = match(syntax_full, next_group_regex, index)
 
-    while index > 0
+        while index > -1
             let group_name = matchstr( syntax_full, '\w\+', index )
 
             let get_syn_list = 1
@@ -164,15 +189,15 @@ function! OmniSyntaxList()
             "         let get_syn_list = 0
             "     endif
             " endif
-        if syntax_group_exclude_{&filetype} != ''
-            if '\<'.syntax_group_exclude_{&filetype}.'\>' =~ '\<'.group_name.'\>'
+            if syntax_group_exclude_{filetype} != ''
+                if '\<'.syntax_group_exclude_{filetype}.'\>' =~ '\<'.group_name.'\>'
                     let get_syn_list = 0
                 endif
             endif
         
             if get_syn_list == 1
-            if syntax_group_include_{&filetype} != ''
-                if '\<'.syntax_group_include_{&filetype}.'\>' !~ '\<'.group_name.'\>'
+                if syntax_group_include_{filetype} != ''
+                    if '\<'.syntax_group_include_{filetype}.'\>' !~ '\<'.group_name.'\>'
                         let get_syn_list = 0
                     endif
                 endif
@@ -183,6 +208,13 @@ function! OmniSyntaxList()
                 " are interested in.
                 let extra_syn_list = s:SyntaxCSyntaxGroupItems(group_name, syntax_full)
 
+                " if !empty(extra_syn_list)
+                "     for elem in extra_syn_list
+                "         let item = {'word':elem, 'kind':'t', 'info':group_name}
+                "         let compl_list += [item]
+                "     endfor
+                " endif
+
                 let syn_list = syn_list . extra_syn_list . "\n"
             endif
 
@@ -190,6 +222,10 @@ function! OmniSyntaxList()
             let index = match(syntax_full, next_group_regex, index)
         endwhile
 
+        let ftindex  = ftindex + len(ft_part_name)
+        let ftindex  = match( &filetype, '\w\+', ftindex )
+    endwhile
+
     " Convert the string to a List and sort it.
     let compl_list = sort(split(syn_list))
 
@@ -228,7 +264,7 @@ function! s:SyntaxCSyntaxGroupItems( group_name, syntax_full )
     "     \n\w         - at the first newline starting with a character
     let syntax_group = matchstr(a:syntax_full, 
                 \ "\n".a:group_name.'\s\+xxx\s\+\zs.\{-}\ze'."\n".'\w'
-                \)
+                \ )
 
     if syntax_group != ""
         " let syn_list = substitute( @l, '^.*xxx\s*\%(contained\s*\)\?', "", '' )
@@ -242,17 +278,21 @@ function! s:SyntaxCSyntaxGroupItems( group_name, syntax_full )
         "    contained nextgroup=...
         " So this will strip off the ending of lines with known
         " keywords.
-        let syn_list = substitute( syntax_group, '\<\('.
+        let syn_list = substitute( 
+                    \    syntax_group, '\<\('.
                     \    substitute(
-                    \ escape( s:syn_remove_words, '\\/.*$^~[]')
-                    \ , ',', '\\|', 'g').
+                    \      escape(s:syn_remove_words, '\\/.*$^~[]')
+                    \      , ',', '\\|', 'g'
+                    \    ).
                     \    '\).\{-}\%($\|'."\n".'\)'
-                    \ , "\n", 'g' )
+                    \    , "\n", 'g' 
+                    \  )
 
         " Now strip off the newline + blank space + contained
-        let syn_list = substitute( syn_list, '\%(^\|\n\)\@<=\s*\<\('.
-                    \ 'contained\)'
-                    \ , "", 'g' )
+        let syn_list = substitute( 
+                    \    syn_list, '\%(^\|\n\)\@<=\s*\<\(contained\)'
+                    \    , "", 'g' 
+                    \ )
 
         " There are a number of items which have non-word characters in
         " them, *'T_F1'*.  vim.vim is one such file.

runtime/autoload/tar.vim

@@ -1,7 +1,7 @@
 " tar.vim: Handles browsing tarfiles
 "            AUTOLOAD PORTION
-" Date:			Mar 27, 2006
-" Version:		7
+" Date:			May 02, 2006
+" Version:		9
 " Maintainer:	Charles E Campbell, Jr <drchipNOSPAM at campbellfamily dot biz>
 " License:		Vim License  (see vim's :help license)
 "
@@ -24,7 +24,7 @@ set cpo&vim
 if exists("g:loaded_tar")
  finish
 endif
-let g:loaded_tar= "v7"
+let g:loaded_tar= "v9"
 "call Decho("loading autoload/tar.vim")
 
 " ---------------------------------------------------------------------
@@ -97,6 +97,7 @@ fun! tar#Browse(tarfile)
    " assuming cygwin
    let tarfile=substitute(system("cygpath -u ".tarfile),'\n$','','e')
   endif
+  let curlast= line("$")
   if tarfile =~# '\.\(gz\|tgz\)$'
 "   call Decho("exe silent r! gzip -d -c '".tarfile."'| tar -".g:tar_browseoptions." - ")
    exe "silent r! gzip -d -c '".tarfile."'| tar -".g:tar_browseoptions." - "
@@ -108,8 +109,27 @@ fun! tar#Browse(tarfile)
    exe "silent r! ".g:tar_cmd." -".g:tar_browseoptions." '".tarfile."'"
   endif
   if v:shell_error != 0
-   echohl Error | echo '***error*** (tar#Browse) while browsing; check your g:tar_browseoptions<".g:tar_browseoptions.">"
-"  call Dret("tar#Browse : w:tarfile<".w:tarfile.">")
+   echohl WarningMsg | echo "***warning*** (tar#Browse) please check your g:tar_browseoptions<".g:tar_browseoptions.">"
+   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
+"   call Dret("tar#Browse : a:tarfile<".a:tarfile.">")
+   silent %d
+   let eikeep= &ei
+   set ei=BufReadCmd,FileReadCmd
+   exe "r ".a:tarfile
+   let &ei= eikeep
+   1d
+   return
+  endif
+  if line("$") == curlast || ( line("$") == (curlast + 1) && getline("$") =~? '\c\%(warning\|error\|inappropriate\|unrecognized\)')
+   echohl WarningMsg | echo "***warning*** (tar#Browse) ".a:tarfile." doesn't appear to be a tar file" | echohl None
+   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
+   silent %d
+   let eikeep= &ei
+   set ei=BufReadCmd,FileReadCmd
+   exe "r ".a:tarfile
+   let &ei= eikeep
+   1d
+"   call Dret("tar#Browse : a:tarfile<".a:tarfile.">")
    return
   endif
 
@@ -147,12 +167,6 @@ fun! s:TarBrowseSelect()
   new
   wincmd _
   let s:tblfile_{winnr()}= curfile
-"  if has("unix")
-""   call Decho("exe e tarfile:".tarfile.':'.fname)
-"   exe "e tarfile:".tarfile.':'.fname
-"  elseif has("win32")
-"   call tar#Read("tarfile:".tarfile.':'.fname,1)
-"  endif
   call tar#Read("tarfile:".tarfile.':'.fname,1)
   filetype detect
 

runtime/autoload/vimball.vim

@@ -1,7 +1,7 @@
 " vimball : construct a file containing both paths and files
 " Author: Charles E. Campbell, Jr.
-" Date:   Apr 26, 2006
-" Version: 9
+" Date:   May 01, 2006
+" Version: 13
 " GetLatestVimScripts: 1502 1 :AutoInstall: vimball.vim
 " Copyright: (c) 2004-2006 by Charles E. Campbell, Jr.
 "            The VIM LICENSE applies to Vimball.vim, and Vimball.txt
@@ -15,7 +15,7 @@ if &cp || exists("g:loaded_vimball")
  finish
 endif
 let s:keepcpo        = &cpo
-let g:loaded_vimball = "v9"
+let g:loaded_vimball = "v13"
 set cpo&vim
 
 " =====================================================================
@@ -40,9 +40,7 @@ fun! vimball#MkVimball(line1,line2,writelevel,vimballname) range
   endif
 
   " user option bypass
-  let eikeep  = &ei
-  let acdkeep = &acd
-  set ei=all noacd
+  call s:SaveSettings()
 
   " go to vim plugin home
   for home in split(&rtp,',') + ['']
@@ -72,8 +70,7 @@ fun! vimball#MkVimball(line1,line2,writelevel,vimballname) range
    if !filereadable(svfile)
     echohl Error | echo "unable to read file<".svfile.">" | echohl None
 	call s:ChgDir(curdir)
-    let &ei  = eikeep
-    let &acd = acdkeep
+	call s:RestoreSettings()
 "    call Dret("MkVimball")
     return
    endif
@@ -131,8 +128,7 @@ fun! vimball#MkVimball(line1,line2,writelevel,vimballname) range
   exe "tabc ".vbtabnr
 
   " restore options
-  let &ei  = eikeep
-  let &acd = acdkeep
+  call s:RestoreSettings()
 
 "  call Dret("MkVimball")
 endfun
@@ -148,15 +144,9 @@ fun! vimball#Vimball(really)
    return
   endif
 
-  " initialize
-  let acdkeep  = &acd
-  let fenkeep  = &fen
-  let regakeep = @a
-  let eikeep   = &ei
-  let vekeep   = &ve
-  let makeep   = getpos("'a")
+  " set up standard settings
+  call s:SaveSettings()
   let curtabnr = tabpagenr()
-  set ei=all ve=all nofen noacd
 
   " set up vimball tab
   tabnew
@@ -188,6 +178,7 @@ fun! vimball#Vimball(really)
    echohl Title | echomsg "Vimball Archive" | echohl None
   else
    echohl Title | echomsg "Vimball Archive Listing" | echohl None
+   echohl Statement | echomsg "files would be placed under: ".home | echohl None
   endif
 
   " apportion vimball contents to various files
@@ -208,6 +199,7 @@ fun! vimball#Vimball(really)
 
    " make directories if they don't exist yet
 "   call Decho("making directories if they don't exist yet")
+   if a:really
     let fnamebuf= fname
     while fnamebuf =~ '/'
     	let dirname  = home."/".substitute(fnamebuf,'/.*$','','e')
@@ -217,6 +209,7 @@ fun! vimball#Vimball(really)
       call mkdir(dirname)
      endif
     endwhile
+   endif
    call s:ChgDir(home)
 
    " grab specified qty of lines and place into "a" buffer
@@ -279,16 +272,7 @@ fun! vimball#Vimball(really)
   setlocal nomod bh=wipe
   exe "tabn ".curtabnr
   exe "tabc ".vbtabnr
-  let &ei  = eikeep
-  let @a   = regakeep
-  let &fen = fenkeep
-  let &acd = acdkeep
-  if makeep[0] != 0
-   " restore mark a
-"   call Decho("restore mark-a: makeep=".string(makeep))
-   call setpos("'a",makeep)
-   ka
-  endif
+  call s:RestoreSettings()
   call s:ChgDir(curdir)
 
 "  call Dret("Vimball")
@@ -361,6 +345,56 @@ fun! vimball#ShowMesg(msg)
 "  call Dret("vimball#ShowMesg")
 endfun
 
+" ---------------------------------------------------------------------
+" s:SaveSettings: {{{2
+fun! s:SaveSettings()
+"  call Dfunc("SaveSettings()")
+  let s:makeep  = getpos("'a")
+  let s:regakeep= @a
+  if exists("&acd")
+   let s:acdkeep = &acd
+  endif
+  let s:eikeep  = &ei
+  let s:fenkeep = &fen
+  let s:hidkeep = &hidden
+  let s:ickeep  = &ic
+  let s:repkeep = &report
+  let s:vekeep  = &ve
+  if exists("&acd")
+   set ei=all ve=all noacd nofen noic report=999 nohid
+  else
+   set ei=all ve=all nofen noic report=999 nohid
+  endif
+"  call Dret("SaveSettings")
+endfun
+
+" ---------------------------------------------------------------------
+" s:RestoreSettings: {{{2
+fun! s:RestoreSettings()
+"  call Dfunc("RestoreSettings()")
+  let @a      = s:regakeep
+  if exists("&acd")
+   let &acd   = s:acdkeep
+  endif
+  let &ei     = s:eikeep
+  let &fen    = s:fenkeep
+  let &hidden = s:hidkeep
+  let &ic     = s:ickeep
+  let &report = s:repkeep
+  let &ve     = s:vekeep
+  if s:makeep[0] != 0
+   " restore mark a
+"   call Decho("restore mark-a: makeep=".string(makeep))
+   call setpos("'a",s:makeep)
+  endif
+  if exists("&acd")
+   unlet s:regakeep s:acdkeep s:eikeep s:fenkeep s:hidkeep s:ickeep s:repkeep s:vekeep s:makeep
+  else
+   unlet s:regakeep s:eikeep s:fenkeep s:hidkeep s:ickeep s:repkeep s:vekeep s:makeep
+  endif
+"  call Dret("RestoreSettings")
+endfun
+
 " ---------------------------------------------------------------------
 let &cpo= s:keepcpo
 unlet s:keepcpo

runtime/autoload/xmlcomplete.vim

@@ -1,7 +1,7 @@
 " Vim completion script
 " Language:	XML
 " Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
-" Last Change:	2006 Apr 19
+" Last Change:	2006 Apr 30
 
 " This function will create Dictionary with users namespace strings and values
 " canonical (system) names of data files.  Names should be lowercase,

runtime/autoload/zip.vim

@@ -1,7 +1,7 @@
 " zip.vim: Handles browsing zipfiles
 "            AUTOLOAD PORTION
-" Date:			Apr 10, 2006
-" Version:		8
+" Date:			May 01, 2006
+" Version:		9
 " 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     = "v8"
+let g:loaded_zip     = "v9"
 let s:zipfile_escape = ' ?&;\'
 
 " ----------------
@@ -77,6 +77,18 @@ fun! zip#Browse(zipfile)
 
 "  call Decho("exe silent r! unzip -l '".a:zipfile."'")
   exe "silent r! unzip -l '".a:zipfile."'"
+  if v:shell_error != 0
+   echohl WarningMsg | echo "***warning*** (zip#Browse) ".a:zipfile." is not a zip file" | echohl None
+   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
+   silent %d
+   let eikeep= &ei
+   set ei=BufReadCmd,FileReadCmd
+   exe "r ".a:zipfile
+   let &ei= eikeep
+   1d
+"   call Dret("zip#Browse")
+   return
+  endif
 "  call Decho("line 6: ".getline(6))
   let namecol= stridx(getline(6),'Name') + 1
 "  call Decho("namecol=".namecol)
@@ -127,8 +139,8 @@ fun! s:ZipBrowseSelect()
   new
   wincmd _
   let s:zipfile_{winnr()}= curfile
-"  call Decho("exe e zipfile:".escape(zipfile,s:zipfile_escape).':'.escape(fname,s:zipfile_escape))
-  exe "e zipfile:".escape(zipfile,s:zipfile_escape).':'.escape(fname,s:zipfile_escape)
+"  call Decho("exe e zipfile:".escape(zipfile,s:zipfile_escape).'::'.escape(fname,s:zipfile_escape))
+  exe "e zipfile:".escape(zipfile,s:zipfile_escape).'::'.escape(fname,s:zipfile_escape)
   filetype detect
 
   let &report= repkeep
@@ -142,9 +154,15 @@ fun! zip#Read(fname,mode)
   let repkeep= &report
   set report=10
 
-  let zipfile = substitute(a:fname,'zipfile:\(.\{-}\):[^\\].*$','\1','')
-  let fname   = substitute(a:fname,'zipfile:.\{-}:\([^\\].*\)$','\1','')
-"  call Decho("zipfile<".zipfile."> fname<".fname.">")
+  if has("unix")
+   let zipfile = substitute(a:fname,'zipfile:\(.\{-}\)::[^\\].*$','\1','')
+   let fname   = substitute(a:fname,'zipfile:.\{-}::\([^\\].*\)$','\1','')
+  else
+   let zipfile = substitute(a:fname,'^.\{-}zipfile:\(.\{-}\)::[^\\].*$','\1','')
+   let fname   = substitute(a:fname,'^.\{-}zipfile:.\{-}::\([^\\].*\)$','\1','')
+  endif
+"  call Decho("zipfile<".zipfile.">")
+"  call Decho("fname  <".fname.">")
 
 "  call Decho("exe r! unzip -p '".zipfile."' '".fname."'")
   exe "silent r! unzip -p '".zipfile."' '".fname."'"
@@ -209,8 +227,15 @@ fun! zip#Write(fname)
   cd _ZIPVIM_
 "  call Decho("current directory now: ".getcwd())
 
-  let zipfile = substitute(a:fname,'zipfile:\(.\{-}\):.*$','\1','')
-  let fname   = substitute(a:fname,'zipfile:.\{-}:\(.*\)$','\1','')
+  if has("unix")
+   let zipfile = substitute(a:fname,'zipfile:\(.\{-}\)::[^\\].*$','\1','')
+   let fname   = substitute(a:fname,'zipfile:.\{-}::\([^\\].*\)$','\1','')
+  else
+   let zipfile = substitute(a:fname,'^.\{-}zipfile:\(.\{-}\)::[^\\].*$','\1','')
+   let fname   = substitute(a:fname,'^.\{-}zipfile:.\{-}::\([^\\].*\)$','\1','')
+  endif
+"  call Decho("zipfile<".zipfile.">")
+"  call Decho("fname  <".fname.">")
 
   if fname =~ '/'
    let dirpath = substitute(fname,'/[^/]\+$','','e')

runtime/colors/darkblue.vim

@@ -1,6 +1,6 @@
 " Vim color file
 " Maintainer:	Bohdan Vlasyuk <bohdan@vstu.edu.ua>
-" Last Change:	2006 Apr 21
+" Last Change:	2006 Apr 30
 
 " darkblue -- for those who prefer dark background
 " [note: looks bit uglier with come terminal palettes,

runtime/colors/delek.vim

@@ -1,6 +1,6 @@
 " Vim color file
 " Maintainer:	David Schweikert <dws@ee.ethz.ch>
-" Last Change:	2006 Apr 14
+" Last Change:	2006 Apr 30
 
 hi clear
 

runtime/doc/Makefile

@@ -75,6 +75,7 @@ DOCS = \
 	pi_paren.txt \
 	pi_spec.txt \
 	pi_tar.txt \
+	pi_vimball.txt \
 	pi_zip.txt \
 	print.txt \
 	quickfix.txt \
@@ -138,7 +139,6 @@ DOCS = \
 	version6.txt \
 	version7.txt \
 	vi_diff.txt \
-	vimball.txt \
 	visual.txt \
 	windows.txt \
 	workshop.txt
@@ -204,6 +204,9 @@ HTMLS = \
 	pi_netrw.html \
 	pi_paren.html \
 	pi_spec.html \
+	pi_tar.html \
+	pi_vimball.html \
+	pi_zip.html \
 	print.html \
 	quickfix.html \
 	quickref.html \
@@ -267,7 +270,6 @@ HTMLS = \
 	version6.html \
 	version7.html \
 	vi_diff.html \
-	vimball.txt \
 	visual.html \
 	windows.html \
 	workshop.html

runtime/doc/arabic.txt

@@ -1,4 +1,4 @@
-*arabic.txt*	For Vim version 7.0f.  Last change: 2005 Mar 29
+*arabic.txt*	For Vim version 7.0.  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.0f.  Last change: 2006 Apr 25
+*autocmd.txt*   For Vim version 7.0.  Last change: 2006 May 06
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -734,8 +734,8 @@ Syntax				When the 'syntax' option has been set.
 				See |:syn-on|.
 							*TabEnter*
 TabEnter			Just after entering a tab page. |tab-page|
-				Before triggering the WinEnter and BufEnter
-				events.
+				After triggering the WinEnter and before
+				triggering the BufEnter event.
 							*TabLeave*
 TabLeave			Just before leaving a tab page. |tab-page|
 				A WinLeave event will have been triggered

runtime/doc/change.txt

@@ -1,4 +1,4 @@
-*change.txt*    For Vim version 7.0f.  Last change: 2006 Apr 25
+*change.txt*    For Vim version 7.0.  Last change: 2006 May 05
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1429,8 +1429,9 @@ value	action	~
 "c"	automatic formatting for comments, but not text (good for C code)
 "tc"	automatic formatting for text and comments
 
-Note that when 'textwidth' is 0, Vim does no formatting anyway (but does
-insert comment leaders according to the 'comments' option).
+Note that when 'textwidth' is 0, Vim does no automatic formatting anyway (but
+does insert comment leaders according to the 'comments' option).  An exception
+is when the 'a' flag is present. |auto-format|
 
 Note that when 'paste' is on, Vim does no formatting at all.
 
@@ -1485,6 +1486,9 @@ editing text paragraphs.  A few hints on how to use this:
 
 - Add the 'c' flag to only auto-format comments.  Useful in source code.
 
+- Set 'textwidth' to the desired width.  If it is zero then 79 is used, or the
+  width of the screen if this is smaller.
+
 And a few warnings:
 
 - When part of the text is not properly separated in paragraphs, making

runtime/doc/cmdline.txt

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

runtime/doc/debug.txt

@@ -1,4 +1,4 @@
-*debug.txt*     For Vim version 7.0f.  Last change: 2006 Apr 24
+*debug.txt*     For Vim version 7.0.  Last change: 2006 May 01
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -47,9 +47,9 @@ some steps to provide a useful bug report.
 GENERIC ~
 
 You must obtain the debugger symbols (PDB) file for your executable: gvim.pdb
-for gvim.exe, or vim.pdb for vim.exe. It should be available from the same
-place that you obtained the executable. Be sure to use the PDB that matches
-the EXE (same date).
+for gvim.exe, or vim.pdb for vim.exe. The PDB should be available from the
+same place that you obtained the executable. Be sure to use the PDB that
+matches the EXE (same date).
 
 If you built the executable yourself with the Microsoft Visual C++ compiler,
 then the PDB was built with the EXE.
@@ -65,10 +65,11 @@ a Vim executable compiled with the Borland compiler; gdb (see above
 |debug-gcc|) for the Cygwin and MinGW compilers.
 
 
-Debugging Vim crashes with Visual Studio 2005/Visual C++ 2005 Express ~
+								*debug-vs2005*
+2.2 Debugging Vim crashes with Visual Studio 2005/Visual C++ 2005 Express ~
 
 First launch vim.exe or gvim.exe and then launch Visual Studio.  (If you don't
-have Visual Studio, follow the instructions in src/INSTALLpc.txt to obtain a
+have Visual Studio, follow the instructions at |get-ms-debuggers| to obtain a
 free copy of Visual C++ 2005 Express Edition.)
 
 On the Tools menu, click Attach to Process.  Choose the Vim process.
@@ -94,18 +95,57 @@ at ":help bug-reports".  Paste the call stack into the bug report.
 If you have a non-free version of Visual Studio, you can save a minidump via
 the Debug menu and send it with the bug report.  A minidump is a small file
 (<100KB), which contains information about the state of your process.
+Visual C++ 2005 Express Edition cannot save minidumps and it cannot be
+installed as a just-in-time debugger. Use WinDbg, |debug-windbg|, if you
+need to save minidumps or you want a just-in-time (postmortem) debugger.
 
+								*debug-windbg*
+2.3 Debugging Vim crashes with WinDbg ~
 
-Debugging Vim with Debugging Tools ~
+See |get-ms-debuggers| to obtain a copy of WinDbg.
 
-You can download the Microsoft Visual C++ Toolkit from
-    http://msdn.microsoft.com/visualc/vctoolkit2003/
-This contains the command-line tools, but not the Visual Studio IDE.
+As with the Visual Studio IDE, you can attach WinDbg to a running Vim process.
+You can also have your system automatically invoke WinDbg as a postmortem
+debugger. To set WinDbg as your postmortem debugger, run "windbg -I".
 
-The Debugging Tools for Windows can be downloaded from
+To attach WinDbg to a running Vim process, launch WinDbg. On the File menu,
+choose Attach to a Process. Select the Vim process and click OK.
+
+At this point, choose Symbol File Path on the File menu, and add the folder
+containing your Vim PDB to the sympath. If you have Vim source available,
+use Source File Path on the File menu. You can now open source files in WinDbg
+and set breakpoints, if you like. Reproduce your crash. WinDbg should open the
+source file at the point of the crash. Using the View menu, you can examine
+the call stack, local variables, watch windows, and so on.
+
+If WinDbg is your postmortem debugger, you do not need to attach WinDbg to
+your Vim process. Simply reproduce the crash and WinDbg will launch
+automatically. As above, set the Symbol File Path and the Source File Path.
+
+To save a minidump, type the following at the WinDbg command line: >
+        .dump vim.dmp
+<
+							*debug-minidump*
+2.4 Opening a Minidump ~
+
+If you have a minidump file, you can open it in Visual Studio or in WinDbg.
+
+In Visual Studio 2005: on the File menu, choose Open, then Project/Solution.
+Navigate to the .dmp file and open it. Now press F5 to invoke the debugger.
+Follow the instructions in |debug-vs2005| to set the Symbol File Path.
+
+In WinDbg: choose Open Crash Dump on the File menu. Follow the instructions in
+|debug-windbg| to set the Symbol File Path.
+
+							*get-ms-debuggers*
+2.5 Obtaining Microsoft Debugging Tools ~
+
+The Debugging Tools for Windows (including WinDbg) can be downloaded from
     http://www.microsoft.com/whdc/devtools/debugging/default.mspx
 This includes the WinDbg debugger.
 
+Visual C++ 2005 Express Edition can be downloaded for free from:
+    http://msdn.microsoft.com/vstudio/express/visualC/default.aspx
 
 =========================================================================
  vim:tw=78:ts=8:ft=help:norl:

runtime/doc/debugger.txt

@@ -1,4 +1,4 @@
-*debugger.txt*  For Vim version 7.0f.  Last change: 2005 Mar 29
+*debugger.txt*  For Vim version 7.0.  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.0f.  Last change: 2006 Mar 09
+*develop.txt*   For Vim version 7.0.  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.0f.  Last change: 2006 Apr 14
+*diff.txt*      For Vim version 7.0.  Last change: 2006 Apr 14
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/digraph.txt

@@ -1,4 +1,4 @@
-*digraph.txt*   For Vim version 7.0f.  Last change: 2006 Apr 25
+*digraph.txt*   For Vim version 7.0.  Last change: 2006 Apr 25
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/editing.txt

@@ -1,4 +1,4 @@
-*editing.txt*   For Vim version 7.0f.  Last change: 2006 Apr 17
+*editing.txt*   For Vim version 7.0.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -343,12 +343,12 @@ CTRL-^			Edit the alternate file (equivalent to ":e #").
 			separated by a non-filename (see 'isfname') and
 			non-numeric character. White space between the
 			filename, the separator and the number are ignored.
-			Examples: >
-				eval.c:10
-				eval.c @ 20
-				eval.c (30)
-				eval.c 40
-<
+			Examples:
+				eval.c:10 ~
+				eval.c @ 20 ~
+				eval.c (30) ~
+				eval.c 40 ~
+
 							*v_gF*
 {Visual}[count]gF	Same as "v_gf".
 

runtime/doc/eval.txt

@@ -1,4 +1,4 @@
-*eval.txt*      For Vim version 7.0f.  Last change: 2006 Apr 26
+*eval.txt*      For Vim version 7.0.  Last change: 2006 May 06
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -2313,6 +2313,8 @@ exists({expr})	The result is a Number, which is non-zero if {expr} is
 					3  matches several user commands
 					To check for a supported command
 					always check the return value to be 2.
+			:2match		The |:2match| command.
+			:3match		The |:3match| command.
 			#event		autocommand defined for this event
 			#event#pattern	autocommand defined for this event and
 					pattern (the pattern is taken
@@ -2344,12 +2346,19 @@ exists({expr})	The result is a Number, which is non-zero if {expr} is
 			exists("##ColorScheme")
 <		There must be no space between the symbol (&/$/*/#) and the
 		name.
-		Note that the argument must be a string, not the name of the
-		variable itself!  For example: >
+		There must be no extra characters after the name, although in
+		a few cases this is ignored.  That may become more strict in
+		the future, thus don't count on it!
+		Working example: >
+			exists(":make")
+<		NOT working example: >
+			exists(":make install")
+
+<		Note that the argument must be a string, not the name of the
+		variable itself.  For example: >
 			exists(bufcount)
 <		This doesn't check for existence of the "bufcount" variable,
-		but gets the contents of "bufcount", and checks if that
-		exists.
+		but gets the value of "bufcount", and checks if that exists.
 
 expand({expr} [, {flag}])				*expand()*
 		Expand wildcards and the following special keywords in {expr}.
@@ -2670,21 +2679,27 @@ getbufvar({expr}, {varname})				*getbufvar()*
 			:echo "todo myvar = " . getbufvar("todo", "myvar")
 <
 getchar([expr])						*getchar()*
-		Get a single character from the user.  If it is an 8-bit
-		character, the result is a number.  Otherwise a String is
-		returned with the encoded character.  For a special key it's a
-		sequence of bytes starting with 0x80 (decimal: 128).
+		Get a single character from the user or input stream.
 		If [expr] is omitted, wait until a character is available.
 		If [expr] is 0, only get a character when one is available.
+			Return zero otherwise.
 		If [expr] is 1, only check if a character is available, it is
-				not consumed.  If a normal character is
-				available, it is returned, otherwise a
-				non-zero value is returned.
-		If a normal character available, it is returned as a Number.
+			not consumed.  Return zero if no character available.
+
+		Without {expr} and when {expr} is 0 a whole character or
+		special key is returned.  If it is an 8-bit character, the
+		result is a number.  Use nr2char() to convert it to a String.
+		Otherwise a String is returned with the encoded character.
+		For a special key it's a sequence of bytes starting with 0x80
+		(decimal: 128).  This is the same value as the string
+		"\<Key>", e.g., "\<Left>".  The returned value is also a
+		String when a modifier (shift, control, alt) was used that is
+		not included in the character.
+
+		When {expr} is 1 only the first byte is returned.  For a
+		one-byte character it is the character itself as a number.
 		Use nr2char() to convert it to a String.
-		The returned value is zero if no character is available.
-		The returned value is a string of characters for special keys
-		and when a modifier (shift, control, alt) was used.
+
 		There is no prompt, you will somehow have to make clear to the
 		user that a character has to be typed.
 		There is no mapping for the character.
@@ -4664,6 +4679,7 @@ substitute({expr}, {pat}, {sub}, {flags})		*substitute()*
 		like the ":substitute" command (without any flags).  But the
 		matching with {pat} is always done like the 'magic' option is
 		set and 'cpoptions' is empty (to make scripts portable).
+		'ignorecase' is still relevant.
 		See |string-match| for how {pat} is used.
 		And a "~" in {sub} is not replaced with the previous {sub}.
 		Note that some codes in {sub} have a special meaning
@@ -4936,10 +4952,11 @@ virtcol({expr})						*virtcol()*
 
 visualmode([expr])						*visualmode()*
 		The result is a String, which describes the last Visual mode
-		used.  Initially it returns an empty string, but once Visual
-		mode has been used, it returns "v", "V", or "<CTRL-V>" (a
-		single CTRL-V character) for character-wise, line-wise, or
-		block-wise Visual mode respectively.
+		used in the current buffer.  Initially it returns an empty
+		string, but once Visual mode has been used, it returns "v",
+		"V", or "<CTRL-V>" (a single CTRL-V character) for
+		character-wise, line-wise, or block-wise Visual mode
+		respectively.
 		Example: >
 			:exe "normal " . visualmode()
 <		This enters the same Visual mode as before.  It is also useful
@@ -5176,6 +5193,7 @@ profile			Compiled with |:profile| support.
 python			Compiled with Python interface.
 qnx			QNX version of Vim.
 quickfix		Compiled with |quickfix| support.
+reltime			Compiled with |reltime()| support.
 rightleft		Compiled with 'rightleft' support.
 ruby			Compiled with Ruby interface |ruby|.
 scrollbind		Compiled with 'scrollbind' support.

runtime/doc/farsi.txt

@@ -1,4 +1,4 @@
-*farsi.txt*     For Vim version 7.0f.  Last change: 2005 Mar 29
+*farsi.txt*     For Vim version 7.0.  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.0f.  Last change: 2006 Mar 24
+*filetype.txt*  For Vim version 7.0.  Last change: 2006 Apr 28
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -551,8 +551,11 @@ then this determined the file type:  plaintex (for plain TeX), context (for
 ConTeXt), or tex (for LaTeX).  Otherwise, the file is searched for keywords to
 choose context or tex.  If no keywords are found, it defaults to plaintex.
 You can change the default by defining the variable g:tex_flavor to the format
-(not the file type) you use most:  plain or context or latex.  (Currently no
-other formats are recognized.)
+(not the file type) you use most.  Use one of these: >
+	let g:tex_flavor = "plain"
+	let g:tex_flavor = "context"
+	let g:tex_flavor = "latex"
+Currently no other formats are recognized.
 
 
  vim:tw=78:ts=8:ft=help:norl:

runtime/doc/fold.txt

@@ -1,4 +1,4 @@
-*fold.txt*      For Vim version 7.0f.  Last change: 2006 Mar 29
+*fold.txt*      For Vim version 7.0.  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.0f.  Last change: 2006 Mar 24
+*getscript.txt*	For Vim version 7.0.  Last change: 2006 Apr 30
 
 		Get the Latest VimScripts
 

runtime/doc/gui.txt

@@ -1,4 +1,4 @@
-*gui.txt*       For Vim version 7.0f.  Last change: 2006 Apr 02
+*gui.txt*       For Vim version 7.0.  Last change: 2006 May 04
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -102,7 +102,7 @@ There are a number of options which only have meaning in the GUI version of
 Vim.  These are 'guicursor', 'guifont', 'guipty' and 'guioptions'.  They are
 documented in |options.txt| with all the other options.
 
-If using the Motif or Athena version of the GUI (but not for the KDE, GTK+ or
+If using the Motif or Athena version of the GUI (but not for the GTK+ or
 Win32 version), a number of X resources are available.  See |gui-resources|.
 
 Another way to set the colors for different occasions is with highlight
@@ -487,7 +487,7 @@ a menu entry.  Hit <Enter> to execute it.  Hit <Esc> if you want to cancel.
 This does require the |+menu| feature enabled at compile time.
 
 							*tear-off-menus*
-KDE, GTK+ and Motif support Tear-off menus.  These are sort of sticky menus or
+GTK+ and Motif support Tear-off menus.  These are sort of sticky menus or
 pop-up menus that are present all the time.  If the resizing does not work
 correctly, this may be caused by using something like "Vim*geometry" in the
 defaults.  Use "Vim.geometry" instead.
@@ -588,12 +588,21 @@ The ":set ic" will not be echoed when using this menu.  Messages from the
 executed command are still given though.  To shut them up too, add a ":silent"
 in the executed command: >
 	:menu <silent> Search.Header :exe ":silent normal /Header\r"<CR>
-<
+"<silent>" may also appear just after "<special>" or "<script>".
+
+					*:menu-<special>* *:menu-special*
+Define a menu with <> notation for special keys, even though the "<" flag
+may appear in 'cpoptions'.  This is useful if the side effect of setting
+'cpoptions' is not desired.  Example: >
+	:menu <special> Search.Header /Header<CR>
+"<special>" must appear as the very first argument to the ":menu" command or
+just after "<silent>" or "<script>".
+
 						*:menu-<script>* *:menu-script*
 The "to" part of the menu will be inspected for mappings.  If you don't want
 this, use the ":noremenu" command (or the similar one for a specific mode).
 If you do want to use script-local mappings, add "<script>" as the very first
-argument to the ":menu" command or after "<silent>".
+argument to the ":menu" command or just after "<silent>" or "<special>".
 
 							*menu-priority*
 You can give a priority to a menu.  Menus with a higher priority go more to
@@ -657,7 +666,7 @@ simple.
 
 							*gui-toolbar*
 The toolbar is currently available in the Win32, Athena, Motif, GTK+ (X11),
-KDE and Photon GUI.  It should turn up in other GUIs in due course.  The
+and Photon GUI.  It should turn up in other GUIs in due course.  The
 default toolbar is setup in menu.vim.
 The display of the toolbar is controlled by the 'guioptions' letter 'T'.  You
 can thus have menu & toolbar together, or either on its own, or neither.
@@ -745,7 +754,7 @@ from the main menu bar.  You must then use the |:popup| or |:tearoff| command
 to display it.
 
 							*popup-menu*
-In the Win32, KDE, GTK+, Motif, Athena and Photon GUI, you can define the
+In the Win32, GTK+, Motif, Athena and Photon GUI, you can define the
 special menu "PopUp".  This is the menu that is displayed when the right mouse
 button is pressed, if 'mousemodel' is set to popup or popup_setpos.
 
@@ -955,8 +964,6 @@ This section describes other features which are related to the GUI.
 	if has("gui_running")
 	    if has("gui_gtk2")
 		:set guifont=Luxi\ Mono\ 12
-	    elseif has("gui_kde")
-		:set guifont=Luxi\ Mono/12/-1/5/50/0/0/0/1/0
 	    elseif has("x11")
 		" Also for GTK 1
 		:set guifont=*-lucidatypewriter-medium-r-normal-*-*-180-*-*-m-*-*

runtime/doc/gui_w16.txt

@@ -1,4 +1,4 @@
-*gui_w16.txt*   For Vim version 7.0f.  Last change: 2005 Mar 29
+*gui_w16.txt*   For Vim version 7.0.  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.0f.  Last change: 2005 Mar 29
+*gui_w32.txt*   For Vim version 7.0.  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.0f.  Last change: 2005 Dec 06
+*gui_x11.txt*   For Vim version 7.0.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/hangulin.txt

@@ -1,4 +1,4 @@
-*hangulin.txt*  For Vim version 7.0f.  Last change: 2006 Apr 02
+*hangulin.txt*  For Vim version 7.0.  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.0f.  Last change: 2003 May 11
+*hebrew.txt*    For Vim version 7.0.  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.0f.  Last change: 2006 Apr 02
+*help.txt*	For Vim version 7.0.  Last change: 2006 May 07
 
 			VIM - main help file
 									 k
@@ -7,13 +7,13 @@
 Close this window:  Use ":q<Enter>".
    Get out of Vim:  Use ":qa!<Enter>" (careful, all changes are lost!).
 
-Jump to a subject:  Position the cursor on a tag between |bars| and hit CTRL-].
+Jump to a subject:  Position the cursor on a tag (e.g. |bars|) and hit CTRL-].
    With the mouse:  ":set mouse=a" to enable the mouse (in xterm or GUI).
-		    Double-click the left mouse button on a tag between |bars|.
+		    Double-click the left mouse button on a tag, e.g. |bars|.
 	Jump back:  Type CTRL-T or CTRL-O (repeat to go further back).
 
 Get specific help:  It is possible to go directly to whatever you want help
-		    on, by giving an argument to the ":help" command |:help|.
+		    on, by giving an argument to the |:help| command.
 		    It is possible to further specify the context:
 							*help-context*
 			  WHAT			PREPEND    EXAMPLE	~
@@ -202,5 +202,12 @@ LOCAL ADDITIONS:				*local-additions*
 
 Now that you've jumped here with CTRL-] or a double mouse click, you can use
 CTRL-T, CTRL-O, g<RightMouse>, or <C-RightMouse> to go back to where you were.
+
+Note that tags are within | characters, but when highlighting is enabled these
+are hidden.  That makes it easier to read a command.
+
+Anyway, you can use CTRL-] on any word, also when it is not within |, and Vim
+will try to find help for it.
+
 ------------------------------------------------------------------------------
  vim:tw=78:fo=tcq2:isk=!-~,^*,^\|,^\":ts=8:ft=help:norl:

runtime/doc/howto.txt

@@ -1,4 +1,4 @@
-*howto.txt*	For Vim version 7.0f.  Last change: 2006 Apr 02
+*howto.txt*	For Vim version 7.0.  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.0f.  Last change: 2005 Mar 29
+*if_cscop.txt*  For Vim version 7.0.  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.0f.  Last change: 2006 Mar 06
+*if_mzsch.txt*  For Vim version 7.0.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Sergey Khorev

runtime/doc/if_ole.txt

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

runtime/doc/if_perl.txt

@@ -1,4 +1,4 @@
-*if_perl.txt*   For Vim version 7.0f.  Last change: 2006 Mar 06
+*if_perl.txt*   For Vim version 7.0.  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.0f.  Last change: 2006 Jan 20
+*if_pyth.txt*   For Vim version 7.0.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Paul Moore

runtime/doc/if_ruby.txt

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

runtime/doc/if_sniff.txt

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

runtime/doc/if_tcl.txt

@@ -1,4 +1,4 @@
-*if_tcl.txt*    For Vim version 7.0f.  Last change: 2006 Mar 06
+*if_tcl.txt*    For Vim version 7.0.  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.0f.  Last change: 2006 Apr 25
+*indent.txt*    For Vim version 7.0.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/index.txt

@@ -1,4 +1,4 @@
-*index.txt*     For Vim version 7.0f.  Last change: 2006 Apr 10
+*index.txt*     For Vim version 7.0.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/insert.txt

@@ -1,4 +1,4 @@
-*insert.txt*    For Vim version 7.0f.  Last change: 2006 Apr 26
+*insert.txt*    For Vim version 7.0.  Last change: 2006 May 05
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -919,6 +919,8 @@ Completion is done by a function that can be defined by the user with the
 
 See below for how the function is called and an example |complete-functions|.
 For remarks about specific filetypes see |compl-omni-filetypes|.
+More completion scripts will appear, check www.vim.org.  Currently there is a
+first version for C++.
 
 							*i_CTRL-X_CTRL-O*
 CTRL-X CTRL-O		Guess what kind of item is in front of the cursor and
@@ -1018,8 +1020,9 @@ items:
 	info		more information about the item, can be displayed in a
 			preview window
 	kind		single letter indicating the type of completion
-	icase		when non-zero case is to be ignored; when omitted
-			the 'ignorecase' option is used
+	icase		when non-zero case is to be ignored when comparing
+			items to be equal; when omitted zero is used, thus
+			items that only differ in case are added
 	dup		when non-zero this match will be added even when an
 			item with the same word is already present.
 
@@ -1109,7 +1112,7 @@ Vim can display the matches in a simplistic popup menu.
 The menu is used when:
 - The 'completeopt' option contains "menu" or "menuone".
 - The terminal supports at least 8 colors.
-- There are at least two matches.  One of "menuone" is used.
+- There are at least two matches.  One if "menuone" is used.
 
 The 'pumheight' option can be used to set a maximum height.  The default is to
 use all space available.
@@ -1272,32 +1275,21 @@ run |:make| command to detect formatting problems.
 
 HTML flavor						*html-flavor*
 
-Default HTML completion depends on filetype. For HTML files it is HTML
-4.01 Transitional (&ft=='html'), for XHTML it is XHTML 1.0 Strict
-(&ft=='xhtml').
+The default HTML completion depends on the filetype.  For HTML files it is
+HTML 4.01 Transitional ('filetype' is "html"), for XHTML it is XHTML 1.0
+Strict ('filetype' is "xhtml").
 
-These are not the only HTML versions. To use another data file and still
-have benefits of custom completion for class, style, etc. attributes set
-b:html_omni_flavor variable. Example (in .vimrc or filetype plugin
-file): >
+When doing completion outside of any other tag you will have possibility to
+choose DOCTYPE and the appropriate data file will be loaded and used for all
+next completions.
 
-	let g:html_omni_flavor = 'xhtml10s'
+More about format of data file in |xml-omni-datafile|. Some of the data files
+may be found on the Vim website (|www|).
 
-(Completion data file for HTML 4.01 Strict is also provided by Vim
-distribution.)
-
-Data for HTML completion will be read from 'autoload/xml/html10s.vim' file
-located somewhere in 'runtimepath'.
-
-Note: HTML completion files are also located in 'autoload/xml'
-directory.
-
-More about format of data file in |xml-omni-datafile|. Some of data
-files may in future be found on vim-online site (|www|).
-
-Note that b:html_omni_flavor may point to file with any XML data.  This
-makes possible to mix PHP (|ft-php-omni|) completion with whatever XML
-dialect (assuming you have data file for it).
+Note that b:html_omni_flavor may point to a file with any XML data.  This
+makes possible to mix PHP (|ft-php-omni|) completion with any XML dialect
+(assuming you have data file for it).  Without setting that variable XHTML 1.0
+Strict will be used.
 
 
 JAVASCRIPT					       *ft-javascript-omni*
@@ -1486,86 +1478,100 @@ PHP code and SQL code at the same time.
 
 XML							*ft-xml-omni*
 
-Vim 7 provides mechanism to context aware completion of XML files.  It depends
-on special |xml-omni-datafile| and two commands: |:XMLns| and |:XMLent|.
-Features are:
+Vim 7 provides a mechanism for context aware completion of XML files.  It
+depends on a special |xml-omni-datafile| and two commands: |:XMLns| and
+|:XMLent|.  Features are:
 
-- after "<" complete tag name depending on context (no div suggest
-  inside of an a tag)
-- inside of tag complete proper attributes (no width attribute for an
-  a tag)
-- when attribute has limited number of possible values help to complete
+- after "<" complete the tag name, depending on context
+- inside of a tag complete proper attributes
+- when an attribute has a 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 the
+  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*
 
-Vim distribution provides two data files as examples (xhtml10s.vim, xsl.vim)
+XML data files are stored in the "autoload/xml" directory in 'runtimepath'.
+Vim distribution provides examples of data files in the
+"$VIMRUNTIME/autoload/xml" directory.  They have a meaningful name which will
+be used in commands.  It should be a unique name which will not create
+conflicts.  For example, the name xhtml10s.vim means it is the data file for
+XHTML 1.0 Strict.
 
-XML data files are stored in "autoload/xml" directory in 'runtimepath'.  They
-have meaningful name which will be used in commands. It should be unique name
-which will not create conflicts in future. For example name xhtml10s.vim means
-it is data file for XHTML 1.0 Strict.
+Each file contains a variable with a name like g:xmldata_xhtml10s . It is
+a compound from two parts:
 
-File contains one variable with fixed name: g:xmldata_xhtml10s . It is
-compound from two parts:
-
-1. "g:xmldata_"  general prefix
-2. "xhtml10s"    name of file and name of described XML dialect
+1. "g:xmldata_"  general prefix, constant for all data files
+2. "xhtml10s"    the name of the file and the name of the described XML
+		 dialect; it will be used as an argument for the |:XMLns|
+		 command
 
 Part two must be exactly the same as name of file.
 
-Variable is data structure in form of |Dictionary|. Keys are tag names and
-values are two element |List|. First element of List is also List with names
-of possible children, second element is |Dictionary| with names of attributes
-as keys and possible values of attributes as values. Example: >
+The variable is a |Dictionary|.  Keys are tag names and each value is a two
+element |List|.  The first element of the List is also a List with the names
+of possible children.  The second element is a |Dictionary| with the names of
+attributes as keys and the possible values of attributes as values.  Example: >
 
-    let g:xmldata_crippledhtml = {
-    \ "html":
-    \ [ ["body", "head"], {"id": [], "xmlns": ["http://www.w3.org/1999/xhtml"],
-    \ "lang": [], "xml:lang": [], "dir": ["ltr", "rtl"]}],
-    \ "script":
-    \ [ [], {"id": [], "charset": [], "type": ["text/javascript"], "src": [],
-    \ "defer": ["BOOL"], "xml:space": ["preserve"]}],
-    \ "meta":
-    \ [ [], {"id": [], "http-equiv": [], "name": [], "content": [], "scheme":
-    \ [], "lang": [], "xml:lang": [], "dir": ["ltr", "rtl"]}]
-    \ "vimxmlentities": ["amp", "lt", "gt", "apos", "quot"]},
+    let g:xmldata_crippled = {
+    \ "vimxmlentities": ["amp", "lt", "gt", "apos", "quot"],
+    \ 'vimxmlroot': ['tag1'],
+    \ 'tag1':
+    \ [ ['childoftag1a', 'childoftag1b'], {'attroftag1a': [],
+    \ 'attroftag1b': ['valueofattr1', 'valueofattr2']}],
+    \ 'childoftag1a':
+    \ [ [], {'attrofchild': ['attrofchild']}],
+    \ 'childoftag1b':
+    \ [ ['childoftag1a'], {'attrofchild': []}],
     \ "vimxmltaginfo": {
-    \ 'meta': ['/>', '']},
-    \ "vimxmlattrinfo": {
-    \ 'http-equiv': ['ContentType', '']}
+    \ 'tag1': ['Menu info', 'Long information visible in preview window']},
+    \ 'vimxmlattrinfo': {
+    \ 'attrofchild': ['Menu info', 'Long information visible in preview window']}}
 
-This example should be put in "autoload/xml/crippledhtml.vim" file.
+This example would be put in the "autoload/xml/crippled.vim" file and could
+help to write this file: >
 
-In example are visible four special elements:
+    <tag1 attroftag1b="valueofattr1">
+        <childoftag1a attrofchild>
+                &amp; &lt;
+        </childoftag1a>
+        <childoftag1b attrofchild="5">
+            <childoftag1a>
+                &gt; &apos; &quot;
+            </childoftag1a>
+        </childoftag1b>
+    </tag1>
 
-1. "vimxmlentities" - special key with List containing entities of this XML
+In the example four special elements are visible:
+
+1. "vimxmlentities" - a special key with List containing entities of this XML
    dialect.
-2. "BOOL" - value of attribute key showing if attribute should be inserted
-   bare ("defer" vs. 'defer="'). It can be the only element of List of
-   attribute values.
-3. "vimxmltaginfo" - special key with dictionary containing as key tag names,
-   as value two element List for additional menu info and long description.
-4. "vimxmlattrinfo" - special key with dictionary containing as key attribute
-   names, as value two element List for additional menu info and long
+2. If the list containing possible values of attributes has one element and
+   this element is equal to the name of the attribute this attribute will be
+   treated as boolean and inserted as 'attrname' and not as 'attrname="'
+3. "vimxmltaginfo" - a special key with a Dictionary containing tag
+   names as keys and two element List as values, for additional menu info and
+   the long description.
+4. "vimxmlattrinfo" - special key with Dictionary containing attribute names
+   as keys and two element List as values, for additional menu info and long
    description.
 
-Note: Tag names in data file MUST not contain namespace description.  Check
-xsl.vim for example.
+Note: Tag names in the data file MUST not contain a namespace description.
+Check xsl.vim for an example.
+Note: All data and functions are publicly available as global
+variables/functions and can be used for personal editing functions.
 
 
 DTD -> Vim							*dtd2vim*
 
-On |www| is script |dtd2vim| which parses DTD and creates XML data file
+On |www| is the script |dtd2vim| which parses DTD and creates an XML data file
 for Vim XML omni completion.
 
     dtd2vim: http://www.vim.org/scripts/script.php?script_id=1462
 
-Check there and beginning of file for details of usage.
-Script requires perl and: 
+Check the beginning of that file for usage details.
+The script requires perl and:
 
     perlSGML: http://savannah.nongnu.org/projects/perlsgml
 
@@ -1575,11 +1581,11 @@ Commands
 :XMLns {name} [{namespace}]					*:XMLns*
 
 Vim has to know which data file should be used and with which namespace.  For
-loading of data file and connecting data with prope namespace use |:XMLns|
-command. First (obligatory) argument is name of data (xhtml10s, xsl). Second
-argument is code of namespace (h, xsl). When used without second argument
-dialect will be used as default - without namespace declaration. For example
-to use XML completion in .xsl files: >
+loading of the data file and connecting data with the proper namespace use
+|:XMLns| command.  The first (obligatory) argument is the name of the data
+(xhtml10s, xsl).  The second argument is the code of namespace (h, xsl).  When
+used without a second argument the dialect will be used as default - without
+namespace declaration.  For example to use XML completion in .xsl files: >
 
 	:XMLns xhtml10s
 	:XMLns xsl xsl
@@ -1587,35 +1593,34 @@ to use XML completion in .xsl files: >
 
 :XMLent {name}							*:XMLent*
 
-By default entities will be completed from data file of default
-namespace. XMLent command should be used in case when there is no
-default namespace: >
+By default entities will be completed from the data file of the default
+namespace.  The XMLent command should be used in case when there is no default
+namespace: >
 
 	:XMLent xhtml10s
 
 Usage
 
-While used in situation (after declarations from previous part, | is
+While used in this situation (after declarations from previous part, | is
 cursor position): >
 
 	<|
 
-Will complete to appropriate XHTML tag, and in this situation: >
+Will complete to an appropriate XHTML tag, and in this situation: >
 
 	<xsl:|
 
-Will complete to appropriate XSL tag.
+Will complete to an appropriate XSL tag.
 
-File xmlcomplete.vim provides through |autoload| mechanism
-GetLastOpenTag function which can be used in XML files to get name of
-last open tag with (b:unaryTagsStack has to be defined): >
+
+The script xmlcomplete.vim, provided through the |autoload| mechanism,
+has the xmlcomplete#GetLastOpenTag() function which can be used in XML files
+to get the name of the last open tag (b:unaryTagsStack has to be defined): >
 
 	:echo xmlcomplete#GetLastOpenTag("b:unaryTagsStack")
 
 
 
-
-
 ==============================================================================
 8. Insert mode commands					*inserting*
 

runtime/doc/intro.txt

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

runtime/doc/map.txt

@@ -1,4 +1,4 @@
-*map.txt*       For Vim version 7.0f.  Last change: 2006 Apr 25
+*map.txt*       For Vim version 7.0.  Last change: 2006 May 03
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -157,8 +157,9 @@ type "a", then "bar" will get inserted.
 
 1.2 SPECIAL ARGUMENTS					*:map-arguments*
 
-"<buffer>", "<silent>", "<script>", "<expr>" and "<unique>" can be used in any
-order.  They must appear right after the command, before any other arguments.
+"<buffer>", "<silent>", "<special>", "<script>", "<expr>" and "<unique>" can
+be used in any order.  They must appear right after the command, before any
+other arguments.
 
 				*:map-local* *:map-<buffer>* *E224* *E225*
 If the first argument to one of these commands is "<buffer>" it will apply to
@@ -185,6 +186,12 @@ Prompts will still be given, e.g., for inputdialog().
 Using "<silent>" for an abbreviation is possible, but will cause redrawing of
 the command line to fail.
 
+						*:map-<special>* *:map-special*
+Define a mapping with <> notation for special keys, even though the "<" flag
+may appear in 'cpoptions'.  This is useful if the side effect of setting
+'cpoptions' is not desired.  Example: >
+	:map <special> <F12> /Header<CR>
+<
 						*:map-<script>* *:map-script*
 If the first argument to one of these commands is "<script>" and it is used to
 define a new mapping or abbreviation, the mapping will only remap characters
@@ -218,8 +225,14 @@ The result of the InsertDot() function will be inserted.  It could check the
 text before the cursor and start omni completion when some condition is met.
 
 Be very careful about side effects!  The expression is evaluated while
-obtaining characters, if you change buffer text, move the cursor, edit another
-file, etc. you may very well make command dysfunctional.
+obtaining characters, you may very well make the command dysfunctional.
+For this reason the following is blocked:
+- changing the buffer text |textlock|
+- editing another buffer
+- the |:normal| command
+- moving the cursor is allowed, but it is restored afterwards
+If you want the mapping to do any of these let the returned characters do
+that.
 
 Here is an example that inserts a list number that increases: >
 	let counter = 0
@@ -1083,10 +1096,10 @@ When 'verbose' is non-zero, listing a command will also display where it was
 last defined. Example: >
 
     :verbose command TOhtml
-	Name        Args Range Complete  Definition
-	TOhtml      0    %               :call Convert2HTML(<line1>, <line2>)
-	    Last set from /usr/share/vim/vim-7.0/plugin/tohtml.vim
-<
+<	Name	    Args Range Complete  Definition ~
+	TOhtml	    0	 %		 :call Convert2HTML(<line1>, <line2>) ~
+	    Last set from /usr/share/vim/vim-7.0/plugin/tohtml.vim ~
+
 See |:verbose-cmd| for more information.
 
 							*E174* *E182*

runtime/doc/mbyte.txt

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

runtime/doc/message.txt

@@ -1,4 +1,4 @@
-*message.txt*   For Vim version 7.0f.  Last change: 2006 Apr 11
+*message.txt*   For Vim version 7.0.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/mlang.txt

@@ -1,4 +1,4 @@
-*mlang.txt*     For Vim version 7.0f.  Last change: 2004 Feb 24
+*mlang.txt*     For Vim version 7.0.  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.0f.  Last change: 2006 Apr 25
+*motion.txt*    For Vim version 7.0.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -629,8 +629,9 @@ a"							*v_aquote* *aquote*
 a'							*v_a'* *a'*
 a`							*v_a`* *a`*
 			"a quoted string".  Selects the text from the previous
-			quote until the next quote.  The 'quoteescape' is used
-			to skip escaped quotes.
+			quote until the next quote.  The 'quoteescape' option
+			is used to skip escaped quotes.
+			Only works within one line.
 			When the cursor starts on a quote, Vim will figure out
 			which quote pairs form a string by searching from the
 			start of the line.
@@ -706,7 +707,8 @@ there are a few restrictions.
 
 The normal method is to select a <tag> until the matching </tag>.  For "at"
 the tags are included, for "it" they are excluded.  But when "it" is repeated
-the tags will be included (otherwise nothing would change).
+the tags will be included (otherwise nothing would change).  Also, "it" used
+on a tag block with no contents will select the leading tag.
 
 "<aaa/>" items are skipped.  Case is ignored, also for XML where case does
 matter.
@@ -852,11 +854,17 @@ was made yet in the current file.
 
 							*'<* *`<*
 '<  `<			To the first character of the last selected Visual
-			area in the current buffer.  {not in Vi}.
+			area in the current buffer.  For block mode it may
+			also be the last character in the first line (to be
+			able to define the block).  {not in Vi}.
 
 							*'>* *`>*
 '>  `>			To the last character of the last selected Visual
-			area in the current buffer.  {not in Vi}.
+			area in the current buffer.  For block mode it may
+			also be the first character of the last line (to be
+			able to define the block).  Note that 'selection'
+			applies, the position may be just after the Visual
+			area.  {not in Vi}.
 
 							*''* *``*
 ''  ``			To the position before the latest jump, or where the

runtime/doc/netbeans.txt

@@ -1,4 +1,4 @@
-*netbeans.txt*  For Vim version 7.0f.  Last change: 2006 Mar 09
+*netbeans.txt*  For Vim version 7.0.  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.0f.  Last change: 2006 Apr 26
+*options.txt*	For Vim version 7.0.  Last change: 2006 May 04
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -763,7 +763,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			global
 	Write the contents of the file, if it has been modified, on each
 	:next, :rewind, :last, :first, :previous, :stop, :suspend, :tag, :!,
-	:make, CTRL-] and CTRL-^ command; and when a CTRL-O, CTRL-I,
+	:make, CTRL-] and CTRL-^ command; and when a :buffer, CTRL-O, CTRL-I,
 	'{A-Z0-9}, or `{A-Z0-9} command takes one to another file.
 	Note that for some commands the 'autowrite' option is not used, see
 	'autowriteall' for that.
@@ -2990,9 +2990,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	operator.  When this option is empty 'formatprg' is used.
 
 	The |v:lnum|  variable holds the first line to be formatted.
-	The |v:count| variable the number of lines to be formatted.
-	The |v:char|  variable the character to be inserted.  This can be
-		      empty.  Don't insert it yet!
+	The |v:count| variable holds the number of lines to be formatted.
+	The |v:char|  variable holds the character that is going to be
+		      inserted.  This can be empty.  Don't insert it yet!
 
 	Example: >
 		:set formatexpr=mylang#Format()
@@ -3201,7 +3201,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 	For Mac OSX you can use something like this: >
 	    :set guifont=Monaco:h10
-<								*E236*
+<	Also see 'macatsui', it can help fix display problems.
+								*E236*
 	Note that the fonts must be mono-spaced (all characters have the same
 	width).  An exception is GTK 2: all fonts are accepted, but
 	mono-spaced fonts look best.
@@ -3341,8 +3342,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	  'e'	Add tab pages when indicated with 'showtabline'.
 		'guitablabel' can be used to change the text in the labels.
 		When 'e' is missing a non-GUI tab pages line may be used.
-		The GUI tabs are only supported on some systens, currently
-		only for GTK.
+		The GUI tabs are only supported on some systems, currently
+		GTK, Motif and MS-Windows.
 
 	  'f'	Foreground: Don't use fork() to detach the GUI from the shell
 		where it was started.  Use this for programs that wait for the
@@ -3411,8 +3412,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 			{only available when compiled with GUI enabled and
 			with the +windows feature}
 	When nonempty describes the text to use in a label of the GUI tab
-	pages line.  When empty Vim will use a default label.  See
-	|setting-guitablabel| for more info.
+	pages line.  When empty and when the result is empty Vim will use a
+	default label.  See |setting-guitablabel| for more info.
 
 	The format of this option is like that of 'statusline'.
 	'guitabtooltip' is used for the tooltip, see below.
@@ -3431,8 +3432,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	pages line.  When empty Vim will use a default tooltip.
 	This option is otherwise just like 'guitablabel' above.
 
-	The tooltip only works for some systems.
-
 
 						*'helpfile'* *'hf'*
 'helpfile' 'hf'		string	(default (MSDOS)  "$VIMRUNTIME\doc\help.txt"
@@ -4793,6 +4792,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	completion with CTRL-X CTRL-O. |i_CTRL-X_CTRL-O|
 	See |complete-functions| for an explanation of how the function is
 	invoked and what it should return.
+	This option is usually set by a filetype plugin.
+	|:filetype-plugin-on|
 
 
 						*'operatorfunc'* *'opfunc'*
@@ -5108,8 +5109,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 			{not available when compiled without the
 			|+insert_expand| feature}
 			{not in Vi}
-	Determines the maximum number of items to show in the popup menu.
-	When zero as much space as available is used.
+	Determines the maximum number of items to show in the popup menu for
+	Insert mode completion.  When zero as much space as available is used.
 	|ins-completion-menu|.
 
 

runtime/doc/os_390.txt

@@ -1,4 +1,4 @@
-*os_390.txt*    For Vim version 7.0f.  Last change: 2005 Mar 29
+*os_390.txt*    For Vim version 7.0.  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.0f.  Last change: 2005 Mar 29
+*os_amiga.txt*  For Vim version 7.0.  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.0f.  Last change: 2005 Mar 29
+*os_beos.txt*	For Vim version 7.0.  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.0f.  Last change: 2006 Mar 30
+*os_dos.txt*    For Vim version 7.0.  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.0f.  Last change: 2006 Mar 29
+*os_mac.txt*    For Vim version 7.0.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar et al.

runtime/doc/os_mint.txt

@@ -1,4 +1,4 @@
-*os_mint.txt*   For Vim version 7.0f.  Last change: 2005 Mar 29
+*os_mint.txt*   For Vim version 7.0.  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.0f.  Last change: 2005 Mar 29
+*os_msdos.txt*  For Vim version 7.0.  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.0f.  Last change: 2005 Mar 29
+*os_os2.txt*    For Vim version 7.0.  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.0f.  Last change: 2005 Mar 29
+*os_qnx.txt*    For Vim version 7.0.  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.0f.  Last change: 2005 Mar 29
+*os_risc.txt*   For Vim version 7.0.  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.0f.  Last change: 2005 Mar 29
+*os_unix.txt*   For Vim version 7.0.  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.0f.  Last change: 2006 Mar 02
+*os_vms.txt*    For Vim version 7.0.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL

runtime/doc/os_win32.txt

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

runtime/doc/pattern.txt

@@ -1,4 +1,4 @@
-*pattern.txt*   For Vim version 7.0f.  Last change: 2006 Apr 22
+*pattern.txt*   For Vim version 7.0.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1019,7 +1019,7 @@ x	A single character, with no special meaning, matches itself
 	  have almost the same meaning, e.g., when ignoring accents.  The form
 	  is:
 		[=a=]
-	  Currrently this is only implemented for latin1.  Also works for the
+	  Currently this is only implemented for latin1.  Also works for the
 	  latin1 characters in utf-8 and latin9.
 							*/[[.* *[..]*
 	- A collation element.  This currently simply accepts a single

runtime/doc/pi_gzip.txt

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

runtime/doc/pi_netrw.txt

@@ -1,6 +1,6 @@
-*pi_netrw.txt*  For Vim version 7.0f.  Last change: 2006 Apr 26
+*pi_netrw.txt*  For Vim version 7.0.  Last change: 2006 May 02
 
-		VIM REFERENCE MANUAL    by Charles E. Campbell, Jr.
+		NETRW REFERENCE MANUAL	  by Charles E. Campbell, Jr.
 
 
 *dav*		*http*		*network*	*rcp*		*scp*
@@ -1473,6 +1473,19 @@ which is loaded automatically at startup (assuming :set nocp).
 ==============================================================================
 11. History						*netrw-history* {{{1
 
+	v98: May 02, 2006 * the "p" key didn't work properly when the browsing
+			    directory name had spaces in it.
+	v97: May 01, 2006 * exists("&acd") now used to determine if
+			    the 'acd' option exists
+			  * "obtain" now works again under Windows
+	v96: * bugfix - the |'acd'| option is not always defined but is
+	       now bypassed only when it is
+	v95: * bugfix - Hiding mode worked correctly (don't show any file
+	       matching any of the g:netrw_hide patterns), but
+	       but showing mode was showing only those files that didn't
+	       match any of the g:netrw_hide patterns.  Instead, it now
+	       shows all files that match any of the g:netrw_hide patterns
+	       (the difference between a logical and and logical or).
 	v94: * bugfix - a Decho() had a missing quote; only affects things
 	       when debugging was enabled.
 	v93: * bugfix - removed FocusGained event from causing a slow-browser

runtime/doc/pi_paren.txt

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

runtime/doc/pi_spec.txt

@@ -1,4 +1,4 @@
-*pi_spec.txt*   For Vim version 7.0f.  Last change: 2006 Apr 24
+*pi_spec.txt*   For Vim version 7.0.  Last change: 2006 Apr 24
 
 by Gustavo Niemeyer ~
 

runtime/doc/pi_tar.txt

@@ -1,4 +1,4 @@
-*pi_tar.txt*	For Vim version 7.0f.  Last change: 2006 Apr 24
+*pi_tar.txt*	For Vim version 7.0.  Last change: 2006 May 02
 
 		       +====================+
 		       | Tar File Interface |
@@ -42,6 +42,9 @@ Copyright: The GPL (gnu public license) applies to	*tar-copyright*
 ==============================================================================
 4. History						*tar-history*
 
+   v9 May 02, 2006 * improved detection of masquerading as tar file
+   v8 May 02, 2006 * allows editing of files that merely masquerade as tar
+		     files
    v7 Mar 22, 2006 * work on making tar plugin work across network
       Mar 27, 2006 * g:tar_cmd now available for users to change the name
 		     of the tar program to be used.  By default, of course,

runtime/doc/pi_vimball.txt

@@ -1,6 +1,8 @@
-*vimball.txt*	For Vim version 7.0f.  Last change: 2006 Apr 25
+*pi_vimball.txt*	For Vim version 7.0.  Last change: 2006 May 01
 
+			       ----------------
 			       Vimball Archiver
+			       ----------------
 
 Author:  Charles E. Campbell, Jr.  <NdrOchip@ScampbellPfamily.AbizM>
 	  (remove NOSPAM from Campbell's email first)
@@ -28,14 +30,17 @@ Copyright: (c) 2004-2006 by Charles E. Campbell, Jr.	*Vimball-copyright*
 	your vimball; as an example: >
 		plugin/something.vim
 		doc/something.txt
-<	using MkVimball on this range will create a file called
-	"filename.vba" which can be used by Vimball.vim to re-create these
-	files.  If the "filename.vba" file already exists, then MkVimball
-	will issue a warning and not create the file.
+<	using MkVimball on this range will create a file called "filename.vba"
+	which can be used by Vimball.vim to re-create these files.  If the
+	"filename.vba" file already exists, then MkVimball will issue a
+	warning and not create the file.  Note that these paths are relative
+	to your .vim (vimfiles) directory, and the files should be in that
+	directory.  The vimball plugin uses the first |'runtimepath'|directory
+	that exists as a prefix; don't use absolute paths.
 
-	However, if you use the exclamation point (!), then MkVimball will
-	create the "filename.vba" file, overwriting it if it already exists.
-	This behavior resembles that for |:w|.
+	If you use the exclamation point (!), then MkVimball will create the
+	"filename.vba" file, overwriting it if it already exists.  This
+	behavior resembles that for |:w|.
 
 							*vimball-extract*
 		vim filename.vba
@@ -54,8 +59,19 @@ Copyright: (c) 2004-2006 by Charles E. Campbell, Jr.	*Vimball-copyright*
 
 
 ==============================================================================
-3. Vimball History					*vimball-history*
+3. Vimball History					*vimball-history* {{{1
 
+	13 : May 01, 2006 * exists("&acd") used to determine if the acd
+			    option exists
+	12 : May 01, 2006 * bugfix - the |'acd'| option is not always defined
+	11 : Apr 27, 2006 * VimballList would create missing subdirectories that
+			    the vimball specified were needed.	Fixed.
+	10 : Apr 27, 2006 * moved all setting saving/restoration to a pair of
+			    functions.	Included some more settings in them
+			    which frequently cause trouble.
+	9  : Apr 26, 2006 * various changes to support Windows prediliction
+			    for backslashes and spaces in file and directory
+			    names.
 	7  : Apr 25, 2006 * bypasses foldenable
 			  * uses more exe and less norm! (:yank :put etc)
 			  * does better at insuring a "Press ENTER" prompt

runtime/doc/pi_zip.txt

@@ -1,4 +1,4 @@
-*pi_zip.txt*	For Vim version 7.0f.  Last change: 2006 Apr 24
+*pi_zip.txt*	For Vim version 7.0.  Last change: 2006 May 01
 
 				+====================+
 				| Zip File Interface |