diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 833b6aa..d4d0042 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 Mar 04
+*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Mar 06
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,13 +30,13 @@
 							*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.
+-   Patch from Steve Wall (2005 Mar 3) for dec locator mode with xterm 
+    above column 223.
+    Doesn't work: may send wrong escape sequence to terminal, because mouse
+    type already changed when calling mch_setmouse(FALSE).
 
-Mingw code to catch out-of-stack error doesn't work.  See MINGW_TRY in
-regexp.c.  Try with example from Michaelis.
+Remove code for out-of-stack checks.
+Verify non-recursive regmatch() is OK with example from Michaelis.
 
 Mac unicode patch (Da Woon Jung):
 - selecting proportional font breaks display
@@ -47,9 +47,6 @@
 	  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
   script names and a help file and produces a script that can be sourced to
@@ -63,7 +60,7 @@
 
 Patch for 'balloonexpr' option.  Sergey Khorev, Feb 26.  Addition Feb 27.
 
-Patch for "paranoid mode" by Kevin Collins, March 3.
+Patch for "paranoid mode" by Kevin Collins, March 3.  Later updated.
 
 Awaiting response:
 -   Patch for mch_FullName() also in Vim 6.3?  os_mswin.c
@@ -1076,8 +1073,6 @@
     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!):
@@ -1641,11 +1636,6 @@
 
 
 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 .
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index 5fb3564..3d2efa0 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 Mar 04
+*version7.txt*  For Vim version 7.0aa.  Last change: 2005 Mar 06
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -98,6 +98,12 @@
 "-w {scriptout}" only works when {scriptout} doesn't start with a digit.
 Otherwise it's used to set the 'window' option.
 
+Previously <Home> and <xHome> could be mapped separately.  This had the
+disadvantage that all mappings (with modifiers) had to be duplicated, since
+you can't be sure what the keyboard generates.  Now all <xHome> are internally
+translated to <Home>, both for the keys and for mappings.  Also for <xEnd>,
+<xF1>, etc.
+
 ==============================================================================
 NEW FEATURES						*new-7*
 
@@ -422,6 +428,11 @@
 
 Move the help for printing to a separate help file.  It's quite a lot now.
 
+The pattern matching code was changed from a recursive function to an
+iterative mechanism.  This avoids out-of-stack errors.  State is stored in
+allocated memory, running out of memory can always be detected.  Allows
+matching more complex things, but Vim may seem to hang while doing that.
+
 ":breakadd here" and ":breakdel here" can be used to set or delete a
 breakpoint at the cursor.
 
@@ -548,6 +559,13 @@
 variable that specifies what triggered the event.  |v:fcs_choice| can be used
 to reload the buffer or ask the user what to do.
 
+Not all modifiers were recognized for xterm function keys.  Added the
+possibility in term codes to end in ";*X" or "O*X", where X is any character
+and the * stands for the modifier code.
+Added the <xUp>, <xDown>, <xLeft> and <xRight> keys, to be able to recognize
+the two forms that xterm can send their codes in and still handle all possible
+modifiers.
+
 ==============================================================================
 COMPILE TIME CHANGES					*compile-changes-7*