updated for version 7.0b

Makefile

@@ -69,15 +69,15 @@ 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 = 0aa
+MINOR = 0b
 
 # Uncomment this line if the Win32s version is to be included.
-#DOSBIN_S =  dosbin_s
+DOSBIN_S =  dosbin_s
 
 # CHECKLIST for creating a new version:
 #
 # - Update Vim version number.  For a test version in: src/version.h, Contents,
-#   MAJOR/MINOR above, VIMRTDIR and VERSION in src/Makefile, README*.txt,
+#   MAJOR/MINOR above, VIMMAJOR and VIMMINOR in src/Makefile, README*.txt,
 #   runtime/doc/*.txt and nsis/gvim.nsi. Other things in README_os2.txt.  For a
 #   minor/major version: src/GvimExt/GvimExt.reg, src/vim.def, src/vim16.def.
 # - Correct included_patches[] in src/version.c.
@@ -92,7 +92,7 @@ MINOR = 0aa
 # - Check for missing entries in runtime/makemenu.vim (with checkmenu script).
 # - Check for missing options in runtime/optwin.vim et al. (with check.vim).
 # - Do "make menu" to update the runtime/synmenu.vim file.
-# - Add remarks for changes to runtime/doc/version6.txt.
+# - Add remarks for changes to runtime/doc/version7.txt.
 # - In runtime/doc run "make" and "make html" to check for errors.
 # - Check if src/Makefile and src/feature.h don't contain any personal
 #   preferences or the GTK, Perl, etc. mentioned above.
@@ -139,13 +139,13 @@ MINOR = 0aa
 # Win32 GUI version:
 # - "nmake -f Make_mvc.mak GUI=yes.
 # - move "gvim.exe" to here (otherwise the OLE version will overwrite it).
-# - Move ObjC/gvim.pdb to here.
+# - Move ObjG/gvim.pdb to here.
 # - Delete vimrun.exe, install.exe and uninstall.exe.
 # - Copy "GvimExt/gvimext.dll" to here.
 # Win32 GUI version with OLE, PERL, TCL, PYTHON and dynamic IME:
 # - Run src/bigvim.bat ("nmake -f Make_mvc.mak GUI=yes OLE=yes IME=yes ...)
 # - Rename "gvim.exe" to "gvim_ole.exe".
-# - Rename ObjC/gvim.pdb to "gvim_ole.pdb".
+# - Rename ObjGOLYTR/gvim.pdb to "gvim_ole.pdb".
 # - Delete install.exe and uninstall.exe.
 # - If building the Win32s version delete vimrun.exe.
 # Win32s GUI version:

README.txt

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

README_ami.txt

@@ -1,4 +1,4 @@
-README_ami.txt for version 7.0aa of Vim: Vi IMproved.
+README_ami.txt for version 7.0b 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.0aa of Vim: Vi IMproved.
+README_amibin.txt for version 7.0b of Vim: Vi IMproved.
 
 See "README.txt" for general information about Vim.
 See "README_ami.txt" for installation instructions for the Amiga.

README_dos.txt

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

README_extra.txt

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

README_mac.txt

@@ -1,4 +1,4 @@
-README_mac.txt for version 7.0aa of Vim: Vi IMproved.
+README_mac.txt for version 7.0b 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.0aa of Vim: Vi IMproved.
+README_ole.txt for version 7.0b 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_os390.txt

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

README_w32s.txt

@@ -1,4 +1,4 @@
-README_w32s.txt for version 7.0aa of Vim: Vi IMproved.
+README_w32s.txt for version 7.0b 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 0aa
+!define VER_MINOR 0b
 
 # ----------- No configurable settings below this line -----------
 
@@ -217,6 +217,12 @@ Section "Vim executables and runtime files"
 	SetOutPath $0\syntax
 	File ${VIMRT}\syntax\*.*
 
+	SetOutPath $0\spell
+	File ${VIMRT}\spell\*.txt
+	File ${VIMRT}\spell\*.vim
+	File ${VIMRT}\spell\*.spl
+	File ${VIMRT}\spell\*.sug
+
 	SetOutPath $0\tools
 	File ${VIMRT}\tools\*.*
 

runtime/autoload/netrw.vim

@@ -1,7 +1,7 @@
 " netrw.vim: Handles file transfer and remote directory listing across a network
 "            AUTOLOAD PORTION
-" Date:		Mar 21, 2006
+" Date:		Mar 22, 2006
-" Version:	82
+" Version:	83
 " 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 = "v82"
+let g:loaded_netrw = "v83"
 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
@@ -1280,6 +1280,8 @@ fun! s:NetBrowse(dirname)
   setlocal bt=nofile nobl nonu noswf
   if g:netrw_fastbrowse >= 1
    setlocal bh=hide
+  else
+   setlocal bh=delete
   endif
 
   " save current directory on directory history list
@@ -1508,6 +1510,8 @@ fun! s:NetBrowseChgDir(dirname,newdir)
    setlocal ma nobl
    if g:netrw_fastbrowse >= 1
     setlocal bh=hide
+   else
+    setlocal bh=delete
    endif
    %d
 
@@ -1538,7 +1542,7 @@ endfun
 " ---------------------------------------------------------------------
 "  NetGetWord: it gets the directory named under the cursor {{{2
 fun! s:NetGetWord()
-"  call Dfunc("NetGetWord() line#".line("."))
+"  call Dfunc("NetGetWord() line#".line(".")." longlist=".g:netrw_longlist." virtcol=".virtcol("."))
   call s:UseBufWinVars()
 
   " insure that w:netrw_longlist is set up
@@ -1548,6 +1552,7 @@ fun! s:NetGetWord()
    else
     let w:netrw_longlist= 0
    endif
+"   call Decho("w:netrw_longlist=".w:netrw_longlist)
   endif
 
   if exists("w:netrw_bannercnt") && line(".") < w:netrw_bannercnt
@@ -1596,7 +1601,7 @@ fun! s:NetGetWord()
    endif
 
    let filestart = (virtcol(".")/b:netrw_cpf)*b:netrw_cpf
-"   call Decho("virtcol=".virtcol(".")." cpf=".b:netrw_cpf." bannercnt=".w:netrw_bannercnt." filestart=".filestart)
+"   call Decho("filestart= ([virtcol=".virtcol(".")."]/[b:netrw_cpf=".b:netrw_cpf."])*b:netrw_cpf=".filestart."  bannercnt=".w:netrw_bannercnt)
 "   call Decho("1: dirname<".dirname.">")
    if filestart > 0|let dirname= substitute(dirname,'^.\{'.filestart.'}','','')|endif
 "   call Decho("2: dirname<".dirname.">")
@@ -1613,7 +1618,7 @@ endfun
 " ---------------------------------------------------------------------
 " NetBrowseRm: remove/delete a remote file or directory {{{2
 fun! s:NetBrowseRm(usrhost,path) range
-"  call Dfunc("NetBrowseRm(usrhost<".a:usrhost."> path<".a:path.">)")
+"  call Dfunc("NetBrowseRm(usrhost<".a:usrhost."> path<".a:path.">) virtcol=".virtcol("."))
 "  call Decho("firstline=".a:firstline." lastline=".a:lastline)
 
   " preparation for removing multiple files/directories
