--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 8.0.  Last change: 2017 Jun 13
+*todo.txt*      For Vim version 8.0.  Last change: 2017 Jul 15
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -35,9 +35,39 @@ entered there will not be repeated below
 							*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:
+    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:
+    http://clewn.sf.net.
+-   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.
+- 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:
-- When redrawing for the channel buffer, command line completion is cleared.
-  (Ramel Eshed, 2017 May 4)
 - Try out background make plugin: 
   https://github.com/AndrewVos/vim-make-background
 - Problem with stderr on Windows? (Vincent Rischmann, 2016 Aug 31, #1026)
@@ -101,14 +131,14 @@ Regexp problems:
   col and vcol when moving to another line.
 - this doesn't work: "syntax match ErrorMsg /.\%9l\%>20c\&\%<28c/".  Leaving
   out the \& works.  Seems any column check after \& fails.
-- The pattern "\1" with the old engine gives E65, with the new engine it
-  matches the empty string. (Dominique Pelle, 2015 Oct 2, Nov 24)
-  had_endbrace[] is set but not initialized or used.
 - Difference between two engines: ".*\zs\/\@>\/" on text "///"
   (Chris Paul, 2016 Nov 13)  New engine not greedy enough?
   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)
+
 With foldmethod=syntax and nofoldenable comment highlighting isn't removed.
 (Marcin Szewczyk, 2017 Apr 26)
 
@@ -119,13 +149,38 @@ ml_get errors with buggy script. (Domini
 
 Error in emsg with buggy script. (Dominique, 2017 Apr 30)
 
+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)
+
 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.
 
