diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index ee2dc56..4536d5b 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 8.2.  Last change: 2021 Apr 25
+*autocmd.txt*   For Vim version 8.2.  Last change: 2021 May 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -985,9 +985,10 @@
 							*QuitPre*
 QuitPre				When using `:quit`, `:wq` or `:qall`, before
 				deciding whether it closes the current window
-				or quits Vim.  Can be used to close any
-				non-essential window if the current window is
-				the last ordinary window.
+				or quits Vim.  For `:wq` the buffer is written
+				before QuitPre is triggered.  Can be used to
+				close any non-essential window if the current
+				window is the last ordinary window.
 				Also see |ExitPre|.
 							*RemoteReply*
 RemoteReply			When a reply from a Vim that functions as
diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index 2cd96d0..5564f5d 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 8.2.  Last change: 2021 May 08
+*cmdline.txt*   For Vim version 8.2.  Last change: 2021 May 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1134,7 +1134,7 @@
 It is possible to use ":", "/" and other commands that use the command-line,
 but it's not possible to open another command-line window then.  There is no
 nesting.
-							*E11*
+							*E11* *E1188*
 The command-line window is not a normal window.  It is not possible to move to
 another window or edit another buffer.  All commands that would do this are
 disabled in the command-line window.  Of course it _is_ possible to execute
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt
index 62201d4..2a231b1 100644
--- a/runtime/doc/diff.txt
+++ b/runtime/doc/diff.txt
@@ -1,4 +1,4 @@
-*diff.txt*      For Vim version 8.2.  Last change: 2021 Feb 10
+*diff.txt*      For Vim version 8.2.  Last change: 2021 May 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -345,9 +345,11 @@
 
 The ">" is replaced with the value of 'shellredir'.
 
-The output of "diff" must be a normal "ed" style diff or a unified diff.  Do
-NOT use a context diff.  This example explains the format that Vim expects for
-the "ed" style diff: >
+The output of "diff" must be a normal "ed" style diff or a unified diff.  A
+context diff will NOT work.  For a unified diff no context lines can be used.
+Using "diff -u" will NOT work, use "diff -U0".
+
+This example explains the format that Vim expects for the "ed" style diff: >
 
 	1a2
 	> bbb
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index 1351d4e..2331798 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -1,4 +1,4 @@
-*editing.txt*   For Vim version 8.2.  Last change: 2021 Apr 05
+*editing.txt*   For Vim version 8.2.  Last change: 2021 May 27
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1320,8 +1320,8 @@
 							*:chd* *:chdir*
 :chd[ir][!] [path]	Same as |:cd|.
 
-							*:tcd*
-:tcd[!] {path}		Like |:cd|, but only set the directory for the current
+							*:tc* *:tcd*
+:tc[d][!] {path}	Like |:cd|, but only set the directory for the current
 			tab.  The current window will also use this directory.
 			The current directory is not changed for windows in
 			other tabs and for windows in the current tab that
@@ -1331,7 +1331,7 @@
 :tch[dir][!]		Same as |:tcd|.
 
 							*:tcd-*
-:tcd[!] -		Change to the previous current directory, before the
+:tc[d][!] -		Change to the previous current directory, before the
 			last ":tcd {path}" command.
 
 							*:lc* *:lcd*
diff --git a/runtime/doc/ft_sql.txt b/runtime/doc/ft_sql.txt
index e8490d5..9a7a6e7 100644
--- a/runtime/doc/ft_sql.txt
+++ b/runtime/doc/ft_sql.txt
@@ -440,7 +440,7 @@
 			     replace the column list with the list of tables.
 			   - This allows you to quickly drill down into a
 			     table to view its columns and back again.
-			   - <Right> and <Left> can be also be chosen via
+			   - <Right> and <Left> can also be chosen via
 			     your |.vimrc| >
                                 let g:ftplugin_sql_omni_key_right = '<Right>'
                                 let g:ftplugin_sql_omni_key_left  = '<Left>'
