diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index e3bb34eb7..6c7435c9a 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt*	For Vim version 8.2.  Last change: 2020 Mar 14
+*eval.txt*	For Vim version 8.2.  Last change: 2020 Mar 16
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -5839,8 +5839,8 @@ has({feature})	The result is a Number, which is 1 if the feature {feature} is
 			if has('feature')
 			  let x = this->breaks->without->the->feature
 			endif
-<		If the `endif` would be in the second line it would not be
-		found.
+<		If the `endif` would be moved to the second line as "| endif" it
+		would not be found.
 
 
 has_key({dict}, {key})					*has_key()*
@@ -7190,11 +7190,11 @@ menu_info({name} [, {mode}])				*menu_info()*
 		Returns an empty dictionary if the menu item is not found.
 
 		Examples: >
-			:echo maparg('Edit.Cut')
-			:echo maparg('File.Save', 'n')
+			:echo menu_info('Edit.Cut')
+			:echo menu_info('File.Save', 'n')
 <
 		Can also be used as a |method|: >
-			GetMenuName()->maparg('v')
+			GetMenuName()->menu_info('v')
 
 
 <							*min()*
diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt
index 41e20b106..3bb7fc945 100644
--- a/runtime/doc/gui.txt
+++ b/runtime/doc/gui.txt
@@ -1,4 +1,4 @@
-*gui.txt*       For Vim version 8.2.  Last change: 2019 Nov 16
+*gui.txt*       For Vim version 8.2.  Last change: 2020 Mar 16
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -855,6 +855,8 @@ Special characters in the list, just before the rhs:
 *	The menu was defined with "nore" to disallow remapping.
 &	The menu was defined with "<script>" to allow remapping script-local
 	mappings only.
+s	The menu was defined with "<silent>" to avoid showing what it is
+	mapped to when triggered.
 -	The menu was disabled.
 
 Note that hitting <Tab> while entering a menu name after a menu command may
diff --git a/runtime/doc/os_haiku.txt b/runtime/doc/os_haiku.txt
index 1154ea755..880d284bf 100644
--- a/runtime/doc/os_haiku.txt
+++ b/runtime/doc/os_haiku.txt
@@ -1,4 +1,4 @@
-*os_haiku.txt*	For Vim version 8.2.  Last change: 2020 Feb 26
+*os_haiku.txt*	For Vim version 8.2.  Last change: 2020 Mar 19
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -16,7 +16,7 @@ targets personal computing.
  2. Compiling Vim		|haiku-compiling|
  3. The Haiku GUI		|haiku-gui|
  4. The $VIM directory		|haiku-vimdir|
- 5. The $BE_USER_SETTINGS
+ 5. The $USER_SETTINGS_DIR
     directory			|haiku-user-settings-dir|
  6. Drag & Drop			|haiku-dragndrop|
  7. Single Launch vs. Multiple
@@ -44,8 +44,13 @@ Vim can be compiled using the standard configure/make approach. Running
 vim with the Haiku GUI support.  Run ./configure --help , to find out other
 features you can enable/disable.
 
+Haiku uses "ncurses6" as its terminal library, therefore you need to have
+"ncurses6_devel" package installed from HaikuDepot in order to configure
+the Haiku build. Just append "--with-tlib=ncurses6" to ./configure command
+below for the initial build.
+
 Now you should use "make" to compile Vim, then "make install" to install it.
-For seamless integration into the Haiku the GUI-less vim binary should be
+For seamless integration into Haiku, the GUI-less vim binary should be
 additionally installed over the GUI version. Typical build commands are: >
 
   ./configure --prefix=`finddir B_SYSTEM_NONPACKAGED_DIRECTORY` \
@@ -89,9 +94,10 @@ The default value for $VIM is set at compile time and can be determined with >
 
   :version
 
-The normal value is /boot/common/data/vim.  If you don't like it you can
-set the VIM environment variable to override this, or set 'helpfile' in your
-.vimrc: >
+The normal value is /boot/system/data/vim for Haikuports version, 
+/boot/system/non-packaged/data/vim for manual builds.  If you don't like it
+you can set the VIM environment variable to override this, or set 'helpfile'
+in your .vimrc: >
 
   :if version >= 500
   :    set helpfile=~/vim/runtime/doc/help.txt
@@ -221,7 +227,6 @@ Thank you, all!
 The port is under development now and far away from the perfect state. Bug
 reports, patches and wishes are welcome.
 
