--- a/runtime/doc/gui_x11.txt
+++ b/runtime/doc/gui_x11.txt
@@ -458,9 +458,7 @@ are obtained through the 'gtk-config' sh
 
 If you want to build with GTK+ 2 support pass the --enable-gtk2-check argument
 to ./configure.  Optionally, support for GNOME 2 will be compiled if the
---enable-gnome-check option is also given.  Note that the support for GTK+ 2
-is still experimental.  However, many people have reported that it works just
-fine for them.
+--enable-gnome-check option is also given.
 
 Otherwise, if you are using Motif or Athena, when you have the Motif or Athena
 files in a directory where configure doesn't look, edit the Makefile to enter
@@ -468,15 +466,12 @@ the names of the directories.  Search fo
 the Motif directories, "CONF_OPT_X" for Athena.
 
 							*gui-x11-gtk*
-At the time of this writing, you may use either GTK+ version 1.0.6 or 1.2.  It
-is suggested that you use v1.2 since not all of Vim's GUI features are present
-if using v1.0.6.  For instance, there are no tearoff menus present in v1.0.6.
-Using a version from GTK+'s CVS tree may or may not work, and is therefore not
-supported and not recommended.
+At the time of this writing, GTK+ version 1.0.6 and 1.2 are outdated.  It
+is suggested that you use GTK 2.  The GTK 1 support will most likely be
+dropped soon.
 
-For the experimental GTK+ 2 GUI, using the latest release of the GTK+ 2.0 or
-GTK+ 2.2 series is recommended.  CVS HEAD seems to work fine most of time as
-well.
+For the GTK+ 2 GUI, using the latest release of the GTK+ 2.0 or GTK+ 2.2
+series is recommended.
 
 Lastly, although GTK+ has supposedly been ported to the Win32 platform, this
 has not been tested with Vim and is also unsupported.  Also, it's unlikely to

--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -30,7 +30,13 @@ be worked on, but only if you sponsor Vi
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
+internal error hash_add() (Peter Odding)
+    :set tags=/tmp/bad_tags
+    :call taglist('.')
+Also with one line tags file. (Lech Lorens, Jun 9)
+
 gtk_selection_clear_targets not available in GTK1 (Patrick Texier)
+Use #ifdefs to use old code for GTK1.
 
 Cursor positioning wrong with 0x200e character. (John Becket, 2010 May 6)
 
@@ -125,6 +131,9 @@ Slow combination of folding and PHP synt
 it.  Caused by "syntax sync fromstart" in combination with patch 7.2.274.
 (Christian Brabandt, 2010 May 27)
 
+When completion inserts the first match, it may trigger the line to be folded.
+Disable updating folds while completion is active? (Peter Odding, 2010 Jun 9)
+
 In command line window ":close" doesn't work properly. (Tony Mechelynck, 2009
 Jun 1)
 
@@ -1084,6 +1093,7 @@ restored. (Luc St-Louis)
 
 
 Vim 7.3:
+- crash when reloading file. (Namsh, 2010 Jun 11)
 - using NSIS 2.46: install on Windows 7 works, but no "Edit with Vim" menu.
    Use register_shell_extension()? (George Reilly, 2010 May 26)
    Ron's version: http://dev.ronware.org/p/vim/finfo?name=gvim.nsi
@@ -1107,7 +1117,10 @@ Vim 7.3:
   Show "file saved" marker in :undolist
   Function to get undo tree: undotree().  List of lists.  Each entry is a
   dictionary: {'nr': 2, 'time': 1234, 'saved': 1}
-- Remove support for GTK 1?
+- Patch for conceal feature and 'foldcolumn'. (Dominique Pelle, 2010 Jun 10,
+  second patch)
+- patch for conceal feature and 'modifiable'. (Dominique Pelle, 2010 Jun 9)
+- Remove support for GTK 1?  Patch by James Vega, Jun 11.
 Patches to include:
 - Patch for Lisp support with ECL (Mikael Jansson, 2008 Oct 25)
 - Minor patches from Dominique Pelle, 2010 May 15
@@ -1116,6 +1129,8 @@ Patches to include:
 - Patch to support clipboard for Mac terminal. (Jjgod Jiang, 2009 Aug 1)
 - Patch to support :browse for more commands. (Lech Lorens, 2009 Jul 18)
 - Patch to improve javascript indenting. (Hari Kumar G, 2010 May 22)
+- Patch to make CTRL-L work better with 'ignorecase' and 'smarcase'. (Martin
+  Toft, 2010 Jun 8)
 - Patch to add diff functionality to 2html.vim. (Christian Brabandt, 2009 Dec
   15)
 - Win32: patch for better font scaling. (George Reilly, 2009 Mar 26) 

--- a/src/undo.c
+++ b/src/undo.c
@@ -1279,7 +1279,7 @@ u_write_undo(name, forceit, buf, hash)
     if (buf->b_u_numhead == 0 && buf->b_u_line_ptr == NULL)
     {
 	if (p_verbose > 0)
-	    verb_msg((char_u *)_("Skipping undo file write, noting to undo"));
+	    verb_msg((char_u *)_("Skipping undo file write, nothing to undo"));
 	goto theend;
     }