Update runtime files

27 files changed, 1914 insertions, 1390 deletions

diff --git a/nsis/lang/serbian.nsi b/nsis/lang/serbian.nsi
new file mode 100644
index 0000000000..60170da52c
--- /dev/null
+++ b/nsis/lang/serbian.nsi
@@ -0,0 +1,280 @@
+# vi:set ts=8 sts=4 sw=4 et fdm=marker:
+#
+# serbian.nsi: Serbian language strings for gvim NSIS installer.
+#
+# Locale ID    : 3098
+# fileencoding : UTF-8
+# Author       : Ivan Pešić
+
+!insertmacro MUI_LANGUAGE "Српски"
+
+
+# Overwrite the default translation.
+# These strings should be always English.  Otherwise dosinst.c fails.
+LangString ^SetupCaption     ${LANG_SERBIAN} \
+        "$(^Name) Setup"
+LangString ^UninstallCaption ${LANG_SERBIAN} \
+        "$(^Name) Uninstall"
+
+##############################################################################
+# MUI Configuration Strings                                               {{{1
+##############################################################################
+
+#LangString str_dest_folder          ${LANG_SERBIAN} \
+#    "Destination Folder (Must end with $\"vim$\")"
+
+LangString str_show_readme          ${LANG_SERBIAN} \
+    "Прикажи ПРОЧИТАЈМЕ када се заврши инсталација"
+
+# Install types:
+LangString str_type_typical         ${LANG_SERBIAN} \
+    "Типична"
+
+LangString str_type_minimal         ${LANG_SERBIAN} \
+    "Минимална"
+
+LangString str_type_full            ${LANG_SERBIAN} \
+    "Пуна"
+
+
+##############################################################################
+# Section Titles & Description                                            {{{1
+##############################################################################
+
+LangString str_section_old_ver      ${LANG_SERBIAN} \
+    "Уклањање постојећ(е/их) верзиј(е/а)"
+LangString str_desc_old_ver         ${LANG_SERBIAN} \
+    "Уклања постојећ(у/е) Vim верзииј(у/е) из вашег система."
+
+LangString str_section_exe          ${LANG_SERBIAN} \
+    "Vim ГКИ и фајлови потребни за извршавање"
+LangString str_desc_exe             ${LANG_SERBIAN} \
+    "Vim ГКИ извршни фајлови и фајлови потребни током извршавања. Ова компонента је неопходна."
+
+LangString str_section_console      ${LANG_SERBIAN} \
+    "Vim конзолни програм"
+LangString str_desc_console         ${LANG_SERBIAN} \
+    "Конзолна верзија програма Vim (vim.exe)."
+
+LangString str_section_batch        ${LANG_SERBIAN} \
+    "Креирај .bat фајлове"
+LangString str_desc_batch           ${LANG_SERBIAN} \
+    "Креира у Windows директоријуму .bat фајлове за Vim варијанте \
+     у циљу коришћења из командне линије."
+
+LangString str_group_icons          ${LANG_SERBIAN} \
+    "Креирај иконе за Vim"
+LangString str_desc_icons           ${LANG_SERBIAN} \
+    "Креира иконе за Vim на различитим местима, како би се олакшао приступ."
+
+LangString str_section_desktop      ${LANG_SERBIAN} \
+    "На радној површини"
+LangString str_desc_desktop         ${LANG_SERBIAN} \
+    "Креира иконе за gVim извршне фајлове на радној површини."
+
+LangString str_section_start_menu   ${LANG_SERBIAN} \
+    "У фасцикли Програми унутар Старт менија"
+LangString str_desc_start_menu      ${LANG_SERBIAN} \
+    "Додаје Vim у фолдер Програми Старт менија."
+
+#LangString str_section_quick_launch ${LANG_SERBIAN} \
+#    "In the Quick Launch Bar"
+#LangString str_desc_quick_launch    ${LANG_SERBIAN} \
+#    "Add Vim shortcut in the quick launch bar."
+
+LangString str_section_edit_with    ${LANG_SERBIAN} \
+    "Додај Vim контекстни мени"
+LangString str_desc_edit_with       ${LANG_SERBIAN} \
+    "Додаје Vim у $\"Отвори помоћу...$\" листу контекстног менија."
+
+#LangString str_section_edit_with32  ${LANG_SERBIAN} \
+#    "32-bit Version"
+#LangString str_desc_edit_with32     ${LANG_SERBIAN} \
+#    "Add Vim to the $\"Open With...$\" context menu list \
+#     for 32-bit applications."
+
+#LangString str_section_edit_with64  ${LANG_SERBIAN} \
+#    "64-bit Version"
+#LangString str_desc_edit_with64     ${LANG_SERBIAN} \
+#    "Add Vim to the $\"Open With...$\" context menu list \
+#     for 64-bit applications."
+
+LangString str_section_vim_rc       ${LANG_SERBIAN} \
+    "Креирај Подразумевану конфигурацију"
+LangString str_desc_vim_rc          ${LANG_SERBIAN} \
+    "Креира подразумевани конфиг фајл (_vimrc) ако неки већ не постоји."
+
+LangString str_group_plugin         ${LANG_SERBIAN} \
+    "Креира директоријуме додатака"
+LangString str_desc_plugin          ${LANG_SERBIAN} \
+    "Креира директоријуме додатака. Ови директоријуми омогућавају проширење програма Vim \
+     убацивањем фајла у директоријум."
+
+LangString str_section_plugin_home  ${LANG_SERBIAN} \
+    "Приватне"
+LangString str_desc_plugin_home     ${LANG_SERBIAN} \
+    "Креира директоријуме додатака у HOME директоријуму."
+
+LangString str_section_plugin_vim   ${LANG_SERBIAN} \
+    "Дељене"
+LangString str_desc_plugin_vim      ${LANG_SERBIAN} \
+    "Креира директоријуме додатака у Vim инсталационом директоријуму, користе их сви \
+     на систему."
+
+LangString str_section_vis_vim      ${LANG_SERBIAN} \
+    "VisVim проширење"
+LangString str_desc_vis_vim         ${LANG_SERBIAN} \
+    "VisVim проширење за Microsoft Visual Studio интеграцију."
+
+LangString str_section_nls          ${LANG_SERBIAN} \
+    "Подршка за домаћи језик"
+LangString str_desc_nls             ${LANG_SERBIAN} \
+    "Инсталира фајлове за домаћу језичку подршку."
+
+LangString str_unsection_register   ${LANG_SERBIAN} \
+    "Поништи регистрацију Vim"
+LangString str_desc_unregister      ${LANG_SERBIAN} \
+    "Поништава регистрацију програма Vim на систему."
+
+LangString str_unsection_exe        ${LANG_SERBIAN} \
+    "Уклони Vim извршне фајлове/фајлове потребне у време извршавања"
+LangString str_desc_rm_exe          ${LANG_SERBIAN} \
+    "Уклања све Vim извршне фајлове и оне потребне у време извршавања."
+
+LangString str_ungroup_plugin       ${LANG_SERBIAN} \
+    "Укони директоријуме додатака"
+LangString str_desc_rm_plugin       ${LANG_SERBIAN} \
+    "Уклања директоријуме додатака ако су празни."
+
+LangString str_unsection_plugin_home ${LANG_SERBIAN} \
+    "Приватне"
+LangString str_desc_rm_plugin_home  ${LANG_SERBIAN} \
+    "Уклања директоријуме додатака из HOME директоријума."
+
+LangString str_unsection_plugin_vim ${LANG_SERBIAN} \
+    "Дељене"
+LangString str_desc_rm_plugin_vim   ${LANG_SERBIAN} \
+    "Уклања директоријуме додатака из Vim инсталациониг директоријума."
+
+LangString str_unsection_rootdir    ${LANG_SERBIAN} \
+    "Уклони Vim корени директоријум"
+LangString str_desc_rm_rootdir      ${LANG_SERBIAN} \
+    "Уклања Vim корени директоријум. Он садржи ваше Vim конфигурационе фајлове!"
+
+
+##############################################################################
+# Messages                                                                {{{1
+##############################################################################
+
+#LangString str_msg_too_many_ver  ${LANG_SERBIAN} \
+#    "Found $vim_old_ver_count Vim versions on your system.$\r$\n\
+#     This installer can only handle ${VIM_MAX_OLD_VER} versions \
+#     at most.$\r$\n\
+#     Please remove some versions and start again."
+
+#LangString str_msg_invalid_root  ${LANG_SERBIAN} \
+#    "Invalid install path: $vim_install_root!$\r$\n\
+#     It should end with $\"vim$\"."
+
+#LangString str_msg_bin_mismatch  ${LANG_SERBIAN} \
+#    "Binary path mismatch!$\r$\n$\r$\n\
+#     Expect the binary path to be $\"$vim_bin_path$\",$\r$\n\
+#     but system indicates the binary path is $\"$INSTDIR$\"."
+
+#LangString str_msg_vim_running   ${LANG_SERBIAN} \
+#    "Vim is still running on your system.$\r$\n\
+#     Please close all instances of Vim before you continue."
+
+#LangString str_msg_register_ole  ${LANG_SERBIAN} \
+#    "Attempting to register Vim with OLE. \
+#     There is no message indicates whether this works or not."
+
+#LangString str_msg_unreg_ole     ${LANG_SERBIAN} \
+#    "Attempting to unregister Vim with OLE. \
+#     There is no message indicates whether this works or not."
+
+#LangString str_msg_rm_start      ${LANG_SERBIAN} \
+#    "Uninstalling the following version:"
+
+#LangString str_msg_rm_fail       ${LANG_SERBIAN} \
+#    "Fail to uninstall the following version:"
+
+#LangString str_msg_no_rm_key     ${LANG_SERBIAN} \
+#    "Cannot find uninstaller registry key."
+
+#LangString str_msg_no_rm_reg     ${LANG_SERBIAN} \
+#    "Cannot find uninstaller from registry."
+
+#LangString str_msg_no_rm_exe     ${LANG_SERBIAN} \
+#    "Cannot access uninstaller."
+
+#LangString str_msg_rm_copy_fail  ${LANG_SERBIAN} \
+#    "Fail to copy uninstaller to temporary directory."
+
+#LangString str_msg_rm_run_fail   ${LANG_SERBIAN} \
+#    "Fail to run uninstaller."
+
+#LangString str_msg_abort_install ${LANG_SERBIAN} \
+#    "Installer will abort."
+
+LangString str_msg_install_fail  ${LANG_SERBIAN} \
+    "Инсталација није успела. Више среће идући пут."
+
+LangString str_msg_rm_exe_fail   ${LANG_SERBIAN} \
+    "Неки фајлови у $0 нису обрисани!$\r$\n\
+     Морате то ручно да обавите."
+
+#LangString str_msg_rm_root_fail  ${LANG_SERBIAN} \
+#    "WARNING: Cannot remove $\"$vim_install_root$\", it is not empty!"
+
+LangString str_msg_uninstalling  ${LANG_SERBIAN} \
+    "Уклањање старе верзије..."
+
+LangString str_msg_registering   ${LANG_SERBIAN} \
+    "Регистровање..."
+
+LangString str_msg_unregistering ${LANG_SERBIAN} \
+    "Поништавање регистрације..."
+
+
+##############################################################################
+# Dialog Box                                                              {{{1
+##############################################################################
+
+LangString str_vimrc_page_title    ${LANG_SERBIAN} \
+    "Изаберите _vimrc подешавања"
+LangString str_vimrc_page_subtitle ${LANG_SERBIAN} \
+    "Изаберите подешавања за побољшања, тастатуру и миша."
+
+LangString str_msg_compat_title    ${LANG_SERBIAN} \
+    " Vi / Vim понашање "
+LangString str_msg_compat_desc     ${LANG_SERBIAN} \
+    "&Компатибилност и побољшања"
+LangString str_msg_compat_vi       ${LANG_SERBIAN} \
+    "Vi компатибилно"
+LangString str_msg_compat_vim      ${LANG_SERBIAN} \
+    "Vim оригинално"
+LangString str_msg_compat_defaults ${LANG_SERBIAN} \
+    "Vim са неким побољшањима (учитава defaults.vim)"
+LangString str_msg_compat_all      ${LANG_SERBIAN} \
+    "Vim са свим побољшањима (учитава vimrc_example.vim) (Подразумевано)"
+
+LangString str_msg_keymap_title   ${LANG_SERBIAN} \
+    " Мапирања "
+LangString str_msg_keymap_desc    ${LANG_SERBIAN} \
+    "&Ремапира неколико тастера за Windows (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F, итд.)"
+LangString str_msg_keymap_default ${LANG_SERBIAN} \
+    "Немој да ремапираш тастере (Подразумевано)"
+LangString str_msg_keymap_windows ${LANG_SERBIAN} \
+    "Ремапира неколико тастера"
+
+LangString str_msg_mouse_title   ${LANG_SERBIAN} \
+    " Миш "
+LangString str_msg_mouse_desc    ${LANG_SERBIAN} \
+    "&Понашање левог и десног тастера"
+LangString str_msg_mouse_default ${LANG_SERBIAN} \
+    "Десни: искачући мени, Леви: визуелни режим (Подразумевано)"
+LangString str_msg_mouse_windows ${LANG_SERBIAN} \
+    "Десни: искачући мени, Леви: режим избора (Windows)"
+LangString str_msg_mouse_unix    ${LANG_SERBIAN} \
+    "Десни: проширује избор, Леви: визуелни режим (Unix)"
diff --git a/runtime/autoload/haskellcomplete.vim b/runtime/autoload/haskellcomplete.vim
index 520ab93700..48fbac7f9f 100644
--- a/runtime/autoload/haskellcomplete.vim
+++ b/runtime/autoload/haskellcomplete.vim
@@ -2,7 +2,7 @@
 " Language:        Haskell
 " Maintainer:      Daniel Campoverde <alx@sillybytes.net>
 " URL:             https://github.com/alx741/haskellcomplete.vim
