diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index e5e934b..75c0522 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.0c.  Last change: 2006 Mar 29
+*todo.txt*      For Vim version 7.0c.  Last change: 2006 Apr 05
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,22 +30,22 @@
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-When "search" is in 'foldopen' have [s and ]s open folds.
-
 New Hungarian dictionary. (Laci Nemeth)
-    test COMPOUNDFORBIDFLAG
-    implement use of COMPOUNDPERMITFLAG
-    implement use of CHECKCOMPOUND* flags, <compoptions>
-    implement using CHECKCOMPOUNDPATTERN: match words with sl_comppat[].
-    explain the use of affix flags, replace |spell-affix-rare|
+-   Support flags on a suffix used for second level affixes.
+    The flags may also be used for compounding.  Default is an OR
+    mechanism with the flags of the word.
+    Adding "compset" flag on the affixes means the compound flags of the word
+    are not used?
 
--   Set user variables to the names of the actually used user vimrc file,
-    the first directory looked for user plugins/syntax files.
-    $MYVIMRC for .vimrc, $MYGVIMRC for .gvimrc, $MYRUNTIME/plugin for
-    runtime files?
-    Also: when the environment variable exists, use it.  If it doesn't
-    exist, set it.  Requires good names: $VIM_USER_VIMRC  $VIM_USER_DIR
-    Add a menu item "Preferences" that does "sp $MYVIMRC".
+-   implement use of CHECKCOMPOUND* flags, <compoptions> in .spl file
+
+-   Add CHECKCOMPOUNDCASE: when compounding make leading capital lower case.
+    How is it supposed to work?
+
+-   implement using CHECKCOMPOUNDPATTERN: match words with sl_comppat[].
+
+Obey 'switchbuf' "useopen" value for windows in other tabs, e.g. for :sbuffer.
+Or use another value, e.g., "usetab"?
 
 Add more tests for all new functionality in Vim 7.  Especially new functions.
 
@@ -641,7 +641,7 @@
     UnxUtils.zip archive.
     Alternate one: http://www.pramodx.20m.com/tee_for_win32.htm, but Walter
     Briscoe says it's not as good.
-8   'fillchars' doesn't work for multi-byte characters.
+8   "stl" and "stlnc" in 'fillchars' don't work for multi-byte characters.
 8   Command line completion: buffers "foo.txt" and "../b/foo.txt", completing
     ":buf foo<Tab>" doesn't find the second one. (George V. Reilly)
 7   Output for ":scriptnames" and ":breaklist" should shorten the file names:
@@ -1090,7 +1090,6 @@
 
 
 Tab pages:
-9   Win32 GUI: menu for tab pages line.
 9   GUI implementation for the tab pages line for other systems.
 8   Make GUI menu in tab pages line configurable.  Like the popup menu.
 8   tab pages in the session file, if "tabpages" in 'sessionoptions'
@@ -1106,28 +1105,14 @@
 
 
 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.
+-   Add a command the repeats ]s and z=, showing the misspelled word in its
+    context.  Thus to spell-check a whole file.
 -   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
-    mechanism with the flags of the word.  Adding "compset" on the affixes
-    means the compound flags of the word are not used.
-    Instead of "SFX a 0 add/FLAGS ." we could use "SFX a 0 add . /FLAGS" (or
-    support both).
 -   Support breakpoint character ? 0xb7 and ignore it?  Makes it possible to
     use same wordlist for hyphenation.
 -   Compound word is accepted if nr of words is <= COMPOUNDWORDMAX OR nr of
@@ -1335,6 +1320,8 @@
     cluster can be added to existing syntax items.
 8   C syntax: Don't highlight {} as errors inside () when used like this:
     "({ something })", often used in GCC code.
+7   Add a "startgroup" to a region.  Used like "nextgroup" inside the region,
+    preferred item at the start of the region. (Charles Campbell)
 8   When editing a new file without a name and giving it a name (by writing
     it) and 'filetype' is not set, detect the filetype.  Avoid doing it for
     ":wq file".
@@ -2245,6 +2232,12 @@
 
 
 'cindent', 'smartindent':
+8   Aligning with "e" of "error" because of the ':' doesn't make sense:
+	cout << (  a ? f() : "error")
+8   Wrong indent with default settings when (dl) appears in this line:
+	    (dl)->barbar(
+			 dk);
+    When "(dl)" is changed to "dl" it uses 'sw' * 2 as expected.
 8   Wrong indent below ? : with ():
 	if ((a ? (b) : c) != 0)
 		       aligns with ":".