diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index cd66041..f6da0cf 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 May 04
+*builtin.txt*	For Vim version 8.2.  Last change: 2022 May 09
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -3216,7 +3216,7 @@
 		Return the type of the current command-line completion.
 		Only works when the command line is being edited, thus
 		requires use of |c_CTRL-\_e| or |c_CTRL-R_=|.
-		See |command-completion| for the return string.
+		See |:command-completion| for the return string.
 		Also see |getcmdtype()|, |setcmdpos()| and |getcmdline()|.
 		Returns an empty string when completion is not defined.
 
@@ -5330,7 +5330,7 @@
 		  "lnum"     The line number in "sid", zero if unknown.
 		  "nowait"   Do not wait for other, longer mappings.
 			     (|:map-<nowait>|).
-		  "abbr"     True if this is an |abbreviation|.
+		  "abbr"     True if this is an abbreviation |abbreviations|.
 
 		The dictionary can be used to restore a mapping with
 		|mapset()|.
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index 3823a96..8808e43 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -1,4 +1,4 @@
-*map.txt*       For Vim version 8.2.  Last change: 2022 Apr 14
+*map.txt*       For Vim version 8.2.  Last change: 2022 May 09
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -120,7 +120,8 @@
 			command applies.
 			Use the <buffer> argument to remove buffer-local
 			mappings |:map-<buffer>|
-			Warning: This also removes the default mappings.
+			Warning: This also removes the |mac-standard-mappings|
+			and the |dos-standard-mappings|.
 
 :map				|mapmode-nvo|
 :nm[ap]				|mapmode-n|
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 27b1b1b..3ec5a99 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -1,4 +1,4 @@
-*starting.txt*  For Vim version 8.2.  Last change: 2022 Apr 12
+*starting.txt*  For Vim version 8.2.  Last change: 2022 May 09
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -764,6 +764,8 @@
 One hint: If you want to go to Normal mode to be able to type a sequence of
 commands, use CTRL-L. |i_CTRL-L|
 