-Using freed memory with "qf" FileType autocommand that does :cclose.
-(Lemonboy, 2017 May 28, #1730, fix in 1734, with test that doesn't fail, but
-it fails when run manually)  Add "starting" to test_override()?
+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.
+
+Refactored HTML indent file. (Michael Lee, #1821)
+
+Using uninitialzed value in test_crypt.
+
+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.
+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)
 
 Problem with three-piece comment. (Michael Lee, 2017 May 11, #1696)
 
@@ -134,15 +189,24 @@ case of :bwipe followed by :new.
 
 Files for Latvian language. (Vitolins, 2017 May 3, #1675)
 
+MS-Windows: Opening same file in a second gvim hangs. (Sven Bruggemann, 2017
+Jul 4)
+
 Setting 'clipboard' to "unnamed" makes a global command very slow (Daniel
 Drucker, 2017 May 8).
 This was supposed to be fixed, did it break again somehow?
 Christian cannot reproduce it.
 
+Using composing char in mapping does not work properly. maparg() shows the
+wrong thing. (Nikolai Pavlov, 2017 Jul 8, #1827)
+Or is this not an actual problem?
+
 Better TeX indent file. (Christian Brabandt, 2017 May 3)
 
 Openhab syntax file (mueller, #1678)
 
+Patch to use a separate code for BS on Windows. (Linwei, #1823)
+
 Use gvimext.dll from the nightly build? (Issue #249)
 
 'synmaxcol' works with bytes instead of screen cells. (Llandon, 2017 May 31,
@@ -151,18 +215,17 @@ Use gvimext.dll from the nightly build? 
 Problem with using :cd when remotely editing a file. (Gerd Wachsmuth, 2017 May
 8, #1690)
 
-'equalalways' only works for one column. (Glacambre, 2017 May 15, #1707)
-
 Include solarized color scheme?
 
-Updates to GTK help. (Kazunobu Kuriyama, 2017 May 4)
-
 Running test_gui and test_gui_init with Motif sometimes kills the window
 manager.  Problem with Motif?
 
 Bogus characters inserted when triggering indent while changing text.
 (Vitor Antunes, 2016 Nov 22, #1269)
 
+Using "wviminfo /tmp/viminfo" does not store file marks that Vim knows about,
+it only works when merging with an existing file.  (Shougo, 2017 Jun 19, #1781)
+
 Segmentation fault with complete(). (Lifepillar, 2017 Apr 29, #1668)
 Check for "pat" to be NULL in search_for_exact_line()?
 How did it get NULL?  Comment by Christian, Apr 30.
@@ -172,6 +235,9 @@ Is it possible to keep the complete menu
 
 Memory leak in test97?  The string is actually freed.  Weird.
 
+assert_fails() can only check for the first error.  Make it possible to have
+it catch multiple errors and check all of them.
+
 New value "uselast" for 'switchbuf'. (Lemonboy, 2017 Apr 23, #1652)
 
 Add a toolbar in the terminal.  Can be global, above all windows, or specific
@@ -187,6 +253,11 @@ Perhaps simpler: actually delete the map
 mappings (with a lhs prefix, like maparg()), mapdelete() to delete,
 maprestore() to restore (using the output of maplist().
 
+Patch to add setbufline(). (email from Yasuhiro Matsumoto, patch by Ozaki
+Kiichi, 2016 Feb 28)
+Update Mar 8: https://gist.github.com/mattn/23c1f50999084992ca98
+Update Mar 13: https://gist.github.com/mattn/23c1f50999084992ca98
+
 Add an argument to :mkvimrc (or add aother command) to skip mappings from
 plugins (source is a Vim script).  No need to put these in a .vimrc, they will
 be defined when the plugin is loaded.
@@ -200,6 +271,9 @@ What if there is an invalid character?
 
 Json string with trailing \u should be an error. (Lcd)
 
+import can't be used in define option when include matches too.
+(Romain Lafourcade, 2017 Jun 18, #1519)
+
 When session file has name in argument list but the buffer was deleted, the
 buffer is not deleted when using the session file. (#1393)
 Should add the buffer in hidden state.
@@ -211,10 +285,6 @@ Wrong diff highlighting with three files
 Also get E749 on exit.
 Another example in #1309
 
-Patch to change all use of &sw to shiftwidth(). (Tyru, 2017 Feb 19)
-Takuya Fujiwara
-Wait until maintainers integrate it.
-
 When deleting a mark or register, leave a tombstone, so that it's also deleted
 when writing viminfo (and the delete was the most recent action). #1339
 
@@ -244,6 +314,12 @@ 8   "stl" and "stlnc" in 'fillchars' don
 Using CTRL-G_U in InsertCharPre causes trouble for redo. (Israel Chauca
 Fuentes, 2017 Feb 12, #1470)
 
+Add a "keytrans()" function, which turns the internal byte representation of a
+key into a form that can be used for :map.  E.g.
+    let xx = "\<C-Home>"
+    echo keytrans(xx)
+    <C-Home>
+
 Check for errors E704 and E705 only does VAR_FUNC, should also do VAR_PARTIAL.
 (Nikolai Pavlov, 2017 Mar 13, #1557)
 Make a function to check for function-like type?
@@ -257,9 +333,6 @@ Implement optional arguments for functio
     call Foo(12, all = 0)
     call Foo(12, 15, 0)
 
-writefile() does not abort as soon as an error is found. (Nikolai Pavlov,
-2017 Feb 14, #1476)
-
 Patch to support on-the-spot and over-the-spot input method. (Ken Takata, 2017
 Feb 14).
 
@@ -273,6 +346,10 @@ somewhere else.  :{range}copy {dest} !cm
 Patch to fix that empty first tab is not in session.
 (Hirohito Higashi, 2016 Nov 25, #1282)
 
+Patch to add random number generator. (Hong Xu, 2010 Nov 8, update Nov 10)
+Alternative from Christian Brabandt. (2010 Sep 19)
+New one from Yasuhiro Matsumoto, #1277.
+
 Patch for restoring wide characters in the console buffer.
 (Ken Takata, 2016 Jun 7)
 
@@ -286,9 +363,6 @@ The TermResponse event is not triggered 
 "all".  Netrw does this. (Gary Johnson, 2017 Jan 24)
 Postpone the event until 'eventignore' is reset.
 
-Patch to make urxvt mouse work better, recognize Esc[*M termcap code.
-(Maurice Bos, 2017 Feb 17, #1486)
-
 Expanding /**/ is slow.  Idea by Luc Hermitte, 2017 Apr 14.
 
 Once .exe with updated installer is available: Add remark to download page
@@ -324,11 +398,24 @@ Does this also fix #1408 ?
 
 Patch to add "module" to quickfix entries. (Coot, 2017 Jun 8, #1757)
 
+'cursorline' and match interfere. (Ozaki Kiichi, 2017 Jun 23, #1792)
+
 Patch for 'cursorlinenr' option. (Ozaki Kiichi, 2016 Nov 30)
 
+Patch to be able to separately map CTRL-H and BS on Windows.
+(Linwei, 2017 Jul 11, #1833)
+
 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)
 
@@ -385,9 +472,6 @@ Include the test.
 Patch to add tagfunc().  Cleaned up by Christian Brabandt, 2013 Jun 22.
 New update 2017 Apr 10, #1628
 
-Unnamed register only contains the last deleted text when appending deleted
-text to a register. (Wolfgang Jeltsch, reproduced by Ben Fritz, 2017 Apr 10)
-
 When 'keywordprg' starts with ":" the argument is still escaped as a shell
 command argument. (Romain Lafourcade, 2016 Oct 16, #1175)
 
@@ -405,6 +489,8 @@ execute() cannot be used with command co
 
 cmap using execute() has side effects. (Killthemule, 2016 Aug 17, #983)
 
+:map X may print invalid data. (Nikolay Pavlov, 2017 Jul 3, #1816)
+
 Patch to order results from taglist(). (Duncan McDougall, 2016 Oct 25)
 
 patch for 'spellcamelcase' option: spellcheck each CamelCased word.
@@ -502,9 +588,6 @@ Because of using the initial buffer? (Du
 Patch to add the :bvimgrep command.  (Christian Brabandt, 2014 Nov 12)
 Updated 2016 Jun 10, #858  Update 2017 Mar 28: use <buffer>
 
-Patch to fix that an encoding conversion failure results in a corrupted or
-empty file. (Christian Brabandt, #1765, https://github.com/chrisbra/vim-mq-patches/blob/master/conversion_error)
-
 Add redrawtabline command. (Naruhiko Nishino, 2016 Jun 11)
 
 Neovim patch for utfc_ptr2char_len() https://github.com/neovim/neovim/pull/4574
@@ -522,11 +605,6 @@ Possibly include the needed code so that
 Add a way to restart a timer.  It's similar to timer_stop() and timer_start(),
 but the reference remains valid.
 
-Patch to add setbufline(). (email from Yasuhiro Matsumoto, patch by Ozaki
-Kiichi, 2016 Feb 28)
-Update Mar 8: https://gist.github.com/mattn/23c1f50999084992ca98
-Update Mar 13: https://gist.github.com/mattn/23c1f50999084992ca98
-
 Need to try out instructions in INSSTALLpc.txt about how to install all
 interfaces and how to build Vim with them.
 Appveyor build with self-installing executable, includes getting most
@@ -639,8 +717,6 @@ Patch to add TagNotFound autocommand. (A
 Patch to add Error autocommand. (Anton Lindqvist, 2016 Feb 17)
 Only remembers one error.
 
-Illegal memory access, requires ASAN to see. (Dominique Pelle, 2015 Jul 28)
-
 Gvim: when both Tab and CTRL-I are mapped, use CTRL-I not for Tab.
 
 Unexpected delay when using CTRL-O u.  It's not timeoutlen.
@@ -708,11 +784,6 @@ 30)
 MS-Windows: Crash opening very long file name starting with "\\".
 (Christian Brock, 2012 Jun 29)
 
-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.
-
 The OptionSet autocommand event is not always triggered. (Rick Howe, 2015 Sep
 24): :diffthis, :diffoff.
 
@@ -1408,9 +1479,6 @@ 2011 Feb 27)
 Editing a file with a ^M with 'ff' set to "mac", opening a help file, then the
 ^M is displayed as ^J sometimes.  Getting 'ff' value from wrong window/buffer?
 
-'colorcolumn' has higher priority than hlsearch.  Should probably be the other
-way around. (Nazri Ramliy, 2013 Feb 19)
-
 When Vim is put in the background (SIGTSTP) and then gets a SIGHUP it doesn't
 exit.  It exists as soon as back in the foreground. (Stephen Liang, 2011 Jan
 9)  Caused by vim_handle_signal(SIGNAL_BLOCK); in ui.c.
@@ -1459,14 +1527,13 @@ setpos() does not restore cursor positio
 7   The 'directory' option supports changing path separators to "%" to make
     file names unique, also support this for 'backupdir'. (Mikolaj Machowski)
     Patch by Christian Brabandt, 2010 Oct 21.
+    Is this an update:  related to: #179
+    https://github.com/chrisbra/vim-mq-patches/blob/master/backupdir
+    Fixed patch 2017 Jul 1.
 
 With "tw=55 fo+=a" typing space before ) doesn't work well. (Scott Mcdermott,
 2010 Oct 24)
 
-Patch to add random number generator. (Hong Xu, 2010 Nov 8, update Nov 10)
-Alternative from Christian Brabandt. (2010 Sep 19)
-New one from Yasuhiro Matsumoto, #1277.
-
 Messages in message.txt are highlighted as examples.
 
 When using cp850 the NBSP (0xff) is not drawn correctly. (Brett Stahlman, 2010
@@ -2406,13 +2473,6 @@ respond to selection requests.  Invoking
 the shell doesn't help.  Would require forking and doing a message loop, like
 what happens for the GUI.
 
-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.
-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.
-
 ":vimgrep" does not recognize a recursive symlink.  Is it possible to detect
 this, at least for Unix (using device/inode)?
 
@@ -3275,18 +3335,6 @@ Most interesting new features to be adde
     Alternative: Make a function for Ex commands: cmd_edit().
 -   Add COLUMN NUMBERS to ":" commands ":line1,line2[col1,col2]cmd".  Block
     can be selected with CTRL-V.  Allow '$' (end of line) for col2.
--   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.
-    And the idevim plugin/script.
-    To be able to start the debugger from inside Vim: For GUI run a program
-    with a netbeans connection; for console: start a program that splits the
-    terminal, runs the debugger in one window and reconnect Vim I/O to the
-    other window.
-    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.
 -   ECLIPSE plugin.  Problem is: the interface is very complicated.  Need to
     implement part in Java and then connect to Vim.  Some hints from Alexandru
     Roman, 2004 Dec 15.  Should then also work with Oracle Jdeveloper, see JSR
@@ -3299,9 +3347,6 @@ Most interesting new features to be adde
     scrolls back to where the cursor is.
 -   Scroll commands by screen line. g CTRL-E and g CTRL-Y ?  Requires the
     first line to be able to start halfway.
--   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
 8   Add a command to jump to a certain kind of tag.  Allow the user to specify
     values for the optional fields.  E.g., ":tag size type=m".
     Also allow specifying the file and command, so that the result of
@@ -3490,9 +3535,6 @@ 8   Add hl groups to 'spelllang'?
 Diff mode:
 9   When making small changes, e.g. deleting a character, update the diff.
     Possibly without running diff.
-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 quite big and badly documented though.
 8   Also show difference with the file when editing started?  Should show what
     can be undone. (Tom Popovich)