diff --git a/runtime/doc/if_tcl.txt b/runtime/doc/if_tcl.txt
index 90dec9d..88ab119 100644
--- a/runtime/doc/if_tcl.txt
+++ b/runtime/doc/if_tcl.txt
@@ -1,4 +1,4 @@
-*if_tcl.txt*    For Vim version 8.2.  Last change: 2019 Jul 21
+*if_tcl.txt*    For Vim version 8.2.  Last change: 2021 May 27
 
 
 		  VIM REFERENCE MANUAL    by Ingo Wilken
@@ -25,12 +25,12 @@
 ==============================================================================
 1. Commands				*tcl-ex-commands* *E571* *E572*
 
-							*:tcl* *:tc*
-:tc[l] {cmd}		Execute Tcl command {cmd}.  A simple check if `:tcl`
+							*:tcl*
+:tcl {cmd}		Execute Tcl command {cmd}.  A simple check if `:tcl`
 			is working: >
 				:tcl puts "Hello"
 
-:[range]tc[l] << [trim] [{endmarker}]
+:[range]tcl << [trim] [{endmarker}]
 {script}
 {endmarker}
 			Execute Tcl script {script}.
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index 5749309..545adff 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -1,4 +1,4 @@
-*index.txt*     For Vim version 8.2.  Last change: 2021 Apr 24
+*index.txt*     For Vim version 8.2.  Last change: 2021 May 27
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1657,9 +1657,9 @@
 |:tab|		:tab		create new tab when opening new window
 |:tag|		:ta[g]		jump to tag
 |:tags|		:tags		show the contents of the tag stack
-|:tcd|		:tcd		change directory for tab page
+|:tcd|		:tc[d]		change directory for tab page
 |:tchdir|	:tch[dir]	change directory for tab page
-|:tcl|		:tc[l]		execute Tcl command
+|:tcl|		:tcl		execute Tcl command
 |:tcldo|	:tcld[o]	execute Tcl command for each line
 |:tclfile|	:tclf[ile]	execute Tcl script file
 |:tearoff|	:te[aroff]	tear-off a menu
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 2f69049..b2b79cb 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 8.2.  Last change: 2021 May 15
+*options.txt*	For Vim version 8.2.  Last change: 2021 May 16
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -7495,6 +7495,8 @@
 'switchbuf' 'swb'	string	(default "")
 			global
 	This option controls the behavior when switching between buffers.
+	Mostly for |quickfix| commands some values are also used for other
+	commands, as mentioned below.
 	Possible values (comma separated list):
 	   useopen	If included, jump to the first open window that
 			contains the specified buffer (if there is one).
diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index f94da7d..9ebefa9 100644
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -1,4 +1,4 @@
-*quickfix.txt*  For Vim version 8.2.  Last change: 2021 May 02
+*quickfix.txt*  For Vim version 8.2.  Last change: 2021 May 22
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1386,7 +1386,8 @@
 	%o		module name (finds a string)
 	%l		line number (finds a number)
 	%c		column number (finds a number representing character
-			column of the error, (1 <tab> == 1 character column))
+			column of the error, byte index, a <tab> is 1
+			character column)
 	%v		virtual column number (finds a number representing
 			screen column of the error (1 <tab> == 8 screen
 			columns))
diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt
index 1504ea9..872f251 100644
--- a/runtime/doc/spell.txt
+++ b/runtime/doc/spell.txt
@@ -1143,10 +1143,10 @@
 CIRCUMFIX						*spell-CIRCUMFIX*
 
 The CIRCUMFIX flag means a prefix and suffix must be added at the same time.
-If a prefix has the CIRCUMFIX flag than only suffixes with the CIRCUMFIX flag
+If a prefix has the CIRCUMFIX flag then only suffixes with the CIRCUMFIX flag
 can be added, and the other way around.
