diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 9c26255..b9c61cd 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 8.0.  Last change: 2018 Apr 20
+*todo.txt*      For Vim version 8.0.  Last change: 2018 Apr 30
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -40,32 +40,31 @@
 
 Problem with sudo. #2758
 
+Make assert_functions return non-zero on failure.  Make sure they add one
+entry to v:errors then.
+Use WaitForAssert() in tests: give error when failed.
+Remove asserts after WaitFor().
+
+balloon_show() does not work properly in the terminal. (Ben Jackson, 2017 Dec
+20, #2481)
+Also see #2352, want better control over balloon, perhaps set the position.
+
 Errors found with random data:
     heap-buffer-overflow in alist_add (#2472)
 
-Patch to avoid bad highlighting caused by #if. (ichizok, #2731)
+Patch to shorten filenames in quickfix window. (Yegappan, 2018 Apr 28, #2851,
+closes #2846)
 
-Patch to refactor qf_set_properties(). (Yegappan, Apr 17, #2812)
-
-Patch for static analysis warnings. (Christian Brabandt, 2018 Apr 1, #2770)
-Ther are more here: https://lgtm.com/projects/g/vim/vim/alerts/?mode=list
-
-Patch to refactor ex_helpgrep. (Yegappan, #2766, 2018 Mar 30)
-Also in email, take the one with a test.
-
-Allow for C99 features, decide which ones are OK:
-- "inline"
-- "long long"
-- flexible array members (change code to avoid FORTIFY_SOURCE problems)
+More warnings from static analysis:
+https://lgtm.com/projects/g/vim/vim/alerts/?mode=list
 
 Looks like an error for inserting register makes ":file other" not work.
 (Tom M, 2018 Mar 28)  Reset did_emsg after inserting a register.
 Or at the top of the loop? (Apr 4)
 
-Patch to fix mouse pointer after :tselect. (Hirohito Higashi, #2709)
-How to reproduce the problem?  Remarks by Hirohito, Apr 8.
-
-Patch to avoid job killed when I/O is disconnected. (ichizok, #2734)
+Patch to add "module" to quickfix entries. (Marcin Szamotulski, Coot, 2017 Jun
+8, #1757)  Now part of #2322.  Or #2327?  #1757 was re-opened, include that
+first.
 
 When opening foo/x.txt and bar/x.txt get swap file warning.  Should check the
 file name. (Juergen Weigert)
@@ -80,14 +79,6 @@
 - Test_setbufvar_options()
 - Test_exit_callback_interval()
 
-Mouse pointer sticks to stop shape.  Only on Windows GUI?  #2709
-
-Patch to make log_tr() use variable arguments. (Ichizok, 2018 Mar 20, #2730)
-
-balloon_show() does not work properly in the terminal. (Ben Jackson, 2017 Dec
-20, #2481)
-Also see #2352, want better control over balloon, perhaps set the position.
-
 Try out background make plugin: 
   https://github.com/AndrewVos/vim-make-background
 or asyncmake: 
@@ -96,18 +87,13 @@
 Add a ModeChanged autocommand that has an argument indicating the old and new
 mode.  Also used for switching Terminal mode.
 
-Cursor in status line after search. (#2530)
+Patch to shorten filenames in quickfix window. (Yegappan Lakshmanan, 2018
+Apr 27)
 
 Add an option with file patterns, to be used when unloading a buffer: If there
 is a match, remove entries for the buffer from marks, jumplist, etc.  To be
 used for git temp files.
 
-Patch to fix that an empty buffer remains when using :argedit. (Christian,
-#2713)  Updated patch.
-
-Patch to fix interaction between 'virtualedit' and i_CTRL-G_j. (Christian
-Brabandt, #2743)
-
 Cursor in wrong position when line wraps. (#2540)
 
 Add an option similar to 'lazyredraw' to skip redrawing while executing a
@@ -131,6 +117,9 @@
 
 Check argument of systemlist(). (Pavlov)
 
+Patch to support 256 colors in Windows console. (Nobuhiro Takasaki, 2018 Apr
+25, #2821)
+
 Patch to add reg_executing() and reg_recording(). (Hirohito Higashi, #2745)
 
 No maintainer for Vietnamese translations.
@@ -146,10 +135,6 @@
 Starting job with cwd option, when the directory does not exist, gives a
 confusing error message. (Wang Shidong, 2018 Jan 2, #2519)
 
-Patch to add "module" to quickfix entries. (Marcin Szamotulski, Coot, 2017 Jun
-8, #1757)  Now part of #2322.  Or #2327?  #1757 was re-opened, include that
-first.
-
 Add the debug command line history to viminfo.
 
 Avoid that "sign unplace id" does a redraw right away, esp. when there is a
@@ -163,6 +148,9 @@
 Will have to explain the manual steps (downloading the .aff and .dic files,
 applying the diff, etc.
 
+Pasting a register in Visual mode cannot be repeated. (Mahmoud Al-Qudsi, 2018
+Apr 26, #2849)
+
 User dictionary ~/.vim/spell/lang.utf-8.add not used for spell checking until a
 word is re-added to it. (Matej Cepl, 2018 Feb 6)
 
@@ -252,9 +240,6 @@
 
 Error in emsg with buggy script. (Dominique, 2017 Apr 30)
 
-Using CTRL-G j in insert mode in combination with 'virtualedit' doesn't work
-as expected. (Rich, 2018 March 23, #2743)
-
 Patch to fix encoding in print document name (Yasuhiro Matsumoto, 2017 Dec 20,
 #2478)