diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 49fc70a..e41a5da 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1084,9 +1084,14 @@
 
 
 Vim 7.3:
+- Use NSIS 2.45, it includes Windows 7 support.
+	Include "RequestExecutionLevel highest"
+	Ron's version: http://dev.ronware.org/p/vim/finfo?name=gvim.nsi
+- Supply a 64 bit version of gvimext.dll for 64 bit windows.
+    http://code.google.com/p/vim-win3264/
+    Gvim can be 32 bit.
 Patches to include:
-8   Persistent undo bugs / fixes:
-    - Add tests.  Also with different 'enc'
+- Persistent undo bugs / fixes:
     - Add undofile(name): get undo file name for buffer "name".
 - Extend test62 for gettabvar() and settabvar(). (Yegappan Lakshmanan, 2010
   May 23)
@@ -1152,12 +1157,6 @@
 	Patch for Make_ming.mak from Paul Moore (2008 Sep 1)
       http://code.google.com/p/vim-iflua/  Download  vim72-lua-0.7.patch.gz
 Needs some work:
-- Use NSIS 2.45, it includes Windows 7 support.
-	Include "RequestExecutionLevel highest"
-	Ron's version: http://dev.ronware.org/p/vim/finfo?name=gvim.nsi
-- Supply a 64 bit version of gvimext.dll for 64 bit windows.
-    http://code.google.com/p/vim-win3264/
-    Gvim can be 32 bit.
 - Have a look at patch to enable screen access from Python. (Marko Mahnic,
   2010 Apr 12)
 - Patch for Python 3 support. (Roland Puntaier, 2009 Sep 22)
diff --git a/runtime/doc/undo.txt b/runtime/doc/undo.txt
index 05e5555..2c5568e 100644
--- a/runtime/doc/undo.txt
+++ b/runtime/doc/undo.txt
@@ -263,9 +263,10 @@
 *E824*	The version number of the undo file indicates that it's written by a
 	newer version of Vim.  You need that newer version to open it.  Don't
 	write the buffer if you want to keep the undo info in the file.
-"Undo file contents changed"
+"File contents changed, cannot use undo info"
 	The file text differs from when the undo file was written.  This means
-	the undo file cannot be used, it would corrupt the text.
+	the undo file cannot be used, it would corrupt the text.  This also
+	happens when 'encoding' differs from when the undo file was written.
 *E825* *E826*	The undo file does not contain valid contents and cannot be
 	used.
 *E827*	The magic number at the end of the file was not found.  This usually