@@ -1624,7 +1629,6 @@ fun! s:NetBrowseRm(usrhost,path) range
   while ctr <= a:lastline
    exe ctr
 
-   norm! 0
    let rmfile= s:NetGetWord()
 "   call Decho("rmfile<".rmfile.">")
 
@@ -2849,6 +2853,8 @@ fun! netrw#DirBrowse(dirname)
   setlocal bt=nofile nobl ma nonu noswf nowrap
   if g:netrw_fastbrowse >= 2
    setlocal bh=hide
+  else
+   setlocal bh=delete
   endif
   keepalt silent! %d
 
@@ -3178,7 +3184,7 @@ fun! s:LocalBrowseShellCmdRefresh()
   for ibuf in s:netrw_browselist
    if bufwinnr(ibuf) == -1
 "    call Decho("wiping  buf#".ibuf)
-    exe "bw ".ibuf
+    exe "silent! bw ".ibuf
     call remove(s:netrw_browselist,ibl)
 "    call Decho("browselist=".string(s:netrw_browselist))
     continue
@@ -3898,11 +3904,11 @@ fun! s:NetOptionSave()
 
   " Get Temporary Filename
   let w:aikeep   = &ai
-  " record autochdir setting and then insure its unset (tnx to David Fishburn)
+"  " netrw and the acd option do not work together properly
-  if &acd && (has("netbeans_intg") || has("sun_workshop"))
+"  if &acd && (has("netbeans_intg") || has("sun_workshop"))
-   set noacd
+"   set noacd
-   echohl Warning | echomsg "***warning*** directory browsing and the acd setting are incompatible" |echohl None
+"   echohl Warning | echomsg "***warning*** directory browsing and the acd setting are incompatible" |echohl None
-  endif
+"  endif
   let w:fokeep    = &fo
   let w:aikeep    = &ai
   let w:cikeep    = &ci

runtime/autoload/zip.vim

@@ -75,7 +75,7 @@ fun! zip#Browse(zipfile)
   0d
   $
 
-  call Decho("exe silent r! unzip -l '".escape(a:zipfile,s:zipfile_escape)."'")
+"  call Decho("exe silent r! unzip -l '".escape(a:zipfile,s:zipfile_escape)."'")
   exe "silent r! unzip -l '".escape(a:zipfile,s:zipfile_escape)."'"
   $d
   silent 4,$v/^\s\+\d\+\s\{0,5}\d/d

runtime/doc/Makefile

@@ -123,6 +123,7 @@ DOCS = \
 	usr_29.txt \
 	usr_30.txt \
 	usr_31.txt \
+	usr_32.txt \
 	usr_40.txt \
 	usr_41.txt \
 	usr_42.txt \
@@ -251,6 +252,7 @@ HTMLS = \
 	usr_29.html \
 	usr_30.html \
 	usr_31.html \
+	usr_32.html \
 	usr_40.html \
 	usr_41.html \
 	usr_42.html \

runtime/doc/autocmd.txt

@@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 7.0aa.  Last change: 2006 Mar 15
+*autocmd.txt*   For Vim version 7.0b.  Last change: 2006 Mar 15
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/change.txt

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

runtime/doc/cmdline.txt

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

runtime/doc/debug.txt

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

runtime/doc/debugger.txt

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

runtime/doc/digraph.txt

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

runtime/doc/editing.txt

@@ -1,4 +1,4 @@
-*editing.txt*   For Vim version 7.0aa.  Last change: 2006 Mar 06
+*editing.txt*   For Vim version 7.0b.  Last change: 2006 Mar 06
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/fold.txt

@@ -1,4 +1,4 @@
-*fold.txt*      For Vim version 7.0aa.  Last change: 2005 Sep 10
+*fold.txt*      For Vim version 7.0b.  Last change: 2005 Sep 10
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/gui.txt

@@ -1,4 +1,4 @@
-*gui.txt*       For Vim version 7.0aa.  Last change: 2006 Mar 20
+*gui.txt*       For Vim version 7.0b.  Last change: 2006 Mar 20
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/gui_w16.txt

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

runtime/doc/hangulin.txt

@@ -1,4 +1,4 @@
-*hangulin.txt*  For Vim version 7.0aa.  Last change: 2005 Mar 29
+*hangulin.txt*  For Vim version 7.0b.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Chi-Deok Hwang and Sung-Hyun Nam

runtime/doc/help.txt

@@ -1,4 +1,4 @@
-*help.txt*	For Vim version 7.0aa.  Last change: 2006 Mar 17
+*help.txt*	For Vim version 7.0b.  Last change: 2006 Mar 24
 
 			VIM - main help file
 									 k
@@ -71,6 +71,7 @@ Editing Effectively ~
 |usr_29.txt|  Moving through programs
 |usr_30.txt|  Editing programs
 |usr_31.txt|  Exploiting the GUI
+|usr_32.txt|  The undo tree
 
 Tuning Vim ~
 |usr_40.txt|  Make new commands
@@ -194,13 +195,6 @@ Standard plugins ~
 |pi_zip.txt|	Zip archive explorer
 
 LOCAL ADDITIONS:				*local-additions*
-|cecutil.txt|	DrChip's Utilities				Jun 11, 2004
-|engspchk.txt|	English Spelling Checker   (v61)	Mar 14, 2005
-|example.txt|	Example for a locally added help file
-|matchit.txt|   Extended "%" matching
-|test.txt|	Testing the h<>lp c<>mm<6D>nd n<>w
-|typecorr.txt|	Plugin for correcting typing mistakes
-|helpp.txt|	Dummy line to avoid an error message
 
 ------------------------------------------------------------------------------
 *bars*		Bars example

runtime/doc/if_cscop.txt

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

runtime/doc/if_ole.txt

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

runtime/doc/if_perl.txt

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

runtime/doc/if_ruby.txt

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

runtime/doc/if_sniff.txt

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

runtime/doc/if_tcl.txt

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

runtime/doc/index.txt

@@ -1,4 +1,4 @@
-*index.txt*     For Vim version 7.0aa.  Last change: 2006 Mar 20
+*index.txt*     For Vim version 7.0b.  Last change: 2006 Mar 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1088,6 +1088,7 @@ The commands are sorted on the non-optional part of their name.
 |:cexpr|	:cex[pr]	read errors from expr and jump to first
 |:cfile|	:cf[ile]	read file with error messages and jump to first
 |:cfirst|	:cfir[st]	go to the specified error, default first one
+|:cgetbuffer|	:cgetb[uffer]	get errors from buffer
 |:cgetexpr|	:cgete[xpr]	get errors from expr
 |:cgetfile|	:cg[etfile]	read file with error messages
 |:changes|	:cha[nges]	print the change list
@@ -1242,6 +1243,7 @@ The commands are sorted on the non-optional part of their name.
 |:lexpr|	:lex[pr]	read locations from expr and jump to first
 |:lfile|	:lf[ile]	read file with locations and jump to first
 |:lfirst|	:lfir[st]	go to the specified location, default first one
+|:lgetbuffer|	:lgetb[uffer]	get locations from buffer
 |:lgetexpr|	:lgete[xpr]	get locations from expr
 |:lgetfile|	:lg[etfile]	read file with locations
 |:lgrep|	:lgr[ep]	run 'grepprg' and jump to first match

