diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 6eac18d..cc0ec8f 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.0aa.  Last change: 2006 Mar 04
+*todo.txt*      For Vim version 7.0aa.  Last change: 2006 Mar 06
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,69 +30,10 @@
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-Add options to optwin.vim:
-tabpagemax
-tabline
-showtabline
-guitablabel
-formatexpr
-
-Add options to quickref.txt:
-guitablabel
-showtabline
-tabline
-tabpagemax
-
-spelling:
-- Rename COMPOUNDFLAGS to COMPOUNDPATTERN or COMPOUNDRULE?
-    Hunspell now uses COMPOUND with a count.
-- Check out Hunspell 1.1.3.
-    Try to make the newly added features compatible.
-    what does MAXNGRAMSUGS do?
-    See announcement (Nemeth, 5 jan)
-    is COMPLEXPREFIXES necessary now that we have flags for affixes?
-- Look into Hungarian dictionary:
-  http://magyarispell.sourceforge.net/hu_HU-1.0.tar.gz
-- When compounding Hunspell doesn't allow affixes inside the compound word,
-  only before and after it.  COMPOUNDPERMITFLAG can be used to allow it.
-  Check Myspell and Aspell if they also work this way.
-  Thus a word + suffix needs a flag that it can't be used with a following
-  compound, and word + prefix can't be after another word in a compound.
-- Implement COMPOUNDFORBIDFLAG .
-
-Mac unicode patch (Da Woon Jung):
--   Mac: Unicode input and display (Eckehard Berns, 2004 June 27)
-    Other patch from Da Woon Jung, 2005 Jan 16.
-8   Add patch from Muraoka Taro (Mar 16) to support input method on Mac?
-    New patch 2004 Jun 16
-- configuration option for platform: i386, ppc or both.
-    Use __LITTLE_ENDIAN__ to test for current platform.
-- selecting proportional font breaks display
-- UTF-8 text causes display problems.  Font replacement causes this.
-- Command-key mappings do not work. (Alan Schmitt)
-- Add default key mappings for the command key (Alan Schmitt)
-    use http://macvim.org/OSX/files/gvimrc
-- With 'nopaste' pasting is wrong, with 'paste' Command-V doesn't work.
-  (Alan Schmitt)
-
-8   Support four composing/combining characters, needed for Hebrew. (Ron Aaron)
-    Add the 'maxcombining' option to set the nr. of composing characters.
-    At the same time support 32 bit Unicode characters?
-8   "ga" should show all composing characters, also if there are more than 2.
-8   Searching for a composing character by itself should work.  Perhaps "."
-    with a composing char should work too.
-
-Win32: Use the free downloadable compiler 7.1 (2003).  Figure out how to do
-debugging (with Agide?) and describe it. (George Reilly)
-Try out using the free MS compiler and debugger, using Make_mvc.mak.
-Also generate the .pdb file that can be used to generate a useful crash report
-on MS-Windows. (George Reilly)
-
-Win32: Check that installer puts menu items in "all users" dir when possible,
-not administrator dir.
-
-When "= evaluation results in a List, use it as a sequence of lines.
-As if join(list, "\n") was used.
+When expanding on the command line, recognize shell commands, such as ":!cmd".
+    Move from ExpandFromContext() to separate function.
+    Check for file being executable.  EW_EXEC
+    Escape special characters ";&<>(){}". Also in file names. (Adri Verhoef)
 
 Autoload:
 - Add a Vim script in $VIMRUNTIME/tools that takes a file with a list of
@@ -105,12 +46,23 @@
     helpfile doc/myscript.txt
   For the "helpfile" item ":helptags" is run.
 
-When expanding on the command line, recognize shell commands, such as ":!cmd".
-Complete command names by searching in $PATH.  When completing file names
-escape special characters ";&<>(){}". (Adri Verhoef)
+Win32: Describe how to do debugging and describe it. (George Reilly)
 
 Are there more commands where v:swapcommand can be set to something useful?
 
+Mac unicode patch (Da Woon Jung):
+-   Mac: Unicode input and display (Eckehard Berns, 2004 June 27)
+    Other patch from Da Woon Jung, 2005 Jan 16.
+8   Add patch from Muraoka Taro (Mar 16) to support input method on Mac?
+    New patch 2004 Jun 16
+- selecting proportional font breaks display
+- UTF-8 text causes display problems.  Font replacement causes this.
+- Command-key mappings do not work. (Alan Schmitt)
+- Add default key mappings for the command key (Alan Schmitt)
+    use http://macvim.org/OSX/files/gvimrc
+- With 'nopaste' pasting is wrong, with 'paste' Command-V doesn't work.
+  (Alan Schmitt)
+
 
 CONSIDERED FOR VERSION 7.0:
 
@@ -1301,6 +1253,21 @@
 
 
 Spell checking:
+-   Implement COMPOUNDFORBIDFLAG .
+-   Check out Hunspell 1.1.4.
+    The manpage doesn't match the source code...
+    Try to make the newly added features compatible.
+    what does MAXNGRAMSUGS do?
+    is COMPLEXPREFIXES necessary when we have flags for affixes?
+-   Look into Hungarian dictionary: hu_HU-1.0.tar.gz
+    This one doesn't match with Hunspell 1.1.4.
+-   Add CHECKCOMPOUNDCASE: when compounding make leading capital lower case.
+    How is it supposed to work?
+-   When compounding Hunspell doesn't allow affixes inside the compound word,
+    only before and after it.  COMPOUNDPERMITFLAG can be used to allow it.
+    Check Myspell and Aspell if they also work this way.
+    Thus a word + suffix needs a flag that it can't be used with a following
+    compound, and word + prefix can't be after another word in a compound.
 -   suggestion for "KG" to "kg" when it's keepcase.
 -   Support flags on a suffix.  Used for second level affixes, rare and
     nocomp.  The flags may also be used for compounding.  Default is an OR