diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index cf1f062..07c4f05 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.4.  Last change: 2016 Jun 25
+*todo.txt*      For Vim version 7.4.  Last change: 2016 Jul 02
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -34,8 +34,6 @@
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-:clist! +10  list next 10 errors
-
 Further implement 'barline' in viminfo:
 - Use timestamp for more items: locations, marks.
 
@@ -43,6 +41,7 @@
 clear the next list, not the current one.  Ramel Eshed, Jun 8.
 
 +channel:
+- Should write_buf_line() change NL to NUL characters?
 - GUI cursor blinking interrupted when the job output goes to a buffer that is
   in a window. (Ramel Eshed, 2016 Jun 9)
 - GUI cursor blinking interrupted when there is a status line.  (Ramel Eshed,
@@ -64,8 +63,7 @@
 Quickfix improvements for background building and grepping:
   Patch from Yegappan, 2016 Jun 17.
   Need to reset values when starting a new list.
-- Move 'efm' parsing to a separate function.  If 'efm' is the same as last
-  time re-use the fmt_first list.
+- If 'efm' is the same as last time re-use the fmt_first list.
 - Do not clear "dir_stack", "directory" and "file_stack", "currfile" when
   using ":addexpr".
   Move multiline, multiignore, multiscan outside of the function.
@@ -126,19 +124,34 @@
 - Search for /\%d0\+  causes error E363 in a file with consecutive NUL
   characters. (Christian Brabandt, 2016 Jun 7)
 
-Patch to fix problem with GUI termcode. (Kazunobu Kuriyama, 2016 Jun 15)
-
 json_encode(): should convert to utf-8. (Nikolai Pavlov, 2016 Jan 23)
 What if there is an invalid character?
 
 Should json_encode()/json_decode() restrict recursiveness?
 Or avoid recursiveness.
 
+Patch to support 64 bit ints for Number. (Ken Takata, 2016 Jan 21)
+Update 2016 Apr 24.
+Update 2016 Jun 14, includes some tests.
+
+Patch to support expression argument to sort() instead of a function name.
+Yasuhiro Matsumoto, 2013 May 31.
+Or should we add a more general mechanism, like a lambda() function?
+Patch by Yasuhiro Matsumoto, 2014 Sep 16, update 2016 Apr 17.
+Correction for test, Ken Takata, 2016 May 27.
+Merged patch: Ken Takata, 2016 Jun 15.
+
 Once .exe with updated installer is available: Add remark to download page
 about /S and /D options (Ken Takata, 2016 Apr 13)
 
 Cursor positioned in the wrong place when editing src/testdir/test_viml.vim.
 
+Javascript indent wrong after /* in single quoted string:
+    var SRC = 'src/*.js';
+    function log(tag) {
+	a = b;
+    }
+
 Use ADDR_OTHER instead of ADDR_LINES for many more commands.
 Add tests for using number larger than number of lines in buffer.
 
@@ -150,13 +163,6 @@
 'completeopt' noinsert breaks redo register (Shougo, 2016 Jun 18, #874)
 Patch to fix this: #875
 
-Patch to support expression argument to sort() instead of a function name.
-Yasuhiro Matsumoto, 2013 May 31.
-Or should we add a more general mechanism, like a lambda() function?
-Patch by Yasuhiro Matsumoto, 2014 Sep 16, update 2016 Apr 17.
-Correction for test, Ken Takata, 2016 May 27.
-Merged patch: Ken Takata, 2016 Jun 15.
-
 Problem with whitespace in errorformat. (Gerd Wachsmuth, 2016 May 15, #807)
 
 ":caddexpr" should keep state, so that directory changes can be respected.
@@ -165,7 +171,7 @@
 adding iterms.  And keep them in qf_list_T.
 
 Patch to add filtering of the quickfix list. (Yegappan Lakshmanan, 2016 Mar
-13, last version)  Update May 22, #830.
+13, last version)  Update June 26, #830.
 
 When 'autochdir' is set, writing  new file does not change the current dir.
 (Dan Church, issue #777)
@@ -182,6 +188,12 @@
 
 Cannot delete a file with square brackets with delete(). (#696)
 
+No autocommand for when changing directory.  Patch from allen haim, 2016 Jun
+27, #888
+
+Should make ":@r" handle line continuation. (Cesar Romani, 2016 Jun 26)
+Also for ":@.".
+
 Patch to add TabNew, TabNewEntered and TabClosed autocommand events.
 (Felipe Morales, 2015 Feb 1)
 
@@ -211,6 +223,9 @@
 Patch for Python: #622. (Roland Puntaier, 2016 Feb 2)
 What does it change?
 
+When generating the Unicode tables with runtime/tools/unicode.vim the
+emoji_width table has only one entry.
+
 It's possible to add ",," to 'wildignore', an empty entry.  Causes problems.
 Reject the value? #710.
 
@@ -219,18 +234,6 @@
 Update mentioned by Christian, 2016 Apr 25.
 Update from Ken Takata, 2016 Apr 26.
 
-Win32: patch to use 64 bit stat() if possible. (Ken Takata, 2014 May 12)
-More tests May 14. Update May 29.  Update Aug 10.
-Now part of large file patches. (Ken Takata, 2016 Feb 1)
-Win64: Seek error in swap file for a very big file (3 Gbyte).  Check storing
-pointer in long and seek offset in 64 bit var.
-Patches from Ken Takata might help (2014 Apr 17)
-Update 2016 Mar 28.  Can include all parts into one dist patch.
-
-Patch to support 64 bit ints for Number. (Ken Takata, 2016 Jan 21)
-Update 2016 Apr 24.
-Update 2016 Jun 14, includes some tests.
-
 Patch to improve cscope. (Adrian Kocis, #843)
 
 Patch for groovy multi-line comment highlighting. (Justin M. Keyes, 2016 May
@@ -584,7 +587,7 @@
 Patch to make closed folds line up. (Charles Campbell, 2014 Sep 12)
 Remark from Roland Eggner: does it cause crashes? (2014 Dec 12)
 Updated patch by Roland Eggner, Dec 16
-Updated patch from Charles, 2016 Jan 4.
+Updated patch from Charles, 2016 Jul 2
 
 Patch to open folds for 'incsearch'. (Christian Brabandt, 2015 Jan 6)
 
@@ -1161,7 +1164,7 @@
 
 "0g@$" puts '] on last byte of multi-byte. (ZyX, 2011 Jan 22)
 
-Patch to addd TextDeletePost and TextYankPost events. (Philippe Vaucher, 2011
+Patch to add TextDeletePost and TextYankPost events. (Philippe Vaucher, 2011
 May 24)  Update May 26.
 
 Patch for :tabrecently. (Hirokazu Yoshida, 2012 Jan 30)