runtime/doc/insert.txt

@@ -1,4 +1,4 @@
-*insert.txt*    For Vim version 7.0aa.  Last change: 2006 Mar 21
+*insert.txt*    For Vim version 7.0b.  Last change: 2006 Mar 21
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/map.txt

@@ -1,4 +1,4 @@
-*map.txt*       For Vim version 7.0aa.  Last change: 2006 Mar 20
+*map.txt*       For Vim version 7.0b.  Last change: 2006 Mar 20
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/mbyte.txt

@@ -1,4 +1,4 @@
-*mbyte.txt*     For Vim version 7.0aa.  Last change: 2006 Mar 05
+*mbyte.txt*     For Vim version 7.0b.  Last change: 2006 Mar 05
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar et al.

runtime/doc/message.txt

@@ -1,4 +1,4 @@
-*message.txt*   For Vim version 7.0aa.  Last change: 2006 Mar 01
+*message.txt*   For Vim version 7.0b.  Last change: 2006 Mar 01
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/mlang.txt

@@ -1,4 +1,4 @@
-*mlang.txt*     For Vim version 7.0aa.  Last change: 2004 Feb 24
+*mlang.txt*     For Vim version 7.0b.  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.0aa.  Last change: 2006 Jan 02
+*motion.txt*    For Vim version 7.0b.  Last change: 2006 Jan 02
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/netbeans.txt

@@ -1,4 +1,4 @@
-*netbeans.txt*  For Vim version 7.0aa.  Last change: 2006 Mar 09
+*netbeans.txt*  For Vim version 7.0b.  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.0aa.  Last change: 2006 Mar 18
+*options.txt*	For Vim version 7.0b.  Last change: 2006 Mar 18
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar

runtime/doc/os_390.txt

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

runtime/doc/os_beos.txt

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

runtime/doc/os_mac.txt

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

runtime/doc/os_mint.txt

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

runtime/doc/pi_gzip.txt

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

runtime/doc/pi_netrw.txt

@@ -1,4 +1,4 @@
-*pi_netrw.txt*  For Vim version 7.0.  Last change: Mar 21, 2006
+*pi_netrw.txt*  For Vim version 7.0b.  Last change: Mar 22, 2006
 
 		VIM REFERENCE MANUAL    by Charles E. Campbell, Jr.
 
@@ -365,7 +365,7 @@ Both the :Nread and the :Nwrite ex-commands can accept multiple filenames.
 NETRC							*netrw-netrc*
 
 The typical syntax for lines in a <.netrc> file is given as shown below.
-Ftp under Unix usually support <.netrc>; Windows' ftp usually doesn't.
+Ftp under Unix usually supports <.netrc>; ftp under Windows usually doesn't.
 >
 	machine {full machine name} login {user-id} password "{password}"
 	default login {user-id} password "{password}"
@@ -395,11 +395,12 @@ However, |netrw-listhack| can help with this problem.
 ==============================================================================
 4. Activation						*netrw-activate*
 
-Network-oriented file transfers are available by default whenever
+Network-oriented file transfers are available by default whenever Vim's
 |'nocompatible'| mode is enabled.  The <netrw.vim> file resides in your
 system's vim-plugin directory and is sourced automatically whenever you bring
 up vim.  I suggest that, at a minimum, you have at least the following in your
 <.vimrc> customization file: >
+
 	set nocp
 	if version >= 600
 	  filetype plugin indent on
@@ -420,11 +421,14 @@ Thus one may use files across networks just as simply as if they were local. >
 See |netrw-activate| for more on how to encourage your vim to use plugins
 such as netrw.
 
+
 ==============================================================================
 6. Ex Commands						*netrw-ex*
 
-The usual read/write commands are supported.  There are also a couple of
+The usual read/write commands are supported.  There are also a few
-additional commands available.
+additional commands available.  Often you won't need to use Nw or
+Nread as shown in |netrw-transparent| (ie. use :e url, :r url, :w url;
+see |netrw-urls|).
 
 :[range]Nw	Write the specified lines to the current
 		file as specified in b:netrw_lastfile.
@@ -455,7 +459,7 @@ additional commands available.
 		strings.
 
 :NetrwSettings  This command is desribed in |netrw-settings| -- used to
-                display netrw settings and change netrw behavior
+                display netrw settings and change netrw behavior.
 
 
 ==============================================================================