-" Last Change:     2018 Aug 26
+" Last Change:     2019 May 14
 
 " Usage:           setlocal omnifunc=haskellcomplete#Complete
 
@@ -63,6 +63,7 @@ function! haskellcomplete#Complete(findstart, base)
                     call add(l:matches, extension)
                 endif
             endfor
+            let b:completingLangExtension = 0
             return l:matches
         endif
 
@@ -78,6 +79,7 @@ function! haskellcomplete#Complete(findstart, base)
                     call add(l:matches, flag)
                 endif
             endfor
+            let b:completingOptionsGHC = 0
             return l:matches
         endif
 
@@ -93,6 +95,7 @@ function! haskellcomplete#Complete(findstart, base)
                     call add(l:matches, module)
                 endif
             endfor
+            let b:completingModule = 0
             return l:matches
         endif
 
diff --git a/runtime/delmenu.vim b/runtime/delmenu.vim
index 5cefe26d35..1372182641 100644
--- a/runtime/delmenu.vim
+++ b/runtime/delmenu.vim
@@ -2,7 +2,7 @@
 " Warning: This also deletes all menus defined by the user!
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2001 May 27
+" Last Change:	2019 Sep 11
 
 aunmenu *
 tlunmenu *
@@ -21,6 +21,11 @@ silent! unlet menutrans_path_dialog
 silent! unlet menutrans_tags_dialog
 silent! unlet menutrans_textwidth_dialog
 silent! unlet menutrans_fileformat_dialog
