diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 7e59d0b..53b0bdd 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 15
+*todo.txt*      For Vim version 8.0.  Last change: 2017 Jul 22
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -35,31 +35,20 @@
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-When redrawing for the channel buffer, command line completion is cleared.
-  (Ramel Eshed, 2017 May 4)
-When a timer triggers the command completion disappears. (Dominique Pelle,
-2017 Jun 13, #1768)
-Caused by 8.0.0592.
-Check if anything was output?  Don't redraw when scrolled. (#1820)
-When redrawing the command line a pending CTRL-R shows ", which is removed.
-
-No maintainer for German translations.
 No maintainer for Vietnamese translations.
 No maintainer for Simplified Chinese translations.
 
 
 Terminal emulator window:
 - Lots of stuff to implement, see src/terminal.c
-- Windows implementation (WiP): https://github.com/mattn/vim/tree/terminal
-    Using winpty ?
--   Running a shell command from the GUI still has limitations.  Look into how
-    the terminal emulator of the Vim shell project can help:
+- 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
--   Add debugger interface.  Implementation for gdb by Xavier de Gaye.
-    Should work like an IDE.  Try to keep it generic.  Now found here:
+- 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.
--   Look into the idevim plugin/script.
--   Related wishes for NetBeans commands:
+- Look into the idevim plugin/script.
+- Related wishes for NetBeans commands:
     - make it possible to have 'defineAnnoType' also handle terminal colors.
     - send 'balloonText' events for the cursor position (using CursorHold ?)
       in terminal mode.
@@ -136,8 +125,8 @@
   Another one: echom matchstr(" sdfsfsf\n sfdsdfsdf",'[^\n]*')
   (2017 May 15, #1252)
 
-Patch to update b:changedtick in the quickfix window. (Yegappan Lakshmanan,
-2017 Jul 13)
+Patch for quickfix: parse lines for any quickfix list. (Yegappan Lakshmanan,
+2017 Jul 20)
 
 With foldmethod=syntax and nofoldenable comment highlighting isn't removed.
 (Marcin Szewczyk, 2017 Apr 26)
@@ -151,10 +140,6 @@
 
 Better detection of strace file. (Steven Fernandez, 2017 Jul 12, #1837)
 
-To reproduce problems "vim -u NONE -N" is often used, but this still uses
-'viminfo'. Add "-I" to not use 'viminfo'?
-Or use "vim -B" for "bug reproduction"?
-
 Bug with conceal mode: 3rd element returned by synconcealed() differs for
 every call. (Dominique Pelle, 2017 Jun 18)
 
@@ -162,18 +147,31 @@
 defaults for a plugin. Comments from Zyx, 2017 May 10.
 Perhaps use a vimcontext / endvimcontext command block.
 
-Patch to trigger OptionSet when entering diff mode. (Christian Brabandt, 2017
-Jul 7)
-
 Illegal memory access, requires ASAN to see. (Dominique Pelle, 2015 Jul 28)
 Still happens (2017 Jul 9)
 
 Memory leak in test_arabic.
 
+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.
+
 Refactored HTML indent file. (Michael Lee, #1821)
 
 Using uninitialzed value in test_crypt.
 
+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)
+    mydict~get(idx)
+    mystring~len()
+Alternatives for ~:
+    ^  list^get()    could also be used
+    .  list.get()    already means concatenate
+    $  list$get()    harder to read
+    @  list@get()    harder to read
+    ->  list->get()  two characters, used for lambda
+
 X11: Putting more than about 262040 characters of text on the clipboard and
 pasting it in another Vim doesn't work.  (Dominique Pelle, 2008 Aug 21-23)
 clip_x11_request_selection_cb() is called with zero value and length.
@@ -187,6 +185,10 @@
 When checking if a bufref is valid, also check the buffer number, to catch the
 case of :bwipe followed by :new.
 
+Patch to skip writing a temp file for diffing if the buffer is equal to the
+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)
 
 MS-Windows: Opening same file in a second gvim hangs. (Sven Bruggemann, 2017
@@ -1057,9 +1059,6 @@
 Patch to add ":undorecover", get as much text out of the undo file as
 possible. (Christian Brabandt, 2014 Mar 12, update Aug 22)
 
-Include Haiku port? (Adrien Destugues, Siarzhuk Zharski, 2013 Oct 24)
-It can replace the BeOS code, which is likely not used anymore.
-
 Updated spec ftplugin. (Matěj Cepl, 2013 Oct 16)
 
 Patch to right-align signs. (James Kolb (email james), 2013 Sep 23)