diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 8e9aca24dda545bac8d1c44792c0ccd142cca007..fa44ff38c0cbd1d8d5d62b711e579c13074da99a 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 Jan 31
+*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Feb 02
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,17 +30,10 @@ be worked on, but only if you sponsor Vim development.  See |sponsor|.
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-List data type performance:
-- Cache the length of a List?
-- Cache the last used index?
-- Use blocks of items, so that finding an item by index is faster?
-
-Can ":grep" made faster somehow?  Do profiling.
-":vimgrep pat %" doesn't work.
-
 Sanity check of eval.c:
-- Go through the code for magic braces.
 - Check use of v_type for VAR_FUNC, VAR_LIST ad VAR_DICT.
+- Go through the code for magic braces.
+- Check list watchers.
 
 Mention rsync command on runtime.php page:
     rsync -avzcP --delete --exclude="dos" --delete-excluded ftp.nluug.nl::Vim/runtime/ vim63-runtime
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index 950f52a09cdbc3d284e590fb0340345b43c0400f..cf8d842eef5baed48229154d7faf95b5c6abeb58 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 Jan 31
+*version7.txt*  For Vim version 7.0aa.  Last change: 2005 Feb 01
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -722,4 +722,6 @@ starts with "sl".
 When 'paste' is set in the GUI the Paste toolbar button doesn't work.  Clear
 'paste' when starting the GUI.
 
+A message about a wrong viminfo line included the trailing NL.
+
  vim:tw=78:ts=8:ft=help:norl:
diff --git a/src/main.c b/src/main.c
index 3b888f278b54109a9e3835a8da240cd119222b71..0919a47428ed8b0a2e7176d46297ed0617a9c33e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2469,7 +2469,7 @@ mainerr(n, str)
 #endif
 
     mch_errmsg(longVersion);
-    mch_errmsg("\n");
+    mch_errmsg("\r\n");
     mch_errmsg(_(main_errors[n]));
     if (str != NULL)
     {
@@ -2477,7 +2477,7 @@ mainerr(n, str)
 	mch_errmsg((char *)str);
 	mch_errmsg("\"");
     }
-    mch_errmsg(_("\nMore info with: \"vim -h\"\n"));
+    mch_errmsg(_("\nMore info with: \"vim -h\"\r\n"));
 
     mch_exit(1);
 }