diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 38cc9a1..9b08aef 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -38,10 +38,6 @@
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-Crash when ui_breakcheck() called from regexec() calls regexec() recursively.
-(Andy Massimino, #3175)
-Make regexp work recursively, store all globals in "rex"?
-
 Prompt buffer:
 - Add a command line history.
 - delay next prompt until plugin gives OK?
@@ -81,6 +77,8 @@
 - _stat64 is not defined, need to use "struct stat" in vim.h
 - WINVER conflict, should use 0x0600 by default?
 
+Patches for Python: #3162, #3263 (Ozaki Kiichi)
+
 Crash when mixing matchadd and substitute()? (Max Christian Pohle, 2018 May
 13, #2910)  Can't reproduce?
 
@@ -96,29 +94,43 @@
 More warnings from static analysis:
 https://lgtm.com/projects/g/vim/vim/alerts/?mode=list
 
+Patch for Perl 5.28 on Windows. (#3196)
+
 Pasting foo} causes Vim to behave weird. (John Little, 2018 Jun 17)
 Related to bracketed paste.  I cannot reproduce it.
 
 Patch replacing imp with importlib. (#3163)
 
+Patch to make CTRL-S in mswin.vim work better. (#3211)
+But use "gi" instead of "a".
+
 Using ":file" in quickfix window during an autocommand doesn't work. 
 (Jason Franklin, 2018 May 23) Allow for using it when there is no argument.
 
 Patch in pull request #2967: Allow white space in sign text. (Ben Jackson)
 
+Removing flags from 'cpoptions' breaks the Winbar buttons in termdebug.
+(Dominique Pelle, 2018 Jul 16)
+
 Whenever the file name is "~" then expand('%:p') returns $HOME. (Aidan
 Shafran, 2018 Jun 23, #3072)  Proposed patch by Aidan, 2018 Jun 24.
 
 Patch to set w_set_curswant when setting the cursor in language interfaces.
 (David Hotham, 2018 Jun 22, #3060)
 
+Problem with two buffers with the same name a/b, if it didn't exist before and
+is created outside of Vim. (dskloetg, 2018 Jul 16, #3219)
+
 Patch to make CTRL-W <CR> work properly in a quickfix window. (Jason Franklin,
 2018 May 30)
 
-Patch to make mode() return something different for Normal mode when coming
-from Insert mode with CTRL-O. (#3000)
+gethostbyname() is old, use getaddrinfo() if available. (#3227)
 
-Patches for Python: #3162, #3263 (Ozaki Kiichi)
+matchaddpos() gets slow with many matches.  Proposal by Rick Howe, 2018 Jul
+19.
+
+Patch to make mode() return something different for Normal mode when coming
+from Insert mode with CTRL-O. (#3000)  Useful for positioning the cursor.
 
 Script generated by :mksession does not work well if there are windows with
 modified buffers
@@ -231,6 +243,10 @@
 mess up the cache?  (Mike Lee Williams, 2018 Jan 27, #2539)
 Also: 'foldtext' is evaluated too often. (Daniel Hahler, #2773)
 
+With 'foldmethod' "indent" and appending an empty line, what follows isn't
+included in the existing fold.  Deleting the empty line and undo fixes it.
+(Oleg Koshovetc, 2018 Jul 15, #3214)
+
 When using :packadd files under "later" are not used, which is inconsistent
 with packages under "start". (xtal8, #1994)
 
@@ -256,6 +272,8 @@
 
 Add the debug command line history to viminfo.
 
+Issue #686: apply 'F' in 'shortmess' to more messages.  Also #3221.
+
 Avoid that "sign unplace id" does a redraw right away, esp. when there is a
 sequence of these commands. (Andy Stewart, 2018 Mar 16)