diff --git a/runtime/compiler/msvc.vim b/runtime/compiler/msvc.vim
index 5fb1f24b36f5a9e6f6d092a85e8b8a5906116627..056225c7d2329fd19698378fa2f92ab4e8a76f47 100644
--- a/runtime/compiler/msvc.vim
+++ b/runtime/compiler/msvc.vim
@@ -1,17 +1,13 @@
 " Vim compiler file
 " Compiler:	Miscrosoft Visual C
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2004 Mar 19
+" Last Change:	2005 Jun 22
 
 if exists("current_compiler")
   finish
 endif
 let current_compiler = "msvc"
 
-if exists(":CompilerSet") != 2		" older Vim always used :setlocal
-  command -nargs=* CompilerSet setlocal <args>
-endif
-
 " The errorformat for MSVC is the default.
-CompilerSet errorformat&
-CompilerSet makeprg=nmake
+setlocal errorformat&
+setlocal makeprg=nmake
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 6159b8fd64b7b397269875586b64ee175d65abc8..feb8e809eb08af14e4417dbc555a32fd9e1fcef7 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -99,25 +99,25 @@ PLANNED FOR VERSION 7.0:
 -   Add SPELLCHECKER, with support for many languages.
     - Spell checking code todo's:
 	- Code for making suggestions:
-	  - ":mkspell" runs out of memory for Polish with utf-8.
-	  - When 'spellfile' directory doesn't exist, ask user to create it?
-	  - When 'spelllang' has more than one language only .add file of
-	    first is used?
-	  - Aspell has the "special" character, useful?
-	  - Can "the the" be added as a bad word?
-		Add BAD item in .aff file, set WF_BANNED flag.
-	  - Simple and fast sound-a-like: mapping list for first char and rest
-		    vowel as first char: *
-		    remove other vowels
-	  - How about words that are split over two lines?  E.g., "et al.".
-	  - When putting map string in .spl file check for duplicate chars.
 	  - Hebrew: also use prefixes for suggestions.  See message from
 	    Kaminsky (June 20) for ideas.
+	  - When "tn" has been marked as bad word it's sometimes still used
+	    for suggestions.  Depends on the order.
+	  - Suggestions for "t he": works well when 'spellsuggest' is "fast",
+	    not when it's "best" or "double".  Sound of "the" is "@", for "t
+	    he" it is "t h".
 	  - The sound-folding doesn't work for multi-byte characters.  It's
 	    very slow too.
+	  - Simple and fast sound-a-like: mapping list for first char and rest
+		    vowel as first char: *
+		    remove other vowels
+	- When 'spellfile' directory doesn't exist, ask user to create it?
+	- When 'spelllang' has more than one language only .add file of
+	  first is used?
 	- Also put list of word characters in word list file.  Otherwise the
 	  one for Italian may differ from the one used for English.
-	- Make "en-rare" spell file.
+	- Make "en-rare" spell file.  Support additional files, e.g.
+	  "medical".
 	  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