+silent! unlet menutrans_fileformat_choices
 silent! unlet menutrans_no_file
+silent! unlet menutrans_set_lang_to
+silent! unlet menutrans_spell_change_ARG_to
+silent! unlet menutrans_spell_add_ARG_to_word_list
+silent! unlet menutrans_spell_ignore_ARG
 
 " vim: set sw=2 :
diff --git a/runtime/doc/channel.txt b/runtime/doc/channel.txt
index 9b36c0724c..8767d8714b 100644
--- a/runtime/doc/channel.txt
+++ b/runtime/doc/channel.txt
@@ -1,4 +1,4 @@
-*channel.txt*      For Vim version 8.1.  Last change: 2019 Aug 22
+*channel.txt*      For Vim version 8.1.  Last change: 2019 Sep 11
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -508,6 +508,9 @@ ch_evalexpr({handle}, {expr} [, {options}])			*ch_evalexpr()*
 		expression.  When there is an error or timeout it returns an
 		empty string.
 
+		Note that while waiting for the response, Vim handles other
+		messages.  You need to make sure this doesn't cause trouble.
+
 		Can also be used as a |method|: >
 			GetChannel()->ch_evalexpr(expr)
 
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index f19e0c04a7..8cb2af1e66 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt*	For Vim version 8.1.  Last change: 2019 Sep 06
+*eval.txt*	For Vim version 8.1.  Last change: 2019 Sep 10
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index 82691e8fca..47c40a2f83 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -1,4 +1,4 @@
-*insert.txt*    For Vim version 8.1.  Last change: 2019 Aug 21
+*insert.txt*    For Vim version 8.1.  Last change: 2019 Sep 08
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1124,7 +1124,7 @@ is used when the info popup is created.  The option is a comma separated list
 of values:
 	height		maximum height of the popup
 	width		maximum width of the popup
