updated for version 7.0107

Filelist

@@ -30,6 +30,7 @@ SRC_ALL1 =	\
 		src/gui.h \
 		src/gui_beval.c \
 		src/gui_beval.h \
+		src/hashtable.c \
 		src/keymap.h \
 		src/macros.h \
 		src/main.c \
@@ -56,6 +57,7 @@ SRC_ALL1 =	\
 		src/screen.c \
 		src/search.c \
 		src/structs.h \
+		src/spell.c \
 		src/syntax.c \
 		src/tag.c \
 		src/term.c \
@@ -73,7 +75,7 @@ SRC_ALL2 =	\
 		src/main.aap \
 		src/testdir/main.aap \
 		src/testdir/*.in \
-		src/testdir/*.ok \
+		src/testdir/test[0-9]*.ok \
 		src/testdir/test49.vim \
 		src/proto.h \
 		src/proto/buffer.pro \
@@ -92,6 +94,7 @@ SRC_ALL2 =	\
 		src/proto/getchar.pro \
 		src/proto/gui.pro \
 		src/proto/gui_beval.pro \
+		src/proto/hashtable.pro \
 		src/proto/main.pro \
 		src/proto/mark.pro \
 		src/proto/mbyte.pro \
@@ -110,6 +113,7 @@ SRC_ALL2 =	\
 		src/proto/regexp.pro \
 		src/proto/screen.pro \
 		src/proto/search.pro \
+		src/proto/spell.pro \
 		src/proto/syntax.pro \
 		src/proto/tag.pro \
 		src/proto/term.pro \
@@ -323,7 +327,7 @@ SRC_DOS =	\
 
 # source files for DOS without CR/LF translation (also in the extra archive)
 SRC_DOS_BIN =	\
-		src/VisVim/Res \
+		src/VisVim/Res/*.bmp \
 		src/tearoff.bmp \
 		src/tools.bmp \
 		src/tools16.bmp \
@@ -658,7 +662,12 @@ EXTRA =		\
 # generic language files
 LANG_GEN = \
 		README_lang.txt \
+		runtime/doc/*-fr.1 \
+		runtime/doc/*-fr.UTF-8.1 \
 		runtime/doc/*-it.1 \
+		runtime/doc/*-it.UTF-8.1 \
+		runtime/doc/*-ru.1 \
+		runtime/doc/*-ru.UTF-8.1 \
 		runtime/lang/README.txt \
 		runtime/lang/menu_*.vim \
 		runtime/keymap/README.txt \
@@ -672,6 +681,16 @@ LANG_GEN = \
 		runtime/tutor/tutor.pl.* \
 		runtime/tutor/tutor.ru.* \
 		runtime/tutor/tutor.zh.* \
+		runtime/spell/README.txt \
+		runtime/spell/??/*.diff \
+		runtime/spell/??/main.aap \
+		runtime/spell/main.aap \
+
+# generic language files, binary
+LANG_GEN_BIN = \
+		runtime/spell/en.ascii.spl \
+		runtime/spell/en.latin1.spl \
+		runtime/spell/en.utf-8.spl \
 
 # all files for lang archive
 LANG_SRC = \
@@ -680,6 +699,7 @@ LANG_SRC = \
 		src/po/README_mvc.txt \
 		src/po/cleanup.vim \
 		src/po/Makefile \
+		src/po/Make_cyg.mak \
 		src/po/Make_ming.mak \
 		src/po/Make_mvc.mak \
 		src/po/sjiscorr.c \

Makefile

@@ -282,6 +282,7 @@ unixrt: dist prepare
 	tar cf - \
 		$(RT_SCRIPTS) \
 		$(LANG_GEN) \
+		$(LANG_GEN_BIN) \
 		| (cd dist/$(VIMRTDIR); tar xf -)
 	cd dist && tar cf $(VIMVER)-rt2.tar $(VIMRTDIR)
 	gzip -9 dist/$(VIMVER)-rt2.tar
@@ -439,6 +440,7 @@ dosrt_unix2dos: dist prepare no_title.vim
 		$(RT_UNIX_DOS_BIN) \
 		$(RT_ALL_BIN) \
 		$(RT_DOS_BIN) \
+		$(LANG_GEN_BIN) \
 		| (cd dist/vim/$(VIMRTDIR); tar xf -)
 	mv dist/vim/$(VIMRTDIR)/runtime/* dist/vim/$(VIMRTDIR)
 	rmdir dist/vim/$(VIMRTDIR)/runtime

runtime/bugreport.vim

@@ -2,7 +2,7 @@
 :" information about the environment of a possible bug in Vim.
 :"
 :" Maintainer:	Bram Moolenaar <Bram@vim.org>
-:" Last change:	2001 Feb 02
+:" Last change:	2005 Jun 12
 :"
 :" To use inside Vim:
 :"	:so $VIMRUNTIME/bugreport.vim
@@ -49,6 +49,8 @@
 :  call <SID>CheckFile($VIMRUNTIME . "/syntax/synload.vim")
 :  delfun <SID>CheckDir
 :  delfun <SID>CheckFile
+:  echo "--- Scripts sourced ---"
+:  scriptnames
 :endif
 :set all
 :set termcap

runtime/colors/darkblue.vim

@@ -1,6 +1,6 @@
 " Vim color file
 " Maintainer:	Bohdan Vlasyuk <bohdan@vstu.edu.ua>
-" Last Change:	2002 Mar 09
+" Last Change:	2005 Mar 28
 
 " darkblue -- for those who prefer dark background
 " [note: looks bit uglier with come terminal palettes,
@@ -32,31 +32,31 @@ hi MoreMsg			ctermfg=darkgreen	ctermfg=darkgreen
 hi Question			guifg=green gui=none ctermfg=green cterm=none
 hi NonText			guifg=#0030ff		ctermfg=darkblue
 
-hi StatusLine		guifg=blue guibg=darkgray gui=none		ctermfg=blue ctermbg=gray term=none cterm=none
-hi StatusLineNC		guifg=black guibg=darkgray gui=none		ctermfg=black ctermbg=gray term=none cterm=none
-hi VertSplit		guifg=black guibg=darkgray gui=none		ctermfg=black ctermbg=gray term=none cterm=none
+hi StatusLine	guifg=blue guibg=darkgray gui=none		ctermfg=blue ctermbg=gray term=none cterm=none
+hi StatusLineNC	guifg=black guibg=darkgray gui=none		ctermfg=black ctermbg=gray term=none cterm=none
+hi VertSplit	guifg=black guibg=darkgray gui=none		ctermfg=black ctermbg=gray term=none cterm=none
 
-hi Folded			guifg=#808080 guibg=#000040			ctermfg=darkgrey ctermbg=black cterm=bold term=bold
-hi FoldColumn		guifg=#808080 guibg=#000040			ctermfg=darkgrey ctermbg=black cterm=bold term=bold
-hi LineNr			guifg=#90f020			ctermfg=green cterm=none
+hi Folded	guifg=#808080 guibg=#000040			ctermfg=darkgrey ctermbg=black cterm=bold term=bold
+hi FoldColumn	guifg=#808080 guibg=#000040			ctermfg=darkgrey ctermbg=black cterm=bold term=bold
+hi LineNr	guifg=#90f020			ctermfg=green cterm=none
 
-hi DiffAdd			guibg=darkblue	ctermbg=darkblue term=none cterm=none
-hi DiffChange		guibg=darkmagenta ctermbg=magenta cterm=none
-hi DiffDelete		ctermfg=blue ctermbg=cyan gui=bold guifg=Blue guibg=DarkCyan
-hi DiffText			cterm=bold ctermbg=red gui=bold guibg=Red
+hi DiffAdd	guibg=darkblue	ctermbg=darkblue term=none cterm=none
+hi DiffChange	guibg=darkmagenta ctermbg=magenta cterm=none
+hi DiffDelete	ctermfg=blue ctermbg=cyan gui=bold guifg=Blue guibg=DarkCyan
+hi DiffText	cterm=bold ctermbg=red gui=bold guibg=Red
 
-hi Cursor			guifg=#000020 guibg=#ffaf38 ctermfg=bg ctermbg=brown
-hi lCursor			guifg=#ffffff guibg=#000000 ctermfg=bg ctermbg=darkgreen
+hi Cursor   	guifg=black guibg=yellow ctermfg=black ctermbg=yellow
+hi lCursor   	guifg=black guibg=white ctermfg=black ctermbg=white
 
 
-hi Comment			guifg=#80a0ff ctermfg=darkred
-hi Constant			ctermfg=magenta guifg=#ffa0a0 cterm=none
-hi Special			ctermfg=brown guifg=Orange cterm=none gui=none
-hi Identifier		ctermfg=cyan guifg=#40ffff cterm=none
-hi Statement		ctermfg=yellow cterm=none guifg=#ffff60 gui=none
-hi PreProc			ctermfg=magenta guifg=#ff80ff gui=none cterm=none
-hi type				ctermfg=green guifg=#60ff60 gui=none cterm=none
-hi Underlined		cterm=underline term=underline
-hi Ignore			guifg=bg ctermfg=bg
+hi Comment	guifg=#80a0ff ctermfg=darkred
+hi Constant	ctermfg=magenta guifg=#ffa0a0 cterm=none
+hi Special	ctermfg=brown guifg=Orange cterm=none gui=none
+hi Identifier	ctermfg=cyan guifg=#40ffff cterm=none
+hi Statement	ctermfg=yellow cterm=none guifg=#ffff60 gui=none
+hi PreProc	ctermfg=magenta guifg=#ff80ff gui=none cterm=none
+hi type		ctermfg=green guifg=#60ff60 gui=none cterm=none
+hi Underlined	cterm=underline term=underline
+hi Ignore	guifg=bg ctermfg=bg
 
 

runtime/compiler/ant.vim

@@ -1,7 +1,7 @@
 " Vim Compiler File
 " Compiler:	ant
 " Maintainer:	Johannes Zellner <johannes@zellner.org>
-" Last Change:	Tue, 27 Apr 2004 15:01:45 CEST
+" Last Change:	Mi, 13 Apr 2005 22:50:07 CEST
 
 if exists("current_compiler")
     finish
@@ -21,15 +21,15 @@ CompilerSet makeprg=ant
 "     ant with jikes +E, which assumes  the following
 "     two property lines in your 'build.xml':
 "
-"	  <property name = "build.compiler"	  value = "jikes"/>
-"	  <property name = "build.compiler.emacs" value = "true"/>
+"         <property name = "build.compiler"       value = "jikes"/>
+"         <property name = "build.compiler.emacs" value = "true"/>
 "
 " second line:
 "     ant with javac
 "
 " note that this will work also for tasks like [wtkbuild]
 "
-setlocal errorformat=\ %#[%.%#]\ %#%f:%l:%v:%*\\d:%*\\d:\ %t%[%^:]%#:%m,
+CompilerSet errorformat=\ %#[%.%#]\ %#%f:%l:%v:%*\\d:%*\\d:\ %t%[%^:]%#:%m,
     \%A\ %#[%.%#]\ %f:%l:\ %m,%-Z\ %#[%.%#]\ %p^,%C\ %#[%.%#]\ %#%m
 
 " ,%-C%.%#

runtime/compiler/bdf.vim

@@ -1,30 +1,22 @@
 " Vim compiler file
-" Compiler:	    BDF to PCF Conversion
-" Maintainer:	    Nikolai Weibull <sourc@pcppopper.org>
-" URL:		    http://www.pcppopper.org/vim/compiler/pcp/bdf/
-" Latest Revision:  2004-05-22
-" arch-tag:	    2e2f3a55-199b-468c-aa2e-d6b1a7b87806
+" Compiler:         BDF to PCF Conversion
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
 
 if exists("current_compiler")
   finish
 endif
 let current_compiler = "bdf"
 
-if exists(":CompilerSet") != 2          " older Vim always used :setlocal
-  command -nargs=* CompilerSet setlocal <args>
-endif
-
 let s:cpo_save = &cpo
 set cpo-=C
 
-CompilerSet makeprg=bdftopcf\ $*
+setlocal makeprg=bdftopcf\ $*
 
-CompilerSet errorformat=%ABDF\ %trror\ on\ line\ %l:\ %m,
+setlocal errorformat=%ABDF\ %trror\ on\ line\ %l:\ %m,
       \%-Z%p^,
       \%Cbdftopcf:\ bdf\ input\\,\ %f\\,\ corrupt,
       \%-G%.%#
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-" vim: set sts=2 sw=2:

runtime/compiler/gcc.vim

@@ -0,0 +1,26 @@
+" Vim compiler file
+" Compiler:         GNU C Compiler
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "gcc"
+
+let s:cpo_save = &cpo
+set cpo-=C
+
+setlocal errorformat=
+      \%*[^\"]\"%f\"%*\\D%l:\ %m,
+      \\"%f\"%*\\D%l:\ %m,
+      \%-G%f:%l:\ %trror:\ (Each\ undeclared\ identifier\ is\ reported\ only\ once,
+      \%-G%f:%l:\ %trror:\ for\ each\ function\ it\ appears\ in.),
+      \%f:%l:\ %m,
+      \\"%f\"\\,\ line\ %l%*\\D%c%*[^\ ]\ %m,
+      \%D%*\\a[%*\\d]:\ Entering\ directory\ `%f',
+      \%X%*\\a[%*\\d]:\ Leaving\ directory\ `%f',
+      \%DMaking\ %*\\a\ in\ %f
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/compiler/msvc.vim

@@ -1,17 +1,13 @@
 " Vim compiler file
 " Compiler:	Miscrosoft Visual C
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2004 Mar 19
+" Last Change:	2005 Jun 22
 
 if exists("current_compiler")
   finish
 endif
 let current_compiler = "msvc"
 
-if exists(":CompilerSet") != 2		" older Vim always used :setlocal
-  command -nargs=* CompilerSet setlocal <args>
-endif
-
 " The errorformat for MSVC is the default.
-CompilerSet errorformat&
-CompilerSet makeprg=nmake
+setlocal errorformat&
+setlocal makeprg=nmake

runtime/compiler/rst.vim

@@ -1,23 +1,17 @@
 " Vim compiler file
-" Compiler:	    reStructuredText Documentation Format
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
-" URL:		    http://www.pcppopper.org/vim/compiler/pcp/rst/
-" Latest Revision:  2004-05-22
-" arch-tag:	    ac64a95a-5d45-493d-a9f9-f96fc8568657
+" Compiler:         reStructuredText Documentation Format
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-29
 
 if exists("current_compiler")
   finish
 endif
 let current_compiler = "rst"
 
-if exists(":CompilerSet") != 2          " older Vim always used :setlocal
-  command -nargs=* CompilerSet setlocal <args>
-endif
-
 let s:cpo_save = &cpo
 set cpo-=C
 
-CompilerSet errorformat=
+setlocal errorformat=
       \%f:%l:\ (%tEBUG/0)\ %m,
       \%f:%l:\ (%tNFO/1)\ %m,
       \%f:%l:\ (%tARNING/2)\ %m,
@@ -29,5 +23,3 @@ CompilerSet errorformat=
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-" vim: set sts=2 sw=2:

runtime/compiler/splint.vim

@@ -2,7 +2,7 @@
 " Compiler:     splint/lclint (C source code checker)
 " Maintainer:   Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 " Splint Home:	http://www.splint.org/
-" Last Change:  2004 Oct 02
+" Last Change:  2005 Apr 21
 " $Revision$
 
 if exists("current_compiler")
@@ -53,6 +53,7 @@ CompilerSet makeprg=splint\ %
 
 CompilerSet errorformat=%OLCLint*m,
 	\%OSplint*m,
+	\%f(%l\\,%c):\ %m,
 	\%*[\ ]%f:%l:%c:\ %m,
 	\%*[\ ]%f:%l:\ %m,
 	\%*[^\"]\"%f\"%*\\D%l:\ %m,

runtime/doc/Makefile

@@ -68,7 +68,6 @@ DOCS = \
 	os_vms.txt \
 	os_win32.txt \
 	pattern.txt \
-	pi_expl.txt \
 	pi_gzip.txt \
 	pi_netrw.txt \
 	pi_spec.txt \
@@ -85,6 +84,7 @@ DOCS = \
 	sign.txt \
 	sponsor.txt \
 	starting.txt \
+	spell.txt \
 	syntax.txt \
 	tagsrch.txt \
 	term.txt \
@@ -189,7 +189,6 @@ HTMLS = \
 	os_vms.html \
 	os_win32.html \
 	pattern.html \
-	pi_expl.html \
 	pi_gzip.html \
 	pi_netrw.html \
 	pi_spec.html \
@@ -206,6 +205,7 @@ HTMLS = \
 	sign.html \
 	sponsor.html \
 	starting.html \
+	spell.html \
 	syntax.html \
 	tagsrch.html \
 	tags.html \
@@ -256,10 +256,27 @@ HTMLS = \
 	windows.html \
 	workshop.html
 
+CONVERTED = \
+	vim-fr.UTF-8.1 \
+	evim-fr.UTF-8.1 \
+	vimdiff-fr.UTF-8.1 \
+	vimtutor-fr.UTF-8.1 \
+	xxd-fr.UTF-8.1 \
+	vim-it.UTF-8.1 \
+	evim-it.UTF-8.1 \
+	vimdiff-it.UTF-8.1 \
+	vimtutor-it.UTF-8.1 \
+	xxd-it.UTF-8.1 \
+	vim-ru.UTF-8.1 \
+	evim-ru.UTF-8.1 \
+	vimdiff-ru.UTF-8.1 \
+	vimtutor-ru.UTF-8.1 \
+	xxd-ru.UTF-8.1 \
+
 .SUFFIXES:
 .SUFFIXES: .c .o .txt .html
 
-all: tags vim.man vimdiff.man vimtutor.man xxd.man
+all: tags vim.man vimdiff.man vimtutor.man xxd.man $(CONVERTED)
 
 # Use Vim to generate the tags file.  Can only be used when Vim has been
 # compiled and installed.  Supports multiple languages.
@@ -367,3 +384,48 @@ os_risc.txt:
 
 os_win32.txt:
 	touch os_win32.txt
+
+vim-fr.UTF-8.1: vim-fr.1
+	iconv -f latin1 -t utf-8 $< >$@
+
+evim-fr.UTF-8.1: evim-fr.1
+	iconv -f latin1 -t utf-8 $< >$@
+
+vimdiff-fr.UTF-8.1: vimdiff-fr.1
+	iconv -f latin1 -t utf-8 $< >$@
+
+vimtutor-fr.UTF-8.1: vimtutor-fr.1
+	iconv -f latin1 -t utf-8 $< >$@
+
+xxd-fr.UTF-8.1: xxd-fr.1
+	iconv -f latin1 -t utf-8 $< >$@
+
+vim-it.UTF-8.1: vim-it.1
+	iconv -f latin1 -t utf-8 $< >$@
+
+evim-it.UTF-8.1: evim-it.1
+	iconv -f latin1 -t utf-8 $< >$@
+
+vimdiff-it.UTF-8.1: vimdiff-it.1
+	iconv -f latin1 -t utf-8 $< >$@
+
+vimtutor-it.UTF-8.1: vimtutor-it.1
+	iconv -f latin1 -t utf-8 $< >$@
+
+xxd-it.UTF-8.1: xxd-it.1
+	iconv -f latin1 -t utf-8 $< >$@
+
+vim-ru.UTF-8.1: vim-ru.1
+	iconv -f KOI8-R -t utf-8 $< >$@
+
+evim-ru.UTF-8.1: evim-ru.1
+	iconv -f KOI8-R -t utf-8 $< >$@
+
+vimdiff-ru.UTF-8.1: vimdiff-ru.1
+	iconv -f KOI8-R -t utf-8 $< >$@
+
+vimtutor-ru.UTF-8.1: vimtutor-ru.1
+	iconv -f KOI8-R -t utf-8 $< >$@
+
+xxd-ru.UTF-8.1: xxd-ru.1
+	iconv -f KOI8-R -t utf-8 $< >$@

runtime/doc/arabic.txt

@@ -1,4 +1,4 @@
-*arabic.txt*	For Vim version 7.0aa.  Last change: 2004 Jun 09
+*arabic.txt*	For Vim version 7.0aa.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL	  by Nadim Shaikli
@@ -24,7 +24,7 @@ Introduction
 ------------
 Arabic is a rather demanding language in which a number of special
 features are required.	Characters are right-to-left oriented and
-ought to appear as such on the screen (ie. from right to left).
+ought to appear as such on the screen (i.e. from right to left).
 Arabic also requires shaping of its characters, meaning the same
 character has a different visual form based on its relative location
 within a word (initial, medial, final or stand-alone).	Arabic also
@@ -60,7 +60,7 @@ o  Changing keyboard mapping and reverse insert modes using a single
 
 o  Toggling complete Arabic support via a single command.
 
-o  While in Arabic mode, numbers are entered from left to right. Upon
+o  While in Arabic mode, numbers are entered from left to right.  Upon
    entering a none number character, that character will be inserted
    just into the left of the last number.
 
@@ -101,14 +101,14 @@ need to be accounted for and invoked.
 
 o  Setting the Arabic fonts
 
-   +  For VIM GUI set the 'guifont' to your_ARABIC_FONT. This is done
+   +  For VIM GUI set the 'guifont' to your_ARABIC_FONT.  This is done
       by entering the following command in the VIM window.
 >
 		:set guifont=your_ARABIC_FONT
 <
       NOTE: the string 'your_ARABIC_FONT' is used to denote a complete
-	    font name akin to that used in linux/unix system.
-	    (eg. -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso10646-1)
+	    font name akin to that used in Linux/Unix systems.
+	    (e.g. -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso10646-1)
 
       You can append the 'guifont' set command to your .vimrc file
       in order to get the same above noted results.  In other words,
@@ -179,11 +179,11 @@ o  Enable Arabic settings [short-cut]
 
    If, on the other hand, you'd like to be verbose and explicit and
    are opting not to use the 'arabic' short-cut command, here's what
-   is needed (ie. if you use ':set arabic' you can skip this section) -
+   is needed (i.e. if you use ':set arabic' you can skip this section) -
 
    +  Arabic Keymapping Activation
 
-      To activate the Arabic keymap (ie. to remap your English/Latin
+      To activate the Arabic keymap (i.e. to remap your English/Latin
       keyboard to look-n-feel like a standard Arabic one), set the
       'keymap' command to "arabic".  This is done by entering
 >
@@ -197,14 +197,14 @@ o  Enable Arabic settings [short-cut]
       default mapping (English), it is advised that users use the 'CTRL-^'
       key press while in insert (or add/replace) mode.	The command-line
       will display your current mapping by displaying an "Arabic" string
-      next to your insertion mode (eg. -- INSERT Arabic --) indicating
+      next to your insertion mode (e.g. -- INSERT Arabic --) indicating
       your current keymap.
 
    +  Arabic deletion of a combined pair character
 
       By default VIM has the 'delcombine' option disabled.  This option
       allows the deletion of ALEF in a LAM_ALEF (LAA) combined character
-      and still retain the LAM (ie. it reverts to treating the combined
+      and still retain the LAM (i.e. it reverts to treating the combined
       character as its natural two characters form -- this also pertains
       to harakat and their combined forms).  You can enable this option
       by entering
@@ -227,7 +227,7 @@ o  Enable Arabic settings [short-cut]
       - While in Left-to-right mode, enter ':set rl' in the command line
 	('rl' is the abbreviation for rightleft).
 
-      - Put the ':set rl' line in your '.vimrc' file to start the VIM in
+      - Put the ':set rl' line in your '.vimrc' file to start Vim in
 	right-to-left mode permanently.
 
    +  Arabic right-to-left command-line Mode
@@ -295,7 +295,7 @@ Restrictions
 ------------
 
 o  VIM in its GUI form does not currently support Bi-directionality
-   (ie. the ability to see both Arabic and Latin intermixed within
+   (i.e. the ability to see both Arabic and Latin intermixed within
    the same line).
 
 
@@ -304,7 +304,7 @@ Known Bugs
 
 There is one known minor bug,
 
- 1. If you insert a haraka (eg. Fatha (U+064E)) after a LAM (U+0644)
+ 1. If you insert a haraka (e.g. Fatha (U+064E)) after a LAM (U+0644)
     and then insert an ALEF (U+0627), the appropriate combining will
     not happen due to the sandwiched haraka resulting in something
     that will NOT be displayed correctly.
@@ -320,4 +320,3 @@ There is one known minor bug,
 No other bugs are known to exist.
 
  vim:tw=78:ts=8:ft=help:norl:
-

runtime/doc/autocmd.txt

@@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 7.0aa.  Last change: 2004 Dec 24
+*autocmd.txt*   For Vim version 7.0aa.  Last change: 2005 Mar 04
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -204,10 +204,12 @@ FilterReadPre			Before reading a file from a filter command.
 				the current buffer, not the name of the
 				temporary file that is the output of the
 				filter command.
+				Not triggered when 'shelltemp' is off.
 							*FilterReadPost*
 FilterReadPost			After reading a file from a filter command.
 				Vim checks the pattern against the name of
 				the current buffer as with FilterReadPre.
+				Not triggered when 'shelltemp' is off.
 							*FileType*
 FileType			When the 'filetype' option has been set.
 				<afile> can be used for the name of the file
@@ -270,11 +272,13 @@ FilterWritePre			Before writing a file for a filter command or
 				the current buffer, not the name of the
 				temporary file that is the output of the
 				filter command.
+				Not triggered when 'shelltemp' is off.
 							*FilterWritePost*
 FilterWritePost			After writing a file for a filter command or
 				making a diff.
 				Vim checks the pattern against the name of
 				the current buffer as with FilterWritePre.
+				Not triggered when 'shelltemp' is off.
 							*FileChangedShell*
 FileChangedShell		When Vim notices that the modification time of
 				a file has changed since editing started.
@@ -282,7 +286,7 @@ FileChangedShell		When Vim notices that the modification time of
 				change. |timestamp|
 				Mostly triggered after executing a shell
 				command, but also with a |:checktime| command
-				or when Vim regains input focus.
+				or when Gvim regains input focus.
 				This autocommand is triggered for each changed
 				file.  It is not used when 'autoread' is set
 				and the buffer was not changed.  If a
@@ -290,6 +294,9 @@ FileChangedShell		When Vim notices that the modification time of
 				warning message and prompt is not given.
 				This is useful for reloading related buffers
 				which are affected by a single command.
+				The |v:fcs_reason| variable is set to indicate
+				what happened and |v:fcs_choice| can be used
+				to tell Vim what to do next.
 				NOTE: When this autocommand is executed, the
 				current buffer "%" may be different from the
 				buffer that was changed "<afile>".
@@ -324,6 +331,7 @@ FuncUndefined			When a user function is used but it isn't
 				defined.  Useful for defining a function only
 				when it's used.  Both <amatch> and <afile> are
 				set to the name of the function.
+				See |autoload-functions|.
 							*CursorHold*
 CursorHold			When the user doesn't press a key for the time
 				specified with 'updatetime'.  Not re-triggered
@@ -495,7 +503,7 @@ InsertChange			When typing <Insert> while in Insert or
 				anything else that the user does not expect.
 							*InsertLeave*
 InsertLeave			When leaving Insert mode.  Also when using
-				CTRL-O |i_CTRL-O|.
+				CTRL-O |i_CTRL-O|.  But not for |i_CTRL-C|.
 							*FileEncoding*
 FileEncoding			Obsolete.  It still works and is equivalent
 				to |EncodingChanged|.
@@ -520,6 +528,20 @@ TermResponse			After the response to |t_RV| is received from
 				the terminal.  The value of |v:termresponse|
 				can be used to do things depending on the
 				terminal version.
+QuickFixCmdPre						*QuickFixCmdPre*
+				Before a quickfix command is run (|:make|,
+				|:grep|, |:grepadd|, |:vimgrep|,
+				|:vimgrepadd|). The pattern is matched against
+				the command being run.  When |:grep| is used
+				but 'grepprg' is set to "internal" it still
+				matches "grep".
+				This command cannot be used to set the
+				'makeprg' and 'grepprg' variables.
+				If this command causes an error, the quickfix
+				command is not executed.
+QuickFixCmdPost						*QuickFixCmdPost*
+				like QuickFixCmdPre, but after a quickfix
+				command is run.
 							*UserGettingBored*
 UserGettingBored		When the user hits CTRL-C.  Just kidding! :-)
 							*User*

runtime/doc/change.txt

@@ -1,4 +1,4 @@
-*change.txt*    For Vim version 7.0aa.  Last change: 2004 Dec 29
+*change.txt*    For Vim version 7.0aa.  Last change: 2005 Jun 25
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -19,6 +19,7 @@ commands with the "." command.
    4.4 Changing tabs		   |change-tabs|
 5. Copying and moving text	|copy-move|
 6. Formatting text		|formatting|
+7. Sorting text			|sorting|
 
 For inserting text see |insert.txt|.
 
@@ -52,6 +53,8 @@ For inserting text see |insert.txt|.
 			of the line and [count]-1 more lines [into register
 			x]; synonym for "d$".
 			(not |linewise|)
+			When the '#' flag is in 'cpoptions' the count is
+			ignored.
 
 {Visual}["x]x	or					*v_x* *v_d* *v_<Del>*
 {Visual}["x]d   or
@@ -110,19 +113,22 @@ gJ			Join [count] lines, with a minimum of two lines.
 			Vi}
 
 							*:j* *:join*
-:[range]j[oin][!]	Join [range] lines.  Same as "J", except with [!]
+:[range]j[oin][!] [flags]
+			Join [range] lines.  Same as "J", except with [!]
 			the join does not insert or delete any spaces.
 			If a [range] has equal start and end values, this
 			command does nothing.  The default behavior is to
 			join the current line with the line below it.
 			{not in Vi: !}
+			See |ex-flags| for [flags].
 
-:[range]j[oin][!] {count}
+:[range]j[oin][!] {count} [flags]
 			Join {count} lines, starting with [range] (default:
 			current line |cmdline-ranges|).  Same as "J", except
 			with [!] the join does not insert or delete any
 			spaces.
 			{not in Vi: !}
+			See |ex-flags| for [flags].
 
 These commands delete the <EOL> between lines.  This has the effect of joining
 multiple lines into one line.  You can repeat these commands (except ":j") and
@@ -234,10 +240,12 @@ If you prefer "cw" to include the space after a word, use this mapping: >
 	:map cw dwi
 <
 							*:c* *:ch* *:change*
-:{range}c[hange]	Replace lines of text with some different text.
+:{range}c[hange][!]	Replace lines of text with some different text.
 			Type a line containing only "." to stop replacing.
 			Without {range}, this command changes only the current
 			line.
+			Adding [!] toggles 'autoindent' for the time this
+			command is executed.
 
 ==============================================================================
 3. Simple changes					*simple-change*
@@ -378,7 +386,7 @@ The CTRL-A command is very useful in a macro.  Example: Use the following
 steps to make a numbered list.
 
 1. Create the first list entry, make sure it starts with a number.
-2. qa	     - start recording into buffer 'a'
+2. qa	     - start recording into register 'a'
 3. Y	     - yank the entry
 4. p	     - put a copy of the entry below the first one
 5. CTRL-A    - increment the number
@@ -422,12 +430,15 @@ SHIFTING LINES LEFT OR RIGHT				*shift-left-right*
 			lines to [indent] (default 0).  {not in Vi}
 
 							*:>*
-:[range]>		Shift {count} [range] lines one 'shiftwidth' right.
+:[range]> [flags]	Shift {count} [range] lines one 'shiftwidth' right.
 			Repeat '>' for shifting multiple 'shiftwidth's.
+			See |ex-flags| for [flags].
 
-:[range]> {count}	Shift {count} lines one 'shiftwidth' right, starting
+:[range]> {count} [flags]
+			Shift {count} lines one 'shiftwidth' right, starting
 			with [range] (default current line |cmdline-ranges|).
 			Repeat '>' for shifting multiple 'shiftwidth's.
+			See |ex-flags| for [flags].
 
 The ">" and "<" commands are handy for changing the indentation within
 programs.  Use the 'shiftwidth' option to set the size of the white space
@@ -517,7 +528,7 @@ comment (starting with '"') after the ":!" command.
 
 4.2 Substitute						*:substitute*
 							*:s* *:su*
-:[range]s[ubstitute]/{pattern}/{string}/[&][c][e][g][p][r][i][I] [count]
+:[range]s[ubstitute]/{pattern}/{string}/[flags] [count]
 			For each line in [range] replace a match of {pattern}
 			with {string}.
 			For the {pattern} see |pattern|.
@@ -529,31 +540,31 @@ comment (starting with '"') after the ":!" command.
 			starting with the last line in [range].  When [range]
 			is omitted start in the current line.
 			Also see |cmdline-ranges|.
-			See |:s_flags| for the flags.
+			See |:s_flags| for [flags].
 
-:[range]s[ubstitute] [c][e][g][p][r][i][I] [count]
-:[range]&[&][c][e][g][p][r][i][I] [count]			*:&*
+:[range]s[ubstitute] [flags] [count]
+:[range]&[&][flags] [count]					*:&*
 			Repeat last :substitute with same search pattern and
 			substitute string, but without the same flags.  You
-			may add extra flags (see |:s_flags|).
+			may add [flags], see |:s_flags|.
 			Note that after ":substitute" the '&' flag can't be
 			used, it's recognized as a pattern separator.
 			The space between ":substitute" and the 'c', 'g' and
 			'r' flags isn't required, but in scripts it's a good
 			idea to keep it to avoid confusion.
 
-:[range]~[&][c][e][g][p][r][i][I] [count]			*:~*
+:[range]~[&][flags] [count]					*:~*
 			Repeat last substitute with same substitute string
 			but with last used search pattern.  This is like
-			":&r".  See |:s_flags| for the flags.
+			":&r".  See |:s_flags| for [flags].
 
-						*&*
+								*&*
 &			Synonym for ":s//~/" (repeat last substitute).  Note
 			that the flags are not remembered, thus it might
 			actually work differently.  You can use ":&&" to keep
 			the flags.
 
-						*g&*
+								*g&*
 g&			Synonym for ":%s//~/&" (repeat last substitute on all
 			lines with the same flags).
 			Mnemonic: global substitute. {not in Vi}
@@ -619,8 +630,15 @@ The flags that you can use for the substitute commands:
 	options are not used.
 	{not in Vi}
 
+[n]	Report the number of matches, do not actually substitute.  The [c]
+	flag is ignored.  The matches are reported as if 'report' is zero.
+	Useful to |count-items|.
+
 [p]	Print the line containing the last substitute.
-	{not in Vi}
+
+[#]	Like [p] and prepend the line number.
+
+[l]	Like [l] but print the text like |:list|.
 
 [r]	Only useful in combination with ":&" or ":s" without arguments.  ":&r"
 	works the same way as ":~":  When the search pattern is empty, use the
@@ -666,6 +684,9 @@ For the definition of a pattern, see |pattern|.
 When the {string} starts with "\=" it is evaluated as an expression, see
 |sub-replace-expression|.  Otherwise these characters in {string} have a
 special meaning:
+								*:s%*
+When {string} is equal to "%" and '/' is included with the 'cpotions' option,
+then the {string} of the previous substitute command is used. |cpo-/|
 
 magic	nomagic	  action    ~
   &	  \&	  replaced with the whole matched pattern	     *s/\&*
@@ -728,8 +749,8 @@ either the first or second pattern in parentheses did not match, so either
 <
 
 Substitute with an expression			*sub-replace-expression*
-
-When the substitute string starts with "\=" the remainer is interpreted as an
+						*sub-replace-\=*
+When the substitute string starts with "\=" the remainder is interpreted as an
 expression.  This does not work recursively: a substitute() function inside
 the expression cannot use "\=" for the substitute string.
 
@@ -895,6 +916,8 @@ inside of strings can change!  Also see 'softtabstop' option. >
 			current line).  This always works |linewise|, thus
 			this command can be used to put a yanked block as new
 			lines.
+			The cursor is left on the first non-blank in the last
+			new line.
 			The register can also be '=' followed by an optional
 			expression.  The expression continues until the end of
 			the command.  You need to escape the '|' and '"'
@@ -944,9 +967,9 @@ When using a put command like |p| or |P| in Visual mode, Vim will try to
 replace the selected text with the contents of the register.  Whether this
 works well depends on the type of selection and the type of the text in the
 register.  With blockwise selection it also depends on the size of the block
-and whether the corners are on an existing character. (implementation detail:
+and whether the corners are on an existing character.  (Implementation detail:
 it actually works by first putting the register after the selection and then
-deleting the selection).
+deleting the selection.)
 
 							*blockwise-register*
 If you use a blockwise Visual mode command to get the text into the register,
@@ -1017,7 +1040,8 @@ except when the command specifies a register with ["x].
 4. Named registers "a to "z or "A to "Z			*quote_alpha* *quotea*
 Vim fills these registers only when you say so.  Specify them as lowercase
 letters to replace their previous contents or as uppercase letters to append
-to their previous contents.
+to their previous contents.  When the '>' flag is present in 'cpoptions' then
+a line break is inserted before the appended text.
 
 5. Read-only registers ":, "., "% and "#
 These are '%', '#', ':' and '.'.  You can use them only with the "p", "P",
@@ -1050,9 +1074,12 @@ normal command-line editing commands are available, including a special
 history for expressions.  When you end the command-line by typing <CR>, Vim
 computes the result of the expression.  If you end it with <Esc>, Vim abandons
 the expression.  If you do not enter an expression, Vim uses the previous
-expression (like with the "/" command).  If the "= register is used for the
-"p" command, the string is split up at <NL> characters.  If the string ends in
-a <NL>, it is regarded as a linewise register.  {not in Vi}
+expression (like with the "/" command).  The expression must evaluate to a
+string.  If the result is a number it's turned into a string.  A List,
+Dictionary or FuncRef results in an error message (use string() to convert).
+If the "= register is used for the "p" command, the string is split up at <NL>
+characters.  If the string ends in a <NL>, it is regarded as a linewise
+register.  {not in Vi}
 
 7. Selection and drop registers "*, "+ and "~ 
 Use these register for storing and retrieving the selected text for the GUI.
@@ -1134,13 +1161,17 @@ The next three commands always work on whole lines.
 			compile time.
 
 							*gq*
-gq{motion}		Format the lines that {motion} moves over.  The
-			'textwidth' option controls the length of each
-			formatted line (see below).  If the 'textwidth' option
-			is 0, the formatted line length is the screen width
-			(with a maximum width of 79).  {not in Vi}
+gq{motion}		Format the lines that {motion} moves over.
+			If 'formatprg' is empty formatting is done internally
+			and the 'textwidth' option controls the length of each
+			formatted line (see below).
+			If the 'textwidth' option is 0, the formatted line
+			length is the screen width (with a maximum width of
+			79).  {not in Vi}
 			The 'formatoptions' option controls the type of
 			formatting |fo-table|.
+			The cursor is left on the first non-blank of the last
+			formatted line.
 			NOTE: The "Q" command formerly performed this
 			function.  If you still want to use "Q" for
 			formatting, use this mapping: >
@@ -1392,7 +1423,7 @@ If the 'comments' option includes "/*", "*" and/or "*/", then Vim has some
 built in stuff to treat these types of comments a bit more cleverly.
 Opening a new line before or after "/*" or "*/" (with 'r' or 'o' present in
 'formatoptions') gives the correct start of the line automatically.  The same
-happens with formatting and auto-wrapping. Opening a line after a line
+happens with formatting and auto-wrapping.  Opening a line after a line
 starting with "/*" or "*" and containing "*/", will cause no comment leader to
 be inserted, and the indent of the new line is taken from the line containing
 the start of the comment.
@@ -1452,5 +1483,52 @@ And a few warnings:
 
 - Formatting a long paragraph and/or with complicated indenting may be slow.
 
+==============================================================================
+7. Sorting text						*sorting*
+
+Vim has a sorting function and a sorting command.  The sorting function can be
+found here: |sort()|.
+
+							*:sor* *:sort*
+:[range]sor[t][!] [i] [u] [/{pattern}/]
+			Sort lines in [range].
+
+			With [!] the order is reversed.
+
+			With [i] case is ignored.
+
+			With [n] sorting is done on the first decimal number
+			in the line (after a {pattern} match).
+
+			With [x] sorting is done on the first hexadecimal
+			number in the line (after a {pattern} match).  A
+			leading "0x" or "0X" is ignored.
+
+			With [o] sorting is done on the first octal number in
+			the line (after a {pattern} match).
+
+			With [u] only keep the first of a sequence of
+			identical lines (ignoring case when [i] is used).
+			Note that leading and trailing white space may cause
+			lines to be different.
+
+			When /{pattern}/ is specified the text matched with
+			{pattern} is skipped, so that you sort on what comes
+			after the match.  For lines without a match sorting
+			starts in the first column (e.g., for empty lines).
+			Instead of the slash any non-letter can be used.
+			For example, to sort on the second comma-separated
+			field: >
+				:sort /[^,]*,/
+<			To sort on the text at virtual column 10 (thus
+			ignoring the difference between tabs and spaces): >
+				:sort /.*\%10v/
+<
+Note that using ":sort" with ":global" doesn't sort the matching lines, it's
+quite useless.
+
+The details about sorting depend on the library function used.  There is no
+guarantee that sorting is "stable" or obeys the current locale.  You will have
+to try it out.
 
  vim:tw=78:ts=8:ft=help:norl:

runtime/doc/cmdline.txt

@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 7.0aa.  Last change: 2004 Dec 20
+*cmdline.txt*   For Vim version 7.0aa.  Last change: 2005 Jul 05
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -17,8 +17,9 @@ Basic command line editing is explained in chapter 20 of the user manual
 2. Command-line completion	|cmdline-completion|
 3. Ex command-lines		|cmdline-lines|
 4. Ex command-line ranges	|cmdline-ranges|
-5. Ex special characters	|cmdline-special|
-6. Command-line window		|cmdline-window|
+5. Ex command-line flags	|ex-flags|
+6. Ex special characters	|cmdline-special|
+7. Command-line window		|cmdline-window|
 
 ==============================================================================
 1. Command-line editing					*cmdline-editing*
@@ -153,6 +154,10 @@ CTRL-R {0-9a-z"%#:-=.}					*c_CTRL-R* *c_<C-R>*
 			'='	the expression register: you are prompted to
 				enter an expression (see |expression|)
 		See |registers| about registers.  {not in Vi}
+		Implementation detail: When using the |expression| register
+		and invoking setcmdpos(), this sets the position before
+		inserting the resulting string.  Use CTRL-R CTRL-R to set the
+		position afterwards.
 
 CTRL-R CTRL-F				*c_CTRL-R_CTRL-F* *c_<C-R>_<C-F>*
 CTRL-R CTRL-P				*c_CTRL-R_CTRL-P* *c_<C-R>_<C-P>*
@@ -664,7 +669,20 @@ Visual Mode and Range					*v_:*
 		lines.
 
 ==============================================================================
-5. Ex special characters				*cmdline-special*
+5. Ex command-line flags				*ex-flags*
+
+These flags are supported by a selection of Ex commands.  They print the line
+that the cursor ends up after executing the command:
+
+	l	output like for |:list|
+	#	add line number
+	p	output like for |:print|
+
+The flags can be combined, thus "l#" uses both a line number and |:list| style
+output.
+
+==============================================================================
+6. Ex special characters				*cmdline-special*
 
 In Ex commands, at places where a file name can be used, the following
 characters have a special meaning.  These can also be used in the expression
@@ -708,7 +726,7 @@ Note: these are typed literally, they are not special keys!
 		   effective buffer number (for ":r file" it is the current
 		   buffer, the file being read is not in a buffer).
 	<amatch>   when executing autocommands, is replaced with the match for
-		   which this autocommand was executed.  It differs form
+		   which this autocommand was executed.  It differs from
 		   <afile> only when the file name isn't used to match with
 		   (for FileType and Syntax events).
 	<sfile>    when executing a ":source" command, is replaced with the

runtime/doc/debugger.txt

@@ -1,4 +1,4 @@
-*debugger.txt*  For Vim version 7.0aa.  Last change: 2001 Dec 22
+*debugger.txt*  For Vim version 7.0aa.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Gordon Prieur
@@ -27,19 +27,19 @@ Environment (IDE):
 
 These features were added specifically for use in the Motif version of gvim.
 However, the |alt-input| and |debug-highlight| were written to be usable in
-both vim and gvim. Some of the other features could be used in the non-GUI
-vim with slight modifications. However, I did not do this nor did I test the
+both vim and gvim.  Some of the other features could be used in the non-GUI
+vim with slight modifications.  However, I did not do this nor did I test the
 reliability of building for vim or non Motif GUI versions.
 
 
 1.1 Alternate Command Input				*alt-input*
 
 For Vim to work with a debugger there must be at least an input connection
-with a debugger or external tool. In many cases there will also be an output
+with a debugger or external tool.  In many cases there will also be an output
 connection but this isn't absolutely necessary.
 
 The purpose of the input connection is to let the external debugger send
-commands to Vim. The commands sent by the debugger should give the debugger
+commands to Vim.  The commands sent by the debugger should give the debugger
 enough control to display the current debug environment and state.
 
 The current implementation is based on the X Toolkit dispatch loop and the
@@ -49,15 +49,15 @@ XtAddInput() function call.
 1.2 Debug Signs						*debug-signs*
 
 Many debuggers mark specific lines by placing a small sign or color highlight
-on the line. The |:sign| command lets the debugger set this graphic mark. Some
+on the line.  The |:sign| command lets the debugger set this graphic mark.  Some
 examples where this feature would be used would be a debugger showing an arrow
-representing the Program Counter (PC) of the program being debugged. Another
-example would be a small stop sign for a line with a breakpoint. These visible
+representing the Program Counter (PC) of the program being debugged.  Another
+example would be a small stop sign for a line with a breakpoint.  These visible
 highlights let the user keep track of certain parts of the state of the
 debugger.
 
-This feature can be used with more than debuggers, too. An IPE can use a sign
-to highlight build errors, searched text, or other things. The sign feature
+This feature can be used with more than debuggers, too.  An IPE can use a sign
+to highlight build errors, searched text, or other things.  The sign feature
 can also work together with the |debug-highlight| to ensure the mark is
 highly visible.
 
@@ -66,17 +66,17 @@ Debug signs are defined and placed using the |:sign| command.
 
 1.3 Debug Source Highlight				*debug-highlight*
 
-This feature allows a line to have a predominant highlight. The highlight is
-intended to make a specific line stand out. The highlight could be made to
+This feature allows a line to have a predominant highlight.  The highlight is
+intended to make a specific line stand out.  The highlight could be made to
 work for both vim and gvim, whereas the debug sign is, in most cases, limited
-to gvim. The one exception to this is Sun Microsystem's dtterm. The dtterm
+to gvim.  The one exception to this is Sun Microsystem's dtterm.  The dtterm
 from Sun has a "sign gutter" for showing signs.
 
 
 1.4 Message Footer					*gui-footer*
 
-The message footer can be used to display messages from a debugger or IPE. It
-can also be used to display menu and toolbar tips. The footer area is at the
+The message footer can be used to display messages from a debugger or IPE.  It
+can also be used to display menu and toolbar tips.  The footer area is at the
 bottom of the GUI window, below the line used to display colon commands.
 
 The display of the footer is controlled by the 'guioptions' letter 'F'.
@@ -85,30 +85,33 @@ The display of the footer is controlled by the 'guioptions' letter 'F'.
 1.5 Balloon Evaluation					*balloon-eval*
 
 This feature allows a debugger, or other external tool, to display dynamic
-information based on where the mouse is pointing. The purpose of this feature
+information based on where the mouse is pointing.  The purpose of this feature
 was to allow Sun's Visual WorkShop debugger to display expression evaluations.
 However, the feature was implemented in as general a manner as possible and
 could be used for displaying other information as well.
 
-The Balloon Evaluation has some settable parameters too.  The font list and
-colors can be set via X resources (XmNballoonEvalFontList,
+The Balloon Evaluation has some settable parameters too.  For Motif the font
+list and colors can be set via X resources (XmNballoonEvalFontList,
 XmNballoonEvalBackground, and XmNballoonEvalForeground).
 The 'balloondelay' option sets the delay before an attempt is made to show a
 balloon.
 The 'ballooneval' option needs to be set to switch it on.
 
 Balloon evaluation is only available when compiled with the |+balloon_eval|
-and |+sun_workshop| features.
+feature.
 
 The Balloon evaluation functions are also used to show a tooltip for the
 toolbar.  The 'ballooneval' option does not need to be set for this.  But the
 other settings apply.
 
+Another way to use the balloon is with the 'balloonexpr' option.  This is
+completely user definable.
+
 ==============================================================================
 2. Vim Compile Options					*debugger-compilation*
 
 The debugger features were added explicitly for use with Sun's Visual
-WorkShop Integrated Programming Environment (ipe). However, they were done
+WorkShop Integrated Programming Environment (ipe).  However, they were done
 in as generic a manner as possible so that integration with other debuggers
 could also use some or all of the tools used with Sun's ipe.
 
@@ -120,7 +123,7 @@ The following compile time preprocessor variables control the features:
     Message Footer				FEAT_FOOTER
     Balloon Evaluation				FEAT_BEVAL
 
-The first integration with a full IPE/IDE was with Sun Visual WorkShop. To
+The first integration with a full IPE/IDE was with Sun Visual WorkShop.  To
 compile a gvim which interfaces with VWS set the following flag, which sets
 all the above flags:
 
@@ -129,7 +132,9 @@ all the above flags:
 ==============================================================================
 3. Integrated Debuggers					*debugger-integration*
 
-Currently the only fully integrated debugger/IPE/IDE is Sun's Visual WorkShop
-Integrated Programming Environment.
+One fully integrated debugger/IPE/IDE is Sun's Visual WorkShop Integrated
+Programming Environment.
+
+For Sun NetBeans support see |netbeans|.
 
  vim:tw=78:sw=4:ts=8:ft=help:norl:

runtime/doc/develop.txt

@@ -1,4 +1,4 @@
-*develop.txt*   For Vim version 7.0aa.  Last change: 2004 Jan 17
+*develop.txt*   For Vim version 7.0aa.  Last change: 2005 Jun 13
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -366,7 +366,37 @@ window		View on a buffer.  There can be several windows in Vim,
 		fit in the shell.
 
 
-To be continued...
+Spell checking						*develop-spell*
+
+When spell checking was going to be added to Vim a survey was done over the
+available spell checking libraries and programs.  Unfortunately, the result
+was that none of them provided sufficient capabilities to be used as the spell
+checking engine in Vim, for various reasons:
+
+- Missing support for multi-byte encodings.  At least UTF-8 must be supported,
+  so that more than one language can be used in the same file.
+  Doing on-the-fly conversion is not always possible (would require iconv
+  support).
+- For the programs and libraries: Using them as-is would require installing
+  them separately from Vim.  That's mostly not impossible, but a drawback.
+- Performance: A few tests showed that it's possible to check spelling on the
+  fly (while redrawing), just like syntax highlighting.  But the mechanisms
+  used by other code are much slower.  Myspell uses a simplistic hashtable,
+  for example.
+- For using an external program like aspell a communication mechanism would
+  have to be setup.  That's complicated to do in a portable way (Unix-only
+  would be relatively simple, but that's not good enough).  And performance
+  will become a problem (lots of process switching involved).
+- Missing support for words with non-word characters, such as "Etten-Leur" and
+  "et al.", would require marking the pieces of them OK, lowering the
+  reliability.
+- Missing support for regions or dialects.  Makes it difficult to accept
+  all English words and highlight non-Canadian words differently.
+- Missing support for rare words.  Many words are correct but hardly ever used
+  and could be a misspelled often-used word.
+- For making suggestions the speed is less important and requiring to install
+  another program or library would be acceptable.  But the word lists probably
+  differ, the suggestions may be wrong words.
 
 ==============================================================================
 4. Assumptions						*design-assumptions*

runtime/doc/diff.txt

@@ -1,4 +1,4 @@
-*diff.txt*      For Vim version 7.0aa.  Last change: 2004 Jul 20
+*diff.txt*      For Vim version 7.0aa.  Last change: 2005 Apr 26
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -157,10 +157,12 @@ original file and diff with that.  For example: >
 
 A buffer that is unloaded cannot be used for the diff.  But it does work for
 hidden buffers.  You can use ":hide" to close a window without unloading the
-buffer.
-
+buffer.  If you don't want a buffer to remain used for the diff do ":set
+nodiff" before hiding it.
 
 							*:diffu* *:diffupdate*
+:diffu[pdate]			Update the diff highlighting and folds.
+
 Vim attempts to keep the differences updated when you make changes to the
 text.  This mostly takes care of inserted and deleted lines.  Changes within a
 line and more complicated changes do not cause the differences to be updated.

runtime/doc/digraph.txt

@@ -1,4 +1,4 @@
-*digraph.txt*   For Vim version 7.0aa.  Last change: 2004 Oct 07
+*digraph.txt*   For Vim version 7.0aa.  Last change: 2005 Mar 06
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -161,8 +161,13 @@ These are the RFC1345 digraphs for the one-byte characters.  See the output of
 ":digraphs" for the others.  The characters above 255 are only available when
 Vim was compiled with the |+multi_byte| feature.
 
+EURO
+
 Exception: RFC1345 doesn't specify the euro sign.  In Vim the digraph =e was
-added for this.
+added for this.  Note the difference between latin1, where the digraph Cu is
+used for the currency sign, and latin9 (iso-8859-15), where the digraph =e is
+used for the euro sign, while both of them are the character 164, 0xa4.
+
 							*digraph-table*
 char  digraph	hex	dec	official name ~
 ^@	NU	0x00	  0	NULL (NUL)

runtime/doc/editing.txt

@@ -1,4 +1,4 @@
-*editing.txt*   For Vim version 7.0aa.  Last change: 2004 Dec 29
+*editing.txt*   For Vim version 7.0aa.  Last change: 2005 May 21
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -46,7 +46,7 @@ However, the alternate file name is not changed when |:keepalt| is used.
 			name.  {not in Vi}
 
 All file names are remembered in the buffer list.  When you enter a file name,
-for editing (e.g., with ":e filename") or writing (e.g., with ":w file name"),
+for editing (e.g., with ":e filename") or writing (e.g., with ":w filename"),
 the file name is added to the list.  You can use the buffer list to remember
 which files you edited and to quickly switch from one file to another (e.g.,
 to copy text) with the |CTRL-^| command.  First type the number of the file
@@ -54,12 +54,12 @@ and then hit CTRL-^.  {Vi: only one alternate file name is remembered}
 
 
 CTRL-G		or				*CTRL-G* *:f* *:fi* *:file*
-:f[ile]			Prints the current file name (as typed), the
-			cursor position (unless the 'ruler' option is set),
-			and the file status (readonly, modified, read errors,
-			new file).  See the 'shortmess' option about how tho
-			make this message shorter.  {Vi does not include
-			column number}
+:f[ile]			Prints the current file name (as typed, unless ":cd"
+			was used), the cursor position (unless the 'ruler'
+			option is set), and the file status (readonly,
+			modified, read errors, new file).  See the 'shortmess'
+			option about how to make this message shorter.
+			{Vi does not include column number}
 
 :f[ile]!		like |:file|, but don't truncate the name even when
 			'shortmess' indicates this.
@@ -69,18 +69,21 @@ CTRL-G		or				*CTRL-G* *:f* *:fi* *:file*
 			buffer number is also given.  {not in Vi}
 
 					*g_CTRL-G* *word-count* *byte-count*
-g CTRL-G		Prints the current position of the cursor in four
-			ways: Column, Line, Word and Byte.  If there are
-			characters in the line that take more than one
-			position on the screen (<Tab> or special character),
-			both the "real" column and the screen column are
-			shown, separated with a dash.  See also 'ruler'
-			option.  {not in Vi}
+g CTRL-G		Prints the current position of the cursor in five
+			ways: Column, Line, Word, Character and Byte.  If the
+			number of Characters and Bytes is the same then the
+			Character position is omitted.
+			If there are characters in the line that take more
+			than one position on the screen (<Tab> or special
+			character), both the "real" column and the screen
+			column are shown, separated with a dash.
+			See also 'ruler' option.  {not in Vi}
 
 							*v_g_CTRL-G*
-{Visual}g CTRL-G	Similar to "g CTRL-G", but Word, Line, and Byte counts
-			for the visually selected region are displayed.  In
-			Blockwise mode, Column count is also shown.  (For
+{Visual}g CTRL-G	Similar to "g CTRL-G", but Word, Character, Line, and
+			Byte counts for the visually selected region are
+			displayed.
+			In Blockwise mode, Column count is also shown.  (For
 			{Visual} see |Visual-mode|.)
 			{not in VI}
 
@@ -90,7 +93,7 @@ g CTRL-G		Prints the current position of the cursor in four
 			If the buffer did have a name, that name becomes the
 			|alternate-file| name.  An unlisted buffer is created
 			to hold the old name.
-
+							*:0file*
 :0f[ile][!]		Remove the name of the current buffer.  The optional !
 			avoids truncating the message, as with |:file|.  {not
 			in Vi}
@@ -560,7 +563,9 @@ list of the current window.
 			current entry.
 			This command keeps the currently edited file, also
 			when it's deleted from the argument list.
-			{not in Vi} {not available when compiled without the
+			Example: >
+				:argdel *.obj
+<			{not in Vi} {not available when compiled without the
 			|+listcmds| feature}
 
 :{range}argd[elete]	Delete the {range} files from the argument list.
@@ -907,8 +912,8 @@ if the system allows it (the directory must be writable).
 							*write-fail*
 If the writing of the new file fails, you have to be careful not to lose
 your changes AND the original file.  If there is no backup file and writing
-the new file failed, you have already lost the original file! DON'T EXIT VIM
-UNTIL YOU WRITE OUT THE FILE! If a backup was made, it is put back in place
+the new file failed, you have already lost the original file!  DON'T EXIT VIM
+UNTIL YOU WRITE OUT THE FILE!  If a backup was made, it is put back in place
 of the original file (if possible).  If you exit Vim, and lose the changes
 you made, the original file will mostly still be there.  If putting back the
 original file fails, there will be an error message telling you that you
@@ -1140,13 +1145,16 @@ You may use the |:cd| and |:lcd| commands to change to another directory, so
 you will not have to type that directory name in front of the file names.  It
 also makes a difference for executing external commands, e.g. ":!ls".
 
+Changing directory fails when the current buffer is modified, the '.' flag is
+present in 'cpoptions' and "!" is not used in the command.
+
 							*:cd* *E472*
-:cd			On non-Unix systems: Print the current directory
+:cd[!]			On non-Unix systems: Print the current directory
 			name.  On Unix systems: Change the current directory
 			to the home directory.  Use |:pwd| to print the
 			current directory on all systems.
 
-:cd {path}		Change the current directory to {path}.
+:cd[!] {path}		Change the current directory to {path}.
 			If {path} is relative, it is searched for in the
 			directories listed in |'cdpath'|.
 			Does not change the meaning of an already opened file,
@@ -1157,19 +1165,19 @@ also makes a difference for executing external commands, e.g. ":!ls".
 				:cd %:h
 <
 							*:cd-* *E186*
-:cd -			Change to the previous current directory (before the
+:cd[!] -		Change to the previous current directory (before the
 			previous ":cd {path}" command). {not in Vi}
 
 							*:chd* *:chdir*
-:chd[ir] [path]		Same as |:cd|.
+:chd[ir][!] [path]	Same as |:cd|.
 
 							*:lc* *:lcd*
-:lc[d] {path}		Like |:cd|, but only set the current directory for the
+:lc[d][!] {path}	Like |:cd|, but only set the current directory for the
 			current window.  The current directory for other
 			windows is not changed. {not in Vi}
 
 							*:lch* *:lchdir*
-:lch[dir]		Same as |:lcd|. {not in Vi}
+:lch[dir][!]		Same as |:lcd|. {not in Vi}
 
 							*:pw* *:pwd* *E187*
 :pw[d]			Print the current directory name.  {Vi: no pwd}
@@ -1328,9 +1336,9 @@ file though, only when the file wasn't changed inside of Vim.
 Note that if a FileChangedShell autocommand is defined you will not get a
 warning message or prompt.  The autocommand is expected to handle this.
 
-There is no warning for a directory (e.g., in the |file-explorer|).  But you
-do get warned if you started editing a new file and it was created as a
-directory later.
+There is no warning for a directory (e.g., with |netrw-browse|).  But you do
+get warned if you started editing a new file and it was created as a directory
+later.
 
 When Vim notices the timestamp of a file has changed, and the file is being
 edited in a buffer but has not changed, Vim checks if the contents of the file
@@ -1385,6 +1393,11 @@ It is also possible that you modified the file yourself, from another edit
 session or with another command (e.g., a filter command).  Then you will know
 which version of the file you want to keep.
 
+There is one situation where you get the message while there is nothing wrong:
+On a Win32 system on the day daylight saving time starts.  There is something
+in the Win32 libraries that confuses Vim about the hour time difference.  The
+problem goes away the next day.
+
 ==============================================================================
 11. File Searching					*file-searching*
 
@@ -1395,7 +1408,7 @@ options.  There are three different types of searching:
 
 1) Downward search:
    Downward search uses the wildcards '*', '**' and possibly others
-   supported by your operating system. '*' and '**' are handled inside Vim, so
+   supported by your operating system.  '*' and '**' are handled inside Vim, so
    they work on all operating systems.
 
    The usage of '*' is quite simple: It matches 0 or more characters.
@@ -1429,10 +1442,10 @@ options.  There are three different types of searching:
 
 2) Upward search:
    Here you can give a directory and then search the directory tree upward for
-   a file. You could give stop-directories to limit the upward search. The
+   a file.  You could give stop-directories to limit the upward search.  The
    stop-directories are appended to the path (for the 'path' option) or to
-   the filename (for the 'tags' option) with a ';'. If you want several
-   stop-directories separate them with ';'. If you want no stop-directory
+   the filename (for the 'tags' option) with a ';'.  If you want several
+   stop-directories separate them with ';'.  If you want no stop-directory
    ("search upward till the root directory) just use ';'. >
 	/usr/include/sys;/usr
 <   will search in: >
@@ -1451,7 +1464,7 @@ options.  There are three different types of searching:
 	/u/user_x/work/include
 	/u/user_x/include
 
-3) Combined up/downward search
+3) Combined up/downward search:
    If Vim's current path is /u/user_x/work/release and you do >
 	set path=**;/u/user_x
 <  and then search for a file with |gf| the file is searched in: >
@@ -1459,10 +1472,10 @@ options.  There are three different types of searching:
 	/u/user_x/work/**
 	/u/user_x/**
 <
-   BE CAREFUL! This might consume a lot of time, as the search of
+   BE CAREFUL!  This might consume a lot of time, as the search of
    '/u/user_x/**' includes '/u/user_x/work/**' and
    '/u/user_x/work/release/**'.  So '/u/user_x/work/release/**' is searched
-   three and '/u/user_x/work/**' is searched two times.
+   three times and '/u/user_x/work/**' is searched twice.
 
    In the above example you might want to set path to: >
 	:set path=**,/u/user_x/**

runtime/doc/evim-fr.1

@@ -0,0 +1,56 @@
+.TH EVIM 1 "16 f<>vrier 2002 February 16"
+.SH NAME
+evim \- <20> Easy Vim <20>, <20>dite un fichier avec Vim sans utiliser les modes
+.SH SYNOPSIS
+.br
+.B evim
+[options] [fichier ...]
+.br
+.B eview
+.SH DESCRIPTION
+.B eVim
+lance
+.B Vim
+et configure ses options afin qu'il se comporte comme un <20>diteur sans mode.
+Cela reste Vim, mais vous pouvez l'utiliser comme un <20>diteur <20> cliquer-taper <20>.
+Cela ressemble beaucoup <20> l'<27>dition avec Notepad sur MS-Windows.
+.B eVim
+ne fonctionne qu'avec l'interface graphique, qui est n<>cessaire pour permettre
+l'utilisation des menus et de la barre d'outils.
+.PP
+Il n'est utile qu'aux personnes qui ne parviennent vraiment pas <20> utiliser Vim
+de fa<66>on traditionnelle. L'<27>dition est alors bien moins efficace.
+.PP
+.B eview
+fait la m<>me chose, mais d<>marre Vim en mode Lecture-seule.
+Cela revient <20> lancer evim \-R.
+.PP
+Voir vim(1) pour davantage d'informations sur Vim, les options, etc.
+.PP
+L'option 'insertmode' est activ<69>e pour permettre de taper directement du texte.
+.br
+Les mappages sont configur<75>s pour que Copier et Coller fonctionnent avec les
+raccourcis habituels de MS-Windows. CTRL-X coupe le texte, CTRL-C copie le
+texte et CTRL-V colle le texte.
+Vous pouvez utiliser CTRL-Q pour obtenir la fonction originale de CTRL-V.
+.SH OPTIONS
+Voir vim(1).
+.SH FICHIERS
+.TP 15
+/usr/local/lib/vim/evim.vim
+Le script charg<72> pour initialiser eVim.
+.SH AUSSI CONNU SOUS
+<EFBFBD>galement connu sous le nom <20> Vim pour gumbies <20> [N.D.T. : Flying Circus...].
+Quand vous utilisez eVim, vous <20>tes cens<6E> prendre un mouchoir de poche,
+faire un noeud <20> chaque coin et le porter sur votre t<>te.
+.SH VOIR AUSSI
+vim(1)
+.SH AUTEUR
+La majeure partie de
+.B Vim
+a <20>t<EFBFBD> <20>crite par Bram Moolenaar, avec l'aide de nombreux autres contributeurs.
+Voir le menu Aide/Remerciements ou ":help credits" dans
+.B Vim.
+.SH TRADUCTION
+Cette page de manuel a <20>t<EFBFBD> traduite David Blanchet.
+<david.blanchet@free.fr> 2005-03-26.

runtime/doc/evim-fr.UTF-8.1

@@ -0,0 +1,56 @@
+.TH EVIM 1 "16 février 2002 February 16"
+.SH NAME
+evim \- « Easy Vim », édite un fichier avec Vim sans utiliser les modes
+.SH SYNOPSIS
+.br
+.B evim
+[options] [fichier ...]
+.br
+.B eview
+.SH DESCRIPTION
+.B eVim
+lance
+.B Vim
+et configure ses options afin qu'il se comporte comme un éditeur sans mode.
+Cela reste Vim, mais vous pouvez l'utiliser comme un éditeur « cliquer-taper ».
+Cela ressemble beaucoup à l'édition avec Notepad sur MS-Windows.
+.B eVim
+ne fonctionne qu'avec l'interface graphique, qui est nécessaire pour permettre
+l'utilisation des menus et de la barre d'outils.
+.PP
+Il n'est utile qu'aux personnes qui ne parviennent vraiment pas à utiliser Vim
+de façon traditionnelle. L'édition est alors bien moins efficace.
+.PP
+.B eview
+fait la même chose, mais démarre Vim en mode Lecture-seule.
+Cela revient à lancer evim \-R.
+.PP
+Voir vim(1) pour davantage d'informations sur Vim, les options, etc.
+.PP
+L'option 'insertmode' est activée pour permettre de taper directement du texte.
+.br
+Les mappages sont configurés pour que Copier et Coller fonctionnent avec les
+raccourcis habituels de MS-Windows. CTRL-X coupe le texte, CTRL-C copie le
+texte et CTRL-V colle le texte.
+Vous pouvez utiliser CTRL-Q pour obtenir la fonction originale de CTRL-V.
+.SH OPTIONS
+Voir vim(1).
+.SH FICHIERS
+.TP 15
+/usr/local/lib/vim/evim.vim
+Le script chargé pour initialiser eVim.
+.SH AUSSI CONNU SOUS
+Également connu sous le nom « Vim pour gumbies » [N.D.T. : Flying Circus...].
+Quand vous utilisez eVim, vous êtes censé prendre un mouchoir de poche,
+faire un noeud à chaque coin et le porter sur votre tête.
+.SH VOIR AUSSI
+vim(1)
+.SH AUTEUR
+La majeure partie de
+.B Vim
+a été écrite par Bram Moolenaar, avec l'aide de nombreux autres contributeurs.
+Voir le menu Aide/Remerciements ou ":help credits" dans
+.B Vim.
+.SH TRADUCTION
+Cette page de manuel a été traduite David Blanchet.
+<david.blanchet@free.fr> 2005-03-26.

runtime/doc/evim-it.1

@@ -25,7 +25,7 @@ maniera usuale.
 La modifica file sar<61> molto meno efficiente.
 .PP
 .B eview
-come sopra, ma parte in modalit<69> "Sola Lettura".  Funziona come evim -R.
+come sopra, ma parte in modalit<69> "Sola Lettura".  Funziona come evim \-R.
 .PP
 Vedere vim(1) per dettagli riguardo a Vim, opzioni, etc.
 .PP

runtime/doc/evim-it.UTF-8.1

@@ -0,0 +1,54 @@
+.TH EVIM 1 "16 febbraio 2002 "
+.SH NOME
+evim \- Vim "facile", Vim impostato in modo da poter essere usato
+facilmente per modificare file, anche da chi non abbia familiarità
+con i comandi.
+.SH SINTASSI
+.br
+.B evim
+[opzioni] [file ..]
+.br
+.B eview
+.SH DESCRIZIONE
+.B evim
+Inizia
+.B Vim
+e imposta le opzioni per farlo comportare come un editore "modeless".
+State sempre usando Vim, ma come un editore "posizionati-e-clicca".
+Simile all'uso di Notepad in MS-Windows.
+.B evim
+richiede la presenza della GUI, per avere a disposizione menu e barra
+strumenti.
+.PP
+Da usarsi solo da parte di chi non è in grado di lavorare con Vim nella
+maniera usuale.
+La modifica file sarà molto meno efficiente.
+.PP
+.B eview
+come sopra, ma parte in modalità "Sola Lettura".  Funziona come evim \-R.
+.PP
+Vedere vim(1) per dettagli riguardo a Vim, opzioni, etc.
+.PP
+L'opzione 'insertmode' è impostata per poter immettere del testo direttamente.
+.br
+Sono definite delle mappature che consentono di usare COPIA e INCOLLA con i
+familiari tasti usati sotto MS-Windows.
+CTRL-X taglia testo, CTRL-C copia testo e CTRL-V incolla testo.
+Usate CTRL-Q per ottenere quello chs si ottierrebbe con CTRL-V in Vim nativo.
+.SH OPZIONI
+Vedere vim(1).
+.SH FILE
+.TP 15
+/usr/local/lib/vim/evim.vim
+Lo script caricato per inizializzare eVim.
+.SH NAC [NOTO ANCHE COME]
+Noto Anche Come "Vim per semplici".
+Quando usate evim si suppone che prendiate un fazzoletto,
+facciate un nodo ad ogni angolo e ve lo mettiate in testa.
+.SH VEDERE ANCHE
+vim(1)
+.SH AUTORE
+Buona parte di
+.B Vim
+è stato scritto da Bram Moolenaar, con molto aiuto da altri.
+Vedere il Menu "Aiuto/Crediti".

runtime/doc/evim-ru.1

@@ -0,0 +1,59 @@
+.TH EVIM 1 "2002 February 16"
+.SH <EFBFBD><EFBFBD><EFBFBD>
+evim \- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Vim, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Vim <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+.SH <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+.br
+.B evim
+[<5B><><EFBFBD><EFBFBD><EFBFBD>] [<5B><><EFBFBD><EFBFBD> ..]
+.br
+.B eview
+.SH <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+.B evim
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+.B Vim
+<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Vim <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+Notepad <20><> MS-Windows.
+.B eVim
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
+.PP
+<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD>, <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>-<2D><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> Vim <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Vim.
+.PP
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+.B eview
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>". <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 
+evim \-R.
+.PP
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> Vim, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20>.<2E>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 
+vim(1).
+.PP
+<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+.B evim
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> 'insertmode', <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
+.br
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> MS-Windows
+<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. CTRL-X <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, CTRL-C <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> CTRL-V <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> CTRL-V, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> CTRL-Q.
+.SH <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>. vim(1).
+.SH <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+.TP 15
+/usr/local/lib/vim/evim.vim
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> eVim.
+.SH AKA
+eVim <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> "Vim <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>".
+<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
+.SH <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+vim(1)
+.SH <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>
+.B Vim
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Bram Moolenaar), <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>. <20><>. <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.

runtime/doc/evim-ru.UTF-8.1

@@ -0,0 +1,59 @@
+.TH EVIM 1 "2002 February 16"
+.SH ИМЯ
+evim \- простой Vim, позволяет редактировать файл с помощью Vim в безрежимном режиме
+.SH КОМАНДНАЯ СТРОКА
+.br
+.B evim
+[ключи] [файл ..]
+.br
+.B eview
+.SH ОПИСАНИЕ
+Команда
+.B evim
+запускает
+.B Vim
+и настраивает ряд опций таким образом, что он начинает вести себя
+как обычный безрежимный редактор. В этом режиме Vim напоминает
+Notepad из MS-Windows.
+.B eVim
+всегда запускается с поддержкой графического интерфейса, чтобы обеспечить
+использование меню и инструментальной панели.
+.PP
+Эта команда создана для тех, кто по каким-то причинам не в состоянии 
+работать с Vim в обычном режиме. Редактирование файлов при этом происходит
+гораздо менее эффективно, чем при использовании обычного Vim.
+.PP
+Команда
+.B eview
+выполняет почти ту же самую задачу, но файл открывается в режиме "только
+для чтения". Использование этой команды полностью идентично использованию 
+evim \-R.
+.PP
+Подробнее о Vim, ключах запуска и т.п. смотрите на странице справочника 
+vim(1).
+.PP
+При использовании
+.B evim
+включается опция 'insertmode', что позволяет вводить текст напрямую.
+.br
+Кроме того, настраиваются привязки, позволяющие использовать кнопки MS-Windows
+для выполнения команд копирования и вклейки. CTRL-X используется для вырезания 
+текста, CTRL-C для копирования и CTRL-V для вклейки. Чтобы воспользоваться
+изначальным значением кнопки CTRL-V, используйте CTRL-Q.
+.SH ПАРАМЕТРЫ ЗАПУСКА
+См. vim(1).
+.SH ФАЙЛЫ
+.TP 15
+/usr/local/lib/vim/evim.vim
+Сценарий, который загружается для инициализации eVim.
+.SH AKA
+eVim также известен как "Vim для чайников".
+Для наилучшего эффекта рекомендуется во время использования повязать
+на голове платок, предварительно завязав на каждом конце по узелку.
+.SH СМОТРИ ТАКЖЕ
+vim(1)
+.SH АВТОРЫ
+Большая часть
+.B Vim
+создана Брамом Мооленааром (Bram Moolenaar), которому помогает огромное 
+количество людей. См. меню Справка/Благодарности.

runtime/doc/evim.1

@@ -21,7 +21,7 @@ Only to be used for people who really can't work with Vim in the normal way.
 Editing will be much less efficient.
 .PP
 .B eview
-is the same, but starts in read-only mode.  It works just like evim -R.
+is the same, but starts in read-only mode.  It works just like evim \-R.
 .PP
 See vim(1) for details about Vim, options, etc.
 .PP

runtime/doc/farsi.txt

@@ -1,4 +1,4 @@
-*farsi.txt*     For Vim version 7.0aa.  Last change: 2004 Jun 16
+*farsi.txt*     For Vim version 7.0aa.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Mortaza Ghassab Shiran
@@ -42,7 +42,7 @@ o  Changing keyboard mapping and reverse insert modes using a single
 o  Backing from reverse insert mode to the correct place in the file
    (if possible).
 
-o  While in Farsi mode, numbers are entered from left to right. Upon entering
+o  While in Farsi mode, numbers are entered from left to right.  Upon entering
    a none number character, that character will be inserted just into the
    left of the last number.
 
@@ -54,8 +54,8 @@ o  Farsi keymapping on the command line in reverse insert mode.
 
 o  Toggling between left-to-right and right-to-left via F8 function key.
 
-o  Toggling between Farsi ISIR-3342 standard encoding and VIM Farsi via F9
-   function key. Since this makes sense only for the text written in
+o  Toggling between Farsi ISIR-3342 standard encoding and Vim Farsi via F9
+   function key.  Since this makes sense only for the text written in
    right-to-left mode, this function is also supported only in right-to-left
    mode.
 
@@ -77,8 +77,8 @@ Font Installation
 
 o  Installation of fonts for MS Window systems (NT/95/98)
 
-   From 'Control Panel' folder, start the 'Fonts' program. Then from 'file'
-   menu item select 'Install New Fonts ...'. Browse and select the
+   From 'Control Panel' folder, start the 'Fonts' program.  Then from 'file'
+   menu item select 'Install New Fonts ...'.  Browse and select the
    'far-a01.fon', then follow the installation guide.
    NOTE: several people have reported that this does not work.  The solution
    is unknown.
@@ -104,19 +104,19 @@ o  Installation of fonts for X Window systems (SunOS)
 o  Installation of ASCII screen fonts (Unix/Linux)
 
    For Linux system, copy the far-a01.f16 fonts into /usr/lib/kbd/consolefonts
-   directory and execute the setfont program as "setfont far-a01.f16". For
+   directory and execute the setfont program as "setfont far-a01.f16".  For
    other systems (e.g. SCO Unix), please refer to the fonts installation
    section of your system administration manuals.
 
 o  Installation of ASCII screen fonts (DOS)
 
-   After system power on, prior to the first use of VIM, upload the Farsi
+   After system power on, prior to the first use of Vim, upload the Farsi
    fonts by executing the far-a01.com font uploading program.
 
 
 Usage
 -----
-Prior to starting VIM, the environment in which VIM can run in Farsi mode,
+Prior to starting Vim, the environment in which Vim can run in Farsi mode,
 must be set.  In addition to installation of Farsi fonts, following points
 refer to some of the system environments, which you may need to set:
 Key code mapping, loading graphic card in ASCII screen mode, setting the IO
@@ -124,26 +124,26 @@ driver in 8 bit clean mode ... .
 
 o  Setting the Farsi fonts
 
-   +  For VIM GUI set the 'guifont' to far-a01. This is done by entering
-      ':set guifont=far-a01' in the VIM window.
+   +  For Vim GUI set the 'guifont' to far-a01.  This is done by entering
+      ':set guifont=far-a01' in the Vim window.
 
-      You can have 'guifont' set to far-a01 by VIM during the VIM startup
+      You can have 'guifont' set to far-a01 by Vim during the Vim startup
       by appending the ':set guifont=far-a01' into your .vimrc file
       (in case of NT/95/98 platforms _vimrc).
 
-      Under the X Window environment, you can also start the VIM with
+      Under the X Window environment, you can also start Vim with the
       '-fn far-a01' option.
 
-   +  For the VIM within a xterm, start a xterm with the Farsi fonts (e.g.
-      kterm -fn far-a01). Then start the VIM inside the kterm.
+   +  For Vim within a xterm, start a xterm with the Farsi fonts (e.g.
+      kterm -fn far-a01).  Then start Vim inside the kterm.
 
-   +  For VIM under DOS, prior to the first usage of VIM, upload the Farsi
+   +  For Vim under DOS, prior to the first usage of Vim, upload the Farsi
       fonts by executing the far-a01.com fonts uploading program.
 
 o  Farsi Keymapping Activation
 
    To activate the Farsi keymapping, set either 'altkeymap' or 'fkmap'.
-   This is done by entering ':set akm' or ':set fk' in the VIM window.
+   This is done by entering ':set akm' or ':set fk' in the Vim window.
    You can have 'altkeymap' or 'fkmap' set as default by appending ':set akm'
    or ':set fk' in your .vimrc file or _vimrc in case of NT/95/98 platforms.
 
@@ -152,24 +152,24 @@ o  Farsi Keymapping Activation
 
 o  right-to-left Farsi Mode
 
-   By default VIM starts in Left-to-right mode. Following are ways to change
+   By default Vim starts in Left-to-right mode.  Following are ways to change
    the window orientation:
 
-   + Start the VIM with -F option (e.g. vim -F ... ).
+   + Start Vim with the -F option (e.g. vim -F ...).
 
-   + Use F8 function key to toggle between left-to-right and right-to-left.
+   + Use the F8 function key to toggle between left-to-right and right-to-left.
 
    + While in Left-to-right mode, enter 'set rl' in the command line ('rl' is
      the abbreviation for rightleft).
 
-   + Put the 'set rl' line in your '.vimrc' file to start the  VIM in
+   + Put the 'set rl' line in your '.vimrc' file to start Vim in
      right-to-left mode permanently.
 
 Encoding
 --------
 
-The letter encoding used is the VIM extended ISIR-3342 standard with a built
-in function to convert between VIM extended ISIR-3342 and ISIR-3342 standard.
+The letter encoding used is the Vim extended ISIR-3342 standard with a built
+in function to convert between Vim extended ISIR-3342 and ISIR-3342 standard.
 
 For document portability reasons, the letter encoding is kept the same across
 different platforms (i.e. UNIX's, NT/95/98, MS DOS, ...).
@@ -183,11 +183,11 @@ o  Keyboard
    +  CTRL-_ moves the cursor to the end of the typed text in edit mode.
 
    +  CTRL-_ in command mode only toggles keyboard mapping between Farsi(akm)/
-      Latin. The Farsi text is then entered in reverse insert mode.
+      Latin.  The Farsi text is then entered in reverse insert mode.
 
    +  F8 - Toggles between left-to-right and right-to-left.
 
-   +  F9 - Toggles the encoding between ISIR-3342 standard and VIM extended
+   +  F9 - Toggles the encoding between ISIR-3342 standard and Vim extended
       ISIR-3342 (supported only in right-to-left mode).
 
    +  Keyboard mapping is based on the Iranian ISIRI-2901 standard.
@@ -231,28 +231,28 @@ o  In insert/replace mode and fkmap (Farsi mode) set, CTRL-B is not
    supported.
 
 o  If you change the character mapping between Latin/Farsi, the redo buffer
-   will be reset (emptied). That is, redo is valid and will function (using
+   will be reset (emptied).  That is, redo is valid and will function (using
    '.') only within the mode you are in.
 
 o  While numbers are entered in Farsi mode, the redo buffer will be reset
-   (emptied). That is, you can not redo the last changes (using '.') after
+   (emptied).  That is, you cannot redo the last changes (using '.') after
    entering numbers.
 
-o  While in left-to-right and Farsi mode set, CTRL-R is not supported.
+o  While in left-to-right mode and Farsi mode set, CTRL-R is not supported.
 
 o  While in right-to-left mode, the search on 'Latin' pattern does not work,
    except if you enter the Latin search pattern in reverse.
 
-o  In the command mode, there is no support for entering the numbers from left
-   to right and also for the sake of the flexibility the keymapping logic is
+o  In command mode there is no support for entering numbers from left
+   to right and also for the sake of flexibility the keymapping logic is
    restricted.
 
-o  Under X Window environment, if you want to run the VIM within a xterm
+o  Under the X Window environment, if you want to run Vim within a xterm
    terminal emulator and Farsi mode set, you need to have an ANSI compatible
-   xterm terminal emulator. This is because the letter codes above 128 decimal
+   xterm terminal emulator.  This is because the letter codes above 128 decimal
    have certain meanings in the standard xterm terminal emulator.
 
-   Note: Under X Window environment, VIM GUI works fine in Farsi mode.
+   Note: Under X Window environment, Vim GUI works fine in Farsi mode.
 	 This eliminates the need of any xterm terminal emulator.
 
 
@@ -261,7 +261,7 @@ Bugs
 While in insert/replace and Farsi mode set, if you repeatedly change the
 cursor position (via cursor movement) and enter new text and then try to undo
 the last change, the undo will lag one change behind.  But as you continue to
-undo, you will reach the original line of text. You can also use U to undo all
+undo, you will reach the original line of text.  You can also use U to undo all
 changes made in the current line.
 
 For more information about the bugs refer to rileft.txt.

runtime/doc/filetype.txt

@@ -1,4 +1,4 @@
-*filetype.txt*  For Vim version 7.0aa.  Last change: 2004 Aug 31
+*filetype.txt*  For Vim version 7.0aa.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -382,7 +382,7 @@ ways to change this:
 
 CHANGELOG						*changelog-plugin*
 
-Allows for easy entrance of Changelog entries in Changelog files. There are
+Allows for easy entrance of Changelog entries in Changelog files.  There are
 some commands, mappings, and variables worth exploring:
 
 Options:
@@ -462,7 +462,7 @@ g:changelog_date_entry_search
 The Changelog entries are inserted where they add the least amount of text.
 After figuring out the current date and user, the file is searched for an
 entry beginning with the current date and user and if found adds another item
-under it. If not found, a new entry and item is prepended to the beginning of
+under it.  If not found, a new entry and item is prepended to the beginning of
 the Changelog.
 
 
@@ -474,7 +474,7 @@ Options:
 'textwidth'	is set to 72 for fixed source format as required by the
 		Fortran standards and to 80 for free source format.
 'formatoptions' is set to break code and comment lines and to preserve long
-		lines. You can format comments with |gq|.
+		lines.  You can format comments with |gq|.
 For further discussion of fortran_have_tabs and the method used for the
 detection of source format see |fortran-syntax|.
 

runtime/doc/fold.txt

@@ -1,4 +1,4 @@
-*fold.txt*      For Vim version 7.0aa.  Last change: 2004 Dec 29
+*fold.txt*      For Vim version 7.0aa.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -330,7 +330,7 @@ zC		Close all folds under the cursor recursively.  Folds that
 		'foldenable' will be set.
 
 							*za*
-za		When on a closed fold: open it. When folds are nested, you
+za		When on a closed fold: open it.  When folds are nested, you
 		may have to use "za" several times.  When a count is given,
 		that many closed folds are opened.
 		When on an open fold: close it and set 'foldenable'.  This

runtime/doc/gui.txt

@@ -1,4 +1,4 @@
-*gui.txt*       For Vim version 7.0aa.  Last change: 2004 Dec 29
+*gui.txt*       For Vim version 7.0aa.  Last change: 2005 Jul 07
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -25,8 +25,8 @@ Other GUI documentation:
 
 First you must make sure you actually have a version of Vim with the GUI code
 included.  You can check this with the ":version" command, it should include
-"+GUI_Athena", "+GUI_BeOS", "+GUI_GTK", "+GUI_KDE", "+GUI_Motif" or
-"MS-Windows ... bit GUI version".
+"+GUI_Athena", "+GUI_GTK", "+GUI_KDE", "+GUI_Motif" or "MS-Windows ... bit
+GUI version".
 
 How to start the GUI depends on the system used.  Mostly you can run the
 GUI version of Vim with:
@@ -144,7 +144,7 @@ window Vim is running in with this command: >
 ==============================================================================
 2. Scrollbars						*gui-scrollbars*
 
-There are vertical scrollbars and a horizontal scrollbars.  You may
+There are vertical scrollbars and a horizontal scrollbar.  You may
 configure which ones appear with the 'guioptions' option.
 
 The interface looks like this (with ":set guioptions=mlrb"):
@@ -184,7 +184,7 @@ When the scrollbar is dragged all the way down, the last line of the file
 will appear in the top of the window.
 
 If a window is shrunk to zero height (by the growth of another window) its
-scrollbar disappears. It reappears when the window is restored.
+scrollbar disappears.  It reappears when the window is restored.
 
 If a window is vertically split, it will get a scrollbar when it is the
 current window and when, taking the middle of the current window and drawing a
@@ -203,11 +203,11 @@ scrolled as far as possible left and right.  The cursor is moved when
 necessary, it must remain on a visible character (unless 'virtualedit' is
 set).
 
-Computing the length of the longest visible takes quite a bit of computation,
-and it has to be done every time something changes.  If this takes too much
-time or you don't like the cursor jumping to another line, include the 'h'
-flag in 'guioptions'.  Then the scrolling is limited by the text of the
-current cursor line.
+Computing the length of the longest visible line takes quite a bit of
+computation, and it has to be done every time something changes.  If this
+takes too much time or you don't like the cursor jumping to another line,
+include the 'h' flag in 'guioptions'.  Then the scrolling is limited by the
+text of the current cursor line.
 
 							*athena-intellimouse*
 If you have an Intellimouse and an X server that supports using the wheel,
@@ -408,7 +408,7 @@ used - you should read whichever of these is appropriate now).
 							*clipboard*
 There is a special register for storing this selection, it is the "*
 register.  Nothing is put in here unless the information about what text is
-selected is about to change (eg with a left mouse click somewhere), or when
+selected is about to change (e.g. with a left mouse click somewhere), or when
 another application wants to paste the selected text.  Then the text is put
 in the "* register.  For example, to cut a line and make it the current
 selection/put it on the clipboard: >
@@ -504,7 +504,7 @@ floating menus that do not appear on the main menu bar.
 				*E328* *E329* *E337*
 To create a new menu item, use the ":menu" commands.  They are mostly like
 the ":map" set of commands but the first argument is a menu item name, given
-as a path of menus and submenus with a '.' between them. eg: >
+as a path of menus and submenus with a '.' between them, e.g.: >
 
    :menu File.Save  :w<CR>
    :inoremenu File.Save  <C-O>:w<CR>
@@ -648,9 +648,9 @@ 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 default
-toolbar is setup in menu.vim.
-The display of the toolbar is controlled by the 'guioptions' letter 'T'. You
+KDE 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.
 The appearance is controlled by the 'toolbar' option.  You can chose between
 an image, text or both.
@@ -661,7 +661,7 @@ level.  Vim interprets the items in this menu as follows:
 1)  If an "icon=" argument was specified, the file with this name is used.
     The file can either be specified with the full path or with the base name.
     In the last case it is searched for in the "bitmaps" directory in
-    'runtimepath', like in point 3).  Examples: >
+    'runtimepath', like in point 3.  Examples: >
 	:amenu icon=/usr/local/pixmaps/foo_icon.xpm ToolBar.Foo :echo "Foo"<CR>
 	:amenu icon=FooIcon ToolBar.Foo :echo "Foo"<CR>
 <   Note that in the first case the extension is included, while in the second
@@ -671,7 +671,7 @@ level.  Vim interprets the items in this menu as follows:
     A menu priority must come _after_ the icon argument: >
 	:amenu icon=foo 1.42 ToolBar.Foo :echo "42!"<CR>
 2)  An item called 'BuiltIn##', where ## is a number, is taken as number ## of
-    the built-in bitmaps available in Vim. Currently there are 31 numbered
+    the built-in bitmaps available in Vim.  Currently there are 31 numbered
     from 0 to 30 which cover most common editing operations |builtin-tools|. >
 	:amenu ToolBar.BuiltIn22 :call SearchNext("back")<CR>
 3)  An item with another name is first searched for in the directory
@@ -747,7 +747,7 @@ To see what an existing menu is mapped to, use just one argument after the
 menu commands (just like you would with the ":map" commands).  If the menu
 specified is a submenu, then all menus under that hierarchy will be shown.
 If no argument is given after :menu at all, then ALL menu items are shown
-for the appropriate mode (eg, Command-line mode for :cmenu).
+for the appropriate mode (e.g., Command-line mode for :cmenu).
 
 Special characters in the list, just before the rhs:
 *	The menu was defined with "nore" to disallow remapping.
@@ -856,7 +856,7 @@ See section |42.4| in the user manual.
 
 When a tip is defined for a menu item, it appears in the command-line area
 when the mouse is over that item, much like a standard Windows menu hint in
-the status bar. (Except when Vim is in Command-line mode, when of course
+the status bar.  (Except when Vim is in Command-line mode, when of course
 nothing is displayed.)
 When a tip is defined for a ToolBar item, it appears as a tooltip when the
 mouse pauses over that button, in the usual fashion.  Use the |hl-Tooltip|
@@ -870,7 +870,7 @@ The tip is defined like this: >
 And delete it with: >
 	:tunmenu MyMenu.Hello
 
-Tooltips are currently only supported for the X11 and Win32 GUI. However, they
+Tooltips are currently only supported for the X11 and Win32 GUI.  However, they
 should appear for the other gui platforms in the not too distant future.
 
 The ":tmenu" command works just like other menu commands, it uses the same
@@ -897,9 +897,13 @@ it behaves in a strange way.
 				appear on the menu-bar (see |hidden-menus|).
 				{only available for Win32 and GTK GUI}
 
+:popu[p]! {name}		Like above, but use the position of the mouse
+				pointer instead of the cursor.
+
 Example: >
 	:popup File
-will make the "File" menu (if there is one) appear at the text cursor. >
+will make the "File" menu (if there is one) appear at the text cursor (mouse
+pointer if ! was used). >
 
 	:amenu ]Toolbar.Make	:make<CR>
 	:popup ]Toolbar
@@ -920,7 +924,7 @@ This section describes other features which are related to the GUI.
   get "<Modifiers-Key>".
 
 - In the GUI, the modifiers SHIFT, CTRL, and ALT (or META) may be used within
-  mappings of special keys and mouse events.  eg: :map <M-LeftDrag> <LeftDrag>
+  mappings of special keys and mouse events.  E.g.: :map <M-LeftDrag> <LeftDrag>
 
 - In the GUI, several normal keys may have modifiers in mappings etc, these
   are <Space>, <Tab>, <NL>, <CR>, <Esc>.

runtime/doc/gui_w16.txt

@@ -1,4 +1,4 @@
-*gui_w16.txt*   For Vim version 7.0aa.  Last change: 2001 Sep 03
+*gui_w16.txt*   For Vim version 7.0aa.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -21,32 +21,32 @@ Other relevant documentation:
 
 {Vi does not have a Windows GUI}
 
-The Win16 version of Vim will run on Windows 3.1 or later. It has not been
+The Win16 version of Vim will run on Windows 3.1 or later.  It has not been
 tested on 3.0, it probably won't work without being recompiled and
-modified. (but you really should upgrade to 3.11 anyway. :)
+modified.  (But you really should upgrade to 3.11 anyway. :)
 
 In most respects it behaves identically to the Win32 GUI version, including
-having a flat-style toolbar(!). The chief differences:
+having a flat-style toolbar(!).  The chief differences:
 
 1) Bold/Italic text is not available, to speed up repaint/reduce resource
-   usage. (You can re-instate this by undefining MSWIN16_FASTTEXT.)
+   usage.  (You can re-instate this by undefining MSWIN16_FASTTEXT.)
 2) No tearoff menu emulation.
 3) No OLE interface.
-4) No long filename support (of course)
+4) No long filename support (of course).
 5) No tooltips on toolbar buttons - instead they produce command-line tips
    like menu items do.
-6) Line length limited to 32767 characters (like 16-bit DOS version)
+6) Line length limited to 32767 characters (like 16-bit DOS version).
 
 
 ==============================================================================
 1. Starting the GUI					*win16-start*
 
 The Win16 GUI version of Vim will always start the GUI, no matter how you
-start it or what it's called. There is no 'console' version as such, but you
+start it or what it's called.  There is no 'console' version as such, but you
 can use one of the DOS versions in a DOS box.
 
 The Win16 GUI has an extra menu item:  "Window/Select Font".  It brings up the
-standard Windows font selector. Note that bold and italic fonts are not
+standard Windows font selector.  Note that bold and italic fonts are not
 supported in an attempt to maximize GDI drawing speed.
 
 Setting the menu height doesn't work for the Win16 GUI.
@@ -82,7 +82,7 @@ The clipboard works in the same way as the Win32 version: see |gui-clipboard|.
 4. Shell Commands					*win16-shell*
 
 Vim spawns a DOS window for external commands, to make it possible to run any
-DOS command. The window uses the _default.pif settings.
+DOS command.  The window uses the _default.pif settings.
 
 							*win16-!start*
 Normally, Vim waits for a command to complete before continuing (this makes
@@ -135,7 +135,7 @@ as the traditional interface shared with the console version.
 6.1 Dialogs
 
 The dialogs displayed by the "confirm" family (i.e. the 'confirm' option,
-|:confirm| command and |confirm()| function are GUI-based rather than the
+|:confirm| command and |confirm()| function) are GUI-based rather than the
 console-based ones used by other versions.  There is no option to change this.
 
 
@@ -157,7 +157,7 @@ PrintFile.  See $VIMRUNTIME/menu.vim for how it works by default.
 Using this should also work: >
 	:w >>prn
 
-Vim supports a number of standard MS Windows features. Some of these are
+Vim supports a number of standard MS Windows features.  Some of these are
 detailed elsewhere: see |'mouse'|, |win32-hidden-menus|.
 Also see |:simalt|
 
@@ -176,11 +176,11 @@ names with any Ex command.
 
 							*win16-truetype*
 It is recommended that you use a raster font and not a TrueType
-fixed-pitch font. e.g. Use Courier, not Courier New. This is not just
+fixed-pitch font.  E.g. use Courier, not Courier New.  This is not just
 to use less resources but because there are subtle bugs in the
-handling of fixed-pitch TrueType in Win3.1x. In particular, when you move
+handling of fixed-pitch TrueType in Win3.1x.  In particular, when you move
 a block cursor over a pipe character '|', the cursor is drawn in the wrong
-size and bits get left behind. This is a bug in the Win3.1x GDI, it doesn't
+size and bits get left behind.  This is a bug in the Win3.1x GDI, it doesn't
 happen if you run the exe under 95/NT.
 
  vim:tw=78:sw=4:ts=8:ft=help:norl:

runtime/doc/gui_w32.txt

@@ -1,4 +1,4 @@
-*gui_w32.txt*   For Vim version 7.0aa.  Last change: 2005 Jan 07
+*gui_w32.txt*   For Vim version 7.0aa.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -58,7 +58,7 @@ of Windows 3.1 or 3.11.  See |win32s|.
 
 To set Vim as the default editor for a file type:
 1. Start a Windows Explorer
-2. Chose View/Options -> File Types
+2. Choose View/Options -> File Types
 3. Select the path to gvim for every file type that you want to use it for.
    (you can also use three spaces in the file type field, for files without an
    extension).
@@ -235,7 +235,7 @@ cancel an operation.  Use CTRL-Break for that.
 
 CTRL-Z is used for undo.  This means you can't suspend Vim.
 
-							*CTRL-V-alternative*
+						*CTRL-V-alternative* *CTRL-Q*
 Since CTRL-V is used to paste, you can't use it to start a blockwise Visual
 selection.  You can use CTRL-Q instead.  You can also use CTRL-Q in Insert
 mode and Command-line mode to get the old meaning of CTRL-V.  But CTRL-Q
@@ -262,8 +262,8 @@ question if you really want to kill the application, Vim may be killed too!
 
 In Windows 95, the window in which the commands are executed is always 25x80
 characters, to be as DOS compatible as possible (this matters!).  The default
-system font is used. On NT, the window will be the default you have set up for
-"Console" in Control Panel. On Win32s, the properties of the DOS box are
+system font is used.  On NT, the window will be the default you have set up for
+"Console" in Control Panel.  On Win32s, the properties of the DOS box are
 determined by _default.pif in the windows directory.
 
 							*msdos-mode*
@@ -283,7 +283,7 @@ sense for most shell commands which produce output for Vim to use).  If you
 want Vim to start a program and return immediately, you can use the following
 syntax on W95 & NT: >
 	:!start {command}
-On Win32s, you will have to go to another window instead. Don't forget that
+On Win32s, you will have to go to another window instead.  Don't forget that
 you must tell Windows 3.1x to keep executing a DOS command in the background
 while you switch back to Vim.
 
@@ -295,7 +295,7 @@ On Win32, the normal DOS colors can be used.  See |dos-colors|.
 Additionally the system configured colors can also be used.  These are known
 by the names Sys_XXX, where XXX is the appropriate system color name, from the
 following list (see the Win32 documentation for full descriptions).  Case is
-ignored. note: On Win32s not all of these colors are supported.
+ignored.  Note: On Win32s not all of these colors are supported.
 
 Sys_3DDKShadow		Sys_3DFace			Sys_BTNFace
 Sys_3DHilight		Sys_3DHighlight			Sys_BTNHilight
@@ -366,7 +366,7 @@ without having to go to the menu bar each time.
 This is most useful if you find yourself using a command buried in a sub-menu
 over and over again.
 The tearoff menus can be positioned where you like, and always stay just above
-the Main Vim window. You can get rid of them by closing them as usual; they
+the Main Vim window.  You can get rid of them by closing them as usual; they
 also of course close when you exit Vim.
 
 							*:tearoff* *:te*
@@ -400,7 +400,7 @@ The rules are:
       b) Parameters are separated by white space.
       c) A parameter can be enclosed in double quotes to include white space.
       d) A sequence of zero or more backslashes (\) and a double quote (")
-	is special. The effective number of backslashes is halved, rounded
+	is special.  The effective number of backslashes is halved, rounded
 	down.  An even number of backslashes reverses the acceptability of
 	spaces and tabs, an odd number of backslashes produces a literal
 	double quote.
@@ -429,7 +429,7 @@ The "File/Print" menu prints the text with syntax highlighting, see
 printer installed this should also work: >
 	:w >>prn
 
-Vim supports a number of standard MS Windows features. Some of these are
+Vim supports a number of standard MS Windows features.  Some of these are
 detailed elsewhere: see |'mouse'|, |win32-hidden-menus|.
 
 							*drag-n-drop-win32*
@@ -441,7 +441,7 @@ be opened as normal.  See |drag-n-drop|.
 			{not in Vi} {only for Win32 versions}
 
 Normally, Vim takes control of all Alt-<Key> combinations, to increase the
-number of possible mappings. This clashes with the standard use of Alt as the
+number of possible mappings.  This clashes with the standard use of Alt as the
 key for accessing menus.
 The quick way of getting standard behavior is to set the 'winaltkeys' option
 to "yes".  This however prevents you from mapping Alt keys at all.
@@ -449,18 +449,18 @@ Another way is to set 'winaltkeys' to "menu".  Menu shortcut keys are then
 handled by windows, other ALT keys can be mapped.  This doesn't allow a
 dependency on the current state though.
 To get round this, the :simalt command allows Vim (when 'winaltkeys' is not
-"yes") to fake a Windows-style Alt keypress. You can use this to map Alt key
+"yes") to fake a Windows-style Alt keypress.  You can use this to map Alt key
 combinations (or anything else for that matter) to produce standard Windows
-actions. Here are some examples: >
+actions.  Here are some examples: >
 
 	:map <M-f> :simalt f<CR>
 This makes Alt-F pop down the 'File' menu (with the stock Menu.vim) by
 simulating the keystrokes Alt, F. >
 	:map <M-Space> :simalt ~<CR>
-This maps Alt-Space to pop down the system menu for the Vim window. Note that
+This maps Alt-Space to pop down the system menu for the Vim window.  Note that
 ~ is used by simalt to represent the <Space> character. >
 	:map <C-n> :simalt ~n<CR>
-Maps Control-N to produce the keys Alt-Space followed by N. This minimizes the
+Maps Control-N to produce the keys Alt-Space followed by N.  This minimizes the
 Vim window via the system menu.
 
 						*intellimouse-wheel-problems*

runtime/doc/gui_x11.txt

@@ -1,4 +1,4 @@
-*gui_x11.txt*   For Vim version 7.0aa.  Last change: 2004 Dec 29
+*gui_x11.txt*   For Vim version 7.0aa.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -113,7 +113,7 @@ same.  Note that some fonts that have the same point size don't have the same
 pixel size!  Additionally, the positioning of the fonts must be the same
 (ascent and descent).  You can check this with "xlsfonts -l {fontname}".
 
-If any of these things are also set with Vim commands, eg with
+If any of these things are also set with Vim commands, e.g. with
 ":set guifont=Screen15", then this will override the X resources (currently
 'guifont' is the only option that is supported).
 

runtime/doc/hangulin.txt

@@ -1,4 +1,4 @@
-*hangulin.txt*  For Vim version 7.0aa.  Last change: 2001 Sep 03
+*hangulin.txt*  For Vim version 7.0aa.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Chi-Deok Hwang and Sung-Hyun Nam
@@ -7,17 +7,17 @@ Introduction					*hangul*
 ------------
 It is to input hangul, the Korean language, with VIM GUI version.
 If you have a XIM program, you can use another |+xim| feature.
-Basically, it is for whom has no XIM program.
+Basically, it is for anybody who has no XIM program.
 
 Compile
 -------
-Next is a basic option. You can add any other configure option. >
+Next is a basic option.  You can add any other configure option. >
 
    ./configure --with-x --enable-multibyte --enable-fontset --enable-hangulinput
 
-And you should check the feature.h. If |+hangul_input| feature is enabled
+And you should check feature.h.  If |+hangul_input| feature is enabled
 by configure, you can select more options such as keyboard type, 2 bulsik
-or 3 bulsik. You can find keywords like next in there. >
+or 3 bulsik.  You can find keywords like next in there. >
 
 	#define HANGUL_DEFAULT_KEYBOARD 2
 	#define ESC_CHG_TO_ENG_MODE
@@ -38,7 +38,7 @@ You should add nexts to your global vimrc ($HOME/.vimrc). >
 Keyboard
 --------
 You can change keyboard type (2 bulsik or 3 bulsik) using VIM_KEYBOARD
-or HANGUL_KEYBOARD_TYPE environment variables. For sh, just do (2 bulsik): >
+or HANGUL_KEYBOARD_TYPE environment variables.  For sh, just do (2 bulsik): >
 
     export VIM_KEYBOARD="2"
 or >
@@ -67,9 +67,9 @@ $HOME/.gvimrc: >
 
 attention! the , (comma) or ; (semicolon)
 
-And there should be no ':set guifont'. If it exists, then Gvim ignores
-':set guifontset'. It means VIM runs without fontset supporting.
-So, you can see only English. Hangul does not be correctly displayed.
+And there should be no ':set guifont'.  If it exists, then Gvim ignores
+':set guifontset'.  It means VIM runs without fontset supporting.
+So, you can see only English.  Hangul does not be correctly displayed.
 
 After 'fontset' feature is enabled, VIM does not allow using 'font'.
 For example, if you use >
@@ -78,17 +78,17 @@ in your .gvimrc, then you should do for syntax >
    :hi Comment guifg=Cyan font=another_eng_font,another_your_font
 If you just do >
    :hi Comment font=another_eng_font
-then you can see a GOOD error message. Be careful!
+then you can see a GOOD error message.  Be careful!
 
 hangul_font width should be twice than english_font width.
 
 Unsupported Feature
 -------------------
-Johab font not yet supported. And I don't have any plan.
+Johab font not yet supported.  And I don't have any plan.
 If you really want to use johab font, you can use the
 hanguldraw.c in gau package.
 
-Hanja input not yet supported. And I don't have any plan.
+Hanja input not yet supported.  And I don't have any plan.
 If you really want to input hanja, just use VIM with hanterm.
 
 Bug or Comment

runtime/doc/help.txt

@@ -1,4 +1,4 @@
-*help.txt*	For Vim version 7.0aa.  Last change: 2004 Dec 30
+*help.txt*	For Vim version 7.0aa.  Last change: 2005 Mar 19
 
 			VIM - main help file
 									 k
@@ -122,6 +122,7 @@ Advanced editing ~
 |quickfix.txt|	commands for a quick edit-compile-fix cycle
 |windows.txt|	commands for using multiple windows and buffers
 |syntax.txt|	syntax highlighting
+|spell.txt|	spell checking
 |diff.txt|	working with two or three versions of the same file
 |autocmd.txt|	automatically executing commands on an event
 |filetype.txt|	settings done specifically for a type of file

runtime/doc/if_cscop.txt

@@ -1,4 +1,4 @@
-*if_cscop.txt*  For Vim version 7.0aa.  Last change: 2004 Oct 21
+*if_cscop.txt*  For Vim version 7.0aa.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Andy Kahn
@@ -239,12 +239,12 @@ started will have no effect!
 					    *cscopequickfix* *csqf* *E469*
 {not available when compiled without the |+quickfix| feature}
 'cscopequickfix' specifies whether to use quickfix window to show cscope
-results. This is a list of comma-separated values. Each item consists of
+results.  This is a list of comma-separated values. Each item consists of
 |cscope-find| command (s, g, d, c, t, e, f or i) and flag (+, - or 0).
 '+' indicates that results must be appended to quickfix window,
 '-' implies previous results clearance, '0' or command absence - don't use
-quickfix. Search is performed from start until first command occurrence.
-The default value is "" (don't use quickfix anyway). The following value
+quickfix.  Search is performed from start until first command occurrence.
+The default value is "" (don't use quickfix anyway).  The following value
 seems to be useful: >
 	:set cscopequickfix=s-,c-,d-,i-,t-,e-
 <
@@ -472,7 +472,7 @@ cscope within Vim to him.
 							*cscope-win32*
 For a cscope version for Win32 see: http://iamphet.nm.ru/cscope/index.html
 
-Win32 support was added by Sergey Khorev <khorev@softlab.ru>. Contact him
-if you have Win32-specific issues.
+Win32 support was added by Sergey Khorev <sergey.khorev@gmail.com>.  Contact
+him if you have Win32-specific issues.
 
  vim:tw=78:ts=8:ft=help:norl:

runtime/doc/if_mzsch.txt

@@ -1,4 +1,4 @@
-*if_mzsch.txt*  For Vim version 7.0aa.  Last change: 2004 Jul 05
+*if_mzsch.txt*  For Vim version 7.0aa.  Last change: 2005 May 08
 
 
 		  VIM REFERENCE MANUAL    by Sergey Khorev
@@ -17,6 +17,7 @@ The MzScheme interface is available only if Vim was compiled with the
 |+mzscheme| feature.
 
 Based on the work of Brent Fulgham.
+Dynamic loading added by Sergey Khorev
 
 For downloading MzScheme and other info:
 	http://www.plt-scheme.org/software/mzscheme/
@@ -109,6 +110,9 @@ something like this in your .vimrc (EOFs should not have indentation): >
 <
 
 The global namespace just instantiated this module with the prefix "vimext:".
+							*mzscheme-sandbox*
+When executed in the |sandbox|, access to some filesystem and Vim interface
+procedures is restricted.
 
 ==============================================================================
 2. Examples						*mzscheme-examples*

runtime/doc/if_ole.txt

@@ -1,4 +1,4 @@
-*if_ole.txt*    For Vim version 7.0aa.  Last change: 2004 Dec 09
+*if_ole.txt*    For Vim version 7.0aa.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Paul Moore
@@ -22,7 +22,7 @@ An alternative is using the client-server communication |clientserver|.
 1. Activation						*ole-activation*
 
 Vim acts as an OLE automation server, accessible from any automation client,
-for example, Visual Basic, Python, or Perl. The Vim application "name" (its
+for example, Visual Basic, Python, or Perl.  The Vim application "name" (its
 "ProgID", in OLE terminology) is "Vim.Application".
 
 Hence, in order to start a Vim instance (or connect to an already running
@@ -41,8 +41,8 @@ instance), code similar to the following should be used:
 	$vim = new Win32::OLE 'Vim.Application';
 
 Vim does not support acting as a "hidden" OLE server, like some other OLE
-Automation servers. When a client starts up an instance of Vim, that instance
-is immediately visible. Simply closing the OLE connection to the Vim instance
+Automation servers.  When a client starts up an instance of Vim, that instance
+is immediately visible.  Simply closing the OLE connection to the Vim instance
 is not enough to shut down the Vim instance - it is necessary to explicitly
 execute a quit command (for example, :qa!, :wqa).
 
@@ -54,17 +54,17 @@ Vim exposes four methods for use by clients.
 							*ole-sendkeys*
 SendKeys(keys)		Execute a series of keys.
 
-This method takes a single parameter, which is a string of keystrokes. These
+This method takes a single parameter, which is a string of keystrokes.  These
 keystrokes are executed exactly as if they had been types in at the keyboard.
 Special keys can be given using their <..> names, as for the right hand side
-of a mapping. Note: Execution of the Ex "normal" command is not supported -
+of a mapping.  Note: Execution of the Ex "normal" command is not supported -
 see below |ole-normal|.
 
 Examples (Visual Basic syntax) >
 	Vim.SendKeys "ihello<Esc>"
 	Vim.SendKeys "ma1GV4jy`a"
 
-These examples assume that Vim starts in Normal mode. To force Normal mode,
+These examples assume that Vim starts in Normal mode.  To force Normal mode,
 start the key sequence with CTRL-\ CTRL-N as in >
 
 	Vim.SendKeys "<C-\><C-N>ihello<Esc>"
@@ -109,7 +109,7 @@ Example (Visual Basic syntax) >
 
 Due to the way Vim processes OLE Automation commands, combined with the method
 of implementation of the ex command :normal, it is not possible to execute the
-:normal command via OLE automation. Any attempt to do so will fail, probably
+:normal command via OLE automation.  Any attempt to do so will fail, probably
 harmlessly, although possibly in unpredictable ways.
 
 There is currently no practical way to trap this situation, and users must
@@ -118,7 +118,7 @@ simply be aware of the limitation.
 4. Registration					*ole-registration* *E243*
 
 Before Vim will act as an OLE server, it must be registered in the system
-registry. In order to do this, Vim should be run with a single parameter of
+registry.  In order to do this, Vim should be run with a single parameter of
 "-register".
 							*-register*  >
 	gvim -register
@@ -131,9 +131,9 @@ In some situations registering is not possible.  This happens when the
 registry is not writable.  If you run into this problem you need to run gvim
 as "Administrator".
 
-Once vim is registered, the application path is stored in the registry. Before
-moving, deleting, or upgrading Vim, the registry entries should be removed
-using the "-unregister" switch.
+Once vim is registered, the application path is stored in the registry.
+Before moving, deleting, or upgrading Vim, the registry entries should be
+removed using the "-unregister" switch.
 							*-unregister*  >
 	gvim -unregister
 

runtime/doc/if_perl.txt

@@ -1,4 +1,4 @@
-*if_perl.txt*   For Vim version 7.0aa.  Last change: 2004 Aug 30
+*if_perl.txt*   For Vim version 7.0aa.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Sven Verdoolaege
@@ -18,7 +18,7 @@ The Perl interface only works when Vim was compiled with the |+perl| feature.
 1. Editing Perl files					*perl-editing*
 
 Vim syntax highlighting supports Perl and POD files.  Vim assumes a file is
-Perl code if the filename has a .pl or .pm suffix. Vim also examines the first
+Perl code if the filename has a .pl or .pm suffix.  Vim also examines the first
 line of a file, regardless of the filename suffix, to check if a file is a
 Perl script (see scripts.vim in Vim's syntax directory).  Vim assumes a file
 is POD text if the filename has a .POD suffix.
@@ -50,7 +50,7 @@ http://www.perl.com/CPAN/ports/nt/Standard/x86/
 3. Using the Perl interface				*perl-using*
 
 							*:perl* *:pe*
-:pe[rl] {cmd}		Execute Perl command {cmd}. The current package
+:pe[rl] {cmd}		Execute Perl command {cmd}.  The current package
 			is "main".
 
 :pe[rl] << {endpattern}
@@ -84,7 +84,7 @@ Example vim script: >
 							*:perldo* *:perld*
 :[range]perld[o] {cmd}	Execute Perl command {cmd} for each line in the
 			[range], with $_ being set to the text of each line in
-			turn, without a trailing <EOL>. Setting $_ will change
+			turn, without a trailing <EOL>.  Setting $_ will change
 			the text, but note that it is not possible to add or
 			delete lines using this command.
 			The default for [range] is the whole file: "1,$".
@@ -211,7 +211,7 @@ Buffer->Count()		Returns the number of lines in the Buffer.
 							*perl-Get*
 Buffer->Get({lnum}, {lnum}?, ...)
 			Returns a text string of line {lnum} in the Buffer
-			for each {lnum} specified. An array can be passed
+			for each {lnum} specified.  An array can be passed
 			with a list of {lnum}'s specified.
 
 							*perl-Delete*

runtime/doc/if_pyth.txt

@@ -1,4 +1,4 @@
-*if_pyth.txt*   For Vim version 7.0aa.  Last change: 2004 Jul 25
+*if_pyth.txt*   For Vim version 7.0aa.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Paul Moore
@@ -85,7 +85,7 @@ just like in the Python interpreter.)
 2. The vim module					*python-vim*
 
 Python code gets all of its access to vim (with one exception - see
-|python-output| below) via the "vim" module. The vim module implements two
+|python-output| below) via the "vim" module.  The vim module implements two
 methods, three constants, and one error object.  You need to import the vim
 module before using it: >
 	:python import vim
@@ -113,7 +113,7 @@ Overview >
 Methods of the "vim" module
 
 vim.command(str)					*python-command*
-	Executes the vim (ex-mode) command str. Returns None.
+	Executes the vim (ex-mode) command str.  Returns None.
 	Examples: >
 	    :py vim.command("set tw=72")
 	    :py vim.command("%s/aaa/bbb/g")
@@ -130,7 +130,7 @@ vim.command(str)					*python-command*
 
 vim.eval(str)						*python-eval*
 	Evaluates the expression str using the vim internal expression
-	evaluator (see |expression|). Returns the expression result as a
+	evaluator (see |expression|).  Returns the expression result as a
 	string.
 	Examples: >
 	    :py text_width = vim.eval("&tw")
@@ -156,7 +156,7 @@ Constants of the "vim" module
 	to which the variables referred.
 
 vim.buffers						*python-buffers*
-	A sequence object providing access to the list of vim buffers. The
+	A sequence object providing access to the list of vim buffers.  The
 	object supports the following operations: >
 	    :py b = vim.buffers[i]	# Indexing (read-only)
 	    :py b in vim.buffers	# Membership test
@@ -164,7 +164,7 @@ vim.buffers						*python-buffers*
 	    :py for b in vim.buffers:	# Sequential access
 <
 vim.windows						*python-windows*
-	A sequence object providing access to the list of vim windows. The
+	A sequence object providing access to the list of vim windows.  The
 	object supports the following operations: >
 	    :py w = vim.windows[i]	# Indexing (read-only)
 	    :py w in vim.windows	# Membership test
@@ -179,10 +179,10 @@ vim.current						*python-current*
 		vim.current.window	The current window (RO)		Window
 		vim.current.range	The current line range (RO)	Range
 
-	The last case deserves a little explanation. When the :python or
+	The last case deserves a little explanation.  When the :python or
 	:pyfile command specifies a range, this range of lines becomes the
-	"current range". A range is a bit like a buffer, but with all access
-	restricted to a subset of lines. See |python-range| for more details.
+	"current range".  A range is a bit like a buffer, but with all access
+	restricted to a subset of lines.  See |python-range| for more details.
 
 
 Output from Python					*python-output*
@@ -197,31 +197,31 @@ Output from Python					*python-output*
 
 							*python-input*
 	Input (via sys.stdin, including input() and raw_input()) is not
-	supported, and may cause the program to crash. This should probably be
+	supported, and may cause the program to crash.  This should probably be
 	fixed.
 
 ==============================================================================
 3. Buffer objects					*python-buffer*
 
-Buffer objects represent vim buffers. You can obtain them in a number of ways:
+Buffer objects represent vim buffers.  You can obtain them in a number of ways:
 	- via vim.current.buffer (|python-current|)
 	- from indexing vim.buffers (|python-buffers|)
 	- from the "buffer" attribute of a window (|python-window|)
 
 Buffer objects have one read-only attribute - name - the full file name for
-the buffer. They also have three methods (append, mark, and range; see below).
+the buffer.  They also have three methods (append, mark, and range; see below).
 
-You can also treat buffer objects as sequence objects. In this context, they
+You can also treat buffer objects as sequence objects.  In this context, they
 act as if they were lists (yes, they are mutable) of strings, with each
-element being a line of the buffer. All of the usual sequence operations,
+element being a line of the buffer.  All of the usual sequence operations,
 including indexing, index assignment, slicing and slice assignment, work as
-you would expect. Note that the result of indexing (slicing) a buffer is a
-string (list of strings). This has one unusual consequence - b[:] is different
-from b. In particular, "b[:] = None" deletes the whole of the buffer, whereas
+you would expect.  Note that the result of indexing (slicing) a buffer is a
+string (list of strings).  This has one unusual consequence - b[:] is different
+from b.  In particular, "b[:] = None" deletes the whole of the buffer, whereas
 "b = None" merely updates the variable b, with no effect on the buffer.
 
-Buffer indexes start at zero, as is normal in Python. This differs from vim
-line numbers, which start from 1. This is particularly relevant when dealing
+Buffer indexes start at zero, as is normal in Python.  This differs from vim
+line numbers, which start from 1.  This is particularly relevant when dealing
 with marks (see below) which use vim line numbers.
 
 The buffer object methods are:
@@ -255,12 +255,12 @@ Examples (assume b is the current buffer) >
 ==============================================================================
 4. Range objects					*python-range*
 
-Range objects represent a part of a vim buffer. You can obtain them in a
+Range objects represent a part of a vim buffer.  You can obtain them in a
 number of ways:
 	- via vim.current.range (|python-current|)
 	- from a buffer's range() method (|python-buffer|)
 
-A range object is almost identical in operation to a buffer object. However,
+A range object is almost identical in operation to a buffer object.  However,
 all operations are restricted to the lines within the range (this line range
 can, of course, change as a result of slice assignments, line deletions, or
 the range.append() method).
@@ -283,11 +283,11 @@ Example (assume r is the current range):
 ==============================================================================
 5. Window objects					*python-window*
 
-Window objects represent vim windows. You can obtain them in a number of ways:
+Window objects represent vim windows.  You can obtain them in a number of ways:
 	- via vim.current.window (|python-current|)
 	- from indexing vim.windows (|python-windows|)
 
-You can manipulate window objects only through their attributes. They have no
+You can manipulate window objects only through their attributes.  They have no
 methods, and no sequence or other interface.
 
 Window attributes are:

runtime/doc/if_ruby.txt

@@ -1,4 +1,4 @@
-*if_ruby.txt*   For Vim version 7.0aa.  Last change: 2004 Mar 14
+*if_ruby.txt*   For Vim version 7.0aa.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Shugo Maeda
@@ -32,7 +32,7 @@ downloading Ruby there.
 			Execute Ruby script {script}.
 			{endpattern} must NOT be preceded by any white space.
 			If {endpattern} is omitted, it defaults to a dot '.'
-			like for the |:append| and |:insert| commands. This
+			like for the |:append| and |:insert| commands.  This
 			form of the |:ruby| command is mainly useful for
 			including ruby code in vim scripts.
 			Note: This command doesn't work when the Ruby feature
@@ -60,7 +60,7 @@ Example Vim script: >
 						*:rubydo* *:rubyd* *E265*
 :[range]rubyd[o] {cmd}	Evaluate Ruby command {cmd} for each line in the
 			[range], with $_ being set to the text of each line in
-			turn, without a trailing <EOL>. Setting $_ will change
+			turn, without a trailing <EOL>.  Setting $_ will change
 			the text, but note that it is not possible to add or
 			delete lines using this command.
 			The default for [range] is the whole file: "1,$".
@@ -115,7 +115,7 @@ VIM::command({cmd})
 							*ruby-evaluate*
 VIM::evaluate({expr})
 	Evaluates {expr} using the vim internal expression evaluator (see
-	|expression|). Returns the expression result as a string.
+	|expression|).  Returns the expression result as a string.
 
 ==============================================================================
 3. VIM::Buffer objects					*ruby-buffer*
@@ -126,7 +126,7 @@ Class Methods:
 
 current		Returns the current buffer object.
 count		Returns the number of buffers.
-self[{n}]	Returns the buffer object for the number {n}. The first number
+self[{n}]	Returns the buffer object for the number {n}.  The first number
 		is 0.
 
 Methods:
@@ -151,7 +151,7 @@ Class Methods:
 
 current		Returns the current window object.
 count		Returns the number of windows.
-self[{n}]	Returns the window object for the number {n}. The first number
+self[{n}]	Returns the window object for the number {n}.  The first number
 		is 0.
 
 Methods:

runtime/doc/if_sniff.txt

@@ -1,4 +1,4 @@
-*if_sniff.txt*	For Vim version 7.0aa.  Last change: 2001 Sep 03
+*if_sniff.txt*	For Vim version 7.0aa.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL
@@ -45,7 +45,7 @@ edit source code.  On the other hand, you can send queries to SNiFF+ with the
 :sni[ff]		    Display all possible requests and the connection
 			    status
 
-Most requests require a symbol (identifier) as parameter. If it is omitted,
+Most requests require a symbol (identifier) as parameter.  If it is omitted,
 Vim will use the current word under the cursor.
 The available requests are listed below:
 
@@ -54,7 +54,7 @@ request		      mapping	description
 connect			sc	Establish connection with SNiFF+.
 				Make sure SNiFF+ is prepared for this in the
 				Preferences
-disconnect		sq	Disconnect from SNiFF+. You can reconnect any
+disconnect		sq	Disconnect from SNiFF+.  You can reconnect any
 				time with :sniff connect (or 'sc')
 toggle			st	Toggle between implementation
 				and definition file
@@ -80,7 +80,7 @@ show-docu		sd	Show documentation of symbol
 gen-docu		sD	Generate documentation of symbol
 
 The mappings are defined in a file 'sniff.vim', which is part of every SNiFF+
-product ($SNIFF_DIR/config/sniff.vim). This file is sourced whenever Vim
+product ($SNIFF_DIR/config/sniff.vim).  This file is sourced whenever Vim
 connects to SNiFF+.
 
 ==============================================================================

runtime/doc/if_tcl.txt

@@ -1,4 +1,4 @@
-*if_tcl.txt*    For Vim version 7.0aa.  Last change: 2004 Jan 17
+*if_tcl.txt*    For Vim version 7.0aa.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Ingo Wilken
@@ -36,7 +36,7 @@ comments, ideas etc to <Ingo.Wilken@informatik.uni-oldenburg.de>
 			wasn't compiled in.  To avoid errors, see
 			|script-here|.
 
-{endmarker} must NOT be preceded by any white space. If {endmarker} is
+{endmarker} must NOT be preceded by any white space.  If {endmarker} is
 omitted from after the "<<", a dot '.' must be used after {script}, like for
 the |:append| and |:insert| commands.
 This form of the |:tcl| command is mainly useful for including tcl code in Vim
@@ -152,7 +152,7 @@ Commands:
 
 	::vim::window {option}				*tcl-window*
 	Provides access to vim windows.  Currently only the "list" option is
-	implemented. This creates a window command (see |tcl-window-cmds|) for
+	implemented.  This creates a window command (see |tcl-window-cmds|) for
 	each window, and returns a list of the command names as the result.
 	Example: >
 		set wins [::vim::window list]
@@ -227,7 +227,7 @@ The ::vim::current(window) variable contains the name of the window command
 for the current window.  A window command is automatically deleted when the
 corresponding vim window is closed.
 
-Lets assume the name of the window command is stored in the Tcl variable "win",
+Let's assume the name of the window command is stored in the Tcl variable "win",
 i.e. "$win" calls the command.  The following options are available: >
 
 	$win buffer		# Create Tcl command for window's buffer.
@@ -306,7 +306,7 @@ changed, all marks in the buffer are automatically adjusted.  Any changes to
 the buffer's contents made by Tcl commands can be undone with the "undo" vim
 command (see |undo|).
 
-Lets assume the name of the buffer command is stored in the Tcl variable "buf",
+Let's assume the name of the buffer command is stored in the Tcl variable "buf",
 i.e. "$buf" calls the command.  The following options are available: >
 
 	$buf append {n} {str}	# Append a line to buffer, after line {n}.
@@ -497,7 +497,7 @@ This procedure runs an ex command on each buffer (idea stolen from Ron Aaron):
 	}
 Use it like this:
 	:tcl eachbuf %s/foo/bar/g
-Be careful with Tcl's string and backslash substitution, tough. If in doubt,
+Be careful with Tcl's string and backslash substitution, tough.  If in doubt,
 surround the ex command with curly braces.
 
 

runtime/doc/indent.txt

@@ -1,4 +1,4 @@
-*indent.txt*    For Vim version 7.0aa.  Last change: 2004 Sep 02
+*indent.txt*    For Vim version 7.0aa.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -237,7 +237,7 @@ assume a 'shiftwidth' of 4.
 				}		  }
 <
 	bN    If N != 0 Vim will align a final "break" with the case label,
-	      so that case..break looks like a sort of block. (default: 0).
+	      so that case..break looks like a sort of block.  (default: 0).
 
 		cino=		    cino=b1 >
 		  switch (x)	      switch(x)
@@ -325,7 +325,7 @@ assume a 'shiftwidth' of 4.
 		  ********/		    ********/
 <	      (Example uses ":set comments& comments-=s1:/* comments^=s0:/*")
 
-	/N    Indent comment lines N characters extra. (default 0).
+	/N    Indent comment lines N characters extra.  (default 0).
 		cino=			  cino=/4 >
 		  a = b;		    a = b;
 		  /* comment */			/* comment */
@@ -381,7 +381,7 @@ assume a 'shiftwidth' of 4.
 	      the last non-white character in its line and it is not the
 	      closing parentheses, indent the following line N characters
 	      relative to the outer context (i.e. start of the line or the
-	      next unclosed parentheses). (default: 0).
+	      next unclosed parentheses).  (default: 0).
 
 		cino=(0			   cino=(0,W4 >
 		  a_long_line(		    a_long_line(
@@ -406,7 +406,7 @@ assume a 'shiftwidth' of 4.
 <
 					*java-cinoptions* *java-indenting*
 	jN    Indent java anonymous classes correctly.  The value 'N' is
-	      currently unused but must be non-zero (e.g. 'j1'). 'j1' will
+	      currently unused but must be non-zero (e.g. 'j1').  'j1' will
 	      indent for example the following code snippet correctly: >
 
 		object.add(new ChangeListener() {
@@ -451,31 +451,31 @@ REMARKS ABOUT SPECIFIC INDENT FILES ~
 
 FORTRAN							*fortran-indent*
 
-Block if, select case, and where constructs are indented. Comments, labelled
+Block if, select case, and where constructs are indented.  Comments, labelled
 statements and continuation lines are indented if the Fortran is in free
 source form, whereas they are not indented if the Fortran is in fixed source
-form because of the left margin requirements. Hence manual indent corrections
+form because of the left margin requirements.  Hence manual indent corrections
 will be necessary for labelled statements and continuation lines when fixed
-source form is being used. For further discussion of the method used for the
+source form is being used.  For further discussion of the method used for the
 detection of source format see |fortran-syntax|.
 
 Do loops ~
-All do loops are left unindented by default. Do loops can be unstructured in
+All do loops are left unindented by default.  Do loops can be unstructured in
 Fortran with (possibly multiple) loops ending on a labelled executable
-statement of almost arbitrary type. Correct indentation requires
-compiler-quality parsing. Old code with do loops ending on labelled statements
+statement of almost arbitrary type.  Correct indentation requires
+compiler-quality parsing.  Old code with do loops ending on labelled statements
 of arbitrary type can be indented with elaborate programs such as Tidy
-(http://www.unb.ca/chem/ajit/f_tidy.htm). Structured do/continue loops are
+(http://www.unb.ca/chem/ajit/f_tidy.htm).  Structured do/continue loops are
 also left unindented because continue statements are also used for purposes
-other than ending a do loop. Programs such as Tidy can convert structured
-do/continue loops to the do/enddo form. Do loops of the do/enddo variety can
-be indented. If you use only structured loops of the do/enddo form, you should
+other than ending a do loop.  Programs such as Tidy can convert structured
+do/continue loops to the do/enddo form.  Do loops of the do/enddo variety can
+be indented.  If you use only structured loops of the do/enddo form, you should
 declare this by setting the fortran_do_enddo variable in your .vimrc as
 follows >
 
    let fortran_do_enddo=1
 
-in which case do loops will be indented. If all your loops are of do/enddo
+in which case do loops will be indented.  If all your loops are of do/enddo
 type only in, say, .f90 files, then you should set a buffer flag with an
 autocommand such as >
 
@@ -485,6 +485,20 @@ to get do loops indented in .f90 files and left alone in Fortran files with
 other extensions such as .for.
 
 
+PYTHON							*python-indent*
+
+The amount of indent can be set for the following situations.  The examples
+given are de the defaults.  Note that the variables are set to an expression,
+so that you can change the value of 'shiftwidth' later.
+
+Indent after an open paren: >
+	let g:pyindent_open_paren = '&sw * 2'
+Indent after a nested paren: >
+	let g:pyindent_nested_paren = '&sw'
+Indent for a continuation line: >
+	let g:pyindent_continue = '&sw * 2'
+
+
 VERILOG							*verilog-indent*
 
 General block statements such as if, for, case, always, initial, function,

runtime/doc/index.txt

@@ -1,4 +1,4 @@
-*index.txt*     For Vim version 7.0aa.  Last change: 2004 Dec 29
+*index.txt*     For Vim version 7.0aa.  Last change: 2005 Jul 06
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -800,7 +800,7 @@ tag		char	      note action in Normal mode	~
 ==============================================================================
 3. Visual mode						*visual-index*
 
-Most commands in Visual mode are the same as in Normal mode. The ones listed
+Most commands in Visual mode are the same as in Normal mode.  The ones listed
 here are those that are different.
 
 tag		command	      note action in Visual mode	~
@@ -1137,6 +1137,7 @@ The commands are sorted on the non-optional part of their name.
 |:elseif|	:elsei[f]	part of an :if command
 |:emenu|	:em[enu]	execute a menu by name
 |:endif|	:en[dif]	end previous :if
+|:endfor|	:endfo[r]	end previous :for
 |:endfunction|	:endf[unction]	end of a user function
 |:endtry|	:endt[ry]	end previous :try
 |:endwhile|	:endw[hile]	end previous :while
@@ -1158,11 +1159,12 @@ The commands are sorted on the non-optional part of their name.
 |:folddoopen|	:foldd[oopen]	execute command on lines not in a closed fold
 |:folddoclosed|	:folddoc[losed]	execute command on lines in a closed fold
 |:foldopen|	:foldo[pen]	open folds
+|:for|		:for		for loop
 |:function|	:fu[nction]	define a user function
 |:global|	:g[lobal]	execute commands for matching lines
 |:goto|		:go[to]		go to byte in the buffer
 |:grep|		:gr[ep]		run 'grepprg' and jump to first match
-|:grepadd|	:grepa[dd]	like grep, but append to current list
+|:grepadd|	:grepa[dd]	like :grep, but append to current list
 |:gui|		:gu[i]		start the GUI
 |:gvim|		:gv[im]		start the GUI
 |:hardcopy|	:ha[rdcopy]	send text to the printer
@@ -1195,6 +1197,7 @@ The commands are sorted on the non-optional part of their name.
 |:join|		:j[oin]		join lines
 |:jumps|	:ju[mps]	print the jump list
 |:k|		:k		set a mark
+|:keepalt|	:keepa[lt]	following command keeps the alternate file
 |:keepmarks|	:kee[pmarks]	following command keeps marks where they are
 |:keepjumps|	:keepj[jumps]	following command keeps jumplist and marks
 |:list|		:l[ist]		print lines
@@ -1211,6 +1214,7 @@ The commands are sorted on the non-optional part of their name.
 |:loadkeymap|	:loadk[eymap]	load the following keymaps until EOF
 |:loadview|	:lo[adview]	load view for current window from a file
 |:lockmarks|	:loc[kmarks]	following command keeps marks where they are
+|:lockvar|	:lockv[ar]	lock variables
 |:ls|		:ls		list all buffers
 |:lunmap|	:lu[nmap]	like ":unmap!" but includes Lang-Arg mode
 |:move|		:m[ove]		move lines
@@ -1226,11 +1230,13 @@ The commands are sorted on the non-optional part of their name.
 |:messages|	:mes[sages]	view previously displayed messages
 |:mkexrc|	:mk[exrc]	write current mappings and settings to a file
 |:mksession|	:mks[ession]	write session info to a file
+|:mkspell|	:mksp[ell]	produce .spl spell file
 |:mkvimrc|	:mkv[imrc]	write current mappings and settings to a file
 |:mkview|	:mkvie[w]	write view of current window to a file
 |:mode|		:mod[e]		show or change the screen mode
 |:mzscheme|	:mz[scheme]	execute MzScheme command
 |:mzfile|	:mzf[ile]	execute MzScheme script file
+|:nbkey|	:nb[key]	pass a key to Netbeans
 |:next|		:n[ext]		go to next file in the argument list
 |:new|		:new		create a new empty window
 |:nmap|		:nm[ap]		like ":map" but for Normal mode
@@ -1257,10 +1263,14 @@ The commands are sorted on the non-optional part of their name.
 |:options|	:opt[ions]	open the options-window
 |:ounmap|	:ou[nmap]	like ":unmap" but for Operator-pending mode
 |:ounmenu|	:ounme[nu]	remove menu for Operator-pending mode
-|:print|	:p[rint]	print lines
 |:pclose|	:pc[lose]	close preview window
 |:pedit|	:ped[it]	edit file in the preview window
 |:perl|		:pe[rl]		execute Perl command
+|:print|	:p[rint]	print lines
+|:profdel|	:profd[el]	stop profiling a function or script
+|:profile|	:prof[ile]	profiling functions and scripts
+|:promptfind|	:pro[mtfind]	open GUI dialog for searching
+|:promptrepl| 	:promtr[epl]	open GUI dialog for search/replace
 |:perldo|	:perld[o]	execute Perl command for each line
 |:pop|		:po[p]		jump to older entry in tag stack
 |:popup|	:pop[up]	popup a menu by name
@@ -1307,6 +1317,7 @@ The commands are sorted on the non-optional part of their name.
 |:substitute|	:s[ubstitute]	find and replace text
 |:sNext|	:sN[ext]	split window and go to previous file in
 				argument list
+|:sandbox|	:san[dbox]	execute a command in the sandbox
 |:sargument|	:sa[rgument]	split window and go to specific file in
 				argument list
 |:sall|		:sal[l]		open a window for each file in argument list
@@ -1350,7 +1361,12 @@ The commands are sorted on the non-optional part of their name.
 				argument list
 |:sniff|	:sni[ff]	send request to sniff
 |:snomagic|	:sno[magic]	:substitute with 'nomagic'
+|:sort|		:sor[t]		sort lines
 |:source|	:so[urce]	read Vim or Ex commands from a file
+|:spelldump|	:spelld[ump]	split window and fill with all correct words
+|:spellgood|	:spe[llgood]	add good word for spelling
+|:spellrepall|	:spellr[epall]	replace all bad words like last |z?|
+|:spellwrong|	:spellw[rong]	add spelling mistake
 |:split|	:sp[lit]	split current window
 |:sprevious|	:spr[evious]	split window and go to previous file in the
 				argument list
@@ -1395,6 +1411,7 @@ The commands are sorted on the non-optional part of their name.
 |:unhide|	:unh[ide]	open a window for each loaded file in the
 				buffer list
 |:unlet|	:unl[et]	delete variable
+|:unlockvar|	:unlo[ckvar]	unlock variables
 |:unmap|	:unm[ap]	remove mapping
 |:unmenu|	:unme[nu]	remove menu
 |:update|	:up[date]	write buffer if modified
@@ -1402,6 +1419,8 @@ The commands are sorted on the non-optional part of their name.
 |:version|	:ve[rsion]	print version number and other info
 |:verbose|	:verb[ose]	execute command with 'verbose' set
 |:vertical|	:vert[ical]	make following command split vertically
+|:vimgrep|	:vim[grep]	search for pattern in files
+|:vimgrepadd|	:vimgrepa[dd]	like :vimgrep, but append to current list
 |:visual|	:vi[sual]	same as ":edit", but turns off "Ex" mode
 |:viusage|	:viu[sage]	overview of Normal mode commands
 |:view|		:vie[w]		edit a file read-only

runtime/doc/insert.txt

@@ -1,4 +1,4 @@
-*insert.txt*    For Vim version 7.0aa.  Last change: 2005 Jan 05
+*insert.txt*    For Vim version 7.0aa.  Last change: 2005 Apr 08
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -53,7 +53,8 @@ char		action	~
 		yourself to use CTRL-[.
 						*i_CTRL-C*
 CTRL-C		Quit insert mode, go back to Normal mode.  Do not check for
-		abbreviations.
+		abbreviations.  Does not trigger the |InsertLeave| autocommand
+		event.
 
 						*i_CTRL-@*
 CTRL-@		Insert previously inserted text and stop insert.  {Vi: only
@@ -189,7 +190,7 @@ CTRL-Q		Same as CTRL-V.
 		work then.  It does work in the GUI.
 
 CTRL-X		Enter CTRL-X mode.  This is a sub-mode where commands can
-		be given to complete words or scroll the window. See
+		be given to complete words or scroll the window.  See
 		|i_CTRL-X| and |ins-completion|. {not in Vi}
 
 						*i_CTRL-E*
@@ -270,7 +271,7 @@ entered directly.  This way you can enter any character, except a line break
 
 first char	mode	     max nr of chars   max value ~
 (none)		decimal		   3		255
-o or O		octal		   3		255
+o or O		octal		   3		377	 (255)
 x or X		hexadecimal	   2		ff	 (255)
 u		hexadecimal	   4		ffff	 (65535)
 U		hexadecimal	   8		7fffffff (2147483647)
@@ -391,7 +392,7 @@ The CTRL-G j and CTRL-G k commands can be used to insert text in front of a
 column.  Example: >
    int i;
    int j;
-Position the cursor on the first "int", type "istatic<C-G>j       ".  The
+Position the cursor on the first "int", type "istatic <C-G>j       ".  The
 result is: >
    static int i;
 	  int j;
@@ -725,7 +726,7 @@ CTRL-X CTRL-K		Search the files given with the 'dictionary' option
 			keyword replaces the previous matching keyword.
 
 							*i_CTRL-X_CTRL-T*
-CTRL-X CTRL-T		Works as CTRL-X CTRL-K, but in a special way. It uses
+CTRL-X CTRL-T		Works as CTRL-X CTRL-K, but in a special way.  It uses
 			the 'thesaurus' option instead of 'dictionary'.  If a
 			match is found in the thesaurus file, all the
 			remaining words on the same line are included as
@@ -921,6 +922,9 @@ i			Insert text before the cursor [count] times.
 							*I*
 I			Insert text before the first non-blank in the line
 			[count] times.
+			When the 'H' flag is present in 'cpoptions' and the
+			line only contains blanks, insert start just before
+			the last blank.
 
 							*gI*
 gI			Insert text in column 1 [count] times.  {not in Vi}
@@ -940,11 +944,15 @@ gi			Insert text in the same position as where Insert mode
 o			Begin a new line below the cursor and insert text,
 			repeat [count] times.  {Vi: blank [count] screen
 			lines}
+			When the '#' flag is in 'cpoptions' the count is
+			ignored.
 
 							*O*
 O			Begin a new line above the cursor and insert text,
 			repeat [count] times.  {Vi: blank [count] screen
 			lines}
+			When the '#' flag is in 'cpoptions' the count is
+			ignored.
 
 These commands are used to start inserting text.  You can end insert mode with
 <Esc>.  See |mode-ins-repl| for the other special characters in Insert mode.
@@ -962,18 +970,29 @@ too long when appending characters a line break is automatically inserted.
 9. Ex insert commands					*inserting-ex*
 
 							*:a* *:append*
-:{range}a[ppend]	Insert several lines of text below the specified
+:{range}a[ppend][!]	Insert several lines of text below the specified
 			line.  If the {range} is missing, the text will be
 			inserted after the current line.
+			Adding [!] toggles 'autoindent' for the time this
+			command is executed.
 
 							*:i* *:in* *:insert*
-:{range}i[nsert]	Insert several lines of text above the specified
+:{range}i[nsert][!]	Insert several lines of text above the specified
 			line.  If the {range} is missing, the text will be
 			inserted before the current line.
+			Adding [!] toggles 'autoindent' for the time this
+			command is executed.
 
 These two commands will keep on asking for lines, until you type a line
 containing only a ".".  Watch out for lines starting with a backslash, see
 |line-continuation|.
+When these commands are used with |:global| or |:vglobal| then the lines are
+obtained from the text following the command.  Separate lines with a NL
+escaped with a backslash: >
+	:global/abc/insert\
+	one line\
+	another line
+The final "." is not needed then.
 NOTE: ":append" and ":insert" don't work properly in between ":if" and
 ":endif", ":for" and ":endfor", ":while" and ":endwhile".
 

runtime/doc/intro.txt

@@ -1,4 +1,4 @@
-*intro.txt*     For Vim version 7.0aa.  Last change: 2004 Dec 16
+*intro.txt*     For Vim version 7.0aa.  Last change: 2005 Jun 12
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -198,7 +198,7 @@ The user may create scripts for Vim that use external commands.  These might
 introduce Y2K problems, but those are not really part of Vim itself.
 
 ==============================================================================
-3. Credits						*credits* *author*
+3. Credits				*credits* *author* *Bram* *Moolenaar*
 
 Most of Vim was written by Bram Moolenaar <Bram@vim.org>.
 
@@ -289,8 +289,7 @@ Vi	"the original".  Without further remarks this is the version
 Posix	From the IEEE standard 1003.2, Part 2: Shell and utilities.
 	Generally known as "Posix".  This is a textual description of
 	how Vi is supposed to work.
-	The version used is a draft from beginning 1996, so all remarks are
-	"expected to comply to" this.  Anything can change though...
+	See |posix-compliance|.
 							*Nvi*
 Nvi	The "New" Vi.  The version of Vi that comes with BSD 4.4 and FreeBSD.
 	Very good compatibility with the original Vi, with a few extensions.
@@ -331,11 +330,11 @@ and <> are part of what you type, the context should make this clear.
 ["x]		An optional register designation where text can be stored.
 		See |registers|.  The x is a single character between 'a' and
 		'z' or 'A' and 'Z' or '"', and in some cases (with the put
-		command) between '0' and '9', '%', '#', or others. The
+		command) between '0' and '9', '%', '#', or others.  The
 		uppercase and lowercase letter designate the same register,
 		but the lowercase letter is used to overwrite the previous
 		register contents, while the uppercase letter is used to
-		append to the previous register contents. Without the ""x" or
+		append to the previous register contents.  Without the ""x" or
 		with """" the stored text is put into the unnamed register.
 
 							*{}*
@@ -691,9 +690,9 @@ Q			Switch to "Ex" mode.  This is a bit like typing ":"
 			|vimrc_example.vim| script "Q" works like "gq".
 
 					*gQ*
-gQ			Switch to "Ex" mode, but really behave like typing ":"
-			commands after another.  All command line editing,
-			completion etc. is available.
+gQ			Switch to "Ex" mode like with "Q", but really behave
+			like typing ":" commands after another.  All command
+			line editing, completion etc. is available.
 			Use the ":vi" command |:visual| to exit "Ex" mode.
 			{not in Vi}
 

runtime/doc/map.txt

@@ -1,4 +1,4 @@
-*map.txt*       For Vim version 7.0aa.  Last change: 2004 Dec 29
+*map.txt*       For Vim version 7.0aa.  Last change: 2005 Jun 03
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -22,7 +22,7 @@ is to define a sequence commands for a function key.  Example: >
 
 	:map <F2> a<C-R>=strftime("%c")<CR><Esc>
 
-This appends the current date and time after the cursor. (in <> notation |<>|)
+This appends the current date and time after the cursor (in <> notation |<>|).
 
 There are commands to enter new mappings, remove mappings and list mappings.
 See |map-overview| for the various forms of "map" and their relationships with
@@ -174,7 +174,7 @@ There are five sets of mappings
 - For Visual mode: When typing commands while the Visual area is highlighted.
 - For Operator-pending mode: When an operator is pending (after "d", "y", "c",
   etc.).  Example: ":omap { w" makes "y{" work like "yw" and "d{" like "dw".
-- For Insert mode. These are also used in Replace mode.
+- For Insert mode.  These are also used in Replace mode.
 - For Command-line mode: When entering a ":" or "/" command.
 
 There are no separate mappings for Select mode.  The same as for Visual mode
@@ -811,7 +811,7 @@ feature}.
 ==============================================================================
 4. User-defined commands				*user-commands*
 
-It is possible to define your own Ex commands. A user-defined command can act
+It is possible to define your own Ex commands.  A user-defined command can act
 just like a built-in command (it can have a range or arguments, arguments can
 be completed as filenames or buffer names, etc), except that when the command
 is executed, it is transformed into a normal ex command and then executed.
@@ -820,7 +820,7 @@ For starters: See section |40.2| in the user manual.
 
 						*E183* *user-cmd-ambiguous*
 All user defined commands must start with an uppercase letter, to avoid
-confusion with builtin commands. (There are a few builtin commands, notably
+confusion with builtin commands.  (There are a few builtin commands, notably
 :Next, :Print and :X, which do start with an uppercase letter.  The builtin
 will always take precedence in these cases).  The other characters of the user
 command can be uppercase letters, lowercase letters or digits.  When using
@@ -829,8 +829,8 @@ ambiguous.  For example, the command ":Cc2" could be the user command ":Cc2"
 without an argument, or the command ":Cc" with argument "2".  It is advised to
 put a space between the command name and the argument to avoid these problems.
 
-When using a user-defined command, the command can be abbreviated. However, if
-an abbreviation is not unique, an error will be issued. Furthermore, a
+When using a user-defined command, the command can be abbreviated.  However, if
+an abbreviation is not unique, an error will be issued.  Furthermore, a
 built-in command will always take precedence.
 
 Example: >
@@ -846,7 +846,7 @@ It is recommended that full names for user-defined commands are used in
 scripts.
 
 :com[mand]						*:com* *:command*
-			List all user-defined commands. When listing commands,
+			List all user-defined commands.  When listing commands,
 			the characters in the first two columns are
 			    !	Command has the -bang attribute
 			    "	Command has the -register attribute
@@ -858,8 +858,8 @@ scripts.
 							*E174* *E182*
 :com[mand][!] [{attr}...] {cmd} {rep}
 			Define a user command.  The name of the command is
-			{cmd} and its replacement text is {rep}. The command's
-			attributes (see below) are {attr}. If the command
+			{cmd} and its replacement text is {rep}.  The command's
+			attributes (see below) are {attr}.  If the command
 			already exists, an error is reported, unless a ! is
 			specified, in which case the command is redefined.
 
@@ -871,20 +871,20 @@ scripts.
 
 Command attributes
 
-User-defined commands are treated by Vim just like any other ex commands. They
-can have arguments, or have a range specified. Arguments are subject to
-completion as filenames, buffers, etc. Exactly how this works depends upon the
+User-defined commands are treated by Vim just like any other ex commands.  They
+can have arguments, or have a range specified.  Arguments are subject to
+completion as filenames, buffers, etc.  Exactly how this works depends upon the
 command's attributes, which are specified when the command is defined.
 
 There are a number of attributes, split into four categories: argument
-handling, completion behavior, range handling, and special cases. The
+handling, completion behavior, range handling, and special cases.  The
 attributes are described below, by category.
 
 Argument handling					*E175* *E176*
 
 By default, a user defined command will take no arguments (and an error is
-reported if any are supplied). However, it is possible to specify that the
-command can take arguments, using the -nargs attribute. Valid cases are:
+reported if any are supplied).  However, it is possible to specify that the
+command can take arguments, using the -nargs attribute.  Valid cases are:
 
 	-nargs=0    No arguments are allowed (the default)
 	-nargs=1    Exactly one argument is required
@@ -932,26 +932,36 @@ completion can be enabled:
 	-complete=tag_listfiles	tags, file names are shown when CTRL-D is hit
 	-complete=var		user variables
 	-complete=custom,{func} custom completion, defined via {func}
+	-complete=customlist,{func} custom completion, defined via {func}
 
 Custom completion			    *:command-completion-custom*
 							*E467* *E468*
 It is possible to define customized completion schemes via the "custom,{func}"
-completion argument.  The {func} part should be a function with the following
-prototype >
+or the "customlist,{func}" completion argument.  The {func} part should be a
+function with the following prototype >
 
 	:function {func}(ArgLead, CmdLine, CursorPos)
 
-The function need not use all these arguments, but it should provide the
-completion candidates as the return value, one per line in a newline separated
-string.  The function arguments are:
+The function need not use all these arguments. The function should provide the
+completion candidates as the return value.
+
+For the "custom" argument, the function should return the completion
+candidates one per line in a newline separated string.
+
+For the "customlist" argument, the function should return the completion
+candidates as a Vim List. Non-string items in the list are ignored.
+
+The function arguments are:
 	ArgLead		the leading portion of the argument currently being
 			completed on
 	CmdLine		the entire command line
 	CursorPos	the cursor position in it
-The function may use these for determining context.  It is not necessary to
-filter candidates against the (implicit pattern in) ArgLead.  Vim will do
-filter the candidates with its regexp engine after function return, and this
-is probably more efficient in most cases.
+The function may use these for determining context.  For the "custom"
+argument, it is not necessary to filter candidates against the (implicit
+pattern in) ArgLead.  Vim will do filter the candidates with its regexp engine
+after function return, and this is probably more efficient in most cases. For
+the "customlist" argument, Vim will not filter the returned completion
+candidates and the user supplied function should filter the candidates.
 
 The following example lists user names to a Finger command >
     :com -complete=custom,ListUsers -nargs=1 Finger !finger <args>
@@ -959,20 +969,28 @@ The following example lists user names to a Finger command >
     :    return system("cut -d: -f1 /etc/passwd")
     :endfun
 
+The following example completes filenames from the directories specified in
+the 'path' option: >
+    :com -nargs=1 -bang -complete=customlist,EditFileComplete
+			\ EditFile edit<bang> <args>
+    :fun EditFileComplete(A,L,P)
+    :    return split(globpath(&path, a:ArgLead))
+    :endfun
+<
 Range handling						*E177* *E178*
 
-By default, user-defined commands do not accept a line number range. However,
+By default, user-defined commands do not accept a line number range.  However,
 it is possible to specify that the command does take a range (the -range
 attribute), or that it takes an arbitrary count value, either in the line
 number position (-range=N, like the |:split| command) or as a "count"
-argument (-count=N, like the |:Next| command). Possible attributes are:
+argument (-count=N, like the |:Next| command).  Possible attributes are:
 
 	-range	    Range allowed, default is current line
 	-range=%    Range allowed, default is whole file (1,$)
 	-range=N    A count (default N) which is specified in the line
 		    number position (like |:split|)
 	-count=N    A count (default N) which is specified either in the line
-		    number position, or as an initial argument (like |:Next|)
+		    number position, or as an initial argument (like |:Next|).
 		    Specifying -count (without a default) acts like -count=0
 
 Note that -range=N and -count=N are mutually exclusive - only one should be
@@ -997,9 +1015,9 @@ replacement text separately.
 Replacement text
 
 The replacement text for a user defined command is scanned for special escape
-sequences, using <...> notation. Escape sequences are replaced with values
-from the entered command line, and all other text is copied unchanged. The
-resulting string is executed as an Ex command. If the initial < of an escape
+sequences, using <...> notation.  Escape sequences are replaced with values
+from the entered command line, and all other text is copied unchanged.  The
+resulting string is executed as an Ex command.  If the initial < of an escape
 sequence is preceded by a backslash, the sequence is copied unchanged.
 
 The valid escape sequences are
@@ -1017,7 +1035,7 @@ The valid escape sequences are
 		expands to nothing.
 						*<reg>* *<register>*
 	<reg>	(See the '-register' attribute) The optional register,
-		if specified. Otherwise, expands to nothing. <register>
+		if specified.  Otherwise, expands to nothing.  <register>
 		is a synonym for this.
 						*<args>*
 	<args>	The command arguments, exactly as supplied (but as
@@ -1032,9 +1050,10 @@ The valid escape sequences are
 If the first two characters of an escape sequence are "q-" (for example,
 <q-args>) then the value is quoted in such a way as to make it a valid value
 for use in an expression.  This uses the argument as one single value.
+When there is no argument <q-args> is an empty string.
 
 To allow commands to pass their arguments on to a user-defined function, there
-is a special form <f-args> ("function args"). This splits the command
+is a special form <f-args> ("function args").  This splits the command
 arguments at spaces and Tabs, quotes each argument individually, and the
 <f-args> sequence is replaced by the comma-separated list of quoted arguments.
 See the Mycmd example below.  When there is no argument, <f-args> also has no

runtime/doc/mbyte.txt

@@ -1,4 +1,4 @@
-*mbyte.txt*     For Vim version 7.0aa.  Last change: 2004 Dec 19
+*mbyte.txt*     For Vim version 7.0aa.  Last change: 2005 Jul 09
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar et al.
@@ -286,6 +286,29 @@ Supported 'encoding' values are:			*encoding-values*
 1   koi8-u	Ukrainian
 1   macroman    MacRoman (Macintosh encoding)
 1   8bit-{name} any 8-bit encoding (Vim specific name)
+1   cp437	similar to iso-8859-1
+1   cp737	similar to iso-8859-7
+1   cp775	Baltic
+1   cp850	similar to iso-8859-4
+1   cp852	similar to iso-8859-1
+1   cp855	similar to iso-8859-2
+1   cp857	similar to iso-8859-5
+1   cp860	similar to iso-8859-9
+1   cp861	similar to iso-8859-1
+1   cp862	similar to iso-8859-1
+1   cp863	similar to iso-8859-8
+1   cp865	similar to iso-8859-1
+1   cp866	similar to iso-8859-5
+1   cp869	similar to iso-8859-7
+1   cp874	Thai
+1   cp1250	Czech, Polish, etc.
+1   cp1251	Cyrillic
+1   cp1253	Greek
+1   cp1254	Turkish
+1   cp1255	Hebrew
+1   cp1256	Arabic
+1   cp1257	Baltic
+1   cp1258	Vietnamese
 1   cp{number}	MS-Windows: any installed single-byte codepage
 2   cp932	Japanese (Windows only)
 2   euc-jp	Japanese (Unix only)
@@ -436,7 +459,7 @@ Useful utilities for converting the charset:
 	ftp://ftp.cuhk.hk/pub/chinese/ifcss/software/unix/convert/hc-30.tar.gz
 
     Korean:	    hmconv
-	Hmconv is Korean code conversion utility especially for E-mail. It can
+	Hmconv is Korean code conversion utility especially for E-mail.  It can
 	convert between EUC-KR and ISO-2022-KR.  Hmconv can be found at:
 	ftp://ftp.kaist.ac.kr/pub/hangul/code/hmconv/
 
@@ -444,7 +467,7 @@ Useful utilities for converting the charset:
 	Lv is a Powerful Multilingual File Viewer.  And it can be worked as
 	|charset| converter.  Supported |charset|: ISO-2022-CN, ISO-2022-JP,
 	ISO-2022-KR, EUC-CN, EUC-JP, EUC-KR, EUC-TW, UTF-7, UTF-8, ISO-8859
-	series, Shift_JIS, Big5 and HZ. Lv can be found at:
+	series, Shift_JIS, Big5 and HZ.  Lv can be found at:
 	http://www.ff.iij4u.or.jp/~nrt/freeware/lv4495.tar.gz
 
 
@@ -506,7 +529,7 @@ Now start xterm with >
 or, for bigger character: >
   xterm -u8 -fn -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1
 
-and you will have a working UTF-8 terminal emulator. Try both >
+and you will have a working UTF-8 terminal emulator.  Try both >
 
    cat utf-8-demo.txt
    vim utf-8-demo.txt
@@ -761,7 +784,7 @@ is suitable for complex input, such as CJK.
   number of Hira-gana characters are 76.  So, first, we pre-input text as
   pronounced in Hira-gana, second, we convert Hira-gana to Kanji or Kata-Kana,
   if needed.  There are some Kana-Kanji conversion server: jserver
-  (distributed with Wnn, see below) and canna. Canna could be found at:
+  (distributed with Wnn, see below) and canna.  Canna could be found at:
   ftp://ftp.nec.co.jp/pub/Canna/ (no longer works).
 
 There is a good input system: Wnn4.2.  Wnn 4.2 contains,
@@ -801,7 +824,7 @@ Use the RPM or port for your system.
     Preedit Area and Status Area are performed by the client application in
     the area of application.  The client application is directed by the
     |IM-server| to display all pre-edit data at the location of text
-    insertion. The client registers callbacks invoked by the input method
+    insertion.  The client registers callbacks invoked by the input method
     during pre-editing.
 *.  over-the-spot					*OverTheSpot*
     Status Area is created in a fixed position within the area of application,
@@ -1231,7 +1254,7 @@ is no longer relevant in the GTK+ 2 GUI.
 Up to two combining characters can be used.  The combining character is drawn
 on top of the preceding character.  When editing text a composing character is
 mostly considered part of the preceding character.  For example "x" will
-delete a character and its following composing characters by default. If the
+delete a character and its following composing characters by default.  If the
 'delcombine' option is on, then pressing 'x' will delete the combining
 characters, one at a time, then the base character.  But when inserting, you
 type the first character and the following composing characters separately,
@@ -1253,7 +1276,7 @@ characters present in the selected font.
 
 Useful commands:
 - "ga" shows the decimal, hexadecimal and octal value of the character under
-  the cursor.  If there are composing characters these are shown too. (if the
+  the cursor.  If there are composing characters these are shown too.  (If the
   message is truncated, use ":messages").
 - "g8" shows the bytes used in a UTF-8 character, also the composing
   characters, as hex numbers.
@@ -1319,7 +1342,7 @@ a zero if necessary.
 COMMAND ARGUMENTS					*utf-8-char-arg*
 
 Commands like |f|, |F|, |t| and |r| take an argument of one character.  For
-UTF-8 this argument may include one or two composing characters.  These needs
+UTF-8 this argument may include one or two composing characters.  These need
 to be produced together with the base character, Vim doesn't wait for the next
 character to be typed to find out if it is a composing character or not.
 Using 'keymap' or |:lmap| is a nice way to type these characters.

runtime/doc/message.txt

@@ -1,4 +1,4 @@
-*message.txt*   For Vim version 7.0aa.  Last change: 2004 Aug 26
+*message.txt*   For Vim version 7.0aa.  Last change: 2005 Feb 13
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -55,7 +55,7 @@ or view a list of recent messages with: >
 LIST OF MESSAGES
 			*E222* *E228* *E232* *E256* *E293* *E298* *E304* *E317*
 			*E318* *E356* *E438* *E439* *E440* *E316* *E320* *E322*
-			*E323* *E341* *E473* *E570*  >
+			*E323* *E341* *E473* *E570* *E685* >
   Add to read buffer
   makemap: Illegal mode
   Cannot create BalloonEval with both message and callback
@@ -74,6 +74,7 @@ LIST OF MESSAGES
   line number out of range: {N} past the end
   line count wrong in block {N}
   Internal error
+  Internal error: {function}
   fatal error in cs_manage_matches
 
 This is an internal error.  If you can reproduce it, please send in a bug
@@ -363,7 +364,8 @@ cannot be written.  You need to give the buffer a file name: >
 
 When using the '~' character in a pattern, it is replaced with the previously
 used pattern in a ":substitute" command.  This fails when no such command has
-been used yet.  See |/~|.
+been used yet.  See |/~|.  This also happens when using ":s/pat/%/", where the
+"%" stands for the previous substitute string.
 
 							*E35*  >
   No previous regular expression

runtime/doc/motion.txt

@@ -1,4 +1,4 @@
-*motion.txt*    For Vim version 7.0aa.  Last change: 2004 Dec 29
+*motion.txt*    For Vim version 7.0aa.  Last change: 2005 Apr 04
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -72,7 +72,7 @@ and end position.  Generally, motions that move between lines affect lines
 characterwise).  However, there are some exceptions.
 
 						*exclusive* *inclusive*
-A character motion is either inclusive or exclusive. When inclusive, the start
+A character motion is either inclusive or exclusive.  When inclusive, the start
 and end position of the motion are included in the operation.  When exclusive,
 the last character towards the end of the buffer is not included.  Linewise
 motions always include the start and end position.
@@ -350,6 +350,10 @@ or the last line.  The first two commands put the cursor in the same column
 except after the "$" command, then the cursor will be put on the last
 character of the line.
 
+If "k", "-" or CTRL-P is used with a [count] and there are less than [count]
+lines above the cursor and the 'cpo' option includes the "-" flag it is an
+error. |cpo--|.
+
 ==============================================================================
 4. Word motions						*word-motions*
 
@@ -461,9 +465,12 @@ A paragraph begins after each empty line, and also at each of a set of
 paragraph macros, specified by the pairs of characters in the 'paragraphs'
 option.  The default is "IPLPPPQPP LIpplpipbp", which corresponds to the
 macros ".IP", ".LP", etc.  (These are nroff macros, so the dot must be in the
-first column).  A section boundary is also a paragraph boundary.  Note that
-this does not include a '{' or '}' in the first column.  Also note that a
-blank line (only containing white space) is NOT a paragraph boundary.
+first column).  A section boundary is also a paragraph boundary.
+Note that a blank line (only containing white space) is NOT a paragraph
+boundary.
+Also note that this does not include a '{' or '}' in the first column.  When
+the '{' flag is in 'cpoptions' then '{' in the first column is used as a
+paragraph boundary |posix|.
 
 							*section*
 A section begins after a form-feed (<C-L>) in the first column and at each of
@@ -938,7 +945,9 @@ These commands are not marks themselves, but jump to a mark:
 <
 			Note that ":keepjumps" must be used for every command.
 			When invoking a function the commands in that function
-			can still change the jumplist.
+			can still change the jumplist.  Also, for 
+			":keepjumps exe 'command '" the "command" won't keep
+			jumps.  Instead use: ":exe 'keepjumps command'"
 
 ==============================================================================
 8. Jumps					*jump-motions*
@@ -1052,7 +1061,7 @@ g;			Go to [count] older position in change list.
 
 							*g,* *E663*
 g,			Go to [count] newer cursor position in change list.
-			Just like "g;| but in the opposite direction.
+			Just like |g;| but in the opposite direction.
 			(not a motion command)
 			{not in Vi}
 			{not available without the +jumplist feature}

runtime/doc/netbeans.txt

@@ -1,4 +1,4 @@
-*netbeans.txt*  For Vim version 7.0aa.  Last change: 2004 Jun 16
+*netbeans.txt*  For Vim version 7.0aa.  Last change: 2005 Apr 04
 
 
 		  VIM REFERENCE MANUAL    by Gordon Prieur
@@ -16,7 +16,8 @@ NetBeans ExternalEditor Integration Features		*netbeans*
 8.  Messages					|netbeans-messages|
 9.  Running Vim from NetBeans			|netbeans-run|
 10. NetBeans protocol				|netbeans-protocol|
-11. Known problems				|netbeans-problems|
+11. NetBeans commands				|netbeans-commands|
+12. Known problems				|netbeans-problems|
 
 {Vi does not have any of these features}
 {only available when compiled with the |+netbeans_intg| feature}
@@ -37,7 +38,7 @@ Visit http://www.sun.com for more information regarding the Sun ONE Studio
 product line.
 
 Current releases of NetBeans provide full support for Java and limited support
-for C, C++, and Fortran. Current releases of Sun ONE Studio provide full
+for C, C++, and Fortran.  Current releases of Sun ONE Studio provide full
 support for Java, C, C++, and Fortran.
 
 The interface to NetBeans is also supported by Agide, the A-A-P GUI IDE.
@@ -49,12 +50,12 @@ See the A-A-P website for information: http://www.A-A-P.org.
 ==============================================================================
 2. NetBeans Key Bindings				*netbeans-keybindings*
 
-Vim understands a number of key bindings that execute NetBeans commands. These
-are typically all the Function key combinations. To execute a NetBeans command,
-the user must press the Pause key followed by a NetBeans key binding. For
-example, in order to compile a Java file, the NetBeans key binding is "F9". So,
-while in vim, press "Pause F9" to compile a java file. To toggle a breakpoint
-at the current line, press "Pause Shift F8".
+Vim understands a number of key bindings that execute NetBeans commands.
+These are typically all the Function key combinations.  To execute a NetBeans
+command, the user must press the Pause key followed by a NetBeans key binding.
+For example, in order to compile a Java file, the NetBeans key binding is
+"F9".  So, while in vim, press "Pause F9" to compile a java file.  To toggle a
+breakpoint at the current line, press "Pause Shift F8".
 
 The Pause key is Function key 21.  If you don't have a working Pause key and
 want to use F8 instead, use: >
@@ -80,10 +81,10 @@ In case you do not want the NetBeans interface you can disable it by
 uncommenting a line with "--disable-netbeans" in the Makefile.
 
 Currently, only gvim is supported in this integration as NetBeans does not
-have means to supply a terminal emulator for the vim command. Furthermore,
+have means to supply a terminal emulator for the vim command.  Furthermore,
 there is only GUI support for GTK, GNOME, and Motif.
 
-If Motif support is required the user must supply XPM libraries. See
+If Motif support is required the user must supply XPM libraries.  See
 |workshop-xpm| for details on obtaining the latest version of XPM.
 
 
@@ -98,45 +99,45 @@ XPM by yourself or use precompiled libraries from http://iamphet.nm.ru/misc/
 ==============================================================================
 4. Downloading NetBeans					*netbeans-download*
 
-The NetBeans IDE is available for download from netbeans.org. You can download
+The NetBeans IDE is available for download from netbeans.org.  You can download
 a released version, download sources, or use CVS to download the current
-source tree. If you choose to download sources, follow directions from
+source tree.  If you choose to download sources, follow directions from
 netbeans.org on building NetBeans.
 
 Depending on the version of NetBeans you download, you may need to do further
-work to get the required External Editor module. This is the module which lets
-NetBeans work with gvim (or xemacs :-). See http://externaleditor.netbeans.org
+work to get the required External Editor module.  This is the module which lets
+NetBeans work with gvim (or xemacs :-).  See http://externaleditor.netbeans.org
 for details on downloading this module if your NetBeans release does not have
 it.
 
-For C, C++, and Fortran support you will also need the cpp module. See
+For C, C++, and Fortran support you will also need the cpp module.  See
 http://cpp.netbeans.org for information regarding this module.
 
 You can also download Sun ONE Studio from Sun Microsystems, Inc for a 30 day
-free trial. See http://www.sun.com for further details.
+free trial.  See http://www.sun.com for further details.
 
 ==============================================================================
 5. Preparing NetBeans for Vim				*netbeans-preparation*
 
 In order for NetBeans to work with vim, the NetBeans External Editor module
-must be loaded and enabled. If you have a Sun ONE Studio Enterprise Edition
-then this module should be loaded and enabled. If you have a NetBeans release
+must be loaded and enabled.  If you have a Sun ONE Studio Enterprise Edition
+then this module should be loaded and enabled.  If you have a NetBeans release
 you may need to find another way of obtaining this open source module.
 
 You can check if you have this module by opening the Tools->Options dialog
 and drilling down to the "Modules" list (IDE Configuration->System->Modules).
 If your Modules list has an entry for "External Editor" you must make sure
-it is enabled (the "Enabled" property should have the value "True"). If your
+it is enabled (the "Enabled" property should have the value "True").  If your
 Modules list has no External Editor see the next section on |obtaining-exted|.
 
 ==============================================================================
 6. Obtaining the External Editor Module			    *obtaining-exted*
 
-There are 2 ways of obtaining the External Editor module. The easiest way
+There are 2 ways of obtaining the External Editor module.  The easiest way
 is to use the NetBeans Update Center to download and install the module.
 Unfortunately, some versions do not have this module in their update
-center. If you cannot download via the update center you will need to
-download sources and build the module. I will try and get the module
+center.  If you cannot download via the update center you will need to
+download sources and build the module.  I will try and get the module
 available from the NetBeans Update Center so building will be unnecessary.
 Also check http://externaleditor.netbeans.org for other availability options.
 
@@ -151,22 +152,22 @@ Assuming you have loaded and enabled the NetBeans External Editor module
 as described in |netbeans-preparation| all you need to do is verify that
 the gvim command line is properly configured for your environment.
 
-Open the Tools->Options dialog and open the Editing category. Select the
-External Editor. The right hand pane should contain a Properties tab and
-an Expert tab. In the Properties tab make sure the "Editor Type" is set
-to "Vim". In the Expert tab make sure the "Vim Command" is correct.
+Open the Tools->Options dialog and open the Editing category.  Select the
+External Editor.  The right hand pane should contain a Properties tab and
+an Expert tab.  In the Properties tab make sure the "Editor Type" is set
+to "Vim".  In the Expert tab make sure the "Vim Command" is correct.
 
-You should be careful if you change the "Vim Command". There are command
+You should be careful if you change the "Vim Command".  There are command
 line options there which must be there for the connection to be properly
-set up. You can change the command name but thats about it. If your gvim
-can be found by your $PATH then the VIM Command can start with "gvim". If
+set up.  You can change the command name but that's about it.  If your gvim
+can be found by your $PATH then the VIM Command can start with "gvim".  If
 you don't want gvim searched from your $PATH then hard code in the full
-Unix path name. At this point you should get a gvim for any source file
+Unix path name.  At this point you should get a gvim for any source file
 you open in NetBeans.
 
 If some files come up in gvim and others (with different file suffixes) come
 up in the default NetBeans editor you should verify the MIME type in the
-Expert tab MIME Type property. NetBeans is MIME oriented and the External
+Expert tab MIME Type property.  NetBeans is MIME oriented and the External
 Editor will only open MIME types specified in this property.
 
 ==============================================================================
@@ -193,10 +194,18 @@ Partial writes disallowed for NetBeans buffers
 NetBeans connection lost for this buffer
 		NetBeans has become confused about the state of this file.
 		Rather than risc data corruption, NetBeans has severed the
-		connection for this file. Vim will take over responsibility
+		connection for this file.  Vim will take over responsibility
 		for saving changes to this file and NetBeans will no longer
 		know of these changes.
 
+							*E744*
+NetBeans does not allow changes in read-only files
+		Vim normally allows changes to a read-only file and only
+		enforces the read-only rule if you try to write the file.
+		However, NetBeans does not let you make changes to a file
+		which is read-only and becomes confused if vim does this.
+		So vim does not allow modifications to files when run with
+		NetBeans.
 ==============================================================================
 9. Running Vim from NetBeans				*netbeans-run*
 
@@ -239,13 +248,13 @@ NetBeans (see http://externaleditor.netbeans.org).  Later it was extended to
 work with Agide (A-A-P GUI IDE, see http://www.a-a-p.org).  The extensions are
 marked with "version 2.1".
 
-Version 2.2 of the protocol has several minor changes which should only
-affect NetBeans users (ie, not Agide users). However, a bug was fixed which
-could cause confusion. The netbeans_saved() function sent a "save" protocol
-command. In protocol version 2.1 and earlier this was incorrectly interpreted
-as a notification that a write had taken place. In reality, it told NetBeans
-to save the file so multiple writes were being done. This caused various
-problems and has been fixed in 2.2. To decrease the likelihood of this
+Version 2.2 of the protocol has several minor changes which should only affect
+NetBeans users (ie, not Agide users).  However, a bug was fixed which could
+cause confusion.  The netbeans_saved() function sent a "save" protocol
+command.  In protocol version 2.1 and earlier this was incorrectly interpreted
+as a notification that a write had taken place.  In reality, it told NetBeans
+to save the file so multiple writes were being done.  This caused various
+problems and has been fixed in 2.2.  To decrease the likelihood of this
 confusion happening again, netbeans_saved() has been renamed to
 netbeans_save_buffer().
 
@@ -419,7 +428,7 @@ initDone	Mark the buffer as ready for use.  Implicitly makes the buffer
 
 insertDone
 		Sent by NetBeans to tell vim an initial file insert is done.
-		This triggers a read message being printed. Prior to version
+		This triggers a read message being printed.  Prior to version
 		2.3, no read messages were displayed after opening a file.
 		New in version 2.3.
 
@@ -457,8 +466,8 @@ save		Save the buffer when it was modified.  The other side of the
 		New in version 2.2.
 
 saveDone
-		Sent by NetBeans to tell vim a save is done. This triggers
-		a save message being printed. Prior to version 2.3, no save
+		Sent by NetBeans to tell vim a save is done.  This triggers
+		a save message being printed.  Prior to version 2.3, no save
 		messages were displayed after a save.
 		New in version 2.3.
 
@@ -530,7 +539,7 @@ showBalloon text
 
 specialKeys
 		Map a set of keys (mostly function keys) to be passed back
-		to NetBeans for processing. This lets NetBeans hotkeys be
+		to NetBeans for processing.  This lets NetBeans hotkeys be
 		used from vim.
 		Implemented in version 2.3.
 
@@ -551,6 +560,9 @@ stopCaretListen
 stopDocumentListen
 		Mark the buffer to stop reporting changes to the IDE.
 		Opposite of startDocumentListen.
+		NOTE: if "netbeansBuffer" was used to mark this buffer as a
+		NetBeans buffer, then the buffer is deleted in Vim.  This is
+		for compatibility with Sun Studio 10.
 
 unguard off len
 		Opposite of "guard", remove guarding for a text area.
@@ -640,7 +652,7 @@ buttonRelease button lnum col
 		at the time of the release.  Only for buffers that are owned
 		by NetBeans.  This event is not sent if the button was
 		released while the mouse was in the status line or in a
-		separator line. If col is less than 1 the button release was
+		separator line.  If col is less than 1 the button release was
 		in the sign area.
 		New in version 2.2.
 
@@ -755,7 +767,18 @@ DETACH		IDE -> editor: break the connection without exiting the
 REJECT		Not used.
 
 ==============================================================================
-11. Known problems					*netbeans-problems*
+11. NetBeans Commands					*netbeans-commands*
+
+							*:nbkey*
+:nbkey key			Pass the key to NetBeans for processing
+
+Pass the key to NetBeans for hot-key processing.  You should not need to use
+this command directly.  However, NetBeans passes a list of hot-keys to Vim at
+startup and when one of these keys is pressed, this command is generated to
+send the key press back to NetBeans.
+
+==============================================================================
+12. Known problems					*netbeans-problems*
 
 NUL bytes are not possible.  For editor -> IDE they will appear as NL
 characters.  For IDE -> editor they cannot be inserted.

runtime/doc/options.txt

@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.0aa.  Last change: 2005 Jan 07
+*options.txt*	For Vim version 7.0aa.  Last change: 2005 Jul 11
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -600,10 +600,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 			{not in Vi}
 			{only available when compiled with the |+farsi|
 			feature}
-	When on, the second language is Farsi. In editing mode CTRL-_ toggles
+	When on, the second language is Farsi.  In editing mode CTRL-_ toggles
 	the keyboard map between Farsi and English, when 'allowrevins' set.
 
-	When off, the keyboard map toggles between Hebrew and English. This
+	When off, the keyboard map toggles between Hebrew and English.  This
 	is useful to start the Vim in native mode i.e. English (left-to-right
 	mode) and have default second language Farsi or Hebrew (right-to-left
 	mode).  See |farsi.txt|.
@@ -620,7 +620,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	letters, Cyrillic letters).
 
 	There are currently two possible values:
-	"single":	Use the same width as characters in US-ASCII. This is
+	"single":	Use the same width as characters in US-ASCII.  This is
 			expected by most users.
 	"double":	Use twice the width of ASCII characters.
 
@@ -628,9 +628,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	those characters are solely based on how many octets they take in
 	legacy/traditional CJK encodings.  In those encodings, Euro,
 	Registered sign, Greek/Cyrillic letters are represented by two octets,
-	therefore those fonts have "wide" glyphs for them. This is also
+	therefore those fonts have "wide" glyphs for them.  This is also
 	true of some line drawing characters used to make tables in text
-	file. Therefore, when a CJK font is used for GUI Vim or
+	file.  Therefore, when a CJK font is used for GUI Vim or
 	Vim is running inside a terminal (emulators) that uses a CJK font
 	(or Vim is run inside an xterm invoked with "-cjkwidth" option.),
 	this option should be set to "double" to match the width perceived
@@ -659,7 +659,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			|+netbeans_intg| or |+sun_workshop| feature}
 	When on, Vim will change its value for the current working directory
 	whenever you open a file, switch buffers, delete a buffer or
-	open/close a window. It will change to the directory containing the
+	open/close a window.  It will change to the directory containing the
 	file which was opened or selected.  This option is provided for
 	backward compatibility with the Vim released with Sun ONE Studio 4
 	Enterprise Edition.
@@ -977,7 +977,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	The pattern is used like with |:autocmd|, see |autocmd-patterns|.
 	Watch out for special characters, see |option-backslash|.
 	When $TMPDIR, $TMP or $TEMP is not defined, it is not used for the
-	default value. "/tmp/*" is only used for Unix.
+	default value.  "/tmp/*" is only used for Unix.
 
 						*'balloondelay'* *'bdlay'*
 'balloondelay' 'bdlay'	number	(default: 600)
@@ -992,9 +992,40 @@ A jump table for the options with a short description can be found at |Q_op|.
 			global
 			{not in Vi}
 			{only available when compiled with the |+balloon_eval|
-			and |+sun_workshop| or |+netbeans_intg| features}
+			feature}
 	Switch on the |balloon-eval| functionality.
 
+						     *'balloonexpr'* *'bexpr'*
+'balloonexpr' 'bexpr'	string	(default "")
+			global
+			{not in Vi}
+			{only available when compiled with the |+balloon_eval|
+			feature}
+	Expression to show in evaluation balloon.  It is only used when
+	'ballooneval' is on.  These variables can be used:
+
+	v:beval_bufnr	number of the buffer in which balloon is going to show
+	v:beval_winnr	number of the window
+	v:beval_lnum	line number
+	v:beval_col	column number (byte index)
+	v:beval_text	word under or after the mouse pointer
+
+	The evaluation of the expression must not have side effects!
+	Example: >
+    function! MyBalloonExpr()
+	return 'Cursor is at line ' . v:beval_lnum . 
+		\', column ' . v:beval_col .
+		\ ' of file ' .  bufname(v:beval_bufnr) .
+		\ ' on word "' . v:beval_text . '"'
+    endfunction
+    set bexpr=MyBalloonExpr()
+    set ballooneval
+<
+	NOTE: The balloon is displayed only if the cursor is on a text
+	character.  If the result of evaluating 'balloonexpr' is not empty,
+	Vim does not try to send a message to an external debugger (Netbeans
+	or Sun Workshop).
+
 				     *'binary'* *'bin'* *'nobinary'* *'nobin'*
 'binary' 'bin'		boolean	(default off)
 			local to buffer
@@ -1382,7 +1413,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 			global
 			{not in Vi}
 	Number of columns of the screen.  Normally this is set by the terminal
-	initialization and does not have to be set by hand.
+	initialization and does not have to be set by hand.  Also see
+	|posix-screen-size|.
 	When Vim is running in the GUI or in a resizable window, setting this
 	option will cause the window size to be changed.  When you only want
 	to use the size for the GUI, put the command in your |gvimrc| file.
@@ -1411,7 +1443,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	|fold-marker|.
 
 			*'compatible'* *'cp'* *'nocompatible'* *'nocp'*
-'compatible' 'cp'	boolean	(default on, off when a .vimrc file is found)
+'compatible' 'cp'	boolean	(default on, off when a .vimrc or .gvimrc file
+								is found)
 			global
 			{not in Vi}
 	This option has the effect of making Vim either more Vi-compatible, or
@@ -1426,12 +1459,13 @@ A jump table for the options with a short description can be found at |Q_op|.
 	options.  This default was chosen for those people who want to use Vim
 	just like Vi, and don't even (want to) know about the 'compatible'
 	option.
-	When a ".vimrc" file is found while Vim is starting up, this option is
-	switched off, and all options that have not been modified will be set
-	to the Vim defaults.  Effectively, this means that when a ".vimrc"
-	file exists, Vim will use the Vim defaults, otherwise it will use the
-	Vi defaults.  (Note: This doesn't happen for the system-wide vimrc
-	file).  Also see |compatible-default|.
+	When a ".vimrc" or ".gvimrc" file is found while Vim is starting up,
+	this option is switched off, and all options that have not been
+	modified will be set to the Vim defaults.  Effectively, this means
+	that when a ".vimrc" or ".gvimrc" file exists, Vim will use the Vim
+	defaults, otherwise it will use the Vi defaults.  (Note: This doesn't
+	happen for the system-wide vimrc or gvimrc file).  Also see
+	|compatible-default| and |posix-compliance|.
 	You can also set this option with the "-C" argument, and reset it with
 	"-N".  See |-C| and |-N|.
 	Switching this option off makes the Vim defaults be used for options
@@ -1538,8 +1572,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	   6. included files
 
 	As you can see, CTRL-N and CTRL-P can be used to do any 'iskeyword'-
-	based expansion (eg dictionary |i_CTRL-X_CTRL-K|, included patterns
-	|i_CTRL-X_CTRL-I|, tags |i_CTRL-X_CTRL-]| and normal expansions)
+	based expansion (e.g., dictionary |i_CTRL-X_CTRL-K|, included patterns
+	|i_CTRL-X_CTRL-I|, tags |i_CTRL-X_CTRL-]| and normal expansions).
 
 						*'completefunc'* *'cfu'*
 'completefunc' 'cfu'	string	(default: empty)
@@ -1639,6 +1673,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 	"+=" and "-=" feature of ":set" |add-option-flags|.
 	NOTE: This option is set to the Vi default value when 'compatible' is
 	set and to the Vim default value when 'compatible' is reset.
+	NOTE: This option is set to the POSIX default value at startup when
+	the Vi default value would be used and the $VIM_POSIX environment
+	variable exists |posix|.  This means tries to behave like the POSIX
+	specification.
 
 	    contains	behavior	~
 								*cpo-a*
@@ -1707,6 +1745,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 			yet.
 								*cpo-g*
 		g	Goto line 1 when using ":edit" without argument.
+								*cpo-H*
+		H	When using "I" on a line with only blanks, insert
+			before the last blank.  Without this flag insert after
+			the last blank.
 								*cpo-i*
 		i	When included, interrupting the reading of a file will
 			leave it modified.
@@ -1718,7 +1760,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			not after '!' or '?'.  Also see 'joinspaces'.
 								*cpo-J*
 		J	A |sentence| has to be followed by two spaces after
-			the '.', '!' or '?'. A <Tab> is not recognized as
+			the '.', '!' or '?'.  A <Tab> is not recognized as
 			white space.
 								*cpo-k*
 		k	Disable the recognition of raw key codes in
@@ -1736,9 +1778,11 @@ A jump table for the options with a short description can be found at |Q_op|.
 			enables cancelling the mapping by typing <F1><Esc>.
 								*cpo-l*
 		l	Backslash in a [] range in a search pattern is taken
-			literally, only "\]" is special  See |/[]|
+			literally, only "\]", "\^", "\-" and "\\" are special.
+			See |/[]|
 			   'l' included: "/[ \t]"  finds <Space>, '\' and 't'
 			   'l' excluded: "/[ \t]"  finds <Space> and <Tab>
+			Also see |cpo-\|.
 								*cpo-L*
 		L	When the 'list' option is set, 'wrapmargin',
 			'textwidth', 'softtabstop' and Virtual Replace mode
@@ -1767,6 +1811,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 								*cpo-p*
 		p	Vi compatible Lisp indenting.  When not present, a
 			slightly better algorithm is used.
+								*cpo-q*
+		q	When joining multiple lines leave the cursor at the
+			position where it would be when joining two lines.
 								*cpo-r*
 		r	Redo ("." command) uses "/" to repeat a search
 			command, instead of the actually used search string.
@@ -1815,8 +1862,15 @@ A jump table for the options with a short description can be found at |Q_op|.
 		x	<Esc> on the command-line executes the command-line.
 			The default in Vim is to abandon the command-line,
 			because <Esc> normally aborts a command.  |c_<Esc>|
+								*cpo-X*
+		X	When using a count with "R" the replaced text is
+			deleted only once.  Also when repeating "R" with "."
+			and a count.
 								*cpo-y*
 		y	A yank command can be redone with ".".
+								*cpo-Z*
+		Z	When using "w!" while the 'readonly' option is set,
+			don't reset 'readonly'.
 								*cpo-!*
 		!	When redoing a filter command, use the last used
 			external command, whatever it was.  Otherwise the last
@@ -1844,11 +1898,18 @@ A jump table for the options with a short description can be found at |Q_op|.
 			there is one).  This works very well for C programs.
 			This flag is also used for other features, such as
 			C-indenting.
+								*cpo--*
+		-	When included, a vertical movement command fails when
+			it would above the first line or below the last line.
+			Without it the cursor moves to the first or last line,
+			unless it already was in that line.
+			Applies to the commands "-", "k", CTRL-P, "+", "j",
+			CTRL-N and CTRL-J.
 								*cpo-+*
 		+	When included, a ":write file" command will reset the
 			'modified' flag of the buffer, even though the buffer
 			itself may still be different from its file.
-			 					cpo-star*
+			 					*cpo-star*
 		*	Use ":*" in the same way as ":@".  When not included,
 			":*" is an alias for ":'<,'>", select the Visual area.
 								*cpo-<*
@@ -1859,6 +1920,42 @@ A jump table for the options with a short description can be found at |Q_op|.
 				'<' included:	"<Tab>"  (5 characters)
 				'<' excluded:	"^I"	 (^I is a real <Tab>)
 			Also see the 'k' flag above.
+								*cpo->*
+		>	When appending to a register, put a line break before
+			the appended text.
+
+	POSIX flags.  These are not included in the Vi default value, except
+	when $VIM_POSIX was set on startup. |posix|
+
+	    contains	behavior	~
+			 					*cpo-#*
+		#	A count before "D", "o" and "O" has no effect.
+								*cpo-&*
+		&	When ":preserve" was used keep the swap file when
+			exiting normally while this buffer is still loaded.
+			This flag is tested when exiting.
+								*cpo-\*
+		\	Backslash in a [] range in a search pattern is taken
+			literally, only "\]" is special  See |/[]|
+			   'l' included: "/[ \t]"  finds <Space>, '\' and 't'
+			   'l' excluded: "/[ \t]"  finds <Space> and <Tab>
+			Also see |cpo-\|.
+								*cpo-/*
+		/	When "%" is used as the replacement string in a |:s|
+			command, use the previous replacement string. |:s%|
+								*cpo-{*
+		{	The |{| and |}| commands also stop at a "{" character
+			at the start of a line.
+								*cpo-.*
+		.	The ":chdir" and ":cd" commands fail if the current
+			buffer is modified, unless ! is used.  Vim doesn't
+			need this, since it remembers the full path of an
+			opened file.
+								*cpo-bar*
+		|	The value of the $LINES and $COLUMNS environment
+			variables overrule the terminal size values obtained
+			with system specific functions.
+
 
 						*'cscopepathcomp'* *'cspc'*
 'cscopepathcomp' 'cspc'	number	(default 0)
@@ -1924,6 +2021,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	When set to "msg", error messages that would otherwise be omitted will
 	be given anyway.  This is useful when debugging 'foldexpr' or
 	'indentexpr'.
+	When set to "beep", a message will be given when otherwise only a beep
+	would be produced.
+	The values can be combined, separated by a comma.
 
 						*'define'* *'def'*
 'define' 'def'		string	(default "^\s*#\s*define")
@@ -1969,6 +2069,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	To include a comma in a file name precede it with a backslash.  Spaces
 	after a comma are ignored, otherwise spaces are included in the file
 	name.  See |option-backslash| about using backslashes.
+	This has nothing to do with the |Dictionary| variable type.
 	Where to find a list of words?
 	- On FreeBSD, there is the file "/usr/share/dict/words".
 	- In the Simtel archive, look in the "msdos/linguist" directory.
@@ -2064,7 +2165,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	  "." is replaced with the path name of the edited file.
 	- For Unix and Win32, if a directory ends in two path separators, the
 	  swap file name will be built from the complete path to the file
-	  with all path separators substituted to percent '%' signs. This will
+	  with all path separators substituted to percent '%' signs.  This will
 	  ensure file name uniqueness in the preserve directory.
 	- Spaces after the comma are ignored, other spaces are considered part
 	  of the directory name.  To have a space at the start of a directory
@@ -2737,7 +2838,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	A pattern that is used to recognize a list header.  This is used for
 	the "n" flag in 'formatoptions'.
 	The pattern must match exactly the text that will be the indent for
-	the line below it.  You can use |\ze| to mark the end of the match
+	the line below it.  You can use |/\ze| to mark the end of the match
 	while still checking more characters.  There must be a character
 	following the pattern, when it matches the whole line it is handled
 	like there is no match.
@@ -2803,7 +2904,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 						      VMS: "SEARCH/NUMBERS ")
 			global or local to buffer |global-local|
 			{not in Vi}
-	Program to use for the ":grep" command. This option may contain '%'
+	Program to use for the |:grep| command.  This option may contain '%'
 	and '#' characters, which are expanded like when used in a command-
 	line.  The placeholder "$*" is allowed to specify where the arguments
 	will be included.  Environment variables are expanded |:set_env|.  See
@@ -2811,8 +2912,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	When your "grep" accepts the "-H" argument, use this to make ":grep"
 	also work well with a single file: >
 		:set grepprg=grep\ -nH
-<	Special value: When 'grepprg' is set to "internal" the ":grep" works
-	like ":vimgrep".
+<	Special value: When 'grepprg' is set to "internal" the |:grep| command
+	works like |:vimgrep| and |:grepadd| like |:vimgrepadd|.
 	See also the section |:make_makeprg|, since most of the comments there
 	apply equally to 'grepprg'.
 	For Win32, the default is "findstr /n" if "findstr.exe" can be found,
@@ -2918,7 +3019,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	font names a list can be specified, font names separated with commas.
 	The first valid font is used.
 
-	When 'guifontset' is not empty, 'guifont' is not used.
+	On systems where 'guifontset' is supported (X11) and 'guifontset' is
+	not empty, then 'guifont' is not used.
 
 	Spaces after a comma are ignored.  To include a comma in a font name
 	precede it with a backslash.  Setting an option requires an extra
@@ -2935,7 +3037,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	the case of X).  The font names given should be "normal" fonts.  Vim
 	will try to find the related bold and italic fonts.
 
-	For Win32, GTK and Photon only: >
+	For Win32, GTK, Mac OS and Photon: >
 	    :set guifont=*
 <	will bring up a font requester, where you can pick the font you want.
 
@@ -2945,7 +3047,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 	For the GTK+ 2 GUI the font name looks like this: >
 	    :set guifont=Andale\ Mono\ 11
 <	That's all.  XLFDs are no longer accepted.
-								*E236*
+
+	For Mac OSX you can use something like this: >
+	    :set guifont=Monaco:h10
+<								*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.
@@ -2961,7 +3066,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 		i   - italic
 		u   - underline
 		s   - strikeout
-		cXX - character set XX. valid charsets are: ANSI, ARABIC,
+		cXX - character set XX.  Valid charsets are: ANSI, ARABIC,
 		      BALTIC, CHINESEBIG5, DEFAULT, EASTEUROPE, GB2312, GREEK,
 		      HANGEUL, HEBREW, JOHAB, MAC, OEM, RUSSIAN, SHIFTJIS,
 		      SYMBOL, THAI, TURKISH, VIETNAMESE ANSI and BALTIC.
@@ -3043,7 +3148,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 						*'guioptions'* *'go'*
 'guioptions' 'go'	string	(default "gmrLtT"   (MS-Windows),
-					 "agimrLtT" (GTK, Motif and Athena)
+					 "agimrLtT" (GTK, Motif and Athena))
 			global
 			{not in Vi}
 			{only available when compiled with GUI enabled}
@@ -3106,8 +3211,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 	  't'	Include tearoff menu items.  Currently only works for Win32,
 		GTK+, and Motif 1.2 GUI.
-	  'T'	Include Toolbar.  Currently only in Win32, GTK+, Motif, and
-		Athena GUIs.
+	  'T'	Include Toolbar.  Currently only in Win32, GTK+, Motif, Photon
+	        and Athena GUIs.
 
 	  'r'	Right-hand scrollbar is always present.
 	  'R'	Right-hand scrollbar is present when there is a vertically
@@ -3213,7 +3318,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 				     t:Title,v:Visual,w:WarningMsg,W:WildMenu,
 				     f:Folded,F:FoldColumn,A:DiffAdd,
 				     C:DiffChange,D:DiffDelete,T:DiffText,
-				     >:SignColumn")
+				     >:SignColumn,B:SpellBad,P:SpellCap,
+				     R:SpellRare,L:SpellLocal")
 			global
 			{not in Vi}
 	This option can be used to set highlighting mode for various
@@ -3245,7 +3351,15 @@ A jump table for the options with a short description can be found at |Q_op|.
 	|hl-WildMenu|	 W  wildcard matches displayed for 'wildmenu'
 	|hl-Folded|	 f  line used for closed folds
 	|hl-FoldColumn|	 F  'foldcolumn'
+	|hl-DiffAdd|	 A  added line in diff mode
+	|hl-DiffChange|	 C  changed line in diff mode
+	|hl-DiffDelete|	 D  deleted line in diff mode
+	|hl-DiffText|	 T  inserted text in diff mode
 	|hl-SignColumn|	 >  column used for |signs|
+	|hl-SpellBad|	 B  misspelled word |spell|
+	|hl-SpellCap|	 P  word that should start with capital|spell|
+	|hl-SpellRare|	 R  rare word |spell|
+	|hl-SpellLocal|	 L  word from other region |spell|
 
 	The display modes are:
 		r	reverse		(termcap entry "mr" and "me")
@@ -3253,6 +3367,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 		b	bold		(termcap entry "md" and "me")
 		s	standout	(termcap entry "so" and "se")
 		u	underline	(termcap entry "us" and "ue")
+		c	undercurl	(termcap entry "Cs" and "Ce")
 		n	no highlighting
 		-	no highlighting
 		:	use a highlight group
@@ -3334,7 +3449,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Unix xterm and iris-ansi by default, where 't_IS' is taken from the
 	builtin termcap).
 	When Vim was compiled with HAVE_X11 defined, the original icon will be
-	restored if possible |X11|. See |X11-icon| for changing the icon on
+	restored if possible |X11|.  See |X11-icon| for changing the icon on
 	X11.
 
 						*'iconstring'*
@@ -3469,7 +3584,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Pattern to be used to find an include command.  It is a search
 	pattern, just like for the "/" command (See |pattern|).  The default
 	value is for C programs.  This option is used for the commands "[i",
-	"]I", "[d", etc..  The 'isfname' option is used to recognize the file
+	"]I", "[d", etc.  The 'isfname' option is used to recognize the file
 	name that comes after the matched pattern.  See |option-backslash|
 	about including spaces and backslashes.
 
@@ -3647,7 +3762,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	The characters given by this option are included in identifiers.
 	Identifiers are used in recognizing environment variables and after a
 	match of the 'define' option.  It is also used for "\i" in a
-	|pattern|. See 'isfname' for a description of the format of this
+	|pattern|.  See 'isfname' for a description of the format of this
 	option.
 	Careful: If you change this option, it might break expanding
 	environment variables.  E.g., when '/' is included and Vim tries to
@@ -3881,7 +3996,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			global
 	Number of lines of the Vim window.
 	Normally you don't need to set this.  It is done automatically by the
-	terminal initialization code.
+	terminal initialization code.  Also see |posix-screen-size|.
 	When Vim is running in the GUI or in a resizable window, setting this
 	option will cause the window size to be changed.  When you only want
 	to use the size for the GUI, put the command in your |gvimrc| file.
@@ -3900,6 +4015,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Number of pixel lines inserted between characters.  Useful if the font
 	uses the full character cell height, making lines touch each other.
 	When non-zero there is room for underlining.
+	With some fonts there can be too much room between lines (to have
+	space for ascents and descents).  Then it makes sense to set
+	'linespace' to a negative value.  This may cause display problems
+	though!
 
 						*'lisp'* *'nolisp'*
 'lisp'			boolean	(default off)
@@ -4084,6 +4203,20 @@ A jump table for the options with a short description can be found at |Q_op|.
 	other memory to be freed.  Maximum value 2000000.  Use this to work
 	without a limit.  Also see 'maxmemtot'.
 
+						*'maxmempattern'* *'mmp'*
+'maxmempattern' 'mmp'	number	(default 1000)
+			global
+			{not in Vi}
+	Maximum amount of memory (in Kbyte) to use for pattern matching.
+	Maximum value 2000000.  Use this to work without a limit.
+							*E363*
+	When Vim runs into the limit it gives an error message mostly behaves
+	like CTRL-C was typed.
+	Running into the limit often means that the pattern is very
+	inefficient or too complex.  This may already happen with the pattern
+	"\(.\)*" on a very long line.  ".*" works much better.
+	Vim may run out of memory before hitting the 'maxmempattern' limit.
+
 						*'maxmemtot'* *'mmt'*
 'maxmemtot' 'mmt'	number	(default between 2048 and 10240 (system
 				 dependent) or half the amount of memory
@@ -4169,7 +4302,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 		h	all previous modes when editing a help file
 		a	all previous modes
 		r	for |hit-enter| and |more-prompt| prompt
-		A	auto-select in Visual mode
 	Normally you would enable the mouse in all four modes with: >
 		:set mouse=a
 <	When the mouse is not enabled, the GUI will still use the mouse for
@@ -4211,12 +4343,12 @@ A jump table for the options with a short description can be found at |Q_op|.
 			like in an xterm.
 	   popup	Right mouse button pops up a menu.  The shifted left
 			mouse button extends a selection.  This works like
-			with Microsoft Windows
+			with Microsoft Windows.
 	   popup_setpos Like "popup", but the cursor will be moved to the
 			position where the mouse was clicked, and thus the
 			selected operation will act upon the clicked object.
 			If clicking inside a selection, that selection will
-			be acted upon, ie. no cursor move.  This implies of
+			be acted upon, i.e. no cursor move.  This implies of
 			course, that right clicking outside a selection will
 			end Visual mode.
 	Overview of what button does what for each model:
@@ -4239,7 +4371,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 					*'mouseshape'* *'mouses'* *E547*
 'mouseshape' 'mouses'	string	(default "i:beam,r:beam,s:updown,sd:cross,
-					m:no,ml:up-arrow,v:rightup-arrow"
+					m:no,ml:up-arrow,v:rightup-arrow")
 			global
 			{not in Vi}
 			{only available when compiled with the |+mouseshape|
@@ -4401,6 +4533,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 	knows about pasting and will mostly do the right thing without 'paste'
 	being set.  The same is true for a terminal where Vim handles the
 	mouse clicks itself.
+	This option is reset when starting the GUI.  Thus if you set it in
+	your .vimrc it will work in a terminal, but not in the GUI.  Setting
+	'paste' in the GUI has side effects: e.g., the Paste toolbar button
+	will no longer work in Insert mode, because it uses a mapping.
 	When the 'paste' option is switched on (also when it was already on):
 		- mapping in Insert mode and Command-line mode is disabled
 		- abbreviations are disabled
@@ -4633,8 +4769,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 'printmbcharset' 'pmbcs'  string (default "")
 			global
 			{not in Vi}
-			{only available when compiled with the |+printer|
-			and |+multi_byte| features}
+			{only available when compiled with the |+printer|,
+			|+postscript| and |+multi_byte| features}
 	The CJK character set to be used for CJK output from |:hardcopy|.
 	See |pmbcs-option|.
 
@@ -4642,8 +4778,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 'printmbfont' 'pmbfn'	string (default "")
 			global
 			{not in Vi}
-			{only available when compiled with the |+printer|
-			and |+multi_byte| features}
+			{only available when compiled with the |+printer|,
+			|+postscript| and |+multi_byte| features}
 	List of font names to be used for CJK output from |:hardcopy|.
 	See |pmbfn-option|.
 
@@ -4655,7 +4791,12 @@ A jump table for the options with a short description can be found at |Q_op|.
 	List of items that control the format of the output of |:hardcopy|.
 	See |popt-option|.
 
-						*'quoteescape''* *'qe'*
+						*'prompt'* *'noprompt'*
+'prompt'		boolean	(default on)
+			global
+	When on a ":" prompt is used in Ex mode.
+
+						*'quoteescape'* *'qe'*
 'quoteescape' 'qe'	string	(default "\")
 			local to buffer
 			{not in Vi}
@@ -4671,9 +4812,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 	If on, writes fail unless you use a '!'.  Protects you from
 	accidentally overwriting a file.  Default on when Vim is started
 	in read-only mode ("vim -R") or when the executable is called "view".
+	When using ":w!" the 'readonly' option is reset for the current
+	buffer, unless the 'Z' flag is in 'cpoptions'.
 	{not in Vi:}  When using the ":view" command the 'readonly' option is
-	set for the newly edited buffer.  When using ":w!" the 'readonly'
-	option is reset for the current buffer.
+	set for the newly edited buffer.
 
 						*'remap'* *'noremap'*
 'remap'			boolean	(default on)
@@ -4761,7 +4903,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	If 'rulerformat' is set, it will determine the contents of the ruler.
 	Each window has its own ruler.  If a window has a status line, the
 	ruler is shown there.  Otherwise it is shown in the last line of the
-	screen.  If the statusline is given by 'statusline' (ie. not empty),
+	screen.  If the statusline is given by 'statusline' (i.e. not empty),
 	this option takes precedence over 'ruler' and 'rulerformat'
 	If the number of characters displayed is different from the number of
 	bytes in the text (e.g., for a TAB or a multi-byte character), both
@@ -4815,13 +4957,14 @@ A jump table for the options with a short description can be found at |Q_op|.
 						$VIM/vimfiles,
 						$VIMRUNTIME,
 						$VIM/vimfiles/after,
-						sys$login:vimfiles/after"
+						sys$login:vimfiles/after")
 			global
 			{not in Vi}
 	This is a list of directories which will be searched for runtime
 	files:
 	  filetype.vim	filetypes by file name |new-filetype|
 	  scripts.vim	filetypes by file contents |new-filetype-scripts|
+	  autoload/	automatically loaded scripts |autoload-functions|
 	  colors/	color scheme files |:colorscheme|
 	  compiler/	compiler files |:compiler|
 	  doc/		documentation |write-local-help|
@@ -4924,7 +5067,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 			feature}
 			{not in Vi}
 	This is a comma-separated list of words that specifies how
-	'scrollbind' windows should behave.
+	'scrollbind' windows should behave.  'sbo' stands for ScrollBind
+	Options.
 	The following words are available:
 	    ver		Bind vertical scrolling for 'scrollbind' windows
 	    hor		Bind horizontal scrolling for 'scrollbind' windows
@@ -5184,6 +5328,22 @@ A jump table for the options with a short description can be found at |Q_op|.
 	separator.  To test if this is so use: >
 		if exists('+shellslash')
 <
+			*'shelltemp'* *'stmp'* *'noshelltemp'* *'nostmp'*
+'shelltemp' 'stmp'	boolean	(Vi default off, Vim default on)
+			global
+			{not in Vi}
+	When on, use temp files for shell commands.  When off use a pipe.
+	When using a pipe is not possible temp files are used anyway.
+	Currently a pipe is only supported on Unix.  You can check it with: >
+		:if has("filterpipe")
+<	The advantage of using a pipe is that nobody can read the temp file
+	and the 'shell' command does not need to support redirection.
+	The advantage of using a temp file is that the file type and encoding
+	can be detected.
+	The |FilterReadPre|, |FilterReadPost| and |FilterWritePre|,
+	|FilterWritePost| autocommands event are not triggered when
+	'shelltemp' is off.
+
 						*'shelltype'* *'st'*
 'shelltype' 'st'	number	(default 0)
 			global
@@ -5233,7 +5393,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	|'cindent'|, |>>|, |<<|, etc.
 
 						*'shortmess'* *'shm'*
-'shortmess' 'shm'	string	(Vim default "filnxtToO", Vi default: "")
+'shortmess' 'shm'	string	(Vim default "filnxtToO", Vi default: "",
+							POSIX default: "A")
 			global
 			{not in Vi}
 	This option helps to avoid all the |hit-enter| prompts caused by file
@@ -5262,7 +5423,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 		on the command-line, "<" will appear in the left most column.
 		Ignored in Ex mode.
 	  T	truncate other messages in the middle if they are too long to
-		fit on the command line. "..." will appear in the middle.
+		fit on the command line.  "..." will appear in the middle.
 		Ignored in Ex mode.
 	  W	don't give "written" or "[w]" when writing a file
 	  A	don't give the "ATTENTION" message when an existing swap file
@@ -5382,7 +5543,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			global
 			{not in Vi}
 	The minimal number of screen columns to keep to the left and to the
-	right of the cursor if 'nowrap' is set. Setting this option to a value
+	right of the cursor if 'nowrap' is set.  Setting this option to a value
 	greater than 0 while having |'sidescroll'| also at a non-zero value
 	makes some context visible in the line you are scrolling in
 	horizontally (except at the end and beginning of the line).  Setting
@@ -5471,6 +5632,138 @@ A jump table for the options with a short description can be found at |Q_op|.
 	set.
 	NOTE: This option is set to 0 when 'compatible' is set.
 
+						*'spell'* *'nospell'*
+'spell'			boolean	(default off)
+			local to window
+			{not in Vi}
+			{not available when compiled without the |+syntax|
+			feature}
+	When on spell checking will be done.  See |spell|.
+	The languages are specified with 'spelllang'.
+
+						*'spellcapcheck'* *'spc'*
+'spellcapcheck' 'spc'	string	(default "[.?!]\_[\])'" \t]\+")
+			local to buffer
+			{not in Vi}
+			{not available when compiled without the |+syntax|
+			feature}
+	Pattern to locate the end of a sentence.  The following word will be
+	checked to start with a capital letter.  If not then it is highlighted
+	with SpellCap |hl-SpellCap|.
+	When this check is not wanted make this option empty.
+	Only used when 'spell' is set.
+	Be careful with special characters, see |option-backslash| about
+	including spaces and backslashes.
+
+						*'spellfile'* *'spf'*
+'spellfile' 'spf'	string	(default empty)
+			local to buffer
+			{not in Vi}
+			{not available when compiled without the |+syntax|
+			feature}
+	Name of the word list file where words are added for the |zg| and |zw|
+	commands.  It must end in ".{encoding}.add".  You need to include the
+	path, otherwise the file is placed in the current directory.
+								*E765*
+	It may also be a comma separated list of names.  A count before the
+	|zg| and |zw| commands can be used to access each.  This allows using
+	a personal word list file and a project word list file.
+	When a word is added while this option is empty Vim will set it for
+	you: Using the first "spell" directory in 'runtimepath' that is
+	writable and the first language name that appears in 'spelllang',
+	ignoring the region.
+	The resulting ".spl" file will be used for spell checking, it does not
+	have to appear in 'spelllang'.
+	Normally one file is used for all regions, but you can add the region
+	name if you want to.  However, it will then only be used when
+	'spellfile' is set to it, for entries in 'spelllang' only files
+	without region name will be found.
+	This option cannot be set from a |modeline| or in the |sandbox|, for
+	security reasons.
+
+						*'spelllang'* *'spl'*
+'spelllang' 'spl'	string	(default "en")
+			local to buffer
+			{not in Vi}
+			{not available when compiled without the |+syntax|
+			feature}
+	A comma separated list of word list names.  When the 'spell' option is
+	on spellchecking will be done for these languages.  Example: >
+		set spelllang=en_us,nl,medical
+<	This means US English, Dutch and medical words are recognized.  Words
+	that are not recognized will be highlighted.
+	The word list name must not include a comma or dot.  Using a dash is
+	recommended to separate the two letter language name from a
+	specification.  Thus "en-rare" is used for rare English words.
+	A region name must come last and have the form "_xx", where "xx" is
+	the two-letter, lower case region name.  You can use more than one
+	region by listing them: "en_us,en_ca" supports both US and Canadian
+	English, but not words specific for Australia, New Zealand or Great
+	Britain.
+	As a special case the name of a .spl file can be given as-is.  This is
+	mainly for testing purposes.  You must make sure the correct encoding
+	is used, Vim doesn't check it.
+	When 'encoding' is set the word lists are reloaded.  Thus it's a good
+	idea to set 'spelllang' after setting 'encoding'.
+	How the related spell files are found is explained here: |spell-load|.
+
+						*'spellsuggest'* *'sps'*
+'spellsuggest' 'sps'	string	(default "best")
+			global
+			{not in Vi}
+			{not available when compiled without the |+syntax|
+			feature}
+	Methods used for spelling suggestions.  Both for the |z?| command and
+	the |spellsuggest()| function.  This is a comma-separated list of
+	items:
+
+	best		Internal method that works best for English.  Finds
+			changes like "fast" and uses a bit of sound-a-like
+			scoring to improve the ordering.
+
+	double		Internal method that uses two methods and mixes the
+			results.  The first method is "fast", the other method
+			computes how much the suggestion sounds like the bad
+			word.  That only works when the language specifies
+			sound folding.  Can be slow and doesn't always give
+			better results.
+
+	fast		Internal method that only checks for simple changes:
+			character inserts/deletes/swaps.  Works well for
+			simple typing mistakes.
+
+	file:{filename} Read file {filename}, which must have two columns,
+			separated by a slash.  The first column contains the
+			bad word, the second column the suggested good word.
+			Example:
+				theribal/terrible ~
+			Use this for common mistakes that do not appear at the
+			top of the suggestion list with the internal methods.
+			Lines without a slash are ignored, use this for
+			comments.
+			The file is used for all languages.
+
+	expr:{expr}	Evaluate expression {expr}.  Use a function to avoid
+			trouble with spaces.  |v:val| holds the badly spelled
+			word.  The expression must evaluate to a List of
+			Lists, each with a suggestion and a score.
+			Example:
+				[['the', 33], ['that', 44]]
+			Set 'verbose' and use |z?| to see the scores that the
+			internal methods use.  A lower score is better.
+			This may invoke |spellsuggest()| if you temporarily
+			set 'spellsuggest' to exclude the "expr:" part.
+			Errors are silently ignored, unless you set the
+			'verbose' option to a non-zero value.
+
+	Only one of "best", "double" or "fast" may be used.  The others may
+	appear several times in any order.  Example: >
+		:set sps=file:~/.vim/sugg,best,expr:MySuggest()
+<
+	This option cannot be set from a |modeline| or in the |sandbox|, for
+	security reasons.
+
+
 			*'splitbelow'* *'sb'* *'nosplitbelow'* *'nosb'*
 'splitbelow' 'sb'	boolean	(default off)
 			global
@@ -5523,9 +5816,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	'laststatus' is 2) is controlling the output of |CTRL-G|.
 
 	field	    meaning ~
-	-	    Left justify the item. The default is right justified
+	-	    Left justify the item.  The default is right justified
 		    when minwid is larger than the length of the item.
-	0	    Leading zeroes in numeric items. Overridden by '-'.
+	0	    Leading zeroes in numeric items.  Overridden by '-'.
 	minwid	    Minimum width of the item, padding as set by '-' & '0'.
 		    Value must be 50 or less.
 	maxwid	    Maximum width of the item.  Truncation occurs with a '<'
@@ -5566,7 +5859,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	      Mnemonic: Offset from start of file (with one added)
 	      {not available when compiled without |+byte_offset| feature}
 	O N   As above, in hexadecimal.
-	N N   Printer page number. (Only works in the 'printheader' option.)
+	N N   Printer page number.  (Only works in the 'printheader' option.)
 	l N   Line number.
 	L N   Number of lines in buffer.
 	c N   Column number.
@@ -5575,7 +5868,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	p N   Percentage through file in lines as in |CTRL-G|.
 	P S   Percentage through file of displayed window.  This is like the
 	      percentage described for 'ruler'.  Always 3 in length.
-	a S   Argument list status as in default title. ({current} of {max})
+	a S   Argument list status as in default title.  ({current} of {max})
 	      Empty if the argument file count is zero or one.
 	{ NF  Evaluate expression between '{' and '}' and substitute result.
 	( -   Start of item group.  Can be used for setting the width and
@@ -5586,7 +5879,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	= -   Separation point between left and right aligned items.
 	      No width fields allowed.
 	* -   Set highlight group to User{N}, where {N} is taken from the
-	      minwid field. eg. %1*.  Restore normal highlight with %* or %0*.
+	      minwid field, e.g. %1*.  Restore normal highlight with %* or %0*.
 	      The difference between User{N} and StatusLine  will be applied
 	      to StatusLineNC for the statusline of non-current windows.
 	      The number N must be between 1 and 9.  See |hl-User1..9|
@@ -5597,10 +5890,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 	with a space it is assumed that it wants to separate itself from
 	anything but other flags.  That is: A leading comma is removed if the
 	preceding character stems from plaintext.  A leading space is removed
-	if the preceding character stems from another active flag. This will
+	if the preceding character stems from another active flag.  This will
 	make a nice display when flags are used like in the examples below.
 
-	When all items in a group becomes an empty string (ie. flags that are
+	When all items in a group becomes an empty string (i.e. flags that are
 	not set) and a minwid is not set for the group, the whole group will
 	become empty.  This will make a group like the following disappear
 	completely from the statusline when none of the flags are set. >
@@ -5609,7 +5902,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Beware that an expression is evaluated each and every time the status
 	line is displayed.  The current buffer and current window will be set
 	temporarily to that of the window (and buffer) whose statusline is
-	currently being drawn. The expression will evaluate in this context.
+	currently being drawn.  The expression will evaluate in this context.
 	The variable "actual_curbuf" is set to the 'bufnr()' number of the
 	real current buffer.  The expression is evaluated in the |sandbox|.
 
@@ -5622,7 +5915,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Otherwise the result is taken as flag text and applied to the rules
 	described above.
 
-	Watch out for errors in expressions.  They may render Vim unusable !
+	Watch out for errors in expressions.  They may render Vim unusable!
 	If you are stuck, hold down ':' or 'Q' to get a prompt, then quit and
 	edit your .vimrc or whatever with "vim -u NONE" to get it right.
 
@@ -5719,9 +6012,23 @@ A jump table for the options with a short description can be found at |Q_op|.
 			also used in all buffer related split commands, for
 			example ":sbuffer", ":sbnext", or ":sbrewind".
 	   split	If included, split the current window before loading
-			a buffer. Otherwise: do not split, use current window.
+			a buffer.  Otherwise: do not split, use current window.
 			Supported in |quickfix| commands that display errors.
 
+						*'synmaxcol'* *'smc'*
+'synmaxcol' 'smc'	number	(default 3000)
+			local to buffer
+			{not in Vi}
+			{not available when compiled without the |+syntax|
+			feature}
+	Maximum column in which to search for syntax items.  With longer lines
+	some parts may not be highlighted and following text may not be
+	highlighted correctly (e.g., when the start or end of a region is not
+	recognized because it is beyond 'synmaxcol').
+	This helps to avoid very slow redrawing for an XML file that is one
+	long line.
+	Set to zero to remove the limit.
+
 						*'syntax'* *'syn'*
 'syntax' 'syn'		string	(default empty)
 			local to buffer
@@ -5733,7 +6040,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Otherwise this option does not always reflect the current syntax (the
 	b:current_syntax variable does).
 	This option is most useful in a modeline, for a file which syntax is
-	not automatically recognized.  Example, for in an IDL file: >
+	not automatically recognized.  Example, in an IDL file: >
 		/* vim: set syntax=idl : */
 <	To switch off syntax highlighting for the current file, use: >
 		:set syntax=OFF
@@ -6241,10 +6548,12 @@ A jump table for the options with a short description can be found at |Q_op|.
 				"s"  = button state
 				"c"  = column plus 33
 				"r"  = row plus 33
+	   		This only works up to 223 columns!  See "dec" for a
+			solution.
 	   xterm2	Works like "xterm", but with the xterm reporting the
 			mouse position while the mouse is dragged.  This works
 			much faster and more precise.  Your xterm must at
-			least at patchlevel 88	/ XFree 3.3.3 for this to
+			least at patchlevel 88 / XFree 3.3.3 for this to
 			work.  See below for how Vim detects this
 			automatically.
 							*netterm-mouse*
@@ -6254,6 +6563,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 							*dec-mouse*
 	   dec		DEC terminal mouse handling.  The mouse generates a
 			rather complex sequence, starting with "<Esc>[".
+			This is also available for an Xterm, if it was
+			configured with "--enable-dec-locator".
 							*jsbterm-mouse*
 	   jsbterm	JSB term mouse handling.
 							*pterm-mouse*
@@ -6354,6 +6665,21 @@ A jump table for the options with a short description can be found at |Q_op|.
 	This option can also be set with the "-V" argument.  See |-V|.
 	This option is also set by the |:verbose| command.
 
+	When the 'verbosefile' option is set then the verbose messages are not
+	displayed.
+
+						*'verbosefile'* *'vfile'*
+'verbosefile' 'vfile'	string	(default empty)
+			global
+			{not in Vi}
+	When not empty all messages are written in a file with this name.
+	When the file exists messages are appended.
+	Writing to the file ends when Vim exits or when 'verbosefile' is made
+	empty.
+	Setting 'verbosefile' to a new value is like making it empty first.
+	The difference with |:redir| is that verbose messages are not
+	displayed when 'verbosefile' is set.
+
 						*'viewdir'* *'vdir'*
 'viewdir' 'vdir'	string	(default for Amiga, MS-DOS, OS/2 and Win32:
 							 "$VIM/vimfiles/view",
@@ -6447,7 +6773,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 		saved.  When not included, the value of 'history' is used.
 	c	When included, convert the text in the viminfo file from the
 		'encoding' used when writing the file to the current
-		'encoding'. See |viminfo-encoding|.
+		'encoding'.  See |viminfo-encoding|.
 	f	Whether file marks need to be stored.  If zero, file marks ('0
 		to '9, 'A to 'Z) are not stored.  When not present or when
 		non-zero, they are all stored.  '0 is used for the current
@@ -6590,8 +6916,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 			global
 			{not in Vi}
 	'wildcharm' works exactly like 'wildchar', except that it is
-	recognized when used inside a macro. You can find "spare" command-line
-	keys suitable for this option by looking at |ex-edit-index|. Normally
+	recognized when used inside a macro.  You can find "spare" command-line
+	keys suitable for this option by looking at |ex-edit-index|.  Normally
 	you'll never actually type 'wildcharm', just use it in mappings that
 	automatically invoke completion mode, e.g.: >
 		:set wcm=<C-Z>
@@ -6681,7 +7007,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 	Examples: >
 		:set wildmode=full
-<	Complete first full match, next match, etc. (the default) >
+<	Complete first full match, next match, etc.  (the default) >
 		:set wildmode=longest,full
 <	Complete longest common string, then each full match >
 		:set wildmode=list:full
@@ -6728,6 +7054,20 @@ A jump table for the options with a short description can be found at |Q_op|.
 	This option is not used for <F10>; on Win32 and with GTK <F10> will
 	select the menu, unless it has been mapped.
 
+						*'window'* *'wi'*
+'window' 'wi'		number  (default screen height - 1)
+			global
+	Window height.  Do not confuse this with the height of the Vim window,
+	use 'lines' for that.
+	Used for |CTRL-F| and |CTRL-B| when there is only one window and the
+	value is smaller than 'lines' minus one.  The screen will scroll
+	'window' minus two lines, with a minimum of one.
+	When 'window' is equal to 'lines' minus one CTRL-F and CTRL-B scroll
+	in a much smarter way, taking care of wrapping lines.
+	When resizing the Vim window, the value is smaller than 1 or more than
+	or equal to 'lines' it will be set to 'lines' minus 1.
+	{Vi also uses the option to specify the number of displayed lines}
+
 						*'winheight'* *'wh'* *E591*
 'winheight' 'wh'	number	(default 1)
 			global

runtime/doc/os_390.txt

@@ -1,4 +1,4 @@
-*os_390.txt*    For Vim version 7.0aa.  Last change: 2003 Jun 03
+*os_390.txt*    For Vim version 7.0aa.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL	  by Ralf Schandl
@@ -12,17 +12,17 @@ This file contains the particulars for the z/OS UNIX version of Vim.
 4. ASCII/EBCDIC dependent scripts	|zOS-has-ebcdic|
 5. XTerm Problems			|zOS-xterm|
 6. Motif Problems			|zOS-Motif|
-7  Bugs					|zOS-Bugs|
+7. Bugs					|zOS-Bugs|
 8. Known weaknesses			|zOS-weaknesses|
 9. Changes				|zOS-changes|
 
 DISCLAIMER: ~
-We are IBM employees, but IBM is not responsible for this port. This is our
+We are IBM employees, but IBM is not responsible for this port.  This is our
 private fun, and is provided in the hopes that it may be useful to others.
 
 Please note that this software has NOT been submitted to any formal IBM
-testing and is published AS IS. Please do not contact IBM for support for this
-software, as it is not an official component of any IBM product. IT IS NOT
+testing and is published AS IS.  Please do not contact IBM for support for this
+software, as it is not an official component of any IBM product.  IT IS NOT
 SUPPORTED, GUARANTEED, OR RELATED WHATSOEVER TO IBM.
 
 Contributors: ~
@@ -60,22 +60,22 @@ Vim should compile, link, and run right out of the box on a standard IBM z/OS
 UNIX mainframe.  I've personally run it on z/OS V1R2 and V1R3 machines without
 problems.
 
-Many changes had to be done to the code to port Vim to z/OS UNIX. As like
-most UNIX programs, Vim contained heavy ASCII dependencies. I might have
+Many changes had to be done to the code to port Vim to z/OS UNIX.  As like
+most UNIX programs, Vim contained heavy ASCII dependencies.  I might have
 missed an ASCII dependency, or it is possible that a new one has been added
-with a feature or bug fix. Most programmers are simply not aware of possible
-ASCII/EBCDIC conversion issues. If you hit a problem that seems related to
+with a feature or bug fix.  Most programmers are simply not aware of possible
+ASCII/EBCDIC conversion issues.  If you hit a problem that seems related to
 this, feel free to contact us at the email addresses above.
 
 One indication of ASCII/EBCDIC conversion problems is screen corruption with
 "unprintable" characters.  For example, at one point the errorbell was broken
-in Vim. Any time Vim tried to ring the terminal bell an ASCII character 0x07
-would be printed. This works fine on most terminals, but is broken on an
-EBCDIC one. The correct solution was to define a different value for the bell
+in Vim.  Any time Vim tried to ring the terminal bell an ASCII character 0x07
+would be printed.  This works fine on most terminals, but is broken on an
+EBCDIC one.  The correct solution was to define a different value for the bell
 character on EBCDIC systems.
 
 Remember, it's only possible to fix a bug if the community knows about it.
-Don't rely on someone else to report it! See the section |bug-reports|.
+Don't rely on someone else to report it!  See the section |bug-reports|.
 
 ==============================================================================
 3. Building VIM for z/OS UNIX		*OS390-building* *zOS-building*
@@ -83,12 +83,12 @@ Don't rely on someone else to report it! See the section |bug-reports|.
 A word on debugging code first: ~
 
 The normal run of configure adds the flag '-g' to the compiler options,
-to include debugging information into the executable. This information
+to include debugging information into the executable.  This information
 are normally removed from the executable with the strip command during
-installation. On z/OS UNIX, it is not possible to remove this from
-the executable. The strip command exists on z/OS UNIX and is called
+installation.  On z/OS UNIX, it is not possible to remove this from
+the executable.  The strip command exists on z/OS UNIX and is called
 during the installation, but it does nothing.  It is equivalent to the
-'touch' command. This is due to the way debug symbols are stored in the
+'touch' command.  This is due to the way debug symbols are stored in the
 objects generated by the compiler.
 
 If you want to build Vim without debugging code, export the environment
@@ -99,11 +99,11 @@ variable CFLAGS set to an empty string before you call the configure script.
 
 Building without X11: ~
 
-Note: Use cc to build Vim. The c89 compiler has stricter syntax checking
+Note: Use cc to build Vim.  The c89 compiler has stricter syntax checking
 and will not compile Vim cleanly.
 
 If you build VIM without X11 support, compiling and building is
-straightforward. Don't forget to export _CC_CCMODE=1 before calling
+straightforward.  Don't forget to export _CC_CCMODE=1 before calling
 configure and make.
 >
     $ export _CC_CCMODE=1
@@ -114,7 +114,7 @@ configure and make.
 	Test notes:
 	Test 11 will fail if you do not have gzip installed.
 	Test 42 will fail, as VIM on z/OS UNIX doesn't support the multibyte
-	feature. (David Moore: "Doesn't work _yet_!  :-)  I'll see what I
+	feature.  (David Moore: "Doesn't work _yet_!  :-)  I'll see what I
 	can do.")
 >
 
@@ -123,8 +123,8 @@ configure and make.
 
 Building with X11: ~
 
-There are two ways for building Vim with X11 support. You can link it
-statically with the X11 libraries or can bind it with the X11 DLLs. The
+There are two ways for building Vim with X11 support.  You can link it
+statically with the X11 libraries or can bind it with the X11 DLLs.  The
 statically linked version results in a huge executable (~13MB), while the
 dynamically linked executable is much smaller (~4.5MB).
 
@@ -137,7 +137,7 @@ Here is what you do, if you want Motif:
      VIM is now linked statically with the X11 libraries.
 
   b) Dynamic link:
-     Make VIM as described for the static link. Then change the contents of
+     Make VIM as described for the static link.  Then change the contents of
      the 'auto/link.sed' file by appending: >
 	s%-lXm  *%/usr/lib/Xm.x %g
 	s%-lX11  *%/usr/lib/X11.x %g
@@ -155,7 +155,7 @@ See the Makefile and the file link.sh on how link.sed is used.
 ==============================================================================
 4. ASCII/EBCDIC dependent scripts	*OS390-has-ebcdic* *zOS-has-ebcdic*
 
-For the internal script language the feature "ebcdic" was added. With this
+For the internal script language the feature "ebcdic" was added.  With this
 you can fix ASCII dependent scripts like this:
 >
     if has("ebcdic")
@@ -178,7 +178,7 @@ the screen with <C-L> or if you can't move to the left with the cursor key on
 the command line, try adding >
 	:set t_le=^H
 <
-to your .vimrc. Note: '^H' is one character, hit <C-V><C-H> to get it.
+to your .vimrc.  Note: '^H' is one character, hit <C-V><C-H> to get it.
 
 ==============================================================================
 6. Motif Problems			*OS390-Motif* *zOS-Motif*
@@ -203,9 +203,9 @@ There is no solution for this as of yet.
 8. Known weaknesses			*OS390-weaknesses* *zOS-weaknesses*
 
 - No binary search in tag files.
-  The program /bin/sort sorts by ASCII value by default. This program is
-  normally used by ctags to sort the tags. There might be a version of
-  ctags out there, that does it right, but we can't be sure. So this seems to
+  The program /bin/sort sorts by ASCII value by default.  This program is
+  normally used by ctags to sort the tags.  There might be a version of
+  ctags out there, that does it right, but we can't be sure.  So this seems to
   be a permanent restriction.
 
 - Multibyte support (utf-8) doesn't work, it's disabled at compile time.
@@ -246,10 +246,10 @@ not an exhaustive summary of all the modifications made to the code base.
   screen corruption problems in gVim reported by Anthony Giorgio.
 
   Anthony Giorgio updated this document:
-	- Changed OS/390 to z/OS where appropriate. IBM decided to rename
+	- Changed OS/390 to z/OS where appropriate.  IBM decided to rename
 		all of its servers and operating systems.  z/OS and OS/390
 		are the same product, but the version numbering system was
-		reset for the name change. (e.g. OS/390 V2R11 == z/OS V1R1)
+		reset for the name change (e.g. OS/390 V2R11 == z/OS V1R1).
 	- Added information about second edition of the Open Source Redbook.
 	- Moved Redbook information to a separate section.
 	- Various tweaks and changes.
@@ -265,16 +265,16 @@ not an exhaustive summary of all the modifications made to the code base.
 
 6.0q (alpha):
   Minor changes for nrformats=alpha (see |'nrformats'|).
-  Problem with hard-coded keycode for the English pound sign. Added a define in
+  Problem with hard-coded keycode for the English pound sign.  Added a define in
   ascii.h
   Disabled multibyte for EBCDIC in feature.h
 
 6.0f (alpha):
-  First compile of Vim 6 on z/OS UNIX. Some minor changes were needed.
+  First compile of Vim 6 on z/OS UNIX.  Some minor changes were needed.
 
   Finally found the reason why make from the top level didn't work (I must have
-  been blind before!). The Makefile contained a list of targets in one target
-  line. On all other UNIX's the macro $@ evaluates to the first target in this
+  been blind before!).  The Makefile contained a list of targets in one target
+  line.  On all other UNIX's the macro $@ evaluates to the first target in this
   list, only on z/OS UNIX it evaluates to the last one :-(.
 
 5.6-390d:
@@ -282,7 +282,7 @@ not an exhaustive summary of all the modifications made to the code base.
 
 5.6-390c:
   I grepped through the source and examined every spot with a character
-  involved in a operation (+-). I hope I now found all EBCDIC/ASCII
+  involved in a operation (+-).  I hope I now found all EBCDIC/ASCII
   stuff, but ....
 
   Fixed:
@@ -295,7 +295,7 @@ not an exhaustive summary of all the modifications made to the code base.
     - fixed quick-access table in findoptions()
     - fixed 'g^H' select mode
     - fixed tgetstr() 'get terminal capability string', ESC and
-	    Ctrl chars where wrong. (Not used on OS/390 UNIX)
+	    Ctrl chars where wrong.  (Not used on OS/390 UNIX)
 
 
   ctags:
@@ -311,13 +311,13 @@ not an exhaustive summary of all the modifications made to the code base.
 	- added special compiler and linker options if building with X11
     - configure:
 	- after created via autoconf hand-edited it to make the test for
-	  ICEConnectionNumber work. This is a autoconf problem. OS/390 UNIX
+	  ICEConnectionNumber work.  This is a autoconf problem.  OS/390 UNIX
 	  needs -lX11 for this.
     - Makefile
 	- Don't include the lib directories ('-L...') into the variable
-	  ALL_LIBS. Use own variable ALL_LIB_DIRS instead. A fully POSIX
+	  ALL_LIBS.  Use own variable ALL_LIB_DIRS instead.  A fully POSIX
 	  compliant compiler must not accept objects/libraries and options
-	  mixed. Now we can call the linker like this:
+	  mixed.  Now we can call the linker like this:
 
 	    $(CC) $(LDFLAGS) $(ALL_LIB_DIRS) $(OBJ) $(ALL_LIBS)
 

runtime/doc/os_amiga.txt

@@ -1,4 +1,4 @@
-*os_amiga.txt*  For Vim version 7.0aa.  Last change: 2004 Jun 28
+*os_amiga.txt*  For Vim version 7.0aa.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -13,7 +13,7 @@ Installation on the Amiga:
   look for the file "VIM:doc/help.txt" (for the help command).
   Setting the environment variable $VIM also works.  And the other way around:
   when $VIM used and it is not defined, "VIM:" is used.
-- With DOS 1.3 or earlier: Put "arp.library" in "libs:". Vim must have been
+- With DOS 1.3 or earlier: Put "arp.library" in "libs:".  Vim must have been
   compiled with the |+ARP| feature enabled.  Make sure that newcli and run are
   in "C:" (for executing external commands).
 - Put a shell that accepts a command with "-c" (e.g. "Csh" from Fish disk
@@ -21,13 +21,13 @@ Installation on the Amiga:
   executing external commands).
 
 If you have sufficient memory you can avoid startup delays by making Vim and
-csh resident with the command "rez csh vim". You will have to put
-"rezlib.library" in your "libs:" directory. Under 2.0 you will need rez
+csh resident with the command "rez csh vim".  You will have to put
+"rezlib.library" in your "libs:" directory.  Under 2.0 you will need rez
 version 0.5.
 
 If you do not use digraphs, you can save some memory by recompiling without
-the |+digraphs| feature. If you want to use Vim with other terminals you can
-recompile with the TERMCAP option. Vim compiles with Manx 5.x and SAS 6.x.
+the |+digraphs| feature.  If you want to use Vim with other terminals you can
+recompile with the TERMCAP option.  Vim compiles with Manx 5.x and SAS 6.x.
 See the makefiles and feature.h.
 
 If you notice Vim crashes on some files when syntax highlighting is on, or
@@ -47,7 +47,7 @@ If you want to use different colors set the termcap codes:
 	t_ZH (for italic text)
 	t_ZR (for normal text after t_ZH)
 
-Standard ANSI escape sequences are used. The codes are:
+Standard ANSI escape sequences are used.  The codes are:
 30 grey char   40 grey cell   >0 grey background    0 all attributes off
 31 black char  41 black cell  >1 black background   1 boldface
 32 white char  42 white cell  >2 white background   2 faint
@@ -57,8 +57,8 @@ Standard ANSI escape sequences are used. The codes are:
 36 white char  46 white cell  >6 white background   8 invisible
 37 blue char   47 blue cell   >7 blue background
 
-The codes with '>' must be the last. The cell and background color should be
-the same. The codes can be combined by separating them with a semicolon. For
+The codes with '>' must be the last.  The cell and background color should be
+the same.  The codes can be combined by separating them with a semicolon.  For
 example to get white text on a blue background: >
   :set t_me=^V<Esc>[0;32;43;>3m
   :set t_se=^V<Esc>[0;32;43;>3m
@@ -72,14 +72,14 @@ example to get white text on a blue background: >
 
 When using multiple commands with a filter command, e.g. >
   :r! echo this; echo that
-Only the output of the last command is used. To fix this you have to group the
-commands. This depends on the shell you use (that is why it is not done
-automatically in Vim). Examples: >
+Only the output of the last command is used.  To fix this you have to group the
+commands.  This depends on the shell you use (that is why it is not done
+automatically in Vim).  Examples: >
   :r! (echo this; echo that)
   :r! {echo this; echo that}
 
 Commands that accept a single file name allow for embedded spaces in the file
-name. However, when using commands that accept several file names, embedded
+name.  However, when using commands that accept several file names, embedded
 spaces need to be escaped with a backslash.
 
 ------------------------------------------------------------------------------
@@ -94,8 +94,8 @@ For the latest info about the MorphOS version:
 Problems ~
 
 There are a couple of problems which are not MorphOS related but more Vim and
-UN*X related. When starting up Vim in ram: it complains with a nag requester
-from MorphOS please simply ignore it. Another problem is when running Vim as
+UN*X related.  When starting up Vim in ram: it complains with a nag requester
+from MorphOS please simply ignore it.  Another problem is when running Vim as
 is some plugins will cause a few problems which you can ignore as well.
 Hopefully someone will be fixing it over the time.
 
@@ -116,7 +116,7 @@ Installation ~
 
 	ftp://ftp.vim.org/pub/vim/amiga/vim62rt.tgz
 
-   and unpack it in your 'Apps' directory of the MorphOS installation. For me
+   and unpack it in your 'Apps' directory of the MorphOS installation.  For me
    this would create following directory hierarchy:
 
 	MorphOS:Apps/Vim/Vim62/...
@@ -130,8 +130,8 @@ Installation ~
 
 4) Copy the '.vimrc' file to s:
 
-5) There is also a file named 'color-sequence' included in this archive. This
-   will set the MorphOS Shell to show ANSI colors. Please copy the file to s:
+5) There is also a file named 'color-sequence' included in this archive.  This
+   will set the MorphOS Shell to show ANSI colors.  Please copy the file to s:
    and change the s:shell-startup to:
 
 	;Begin VIM

runtime/doc/os_beos.txt

@@ -1,4 +1,4 @@
-*os_beos.txt*	For Vim version 7.0aa.  Last change: 2004 May 01
+*os_beos.txt*	For Vim version 7.0aa.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -31,11 +31,11 @@ matters not discussed in this file, Vim behaves very much like the Unix
 1. General						*beos-general*
 
 The default syntax highlighting mostly works with different foreground colors
-to highlight items. This works best if you set your Terminal window to a
-darkish background and light letters. Some middle-grey background (for
+to highlight items.  This works best if you set your Terminal window to a
+darkish background and light letters.  Some middle-grey background (for
 instance (r,g,b)=(168,168,168)) with black letters also works nicely.  If you
 use the default light background and dark letters, it may look better to
-simply reverse the notion of foreground and background color settings. To do
+simply reverse the notion of foreground and background color settings.  To do
 this, add this to your .vimrc file (where <Esc> may need to be replaced with
 the escape character): >
 
@@ -48,7 +48,7 @@ the escape character): >
 2. Compiling Vim					*beos-compiling*
 
 From the Advanced Access Preview Release (AAPR) on, Vim can be configured with
-the standard configure script. To get the compiler and its flags right, use
+the standard configure script.  To get the compiler and its flags right, use
 the following command-line in the shell (you can cut and paste it in one go):
 
 CC=$BE_C_COMPILER CFLAGS="$BE_DEFAULT_C_FLAGS -O7" \
@@ -60,9 +60,9 @@ When configure has run, and you wish to enable GUI support, you must edit the
 config.mk file so that the lines with GUI_xxx refer to $(BEOSGUI_xxx) instead
 of $(NONE_xxx).
 Alternatively you can make this change in the Makefile; it will have a
-more permanent effect. Search for "NONE_".
+more permanent effect.  Search for "NONE_".
 
-After compilation you need to add the resources to the binary. Add the
+After compilation you need to add the resources to the binary.  Add the
 following few lines near the end (before the line with "exit $exit_value") of
 the link.sh script to do this automatically.
 
@@ -81,12 +81,12 @@ You will need it when using "make install" to install Vim.
 Now type "make" to compile Vim, then "make install" to install it.
 
 If you want to install Vim by hand, you must copy Vim to $HOME/config/bin, and
-create a bunch of symlinks to it ({g,r,rg}{vim,ex,view}). Furthermore you must
-copy Vims configuration files to $HOME/config/share/vim:
+create a bunch of symlinks to it ({g,r,rg}{vim,ex,view}).  Furthermore you must
+copy Vim's configuration files to $HOME/config/share/vim:
 vim-5.0s/{*.vim,doc,syntax}.  For completeness, you should also copy the nroff
-manual pages to $HOME/config/man/man1. Don't forget ctags/ctags and xxd/xxd!
+manual pages to $HOME/config/man/man1.  Don't forget ctags/ctags and xxd/xxd!
 
-Obviously, you need the unlimited linker to actually link Vim. See
+Obviously, you need the unlimited linker to actually link Vim.  See
 http://www.metrowerks.com for purchasing the CodeWarrior compiler for BeOS.
 There are currently no other linkers that can do the job.
 
@@ -97,7 +97,7 @@ you have the appropriate files installed. |beos-perl|
 3. Timeout in the Terminal				*beos-timeout*
 
 Because some POSIX/UNIX features are still missing[1], there is no direct OS
-support for read-with-timeout in the Terminal. This would meat that you cannot
+support for read-with-timeout in the Terminal.  This would mean that you cannot
 use :mappings of more than one character, unless you also :set notimeout.
 |'timeout'|
 
@@ -112,16 +112,16 @@ indistinctive character sequences.
 These problems do not exist in the GUI.
 
 [1]: there is no select() on file descriptors; also the termios VMIN and VTIME
-settings do not seem to work properly. This has been the case since DR7 at
+settings do not seem to work properly.  This has been the case since DR7 at
 least and still has not been fixed as of PR2.
 
 							*beos-unicode*
 4. Unicode vs. Latin1					*beos-utf8*
 
 BeOS uses Unicode and UTF-8 for text strings (16-bit characters encoded to
-8-bit characters). Vim assumes ISO-Latin1 or other 8-bit character codes.
-This does not produce the desired results for non-ASCII characters. Try the
-command :digraphs to see. If they look messed up, use :set isprint=@ to
+8-bit characters).  Vim assumes ISO-Latin1 or other 8-bit character codes.
+This does not produce the desired results for non-ASCII characters.  Try the
+command :digraphs to see.  If they look messed up, use :set isprint=@ to
 (slightly) improve the display of ISO-Latin1 characters 128-255.  This works
 better in the GUI, depending on which font you use (below).
 
@@ -133,46 +133,46 @@ You may also use the /boot/bin/xtou command to convert UTF-8 files from (xtou
 
 Normally Vim starts with the GUI if you start it as gvim or vim -g.  The BeOS
 version tries to determine if it was started from the Tracker instead of the
-Terminal, and if so, use the GUI anyway. However, the current detection scheme
-is fooled if you use the command "vim - </dev/null" or "vim filename &". The
+Terminal, and if so, use the GUI anyway.  However, the current detection scheme
+is fooled if you use the command "vim - </dev/null" or "vim filename &".  The
 latter can be called a feature but probably only works because there is no
 BSD-style job control.
 
 Stuff that does not work yet:
 
 - Running external commands from the GUI does not work 100% (again due to lack
-  of support for select()). There was a choice between seeing the command's
-  output, or being able to interrupt it. I chose for seeing the output. Even
+  of support for select()).  There was a choice between seeing the command's
+  output, or being able to interrupt it.  I chose for seeing the output.  Even
   now the command sometimes crashes mysteriously, apparently in Be's
-  malloc_internal() called from the putenv() function, after fork()ing. (data
-  access exception occurred, ec01b0ec:  90e80000 *stw r7, 0x0000 (r8))(:!ls
-  works usually, :r !ls usually doesn't). This has been reported as bug
+  malloc_internal() called from the putenv() function, after fork()ing.  (data
+  access exception occurred, ec01b0ec:  90e80000 *stw r7, 0x0000 (r8)).  (:!ls
+  works usually, :r !ls usually doesn't).  This has been reported as bug
   # 971215-083826.
 - The window title.
 - Starting the GUI from the Terminal version with :gui always acts as if
-  :gui -f were used. There is no way to fix this that I can see.
+  :gui -f were used.  There is no way to fix this that I can see.
 - There are some small display glitches here and there that I hope to clean up
-  later. Most of them occur when the window is partially obscured. Some of
+  later.  Most of them occur when the window is partially obscured.  Some of
   them seem to be bugs in BeOS, because the Terminal has similar glitches.
-- Mouse up events are not generated when outside the window. This is a bug in
-  BeOS. You can notice this when selecting text and moving the cursor outside
+- Mouse up events are not generated when outside the window.  This is a bug in
+  BeOS.  You can notice this when selecting text and moving the cursor outside
   the window, then letting go of the mouse button.  Another way is when you
   drag the scrollbar and do the same thing.  Because Vim still thinks you are
-  still playing with the scrollbar it won't change it itself. I provided a
+  still playing with the scrollbar it won't change it itself.  I provided a
   workaround which kicks in when the window is activated or deactivated (so it
   works best with focus- follows-mouse (/boot/bin/ffm) turned on).
 - The cursor does not flash (very low priority; I'm not sure I even like it
   when it flashes)
 
 
-The $VIM directory					*beos-vimdir*
+6. The $VIM directory					*beos-vimdir*
 
 $VIM is the symbolic name for the place where Vims support files are stored.
 The default value for $VIM is set at compile time and can be determined with >
 
   :version
 
-The normal value is /boot/home/config/share/vim. If you don't like it you can
+The normal value is /boot/home/config/share/vim.  If you don't like it you can
 set the VIM environment variable to override this, or set 'helpfile' in your
 .vimrc: >
 
@@ -189,7 +189,7 @@ session, unless you use the File Types application to set Vim to be "Single
 Launch") or on the Vim window (starts editing the files).  Dropping a folder
 sets Vim's current working directory. |:cd| |:pwd| If you drop files or
 folders with either SHIFT key pressed, Vim changes directory to the folder
-that contains the first item dropped. When starting Vim, there is no need to
+that contains the first item dropped.  When starting Vim, there is no need to
 press shift: Vim behaves as if you do.
 
 Files dropped set the current argument list. |argument-list|
@@ -198,10 +198,10 @@ Files dropped set the current argument list. |argument-list|
 8. Single Launch vs. Multiple Launch			*beos-launch*
 
 As distributed Vim's Application Flags (as seen in the FileTypes preference)
-are set to Multiple Launch. If you prefer, you can set them to Single Launch
+are set to Multiple Launch.  If you prefer, you can set them to Single Launch
 instead.  Attempts to start a second copy of Vim will cause the first Vim to
-open the files instead. This works from the Tracker but also from the command
-line. In the latter case, non-file (option) arguments are not supported.
+open the files instead.  This works from the Tracker but also from the command
+line.  In the latter case, non-file (option) arguments are not supported.
 
 NB: Only the GUI version has a BApplication (and hence Application Flags).
 This section does not apply to the GUI-less version, should you compile one.
@@ -214,16 +214,16 @@ Set fonts with >
   :set guifont=Courier10_BT/Roman/10
 
 where the first part is the font family, the second part the style, and the
-third part the size. You can use underscores instead of spaces in family and
+third part the size.  You can use underscores instead of spaces in family and
 style.
 
-Best results are obtained with monospaced fonts (such as Courier). Vim
+Best results are obtained with monospaced fonts (such as Courier).  Vim
 attempts to use all fonts in B_FIXED_SPACING mode but apparently this does not
 work for proportional fonts (despite what the BeBook says).
 
 Vim also tries to use the B_ISO8859_1 encoding, also known as ISO Latin 1.
-This also does not work for all fonts. It does work for Courier, but not for
-ProFontISOLatin1/Regular (strangely enough). You can verify this by giving the >
+This also does not work for all fonts.  It does work for Courier, but not for
+ProFontISOLatin1/Regular (strangely enough).  You can verify this by giving the >
 
   :digraphs
 
@@ -270,30 +270,30 @@ because the ALT (aka COMMAND) keys are not passed to applications.
 
 Vim calls the various mouse buttons LeftMouse, MiddleMouse and RightMouse.  If
 you use the default Mouse preference settings these names indeed correspond to
-reality. Vim uses this mapping:
+reality.  Vim uses this mapping:
 
     Button 1 -> LeftMouse,
     Button 2 -> RightMouse,
     Button 3 -> MiddleMouse.
 
 If your mouse has fewer than 3 buttons you can provide your own mapping from
-mouse clicks with modifier(s) to other mouse buttons. See the file
+mouse clicks with modifier(s) to other mouse buttons.  See the file
 vim-5.x/macros/swapmous.vim for an example.		|gui-mouse-mapping|
 
 
 12. Color names						*beos-colors*
 
-Vim has a number of color names built-in. Additional names are read from the
-file $VIMRUNTIME/rgb.txt, if present. This file is basically the color
-database from X. Names used from this file are cached for efficiency.
+Vim has a number of color names built-in.  Additional names are read from the
+file $VIMRUNTIME/rgb.txt, if present.  This file is basically the color
+database from X.  Names used from this file are cached for efficiency.
 
 
 13. Compiling with Perl					*beos-perl*
 
-Compiling with Perl support enabled is slightly tricky. The Metrowerks
-compiler has some strange ideas where to search for include files. Since
+Compiling with Perl support enabled is slightly tricky.  The Metrowerks
+compiler has some strange ideas where to search for include files.  Since
 several include files with Perl have the same names as some Vim header
-files, the wrong ones get included. To fix this, run the following Perl
+files, the wrong ones get included.  To fix this, run the following Perl
 script while in the vim-5.0/src directory: >
 
    preproc.pl > perl.h

runtime/doc/os_mac.txt

@@ -1,4 +1,4 @@
-*os_mac.txt*    For Vim version 7.0aa.  Last change: 2004 Dec 13
+*os_mac.txt*    For Vim version 7.0aa.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar et al.
@@ -33,7 +33,7 @@ Indianapolis IN 46220 USA
 ==============================================================================
 1. Filename Convention					*mac-filename*
 
-You can use either the unix or mac path separator or a mix of both. In order
+You can use either the unix or mac path separator or a mix of both.  In order
 to determine if the specified filename is relative to the current folder or
 absolute (i.e. relative to the "Desktop"), the following algorithm is used:
 
@@ -59,7 +59,7 @@ You can use the |$VIM| and |$VIMRUNTIME|  variable. >
 2. .vimrc and .vim files				*mac-vimfile*
 
 On the Mac files starting with a dot "." are discouraged, thus the rc files
-are named "vimrc" or "_vimrc" and "gvimrc" or "_gvimrc". These files can be in
+are named "vimrc" or "_vimrc" and "gvimrc" or "_gvimrc".  These files can be in
 any format (mac, dos or unix).  Vim can handle any file format when the
 |'nocompatible'| option is set, otherwise it will only handle mac format
 files.

runtime/doc/os_mint.txt

@@ -1,4 +1,4 @@
-*os_mint.txt*   For Vim version 7.0aa.  Last change: 2001 Sep 03
+*os_mint.txt*   For Vim version 7.0aa.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Jens M. Felderhoff
@@ -15,12 +15,12 @@ The Unix behavior described in the documentation also refers to the
 MiNT version of Vim unless explicitly stated otherwise.
 
 For wildcard expansion of <~> (home directory) you need a shell that
-expands the tilde. The vanilla Bourne shell doesn't recognize it.
+expands the tilde.  The vanilla Bourne shell doesn't recognize it.
 With csh and ksh it should work OK.
 
 The MiNT version of vim needs the termcap file /etc/termcap with the
-terminal capabilities of your terminal. Builtin termcaps are
-supported for the vt52 terminal. Termcap entries for the TOSWIN window
+terminal capabilities of your terminal.  Builtin termcaps are
+supported for the vt52 terminal.  Termcap entries for the TOSWIN window
 manager and the virtual console terminals have been appended to the
 termcap file that comes with the Vim distribution.
 

runtime/doc/os_msdos.txt

@@ -1,4 +1,4 @@
-*os_msdos.txt*  For Vim version 7.0aa.  Last change: 2004 Aug 31
+*os_msdos.txt*  For Vim version 7.0aa.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -97,7 +97,7 @@ write a file, and for filter commands.  Or Vim runs out of memory, and random
 problems may result.
 
 The Dos32 version cannot have an unlimited number of files open at any one
-time.  The limit depends on the setting of FILES in your CONFIG.SYS. This
+time.  The limit depends on the setting of FILES in your CONFIG.SYS.  This
 defaults to 15; if you need to edit a lot of files, you should increase this.
 If you do not set FILES high enough, you can get strange errors, and shell
 commands may cause a crash!
@@ -241,7 +241,7 @@ In other versions, the following can be used.
 
 How to copy/paste text from/to vim in a dos box:
 
-1) to get VIM to run in a window, instead of full screen, press alt+enter.
+1) To get VIM to run in a window, instead of full screen, press alt+enter.
    This toggles back and forth between full screen and a dos window.
    NOTE: In Windows 95 you must have the property "Fast Pasting" unchecked!
    In the properties dialog box for the MS-DOS window, go to "MS-DOS
@@ -251,25 +251,25 @@ How to copy/paste text from/to vim in a dos box:
 
 2) To paste something _into_ Vim, put Vim in insert mode.
 
-3) put the text you want to paste on the windows clipboard.
+3) Put the text you want to paste on the windows clipboard.
 
-4) Click the control box in the upper left of the Vim window. (This looks
-   like a big minus sign). If you don't want to use the mouse, you can get
+4) Click the control box in the upper left of the Vim window.  (This looks
+   like a big minus sign.)  If you don't want to use the mouse, you can get
    this with alt+spacebar.
-5) on the resulting dropdown menu choose "Edit"
-6) on the child dropdown menu choose "Paste"
+5) On the resulting dropdown menu choose "Edit".
+6) On the child dropdown menu choose "Paste".
 
 To copy something from the Vim window to the clipboard,
 
-1) select the control box to get the control drop down menu.
-2) select "Edit".
-3) select "Mark"
-4) using either the keys or the mouse, select the part of the Vim window that
-   you want to copy. To use the keys, use the arrow keys, and hold down shift
+1) Select the control box to get the control drop down menu.
+2) Select "Edit".
+3) Select "Mark".
+4) Using either the keys or the mouse, select the part of the Vim window that
+   you want to copy.  To use the keys, use the arrow keys, and hold down shift
    to extend the selection.
-5) when you've completed your selection, press 'enter.' The selection
-   is now in the windows clipboard. By the way, this can be any
-   rectangular selection, for example columns 4-25 in rows 7-10. It can
+5) When you've completed your selection, press 'enter'.  The selection
+   is now in the windows clipboard.  By the way, this can be any
+   rectangular selection, for example columns 4-25 in rows 7-10.  It can
    include anything in the VIM window: the output of a :!dir, for
    example.
 

runtime/doc/os_os2.txt

@@ -1,4 +1,4 @@
-*os_os2.txt*    For Vim version 7.0aa.  Last change: 2004 Jan 09
+*os_os2.txt*    For Vim version 7.0aa.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Paul Slootman
@@ -28,19 +28,19 @@ that are started via a shell escape from within Vim.  This specifically means
 that Vim won't be able to remove the swap file(s) associated with buffers open
 at the time the other program was started, until the other program is stopped.
 At that time, the swap file may be removed, but if Vim could not do that the
-first time, it won't be removed at all. You'll get warnings that some other
+first time, it won't be removed at all.  You'll get warnings that some other
 Vim session may be editing the file when you start Vim up again on that file.
-This can be reproduced with ":!start epm". Now quit Vim, and start Vim again
+This can be reproduced with ":!start epm".  Now quit Vim, and start Vim again
 with the file that was in the buffer at the time epm was started.  I'm working
 on this!
 
 A second problem is that Vim doesn't understand the situation when using it
 when accessing the OS/2 system via the network, e.g. using telnet from a Unix
-system, and then starting Vim. The problem seems to be that OS/2 =sometimes=
+system, and then starting Vim.  The problem seems to be that OS/2 =sometimes=
 recognizes function / cursor keys, and tries to convert those to the
-corresponding OS/2 codes generated by the "normal" PC keyboard. I've been
+corresponding OS/2 codes generated by the "normal" PC keyboard.  I've been
 testing a workaround (mapping the OS/2 codes to the correct functions), but so
-far I can't say anything conclusive (this is on Warp 3, by the way). In the
+far I can't say anything conclusive (this is on Warp 3, by the way).  In the
 meantime any help will be appreciated.
 
 
@@ -52,12 +52,12 @@ is generally available as (ask Archie about it):
     emxrt.zip     emx runtime package
 
 I've included a copy of emx.dll, which should be copied to one of the
-directories listed in your LIBPATH. Emx is GPL'ed, but the emx.dll library is
+directories listed in your LIBPATH.  Emx is GPL'ed, but the emx.dll library is
 not (read COPYING.EMX to find out what that means to you).
 
 This emx.dll is from the emxfix04.zip package, which unfortunately has a bug,
 eh, I mean a POSIX feature, in select().  Versions of Vim before 3.27 will
-appear to hang when starting (actually, while processing vimrc). Hit <Enter> a
+appear to hang when starting (actually, while processing vimrc).  Hit <Enter> a
 couple of times until Vim starts working if this happens.  Next, get an up to
 date version of Vim!
 
@@ -84,14 +84,14 @@ you get a tree of Vim files like this:
 	etc.
 
 Note: .vimrc may also be called _vimrc to accommodate those who have chosen to
-install OS/2 on a FAT file system. Vim first tries to find .vimrc and if that
+install OS/2 on a FAT file system.  Vim first tries to find .vimrc and if that
 fails, looks for _vimrc in the same place.  The existence of a .vimrc or
 _vimrc file influences the 'compatible' options, which can have unexpected side
 effects.  See |'compatible'|.
 
 If you're using network drives with OS/2, then you can install Vim on a
 network drive (including .vimrc; this is then called the "system" vimrc file),
-and then use a personal copy of .vimrc (the "user" vimrc file). This should be
+and then use a personal copy of .vimrc (the "user" vimrc file).  This should be
 located in a directory indicated by the HOME environment variable.
 
 
@@ -135,14 +135,14 @@ TERMINAL SETTING
 
 							*os2ansi*
 Use "os2ansi" as the TERM environment variable (or don't set it at all, as the
-default is the correct value). You can set term to os2ansi in the .vimrc, in
+default is the correct value).  You can set term to os2ansi in the .vimrc, in
 case you need TERM to be a different value for other applications.  The
 problem is that OS/2 ANSI emulation is quite limited (it doesn't have insert /
 delete line, for example).
 
 If you want to use a different value for TERM (because of other programs, for
 example), make sure that the termcap entry for that TERM value has the
-appropriate key mappings. The termcap.dat distributed with emx does not always
+appropriate key mappings.  The termcap.dat distributed with emx does not always
 have them.  Here are some suitable values to add to the termcap entry of your
 choice; these allow the cursor keys and the named function keys (such as
 pagedown) to work.
@@ -214,7 +214,7 @@ clipboard you would use: >
 	endif
 
 This will ensure that only on OS/2 clipbrd is called whereas on other
-platforms vims build in mechanism is used. (To enable this functions on every
+platforms vims build in mechanism is used.  (To enable this functions on every
 load of Vim place the above lines in your .vimrc.)
 
  vim:tw=78:ts=8:ft=help:norl:

runtime/doc/os_qnx.txt

@@ -1,4 +1,4 @@
-*os_qnx.txt*    For Vim version 7.0aa.  Last change: 2004 Apr 23
+*os_qnx.txt*    For Vim version 7.0aa.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Julian Kinraid
@@ -22,7 +22,7 @@ Vim on QNX behaves much like other unix versions. |os_unix.txt|
 
 2. Compiling Vim					*qnx-compiling*
 
-Vim can be compiled using the standard configure/make approach. If you want to
+Vim can be compiled using the standard configure/make approach.  If you want to
 compile for X11, pass the --with-x option to configure.  Otherwise, running
 ./configure without any arguments or passing --enable-gui=photon, will compile
 vim with the Photon gui support.  Run ./configure --help , to find out other
@@ -118,12 +118,12 @@ Known problems:
 		set noguipty
 
 Bugs:
-	- Still a slight problem with menu highlighting
+	- Still a slight problem with menu highlighting.
 	- When using phditto/phinows/etc., if you are using a font that
 	  doesn't support the bold attribute, when vim attempts to draw
 	  bold text it will be all messed up.
 	- The cursor can sometimes be hard to see.
-	- A number of minor problems that can fixed :)
+	- A number of minor problems that can fixed. :)
 
 Todo:
 	- Improve multi-language support.

runtime/doc/os_risc.txt

@@ -1,4 +1,4 @@
-*os_risc.txt*   For Vim version 7.0aa.  Last change: 2004 May 01
+*os_risc.txt*   For Vim version 7.0aa.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Thomas Leonard
@@ -47,9 +47,9 @@ distribution, but modified slightly to work within the limits of ADFS, plus
 some extra files such as the window templates.
 
 User choices are read from `Choices:*' and are saved to `<Choices$Write>.*'.
-If you have the new !Boot structure then these should be set up already. If
+If you have the new !Boot structure then these should be set up already.  If
 not, set Choices$Path to a list of directories to search when looking for
-user configuration files. Set Choices$Write to the directory you want files
+user configuration files.  Set Choices$Write to the directory you want files
 to be saved into (so your search patterns and marks can be remembered between
 sessions).
 
@@ -58,7 +58,7 @@ sessions).
 2. Filename munging
 
 All pathname munging is disabled by default, so Vim should behave like a
-normal RISC OS application now. So, if you want to edit `doc/html' then you
+normal RISC OS application now.  So, if you want to edit `doc/html' then you
 actually type `*vi doc/html'.
 
 The only times munging is done is when:
@@ -66,7 +66,7 @@ The only times munging is done is when:
 - Searching included files from C programs, since these are always munged.
   See |[I|.
   Note: make sure you are in the right directory when you use this
-	command (ie the one with subdirectories 'c' and 'h').
+	command (i.e. the one with subdirectories 'c' and 'h').
 
 - Sourcing files using |:so|.
   Paths starting `$VIM/' are munged like this:
@@ -88,7 +88,7 @@ To use Vim from the command-line use the `*vi' command (or '*ex' for
 Type `*vi -h' for a list of options.
 
 Running the command-line version of Vim in a large high-color mode may cause
-the scrolling to be very slow. Either change to a mode with fewer colors or
+the scrolling to be very slow.  Either change to a mode with fewer colors or
 use the GUI version.
 
 Also, holding down Ctrl will slow it down even more, and Ctrl-Shift will
@@ -115,7 +115,7 @@ The global clipboard is supported, so you can select some text and then
 paste it directly into another application (provided it supports the
 clipboard too).
 
-Clicking Menu now opens a menu like a normal RISC OS program. Hold down Shift
+Clicking Menu now opens a menu like a normal RISC OS program.  Hold down Shift
 when clicking Menu to paste (from the global clipboard).
 
 Dragging a file to the window replaces the CURRENT buffer (the one with the
@@ -134,27 +134,27 @@ For fonts, you have the choice of the system font, an outline font, the system
 font via ZapRedraw and any of the Zap fonts via ZapRedraw: >
 
   :set guifont=
-<			To use the system font via the VDU drivers. Supports
+<			To use the system font via the VDU drivers.  Supports
 			bold and underline.
 >
   :set guifont=Corpus.Medium
-<			Use the named outline font. You can use any font, but
+<			Use the named outline font.  You can use any font, but
 			only monospaced ones like Corpus look right.
 >
   :set guifont=Corpus.Medium:w8:h12:b:i
 <			As before, but with size of 8 point by 12 point, and
 			in bold italic.
 			If only one of width and height is given then that
-			value is used for both. If neither is given then 10
+			value is used for both.  If neither is given then 10
 			point is used.
 
-Thanks to John Kortink, Vim can use the ZapRedraw module. Start the font name
+Thanks to John Kortink, Vim can use the ZapRedraw module.  Start the font name
 with '!' (or '!!' for double height), like this: >
 
   :set guifont=!!
 <			Use the system font, but via ZapRedraw.  This gives a
 			faster redraw on StrongARM processors, but you can't
-			get bold or italic text. Double height.
+			get bold or italic text.  Double height.
 >
   :set guifont=!script
 <			Uses the named Zap font (a directory in VimFont$Path).
@@ -164,12 +164,12 @@ with '!' (or '!!' for double height), like this: >
 			currently, but you can use any of the Zap fonts if
 			they are in VimFont$Path.
 			Vim will try to load font files '0', 'B', 'I' and 'IB'
-			from the named directory. Only '0' (normal style) MUST
-			be present. Link files are not currently supported.
+			from the named directory.  Only '0' (normal style) MUST
+			be present.  Link files are not currently supported.
 
 Note that when using ZapRedraw the edit bar is drawn in front of the character
-you are on rather than behind it. Also redraw is incorrect for screen modes
-with eigen values of 0. If the font includes control characters then you can
+you are on rather than behind it.  Also redraw is incorrect for screen modes
+with eigen values of 0.  If the font includes control characters then you can
 get Vim to display them by changing the 'isprint' option.
 
 If you find the scrolling is too slow on your machine, try experimenting
@@ -199,8 +199,8 @@ It seems to work pretty well now, using '*vi -T ansi'.
 
 If Vim crashes then the swap and backup files (if any) will be in the
 directories set with the 'directory' and 'bdir' options.  By default the swap
-files are in <Wimp$ScrapDir> (ie inside !Scrap) and backups are in the
-directory you were saving to. Vim will allow you to try and recover the file
+files are in <Wimp$ScrapDir> (i.e. inside !Scrap) and backups are in the
+directory you were saving to.  Vim will allow you to try and recover the file
 when you next try to edit it.
 
 To see a list of swap files, press <F12> and type `*vi -r'.
@@ -223,13 +223,13 @@ command-line version, or press CTRL-C in the GUI version.
 							*riscos-memory*
 8. Memory usage
 
-Vim will use dynamic areas on RISC OS 3.5 or later. If you can use them on
-older machines then edit the !RunTxt and GVim files. I don't know what UnixLib
+Vim will use dynamic areas on RISC OS 3.5 or later.  If you can use them on
+older machines then edit the !RunTxt and GVim files.  I don't know what UnixLib
 does by default on these machines so I'm playing safe.
 
 It doesn't work at all well without dynamic areas, since it can't change its
-memory allocation once running. Hence you should edit `!Vim.GVim' and
-`!Vim.!RunTxt' to choose the best size for you. You probably need at least
+memory allocation once running.  Hence you should edit `!Vim.GVim' and
+`!Vim.!RunTxt' to choose the best size for you.  You probably need at least
 about 1400K.
 
 ==============================================================================
@@ -237,11 +237,11 @@ about 1400K.
 9. Filetypes
 
 You can now specify that autocommands are only executed for files of certain
-types. The filetype is given in the form &xxx, when xxx is the filetype.
+types.  The filetype is given in the form &xxx, when xxx is the filetype.
 
-Filetypes must be specified by number (eg &fff for Text).
+Filetypes must be specified by number (e.g. &fff for Text).
 
-The system has changed from version 5.3. The new sequence of events is:
+The system has changed from version 5.3.  The new sequence of events is:
 
 - A file is loaded. |'osfiletype'| is set to the RISC OS filetype.
 - Based on the filetype and pathname, Vim will try to set |'filetype'| to the
@@ -264,7 +264,7 @@ Some examples may make this clearer:
   since many pathnames contain them.
 
 - You can prefix the command with '~', which stops any output from being
-  displayed. This also means that you don't have to press <Enter> afterwards,
+  displayed.  This also means that you don't have to press <Enter> afterwards,
   and stops the screen from being redrawn. {only in the GUI version}
 
 ==============================================================================
@@ -274,14 +274,14 @@ Some examples may make this clearer:
 Downloading everything you need:
 
 - Get the latest source distribution (see www.vim.org)
-- Get the runtime environment files (eg these help files)
+- Get the runtime environment files (e.g. these help files)
 - Get the `extra' archive (contains the RISC OS specific bits)
 - Get the RISC OS binary distribution (if possible)
 
 
 Unarchiving:
 
-- Create a raFS disk and put the archives on it.
+- Create a raFS disk and put the archives on it
 - Un-gzip them
 - Un-tar them   (*tar xELf 50 archive/tar)
 
@@ -289,9 +289,9 @@ Unarchiving:
 Recompiling the sources:
 
 - Create c, s, and h directories.
-- Put all the header files in 'h'	     \
-- Put all the C files in `c'		     | And lose the extensions
-- Put the assembler file (`swis/s') in 's'   /
+- Put all the header files in 'h'.	     \
+- Put all the C files in `c'.		     | And lose the extensions
+- Put the assembler file (`swis/s') in 's'.  /
 - Rename all the files in `proto' to `h', like this:
     raFS::VimSrc.source.proto.file/pro
 	  becomes
@@ -300,9 +300,9 @@ Recompiling the sources:
     .pro"
        with
     _pro.h"
-- Create a simple Makefile if desired and do '*make -k'
-  Use 'CC = gcc -DRISCOS -DUSE_GUI -O2 -x c' in the Makefile
-- Save the binary as !Vim.Vim in the binary distribution
+- Create a simple Makefile if desired and do '*make -k'.
+  Use 'CC = gcc -DRISCOS -DUSE_GUI -O2 -x c' in the Makefile.
+- Save the binary as !Vim.Vim in the binary distribution.
 
 
 Updating the run-time environment:
@@ -311,9 +311,9 @@ Updating the run-time environment:
   new files.
 - Remove files in `doc' not ending in `/txt', except for `tags'.
 - Lose the extensions from the files in `doc'.
-- Edit the `doc.tags' file. Remove extensions from the second column: >
+- Edit the `doc.tags' file.  Remove extensions from the second column: >
 	:%s/^\(.[^\t]*\t.*\)\.txt\t/\1\t/
-- Remove extensions from the syntax files. Split them into two directories
+- Remove extensions from the syntax files.  Split them into two directories
   to avoid the 77 entry limit on old ADFS filesystems.
 - Edit `Vim:FileType' to match `*.c.*' as well as `*/c' and so on.
   Add filetype checking too.

runtime/doc/os_unix.txt

@@ -1,4 +1,4 @@
-*os_unix.txt*   For Vim version 7.0aa.  Last change: 2003 Mar 15
+*os_unix.txt*   For Vim version 7.0aa.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -11,7 +11,7 @@ For compiling Vim on Unix see "INSTALL" and "Makefile" in the src directory.
 
 The default help file name is "/usr/local/lib/vim/help.txt"
 The files "$HOME/.vimrc" and "$HOME/.exrc" are used instead of "s:.vimrc" and
-"s:.exrc". Additionally "/usr/local/etc/vimrc" is used first.
+"s:.exrc".  Additionally "/usr/local/etc/vimrc" is used first.
 If "/usr/local/share" exists it is used instead of "/usr/local/lib".
 
 Temporary files (for filtering) are put in "/tmp".  If you want to place them
@@ -26,15 +26,15 @@ For executing external commands fork()/exec() is used when possible, otherwise
 system() is used, which is a bit slower.  The output of ":version" includes
 |+fork| when fork()/exec() is used, |+system()| when system() is used.  This
 can be changed at compile time.
-(For forking of the GUI version see |gui-fork|).
+(For forking of the GUI version see |gui-fork|.)
 
 Because terminal updating under Unix is often slow (e.g. serial line
 terminal, shell window in suntools), the 'showcmd' and 'ruler' options
-are default off. If you have a fast terminal, try setting them on.  You might
+are default off.  If you have a fast terminal, try setting them on.  You might
 also want to set 'ttyfast'.
 
 When using Vim in an xterm the mouse clicks can be used by Vim by setting
-'mouse' to "a". If there is access to an X-server gui style copy/paste will
+'mouse' to "a".  If there is access to an X-server gui style copy/paste will
 be used and visual feedback will be provided while dragging with the mouse.
 If you then still want the xterm copy/paste with the mouse, press the shift
 key when using the mouse.  See |mouse-using|.  Visual feedback while dragging
@@ -54,7 +54,7 @@ supports colors, but "T_Co" is empty or zero): >
 
 For real color terminals the ":highlight" command can be used.
 
-The file "tools/Vim132" is a shell script that can be used to put Vim in 132
+The file "tools/vim132" is a shell script that can be used to put Vim in 132
 column mode on a vt100 and lookalikes.
 
  vim:tw=78:ts=8:ft=help:norl:

runtime/doc/os_vms.txt

@@ -1,4 +1,4 @@
-*os_vms.txt*    For Vim version 7.0aa.  Last change: 2004 Jun 16
+*os_vms.txt*    For Vim version 7.0aa.  Last change: 2005 Apr 01
 
 
 		  VIM REFERENCE MANUAL
@@ -69,32 +69,32 @@ See the file [.SRC]INSTALLVMS.TXT.
 4. Problems						*vms-problems*
 
 The code has been tested under Open VMS 6.2 - 7.3 on Alpha and VAX platforms
-with the DECC compiler. It should work without bigger problems.
-If it happened that your system does not have some include libraries you can
-tune up in OS_VMS_CONF.H file.
+with the DEC C compiler.  It should work without bigger problems.
+If your system does not have some include libraries you can tune up in
+OS_VMS_CONF.H file.
 
 If you decided to build Vim with +perl, +python, etc. options, first you need
-to download OpenVMS distributions of Perl and Python. Build and deploy the
-libraries and change adequate lines in MAKE_VMS.MMS file. There should not be
-problem from Vim side.
+to download OpenVMS distributions of Perl and Python.  Build and deploy the
+libraries and change adequate lines in MAKE_VMS.MMS file.  There should not be
+a problem from Vim side.
 
-Note: Under VAX it should work with DEC C compiler without problem. VAXC
-compiler is not fully ANSI C compatible in pre-processor directives
-semantics, therefore you have to use a converter program what will do the
-lion part of the job. For detailed instruction read file INSTALLvms.txt
+Note: Under VAX it should work with the DEC C compiler without problems.  The
+VAX C compiler is not fully ANSI C compatible in pre-processor directives
+semantics, therefore you have to use a converter program what will do the lion
+part of the job.  For detailed instructions read file INSTALLvms.txt
 
-MMS_VIM.EXE is building together with VIM.EXE, but for XD.EXE you should
+MMS_VIM.EXE is build together with VIM.EXE, but for XD.EXE you should
 change to subdirectory and build it separately.
 
-CTAGS is not part of Vim source distribution any more, however the OpenVMS
-specific source might contain CTAGS source files as it is described above.
+CTAGS is not part of the Vim source distribution anymore, however the OpenVMS
+specific source might contain CTAGS source files as described above.
 You can find more information about CTAGS on VMS at
 http://www.polarhome.com/ctags/
 
 Advanced users may try some acrobatics in FEATURE.H file also.
 
 It is possible to compile with +xfontset +xim options too, but then you have
-to set up GUI fonts etc. correctly. See. :help xim from Vim command prompt.
+to set up GUI fonts etc. correctly.  See :help xim from Vim command prompt.
 
 You may want to use GUI with GTK icons, then you have to download and install
 GTK for OpenVMS or at least runtime shareable images - LIBGTK from
@@ -132,18 +132,18 @@ Use: >
 	define/nolog TMP	device:[path.tmp]
 
 to get vim.exe to find its document, filetype, and syntax files, and to
-specify a directory where temporary files will be located. Copy the "runtime"
+specify a directory where temporary files will be located.  Copy the "runtime"
 subdirectory of the vim distribution to vimruntime.
 
 Logicals $VIMRUNTIME and $TMP are optional.
 
 If $VIMRUNTIME is not set, Vim will guess and try to set up automatically.
-Read more about at :help runtime
+Read more about it at :help runtime
 
 If $TMP is not set, you will not be able to use some functions as CTAGS,
 XXD, printing etc. that use temporary directory for normal operation.
-$TMP directory should be readable and writable by the user(s).
-The easiest way to set up $TMP is to define logical: >
+The $TMP directory should be readable and writable by the user(s).
+The easiest way to set up $TMP is to define a logical: >
 
 	define/nolog TMP SYS$SCRATCH
 or as: >
@@ -155,9 +155,9 @@ or as: >
 
 Usually, you want to run just one version of Vim on your system, therefore
 it is enough to dedicate one directory for Vim.
-Copy all Vim runtime directory structure to the deployment position.
+Copy the whole Vim runtime directory structure to the deployment position.
 Add the following lines to your LOGIN.COM (in SYS$LOGIN directory).
-Set up logical $VIM as: >
+Set up the logical $VIM as: >
 
 	$ define VIM device:<path>
 
@@ -174,20 +174,20 @@ Please, check the notes for customization and configuration of symbols.
 You may want to create .vimrc and .gvimrc files in your home directory
 (SYS$LOGIN) to overwrite default settings.
 
-The easiest way is just rename example files. You may leave the menu file
-(MENU.VIM) and files vimrc and gvimrc in the original $VIM directory. It will
-be default setup for all users, and for users is enough just to have their
-own additions or resetting in home directory in files .vimrc and .gvimrc.
+The easiest way is just rename example files.  You may leave the menu file
+(MENU.VIM) and files vimrc and gvimrc in the original $VIM directory.  It will
+be default setup for all users, and for users it is enough just to have their
+own additions or resetting in their home directory in files .vimrc and .gvimrc.
 It should work without problems.
 
-Note: Remember, system rc files (default for all users) does not have leading
-"." So, system rc files are: >
+Note: Remember, system rc files (default for all users) don't have a leading
+".".  So, system rc files are: >
 
 	$VIM:vimrc
 	$VIM:gvimrc
 	$VIM:menu.vim
 
-and user's customized rc files are: >
+and user customized rc files are: >
 
 	sys$login:.vimrc
 	sys$login:.gvimrc
@@ -203,7 +203,7 @@ Example LOGIN.COM: >
 
 Note: This set-up should be enough, if you are working on standalone server or
 clustered environment, but if you want to use Vim as internode editor in
-DECNET environment, it will satisfy you as well.
+DECNET environment, it will satisfy as well.
 You just have to define the "whole" path: >
 
 	$ define VIM "<server_name>[""user password""]::device:<path>"
@@ -214,10 +214,11 @@ as for example: >
 	$ define VIM "PLUTO::RF10:[UTIL.VIM]"
 	$ define VIM "PLUTO""ZAY mypass""::RF10:[UTIL.VIM]" ! if passwd required
 
-You can also use $VIMRUNTIME logical to point to proper version of Vim if you
-have installed more versions in the same time. If $VIMRUNTIME is not defined
-Vim will borrow value from $VIM logical. You can find more information about
-$VIMRUNTIME logical by typing :help runtime as a Vim command.
+You can also use the $VIMRUNTIME logical to point to the proper version of Vim
+if you have installed more versions at the same time.  If $VIMRUNTIME is not
+defined Vim will borrow its value from the $VIM logical.  You can find more
+information about the $VIMRUNTIME logical by typing :help runtime as a Vim
+command.
 
 System administrators might want to set up a system wide Vim installation,
 then add to the SYS$STARTUP:SYLOGICALS.COM >
@@ -231,38 +232,40 @@ and to the SYS$STARTUP:SYLOGIN.COM >
 	$ gv*im:== spawn/nowait/input=NLA0 mcr VIM:VIM.EXE -g -GEOMETRY 80x40
 
 
-It will set up normal Vim work environment for every user on the system.
+It will set up a normal Vim work environment for every user on the system.
 
 ==============================================================================
 
 7. GUI mode questions					*vms-gui*
 
-OpenVMS in a real mainframe OS, therefore even if it has a GUI console, most of
-the users does not use a native X/Window environment during normal operation.
-It is not possible to start Vim in GUI mode "just like that". But anyhow it is
-not too complicate either.
+OpenVMS is a real mainframe OS, therefore even if it has a GUI console, most
+of the users do not use a native X/Window environment during normal operation.
+It is not possible to start Vim in GUI mode "just like that".  But anyhow it
+is not too complicated either.
 
-First of all: you will need an executable that is built with enabled GUI.
+First of all: you will need an executable that is built with the GUI enabled.
 
 Second: you need to have installed DECW/Motif on your VMS server, otherwise
 you will get errors that some shareable libraries are missing.
 
-Third: If you choose to run Vim with extra feature as GUI/GTK then you need
-GTK installation too or at least GTK runtime environment (LIBGTK etc.)
+Third: If you choose to run Vim with extra features such as GUI/GTK then you
+need a GTK installation too or at least a GTK runtime environment (LIBGTK
+etc.).
 
 1) If you are working on the VMS X/Motif console:
    Start Vim with the command: >
 
 	$ mc device:<path>VIM.EXE -g
 <
-   or type :gui as a command to the Vim command prompt. For more info :help gui
+   or type :gui as a command to the Vim command prompt.  For more info :help
+   gui
 
-2) If you are working on other X/Window environment as Unix or some remote X
-   VMS console. Set up display to your host with: >
+2) If you are working on some other X/Window environment like Unix or a remote
+   X VMS console.  Set up display to your host with: >
 
 	$ set disp/create/node=<your IP address>/trans=<transport-name>
 <
-   and start Vim as in point 1. You can find more help in VMS documentation or
+   and start Vim as in point 1.  You can find more help in VMS documentation or
    type: help set disp in VMS prompt.
    Examples: >
 
@@ -276,11 +279,11 @@ For more information type $help set disp in VMS prompt.
 3) Another elegant solution is XDM if you have installed on OpenVMS box.
    It is possible to work from XDM client as from GUI console.
 
-4) If you are working on MS Windows or other non X/Window environment
-   You need to set up one X server and run Vim as in point 2.
-   For MS Windows there are available free X servers as MIX , Omni X etc.
+4) If you are working on MS-Windows or some other non X/Window environment
+   you need to set up one X server and run Vim as in point 2.
+   For MS-Windows there are available free X servers as MIX , Omni X etc.,
    as well as excellent commercial products as eXcursion or ReflectionX with
-   built in DEC support.
+   built-in DEC support.
 
 Please note, that executables without GUI are slightly faster during startup
 then with enabled GUI in character mode. Therefore, if you do not use GUI
@@ -319,7 +322,7 @@ Read more in ch: 8.6 (Terminal problems).
 
 8.2 Filters
 
-Vim supports filters; ie. if you have a sort program that can handle
+Vim supports filters, i.e., if you have a sort program that can handle
 input/output redirection like Unix (<infile >outfile), you could use >
 
 	:map \s 0!'aqsort<CR>
@@ -333,19 +336,20 @@ Vim is saving files into a new file with the next higher file version
 number, try these settings. >
 
 	:set nobackup	     " does not create *.*_ backup files
-	:set nowritebackup   " does not have any purpose on VMS. It's default.
+	:set nowritebackup   " does not have any purpose on VMS.  It's the
+	                     " default.
 
 Recovery is working perfect as well from the default swap file.
 Read more with :help swapfile
 
 (Claude Marinier <ClaudeMarinier@xwavesolutions.com> Vim 5.5, Zoltan Arpadffy
-Vim 5.6 )
+Vim 5.6)
 
 
 8.4 Directory conversion
 
 Vim will internally convert any unix-style paths and even mixed unix/VMS
-paths into VMS style paths. Some typical conversions resemble:
+paths into VMS style paths.  Some typical conversions resemble:
 
 	/abc/def/ghi		-> abc:[def]ghi.
 	/abc/def/ghi.j		-> abc:[def]ghi.j
@@ -377,9 +381,9 @@ example: >
 Note: syntax is very important, otherwise VMS will recognize more parameters
 instead of one (resulting with: file not found)
 
-2.  Set up Vim as your internode editor. If Vim is not installed on your host,
-just set up your IP address, full Vim path including the server name and run
-the command procedure below: >
+2.  Set up Vim as your internode editor.  If Vim is not installed on your
+host, just set up your IP address, the full Vim path including the server name
+and run the command procedure below: >
 
 	$ if (p1 .eqs. "") .OR. (p2 .eqs. "") then goto usage
 	$ set disp/create/node=<your_IP_here>/trans=tcpip
@@ -392,8 +396,8 @@ the command procedure below: >
 	$ write sys$output " Example: @SETVIM.COM username passwd"
 	$ end:
 
-Note: Never use it in clustered environment (you do not need it), and load could
-be very-very slow, but even faster then a local Emacs. :-)
+Note: Never use it in a clustered environment (you do not need it), loading
+could be very-very slow, but even faster then a local Emacs. :-)
 
 (Zoltan Arpadffy, Vim 5.6)
 
@@ -404,7 +408,7 @@ If your terminal name is not known to Vim and it is trying to find the default
 one you will get the following message during start-up:
 ---
 Terminal entry not found in termcap
-'unknown-terminal' not known. Available built-in terminals are:
+'unknown-terminal' not known.  Available built-in terminals are:
     builtin_gui
     builtin_riscos
     builtin_amiga
@@ -422,13 +426,13 @@ defaulting to 'vt320'
 ---
 The solution is to define default terminal name: >
 
-	$ ! unknown terminal name. let us use vt320 or ansi instead.
+	$ ! unknown terminal name.  Let us use vt320 or ansi instead.
 	$ ! Note: it's case sensitive
 	$ define term "vt320"
 
 Terminals from VT100 to VT320 (as V300, VT220, VT200 ) do not need any extra
-keyboard mappings. They should work perfect as they are, including arrows,
-Ins, Del buttons etc. Except Backspace in GUI mode. To solve it, add to
+keyboard mappings.  They should work perfect as they are, including arrows,
+Ins, Del buttons etc., except Backspace in GUI mode.  To solve it, add to
 .gvimrc: >
 
 	inoremap <Del> <BS>
@@ -457,9 +461,9 @@ special commands to execute executables: >
 	MCR <path>filename <parameters>
 
 OpenVMS users always have to be aware that the Vim command :! "just" drop them
-to DCL prompt. This feature is possible to use without any problem with all
+to DCL prompt.  This feature is possible to use without any problem with all
 DCL commands, but if we want to execute some program as XXD, CTAGS, JTAGS etc.
-we're running into trouble if we following the Vim documentation (see: help
+we're running into trouble if we follow the Vim documentation (see: help
 xxd).
 
 Solution: Execute with the MC command and add the full path to the executable.
@@ -470,9 +474,9 @@ Example: Instead of :%!xxd command use: >
 ... or in general: >
 	:!mc <path>filename <parameters>
 
-Note: You can use XXD, and CTAGS from GUI menu.
+Note: You can use XXD and CTAGS from GUI menu.
 
-To customize ctags it is possible to define logical $CTAGS with standard
+To customize ctags it is possible to define the logical $CTAGS with standard
 parameters as: >
 
 	define/nolog CTAGS "--totals -o sys$login:tags"
@@ -488,7 +492,7 @@ documentation at http://ctags.sourceforge.net/ctags.html.
 If you want to use your .vimrc and .gvimrc from other platforms (e.g. Windows)
 you can get in trouble if you ftp that file(s): VMS has different end-of-line
 indication.
-The symptom is that ViM is not sourcing your .vimrc/.gvimrc, even if you say:
+The symptom is that Vim is not sourcing your .vimrc/.gvimrc, even if you say:
 >
 	:so sys$login:.vimrc
 
@@ -535,8 +539,8 @@ will be confused after a window-resize.
 
 From 6.0 diff functionality has been implemented, but OpenVMS does not use
 GNU/Unix like diff therefore built in diff does not work.
-There is a simple solution to solve this anomaly. Install an Unix like diff
-and Vim will work perfect in diff mode too. You just have to redefine your
+There is a simple solution to solve this anomaly.  Install a Unix like diff
+and Vim will work perfect in diff mode too.  You just have to redefine your
 diff program as: >
 
 	define /nolog diff <GNU_PATH>diff.exe
@@ -551,16 +555,16 @@ boxes that is meant to solve GNU problems on OpenVMS.
 8.12 diff-mode
 
 Vim 6.0 and higher supports vim diff-mode (See |new-diff-mode|, |diff-mode|
-and |08.7|). This uses the external program 'diff' and expects a Unix-like
-output format from diff. The standard VMS diff has a different output
-format. To use vim on VMS in diff-mode, you need to:
+and |08.7|).  This uses the external program 'diff' and expects a Unix-like
+output format from diff.  The standard VMS diff has a different output
+format.  To use vim on VMS in diff-mode, you need to:
     1 Install a Unix-like diff program, e.g. GNU diff
     2 Tell vim to use the Unix-like diff for diff-mode.
 
 You can download GNU diff from the VIM-VMS website, it is one of the GNU
-tools in http://www.polarhome.com/vim/files/gnu_tools.zip. I suggest to
+tools in http://www.polarhome.com/vim/files/gnu_tools.zip.  I suggest to
 unpack it in a separate directory "GNU" and create a logical GNU: that
-points to that directory. e.g: >
+points to that directory, e.g: >
 
    DEFINE GNU    <DISK>:[<DIRECTORY>.BIN.GNU]
 
@@ -569,9 +573,9 @@ prompt: >
 
    GDIFF :==     $GNU:DIFF.EXE
 
-Now you need to tell vim to use the new diff program. Take the example
+Now you need to tell vim to use the new diff program.  Take the example
 settings from |diff-diffexpr| and change the call to the external diff
-program to the new diff on VMS. Add this to your .vimrc file: >
+program to the new diff on VMS.  Add this to your .vimrc file: >
 
      " Set up vimdiff options
        if v:version >= 600
@@ -612,8 +616,8 @@ You can now compare files in 4 ways: >
 
 8.13 Allow '$' in C keywords
 
-DEC C uses many identifiers with '$' in them. This is not allowed in ANSI C,
-and vim recognises the '$' as the end of the identifier. You can change this
+DEC C uses many identifiers with '$' in them.  This is not allowed in ANSI C,
+and vim recognises the '$' as the end of the identifier.  You can change this
 with the |iskeyword|command.
 Add this command to your .vimrc file: >
 
@@ -625,7 +629,7 @@ CS.VIM) and add this command: >
 	set iskeyword+=$
 
 Now word-based commands, e.g. the '*'-search-command and the CTRL-]
-tag-lookup, work on the whole identifier. (Ctags on VMS also supports '$' in
+tag-lookup, work on the whole identifier.  (Ctags on VMS also supports '$' in
 C keywords since ctags version 5.1.)
 
 ( Coen Engelbarts, Vim 6.1)
@@ -633,8 +637,8 @@ C keywords since ctags version 5.1.)
 8.14 VIMTUTOR for beginners
 
 It exits VIMTUTOR.COM DCL script that can help Vim beginners to learn/make
-first steps with Vim on OpenVMS. Depending of binary distribution you may start
-it with: >
+first steps with Vim on OpenVMS.  Depending of binary distribution you may
+start it with: >
 
 	@vim:vimtutor
 

runtime/doc/os_win32.txt

@@ -1,4 +1,4 @@
-*os_win32.txt*  For Vim version 7.0aa.  Last change: 2004 Aug 31
+*os_win32.txt*  For Vim version 7.0aa.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by George Reilly
@@ -192,7 +192,7 @@ A. In the GUI version, you can use the 'guifont' option.  Example: >
 Q. When I change the size of the console window with ':set lines=xx' or
    similar, the font changes! (Win95)
 A. You have the console font set to 'Auto' in Vim's (or your MS-DOS prompt's)
-   properties. This makes W95 guess (badly!) what font is best. Set an explicit
+   properties.  This makes W95 guess (badly!) what font is best.  Set an explicit
    font instead.
 
 Q. Why can't I paste into Vim when running Windows 95?
@@ -282,7 +282,7 @@ A. VisionFS can't handle certain dot (.) three letter extension file names.
 	dir > file.bat
 <
    The result is that the "dir" command updates the "file.bat~" file, instead
-   of creating a new "file.bat" file. This same behavior is exhibited in Vim
+   of creating a new "file.bat" file.  This same behavior is exhibited in Vim
    when editing an existing file named "foo.bat" because the default behavior
    of Vim is to create a temporary file with a '~' character appended to the
    name.  When the file is written, it winds up being deleted.
@@ -306,13 +306,13 @@ A. When using :! to run an external command, you can run it with "start": >
    To avoid this special treatment, use ":! start".
 
 Q. I'm using Win32s, and when I try to run an external command like "make",
-   Vim doesn't wait for it to finish! Help!
+   Vim doesn't wait for it to finish!  Help!
 A. The problem is that a 32-bit application (Vim) can't get notification from
-   Windows that a 16-bit application (your DOS session) has finished. Vim
+   Windows that a 16-bit application (your DOS session) has finished.  Vim
    includes a work-around for this, but you must set up your DOS commands to
-   run in a window, not full-screen. Unfortunately the default when you
-   install Windows is full-screen. To change this:
-   1) Start PIF editor (in the Main program group)
+   run in a window, not full-screen.  Unfortunately the default when you
+   install Windows is full-screen.  To change this:
+   1) Start PIF editor (in the Main program group).
    2) Open the file "_DEFAULT.PIF" in your Windows directory.
    3) Changes the display option from "Full Screen" to "Windowed".
    4) Save and exit.
@@ -321,10 +321,10 @@ A. The problem is that a 32-bit application (Vim) can't get notification from
 	:!dir C:\<CR>".
 <  You should see a DOS box window appear briefly with the directory listing.
 
-Q. I use Vim under Win32s and NT. In NT, I can define the console to default to
-   50 lines, so that I get a 80x50 shell when I ':sh'. Can I do the same in
+Q. I use Vim under Win32s and NT.  In NT, I can define the console to default to
+   50 lines, so that I get a 80x50 shell when I ':sh'.  Can I do the same in
    W3.1x, or am I stuck with 80x25?
-A. Edit SYSTEM.INI and add 'ScreenLines=50' to the [NonWindowsApp] section. DOS
+A. Edit SYSTEM.INI and add 'ScreenLines=50' to the [NonWindowsApp] section.  DOS
    prompts and external DOS commands will now run in a 50-line window.
 
  vim:tw=78:fo=tcq2:ts=8:ft=help:norl:

runtime/doc/pattern.txt

@@ -1,4 +1,4 @@
-*pattern.txt*   For Vim version 7.0aa.  Last change: 2004 Dec 18
+*pattern.txt*   For Vim version 7.0aa.  Last change: 2005 May 22
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -217,7 +217,7 @@ To clear the last used search pattern: >
 This will not set the pattern to an empty string, because that would match
 everywhere.  The pattern is really cleared, like when starting Vim.
 
-The search usual skips matches that don't move the cursor.  Whether the next
+The search usually skips matches that don't move the cursor.  Whether the next
 match is found at the next character or after the skipped match depends on the
 'c' flag in 'cpoptions'.  See |cpo-c|.
 	   with 'c' flag:   "/..." advances 1 to 3 characters
@@ -225,6 +225,10 @@ match is found at the next character or after the skipped match depends on the
 The unpredictability with the 'c' flag is caused by starting the search in the
 first column, skipping matches until one is found past the cursor position.
 
+When searching backwards, searching starts at the start of the line, using the
+'c' flag in 'cpoptions' as described above.  Then the last match before the
+cursor position is used.
+
 In Vi the ":tag" command sets the last search pattern when the tag is searched
 for.  In Vim this is not done, the previous search pattern is still remembered,
 unless the 't' flag is present in 'cpoptions'.  The search pattern is always
@@ -268,7 +272,7 @@ the "*" is under your right hand middle finger (search to the right and down).
 ==============================================================================
 2. The definition of a pattern		*search-pattern* *pattern* *[pattern]*
 					*regular-expression* *regexp* *Pattern*
-					*E76* *E361* *E363* *E383* *E476*
+					*E76* *E383* *E476*
 
 For starters, read chapter 27 of the user manual |usr_27.txt|.
 
@@ -518,11 +522,6 @@ An atom can be followed by an indication of how many times the atom can be
 matched and in what way.  This is called a multi.  See |/multi| for an
 overview.
 
-It is not possible to use a multi that can match more than one time after an
-atom that can match an empty string.  That's because this could result in an
-endless loop.  If you try it, you will get this error message: >
-	*, \+ or \{ operand could be empty
-<
 						*/star* */\star* *E56*
 *	(use \* when 'magic' is not set)
 	Matches 0 or more of the preceding atom, as many as possible.
@@ -573,7 +572,7 @@ endless loop.  If you try it, you will get this error message: >
 \{-}	matches 0 or more of the preceding atom, as few as possible
 	{Vi does not have any of these}
 
-	n and m are positive decimal numbers
+	n and m are positive decimal numbers or zero
 
 	If a "-" appears immediately after the "{", then a shortest match
 	first algorithm is used (see example below).  In particular, "\{-}" is
@@ -632,7 +631,7 @@ endless loop.  If you try it, you will get this error message: >
 	position: "\(foo\)\@!bar" will match "bar" in "foobar", because at the
 	position where "bar" matches, "foo" does not match.  To avoid matching
 	"foobar" you could use "\(foo\)\@!...bar", but that doesn't match a
-	bar at the start of a line. Use "\(foo\)\@<!bar".
+	bar at the start of a line.  Use "\(foo\)\@<!bar".
 
 							*/\@<=*
 \@<=	Matches with zero width if the preceding atom matches just before what
@@ -736,7 +735,7 @@ $	At end of pattern or in front of "\|" or "\)" ("|" or ")" after "\v"):
 
 							*/\>*
 \>	Matches the end of a word: The previous char is the last char of a
-	word. The 'iskeyword' option specifies what is a word character.
+	word.  The 'iskeyword' option specifies what is a word character.
 	|/zero-width|
 
 							*/\zs*
@@ -746,7 +745,7 @@ $	At end of pattern or in front of "\|" or "\)" ("|" or ")" after "\v"):
 		/^\s*\zsif
 <	matches an "if" at the start of a line, ignoring white space.
 	Can be used multiple times, the last one encountered in a matching
-	branch is used. Example: >
+	branch is used.  Example: >
 		/\(.\{-}\zsFab\)\{3}
 <	Finds the third occurrence of "Fab".
 	{not in Vi} {not available when compiled without the +syntax feature}
@@ -836,8 +835,8 @@ $	At end of pattern or in front of "\|" or "\)" ("|" or ")" after "\v"):
 	are halfway a Tab or other character that occupies more than one
 	screen character.  {not in Vi}
 	WARNING: When inserting or deleting text Vim does not automatically
-	update the matches.  This means Syntax highlighting quickly becomes
-	wrong.
+	update highlighted matches.  This means Syntax highlighting quickly
+	becomes wrong.
 	Example, to highlight the all characters after virtual column 72: >
 		/\%>72v.*
 <	When 'hlsearch' is set and you move the cursor around and make changes
@@ -931,7 +930,7 @@ x	A single character, with no special meaning, matches itself
 
 []	(with 'nomagic': \[])		*/[]* */\[]* */\_[]* */collection*
 \_[]
-	A collection. This is a sequence of characters enclosed in brackets.
+	A collection.  This is a sequence of characters enclosed in brackets.
 	It matches any single character in the collection.
 	Example		matches ~
 	[xyz]		any 'x', 'y' or 'z'
@@ -978,6 +977,17 @@ x	A single character, with no special meaning, matches itself
 	  a list of at least one character, each of which is either '-', '.',
 	  '/', alphabetic, numeric, '_' or '~'.
 	  These items only work for 8-bit characters.
+							*/[[=* *[==]*
+	- An equivalence class.  This means that characters are matched that
+	  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
+	  latin1 characters in utf-8 and latin9.
+							*/[[.* *[..]*
+	- A collation element.  This currently simply accepts a single
+	  character in the form:
+	  	[.a.]
 							  */\]*
 	- To include a literal ']', '^', '-' or '\' in the collection, put a
 	  backslash before it: "[xyz\]]", "[\^xyz]", "[xy\-z]" and "[xyz\\]".
@@ -1023,7 +1033,7 @@ x	A single character, with no special meaning, matches itself
 <	Matches the words "r", "re", "ro", "rea", "roa", "read" and "road".
 	{not available when compiled without the +syntax feature}
 
-				*/\%d* */\%x* */\%o* */\%u* */\%U/* *E678*
+				*/\%d* */\%x* */\%o* */\%u* */\%U* *E678*
 
 \%d123	Matches the character specified with a decimal number.  Must be
 	followed by a non-digit.

runtime/doc/pi_expl.txt

@@ -1,215 +0,0 @@
-*pi_expl.txt*   For Vim version 7.0aa.  Last change: 2004 Dec 29
-
-
-		  VIM REFERENCE MANUAL    by M A Aziz Ahmed
-					  updated by Mark Waggoner
-
-
-						*file-explorer* *file-browser*
-Plugin for exploring (or browsing) directories and files
-
-1. Starting the file explorer		|expl-starting|
-
-The functionality mentioned here is a |standard-plugin|.
-This plugin is only available if 'compatible' is not set.
-You can avoid loading this plugin by setting the "loaded_explorer" variable: >
-	:let loaded_explorer = 1
-
-{Vi does not have any of this}
-
-==============================================================================
-1. Starting the file explorer				*expl-starting*
-
-This plugin is used to explore directories inside Vim. The file explorer is
-launched whenever the user tries to edit a directory.
-						*:Explore* *:Sexplore*
-To launch the explorer in the directory of the file currently edited: >
-	:Explore
-If the file has changes the window is split.  To always split the window: >
-	:Sexplore
-To launch the explorer in a specific directory: >
-	:Explore dirname
-	:Sexplore dirname
-
-From inside the explorer move your cursor to a line containing a file or
-directory name.  The following command keys are available:
-
-  <enter> will open the file in the window the explorer is currently
-      occupying.
-  'o' will split a new window and open the file in the new window.
-  'O' will open the file chosen using the window that the cursor was in just
-      before you started or entered the explorer window.  If the explorer is
-      the only window, it will first split a new window to use for the file to
-      be opened.
-  'p' will open (or use) the preview window showing the file
-  'x' will execute the file with the system tools.  Only when supported
-      (currently MS-Windows and KDE).
-
-When splitting off a new window, you can control where the split window will
-go relative to the explorer window using the variables g:explVertical,
-g:explSplitBelow and g:explSplitRight.
-
-							*g:explVertical*
-							*g:explSplitBelow*
-							*g:explSplitRight*
-							*g:explStartBelow*
-							*g:explStartRight*
-To control whether the split is made horizontally or vertically, use: >
-  let g:explVertical=1	" Split vertically
-  let g:explVertical=0	" Split horizontally (default)
-
-To control where the window goes relative to the explorer window when
-splitting horizontally, use the variable: >
-  let g:explSplitBelow=1    " Put new window below explorer window
-  let g:explSplitBelow=0    " Put new window above explorer window
-The default for this is the setting of splitbelow at the time the plugin is
-loaded.
-
-To control where the window goes relative to the explorer window when
-splitting vertically, use the variable: >
-  let g:explSplitRight=1    " Put new window to the right of the explorer
-  let g:explSplitRight=0    " Put new window to the left of the explorer
-The default for this is the setting of splitright at the time the plugin is
-loaded.
-
-To use a different split method for the explorer window, use: >
-  let g:explStartRight=1    " Put new explorer window to the right of the
-			    " current window
-  let g:explStartRight=0    " Put new explorer window to the left of the
-			    " current window
-The default is the value of g:explSplitRight at the time the plugin is loaded.
-
-To use a different split method for the explorer window, use: >
-  let g:explStartBelow=1    " Put new explorer window below the
-			    " current window
-  let g:explStartBelow=0    " Put new explorer window above the
-			    " current window
-The default is the value of g:explSplitBelow at the time the plugin is loaded.
-
-The start splits allow for the explorer window to be placed in a file browser
-type arrangement, where the directories are shown on the left and the contents
-opened on the right.  The start split settings are only used when issuing
-the Sexplore command.
-
-Note that the window split is done a little bit differently than window splits
-are usually done.  Ordinarily, when splitting a window, the space occupied by
-the current window will be split to give space for the new window.  The
-explorer attempts to instead split from a window adjacent to the explorer
-window so that the explorer window will not change sizes.  If there is not an
-adjacent window in the direction you are splitting, the explorer window is
-split.
-
-							*g:explWinSize*
-After opening a file with the 'o' command, you might want to resize the
-explorer window. This can be done by setting the variable >
-  let g:explWinSize=N
-N is the number of rows (when the window is split horizontally) or the number
-of columns (when the window is split vertically).  If g:explWinSize is set to
-an empty string (""), resizing will not be done.  g:explWinSize defaults to
-15.
-
-							*g:explDetailedList*
-The file size (in bytes) and modification time can be displayed inside the
-file explorer window. By pressing 'i', you can toggle between the name only
-display and the more lengthy display.  If you want the size and date to show
-by default, use >
-  let g:explDetailedList=1
-Doing this may slightly slow down explorer. The difference may or may not be
-noticeable depending on your system and whether the directory is local or on
-the network and on the size of the directory.
-
-							*g:explDateFormat*
-The format of date displayed is configurable using the variable
-g:explDateFormat.  explorer uses this variable to pass to strftime() to fetch
-the date information. |strftime()|  The default is >
-  let g:explDateFormat="%d %b %Y %H:%M"
-
-Note that for sorting purposes, the date is always placed at the end of the
-line in its 'raw' form.  If you have syntax highlighting turned on, this raw
-date should be invisible.
-
-							*g:explHideFiles*
-You can hide some files by filling the variable g:explHidFiles with regular
-expressions. A filename that matches any of these regular expressions will not
-be shown. For example, >
-
-  let g:explHideFiles='^\.,\.gz$,\.exe$,\.zip$'
-
-will not show files that begin with "." and those that end in .gz, .exe or
-.zip. However, all directory names will always be shown. If while exploring,
-you'd like to see the hidden files as well, use the command "a".
-The explorer header will indicate if filtering is being done.
-
-							*g:explDetailedHelp*
-The help information spanning a few lines can be turned off (and just a single
-help message enabled) using the option >
-  let g:explDetailedHelp=0
-You can anytime switch to the detailed help format by pressing ?.
-
-							*explorer-delete*
-Pressing 'D' inside explorer deletes the file under the cursor. You can delete
-many files by visually selecting them and using 'D'. The deletion is
-interactive in the form y/n/a/q. Directory deletion is not supported (mainly
-because there is no way to delete a directory using a vim built-in function).
-
-							*explorer-rename*
-Pressing 'R' inside explorer will allow you to rename the file under the
-cursor.
-
-							*g:explSortBy*
-The display in the file explorer can be sorted in forward or reverse order by
-name, size, or modification date.  You can set the default sorting direction
-with the option >
-  let g:explSortBy='name'		" alphabetically
-  let g:explSortBy='reverse name'	" reverse alphabetically
-  let g:explSortBy='date'		" newest first
-  let g:explSortBy='reverse date'	" oldest first
-  let g:explSortBy='size'		" largest first
-  let g:explSortBy='reverse size'       " smallest first
-While in the explorer, you can rotate through the sort fields by pressing the
-'s' key and you can reverse the current sort order by pressing the 'r' key.
-Sorting on fields other than the name will be faster if the size and date are
-displayed (using 'i' or g:explDetailedList).
-The explorer heading will indicate the current sort order.
-
-							*g:explDirsFirst*
-To control the segregation of directories and files, you can set this option >
-  let g:explDirsFirst=1     " Directories at the top of the list (default)
-  let g:explDirsFirst=0     " Directories mixed in with files
-  let g:explDirsFirst=-1    " Directories at the bottom of the list
-
-							*g:explSuffixesLast*
-To control the segregation of files matching the suffixes option, you can set
-this option >
-  let g:explSuffixesLast=1     " Files matching suffixes sorted at the bottom
-			       " of the list (default)
-  let g:explSuffixesLast=0     " Files matching suffixes sorted normally
-  let g:explSuffixesLast=-1    " Files matching suffixes sorted at the top of
-			       " the list
-The heading will indicate if suffixes have been moved to the end (or start) of
-the list.
-
-							*g:explUseSeparators*
-Directories and files matching the suffixes list will be highlighted.  If you
-have the directories, files, and suffixes separated, and you would like a
-separator line between the groups, you can set the option >
-  let g:explUseSeparators=1    " Use separator lines
-  let g:explUseSeparators=0    " Don't use separator lines
-<
-							 *g:explFileHandler*
-If you set the "g:explFileHandler" variable to the name of a function, typing
-'x' will call this function.  The file or directory under the cursor will be
-passed as an argument to the function.  Suppose you have KDE, you could use
-this: >
-
-  function MyFileHandler(fn)
-    exec "silent! !kfmclient exec " . escape(a:fn,' \%#')
-  endfunction
-  let g:explFileHandler = 'MyFileHandler'
-
-For Win32 the variable is set by default to invoke the execute action. If you
-type 'x' on a HTML file, Microsoft Internet Explorer will start (or whatever
-application you have associated with HTML files).
-
-==============================================================================
- vim:tw=78:noet:ts=8:ft=help:norl:

runtime/doc/pi_netrw.txt

@@ -177,16 +177,16 @@ by setting a variable (ex. scp uses the variable g:netrw_scp_cmd,
 which is defaulted to "scp -q").
 
 Ftp, an old protocol, seems to be blessed by numerous implementations.
-Unfortunately, some implementations are noisy (ie., add junk to the end
+Unfortunately, some implementations are noisy (i.e., add junk to the end
 of the file).  Thus, concerned users may decide to write a NetReadFixup()
 function that will clean up after reading with their ftp.  Some Unix systems
-(ie., FreeBSD) provide a utility called "fetch" which uses the ftp protocol
+(i.e., FreeBSD) provide a utility called "fetch" which uses the ftp protocol
 but is not noisy and more convenient, actually, for <netrw.vim> to use.
 Consequently, if "fetch" is executable, it will be used to do reads for
 ftp://... (and http://...) .  See |netrw-var| for more about this.
 
 For rcp, scp, sftp, and http, one may use network-oriented file transfers
-transparently; ie.
+transparently; i.e.
 >
 	vim rcp://[user@]machine/path
 	vim scp://[user@]machine/path
@@ -198,7 +198,7 @@ that file.  Your ftp must be able to use the <.netrc> file on its own, however.
 	vim ftp://[user@]machine[[:#]portnumber]/path
 <
 However, ftp will often need to query the user for the userid and password.
-The latter will be done "silently"; ie. asterisks will show up instead of
+The latter will be done "silently"; i.e. asterisks will show up instead of
 the actually-typed-in password.  Netrw will retain the userid and password
 for subsequent read/writes from the most recent transfer so subsequent
 transfers (read/write) to or from that machine will take place without
@@ -625,7 +625,7 @@ NETRW BROWSER VARIABLES					*netrw-browse-var*
 	g:netrw_timefmt			specify format string to strftime() (%c)
 	g:netrw_winsize			specify initial size of new o/v windows
 
-INTRODUCTION TO DIRECTORY BROWSING
+INTRODUCTION TO DIRECTORY BROWSING			*file-explorer*
 
 Netrw supports the browsing of directories on the local system and on remote
 hosts, including generating listing directories, entering directories, editing
@@ -740,7 +740,7 @@ One may rename a block of files and directories by selecting them with
 the V (|linewise-visual|).
 
 
-HIDING FILES OR DIRECTORIES		*g:netrw-a* *g:netrw_list_hide*
+HIDING FILES OR DIRECTORIES		*netrw-a* *g:netrw_list_hide*
 
 Netrw's browsing facility allows one to use the hiding list in one of
 three ways: ignore it, hide files which match, and show only those files

runtime/doc/pi_spec.txt

@@ -1,13 +1,13 @@
-*pi_spec.txt*   For Vim version 7.0aa.  Last change: 2002 Oct 29
+*pi_spec.txt*   For Vim version 7.0aa.  Last change: 2005 Apr 01
 
 by Gustavo Niemeyer ~
 
 This is a filetype plugin to work with rpm spec files.
 
 Currently, this Vim plugin allows you to easily update the %changelog
-section in RPM spec files. It will even create a section for you if it
-doesn't exist yet. If you've already inserted an entry today, it will
-give you the opportunity to just add a new item in today's entry. If you
+section in RPM spec files.  It will even create a section for you if it
+doesn't exist yet.  If you've already inserted an entry today, it will
+give you the opportunity to just add a new item in today's entry.  If you
 don't provide a format string (|spec_chglog_format|), it'll ask you an
 email address and build a format string by itself.
 
@@ -22,24 +22,24 @@ The spec_chglog plugin provides a map like the following:
 	:map <buffer> <LocalLeader>c <Plug>SpecChangelog
 
 It means that you may run the plugin inside a spec file by pressing
-your maplocalleader key (default is '\') plus 'c'. If you do not have
+your maplocalleader key (default is '\') plus 'c'.  If you do not have
 |spec_chglog_format| set, the plugin will ask you for an email address
 to use in this edit session.
 
 Everytime you run the plugin, it will check to see if the last entry
-in the changelog has been written today and by you. If it's the entry
+in the changelog has been written today and by you.  If it's the entry
 mathes, it will just insert a new changelog item, otherwise it will
-create a new changelog entry. If you are running with
+create a new changelog entry.  If you are running with
 |spec_chglog_release_info| enabled, it will also check if the name, version
-and release matches. The plugin is smart enough to ask you if it should
+and release matches.  The plugin is smart enough to ask you if it should
 update the package release, if you have not done so.
 
 Setting a map					*spec-setting-a-map*
 -------------
 
 As you should know, you can easily set a map to access any Vim command (or
-anything, for that matter). If you don't like the default map of
-<LocalLeader>c, you may just set up your own key. The following line
+anything, for that matter).  If you don't like the default map of
+<LocalLeader>c, you may just set up your own key.  The following line
 shows you how you could do this in your .vimrc file, mapping the plugin to
 the <F5> key:
 
@@ -57,16 +57,16 @@ This command will add a map only in the spec file buffers.
 The format string				*spec_chglog_format*
 -----------------
 
-You can easily customize how your spec file entry will look like. To do
+You can easily customize how your spec file entry will look like.  To do
 this just set the variable "spec_chglog_format" in your .vimrc file like
 this: >
 
 	let spec_chglog_format = "%a %b %d %Y My Name <my@email.com>"
 
-Note that "%a %b %d %Y" is the most used time format. If you don't provide
+Note that "%a %b %d %Y" is the most used time format.  If you don't provide
 a format string, when you run the SpecChangelog command for the first
 time, it will ask you an email address and build the |spec_chglog_format|
-variable for you. This way, you will only need to provide your email
+variable for you.  This way, you will only need to provide your email
 address once.
 
 To discover which format options you can use, take a look at the strftime()
@@ -76,7 +76,7 @@ Where to insert new items			*spec_chglog_prepend*
 -------------------------
 
 The plugin will usually insert new %changelog entry items (note that it's
-not the entry itself) after the existing ones. If you set the
+not the entry itself) after the existing ones.  If you set the
 spec_chglog_prepend variable >
 
 	let spec_chglog_prepend = 1
@@ -87,11 +87,11 @@ Inserting release info				*spec_chglog_release_info*
 ----------------------
 
 If you want, the plugin may automatically insert release information
-on each changelog entry. One advantage of turning this feature on is
+on each changelog entry.  One advantage of turning this feature on is
 that it may control if the release has been updated after the last
-change in the package or not. If you have not updated the package
+change in the package or not.  If you have not updated the package
 version or release, it will ask you if it should update the package
-release for you. To turn this feature on, just insert the following
+release for you.  To turn this feature on, just insert the following
 code in your .vimrc: >
 
 	let spec_chglog_release_info = 1

runtime/doc/print.txt

@@ -1,4 +1,4 @@
-*print.txt*     For Vim version 7.0aa.  Last change: 2004 Jul 05
+*print.txt*     For Vim version 7.0aa.  Last change: 2005 Apr 01
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -32,7 +32,7 @@ used.
 			printer.
 
 			On MS-Windows a dialog is displayed to allow selection
-			of printer, paper size etc. To skip the dialog, use
+			of printer, paper size etc.  To skip the dialog, use
 			the [!].  In this case the printer defined by
 			'printdevice' is used, or, if 'printdevice' is empty,
 			the system default printer.
@@ -65,7 +65,7 @@ the current window's 'wrap' or 'linebreak' settings.  The "wrap" item in
 'printoptions' can be used to switch wrapping off.
 The current highlighting colors are used in the printout, with the following
 considerations:
-1) The normal background is always rendered as white (i.e. blank paper.)
+1) The normal background is always rendered as white (i.e. blank paper).
 2) White text or the default foreground is rendered as black, so that it shows
    up!
 3) If 'background' is "dark", then the colours are darkened to compensate for

runtime/doc/quickfix.txt

@@ -1,4 +1,4 @@
-*quickfix.txt*  For Vim version 7.0aa.  Last change: 2004 Dec 28
+*quickfix.txt*  For Vim version 7.0aa.  Last change: 2005 May 20
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -30,6 +30,11 @@ The idea is to save the error messages from the compiler in a file and use Vim
 to jump to the errors one by one.  You can examine each problem and fix it,
 without having to remember all the error messages.
 
+In Vim the quickfix commands are used more generally to find a list of
+positions in files.  For example, |:vimgrep| finds pattern matches.  You can
+use the positions in a script with the |getqflist()| function.  Thus you can
+do a lot more than the edit/compile/fix cycle!
+
 If you are using Manx's Aztec C compiler on the Amiga look here for how to use
 it with Vim: |quickfix-manx|.  If you are using another compiler you should
 save the error messages in a file and start Vim with "vim -q filename".  An
@@ -117,7 +122,7 @@ The following quickfix commands can be used:
 :cl[ist] [from] [, [to]]
 			List all errors that are valid |quickfix-valid|.
 			If numbers [from] and/or [to] are given, the respective
-			range of errors is listed. A negative number counts
+			range of errors is listed.  A negative number counts
 			from the last error backwards, -1 being the last error.
 			The 'switchbuf' settings are respected when jumping
 			to a buffer.
@@ -131,6 +136,10 @@ deleted for some reason, the message "line changed" is shown to warn you that
 the error location may not be correct.  If you quit Vim and start again the
 marks are lost and the error locations may not be correct anymore.
 
+If vim is built with |+autocmd| support, two autocommands are available for
+running commands before and after a quickfix command (':make', ':grep' and so
+on) is executed. See |QuickFixCmdPre| and |QuickFixCmdPost| for details.
+
 =============================================================================
 2. The error window					*quickfix-window*
 
@@ -166,12 +175,14 @@ height manually (e.g., by dragging the status line above it with the mouse).
 
 In the quickfix window, each line is one error.  The line number is equal to
 the error number.  You can use ":.cc" to jump to the error under the cursor.
-Hitting the <CR> key or double-clicking the mouse on a line has the same
+Hitting the <Enter> key or double-clicking the mouse on a line has the same
 effect.  The file containing the error is opened in the window above the
 quickfix window.  If there already is a window for that file, it is used
 instead.  If the buffer in the used window has changed, and the error is in
 another file, jumping to the error will fail.  You will first have to make
 sure the window contains a buffer which can be abandoned.
+					*CTRL-W_<Enter>* *CTRL-W_<CR>*
+You can use CTRL-W <Enter> to open a new window and jump to the error there.
 
 When the quickfix window has been filled, two autocommand events are
 triggered.  First the 'filetype' option is set to "qf", which triggers the
@@ -220,20 +231,24 @@ lists, use ":cnewer 99" first.
 4. Using :make						*:make_makeprg*
 
 							*:mak* *:make*
-:mak[e][!] [arguments]	1. If the 'autowrite' option is on, write any changed
+:mak[e][!] [arguments]	1. If vim was built with |+autocmd|, all relevant
+			   |QuickFixCmdPre| autocommands are executed.
+			2. If the 'autowrite' option is on, write any changed
 			   buffers
-			2. An errorfile name is made from 'makeef'.  If
+			3. An errorfile name is made from 'makeef'.  If
 			   'makeef' doesn't contain "##", and a file with this
 			   name already exists, it is deleted.
-			3. The program given with the 'makeprg' option is
+			4. The program given with the 'makeprg' option is
 			   started (default "make") with the optional
 			   [arguments] and the output is saved in the
 			   errorfile (for Unix it is also echoed on the
 			   screen).
-			4. The errorfile is read using 'errorformat'.
-			5. If [!] is not given the first error is jumped to.
-			6. The errorfile is deleted.
-			7. You can now move through the errors with commands
+			5. The errorfile is read using 'errorformat'.
+			6. If [!] is not given the first error is jumped to.
+			7. The errorfile is deleted.
+			8. If vim was built with |+autocmd|, all relevant
+			   |QuickFixCmdPost| autocommands are executed.
+			9. You can now move through the errors with commands
 			   like |:cnext| and |:cprevious|, see above.
 			This command does not accept a comment, any "
 			characters are considered part of the arguments.
@@ -288,18 +303,34 @@ advantages are:
 - Uses Vim search patterns.  Multi-line patterns can be used.
 - When plugins are enabled: compressed and remote files can be searched.
 	|gzip| |netrw|
+- When 'hidden' is set the files are kept loaded, thus repeating a search is
+  much faster.  Uses a lot of memory though!
 
 
 5.1 using Vim's internal grep
 
-							*:vim* *:vimgrep*
-:vim[grep][!] /{pattern}/ {file} ...
+					*:vim* *:vimgrep* *E682* *E683*
+:vim[grep][!] /{pattern}/[g][j] {file} ...
 			Search for {pattern} in the files {file} ... and set
 			the error list to the matches.
-			{pattern} if a Vim search pattern.  Instead of
-			enclosing it in / any non-ID character |'isident'|
-			can be used, so long as it does not appear in
-			{pattern}.
+			Without the 'g' flag each line is added only once.
+			With 'g' every match is added.
+
+			{pattern} is a Vim search pattern.  Instead of
+			enclosing it in / any non-ID character (see
+			|'isident'|) can be used, so long as it does not
+			appear in {pattern}.
+			'ignorecase' applies.  To overrule it put |/\c| in the
+			pattern to ignore case or |/\C| to match case.
+			'smartcase' is not used.
+
+			Without the 'j' flag Vim jumps to the first match.
+			With 'j' only the quickfix list is updated.
+			With the [!] any changes in the current buffer are
+			abandoned.
+
+			Every second or so the searched file name is displayed
+			to give you an idea of the progress made.
 			Examples: >
 				:vimgrep /an error/ *.c
 				:vimgrep /\<FileName\>/ *.h include/*
@@ -312,7 +343,8 @@ advantages are:
 				:vimgrep Error *.c
 <
 						*:vimgrepa* *:vimgrepadd*
-:vimgrepa[dd][!] [/]{pattern}[/] {file} ...
+:vimgrepa[dd][!] /{pattern}/[g][j] {file} ...
+:vimgrepa[dd][!] {pattern} {file} ...
 			Just like ":vimgrep", but instead of making a new list
 			of errors the matches are appended to the current
 			list.
@@ -348,16 +380,16 @@ id-utils) in a similar way to its compiler integration (see |:make| above).
 5.3 Setting up external grep
 
 If you have a standard "grep" program installed, the :grep command may work
-well with the defaults. The syntax is very similar to the standard command: >
+well with the defaults.  The syntax is very similar to the standard command: >
 
 	:grep foo *.c
 
-Will search all files with the .c extension for the substring "foo". The
+Will search all files with the .c extension for the substring "foo".  The
 arguments to :grep are passed straight to the "grep" program, so you can use
 whatever options your "grep" supports.
 
 By default, :grep invokes grep with the -n option (show file and line
-numbers). You can change this with the 'grepprg' option. You will need to set
+numbers).  You can change this with the 'grepprg' option.  You will need to set
 'grepprg' if:
 
 a)	You are using a program that isn't called "grep"
@@ -447,7 +479,7 @@ not "b:current_compiler".  What the command actually does is the following:
 - Execute ":runtime! compiler/{name}.vim".  The plugins are expected to set
   options with "CompilerSet" and set the "current_compiler" variable to the
   name of the compiler.
-- Delete the "CompilerSet user command.
+- Delete the "CompilerSet" user command.
 - Set "b:current_compiler" to the value of "current_compiler".
 - Without "!" the old value of "current_compiler" is restored.
 
@@ -483,8 +515,8 @@ stdin (standard input) will not be interactive.
 PYUNIT COMPILER						*compiler-pyunit*
 
 This is not actually a compiler, but a unit testing framework for the
-Python language. It is included into standard Python distribution
-starting from version 2.0. For older versions, you can get it from
+Python language.  It is included into standard Python distribution
+starting from version 2.0.  For older versions, you can get it from
 http://pyunit.sourceforge.net.
 
 When you run your tests with the help of the framework, possible errors
@@ -502,20 +534,20 @@ Also see http://vim.sourceforge.net/tip_view.php?tip_id=280.
 TEX COMPILER						*compiler-tex*
 
 Included in the distribution compiler for TeX ($VIMRUNTIME/compiler/tex.vim)
-uses make command if possible. If the compiler finds a file named "Makefile"
+uses make command if possible.  If the compiler finds a file named "Makefile"
 or "makefile" in the current directory, it supposes that you want to process
-your *TeX files with make, and the makefile does the right work. In this case
-compiler sets 'errorformat' for *TeX output and leaves 'makeprg' untouched. If
+your *TeX files with make, and the makefile does the right work.  In this case
+compiler sets 'errorformat' for *TeX output and leaves 'makeprg' untouched.  If
 neither "Makefile" nor "makefile" is found, the compiler will not use make.
 You can force the compiler to ignore makefiles by defining
 b:tex_ignore_makefile or g:tex_ignore_makefile variable (they are checked for
 existence only).
 
 If the compiler chose not to use make, it need to choose a right program for
-processing your input. If b:tex_flavor or g:tex_flavor (in this precedence)
+processing your input.  If b:tex_flavor or g:tex_flavor (in this precedence)
 variable exists, it defines TeX flavor for :make (actually, this is the name
 of executed command), and if both variables do not exist, it defaults to
-"latex". For example, while editing chapter2.tex \input-ed from mypaper.tex
+"latex".  For example, while editing chapter2.tex \input-ed from mypaper.tex
 written in AMS-TeX: >
 
 	:let b:tex_flavor = 'amstex'
@@ -525,16 +557,16 @@ written in AMS-TeX: >
 
 Note that you must specify a name of the file to process as an argument (to
 process the right file when editing \input-ed or \include-ed file; portable
-solution for substituting % for no arguments is welcome). This is not in the
+solution for substituting % for no arguments is welcome).  This is not in the
 semantics of make, where you specify a target, not source, but you may specify
 filename without extension ".tex" and mean this as "make filename.dvi or
 filename.pdf or filename.some_result_extension according to compiler".
 
 Note: tex command line syntax is set to usable both for MikTeX (suggestion
-by Srinath Avadhanula) and teTeX (checked by Artem Chuprina). Suggestion
+by Srinath Avadhanula) and teTeX (checked by Artem Chuprina).  Suggestion
 from |errorformat-LaTeX| is too complex to keep it working for different
 shells and OSes and also does not allow to use other available TeX options,
-if any. If your TeX doesn't support "-interaction=nonstopmode", please
+if any.  If your TeX doesn't support "-interaction=nonstopmode", please
 report it with different means to express \nonstopmode from the command line.
 
 =============================================================================
@@ -568,7 +600,7 @@ Basic items
 			column of the error, (1 <tab> == 1 character column))
 	%v		virtual column number (finds a number representing
 			screen column of the error (1 <tab> == 8 screen
-			columns)
+			columns))
 	%t		error type (finds a single character)
 	%n		error number (finds a number)
 	%m		error message (finds a string)
@@ -577,8 +609,10 @@ Basic items
 			uses the length for the column number)
 	%*{conv}	any scanf non-assignable conversion
 	%%		the single '%' character
+	%s		search text (finds a string)
 
-The "%f" conversion depends on the current 'isfname' setting.
+The "%f" conversion depends on the current 'isfname' setting.  "~/" is
+expanded to the home directory and environment variables are expanded.
 
 The "%f" and "%m" conversions have to detect the end of the string.  They
 should be followed by a character that cannot be in the string.  Everything
@@ -599,6 +633,13 @@ or >
 to indicate the column of the error.  This is to be used in a multi-line error
 message.  See |errorformat-javac| for a  useful example.
 
+The "%s" conversion specifies the text to search for to locate the error line.
+The text is used as a literal string.  The anchors "^" and "$" are added to
+the text to locate the error line exactly matching the search text and the
+text is prefixed with the "\V" atom to make it "very nomagic".  The "%s"
+conversion can be used to locate lines without a line number in the error
+output.  Like the output of the "grep" shell command.
+When the pattern is present the line number will not be used.
 
 Changing directory
 
@@ -606,7 +647,7 @@ The following uppercase conversion characters specify the type of special
 format strings.  At most one of them may be given as a prefix at the begin
 of a single comma-separated format pattern.
 Some compilers produce messages that consist of directory names that have to
-be prepended to each file name read by %f (example: GNU make). The following
+be prepended to each file name read by %f (example: GNU make).  The following
 codes can be used to scan these directory names; they will be stored in an
 internal directory stack.					*E379*
 	%D		"enter directory" format string; expects a following
@@ -614,7 +655,7 @@ internal directory stack.					*E379*
 	%X		"leave directory" format string; expects following %f
 
 When defining an "enter directory" or "leave directory" format, the "%D" or
-"%X" has to be given at the start of that substring. Vim tracks the directory
+"%X" has to be given at the start of that substring.  Vim tracks the directory
 changes and prepends the current directory to each erroneous file found with a
 relative path.  See |quickfix-directory-stack| for details, tips and
 limitations.
@@ -623,7 +664,7 @@ limitations.
 Multi-line messages				*errorformat-multi-line*
 
 It is possible to read the output of programs that produce multi-line
-messages, ie. error strings that consume more than one line.  Possible
+messages, i.e. error strings that consume more than one line.  Possible
 prefixes are:
 	%E		start of a multi-line error message
 	%W		start of a multi-line warning message
@@ -716,7 +757,7 @@ A call of |:clist| writes them accordingly with their correct filenames:
   9 a3.tt:67 col 3 warning: 's' already defined
 
 Unlike the other prefixes that all match against whole lines, %P, %Q and %O
-can be used to match several patterns in the same line. Thus it is possible
+can be used to match several patterns in the same line.  Thus it is possible
 to parse even nested files like in the following line:
   {"file1" {"file2" error1} error2 {"file3" error3 {"file4" error4 error5}}}
 The %O then parses over strings that do not contain any push/pop file name
@@ -726,11 +767,11 @@ information.  See |errorformat-LaTeX| for an extended example.
 Ignoring and using whole messages			*efm-ignore*
 
 The codes '+' or '-' can be combined with the uppercase codes above; in that
-case they have to precede the letter, eg. '%+A' or '%-G':
+case they have to precede the letter, e.g. '%+A' or '%-G':
 	%-		do not include the matching multi-line in any output
 	%+		include the whole matching line in the %m error string
 
-One prefix is only useful in combination with '+' or '-', namely %G. It parses
+One prefix is only useful in combination with '+' or '-', namely %G.  It parses
 over lines containing general information like compiler version strings or
 other headers that can be skipped.
 	%-G		ignore this message
@@ -745,7 +786,7 @@ with previous versions of Vim.  However, it is also possible to specify
 Since meta characters of the regular expression language can be part of
 ordinary matching strings or file names (and therefore internally have to
 be escaped), meta symbols have to be written with leading '%':
-	%\		the single '\' character. Note that this has to be
+	%\		the single '\' character.  Note that this has to be
 			escaped ("%\\") in ":set errorformat=" definitions.
 	%.		the single '.' character.
 	%#		the single '*'(!) character.
@@ -755,7 +796,7 @@ be escaped), meta symbols have to be written with leading '%':
 	%~		the single '~' character.
 When using character classes in expressions (see |/\i| for an overview),
 terms containing the "\+" quantifier can be written in the scanf() "%*"
-notation. Example: "%\\d%\\+" ("\d\+", "any number") is equivalent to "%*\\d".
+notation.  Example: "%\\d%\\+" ("\d\+", "any number") is equivalent to "%*\\d".
 Important note: The \(...\) grouping of sub-matches can not be used in format
 specifications because it is reserved for internal conversions.
 
@@ -841,19 +882,19 @@ required for the set command.
 8. The directory stack				*quickfix-directory-stack*
 
 Quickfix maintains a stack for saving all used directories parsed from the
-make output. For GNU-make this is rather simple, as it always prints the
-absolute path of all directories it enters and leaves. Regardless if this is
+make output.  For GNU-make this is rather simple, as it always prints the
+absolute path of all directories it enters and leaves.  Regardless if this is
 done via a 'cd' command in the makefile or with the parameter "-C dir" (change
-to directory before reading the makefile). It may be useful to use the switch
+to directory before reading the makefile).  It may be useful to use the switch
 "-w" to force GNU-make to print out the working directory before and after
 processing.
 
 Maintaining the correct directory is more complicated if you don't use
-GNU-make. AIX-make for example doesn't print any information about its working
-directory. Then you need to enhance the makefile. In the makefile of LessTif
-there is a command which echoes "Making {target} in {dir}". The special
-problem here is that it doesn't print informations on leaving the directory
-and that it doesn't print the absolute path.
+GNU-make.  AIX-make for example doesn't print any information about its
+working directory.  Then you need to enhance the makefile.  In the makefile of
+LessTif there is a command which echoes "Making {target} in {dir}".  The
+special problem here is that it doesn't print informations on leaving the
+directory and that it doesn't print the absolute path.
 
 To solve the problem with relative paths and missing "leave directory"
 messages Vim uses following algorithm:
@@ -867,10 +908,10 @@ messages Vim uses following algorithm:
 
 Additionally it is checked for every file, if it really exists in the
 identified directory.  If not, it is searched in all other directories of the
-directory stack (NOT the directory subtree!). If it is still not found, it is
+directory stack (NOT the directory subtree!).  If it is still not found, it is
 assumed that it is in Vim's current directory.
 
-There are limitation in this algorithm. This examples assume that make just
+There are limitation in this algorithm.  This examples assume that make just
 prints information about entering a directory in the form "Making all in dir".
 
 1) Assume you have following directories and files:
@@ -917,7 +958,7 @@ Add
 to your 'errorformat' to handle the above output.
 
 Note that Vim doesn't check if the directory name in a "leave directory"
-messages is the current directory. This is why you could just use the message
+messages is the current directory.  This is why you could just use the message
 "Leaving dir".
 
 =============================================================================
@@ -979,7 +1020,7 @@ It should be easy to adopt the above LaTeX errorformat to any compiler output
 consisting of multi-line errors.
 
 The commands can be placed in a |vimrc| file or some other Vim script file,
-eg. a script containing LaTeX related stuff which is loaded only when editing
+e.g. a script containing LaTeX related stuff which is loaded only when editing
 LaTeX sources.
 Make sure to copy all lines of the example (in the given order), afterwards
 remove the comment lines.  For the '\' notation at the start of some lines see
@@ -993,7 +1034,7 @@ remove the comment lines.  For the '\' notation at the start of some lines see
  :set efm=%E!\ LaTeX\ %trror:\ %m,
 	\%E!\ %m,
 <		Start of multi-line warning messages; the first two also
-		include the line number. Meaning of some regular expressions:
+		include the line number.  Meaning of some regular expressions:
 		  - "%.%#"  (".*")   matches a (possibly empty) string
 		  - "%*\\d" ("\d\+") matches a number >
 	\%+WLaTeX\ %.%#Warning:\ %.%#line\ %l%.%#,
@@ -1032,7 +1073,7 @@ remove the comment lines.  For the '\' notation at the start of some lines see
 		on a stack since the file apparently does not contain any
 		error: >
 	\%+O(%f)%r,
-<		Push a file name onto the stack. The name is given after '(': >
+<		Push a file name onto the stack.  The name is given after '(': >
 	\%+P(%f%r,
 	\%+P\ %\\=(%f%r,
 	\%+P%*[^()](%f%r,

runtime/doc/quickref.txt

@@ -1,4 +1,4 @@
-*quickref.txt*  For Vim version 7.0aa.  Last change: 2004 Jul 27
+*quickref.txt*  For Vim version 7.0aa.  Last change: 2005 Jul 06
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -607,6 +607,7 @@ Short explanation of each option:		*option-list*
 |'backupskip'|	  |'bsk'|    no backup for files that match these patterns
 |'balloondelay'|  |'bdlay'|  delay in mS before a balloon may pop up
 |'ballooneval'|   |'beval'|  switch on balloon evaluation
+|'balloonexpr'|   |'bexpr'|  expression to show in balloon
 |'binary'|	  |'bin'|    read/write/edit file in binary mode
 |'bioskey'|	  |'biosk'|  MS-DOS: use bios calls for input characters
 |'bomb'|		     prepend a Byte Order Mark to the file
@@ -685,8 +686,10 @@ Short explanation of each option:		*option-list*
 |'foldnestmax'|   |'fdn'|    maximum fold depth
 |'foldopen'|	  |'fdo'|    for which commands a fold will be opened
 |'foldtext'|	  |'fdt'|    expression used to display for a closed fold
+|'formatlistpat'| |'flp'|    pattern used to recognize a list header
 |'formatoptions'| |'fo'|     how automatic formatting is to be done
 |'formatprg'|	  |'fp'|     name of external program used with "gq" command
+|'fsync'|	  |'fs'|     whether to invoke fsync() after file write
 |'gdefault'|	  |'gd'|     the ":substitute" flag 'g' is default on
 |'grepformat'|	  |'gfm'|    format of 'grepprg' output
 |'grepprg'|	  |'gp'|     program to use for ":grep"
@@ -750,6 +753,7 @@ Short explanation of each option:		*option-list*
 |'maxfuncdepth'|  |'mfd'|    maximum recursive depth for user functions
 |'maxmapdepth'|   |'mmd'|    maximum recursive depth for mapping
 |'maxmem'|	  |'mm'|     maximum memory (in Kbyte) used for one buffer
+|'maxmempattern'| |'mmp'|    maximum memory (in Kbyte) used for pattern search
 |'maxmemtot'|	  |'mmt'|    maximum memory (in Kbyte) used for all buffers
 |'menuitems'|	  |'mis'|    maximum number of items in a menu
 |'modeline'|	  |'ml'|     recognize modelines at start or end of file
@@ -812,6 +816,7 @@ Short explanation of each option:		*option-list*
 |'shellquote'|	  |'shq'|    quote character(s) for around shell command
 |'shellredir'|	  |'srr'|    string to put output of filter in a temp file
 |'shellslash'|	  |'ssl'|    use forward slash for shell file names
+|'shelltemp'|	  |'stmp'|   whether to use a temp file for shell commands
 |'shelltype'|	  |'st'|     Amiga: influences how to use a shell
 |'shellxquote'|	  |'sxq'|    like 'shellquote', but include redirection
 |'shiftround'|	  |'sr'|     round indent to multiple of shiftwidth
@@ -829,6 +834,11 @@ Short explanation of each option:		*option-list*
 |'smartindent'|   |'si'|     smart autoindenting for C programs
 |'smarttab'|	  |'sta'|    use 'shiftwidth' when inserting <Tab>
 |'softtabstop'|	  |'sts'|    number of spaces that <Tab> uses while editing
+|'spell'|		     enable spell checking
+|'spellcapcheck'| |'spc'|    pattern to locate end of a sentence
+|'spellfile'|	  |'spf'|    files where |zg| and |zw| store words
+|'spelllang'|	  |'spl'|    language(s) to do spell checking for
+|'spellsuggest'|  |'sps'|    method(s) used to suggest spelling corrections
 |'splitbelow'|	  |'sb'|     new window from split is below the current one
 |'splitright'|	  |'spr'|    new window is put right of the current one
 |'startofline'|   |'sol'|    commands move cursor to first blank in line
@@ -873,6 +883,7 @@ Short explanation of each option:		*option-list*
 |'updatecount'|   |'uc'|     after this many characters flush swap file
 |'updatetime'|	  |'ut'|     after this many milliseconds flush swap file
 |'verbose'|	  |'vbs'|    give informative messages
+|'verbosefile'|	  |'vfile'|  file to write messages in
 |'viewdir'|	  |'vdir'|   directory where to store files with :mkview
 |'viewoptions'|   |'vop'|    specifies what to save for :mkview
 |'viminfo'|	  |'vi'|     use .viminfo file upon startup and exiting
@@ -886,6 +897,7 @@ Short explanation of each option:		*option-list*
 |'wildignore'|	  |'wig'|    files matching these patterns are not completed
 |'wildmenu'|	  |'wmnu'|   use menu for command line completion
 |'wildmode'|	  |'wim'|    mode for 'wildchar' command-line expansion
+|'wildoptions'|   |'wop'|    specifies how command line completion is done.
 |'winaltkeys'|	  |'wak'|    when the windows system handles ALT keys
 |'winheight'|	  |'wh'|     minimum number of lines for the current window
 |'winfixheight'|  |'wfh'|    keep window height when opening/closing windows
@@ -1169,7 +1181,7 @@ Context-sensitive completion on the command-line:
 |:xall|	  :xa[ll][!]  or :wqall[!]
 				Write all changed buffers and exit
 
-|:stop|	  :st[op][!]		Suspend VIM or start new shell. If 'aw' option
+|:stop|	  :st[op][!]		Suspend VIM or start new shell.  If 'aw' option
 				   is set and [!] not given write the buffer.
 |CTRL-Z|     CTRL-Z		Same as ":stop"
 ------------------------------------------------------------------------------

runtime/doc/quotes.txt

@@ -1,4 +1,4 @@
-*quotes.txt*    For Vim version 7.0aa.  Last change: 2004 May 06
+*quotes.txt*    For Vim version 7.0aa.  Last change: 2005 Apr 04
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -18,7 +18,7 @@ Coming with a very GUI mindset from Windows, I always thought of people using
 Vi as some kind of outer space alien in human clothes.  Once I tried I really
 got addicted by its power and now I found myself typing Vim keypresses in the
 oddest places! That's why I would like to see Vim embedded in every
-application which deals with text editing. (Jos<6F> Fonseca)
+application which deals with text editing.  (Jos<6F> Fonseca)
 
 I was a 12-year emacs user who switched to Vim about a year ago after finally
 giving up on the multiple incompatible versions, flaky contributed packages,
@@ -32,17 +32,17 @@ the Vi editor")
 
 Out of all the open software i've ever seen and used, and i've seen a lot, Vim
 is the best, most useful and highest quality to work with, second only to the
-linux kernel itself. (Peter Jay Salzman)
+linux kernel itself.  (Peter Jay Salzman)
 
 It's well worth noting that the _entirety_ of SourceForge was written using
-Vim and its nifty PHP syntax highlighting. I think the entire SF.net tech
+Vim and its nifty PHP syntax highlighting.  I think the entire SF.net tech
 staff uses Vim and we're all excited to have you aboard! (Tim Perdue)
 
 Vim is one of a select bunch of tools for which I have no substitute.  It is
 a brilliant piece of work! (Biju Chacko)
 
 A previous girlfriend of mine switched to emacs.  Needless to say, the
-relationship went nowhere. (Geoffrey Mann)
+relationship went nowhere.  (Geoffrey Mann)
 
 I rarely think about Vim, in the same way that I guess a fish rarely thinks
 about water.  It's the environment in which everything else happens.  I'm a
@@ -51,7 +51,7 @@ is the only thing that's consistent across all my systems, and it's just about
 the only thing that doesn't break from time to time.  When a new system comes
 in the door without Vim, I install it right away.  Great to have a tool that's
 the same everywhere, that's completely reliable, so I can ignore it and think
-about other things. (Pete Schaeffer)
+about other things.  (Pete Schaeffer)
 
 Having recently succeeded in running Vim via telnet through a Nokia
 Communicator, I can now report that it works nicely on a Palm Pilot too.
@@ -63,10 +63,10 @@ versions of 'emacs' in the late 1970's and was relieved by finding 'vi' in the
 first UNIX I came across in 1983).  In my opinion, it's about time 'VIM'
 replace 'emacs' as the standard for top editors.  (Bo Thide', Sweden)
 
-I love and use VIM heavily too. (Larry Wall)
+I love and use VIM heavily too.  (Larry Wall)
 
 Vi is like a Ferrari, if you're a beginner, it handles like a bitch, but once
-you get the hang of it, its small, powerful and FAST! (Unknown)
+you get the hang of it, it's small, powerful and FAST! (Unknown)
 VIM is like a new model Ferrari, and sounds like one too - "VIIIIIIMMM!"
 (Stephen Riehm, Germany)
 
@@ -77,12 +77,12 @@ quickly get used to and appreciate the advantages of this editor.  (Garry
 Glendown, conclusion of an article on VIM in iX magazine 9/1998)
 
 I've recently acquired the O'Reilly book on VI (it also discusses VIM
-in-depth), and I'm amazed at just how powerful this application is. (Jeffrey
+in-depth), and I'm amazed at just how powerful this application is.  (Jeffrey
 Rankin)
 
 This guide was written using the Windows 9.x distribution of GVIM, which is
 quite possibly the greatest thing to come along since God created the naked
-girl. (Michael DiBernardo)
+girl.  (Michael DiBernardo)
 
 Boy, I thought I knew almost everything about VIM, but every time I browse the
 online documentation, I hit upon a minor but cool aspect of a VIM feature that
@@ -103,7 +103,7 @@ of those "Perfect Programmer's Editor" threads and was delighted to discover
 that VIM already supports it.  (Brendan Macmillan, Australia)
 
 I just discovered VIM (5.0) and I'm telling everyone I know about it!
-I tell them VIM stands for VI for the new (M)illenium. Thanks so much!
+I tell them VIM stands for VI for the new (M)illenium.  Thanks so much!
 (Matt F. Valentine)
 
 I think from now on "vi" should be called "Vim Imitation", not the other way
@@ -121,12 +121,12 @@ Whenever I move to a new computing platform, the first thing I do is to port
 VIM.  Lately, I am simply stunned by its ease of compilation using the
 configure facility.  (A.M. Sabuncu, Turkey)
 
-The options are really excellent and very powerful. (Anish Maharaj)
+The options are really excellent and very powerful.  (Anish Maharaj)
 
 The Spring user-interface designs are in, and word from the boutiques is that
 80x24 text-only mode is back with a *vengeance! Vi editor clone VIM burst onto
 March desk-tops with a dazzling show of pastel syntax highlights for its 5.0
-look. Strident and customizable, VIM raises eyebrows with its interpretation
+look.  Strident and customizable, VIM raises eyebrows with its interpretation
 of the classic Vi single-key macro collection.
 http://www.ntk.net/index.cgi?back=archive98/now0327.txt&line=179#l
 
@@ -134,7 +134,7 @@ I just wanted to take this opportunity to let you know that VIM 5 ROCKS!
 Syntax highlighting: how did I survive without it?!  Thank you for creating
 mankind's best editor!  (Mun Johl, USA)
 
-Thanks again for VIM.  I use it every day on Linux. (Eric Foster-Johnson,
+Thanks again for VIM.  I use it every day on Linux.  (Eric Foster-Johnson,
 author of the book "UNIX Programming Tools")
 
 The BEST EDITOR EVER (Stuart Woolford)
@@ -172,17 +172,17 @@ I am really happy with such a wonderful software package.  Much better than
 almost any expensive, off the shelf program.  (Jeff Walker)
 
 Whenever I reread the VIM documentation I'm overcome with excitement at the
-power of the editor. (William Edward Webber, Australia)
+power of the editor.  (William Edward Webber, Australia)
 
 Hurrah for VIM!! It is "at your fingertips" like vi, and has the extensions
 that vi sorely needs: highlighting for executing commands on blocks, an easily
-navigable and digestible help screen, and more. (Paul Pax)
+navigable and digestible help screen, and more.  (Paul Pax)
 
 The reason WHY I don't have this amazingly useful macro any more, is that I
 now use VIM - and this is built in!! (Stephen Riehm, Germany)
 
-I am a user of VIM and I love it. I use it to do all my programming, C,
-C++, HTML what ever. (Tim Allwine)
+I am a user of VIM and I love it.  I use it to do all my programming, C,
+C++, HTML what ever.  (Tim Allwine)
 
 I discovered VIM after years of struggling with the original vi, and I just
 can't live without it any more.  (Emmanuel Mogenet, USA)
@@ -194,11 +194,11 @@ better than most commercial software!  (Leiming Qian)
 This version of VIM will just blow people apart when they discover just how
 fantastic it is! (Tony Nugent, Australia)
 
-I took your advice & finally got VIM & I'm really impressed. Instant convert.
+I took your advice & finally got VIM & I'm really impressed.  Instant convert.
 (Patrick Killelea, USA)
 
 VIM is by far my favorite piece of shareware and I have been particularly
-pleased with version 3.0.  This is really a solid piece of work. (Robert
+pleased with version 3.0.  This is really a solid piece of work.  (Robert
 Colon, USA)
 
 VIM is a joy to use, it is so well thought and practical that I wonder why
@@ -244,7 +244,7 @@ VIM is the greatest editor since the stone chisel.  (Jose Unpingco, USA)
 
 I would like to say that with VIM I am finally making the 'emacs to vi'
 transition - as an Editor it is so much better in many ways: keyboard layout,
-memory usage, text alteration to name 3. (Mark Adam)
+memory usage, text alteration to name 3.  (Mark Adam)
 
 In fact, now if I want to know what a particular setting does in vi, I fire up
 VIM and check out it's help!  (Nikhil Patel, USA)
@@ -255,7 +255,7 @@ before I encountered this program.  (Steinar Knutsen, Norway)
 I use VIM since version 3.0.  Since that time, it is the ONLY editor I use,
 with Solaris, Linux and OS/2 Warp.  I suggest all my friends to use VIM, they
 try, and they continue using it.  VIM is really the best software I have ever
-downloaded from the Internet, and the best editor I know of. (Marco
+downloaded from the Internet, and the best editor I know of.  (Marco
 Eccettuato, Italy)
 
 

runtime/doc/recover.txt

@@ -1,4 +1,4 @@
-*recover.txt*   For Vim version 7.0aa.  Last change: 2004 Jun 16
+*recover.txt*   For Vim version 7.0aa.  Last change: 2005 Feb 10
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -116,8 +116,12 @@ command:
 
 					*:pre* *:preserve* *E313* *E314*
 :pre[serve]		Write all text for all buffers into swap file.  The
-			original file is no longer needed for recovery.  {Vi:
-			emergency exit}
+			original file is no longer needed for recovery.
+			This sets a flag in the current buffer.  When the '&'
+			flag is present in 'cpoptions' the swap file will not
+			be deleted for this buffer when Vim exits and the
+			buffer is still loaded |cpo-&|.
+			{Vi: might also exit}
 
 A Vim swap file can be recognized by the first six characters: "b0VIM ".
 After that comes the version number, e.g., "3.0".

runtime/doc/remote.txt

@@ -1,4 +1,4 @@
-*remote.txt*    For Vim version 7.0aa.  Last change: 2003 Nov 10
+*remote.txt*    For Vim version 7.0aa.  Last change: 2005 Apr 01
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -87,7 +87,7 @@ SERVER NAME
 By default Vim will try to register the name under which it was invoked (gvim,
 egvim ...).  This can be overridden with the --servername argument.  If the
 specified name is not available, a postfix is applied until a free name is
-encountered, ie. "gvim1" for the second invocation of gvim on a particular
+encountered, i.e. "gvim1" for the second invocation of gvim on a particular
 X-server.  The resulting name is available in the servername builtin variable
 |v:servername|.  The case of the server name is ignored, thus "gvim" and
 "GVIM" are considered equal.
@@ -121,7 +121,7 @@ wait for each of the files to have been edited.  This uses the BufUnload
 event, thus as soon as a file has been unloaded, Vim assumes you are done
 editing it.
 Note that the --remote and --remote-wait arguments will consume the rest of
-the command line.  Ie. all remaining arguments will be regarded as filenames.
+the command line.  I.e. all remaining arguments will be regarded as filenames.
 You can not put options there!
 
 

runtime/doc/repeat.txt

@@ -1,4 +1,4 @@
-*repeat.txt*    For Vim version 7.0aa.  Last change: 2004 Jul 30
+*repeat.txt*    For Vim version 7.0aa.  Last change: 2005 Jun 26
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -13,6 +13,7 @@ Chapter 26 of the user manual introduces repeating |usr_26.txt|.
 3. Complex repeats	|complex-repeat|
 4. Using Vim scripts	|using-scripts|
 5. Debugging scripts	|debug-scripts|
+6. Profiling		|profiling|
 
 ==============================================================================
 1. Single repeats					*single-repeat*
@@ -81,6 +82,11 @@ This replaces all occurrences of "pat" with "PAT".  The same can be done with:
 	:%s/pat/PAT/g
 Which is two characters shorter!
 
+A special case is using ":visual" as a command.  This will move to a matching
+line, go to Normal mode to let you execute commands there until you use |Q| to
+return to Ex mode.  This will be repeated for each matching line.  While doing
+this you cannot use ":global".
+
 ==============================================================================
 3. Complex repeats					*complex-repeat*
 
@@ -102,7 +108,7 @@ q			Stops recording.  (Implementation note: The 'q' that
 			expression.  The result of the expression is then
 			executed.  See also |@:|.  {Vi: only named registers}
 
-							*@@*
+							*@@* *E748*
 @@			Repeat the previous @{0-9a-z":*} [count] times.
 
 :[addr]*{0-9a-z".=}						*:@* *:star*
@@ -170,7 +176,7 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|.
 			matching files.  Example: >
 				:runtime! plugin/*.vim
 <			This is what Vim uses to load the plugin files when
-			starting up. This similar command: >
+			starting up.  This similar command: >
 				:runtime plugin/*.vim
 <			would source the first file only.
 
@@ -284,7 +290,7 @@ first line has something like ":map <F1> :help^M", where "^M" is a <CR>.  If
 the first line ends in a <CR>, but following ones don't, you will get an error
 message, because the <CR> from the first lines will be lost.
 
-Macintosh: Files that are read with ":source" normally have <CR> <EOL>s.
+Mac Classic: Files that are read with ":source" normally have <CR> <EOL>s.
 These always work.  If you are using a file with <NL> <EOL>s (for example, a
 file made on Unix), this will be recognized if 'fileformats' is not empty and
 the first line does not end in a <CR>.  Be careful not to use a file with <NL>
@@ -478,6 +484,7 @@ DEFINING BREAKPOINTS
 The [lnum] is the line number of the breakpoint.  Vim will stop at or after
 this line.  When omitted line 1 is used.
 
+							*:debug-name*
 {name} is a pattern that is matched with the file or function name.  The
 pattern is like what is used for autocommands.  There must be a full match (as
 if the pattern starts with "^" and ends in "$").  A "*" matches any sequence
@@ -497,6 +504,10 @@ The match for functions is done against the name as it's shown in the output
 of ":function".  For local functions this means that something like "<SNR>99_"
 is prepended.
 
+Note that functions are first loaded and later executed.  When they are loaded
+the "file" breakpoints are checked, when they are executed the "func"
+breakpoints.
+
 
 DELETING BREAKPOINTS
 						*:breakd* *:breakdel* *E161*
@@ -504,6 +515,9 @@ DELETING BREAKPOINTS
 		Delete breakpoint {nr}.  Use |:breaklist| to see the number of
 		each breakpoint.
 
+:breakd[el] *
+		Delete all breakpoints.
+
 :breakd[el] func [lnum] {name}
 		Delete a breakpoint in a function.
 
@@ -538,4 +552,96 @@ OBSCURE
 		Undo ":debuggreedy": get debug mode commands directly from the
 		user, don't use typeahead for debug commands.
 
+==============================================================================
+6. Profiling						*profile* *profiling*
+
+Profiling means that Vim measures the time that is spend on executing
+functions and/or scripts.  The |+profile| feature is required for this.
+It is only included when Vim was compiled with "huge" features.
+{Vi does not have profiling}
+
+:prof[ile] start {fname}			*:prof* *:profile* *E750*
+		Start profiling, write the output in {fname} upon exit.
+		If {fname} already exists it will be overwritten.
+		The variable |v:profiling| is set to one.
+
+:prof[ile] func {pattern}
+		Profile function that matches the pattern {pattern}.
+		See |:debug-name| for how {pattern} is used.
+
+:prof[ile][!] file {pattern}
+		Profile script file that matches the pattern {pattern}.
+		See |:debug-name| for how {pattern} is used.
+		This only profiles the script itself, not the functions
+		defined in it.
+		When the [!] is added then all functions defined in the script
+		will also be profiled.  But only if the script is loaded after
+		this command.
+
+
+:profd[el] ...						*:profd* *:profdel*
+		Stop profiling for the arguments specified. See |:breakdel|
+		for the arguments.
+
+
+You must always start with a ":profile start fname" command.  The resulting
+file is written when Vim exits.  Here is an example of the output, with line
+numbers prepended for the explanation:
+
+  1 FUNCTION  Test2() ~
+  2 Called 1 time ~
+  3 Total time:   0.155251 ~
+  4  Self time:   0.002006 ~
+  5  ~
+  6 count  total (s)   self (s) ~
+  7     9              0.000096   for i in range(8) ~
+  8     8   0.153655   0.000410     call Test3() ~
+  9     8              0.000070   endfor ~
+ 10                               " Ask a question ~
+ 11     1              0.001341   echo input("give me an answer: ") ~
+
+The header (lines 1-4) gives the time for the whole function.  The "Total"
+time is the time passed while the function was executing.  The "Self" time is
+the "Total" time reduced by time spent in:
+- other user defined functions
+- sourced scripts
+- executed autocommands
+- external (shell) commands
+
+Lines 7-11 show the time spent in each executed line.  Lines that are not
+executed do not count.  Thus a comment line is never counted.
+
+The Count column shows how many times a line was executed.  Note that the
+"for" command in line 7 is executed one more time as the following lines.
+That is because the line is also executed to detect the end of the loop.
+
+The time Vim spends waiting for user input isn't counted at all.  Thus how
+long you take to respond to the input() prompt is irrelevant.
+
+Profiling should give a good indication of where time is spent, but keep in
+mind there are various things that may clobber the results:
+
+- The accuracy of the time measured depends on the gettimeofday() system
+  function.  It may only be as accurate as 1/100 second, even though the times
+  are displayed in micro seconds.
+
+- Real elapsed time is measured, if other processes are busy they may cause
+  delays at unpredictable moments.  You may want to run the profiling several
+  times and use the lowest results.
+
+- If you have several commands in one line you only get one time.  Split the
+  line to see the time for the individual commands.
+
+- The time of the lines added up is mostly less than the time of the whole
+  function.  There is some overhead in between.
+
+- Functions that are deleted before Vim exits will not produce profiling
+  information.  You can check the |v:profiling| variable if needed: >
+  	:if !v:profiling
+	:   delfunc MyFunc
+	:endif
+<
+- Profiling may give weird results on multi-processor systems, when sleep
+  mode kicks in or the processor frequency is reduced to save power.
+
  vim:tw=78:ts=8:ft=help:norl:

runtime/doc/rileft.txt

@@ -1,4 +1,4 @@
-*rileft.txt*    For Vim version 7.0aa.  Last change: 2003 May 07
+*rileft.txt*    For Vim version 7.0aa.  Last change: 2005 Apr 04
 
 
 		  VIM REFERENCE MANUAL    by Avner Lottem
@@ -36,7 +36,7 @@ bidi and is merely opting to present a functional means to display/enter/use
 right-to-left languages.  An older hybrid solution in which direction is
 encoded for every character (or group of characters) are not supported either
 as this kind of support is out of the scope of a simple addition to an
-existing editor (and its not sanctioned by Unicode either).
+existing editor (and it's not sanctioned by Unicode either).
 
 
 Highlights

runtime/doc/russian.txt

@@ -1,4 +1,4 @@
-*russian.txt*   For Vim version 7.0aa.  Last change: 2004 Dec 22
+*russian.txt*   For Vim version 7.0aa.  Last change: 2005 Apr 01
 
 
 		  VIM REFERENCE MANUAL    by Vassily Ragosin
@@ -14,7 +14,7 @@ Russian language localization and support in Vim	   *russian* *Russian*
 ===============================================================================
 1. Introduction							*russian-intro*
 
-Russian language is supported perfectly well in Vim. You can type and view
+Russian language is supported perfectly well in Vim.  You can type and view
 Russian text just as any other, without the need to tweak the settings.
 
 ===============================================================================
@@ -28,8 +28,8 @@ example,
 <
 In the latter case, you can switch between languages even if you do not have
 system Russian keyboard or independently from a system-wide keyboard settings.
-See 'keymap'. You can also map a key to switch between keyboards, if you
-choose the latter option. See |:map|.
+See 'keymap'.  You can also map a key to switch between keyboards, if you
+choose the latter option.  See |:map|.
 
 For your convenience, to avoid switching between keyboards, when you need to
 enter Normal mode command, you can also set 'langmap' option:
@@ -51,11 +51,11 @@ different codepages from
     http://www.sourceforge.net/projects/ruvim/
 
 Make sure that your Vim is at least 6.2.506 and use ruvim 0.5 or later for
-automatic installs. Vim also needs to be compiled with |+gettext| feature for
+automatic installs.  Vim also needs to be compiled with |+gettext| feature for
 user interface items translations to work.
 
 After downloading an archive from RuVim project, unpack it into your
-$VIMRUNTIME directory. We recommend using UTF-8 archive, if your version of
+$VIMRUNTIME directory.  We recommend using UTF-8 archive, if your version of
 Vim is compiled with |+multi_byte| feature enabled.
 
 In order to use the Russian documentation, make sure you have set the
@@ -66,7 +66,7 @@ In order to use the Russian documentation, make sure you have set the
 
 -- If you are using Russian message translations in Win32 console, then
    you may see the output produced by "vim --help", "vim --version" commands
-   and Win32 console window title appearing in a wrong codepage. This problem
+   and Win32 console window title appearing in a wrong codepage.  This problem
    is related to a bug in GNU gettext library and may be fixed in the future
    releases of gettext.
 

runtime/doc/scroll.txt

@@ -1,4 +1,4 @@
-*scroll.txt*    For Vim version 7.0aa.  Last change: 2004 Jun 08
+*scroll.txt*    For Vim version 7.0aa.  Last change: 2005 Apr 01
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -52,6 +52,8 @@ CTRL-D			Scroll window Downwards in the buffer.  The number of
 <PageDown>	or				*<PageDown>* *CTRL-F*
 CTRL-F			Scroll window [count] pages Forwards (downwards) in
 			the buffer.  See also 'startofline' option.
+			When there is only one window the 'window' option
+			might be used.
 
 							*z+*
 z+			Without [count]: Redraw with the line just below the
@@ -89,6 +91,8 @@ CTRL-U			Scroll window Upwards in the buffer.  The number of
 <PageUp>	or					*<PageUp>* *CTRL-B*
 CTRL-B			Scroll window [count] pages Backwards (upwards) in the
 			buffer.  See also 'startofline' option.
+			When there is only one window the 'window' option
+			might be used.
 
 							*z^*
 z^			Without [count]: Redraw with the line just above the
@@ -261,12 +265,12 @@ You can also use Alt and Ctrl modifiers.
 This only works when Vim gets the scroll wheel events, of course.  You can
 check if this works with the "xev" program.
 
-When using Xfree86, the /etc/XF86Config file should have the correct entry for
+When using XFree86, the /etc/XF86Config file should have the correct entry for
 your mouse.  For FreeBSD, this entry works for a Logitech scrollmouse: >
     Protocol     "MouseMan"
     Device       "/dev/psm0"
     ZAxisMapping 4 5
-See the Xfree86 documentation for information.
+See the XFree86 documentation for information.
 
 							*xterm-mouse-wheel*
 To use the mouse wheel in a new xterm you only have to make the scroll wheel

runtime/doc/sign.txt

@@ -1,4 +1,4 @@
-*sign.txt*      For Vim version 7.0aa.  Last change: 2004 May 22
+*sign.txt*      For Vim version 7.0aa.  Last change: 2005 Apr 04
 
 
 		  VIM REFERENCE MANUAL    by Gordon Prieur
@@ -18,19 +18,19 @@ Sign Support Features				*sign-support*
 
 When a debugger or other IDE tool is driving an editor it needs to be able
 to give specific highlights which quickly tell the user useful information
-about the file. One example of this would be a debugger which had an icon
-in the left-hand column denoting a breakpoint. Another example might be an
-arrow representing the Program Counter (PC). The sign features allow both
+about the file.  One example of this would be a debugger which had an icon
+in the left-hand column denoting a breakpoint.  Another example might be an
+arrow representing the Program Counter (PC).  The sign features allow both
 placement of a sign, or icon, in the left-hand side of the window and
-definition of a highlight which will be applied to that line. Displaying the
+definition of a highlight which will be applied to that line.  Displaying the
 sign as an image is most likely only feasible in gvim (although Sun
-Microsystem's dtterm does support this its the only terminal emulator I know
+Microsystem's dtterm does support this it's the only terminal emulator I know
 of which does).  A text sign and the highlight should be feasible in any color
 terminal emulator.
 
-Signs and highlights are not useful just for debuggers. Sun's Visual
+Signs and highlights are not useful just for debuggers.  Sun's Visual
 WorkShop uses signs and highlights to mark build errors and SourceBrowser
-hits. Additionally, the debugger supports 8 to 10 different signs and
+hits.  Additionally, the debugger supports 8 to 10 different signs and
 highlight colors. |workshop|  Same for Netbeans |netbeans|.
 
 There are two steps in using signs:

runtime/doc/spell.txt

@@ -0,0 +1,816 @@
+*spell.txt*	For Vim version 7.0aa.  Last change: 2005 Jul 05
+
+
+		  VIM REFERENCE MANUAL	  by Bram Moolenaar
+
+
+Spell checking						*spell*
+
+1. Quick start			|spell-quickstart|
+2. Remarks on spell checking	|spell-remarks|
+3. Generating a spell file	|spell-mkspell|
+4. Spell file format		|spell-file-format|
+
+{Vi does not have any of these commands}
+
+Spell checking is not available when the |+syntax| feature has been disabled
+at compile time.
+
+==============================================================================
+1. Quick start						*spell-quickstart*
+
+This command switches on spell checking: >
+
+	:setlocal spell spelllang=en_us
+
+This switches on the 'spell' option and specifies to check for US English.
+
+The words that are not recognized are highlighted with one of these:
+	SpellBad	word not recognized			|hl-SpellBad|
+	SpellCap	word not capitalised			|hl-SpellCap|
+	SpellRare	rare word				|hl-SpellRare|
+	SpellLocal	wrong spelling for selected region	|hl-SpellLocal|
+
+Vim only checks words for spelling, there is no grammar check.
+
+To search for the next misspelled word:
+
+							*]s* *E756*
+]s			Move to next misspelled word after the cursor.
+			A count before the command can be used to repeat.
+
+							*[s*
+[s			Like "]s" but search backwards, find the misspelled
+			word before the cursor.  Doesn't recognize words
+			split over two lines, thus may stop at words that are
+			not highlighted as bad.  Does not stop at word with
+			missing capital at the start of a line.
+
+							*]S*
+]S			Like "]s" but only stop at bad words, not at rare
+			words or words for another region.
+
+							*[S*
+[S			Like "]S" but search backwards.
+
+
+To add words to your own word list:				*E764*
+
+							*zg*
+zg			Add word under the cursor as a good word to the first
+			name in 'spellfile'.  In Visual mode the selected
+			characters are added as a word (including white
+			space!).  If the word is explicitly marked as bad word
+			in another spell file the result is unpredictable.
+			A count may precede the command to indicate the entry
+			in 'spellfile' to be used.  A count of two uses the
+			second entry.
+
+							*zG*
+zG			Like "zg" but add the word to the internal word list
+			|internal-wordlist|.
+
+							*zw*
+zw			Like "zg" but mark the word as a wrong (bad) word.
+
+							*zW*
+zW			Like "zw" but add the word to the internal word list
+			|internal-wordlist|.
+
+							*:spe* *:spellgood*
+:[count]spe[llgood] {word}
+			Add {word} as a good word to 'spellfile', like with
+			"zg".  Without count the first name is used, with a
+			count of two the second entry, etc.
+
+:spe[llgood]! {word}	Add {word} as a good word to the internal word list,
+			like with "zG".
+
+							*:spellw* *:spellwrong*
+:[count]spellw[rong] {word}
+			Add {word} as a wrong (bad) word to 'spellfile', as
+			with "zw".  Without count the first name is used, with
+			a count of two the second entry, etc.
+
+:spellw[rong]! {word}	Add {word} as a wrong (bad) word to the internal word
+			list.
+
+After adding a word to 'spellfile' with the above commands its associated
+".spl" file will automatically be updated and reloaded.  If you change
+'spellfile' manually you need to use the |:mkspell| command.  This sequence of
+commands mostly works well: >
+	:edit <file in 'spellfile'>
+<	(make changes to the spell file) >
+	:mkspell! %
+
+More details about the 'spellfile' format below |spell-wordlist-format|.
+
+							*internal-wordlist*
+The internal word list is used for all buffers where 'spell' is set.  It is
+not stored, it is lost when you exit Vim.  It is also cleared when 'encoding'
+is set.
+
+
+Finding suggestions for bad words:
+							*z?*
+z?			For the word under/after the cursor suggest correctly
+			spelled words.  This also works to find alternatives
+			for a word that is not highlighted as a bad word,
+			e.g., when the word after it is bad.
+			The results are sorted on similarity to the word
+			under/after the cursor.
+			This may take a long time.  Hit CTRL-C when you are
+			bored.
+			This does not work when there is a line break halfway
+			a bad word (e.g., "the the").
+			You can enter the number of your choice or press
+			<Enter> if you don't want to replace.  You can also
+			use the mouse to click on your choice (only works if
+			the mouse can be used in Normal mode and when there
+			are no line wraps).  Click on the first (header) line
+			to cancel.
+			If 'verbose' is non-zero a score will be displayed to
+			indicate the likeliness to the badly spelled word (the
+			higher the score the more different).
+			When a word was replaced the redo command "." will
+			repeat the word replacement.  This works like "ciw",
+			the good word and <Esc>.
+
+					*:spellr* *:spellrepall* *E752* *E753*
+:spellr[epall]		Repeat the replacement done by |z?| for all matches
+			with the replaced word in the current window.
+
+The 'spellsuggest' option influences how the list of suggestions is generated
+and sorted.  See |'spellsuggest'|.
+
+The 'spellcapcheck' option is used to check the first word of a sentence
+starts with a capital.  This doesn't work for the first word in the file.
+When there is a line break right after a sentence the highlighting of the next
+line may be postponed.  Use |CTRL-L| when needed.
+
+==============================================================================
+2. Remarks on spell checking				*spell-remarks*
+
+PERFORMANCE
+
+Vim does on-the-fly spell checking.  To make this work fast the word list is
+loaded in memory.  Thus this uses a lot of memory (1 Mbyte or more).  There
+might also be a noticeable delay when the word list is loaded, which happens
+when 'spell' is set and when 'spelllang' is set while 'spell' was already set.
+To minimize the delay each word list is only loaded once, it is not deleted
+when 'spelllang' is made empty or 'spell' is reset.  When 'encoding' is set
+all the word lists are reloaded, thus you may notice a delay then too.
+
+
+REGIONS
+
+A word may be spelled differently in various regions.  For example, English
+comes in (at least) these variants:
+
+	en		all regions
+	en_au		Australia
+	en_ca		Canada
+	en_gb		Great Britain
+	en_nz		New Zealand
+	en_us		USA
+
+Words that are not used in one region but are used in another region are
+highlighted with SpellLocal |hl-SpellLocal|.
+
+Always use lowercase letters for the language and region names.
+
+When adding a word with |zg| or another command it's always added for all
+regions.  You can change that by manually editing the 'spellfile'.  See
+|spell-wordlist-format|.  Note that the regions as specified in the files in
+'spellfile' are only used when all entries in "spelllang" specify the same
+region (not counting files specified by their .spl name).
+
+
+SPELL FILES						*spell-load*
+
+Vim searches for spell files in the "spell" subdirectory of the directories in
+'runtimepath'.  The name is: LL.EEE.spl, where:
+	LL	the language name
+	EEE	the value of 'encoding'
+
+The value for "LL" comes from 'spelllang', but excludes the region name.
+Examples:
+	'spelllang'	LL ~
+	en_us		en
+	en-rare		en-rare
+	medical_ca	medical
+
+Only the first file is loaded, the one that is first in 'runtimepath'.  If
+this succeeds then additionally files with the name LL.EEE.add.spl are loaded.
+All the ones that are found are used.
+
+Additionally, the files related to the names in 'spellfile' are loaded.  These
+are the files that |zg| and |zw| add good and wrong words to.
+
+Exceptions:
+- Vim uses "latin1" when 'encoding' is "iso-8859-15".  The euro sign doesn't
+  matter for spelling.
+- When no spell file for 'encoding' is found "ascii" is tried.  This only
+  works for languages where nearly all words are ASCII, such as English.  It
+  helps when 'encoding' is not "latin1", such as iso-8859-2, and English text
+  is being edited.  For the ".add" files the same name as the found main
+  spell file is used.
+
+For example, with these values:
+	'runtimepath' is "~/.vim,/usr/share/vim70,~/.vim/after"
+	'encoding'    is "iso-8859-2"
+	'spelllang'   is "pl"
+
+Vim will look for:
+1. ~/.vim/spell/pl.iso-8859-2.spl
+2. /usr/share/vim70/spell/pl.iso-8859-2.spl
+3. ~/.vim/spell/pl.iso-8859-2.add.spl
+4. /usr/share/vim70/spell/pl.iso-8859-2.add.spl
+5. ~/.vim/after/spell/pl.iso-8859-2.add.spl
+
+This assumes 1. is not found and 2. is found.
+
+If 'encoding' is "latin1" Vim will look for:
+1. ~/.vim/spell/pl.latin1.spl
+2. /usr/share/vim70/spell/pl.latin1.spl
+3. ~/.vim/after/spell/pl.latin1.spl
+4. ~/.vim/spell/pl.ascii.spl
+5. /usr/share/vim70/spell/pl.ascii.spl
+6. ~/.vim/after/spell/pl.ascii.spl
+
+This assumes none of them are found (Polish doesn't make sense when leaving
+out the non-ASCII characters).
+
+Spelling for EBCDIC is currently not supported.
+
+A spell file might not be available in the current 'encoding'.  See
+|spell-mkspell| about how to create a spell file.  Converting a spell file
+with "iconv" will NOT work!
+
+							*E758* *E759*
+When loading a spell file Vim checks that it is properly formatted.  If you
+get an error the file may be truncated, modified or intended for another Vim
+version.
+
+
+WORDS
+
+Vim uses a fixed method to recognize a word.  This is independent of
+'iskeyword', so that it also works in help files and for languages that
+include characters like '-' in 'iskeyword'.  The word characters do depend on
+'encoding'.
+
+The table with word characters is stored in the main .spl file.  Therefore it
+matters what the current locale is when generating it!  A .add.spl file does
+not contain a word table though.
+
+A word that starts with a digit is always ignored.  That includes hex numbers
+in the form 0xff and 0XFF.
+
+
+WORD COMBINATIONS
+
+It is possible to spell-check words that include a space.  This is used to
+recognize words that are invalid when used by themselves, e.g. for "et al.".
+It can also be used to recognize "the the" and highlight it.
+
+The number of spaces is irrelevant.  In most cases a line break may also
+appear.  However, this makes it difficult to find out where to start checking
+for spelling mistakes.  When you make a change to one line and only that line
+is redrawn Vim won't look in the previous line, thus when "et" is at the end
+of the previous line "al." will be flagged as an error.  And when you type
+"the<CR>the" the highlighting doesn't appear until the first line is redrawn.
+Use |CTRL-L| to redraw right away.  "[s" will also stop at a word combination
+with a line break.
+
+When encountering a line break Vim skips characters such as '*', '>' and '"',
+so that comments in C, shell and Vim code can be spell checked.
+
+
+SYNTAX HIGHLIGHTING					*spell-syntax*
+
+Files that use syntax highlighting can specify where spell checking should be
+done:
+
+1.  everywhere			   default
+2.  in specific items		   use "contains=@Spell"
+3.  everywhere but specific items  use "contains=@NoSpell"
+
+For the second method adding the @NoSpell cluster will disable spell checking
+again.  This can be used, for example, to add @Spell to the comments of a
+program, and add @NoSpell for items that shouldn't be checked.
+
+
+VIM SCRIPTS
+
+If you want to write a Vim script that does something with spelling, you may
+find these functions useful:
+
+    spellbadword()	find badly spelled word at the cursor
+    spellsuggest()	get list of spelling suggestions
+    soundfold()		get the sound-a-like version of a word
+
+==============================================================================
+3. Generating a spell file				*spell-mkspell*
+
+Vim uses a binary file format for spelling.  This greatly speeds up loading
+the word list and keeps it small.
+						    *.aff* *.dic* *Myspell*
+You can create a Vim spell file from the .aff and .dic files that Myspell
+uses.  Myspell is used by OpenOffice.org and Mozilla.  You should be able to
+find them here:
+	http://lingucomponent.openoffice.org/spell_dic.html
+You can also use a plain word list.  The results are the same, the choice
+depends on what word lists you can find.
+
+If you install Aap (from www.a-a-p.org) you can use the recipes in the
+runtime/spell/??/ directories.  Aap will take care of downloading the files,
+apply patches needed for Vim and build the .spl file.
+
+Make sure your current locale is set properly, otherwise Vim doesn't know what
+characters are upper/lower case letters.  If the locale isn't available (e.g.,
+when using an MS-Windows codepage on Unix) add tables to the .aff file
+|spell-affix-chars|.  If the .aff file doesn't define a table then the word
+table of the currently active spelling is used.  If spelling is not active
+then Vim will try to guess.
+
+							*:mksp* *:mkspell*
+:mksp[ell][!] [-ascii] {outname} {inname} ...
+			Generate a Vim spell file word lists.  Example: >
+		:mkspell /tmp/nl nl_NL.words
+<								*E751*
+			When {outname} ends in ".spl" it is used as the output
+			file name.  Otherwise it should be a language name,
+			such as "en", without the region name.  The file
+			written will be "{outname}.{encoding}.spl", where
+			{encoding} is the value of the 'encoding' option.
+
+			When the output file already exists [!] must be used
+			to overwrite it.
+
+			When the [-ascii] argument is present, words with
+			non-ascii characters are skipped.  The resulting file
+			ends in "ascii.spl".
+
+			The input can be the Myspell format files {inname}.aff
+			and {inname}.dic.  If {inname}.aff does not exist then
+			{inname} is used as the file name of a plain word
+			list.
+
+			Multiple {inname} arguments can be given to combine
+			regions into one Vim spell file.  Example: >
+		:mkspell ~/.vim/spell/en /tmp/en_US /tmp/en_CA /tmp/en_AU
+<			This combines the English word lists for US, CA and AU
+			into one en.spl file.
+			Up to eight regions can be combined. *E754* *755*
+			The REP and SAL items of the first .aff file where
+			they appear are used. |spell-affix-REP|
+			|spell-affix-SAL|
+
+			This command uses a lot of memory, required to find
+			the optimal word tree (Polish requires a few hundred
+			Mbyte).  The final result will be much smaller.
+
+			After the spell file was written and it was being used
+			in a buffer it will be reloaded automatically.
+
+:mksp[ell] [-ascii] {name}.{enc}.add
+			Like ":mkspell" above, using {name}.{enc}.add as the
+			input file and producing an output file in the same
+			directory that has ".spl" appended.
+
+:mksp[ell] [-ascii] {name}
+			Like ":mkspell" above, using {name} as the input file
+			and producing an output file in the same directory
+			that has ".{enc}.spl" appended.
+
+Since you might want to change a Myspell word list for use with Vim the
+following procedure is recommended:
+
+1. Obtain the xx_YY.aff and xx_YY.dic files from Myspell.
+2. Make a copy of these files to xx_YY.orig.aff and xx_YY.orig.dic.
+3. Change the xx_YY.aff and xx_YY.dic files to remove bad words, add missing
+   words, define word characters with FOL/LOW/UPP, etc.  The distributed
+   "src/spell/*.diff" files can be used.
+4. Start Vim with the right locale and use |:mkspell| to generate the Vim
+   spell file.
+5. Try out the spell file with ":set spell spelllang=xx" if you wrote it in
+   a spell directory in 'runtimepath', or ":set spelllang=xx.enc.spl" if you
+   wrote it somewhere else.
+
+When the Myspell files are updated you can merge the differences:
+1. Obtain the new Myspell files as xx_YY.new.aff and xx_UU.new.dic.
+2. Use Vimdiff to see what changed: >
+	vimdiff xx_YY.orig.dic xx_YY.new.dic
+3. Take over the changes you like in xx_YY.dic.
+   You may also need to change xx_YY.aff.
+4. Rename xx_YY.new.dic to xx_YY.orig.dic and xx_YY.new.aff to xx_YY.new.aff.
+
+
+SPELL FILE DUMP
+
+If for some reason you want to check what words are supported by the currently
+used spelling files, use this command:
+
+							*:spelldump* *:spelld*
+:spelld[ump]		Open a new window and fill it with all currently valid
+			words.
+			Note: For some languages the result may be enormous,
+			causing Vim to run out of memory.
+
+The format of the word list is used |spell-wordlist-format|.  You should be
+able to read it with ":mkspell" to generate one .spl file that includes all
+the words.
+
+When all entries to 'spelllang' use the same regions or no regions at all then
+the region information is included in the dumped words.  Otherwise only words
+for the current region are included and no "/regions" line is generated.
+
+Comment lines with the name of the .spl file are used as a header above the
+words that were generated from that .spl file.
+
+==============================================================================
+4. Spell file format					*spell-file-format*
+
+This is the format of the files that are used by the person who creates and
+maintains a word list.
+
+Note that we avoid the word "dictionary" here.  That is because the goal of
+spell checking differs from writing a dictionary (as in the book).  For
+spelling we need a list of words that are OK, thus should not to be
+highlighted.  Person and company names will not appear in a dictionary, but do
+appear in a word list.  And some old words are rarely used while they are
+common misspellings.  These do appear in a dictionary but not in a word list.
+
+There are two formats: A straight list of words and a list using affix
+compression.  The files with affix compression are used by Myspell (Mozilla
+and OpenOffice.org).  This requires two files, one with .aff and one with .dic
+extension.
+
+
+FORMAT OF STRAIGHT WORD LIST				*spell-wordlist-format*
+
+The words must appear one per line.  That is all that is required.
+
+Additionally the following items are recognized:
+
+- Empty and blank lines are ignored.
+
+- Lines starting with a # are ignored (comment lines).
+
+- A line starting with "/encoding=", before any word, specifies the encoding
+  of the file.  After the second '=' comes an encoding name.  This tells Vim
+  to setup conversion from the specified encoding to 'encoding'.  Thus you can
+  use one word list for several target encodings.
+
+- A line starting with "/regions=" specifies the region names that are
+  supported.  Each region name must be two ASCII letters.  The first one is
+  region 1.  Thus "/regions=usca" has region 1 "us" and region 2 "ca".
+  In an addition word list the region names should be equal to the main word
+  list!
+
+- Other lines starting with '/' are reserved for future use.  The ones that
+  are not recognized are ignored (but you do get a warning message).
+
+- A "/" may follow the word with the following items:
+    =   	Case must match exactly.
+    ?		Rare word.
+    !		Bad (wrong) word.
+    digit	A region in which the word is valid.  If no regions are
+    		specified the word is valid in all regions.
+
+Example:
+
+	# This is an example word list		comment
+	/encoding=latin1			encoding of the file
+	/regions=uscagb				regions "us", "ca" and "gb"
+	example					word for all regions
+	blah/12					word for regions "us" and "ca"
+	vim/!					bad word
+	Campbell/?3				rare word in region 3 "gb"
+	's mornings/=				keep-case word
+
+Note that when "/=" is used the same word with all upper-case letters is not
+accepted.  This is different from a word with mixed case that is automatically
+marked as keep-case, those words may appear in all upper-case letters.
+
+
+FORMAT WITH AFFIX COMPRESSION
+
+There are two files: the basic word list and an affix file.  The affixes are
+used to modify the basic words to get the full word list.  This significantly
+reduces the number of words, especially for a language like Polish.  This is
+called affix compression.
+
+The format for the affix and word list files is mostly identical to what
+Myspell uses (the spell checker of Mozilla and OpenOffice.org).  A description
+can be found here:
+	http://lingucomponent.openoffice.org/affix.readme ~
+Note that affixes are case sensitive, this isn't obvious from the description.
+
+Vim supports a few extras.  Hopefully Myspell will support these too some day.
+See |spell-affix-vim|.
+
+The basic word list and the affix file are combined and turned into a binary
+spell file.  All the preprocessing has been done, thus this file loads fast.
+The binary spell file format is described in the source code (src/spell.c).
+But only developers need to know about it.
+
+The preprocessing also allows us to take the Myspell language files and modify
+them before the Vim word list is made.  The tools for this can be found in the
+"src/spell" directory.
+
+
+WORD LIST FORMAT				*spell-dic-format*
+
+A very short example, with line numbers:
+
+	1	1234
+	2	aan
+	3	Als
+	4	Etten-Leur
+	5	et al.
+	6	's-Gravenhage
+	7	's-Gravenhaags
+	8	bedel/P
+	9	kado/1
+	10	cadeau/2
+
+The first line contains the number of words.  Vim ignores it, but you do get
+an error message if it's not there.  *E760*
+
+What follows is one word per line.  There should be no white space before or
+after the word.
+
+When the word only has lower-case letters it will also match with the word
+starting with an upper-case letter.
+
+When the word includes an upper-case letter, this means the upper-case letter
+is required at this position.  The same word with a lower-case letter at this
+position will not match. When some of the other letters are upper-case it will
+not match either.
+
+The word with all upper-case characters will always be OK.
+
+	word list	matches			does not match ~
+	als		als Als ALS		ALs AlS aLs aLS
+	Als		Als  ALS		als ALs AlS aLs aLS
+	ALS		ALS			als Als ALs AlS aLs aLS
+	AlS		AlS ALS			als Als ALs aLs aLS
+
+The KEP affix ID can be used to specifically match a word with identical case
+only, see below |spell-affix-KEP|.
+
+Note in line 5 to 7 that non-word characters are used.  You can include
+any character in a word.  When checking the text a word still only matches
+when it appears with a non-word character before and after it.  For Myspell a
+word starting with a non-word character probably won't work.
+
+After the word there is an optional slash and flags.  Most of these flags are
+letters that indicate the affixes that can be used with this word.  These are
+specified with SFX and PFX lines in the .aff file.  See the Myspell
+documentation.
+
+							*spell-affix-vim*
+A flag that Vim adds and is not in Myspell is the flag defined with KEP in the
+affix file.  This has the meaning that case matters.  This can be used if the
+word does not have the first letter in upper case at the start of a sentence.
+Example (assuming that = was used for KEP):
+
+    word list	    matches		    does not match ~
+    's morgens/=    's morgens		    'S morgens 's Morgens 'S MORGENS
+    's Morgens	    's Morgens 'S MORGENS   'S morgens 's morgens
+
+The flag can also be used to avoid that the word matches when it is in all
+upper-case letters.
+
+							*spell-affix-mbyte*
+The basic word list is normally in an 8-bit encoding, which is mentioned in
+the affix file.  The affix file must always be in the same encoding as the
+word list.  This is compatible with Myspell.  For Vim the encoding may also be
+something else, any encoding that "iconv" supports.  The "SET" line must
+specify the name of the encoding.  When using a multi-byte encoding it's
+possible to use more different affixes (but Myspell doesn't support that, thus
+you may not want to use it anyway).
+
+
+CHARACTER TABLES
+							*spell-affix-chars*
+When using an 8-bit encoding the affix file should define what characters are
+word characters (as specified with ENC).  This is because the system where
+":mkspell" is used may not support a locale with this encoding and isalpha()
+won't work.  For example when using "cp1250" on Unix.
+
+					*E761* *E762* *spell-affix-FOL*
+					*spell-affix-LOW* *spell-affix-UPP*
+Three lines in the affix file are needed.  Simplistic example:
+
+	FOL  <20><><EFBFBD> ~
+	LOW  <20><><EFBFBD> ~
+	UPP  <20><><EFBFBD> ~
+
+All three lines must have exactly the same number of characters.
+
+The "FOL" line specifies the case-folded characters.  These are used to
+compare words while ignoring case.  For most encodings this is identical to
+the lower case line.
+
+The "LOW" line specifies the characters in lower-case.  Mostly it's equal to
+the "FOL" line.
+
+The "UPP" line specifies the characters with upper-case.  That is, a character
+is upper-case where it's different from the character at the same position in
+"FOL".
+
+ASCII characters should be omitted, Vim always handles these in the same way.
+When the encoding is UTF-8 no word characters need to be specified.
+
+							*E763*
+Vim allows you to use spell checking for several languages in the same file.
+You can list them in the 'spelllang' option.  As a consequence all spell files
+for the same encoding must use the same word characters, otherwise they can't
+be combined without errors.  If you get a warning that the word tables differ
+you may need to generate the .spl file again with |:mkspell|.  Check the FOL,
+LOW and UPP lines in the used .aff file.
+
+The XX.ascii.spl spell file generated with the "-ascii" argument will not
+contain the table with characters, so that it can be combine with spell files
+for any encoding.  The .add.spl files also do not contain the table.
+
+
+MID-WORD CHARACTERS
+							*spell-midword*
+Some characters are only to be considered word characters if they are used in
+between two ordinary word characters.  An example is the single quote: It is
+often used to put text in quotes, thus it can't be recognized as a word
+character, but when it appears in between word characters it must be part of
+the word.  This is needed to detect a spelling error such as they'are.  That
+should be they're, but since "they" and "are" are words themselves that would
+go unnoticed.
+
+These characters are defined with MIDWORD in the .aff file:
+
+	MIDWORD	'- ~
+
+
+AFFIXES
+					    *spell-affix-PFX* *spell-affix-SFX*
+The usual PFX (prefix) and SFX (suffix) lines are supported (see the Myspell
+documentation or the Aspell manual:
+http://aspell.net/man-html/Affix-Compression.html).
+
+Note that Myspell ignores any extra text after the relevant info.  Vim
+requires this text to start with a "#" so that mistakes don't go unnoticed.
+Example:
+
+	SFX F 0 in   [^i]n      # Spion > Spionin  ~
+	SFX F 0 nen  in         # Bauerin > Bauerinnen ~
+
+An extra item for Vim is the "rare" flag.  It must come after the other
+fields, before a comment.  When used then all words that use the affix will be
+marked as rare words.  Example:
+
+	PFX F 0 nene  .   rare ~
+	SFX F 0 oin   n   rare   # hardly ever used ~
+
+However, if the word also appears as a good word in another way it won't be
+marked as rare.
+
+						    *spell-affix-PFXPOSTPONE*
+When an affix file has very many prefixes that apply to many words it's not
+possible to build the whole word list in memory.  This applies to Hebrew (a
+list with all words is over a Gbyte).  In that case applying prefixes must be
+postponed.  This makes spell checking slower.  It is indicated by this keyword
+in the .aff file:
+
+	PFXPOSTPONE ~
+
+Only prefixes without a chop string can be postponed, prefixes with a chop
+string will still be included in the word list.
+
+
+KEEP-CASE WORDS
+							*spell-affix-KEP*
+In the affix file a KEP line can be used to define the affix name used for
+keep-case words.  Example:
+
+	KEP = ~
+
+See above for an example |spell-affix-vim|.
+
+
+RARE WORDS
+							*spell-affix-RAR*
+In the affix file a RAR line can be used to define the affix name used for
+rare words.  Example:
+
+	RAR ? ~
+
+Rare words are highlighted differently from bad words.  This is to be used for
+words that are correct for the language, but are hardly ever used and could be
+a typing mistake anyway.  When the same word is found as good it won't be
+highlighted as rare.
+
+
+BAD WORDS
+							*spell-affix-BAD*
+In the affix file a BAD line can be used to define the affix name used for
+bad words.  Example:
+
+	BAD ! ~
+
+This can be used to exclude words that would otherwise be good.  For example
+"the the" in the .dic file:
+
+	the the/! ~
+
+Once a word has been marked as bad it won't be undone by encountering the same
+word as good.
+
+
+REPLACEMENTS						*spell-affix-REP*
+
+In the affix file REP items can be used to define common mistakes.  This is
+used to make spelling suggestions.  The items define the "from" text and the
+"to" replacement.  Example:
+
+	REP 4 ~
+	REP f ph ~
+	REP ph f ~
+	REP k ch ~
+	REP ch k ~
+
+The first line specifies the number of REP lines following.  Vim ignores it.
+Don't include simple one-character replacements or swaps.  Vim will try these
+anyway.  You can include whole words if you want to, but you might want to use
+the "file:" item in 'spellsuggest' instead.
+
+
+SIMILAR CHARACTERS					*spell-affix-MAP*
+
+In the affix file MAP items can be used to define letters that are very much
+alike.  This is mostly used for a letter with different accents.  This is used
+to prefer suggestions with these letters substituted.  Example:
+
+	MAP 2 ~
+	MAP e<><65><EFBFBD><EFBFBD> ~
+	MAP u<><75><EFBFBD><EFBFBD> ~
+
+The first line specifies the number of MAP lines following.  Vim ignores it.
+
+Each letter must appear in only one of the MAP items.  It's a bit more
+efficient if the first letter is ASCII or at least one without accents.
+
+
+SOUND-A-LIKE						*spell-affix-SAL*
+
+In the affix file SAL items can be used to define the sounds-a-like mechanism
+to be used.  The main items define the "from" text and the "to" replacement.
+Simplistic example:
+
+	SAL CIA                  X ~
+	SAL CH                   X ~
+	SAL C                    K ~
+	SAL K                    K ~
+
+There are a few rules and this can become quite complicated.  An explanation
+how it works can be found in the Aspell manual:
+http://aspell.net/man-html/Phonetic-Code.html.
+
+There are a few special items:
+
+	SAL followup		true ~
+	SAL collapse_result	true ~
+	SAL remove_accents	true ~
+
+"1" has the same meaning as "true".  Any other value means "false".
+
+
+SIMPLE SOUNDFOLDING		*spell-affix-SOFOFROM* *spell-affix-SOFOTO*
+
+The SAL mechanism is complex and slow.  A simpler mechanism is mapping all
+characters to another character, mapping similar sounding characters to the
+same character.  At the same time this does case folding.  You can not have
+both SAL items and simple soundfolding.
+
+There are two items required: one to specify the characters that are mapped
+and one that specifies the characters they are mapped to.  They must have
+exactly the same number of characters.  Example:
+
+    SOFOFROM abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ ~
+    SOFOTO   ebctefghejklnnepkrstevvkesebctefghejklnnepkrstevvkes ~
+
+In the example all vowels are mapped to the same character 'e'.  Another
+method would be to leave out all vowels.  Some characters that sound nearly
+the same and are often mixed up, such as 'm' and 'n', are mapped to the same
+character.  Don't do this too much, all words will start looking alike.
+
+Characters that do not appear in SOFOFROM will be left out, except that all
+white space is replaced by one space.  Sequences of the same character in
+SOFOFROM are replaced by one.
+
+You can use the |soundfold()| function to try out the results.  Or set the
+'verbose' option to see the score in the output of the |z?| command.
+
+
+ vim:tw=78:sw=4:ts=8:ft=help:norl:

runtime/doc/starting.txt

@@ -1,4 +1,4 @@
-*starting.txt*  For Vim version 7.0aa.  Last change: 2005 Jan 07
+*starting.txt*  For Vim version 7.0aa.  Last change: 2005 Jun 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -263,8 +263,14 @@ a slash.  Thus "-R" means recovery and "-/R" readonly.
 		To be used when Vim is used to execute Ex commands from a file
 		instead of a terminal.  Switches off most prompts and
 		informative messages.  Also warnings and error messages.
-		But ":print" output is displayed.  And when 'verbose' is
-		non-zero messages are printed (for debugging).
+		The output of these commands is displayed (to stdout):
+			:print
+			:list
+			:number
+			:set      to display option values.
+		When 'verbose' is non-zero messages are printed (for
+		debugging, to stderr).
+		'term' and $TERM are not used.
 		If Vim appears to be stuck try typing "qa!<Enter>".  You don't
 		get a prompt thus you can't see Vim is waiting for you to type
 		something.
@@ -275,7 +281,7 @@ a slash.  Thus "-R" means recovery and "-/R" readonly.
 <
 							*-b*
 -b		Binary mode.  File I/O will only recognize <NL> to separate
-		lines. The 'expandtab' option will be reset.  The 'textwidth'
+		lines.  The 'expandtab' option will be reset.  The 'textwidth'
 		option is set to 0.  'modeline' is reset.  The 'binary' option
 		is set.  This is done after reading the vimrc/exrc files but
 		before reading any file in the arglist.  See also
@@ -288,17 +294,17 @@ a slash.  Thus "-R" means recovery and "-/R" readonly.
 -A		Arabic mode.  Sets the 'arabic' option on.  (Only when
 		compiled with the |+arabic| features (which include
 		|+rightleft|), otherwise Vim gives an error message
-		and exits.  {not in Vi}
+		and exits.)  {not in Vi}
 
 							*-F*
 -F		Farsi mode.  Sets the 'fkmap' and 'rightleft' options on.
 		(Only when compiled with |+rightleft| and |+farsi| features,
-		otherwise Vim gives an error message and exits).  {not in Vi}
+		otherwise Vim gives an error message and exits.)  {not in Vi}
 
 							*-H*
 -H		Hebrew mode.  Sets the 'hkmap' and 'rightleft' options on.
 		(Only when compiled with the |+rightleft| feature, otherwise
-		Vim gives an error message and exits).  {not in Vi}
+		Vim gives an error message and exits.)  {not in Vi}
 
 							*-V* *verbose*
 -V[N]		Verbose.  Sets the 'verbose' option to [N] (default: 10).
@@ -306,6 +312,11 @@ a slash.  Thus "-R" means recovery and "-/R" readonly.
 		for reading or writing a viminfo file.  Can be used to find
 		out what is happening upon startup and exit.  {not in Vi}
 
+-V[N]{filename}
+		Like -V and set 'verbosefile' to {filename}.  The result is
+		that messages are not displayed but written to the file
+		{filename}.  {filename} must not start with a digit.
+
 							*-D*
 -D		Debugging.  Go to debugging mode when executing the first
 		command from a script. |debug-mode|
@@ -367,7 +378,7 @@ a slash.  Thus "-R" means recovery and "-/R" readonly.
 -T {terminal}	Set the terminal type to "terminal".  This influences the
 		codes that Vim will send to your terminal.  This is normally
 		not needed, because Vim will be able to find out what type
-		of terminal you are using (See |terminal-info|).  {not in Vi}
+		of terminal you are using.  (See |terminal-info|.)  {not in Vi}
 
 							*-d*
 -d		Start in diff mode, like |vimdiff|.
@@ -422,7 +433,7 @@ a slash.  Thus "-R" means recovery and "-/R" readonly.
 
 							*-U* *E230*
 -U {gvimrc}	The file "gvimrc" is read for initializations when the GUI
-		starts.  Other GUI initializations are skipped. When {gvimrc}
+		starts.  Other GUI initializations are skipped.  When {gvimrc}
 		is equal to "NONE", no file is read for GUI initializations at
 		all.  |gui-init|
 		Exception: Reading the system-wide menu file is always done.
@@ -469,22 +480,23 @@ a slash.  Thus "-R" means recovery and "-/R" readonly.
 		started in Ex mode, see |-s-ex|.  See also |complex-repeat|.
 		{not in Vi}
 
+							*-w_nr*
+-w {number}
+-w{number}	Set the 'window' option to {number}.
+
 							*-w*
 -w {scriptout}	All the characters that you type are recorded in the file
 		"scriptout", until you exit Vim.  This is useful if you want
 		to create a script file to be used with "vim -s" or
 		":source!".  When the "scriptout" file already exists, new
 		characters are appended.  See also |complex-repeat|.
+		{scriptout} cannot start with a digit.
 		{not in Vi}
 
 							*-W*
 -W {scriptout}	Like -w, but do not append, overwrite an existing file.
 		{not in Vi}
 
-							*-w_nr*
--w{number}	Does nothing.  This was included for Vi-compatibility.  In Vi
-		it sets the 'window' option, which is not implemented in Vim.
-
 --remote [+{cmd}] {file} ...
 		Open the {file} in another Vim that functions as a server.
 		Any non-file arguments must come before this.
@@ -699,6 +711,8 @@ accordingly.  Vim proceeds in this order:
 2. Process the arguments
 	The options and file names from the command that start Vim are
 	inspected.  Buffers are created for all files (but not loaded yet).
+	The |-V| argument can be used to display or log what happens next,
+	useful for debugging the initializations.
 
 3. Execute Ex commands, from environment variables and/or files
 	An environment variable is read as one Ex command line, where multiple
@@ -757,10 +771,11 @@ accordingly.  Vim proceeds in this order:
 	-  The environment variable EXINIT.
 	   The value of $EXINIT is used as an Ex command line.
 	-  The user exrc file(s).  Same as for the user vimrc file, but with
-	   "vimrc" replaced by "exrc".  But without the (*)!
+	   "vimrc" replaced by "exrc".  But only one of ".exrc" and "_exrc" is
+	   used, depending on the system.  And without the (*)!
 
      d. If the 'exrc' option is on (which is not the default), the current
-	directory is searched for four files.  The first that exists is used,
+	directory is searched for three files.  The first that exists is used,
 	the others are ignored.
 	-  The file ".vimrc" (for Unix, Amiga and OS/2) (*)
 		    "_vimrc" (for MS-DOS and Win32) (*)
@@ -768,8 +783,6 @@ accordingly.  Vim proceeds in this order:
 		    ".vimrc" (for MS-DOS and Win32) (*)
 	-  The file ".exrc"  (for Unix, Amiga and OS/2)
 		    "_exrc"  (for MS-DOS and Win32)
-	-  The file "_exrc"  (for Unix, Amiga and OS/2)
-		    ".exrc"  (for MS-DOS and Win32)
 
      (*) Using this file or environment variable will cause 'compatible' to be
 	 off by default.  See |compatible-default|.
@@ -877,7 +890,8 @@ set, it will be set to 'nocompatible'.  This has the side effect of setting or
 resetting other options (see 'compatible').  But only the options that have
 not been set or reset will be changed.  This has the same effect like the
 value of 'compatible' had this value when starting Vim.  Note that this
-doesn't happen for the system-wide vimrc file.
+doesn't happen for the system-wide vimrc file.  It does also happen for gvimrc
+files.
 
 But there is a side effect of setting or resetting 'compatible' at the moment
 a .vimrc file is found: Mappings are interpreted the moment they are
@@ -1193,7 +1207,7 @@ This saves the current Session, and starts off the command to load another.
 			When [file] is omitted or is a number from 1 to 9, a
 			name is generated and 'viewdir' prepended.  When last
 			directory name in 'viewdir' does not exist, this
-			directory is created.
+			directory is created.			*E739*
 			An existing file is always overwritten then.  Use
 			|:loadview| to load this view again.
 			When [file] is the name of a file ('viewdir' is not

runtime/doc/syntax.txt

@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 7.0aa.  Last change: 2004 Dec 09
+*syntax.txt*	For Vim version 7.0aa.  Last change: 2005 Jul 05
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -184,6 +184,11 @@ add a few items or change the highlighting, follow these steps:
 That's it.  The next time you edit a C file the Comment color will be
 different.  You don't even have to restart Vim.
 
+If you have multiple files, you can use the filetype as the directory name.
+All the "*.vim" files in this directory will be used, for example:
+	~/.vim/after/syntax/c/one.vim
+	~/.vim/after/syntax/c/two.vim
+
 
 REPLACING AN EXISTING SYNTAX FILE			*mysyntaxfile-replace*
 
@@ -394,7 +399,8 @@ Go back to the default to use 'number' by deleting the variable: >
    :unlet html_number_lines
 
 Closed folds are put in the HTML as they are displayed.  If you don't want
-this, use the "zR" command before invoking 2html.
+this, use the "zR" command before invoking 2html, or use: >
+   :let html_ignore_folding = 1
 
 By default, HTML optimized for old browsers is generated.  If you prefer using
 cascading style sheets (CSS1) for the attributes (resulting in considerably
@@ -515,9 +521,9 @@ the performance unacceptable, turn on ada_withuse_ordinary.
 ANT						*ant.vim* *ant-syntax*
 
 The ant syntax file provides syntax highlighting for javascript and python
-by default. Syntax highlighting for other script languages can be installed
+by default.  Syntax highlighting for other script languages can be installed
 by the function AntSyntaxScript(), which takes the tag name as first argument
-and the script syntax file name as second argument. Example: >
+and the script syntax file name as second argument.  Example: >
 
 	:call AntSyntaxScript('perl', 'perl.vim')
 
@@ -631,6 +637,8 @@ c_space_errors		trailing white space and spaces before a <Tab>
 c_no_trail_space_error	 ... but no trailing spaces
 c_no_tab_space_error	 ... but no spaces before a <Tab>
 c_no_bracket_error	don't highlight {}; inside [] as errors
+c_no_curly_error	don't highlight {}; inside [] and () as errors;
+				except { and } in first column
 c_no_ansi		don't do standard ANSI types and constants
 c_ansi_typedefs		 ... but do standard ANSI types
 c_ansi_constants	 ... but do standard ANSI constants
@@ -730,7 +738,7 @@ To disable it again, use this: >
 
 COLD FUSION				*coldfusion.vim* *coldfusion-syntax*
 
-The ColdFusion has its own version of HTML comments. To turn on ColdFusion
+The ColdFusion has its own version of HTML comments.  To turn on ColdFusion
 comment highlighting, add the following line to your startup file: >
 
 	:let html_wrong_comments = 1
@@ -756,7 +764,7 @@ For using tcsh: >
 
 Any script with a tcsh extension or a standard tcsh filename (.tcshrc,
 tcsh.tcshrc, tcsh.login) will have filetype tcsh.  All other tcsh/csh scripts
-will be classified as tcsh, UNLESS the "filetype_csh" variable exists. If the
+will be classified as tcsh, UNLESS the "filetype_csh" variable exists.  If the
 "filetype_csh" variable exists, the filetype will be set to the value of the
 variable.
 
@@ -764,9 +772,9 @@ variable.
 CYNLIB						*cynlib.vim* *cynlib-syntax*
 
 Cynlib files are C++ files that use the Cynlib class library to enable
-hardware modelling and simulation using C++. Typically Cynlib files have a .cc
+hardware modelling and simulation using C++.  Typically Cynlib files have a .cc
 or a .cpp extension, which makes it very difficult to distinguish them from a
-normal C++ file. Thus, to enable Cynlib highlighting for .cc files, add this
+normal C++ file.  Thus, to enable Cynlib highlighting for .cc files, add this
 line to your .vimrc file: >
 
 	:let cynlib_cyntax_for_cc=1
@@ -794,7 +802,7 @@ DESKTOP					   *desktop.vim* *desktop-syntax*
 Primary goal of this syntax file is to highlight .desktop and .directory files
 according to freedesktop.org standard: http://pdx.freedesktop.org/Standards/
 But actually almost none implements this standard fully.  Thus it will
-highlight all Unix ini files. But you can force strict highlighting according
+highlight all Unix ini files.  But you can force strict highlighting according
 to standard by placing this in your vimrc file: >
 	:let enforce_freedesktop_standard = 1
 
@@ -843,8 +851,8 @@ If this variable is not defined it defaults to a value of 2 to support
 Windows 2000.
 
 A second option covers whether *.btm files should be detected as type
-"dosbatch" (MS-DOS batch files) or type "btm" (4DOS batch files). The latter
-is used by default. You may select the former with the following line: >
+"dosbatch" (MS-DOS batch files) or type "btm" (4DOS batch files).  The latter
+is used by default.  You may select the former with the following line: >
 
    :let g:dosbatch_syntax_for_btm = 1
 
@@ -854,12 +862,12 @@ If this variable is undefined or zero, btm syntax is selected.
 
 DTD						*dtd.vim* *dtd-syntax*
 
-The DTD syntax highlighting is case sensitive by default. To disable
+The DTD syntax highlighting is case sensitive by default.  To disable
 case-sensitive highlighting, add the following line to your startup file: >
 
 	:let dtd_ignore_case=1
 
-The DTD syntax file will highlight unknown tags as errors. If
+The DTD syntax file will highlight unknown tags as errors.  If
 this is annoying, it can be turned off by setting: >
 
 	:let dtd_no_tag_errors=1
@@ -869,7 +877,7 @@ Parameter entity names are highlighted in the definition using the
 'Type' highlighting group and 'Comment' for punctuation and '%'.
 Parameter entity instances are highlighted using the 'Constant'
 highlighting group and the 'Type' highlighting group for the
-delimiters % and ;. This can be turned off by setting: >
+delimiters % and ;.  This can be turned off by setting: >
 
 	:let dtd_no_param_entities=1
 
@@ -879,8 +887,8 @@ The DTD syntax file is also included by xml.vim to highlight included dtd's.
 EIFFEL						*eiffel.vim* *eiffel-syntax*
 
 While Eiffel is not case-sensitive, its style guidelines are, and the
-syntax highlighting file encourages their use. This also allows to
-highlight class names differently. If you want to disable case-sensitive
+syntax highlighting file encourages their use.  This also allows to
+highlight class names differently.  If you want to disable case-sensitive
 highlighting, add the following line to your startup file: >
 
 	:let eiffel_ignore_case=1
@@ -912,7 +920,7 @@ experimentally handled by some compilers can be enabled by: >
 
 	:let eiffel_ise=1
 
-Finally, some vendors support hexadecimal constants. To handle them, add >
+Finally, some vendors support hexadecimal constants.  To handle them, add >
 
 	:let eiffel_hex_constants=1
 
@@ -958,38 +966,38 @@ Note that the form.vim syntax file implements FORM preprocessor commands and
 directives per default in the same syntax group.
 
 A predefined enhanced color mode for FORM is available to distinguish between
-header statements and statements in the body of a FORM program. To activate
+header statements and statements in the body of a FORM program.  To activate
 this mode define the following variable in your vimrc file >
 
 	:let form_enhanced_color=1
 
 The enhanced mode also takes advantage of additional color features for a dark
-gvim display. Here, statements are colored LightYellow instead of Yellow, and
+gvim display.  Here, statements are colored LightYellow instead of Yellow, and
 conditionals are LightBlue for better distinction.
 
 
 FORTRAN					*fortran.vim* *fortran-syntax*
 
 Default highlighting and dialect ~
-Highlighting appropriate for f95 (Fortran 95) is used by default. This choice
+Highlighting appropriate for f95 (Fortran 95) is used by default.  This choice
 should be appropriate for most users most of the time because Fortran 95 is a
 superset of Fortran 90 and almost a superset of Fortran 77.
 
 Fortran source code form ~
-Fortran 9x code can be in either fixed or free source form. Note that the
+Fortran 9x code can be in either fixed or free source form.  Note that the
 syntax highlighting will not be correct if the form is incorrectly set.
 
 When you create a new fortran file, the syntax script assumes fixed source
-form. If you always use free source form, then >
+form.  If you always use free source form, then >
     :let fortran_free_source=1
-in your .vimrc prior to the :syntax on command. If you always use fixed source
+in your .vimrc prior to the :syntax on command.  If you always use fixed source
 form, then >
     :let fortran_fixed_source=1
 in your .vimrc prior to the :syntax on command.
 
 If the form of the source code depends upon the file extension, then it is
-most convenient to set fortran_free_source in a ftplugin file. For more
-information on ftplugin files, see |ftplugin|. For example, if all your
+most convenient to set fortran_free_source in a ftplugin file.  For more
+information on ftplugin files, see |ftplugin|.  For example, if all your
 fortran files with an .f90 extension are written in free source form and the
 rest in fixed source form, add the following code to your ftplugin file >
     let s:extfname = expand("%:e")
@@ -1005,25 +1013,25 @@ precedes the "syntax on" command in your .vimrc file.
 
 When you edit an existing fortran file, the syntax script will assume free
 source form if the fortran_free_source variable has been set, and assumes
-fixed source form if the fortran_fixed_source variable has been set. If
+fixed source form if the fortran_fixed_source variable has been set.  If
 neither of these variables have been set, the syntax script attempts to
 determine which source form has been used by examining the first five columns
-of the first 25 lines of your file. If no signs of free source form are
-detected, then the file is assumed to be in fixed source form. The algorithm
-should work in the vast majority of cases. In some cases, such as a file that
+of the first 25 lines of your file.  If no signs of free source form are
+detected, then the file is assumed to be in fixed source form.  The algorithm
+should work in the vast majority of cases.  In some cases, such as a file that
 begins with 25 or more full-line comments, the script may incorrectly decide
-that the fortran code is in fixed form. If that happens, just add a
+that the fortran code is in fixed form.  If that happens, just add a
 non-comment statement beginning anywhere in the first five columns of the
 first twenty five lines, save (:w) and then reload (:e!) the file.
 
 Tabs in fortran files ~
-Tabs are not recognized by the Fortran standards. Tabs are not a good idea in
+Tabs are not recognized by the Fortran standards.  Tabs are not a good idea in
 fixed format fortran source code which requires fixed column boundaries.
-Therefore, tabs are marked as errors. Nevertheless, some programmers like
-using tabs. If your fortran files contain tabs, then you should set the
+Therefore, tabs are marked as errors.  Nevertheless, some programmers like
+using tabs.  If your fortran files contain tabs, then you should set the
 variable fortran_have_tabs in your .vimrc with a command such as >
     :let fortran_have_tabs=1
-placed prior to the :syntax on command. Unfortunately, the use of tabs will
+placed prior to the :syntax on command.  Unfortunately, the use of tabs will
 mean that the syntax file will not be able to detect incorrect margins.
 
 Syntax folding of fortran files ~
@@ -1032,26 +1040,26 @@ fortran_fold with a command such as >
     :let fortran_fold=1
 to instruct the syntax script to define fold regions for program units, that
 is main programs starting with a program statement, subroutines, function
-subprograms, block data subprograms, interface blocks, and modules. If you
+subprograms, block data subprograms, interface blocks, and modules.  If you
 also set the variable fortran_fold_conditionals with a command such as >
     :let fortran_fold_conditionals=1
 then fold regions will also be defined for do loops, if blocks, and select
-case constructs. If you also set the variable
+case constructs.  If you also set the variable
 fortran_fold_multilinecomments with a command such as >
     :let fortran_fold_multilinecomments=1
 then fold regions will also be defined for three or more consecutive comment
-lines. Note that defining fold regions can be slow for large files.
+lines.  Note that defining fold regions can be slow for large files.
 
 If fortran_fold, and possibly fortran_fold_conditionals and/or
 fortran_fold_multilinecomments, have been set, then vim will fold your file if
-you set foldmethod=syntax. Comments or blank lines placed between two program
+you set foldmethod=syntax.  Comments or blank lines placed between two program
 units are not folded because they are seen as not belonging to any program
 unit.
 
 More precise fortran syntax ~
 If you set the variable fortran_more_precise with a command such as >
     :let fortran_more_precise=1
-then the syntax coloring will be more precise but slower. In particular,
+then the syntax coloring will be more precise but slower.  In particular,
 statement labels used in do, goto and arithmetic if statements will be
 recognized, as will construct names at the end of a do, if, select or forall
 construct.
@@ -1063,7 +1071,7 @@ subset elf90, and the Imagine1 subset F.
 If you use f77 with extensions, even common ones like do/enddo loops, do/while
 loops and free source form that are supported by most f77 compilers including
 g77 (GNU Fortran), then you will probably find the default highlighting
-satisfactory. However, if you use strict f77 with no extensions, not even free
+satisfactory.  However, if you use strict f77 with no extensions, not even free
 source form or the MIL STD 1753 extensions, then the advantages of setting the
 dialect to f77 are that names such as SUM are recognized as user variable
 names and not highlighted as f9x intrinsic functions, that obsolete constructs
@@ -1075,14 +1083,14 @@ that f90 features excluded from these dialects will be highlighted as todo
 items and that free source form will be assumed as required for these
 dialects.
 
-The dialect can be selected by setting the variable fortran_dialect. The
+The dialect can be selected by setting the variable fortran_dialect.  The
 permissible values of fortran_dialect are case-sensitive and must be "f95",
-"f90", "f77", "elf" or "F". Invalid values of fortran_dialect are ignored.
+"f90", "f77", "elf" or "F".  Invalid values of fortran_dialect are ignored.
 
 If all your fortran files use the same dialect, set fortran_dialect in your
-.vimrc prior to your syntax on statement. If the dialect depends upon the file
-extension, then it is most convenient to set it in a ftplugin file. For more
-information on ftplugin files, see |ftplugin|. For example, if all your
+.vimrc prior to your syntax on statement.  If the dialect depends upon the file
+extension, then it is most convenient to set it in a ftplugin file.  For more
+information on ftplugin files, see |ftplugin|.  For example, if all your
 fortran files with an .f90 extension are written in the elf subset, your
 ftplugin file should contain the code >
     let s:extfname = expand("%:e")
@@ -1095,9 +1103,9 @@ Note that this will work only if the "filetype plugin indent on" command
 precedes the "syntax on" command in your .vimrc file.
 
 Finer control is necessary if the file extension does not uniquely identify
-the dialect. You can override the default dialect, on a file-by-file basis, by
+the dialect.  You can override the default dialect, on a file-by-file basis, by
 including a comment with the directive "fortran_dialect=xx" (where xx=f77 or
-elf or F or f90 or f95) in one of the first three lines in your file. For
+elf or F or f90 or f95) in one of the first three lines in your file.  For
 example, your older .f files may be written in extended f77 but your newer
 ones may be F codes, and you would identify the latter by including in the
 first three lines of those files a Fortran comment of the form >
@@ -1105,8 +1113,8 @@ first three lines of those files a Fortran comment of the form >
 F overrides elf if both directives are present.
 
 Limitations ~
-Parenthesis checking does not catch too few closing parentheses. Hollerith
-strings are not recognized. Some keywords may be highlighted incorrectly
+Parenthesis checking does not catch too few closing parentheses.  Hollerith
+strings are not recognized.  Some keywords may be highlighted incorrectly
 because Fortran90 has no reserved words.
 
 For further information related to fortran, see |fortran-indent| and
@@ -1163,7 +1171,7 @@ group to make them easier to see.
 GROFF						*groff.vim* *groff-syntax*
 
 The groff syntax file is a wrapper for |nroff.vim|, see the notes
-under that heading for examples of use and configuration. The purpose
+under that heading for examples of use and configuration.  The purpose
 of this wrapper is to set up groff syntax extensions by setting the
 filetype from a |modeline| or in a personal filetype definitions file
 (see |filetype.txt|).
@@ -1172,7 +1180,7 @@ filetype from a |modeline| or in a personal filetype definitions file
 HASKELL			     *haskell.vim* *lhaskell.vim* *haskell-syntax*
 
 The Haskell syntax files support plain Haskell code as well as literate
-Haskell code, the latter in both Bird style and TeX style. The Haskell
+Haskell code, the latter in both Bird style and TeX style.  The Haskell
 syntax highlighting will also highlight C preprocessor directives.
 
 If you want to highlight delimiter characters (useful if you have a
@@ -1191,15 +1199,15 @@ your .vimrc: >
 
 The Haskell syntax highlighting also highlights C preprocessor
 directives, and flags lines that start with # but are not valid
-directives as erroneous. This interferes with Haskell's syntax for
-operators, as they may start with #. If you want to highlight those
+directives as erroneous.  This interferes with Haskell's syntax for
+operators, as they may start with #.  If you want to highlight those
 as operators as opposed to errors, put in your .vimrc: >
 	:let hs_allow_hash_operator = 1
 
 The syntax highlighting for literate Haskell code will try to
 automatically guess whether your literate Haskell code contains
 TeX markup or not, and correspondingly highlight TeX constructs
-or nothing at all. You can override this globally by putting
+or nothing at all.  You can override this globally by putting
 in your .vimrc >
 	:let lhs_markup = none
 for no highlighting at all, or >
@@ -1208,7 +1216,7 @@ to force the highlighting to always try to highlight TeX markup.
 For more flexibility, you may also use buffer local versions of
 this variable, so e.g. >
 	:let b:lhs_markup = tex
-will force TeX highlighting for a particular buffer. It has to be
+will force TeX highlighting for a particular buffer.  It has to be
 set before turning syntax highlighting on for the buffer or
 loading a file.
 
@@ -1226,14 +1234,14 @@ Known tag names are colored the same way as statements in C.  Unknown tag
 names are colored with the same color as the <> or </> respectively which
 makes it easy to spot errors
 
-Note that the same is true for argument (or attribute) names. Known attribute
+Note that the same is true for argument (or attribute) names.  Known attribute
 names are colored differently than unknown ones.
 
-Some HTML tags are used to change the rendering of text. The following tags
+Some HTML tags are used to change the rendering of text.  The following tags
 are recognized by the html.vim syntax coloring file and change the way normal
 text is shown: <B> <I> <U> <EM> <STRONG> (<EM> is used as an alias for <I>,
 while <STRONG> as an alias for <B>), <H1> - <H6>, <HEAD>, <TITLE> and <A>, but
-only if used as a link that is, it must include a href as in
+only if used as a link (that is, it must include a href as in
 <A href="somfile.html">).
 
 If you want to change how such text is rendered, you must redefine the
@@ -1269,13 +1277,13 @@ ends with --!>) you can define >
 
 JavaScript and Visual Basic embedded inside HTML documents are highlighted as
 'Special' with statements, comments, strings and so on colored as in standard
-programming languages. Note that only JavaScript and Visual Basic are currently
+programming languages.  Note that only JavaScript and Visual Basic are currently
 supported, no other scripting language has been added yet.
 
 Embedded and inlined cascading style sheets (CSS) are highlighted too.
 
-There are several html preprocessor languages out there. html.vim has been
-written such that it should be trivial to include it. To do so add the
+There are several html preprocessor languages out there.  html.vim has been
+written such that it should be trivial to include it.  To do so add the
 following two lines to the syntax coloring file for that language
 (the example comes from the asp.vim file):
 
@@ -1351,7 +1359,7 @@ The java.vim syntax highlighting file offers several options:
 
 In Java 1.0.2 it was never possible to have braces inside parens, so this was
 flagged as an error.  Since Java 1.1 this is possible (with anonymous
-classes), and therefore is no longer marked as an error. If you prefer the old
+classes), and therefore is no longer marked as an error.  If you prefer the old
 way, put the following line into your vim startup file: >
 	:let java_mark_braces_in_parens_as_errors=1
 
@@ -1359,7 +1367,7 @@ All identifiers in java.lang.* are always visible in all classes.  To
 highlight them use: >
 	:let java_highlight_java_lang_ids=1
 
-You can also highlight identifiers of most standard java packages if you
+You can also highlight identifiers of most standard Java packages if you
 download the javaid.vim script at http://www.fleiner.com/vim/download.html.
 If you prefer to only highlight identifiers of a certain package, say java.io
 use the following: >
@@ -1367,7 +1375,7 @@ use the following: >
 Check the javaid.vim file for a list of all the packages that are supported.
 
 Function names are not highlighted, as the way to find functions depends on
-how you write java code.  The syntax file knows two possible ways to highlight
+how you write Java code.  The syntax file knows two possible ways to highlight
 functions:
 
 If you write function declarations that are always indented by either
@@ -1381,44 +1389,44 @@ declarations to be highlighted create your own definitions by changing the
 definitions in java.vim or by creating your own java.vim which includes the
 original one and then adds the code to highlight functions.
 
-In java 1.1 the functions System.out.println() and System.err.println() should
+In Java 1.1 the functions System.out.println() and System.err.println() should
 only be used for debugging.  Therefore it is possible to highlight debugging
-statements differently. To do this you must add the following definition in
+statements differently.  To do this you must add the following definition in
 your startup file: >
 	:let java_highlight_debug=1
 The result will be that those statements are highlighted as 'Special'
-characters. If you prefer to have them highlighted differently you must define
+characters.  If you prefer to have them highlighted differently you must define
 new highlightings for the following groups.:
     Debug, DebugSpecial, DebugString, DebugBoolean, DebugType
 which are used for the statement itself, special characters used in debug
-strings, strings, boolean constants and types (this, super) respectively. I
+strings, strings, boolean constants and types (this, super) respectively.  I
 have opted to chose another background for those statements.
 
 In order to help you to write code that can be easily ported between
-java and C++, all C++ keywords are marked as error in a java program.
+Java and C++, all C++ keywords are marked as error in a Java program.
 However, if you use them regularly, you may want to define the following
 variable in your .vimrc file: >
 	:let java_allow_cpp_keywords=1
 
-Javadoc is a program that takes special comments out of java program files and
-creates HTML pages. The standard configuration will highlight this HTML code
-similarly to HTML files (see |html.vim|). You can even add javascript
-and CSS inside this code (see below). There are four differences however:
+Javadoc is a program that takes special comments out of Java program files and
+creates HTML pages.  The standard configuration will highlight this HTML code
+similarly to HTML files (see |html.vim|).  You can even add Javascript
+and CSS inside this code (see below).  There are four differences however:
   1. The title (all characters up to the first '.' which is followed by
      some white space or up to the first '@') is colored differently (to change
      the color change the group CommentTitle).
   2. The text is colored as 'Comment'.
   3. HTML comments are colored as 'Special'
-  4. The special javadoc tags (@see, @param, ...) are highlighted as specials
+  4. The special Javadoc tags (@see, @param, ...) are highlighted as specials
      and the argument (for @see, @param, @exception) as Function.
 To turn this feature off add the following line to your startup file: >
 	:let java_ignore_javadoc=1
 
-If you use the special javadoc comment highlighting described above you
-can also turn on special highlighting for javascript, visual basic
-scripts and embedded CSS (stylesheets). This makes only sense if you
-actually have javadoc comments that include either javascript or embedded
-CSS. The options to use are >
+If you use the special Javadoc comment highlighting described above you
+can also turn on special highlighting for Javascript, visual basic
+scripts and embedded CSS (stylesheets).  This makes only sense if you
+actually have Javadoc comments that include either Javascript or embedded
+CSS.  The options to use are >
 	:let java_javascript=1
 	:let java_css=1
 	:let java_vb=1
@@ -1471,7 +1479,7 @@ set "lite_minlines" to the value you desire.  Example: >
 
 LPC						*lpc.vim* *lpc-syntax*
 
-LPC stands for a simple, memory-efficient language: Lars Pensj| C. The
+LPC stands for a simple, memory-efficient language: Lars Pensj| C.  The
 file name of LPC is usually *.c.  Recognizing these files as LPC would bother
 users writing only C programs.	If you want to use LPC syntax in Vim, you
 should set a variable in your .vimrc file: >
@@ -1490,7 +1498,7 @@ For a C file that is recognized as LPC:
 If you don't want to set the variable, use the modeline in EVERY LPC file.
 
 There are several implementations for LPC, we intend to support most widely
-used ones. Here the default LPC syntax is for MudOS series, for MudOS v22
+used ones.  Here the default LPC syntax is for MudOS series, for MudOS v22
 and before, you should turn off the sensible modifiers, and this will also
 asserts the new efuns after v22 to be invalid, don't set this variable when
 you are using the latest version of MudOS: >
@@ -1512,7 +1520,7 @@ instead, and the name of your source file should be *.pike
 
 LUA						*lua.vim* *lua-syntax*
 
-This syntax file may be used for Lua 4.0 and Lua 5.0 (default). If you are
+This syntax file may be used for Lua 4.0 and Lua 5.0 (default).  If you are
 programming in Lua 4.0, use this: >
 
 	:let lua_version = 4
@@ -1523,16 +1531,16 @@ If lua_version variable doesn't exist, it is set to 5.
 MAIL								*mail.vim*
 
 Vim highlights all the standard elements of an email (headers, signatures,
-quoted text and URLs / email addresses). In keeping with standard conventions,
+quoted text and URLs / email addresses).  In keeping with standard conventions,
 signatures begin in a line containing only "--" followed optionally by
 whitespaces and end with a newline.
 
 Vim treats lines beginning with ']', '}', '|', '>' or a word followed by '>'
-as quoted text. However Vim highlights headers and signatures in quoted text
+as quoted text.  However Vim highlights headers and signatures in quoted text
 only if the text is quoted with '>' (optionally followed by one space).
 
 By default mail.vim synchronises syntax to 100 lines before the first
-displayed line. If you have a slow machine, and generally deal with emails
+displayed line.  If you have a slow machine, and generally deal with emails
 with short headers, you can change this to a smaller value: >
 
     :let mail_minlines = 30
@@ -1572,6 +1580,14 @@ $VIMRUNTIME/syntax/syntax.vim).
   mv_finance	 mv_logic	mv_powseries
 
 
+MATHEMATICA			*mma.vim* *mma-syntax* *mathematica-syntax*
+
+Empty *.m files will automatically be presumed to be Matlab files unless you
+have the following in your .vimrc: >
+
+	let filetype_m = "mma"
+
+
 MOO						*moo.vim* *moo-syntax*
 
 If you use C-style comments inside expressions and find it mangles your
@@ -1597,7 +1613,7 @@ To highlight builtin properties (.name, .location, .programmer etc.): >
 
 	:let moo_builtin_properties = 1
 
-Unknown builtin functions can be recognized and highlighted as errors. If you
+Unknown builtin functions can be recognized and highlighted as errors.  If you
 use this option, add your own extensions to the mooKnownBuiltinFunction group.
 To enable this option: >
 
@@ -1641,7 +1657,7 @@ activate the GNU groff extra features included in the syntax file before you
 can use them.
 
 For example, Linux and BSD distributions use groff as their default text
-processing package. In order to activate the extra syntax highlighting
+processing package.  In order to activate the extra syntax highlighting
 features for groff, add the following option to your start-up files: >
 
   :let b:nroff_is_groff = 1
@@ -1649,7 +1665,7 @@ features for groff, add the following option to your start-up files: >
 Groff is different from the old AT&T n/troff that you may still find in
 Solaris.  Groff macro and request names can be longer than 2 characters and
 there are extensions to the language primitives.  For example, in AT&T troff
-you access the year as a 2-digit number with the request \(yr. In groff you
+you access the year as a 2-digit number with the request \(yr.  In groff you
 can use the same request, recognized for compatibility, or you can use groff's
 native syntax, \[yr].  Furthermore, you can use a 4-digit year directly:
 \[year].  Macro requests can be longer than 2 characters, for example, GNU mm
@@ -1677,7 +1693,7 @@ vertical space input will be output as is.
 Therefore, you should be careful about not using more space between sentences
 than you intend to have in your final document.  For this reason, the common
 practice is to insert a carriage return immediately after all punctuation
-marks. If you want to have "even" text in your final processed output, you
+marks.  If you want to have "even" text in your final processed output, you
 need to maintaining regular spacing in the input text.  To mark both trailing
 spaces and two or more spaces after a punctuation as an error, use: >
 
@@ -1686,7 +1702,7 @@ spaces and two or more spaces after a punctuation as an error, use: >
 Another technique to detect extra spacing and other errors that will interfere
 with the correct typesetting of your file, is to define an eye-catching
 highlighting definition for the syntax groups "nroffDefinition" and
-"nroffDefSpecial" in your configuration files. For example: >
+"nroffDefSpecial" in your configuration files.  For example: >
 
   hi def nroffDefinition term=italic cterm=italic gui=reverse
   hi def nroffDefSpecial term=italic,bold cterm=italic,bold
@@ -1725,15 +1741,15 @@ PAPP						*papp.vim* *papp-syntax*
 
 The PApp syntax file handles .papp files and, to a lesser extend, .pxml
 and .pxsl files which are all a mixture of perl/xml/html/other using xml
-as the top-level file format. By default everything inside phtml or pxml
-sections is treated as a string with embedded preprocessor commands. If
+as the top-level file format.  By default everything inside phtml or pxml
+sections is treated as a string with embedded preprocessor commands.  If
 you set the variable: >
 
 	:let papp_include_html=1
 
 in your startup file it will try to syntax-hilight html code inside phtml
 sections, but this is relatively slow and much too colourful to be able to
-edit sensibly ;)
+edit sensibly. ;)
 
 The newest version of the papp.vim syntax file can usually be found at
 http://papp.plan9.de.
@@ -1749,7 +1765,7 @@ startup vimrc: >
 
 The Pascal syntax file has been extended to take into account some extensions
 provided by Turbo Pascal, Free Pascal Compiler and GNU Pascal Compiler.
-Delphi keywords are also supported. By default, Turbo Pascal 7.0 features are
+Delphi keywords are also supported.  By default, Turbo Pascal 7.0 features are
 enabled.  If you prefer to stick with the standard Pascal keywords, add the
 following line to your startup file: >
 
@@ -1818,8 +1834,8 @@ If you do not want complex things like '@{${"foo"}}' to be parsed: >
 
 (In Vim 6.x it was the other way around: "perl_extended_vars" enabled it.)
 
-The coloring strings can be changed. By default strings and qq friends will be
-highlighted like the first line. If you set the variable
+The coloring strings can be changed.  By default strings and qq friends will be
+highlighted like the first line.  If you set the variable
 perl_string_as_statement, it will be highlighted as in the second line.
 
    "hello world!"; qq|hello world|;
@@ -1828,10 +1844,10 @@ perl_string_as_statement, it will be highlighted as in the second line.
 
 (^ = perlString, S = perlStatement, N = None at all)
 
-The syncing has 3 options. The first two switch off some triggering of
+The syncing has 3 options.  The first two switch off some triggering of
 synchronization and should only be needed in case it fails to work properly.
 If while scrolling all of a sudden the whole screen changes color completely
-then you should try and switch off one of those. Let me know if you can figure
+then you should try and switch off one of those.  Let me know if you can figure
 out the line that causes the mistake.
 
 One triggers on "^\s*sub\s*" and the other on "^[$@%]" more or less. >
@@ -1913,10 +1929,10 @@ PPWizard is a preprocessor for HTML and OS/2 INF files
 This syntax file has the options:
 
 - ppwiz_highlight_defs : determines highlighting mode for PPWizard's
-  definitions. Possible values are
+  definitions.  Possible values are
 
   ppwiz_highlight_defs = 1 : PPWizard #define statements retain the
-    colors of their contents (e. g. PPWizard macros and variables)
+    colors of their contents (e.g. PPWizard macros and variables)
 
   ppwiz_highlight_defs = 2 : preprocessor #define and #evaluate
     statements are shown in a single color with the exception of line
@@ -2059,10 +2075,10 @@ preceding three options): >
 QUAKE						*quake.vim* *quake-syntax*
 
 The Quake syntax definition should work for most any FPS (First Person
-Shooter) based on one of the Quake engines. However, the command names vary
+Shooter) based on one of the Quake engines.  However, the command names vary
 a bit between the three games (Quake, Quake 2, and Quake 3 Arena) so the
 syntax definition checks for the existence of three global variables to allow
-users to specify what commands are legal in their files. The three variables
+users to specify what commands are legal in their files.  The three variables
 can be set for the following effects:
 
 set to highlight commands only available in Quake: >
@@ -2081,7 +2097,7 @@ commands than are actually available to you by the game.
 READLINE				*readline.vim* *readline-syntax*
 
 The readline library is primarily used by the BASH shell, which adds quite a
-few commands and options to the ones already available. To highlight these
+few commands and options to the ones already available.  To highlight these
 items as well you can add the following to your |vimrc| or just type it in the
 command line before loading a file with the readline syntax: >
 	let readline_has_bash = 1
@@ -2106,7 +2122,7 @@ RUBY						*ruby.vim* *ruby-syntax*
 There are a few options to the Ruby syntax highlighting.
 
 By default, the "end" keyword is colorized according to the opening statement
-of the block it closes. While useful, this feature can be expensive: if you
+of the block it closes.  While useful, this feature can be expensive: if you
 experience slow redrawing (or you are on a terminal with poor color support)
 you may want to turn it off by defining the "ruby_no_expensive" variable: >
 	:let ruby_no_expensive = 1
@@ -2144,11 +2160,11 @@ of them it's almost impossibly to cope.
 
 The new standard, SDL-2000, specifies that all identifiers are
 case-sensitive (which was not so before), and that all keywords can be
-used either completely lowercase or completely uppercase. To have the
+used either completely lowercase or completely uppercase.  To have the
 highlighting reflect this, you can set the following variable: >
 	:let sdl_2000=1
 
-This also sets many new keywords. If you want to disable the old
+This also sets many new keywords.  If you want to disable the old
 keywords, which is probably a good idea, use: >
 	:let SDL_no_96=1
 
@@ -2192,10 +2208,10 @@ defined for you)
 Known tag names are colored the same way as statements in C.  Unknown tag
 names are not colored which makes it easy to spot errors.
 
-Note that the same is true for argument (or attribute) names. Known attribute
+Note that the same is true for argument (or attribute) names.  Known attribute
 names are colored differently than unknown ones.
 
-Some SGML tags are used to change the rendering of text. The following tags
+Some SGML tags are used to change the rendering of text.  The following tags
 are recognized by the sgml.vim syntax coloring file and change the way normal
 text is shown: <varname> <emphasis> <command> <function> <literal>
 <replaceable> <ulink> and <link>.
@@ -2282,7 +2298,7 @@ The Speedup syntax file has some options:
 
 - highlight_types : Definition of this variable causes stream types
   like temperature or pressure to be highlighted as Type, not as a
-  plain Identifier. Included are the types that are usually found in
+  plain Identifier.  Included are the types that are usually found in
   the DECLARE section; if you defined own types, you have to include
   them in the syntax file.
 
@@ -2293,13 +2309,13 @@ The Speedup syntax file has some options:
   number of #s.
 
   oneline_comments = 2 : show code starting with the second # as
-  error. This is the default setting.
+  error.  This is the default setting.
 
   oneline_comments = 3 : show the whole line as error if it contains
   more than one #.
 
 Since especially OPERATION sections tend to become very large due to
-PRESETting variables, syncing may be critical. If your computer is
+PRESETting variables, syncing may be critical.  If your computer is
 fast enough, you can increase minlines and/or maxlines near the end of
 the syntax file.
 
@@ -2321,7 +2337,7 @@ This covers the shell named "tcsh".  It is a superset of csh.  See |csh.vim|
 for how the filetype is detected.
 
 Tcsh does not allow \" in strings unless the "backslash_quote" shell variable
-is set. If you want VIM to assume that no backslash quote constructs exist add
+is set.  If you want VIM to assume that no backslash quote constructs exist add
 this line to your .vimrc: >
 
 	:let tcsh_backslash_quote = 0
@@ -2333,7 +2349,7 @@ to a larger number: >
 	:let tcsh_minlines = 100
 
 This will make the syntax synchronization start 100 lines before the first
-displayed line. The default value is 15. The disadvantage of using a larger
+displayed line.  The default value is 15.  The disadvantage of using a larger
 number is that redrawing can become slow.
 
 
@@ -2357,7 +2373,7 @@ If you have a slow computer, you may wish to reduce the values for >
 	:syn sync maxlines=200
 	:syn sync minlines=50
 (especially the latter).  If your computer is fast, you may wish to
-increase them.	This primarily affects synchronizing (ie. just what group,
+increase them.	This primarily affects synchronizing (i.e. just what group,
 if any, is the text at the top of the screen supposed to be in?).
 
 Excessive Error Highlighting? ~
@@ -2454,14 +2470,14 @@ highlighted.
 
 XML						*xml.vim* *xml-syntax*
 
-Xml namespaces are highlighted by default. This can be inhibited by
+Xml namespaces are highlighted by default.  This can be inhibited by
 setting a global variable: >
 
 	:let g:xml_namespace_transparent=1
 <
 							*xml-folding*
 The xml syntax file provides syntax |folding| (see |:syn-fold|) between
-start and end tags. This can be turned on by >
+start and end tags.  This can be turned on by >
 
 	:let g:xml_syntax_folding = 1
 	:set foldmethod=syntax
@@ -2575,7 +2591,7 @@ DEFINING KEYWORDS					*:syn-keyword*
   :syntax keyword   Type   contained int long char
   :syntax keyword   Type   int long contained char
   :syntax keyword   Type   int long char contained
-<
+<								*E747*
 	When you have a keyword with an optional tail, like Ex commands in
 	Vim, you can put the optional characters inside [], to define all the
 	variations at once: >
@@ -2600,7 +2616,7 @@ DEFINING KEYWORDS					*:syn-keyword*
 	The same keyword can be defined multiple times, when its containment
 	differs.  For example, you can define the keyword once not contained
 	and use one highlight group, and once contained, and use a different
-	highlight group. Example: >
+	highlight group.  Example: >
   :syn keyword vimCommand tag
   :syn keyword vimSetting contained tag
 <	When finding "tag" outside of any syntax item, the "vimCommand"
@@ -2656,7 +2672,7 @@ DEFINING REGIONS	*:syn-region* *:syn-start* *:syn-skip* *:syn-end*
 				match with the end pattern.  See
 				|:syn-keepend|.
 	extend			Override a "keepend" for an item this region
-				is contained in. See |:syn-extend|.
+				is contained in.  See |:syn-extend|.
 	excludenl		Don't make a pattern with the end-of-line "$"
 				extend a containing match or item.  Only
 				useful for end patterns.  Must be given before
@@ -3502,6 +3518,7 @@ faster.]
 	Without a "groupthere" argument.  Define a region or match that is
 	skipped while searching for a sync point.
 
+    						*syn-sync-linecont*
     :syntax sync linecont {pattern}
 
 	When {pattern} matches in a line, it is considered to continue in
@@ -3619,11 +3636,14 @@ the same syntax file on all terminals, and use the optimal highlighting.
 
 1. highlight arguments for normal terminals
 
+					*bold* *underline* *undercurl*
+					*inverse* *italic* *standout*
 term={attr-list}			*attr-list* *highlight-term* *E418*
 	attr-list is a comma separated list (without spaces) of the
 	following items (in any order):
 		bold
 		underline
+		undercurl	not always available
 		reverse
 		inverse		same as reverse
 		italic
@@ -3632,6 +3652,9 @@ term={attr-list}			*attr-list* *highlight-term* *E418*
 
 	Note that "bold" can be used here and by using a bold font.  They
 	have the same effect.
+	"undercurl" is a curly underline.  When "undercurl" is not possible
+	then "underline" is used.  In general "undercurl" is only available in
+	the GUI.
 
 start={term-list}				*highlight-start* *E422*
 stop={term-list}				*term-list* *highlight-stop*
@@ -3724,7 +3747,7 @@ ctermbg={color-nr}				*highlight-ctermbg*
 
 	The case of the color names is ignored.
 	Note that for 16 color ansi style terminals (including xterms), the
-	numbers in the NR-8 column is used. Here '*' means 'add 8' so that Blue
+	numbers in the NR-8 column is used.  Here '*' means 'add 8' so that Blue
 	is 12, DarkGray is 8 etc.
 
 	Note that for some color terminals these names may result in the wrong
@@ -3787,8 +3810,10 @@ font={font-name}					*highlight-font*
 
 guifg={color-name}					*highlight-guifg*
 guibg={color-name}					*highlight-guibg*
-	These give the foreground (guifg) and background (guibg) color to
-	use in the GUI.  There are a few special names:
+guisp={color-name}					*highlight-guisp*
+	These give the foreground (guifg), background (guibg) and special
+	(guisp) color to use in the GUI.  "guisp" is used for underline and
+	undercurl.  There are a few special names:
 		NONE		no color (transparent)
 		bg		use normal background color
 		background	use normal background color
@@ -3817,8 +3842,8 @@ guibg={color-name}					*highlight-guibg*
 	You can also specify a color by its Red, Green and Blue values.
 	The format is "#rrggbb", where
 		"rr"	is the Red value
-		"bb"	is the Blue value
 		"gg"	is the Green value
+		"bb"	is the Blue value
 	All values are hexadecimal, range from "00" to "ff".  Examples: >
   :highlight Comment guifg=#11f0c3 guibg=#ff00ff
 <
@@ -3879,6 +3904,20 @@ SpecialKey	Meta and special keys listed with ":map", also for text used
 		to show unprintable characters in the text, 'listchars'.
 		Generally: text that is displayed differently from what it
 		really is.
+							*hl-SpellBad*
+SpellBad	Word that is not recognized by the spellchecker. |spell|
+		This will be combined with the highlighting used otherwise.
+							*hl-SpellCap*
+SpellCap	Word that should start with a capital. |spell|
+		This will be combined with the highlighting used otherwise.
+							*hl-SpellLocal*
+SpellLocal	Word that is recognized by the spellchecker as one that is
+		used in another region. |spell|
+		This will be combined with the highlighting used otherwise.
+							*hl-SpellRare*
+SpellRare	Word that is recognized by the spellchecker as one that is
+		hardly ever used. |spell|
+		This will be combined with the highlighting used otherwise.
 							*hl-StatusLine*
 StatusLine	status line of current window
 							*hl-StatusLineNC*
@@ -3899,7 +3938,7 @@ WildMenu	current match in 'wildmenu' completion
 
 						*hl-User1* *hl-User1..9*
 The 'statusline' syntax allows the use of 9 different highlights in the
-statusline and ruler (via 'rulerformat'). The names are User1 to User9.
+statusline and ruler (via 'rulerformat').  The names are User1 to User9.
 
 For the GUI you can use these groups to set the colors for the menu,
 scrollbars and tooltips.  They don't have defaults.  This doesn't work for the
@@ -4126,14 +4165,14 @@ To use it, execute these commands: >
    :e $VIMRUNTIME/syntax/colortest.vim
    :so %
 
-Some versions of xterm (and other terminals, like the linux console) can
+Some versions of xterm (and other terminals, like the Linux console) can
 output lighter foreground colors, even though the number of colors is defined
 at 8.  Therefore Vim sets the "cterm=bold" attribute for light foreground
 colors, when 't_Co' is 8.
 
 							*xfree-xterm*
 To get 16 colors or more, get the newest xterm version (which should be
-included with Xfree86 3.3 and later).  You can also find the latest version
+included with XFree86 3.3 and later).  You can also find the latest version
 at: >
 	http://invisible-island.net/xterm/xterm.html
 Here is a good way to configure it.  This uses 88 colors and enables the

runtime/doc/tagsrch.txt

@@ -1,4 +1,4 @@
-*tagsrch.txt*   For Vim version 7.0aa.  Last change: 2005 Jan 02
+*tagsrch.txt*   For Vim version 7.0aa.  Last change: 2005 Apr 01
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -251,7 +251,7 @@ g CTRL-]		Like CTRL-], but use ":tjump" instead of ":tag".
 			in Vi}
 
 							*:tf* *:tfirst*
-:[count]tf[irst][!]	Same as ":trewind". {not in Vi}
+:[count]tf[irst][!]	Same as ":trewind".  {not in Vi}
 
 							*:tl* *:tlast*
 :tl[ast][!]		Jump to last matching tag.  See |tag-!| for [!].  {not
@@ -281,12 +281,12 @@ the same as above, with a "p" prepended.
 
 							*:pts* *:ptselect*
 :pts[elect][!] [ident]	Does ":tselect[!] [ident]" and shows the new tag in a
-			"Preview" window. See |:ptag| for more info.
+			"Preview" window.  See |:ptag| for more info.
 			{not in Vi}
 
 							*:ptj* *:ptjump*
 :ptj[ump][!] [ident]	Does ":tjump[!] [ident]" and shows the new tag in a
-			"Preview" window. See |:ptag| for more info.
+			"Preview" window.  See |:ptag| for more info.
 			{not in Vi}
 
 							*:ptn* *:ptnext*
@@ -305,7 +305,7 @@ the same as above, with a "p" prepended.
 			{not in Vi}
 
 							*:ptf* *:ptfirst*
-:[count]ptf[irst][!]	Same as ":ptrewind". {not in Vi}
+:[count]ptf[irst][!]	Same as ":ptrewind".  {not in Vi}
 
 							*:ptl* *:ptlast*
 :ptl[ast][!]		":tlast" in the preview window.  See |:ptag|.
@@ -395,7 +395,7 @@ In a future version changing the buffer will be impossible.  All this for
 security reasons: Somebody might hide a nasty command in the tags file, which
 would otherwise go unnoticed.  Example: >
 	:$d|/tag-function-name/
-{this security prevention is not present in Vi}.
+{this security prevention is not present in Vi}
 
 In Vi the ":tag" command sets the last search pattern when the tag is searched
 for.  In Vim this is not done, the previous search pattern is still remembered,
@@ -582,8 +582,8 @@ If the command is a normal search command (it starts and ends with "/" or
 "?"), some special handling is done:
 - Searching starts on line 1 of the file.
   The direction of the search is forward for "/", backward for "?".
-  Note that 'wrapscan' does not matter, the whole file is always searched. {Vi
-  does use 'wrapscan', which caused tags sometimes not be found).  {Vi starts
+  Note that 'wrapscan' does not matter, the whole file is always searched.  (Vi
+  does use 'wrapscan', which caused tags sometimes not be found.)  {Vi starts
   searching in line 2 of another file.  It does not find a tag in line 1 of
   another file when 'wrapscan' is not set}
 - If the search fails, another try is done ignoring case.  If that fails too,
@@ -596,7 +596,7 @@ If the command is a normal search command (it starts and ends with "/" or
 	"^[#a-zA-Z_].*\<tagname[ \t]*("
   This means: A line starting with '#' or an identifier and containing the tag
   followed by white space and a '('.  This will find macro names and function
-  names with a type prepended.  {the extra searches are not in Vi}.
+  names with a type prepended.  {the extra searches are not in Vi}
 
 ==============================================================================
 6. Include file searches		*include-search* *definition-search*
@@ -744,11 +744,13 @@ CTRL-W i		Open a new window, with the cursor on the first line
 ]D			like "[D", but start at the current cursor position.
 			{not in Vi}
 
-							*:dl* *:dlist*
+							*:dli* *:dlist*
 :[range]dl[ist][!] [/]string[/]
 			Like "[D"  and "]D", but search in [range] lines
 			(default: whole file).
 			See |:search-args| for [/] and [!].  {not in Vi}
+			Note that ":dl" works like ":delete" with the "l"
+			flag.
 
 							*[_CTRL-D*
 [ CTRL-D		Jump to the first macro definition that contains the

runtime/doc/term.txt

@@ -1,4 +1,4 @@
-*term.txt*      For Vim version 7.0aa.  Last change: 2004 Dec 07
+*term.txt*      For Vim version 7.0aa.  Last change: 2005 Jun 06
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -146,7 +146,7 @@ sequence of bytes.
 
 				*vt100-function-keys* *xterm-function-keys*
 An xterm can send function keys F1 to F4 in two modes: vt100 compatible or
-not.  Because Vim cannot know what the xterm is sending, both types of keys
+not.  Because Vim may not know what the xterm is sending, both types of keys
 are recognized.  The same happens for the <Home> and <End> keys.
 			normal			vt100 ~
 	<F1>	t_k1	<Esc>[11~	<xF1>	<Esc>OP	    *<xF1>-xterm*
@@ -167,6 +167,18 @@ recognizes most of them.  Use ":set termcap" to check which are supported and
 what the codes are.  Mostly these are not in a termcap, they are only
 supported by the builtin_xterm termcap.
 
+							*xterm-modifier-keys*
+Newer versions of xterm support Alt and Ctrl for most function keys.  To avoid
+having to add all combinations of Alt, Ctrl and Shift for every key a special
+sequence is recognized at the end of a termcap entry: ";*X".  The "X" can be
+any character, often '~' is used.  The ";*" stands for an optional modifier
+argument.  ";2" is Shift, ";3" is Alt, ";5" is Ctrl and ";9" is Meta (when
+it's different from Alt).  They can be combined.  Examples: >
+	:set <F8>=^[[19;*~
+	:set <Home>=^[[1;*H
+Another speciality about these codes is that they are not overwritten by
+another code.  That is to avoid that the codes obtained from xterm directly
+|t_RV| overwrite them.
 							*xterm-scroll-region*
 The default termcap entry for xterm on Sun and other platforms does not
 contain the entry for scroll regions.  Add ":cs=\E[%i%d;%dr:" to the xterm
@@ -260,6 +272,8 @@ OUTPUT CODES
 	t_ts	set window title start (to status line)		*t_ts* *'t_ts'*
 	t_ue	underline end					*t_ue* *'t_ue'*
 	t_us	underline mode					*t_us* *'t_us'*
+	t_Ce	undercurl end					*t_Ce* *'t_Ce'*
+	t_Cs	undercurl mode					*t_Cs* *'t_Cs'*
 	t_ut	clearing uses the current background color	*t_ut* *'t_ut'*
 	t_vb	visual bell					*t_vb* *'t_vb'*
 	t_ve	cursor visible					*t_ve* *'t_ve'*
@@ -289,6 +303,10 @@ Note: Use the <> form if possible
 	t_kd	<Down>		arrow down			*t_kd* *'t_kd'*
 	t_kr	<Right>		arrow right			*t_kr* *'t_kr'*
 	t_kl	<Left>		arrow left			*t_kl* *'t_kl'*
+		<xUp>		alternate arrow up		*<xUp>*
+		<xDown>		alternate arrow down		*<xDown>*
+		<xRight>	alternate arrow right		*<xRight>*
+		<xLeft>		alternate arrow left		*<xLeft>*
 		<S-Up>		shift arrow up
 		<S-Down>	shift arrow down
 	t_%i	<S-Right>	shift arrow right		*t_%i* *'t_%i'*
@@ -576,7 +594,6 @@ be used by Vim:
 		h	all previous modes when in a help file
 		a	all previous modes
 		r	for |hit-enter| prompt
-		A	auto-select in Visual mode
 
 The default for 'mouse' is empty, the mouse is not used.  Normally you would
 do: >

runtime/doc/tips.txt

@@ -1,4 +1,4 @@
-*tips.txt*      For Vim version 7.0aa.  Last change: 2004 Feb 17
+*tips.txt*      For Vim version 7.0aa.  Last change: 2005 Apr 19
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -129,26 +129,26 @@ Switching screens in an xterm		*xterm-screens* *xterm-save-screen*
 :the same thing as each other for a given xterm setup.
 
 They not necessarily do the same thing, as this may be a termcap vs.
-terminfo problem. You should be aware that there are two databases for
+terminfo problem.  You should be aware that there are two databases for
 describing attributes of a particular type of terminal: termcap and
-terminfo. This can cause differences when the entries differ AND when of
+terminfo.  This can cause differences when the entries differ AND when of
 the programs in question one uses terminfo and the other uses termcap
 (also see |+terminfo|).
 
 In your particular problem, you are looking for the control sequences
-^[[?47h and ^[[?47l. These switch between xterms alternate and main screen
-buffer. As a quick workaround a command sequence like >
+^[[?47h and ^[[?47l.  These switch between xterms alternate and main screen
+buffer.  As a quick workaround a command sequence like >
 	echo -n "^[[?47h"; vim ... ; echo -n "^[[?47l"
-may do what you want. (My notation ^[ means the ESC character, further down
+may do what you want.  (My notation ^[ means the ESC character, further down
 you'll see that the databases use \E instead).
 
 On startup, vim echoes the value of the termcap variable ti (terminfo:
-smcup) to the terminal. When exiting, it echoes te (terminfo: rmcup). Thus
+smcup) to the terminal.  When exiting, it echoes te (terminfo: rmcup).  Thus
 these two variables are the correct place where the above mentioned control
 sequences should go.
 
 Compare your xterm termcap entry (found in /etc/termcap) with your xterm
-terminfo entry (retrieved with /usr/5bin/infocmp -C xterm). Both should
+terminfo entry (retrieved with /usr/5bin/infocmp -C xterm).  Both should
 contain entries similar to: >
 	:te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:
 
@@ -201,21 +201,22 @@ abbreviations that correct them.  For example: >
 ==============================================================================
 Counting words, lines, etc.				*count-items*
 
-To count how often any pattern occurs in a buffer, set 'report' to 0, and use
-the substitute command to replace the pattern with itself.  The reported
-number of substitutions is the number of items.  Examples: >
+To count how often any pattern occurs in the current buffer use the substitute
+command and add the 'n' flag to avoid the substitution.  The reported number
+of substitutions is the number of items.  Examples: >
 
-	:set report=0
-	:%s/./&/g		characters
-	:%s/\i\+/&/g		words
-	:%s/^			lines
-	:%s/the/&/g		"the" anywhere
-	:%s/\<the\>/&/g		"the" as a word
+	:%s/./&/gn		characters
+	:%s/\i\+/&/gn		words
+	:%s/^//n		lines
+	:%s/the/&/gn		"the" anywhere
+	:%s/\<the\>/&/gn	"the" as a word
 
 You might want to reset 'hlsearch' or do ":nohlsearch".
+Add the 'e' flag if you don't want an error when there are no matches.
 
-This does not work if the 'modifiable' option is off.  An alternative is using
-|v_g_CTRL-G| in Visual mode.
+An alternative is using |v_g_CTRL-G| in Visual mode.
+
+If you want to find matches in multiple files use |:vimgrep|.
 
 							*count-bytes*
 If you want to count bytes, you can use this:
@@ -258,7 +259,7 @@ digraph.c
 and I want to rename *.c *.bla.  I'd do it like this: >
 
 	$ vim
-	:r! ls *.c
+	:r !ls *.c
 	:%s/\(.*\).c/mv & \1.bla
 	:w !sh
 	:q!
@@ -338,7 +339,7 @@ be able to give comments to the parts of the mapping. >
 
 (<> notation |<>|.  Note that this is all typed literally.  ^W is "^" "W", not
 CTRL-W.  You can copy/paste this into Vim if '<' is not included in
-'cpoptions')
+'cpoptions'.)
 
 Note that the last comment starts with |", because the ":execute" command
 doesn't accept a comment directly.

runtime/doc/uganda.txt

@@ -1,4 +1,4 @@
-*uganda.txt*    For Vim version 7.0aa.  Last change: 2004 Aug 29
+*uganda.txt*    For Vim version 7.0aa.  Last change: 2005 Feb 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -172,7 +172,7 @@ 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).
-
+							*donate*
 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.

runtime/doc/usr_01.txt

@@ -1,4 +1,4 @@
-*usr_01.txt*	For Vim version 7.0aa.  Last change: 2004 Sep 09
+*usr_01.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 01
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -152,7 +152,7 @@ filename.  For French:
 *01.4*	Copyright					*manual-copyright*
 
 The Vim user manual and reference manual are Copyright (c) 1988-2003 by Bram
-Moolenaar. This material may be distributed only subject to the terms and
+Moolenaar.  This material may be distributed only subject to the terms and
 conditions set forth in the Open Publication License, v1.0 or later.  The
 latest version is presently available at:
 	     http://www.opencontent.org/opl.shtml

runtime/doc/usr_02.txt

@@ -1,4 +1,4 @@
-*usr_02.txt*	For Vim version 7.0aa.  Last change: 2004 Jun 08
+*usr_02.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 01
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -425,7 +425,7 @@ the editor: "ZZ".  This will only close the help window, not exit Vim.
 As you read the help text, you will notice some text enclosed in vertical bars
 (for example, |help|).  This indicates a hyperlink.  If you position the
 cursor anywhere between the bars and press CTRL-] (jump to tag), the help
-system takes you to the indicated subject. (For reasons not discussed here,
+system takes you to the indicated subject.  (For reasons not discussed here,
 the Vim terminology for a hyperlink is tag.  So CTRL-] jumps to the location
 of the tag given by the word under the cursor.)
    After a few jumps, you might want to go back.  CTRL-T (pop tag) takes you
@@ -484,7 +484,7 @@ example, use the following command: >
 
 The table with all mode prefixes can be found here: |help-context|.
 
-Special keys are enclosed in angle brackets. To find help on the up-arrow key
+Special keys are enclosed in angle brackets.  To find help on the up-arrow key
 in Insert mode, for instance, use this command: >
 
 	:help i_<Up>

runtime/doc/usr_03.txt

@@ -1,4 +1,4 @@
-*usr_03.txt*	For Vim version 7.0aa.  Last change: 2004 Jan 17
+*usr_03.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 22
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -13,7 +13,7 @@ these commands below |Q_lr|.
 |03.1|	Word movement
 |03.2|	Moving to the start or end of a line
 |03.3|	Moving to a character
-|03.4|	Matching a paren
+|03.4|	Matching a parenthesis
 |03.5|	Moving to a specific line
 |03.6|	Telling where you are
 |03.7|	Scrolling around
@@ -145,7 +145,7 @@ aborted forward search and doesn't do anything.  Note: <Esc> cancels most
 operations, not just searches.
 
 ==============================================================================
-*03.4*	Matching a paren
+*03.4*	Matching a parenthesis
 
 When writing a program you often end up with nested () constructs.  Then the
 "%" command is very handy: It moves to the matching paren.  If the cursor is
@@ -332,7 +332,7 @@ the <Left> and <Right> cursor keys when necessary.
    Pressing <Enter> executes the command.
 
 	Note:
-	The characters .*[]^%/\?~$ have special meaning. If you want to use
+	The characters .*[]^%/\?~$ have special meanings.  If you want to use
 	them in a search you must put a \ in front of them.  See below.
 
 To find the next occurrence of the same string use the "n" command.  Use this
@@ -601,7 +601,7 @@ The ":jumps" command gives a list of positions you jumped to.  The entry which
 you used last is marked with a ">".
 
 
-NAMED MARKS
+NAMED MARKS							*bookmark*
 
 Vim enables you to place your own marks in the text.  The command "ma" marks
 the place under the cursor as mark a.  You can place 26 marks (a through z) in

runtime/doc/usr_04.txt

@@ -1,4 +1,4 @@
-*usr_04.txt*	For Vim version 7.0aa.  Last change: 2004 Jun 08
+*usr_04.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 01
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -270,7 +270,7 @@ where they open a new line below or above the cursor.
 *04.5*	Moving text
 
 When you delete something with the "d", "x", or another command, the text is
-saved.  You can paste it back by using the p command. (The Vim name for
+saved.  You can paste it back by using the p command.  (The Vim name for
 this is put).
    Take a look at how this works.  First you will delete an entire line, by
 putting the cursor on the line you want to delete and typing "dd".  Now you
@@ -457,7 +457,7 @@ you type <Esc>.
 	This is interesting. ~
 
 You may have noticed that this command replaced 5 characters in the line with
-twelve others. The "R" command automatically extends the line if it runs out
+twelve others.  The "R" command automatically extends the line if it runs out
 of characters to replace.  It will not continue on the next line.
 
 You can switch between Insert mode and Replace mode with the <Insert> key.

runtime/doc/usr_05.txt

@@ -1,4 +1,4 @@
-*usr_05.txt*	For Vim version 7.0aa.  Last change: 2004 Dec 29
+*usr_05.txt*	For Vim version 7.0aa.  Last change: 2005 Feb 08
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -7,7 +7,7 @@
 
 Vim can be tuned to work like you want it to.  This chapter shows you how to
 make Vim start with options set to different values.  Add plugins to extend
-Vims capabilities.  Or define your own macros.
+Vim's capabilities.  Or define your own macros.
 
 |05.1|	The vimrc file
 |05.2|	The example vimrc file explained
@@ -251,8 +251,8 @@ you use an existing Vim command, that command will no longer be available.
 You better avoid that.
    One key that can be used with mappings is the backslash.  Since you
 probably want to define more than one mapping, add another character.  You
-could map "\p" to add parens around a word, and "\c" to add curly braces, for
-example: >
+could map "\p" to add parentheses around a word, and "\c" to add curly braces,
+for example: >
 
 	:map \p i(<Esc>ea)<Esc>
 	:map \c i{<Esc>ea}<Esc>

runtime/doc/usr_07.txt

@@ -1,4 +1,4 @@
-*usr_07.txt*	For Vim version 7.0aa.  Last change: 2004 Mar 12
+*usr_07.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 01
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -266,7 +266,7 @@ positions without placing marks there.
 ==============================================================================
 *07.4*	Backup files
 
-Usually Vim does not produce a backup file. If you want to have one, all you
+Usually Vim does not produce a backup file.  If you want to have one, all you
 need to do is execute the following command: >
 
 	:set backup

runtime/doc/usr_08.txt

@@ -1,4 +1,4 @@
-*usr_08.txt*	For Vim version 7.0aa.  Last change: 2004 Jun 04
+*usr_08.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 01
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -52,7 +52,7 @@ the bottom one the code that uses these variables.
 
 The CTRL-W w command can be used to jump between the windows.  If you are in
 the top window, CTRL-W w jumps to the window below it.  If you are in the
-bottom window it will jump to the first window. (CTRL-W CTRL-W does the same
+bottom window it will jump to the first window.  (CTRL-W CTRL-W does the same
 thing, in case you let go of the CTRL key a bit later.)
 
 

runtime/doc/usr_09.txt

@@ -1,4 +1,4 @@
-*usr_09.txt*	For Vim version 7.0aa.  Last change: 2001 Sep 03
+*usr_09.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 01
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -129,7 +129,7 @@ select text in a standard manner.  The X Window system also has a standard
 system for using the mouse.  Unfortunately, these two standards are not the
 same.
    Fortunately, you can customize Vim.  You can make the behavior of the mouse
-work like an X Window system mouse or a Microsoft Windows mouse. The following
+work like an X Window system mouse or a Microsoft Windows mouse.  The following
 command makes the mouse behave like an X Window mouse: >
 
 	:behave xterm

runtime/doc/usr_10.txt

@@ -1,4 +1,4 @@
-*usr_10.txt*	For Vim version 7.0aa.  Last change: 2004 Mar 12
+*usr_10.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 01
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -437,7 +437,8 @@ If the string you insert contains a newline, the "I" acts just like a Normal
 insert command and affects only the first line of the block.
 
 The "A" command works the same way, except that it appends after the right
-side of the block.
+side of the block.  And it does insert text in a short line.  Thus you can
+make a choice whether you do or don't want to append text to a short line.
    There is one special case for "A": Select a Visual block and then use "$"
 to make the block extend to the end of each line.  Using "A" now will append
 the text to the end of each line.
@@ -699,7 +700,7 @@ as input.  The output of this command then replaces the selected block.
    Because this summarizes badly if you are unfamiliar with UNIX filters, take
 a look at an example.  The sort command sorts a file.  If you execute the
 following command, the unsorted file input.txt will be sorted and written to
-output.txt. (This works on both UNIX and Microsoft Windows.) >
+output.txt.  (This works on both UNIX and Microsoft Windows.) >
 
 	sort <input.txt >output.txt