diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 53b0bdd..3f20e1b 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 8.0.  Last change: 2017 Jul 22
+*todo.txt*      For Vim version 8.0.  Last change: 2017 Aug 01
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -35,6 +35,8 @@
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
+Check out coverity reports.
+
 No maintainer for Vietnamese translations.
 No maintainer for Simplified Chinese translations.
 
@@ -43,7 +45,8 @@
 - Lots of stuff to implement, see src/terminal.c
 - Running a shell command from the GUI still has limitations.  Look into how
   the terminal emulator of the Vim shell project can help:
-    http://vimshell.wana.at
+    http://code.hootsuite.com/vimshell/
+- Add winpty.dll and winpty-agent.exe in the NSIS build.
 - Add debugger interface.  Implementation for gdb by Xavier de Gaye.  Should
   work like an IDE.  Try to keep it generic.  Now found here:
     http://clewn.sf.net.
@@ -52,9 +55,6 @@
     - make it possible to have 'defineAnnoType' also handle terminal colors.
     - send 'balloonText' events for the cursor position (using CursorHold ?)
       in terminal mode.
-- Feature: switch between "running job" and a normal buffer (possibly
-  read-only) to allow for searching, copy/paste, etc. (Domnique).  Having a
-  (large) scrollback would be useful.
 
 +channel:
 - Try out background make plugin: 
@@ -125,6 +125,9 @@
   Another one: echom matchstr(" sdfsfsf\n sfdsdfsdf",'[^\n]*')
   (2017 May 15, #1252)
 
+test_gui fails with gnome2: cannot create .gnome2 dir
+    use  testdir/Xfakehome  instead of does/not/exist?
+
 Patch for quickfix: parse lines for any quickfix list. (Yegappan Lakshmanan,
 2017 Jul 20)
 
@@ -138,6 +141,8 @@
 
 Error in emsg with buggy script. (Dominique, 2017 Apr 30)
 
+Patch for Murphi syntax. (Matthew Fernandez, 2017 Jul 24)
+
 Better detection of strace file. (Steven Fernandez, 2017 Jul 12, #1837)
 
 Bug with conceal mode: 3rd element returned by synconcealed() differs for
@@ -147,6 +152,11 @@
 defaults for a plugin. Comments from Zyx, 2017 May 10.
 Perhaps use a vimcontext / endvimcontext command block.
 
+Signs drawn on top of messages. (worp, #1907)
+
+Folds open when job writes to another buffer. (Jonathan Fudger, 2017 Jul 31)
+Already fixed?
+
 Illegal memory access, requires ASAN to see. (Dominique Pelle, 2015 Jul 28)
 Still happens (2017 Jul 9)
 
@@ -154,12 +164,15 @@
 
 Include Haiku port? (Adrien Destugues, Siarzhuk Zharski, 2013 Oct 24)
 It can replace the BeOS code, which is likely not used anymore.
-Now on github: #1856.  Is not up-to-date.
+Now on github: #1856.  Is now up-to-date?
 
 Refactored HTML indent file. (Michael Lee, #1821)
 
 Using uninitialzed value in test_crypt.
 
+Test_writefile_fails_conversion failure on Solaris because if different iconv
+behavior.  Skip when "uname" returns "SunOS"? (Pavel Heimlich, #1872)
+
 All functions are global, which makes functions like get() and len() awkward.
 For the future use the ~get() and ~len() syntax, e.g.:
     mylist~get(idx)
@@ -178,10 +191,19 @@
 Also: Get an error message from free() in the process that owns the selection.
 Seems to happen when the selection is requested the second time, but before
 clip_x11_convert_selection_cb() is invoked, thus in X library code.
-Patch to fix this by Kiichi, 2017 Jul 11, #1822)
+Kazunobu Kuriyama is working on a proper fix. (2017 Jul 25)
 
 Problem with three-piece comment. (Michael Lee, 2017 May 11, #1696)
 
+Completion mixes results from the current buffer with tags and other files.
+Happens when typing CTRL-N while still search for results.  E.g., type "b_" in
+terminal.c and then CTRL-N twice.
+Should do current file first and not split it up when more results are found.
+(Also #1890)
+
+Python: After "import vim" error messages only show the first line of the
+stack trace. (Yggdroot, 2017 Jul 28, #1887)
+
 When checking if a bufref is valid, also check the buffer number, to catch the
 case of :bwipe followed by :new.
 
@@ -189,7 +211,7 @@
 existing file. (Akria Sheng, 2017 Jul 22)
 Could also skip writing lines that are the same.
 
-Files for Latvian language. (Vitolins, 2017 May 3, #1675)
+Patch with Files for Latvian language. (Vitolins, 2017 May 3, #1675)
 
 MS-Windows: Opening same file in a second gvim hangs. (Sven Bruggemann, 2017
 Jul 4)
@@ -237,6 +259,9 @@
 
 Memory leak in test97?  The string is actually freed.  Weird.
 
+Patch to add configure flags to skip rtl, farsi and arabic support.
+(Diego Carrión, #1867)
+
 assert_fails() can only check for the first error.  Make it possible to have
 it catch multiple errors and check all of them.
 
@@ -5620,11 +5645,11 @@
 -   Support %name% expansion for "gf" on Windows.
 -   Make "gf" work on "file://c:/path/name".  "file:/c:/" and "file:///c:/"
     should also work?
--   Add 'urlpath', used like 'path' for when "gf" used on an URL?
+-   Add 'urlpath', used like 'path' for when "gf" used on a URL?
 8   When using "gf" on an absolute file name, while editing a remote file
     (starts with scp:// or http://) should prepend the method and machine
     name.
--   When finding an URL or file name, and it doesn't exist, try removing a
+-   When finding a URL or file name, and it doesn't exist, try removing a
     trailing '.'.
 -   Add ":path" command modifier.  Should work for every command that takes a
     file name argument, to search for the file name in 'path'.	Use