-	highlight	highlight group of the popup (default is Pmenu)
+	highlight	highlight group of the popup (default is PmenuSel)
 	align		"item" (default) or "menu"
 	border		"on" (default) or "off"
 Example: >
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index c7247ff9da..0c8589f74f 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 8.1.  Last change: 2019 Aug 21
+*options.txt*	For Vim version 8.1.  Last change: 2019 Sep 09
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
diff --git a/runtime/doc/popup.txt b/runtime/doc/popup.txt
index cff3b9e523..8f1eb5c565 100644
--- a/runtime/doc/popup.txt
+++ b/runtime/doc/popup.txt
@@ -1,4 +1,4 @@
-*popup.txt*  For Vim version 8.1.  Last change: 2019 Sep 04
+*popup.txt*  For Vim version 8.1.  Last change: 2019 Sep 08
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -204,7 +204,7 @@ popup_beval({what}, {options})			*popup_beval()*
 			\ mousemoved: 'WORD',
 			\ })
 <		Use {options} to change the properties.
-		See |popup_beval_example| for an example use.
+		See |popup_beval_example| for an example.
 
 		Can also be used as a |method|: >
 			GetText()->popup_beval({})
diff --git a/runtime/doc/tags b/runtime/doc/tags
index e343579b94..ab0215e7e0 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -183,9 +183,11 @@ $VIM_POSIX	vi_diff.txt	/*$VIM_POSIX*
 'csverb'	options.txt	/*'csverb'*
 'cuc'	options.txt	/*'cuc'*
 'cul'	options.txt	/*'cul'*
+'culopt'	options.txt	/*'culopt'*
 'cursorbind'	options.txt	/*'cursorbind'*
 'cursorcolumn'	options.txt	/*'cursorcolumn'*
 'cursorline'	options.txt	/*'cursorline'*
+'cursorlineopt'	options.txt	/*'cursorlineopt'*
 'cwh'	options.txt	/*'cwh'*
 'debug'	options.txt	/*'debug'*
 'deco'	options.txt	/*'deco'*
@@ -9968,6 +9970,7 @@ win_gotoid()	eval.txt	/*win_gotoid()*
 win_id2tabwin()	eval.txt	/*win_id2tabwin()*
 win_id2win()	eval.txt	/*win_id2win()*
 win_screenpos()	eval.txt	/*win_screenpos()*
+win_splitmove()	eval.txt	/*win_splitmove()*
 winbufnr()	eval.txt	/*winbufnr()*
 wincol()	eval.txt	/*wincol()*
 window	windows.txt	/*window*
diff --git a/runtime/doc/terminal.txt b/runtime/doc/terminal.txt
index 2484b73e9a..b6fba8b389 100644
--- a/runtime/doc/terminal.txt
+++ b/runtime/doc/terminal.txt
@@ -1,4 +1,4 @@
-*terminal.txt*	For Vim version 8.1.  Last change: 2019 Jul 04
+*terminal.txt*	For Vim version 8.1.  Last change: 2019 Sep 08
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
diff --git a/runtime/doc/testing.txt b/runtime/doc/testing.txt
index 82fe64e7a1..10334f3143 100644
--- a/runtime/doc/testing.txt
+++ b/runtime/doc/testing.txt
@@ -1,4 +1,4 @@
-*testing.txt*	For Vim version 8.1.  Last change: 2019 Aug 21
+*testing.txt*	For Vim version 8.1.  Last change: 2019 Sep 08
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index bb3b927fff..754f09cde7 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 8.1.  Last change: 2019 Sep 07
+*todo.txt*      For Vim version 8.1.  Last change: 2019 Sep 10
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -38,6 +38,8 @@ browser use: https://github.com/vim/vim/issues/1234
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
+Split off part of option.c: #4918
+
 Popup windows:
 - Implement flip option
 - Why does 'nrformats' leak from the popup window buffer???
@@ -132,14 +134,12 @@ Remove check for cmd_silent when calling search_stat()? (Gary Johnson)
 
 undo result wrong: Masato Nishihata, #4798
 
-Sound: support on Mac?  Or does libcanberra work there?
+Undo puts cursor in wrong line after "cG<Esc>" undo.
 
-Patch to add win_splitmove() function. (Andy Massimino, #4561)
+Sound: support on Mac?  Or does libcanberra work there?
 
 Patch for #4733: #4734.  Test needs improvements.
 
-Add CmdwinLeavePost (#4762).  Also add WinLeavePost then?
-
 Patch to fix session file when using multiple tabs. (Jason Franklin, 2019 May
 20)
 Also put :argadd commands at the start for all buffers, so that their order
@@ -157,15 +157,6 @@ Ready to include now?
 Adding "10" to 'spellsuggest' causes spell suggestions to become very slow.
 (#4087)
 
-Patch to support 'cursorlineopt' - only highlight the line number of the
-cursor line: #4693
-
-Let plugins know how much space is available in the last line before
-triggering the hit-enter prompt.  Internally called "sc_col".
-(Daniel Hahler, #4732)
-
-Patch for Template string: #4491  Not ready yet.  New pull: #4634
-
 ":bnext" in a help buffer is supposed to go to the next help buffer, but it
 goes to any buffer, and then :bnext skips help buffers, since they are
 unlisted. (#4478)
@@ -191,9 +182,18 @@ with packages under "start". (xtal8, #1994)
 Modeless selection doesn't work in gvim. (#4783)
 Caused by patch 8.1.1534.
 
+Patch to add random number generator. (Hong Xu, 2010 Nov 8, update Nov 10)
+Alternative from Christian Brabandt. (2010 Sep 19)
+New one from Yasuhiro Matsumoto, #1277.
+
 Visual highlight not removed when 'dipslay' is "lastline" and line doesn't
 fit. (Kevin Lawler, #4457)
 
+Patch to add interrupt(). (Yasuhiro Matsumoto, #2834)
+
+Patch to add per-tabpage and per-window previous directory: "lcd -" and "tcd
+-". (Yegappan Lakshmanan, #4362)
+
 Does not build with MinGW out of the box:
 - _stat64 is not defined, need to use "struct stat" in vim.h
 - WINVER conflict, should use 0x0600 by default?
@@ -203,6 +203,11 @@ Crash when mixing matchadd and substitute()? (Max Christian Pohle, 2018 May
 
 Check_external_diff() is used too often. (Daniel Hahler, #4800)
 
+Incorrect formatting with autoindent. (Sebastian Gniazdowski, #4909)
+
+Patch to sort buffers on b_last_used time.  (Andy Massimino, #4722)
+Needs a test.
+
 Errors found with random data:
     heap-buffer-overflow in alist_add (#2472)
 
@@ -311,6 +316,9 @@ Support setting the character displayed below the last line?  Neovim uses
 Check: __attribute__((format(printf, on semsg() and siemsg().  Where was this
 added?
 
+Patch to add a flatten() function.  #3676.  Check that the doc explains the
+maxdepth argument (applies to the input "recursiveness").
+
 Add test for urxvt mouse codes.  Also test that mouse coordinates can be
 negative. (see #4326)
 
@@ -639,6 +647,9 @@ Jan 15, #2555)
 
 ":bufdo e" disabled syntax HL in windows other than the current. (BPJ)
 
+Patch for Template string: #4491.  New pull: #4634
+It's an awful lot of code for something that is just a bit nicer syntax.
+
 Check argument of systemlist(). (Pavlov)
 
 No maintainer for Vietnamese translations.
@@ -989,10 +1000,6 @@ somewhere else.  :{range}copy {dest} !cmd
 Patch to fix that empty first tab is not in session.
 (Hirohito Higashi, 2016 Nov 25, #1282)
 
-Patch to add random number generator. (Hong Xu, 2010 Nov 8, update Nov 10)
-Alternative from Christian Brabandt. (2010 Sep 19)
-New one from Yasuhiro Matsumoto, #1277.
-
 Patch to fix escaping of job arguments. (Yasuhiro Matsumoto, 2016 Oct 5)
 Update Oct 14: https://gist.github.com/mattn/d47e7d3bfe5ade4be86062b565a4bfca
 Update Aug 2017: #1954
diff --git a/runtime/gvim.desktop b/runtime/gvim.desktop
index 91a5e7a4f5..7805cd5840 100644
--- a/runtime/gvim.desktop
+++ b/runtime/gvim.desktop
@@ -20,6 +20,7 @@ Comment=Edit text files
 GenericName[da]=Teksteditor
 GenericName[fr]=Éditeur de texte
 GenericName[pl]=Edytor tekstu
+GenericName[sr]=Едитор текста
 GenericName[is]=Ritvinnsluforrit
 Comment[af]=Redigeer tekslêers
 Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ
diff --git a/runtime/lang/menu_chinese_gb.936.vim b/runtime/lang/menu_chinese_gb.936.vim
index b3276b5365..d96ab37802 100644
--- a/runtime/lang/menu_chinese_gb.936.vim
+++ b/runtime/lang/menu_chinese_gb.936.vim
@@ -1,270 +1,452 @@
 " Menu Translations:    Simplified Chinese
 " Maintainer:           Shun Bai <baishunde@gmail.com>
 " Previous Maintainer:  Yuheng Xie <elephant@linux.net.cn>
-" Last Change:          2014 Oct 15
-
-" vim: ts=8 sw=8 noet
+" Last Change:          2019-09-10
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
   finish
 endif
 let did_menu_trans = 1
-let s:keepcpo= &cpo
+let s:keepcpo = &cpo
 set cpo&vim
 
 scriptencoding cp936
 
 " Help menu
-menutrans &Help			����(&H)
-menutrans &Overview<Tab><F1>	����(&O)<Tab><F1>
-menutrans &User\ Manual		�û��ֲ�(&U)
-menutrans &How-to\ links	How-to\ ָ��(&H)
-menutrans &Find\.\.\.		����(&F)\.\.\.
-menutrans &Credits		��л(&C)
-menutrans Co&pying		��Ȩ(&P)
-menutrans &Sponsor/Register	����/ע��(&S)
-menutrans O&rphans		�¶�(&R)
-menutrans &Version		�汾(&V)
-menutrans &About		����(&A)
+menutrans &Help		����(&H)
+" Help menuitems and dialog {{{1
+menutrans &Overview<Tab><F1>	����(&O)<Tab><F1>
+menutrans &User\ Manual			�û��ֲ�(&U)
+menutrans &How-to\ Links		���ʹ��(&H)
+menutrans &Find\.\.\.			����(&F)\.\.\.
+menutrans &Credits				��л(&C)
+menutrans Co&pying				��Ȩ(&P)
+menutrans &Sponsor/Register		����/ע��(&S)
+menutrans O&rphans				���ȹ¶�(&R)
+menutrans &Version				�汾(&V)
+menutrans &About				����(&A)
+
+" fun! s:Helpfind()
+if !exists("g:menutrans_help_dialog")
+  let g:menutrans_help_dialog = "��������򵥴��Ի�ð���:\n\nǰ׺ i_ ��ʾ����ģʽ�µ�����(��: i_CTRL-X)\nǰ׺ c_ ��ʾ�������µı༭����(��: c_<Del>)\nǰ׺ ' ��ʾѡ����(��: 'shiftwidth')"
+endif
+" }}}
 
 " File menu
-menutrans &File				�ļ�(&F)
-menutrans &Open\.\.\.<Tab>:e		��(&O)\.\.\.<Tab>:e
-menutrans Sp&lit-Open\.\.\.<Tab>:sp	�ָ��(&L)\.\.\.<Tab>:sp
-menutrans Open\ Tab\.\.\.<Tab>:tabnew	�򿪱�ǩ\.\.\.<Tab>:tabnew
-menutrans &New<Tab>:enew		�½�(&N)<Tab>:enew
-menutrans &Close<Tab>:close		�ر�(&C)<Tab>:close
-menutrans &Save<Tab>:w			����(&S)<Tab>:w
-menutrans Save\ &As\.\.\.<Tab>:sav	����Ϊ(&A)\.\.\.<Tab>:sav
-menutrans Split\ &Diff\ with\.\.\.	�ָ�Ƚ�(Diff)(&D)\.\.\.
-menutrans Split\ Patched\ &By\.\.\.	�ָ�򲹶�(Patch)(&B)\.\.\.
-menutrans &Print			��ӡ(&P)
-menutrans Sa&ve-Exit<Tab>:wqa		���沢�˳�(&V)<Tab>:wqa
-menutrans E&xit<Tab>:qa			�˳�(&X)<Tab>:qa
+menutrans &File		�ļ�(&F)
+" File menuitems {{{1
+menutrans &Open\.\.\.<Tab>:e			��(&O)\.\.\.<Tab>:e
+menutrans Sp&lit-Open\.\.\.<Tab>:sp		�ڲ�ִ��ڴ�(&L)\.\.\.<Tab>:sp
+menutrans Open\ Tab\.\.\.<Tab>:tabnew	�ڱ�ǩҳ��\.\.\.<Tab>:tabnew
+menutrans &New<Tab>:enew				�½�(&N)<Tab>:enew
+menutrans &Close<Tab>:close				�ر�(&C)<Tab>:close
+menutrans &Save<Tab>:w					����(&S)<Tab>:w
+menutrans Save\ &As\.\.\.<Tab>:sav		����Ϊ(&A)\.\.\.<Tab>:sav
+menutrans Split\ &Diff\ With\.\.\.		��ִ����ԶԱȲ���(Diff)(&D)\.\.\.
+menutrans Split\ Patched\ &By\.\.\.		��ִ����Խ����޲�(Patch)(&B)\.\.\.
+menutrans &Print						��ӡ(&P)
+menutrans Sa&ve-Exit<Tab>:wqa			���沢�˳�(&V)<Tab>:wqa
+menutrans E&xit<Tab>:qa					�˳�(&X)<Tab>:qa
+" }}}
 
 " Edit menu
-menutrans &Edit				�༭(&E)
-menutrans &Undo<Tab>u			����(&U)<Tab>u
-menutrans &Redo<Tab>^R			����(&R)<Tab>^R
-menutrans Rep&eat<Tab>\.		�ظ��ϴβ���(&E)<Tab>\.
-menutrans Cu&t<Tab>"+x			����(&T)<Tab>"+x
-menutrans &Copy<Tab>"+y			����(&C)<Tab>"+y
-menutrans &Paste<Tab>"+gP		ճ��(&P)<Tab>"+gP
-menutrans Put\ &Before<Tab>[p		ճ�������ǰ(&B)<Tab>[p
-menutrans Put\ &After<Tab>]p		ճ��������(&A)<Tab>]p
-menutrans &Delete<Tab>x			ɾ��(&D)<Tab>x
-menutrans &Select\ All<Tab>ggVG		ȫѡ(&S)<Tab>ggVG
-menutrans &Find\.\.\.			����(&F)\.\.\.
-menutrans Find\ and\ Rep&lace\.\.\.	���Һ��滻(&L)\.\.\.
-menutrans &Find<Tab>/			����(&F)<Tab>/
-menutrans Find\ and\ Rep&lace<Tab>:%s	���Һ��滻(&L)<Tab>:%s
-menutrans Settings\ &Window		�趨����(&W)
-menutrans Startup\ &Settings		�����趨(&S)
-menutrans &Global\ Settings		ȫ���趨(&G)
+menutrans &Edit		�༭(&E)
+" Edit menuitems {{{1
+menutrans &Undo<Tab>u						����(&U)<Tab>u
+menutrans &Redo<Tab>^R						�ָ�(&R)<Tab>^R
+menutrans Rep&eat<Tab>\.					�ظ�(&E)<Tab>\.
+menutrans Cu&t<Tab>"+x						����(&T)<Tab>"+x
+menutrans &Copy<Tab>"+y						����(&C)<Tab>"+y
+menutrans &Paste<Tab>"+gP					ճ��(&P)<Tab>"+gP
+menutrans Put\ &Before<Tab>[p				ճ�������ǰ(&B)<Tab>[p
+menutrans Put\ &After<Tab>]p				ճ��������(&A)<Tab>]p
+menutrans &Delete<Tab>x						ɾ��(&D)<Tab>x
+menutrans &Select\ All<Tab>ggVG				ȫѡ(&S)<Tab>ggVG
+menutrans &Find\.\.\.						����(&F)\.\.\.
+menutrans Find\ and\ Rep&lace\.\.\.			���Һ��滻(&L)\.\.\.
+menutrans &Find<Tab>/						����(&F)<Tab>/
+menutrans Find\ and\ Rep&lace<Tab>:%s		���Һ��滻(&L)<Tab>:%s
+menutrans Settings\ &Window					���ô