-An alternative is to only specify the suffix, and give the that suffix two
-flags: The required prefix and the NEEDAFFIX flag.  |spell-NEEDAFFIX|
+An alternative is to only specify the suffix, and give that suffix two flags:
+the required prefix and the NEEDAFFIX flag.  |spell-NEEDAFFIX|
 
 
 PFXPOSTPONE						*spell-PFXPOSTPONE*
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 685485d..d457067 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 8.2.  Last change: 2021 Apr 02
+*syntax.txt*	For Vim version 8.2.  Last change: 2021 May 30
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -4967,6 +4967,14 @@
 	colors for a color-xterm can be changed from the .Xdefaults file.
 	Unfortunately this means that it's not possible to get the same colors
 	for each user.	See |xterm-color| for info about color xterms.
+							*tmux*
+	When using tmux you may want to use this in the tmux config: >
+	    # tmux colors
+	    set -g default-terminal "xterm-256color"
+	    set -ag terminal-overrides ",xterm-256color:Tc"
+<	More info at:
+	https://github.com/tmux/tmux/wiki/FAQ#how-do-i-use-a-256-colour-terminal
+	https://github.com/tmux/tmux/wiki/FAQ#how-do-i-use-rgb-colour
 
 	The MS-Windows standard colors are fixed (in a console window), so
 	these have been used for the names.  But the meaning of color names in
diff --git a/runtime/doc/tags b/runtime/doc/tags
index dd73ba2..18f71f1 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -3317,7 +3317,7 @@
 :tabs	tabpage.txt	/*:tabs*
 :tag	tagsrch.txt	/*:tag*
 :tags	tagsrch.txt	/*:tags*
-:tc	if_tcl.txt	/*:tc*
+:tc	editing.txt	/*:tc*
 :tcd	editing.txt	/*:tcd*
 :tcd-	editing.txt	/*:tcd-*
 :tch	editing.txt	/*:tch*
@@ -3961,6 +3961,8 @@
 E116	eval.txt	/*E116*
 E117	eval.txt	/*E117*
 E118	eval.txt	/*E118*
+E1187	starting.txt	/*E1187*
+E1188	cmdline.txt	/*E1188*
 E119	eval.txt	/*E119*
 E12	message.txt	/*E12*
 E120	eval.txt	/*E120*
@@ -9742,6 +9744,7 @@
 timestamps	editing.txt	/*timestamps*
 tips	tips.txt	/*tips*
 tips.txt	tips.txt	/*tips.txt*
+tmux	syntax.txt	/*tmux*
 todo	todo.txt	/*todo*
 todo.txt	todo.txt	/*todo.txt*
 toggle	options.txt	/*toggle*
diff --git a/runtime/doc/textprop.txt b/runtime/doc/textprop.txt
index 2a6f405..c134290 100644
--- a/runtime/doc/textprop.txt
+++ b/runtime/doc/textprop.txt
@@ -1,4 +1,4 @@
-*textprop.txt*  For Vim version 8.2.  Last change: 2021 Mar 22
+*textprop.txt*  For Vim version 8.2.  Last change: 2021 May 26
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -126,7 +126,7 @@
 		   length	length of text in bytes, can only be used
 				for a property that does not continue in
 				another line; can be zero
-		   end_lnum	line number for the end of text
+		   end_lnum	line number for the end of text (inclusive)
 		   end_col	column just after the text; not used when
 				"length" is present; when {col} and "end_col"
 				are equal, and "end_lnum" is omitted or equal
@@ -228,7 +228,8 @@
 		{lnum-end} is given, remove matching text properties from line
 		{lnum} to {lnum-end} (inclusive).
 		When {lnum} is omitted remove matching text properties from
-		all lines.
+		all lines (this requires going over all lines, thus will be a
+		bit slow for a buffer with many lines).
 
 		{props} is a dictionary with these fields:
 		   id		remove text properties with this ID
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 1cfb948..b46c440 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 8.2.  Last change: 2021 May 15
+*todo.txt*      For Vim version 8.2.  Last change: 2021 May 28
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -38,6 +38,20 @@
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
+Geen memory leak?
+
+Crash using outer var from nested lambda:
+	vim9script
+	def F(text: string): func(string): func(string): string
+	  return (arg: string): func(string): string => ((sep: string): string => {
+	      return text .. ' ' .. arg
+	    })
+	enddef
+
+	echo F('hello')(' ')('there')
+
+
+
 Vim9 - Make everything work:
 - function returning nothing should return void instead of zero
 - compile "expr" and "call" expression of a channel in channel_exe_cmd()?
@@ -102,6 +116,9 @@
 
 
 Popup windows:
+- Preview popup not properly updated when it overlaps with completion menu.
+    (Yegappan Lakshmanan, 2021 May 22
+- In some cases prop_remove() does not work correctly. (#8261)
 - Add a flag to make a popup window focusable?
     CTRL-W P cycle over any preview window or focusable popup, end up back in
 	     current window.
@@ -134,6 +151,11 @@
 - Figure out the size and position better if wrapping inserts indent
 
 Text properties:
+- property is overruled by cursorline. (#8225).
+  Add better control over priority?  Make list of all highlighting, specify
+  where property fits in.
+  Or Should we let the textprop highlight overrule other (e.g. diff) highlight
+  if the priority is above a certain value?  (#7392)
 - Popup attached to text property stays visible when text is no longer
   visible. (#7736)
 - Popup attached to text property stays visible when text is deleted with
@@ -143,8 +165,6 @@
 - "cc" does not call inserted_bytes(). (Axel Forsman, #5763)
 - Combining text property with 'cursorline' does not always work (Billie
   Cleek, #5533)
-- Should we let the textprop highlight overrule other (e.g. diff) highlight if
-  the priority is above a certain value?  (#7392)
 - See remarks at top of src/textprop.c
 
 'incsearch' with :s:
@@ -221,6 +241,11 @@
 
 Include patch #6290: recognize shell directory change.
 
+MS-Windows GUI: default 'encoding' to "utf-8" ?  (#8221)
+    Add #ifdef MSWIN before enc_locale() in set_init_1().
+    Or just always for MS-Windows?  Conversion to 'termencoding' should always
+    work?
+
 Valgrind reports memory leaks in test_options.
 Valgrind reports overlapping memcpy in
     test_conceal.3
@@ -264,6 +289,9 @@
 
 Remove SPACE_IN_FILENAME ? It is only used for completion.
 
+Searching for \%'> does not find anything when using line Visual selection.
+Probably because it's using MAXCOL.  #8238
+
 Add optional argument to virtcol() that specifies "start", "cursor" or "end"
 to tell which value from getvvcol() should be used. (#7964)
 Value returned by virtcol() changes depending on how lines wrap.  This is
@@ -408,6 +436,8 @@
 which is not useful.  Return "c/v" instead.  And "c/o" when using "d/pat".
 #6127
 
+Add a cterm attribute for "dimmed" or "faint" text. (#8269)
+
 When 'fileignorecase' is set ":e testfile.c" works to edit TestFile.c, but
 ":find testfile.c" does not ignore case.
 Might be related to #6088.
@@ -2985,7 +3015,7 @@
     vimtutor.vim. (Jan Minar, 2008 Jul 20)
 -   When fsync() fails there is no hint about what went wrong.  Patch by Ben
     Schmidt, 2008 Jul 22.
--   testdir/Make_dos_sh.mak for running tests with MingW. (Bill Mccarthy, 2008
+-   testdir/Make_dos_sh.mak for running tests with MingW. (Bill McCarthy, 2008
     Sep 13)
 -   Replace ccomplete.vim by cppcomplete.vim from www.vim.org?  script 1520 by
     Vissale Neang.  (Martin Stubenschrott) Asked Vissale to make the scripts
diff --git a/runtime/doc/usr_08.txt b/runtime/doc/usr_08.txt
index 57287d0..3b11353 100644
--- a/runtime/doc/usr_08.txt
+++ b/runtime/doc/usr_08.txt
@@ -1,4 +1,4 @@
-*usr_08.txt*	For Vim version 8.2.  Last change: 2017 Aug 11
+*usr_08.txt*	For Vim version 8.2.  Last change: 2021 May 20
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -235,7 +235,7 @@
 	+----------------------------------+
 
 Clearly the last one should be at the top.  Go to that window (using CTRL-W w)
-and the type this command: >
+and then type this command: >
 
 	CTRL-W K
 
diff --git a/runtime/doc/usr_09.txt b/runtime/doc/usr_09.txt
index 88189bd..b64af81 100644
--- a/runtime/doc/usr_09.txt
+++ b/runtime/doc/usr_09.txt
@@ -113,7 +113,7 @@
 
 When there are vertically split windows, only the windows on the right side
 will have a scrollbar.  However, when you move the cursor to a window on the
-left, it will be this one the that scrollbar controls.  This takes a bit of
+left, it will be this one that the scrollbar controls.  This takes a bit of
 time to get used to.
    When you work with vertically split windows, consider adding a scrollbar on
 the left.  This can be done with a menu item, or with the 'guioptions' option:
diff --git a/runtime/doc/version6.txt b/runtime/doc/version6.txt
index de364d6..abf1544 100644
--- a/runtime/doc/version6.txt
+++ b/runtime/doc/version6.txt
@@ -9649,7 +9649,7 @@
 
 Patch 6.2f.016
 Problem:    "vim --version > ff" on non-Unix systems results in a file with a
-	    missing line break at the end. (Bill McCArthy)
+	    missing line break at the end. (Bill McCarthy)
 Solution:   Add a line break.
 Files:	    src/main.c
 
@@ -12864,7 +12864,7 @@
 Patch 6.2.444
 Problem:    When adding the 'c' flag to a ":substitute" command it may replace
 	    more times than without the 'c' flag.  Happens for a  match that
-	    starts with "\ze" (Marcel Svitalsk) and when using "\@<=" (Klaus
+	    starts with "\ze" (Marcel Svitalsky) and when using "\@<=" (Klaus
 	    Bosau).
 Solution:   Correct "prev_matchcol" when replacing the line.  Don't replace
 	    the line when the pattern uses look-behind matching.
diff --git a/runtime/doc/vim9.txt b/runtime/doc/vim9.txt
index a368af0..6c25882 100644
--- a/runtime/doc/vim9.txt
+++ b/runtime/doc/vim9.txt
@@ -1,4 +1,4 @@
-*vim9.txt*	For Vim version 8.2.  Last change: 2021 Apr 28
+*vim9.txt*	For Vim version 8.2.  Last change: 2021 May 26
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -101,7 +101,8 @@
 	def CallMe(count: number, message: string): bool
 - Call functions without `:call`: >
 	writefile(['done'], 'file.txt')
-- You cannot use `:xit`, `:t`, `:k`, `:append`, `:change`, `:insert`, `:open`
+- You cannot use `:xit`, `:t`, `:k`, `:append`, `:change`, `:insert`, `:open`,
+  and `:s` or `:d` with only flags.
   or curly-braces names.
 - A range before a command must be prefixed with a colon: >
 	:%s/this/that
@@ -1550,7 +1551,7 @@
 
 If you have any type of value and want to use it as a boolean, use the `!!`
 operator:
-	true: !`!'text'`, `!![99]`, `!!{'x': 1}`, `!!99`
+	true: `!!'text'`, `!![99]`, `!!{'x': 1}`, `!!99`
 	false: `!!''`, `!![]`, `!!{}`
 
 From a language like JavaScript we have this handy construct: >
diff --git a/runtime/doc/visual.txt b/runtime/doc/visual.txt
index 4704067..1fcee21 100644
--- a/runtime/doc/visual.txt
+++ b/runtime/doc/visual.txt
@@ -1,4 +1,4 @@
-*visual.txt*    For Vim version 8.2.  Last change: 2019 Nov 02
+*visual.txt*    For Vim version 8.2.  Last change: 2021 May 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -429,7 +429,7 @@
 
 abcdefghijklmnSTRINGopqrstuvwxyz
 abc	      STRING  defghijklmnopqrstuvwxyz
-abcdef  ghi   STRING	jklmnopqrstuvwxyz
+abcdef  ghi   STRING  	jklmnopqrstuvwxyz
 abcdefghijklmnSTRINGopqrstuvwxyz
 
 2. fo<C-v>3j$ASTRING<ESC>					*v_b_A_example*