@@ -1444,6 +1448,10 @@ which is loaded automatically at startup (assuming :set nocp).
 ==============================================================================
 11. History						*netrw-history* {{{1
 
+	v83: * disabled stop-acd handling; the change in directory handling
+	       may allow acd to be used again.  Awaiting feedback.
+	     * D was refusing to delete remote files/directories in wide
+	       listing mode.
 	v81: * FocusGained also used to refresh/wipe local browser directory
 	       buffers
 	     * (bugfix) netrw was leaving [Scratch] buffers behind when the

runtime/doc/pi_paren.txt

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

runtime/doc/pi_tar.txt

@@ -1,4 +1,6 @@
-*tar.txt*	Tar File Interface				Dec 21, 2005
+*tar.txt*	For Vim version 7.0b.  Last change: 2006 Mar 24
+
+	Tar File Interface
 
 Author:  Charles E. Campbell, Jr.  <NdrOchip@ScampbellPfamily.AbizM>
 	  (remove NOSPAM from Campbell's email first)

runtime/doc/pi_zip.txt

@@ -1,4 +1,6 @@
-*zip.txt*	Zip File Interface				Mar 22, 2006
+*zip.txt*	For Vim version 7.0b.  Last change: 2006 Mar 24
+
+	Zip File Interface
 
 Author:  Charles E. Campbell, Jr.  <NdrOchip@ScampbellPfamily.AbizM>
 	  (remove NOSPAM from Campbell's email first)

runtime/doc/print.txt

@@ -1,4 +1,4 @@
-*print.txt*     For Vim version 7.0aa.  Last change: 2005 Apr 01
+*print.txt*     For Vim version 7.0b.  Last change: 2005 Apr 01
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/quickref.txt

@@ -1,4 +1,4 @@
-*quickref.txt*  For Vim version 7.0aa.  Last change: 2006 Mar 23
+*quickref.txt*  For Vim version 7.0b.  Last change: 2006 Mar 23
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/recover.txt

@@ -1,4 +1,4 @@
-*recover.txt*   For Vim version 7.0aa.  Last change: 2005 Dec 12
+*recover.txt*   For Vim version 7.0b.  Last change: 2005 Dec 12
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/rileft.txt

@@ -1,4 +1,4 @@
-*rileft.txt*    For Vim version 7.0aa.  Last change: 2005 Apr 04
+*rileft.txt*    For Vim version 7.0b.  Last change: 2005 Apr 04
 
 
 		  VIM REFERENCE MANUAL    by Avner Lottem

runtime/doc/russian.txt

@@ -1,4 +1,4 @@
-*russian.txt*   For Vim version 7.0aa.  Last change: 2005 Apr 01
+*russian.txt*   For Vim version 7.0b.  Last change: 2005 Apr 01
 
 
 		  VIM REFERENCE MANUAL    by Vassily Ragosin

runtime/doc/sign.txt

@@ -1,4 +1,4 @@
-*sign.txt*      For Vim version 7.0aa.  Last change: 2005 Apr 04
+*sign.txt*      For Vim version 7.0b.  Last change: 2005 Apr 04
 
 
 		  VIM REFERENCE MANUAL    by Gordon Prieur

runtime/doc/sponsor.txt

@@ -1,4 +1,4 @@
-*sponsor.txt*   For Vim version 7.0aa.  Last change: 2004 Jun 16
+*sponsor.txt*   For Vim version 7.0b.  Last change: 2006 Mar 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -7,13 +7,13 @@
 
 SPONSOR VIM DEVELOPMENT						*sponsor*
 
-Fixing bugs and adding new features takes a lot of effort.  For a few years
+Fixing bugs and adding new features takes a lot of time and effort.  To show
-Bram has attempted to do this next to a full-time job.  During that time the
+your appreciation for the work and motivate Bram and others to continue
-todo list kept getting longer and longer.
+working on Vim please send a donation.
 
-In order for Bram to support Vim properly he needs your support.  Through your
+Since Bram is back to a paid job the money will now be used to help children
-donations Bram will be able to have a part-time job and spend more time on
+in Uganda.  See |uganda|.  But at the same time donations increase Bram's
-fixing bugs and adding new features.
+motivation to work on Vim!
 
 For the most recent information about sponsoring look on the Vim web site:
 
@@ -58,7 +58,7 @@ But only if you enable this on your account page.
 
 HOW TO SEND MONEY						*send-money*
 
-Creditcard	Through PayPal, see the PayPal site for information:
+Credit card	Through PayPal, see the PayPal site for information:
 			https://www.paypal.com
 		The e-mail address for sending sponsorship money is:
 			donate@vim.org
@@ -68,15 +68,7 @@ Creditcard	Through PayPal, see the PayPal site for information:
 		In Euro countries a bank transfer is preferred, this has lower
 		costs.
 
-Bank transfer	Transfer to Bram's account at the Postbank: 1644503.  For
+Other methods	See |iccf-donations|.
-		international transfers you can use these numbers:
-			IBAN:       NL79 PSTB 0001 6445 03
-			SWIFT/BIC:  PSTBNL21
-		This is the address of the bank:
-			ING Bank Amsterdam, Foreign Operations
-			PO Box 1800
-			1000 BV Amsterdam
-			The Netherlands
 		Include "Vim sponsor" or "Vim registration" in the comment of
 		your money transfer.  Send me an e-mail that mentions the
 		amount you transferred if you want to vote for features and
@@ -88,37 +80,26 @@ Cash		Small amounts can be send with ordinary mail.  Put something
 		features and show others you are a registered Vim user or
 		sponsor.
 
-This is Bram's address: Bram Moolenaar
+You can use this permanent address:
-			Clematisstraat 30
+			Bram Moolenaar
-			5925 BE Venlo
+			Molenstraat 2
+			2161 HP Lisse
 			The Netherlands
 
 
-ALTERNATIVE
-
-If you don't care about sponsoring Vim Development or becoming a registered
-Vim user, but do care about helping needy children, consider giving to the
-ICCF Holland foundation.  This is the charity recommended by Vim's author.
-The money is used for a children centre in the south of Uganda, where AIDS has
-caused many victims.  See |uganda|.
-
 
 QUESTIONS AND ANSWERS				*sponsor-faq* *register-faq*
 
 Why should I give money?
 
-Bram has tried to work on Vim next to a full-time job.  The list of known bugs
+If you do not show your appreciation for Vim then Bram will be less motivated
-and ideas for new features has constantly been growing during this time.  Bram
+to fix bugs and add new features.
-simply can't spend enough time on Vim development when he has a full-time job.
-Your contribution will make it possible for Bram to have a part-time job and
-spend much more time on Vim development.  Bugs will be fixed quicker and new
-Vim releases will become available more often.
 
 
 How much money should I send?
 
-That is up to you.  The more you give, the more time Bram can work on Vim.  An
+That is up to you.  The more you give, the more children will be helped.
-indication for individuals that use Vim at home: 10 Euro per year.  For
+An indication for individuals that use Vim at home: 10 Euro per year.  For
 professional use: 30 Euro per year per person.  Send at least 10 euro to be
 able to vote for features.
 
@@ -198,33 +179,30 @@ sent money.  The points will be counted right away.
 
 How about Charityware?
 
-You have to decide yourself whether you want to sponsor Vim development, help
+Currently the Vim donations go to |uganda| anyway.  Thus it doesn't matter if
-the poor children in Uganda (see |uganda|) or both.  Bram will certainly keep
+you sponsor Vim or ICCF.  Except that Vim sponsoring will allow you to vote
-on supporting the project in Uganda.  In the (unlikely) situation that Bram
+for features.
-gets more donations for Vim development than he needs, he will send the money
-to Uganda.
 
 
 I donated $$$, now please add feature XYZ!
 
 There is no direct relation between your donation and the work Bram does.
-Otherwise you would be paying for work and Bram has to pay income tax over the
+Otherwise you would be paying for work and we would have to pay tax over the
 donation.  If you want to hire Bram for specific work, contact him directly,
 don't use the donation system.
 
 
-Are the donations tax deductable?
+Are the donations tax deductible?
 
-No.  Setting up a system for this is complex and imposes too many restrictions.
+That depends on your country.  The donations to help the children in |Uganda|
-The donations to help the children in |Uganda| are tax deductable in Holland,
+are tax deductible in Holland, Germany, Canada and in the USA.  See the ICCF
-Germany, Canada and probably also in the USA.
+website http://www.iccf.nl/donate.html.  You must send an e-mail to Bram to
+let him know that the donation is done because of the use of Vim.
 
 
 Can you send me a bill?
 
-Sending a bill would mean Bram does something in return for your contribution.
+No.  But a receipt is possible.
-That is work and would mean Bram has to pay income tax over the amount.  It is
-possible, but the net amount will be lower.
 
 
  vim:tw=78:ts=8:ft=help:norl:

runtime/doc/tabpage.txt

@@ -1,4 +1,4 @@
-*tabpage.txt*   For Vim version 7.0aa.  Last change: 2006 Mar 03
+*tabpage.txt*   For Vim version 7.0b.  Last change: 2006 Mar 03
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/tags

@@ -1609,6 +1609,9 @@ $VIMRUNTIME	starting.txt	/*$VIMRUNTIME*
 31.3	usr_31.txt	/*31.3*
 31.4	usr_31.txt	/*31.4*
 31.5	usr_31.txt	/*31.5*
+32.1	usr_32.txt	/*32.1*
+32.2	usr_32.txt	/*32.2*
+32.3	usr_32.txt	/*32.3*
 40.1	usr_40.txt	/*40.1*
 40.2	usr_40.txt	/*40.2*
 40.3	usr_40.txt	/*40.3*
@@ -5803,6 +5806,7 @@ i`	motion.txt	/*i`*
 ia64.vim	syntax.txt	/*ia64.vim*
 ib	motion.txt	/*ib*
 iccf	uganda.txt	/*iccf*
+iccf-donations	uganda.txt	/*iccf-donations*
 icon-changed	version4.txt	/*icon-changed*
 iconise	starting.txt	/*iconise*
 iconize	starting.txt	/*iconize*
@@ -7352,6 +7356,7 @@ usr_28.txt	usr_28.txt	/*usr_28.txt*
 usr_29.txt	usr_29.txt	/*usr_29.txt*
 usr_30.txt	usr_30.txt	/*usr_30.txt*
 usr_31.txt	usr_31.txt	/*usr_31.txt*
+usr_32.txt	usr_32.txt	/*usr_32.txt*
 usr_40.txt	usr_40.txt	/*usr_40.txt*
 usr_41.txt	usr_41.txt	/*usr_41.txt*
 usr_42.txt	usr_42.txt	/*usr_42.txt*

runtime/doc/term.txt

@@ -1,4 +1,4 @@
-*term.txt*      For Vim version 7.0aa.  Last change: 2006 Feb 14
+*term.txt*      For Vim version 7.0b.  Last change: 2006 Feb 14
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/tips.txt

@@ -1,4 +1,4 @@
-*tips.txt*      For Vim version 7.0aa.  Last change: 2006 Mar 01
+*tips.txt*      For Vim version 7.0b.  Last change: 2006 Mar 01
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/uganda.nsis.txt

@@ -0,0 +1,292 @@
+    For Vim version 7.0b.  Last change: 2006 Mar 24
+
+		  VIM REFERENCE MANUAL    by Bram Moolenaar
+
+SUMMARY
+
+Vim is Charityware.  You can use and copy it as much as you like, but you are
+encouraged to make a donation for needy children in Uganda.  Please see |kcc|
+below or visit the ICCF web site, available at these URLs:
+
+	http://iccf-holland.org/
+	http://www.vim.org/iccf/
+
+You can also sponsor the development of Vim.  Vim sponsors can vote for
+features.  See |sponsor|.  The money goes to Uganda anyway.
+
+The Open Publication License applies to the Vim documentation, see
+|manual-copyright|.
+
+=== begin of license ===
+
+VIM LICENSE
+
+I)  There are no restrictions on distributing unmodified copies of Vim except
+    that they must include this license text.  You can also distribute
+    unmodified parts of Vim, likewise unrestricted except that they must
+    include this license text.  You are also allowed to include executables
+    that you made from the unmodified Vim sources, plus your own usage
+    examples and Vim scripts.
+
+II) It is allowed to distribute a modified (or extended) version of Vim,
+    including executables and/or source code, when the following four
+    conditions are met:
+    1) This license text must be included unmodified.
+    2) The modified Vim must be distributed in one of the following five ways:
+       a) If you make changes to Vim yourself, you must clearly describe in
+	  the distribution how to contact you.  When the maintainer asks you
+	  (in any way) for a copy of the modified Vim you distributed, you
+	  must make your changes, including source code, available to the
+	  maintainer without fee.  The maintainer reserves the right to
+	  include your changes in the official version of Vim.  What the
+	  maintainer will do with your changes and under what license they
+	  will be distributed is negotiable.  If there has been no negotiation
+	  then this license, or a later version, also applies to your changes.
+	  The current maintainer is Bram Moolenaar <Bram@vim.org>.  If this
+	  changes it will be announced in appropriate places (most likely
+	  vim.sf.net, www.vim.org and/or comp.editors).  When it is completely
+	  impossible to contact the maintainer, the obligation to send him
+	  your changes ceases.  Once the maintainer has confirmed that he has
+	  received your changes they will not have to be sent again.
+       b) If you have received a modified Vim that was distributed as
+	  mentioned under a) you are allowed to further distribute it
+	  unmodified, as mentioned at I).  If you make additional changes the
+	  text under a) applies to those changes.
+       c) Provide all the changes, including source code, with every copy of
+	  the modified Vim you distribute.  This may be done in the form of a
+	  context diff.  You can choose what license to use for new code you
+	  add.  The changes and their license must not restrict others from
+	  making their own changes to the official version of Vim.
+       d) When you have a modified Vim which includes changes as mentioned
+	  under c), you can distribute it without the source code for the
+	  changes if the following three conditions are met:
+	  - The license that applies to the changes permits you to distribute
+	    the changes to the Vim maintainer without fee or restriction, and
+	    permits the Vim maintainer to include the changes in the official
+	    version of Vim without fee or restriction.
+	  - You keep the changes for at least three years after last
+	    distributing the corresponding modified Vim.  When the maintainer
+	    or someone who you distributed the modified Vim to asks you (in
+	    any way) for the changes within this period, you must make them
+	    available to him.
+	  - You clearly describe in the distribution how to contact you.  This
+	    contact information must remain valid for at least three years
+	    after last distributing the corresponding modified Vim, or as long
+	    as possible.
+       e) When the GNU General Public License (GPL) applies to the changes,
+	  you can distribute the modified Vim under the GNU GPL version 2 or
+	  any later version.
+    3) A message must be added, at least in the output of the ":version"
+       command and in the intro screen, such that the user of the modified Vim
+       is able to see that it was modified.  When distributing as mentioned
+       under 2)e) adding the message is only required for as far as this does
+       not conflict with the license used for the changes.
+    4) The contact information as required under 2)a) and 2)d) must not be
+       removed or changed, except that the person himself can make
+       corrections.
+
+III) If you distribute a modified version of Vim, you are encouraged to use
+     the Vim license for your changes and make them available to the
+     maintainer, including the source code.  The preferred way to do this is
+     by e-mail or by uploading the files to a server and e-mailing the URL.
+     If the number of changes is small (e.g., a modified Makefile) e-mailing a
+     context diff will do.  The e-mail address to be used is
+     <maintainer@vim.org>
+
+IV)  It is not allowed to remove this license from the distribution of the Vim
+     sources, parts of it or from a modified version.  You may use this
+     license for previous Vim releases instead of the license that they came
+     with, at your option.
+
+=== end of license ===
+
+Note:
+
+- If you are happy with Vim, please express that by reading the rest of this
+  file and consider helping needy children in Uganda.
+
+- If you want to support further Vim development consider becoming a
+  |sponsor|.  The money goes to Uganda anyway.
+
+- According to Richard Stallman the Vim license is GNU GPL compatible.
+  A few minor changes have been made since he checked it, but that should not
+  make a difference.
+
+- If you link Vim with a library that goes under the GNU GPL, this limits
+  further distribution to the GNU GPL.  Also when you didn't actually change
+  anything in Vim.
+
+- Once a change is included that goes under the GNU GPL, this forces all
+  further changes to also be made under the GNU GPL or a compatible license.
+
+- If you distribute a modified version of Vim, you can include your name and
+  contact information with the "--with-modified-by" configure argument or the
+  MODIFIED_BY define.
+
+==============================================================================
+Kibaale Children's Centre
+
+Kibaale Children's Centre (KCC) is located in Kibaale, a small town in the
+south of Uganda, near Tanzania, in East Africa.  The area is known as Rakai
+District.  The population is mostly farmers.  Although people are poor, there
+is enough food.  But this district is suffering from AIDS more than any other
+part of the world.  Some say that it started there.  Estimations are that 10
+to 30% of the Ugandans are infected with HIV.  Because parents die, there are
+many orphans.  In this district about 60,000 children have lost one or both
+parents, out of a population of 350,000.  And this is still continuing.
+
+The children need a lot of help.  The KCC is working hard to provide the needy
+with food, medical care and education.  Food and medical care to keep them
+healthy now, and education so that they can take care of themselves in the
+future.  KCC works on a Christian base, but help is given to children of any
+religion.
+
+The key to solving the problems in this area is education.  This has been
+neglected in the past years with president Idi Amin and the following civil
+wars.  Now that the government is stable again, the children and parents have
+to learn how to take care of themselves and how to avoid infections.  There is
+also help for people who are ill and hungry, but the primary goal is to
+prevent people from getting ill and to teach them how to grow healthy food.
+
+Most of the orphans are living in an extended family.  An uncle or older
+sister is taking care of them.  Because these families are big and the income
+(if any) is low, a child is lucky if it gets healthy food.  Clothes, medical
+care and schooling is beyond its reach.  To help these needy children, a
+sponsorship program was put into place.  A child can be financially adopted.
+For a few dollars a month KCC sees to it that the child gets indispensable
+items, is healthy, goes to school and KCC takes care of anything else that
+needs to be done for the child and the family that supports it.
+
+Besides helping the child directly, the environment where the child grows up
+needs to be improved.  KCC helps schools to improve their teaching methods.
+There is a demonstration school at the centre and teacher trainings are given.
+Health workers are being trained, hygiene education is carried out and
+households are stimulated to build a proper latrine.  I helped setting up a
+production site for cement slabs.  These are used to build a good latrine.
+They are sold below cost price.
+
+There is a small clinic at the project, which provides children and their
+family with medical help.  When needed, transport to a hospital is offered.
+Immunization programs are carried out and help is provided when an epidemic is
+breaking out (measles and cholera have been a problem).
+
+Summer 1994 to summer 1995 I spent a whole year at the centre, working as a
+volunteer.  I have helped to expand the centre and worked in the area of water
+and sanitation.  I learned that the help that the KCC provides really helps.
+Now that I'm back in Holland, I would like to continue supporting KCC.  To do
+this I'm raising funds and organizing the sponsorship program.  Please
+consider one of these possibilities:
+
+1.  Sponsor a child in primary school: 17 euro a month (or more).
+2.  Sponsor a child in secondary school: 25 euro a month (or more).
+3.  Sponsor the clinic: Any amount a month or quarter
+4.  A one-time donation
+
+Compared with other organizations that do child sponsorship the amounts are
+very low.  This is because the money goes directly to the centre.  Less than
+5% is used for administration.  This is possible because this is a small
+organization that works with volunteers.  If you would like to sponsor a
+child, you should have the intention to do this for at least one year.
+
+How do you know that the money will be spent right?  First of all you have my
+personal guarantee as the author of Vim.  I trust the people that are working
+at the centre, I know them personally.  Further more, the centre is
+co-sponsored and inspected by World Vision, Save the Children Fund and
+International Child Care Fund.  The centre is visited about once a year to
+check the progress (at our own cost).  I have visited the centre myself in
+1996, 1998, 2000, 2001 and 2003.  The visit reports are on the ICCF web site.
+
+If you have any further questions, send me e-mail: <Bram@vim.org>.
+
+The address of the centre is:
+			Kibaale Children's Centre
+			p.o. box 1658
+			Masaka, Uganda, East Africa
+
+Sending money:
+
+Check the ICCF web site for the latest information!  See |iccf| for the URL.
+
+USA:		The methods mentioned below can be used.  Alternatively, you
+		can send a check to the Nehemiah Group Outreach Society
+		(NGOS).  This will reduce banking costs and you can get an IRS
+		tax receipt.  The NGOS forwards the funds directly to the
+		Kibaale project in Uganda.  Checks must be made payable to
+		NGOS but please note on the check "donation Kibaale".  Mail
+		checks to:
+			NGOS
+			P.O. Box 50862
+			Indianapolis, IN 45250
+		Questions regarding the Nehemiah Group Outreach Society (NGOS)
+		should be directed to: Ross deMerchant, Executive Director -
+		r.demerchant AT sbcglobal DOT net.
+		For sponsoring a child contact KCF in Canada (see below) and
+		send the check to NGOS in Indianapolis.
+
+Canada:		Contact Kibaale Children's Fund (KCF) in Surrey, Canada.  They
+		take care of the Canadian sponsors for the children in
+		Kibaale.  KCF forwards 100% of the money to the project in
+		Uganda.  You can send them a one time donation directly.
+		Please send me a note so that I know what has been donated
+		because of Vim.  Ask KCF for information about sponsorship.
+			Kibaale Children's Fund c/o Pacific Academy
+			10238-168 Street
+			Surrey, B.C. V4N 1Z4
+			Canada
+			Phone: 604-581-5353
+		If you make a donation to Kibaale Children's Fund (KCF) you
+		will receive a tax receipt which can be submitted with your
+		tax return.
+
+Holland:	Transfer to the account of "Stichting ICCF Holland" in Venlo.
+		This will allow for tax deduction if you live in Holland.
+			Postbank, nr. 4548774
+
+Germany:	It is possible to make donations that allow for a tax return.
+		Check the ICCF web site for the latest information:
+			http://iccf-holland.org/germany.html
+
+World:		Use a postal money order.  That should be possible from any
+		country, mostly from the post office.  Use this name (which is
+		in my passport): "Abraham Moolenaar".  Use Euro for the
+		currency if possible.
+
+Europe:		Use a bank transfer if possible.  Your bank should have a form
+		that you can use for this.  See "Others" below for the swift
+		code and IBAN number.
+		Any other method should work.  Ask for information about
+		sponsorship.
+
+Credit Card:	You can use PayPal to send money with a Credit card.  This is
+		the most widely used Internet based payment system.  It's
+		really simple to use.  Use this link to find more info:
+		    https://www.paypal.com/affil/pal=Bram%40iccf-holland.org
+		The e-mail address for sending the money to is:
+		    Bram@iccf-holland.org
+		For amounts above 400 Euro ($500) sending a check is
+		preferred.
+
+Others:		Transfer to one of these accounts if possible:
+		    Postbank, account 4548774
+				Swift code: INGB NL 2A
+				IBAN: NL47 PSTB 0004 5487 74
+			under the name "stichting ICCF Holland", Venlo
+		    If that doesn't work:
+		    Rabobank Venlo, account 3765.05.117
+				Swift code: RABO NL 2U
+			under the name "Bram Moolenaar", Venlo
+		Otherwise, send a check in euro or US dollars to the address
+		below.  Minimal amount: $70 (my bank does not accept smaller
+		amounts for foreign check, sorry)
+
+Address to send checks to:
+			stichting ICCF Holland
+			Bram Moolenaar
+			Molenstraat 2
+			2161 HP Lisse
+			The Netherlands
+
+This address is expected to be valid for a long time.  The address in Venlo
+will not be valid after June 2006.
+
+ ts=8:ft=help:norl:

runtime/doc/uganda.txt

@@ -1,4 +1,4 @@
-*uganda.txt*    For Vim version 7.0aa.  Last change: 2005 Oct 15
+*uganda.txt*    For Vim version 7.0b.  Last change: 2006 Mar 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -15,7 +15,7 @@ below or visit the ICCF web site, available at these URLs:
 	http://www.vim.org/iccf/
 
 You can also sponsor the development of Vim.  Vim sponsors can vote for
-features.  See |sponsor|.
+features.  See |sponsor|.  The money goes to Uganda anyway.
 
 The Open Publication License applies to the Vim documentation, see
 |manual-copyright|.
@@ -109,7 +109,7 @@ Note:
   file and consider helping needy children in Uganda.
 
 - If you want to support further Vim development consider becoming a
-  |sponsor|.
+  |sponsor|.  The money goes to Uganda anyway.
 
 - According to Richard Stallman the Vim license is GNU GPL compatible.
   A few minor changes have been made since he checked it, but that should not
@@ -206,7 +206,7 @@ The address of the centre is:
 			p.o. box 1658
 			Masaka, Uganda, East Africa
 
-Sending money:
+Sending money:						*iccf-donations*
 
 Check the ICCF web site for the latest information!  See |iccf| for the URL.
 
@@ -286,8 +286,11 @@ Others:		Transfer to one of these accounts if possible:
 Address to send checks to:
 			stichting ICCF Holland
 			Bram Moolenaar
-			Clematisstraat 30
+			Molenstraat 2
-			5925 BE  Venlo
+			2161 HP Lisse
 			The Netherlands
 
+This address is expected to be valid for a long time.  The address in Venlo
+will not be valid after June 2006.
+
  vim:tw=78:ts=8:ft=help:norl:

runtime/doc/undo.txt

@@ -1,4 +1,4 @@
-*undo.txt*      For Vim version 7.0aa.  Last change: 2006 Mar 21
+*undo.txt*      For Vim version 7.0b.  Last change: 2006 Mar 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -113,9 +113,7 @@ branch off.  This happens when you undo a few changes and then make a new
 change.  The undone changes become a branch.  You can go to that branch with
 the following commands.
 
-What matters here is the order in which the changes are made.  Undo and redo
+This is explained in the user manual: |usr_32.txt|.
-are not considered changes in this context.  After each change you have a new
-state of the text.
 
 							*:undol* *:undolist*
 :undol[ist]		List the leafs in the tree of changes.  Example:

runtime/doc/usr_02.txt

@@ -1,4 +1,4 @@
-*usr_02.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 01
+*usr_02.txt*	For Vim version 7.0b.  Last change: 2006 Mar 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -302,7 +302,7 @@ edited.  Typing this command twice cancels the preceding "U".
 
 The "U" command is a change by itself, which the "u" command undoes and CTRL-R
 redoes.  This might be a bit confusing.  Don't worry, with "u" and CTRL-R you
-can go to any of the situations you had.
+can go to any of the situations you had.  More about that in section ||.
 
 ==============================================================================
 *02.6*	Other editing commands

runtime/doc/usr_03.txt

@@ -1,4 +1,4 @@
-*usr_03.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 22
+*usr_03.txt*	For Vim version 7.0b.  Last change: 2005 Apr 22
 
 		     VIM USER MANUAL - by Bram Moolenaar
 

runtime/doc/usr_08.txt

@@ -1,4 +1,4 @@
-*usr_08.txt*	For Vim version 7.0aa.  Last change: 2006 Feb 25
+*usr_08.txt*	For Vim version 7.0b.  Last change: 2006 Feb 25
 
 		     VIM USER MANUAL - by Bram Moolenaar
 

runtime/doc/usr_09.txt

@@ -1,4 +1,4 @@
-*usr_09.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 01
+*usr_09.txt*	For Vim version 7.0b.  Last change: 2005 Apr 01
 
 		     VIM USER MANUAL - by Bram Moolenaar
 

runtime/doc/usr_10.txt

@@ -1,4 +1,4 @@
-*usr_10.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 01
+*usr_10.txt*	For Vim version 7.0b.  Last change: 2005 Apr 01
 
 		     VIM USER MANUAL - by Bram Moolenaar
 

runtime/doc/usr_21.txt

@@ -1,4 +1,4 @@
-*usr_21.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 01
+*usr_21.txt*	For Vim version 7.0b.  Last change: 2005 Apr 01
 
 		     VIM USER MANUAL - by Bram Moolenaar
 

runtime/doc/usr_22.txt

@@ -1,4 +1,4 @@
-*usr_22.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 10
+*usr_22.txt*	For Vim version 7.0b.  Last change: 2005 Apr 10
 
 		     VIM USER MANUAL - by Bram Moolenaar
 

runtime/doc/usr_24.txt

@@ -1,4 +1,4 @@
-*usr_24.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 01
+*usr_24.txt*	For Vim version 7.0b.  Last change: 2005 Apr 01
 
 		     VIM USER MANUAL - by Bram Moolenaar
 

runtime/doc/usr_25.txt

@@ -1,4 +1,4 @@
-*usr_25.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 01
+*usr_25.txt*	For Vim version 7.0b.  Last change: 2005 Apr 01
 
 		     VIM USER MANUAL - by Bram Moolenaar
 

runtime/doc/usr_26.txt

@@ -1,4 +1,4 @@
-*usr_26.txt*	For Vim version 7.0aa.  Last change: 2002 Oct 29
+*usr_26.txt*	For Vim version 7.0b.  Last change: 2002 Oct 29
 
 		     VIM USER MANUAL - by Bram Moolenaar
 

runtime/doc/usr_29.txt

@@ -1,4 +1,4 @@
-*usr_29.txt*	For Vim version 7.0aa.  Last change: 2004 Feb 12
+*usr_29.txt*	For Vim version 7.0b.  Last change: 2004 Feb 12
 
 		     VIM USER MANUAL - by Bram Moolenaar
 

runtime/doc/usr_32.txt

@@ -0,0 +1,151 @@
+*usr_32.txt*	For Vim version 7.0b.  Last change: 2006 Mar 24
+
+		     VIM USER MANUAL - by Bram Moolenaar
+
+			      The undo tree
+
+
+Vim provides multi-level undo.  If you undo a few changes and then make a new
+change you create a branch in the undo tree.  This text is about moving
+through the branches.
+
+|32.1|	Numbering changes
+|32.2|	Jumping around the tree
+|32.3|	Time travelling
+
+     Next chapter: |usr_40.txt|  Make new commands
+ Previous chapter: |usr_31.txt|  Exploiting the GUI
+Table of contents: |usr_toc.txt|
+
+==============================================================================
+*32.1*	Numbering changes
+
+In section |02.5| we only discussed one line of undo/redo.  But it is also
+possible to branch off.  This happens when you undo a few changes and then
+make a new change.  The new changes become a branch in the undo tree.
+
+Let's start with the text "one".  The first change to make is to append
+" too".  And then move to the first 'o' and change it into 'w'.  We then have
+two changes, numbered 1 and 2, and three states of the text:
+
+		one ~
+		 |
+	      change 1
+	         |
+	      one too ~
+	         |
+	      change 2
+	         |
+	      one two ~
+
+If we now undo one change, back to "one too", and change "one" to "me" we
+create a branch in the undo tree:
+
+		one ~
+		 |
+	      change 1
+	         |
+	      one too ~
+	      /     \
+         change 2  change 3
+            |         |
+         one two    me too ~
+
+You can now use the |u| command to undo.  If you do this twice you get to
+"one".  Use |CTRL-R| to redo, and you will go to "one too".  One more |CTRL-R|
+takes you to "me too".  Thus undo and redo go up and down in the tree, using
+the branch that was last used.
+
+What matters here is the order in which the changes are made.  Undo and redo
+are not considered changes in this context.  After each change you have a new
+state of the text.
+
+Note that only the changes are numbered, the text shown in the tree above has
+no identifier.  They are mostly referred to by the number of the change above
+it.  But sometimes by the number of one of the changes below it, especially
+when moving up in the tree, so that you know which change was just undone.
+
+==============================================================================
+*32.2*	Jumping around the tree
+
+So how do you get to "one two" now?  You can use this command: >
+
+	:undo 2
+
+The text is now "one two", you are below change 2.  You can use the |:undo|
+command to jump to below any change in the tree.
+
+Now make another change: change "one" to "not":
+
+		one ~
+		 |
+	      change 1
+	         |
+	      one too ~
+	      /     \
+         change 2  change 3
+            |         |
+         one two    me too ~
+	    |
+	 change 4
+	    |
+	 not two ~
+
+Now you change your mind and want to go back to "me too".  Use the |g-|
+command.  This moves back in time.  Thus it doesn't walk the tree upwards or
+downwards, but goes to the change made before.
+
+You can repeat |g-| and you will see the text change:
+	me too ~
+	one two ~
+	one too ~
+	one ~
+
+Use |g+| to move forward in time:
+	one ~
+	one too ~
+	one two ~
+	me too ~
+	not two ~
+
+Using |:undo| is useful if you know what change you want to jump to.  |g-| and
+|g+| are useful if you don't know exactly what the change number is.
+
+You can type a count before |g-| and |g+| to repeat them.
+
+==============================================================================
+*32.3*	Time travelling
+
+When you have been working on text for a while the tree grows to become big.
+Then you may want to go to the text of some minutes ago.
+
+To see what branches there are in the undo tree use this command: >
+
+	:undolist
+<	number changes  time ~
+	     3       2  16 seconds ago
+	     4       3  5 seconds ago
+
+Here you can see the number of the leaves in each branch and when the change
+was made.  Assuming we are below change 4, at "not two", you can go back ten
+seconds with this command: >
+
+	:earlier 10s
+
+Depending on how much time you took for the changes you end up at a certain
+position in the tree.  The |:earlier| command argument can be "m" for minutes
+and "h" for hours.  To go all the way back use a big number: >
+
+	:earlier 10h
+
+To travel forward in time again use the |:later| command: >
+
+	:later 1m
+
+The arguments are "s", "m" and "h", just like with |:earlier|.
+
+==============================================================================
+
+Next chapter: |usr_40.txt|  Make new commands
+
+Copyright: see |manual-copyright|  vim:tw=78:ts=8:ft=help:norl:

runtime/doc/usr_41.txt

@@ -1,4 +1,4 @@
-*usr_41.txt*	For Vim version 7.0aa.  Last change: 2006 Mar 21
+*usr_41.txt*	For Vim version 7.0b.  Last change: 2006 Mar 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -2293,6 +2293,8 @@ utility is recommended.
 For utmost portability use Vim itself to pack scripts together.  This can be
 done with the Vimball utility.  See |vimball|.
 
+It's good if you add a line to allow automatic updating.  See |glvs-plugins|.
+
 ==============================================================================
 
 Next chapter: |usr_42.txt|  Add new menus

runtime/doc/usr_42.txt

@@ -1,4 +1,4 @@
-*usr_42.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 01
+*usr_42.txt*	For Vim version 7.0b.  Last change: 2005 Apr 01
 
 		     VIM USER MANUAL - by Bram Moolenaar
 

runtime/doc/usr_43.txt

@@ -1,4 +1,4 @@
-*usr_43.txt*	For Vim version 7.0aa.  Last change: 2002 Jul 14
+*usr_43.txt*	For Vim version 7.0b.  Last change: 2002 Jul 14
 
 		     VIM USER MANUAL - by Bram Moolenaar
 

runtime/doc/usr_44.txt

@@ -1,4 +1,4 @@
-*usr_44.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 01
+*usr_44.txt*	For Vim version 7.0b.  Last change: 2005 Apr 01
 
 		     VIM USER MANUAL - by Bram Moolenaar
 

runtime/doc/usr_45.txt

@@ -1,4 +1,4 @@
-*usr_45.txt*	For Vim version 7.0aa.  Last change: 2004 Jun 08
+*usr_45.txt*	For Vim version 7.0b.  Last change: 2004 Jun 08
 
 		     VIM USER MANUAL - by Bram Moolenaar
 

runtime/doc/usr_90.txt

@@ -1,4 +1,4 @@
-*usr_90.txt*	For Vim version 7.0aa.  Last change: 2004 Mar 21
+*usr_90.txt*	For Vim version 7.0b.  Last change: 2004 Mar 21
 
 		     VIM USER MANUAL - by Bram Moolenaar
 

runtime/doc/usr_toc.txt

@@ -1,4 +1,4 @@
-*usr_toc.txt*	For Vim version 7.0aa.  Last change: 2006 Mar 21
+*usr_toc.txt*	For Vim version 7.0b.  Last change: 2006 Mar 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -34,6 +34,7 @@ Editing Effectively
 |usr_29.txt|  Moving through programs
 |usr_30.txt|  Editing programs
 |usr_31.txt|  Exploiting the GUI
+|usr_32.txt|  The undo tree
 
 Tuning Vim
 |usr_40.txt|  Make new commands
@@ -47,7 +48,8 @@ Making Vim Run
 |usr_90.txt|  Installing Vim
 
 
-More detailed information in the reference manual: |ref-toc|
+Reference manual
+|ref-toc|     More detailed information for all commands
 
 The user manual is available as a single, ready to print HTML and PDF file
 here:
@@ -270,6 +272,11 @@ Subjects that can be read independently.
 		|31.4|	Vim window position and size
 		|31.5|	Various
 
+|usr_32.txt|  The undo tree
+		|32.1|	Numbering changes
+		|32.2|	Jumping around the tree
+		|32.3|	Time travelling
+
 ==============================================================================
 Tuning Vim ~
 

runtime/doc/version4.txt

@@ -1,4 +1,4 @@
-*version4.txt*  For Vim version 7.0aa.  Last change: 2004 Mar 12
+*version4.txt*  For Vim version 7.0b.  Last change: 2004 Mar 12
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/version5.txt

@@ -1,4 +1,4 @@
-*version5.txt*  For Vim version 7.0aa.  Last change: 2005 Apr 01
+*version5.txt*  For Vim version 7.0b.  Last change: 2005 Apr 01
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/version6.txt

@@ -1,4 +1,4 @@
-*version6.txt*  For Vim version 7.0aa.  Last change: 2005 Oct 17
+*version6.txt*  For Vim version 7.0b.  Last change: 2005 Oct 17
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar

runtime/doc/vi_diff.txt

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