diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim
index e85ffc7..5c43ba2 100644
--- a/runtime/autoload/dist/ft.vim
+++ b/runtime/autoload/dist/ft.vim
@@ -1,7 +1,7 @@
 " Vim functions for file type detection
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2019 Mar 08
+" Last Change:	2020 Jan 02
 
 " These functions are moved here from runtime/filetype.vim to make startup
 " faster.
@@ -298,7 +298,7 @@
 
 func dist#ft#FTmms()
   let n = 1
-  while n < 10
+  while n < 20
     let line = getline(n)
     if line =~ '^\s*\(%\|//\)' || line =~ '^\*'
       setf mmix
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index dceae48..09d663e 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt*	For Vim version 8.2.  Last change: 2019 Dec 17
+*eval.txt*	For Vim version 8.2.  Last change: 2020 Jan 02
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt
index 9e4937b..b49c653 100644
--- a/runtime/doc/message.txt
+++ b/runtime/doc/message.txt
@@ -1,4 +1,4 @@
-*message.txt*   For Vim version 8.2.  Last change: 2019 Oct 19
+*message.txt*   For Vim version 8.2.  Last change: 2020 Jan 01
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 0fd23a4..f65d46f 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 8.2.  Last change: 2019 Dec 18
+*options.txt*	For Vim version 8.2.  Last change: 2020 Jan 01
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 2199de1..1aff075 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -4061,6 +4061,7 @@
 E288	mbyte.txt	/*E288*
 E289	mbyte.txt	/*E289*
 E29	change.txt	/*E29*
+E292	message.txt	/*E292*
 E293	message.txt	/*E293*
 E294	message.txt	/*E294*
 E295	message.txt	/*E295*
@@ -4753,7 +4754,7 @@
 E948	terminal.txt	/*E948*
 E949	editing.txt	/*E949*
 E95	message.txt	/*E95*
-E950	message.txt	/*E950*
+E950	options.txt	/*E950*
 E951	pattern.txt	/*E951*
 E952	autocmd.txt	/*E952*
 E953	terminal.txt	/*E953*
@@ -10056,6 +10057,7 @@
 windows95	os_win32.txt	/*windows95*
 windows98	os_win32.txt	/*windows98*
 windowsme	os_win32.txt	/*windowsme*
+windowsversion()	eval.txt	/*windowsversion()*
 winheight()	eval.txt	/*winheight()*
 winid	windows.txt	/*winid*
 winlayout()	eval.txt	/*winlayout()*
diff --git a/runtime/doc/tagsrch.txt b/runtime/doc/tagsrch.txt
index 8b3d20d..1f8eed4 100644
--- a/runtime/doc/tagsrch.txt
+++ b/runtime/doc/tagsrch.txt
@@ -1,4 +1,4 @@
-*tagsrch.txt*   For Vim version 8.2.  Last change: 2019 Nov 07
+*tagsrch.txt*   For Vim version 8.2.  Last change: 2019 Dec 27
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -210,14 +210,14 @@
 			Example output:
 
 >
-	 nr pri kind tag		file
+	  # pri kind tag		file
 	  1 F	f    mch_delay		os_amiga.c
 			mch_delay(msec, ignoreinput)
 	> 2 F	f    mch_delay		os_msdos.c
 			mch_delay(msec, ignoreinput)
 	  3 F	f    mch_delay		os_unix.c
 			mch_delay(msec, ignoreinput)
-	Enter nr of choice (<CR> to abort):
+	Type number and <Enter> (empty cancels):
 <
 			See |tag-priority| for the "pri" column.  Note that
 			this depends on the current file, thus using
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index d41e0d8..38eb91c 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 8.2.  Last change: 2019 Dec 24
+*todo.txt*      For Vim version 8.2.  Last change: 2020 Jan 02
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -38,6 +38,8 @@
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
+- Implement prop_find() issue #4970  Done by Ryan Hackett, #5421
+
 Include ipv6 syntax changes?  (DJ Lucas, #5360)
 
 Still have /* */ comments:
@@ -50,7 +52,9 @@
   input?  Sort-of possible by creating a hidden terminal and opening a popup
   with that buffer: #4063.
 - Use popup (or popup menu) for command line completion
-- Implement flip option
+- When using a popup for the info of a completion menu, and there is not
+  enough space, let the popup overlap with the menu. (#4544)
+- Implement flip option.
 - Make redrawing more efficient and avoid flicker:
     - put popup menu also in popup_mask?
 - Any other commands to disable in a popup window?
@@ -58,7 +62,6 @@
 - Figure out the size and position better if wrapping inserts indent
 
 Text properties:
-- Implement prop_find() issue #4970
 - Text properties spanning more than one line
 - See remarks at top of src/textprop.c
 
@@ -125,7 +128,7 @@
   conversions.
 
 Error numbers available:
-E292, E362, E366, E450, E451, E452,
+E362, E366, E450, E451, E452,
 E453, E454, E460, E489, E491, E565, E578, E610, E611, E653,
 E654, E856, E857, E860, E861, E863, E889, E900
 
@@ -192,6 +195,8 @@
 Now on github: #1856.  Updated Oct 2017
 Got permission to include this under the Vim license.
 
+Add "t" action to settagstack(): truncate and add new entries. (#5405)
+
 Result of synID() sometimes wrong in help files. (#5252)
 
 Problem showing a line if the number column width changes when using "o".
diff --git a/runtime/doc/version8.txt b/runtime/doc/version8.txt
index 86478a3..0e7c2b7 100644
--- a/runtime/doc/version8.txt
+++ b/runtime/doc/version8.txt
@@ -1,4 +1,4 @@
-*version8.txt*  For Vim version 8.2.  Last change: 2019 Dec 21
+*version8.txt*  For Vim version 8.2.  Last change: 2019 Dec 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -26004,7 +26004,6 @@
 	`:tlmenu`
 	`:tlnoremenu`
 	`:tlunmenu`
-	`:wsverb`
 	`:xrestore`
 
 Added options: