diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 73f4d51..78ad818 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1088,18 +1088,16 @@
 - 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
-- Also crypt the swap file, each block separately.  Change mf_write() and
-    mf_read().
-    - How to get b_p_key to these functions?  -> Store buf_T pointer in mfp.
-    - Generate a salt and seed for the swapfile, put it in block 0.
-    - For each block, use password + seed + byte offset to crypt/decrypt.
-    - When changing the password need to read back with the old password and
-      write again with the new one.
-    - Fill the gaps in the block with random bytes, otherwise it's easy to
-      check for correct password by finding NUL bytes.
-    - Verify recovery works.
+- Also crypt the swap file, each block separately:
+    - When changing the password or 'cryptmethod' need to read back with the
+      old password and write again with the new one.
+      Problem: when the file is not written, key differs between text file and
+      swap file!
+- Patch for :ownsyntax completion (Dominique Pelle, 2010 Jun 20)
 - Patch for conceal feature and 'foldcolumn'. (Dominique Pelle, 2010 Jun 10,
   second patch)
+  Also patch from Vince, 2010 Jun 15.  And another June 16.
+  However: more generic patch on the way.
 - patch for conceal feature and 'modifiable'. (Dominique Pelle, 2010 Jun 9)
 - undofile: keep markers where the file was written/read, so that it's easy to
   go back to a saved version of the file:  ":earlier 1f" (f for file)?
@@ -1110,6 +1108,7 @@
   dictionary: {'nr': 2, 'time': 1234, 'saved': 1}
 - Remove support for GTK 1?  Patch by James Vega, Jun 11.
 Patches to include:
+- Patch for X clibboard CurrentTime, (Fries, 2010 Jun 20)
 - Patch for Lisp support with ECL (Mikael Jansson, 2008 Oct 25)
 - Minor patches from Dominique Pelle, 2010 May 15
 - Gvimext patch to support wide file names. (Szabolcs Horvat 2008 Sep 10)
@@ -1117,8 +1116,9 @@
 - 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 use return value of 'formatexpr'. (James Vega, 2010 Jun 16)
 - Patch to make CTRL-L work better with 'ignorecase' and 'smarcase'. (Martin
-  Toft, 2010 Jun 8)
+  Toft, 2010 Jun 8, Jun 16)
 - Patch to add diff functionality to 2html.vim. (Christian Brabandt, 2009 Dec
   15)
 - Win32: patch for better font scaling. (George Reilly, 2009 Mar 26)