diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index dc07b63..e6622af 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 Mar 16
+*todo.txt*      For Vim version 8.0.  Last change: 2018 Mar 29
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -36,18 +36,40 @@
 -------------------- Known bugs and current work -----------------------
 
 Terminal emulator window:
+- dump diff sometimes creates a different way of repeating.
+   Example: https://api.travis-ci.org/v3/job/359102504/log.txt
+  unclear why this can happen.
 - Still some stuff to implement and bugs to fix, see src/terminal.c
-- Crash when using popup menu while balloon is visible?
-- Test_terminal_qall_kill_func if flaky
-- Drop options argument of term_dumpdiff() / termp_dumpload() ?
 
 Mode message isn't updated on vertical split. (Alexei Averchenko, 2018 Feb 2,
 #2611)
 
+Patch to fix vimgrep adding to wrong quickfix list. (Yegappan, 2018 Mar 25)
+
+Problem with sudo. #2758
+
+Code refactoring, macro for message, #2729
+
+Patch to enforce c89 compliance. (James McCoy, #2735)
+With fix for Mac from Kazunobu.
+
 Errors found with random data:
     heap-buffer-overflow in alist_add (#2472)
 
-Implement option_save() and option_restore().
+Patch to avoid bad highlighting caused by #if. (ichizok, #2731)
+
+Implement option_save() and option_restore()?  Or remove the help.
+
+Looks like an error for inserting register makes ":file other" not work.
+(Tom M, 2018 Mar 28)
+
+Patch to fix mouse pointer after :tselect. (Hirohito Higashi, #2709)
+How to reproduce the problem?
+
+Patch to avoid job killed when I/O is disconnected. (ichizok, #2734)
+
+When opening foo/x.txt and bar/x.txt get swap file warning.  Should check the
+file name. (Juergen Weigert)
 
 Compiler warnings (geeknik, 2017 Oct 26):
 - signed integer overflow in do_sub() (#2249)
@@ -55,8 +77,14 @@
 - signed integer overflow in getdecchrs() (#2254)
 - undefined left shift in get_string_tv() (#2250)
 
+Tests failing for "make testgui" with GTK:
+- 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.
@@ -71,10 +99,18 @@
 
 Cursor in status line after search. (#2530)
 
+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)
 
 Alternative manpager.vim. (Enno, 2018 Jan 5, #2529)
 
+Patch to add more flags to :ls. (Marcin Szamotulski, #2751)
+
 Does setting 'cursorline' cause syntax highlighting to slow down?  Perhaps is
 mess up the cache?  (Mike Lee Williams, 2018 Jan 27, #2539)
 
@@ -84,8 +120,12 @@
 Column number is wrong when using 'linebreak' and 'wrap'. (Keith Smiley, 2018
 Jan 15, #2555)
 
+":bufdo e" disabled syntax HL in windows other than the current. (BPJ)
+
 Check argument of systemlist(). (Pavlov)
 
+Patch to add reg_executing() and reg_recording(). (Hirohito Higashi, #2745)
+
 No maintainer for Vietnamese translations.
 No maintainer for Simplified Chinese translations.
 
@@ -126,6 +166,9 @@
 Using 'wildignore' also applies to literally entered file name.  Also with
 :drop (remote commands).
 
+Patch to use the xdiff library instead of external diff. (Christian Brabandt,
+2018 Mar 20, #2732)
+
 "gvim --remote" from a directory with non-word characters changes the current
 directory (Paulo Marcel Coelho Arabic, 2017 Oct 30, #2266)
 Also see #1689.
@@ -150,6 +193,8 @@
 Get a "No Name" buffer when 'hidden' is set and opening a new window from the
 quickfix list. (bfrg, 2018 Jan 22, #2574)
 
+CTRL-X on zero gets stuck on 0xfffffffffffffffe. (Hengyang Zhao, #2746)
+
 A function on a dictionary is not profiled. (ZyX, 2010 Dec 25)
 
 Patch to fix E806. (Dominique, 2017 Nov 22, #2368)
@@ -161,10 +206,23 @@
 Invalid range error when using BufWinLeave for closing terminal.
 (Gabriel Barta, 2017 Nov 15, #2339)
 
+Using an external diff is inefficient.  Not all systems have a good diff
+program available (esp. MS-Windows).  Would be nice to have in internal diff
+implementation.  Can then also use this for displaying changes within a line.
+Olaf Dabrunz is working on this. (10 Jan 2016)
+9   Instead invoking an external diff program, use builtin code.  One can be
+    found here: http://www.ioplex.com/~miallen/libmba/dl/src/diff.c
+    It's complicated and badly documented.
+Alternative: use the xdiff library.  Patch from Christian Brabandt, 2018 Mar
+2018, #2732)
+
 ml_get errors with buggy script. (Dominique, 2017 Apr 30)
 
 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)
 
@@ -222,6 +280,10 @@
 
 Window not closed when deleting buffer. (Harm te Hennepe, 2017 Aug 27, #2029)
 
+Duplication of completion suggestions for ":!hom".  Issue #539.
+Patch by Christian, 2016 Jan 29
+Another patch in #2733.
+>
 Add options_default() / options_restore() to set several options to Vim
 defaults for a plugin. Comments from Zyx, 2017 May 10.
 Perhaps use a vimcontext / endvimcontext command block.
@@ -237,6 +299,9 @@
 
 The ":move" command does not honor closed folds. (Ryan Lue, #2351)
 
+Patch to fix increment/decrement not working properly when 'virtualedit' is
+set. (Hirohito Higashi, 2016 Aug 1, #923)
+
 Memory leaks in test_channel? (or is it because of fork())
 Using uninitialized value in test_crypt.
 Memory leaks in test_escaped_glob
@@ -547,14 +612,6 @@
 When 'completeopt' has "noselect" does not insert a newline. (Lifepillar, 2017
 Apr 23, #1653)
 
-Using an external diff is inefficient.  Not all systems have a good diff
-program available (esp. MS-Windows).  Would be nice to have in internal diff
-implementation.  Can then also use this for displaying changes within a line.
-Olaf Dabrunz is working on this. (10 Jan 2016)
-9   Instead invoking an external diff program, use builtin code.  One can be
-    found here: http://www.ioplex.com/~miallen/libmba/dl/src/diff.c
-    It's complicated and badly documented.
-
 Window resizing with 'winfixheight': With a vertical split the height changes
 anyway. (Tommy allen, 2017 Feb 21, #1502)
 
@@ -570,8 +627,6 @@
 
 Patch to add Zstandard compressed file support. (Nick Terrell, 2016 Oct 24)
 
-Patch to add trim() function. (Bukn, 2016 Nov 25, #1280)
-
 Patch to add MODIFIED_BY to MSVC build file. (Chen Lei, 2016 Nov 24, #1275)
 
 Patch to change argument of :marks. (LemonBoy, 2017 Jan 29, #1426)
@@ -774,9 +829,6 @@
 It's possible to add ",," to 'wildignore', an empty entry.  Causes problems.
 Reject the value? #710.
 
-Patch to fix increment/decrement not working properly when 'virtualedit' is
-set. (Hirohito Higashi, 2016 Aug 1, #923)
-
 When doing "vi buf.md" a BufNew autocommand for *.md is not triggered.
 Because of using the initial buffer? (Dun Peal, 2016 May 12)
 
@@ -806,9 +858,6 @@
 interfaces: https://github.com/k-takata/vim/tree/chrisbra-appveyor-build
 result: https://ci.appveyor.com/project/k-takata/vim/history
 
-Duplication of completion suggestions for ":!hom".  Issue 539.
-Patch by Christian, 2016 Jan 29
->
 Problem that a previous silent ":throw" causes a following try/catch not to
 work. (ZyX, 2013 Sep 28) With examples: (Malcolm Rowe, 2015 Dec 24)
 
@@ -4313,6 +4362,8 @@
 
 
 Shared libraries:
+8   libcall() can keep the library around instead of always calling dlclose().
+    (Jason Felice, 2018 Mar 20)
 6   Add support for loading shared libraries, and calling functions in it.
 	:libload internal-name libname
 	:libunload internal-name