-
  -Siarzhuk Zharski <imker@gmx.li>
 
 
diff --git a/runtime/doc/popup.txt b/runtime/doc/popup.txt
index 512299413..dce2a9040 100644
--- a/runtime/doc/popup.txt
+++ b/runtime/doc/popup.txt
@@ -1,4 +1,4 @@
-*popup.txt*  For Vim version 8.2.  Last change: 2020 Feb 20
+*popup.txt*  For Vim version 8.2.  Last change: 2020 Mar 14
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -152,6 +152,8 @@ different:						*E863*
   then becomes hidden.
 - The default Pmenu color is only used for the border and padding.  To change
   the color of the terminal itself set 'wincolor'.
+- The default minimal size is 5 lines of 20 characters; Use the "minwidth" and
+  "minheight" parameters to set a different value.
 
 To run a terminal in a popup window, first create the terminal hidden.  Then
 pass the buffer number to popup_create().  Example: >
@@ -566,7 +568,8 @@ properties.  It is in one of four forms:
 
 If you want to create a new buffer yourself use |bufadd()| and pass the buffer
 number to popup_create().
-It is not possible to use the buffer of a terminal window. *E278*
+It is not possible to use the buffer of a terminal window. *E278*  You CAN
+create a hidden terminal buffer and use that one in a popup window.
 
 The second argument of |popup_create()| is a dictionary with options:
 	line		Screen line where to position the popup.  Can use a
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 3ba0ccc22..379af501d 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -1267,6 +1267,7 @@ $VIM_POSIX	vi_diff.txt	/*$VIM_POSIX*
 +X11	various.txt	/*+X11*
 +acl	various.txt	/*+acl*
 +arabic	various.txt	/*+arabic*
++autochdir	various.txt	/*+autochdir*
 +autocmd	various.txt	/*+autocmd*
 +autoservername	various.txt	/*+autoservername*
 +balloon_eval	various.txt	/*+balloon_eval*
@@ -7734,7 +7735,11 @@ menu-changes-5.4	version5.txt	/*menu-changes-5.4*
 menu-examples	gui.txt	/*menu-examples*
 menu-priority	gui.txt	/*menu-priority*
 menu-separator	gui.txt	/*menu-separator*
+menu-shortcut	gui.txt	/*menu-shortcut*
+menu-text	gui.txt	/*menu-text*
+menu-tips	gui.txt	/*menu-tips*
 menu.vim	gui.txt	/*menu.vim*
+menu_info()	eval.txt	/*menu_info()*
 menus	gui.txt	/*menus*
 merge	diff.txt	/*merge*
 message-history	message.txt	/*message-history*
@@ -9568,6 +9573,7 @@ toggle	options.txt	/*toggle*
 toggle-revins	version4.txt	/*toggle-revins*
 tolower()	eval.txt	/*tolower()*
 toolbar-icon	gui.txt	/*toolbar-icon*
+tooltips	gui.txt	/*tooltips*
 toupper()	eval.txt	/*toupper()*
 tr()	eval.txt	/*tr()*
 trim()	eval.txt	/*trim()*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index d8f2988ba..07ca1eec4 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 8.2.  Last change: 2020 Mar 13
+*todo.txt*      For Vim version 8.2.  Last change: 2020 Mar 19
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -38,16 +38,14 @@ browser use: https://github.com/vim/vim/issues/1234
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-When starting a terminal popup the size defaults to nothing. Should have a
-sensible default, e.g. four lines of 30 chars.
-call popup_create(term_start(&shell, #{hidden: 1}), #{})
+Add second argument to has(), return True when the feature can exist at all.
 
-Test_terminal_in_popup() still sometimes fails with "All" instead of "Top".
+Patch to fix buffer menu. (Yee Cheng Chin, #5787)
 
-Patch to fix vimtutor problems on Windows (Wu Yongwei, #5774)
-
-Additional tests for menu. (Yegappan, #5760)
-Introduces menu_info(), check that out.
+Add $TEST_MAY_FAIL, comma separated list of test functions that won't be fatal
+when failed. 
+- When matcning in AfterTheTest() then do not add to s:errors but to
+  s:warnings.  in testdir/runtest.vim
 
 Vim9 script:
 - Add vim9 commands to index, so that vim.vim will get them automatically.
@@ -66,8 +64,8 @@ Vim9 script:
 - Check that import in legacy script works and puts item in s:
 - Error in any command in "vim9script" aborts sourcing.
 - Find a way to test expressions in legacy and Vim9 script without duplication
+- Fix memory leaks for test_vim9_disassemble, test_vim9_expr, test_vim9_script
 - Test each level of expressions properly, with type checking
-- Test the
 - Test try/catch and throw better, also nested.
   Test return inside try/finally jumps to finally and then returns.
 - call autoload function.
@@ -93,10 +91,13 @@ Vim9 script:
 	LOADVARARG (varags idx)
 
 Popup windows:
+- With some sequence get get hidden finished terminal buffer. (#5768)
+    Cannot close popup terminal (#5744)
+    Buffer can't be wiped, gets status "aF". (#5764)
+    Is buf->nwindows incorrect?
 - popup_clear() and popup_close() should close the terminal popup, and
    make the buffer hidden. #5745
 - With terminal in popup, allow for popup_hide() to temporarily hide it.?
-- With some sequence get get hidden finished terminal buffer. (#5768)
 - Fire some autocommand event after a new popup window was created and
   positioned?  PopupNew?  Could be used to set some options or move it out of
   the way. (#5737)
@@ -190,6 +191,10 @@ E654, E856, E857, E861, E900
 Patch to fix drawing error with DirectX. (James Grant, #5688)
 Causes flicker on resizing.
 
+Patch to make lambda functions faster (Ken Takata)
+https://github.com/vim/vim/pull/5727
+ LGTM remark: size derived from user input (getenv).  Don't see how.
+
 Patch to use more FOR_ALL_ macros and use them. (Yegappan Lakshmanan, #5339)
 
 Patch to explain use of "%" in :!.  (David Briscoe, #5591)
@@ -252,6 +257,9 @@ remains equal?  Then %argdel to clean it up.  Do try this with 'hidden' set.
 Also #4994: window-local options not always restored, related to using :badd.
 Also #5326: netrw buffers are not restored.
 
+When 'backupdir' has a path ending in double slash (meaning: use full path of
+the file) combined with 'patchmode' the file name is wrong. (#5791)
+
 Patch to support cindent option to handle pragmas differently.
 (Max Rumpf, #5468)
 
@@ -353,6 +361,8 @@ Patch to add MODIFIED_BY to MSVC build file. (Chen Lei, 2016 Nov 24, #1275)
 
 Patch to support "0o" for octal numbers. (Ken Takata, #5304)
 
+Patch to enable IXON, avoid that CTRL-S stops terminal output. (#5775)
+
 When getting a focus event halfway a mapping this aborts the mapping.  E.g.
 when "qq" is mapped and after the first "q" the mouse is moved outside of the
 gvim window (with focus follows mouse), then the K_FOCUSLOST key is put in the
@@ -637,7 +647,12 @@ Make ":interactive !cmd" stop termcap mode, also when used in an autocommand.
 Add buffer argument to undotree(). (#4001)
 
 Using uninitialized value in test_gn
-Using uninitialized value in test_crypt.
+Using uninitialized value in test_crypt (can't explain why).
+memory leak in test_cmdline
+==6522==    by 0x291AFF: ga_grow (misc2.c:2069)
+==6522==    by 0x3D5B4B: win_size_save (window.c:5243)
+==6522==    by 0x222922: open_cmdwin (ex_getln.c:4177)
+==6522==    by 0x21D472: getcmdline_int (ex_getln.c:1376)
 memory leak in test_paste
 Memory leak in test_terminal:
 ==23530==    by 0x2640D7: alloc (misc2.c:874)
@@ -649,6 +664,7 @@ Memory leak in test_terminal:
 ==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)
+Memory leak in test_terminal_fail
 TODO: be able to run all parts of test_alot with valgrind separately
 Memory leak in test_alot with pyeval() (allocating partial)
 Memory leak in test_alot with expand()
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index dfd64c85f..8fece1a17 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: 2019 Dec 17
+*usr_41.txt*	For Vim version 8.2.  Last change: 2020 Mar 15
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index 547ca762a..b6867bcab 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -1,4 +1,4 @@
-*various.txt*   For Vim version 8.2.  Last change: 2020 Feb 22
+*various.txt*   For Vim version 8.2.  Last change: 2020 Mar 19
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -317,6 +317,7 @@ g8			Print the hex values of the bytes used in the
    *+acl*		|ACL| support included
    *+ARP*		Amiga only: ARP support included
 B  *+arabic*		|Arabic| language support
+B  *+autochdir*		support 'autochdir' option
 T  *+autocmd*		|:autocmd|, automatic commands
 H  *+autoservername*	Automatically enable |clientserver|
 m  *+balloon_eval*	|balloon-eval| support in the GUI. Included when
diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt
index a5f909888..6129b8d13 100644
--- a/runtime/doc/windows.txt
+++ b/runtime/doc/windows.txt
@@ -1,4 +1,4 @@
-*windows.txt*   For Vim version 8.2.  Last change: 2019 Dec 07
+*windows.txt*   For Vim version 8.2.  Last change: 2020 Mar 19
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -215,7 +215,7 @@ CTRL-W CTRL_N						*CTRL-W_CTRL-N*
 		height).  Reduces the current window height to create room
 		(and others, if the 'equalalways' option is set).
 
-:[N]sv[iew] [++opt] [+cmd] {file}		*:sv* *:sview* *splitview*
+:[N]sv[iew] [++opt] [+cmd] [file]		*:sv* *:sview* *splitview*
 		Same as ":split", but set 'readonly' option for this buffer.
 
 :[N]sf[ind] [++opt] [+cmd] {file}	     *:sf* *:sfi* *:sfind* *splitfind*
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index cb02ec3e3..4f2fd2552 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2020 Jan 31
+" Last Change:	2020 Mar 19
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
diff --git a/runtime/ftplugin/swift.vim b/runtime/ftplugin/swift.vim
index 26d04eb5f..55678f8bf 100644
--- a/runtime/ftplugin/swift.vim
+++ b/runtime/ftplugin/swift.vim
@@ -10,6 +10,5 @@
 
 setlocal comments=s1:/*,mb:*,ex:*/,:///,://
 setlocal expandtab
-setlocal ts=2
-setlocal sw=2
+setlocal sw=4 sts=4
 setlocal smartindent
diff --git a/runtime/syntax/bsdl.vim b/runtime/syntax/bsdl.vim
new file mode 100644
index 000000000..75c69558e
--- /dev/null
+++ b/runtime/syntax/bsdl.vim
@@ -0,0 +1,17 @@
+" Vim syntax file
+" Language:	Boundary Scan Description Language (BSDL)
+" Maintainer:	Daniel Kho <daniel.kho@logik.haus>
+" Last Changed:	2020 Mar 19 by Daniel Kho
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+    finish
+endif
+
+" Read in VHDL syntax files
+runtime! syntax/vhdl.vim
+unlet b:current_syntax
+
+let b:current_syntax = "bsdl"
+
+" vim: ts=8
diff --git a/runtime/syntax/html.vim b/runtime/syntax/html.vim
index 1571af370..aa9cb1205 100644
--- a/runtime/syntax/html.vim
+++ b/runtime/syntax/html.vim
@@ -3,8 +3,8 @@
 " Maintainer:           Jorge Maldonado Ventura <jorgesumle@freakspot.net>
 " Previous Maintainer:  Claudio Fleiner <claudio@fleiner.com>
 " Repository:           https://notabug.org/jorgesumle/vim-html-syntax
-" Last Change:          2019 Dec 24
-" Included patch from Jorge Maldonado Ventura to add the dialog element
+" Last Change:          2020 Mar 17
+" Included patch from Florian Breisch to add the summary element
 "
 
 " Please check :help html.vim for some comments and a description of the options
@@ -61,7 +61,8 @@ syn keyword htmlTagName contained datalist details dialog embed figcaption
 syn keyword htmlTagName contained figure footer header hgroup keygen main
 syn keyword htmlTagName contained mark menuitem meter nav output picture
 syn keyword htmlTagName contained progress rb rp rt rtc ruby section
-syn keyword htmlTagName contained slot source template time track video wbr
+syn keyword htmlTagName contained slot source summary template time track
+syn keyword htmlTagName contained video wbr
 
 " legal arg names
 syn keyword htmlArg contained action
diff --git a/runtime/syntax/jargon.vim b/runtime/syntax/jargon.vim
index 05f45a2c9..c4b017d9e 100644
--- a/runtime/syntax/jargon.vim
+++ b/runtime/syntax/jargon.vim
@@ -1,23 +1,24 @@
 " Vim syntax file
 " Language:	Jargon File
 " Maintainer:	Dan Church (https://github.com/h3xx)
-" Last Change:	2019 Sep 27
+" Last Change:	2020 Mar 16
 "
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
 	finish
 endif
 
-syn match jargonChaptTitle	/:[^:]*:/
-syn match jargonEmailAddr	/[^<@ ^I]*@[^ ^I>]*/
-syn match jargonUrl	 +\(http\|ftp\)://[^\t )"]*+
-syn region jargonMark	 start="{"  end="}"
+syn region jargonHeader start="^:" end="$" contains=jargonChaptTitle
+syn match jargonChaptTitle /:[^:]*:/ contained
+syn match jargonEmailAddr /[+._A-Za-z0-9-]\+@[+._A-Za-z0-9-]\+/
+syn match jargonUrl +\(https\?\|ftp\)://[^\t )"]*+
+syn region jargonMark start="{[^\t {}]" end="}"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-hi def link jargonChaptTitle	Title
-hi def link jargonEmailAddr	 Comment
-hi def link jargonUrl	 Comment
-hi def link jargonMark	Label
+hi def link jargonChaptTitle Title
+hi def link jargonEmailAddr Comment
+hi def link jargonUrl Comment
+hi def link jargonMark Label
 
 let b:current_syntax = "jargon"
diff --git a/runtime/syntax/vhdl.vim b/runtime/syntax/vhdl.vim
index efcb84028..b40b09652 100644
--- a/runtime/syntax/vhdl.vim
+++ b/runtime/syntax/vhdl.vim
@@ -1,9 +1,9 @@
 " Vim syntax file
 " Language:		VHDL [VHSIC (Very High Speed Integrated Circuit) Hardware Description Language]
-" Maintainer:		Daniel Kho <daniel.kho@tauhop.com>
+" Maintainer:		Daniel Kho <daniel.kho@logik.haus>
 " Previous Maintainer:	Czo <Olivier.Sirol@lip6.fr>
 " Credits:		Stephan Hegel <stephan.hegel@snc.siemens.com.cn>
-" Last Changed:		2018 May 06 by Daniel Kho
+" Last Changed:		2020 Mar 09 by Daniel Kho
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -43,7 +43,7 @@ syn keyword 	vhdlStatement	sequence strong
 syn keyword 	vhdlStatement	then to transport type
 syn keyword 	vhdlStatement	unaffected units until use
 syn keyword 	vhdlStatement	variable
-" VHDL-2017 interface
+" VHDL-2019 interface
 syn keyword 	vhdlStatement	view
 syn keyword 	vhdlStatement	vmode vprop vunit
 syn keyword 	vhdlStatement	wait when while with
@@ -124,7 +124,7 @@ syn match   	vhdlAttribute	"\'succ"
 syn match   	vhdlAttribute	"\'val"
 syn match   	vhdlAttribute	"\'image"
 syn match   	vhdlAttribute	"\'value"
-" VHDL-2017 interface attribute
+" VHDL-2019 interface attribute
 syn match   	vhdlAttribute	"\'converse"
 
 syn keyword	vhdlBoolean	true false
@@ -167,7 +167,7 @@ syn match	vhdlOperator	"=\|\/=\|>\|<\|>="
 syn match	vhdlOperator	"<=\|:="
 syn match	vhdlOperator	"=>"
 
-" VHDL-2017 concurrent signal association (spaceship) operator
+" VHDL-202x concurrent signal association (spaceship) operator
 syn match	vhdlOperator	"<=>"
 
 " VHDL-2008 conversion, matching equality/non-equality operators
@@ -188,7 +188,7 @@ syn match	vhdlError	"\(<\)[&+\-\/\\]\+"
 syn match	vhdlError	"[>=&+\-\/\\]\+\(<\)"
 " Covers most operators
 " support negative sign after operators. E.g. q<=-b;
-" Supports VHDL-2017 spaceship (concurrent simple signal association).
+" Supports VHDL-202x spaceship (concurrent simple signal association).
 syn match	vhdlError	"\(<=\)[<=&+\*\\?:]\+"
 syn match	vhdlError	"[>=&+\-\*\\:]\+\(=>\)"
 syn match	vhdlError	"\(&\|+\|\-\|\*\*\|\/=\|??\|?=\|?\/=\|?<=\|?>=\|>=\|:=\|=>\)[<>=&+\*\\?:]\+"