updated for version 7.0076

Filelist

@@ -57,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 \
@@ -112,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 \
@@ -120,6 +122,8 @@ SRC_ALL2 =	\
 		src/proto/undo.pro \
 		src/proto/version.pro \
 		src/proto/window.pro \
+		src/spell/*.diff \
+		src/spell/Makefile \
 
 
 # source files for Unix only
@@ -325,7 +329,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 \
@@ -660,7 +664,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 \
@@ -674,6 +683,13 @@ LANG_GEN = \
 		runtime/tutor/tutor.pl.* \
 		runtime/tutor/tutor.ru.* \
 		runtime/tutor/tutor.zh.* \
+		runtime/spell/README.txt \
+
+# 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 = \

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/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/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

@@ -84,6 +84,7 @@ DOCS = \
 	sign.txt \
 	sponsor.txt \
 	starting.txt \
+	spell.txt \
 	syntax.txt \
 	tagsrch.txt \
 	term.txt \
@@ -204,6 +205,7 @@ HTMLS = \
 	sign.html \
 	sponsor.html \
 	starting.html \
+	spell.html \
 	syntax.html \
 	tagsrch.html \
 	tags.html \
@@ -254,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.
@@ -365,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: 2005 Feb 21
+*autocmd.txt*   For Vim version 7.0aa.  Last change: 2005 Mar 04
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -286,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
@@ -294,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>".

runtime/doc/change.txt

@@ -1,4 +1,4 @@
-*change.txt*    For Vim version 7.0aa.  Last change: 2005 Feb 23
+*change.txt*    For Vim version 7.0aa.  Last change: 2005 May 22
 
 
 		  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|.
 
@@ -748,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.
 
@@ -915,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 '"'
@@ -964,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,
@@ -1155,13 +1158,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: >
@@ -1413,7 +1420,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.
@@ -1473,5 +1480,34 @@ 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 [u] only keep the first of a sequence of
+			identical lines (ignoring case when [i] is used).
+
+			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/
+<
 
  vim:tw=78:ts=8:ft=help:norl:

runtime/doc/debugger.txt

@@ -1,4 +1,4 @@
-*debugger.txt*  For Vim version 7.0aa.  Last change: 2005 Feb 23
+*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,7 +85,7 @@ 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.
@@ -98,17 +98,20 @@ 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:
 

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 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -366,7 +366,33 @@ 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.
+- For the programs and libraries: Using them as-is would require installing
+  them separately from Vim.  That's 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 a 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.
+
 
 ==============================================================================
 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: 2005 Feb 14
+*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.
@@ -563,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.
@@ -910,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
@@ -1391,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*
 
@@ -1401,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.
@@ -1435,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: >
@@ -1457,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: >
@@ -1465,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/eval.txt

@@ -1,4 +1,4 @@
-*eval.txt*      For Vim version 7.0aa.  Last change: 2005 Feb 26
+*eval.txt*      For Vim version 7.0aa.  Last change: 2005 May 22
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -9,7 +9,7 @@ Expression evaluation			*expression* *expr* *E15* *eval*
 Using expressions is introduced in chapter 41 of the user manual |usr_41.txt|.
 
 Note: Expression evaluation can be disabled at compile time.  If this has been
-done, the features in this document are not available.  See |+eval| and 
+done, the features in this document are not available.  See |+eval| and
 |no-eval-feature|.
 
 1.  Variables			|variables|
@@ -194,6 +194,10 @@ is an empty list.  If the second index is lower, this results in an error. >
 	:echo mylist[2:1]		" result: []
 	:echo mylist[2:0]		" error!
 
+NOTE: mylist[s:e] means using the variable "s:e" as index.  Watch out for
+using a single letter variable before the ":".  Insert a space when needed:
+mylist[s : e].
+
 
 List identity ~
 							*list-identity*
@@ -338,6 +342,10 @@ Functions that are useful with a List: >
 	:let s = string(list)		" String representation of list
 	:call map(list, '">> " . v:val')  " prepend ">> " to each item
 
+Don't forget that a combination of features can make things simple.  For
+example, to add up all the numbers in a list: >
+	:exe 'let sum = ' . join(nrlist, '+')
+
 
 1.4 Dictionaries ~
 						*Dictionaries* *Dictionary*
@@ -445,7 +453,7 @@ expect ":echo adict" to show the items from bdict after the older entries in
 adict.
 
 Weeding out entries from a Dictionary can be done with |filter()|: >
-	:call filter(dict 'v:val =~ "x"') 
+	:call filter(dict 'v:val =~ "x"')
 This removes all entries from "dict" with a value not matching 'x'.
 
 
@@ -1105,6 +1113,32 @@ variables for each buffer.  Use local buffer variables instead |b:var|.
 
 Predefined Vim variables:			*vim-variable* *v:var*
 
+					*v:beval_col* *beval_col-variable*
+v:beval_col	The number of the column, over which the mouse pointer is.
+		This is the byte index in the |v:beval_lnum| line.
+		Only valid while evaluating the 'balloonexpr' option.
+
+					*v:beval_bufnr* *beval_bufnr-variable*
+v:beval_bufnr	The number of the buffer, over which the mouse pointer is. Only
+		valid while evaluating the 'balloonexpr' option.
+
+					*v:beval_lnum* *beval_lnum-variable*
+v:beval_lnum	The number of the line, over which the mouse pointer is. Only
+		valid while evaluating the 'balloonexpr' option.
+
+					*v:beval_text* *beval_text-variable*
+v:beval_text	The text under or after the mouse pointer.  Usually a word as it is
+		useful for debugging a C program.  'iskeyword' applies, but a
+		dot and "->" before the position is included.  When on a ']'
+		the text before it is used, including the matching '[' and
+		word before it.  When on a Visual area within one line the
+		highlighted text is used.
+		Only valid while evaluating the 'balloonexpr' option.
+
+					*v:beval_winnr* *beval_winnr-variable*
+v:beval_winnr	The number of the window, over which the mouse pointer is. Only
+		valid while evaluating the 'balloonexpr' option.
+
 			*v:charconvert_from* *charconvert_from-variable*
 v:charconvert_from
 		The name of the character encoding of a file to be converted.
@@ -1183,6 +1217,32 @@ v:exception	The value of the exception most recently caught and not
 	:endtry
 <		Output: "caught oops".
 
+					*v:fcs_reason* *fcs_reason-variable*
+v:fcs_reason	The reason why the |FileChangedShell| event was triggered.
+		Can be used in an autocommand to decide what to do and/or what
+		to set v:fcs_choice to.  Possible values:
+			deleted		file no longer exists
+			conflict	file contents, mode or timestamp was
+					changed and buffer is modified
+			changed		file contents has changed
+			mode		mode of file changed
+			time		only file timestamp changed
+
+					*v:fcs_choice* *fcs_choice-variable*
+v:fcs_choice	What should happen after a |FileChangedShell| event was
+		triggered.  Can be used in an autocommand to tell Vim what to
+		do with the affected buffer:
+			reload		Reload the buffer (does not work if
+					the file was deleted).
+			ask		Ask the user what to do, as if there
+					was no autocommand.  Except that when
+					only the timestamp changed nothing
+					will happen.
+			<empty>		Nothing, the autocommand should do
+					everything that needs to be done.
+		The default is empty.  If another (invalid) value is used then
+		Vim behaves like it is empty, there is no warning message.
+
 					*v:fname_in* *fname_in-variable*
 v:fname_in	The name of the input file.  Only valid while evaluating:
 			option		used for ~
@@ -1360,7 +1420,7 @@ v:warningmsg	Last given warning message.  It's allowed to set this variable.
 
 See |function-list| for a list grouped by what the function is used for.
 
-(Use CTRL-] on the function name to jump to the full explanation)
+(Use CTRL-] on the function name to jump to the full explanation.)
 
 USAGE				RESULT	DESCRIPTION	~
 
@@ -1400,9 +1460,8 @@ did_filetype()			Number	TRUE if FileType autocommand event used
 diff_filler( {lnum})		Number	diff filler lines about {lnum}
 diff_hlID( {lnum}, {col})	Number	diff highlighting at {lnum}/{col}
 empty( {expr})			Number	TRUE if {expr} is empty
-errorlist()			List	list of quickfix items
 escape( {string}, {chars})	String	escape {chars} in {string} with '\'
-eval( {string})			any	evaluate {string} into its value 
+eval( {string})			any	evaluate {string} into its value
 eventhandler( )			Number	TRUE if inside an event handler
 executable( {expr})		Number	1 if executable {expr} exists
 exists( {expr})			Number	TRUE if {expr} exists
@@ -1437,7 +1496,8 @@ getftime( {fname})		Number	last modification time of file
 getftype( {fname})		String	description of type of file {fname}
 getline( {lnum})		String	line {lnum} of current buffer
 getline( {lnum}, {end})		List	lines {lnum} to {end} of current buffer
-getreg( [{regname}])		String	contents of register
+getqflist()			List	list of quickfix items
+getreg( [{regname} [, 1]])	String	contents of register
 getregtype( [{regname}])	String	type of register
 getwinposx()			Number	X coord in pixels of GUI Vim window
 getwinposy()			Number	Y coord in pixels of GUI Vim window
@@ -1522,11 +1582,13 @@ serverlist()			String	get a list of available servers
 setbufvar( {expr}, {varname}, {val})	set {varname} in buffer {expr} to {val}
 setcmdpos( {pos})		Number	set cursor position in command-line
 setline( {lnum}, {line})	Number	set line {lnum} to {line}
+setqflist( {list}[, {action}])	Number	set list of quickfix items using {list}
 setreg( {n}, {v}[, {opt}])	Number	set register to value and type
 setwinvar( {nr}, {varname}, {val})	set {varname} in window {nr} to {val}
 simplify( {filename})		String	simplify filename as much as possible
 sort( {list} [, {func}])	List	sort {list}, using {func} to compare
-split( {expr} [, {pat}])	List	make List from {pat} separated {expr}
+split( {expr} [, {pat} [, {keepempty}]])
+				List	make List from {pat} separated {expr}
 strftime( {format}[, {time}])	String	time in specified format
 stridx( {haystack}, {needle}[, {start}])
 				Number	index of {needle} in {haystack}
@@ -1545,6 +1607,7 @@ synIDattr( {synID}, {what} [, {mode}])
 				String	attribute {what} of syntax ID {synID}
 synIDtrans( {synID})		Number	translated syntax ID of {synID}
 system( {expr} [, {input}])	String	output of shell command/filter {expr}
+taglist({expr})			List	list of tags matching {expr}
 tempname()			String	name for a temporary file
 tolower( {expr})		String	the String {expr} switched to lowercase
 toupper( {expr})		String	the String {expr} switched to uppercase
@@ -1566,7 +1629,7 @@ writefile({list}, {fname} [, {binary}])
 
 add({list}, {expr})					*add()*
 		Append the item {expr} to List {list}.  Returns the resulting
-		List. Examples: >
+		List.  Examples: >
 			:let alist = add([1, 2, 3], item)
 			:call add(mylist, "woodstock")
 <		Note that when {expr} is a List it is appended as a single
@@ -1755,6 +1818,7 @@ char2nr({expr})						*char2nr()*
 <		The current 'encoding' is used.  Example for "utf-8": >
 			char2nr("<22>")		returns 225
 			char2nr("<22>"[0])		returns 195
+<		nr2char() does the opposite.
 
 cindent({lnum})						*cindent()*
 		Get the amount of indent for line {lnum} according the C
@@ -1970,28 +2034,6 @@ empty({expr})						*empty()*
 		For a long List this is much faster then comparing the length
 		with zero.
 
-errorlist()						*errorlist()*
-		Returns a list with all the current quickfix errors.  Each
-		list item is a dictionary with these entries:
-			bufnr	number of buffer that has the file name, use
-				bufname() to get the name
-			lnum	line number in the buffer (first line is 1)
-			col	column number (first column is 1)
-			vcol	non-zero: column number is visual column
-				zero: column number is byte index
-			nr	error number
-			text	description of the error
-			type	type of the error, 'E', '1', etc.
-			valid	non-zero: recognized error message
-
-		Useful application: Find pattern matches in multiple files and
-		do something with them: >
-			:vimgrep /theword/jg *.c
-			:for d in errorlist()
-			:   echo bufname(d.bufnr) ':' d.lnum '=' d.text
-			:endfor
-
-
 escape({string}, {chars})				*escape()*
 		Escape the characters in {chars} that occur in {string} with a
 		backslash.  Example: >
@@ -2330,8 +2372,9 @@ getbufvar({expr}, {varname})				*getbufvar()*
 		The result is the value of option or local buffer variable
 		{varname} in buffer {expr}.  Note that the name without "b:"
 		must be used.
-		This also works for a global or local window option, but it
-		doesn't work for a global or local window variable.
+		This also works for a global or buffer-local option, but it
+		doesn't work for a global variable, window-local variable or
+		window-local option.
 		For the use of {expr}, see |bufname()| above.
 		When the buffer or variable doesn't exist an empty string is
 		returned, there is no error message.
@@ -2442,7 +2485,7 @@ getfperm({fname})					*getfperm()*
 			:echo getfperm("/etc/passwd")
 <		This will hopefully (from a security point of view) display
 		the string "rw-r--r--" or even "rw-------".
-  
+
 getftime({fname})					*getftime()*
 		The result is a Number, which is the last modification time of
 		the given file {fname}.  The value is measured as seconds
@@ -2494,12 +2537,37 @@ getline({lnum} [, {end}])
 			:let lines = getline(start, end)
 
 
-getreg([{regname}])					*getreg()*
+getqflist()						*getqflist()*
+		Returns a list with all the current quickfix errors.  Each
+		list item is a dictionary with these entries:
+			bufnr	number of buffer that has the file name, use
+				bufname() to get the name
+			lnum	line number in the buffer (first line is 1)
+			col	column number (first column is 1)
+			vcol	non-zero: "col" is visual column
+				zero: "col" is byte index
+			nr	error number
+			text	description of the error
+			type	type of the error, 'E', '1', etc.
+			valid	non-zero: recognized error message
+
+		Useful application: Find pattern matches in multiple files and
+		do something with them: >
+			:vimgrep /theword/jg *.c
+			:for d in getqflist()
+			:   echo bufname(d.bufnr) ':' d.lnum '=' d.text
+			:endfor
+
+
+getreg([{regname} [, 1]])				*getreg()*
 		The result is a String, which is the contents of register
-		{regname}. Example: >
+		{regname}.  Example: >
 			:let cliptext = getreg('*')
 <		getreg('=') returns the last evaluated value of the expression
-		register. (For use in maps).
+		register.  (For use in maps.)
+		getreg('=', 1) returns the expression itself, so that it can
+		be restored with |setreg()|.  For other registers the extra
+		argument is ignored, thus you can always give it.
 		If {regname} is not specified, |v:register| is used.
 
 
@@ -2513,7 +2581,6 @@ getregtype([{regname}])					*getregtype()*
 		<CTRL-V> is one character with value 0x16.
 		If {regname} is not specified, |v:register| is used.
 
-
 							*getwinposx()*
 getwinposx()	The result is a Number, which is the X coordinate in pixels of
 		the left hand side of the GUI Vim window.  The result will be
@@ -2527,8 +2594,9 @@ getwinposy()	The result is a Number, which is the Y coordinate in pixels of
 getwinvar({nr}, {varname})				*getwinvar()*
 		The result is the value of option or local window variable
 		{varname} in window {nr}.
-		This also works for a global or local buffer option, but it
-		doesn't work for a global or local buffer variable.
+		This also works for a global option, buffer-local option and
+		window-local option, but it doesn't work for a global variable
+		or buffer-local variable.
 		Note that the name without "w:" must be used.
 		Examples: >
 			:let list_is_on = getwinvar(2, '&list')
@@ -2621,7 +2689,7 @@ histadd({history}, {item})				*histadd()*
 <		This function is not available in the |sandbox|.
 
 histdel({history} [, {item}])				*histdel()*
-		Clear {history}, ie. delete all its entries.  See |hist-names|
+		Clear {history}, i.e. delete all its entries.  See |hist-names|
 		for the possible values of {history}.
 
 		If the parameter {item} is given as String, this is seen
@@ -2697,7 +2765,7 @@ hlID({name})	The result is a Number, which is the ID of the highlight group
 
 hostname()						*hostname()*
 		The result is a String, which is the name of the machine on
-		which Vim is currently running. Machine names greater than
+		which Vim is currently running.  Machine names greater than
 		256 characters long are truncated.
 
 iconv({expr}, {from}, {to})				*iconv()*
@@ -2817,7 +2885,7 @@ insert({list}, {item} [, {idx}])			*insert()*
 		{idx}.  If {idx} is zero it goes before the first item, just
 		like omitting {idx}.  A negative {idx} is also possible, see
 		|list-index|.  -1 inserts just before the last item.
-		Returns the resulting List. Examples: >
+		Returns the resulting List.  Examples: >
 			:let mylist = insert([2, 3, 5], 1)
 			:call insert(mylist, 4, -1)
 			:call insert(mylist, 6, len(mylist))
@@ -3075,7 +3143,7 @@ match({expr}, {pat}[, {start}[, {count}]])			*match()*
 		If {start} is given, the search starts from byte index
 		{start} in a String or item {start} in a List.
 		The result, however, is still the index counted from the
-		first character/item. Example: >
+		first character/item.  Example: >
 			:echo match("testing", "ing", 2)
 <		result is again "4". >
 			:echo match("testing", "ing", 4)
@@ -3234,7 +3302,9 @@ readfile({fname} [, {binary} [, {max}]])
 			:for line in readfile(fname, '', 10)
 			:  if line =~ 'Date' | echo line | endif
 			:endfor
-<		When {max} is zero or negative the result is an empty list.
+<		When {max} is negative -{max} lines from the end of the file
+		are returned, or as many as there are.
+		When {max} is zero the result is an empty list.
 		Note that without {max} the whole file is read into memory.
 		Also note that there is no recognition of encoding.  Read a
 		file into a buffer if you need to.
@@ -3347,7 +3417,7 @@ repeat({expr}, {count})					*repeat()*
 			:let seperator = repeat('-', 80)
 <		When {count} is zero or negative the result is empty.
 		When {expr} is a List the result is {expr} concatenated
-		{count} times. Example: >
+		{count} times.  Example: >
 			:let longlist = repeat(['a', 'b'], 3)
 <		Results in ['a', 'b', 'a', 'b', 'a', 'b'].
 
@@ -3486,7 +3556,7 @@ server2client( {clientid}, {string})			*server2client()*
 		{only available when compiled with the |+clientserver| feature}
 		Note:
 		This id has to be stored before the next command can be
-		received. Ie. before returning from the received command and
+		received.  I.e. before returning from the received command and
 		before calling any commands that waits for input.
 		See also |clientserver|.
 		Example: >
@@ -3529,12 +3599,62 @@ setcmdpos({pos})					*setcmdpos()*
 		line.
 
 setline({lnum}, {line})					*setline()*
-		Set line {lnum} of the current buffer to {line}.  If this
-		succeeds, 0 is returned.  If this fails (most likely because
-		{lnum} is invalid) 1 is returned.  Example: >
+		Set line {lnum} of the current buffer to {line}.
+		{lnum} is used like with |getline()|.
+		When {lnum} is just below the last line the {line} will be
+		added as a new line.
+		If this succeeds, 0 is returned.  If this fails (most likely
+		because {lnum} is invalid) 1 is returned.  Example: >
 			:call setline(5, strftime("%c"))
+<		When {line} is a List then line {lnum} and following lines
+		will be set to the items in the list.  Example: >
+			:call setline(5, ['aaa', 'bbb', 'ccc'])
+<		This is equivalent to: >
+			:for [n, l] in [[5, 6, 7], ['aaa', 'bbb', 'ccc']]
+			:  call setline(n, l)
+			:endfor
 <		Note: The '[ and '] marks are not set.
 
+
+setqflist({list} [, {action}])				*setqflist()*
+		Creates a quickfix list using the items in {list}.  Each item
+		in {list} is a dictionary.  Non-dictionary items in {list} are
+		ignored.  Each dictionary item can contain the following
+		entries:
+
+		    filename	name of a file
+		    lnum	line number in the file
+		    pattern	search pattern used to locate the error
+		    col		column number
+		    vcol	when non-zero: "col" is visual column
+		    		when zero: "col" is byte index
+		    nr		error number
+		    text	description of the error
+		    type	single-character error type, 'E', 'W', etc.
+
+		The "col", "vcol", "nr", "type" and "text" entries are
+		optional.  Either "lnum" or "pattern" entry can be used to
+		locate a matching error line.
+		If the "filename" entry is not present or neither the "lnum"
+		or "pattern" entries are present, then the item will not be
+		handled as an error line.
+		If both "pattern" and "lnum" are present then "pattern" will
+		be used.
+
+		If {action} is set to 'a', then the items from {list} are
+		added to the existing quickfix list. If there is no existing
+		list, then a new list is created. If {action} is set to 'r',
+		then the items from the current quickfix list are replaced
+		with the items from {list}. If {action} is not present or is
+		set to ' ', then a new list is created.
+
+		Returns zero for success, -1 for failure.
+
+		This function can be used to create a quickfix list
+		independent of the 'errorformat' setting.  Use a command like
+		":cc 1" to jump to the first position.
+
+
 							*setreg()*
 setreg({regname}, {value} [,{options}])
 		Set the register {regname} to {value}.
@@ -3561,7 +3681,7 @@ setreg({regname}, {value} [,{options}])
 
 <		This example shows using the functions to save and restore a
 		register. >
-			:let var_a = getreg('a')
+			:let var_a = getreg('a', 1)
 			:let var_amode = getregtype('a')
 			    ....
 			:call setreg('a', var_a, var_amode)
@@ -3604,6 +3724,7 @@ sort({list} [, {func}])					*sort()* *E702*
 			:let sortedlist = sort(copy(mylist))
 <		Uses the string representation of each item to sort on.
 		Numbers sort after Strings, Lists after Numbers.
+		For sorting text in the current buffer use |:sort|.
 		When {func} is given and it is one then case is ignored.
 		When {func} is a Funcref or a function name, this function is
 		called to compare items.  The function is invoked with two
@@ -3615,16 +3736,23 @@ sort({list} [, {func}])					*sort()* *E702*
 			endfunc
 			let sortedlist = sort(mylist, "MyCompare")
 
-split({expr} [, {pattern}])				*split()*
-		Make a List out of {expr}.  When {pattern} is omitted each
-		white-separated sequence of characters becomes an item.
+split({expr} [, {pattern} [, {keepempty}]])			*split()*
+		Make a List out of {expr}.  When {pattern} is omitted or empty
+		each white-separated sequence of characters becomes an item.
 		Otherwise the string is split where {pattern} matches,
-		removing the matched characters.  Empty strings are omitted.
+		removing the matched characters.
+		When the first or last item is empty it is omitted, unless the
+		{keepempty} argument is given and it's non-zero.
 		Example: >
 			:let words = split(getline('.'), '\W\+')
-<		Since empty strings are not added the "\+" isn't required but
-		it makes the function work a bit faster.
-		The opposite function is |join()|.
+<		To split a string in individual characters: >
+			:for c in split(mystring, '\zs')
+<		If you want to keep the separator you can also use '\zs': >
+			:echo split('abc:def:ghi', ':\zs')
+<			['abc:', 'def:', 'ghi'] ~
+		Splitting a table where the first element can be empty: >
+			:let items = split(line, ':', 1)
+<		The opposite function is |join()|.
 
 
 strftime({format} [, {time}])				*strftime()*
@@ -3654,7 +3782,7 @@ stridx({haystack}, {needle} [, {start}])		*stridx()*
 			:let comma1 = stridx(line, ",")
 			:let comma2 = stridx(line, ",", comma1 + 1)
 <		The search is done case-sensitive.
-		For pattern searches use |match()|. 
+		For pattern searches use |match()|.
 		-1 is returned if the {needle} does not occur in {haystack}.
 		See also |strridx()|.
 		Examples: >
@@ -3715,7 +3843,7 @@ strridx({haystack}, {needle} [, {start}])			*strridx()*
 		For pattern searches use |match()|.
 		-1 is returned if the {needle} does not occur in {haystack}.
 		If the {needle} is empty the length of {haystack} is returned.
-		See also |stridx()|. Examples: >
+		See also |stridx()|.  Examples: >
 		  :echo strridx("an angry armadillo", "an")	     3
 <		  					*strrchr()*
 		When used with a single character it works similar to the C
@@ -3800,6 +3928,7 @@ synIDattr({synID}, {what} [, {mode}])			*synIDattr()*
 		"reverse"	"1" if reverse
 		"inverse"	"1" if inverse (= reverse)
 		"underline"	"1" if underlined
+		"undercurl"	"1" if undercurled
 
 		Example (echoes the color of the syntax item under the
 		cursor): >
@@ -3839,6 +3968,43 @@ system({expr} [, {input}])				*system()* *E677*
 		Unlike ":!cmd" there is no automatic check for changed files.
 		Use |:checktime| to force a check.
 
+
+taglist({expr})							*taglist()*
+		Returns a list of tags matching the regular expression {expr}.
+		Each list item is a dictionary with the following entries:
+			name		name of the tag.
+			filename	name of the file where the tag is
+					defined.
+			cmd		Ex command used to locate the tag in
+					the file.
+			kind		type of the tag.  The value for this
+					entry depends on the language specific
+					kind values generated by the ctags
+					tool.
+			static		a file specific tag.  Refer to
+					|static-tag| for more information.
+		The "kind" entry is only available when using Exuberant ctags
+		generated tags file.  More entries may be present, depending
+		on the content of the tags file: access, implementation,
+		inherits and signature.  Refer to the ctags documentation for
+		information about these fields.  For C code the fields
+		"struct", "class" and "enum" may appear, they give the name of
+		the entity the tag is contained in.
+ 
+		The ex-command 'cmd' can be either an ex search pattern, a
+		line number or a line number followed by a byte number.
+
+		If there are no matching tags, then an empty list is returned.
+
+		To get an exact tag match, the anchors '^' and '$' should be
+		used in {expr}.  Refer to |tag-regexp| for more information
+		about the tag search regular expression pattern.
+
+		Refer to |'tags'| for information about how the tags file is
+		located by Vim. Refer to |tags-file-format| for the format of
+		the tags file generated by the different ctags tools.
+
+
 tempname()					*tempname()* *temp-file-name*
 		The result is a String, which is the name of a file that
 		doesn't exist.  It can be used for a temporary file.  The name
@@ -3939,7 +4105,7 @@ visualmode([expr])						*visualmode()*
 
 							*winbufnr()*
 winbufnr({nr})	The result is a Number, which is the number of the buffer
-		associated with window {nr}. When {nr} is zero, the number of
+		associated with window {nr}.  When {nr} is zero, the number of
 		the buffer in the current window is returned.  When window
 		{nr} doesn't exist, -1 is returned.
 		Example: >
@@ -4456,14 +4622,14 @@ Using a script in the "autoload" directory is simpler, but requires using
 exactly the right file name.  A function that can be autoloaded has a name
 like this: >
 
-	:call filename:funcname()
+	:call filename#funcname()
 
 When such a function is called, and it is not defined yet, Vim will search the
 "autoload" directories in 'runtimepath' for a script file called
 "filename.vim".  For example "~/.vim/autoload/filename.vim".  That file should
 then define the function like this: >
 
-	function filename:funcname()
+	function filename#funcname()
 	   echo "Done!"
 	endfunction
 
@@ -4471,10 +4637,10 @@ The file name and the name used before the colon in the function must match
 exactly, and the defined function must have the name exactly as it will be
 called.
 
-It is possible to use subdirectories.  Every colon in the function name works
-like a path separator.  Thus when calling a function: >
+It is possible to use subdirectories.  Every # in the function name works like
+a path separator.  Thus when calling a function: >
 
-	:call foo:bar:func()
+	:call foo#bar#func()
 
 Vim will look for the file "autoload/foo/bar.vim" in 'runtimepath'.
 
@@ -4483,13 +4649,13 @@ otherwise it looks like a scope, such as "s:".
 
 This also works when reading a variable that has not been set yet: >
 
-	:let l = foo:bar:lvar
+	:let l = foo#bar#lvar
 
 When assigning a value to such a variable nothing special happens.  This can
 be used to pass settings to the autoload script before it's loaded: >
 
-	:let foo:bar:toggle = 1
-	:call foo:bar:func()
+	:let foo#bar#toggle = 1
+	:call foo#bar#func()
 
 Note that when you make a mistake and call a function that is supposed to be
 defined in an autoload script, but the script doesn't actually define the
@@ -4528,7 +4694,7 @@ You can use multiple brace pairs: >
 where "end_of_word" is either "verb" or "jective".
 
 However, the expression inside the braces must evaluate to a valid single
-variable name. e.g. this is invalid: >
+variable name, e.g. this is invalid: >
 	:let foo='a + b'
 	:echo c{foo}d
 .. since the result of expansion is "ca + bd", which is not a variable name.

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: 2005 Jan 14
+*gui.txt*       For Vim version 7.0aa.  Last change: 2005 Apr 11
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -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
@@ -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
@@ -920,7 +920,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 Feb 14
+*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).
@@ -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 <sergey.khorev@gmail.com>. Contact
+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: 2005 Jan 23
+*if_mzsch.txt*  For Vim version 7.0aa.  Last change: 2005 May 08
 
 
 		  VIM REFERENCE MANUAL    by Sergey Khorev
@@ -110,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: 2005 Feb 24
+*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 >
 

runtime/doc/index.txt

@@ -1,4 +1,4 @@
-*index.txt*     For Vim version 7.0aa.  Last change: 2005 Feb 25
+*index.txt*     For Vim version 7.0aa.  Last change: 2005 May 22
 
 
 		  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	~
@@ -1354,6 +1354,7 @@ 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
 |:split|	:sp[lit]	split current window
 |:sprevious|	:spr[evious]	split window and go to previous file in the

runtime/doc/insert.txt

@@ -1,4 +1,4 @@
-*insert.txt*    For Vim version 7.0aa.  Last change: 2005 Feb 21
+*insert.txt*    For Vim version 7.0aa.  Last change: 2005 Apr 08
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -190,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*
@@ -271,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)
@@ -392,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;
@@ -726,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

runtime/doc/intro.txt

@@ -1,4 +1,4 @@
-*intro.txt*     For Vim version 7.0aa.  Last change: 2005 Feb 07
+*intro.txt*     For Vim version 7.0aa.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -330,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.
 
 							*{}*

runtime/doc/map.txt

@@ -1,4 +1,4 @@
-*map.txt*       For Vim version 7.0aa.  Last change: 2005 Feb 27
+*map.txt*       For Vim version 7.0aa.  Last change: 2005 Mar 29
 
 
 		  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
@@ -961,11 +961,11 @@ The following example lists user names to a Finger command >
 
 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,$)
@@ -997,9 +997,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 +1017,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
@@ -1034,7 +1034,7 @@ If the first two characters of an escape sequence are "q-" (for example,
 for use in an expression.  This uses the argument as one single value.
 
 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: 2005 Feb 13
+*mbyte.txt*     For Vim version 7.0aa.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar et al.
@@ -436,7 +436,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 +444,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 +506,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 +761,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 +801,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 +1231,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 +1253,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.

runtime/doc/motion.txt

@@ -1,4 +1,4 @@
-*motion.txt*    For Vim version 7.0aa.  Last change: 2005 Feb 08
+*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.
@@ -1061,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: 2005 Jan 31
+*netbeans.txt*  For Vim version 7.0aa.  Last change: 2005 Apr 04
 
 
 		  VIM REFERENCE MANUAL    by Gordon Prieur
@@ -38,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.
@@ -50,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: >
@@ -81,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.
 
 
@@ -99,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.
 
@@ -152,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.
 
 ==============================================================================
@@ -194,7 +194,7 @@ 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.
 
@@ -248,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().
 
@@ -428,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.
 
@@ -466,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.
 
@@ -539,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.
 
@@ -652,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.
 
@@ -772,8 +772,8 @@ REJECT		Not used.
 							*: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
+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.
 

runtime/doc/options.txt

@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.0aa.  Last change: 2005 Feb 23
+*options.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 14
 
 
 		  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
@@ -1539,8 +1570,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)
@@ -1727,7 +1758,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
@@ -2132,7 +2163,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
@@ -2871,7 +2902,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
@@ -3033,7 +3064,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.
@@ -3115,7 +3146,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}
@@ -3178,8 +3209,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
@@ -3318,6 +3349,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	|hl-Folded|	 f  line used for closed folds
 	|hl-FoldColumn|	 F  'foldcolumn'
 	|hl-SignColumn|	 >  column used for |signs|
+	|hl-SpellBad|	 B  misspelled word |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")
@@ -3325,6 +3359,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
@@ -3406,7 +3441,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'*
@@ -3541,7 +3576,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.
 
@@ -3719,7 +3754,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
@@ -3972,6 +4007,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)
@@ -4156,6 +4195,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
@@ -4283,12 +4336,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:
@@ -4311,7 +4364,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|
@@ -4709,8 +4762,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|.
 
@@ -4718,8 +4771,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|.
 
@@ -4843,7 +4896,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
@@ -4897,7 +4950,7 @@ 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
@@ -5007,7 +5060,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
@@ -5362,7 +5416,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
@@ -5482,7 +5536,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
@@ -5571,6 +5625,30 @@ 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'.
+
+						*'spelllang'* *'spl'*
+'spelllang' 'spl'	string	(default empty)
+			local to buffer
+			{not in Vi}
+			{not available when compiled without the |+syntax|
+			feature}
+	A comma separated list of languages.  when the 'spell' option is on
+	spellchecking will be done for these languages.  Example: >
+		set spelllang=en_us,nl
+<	This means both US English and Dutch words are recognized.  Words that
+	are not recognized will be highlighted.
+	When 'encoding' is set the word lists are reloaded.  Thus it's a good
+	idea to set 'spelllang' after setting 'encoding'.
+	More info at |spell|.
+
 			*'splitbelow'* *'sb'* *'nosplitbelow'* *'nosb'*
 'splitbelow' 'sb'	boolean	(default off)
 			global
@@ -5623,9 +5701,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 '<'
@@ -5666,7 +5744,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.
@@ -5675,7 +5753,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
@@ -5686,7 +5764,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|
@@ -5697,10 +5775,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. >
@@ -5709,7 +5787,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|.
 
@@ -5722,7 +5800,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.
 
@@ -5819,7 +5897,7 @@ 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.
 
 						*'syntax'* *'syn'*
@@ -6341,10 +6419,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*
@@ -6354,6 +6434,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*
@@ -6547,7 +6629,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
@@ -6690,8 +6772,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>
@@ -6781,7 +6863,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
@@ -6833,9 +6915,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 			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 the value is smaller than 'lines'
-	minus one.  The screen will scroll 'window' minus two lines, with a
-	minimum of one.
+	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

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,32 +133,32 @@ 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
@@ -172,7 +172,7 @@ 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: 2005 Feb 20
+*pattern.txt*   For Vim version 7.0aa.  Last change: 2005 May 22
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -272,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|.
 
@@ -631,7 +631,7 @@ overview.
 	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
@@ -735,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*
@@ -745,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}
@@ -835,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
@@ -930,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'

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

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: 2005 Feb 24
+*quickfix.txt*  For Vim version 7.0aa.  Last change: 2005 May 20
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -32,7 +32,7 @@ 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 |errorlist()| function.  Thus 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
@@ -122,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.
@@ -380,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"
@@ -515,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
@@ -534,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'
@@ -557,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.
 
 =============================================================================
@@ -600,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)
@@ -609,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
@@ -631,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
 
@@ -638,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
@@ -646,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.
@@ -655,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
@@ -748,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
@@ -758,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
@@ -777,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.
@@ -787,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.
 
@@ -873,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:
@@ -899,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:
@@ -949,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".
 
 =============================================================================
@@ -1011,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
@@ -1025,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%.%#,
@@ -1064,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 Apr 01
 
 
 		  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
@@ -750,6 +751,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
@@ -1169,7 +1171,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/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: 2005 Feb 26
+*repeat.txt*    For Vim version 7.0aa.  Last change: 2005 Apr 01
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -176,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.
 
@@ -572,7 +572,8 @@ It is only included when Vim was compiled with "huge" features.
 		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.
+		will also be profiled.  But only if the script is loaded after
+		this command.
 
 
 You must always start with a ":profile start fname" command.  The resulting
@@ -632,5 +633,7 @@ mind there are various things that may clobber the results:
 	:   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: 2005 Feb 10
+*scroll.txt*    For Vim version 7.0aa.  Last change: 2005 Apr 01
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -265,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,314 @@
+*spell.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 24
+
+
+		  VIM REFERENCE MANUAL	  by Bram Moolenaar
+
+
+Spell checking						*spell*
+
+1. Quick start			|spell-quickstart|
+2. Generating a spell file	|spell-mkspell|
+9. 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
+	SpellRare	rare word
+	SpellLocal	wrong spelling for selected region
+
+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.
+			This uses the @Spell and @NoSpell clusters from syntax
+			highlighting, see |spell-syntax|.
+
+							*[s*
+[s			Like "]s" but search backwards, find the misspelled
+			word before the cursor.
+
+							*]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.
+
+
+PERFORMANCE
+
+Note that Vim does on-the-fly spellchecking.  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 noticable delay when the word list is loaded,
+which happens when 'spelllang' is set.  Each word list is only loaded once,
+they are not deleted when 'spelllang' is made empty.  When 'encoding' is set
+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.
+
+Always use lowercase letters for the language and region names.
+
+
+SPELL FILES
+
+Vim searches for spell files in the "spell" subdirectory of the directories in
+'runtimepath'.  The name is: LL-XXX.EEE.spl, where:
+	LL	the language name
+	-XXX	optional addition
+	EEE	the value of 'encoding'
+
+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.
+
+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'.
+
+A word that starts with a digit is always ignored.
+
+
+SYNTAX HIGHLIGHTING					*spell-syntax*
+
+Files that use syntax highlighting can specify where spell checking should be
+done:
+
+   everywhere			   default
+   in specific items		   use "contains=@Spell"
+   everywhere but specific items   use "contains=@NoSpell"
+
+Note that mixing @Spell and @NoSpell doesn't make sense.
+
+==============================================================================
+2. 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.
+
+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
+
+:mksp[ell] [-ascii] {outname} {inname} ...		*:mksp* *:mkspell*
+			Generate spell file {outname}.spl from Myspell files
+			{inname}.aff and {inname}.dic.
+			When the [-ascii] argument is present, words with
+			non-ascii characters are skipped.  The resulting file
+			ends in "ascii.spl".  Otherwise the resulting file
+			ends in "ENC.spl", where ENC is the value of
+			'encoding'.
+			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*
+
+Since you might want to change the 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. Set 'encoding' to the desired encoding and use |:mkspell| to generate the
+   Vim spell file.
+5. Try out the spell file with ":set spell spelllang=xx_YY".
+
+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.
+
+==============================================================================
+9. 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 need not to be highlighted.
+Names will not appear in a dictionary, but do appear in a word list.  And
+some old words are rarely used and are common misspellings.  These do appear
+in a dictionary but not in a word list.
+
+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-wordlist-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.  *E760*
+
+What follows is one word per line.  There should be no white space 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 same 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
+
+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.
+
+							*spell-affix-vim*
+A flag that Vim adds and is not in Myspell is the "=" flag.  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:
+
+	word list	matches			does not match ~
+	's morgens/=	's morgens		'S morgens 's Morgens
+	's Morgens	's Morgens		'S morgens 's morgens
+
+							*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.
+
+Performance hint: Although using affixes reduces the number of words, it
+reduces the speed.  It's a good idea to put all the often used words in the
+word list with the affixes prepended/appended.
+
+							*spell-affix-chars*
+The affix file should define the word characters when using an 8-bit encoding
+(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*
+Three lines in the affix file are needed.  Simplistic example:
+
+	FOL  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+	LOW  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+	UPP  <20><><EFBFBD><EFBFBD><EFBFBD><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*
+All spell files for the same encoding must use the same word characters,
+otherwise they can't be combined without errors.  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.
+
+
+ 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 Feb 19
+*starting.txt*  For Vim version 7.0aa.  Last change: 2005 Apr 18
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -281,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
@@ -294,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).
@@ -373,7 +373,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|.
@@ -428,7 +428,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.
@@ -764,10 +764,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) (*)
@@ -775,8 +776,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|.

runtime/doc/syntax.txt

@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 7.0aa.  Last change: 2005 Feb 21
+*syntax.txt*	For Vim version 7.0aa.  Last change: 2005 May 18
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -399,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
@@ -520,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')
 
@@ -737,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
@@ -763,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.
 
@@ -771,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
@@ -801,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
 
@@ -850,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
 
@@ -861,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
@@ -876,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
 
@@ -886,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
@@ -919,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
 
@@ -965,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")
@@ -1012,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 ~
@@ -1039,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.
@@ -1070,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
@@ -1082,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")
@@ -1102,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 >
@@ -1112,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
@@ -1170,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|).
@@ -1179,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
@@ -1198,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 >
@@ -1215,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.
 
@@ -1233,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
@@ -1276,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):
 
@@ -1358,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
 
@@ -1366,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: >
@@ -1374,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
@@ -1388,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
@@ -1478,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: >
@@ -1497,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: >
@@ -1519,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
@@ -1530,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
@@ -1579,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
@@ -1604,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: >
 
@@ -1648,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
@@ -1656,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
@@ -1684,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: >
 
@@ -1693,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
@@ -1732,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.
@@ -1756,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: >
 
@@ -1825,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|;
@@ -1835,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. >
@@ -1920,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
@@ -2066,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: >
@@ -2088,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
@@ -2113,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
@@ -2151,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
 
@@ -2199,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>.
@@ -2289,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.
 
@@ -2300,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.
 
@@ -2328,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
@@ -2340,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.
 
 
@@ -2364,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? ~
@@ -2461,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
@@ -2607,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"
@@ -2663,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
@@ -3632,6 +3641,7 @@ term={attr-list}			*attr-list* *highlight-term* *E418*
 	following items (in any order):
 		bold
 		underline
+		undercurl	not always available
 		reverse
 		inverse		same as reverse
 		italic
@@ -3640,6 +3650,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*
@@ -3732,7 +3745,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
@@ -3795,8 +3808,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
@@ -3825,8 +3840,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
 <
@@ -3887,6 +3902,17 @@ 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-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*
@@ -3907,7 +3933,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
@@ -4134,14 +4160,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/tags

@@ -59,11 +59,13 @@ $VIMRUNTIME	starting.txt	/*$VIMRUNTIME*
 'backupskip'	options.txt	/*'backupskip'*
 'balloondelay'	options.txt	/*'balloondelay'*
 'ballooneval'	options.txt	/*'ballooneval'*
+'balloonexpr'	options.txt	/*'balloonexpr'*
 'bdir'	options.txt	/*'bdir'*
 'bdlay'	options.txt	/*'bdlay'*
 'beautify'	vi_diff.txt	/*'beautify'*
 'beval'	options.txt	/*'beval'*
 'bex'	options.txt	/*'bex'*
+'bexpr'	options.txt	/*'bexpr'*
 'bf'	vi_diff.txt	/*'bf'*
 'bg'	options.txt	/*'bg'*
 'bh'	options.txt	/*'bh'*
@@ -351,6 +353,7 @@ $VIMRUNTIME	starting.txt	/*$VIMRUNTIME*
 'maxfuncdepth'	options.txt	/*'maxfuncdepth'*
 'maxmapdepth'	options.txt	/*'maxmapdepth'*
 'maxmem'	options.txt	/*'maxmem'*
+'maxmempattern'	options.txt	/*'maxmempattern'*
 'maxmemtot'	options.txt	/*'maxmemtot'*
 'mef'	options.txt	/*'mef'*
 'menuitems'	options.txt	/*'menuitems'*
@@ -362,6 +365,7 @@ $VIMRUNTIME	starting.txt	/*$VIMRUNTIME*
 'mls'	options.txt	/*'mls'*
 'mm'	options.txt	/*'mm'*
 'mmd'	options.txt	/*'mmd'*
+'mmp'	options.txt	/*'mmp'*
 'mmt'	options.txt	/*'mmt'*
 'mod'	options.txt	/*'mod'*
 'modeline'	options.txt	/*'modeline'*
@@ -544,6 +548,7 @@ $VIMRUNTIME	starting.txt	/*$VIMRUNTIME*
 'nosmd'	options.txt	/*'nosmd'*
 'nosn'	options.txt	/*'nosn'*
 'nosol'	options.txt	/*'nosol'*
+'nospell'	options.txt	/*'nospell'*
 'nosplitbelow'	options.txt	/*'nosplitbelow'*
 'nosplitright'	options.txt	/*'nosplitright'*
 'nospr'	options.txt	/*'nospr'*
@@ -723,6 +728,9 @@ $VIMRUNTIME	starting.txt	/*$VIMRUNTIME*
 'sol'	options.txt	/*'sol'*
 'sourceany'	vi_diff.txt	/*'sourceany'*
 'sp'	options.txt	/*'sp'*
+'spell'	options.txt	/*'spell'*
+'spelllang'	options.txt	/*'spelllang'*
+'spl'	options.txt	/*'spl'*
 'splitbelow'	options.txt	/*'splitbelow'*
 'splitright'	options.txt	/*'splitright'*
 'spr'	options.txt	/*'spr'*
@@ -763,7 +771,9 @@ $VIMRUNTIME	starting.txt	/*$VIMRUNTIME*
 't_AL'	term.txt	/*'t_AL'*
 't_CS'	term.txt	/*'t_CS'*
 't_CV'	term.txt	/*'t_CV'*
+'t_Ce'	term.txt	/*'t_Ce'*
 't_Co'	term.txt	/*'t_Co'*
+'t_Cs'	term.txt	/*'t_Cs'*
 't_DL'	term.txt	/*'t_DL'*
 't_EI'	term.txt	/*'t_EI'*
 't_F1'	term.txt	/*'t_F1'*
@@ -1065,6 +1075,7 @@ $VIMRUNTIME	starting.txt	/*$VIMRUNTIME*
 +perl	various.txt	/*+perl*
 +postscript	various.txt	/*+postscript*
 +printer	various.txt	/*+printer*
++profile	various.txt	/*+profile*
 +python	various.txt	/*+python*
 +quickfix	various.txt	/*+quickfix*
 +rightleft	various.txt	/*+rightleft*
@@ -1573,6 +1584,7 @@ $VIMRUNTIME	starting.txt	/*$VIMRUNTIME*
 45.3	usr_45.txt	/*45.3*
 45.4	usr_45.txt	/*45.4*
 45.5	usr_45.txt	/*45.5*
+755	spell.txt	/*755*
 90.1	usr_90.txt	/*90.1*
 90.2	usr_90.txt	/*90.2*
 90.3	usr_90.txt	/*90.3*
@@ -2118,6 +2130,8 @@ $VIMRUNTIME	starting.txt	/*$VIMRUNTIME*
 :mkexrc	starting.txt	/*:mkexrc*
 :mks	starting.txt	/*:mks*
 :mksession	starting.txt	/*:mksession*
+:mksp	spell.txt	/*:mksp*
+:mkspell	spell.txt	/*:mkspell*
 :mkv	starting.txt	/*:mkv*
 :mkvie	starting.txt	/*:mkvie*
 :mkview	starting.txt	/*:mkview*
@@ -2383,6 +2397,8 @@ $VIMRUNTIME	starting.txt	/*$VIMRUNTIME*
 :sno	change.txt	/*:sno*
 :snomagic	change.txt	/*:snomagic*
 :so	repeat.txt	/*:so*
+:sor	change.txt	/*:sor*
+:sort	change.txt	/*:sort*
 :source	repeat.txt	/*:source*
 :source_crnl	repeat.txt	/*:source_crnl*
 :sp	windows.txt	/*:sp*
@@ -2770,6 +2786,7 @@ $VIMRUNTIME	starting.txt	/*$VIMRUNTIME*
 <register>	map.txt	/*<register>*
 <sfile>	cmdline.txt	/*<sfile>*
 <xCSI>	intro.txt	/*<xCSI>*
+<xDown>	term.txt	/*<xDown>*
 <xEnd>	term.txt	/*<xEnd>*
 <xEnd>-xterm	term.txt	/*<xEnd>-xterm*
 <xF1>	term.txt	/*<xF1>*
@@ -2782,6 +2799,9 @@ $VIMRUNTIME	starting.txt	/*$VIMRUNTIME*
 <xF4>-xterm	term.txt	/*<xF4>-xterm*
 <xHome>	term.txt	/*<xHome>*
 <xHome>-xterm	term.txt	/*<xHome>-xterm*
+<xLeft>	term.txt	/*<xLeft>*
+<xRight>	term.txt	/*<xRight>*
+<xUp>	term.txt	/*<xUp>*
 =	change.txt	/*=*
 ==	change.txt	/*==*
 >	change.txt	/*>*
@@ -3249,9 +3269,8 @@ E358	options.txt	/*E358*
 E359	term.txt	/*E359*
 E36	windows.txt	/*E36*
 E360	various.txt	/*E360*
-E361	pattern.txt	/*E361*
 E362	term.txt	/*E362*
-E363	pattern.txt	/*E363*
+E363	options.txt	/*E363*
 E364	eval.txt	/*E364*
 E365	print.txt	/*E365*
 E366	options.txt	/*E366*
@@ -3674,7 +3693,15 @@ E748	repeat.txt	/*E748*
 E749	eval.txt	/*E749*
 E75	vi_diff.txt	/*E75*
 E750	repeat.txt	/*E750*
+E754	spell.txt	/*E754*
+E756	spell.txt	/*E756*
+E758	spell.txt	/*E758*
+E759	spell.txt	/*E759*
 E76	pattern.txt	/*E76*
+E760	spell.txt	/*E760*
+E761	spell.txt	/*E761*
+E762	spell.txt	/*E762*
+E763	spell.txt	/*E763*
 E77	message.txt	/*E77*
 E78	motion.txt	/*E78*
 E79	message.txt	/*E79*
@@ -3966,6 +3993,7 @@ ZZ	editing.txt	/*ZZ*
 [I	tagsrch.txt	/*[I*
 [M	motion.txt	/*[M*
 [P	change.txt	/*[P*
+[S	spell.txt	/*[S*
 [[	motion.txt	/*[[*
 []	motion.txt	/*[]*
 [_CTRL-D	tagsrch.txt	/*[_CTRL-D*
@@ -3981,6 +4009,7 @@ ZZ	editing.txt	/*ZZ*
 [pattern]	pattern.txt	/*[pattern]*
 [quotex]	intro.txt	/*[quotex]*
 [range]	cmdline.txt	/*[range]*
+[s	spell.txt	/*[s*
 [star	motion.txt	/*[star*
 [z	fold.txt	/*[z*
 [{	motion.txt	/*[{*
@@ -3995,6 +4024,7 @@ ZZ	editing.txt	/*ZZ*
 ]I	tagsrch.txt	/*]I*
 ]M	motion.txt	/*]M*
 ]P	change.txt	/*]P*
+]S	spell.txt	/*]S*
 ][	motion.txt	/*][*
 ]]	motion.txt	/*]]*
 ]_CTRL-D	tagsrch.txt	/*]_CTRL-D*
@@ -4006,6 +4036,7 @@ ZZ	editing.txt	/*ZZ*
 ]i	tagsrch.txt	/*]i*
 ]m	motion.txt	/*]m*
 ]p	change.txt	/*]p*
+]s	spell.txt	/*]s*
 ]star	motion.txt	/*]star*
 ]z	fold.txt	/*]z*
 ]}	motion.txt	/*]}*
@@ -4182,11 +4213,17 @@ beos-timeout	os_beos.txt	/*beos-timeout*
 beos-unicode	os_beos.txt	/*beos-unicode*
 beos-utf8	os_beos.txt	/*beos-utf8*
 beos-vimdir	os_beos.txt	/*beos-vimdir*
+beval_bufnr-variable	eval.txt	/*beval_bufnr-variable*
+beval_col-variable	eval.txt	/*beval_col-variable*
+beval_lnum-variable	eval.txt	/*beval_lnum-variable*
+beval_text-variable	eval.txt	/*beval_text-variable*
+beval_winnr-variable	eval.txt	/*beval_winnr-variable*
 blockwise-examples	visual.txt	/*blockwise-examples*
 blockwise-operators	visual.txt	/*blockwise-operators*
 blockwise-register	change.txt	/*blockwise-register*
 blockwise-visual	visual.txt	/*blockwise-visual*
 book	intro.txt	/*book*
+bookmark	usr_03.txt	/*bookmark*
 boolean	options.txt	/*boolean*
 break-finally	eval.txt	/*break-finally*
 browse()	eval.txt	/*browse()*
@@ -4557,6 +4594,7 @@ design-not	develop.txt	/*design-not*
 design-speed-size	develop.txt	/*design-speed-size*
 desktop-syntax	syntax.txt	/*desktop-syntax*
 desktop.vim	syntax.txt	/*desktop.vim*
+develop-spell	develop.txt	/*develop-spell*
 develop.txt	develop.txt	/*develop.txt*
 development	develop.txt	/*development*
 dh	change.txt	/*dh*
@@ -4667,7 +4705,6 @@ errorformat-javac	quickfix.txt	/*errorformat-javac*
 errorformat-multi-line	quickfix.txt	/*errorformat-multi-line*
 errorformat-separate-filename	quickfix.txt	/*errorformat-separate-filename*
 errorformats	quickfix.txt	/*errorformats*
-errorlist()	eval.txt	/*errorlist()*
 escape	intro.txt	/*escape*
 escape()	eval.txt	/*escape()*
 escape-bar	version4.txt	/*escape-bar*
@@ -4782,9 +4819,12 @@ faq	intro.txt	/*faq*
 farsi	farsi.txt	/*farsi*
 farsi.txt	farsi.txt	/*farsi.txt*
 fasm.vim	syntax.txt	/*fasm.vim*
+fcs_choice-variable	eval.txt	/*fcs_choice-variable*
+fcs_reason-variable	eval.txt	/*fcs_reason-variable*
 feature-list	eval.txt	/*feature-list*
 fetch	pi_netrw.txt	/*fetch*
 file-browser-5.2	version5.txt	/*file-browser-5.2*
+file-explorer	pi_netrw.txt	/*file-explorer*
 file-formats	editing.txt	/*file-formats*
 file-pattern	autocmd.txt	/*file-pattern*
 file-read	insert.txt	/*file-read*
@@ -4953,6 +4993,7 @@ getfsize()	eval.txt	/*getfsize()*
 getftime()	eval.txt	/*getftime()*
 getftype()	eval.txt	/*getftype()*
 getline()	eval.txt	/*getline()*
+getqflist()	eval.txt	/*getqflist()*
 getreg()	eval.txt	/*getreg()*
 getregtype()	eval.txt	/*getregtype()*
 getwinposx()	eval.txt	/*getwinposx()*
@@ -5097,6 +5138,7 @@ highlight-groups	syntax.txt	/*highlight-groups*
 highlight-gui	syntax.txt	/*highlight-gui*
 highlight-guibg	syntax.txt	/*highlight-guibg*
 highlight-guifg	syntax.txt	/*highlight-guifg*
+highlight-guisp	syntax.txt	/*highlight-guisp*
 highlight-start	syntax.txt	/*highlight-start*
 highlight-stop	syntax.txt	/*highlight-stop*
 highlight-term	syntax.txt	/*highlight-term*
@@ -5135,6 +5177,9 @@ hl-Scrollbar	syntax.txt	/*hl-Scrollbar*
 hl-Search	syntax.txt	/*hl-Search*
 hl-SignColumn	syntax.txt	/*hl-SignColumn*
 hl-SpecialKey	syntax.txt	/*hl-SpecialKey*
+hl-SpellBad	syntax.txt	/*hl-SpellBad*
+hl-SpellLocal	syntax.txt	/*hl-SpellLocal*
+hl-SpellRare	syntax.txt	/*hl-SpellRare*
 hl-StatusLine	syntax.txt	/*hl-StatusLine*
 hl-StatusLineNC	syntax.txt	/*hl-StatusLineNC*
 hl-Title	syntax.txt	/*hl-Title*
@@ -5506,6 +5551,7 @@ matchend()	eval.txt	/*matchend()*
 matchit-install	usr_05.txt	/*matchit-install*
 matchlist()	eval.txt	/*matchlist()*
 matchstr()	eval.txt	/*matchstr()*
+mathematica-syntax	syntax.txt	/*mathematica-syntax*
 max()	eval.txt	/*max()*
 mbyte-IME	mbyte.txt	/*mbyte-IME*
 mbyte-XIM	mbyte.txt	/*mbyte-XIM*
@@ -5535,6 +5581,8 @@ minimal-features	os_msdos.txt	/*minimal-features*
 missing-options	vi_diff.txt	/*missing-options*
 mkdir()	eval.txt	/*mkdir()*
 mlang.txt	mlang.txt	/*mlang.txt*
+mma-syntax	syntax.txt	/*mma-syntax*
+mma.vim	syntax.txt	/*mma.vim*
 mode()	eval.txt	/*mode()*
 mode-Ex	intro.txt	/*mode-Ex*
 mode-cmdline	cmdline.txt	/*mode-cmdline*
@@ -5593,6 +5641,7 @@ mzscheme	if_mzsch.txt	/*mzscheme*
 mzscheme-buffer	if_mzsch.txt	/*mzscheme-buffer*
 mzscheme-commands	if_mzsch.txt	/*mzscheme-commands*
 mzscheme-examples	if_mzsch.txt	/*mzscheme-examples*
+mzscheme-sandbox	if_mzsch.txt	/*mzscheme-sandbox*
 mzscheme-threads	if_mzsch.txt	/*mzscheme-threads*
 mzscheme-vim	if_mzsch.txt	/*mzscheme-vim*
 mzscheme-vimext	if_mzsch.txt	/*mzscheme-vimext*
@@ -5704,6 +5753,7 @@ new-commands	version5.txt	/*new-commands*
 new-commands-5.4	version5.txt	/*new-commands-5.4*
 new-debug-itf	version6.txt	/*new-debug-itf*
 new-debug-mode	version6.txt	/*new-debug-mode*
+new-debug-support	version7.txt	/*new-debug-support*
 new-diff-mode	version6.txt	/*new-diff-mode*
 new-encryption	version5.txt	/*new-encryption*
 new-evim	version6.txt	/*new-evim*
@@ -5740,6 +5790,7 @@ new-script-5.4	version5.txt	/*new-script-5.4*
 new-search-path	version6.txt	/*new-search-path*
 new-searchpat	version6.txt	/*new-searchpat*
 new-session-files	version5.txt	/*new-session-files*
+new-spell	version7.txt	/*new-spell*
 new-unlisted-buffers	version6.txt	/*new-unlisted-buffers*
 new-user-defined	version5.txt	/*new-user-defined*
 new-user-manual	version6.txt	/*new-user-manual*
@@ -5901,6 +5952,7 @@ printing	print.txt	/*printing*
 printing-formfeed	print.txt	/*printing-formfeed*
 profile	repeat.txt	/*profile*
 profiling	repeat.txt	/*profiling*
+profiling-variable	eval.txt	/*profiling-variable*
 progname-variable	eval.txt	/*progname-variable*
 progress-syntax	syntax.txt	/*progress-syntax*
 progress.vim	syntax.txt	/*progress.vim*
@@ -6143,6 +6195,7 @@ set-option	options.txt	/*set-option*
 setbufvar()	eval.txt	/*setbufvar()*
 setcmdpos()	eval.txt	/*setcmdpos()*
 setline()	eval.txt	/*setline()*
+setqflist()	eval.txt	/*setqflist()*
 setreg()	eval.txt	/*setreg()*
 setting-guifont	gui.txt	/*setting-guifont*
 setwinvar()	eval.txt	/*setwinvar()*
@@ -6175,6 +6228,7 @@ sniff-commands	if_sniff.txt	/*sniff-commands*
 sniff-compiling	if_sniff.txt	/*sniff-compiling*
 sniff-intro	if_sniff.txt	/*sniff-intro*
 sort()	eval.txt	/*sort()*
+sorting	change.txt	/*sorting*
 space	intro.txt	/*space*
 spec-customizing	pi_spec.txt	/*spec-customizing*
 spec-how-to-use-it	pi_spec.txt	/*spec-how-to-use-it*
@@ -6185,6 +6239,16 @@ spec_chglog_prepend	pi_spec.txt	/*spec_chglog_prepend*
 spec_chglog_release_info	pi_spec.txt	/*spec_chglog_release_info*
 special-buffers	windows.txt	/*special-buffers*
 speed-up	tips.txt	/*speed-up*
+spell	spell.txt	/*spell*
+spell-affix-chars	spell.txt	/*spell-affix-chars*
+spell-affix-mbyte	spell.txt	/*spell-affix-mbyte*
+spell-affix-vim	spell.txt	/*spell-affix-vim*
+spell-file-format	spell.txt	/*spell-file-format*
+spell-mkspell	spell.txt	/*spell-mkspell*
+spell-quickstart	spell.txt	/*spell-quickstart*
+spell-syntax	spell.txt	/*spell-syntax*
+spell-wordlist-format	spell.txt	/*spell-wordlist-format*
+spell.txt	spell.txt	/*spell.txt*
 split()	eval.txt	/*split()*
 splitfind	windows.txt	/*splitfind*
 splitview	windows.txt	/*splitview*
@@ -6234,6 +6298,7 @@ style-names	develop.txt	/*style-names*
 style-spaces	develop.txt	/*style-spaces*
 style-various	develop.txt	/*style-various*
 sub-menu-priority	gui.txt	/*sub-menu-priority*
+sub-replace-\=	change.txt	/*sub-replace-\\=*
 sub-replace-expression	change.txt	/*sub-replace-expression*
 sub-replace-special	change.txt	/*sub-replace-special*
 submatch()	eval.txt	/*submatch()*
@@ -6280,7 +6345,9 @@ t_AF	term.txt	/*t_AF*
 t_AL	term.txt	/*t_AL*
 t_CS	term.txt	/*t_CS*
 t_CV	term.txt	/*t_CV*
+t_Ce	term.txt	/*t_Ce*
 t_Co	term.txt	/*t_Co*
+t_Cs	term.txt	/*t_Cs*
 t_DL	term.txt	/*t_DL*
 t_EI	term.txt	/*t_EI*
 t_F1	term.txt	/*t_F1*
@@ -6436,6 +6503,7 @@ tag-search	tagsrch.txt	/*tag-search*
 tag-security	tagsrch.txt	/*tag-security*
 tag-skip-file	tagsrch.txt	/*tag-skip-file*
 tag-stack	tagsrch.txt	/*tag-stack*
+taglist()	eval.txt	/*taglist()*
 tags	tagsrch.txt	/*tags*
 tags-and-searches	tagsrch.txt	/*tags-and-searches*
 tags-file-changed	version5.txt	/*tags-file-changed*
@@ -6610,6 +6678,11 @@ utf-8-in-xwindows	mbyte.txt	/*utf-8-in-xwindows*
 utf-8-typing	mbyte.txt	/*utf-8-typing*
 utf8	mbyte.txt	/*utf8*
 v	visual.txt	/*v*
+v:beval_bufnr	eval.txt	/*v:beval_bufnr*
+v:beval_col	eval.txt	/*v:beval_col*
+v:beval_lnum	eval.txt	/*v:beval_lnum*
+v:beval_text	eval.txt	/*v:beval_text*
+v:beval_winnr	eval.txt	/*v:beval_winnr*
 v:charconvert_from	eval.txt	/*v:charconvert_from*
 v:charconvert_to	eval.txt	/*v:charconvert_to*
 v:cmdarg	eval.txt	/*v:cmdarg*
@@ -6620,6 +6693,8 @@ v:ctype	eval.txt	/*v:ctype*
 v:dying	eval.txt	/*v:dying*
 v:errmsg	eval.txt	/*v:errmsg*
 v:exception	eval.txt	/*v:exception*
+v:fcs_choice	eval.txt	/*v:fcs_choice*
+v:fcs_reason	eval.txt	/*v:fcs_reason*
 v:fname_diff	eval.txt	/*v:fname_diff*
 v:fname_in	eval.txt	/*v:fname_in*
 v:fname_new	eval.txt	/*v:fname_new*
@@ -6634,6 +6709,7 @@ v:lang	eval.txt	/*v:lang*
 v:lc_time	eval.txt	/*v:lc_time*
 v:lnum	eval.txt	/*v:lnum*
 v:prevcount	eval.txt	/*v:prevcount*
+v:profiling	eval.txt	/*v:profiling*
 v:progname	eval.txt	/*v:progname*
 v:register	eval.txt	/*v:register*
 v:servername	eval.txt	/*v:servername*
@@ -6960,6 +7036,7 @@ xterm-copy-paste	term.txt	/*xterm-copy-paste*
 xterm-cursor-keys	term.txt	/*xterm-cursor-keys*
 xterm-end-home-keys	term.txt	/*xterm-end-home-keys*
 xterm-function-keys	term.txt	/*xterm-function-keys*
+xterm-modifier-keys	term.txt	/*xterm-modifier-keys*
 xterm-mouse	options.txt	/*xterm-mouse*
 xterm-mouse-wheel	scroll.txt	/*xterm-mouse-wheel*
 xterm-save-screen	tips.txt	/*xterm-save-screen*

runtime/doc/tagsrch.txt

@@ -1,4 +1,4 @@
-*tagsrch.txt*   For Vim version 7.0aa.  Last change: 2005 Feb 14
+*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*

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 Mar 14
 
 
 		  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'*

runtime/doc/tips.txt

@@ -1,4 +1,4 @@
-*tips.txt*      For Vim version 7.0aa.  Last change: 2005 Feb 23
+*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:
 
@@ -259,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!
@@ -339,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/todo.txt

@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Feb 27
+*todo.txt*      For Vim version 7.0aa.  Last change: 2005 May 25
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,47 +30,36 @@ be worked on, but only if you sponsor Vim development.  See |sponsor|.
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-Win32 gettimeofday():
-Or use QueryPerformanceCounter() and QueryPerformanceFrequency()
-int gettimeofday (struct timeval *tv, void* tz)
-     {
-     union {
-     LONG_LONG ns100; /*time since 1 Jan 1601 in 100ns units */
-     FILETIME ft;
-     } now;
-    >
-     GetSystemTimeAsFileTime (&now.ft);
-     tv->tv_usec = (long) ((now.ns100 / 10LL) % 1000000LL);
-     tv->tv_sec = (long) ((now.ns100 - 116444736000000000LL) / 10000000LL);
-     return (0);
-     } 
-Or use GetSystemTime().
-Or:
-  unsigned long Ticks = 0;
-  unsigned long Sec =0;
-  unsigned long Usec = 0;
-  Ticks = timeGetTime();
+GTK: Hang for "gvim </tmp/tt >&/tmp/ttt".  Ready to read char from stdin but
+it's never read.
+Namsh also has a problem with a hang, coming from the added char_avail() call.
+Temporary fix: check "gui.starting".
 
