diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 5f37c74..4cecc83 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -1,4 +1,4 @@
-*builtin.txt*	For Vim version 8.2.  Last change: 2022 Jun 17
+*builtin.txt*	For Vim version 8.2.  Last change: 2022 Jun 27
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1120,10 +1120,10 @@
 		is initiated from 'balloonexpr'.  It will invoke an
 		asynchronous method, in which a callback invokes
 		balloon_show().  The 'balloonexpr' itself can return an
-		empty string or a placeholder.
+		empty string or a placeholder, e.g. "loading...".
 
-		When showing a balloon is not possible nothing happens, no
-		error message.
+		When showing a balloon is not possible then nothing happens,
+		no error message is given.
 		{only available when compiled with the |+balloon_eval| or
 		|+balloon_eval_term| feature}
 
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 2f414cd..e24cfbf 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 8.2.  Last change: 2022 Jun 23
+*options.txt*	For Vim version 8.2.  Last change: 2022 Jun 27
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -5089,8 +5089,9 @@
 				:set listchars+=tab:>-,lead:.
 <							*lcs-leadmultispace*
 	  leadmultispace:c...
-			Like multispace value, but only for leading whitespace
-			overrides |lcs-lead| for leading multiple spaces.
+			Like the |lcs-multispace| value, but for leading
+			spaces only.  Also overrides |lcs-lead| for leading
+			multiple spaces.
 			`:set listchars=leadmultispace:---+` shows ten
 			consecutive leading spaces as:
 				---+---+--XXX ~
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 37dc6d4..35a7c69 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 8.2.  Last change: 2022 Jun 26
+*todo.txt*      For Vim version 8.2.  Last change: 2022 Jun 27
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -602,39 +602,6 @@
 in some cases?  E.g. for ":write" when the changed flag was already off, the
 buffer didn't change at all.
 
-Session file contains absolute paths when "curdir" is removed form
-'sessionoptions', making it impossible to have a session with a relative path.
-(#4450)
-
-Session file only contains local option values for buffers that are in a
-window, not other buffers. (#7532)
-
-Script generated by :mksession does not work well if there are windows with
-modified buffers
-  change "silent only" into "silent only!"
-  change "edit fname" of first buffer to "hide edit fname"
-  skip "badd fname" if "fname" is already in the buffer list
-  remove remark about unloading buffers from documentation
-
-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.
-
-When a session file is created and there are "nofile" buffers, these are not
-filled.  Need to trigger BufReadCmd autocommands.  Also handle deleting the
-initial empty buffer better. (ZyX, 2015 March 8)
-
-Setting the spell file in a session only reads the local additions, not the
-normal spell file. (Enno Nagel, 2014 Mar 29)
-
-Directory wrong in session file, caused by ":lcd" in BufEnter autocommand.
-(Felix Kater, 2009 Mar 3)
-
-Something wrong with session that has "cd" commands and "badd", in such a way
-that Vim doesn't find the edited file in the buffer list, causing the
-ATTENTION message?  (Tony Mechelynck, 2008 Dec 1)
-Also: swap files are in ~/tmp/  One has relative file name ".mozilla/...".
-
 When using a timer callback vgetc_busy is reset, allowing for using input().
 But in a channel callback this does not happen.  We need to do something
 similar to check_due_timer().  Also see #3809.
@@ -662,13 +629,10 @@
 Should also be possible to add highlighting, like in the status line?
 balloonexpr() on MS-Windows GUI doesn't handle accented chars? (nivaemail,
 2018 Sep 14)
-Another request: #3811.
 
 More warnings from static analysis:
 https://lgtm.com/projects/g/vim/vim/alerts/?mode=list
 
-Still a E315 error when using terminal. (Masato Nishihata, #3959)
-
 Not existing directory in CDPATH leads to two shell calls. (#4525)
 
 Use dict_iterate_start() / dict_iterate_next() instead of relying on the
@@ -676,16 +640,10 @@
 
 nvo-mode mapping works on Windows, not on Linux. (#3678)
 
-Missing tests for:
-- add_termcap_entry()
-
 Redo only remembers the last change.  Could use "{count}g." to redo an older
 change.  How does the user know which change?  At least have a way to list
 them: ":repeats".  Add to history, like search history and command line history.
 
-Pasting foo} causes Vim to behave weird. (John Little, 2018 Jun 17)
-Related to bracketed paste.  I cannot reproduce it.
-
 When 'confirm' is set a "silent q" doesn't show the prompt.  It should in this
 case. (Nate Peterson, 2019 Jan 31, #3892)
 For "silent! q" it should not prompt and just fail.
@@ -708,10 +666,6 @@
 scrolls back.  Should allow for this scrolling, like 'scrolloff' does when
 using CTRL-E. (Yee Cheng Chin, #3721)
 
-Invalid memory access with old regexp engine. (Dominique Pelle, 2018 Sep 3,
-#3405)  Introduced by 8.0.1517, which was fixing another memory access error.
-(Sep 8)
-
 Add function to make use of internal diff, working on two lists and returning
 unified diff (list of lines).
 
@@ -730,19 +684,13 @@
 And "extends" and "precedes" are also useful without 'list' set.  Also in
 'fillchars' or another option?
 
-Sourceforge Vim pages still have content, redirect from empty page.
+Sourceforge Vim pages still have content, make them empty, keep redirect.
 Check for PHP errors. (Wayne Davison, 2018 Oct 26)
 
 Problem with Visual yank when 'linebreak' and 'showbreak' are set.
 Patch with tests, but it's not clear how it is supposed to work. (tommm, 2018
 Nov 17)  Asked about this, Dec 22. Christian will have a look.
 
-home_replace() uses $HOME instead of "homedir". (Cesar Martins, 2018 Aug 9)
-
-When the status line uses term_gettitle(), it does not get updated when the
-terminal title changes. (Josh Triplett, 2018 Sep 9, #3418)
-How would we know that the status line needs to be updated?
-
 Update for xim-input-style help (Tony Mechelynck, 2019 Jan 10).
 Feedback from someone who uses this?
 
@@ -759,9 +707,6 @@
 
 Difference between two regexp engines: #3373
 
-Patch to add ch_listen() (Yasuhiro Matsumoto, 2018 Nov 26, #3639)
-What is the practical use for this?  Need an example.
-
 When the last line wraps, selecting with the mouse below that line only
 includes the first screen line. (2018 Aug 23, #3368)
 
@@ -773,11 +718,9 @@
 Add a windowID argument to placing a sign, so that it only shows up in one
 window for the buffer.
 
-Win32 key codes are messy.  Mike Williams tried to fix that, but now old
-mappings no longer work.  Create a new terminal for the better solution?
-
 Compiler warning (geeknik, 2017 Oct 26):
-- undefined left shift in get_string_tv() (#2250)
+- undefined left shift in eval_string(), before hex2nr() (#2250)
+  Use unsigned for "nr".
 
 Add Native language protocol server (LSP) support. (Yegappan Lakshmanan, 2018
 Oct 28)
@@ -789,27 +732,14 @@
 
 Patch to list user digraphs. (Christian Brabandt, 2012 Apr 14)
 
-Patch to add digraph() function. (Christian Brabandt, 2013 Aug 22, update Aug
-24)
-
-Try out background make plugin:
-  https://github.com/AndrewVos/vim-make-background
-or asyncmake:
-  https://github.com/yegappan/asyncmake
-
-Cursor in wrong position when line wraps. (#2540)
-
 Setting 'columns' in a BufEnter autocommand causes a second tab width to
 behave strangely, as if there is a gap and a vertical window separator.
 (Michael Soyka, 2018 Sep 23, #3477)
 
-Make {skip} argument of searchpair() consistent with other places where we
-pass an expression to evaluate.  Allow passing zero for "never skip".
-
 Add an option similar to 'lazyredraw' to skip redrawing while executing a
 script or function.
 
-When using a menu item while the "more" prompt is displayed doesn't work well.
+Using a menu item while the "more" prompt is displayed doesn't work well.
 E.g. after using help->version.  Have a key that ends the "more" prompt and
 does nothing otherwise?
 
@@ -823,26 +753,9 @@
 2017 Feb 9)  Can we expand wildcards first and send the path literally to the
 receiving Vim?  Or make an exception for #, it's not useful remotely.
 
-Should add a test for every command line argument.  Check coverage for what is
-missing: --nofork, -A , -b, -h, etc.
-
-":au * * command" should not be allowed, only use * for event when listing or
-deleting autocmds, not when adding them.
-
 Column number is wrong when using 'linebreak' and 'wrap'. (Keith Smiley, 2018
 Jan 15, #2555)
 
-":bufdo e" disabled syntax HL in windows other than the current. (BPJ)
-
-Check argument of systemlist(). (Pavlov)
-
-No maintainer for Vietnamese translations.
-No maintainer for Simplified Chinese translations.
-
-Python indenting: alternative way to indent arguments:
-http://orchistro.tistory.com/236
-Should be supported with a flag.
-
 Add Makefiles to the runtime/spell directory tree, since nobody uses Aap.
 Will have to explain the manual steps (downloading the .aff and .dic files,
 applying the diff, etc.
@@ -852,9 +765,6 @@
 
 Fold at end of the buffer behaves inconsistently. (James McCoy, 2017 Oct 9)
 
-Using 'wildignore' also applies to literally entered file name.  Also with
-:drop (remote commands).
-
 Implement option_save() and option_restore():
 option_restore({list})					*option_restore()*
 		Restore options previously saved by option_save().
@@ -1688,9 +1598,6 @@
 Add a check for b:no_match_paren in Highlight_matching_Pair() (Marcin
 Szamotulski, 2012 Nov 8)
 
-Session file creation: 'autochdir' causes trouble.  Keep it off until after
-loading all files.
-
 'iminsert' global value set when using ":setlocal iminsert"? (Wu, 2012 Jun 23)
 
 Patch to append regexp to tag commands to make it possible to select one out
@@ -2105,9 +2012,6 @@
 height.  Also happens when there is another window in the frame, if it's not
 very high. (Yegappan Lakshmanan, 2010 Jul 22, Michael Peeters, 2010 Jul 22)
 
-Session file generates error upon loading, cause by --remote-silent-tab.
-(7tommm (ytommm) 2010 Nov 24)
-
 Using ~ works OK on 'a' with composing char, but not on 0x0418  with composing
 char 0x0301. (Tony Mechelynck, 2009 Mar 4)
 
@@ -5510,6 +5414,35 @@
 
 
 Sessions:
+-   Session file contains absolute paths when "curdir" is removed form
+    'sessionoptions', making it impossible to have a session with a relative
+    path.  (#4450)
+-   Session file only contains local option values for buffers that are in a
+    window, not other buffers. (#7532)
+-   Script generated by :mksession does not work well if there are windows
+    with modified buffers:
+      change "silent only" into "silent only!"
+      change "edit fname" of first buffer to "hide edit fname"
+      skip "badd fname" if "fname" is already in the buffer list
+      remove remark about unloading buffers from documentation
+-   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.
+-   When a session file is created and there are "nofile" buffers, these are
+    not filled.  Need to trigger BufReadCmd autocommands.  Also handle
+    deleting the initial empty buffer better. (ZyX, 2015 March 8)
+-   Setting the spell file in a session only reads the local additions, not
+    the normal spell file. (Enno Nagel, 2014 Mar 29)
+-   Directory wrong in session file, caused by ":lcd" in BufEnter autocommand.
+    (Felix Kater, 2009 Mar 3)
+-   Something wrong with session that has "cd" commands and "badd", in such a
+    way that Vim doesn't find the edited file in the buffer list, causing the
+    ATTENTION message?  (Tony Mechelynck, 2008 Dec 1) Also: swap files are in
+    ~/tmp/  One has relative file name ".mozilla/...".
+-   Session file creation: 'autochdir' causes trouble.  Keep it off until
+    after loading all files.
+-   Session file generates error upon loading, cause by --remote-silent-tab.
+    (7tommm (ytommm) 2010 Nov 24)
 8   DOS/Windows: ":mksession" generates a "cd" command where "aa\#bb" means
     directory "#bb" in "aa", but it's used as "aa#bb". (Ronald Hoellwarth)
 7   When there is a "help.txt" window in a session file, restoring that
@@ -5521,7 +5454,6 @@
     default value.
 7   With ":mksession" also store the tag stack and jump history. (Michal
     Malecki)
-7   Persistent variables: "p:var"; stored in viminfo file and sessions files.
 
 
 Options:
diff --git a/runtime/doc/version9.txt b/runtime/doc/version9.txt
index 323829a..8cf03e0 100644
--- a/runtime/doc/version9.txt
+++ b/runtime/doc/version9.txt
@@ -1,4 +1,4 @@
-*version9.txt*  For Vim version 8.2.  Last change: 2022 Jun 25
+*version9.txt*  For Vim version 8.2.  Last change: 2022 Jun 27
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -31600,5 +31600,51 @@
 Solution:   Adjust cmdline_row and msg_row to the value of Rows.
 Files:      src/term.c
 
+Patch 8.2.5161
+Problem:    Might still access invalid memory.
+Solution:   Add extra check for negative value.
+Files:      src/message.c
+
+Patch 8.2.5162
+Problem:    Reading before the start of the line with BS in Replace mode.
+Solution:   Check the cursor column is more than zero.
+Files:      src/edit.c
+
+Patch 8.2.5163
+Problem:    Crash when deleting buffers in diff mode.
+Solution:   Recompute diffs later.  Skip window without a valid buffer.
+Files:      src/diff.c, src/testdir/test_diffmode.vim
+
+Patch 8.2.5164
+Problem:    Invalid memory access after diff buffer manipulations.
+Solution:   Use zero offset when change removes all lines in a diff block.
+Files:      src/diff.c, src/testdir/test_diffmode.vim
+
+Patch 8.2.5165
+Problem:    Import test fails because 'diffexpr' isn't reset.
+Solution:   Reset 'diffexpr'.
+Files:      src/testdir/test_vim9_import.vim
+
+Patch 8.2.5166
+Problem:    Test for DiffUpdated fails.
+Solution:   Also accept a count of two.
+Files:      src/testdir/test_diffmode.vim
+
+Patch 8.2.5167
+Problem:    get(Fn, 'name') on funcref returns special byte code.
+Solution:   Use the printable name.
+Files:      src/evalfunc.c, src/testdir/test_getvar.vim
+
+Patch 8.2.5168
+Problem:    Cannot build with Python 3.11.
+Solution:   Adjust define for _PyObject_TypeCheck. (Zdenek Dohnal,
+            closes #10627)
+Files:      src/if_python3.c
+
+Patch 8.2.5169
+Problem:    Nested :source may use NULL pointer.
+Solution:   Do not use the NULL pointer.
+Files:      src/eval.c, src/testdir/test_vimscript.vim
+
 
  vim:tw=78:ts=8:noet:ft=help:norl: