diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index e994df8..44608a0 100644
--- a/runtime/doc/autocmd.txt
+++ b/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 @@
 				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 @@
 				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>".
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 1838a82..1cfa7b0 100644
--- a/runtime/doc/eval.txt
+++ b/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 Mar 04
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1183,6 +1183,32 @@
 	: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 ~
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 4bf27f6..d0b5abf 100644
--- a/runtime/doc/options.txt
+++ b/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 Mar 03
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -6833,9 +6833,9 @@
 			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
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 4f73e69..c4cdbbb 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -4782,6 +4782,8 @@
 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*
@@ -5078,6 +5080,7 @@
 hebrew.txt	hebrew.txt	/*hebrew.txt*
 help	various.txt	/*help*
 help-context	help.txt	/*help-context*
+help-tags	tags	1
 help-translated	various.txt	/*help-translated*
 help-xterm-window	various.txt	/*help-xterm-window*
 help.txt	help.txt	/*help.txt*
@@ -5901,6 +5904,7 @@
 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*
@@ -6620,6 +6624,8 @@
 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 +6640,7 @@
 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*
diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt
index b9252a9..fba493c 100644
--- a/runtime/doc/term.txt
+++ b/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 04
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -146,7 +146,7 @@
 
 				*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 @@
 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
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index a1c487d..833b6aa 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Feb 28
+*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Mar 04
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,17 +30,25 @@
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
+-   Steve Wall has a patch (2005 Mar 3) for adding function keys up to 37,
+    with modifiers.
+    Still need to recognize modifiers in "ESC O 5 F".  "ESC O * F"?
+":map <C-S-End> lll" has no effect.
+
 Mingw code to catch out-of-stack error doesn't work.  See MINGW_TRY in
 regexp.c.  Try with example from Michaelis.
 
-Russian helpfile doesn't show up correctly when 'encoding' is koi8-r.
-(Vassily Ragosin 2005 Feb 16)
-
 Mac unicode patch (Da Woon Jung):
-- typing doesn't work
 - selecting proportional font breaks display
+- UTF-8 text causes display problems.  Character width wrong?
 
 Patch for gettags(). Yegappan Lakshmanan Feb 27
+- docs: use of ^ and $ in pattern, refer to |tag-regexp|
+	  explain what the fields mean.
+	  use of 'tags' option
+
+-   Patch from Steve Wall (2005 Mar 3) for xterm mouse positioning above
+    column 223.
 
 autoload:
 - Add a Vim script in $VIMRUNTIME/tools that takes a file with a list of
@@ -55,6 +63,8 @@
 
 Patch for 'balloonexpr' option.  Sergey Khorev, Feb 26.  Addition Feb 27.
 
+Patch for "paranoid mode" by Kevin Collins, March 3.
+
 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
@@ -181,10 +191,6 @@
 	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.
@@ -258,12 +264,6 @@
 
 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.
@@ -323,12 +323,6 @@
 	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?
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index 31aa8af..7c0e74d 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -1,4 +1,4 @@
-*various.txt*   For Vim version 7.0aa.  Last change: 2005 Feb 21
+*various.txt*   For Vim version 7.0aa.  Last change: 2005 Mar 04
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -324,6 +324,7 @@
 m  *+perl*		Perl interface |perl|, may have |/dyn|
    *+postscript*	|:hardcopy| writes a PostScript file
 N  *+printer*		|:hardcopy| command
+H  *+profile*		|:profile| command
 m  *+python*		Python interface |python|, may have |/dyn|
 N  *+quickfix*		|:make| and |quickfix| commands
 B  *+rightleft*		Right to left typing |'rightleft'|
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index 2ac2cea..5fb3564 100644
--- a/runtime/doc/version7.txt
+++ b/runtime/doc/version7.txt
@@ -1,4 +1,4 @@
-*version7.txt*  For Vim version 7.0aa.  Last change: 2005 Feb 27
+*version7.txt*  For Vim version 7.0aa.  Last change: 2005 Mar 04
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -412,6 +412,9 @@
 when the buffer does not have a name or no specific name.  See
 |autocmd-buflocal|.  (Yakov Lerner)
 
+For xterm most combinations of modifiers with function keys are recognized.
+|xterm-modifier-keys|
+
 ==============================================================================
 IMPROVEMENTS						*improvements-7*
 
@@ -539,7 +542,11 @@
 been added to |:substitute|.  See |count-items|.
 
 The "screen.linux" $TERM name is recognized to set the default for
-'background' to "dark". (Ciaran McCreesh)
+'background' to "dark". (Ciaran McCreesh)  Also for "cygwin".
+
+The |FileChangedShell| autocommand event can now use the |v:fcs_reason|
+variable that specifies what triggered the event.  |v:fcs_choice| can be used
+to reload the buffer or ask the user what to do.
 
 ==============================================================================
 COMPILE TIME CHANGES					*compile-changes-7*
@@ -897,4 +904,9 @@
 
 When setting $HOME allocated memory would leak.
 
+Win32: bold characters may sometimes write in another character cell.  Use
+unicodepdy[] as for UTF-8. (Taro Muraoka)
+
+":w fname" didn't work for files with 'buftype' set to "nofile".
+
  vim:tw=78:ts=8:ft=help:norl: