--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -50,14 +50,15 @@ Terminal debugger:
   initializing mzscheme avoid the problem, thus it's not some #ifdef.
 
 Terminal emulator window:
+- When the job in the terminal doesn't use mouse events, let the scroll wheel
+  scroll the scrollback, like a terminal does at the shell prompt. #2490
+  And use modeless selection.  #2962
 - With a vertical split only one window is updated. (Linwei, 2018 Jun 2,
   #2977)
 - When pasting should call vterm_keyboard_start_paste(), e.g. when using
   K_MIDDLEMOUSE, calling insert_reg().
 - Users expect parsing the :term argument like a shell does, also support
   single quotes.  E.g. with:  :term grep 'alice says "hello"'  (#1999)
-- How to access selection in Terminal running a shell? (damnskippy, 2018 May
-  27, #29620  When terminal doesn't use the mouse, use modeless selection.
 - Win32: Redirecting input does not work, half of Test_terminal_redir_file()
   is disabled.
 - Win32: Redirecting output works but includes escape sequences.
@@ -78,6 +79,7 @@ Does not build with MinGW out of the box
 - WINVER conflict, should use 0x0600 by default?
 
 Patches for Python: #3162, #3263 (Ozaki Kiichi)
+    Needs update.
 
 Crash when mixing matchadd and substitute()? (Max Christian Pohle, 2018 May
 13, #2910)  Can't reproduce?
@@ -88,41 +90,65 @@ On Win32 when not in the console and t_C
 Errors found with random data:
     heap-buffer-overflow in alist_add (#2472)
 
-Patch to fix that +packages is always in output of :version.
-(thinca, #3198)  reported by Takuya Fujiwara
+Improve fallback for menu translations, to avoid having to create lots of
+files that source the actual file.  E.g. menu_da_de -> menu_da
+Include part of #3242?
+
+Inlcude Chinese-Taiwan translations. (bystar, #3261)
+
+Using mouse for inputlist() doesn't work after patch 8.0.1756. (Dominique
+Pelle, 2018 Jul 22, #3239)  Also see 8.0.0722.  Check both console and GUI.
 
 More warnings from static analysis:
 https://lgtm.com/projects/g/vim/vim/alerts/?mode=list
 
-Patch for Perl 5.28 on Windows. (#3196)
+When handle_drop() is called while the updating_screen is true, it fails
+completely.  Should store the file list and use it when updating_screen is set
+to false in reset_updating_screen().
 
 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)
+Test fails in AppVeyor.
 
 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)
+Memory leak in test_assert:
+==19127==    by 0x2640D7: alloc (misc2.c:874)
+==19127==    by 0x2646D6: vim_strsave (misc2.c:1315)
+==19127==    by 0x1B68D2: f_getcwd (evalfunc.c:4950)
+And:
+==19127==    by 0x2640D7: alloc (misc2.c:874)
+==19127==    by 0x1A9477: set_var (eval.c:7601)
+==19127==    by 0x19F96F: set_var_lval (eval.c:2233)
+==19127==    by 0x19EA3A: ex_let_one (eval.c:1810)
+==19127==    by 0x19D737: ex_let_vars (eval.c:1294)
+==19127==    by 0x19D6B4: ex_let (eval.c:1259)
+Memory leaks in test_channel? (or is it because of fork())
+Using uninitialized value in test_crypt.
+Memory leaks in test_escaped_glob
+==20651==    by 0x2640D7: alloc (misc2.c:874)
+==20651==    by 0x2646D6: vim_strsave (misc2.c:1315)
+==20651==    by 0x3741EA: get_function_args (userfunc.c:131)
+==20651==    by 0x378779: ex_function (userfunc.c:2036)
+Memory leak in test_terminal:
+==23530==    by 0x2640D7: alloc (misc2.c:874)
+==23530==    by 0x2646D6: vim_strsave (misc2.c:1315)
+==23530==    by 0x25841D: FullName_save (misc1.c:5443)
+==23530==    by 0x17CB4F: fix_fname (buffer.c:4794)
+==23530==    by 0x17CB9A: fname_expand (buffer.c:4838)
+==23530==    by 0x1759AB: buflist_new (buffer.c:1889)
+==23530==    by 0x35C923: term_start (terminal.c:421)
+==23530==    by 0x2AFF30: mch_call_shell_terminal (os_unix.c:4377)
+==23530==    by 0x2B16BE: mch_call_shell (os_unix.c:5383)
 
 gethostbyname() is old, use getaddrinfo() if available. (#3227)
 
@@ -152,12 +178,20 @@ Compiler warnings (geeknik, 2017 Oct 26)
 - signed integer overflow in getdecchrs() (#2254)
 - undefined left shift in get_string_tv() (#2250)
 
+Win32 console: <F11> and <F12> typed in Insert mode don't result in normal
+characters. (#3246)
+
 Patch for more quickfix refactoring. (Yegappan Lakshmanan, #2950)
 
 Tests failing for "make testgui" with GTK:
 - Test_setbufvar_options()
 - Test_exit_callback_interval()
 
+When using CTRL-W CR in the quickfix window, the jumplist in the opened window
+is cleared, to avoid going back to the list of errors buffer (would have two
+windows with it).  Can we just remove the jump list entries for the quickfix
+buffer?
+
 Patch to stack and pop the window title and icon. (IWAMOTO Kouichi, 2018 Jun
 22, #3059)
 8   For xterm need to open a connection to the X server to get the window
@@ -446,10 +480,6 @@ The ":move" command does not honor close
 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
-
 Patch to make gM move to middle of line. (Yasuhiro Matsumoto, Sep 8, #2070)
 
 Cannot copy modeless selection when cursor is inside it. (lkintact, #2300)