+There is no way to stop "easy mode", you need to exit Vim.
+
 ==============================================================================
 4. Initialization				*initialization* *startup*
 
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 38835b1..2525ce4 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -4263,6 +4263,7 @@
 E1270	change.txt	/*E1270*
 E1271	vim9.txt	/*E1271*
 E1274	cmdline.txt	/*E1274*
+E1276	builtin.txt	/*E1276*
 E128	eval.txt	/*E128*
 E129	eval.txt	/*E129*
 E13	message.txt	/*E13*
@@ -4401,6 +4402,7 @@
 E253	mbyte.txt	/*E253*
 E254	message.txt	/*E254*
 E255	sign.txt	/*E255*
+E256	eval.txt	/*E256*
 E257	if_cscop.txt	/*E257*
 E258	remote.txt	/*E258*
 E259	if_cscop.txt	/*E259*
@@ -5312,6 +5314,7 @@
 NetBSD-backspace	options.txt	/*NetBSD-backspace*
 NetBeans	netbeans.txt	/*NetBeans*
 NetUserPass()	pi_netrw.txt	/*NetUserPass()*
+NoDefaultCurrentDirectoryInExePath	builtin.txt	/*NoDefaultCurrentDirectoryInExePath*
 None	eval.txt	/*None*
 Normal	intro.txt	/*Normal*
 Normal-mode	intro.txt	/*Normal-mode*
@@ -6640,6 +6643,8 @@
 expr-!~	eval.txt	/*expr-!~*
 expr-!~#	eval.txt	/*expr-!~#*
 expr-!~?	eval.txt	/*expr-!~?*
+expr-$'	eval.txt	/*expr-$'*
+expr-$quote	eval.txt	/*expr-$quote*
 expr-%	eval.txt	/*expr-%*
 expr-&&	eval.txt	/*expr-&&*
 expr-'	eval.txt	/*expr-'*
@@ -6787,6 +6792,7 @@
 fname_out-variable	eval.txt	/*fname_out-variable*
 fnameescape()	builtin.txt	/*fnameescape()*
 fnamemodify()	builtin.txt	/*fnamemodify()*
+fo-/	change.txt	/*fo-\/*
 fo-1	change.txt	/*fo-1*
 fo-2	change.txt	/*fo-2*
 fo-B	change.txt	/*fo-B*
@@ -7351,8 +7357,10 @@
 getcharpos()	builtin.txt	/*getcharpos()*
 getcharsearch()	builtin.txt	/*getcharsearch()*
 getcharstr()	builtin.txt	/*getcharstr()*
+getcmdcompltype()	builtin.txt	/*getcmdcompltype()*
 getcmdline()	builtin.txt	/*getcmdline()*
 getcmdpos()	builtin.txt	/*getcmdpos()*
+getcmdscreenpos()	builtin.txt	/*getcmdscreenpos()*
 getcmdtype()	builtin.txt	/*getcmdtype()*
 getcmdwintype()	builtin.txt	/*getcmdwintype()*
 getcompletion()	builtin.txt	/*getcompletion()*
@@ -7912,6 +7920,7 @@
 internal-variables	eval.txt	/*internal-variables*
 internal-wordlist	spell.txt	/*internal-wordlist*
 internet	intro.txt	/*internet*
+interp-string	eval.txt	/*interp-string*
 interrupt()	builtin.txt	/*interrupt()*
 intro	intro.txt	/*intro*
 intro.txt	intro.txt	/*intro.txt*
@@ -7920,6 +7929,7 @@
 ip	motion.txt	/*ip*
 iquote	motion.txt	/*iquote*
 is	motion.txt	/*is*
+isabsolutepath()	builtin.txt	/*isabsolutepath()*
 isdirectory()	builtin.txt	/*isdirectory()*
 isinf()	builtin.txt	/*isinf()*
 islocked()	builtin.txt	/*islocked()*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 5bf28e2..f7a3d35 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 May 07
+*todo.txt*      For Vim version 8.2.  Last change: 2022 May 09
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -38,6 +38,9 @@
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
+String interpolation: Handle backslash and quotes in the expression normally,
+do not require escaping.
+
 Once Vim9 is stable:
 - Use Vim9 for more runtime files.
 - Check code coverage, add more tests if needed.
@@ -206,15 +209,15 @@
 - When 'encoding' is not utf-8, or the job is using another encoding, setup
   conversions.
 
-String interpolation: Handle backslash and quotes in the expression normally,
-do not require escaping.
-
 Add autocmd functions. PR #10291
   a couple of outstanding comments, wait for Yegappan to respond
 
 Can deref_func_name() and deref_function_name() be merged?
 
-Some prompts are not translated: #9495
+Add mode bits to maparg() dict?  PR #10356
+
+After patch 8.2.4915 w_botline is computed much more often. Can this be
+reduced?
 
 NFA regexp does not handle composing characters well: #10286
     [ɔ̃] matches both ɔ and ɔ̃
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index 1102f7e..eca2d06 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -1,4 +1,4 @@
-*usr_41.txt*	For Vim version 8.2.  Last change: 2022 Apr 25
+*usr_41.txt*	For Vim version 8.2.  Last change: 2022 May 09
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -2570,6 +2570,7 @@
 There are two special items about these files.  First is a mechanism to allow
 a user to overrule or add to the default file.  The default files start with: >
 
+	vim9script
 	if exists("g:current_compiler")
 	  finish
 	endif
diff --git a/runtime/ftplugin/abaqus.vim b/runtime/ftplugin/abaqus.vim
index b263d0c..5ce565e 100644
--- a/runtime/ftplugin/abaqus.vim
+++ b/runtime/ftplugin/abaqus.vim
@@ -1,7 +1,7 @@
 " Vim filetype plugin file
 " Language:     Abaqus finite element input file (www.abaqus.com)
 " Maintainer:   Carl Osterwisch <osterwischc@asme.org>
-" Last Change:  2012 Apr 30
+" Last Change:  2022 May 09
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin") | finish | endif
@@ -86,11 +86,11 @@
     \ . "|unmap <buffer> <LocalLeader><LocalLeader>"
 
 " Undo must be done in nocompatible mode for <LocalLeader>.
-let b:undo_ftplugin = "let s:cpo_save = &cpoptions|"
+let b:undo_ftplugin = "let b:cpo_save = &cpoptions|"
     \ . "set cpoptions&vim|"
     \ . b:undo_ftplugin
-    \ . "|let &cpoptions = s:cpo_save"
-    \ . "|unlet s:cpo_save"
+    \ . "|let &cpoptions = b:cpo_save"
+    \ . "|unlet b:cpo_save"
 
 " Restore saved compatibility options
 let &cpoptions = s:cpo_save
diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
index 9f84e6d..a5aa5a7 100644
--- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
+++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
@@ -2,7 +2,7 @@
 "
 " Author: Bram Moolenaar
 " Copyright: Vim license applies, see ":help license"
-" Last Change: 2022 May 04
+" Last Change: 2022 May 09
 "
 " WORK IN PROGRESS - The basics works stable, more to come
 " Note: In general you need at least GDB 7.12 because this provides the
@@ -201,8 +201,8 @@
   return 'ok'
 endfunc
 
+" Open a terminal window without a job, to run the debugged program in.
 func s:StartDebug_term(dict)
-  " Open a terminal window without a job, to run the debugged program in.
   let s:ptybuf = term_start('NONE', {
 	\ 'term_name': 'debugged program',
 	\ 'vertical': s:vertical,
@@ -346,8 +346,8 @@
   call s:StartDebugCommon(a:dict)
 endfunc
 
+" Open a window with a prompt buffer to run gdb in.
 func s:StartDebug_prompt(dict)
-  " Open a window with a prompt buffer to run gdb in.
   if s:vertical
     vertical new
   else