-  Sec = Ticks/1000;
-  Usec = (Ticks - (Sec*1000))*1000;
-  tp->tv_sec = Sec;
-  tp->tv_usec = Usec;
+Make option like 'verbose' that writes output into a file?  Should make it
+possible to see what's happening without messing up the display.
 
-Test11 sometimes fails.  Must be a problem with fork() and pipes.
+Errors when compiling with Cygwin (Thomas).
 
-'sw' is sometimes 8 when using :vimgrep.
+":sort n" sort on decimal number (skipping white space)
+":sort x" sort on hex number
+":sort o" sort on octal number
+Docs: doesn't work well together with :global.
 
-Mingw can use setjmp()?  Move code from os_unix.c to common file, adjust
-#ifdefs.  Try with example from Michaelis.
+split(): splitting into chars doesn't work.
 
-Russian helpfile doesn't show up correctly when 'encoding' is koi8-r.
-(Vassily Ragosin 2005 Feb 16)
+":qtag" command: make list of matching tags and use like quickfix list.
+This changes the stack of quickfix lists.  Make another list and use ":qnext",
+":qprev", etc.?  Do allow other commands for quickfix list, such as quickfix
+window.
 
 Mac unicode patch (Da Woon Jung):
-- typing doesn't work
 - selecting proportional font breaks display
+- UTF-8 text causes display problems.  Font replacement causes this.
 
-Patch for gettags(). Yegappan Lakshmanan Feb 27
+Should we always set LC_CTYPE to "C", so that all library functions work on
+bytes?  Avoids problems with sprintf() on MS-Windows. (Yongwei)
+Problem noticed: tooltips are messed up.  Depends on the moment 'encoding' is
+changed.
 
 autoload:
 - Add a Vim script in $VIMRUNTIME/tools that takes a file with a list of
@@ -83,37 +72,76 @@ autoload:
     helpfile doc/myscript.txt
   For the "helpfile" item ":helptags" is run.
 
-Patch for 'balloonexpr' option.  Sergey Khorev, Feb 26.  Addition Feb 27.
+Win32: Balloon text can't contain line break.
+    Hints for multiline tooltips from Alexei Alexandrov (2005 Mar 26)
+    Patch from Sergey Khorev, 2005 Apr 11
+    Add has("balloon_multiline")
+
+Patch to alternate fold highlighting.  (Anthony Iano-Fletcher, 2005 May 12)
+More levels?
 
 Awaiting response:
 -   Patch for mch_FullName() also in Vim 6.3?  os_mswin.c
 -   Win32: tearoff menu window should have a scrollbar when it's taller than
     the screen.
 
+Patch for if_python to make exit work better with threads. (ugo)
+Still seems to fail 15% of the time.
+
 
 PLANNED FOR VERSION 7.0:
 
--   new DATA TYPES:
-	- None?  (or use empty string?)
-    See ~/vim/ideas.txt.
--   Add SPELLCHECKER, with easy to add support for many languages.
+-   Add SPELLCHECKER, with support for many languages.
+    - Use "engspchk" from Charles Campbell for ideas.
+    - Is it worth trying the trie structure (see code from Olaf Seibert, 2005
+      May 9)
+    - Spell checking code todo's:
+	- Implement user and project word lists.  Commands to add words and to
+	  mark words as wrong.
+	- Implement = flag in .dic: KEEPCASE for lower case word.
+	    's morgens/=  does not match 'S morgens
+	- Implement compound words?
+	- Make "en-rare" spell file.
+	  Convention: use en_US (language_region) and en-rare (language-field)
+          Add hl groups to 'spelllang'?
+	    :set spelllang=en_us,en-rare/SpellRare,en-math/SpellMath
+	- How about making suggestions?  Use an external program like aspell?
+	  Or include the myspell suggestion code in Vim?
+	- Some word lists are inefficient.  Remove affixes from a word when it
+	  results in another basic word.
+    - References MySpell library (in OpenOffice.org).
+	http://spellchecker.mozdev.org/source.html
+	http://whiteboard.openoffice.org/source/browse/whiteboard/lingucomponent/source/spellcheck/myspell/
+      author: Kevin Hendricks <kevin.hendricks@sympatico.ca>
+    - Alternative: use aspell library.
+      ispell is replaced by aspell, thus forget about ispell.
+    - More complicated: Regions with different languages?  E.g. comments in
+      English, strings in German (po file).
+    - Commands required:
+	add word to private dict: wrong and OK (in popup menu for evim)
+	    :spell good <word>	    zg
+	    :spell wrong <word>	    zw
+    - Update option window for 'spell' and 'spelllang'.
+    - Distribution: Need wordlists for many languages; "language pack"
+      Put them on the ftp site, ready to download.  Include README for
+      copyrights.
+    - Work together with OpenOffice.org to update the wordlists.  (Adri
+      Verhoef, Aad Nales)  Setup vim-spell maillist?
+    - Support for approximate-regexps will help with finding similar words
+      (agrep http://www.tgries.de/agrep/).
+    - Charles Campbell asks for method to add "contained" groups to
+      existing syntax items (to add @Spell).
+      Add ":syntax contains {pattern} add=@Spell" command?  A bit like ":syn
+      cluster" but change the contains list directly for matching syntax
+      items.
+    - Install spell files with src/main.aap.
+    Alternatives using ispell or aspell:
     8   Add spell checking.  Use "ispell -a" somehow.
 	~/vim/patches/wm_vim-5_4d.zip  can be used as an example (includes
 	ispell inside Vim).  Gautam Iyer has an example with "aspell".
-	"engspchk" from Charles Campbell is a good way.  Support for
-	approximate-regexps will help (agrep http://www.tgries.de/agrep/).
-	- Charles Campbell asks for method to add "contained" groups to
-	  existing syntax items (to add @Spell).  Add ":syntax contains
-	  {pattern} add=@Spell" command?  A bit like ":syn cluster" but change
-	  the contains list directly for matching syntax items.
-        - Keep wordlist in syntax group, load it only once and use it several
-	  times later.  Sort of global syntax items.
-	- Use wordlists from openoffice (myspell).  Work together with them to
-	  update the wordlist.  (Adri Verhoef, Aad Nales)
-	- Patch from Marcin Dalecki. (2004 Dec)  Uses ispell
-	  implements "undercurl" attribute.  But how to set its color?
-	  Perhaps use "guicurl=Red" instead?
-	  If underline and undercurl are both there use undercurl only.
+    Patch from Marcin Dalecki, uses pipe to aspell.
+
+
 -   REFACTORING: The main() function is very long.  Move parts to separate
     functions, especially loops.  Ideas from Walter Briscoe (2003 Apr 3, 2004
     Feb 9).
@@ -127,10 +155,13 @@ PLANNED FOR VERSION 7.0:
     like commands.
 -   "INTELLISENSE".  First cleanup the Insert-mode completion.
 	http://www.vim.org/scripts/script.php?script_id=747
+	www.vim.org script 1213 (Java Development Environment) (Fuchuan Wang)
 	http://sourceforge.net/projects/insenvim
 	    of http://insenvim.sourceforge.net
 	http://cedet.sourceforge.net/intellisense.shtml (for Emacs)
 	Ivan Villanueva has something for Java.
+	Ideas from Emads:
+	    http://www.xref-tech.com/xrefactory/more_c_completion.html
     Can't call it Intellisense, it is a trademark by Microsoft.
     Ideas from the Vim 7 BOF at SANE:
     - It's not possible to have one solution for all languages.  Design an
@@ -138,6 +169,7 @@ PLANNED FOR VERSION 7.0:
       Vim-script list.
     - For interpreted languages, use the interpreter to obtain information.
       Should work for Java (Eclipse does this), Python, Tcl, etc.
+      Richard Emberson mentioned working on an interface to Java.
     - Check Readline for its completion interface.
     - Use ctags for other languages.  Writing a file could trigger running
       ctags, merging the tags of the changed file.
@@ -211,10 +243,6 @@ PLANNED FOR VERSION 7.0:
 	screen has not yet been allocated with the new size.
 -   Running a shell command from the GUI still has limitations.  Look into how
     the Vim shell project can help: http://vimshell.wana.at
-8   When a file is change outside of Vim and unmodified in Vim there is no
-    simple way to automatically reload the file.  Either add an option for
-    this or make it simple to have the FileChangedShell invoke the normal
-    action, telling it what to do.
 -   Displaying size of Visual area: use 24-33 column display.
     When selecting multiple lines, up to about a screenfull, also count the
     characters.
@@ -240,6 +268,21 @@ PLANNED FOR VERSION 7.0:
 -   In a :s command multi-byte characters should also be upper/lower cased
     with \u, \U, etc.
 
+Adjust src/main.aap for installing manpages like in Makefile.
+
+Also generate the .pdb file that can be used to generate a useful crash report
+on MS-Windows. (George Reilly)
+
+Add strtol() to avoid the problems with leading zero causing octal conversion.
+
+Try new POSIX tests, made after my comments. (Geoff Clare, 2005 April 7)
+Before April 23 if possible.
+
+Add a 'tool' window: behaves like a preview window but there can be several.
+Don't count it in only_one_window(). (Alexei Alexandrov)
+
+Win32: Patch for Korean IME. (Yusung, 2005 March 21)
+
 Support ":set syntax=cpp.doxygen"?  Suggested patch by Michael Geddes (9 Aug
 2004).  Should also work for 'filetype'.
 
@@ -288,14 +331,6 @@ Updated Ruby interface. (Ryan Paul)
 
 Awaiting updated patches:
     --- awaiting updated patch ---
-    7   Add patch from Wall for this one ( ~/Mail/oldmail/wall/in.00019 ):
-	'flipcase' variable: upper/lowercase pairs.
-	Insert comma's between pairs and allow a range, make it look like
-	'isfname'.  E.g. ":set flipcase=a-zA-Z,xX,23-33:143-153".  The colon to
-	separate the from and to part is optional.
-	Resp: no time now.
-    8   Add GTK 2.3 file dialog support.  Patch by Grahame Bowland, 2004 Mar
-	15, but it doesn't use "initdir" or "dflt". (will update patch)
     8   Add ":n" to fnamemodify(): normalize path, remove "../" when possible.
 	Aric Blumer has a patch for this.
 	He will update the patch for 6.3.
@@ -353,12 +388,6 @@ Awaiting updated patches:
 	done for filetype detection.  Patch from Walter Briscoe, 2003 Jul 1.
     7   Add a "-@ filelist" argument: read file names from a file. (David
 	Kotchan has a patch for it)
-    8   Add term entries for function keys on xterm with alt and ctrl (new in
-	pl 94).  E.g., Control adds ";5" in "<Esc>[20;5~".  Find a generic way
-	to prepend a modifier in console mode, to avoid having to specify each
-	individual modified key.
-	Steve Wall has a patch (2002 Mar 12) for adding function keys up to 37,
-	with modifiers.
     8   Include a connection to an external program through a pipe?  See
 	patches from Felbinger for a mathematica interface.
 	Or use emacs server kind of thing?
@@ -378,6 +407,8 @@ Awaiting updated patches:
     -	For GUI Find/Replace dialog support using a regexp.  Patch for Motif
 	and GTK by degreneir (nov 10 and nov 18).
 
+Patch for "paranoid mode" by Kevin Collins, March 7.  Needs much more work.
+
 Check if file explorer can handle directory names and links with a single
 quote. (Nieko Maatjes, 2005 Jan 4)
 
@@ -391,7 +422,7 @@ Vi incompatibility:
     Also: A mark is lost after: make change, undo, redo and undo.
     Example: "{d''" then "u" then "d''": deletes an extra line, because the ''
     position is one line down. (Veselinovic)
-8   ":change" in a single-line file adds an empty line. When the file used to
+8   ":change" in a single-line file adds an empty line.  When the file used to
     be longer a "~" line is displayed, but there really is an empty line.
     (Haakon Riiser, 2003 Dec 3 and Dec 16)
 8   ":append" and ":insert" in an empty file add an extra empty line. (Haakon
@@ -579,7 +610,7 @@ Athena and Motif:
     wrong.
 9   XIM is disabled by default for SGI/IRIX.  Fix XIM so that 'imdisable' can
     be off by default.
-9   XIM doesn't work properly for Athena/Motif. (Yasuhiro Matsumoto) For now,
+9   XIM doesn't work properly for Athena/Motif. (Yasuhiro Matsumoto)  For now,
     keep XIM active at all times when the input method has the preediting
     flag.
 8   X11: A menu that contains an umlaut is truncated at that character.
@@ -903,7 +934,7 @@ Macintosh:
 7   The Cygwin and MingW makefiles define "PC", but it's not used anywhere.
     Remove? (Dan Sharp)
 9   The argument <f-args> of a user command doesn't handle backslashes
-    properly. "Cmd \ e" is one argument, "Cmd \\ e" still is one argument.
+    properly.  "Cmd \ e" is one argument, "Cmd \\ e" still is one argument.
     "Cmd \  e" is two arguments, first one ending in space. (Kontra Gergely)
 9   User commands use the context of the script they were defined in.  This
     causes a "s:var" argument to unexpectedly use a variable in the defining
@@ -925,7 +956,7 @@ Macintosh:
     won't work for GTK anyway.
 8   When the clipboard isn't supported: ":yank*" gives a confusing error
     message.  Specifically mention that the register name is invalid.
-8   "gf" always excludes trailing punctuation characters. file_name_in_line()
+8   "gf" always excludes trailing punctuation characters.  file_name_in_line()
     is currently fixed to use ".,:;!".  Add an option to make this
     configurable?
 8   'hkmap' should probably be global-local.
@@ -1112,8 +1143,6 @@ Macintosh:
     that the user knows he has to delete the files.
 7   It's possible to redefine a script-local function with ":func
     <SNR>123_Test()". (Krishna)  Disallow this.
-7   After ":%d" an undo reports the number of lines added as if there still
-    was one line.
 
 
 I can't reproduce these (if you can, let me know how!):
@@ -1150,7 +1179,7 @@ Problems that will (probably) not be solved:
 -   Amiga: When using quickfix with the Manx compiler we only get the first 25
     errors.  How do we get the rest?
 -   Amiga: The ":cq" command does not always abort the Manx compiler.  Why?
--   Linux: A file with protection r--rw-rw- is seen readonly for others. The
+-   Linux: A file with protection r--rw-rw- is seen readonly for others.  The
     access() function in GNU libc is probably wrong.
 -   MSDOS: When using smartdrive with write-back buffering, writing to a
     readonly floppy will cause problems.  How to test for a writable floppy
@@ -1301,6 +1330,7 @@ Folding:
 8   Add "z/" and "z?" for searching in not folded text only.
 8   Add different highlighting for a fold line depending on the fold level.
     (Noel Henson)
+7   Use "++--", "+++--" for different levels instead of "+---" "+----".
 8   When a closed fold is displayed open because of 'foldminlines', the
     behavior of commands is still like the fold is closed.  How to make the
     user aware of this?
@@ -1343,7 +1373,8 @@ Multi-byte characters:
     Match with "-\*-\s*coding[:=]\s*\([::word::-_.]\+\)\s*-\*-" and use first
     item.
 8   Add an item in 'fileencodings' to check the first line of an XML file for
-    the encoding. <?xml version="1.0" encoding="UTF-8"?>  Or "charset=UTF-8"?
+    the encoding.  <?xml version="1.0" encoding="UTF-8"?>  Or "charset=UTF-8"?
+    For HTML look for "charset=utf-8".
 8   The quickfix file is read without conversion, thus in 'encoding'.  Add an
     option to specify the encoding of the errorfile and convert it.  Also for
     ":grep" and ":helpgrep".
@@ -1401,6 +1432,7 @@ Multi-byte characters:
 
 
 Printing:
+7   Implement "undercurl" for printing.
 -   Add "page width" to wrap long lines.
 -   Win32: use a font dialog for setting 'printfont'.  Can reuse the code for
     the 'guifont' dialog, put the common code in a separate function.
@@ -1475,7 +1507,7 @@ Syntax highlighting:
 7   Use parsing like awk, so that e.g., a ( without a matching ) can be
     detected.
 8   Make it possible to use "inverted" highlighting, invert the original
-    character.  For Visual mode. (xterm-selection already does this).
+    character.  For Visual mode.  (xterm-selection already does this).
 8   Highlight non-printable characters with "SpecialChar", linked to
     "Special".  Display them with the digraph characters, if possible.
 8   Highlight the clipboard-selection with a highlight group.
@@ -1677,11 +1709,6 @@ Built-in script language:
 
 
 Robustness:
-8   This pattern in syntax/java.vim causes a recursive call of regmatch():
-	syn match   javaStringError      +"\([^"\\]\|\\.\)*$+
-    A long line with a " in it can cause a crash when it runs out of stack
-    space (on systems where this isn't caught).  How can we catch this for
-    more systems?
 6   Add file locking.  Lock a file when starting to edit it with flock() or
     fcntl().  This patch has advisory file locking while reading/writing
     the file for Vim 5.4: ~/vim/patches/kahn_file_locking .
@@ -1826,7 +1853,7 @@ Messages:
     Careful: For a severe error (out of memory), and when the user starts
     typing, error messages must be switched back on.
     Also a flag to ignore error messages for shell commands (for mappings).
--   Option to set time for emsg() sleep. Interrupt sleep when key is typed?
+-   Option to set time for emsg() sleep.  Interrupt sleep when key is typed?
     sleep before second message?
 8   In Ex silent mode or when reading commands from a file, what exactly is
     not printed and what is?  Check ":print", ":set all", ":args", ":vers",
@@ -2064,7 +2091,7 @@ GUI:
 7   Motif: For a confirm() dialog <Enter> should be ignored when no default
     button selected, <Esc> should close the dialog.
 7   When using a pseudo-tty Vim should behave like some terminal (vt52 looks
-    simple enough). Terminal codes to/from shell should be translated.
+    simple enough).  Terminal codes to/from shell should be translated.
 -   Would it be useful to be able to quit the GUI and go back to the terminal
     where it was started from?
 7   Support "-visual <type>" command line argument.
@@ -2083,6 +2110,7 @@ Autocommands:
     changing the buffer name.
 8   Add ScriptReadCmd event: used to load remote Vim scripts, e.g.
     "vim -u http://mach/path/vimrc".
+7   Add TagJump event: do something after jumping to a tag.
 8   Use another option than 'updatetime' for the CursorHold event.  The two
     things are unrelated for the user (but the implementation is more
     difficult).
@@ -2283,6 +2311,9 @@ Command line completion:
 
 
 Command line history:
+9   Remember which command lines were actually typed and were not loaded from
+    viminfo.  When writing viminfo append only these lines, so that lines from
+    other Vim's are not overwritten.
 -   Add "KeyWasTyped" flag: It's reset before each command and set when a
     character from the keyboard is consumed. Value is used to decide to put a
     command line in history or not. Put line in history if it didn't
@@ -2386,7 +2417,7 @@ Insert mode:
 9   Wrong indent for cino=(4, removing the (void) fixes it: (Zellner)
 	(void) MyFancyFunction(
 			       argument);
--   Make smartindenting configurable. Add 'sioptions', e.g. '#' setting the
+-   Make smartindenting configurable.  Add 'sioptions', e.g. '#' setting the
     indent to 0 should be switched on/off.
 7   Support ANSI style function header, with each argument on its own line.
 -   "[p" and "]p" should use 'cindent' code if it's on (only for the first
@@ -2542,16 +2573,16 @@ Visual mode:
 6   In non-Block mode, "A" should append the same text after each line.
 6   ":'<,'>source" should read the selected lines and ":source" them.
 6   When in blockwise visual selection (CTRL-V), allow cursor to be placed
-    right of the line. Could also allow cursor to be placed anywhere on a TAB
+    right of the line.  Could also allow cursor to be placed anywhere on a TAB
     or other special character.
 6   Add commands to move selected text, without deselecting.
 
 
 More advanced repeating commands:
 -   Add "." command for visual mode: redo last visual command (e.g. ":fmt").
-7   Repeating "d:{cmd}" with "." doesn't work. (Benji Fisher) Somehow remember
+7   Repeating "d:{cmd}" with "." doesn't work. (Benji Fisher)  Somehow remember
     the command line so that it can be repeated?
--   Add "." command after operator: repeat last command of same operator. E.g.
+-   Add "." command after operator: repeat last command of same operator.  E.g.
     "c." will repeat last change, also when "x" used since then (Webb).
     "y." will repeat last yank.
     "c2." will repeat the last but one change?
@@ -2589,7 +2620,7 @@ Mappings and Abbreviations:
     not fool proof.  How to handle ambiguous mappings?
 7   Add <0x8f> (hex), <033> (octal) and <123> (decimal) to <> notation?
 7   Allow mapping "Q" and "Q}" at the same time.  Need to put a flag with "Q",
-    that it needs an extra character before it can match. See Vile 'maplonger'
+    that it needs an extra character before it can match.  See Vile 'maplonger'
     option.
 7   When someone tries to unmap with a trailing space, and it fails, try
     unmapping without the trailing space.  Helps for ":unmap xx | unmap yy".
@@ -2631,7 +2662,7 @@ Mappings and Abbreviations:
 -   List mappings that have a raw escape sequence both with the name of the key
     for that escape sequence (if there is one) and the sequence itself.
 -   List mappings: Once with special keys listed as <>, once with meta chars as
-    <M-a>, once with the byte values (octal?). Sort of "spell mapping" command?
+    <M-a>, once with the byte values (octal?).  Sort of "spell mapping" command?
 -   When entering mappings: Add the possibility to enter meta keys like they
     are displayed, within <>: <M-a>, <~@> or <|a>.
 -   Allow multiple arguments to :unmap.
@@ -2658,8 +2689,15 @@ Incsearch:
 Searching:
 7   Add "g/" and "gb" to search for a pattern in the Visually selected text?
     "g?" is already used for rot13.
-8   Add a mechanism for recursiveness: "\(([^()]*\@@[^()]*)\)\@r".  \@@ stands
-    for "go recursive here" and \@r marks the recursive atom.
+8   Add a mechanism for recursiveness: "\@(([^()]*\@g[^()]*)\)".  \@g stands
+    for "go recursive here" and \@( \) marks the recursive part.
+    Perl does it this way:
+	    $paren = qr/ \(( [^()] | (??{ $paren }) )* \) /x;
+    Here $paren is evaluated when it's encountered.  This is like a regexp
+    inside a regexp.  In the above terms it would be:
+	    \@((\([^()]\|\@g\)*)\)
+8   Add an item for a big character range, so that one can search for a
+    chinese character: \z[234-1234]  or \z[XX-YY] or \z[0x23-0x234].
 7   Add an item stack to allow matching ().  One side is "push X on
     the stack if previous atom matched".  Other side is "match with top of
     stack, pop it when it matches".  Use "\@pX" and "\@m"?
@@ -2735,17 +2773,17 @@ Searching:
     as Visual area. (variation on idea from Bertin)
 -   Searching: "/this//that/" should find "that" after "this".
 -   Add global search commands: Instead of wrapping at the end of the buffer,
-    they continue in another buffer. Use flag after search pattern:
+    they continue in another buffer.  Use flag after search pattern:
     a	for the next file in the argument list
     f	for file in the buffer list
     w	for file edited in a window.
-    e.g. "/pat/f". Then "n" and "N" work through files too. "f" flag also for
-    ":s/pat/foo/f"??? Then when 'autowrite' and 'hidden' are both not set, ask
+    e.g. "/pat/f".  Then "n" and "N" work through files too.  "f" flag also for
+    ":s/pat/foo/f"???  Then when 'autowrite' and 'hidden' are both not set, ask
     before saving files: "Save modified buffer "/path/file"? (Yes/Hide/No
     Save-all/hide-All/Quit) ".
 -   ":s/pat/foo/3": find 3rd match of "pat", like sed. (Thomas Koehler)
 7   When searching with 'n' give message when getting back where the search
-    first started. Remember start of search in '/ mark.
+    first started.  Remember start of search in '/ mark.
 7   Add option that scrolls screen to put cursor in middle of screen after
     search always/when off-screen/never.  And after a ":tag" command.  Maybe
     specify how many lines below the screen causes a redraw with the cursor in
@@ -2755,7 +2793,7 @@ Searching:
 7   From xvim: Allow a newline in search patterns (also for :s, can delete
     newline).  Add BOW, EOW, NEWL, NLORANY, NLBUTANY, magic 'n' and 'r', etc.
     [not in xvim:] Add option to switch on matches crossing ONE line boundary.
-7   Add ":iselect", a combination of ":ilist" and ":tselect". (Aaron)
+7   Add ":iselect", a combination of ":ilist" and ":tselect". (Aaron) (Zellner)
     Also ":dselect".
 
 
@@ -2801,8 +2839,8 @@ Buffer list:
 8   Unix: Check all uses of fnamecmp() and fnamencmp() if they should check
     inode too.
 7   Add another number for a buffer, which is visible for the user.  When
-    creating a new buffer, use the lowest number not in use. (or the highest
-    number in use plus one?)
+    creating a new buffer, use the lowest number not in use (or the highest
+    number in use plus one?).
 7   Offer some buffer selection from the command line?  Like using ":ls" and
     asking for a buffer number. (Zachmann)
 -   When starting to edit a file that is already in the buffer list, use the
@@ -2814,7 +2852,7 @@ Buffer list:
 7   Add expansion of buffer names, so that "*.c" is expanded to all buffer
     names.  Needed for ":bdel *.c", ":bunload *.c", etc.
 8   Support for <afile> where a buffer name is expected.
-8   Some commands don't use line numbers, but buffer numbers. '$'
+8   Some commands don't use line numbers, but buffer numbers.  '$'
     should then mean the number of the last buffer.  E.g.: "4,$bdel".
 7   Add an option to mostly use slashes in file names.  Separately for
     internal use and for when executing an external program?
@@ -2828,14 +2866,14 @@ Swap (.swp) files:
     file for the Win32 and Dos 32 bit versions.
 8   When a file is edited by root, add $LOGNAME to know who did su.
 8   When the edited file is a symlink, try to put the swap file in the same
-    dir as the actual file. Adjust FullName().	Avoids editing the same file
+    dir as the actual file.  Adjust FullName().  Avoids editing the same file
     twice (e.g. when using quickfix).  Also try to make the name of the backup
     file the same as the actual file?
     Use the code for resolve()?
 7   When using 64 bit inode numbers, also store the top 32 bits.  Add another
     field for this, using part of bo_fname[], to keep it compatible.
 7   When editing a file on removable media, should put swap file somewhere
-    else.  Use something like 'r' flag in 'viminfo'. 'diravoid'?
+    else.  Use something like 'r' flag in 'viminfo'.  'diravoid'?
     Also: Be able to specify minimum disk space, skip directory when not
     enough room.
 7   Add a configure check for which directory should be used: /tmp, /var/tmp
@@ -2940,7 +2978,7 @@ Multiple Windows:
 7   Add a 'winfixwidth' option, similar to 'winfixheight'.
 6   Add an option to resize the shell when splitting and/or closing a window.
     ":vsp" would make the shell wider by as many columns as needed for the new
-    window.  Specify a maximum size (or use the screen size). ":close" would
+    window.  Specify a maximum size (or use the screen size).  ":close" would
     shrink the shell by as many columns as come available. (Demirel)
 7   When starting Vim several times, instantiate a Vim server, that allows
     communication between the different Vims.  Feels like one Vim running with
@@ -2955,7 +2993,7 @@ Multiple Windows:
 Marks:
 8   When cursor is first moved because of scrolling, set a mark at this
     position.  (Rimon Barr)  Use '-.
-8   Add a command to jump to a mark and make the motion inclusive. g'm and g`m?
+8   Add a command to jump to a mark and make the motion inclusive.  g'm and g`m?
 8   The '" mark is set to the first line, even when doing ":next" a few times.
     Only set the '" mark when the cursor was really moved in a file.
 8   Make `` and '', which would position the new cursor position in the middle
@@ -3013,7 +3051,7 @@ Writing files:
     E.g., ":set patchmode=~/backups/*.orig". (Thomas)
 6   Add an option to prepend something to the backup file name.  E.g., "#".
     Or maybe allow a function to modify the backup file name?
-8   Only make a backup when overwriting a file for the first time. Avoids
+8   Only make a backup when overwriting a file for the first time.  Avoids
     losing the original when writing twice. (Slootman)
 7   On non-Unix machines, also overwrite the original file in some situations
     (file system full, it's a link on an NFS partition).
@@ -3028,13 +3066,13 @@ Writing files:
 
 
 Substitute:
-8   Make it easier to replace in all files in the argument list. E.g.:
+8   Make it easier to replace in all files in the argument list.  E.g.:
     ":argsub/oldword/newword/".  Works like ":argdo %s/oldword/newword/g|w".
 -   :s///p prints the line after a substitution.
 -   With :s///c replace \&, ~, etc. when showing the replacement pattern.
 8   With :s///c allow scrolling horizontally when 'nowrap' is effective.
     Also allow a count before the scrolling keys.
--   Add number option to ":s//2": replace second occurrence of string? Or:
+-   Add number option to ":s//2": replace second occurrence of string?  Or:
     :s///N substitutes N times.
 -   Add answers to ":substitute" with 'c' flag, used in a ":global", e.g.:
     ":g/pat1/s/pat2/pat3/cg": 'A' do all remaining replacements, 'Q' don't do
@@ -3133,7 +3171,7 @@ Various improvements:
     Overrules the default of "--remote-send" to fail and "--remote" to do it
     in this Vim.
 8   When Vim was started without a server, make it possible to start one, as
-    if the "--servername" argument was given. ":startserver <name>"?
+    if the "--servername" argument was given.  ":startserver <name>"?
 8   No address range can be used before the command modifiers.  This makes
     them difficult to use in a menu for Visual mode.  Accept the range and
     have it apply to the following command.
@@ -3204,7 +3242,7 @@ Various improvements:
     buffer.  Make jumplist remember the last ten accessed buffers?
 -   Keep a list of most recently used files for each window, use "[o" to go
     back (older file) and "]n" to go forward (newer file) (like ^O and ^I for
-    jumps) (Webb). Use ":files" and ":ls" to list the files in history order.
+    jumps). (Webb)  Use ":files" and ":ls" to list the files in history order.
 7   Add a history of recently accessed buffer.	Maybe make "2 CTRL-^" jump to
     the 2nd previously visited buffer, "3 CTRL-^" to the third, etc.  Or use
     "3 g CTRL-^" for this?
@@ -3303,8 +3341,6 @@ Various improvements:
     changes all together instead of for each command (e.g. for the rot13
     macro).
 -   Add command like "[I" that also shows the tree of included files.
--   Add command like ":ts" that shows the output of "[I" and asks for a match
-    to jump to. (Zellner)
 -   ":set sm^L" results in ":set s", because short names of options are also
     expanded.  Is there a better way to do this?
 -   Add ":@!" command, to ":@" like what ":source!" is to ":source".
@@ -3321,7 +3357,7 @@ Various improvements:
     Add setting of 'nrformats' to syntax files.
 -   'path' can become very long, don't use NameBuff for expansion.
 -   When unhiding a hidden buffer, put the same line at top of the window as
-    the one before hiding it. Or: keep the same relative cursor position (so
+    the one before hiding it.  Or: keep the same relative cursor position (so
     many percent down the windows).
 -   Make it possible for the 'showbreak' to be displayed at the end of the
     line.  Use a comma to separate the part at the end and the start of the
@@ -3342,12 +3378,12 @@ Various improvements:
 -   Change ":fixdel" into option 'fixdel', t_del will be adjusted each time
     t_bs is set? (Webb)
 -   "gc": goto character, move absolute character positions forward, also
-    counting newlines. "gC" goes backwards (Weigert).
--   When doing CTRL-^, redraw buffer with the same topline (Demirel). Store
+    counting newlines.  "gC" goes backwards (Weigert).
+-   When doing CTRL-^, redraw buffer with the same topline. (Demirel)  Store
     cursor row and window height to redraw cursor at same percentage of window
     (Webb).
 -   Besides remembering the last used line number of a file, also remember the
-    column. Use it with CTRL-^ et. al.
+    column.  Use it with CTRL-^ et. al.
 -   Check for non-digits when setting a number option (careful when entering
     hex codes like 0xff).
 -   Add option to make "." redo the "@r" command, instead of the last command
@@ -3372,11 +3408,11 @@ Various improvements:
 -   Create a program that can translate a .swp file from any machine into a
     form usable by Vim on the current machine.
 -   Add ":noro" command: Reset 'ro' flag for all buffers, except ones that have
-    a readonly file. ":noro!" will reset all 'ro' flags.
+    a readonly file.  ":noro!" will reset all 'ro' flags.
 -   Add a variant of CTRL-V that stops interpretation of more than one
     character.	For entering mappings on the command line where a key contains
     several special characters, e.g. a trailing newline.
--   Add regex for 'paragraphs' and 'sections': 'parare' and 'sectre'. Combine
+-   Add regex for 'paragraphs' and 'sections': 'parare' and 'sectre'.  Combine
     the two into a regex for searching. (Ned Konz)
 -   Make '2' option in 'formatoptions' also work inside comments.
 -   Add 's' flag to 'formatoptions': Do not break when inside a string. (Dodt)
@@ -3394,7 +3430,7 @@ Various improvements:
     entered)?
 -   Check out how screen does output optimizing.  Apparently this is possible
     as an output filter.
--   In dosub() regexec is called twice for the same line. Try to avoid this.
+-   In dosub() regexec is called twice for the same line.  Try to avoid this.
 -   Window updating from memline.c: insert/delete/replace line.
 -   Optimize ml_append() for speed, esp. for reading a file.
 -   V..c should keep indent when 'ai' is set, just like [count]cc.
@@ -3408,7 +3444,7 @@ Various improvements:
     or in octal.
 7   Tighter integration with xxd to edit binary files.  Make it more
     easy/obvious to use.  Command line argument?
--   How does vi detect whether a filter has messed up the screen? Check source.
+-   How does vi detect whether a filter has messed up the screen?  Check source.
     After ":w !command" a wait_return?
 -   Improve screen updating code for doput() (use s_ins()).
 -   With 'p' command on last line: scroll screen up (also for terminals without
@@ -3419,13 +3455,15 @@ Various improvements:
 -   Add "-d null" for editing from a script file without displaying.
 -   In Insert mode: Remember the characters that were removed with backspace
     and re-insert them one at a time with <key1>, all together with <key2>.
--   Amiga: Add possibility to set a keymap. The code in amiga.c does not work
+-   Amiga: Add possibility to set a keymap.  The code in amiga.c does not work
     yet.
 -   Implement 'redraw' option.
 -   Add special code to 'sections' option to define something else but '{' or
     '}' as the start of a section (e.g. one shiftwidth to the right).
 7   Allow using Vim in a pipe: "ls | vim -u xxx.vim - | yyy".  Only needs
     implementing ":w" to stdout in the buffer that was read from stdin.
+    Perhaps writing to stdout will work, since stderr is used for the terminal
+    I/O.
 8   Allow opening an unnamed buffer with ":e !cmd" and ":sp !cmd".  Vile can
     do it.
 -   Add commands like ]] and [[ that do not include the line jumped to.
@@ -3438,7 +3476,7 @@ Various improvements:
 -   Check handling of CTRL-V and '\' for ":" commands that do not have TRLBAR.
 -   When a file cannot be opened but does exist, give error message.
 -   Amiga: When 'r' protection bit is not set, file can still be opened but
-    gives read errors. Check protection before opening.
+    gives read errors.  Check protection before opening.
 -   When writing check for file exists but no permission, "Permission denied".
 -   If file does not exists, check if directory exists.
 -   MSDOS: although t_cv and t_ci are not set, do invert char under cursor.
@@ -3460,23 +3498,23 @@ Various improvements:
 -   Add commands for saving and restoring options ":set save" "set restore",
     for use in macro's and the like.
 -   Keep output from listings in a window, so you can have a look at it while
-    working in another window. Put cmdline in a separate window?
+    working in another window.  Put cmdline in a separate window?
 -   Add possibility to put output of ex commands in a buffer or file, e.g. for
     ":set all".  ":r :set all"?
 -   'edit' option: When off changing the buffer is not possible (Really
     read-only mode).
 -   When the 'equalalways' option is set, creating a new window should not
-    result in windows to become bigger. Deleting a window should not result in
+    result in windows to become bigger.  Deleting a window should not result in
     a window to become smaller (Webb).
 -   When resizing the whole Vim window, the windows inside should be resized
     proportionally (Webb).
--   Include options directly in option table, no indirect pointers. Use
+-   Include options directly in option table, no indirect pointers.  Use
     mkopttab to make option table?
 -   When doing ":w dir", where "dir" is a directory name, write the current
     file into that directory, with the current file name (without the path)?
 -   Support for 'dictionary's that are sorted, makes access a lot faster
     (Haritsis).
--   Add "^Vrx" on the command line, replace with contents of register x. Used
+-   Add "^Vrx" on the command line, replace with contents of register x.  Used
     instead of CTRL-R to make repeating possible. (Marinichev)
 -   Add "^Vb" on the command line, replace with word before or under the
     cursor?
@@ -3578,7 +3616,7 @@ Far future and "big" extensions:
     :g/RE/#l shall print lines with line numbers and in list format.
     :g/RE/dp shall print lines that are deleted.
     POSIX: Commands where flags shall apply to all lines written: list,
-    number, open, print, substitute, visual, &, z. For other commands, flags
+    number, open, print, substitute, visual, &, z.  For other commands, flags
     shall apply to the current line after the command completes.  Examples:
     :7,10j #l Join the lines 7-10 and print the result in list
 -   Allow two or more users to edit the same file at the same time.  Changes

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: 2005 Feb 08
+*usr_03.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 22
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -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_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
 

runtime/doc/usr_11.txt

@@ -1,4 +1,4 @@
-*usr_11.txt*	For Vim version 7.0aa.  Last change: 2004 Apr 23
+*usr_11.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 01
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -34,7 +34,7 @@ messages (with different file names, of course):
 
 	Using swap file ".help.txt.swp" ~
 	Original file "~/vim/runtime/doc/help.txt" ~
-	Recovery completed. You should check if everything is OK. ~
+	Recovery completed.  You should check if everything is OK. ~
 	(You might want to write out this file under another name ~
 	and run diff with the original file to check for changes) ~
 	Delete the .swp file afterwards. ~
@@ -181,7 +181,7 @@ something wrong.  It may be one of these two situations.
    either it was changed after the crash (perhaps you recovered it earlier,
    but didn't delete the swap file?), or else the file was saved before the
    crash but after the last write of the swap file (then you're lucky: you
-   don't even need that old swap file). Vim will warn you for this with this
+   don't even need that old swap file).  Vim will warn you for this with this
    extra line:
 
       NEWER than swap file! ~
@@ -193,17 +193,17 @@ Sometimes the line
 
 	[cannot be read] ~
 
-will appear under the name of the swap file. This can be good or bad,
+will appear under the name of the swap file.  This can be good or bad,
 depending on circumstances.
 
 It is good if a previous editing session crashed without having made any
-changes to the file. Then a directory listing of the swap file will show
-that it has zero bytes. You may delete it and proceed.
+changes to the file.  Then a directory listing of the swap file will show
+that it has zero bytes.  You may delete it and proceed.
 
-It is slightly bad if you don't have read permission for the swap file. You
-may want to view the file read-only, or quit. On multi-user systems, if you
+It is slightly bad if you don't have read permission for the swap file.  You
+may want to view the file read-only, or quit.  On multi-user systems, if you
 yourself did the last changes under a different login name, a logout
-followed by a login under that other name might cure the "read error". Or
+followed by a login under that other name might cure the "read error".  Or
 else you might want to find out who last edited (or is editing) the file and
 have a talk with them.
 

runtime/doc/usr_20.txt

@@ -1,4 +1,4 @@
-*usr_20.txt*	For Vim version 7.0aa.  Last change: 2003 Apr 30
+*usr_20.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 01
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -263,7 +263,7 @@ now check the list for the item you wanted.  If it isn't there, you can use
 characters before pressing <Tab> to complete the rest.
    If you have watched carefully, you will have noticed that "incsearch"
 doesn't start with "is".  In this case "is" stands for the short name of
-"incsearch". (Many options have a short and a long name.)  Vim is clever
+"incsearch".  (Many options have a short and a long name.)  Vim is clever
 enough to know that you might have wanted to expand the short name of the
 option into the long name.
 

runtime/doc/usr_21.txt

@@ -1,4 +1,4 @@
-*usr_21.txt*	For Vim version 7.0aa.  Last change: 2004 Oct 10
+*usr_21.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 01
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -120,7 +120,7 @@ looks like this: >
 	:set viminfo='1000
 
 The f option controls whether global marks (A-Z and 0-9) are stored.  If this
-option is 0, none are stored. If it is 1 or you do not specify an f option,
+option is 0, none are stored.  If it is 1 or you do not specify an f option,
 the marks are stored.  You want this feature, so now you have this: >
 
 	:set viminfo='1000,f1
@@ -199,7 +199,7 @@ work and pick up where you left off the next day.  You can do this by saving
 your editing session and restoring it the next day.
    A Vim session contains all the information about what you are editing.
 This includes things such as the file list, window layout, global variables,
-options and other information. (Exactly what is remembered is controlled by
+options and other information.  (Exactly what is remembered is controlled by
 the 'sessionoptions' option, described below.)
    The following command creates a session file: >
 

runtime/doc/usr_22.txt

@@ -1,4 +1,4 @@
-*usr_22.txt*	For Vim version 7.0aa.  Last change: 2004 Jun 16
+*usr_22.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 10
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -291,7 +291,7 @@ shorter to type: >
 The output could look like this:
 
   1 #h	"help.txt"			line 62 ~
-  2 %l+	"usr_21.txt"			line 1 ~
+  2 %a+	"usr_21.txt"			line 1 ~
   3	"usr_toc.txt"			line 1 ~
 
 The first column contains the buffer number.  You can use this to edit the
@@ -303,7 +303,7 @@ and the line number where the cursor was the last time.
 	u	Buffer is unlisted |unlisted-buffer|.
 	 %	Current buffer.
 	 #	Alternate buffer.
-	  l	Buffer is loaded and displayed.
+	  a	Buffer is loaded and displayed.
 	  h	Buffer is loaded but hidden.
 	   =	Buffer is read-only.
 	   -	Buffer is not modifiable, the 'modifiable' option is off.

runtime/doc/usr_23.txt

@@ -1,4 +1,4 @@
-*usr_23.txt*	For Vim version 7.0aa.  Last change: 2001 Sep 03
+*usr_23.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 01
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -82,7 +82,7 @@ Vim guesses wrong.
 OVERRULING THE FORMAT
 
 If you use the good old Vi and try to edit an MS-DOS format file, you will
-find that each line ends with a ^M character. (^M is <CR>).  The automatic
+find that each line ends with a ^M character.  (^M is <CR>).  The automatic
 detection avoids this.  Suppose you do want to edit the file that way?  Then
 you need to overrule the format: >
 

runtime/doc/usr_24.txt

@@ -1,4 +1,4 @@
-*usr_24.txt*	For Vim version 7.0aa.  Last change: 2003 Aug 18
+*usr_24.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 01
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -104,7 +104,7 @@ Vim do that use this command: >
 When you now type a text like "(example)", as soon as you type the ) Vim will
 briefly move the cursor to the matching (, keep it there for half a second,
 and move back to where you were typing.
-   In case there is not matching (, Vim will beep.  Then you know that you
+   In case there is no matching (, Vim will beep.  Then you know that you
 might have forgotten the ( somewhere, or typed a ) too many.
    The match will also be shown for [] and {} pairs.  You don't have to wait
 with typing the next character, as soon as Vim sees it the cursor will move

runtime/doc/usr_25.txt

@@ -1,4 +1,4 @@
-*usr_25.txt*	For Vim version 7.0aa.  Last change: 2003 Jun 21
+*usr_25.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 01
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -198,7 +198,7 @@ command: >
 
 	:runtime macros/justify.vim
 
-This Vim script file defines a new visual command "_j". To justify a block of
+This Vim script file defines a new visual command "_j".  To justify a block of
 text, highlight the text in Visual mode and then execute "_j".
    Look in the file for more explanations.  To go there, do "gf" on this name:
 $VIMRUNTIME/macros/justify.vim.

runtime/doc/usr_28.txt

@@ -1,4 +1,4 @@
-*usr_28.txt*	For Vim version 7.0aa.  Last change: 2003 Dec 21
+*usr_28.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 01
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -350,7 +350,7 @@ You can try it out on this text:
 Explanation for the 'foldexpr' used in the example (inside out):
    getline(v:lnum)			gets the current line
    substitute(...,'\\s','','g')		removes all white space from the line
-   substitute(...,'[^>].*','',''))	removes everything after leading '>'s
+   substitute(...,'[^>].*','','')	removes everything after leading '>'s
    strlen(...)				counts the length of the string, which
 					is the number of '>'s found
 

runtime/doc/usr_30.txt

@@ -1,4 +1,4 @@
-*usr_30.txt*	For Vim version 7.0aa.  Last change: 2004 Jan 17
+*usr_30.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 01
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -35,7 +35,7 @@ you give) and captures the results: >
 
 If errors were generated, they are captured and the editor positions you where
 the first error occurred.
-   Take a look at an example ":make" session. (Typical :make sessions generate
+   Take a look at an example ":make" session.  (Typical :make sessions generate
 far more errors and fewer stupid ones.)  After typing ":make" the screen looks
 like this:
 
@@ -606,7 +606,7 @@ This allows formatting a message like this:
 Try setting 'textwidth' to a different value, e.g., 80, and format the text by
 Visually selecting it and typing "gq".  The result is:
 
-	> ! Did you see that site? It looks really great. ~
+	> ! Did you see that site?  It looks really great. ~
 	> I don't like it.  The colors are terrible. ~
 	What is the URL of that site? ~
 

runtime/doc/usr_40.txt

@@ -1,4 +1,4 @@
-*usr_40.txt*	For Vim version 7.0aa.  Last change: 2004 Dec 29
+*usr_40.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 01
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -383,9 +383,9 @@ Some of the other options and keywords are as follows:
 	-count={number}		The command can take a count whose default is
 				{number}.  The resulting count can be used
 				through the <count> keyword.
-	-bang			You can use a !. If present, using <bang> will
+	-bang			You can use a !.  If present, using <bang> will
 				result in a !.
-	-register		You can specify a register. (The default is
+	-register		You can specify a register.  (The default is
 				the unnamed register.)
 				The register specification is available as
 				<reg> (a.k.a. <register>).
@@ -425,14 +425,14 @@ More details about all this in the reference manual: |user-commands|.
 *40.3*	Autocommands
 
 An autocommand is a command that is executed automatically in response to some
-event, such as a file being read or written or a buffer change. Through the
+event, such as a file being read or written or a buffer change.  Through the
 use of autocommands you can train Vim to edit compressed files, for example.
 That is used in the |gzip| plugin.
    Autocommands are very powerful.  Use them with care and they will help you
 avoid typing many commands.  Use them carelessly and they will cause a lot of
 trouble.
 
-Suppose you want to replace a date stamp on the end of a file every time it is
+Suppose you want to replace a datestamp on the end of a file every time it is
 written.  First you define a function: >
 
 	:function DateInsert()

runtime/doc/usr_41.txt

@@ -1,4 +1,4 @@
-*usr_41.txt*	For Vim version 7.0aa.  Last change: 2005 Feb 23
+*usr_41.txt*	For Vim version 7.0aa.  Last change: 2005 May 18
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -723,7 +723,7 @@ Interactive:
 	input()			get a line from the user
 	inputsecret()		get a line from the user without showing it
 	inputdialog()		get a line from the user in a dialog
-	inputresave		save and clear typeahead
+	inputsave()		save and clear typeahead
 	inputrestore()		restore typeahead
 
 Vim server:
@@ -745,7 +745,7 @@ Various:
 	maparg()		get rhs of a mapping
 	exists()		check if a variable, function, etc. exists
 	has()			check if a feature is supported in Vim
-	errorlist()		list of quickfix errors
+	getqflist()		list of quickfix errors
 	cscope_connection()	check if a cscope connection exists
 	did_filetype()		check if a FileType autocommand was used
 	eventhandler()		check if invoked by an event handler
@@ -757,7 +757,9 @@ Various:
 	libcallnr()		idem, returning a number
 	getreg()		get contents of a register
 	getregtype()		get type of a register
+	setqflist()		create a quickfix list
 	setreg()		set contents and type of a register
+	taglist()		get list of matching tags
 
 ==============================================================================
 *41.7*	Defining a function
@@ -2227,11 +2229,11 @@ Here you need to know that MyLibFunction() is defined in a script
 To make this a bit simpler Vim offers the autoload mechanism.  Then the
 example looks like this: >
 
-	call mylib:myfunction(arg)
+	call mylib#myfunction(arg)
 
 That's a lot simpler, isn't it?  Vim will recognize the function name and when
 it's not defined search for the script "autoload/mylib.vim" in 'runtimepath'.
-That script must define the "mylib:myfunction()" function.
+That script must define the "mylib#myfunction()" function.
 
 You can put many other functions in the mylib.vim script, you are free to
 organize your functions in library scripts.  But you must use function names
@@ -2241,7 +2243,7 @@ would not know what script to load.
 If you get really enthousiastic and write lots of library scripts, you may
 want to use subdirectories.  Example: >
 
-	call netlib:ftp:read('somefile')
+	call netlib#ftp#read('somefile')
 
 For Unix the library script used for this could be:
 
@@ -2249,7 +2251,7 @@ For Unix the library script used for this could be:
 
 Where the function is defined like this: >
 
-	function netlib:ftp:read(fname)
+	function netlib#ftp#read(fname)
 		"  Read the file fname through ftp
 	endfunction
 
@@ -2259,12 +2261,12 @@ exactly matches the subdirectory and script name.
 
 You can use the same mechanism for variables: >
 
-	let weekdays = dutch:weekdays
+	let weekdays = dutch#weekdays
 
 This will load the script "autoload/dutch.vim", which should contain something
 like: >
 
-	let dutch:weekdays = ['zondag', 'maandag', 'dinsdag', 'woensdag',
+	let dutch#weekdays = ['zondag', 'maandag', 'dinsdag', 'woensdag',
 		\ 'donderdag', 'vrijdag', 'zaterdag']
 
 Further reading: |autoload|.