diff -Nru vim-8.2.1913/.appveyor.yml vim-8.2.2434/.appveyor.yml
--- vim-8.2.1913/.appveyor.yml	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/.appveyor.yml	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,34 @@
+version: "{build}"
+
+skip_tags: true
+
+environment:
+  matrix:
+    - FEATURE: HUGE
+# disabled
+#    - FEATURE: TINY
+#    - FEATURE: SMALL
+#    - FEATURE: NORMAL
+#    - FEATURE: BIG
+
+matrix:
+  fast_finish: true
+
+before_build:
+  # Use Windows SDK 7.1 (= MSVC 2010)
+  - '"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 /release'
+  - 'set INCLUDE=%INCLUDE%C:\Program Files (x86)\Windows Kits\8.1\Include\um'
+
+build_script:
+  - ci/appveyor.bat
+
+test_script:
+  - cd src/testdir
+    # Testing with MSVC gvim
+  - path C:\Python35-x64;%PATH%
+  - nmake -f Make_dos.mak VIMPROG=..\gvim
+  - nmake -f Make_dos.mak clean
+    # Testing with MSVC console version
+  - nmake -f Make_dos.mak VIMPROG=..\vim
+
+# vim: sw=2 sts=2 et ts=8 sr
diff -Nru vim-8.2.1913/appveyor.yml vim-8.2.2434/appveyor.yml
--- vim-8.2.1913/appveyor.yml	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/appveyor.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-version: "{build}"
-
-skip_tags: true
-
-environment:
-  matrix:
-    - FEATURE: HUGE
-# disabled
-#    - FEATURE: TINY
-#    - FEATURE: SMALL
-#    - FEATURE: NORMAL
-#    - FEATURE: BIG
-
-matrix:
-  fast_finish: true
-
-before_build:
-  # Use Windows SDK 7.1 (= MSVC 2010)
-  - '"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 /release'
-  - 'set INCLUDE=%INCLUDE%C:\Program Files (x86)\Windows Kits\8.1\Include\um'
-
-build_script:
-  - ci/appveyor.bat
-
-test_script:
-  - cd src/testdir
-    # Testing with MSVC gvim
-  - path C:\Python35-x64;%PATH%
-  - nmake -f Make_dos.mak VIMPROG=..\gvim
-  - nmake -f Make_dos.mak clean
-    # Testing with MSVC console version
-  - nmake -f Make_dos.mak VIMPROG=..\vim
-
-# vim: sw=2 sts=2 et ts=8 sr
diff -Nru vim-8.2.1913/ci/build-snd-dummy.sh vim-8.2.2434/ci/build-snd-dummy.sh
--- vim-8.2.1913/ci/build-snd-dummy.sh	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/ci/build-snd-dummy.sh	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,19 @@
+#!/bin/bash
+set -eu
+
+LINUX_VERSION=$(uname -r | cut -d. -f1-2)
+LINUX_ARCHIVE_FILE=v${LINUX_VERSION}.tar.gz
+LINUX_SOURCE_DIR=linux-${LINUX_VERSION}
+
+mkdir -p "${TMPDIR}"
+cd "${TMPDIR}"
+
+wget -q "https://github.com/torvalds/linux/archive/${LINUX_ARCHIVE_FILE}"
+
+tar -xf "${LINUX_ARCHIVE_FILE}" "${LINUX_SOURCE_DIR}/sound"
+cd "${LINUX_SOURCE_DIR}/sound"
+
+CC=gcc make -C "/lib/modules/$(uname -r)/build" M="${PWD}" CONFIG_SOUND=m CONFIG_SND=m CONFIG_SND_PCM=m CONFIG_SND_DUMMY=m modules
+
+mkdir -p "${SND_DUMMY_DIR}"
+cp soundcore.ko core/snd.ko core/snd-pcm.ko drivers/snd-dummy.ko "${SND_DUMMY_DIR}"
diff -Nru vim-8.2.1913/ci/setup-xvfb.sh vim-8.2.2434/ci/setup-xvfb.sh
--- vim-8.2.1913/ci/setup-xvfb.sh	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/ci/setup-xvfb.sh	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,17 @@
+#!/bin/bash
+set -e
+
+apt-get install -y xvfb
+
+cat <<EOT >/etc/systemd/system/xvfb.service
+[Unit]
+Description=X Virtual Frame Buffer Service
+After=network.target
+[Service]
+ExecStart=/usr/bin/Xvfb :99 -screen 0 1024x768x24
+[Install]
+WantedBy=multi-user.target
+EOT
+
+systemctl enable xvfb.service
+systemctl start xvfb.service
diff -Nru vim-8.2.1913/.cirrus.yml vim-8.2.2434/.cirrus.yml
--- vim-8.2.1913/.cirrus.yml	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/.cirrus.yml	2021-01-30 22:05:11.000000000 +0000
@@ -3,6 +3,8 @@
   FEATURES: huge
 
 freebsd_12_task:
+  only_if: $CIRRUS_TAG == ''
+  timeout_in: 20m
   freebsd_instance:
     image: freebsd-12-1-release-amd64
   install_script:
diff -Nru vim-8.2.1913/.codecov.yml vim-8.2.2434/.codecov.yml
--- vim-8.2.1913/.codecov.yml	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/.codecov.yml	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,6 @@
+coverage:
+  range: "80...100"
+  status:
+    project:
+      default:
+        threshold: 0.05%
diff -Nru vim-8.2.1913/.coveralls.yml vim-8.2.2434/.coveralls.yml
--- vim-8.2.1913/.coveralls.yml	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/.coveralls.yml	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1 @@
+service_name: github-actions
diff -Nru vim-8.2.1913/debian/changelog vim-8.2.2434/debian/changelog
--- vim-8.2.1913/debian/changelog	2020-11-19 17:39:38.000000000 +0000
+++ vim-8.2.2434/debian/changelog	2021-02-15 12:29:39.000000000 +0000
@@ -1,3 +1,61 @@
+vim (2:8.2.2434-1ubuntu1) hirsute; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/runtime/vimrc:
+      + "syntax on" is a sane default for non-tiny vim.
+    - debian/rules:
+      + Disable tests on riscv64
+    - debian/patches/debian/ubuntu-grub-syntax.patch:
+      + Add Ubuntu-specific "quiet" keyword.
+    - debian/patches/debian/update-upstart-syntax.patch:
+      + Add setuid and setgid to syntax file.
+    - debian/patches/ubuntu-mouse-off.patch:
+      + Mouse mode is actively harmful in some chroots.
+    - debian/patches/patches/increase_timeout.diff:
+      + Increase timeout for the Test_pattern_compile_speed patch.
+  * Dropped changes, deprecated:
+    - patches/riscv64-test-timeout.patch
+      + Increase Test_mode_message_at_leaving_insert_with_esc_mapped timeout
+        for riscv64.
+      + It was changed to WaitForAssert(), our patch patches another function:
+        Test_mode_message_at_leaving_insert_by_ctrl_c()
+  * Dropped changes, included upstream:
+    - debian/patches/ubuntu-series-support.patch:
+      + Add hirsute, move eoan to unsupported
+
+ -- Lukas Märdian <slyon@ubuntu.com>  Mon, 15 Feb 2021 13:29:39 +0100
+
+vim (2:8.2.2434-1) unstable; urgency=medium
+
+  * Merge upstream patch v8.2.2434
+    + 8.2.2428: Fix handling of focus events when 'ttymouse' is unset.
+      (Closes: #980449)
+
+ -- James McCoy <jamessan@debian.org>  Sat, 30 Jan 2021 23:47:07 -0500
+
+vim (2:8.2.2367-1) unstable; urgency=medium
+
+  * Merge upstream patch v8.2.2367
+    + 8.2.2367: Fix test failures on armel/armhf/mipsel
+
+ -- James McCoy <jamessan@debian.org>  Sun, 17 Jan 2021 10:53:54 -0500
+
+vim (2:8.2.2344-2) unstable; urgency=medium
+
+  * rules: Add dummy command to test target to fix make error when
+    DEB_BUILD_OPTIONS=nocheck
+
+ -- James McCoy <jamessan@debian.org>  Thu, 14 Jan 2021 22:25:21 -0500
+
+vim (2:8.2.2344-1) unstable; urgency=medium
+
+  * Merge upstream patch v8.2.2344
+    + ftplugin/spec.vim: Fix missing ":let"  (Closes: #977429)
+    + syntax/cabal.vim: Add build-tools-depends keyword  (Closes: #973548)
+  * rules: Sanitize locale-related environment variables (Closes: #973943)
+
+ -- James McCoy <jamessan@debian.org>  Thu, 14 Jan 2021 21:40:26 -0500
+
 vim (2:8.2.1913-1ubuntu3) hirsute; urgency=medium
 
   * No-change rebuild to build with python3.9 as default.
diff -Nru vim-8.2.1913/debian/changelog.upstream vim-8.2.2434/debian/changelog.upstream
--- vim-8.2.1913/debian/changelog.upstream	2020-10-28 09:19:49.000000000 +0000
+++ vim-8.2.2434/debian/changelog.upstream	2021-01-31 09:42:29.000000000 +0000
@@ -1825,3 +1825,636 @@
  11989  8.2.1799  some Normal mode commands not fully tested
   1670  8.2.1800  Vim9: memory leak if "if" condition is invalid
   2963  8.2.1801  undo file not found when using ":args" or ":next"
+  1942  8.2.1802  Vim9: crash with unterminated dict
+  4105  8.2.1803  a few failures are not tested
+  2042  8.2.1804  resolve('/') returns an empty string
+  2417  8.2.1805  Unix: terminal mode changed when using ":shell"
+  2476  8.2.1806  MS-Windows with Python: Vim freezes after import command
+  2419  8.2.1807  can use :help in a terminal popup window
+  2525  8.2.1808  no test coverage for ":spelldump!"
+  6501  8.2.1809  mapping some keys with Ctrl does not work properly
+  6325  8.2.1810  some code in normal.c not covered by tests
+  5254  8.2.1811  mapping Ctrl-key does not work for '{', '}' and '|'
+  3429  8.2.1812  Vim9: nested closure throws an internal error
+  7815  8.2.1813  Vim9: can assign wrong type to script dict
+  1589  8.2.1814  missing change to remove "static"
+  3003  8.2.1815  Vim9: memory leak when using function reference
+  3451  8.2.1816  Vim9: another memory leak when using function reference
+  3643  8.2.1817  Vim9: wrong instruction when reusing a local variable spot
+  1660  8.2.1818  SE Linux: deprecation warning for security_context_t
+ 12097  8.2.1819  Vim9: Memory leak when using a closure
+  1580  8.2.1820  Vim9: crash when error happens in timer callback
+  3469  8.2.1821  Vim9: concatenating to a NULL list doesn't work
+  1830  8.2.1822  list test doesn't fail
+  2554  8.2.1823  "gN" does not select the matched string
+  9700  8.2.1824  Vim9: variables at the script level escape their scope
+  2429  8.2.1825  Vim9: accessing freed memory
+  7613  8.2.1826  Vim9: cannot use a {} block at script level
+ 47800  8.2.1827  filetype detection does not test enough file names
+  1678  8.2.1828  build failure without the +eval feature
+  2473  8.2.1829  warnings when executing Github actions
+  3772  8.2.1830  MS-Windows: Python3 issue with stdin
+  1427  8.2.1831  file missing from distribution
+  2206  8.2.1832  readdirex() error is displayed as a message
+  2252  8.2.1833  when reading from stdin dup() is called twice
+  4615  8.2.1834  PyEval_InitThreads() is deprecated in Python 3.9
+  5959  8.2.1835  ":help ??" finds the "!!" tag
+  3776  8.2.1836  autocmd test fails on pacifist systems
+  4254  8.2.1837  using "gn" after "gN" does not work
+  5844  8.2.1838  Vim9: cannot insert a comment line in an expression
+  3240  8.2.1839  Vim9: memory leaks reported in assign test
+  4499  8.2.1840  Vim9: error message is not clear about compilation error
+  1798  8.2.1841  Vim9: test for compilation error fails in normal build
+  3440  8.2.1842  crash when USE_FNAME_CASE is defined and using :browse
+  2121  8.2.1843  Netbeans: with huge buffer number memory allocation may fail
+  3792  8.2.1844  using "q" at the more prompt doesn't stop a long message
+ 16660  8.2.1845  Vim9: function defined in a block can't use block variables
+ 30419  8.2.1846  Vim9: block variables are not found in compiled function
+  1462  8.2.1847  Vim9: using negative value for unsigned type
+  2526  8.2.1848  crash when passing a NULL string or list to popup_settext()
+  3974  8.2.1849  Vim9: garbage collection frees block-local variables
+  2961  8.2.1850  "vat" does not select tags correctly over line break
+  3690  8.2.1851  Vim9: "!" followed by space incorrectly used
+  3705  8.2.1852  map() returing zero for NULL list is unexpected
+  2186  8.2.1853  "to_f" is recognized at "topleft" modifier
+  2954  8.2.1854  Vim9: crash when throwing exception for NULL string
+  3963  8.2.1855  Vim9: get error message when nothing is wrong
+  2709  8.2.1856  "2resize" uses size of current window
+  2427  8.2.1857  Vim9: using job_status() on an unused var gives an error
+  4524  8.2.1858  Vim9: filter functions return number instead of bool
+  4184  8.2.1859  Vim9: crash in unpack assignment
+  1340  8.2.1860  Vim9: memory leak when throwing empty string
+  4284  8.2.1861  Vim9: no specific error when parsing lambda fails
+  1381  8.2.1862  vim9: memory leak when compiling lambda fails
+  3537  8.2.1863  json code not sufficiently tested
+ 19569  8.2.1864  Vim9: no error for wrong list type
+  9162  8.2.1865  Vim9: add() does not check type of argument
+  1960  8.2.1866  Vim9: appending to pushed blob gives wrong result
+  7800  8.2.1867  Vim9: argument to add() not checked for blob
+  2028  8.2.1868  Vim9: no error for missing space after comma in dict
+  1338  8.2.1869  Vim9: memory leak when using add()
+ 10627  8.2.1870  Vim9: no need to keep all script variables
+  2653  8.2.1871  using %v in 'errorformat' may fail before %Z
+  6549  8.2.1872  matchfuzzy() does not prefer sequential matches
+  2219  8.2.1873  Vim9: missing white space when using <f-args>
+  7151  8.2.1874  can't do something just before leaving Insert mode
+  1942  8.2.1875  warning when building GTK gui
+111920  8.2.1876  Vim9: argument types are not checked at compile time
+  4573  8.2.1877  test for function list fails
+ 29348  8.2.1878  GTK: error for redefining function
+  8707  8.2.1879  Vim9: argument types of insert() not checked when compiling
+  2033  8.2.1880  Vim9: asan complains about adding zero to NULL
+  4763  8.2.1881  cannot build with GTK3
+  3503  8.2.1882  Vim9: v:disallow_let is no longer needed
+ 20554  8.2.1883  compiler warnings when using Python
+  2445  8.2.1884  compiler warning for uninitialized variable
+  1506  8.2.1885  filetype tests unnessarily creates swap files
+  3335  8.2.1886  using ":silent!" in a popup filter has unexpected effect
+  1607  8.2.1887  Github actions not optimally configured
+  2545  8.2.1888  Vim9: getbufline(-1, 1, '$') gives an error
+  1974  8.2.1889  Vim9: errornous error for missing white space after {}
+  3698  8.2.1890  Vim9: strange error for subtracting from a list
+  6461  8.2.1891  Vim9: skipping over expression doesn't handle line breaks
+  1809  8.2.1892  valgrind warns for using uninitialized access in tests
+ 30521  8.2.1893  fuzzy matching does not support multiple words
+  8705  8.2.1894  Vim9: command modifiers are not supported
+  1452  8.2.1895  Vim9: silent command modifier test fails
+  1997  8.2.1896  valgrind warns for using uninitialized memory
+ 16058  8.2.1897  command modifiers are saved and set inconsistently
+ 95041  8.2.1898  command modifier parsing always uses global cmdmod
+  1524  8.2.1899  crash in out-of-memory situation
+ 19086  8.2.1900  Vim9: command modifiers do not work
+  3666  8.2.1901  variable completion does not work in command line window
+  2177  8.2.1902  default option values changed with :badd for existing buffer
+  1708  8.2.1903  buffer test fails with normal features
+  6966  8.2.1904  still using default option values after using ":badd +1"
+  3500  8.2.1905  the wininfo list may contain stale entries
+  2973  8.2.1906  warning for signed/unsigned
+  6757  8.2.1907  complete_info().selected may be wrong
+  3381  8.2.1908  Lua is initialized even when not used
+ 26399  8.2.1909  number of status line items is limited to 80
+  2258  8.2.1910  reading past the end of the command line
+  1811  8.2.1911  tiny build fails
+  3038  8.2.1912  with Python 3.9 some tests fail
+  2108  8.2.1913  GTK GUI: rounding for the cell height is too strict
+  8479  8.2.1914  Vim9: cannot put line break in expression for '=' register
+  2739  8.2.1915  Vim9: error for wrong number of arguments is not useful
+  3525  8.2.1916  Vim9: function call is aborted even when "silent!" is used
+  1598  8.2.1917  no test for improved Man command
+  2506  8.2.1918  Vim9: E1100 mentions :let
+ 16311  8.2.1919  assert_fails() setting emsg_silent changes normal execution
+  1808  8.2.1920  listlbr test fails when run after another test
+  3900  8.2.1921  fuzzy matching does not recognize path separators
+  5441  8.2.1922  Win32: scrolling problems when part of window is off-screen
+  2326  8.2.1923  Vim9: "filter" command modifier doesn't work
+  3346  8.2.1924  Vim9: crash when indexing dict with NULL key
+  1730  8.2.1925  list/dict test fails
+  2713  8.2.1926  cannot use a space in 'spellfile'
+  5121  8.2.1927  Vim9: get unknown error with an error in a timer function
+  2557  8.2.1928  Vim9: "silent!" not effective when list index is wrong
+  1938  8.2.1929  MS-Windows: problem loading Perl 5.32
+  3202  8.2.1930  wrong input if removing shift results in special key code
+  6643  8.2.1931  Vim9: arguments of extend() not checked at compile time
+  4812  8.2.1932  compiler warnings when building with Athena GUI
+ 10348  8.2.1933  cannot sort using locale ordering
+  7141  8.2.1934  Vim9: command modifiers in :def function not tested
+  3907  8.2.1935  sort test fails on Mac
+  3009  8.2.1936  session sets the local 'scrolloff' value to the global value
+  2812  8.2.1937  Vim9: test for confirm modifier fails in some situations
+  3467  8.2.1938  wiping out a terminal buffer makes some tests fail
+  2855  8.2.1939  invalid memory access in Ex mode with global command
+  1542  8.2.1940  Vim9: browse modifier test fails on Mac
+  1400  8.2.1941  Ex mode test fails on MS-Windows with GUI
+ 18853  8.2.1942  insufficient test coverage for the Netbeans interface
+  2586  8.2.1943  Vim9: wrong error message when colon is missing
+  1746  8.2.1944  Netbeans test is flaky
+  2689  8.2.1945  crash when passing NULL function to reduce()
+  4154  8.2.1946  sort() with NULL string not tested
+  1840  8.2.1947  crash when using "zj" without folds
+  3239  8.2.1948  GUI: crash when handling message while closing a window
+  5647  8.2.1949  Vim9: using extend() on null dict is silently ignored
+  3472  8.2.1950  Vim9: crash when compiling function fails when getting type
+  8017  8.2.1951  test for list and dict fails
+  2974  8.2.1952  Vim9: crash when using a NULL dict key
+  7241  8.2.1953  Vim9: extra "unknown" error after other error
+  3443  8.2.1954  Vim9: not all command modifiers are tested
+  3207  8.2.1955  Vim9: not all command modifiers are tested
+ 20070  8.2.1956  Vim9: cannot specify argument types for lambda
+  8821  8.2.1957  diff and cursorcolumn highlighting don't mix
+  1787  8.2.1958  build failure with timers
+  4620  8.2.1959  crash when terminal buffer name is made empty
+  1615  8.2.1960  warning for uninitialized variable
+  3964  8.2.1961  various comments can be improved
+  5973  8.2.1962  netbeans may access freed memory
+  4665  8.2.1963  crash when using a popup window with "latin1" encoding
+  2917  8.2.1964  not all ConTeXt files are recognized
+  4962  8.2.1965  Vim9: tests fail without the channel feature
+  8595  8.2.1966  popup becomes current window after closing a terminal window
+ 13352  8.2.1967  the session file does not restore the alternate file
+  7333  8.2.1968  Vim9: has() assumes a feature does not change dynamically
+ 21150  8.2.1969  Vim9: map() may change the list or dict item type
+  5264  8.2.1970  it is easy to make mistakes when cleaning up swap files
+  1788  8.2.1971  memory leak when map() fails
+  1887  8.2.1972  crash when recreating nested fold
+  2152  8.2.1973  finding a patch number can be a bit slow
+  2000  8.2.1974  Vim9: test for has('gui_running') fails with VIMDLL
+  1448  8.2.1975  Win32: memory leak when encoding conversion fails
+  2581  8.2.1976  cannot backspace in prompt buffer after using cursor-left
+ 15914  8.2.1977  Vim9: error for using a string in a condition is confusing
+ 33294  8.2.1978  making a mapping work in all modes is complicated
+  3592  8.2.1979  "term_opencmd" option of term_start() is truncated
+ 56846  8.2.1980  Vim9: some tests are not done at the script level
+  2115  8.2.1981  MinGW: parallel compilation might fail
+  2653  8.2.1982  quickfix window not updated when adding invalid entries
+  4506  8.2.1983  ml_get error when using <Cmd> to open a terminal
+  5364  8.2.1984  cannot use :vimgrep in omni completion
+  2853  8.2.1985  crash when closing terminal popup with <Cmd> mapping
+  2317  8.2.1986  expression test is flaky on Appveyor
+  3405  8.2.1987  MS-Windows: Win32.mak is no longer needed
+  2472  8.2.1988  still in Insert mode when opening terminal popup
+  2469  8.2.1989  info popup triggers WinEnter and WinLeave autocommands
+  8043  8.2.1990  cursor position wrong in terminal popup with finished job
+  1597  8.2.1991  Coverity warns for not using the ga_grow() return value
+  1336  8.2.1992  build fails with small features
+  2212  8.2.1993  occasional failure of the netbeans test
+  3411  8.2.1994  MS-Windows: MinGW always does a full build
+  2430  8.2.1995  the popup menu can cause too much redrawing
+  7473  8.2.1996  Vim9: invalid error for argument of extend()
+  2593  8.2.1997  window changes when using bufload() while in a terminal popup
+  2013  8.2.1998  terminal Cmd test sometimes fails to close popup
+  1752  8.2.1999  terminal popup test sometimes fails
+  4364  8.2.2000  Vim9: dict.key assignment not implemented yet
+  7485  8.2.2001  Vim9: :def function does not apply 'maxfuncdepth'
+  2977  8.2.2002  Vim9: lambda argument shadowed by function name
+  2078  8.2.2003  build error with +conceal but without +popupwin
+  1593  8.2.2004  compiler warning for uninitialized variable
+  4290  8.2.2005  redoing a mapping with <Cmd> doesn't work properly
+  2377  8.2.2006  .pbtxt files are not recognized
+  1698  8.2.2007  test for insert mode in popup is not reliable
+  2829  8.2.2008  MS-Windows GUI: handling channel messages lags
+  7230  8.2.2009  MS-Windows: setting $LANG in gvimext only causes problems
+  3691  8.2.2010  Vim9: compiling fails for unreachable return statement
+  4012  8.2.2011  "syn sync" reports a very large number
+  3197  8.2.2012  Vim9: confusing error message when using bool wrongly
+  2637  8.2.2013  Vim9: not skipping white space after unary minus
+  2947  8.2.2014  using CTRL-O in a prompt buffer moves cursor to start
+ 11901  8.2.2015  Vim9: literal dict #{} is not like any other language
+  2285  8.2.2016  swap file test is a little flaky
+  2665  8.2.2017  missing part of the dict change
+  2618  8.2.2018  Vim9: script variable not found from lambda
+  2447  8.2.2019  swap file test fails on MS-Windows
+  3444  8.2.2020  some compilers do not like the "namespace" argument
+  6671  8.2.2021  Vim9: get E1099 when autocommand resets did_emsg
+  2206  8.2.2022  Vim9: star command recognized errornously
+  1600  8.2.2023  Vim: memory leak when :execute fails
+  6790  8.2.2024  flicker when redrawing a popup with a title and border
+  1744  8.2.2025  Amiga: Not all colors are used on OS4
+  1405  8.2.2026  Coverity warns for possibly using not NUL terminated string
+  1278  8.2.2027  Coverity warns for uninitialized field
+  1504  8.2.2028  Coverity warns for using an uninitialized variable
+  1656  8.2.2029  Coverity warns for not checking return value
+  4680  8.2.2030  some tests fail on Mac
+  9065  8.2.2031  some tests fail when run under valgrind
+  5059  8.2.2032  cabalconfig and cabalproject filetypes not recognized
+  8734  8.2.2033  Vim9: :def without argument gives compilation error
+ 16763  8.2.2034  Vim9: list unpack in for statement not compiled yet
+  3305  8.2.2035  MS-Windows: some tests may fail
+  4133  8.2.2036  buffer messed up if creating the quickfix window fails
+  3034  8.2.2037  compiler test depends on list of compiler plugins
+  1646  8.2.2038  compiler test fails on MS-Windows
+  3068  8.2.2039  viminfo is not written when creating a new file
+  2724  8.2.2040  terminal buffer disappears even when 'bufhidden' is "hide"
+  3631  8.2.2041  haskell filetype not optimally recognized
+  2005  8.2.2042  build failure with +profile but without +reltime
+  1935  8.2.2043  GTK3: white border around text stands out
+  4224  8.2.2044  MS-Windows: swap file test sometimes fails
+  5308  8.2.2045  highlighting a character too much with incsearch
+  5626  8.2.2046  some test failures don't give a clear error
+  1679  8.2.2047  Amiga: FEAT_ARP defined when it should not
+  1626  8.2.2048  Amiga: obsolete code
+  1825  8.2.2049  Amiga: obsolete function
+  3205  8.2.2050  search test contains unneeded sleeps
+  3906  8.2.2051  Vim9: crash when aborting a user function call
+  8652  8.2.2052  Vim9: "edit +4 fname" gives an error
+  2406  8.2.2053  Vim9: lamba doesn't accept argument types
+  1909  8.2.2054  Amiga: FEAT_ARP defined when it should not
+  2602  8.2.2055  MS-Windows: two Vim instances may use the same temp file
+  2551  8.2.2056  configure fails if building with implicit-function-declaration
+  4833  8.2.2057  getting the selection may trigger TextYankPost autocmd
+  5332  8.2.2058  using mkview/loadview changes the jumplist
+  2876  8.2.2059  Amiga: can't find plugins
+  5234  8.2.2060  check for features implemented with "if"
+  3155  8.2.2061  Vim9: E1030 error when using empty string for term_sendkeys()
+  2147  8.2.2062  <Cmd> does not handle CTRL-V
+ 10981  8.2.2063  Vim9: only one level of indexing supported
+  5127  8.2.2064  terminal: cursor is on while redrawing, causing flicker
+  5826  8.2.2065  using map() and filter() on a range() is inefficient
+  3767  8.2.2066  Vim9: assignment with += doesn't work
+  3220  8.2.2067  cursor position in popup terminal is wrong
+  5544  8.2.2068  transparent syntax item uses start/end of containing region
+  5202  8.2.2069  the quickfix window is not updated after setqflist()
+  6598  8.2.2070  can't get the exit value in VimLeave(Pre) autocommands
+  3541  8.2.2071  Vim9: list assign doesn't except empty remainder list
+  3533  8.2.2072  Vim9: list assign not well tested
+ 22348  8.2.2073  Vim9: for with unpack only works for local variables
+  3523  8.2.2074  Vim9: using :normal from Vim9 script can't handle range
+  3325  8.2.2075  error for const argument to mapnew()
+  2718  8.2.2076  MS-Windows console: sometimes drops typed characters
+  3278  8.2.2077  build failure with small features
+  2426  8.2.2078  illegal memory access when using :print on invalid text
+  2818  8.2.2079  Vim9: cannot put a linebreak before or after "in" of ":for"
+  2397  8.2.2080  Vim9: no proper error message for using s:var in for loop
+  3607  8.2.2081  Vim9: cannot handle a linebreak after "=" in assignment
+ 67573  8.2.2082  Vim9: can still use the depricated #{} dict syntax
+  3423  8.2.2083  Vim9: crash when using ":silent!" and getting member fails
+  9354  8.2.2084  CTRL-V U doesn't work to enter a Unicode character
+  2989  8.2.2085  Qt translation file is recognized as typescript
+  3938  8.2.2086  libvterm tests are only run on Linux
+  1473  8.2.2087  Vim9: memory leak when statement is truncated
+  1395  8.2.2088  Vim9: script test sometimes fails
+  2136  8.2.2089  libvterm test fails to build on Mac
+  8578  8.2.2090  Vim9: dict does not accept a key in quotes
+  2299  8.2.2091  MS-Windows: build warnings
+ 11955  8.2.2092  Vim9: unpredictable errors for script tests
+  1742  8.2.2093  Vim9: script test sometimes fails
+  2224  8.2.2094  when an expression fails getting next command may be wrong
+  2936  8.2.2095  Vim9: crash when failed dict member is followed by concat
+  4935  8.2.2096  Vim9: command modifiers not restored after assignment
+  5244  8.2.2097  Vim9: using :silent! when calling a function prevents abort
+  2889  8.2.2098  Vim9: function argument of sort() and map() not tested
+  9565  8.2.2099  Vim9: some checks are not tested
+  4273  8.2.2100  insufficient testing for function range and dict
+  1914  8.2.2101  Vim9: memory leak when literal dict has an error
+  3413  8.2.2102  Vim9: not all error messages tested
+  2010  8.2.2103  Vim9: unreachable code
+  6159  8.2.2104  build problem with Ruby 2.7
+  3607  8.2.2105  sound test is a bit flaky
+  2042  8.2.2106  TOML files are not recognized
+  8996  8.2.2107  Vim9: some errors not tested
+  3576  8.2.2108  Vim9: no test to check for :let error
+  2229  8.2.2109  "vim -" does not work well when modifyOtherKeys is enabled
+  1907  8.2.2110  cannot use ":shell" when reading from stdin
+  3235  8.2.2111  GTK: menu background is the same color as the main window
+  3900  8.2.2112  running tests may leave some files behind
+  2179  8.2.2113  MS-Windows GUI: crash after using ":set guifont=" four times
+  1619  8.2.2114  Vim9: unreachable code in assignment
+  2387  8.2.2115  Vim9: some errors not tested for; dead code
+  1953  8.2.2116  MS-Windows GUI: test for 'guifont' is incomplete
+ 11069  8.2.2117  some functions use any value as a string
+  1831  8.2.2118  dead code in the job support
+  2236  8.2.2119  GTK3: status line background color is wrong
+  2597  8.2.2120  not all Perl functionality is tested
+  3450  8.2.2121  internal error when using \ze before \zs in a pattern
+  2390  8.2.2122  Vim9: crash when sourcing vim9script early
+  2115  8.2.2123  after using a complete popup the buffer is listed
+  8331  8.2.2124  Vim9: a range cannot be computed at runtime
+  1607  8.2.2125  Vim9: leaking memory
+  1316  8.2.2126  Ruby: missing function prototype
+  2212  8.2.2127  Vim9: executing user command from Vim9 script not tested
+  6777  8.2.2128  there is no way to do something on CTRL-Z
+  2623  8.2.2129  MS-Windows: Checking if a file name is absolute is slow
+  4283  8.2.2130  Insert mode completion messages end up in message history
+ 13181  8.2.2131  Vim9: crash when lambda uses same var as assignment
+  4988  8.2.2132  padding not drawn properly for popup window with title
+ 10845  8.2.2133  Vim9: checking for a non-empty string is too strict
+  2542  8.2.2134  Vim9: get E1099 when autocmd triggered in builtin function
+  2690  8.2.2135  Vim9: #{ still seen as start of dict in some places
+  2192  8.2.2136  Vim9: Using uninitialized variable
+  7504  8.2.2137  Vim9: :echo and :execute give error for empty argument
+ 12924  8.2.2138  Vim9: "exit_cb" causes Vim to exit
+  2346  8.2.2139  Vim9: unreachable code in assignment
+  1866  8.2.2140  build failure with tiny features
+  4206  8.2.2141  user command with try/catch may not catch an expression error
+  1388  8.2.2142  memory leak when heredoc is not terminated
+  1836  8.2.2143  Vim9: dead code in compiling :unlet
+  3002  8.2.2144  Vim9: some corner cases not tested
+  3691  8.2.2145  Vim9: concatenating lists does not adjust type of result
+  2058  8.2.2146  Vim9: automatic conversion of number to string for dict key
+  3580  8.2.2147  quickfix window title not updated in all tab pages
+  2472  8.2.2148  Vim9: crash when user command doesn't match
+  1787  8.2.2149  popupwin test for latin1 sometimes fails
+ 37152  8.2.2150  Github actions CI isn't used for all available platforms
+  2273  8.2.2151  $dir not expanded when configure checks for moonjit
+  2576  8.2.2152  screenpos() does not include the WinBar offset
+  1622  8.2.2153  popupwin test for latin1 still fails sometimes
+  2421  8.2.2154  popupwin test for terminal buffer fails sometimes
+  1850  8.2.2155  warning from Github actions for code analysis
+  4050  8.2.2156  Github actions run on pusing a tag
+  2379  8.2.2157  Vim9: can delete a Vim9 script variable from a function
+  2037  8.2.2158  CI on cirrus times out, coveralls doesn't always run
+  3280  8.2.2159  Vim9: when declaring a list it is not allocated yet
+ 31506  8.2.2160  various typos
+  3350  8.2.2161  arguments -T and -x not tested yet
+ 14465  8.2.2162  Vim9: Cannot load or store autoload variables
+  2224  8.2.2163  crash when discarded exception is the current exception
+  2947  8.2.2164  Vim9: autoload function doesn't work in uppercased script
+  4221  8.2.2165  Vim9: assignment to dict member does not work
+  2356  8.2.2166  auto format doesn't work when deleting text
+  1999  8.2.2167  Vim9: assign test fails
+  3647  8.2.2168  Vim9: error for assigning to dict of dict
+  6432  8.2.2169  Vim9: test leaves file behind
+ 12049  8.2.2170  Vim9: a global function defined in a :def function fails
+  1891  8.2.2171  valgrind warning for using uninitialized value
+  6008  8.2.2172  Vim9: number of arguments is not always checked
+  3388  8.2.2173  Vim9: get internal error when assigning to undefined variable
+  1641  8.2.2174  Mac version doesn't specify the CPU architecture
+  4485  8.2.2175  github actions: clang-11 handling suboptimal
+  2085  8.2.2176  crash with a sequence of fold commands
+  2675  8.2.2177  pattern "^" does not match if first character is combining
+  6755  8.2.2178  Python 3: non-utf8 character cannot be handled
+ 16498  8.2.2179  Vim9: crash when indexing a dict with a number
+  1868  8.2.2180  Vim9: test for error after error is flaky
+  3866  8.2.2181  valgrind warnings for using uninitialized value
+ 23831  8.2.2182  Vim9: value of 'magic' is still relevant
+  2026  8.2.2183  Vim9: value of 'edcompatible' and 'gdefault' are used
+  3747  8.2.2184  Vim9: no error when using "2" for a line number
+ 55238  8.2.2185  BufUnload is not triggered for the quickfix dummy buffer
+  4476  8.2.2186  Vim9: error when using 'opfunc'
+  4068  8.2.2187  Python 3 test fails sometimes
+ 18894  8.2.2188  Vim9: crash when calling global function from :def function
+  3189  8.2.2189  cannot repeat a command that uses the small delete register
+  2485  8.2.2190  Vim9: crash when compiled with EXITFREE
+  5469  8.2.2191  Vim9: using wrong name with lambda in nested function 
+  2470  8.2.2192  Codecov on github actions fails
+  5117  8.2.2193  Vim9: can change constant in :def function
+ 10221  8.2.2194  Vim9: cannot use :const or :final at the script level
+  3910  8.2.2195  failing tests for :const
+  2698  8.2.2196  :version output has extra spaces in compile and link command
+  1717  8.2.2197  assert arguments order reversed
+  3936  8.2.2198  ml_get error when resizing window and using text property
+  2487  8.2.2199  first write after setting 'eol' does not have NL added
+  4594  8.2.2200  Vim9: lambda without white space around -> is confusing
+  1752  8.2.2201  write file test fails on MS-Windows
+  1753  8.2.2202  write file test still fails on MS-Windows
+  2649  8.2.2203  Moodle gift files are not recognized
+ 27134  8.2.2204  Vim9: using -> both for method and lambda is confusing
+  1891  8.2.2205  Vim9: memory leak when parsing lambda fails
+  2626  8.2.2206  :exe command line completion only works for first argument
+  7240  8.2.2207  illegal memory access if popup menu items are changed
+ 12482  8.2.2208  Vim9: after reloading a script variable index may be invalid
+ 24946  8.2.2209  Vim9: return type of => lambda not parsed
+  3409  8.2.2210  Vim9: allocating a type to set TTFLAG_BOOL_OK
+  3690  8.2.2211  MS-Windows: can't load Python dll if not in the path
+  9594  8.2.2212  Vim9: lambda with => does not work at the script level
+  1746  8.2.2213  checking white space around -> is not backwards compatible
+  7098  8.2.2214  ":e#" does not give a warning for missing white space
+  2512  8.2.2215  Vim9: `=expr` not recognized in global command
+  3750  8.2.2216  Vim9: range with missing colon can be hard to spot
+  2063  8.2.2217  Vim9: command modifiers not restored in catch block
+  2651  8.2.2218  Vim9: failure if passing more args to lambda than expected
+  8081  8.2.2219  Vim9: method call with expression not supported
+  1394  8.2.2220  Vim9: memory leak when parsing nested parenthesis
+  3653  8.2.2221  if <Down> is mapped on the command line 'wildchar' is inserted
+ 15837  8.2.2222  Vim9: cannot keep script variables when reloading
+  8145  8.2.2223  Vim9: Reloading marks a :def function as deleted
+ 14266  8.2.2224  Vim9: crash if script reloaded with different variable type
+ 12065  8.2.2225  Vim9: error when using :import in legacy script twice
+  1415  8.2.2226  Vim9: script test fails
+  7953  8.2.2227  Vim9: recognizing lambda is too complicated
+  7410  8.2.2228  Vim9: cannot use ":e #" because # starts a comment
+  1645  8.2.2229  build failure without the +eval feature
+  2552  8.2.2230  Vim9: insert completion runs into error
+  2578  8.2.2231  when "--remote file" is used "file" is not reloaded
+  1651  8.2.2232  compiler error for falling through into next case
+  7147  8.2.2233  cannot convert a byte index into a character index
+  2703  8.2.2234  command line wildmenu test often fails with Unix GUI
+ 11933  8.2.2235  build failure with some Ruby versions
+  4778  8.2.2236  'scroll' option can change when setting the statusline
+  1472  8.2.2237  CI on Mac fails in sed command
+ 23116  8.2.2238  Vim9: cannot load a Vim9 script without the +eval feature
+ 15191  8.2.2239  Vim9: concatenating lines with backslash is inconvenient
+  3046  8.2.2240  clientserver test fails if full path is used
+  2571  8.2.2241  Build with Ruby and clang may fail
+  7409  8.2.2242  Vim9: bar line continuation does not work at script level
+  2990  8.2.2243  crash when popup mask contains zeroes
+  1989  8.2.2244  crash when making the window width negative
+  2184  8.2.2245  Vim9: return value of winrestcmd() cannot be executed
+  8956  8.2.2246  cursor keys not recognized at the hit-Enter prompt
+ 13752  8.2.2247  VMS: various smaller problems
+  1986  8.2.2248  ASAN error on exit with GUI
+  1949  8.2.2249  termcodes test is flaky when used over ssh
+ 17246  8.2.2250  Vim9: sublist is ambiguous
+  1602  8.2.2251  test failures in legacy script
+  3104  8.2.2252  Vim9: crash when using lambda without return type in dict
+  1254  8.2.2253  Vim9: expr test fails
+ 18904  8.2.2254  Vim9: bool option type is number
+  3341  8.2.2255  Tcl test fails
+  2899  8.2.2256  Vim9: cannot use function( after line break in :def function
+ 38425  8.2.2257  Vim9: using -> for lambda is ambiguous
+  4382  8.2.2258  not all OCaml related files are detected
+  2016  8.2.2259  Test_Executable() fails when using chroot
+  1704  8.2.2260  window resize test fails in very wide terminal
+  2626  8.2.2261  Vim9: boolean option gets string type
+  4412  8.2.2262  Vim9: converting bool to string prefixes v:
+  7110  8.2.2263  Vim9: compilation error with try-catch in skipped block
+  5196  8.2.2264  Vim9: no error for mismatched :endfunc or :enddef
+  2240  8.2.2265  error message for missing endfunc/enddef is last line
+ 12515  8.2.2266  Vim9: it can be hard to see where white space is missing
+  4046  8.2.2267  Vim9: cannot use unlet for a dict member
+ 10588  8.2.2268  Vim9: list unpack seen as declaration
+  3552  8.2.2269  not all :hardcopy code covered by tests
+  1747  8.2.2270  warning for size_t to int conversion
+  2779  8.2.2271  ml_get error when changing hidden buffer in Python
+ 15452  8.2.2272  Vim9: extend() can violate the type of a variable
+  1801  8.2.2273  build failure
+  3894  8.2.2274  badge for Travis is outdated
+  2145  8.2.2275  CTRL-C not recognized in Mintty
+  6071  8.2.2276  list of distributed files is outdated
+  1454  8.2.2277  missing backslash
+  6889  8.2.2278  falling back to old regexp engine can some patterns
+  1660  8.2.2279  Vim9: memory leak with catch in skipped block
+ 19607  8.2.2280  fuzzy matching doesn't give access to the scores
+  2081  8.2.2281  Vim9: compiled "wincmd" cannot be followed by bar
+  2064  8.2.2282  length check mismatch with argument of strncmp()
+  2468  8.2.2283  Vim9: crash when lambda has fewer arguments than expected
+  2577  8.2.2284  Vim9: cannot set an option to a boolean value
+  2454  8.2.2285  Vim9: cannot set an option to a false
+  6448  8.2.2286  sort test fails when locale is Canadian English
+  5162  8.2.2287  sort test fails when locale is French Canadian
+  9404  8.2.2288  Vim9: line break and comment not always skipped
+  9004  8.2.2289  Vim9: 'cpo' can become empty
+  4677  8.2.2290  Vim9: unlet of global variable cannot be compiled
+  7482  8.2.2291  Vim9: cannot use "null" for v:null
+  1909  8.2.2292  Vim: expr test fails
+  1466  8.2.2293  build failure with Motif
+ 26434  8.2.2294  VMS: a few remaining problems
+ 18243  8.2.2295  incsearch does not detect empty pattern properly
+  3461  8.2.2296  cannot use CTRL-N and CTRL-P in a popup menu
+  2564  8.2.2297  Vim9: cannot set 'number' to a boolean value
+  7672  8.2.2298  Vim9: comment right after "(" of function not recognized
+  5002  8.2.2299  Vim9: invalid memory access making error message flaky
+  1819  8.2.2300  Vim9: wrong order on type stack when using dict
+ 44724  8.2.2301  Vim9: cannot unlet a dict or list item
+  2060  8.2.2302  Vim9: using an option value may use uninitialized memory
+  2161  8.2.2303  Vim9: backtick expansion doesn't work for :foldopen
+  4754  8.2.2304  Vim9: no test for unletting an imported variable
+  6553  8.2.2305  Vim9: "++var" and "--var" are silently accepted
+ 23279  8.2.2306  Vim9: when using function reference type is not checked
+  2123  8.2.2307  a shell command in the vimrc causes terminal output
+  4302  8.2.2308  Vim9: no error when assigning lambda to funcref
+  2653  8.2.2309  0o777 not recognized as octal
+  2362  8.2.2310  Vim9: winsaveview() return type is too generic
+  7479  8.2.2311  Vim9: cannot assign to variable that shadows command modifier
+  1498  8.2.2312  build failure with Ruby 3.0 and 32 bits
+  2440  8.2.2313  Vim9: using uninitialized field when parsing range
+ 13291  8.2.2314  Vim9: returning zero takes two instructions
+  2742  8.2.2315  Vim9: "enddef" as dict key misintepreted as function end
+  2755  8.2.2316  Vim9: cannot list a lambda function
+  3507  8.2.2317  Vim9: command modifier before list unpack doesn't work
+ 11934  8.2.2318  Vim9: string and list index work differently
+ 12368  8.2.2319  "exptype_T" can be read as "expected type"
+  3345  8.2.2320  Vim9: no error for comparing bool with string
+ 22245  8.2.2321  Vim9: cannot nest closures
+ 21500  8.2.2322  Vim9: closure nested limiting to one level
+  3407  8.2.2323  Vim9: error when inferring type from empty dict/list
+ 50465  8.2.2324  not easy to get mark en cursor position by character count
+ 10521  8.2.2325  Vim9: crash if map() changes the item type
+  1502  8.2.2326  build error with +eval feature but without +spell
+  2239  8.2.2327  debugging code included
+  2459  8.2.2328  some test files may not be deleted
+  4988  8.2.2329  not all ways Vim can be started are tested
+  2774  8.2.2330  Vim9: crash when using :trow in a not executed block
+ 12719  8.2.2331  Vim9: wrong error when modifying dict declared with :final
+ 10333  8.2.2332  Vim9: missing :endif not reported when using :windo
+  1830  8.2.2333  Vim9: warning for uninitialized variable
+  7653  8.2.2334  Pascal-like filetypes not always detected
+  2392  8.2.2335  Vim9: "silent return" does not restore command modifiers
+ 11580  8.2.2336  Vim9: not possible to extend dictionary with different type
+  2322  8.2.2337  configure test for GTK only says "no"
+  3618  8.2.2338  Vim9: no error if using job_info() result wrongly
+  6342  8.2.2339  cannot get the type of a value as a string
+  2572  8.2.2340  win_execute() unexpectedly returns number zero when failing
+  3340  8.2.2341  expression command line completion incomplete after "g:"
+ 12069  8.2.2342  "char" functions may return wrong column in Insert mode
+ 10134  8.2.2343  Vim9: return type of readfile() is any
+ 20850  8.2.2344  using inclusive index for slice is not always desired
+  8627  8.2.2345  no focus events in a terminal
+  3318  8.2.2346  Codecov reports every little coverage drop
+  1593  8.2.2347  build failure without GUI
+  2979  8.2.2348  no check for modified files after focus gained
+  3304  8.2.2349  Vim9: cannot handle line break after parenthesis at line end
+  1948  8.2.2350  using "void" for no reason
+  2461  8.2.2351  Vim9: error msg for "throw" in function called with "silent!"
+  2164  8.2.2352  if focus lost/gained is received twice code is not ignored
+  2078  8.2.2353  spartql files are not detected
+  8907  8.2.2354  crash with a weird combination of autocommands
+  1889  8.2.2355  stray test failure on Appveyor
+  5258  8.2.2356  Vim9: ":put =expr" does not handle a list properly
+  2060  8.2.2357  Vim9: crash when parsing function return type fails
+  2255  8.2.2358  wrong #ifdef for use_xterm_like_mouse()
+  1914  8.2.2359  strange test failure with MS-Windows
+  1443  8.2.2360  test leaves file behind
+  1878  8.2.2361  Vim9: no highlight for "s///gc" when using 'opfunc'
+ 19936  8.2.2362  Vim9: check of builtin function argument type is incomplete
+  2239  8.2.2363  curpos() does not accept a string argument as before
+  4400  8.2.2364  Vim9: line break in lambda accesses freed memory
+  8739  8.2.2365  Vim9: no check for map() changing item type at script level
+  8671  8.2.2366  when using ":sleep" the cursor is always displayed
+  6610  8.2.2367  test failures on some less often used systems
+  3275  8.2.2368  insufficient tests for setting options
+ 29522  8.2.2369  Vim9: functions return true/false but can't be used as bool
+  2630  8.2.2370  Vim9: command fails in catch block
+  3643  8.2.2371  Vim9: crash when using types in :for with unpack
+  2210  8.2.2372  confusing error message for wrong :let command
+  3262  8.2.2373  Vim9: list assignment only accepts a number index
+  1839  8.2.2374  accessing uninitialized memory in test_undo
+  1971  8.2.2375  test for RGB color skipped in the terminal
+  2628  8.2.2376  Vim9: crash when dividing by zero in compiled code
+  3491  8.2.2377  Vim9: crash when using a range after another expression
+  4405  8.2.2378  Vim9: no error message for dividing by zero
+  2159  8.2.2379  do spell suggestions twice if 'spellsuggest' contains number
+  2232  8.2.2380  Vim9: occasional crash when using try/catch and a timer
+  9598  8.2.2381  Vim9: divide by zero does not abort expression execution
+  2220  8.2.2382  build failure
+  1666  8.2.2383  focus escape sequences are not named
+  2465  8.2.2384  turtle filetype not recognized
+  4333  8.2.2385  "gj" and "gk" do not work correctly when inside a fold
+  3371  8.2.2386  Vim9: crash when using ":silent! put"
+  8866  8.2.2387  runtime type check does not mention argument index
+  6013  8.2.2388  no easy way to get the maximum or mininum number value
+  3879  8.2.2389  test failure on a few systems
+  4180  8.2.2390  Vim9: using positive offset is unexpected
+  7859  8.2.2391  memory leak when creating a global function with closure
+  3162  8.2.2392  fennel filetype not recognized
+  2011  8.2.2393  Vim9: error message when script line starts with "[{"
+  3168  8.2.2394  Vim9: min() and max() return type is "any"
+  2418  8.2.2395  Vim9: error for wrong type may report wrong line number
+  4732  8.2.2396  Vim9: no white space allowed before "->"
+  2753  8.2.2397  Vim9: "%%" not seen as alternate file name for ":bdel"
+  1751  8.2.2398  method test fails
+  1731  8.2.2399  fold test fails in wide terminal
+ 42070  8.2.2400  Vim9: compiled functions are not profiled
+ 10340  8.2.2401  build fails without +profiling feature
+  6014  8.2.2402  some filetypes not detected
+ 15523  8.2.2403  Vim9: profiling if/elseif/endif not correct
+ 18331  8.2.2404  Vim9: profiling try/catch not correct
+  2458  8.2.2405  Vim9: no need to allow white space before "(" for :def
+  1799  8.2.2406  Vim9: profiled :def function leaks memory
+  2268  8.2.2407  old jumplist code is never used
+  2530  8.2.2408  MinGW: "--preprocessor" flag no longer supported
+  9346  8.2.2409  Vim9: profiling only works for one function
+  1660  8.2.2410  build failure without the +profiling feature
+  1867  8.2.2411  profile test fails on MS-Windows
+  1792  8.2.2412  not all fields in "cstack" are initialized
+  2823  8.2.2413  crash when using :all while using a cmdline window
+  1899  8.2.2414  using freed memory when closing the cmdline window
+ 11004  8.2.2415  no way to check for the cmdwin feature
+  2405  8.2.2416  may get stuck in command line window state
+  1713  8.2.2417  condition stack values may be used when not set
+  1699  8.2.2418  color not changed if ModeMsg highlight is set in InsertEnter
+  2061  8.2.2419  autocmd test was failing on MS-Windows with GUI
+  6333  8.2.2420  too many problems with using all autocommand events
+  5632  8.2.2421  double free when using autocommand with "argdel"
+  3025  8.2.2422  crash when deleting with line number out of range
+  1583  8.2.2423  missing error message
+  4530  8.2.2424  some tests are known to cause an error with ASAN
+  1908  8.2.2425  cursor on invalid line with range and :substitute
+  5772  8.2.2426  allowing 'completefunc' to switch windows causes trouble
+  5114  8.2.2427  can still switch windows for 'completefunc'
+  4505  8.2.2428  FocusGained does not work when 'ttymouse' is empty
+  5606  8.2.2429  :goto does not work correctly with text properties
+  3053  8.2.2430  :vimgrep expands wildcards twice
+  3547  8.2.2431  warning for -fno-strength-reduce with Clang 11
+  2118  8.2.2432  libvterm tests are executed even when libtool doesn't work
+  2466  8.2.2433  opening cmdline window gives error in BufLeave autocommand
+  5804  8.2.2434  Vim9: no error when compiling str2nr() with a number
diff -Nru vim-8.2.1913/debian/copyright vim-8.2.2434/debian/copyright
--- vim-8.2.1913/debian/copyright	2020-10-28 09:19:50.000000000 +0000
+++ vim-8.2.2434/debian/copyright	2021-01-31 09:42:29.000000000 +0000
@@ -3,7 +3,7 @@
 Source: https://github.com/vim/vim
 
 Files: *
-Copyright: 2001-2020 Bram Moolenaar <Bram@vim.org>
+Copyright: 2001-2021 Bram Moolenaar <Bram@vim.org>
            2006 Benji Fisher <benji@member.ams.org>
            1999-2016 Charles E. Campbell, Jr. <drchip@campbellfamily.biz>
            2003 Fred Barnes
@@ -35,6 +35,7 @@
 
 Files: runtime/syntax/cmake.vim
        runtime/syntax/elm.vim
+       runtime/syntax/proto.vim
        runtime/syntax/tpp.vim
        runtime/indent/cmake.vim
        runtime/indent/elm.vim
@@ -43,15 +44,14 @@
            Dimitri Merejkowsky <d.merej@gmail.com>
            Gerfried Fuchs <alfie@ist.org>
            Joseph Hager <ajhager@gmail.com>
+           2008 Google Inc.
 License: BSD-3-clause
 
 Files: runtime/ftplugin/wast.vim
        runtime/indent/wast.vim
        runtime/syntax/json.vim
-       runtime/syntax/proto.vim
        runtime/syntax/wast.vim
 Copyright: 2013, Jeroen Ruigrok van der Werven, Eli Parra
-           2008 Google Inc.
            2016 rhysd
 License: Expat
 
diff -Nru vim-8.2.1913/debian/patches/debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch vim-8.2.2434/debian/patches/debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch
--- vim-8.2.1913/debian/patches/debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch	2020-10-28 09:19:50.000000000 +0000
+++ vim-8.2.2434/debian/patches/debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch	2021-01-31 09:42:29.000000000 +0000
@@ -13,10 +13,10 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim
-index 2c3179e..bfaa2dc 100644
+index 1ac74b5..4bb8917 100644
 --- a/runtime/autoload/dist/ft.vim
 +++ b/runtime/autoload/dist/ft.vim
-@@ -665,7 +665,7 @@ func dist#ft#FTtex()
+@@ -684,7 +684,7 @@ func dist#ft#FTtex()
      call cursor(1,1)
      let firstNC = search('^\s*[^[:space:]%]', 'c', 1000)
      if firstNC " Check the next thousand lines for a LaTeX or ConTeXt keyword.
diff -Nru vim-8.2.1913/debian/patches/debian/Detect-the-rst-filetype-using-the-contents-of-the-file.patch vim-8.2.2434/debian/patches/debian/Detect-the-rst-filetype-using-the-contents-of-the-file.patch
--- vim-8.2.1913/debian/patches/debian/Detect-the-rst-filetype-using-the-contents-of-the-file.patch	2020-10-28 09:19:50.000000000 +0000
+++ vim-8.2.2434/debian/patches/debian/Detect-the-rst-filetype-using-the-contents-of-the-file.patch	2021-01-31 09:42:29.000000000 +0000
@@ -8,10 +8,10 @@
  1 file changed, 8 insertions(+)
 
 diff --git a/runtime/scripts.vim b/runtime/scripts.vim
-index 9c2787a..a707498 100644
+index 9217b44..37e05d5 100644
 --- a/runtime/scripts.vim
 +++ b/runtime/scripts.vim
-@@ -363,6 +363,14 @@ else
+@@ -367,6 +367,14 @@ else
    elseif s:line1 =~# 'exec\s\+\S*scheme' || s:line2 =~# 'exec\s\+\S*scheme'
      set ft=scheme
  
diff -Nru vim-8.2.1913/debian/patches/debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch vim-8.2.2434/debian/patches/debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch
--- vim-8.2.1913/debian/patches/debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch	2020-10-28 09:19:50.000000000 +0000
+++ vim-8.2.2434/debian/patches/debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch	2021-01-31 09:42:29.000000000 +0000
@@ -15,10 +15,10 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
-index 239ecb2..e5c5e60 100644
+index 2963193..38c5998 100644
 --- a/runtime/doc/options.txt
 +++ b/runtime/doc/options.txt
-@@ -5151,7 +5151,7 @@ A jump table for the options with a short description can be found at |Q_op|.
+@@ -5155,7 +5155,7 @@ A jump table for the options with a short description can be found at |Q_op|.
  
  				   *'modeline'* *'ml'* *'nomodeline'* *'noml'*
  'modeline' 'ml'		boolean	(Vim default: on (off for root),
diff -Nru vim-8.2.1913/debian/patches/debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch vim-8.2.2434/debian/patches/debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch
--- vim-8.2.1913/debian/patches/debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch	2020-10-28 09:19:50.000000000 +0000
+++ vim-8.2.2434/debian/patches/debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch	2021-01-31 09:42:29.000000000 +0000
@@ -17,10 +17,10 @@
  3 files changed, 19 insertions(+), 1 deletion(-)
 
 diff --git a/src/main.c b/src/main.c
-index 53b8719..d869877 100644
+index ef53b33..6e67e72 100644
 --- a/src/main.c
 +++ b/src/main.c
-@@ -1865,6 +1865,10 @@ parse_command_name(mparm_T *parmp)
+@@ -1868,6 +1868,10 @@ parse_command_name(mparm_T *parmp)
      }
      else if (STRNICMP(initstr, "vim", 3) == 0)
  	initstr += 3;
@@ -31,7 +31,7 @@
  
      // Catch "[r][g]vimdiff" and "[r][g]viewdiff".
      if (STRICMP(initstr, "diff") == 0)
-@@ -3120,7 +3124,12 @@ source_startup_scripts(mparm_T *parmp)
+@@ -3130,7 +3134,12 @@ source_startup_scripts(mparm_T *parmp)
  	 * Get system wide defaults, if the file name is defined.
  	 */
  #ifdef SYS_VIMRC_FILE
@@ -45,7 +45,7 @@
  #endif
  #ifdef MACOS_X
  	(void)do_source((char_u *)"$VIMRUNTIME/macmap.vim", FALSE,
-@@ -3159,6 +3168,9 @@ source_startup_scripts(mparm_T *parmp)
+@@ -3169,6 +3178,9 @@ source_startup_scripts(mparm_T *parmp)
  #ifdef USR_EXRC_FILE2
  		&& do_source((char_u *)USR_EXRC_FILE2, FALSE,
  						       DOSO_NONE, NULL) == FAIL
@@ -56,10 +56,10 @@
  		&& !has_dash_c_arg)
  	    {
 diff --git a/src/os_unix.h b/src/os_unix.h
-index 9b7337a..dbb3d4c 100644
+index 83fe66d..8880fec 100644
 --- a/src/os_unix.h
 +++ b/src/os_unix.h
-@@ -217,6 +217,9 @@ typedef struct dsc$descriptor   DESC;
+@@ -219,6 +219,9 @@ typedef struct dsc$descriptor   DESC;
  /*
   * Unix system-dependent file names
   */
@@ -70,10 +70,10 @@
  # define SYS_VIMRC_FILE "$VIM/vimrc"
  #endif
 diff --git a/src/structs.h b/src/structs.h
-index 007aa9d..95e22e8 100644
+index d6bf667..b978559 100644
 --- a/src/structs.h
 +++ b/src/structs.h
-@@ -4081,6 +4081,9 @@ typedef struct
+@@ -4118,6 +4118,9 @@ typedef struct
  #ifdef FEAT_DIFF
      int		diff_mode;		// start with 'diff' set
  #endif
diff -Nru vim-8.2.1913/debian/patches/riscv64-test-timeout.patch vim-8.2.2434/debian/patches/riscv64-test-timeout.patch
--- vim-8.2.1913/debian/patches/riscv64-test-timeout.patch	2020-05-20 23:08:14.000000000 +0000
+++ vim-8.2.2434/debian/patches/riscv64-test-timeout.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-Index: vim-8.2.0716-3ubuntu1/src/testdir/test_messages.vim
-===================================================================
---- vim-8.2.0716-3ubuntu1.orig/src/testdir/test_messages.vim
-+++ vim-8.2.0716-3ubuntu1/src/testdir/test_messages.vim
-@@ -109,7 +109,7 @@
- 
-   let rows = 10
-   let buf = term_start([GetVimProg(), '--clean', '-S', testfile], {'term_rows': rows})
--  call TermWait(buf, 100)
-+  call TermWait(buf, 400)
-   call assert_equal('run', job_status(term_getjob(buf)))
- 
-   call term_sendkeys(buf, "i")
diff -Nru vim-8.2.1913/debian/patches/series vim-8.2.2434/debian/patches/series
--- vim-8.2.1913/debian/patches/series	2020-11-18 19:54:07.000000000 +0000
+++ vim-8.2.2434/debian/patches/series	2021-02-15 12:29:39.000000000 +0000
@@ -1,4 +1,3 @@
-ubuntu-series-support.patch
 debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch
 debian/Detect-the-rst-filetype-using-the-contents-of-the-file.patch
 debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch
@@ -6,5 +5,4 @@
 ubuntu-grub-syntax.patch
 update-upstart-syntax.patch
 ubuntu-mouse-off.patch
-riscv64-test-timeout.patch
 increase_timeout.diff
diff -Nru vim-8.2.1913/debian/patches/ubuntu-series-support.patch vim-8.2.2434/debian/patches/ubuntu-series-support.patch
--- vim-8.2.1913/debian/patches/ubuntu-series-support.patch	2020-11-09 20:39:26.000000000 +0000
+++ vim-8.2.2434/debian/patches/ubuntu-series-support.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-Index: vim-8.2.1913-1ubuntu1/runtime/syntax/debsources.vim
-===================================================================
---- vim-8.2.1913-1ubuntu1.orig/runtime/syntax/debsources.vim
-+++ vim-8.2.1913-1ubuntu1/runtime/syntax/debsources.vim
-@@ -26,7 +26,7 @@ let s:supported = [
-       \ 'wheezy', 'jessie', 'stretch', 'buster', 'bullseye', 'bookworm',
-       \ 'sid', 'rc-buggy',
-       \
--      \ 'trusty', 'xenial', 'bionic', 'eoan', 'focal', 'groovy', 'devel'
-+      \ 'trusty', 'xenial', 'bionic', 'focal', 'groovy', 'hirsute', 'devel'
-       \ ]
- let s:unsupported = [
-       \ 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato',
-@@ -36,7 +36,7 @@ let s:unsupported = [
-       \ 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic', 'lucid',
-       \ 'maverick', 'natty', 'oneiric', 'precise', 'quantal', 'raring', 'saucy',
-       \ 'utopic', 'vivid', 'wily', 'yakkety', 'zesty', 'artful', 'cosmic',
--      \ 'disco'
-+      \ 'disco', 'eoan'
-       \ ]
- let &cpo=s:cpo
- 
-Index: vim-8.2.1913-1ubuntu1/runtime/syntax/debchangelog.vim
-===================================================================
---- vim-8.2.1913-1ubuntu1.orig/runtime/syntax/debchangelog.vim
-+++ vim-8.2.1913-1ubuntu1/runtime/syntax/debchangelog.vim
-@@ -24,7 +24,7 @@ let s:supported = [
-       \ 'wheezy', 'jessie', 'stretch', 'buster', 'bullseye', 'bookworm',
-       \ 'sid', 'rc-buggy',
-       \
--      \ 'trusty', 'xenial', 'bionic', 'eoan', 'focal', 'groovy', 'devel'
-+      \ 'trusty', 'xenial', 'bionic', 'focal', 'groovy', 'hirsute', 'devel'
-       \ ]
- let s:unsupported = [
-       \ 'frozen', 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato',
-@@ -34,7 +34,7 @@ let s:unsupported = [
-       \ 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic', 'lucid',
-       \ 'maverick', 'natty', 'oneiric', 'precise', 'quantal', 'raring', 'saucy',
-       \ 'utopic', 'vivid', 'wily', 'yakkety', 'zesty', 'artful', 'cosmic',
--      \ 'disco'
-+      \ 'disco', 'eoan'
-       \ ]
- let &cpo=s:cpo
- 
diff -Nru vim-8.2.1913/debian/rules vim-8.2.2434/debian/rules
--- vim-8.2.1913/debian/rules	2020-10-28 09:19:49.000000000 +0000
+++ vim-8.2.2434/debian/rules	2021-01-31 09:42:29.000000000 +0000
@@ -229,8 +229,15 @@
 
 test-vim-%: VARIANT=vim-$*
 test-vim-%:
-# Ensure $TERM is set to a sane value for testing
-	[ $(MAKETEST) != "yes" ] || env LANG=C.UTF-8 TERM=xterm $(MAKE) -j1 -C src/$(VARIANT) test
+	:
+ifeq (yes,$(MAKETEST))
+# Sanitize LC_* env so they don't leak through to child processes and cause problems in build chroots (e.g., missing locales)
+# and set sane values for TERM/LC_ALL/LANG
+	for e in ADDRESS COLLATE CTYPE IDENTIFICATION MEASUREMENT MESSAGES MONETARY NAME NUMERIC PAPER TELEPHONE TIME; do \
+	  unset LC_$${e}; \
+	done; \
+	env TERM=xterm LC_ALL=C.UTF-8 LANG=C.UTF-8 $(MAKE) -j1 -C src/$(VARIANT) test
+endif
 
 override_dh_auto_install-arch:
 
diff -Nru vim-8.2.1913/Filelist vim-8.2.2434/Filelist
--- vim-8.2.1913/Filelist	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/Filelist	2021-01-30 22:05:11.000000000 +0000
@@ -3,20 +3,23 @@
 
 # source files for all source archives
 SRC_ALL =	\
-		.gitignore \
+		.cirrus.yml \
+		.coveralls.yml \
 		.gitattributes \
+		.github/CODEOWNERS \
+		.github/workflows/ci.yml \
+		.github/workflows/codeql-analysis.yml \
+		.gitignore \
 		.hgignore \
 		.lgtm.yml \
 		.travis.yml \
-		.cirrus.yml \
-		.github/workflows/ci-windows.yaml \
-		.github/workflows/codeql-analysis.yml \
-		.github/CODEOWNERS \
 		appveyor.yml \
 		ci/appveyor.bat \
+		ci/build-snd-dummy.sh \
+		ci/config.mk*.sed \
 		ci/if_ver*.vim \
 		ci/load-snd-dummy.sh \
-		ci/config.mk*.sed \
+		ci/setup-xvfb.sh \
 		src/Make_all.mak \
 		src/README.md \
 		src/alloc.h \
diff -Nru vim-8.2.1913/.github/CODEOWNERS vim-8.2.2434/.github/CODEOWNERS
--- vim-8.2.1913/.github/CODEOWNERS	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/.github/CODEOWNERS	2021-01-30 22:05:11.000000000 +0000
@@ -19,6 +19,7 @@
 runtime/autoload/rubycomplete.vim	@segfault @dkearns
 runtime/autoload/tar.vim		@cecamp
 runtime/autoload/vimball.vim		@cecamp
+runtime/autoload/xmlformat.vim		@chrisbra
 runtime/autoload/zip.vim		@cecamp
 runtime/compiler/checkstyle.vim		@dkearns
 runtime/compiler/cucumber.vim		@tpope
@@ -30,6 +31,7 @@
 runtime/compiler/dartdoc.vim		@dkearns
 runtime/compiler/dartfmt.vim		@dkearns
 runtime/compiler/eruby.vim		@dkearns
+runtime/compiler/fbc.vim		@dkearns
 runtime/compiler/gawk.vim		@dkearns
 runtime/compiler/gjs.vim		@dkearns
 runtime/compiler/haml.vim		@tpope
@@ -57,37 +59,49 @@
 runtime/compiler/typedoc.vim		@dkearns
 runtime/compiler/xmllint.vim		@dkearns
 runtime/compiler/xo.vim			@dkearns
+runtime/compiler/zsh.vim		@dkearns
 runtime/doc/pi_getscript.txt		@cecamp
 runtime/doc/pi_logipat.txt		@cecamp
 runtime/doc/pi_netrw.txt		@cecamp
 runtime/doc/pi_tar.txt			@cecamp
 runtime/doc/pi_vimball.txt		@cecamp
 runtime/doc/pi_zip.txt			@cecamp
+runtime/ftplugin/awk.vim		@dkearns
+runtime/ftplugin/basic.vim		@dkearns
 runtime/ftplugin/bst.vim		@tpope
+runtime/ftplugin/cfg.vim		@chrisbra
 runtime/ftplugin/css.vim		@dkearns
 runtime/ftplugin/cucumber.vim		@tpope
 runtime/ftplugin/eiffel.vim		@dkearns
 runtime/ftplugin/eruby.vim		@tpope @dkearns
+runtime/ftplugin/freebasic.vim		@dkearns
 runtime/ftplugin/git.vim		@tpope
 runtime/ftplugin/gitcommit.vim		@tpope
 runtime/ftplugin/gitconfig.vim		@tpope
 runtime/ftplugin/gitrebase.vim		@tpope
 runtime/ftplugin/gitsendemail.vim	@tpope
+runtime/ftplugin/gprof.vim		@dpelle
 runtime/ftplugin/haml.vim		@tpope
 runtime/ftplugin/hgcommit.vim		@k-takata
 runtime/ftplugin/javascript.vim		@dkearns
 runtime/ftplugin/javascriptreact.vim	@dkearns
+runtime/ftplugin/kconfig.vim		@chrisbra
 runtime/ftplugin/liquid.vim		@tpope
 runtime/ftplugin/markdown.vim		@tpope
 runtime/ftplugin/matlab.vim		@cecamp
+runtime/ftplugin/nroff.vim		@a-vrma
 runtime/ftplugin/nsis.vim		@k-takata
 runtime/ftplugin/pdf.vim		@tpope
 runtime/ftplugin/ruby.vim		@tpope @dkearns
 runtime/ftplugin/sass.vim		@tpope
 runtime/ftplugin/scss.vim		@tpope
+runtime/ftplugin/spec.vim		@ignatenkobrain
+runtime/ftplugin/tidy.vim		@dkearns
 runtime/ftplugin/tmux.vim		@ericpruitt
 runtime/ftplugin/typescript.vim		@dkearns
 runtime/ftplugin/typescriptreact.vim	@dkearns
+runtime/ftplugin/xml.vim		@chrisbra
+runtime/ftplugin/zsh.vim		@chrisbra
 runtime/indent/bst.vim			@tpope
 runtime/indent/cucumber.vim		@tpope
 runtime/indent/dosbatch.vim		@k-takata
@@ -99,18 +113,36 @@
 runtime/indent/ruby.vim			@AndrewRadev @dkearns
 runtime/indent/sass.vim			@tpope
 runtime/indent/scss.vim			@tpope
+runtime/indent/sh.vim			@chrisbra
 runtime/indent/teraterm.vim		@k-takata
+runtime/indent/xml.vim			@chrisbra
+runtime/indent/zsh.vim			@chrisbra
+runtime/keymap/tamil_tscii.vim		@yegappan
+runtime/pack/dist/opt/cfilter/plugin/cfilter.vim	@yegappan
+runtime/pack/dist/opt/matchit/		@chrisbra
 runtime/plugin/getscriptPlugin.vim	@cecamp
 runtime/plugin/logiPat.vim		@cecamp
 runtime/plugin/netrwPlugin.vim		@cecamp
 runtime/plugin/tarPlugin.vim		@cecamp
 runtime/plugin/vimballPlugin.vim	@cecamp
 runtime/plugin/zipPlugin.vim		@cecamp
+runtime/syntax/aidl.vim			@dpelle
 runtime/syntax/amiga.vim		@cecamp
+runtime/syntax/asm.vim			@dkearns
+runtime/syntax/asmh8300.vim		@dkearns
+runtime/syntax/awk.vim			@dkearns
+runtime/syntax/basic.vim		@dkearns
 runtime/syntax/bst.vim			@tpope
+runtime/syntax/cabal.vim		@coot
+runtime/syntax/cabalconfig.vim		@coot
+runtime/syntax/cabalproject.vim		@coot
+runtime/syntax/cs.vim			@nickspoons
 runtime/syntax/csh.vim			@cecamp
 runtime/syntax/cucumber.vim		@tpope
+runtime/syntax/datascript.vim		@dpelle
 runtime/syntax/dcl.vim			@cecamp
+runtime/syntax/doxygen.vim		@frogonwheels
+runtime/syntax/dtd.vim			@chrisbra
 runtime/syntax/elmfilt.vim		@cecamp
 runtime/syntax/eruby.vim		@tpope @dkearns
 runtime/syntax/exports.vim		@cecamp
@@ -118,8 +150,11 @@
 runtime/syntax/gitcommit.vim		@tpope
 runtime/syntax/gitconfig.vim		@tpope
 runtime/syntax/gitrebase.vim		@tpope
+runtime/syntax/gprof.vim		@dpelle
 runtime/syntax/haml.vim			@tpope
+runtime/syntax/haskell.vim		@coot
 runtime/syntax/hgcommit.vim		@k-takata
+runtime/syntax/kconfig.vim		@chrisbra
 runtime/syntax/lex.vim			@cecamp
 runtime/syntax/liquid.vim		@tpope
 runtime/syntax/lisp.vim			@cecamp
@@ -134,12 +169,17 @@
 runtime/syntax/pdf.vim			@tpope
 runtime/syntax/php.vim			@TysonAndre
 runtime/syntax/privoxy.vim		@dkearns
+runtime/syntax/prolog.vim		@XVilka
+runtime/syntax/rc.vim			@chrisbra
 runtime/syntax/rpcgen.vim		@cecamp
 runtime/syntax/ruby.vim			@dkearns
 runtime/syntax/sass.vim			@tpope
 runtime/syntax/scss.vim			@tpope
 runtime/syntax/sh.vim			@cecamp
 runtime/syntax/sm.vim			@cecamp
+runtime/syntax/spec.vim			@ignatenkobrain
+runtime/syntax/sqloracle.vim		@chrisbra
+runtime/syntax/sshdconfig.vim		@Jakuje
 runtime/syntax/tags.vim			@cecamp
 runtime/syntax/teraterm.vim		@k-takata
 runtime/syntax/tex.vim			@cecamp
@@ -149,6 +189,15 @@
 runtime/syntax/wget.vim			@dkearns
 runtime/syntax/xbl.vim			@dkearns
 runtime/syntax/xmath.vim		@cecamp
+runtime/syntax/xml.vim			@chrisbra
 runtime/syntax/xslt.vim			@Boobies
 runtime/syntax/xxd.vim			@cecamp
 runtime/syntax/yacc.vim			@cecamp
+runtime/syntax/zsh.vim			@chrisbra
+runtime/tutor/tutor.eo			@dpelle
+runtime/tutor/tutor.eo.utf-8		@dpelle
+runtime/tutor/tutor.fr			@dpelle
+runtime/tutor/tutor.fr.utf-8		@dpelle
+src/po/de.po				@chrisbra
+src/po/eo.po				@dpelle
+src/po/fr.po				@dpelle
diff -Nru vim-8.2.1913/.github/workflows/ci-windows.yaml vim-8.2.2434/.github/workflows/ci-windows.yaml
--- vim-8.2.1913/.github/workflows/ci-windows.yaml	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/.github/workflows/ci-windows.yaml	1970-01-01 00:00:00.000000000 +0000
@@ -1,229 +0,0 @@
-name: GitHub CI
-
-on:
-  push:
-    branches:
-      - '**'
-  pull_request:
-
-env:
-  VCVARSALL: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat
-
-  # Interfaces
-  # Lua
-  LUA_VER: 54
-  LUA_VER_DOT: '5.4'
-  LUA_RELEASE: 5.4.0
-  LUA32_URL: https://downloads.sourceforge.net/luabinaries/lua-%LUA_RELEASE%_Win32_dllw6_lib.zip
-  LUA64_URL: https://downloads.sourceforge.net/luabinaries/lua-%LUA_RELEASE%_Win64_dllw6_lib.zip
-  LUA_DIR: D:\Lua
-  # Python 2
-  PYTHON_VER: 27
-  PYTHON_VER_DOT: '2.7'
-  # Python 3
-  PYTHON3_VER: 38
-  PYTHON3_VER_DOT: '3.8'
-
-  # Other dependencies
-  # winpty
-  WINPTY_URL: https://github.com/rprichard/winpty/releases/download/0.4.3/winpty-0.4.3-msvc2015.zip
-
-  # Escape sequences
-  COL_RED: "\x1b[31m"
-  COL_GREEN: "\x1b[32m"
-  COL_YELLOW: "\x1b[33m"
-  COL_RESET: "\x1b[m"
-
-jobs:
-  build:
-    runs-on: windows-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        toolchain: [msvc, mingw]
-        arch: [x64, x86]
-        features: [HUGE, NORMAL]
-        include:
-          - arch: x64
-            vcarch: amd64
-            warch: x64
-            bits: 64
-            msystem: MINGW64
-            cygreg: registry
-            pyreg: ""
-          - arch: x86
-            vcarch: x86
-            warch: ia32
-            bits: 32
-            msystem: MINGW32
-            cygreg: registry32
-            pyreg: "-32"
-        exclude:
-          - toolchain: msvc
-            arch: x64
-            features: NORMAL
-          - toolchain: mingw
-            arch: x86
-            features: NORMAL
-
-    steps:
-    - name: Initalize
-      id: init
-      shell: bash
-      run: |
-        git config --global core.autocrlf input
-        python_dir=$(cat "/proc/${{ matrix.cygreg }}/HKEY_LOCAL_MACHINE/SOFTWARE/Python/PythonCore/${PYTHON_VER_DOT}/InstallPath/@")
-        python3_dir=$(cat "/proc/${{ matrix.cygreg }}/HKEY_LOCAL_MACHINE/SOFTWARE/Python/PythonCore/${PYTHON3_VER_DOT}${{ matrix.pyreg }}/InstallPath/@")
-        echo "PYTHON_DIR=$python_dir" >> $GITHUB_ENV
-        echo "PYTHON3_DIR=$python3_dir" >> $GITHUB_ENV
-
-    - uses: msys2/setup-msys2@v2
-      if: matrix.toolchain == 'mingw'
-      with:
-        msystem: ${{ matrix.msystem }}
-        release: false
-
-    - uses: actions/checkout@v2
-
-    - name: Create a list of download URLs
-      shell: cmd
-      run: |
-        type NUL > urls.txt
-        echo %LUA_RELEASE%>> urls.txt
-        echo %WINPTY_URL%>> urls.txt
-
-    - name: Cache downloaded files
-      uses: actions/cache@v2
-      with:
-        path: downloads
-        key: ${{ runner.os }}-${{ matrix.bits }}-${{ hashFiles('urls.txt') }}
-
-    - name: Download dependencies
-      shell: cmd
-      run: |
-        path C:\Program Files\7-Zip;%path%
-        if not exist downloads mkdir downloads
-
-        echo %COL_GREEN%Download Lua%COL_RESET%
-        call :downloadfile %LUA${{ matrix.bits }}_URL% downloads\lua.zip
-        7z x downloads\lua.zip -o%LUA_DIR% > nul || exit 1
-
-        echo %COL_GREEN%Download winpty%COL_RESET%
-        call :downloadfile %WINPTY_URL% downloads\winpty.zip
-        7z x -y downloads\winpty.zip -oD:\winpty > nul || exit 1
-        copy /Y D:\winpty\${{ matrix.warch }}\bin\winpty.dll        src\winpty${{ matrix.bits }}.dll
-        copy /Y D:\winpty\${{ matrix.warch }}\bin\winpty-agent.exe  src\
-
-        goto :eof
-
-        :downloadfile
-        :: call :downloadfile <URL> <localfile>
-        if not exist %2 (
-          curl -f -L %1 -o %2
-        )
-        if ERRORLEVEL 1 (
-          rem Retry once.
-          curl -f -L %1 -o %2 || exit 1
-        )
-        goto :eof
-
-    - name: Copy src directory to src2
-      shell: cmd
-      run: |
-        xcopy src src2\ /E > nul
-
-    - name: Build (MSVC)
-      if: matrix.toolchain == 'msvc'
-      shell: cmd
-      run: |
-        call "%VCVARSALL%" ${{ matrix.vcarch }}
-        cd src
-        :: Filter out the progress bar from the build log
-        sed -e "s/@<<$/@<< | sed -e 's#.*\\\\r.*##'/" Make_mvc.mak > Make_mvc2.mak
-        if "${{ matrix.features }}"=="HUGE" (
-          nmake -nologo -f Make_mvc2.mak ^
-            FEATURES=${{ matrix.features }} ^
-            GUI=yes IME=yes ICONV=yes VIMDLL=yes ^
-            DYNAMIC_LUA=yes LUA=%LUA_DIR% ^
-            DYNAMIC_PYTHON=yes PYTHON=%PYTHON_DIR% ^
-            DYNAMIC_PYTHON3=yes PYTHON3=%PYTHON3_DIR%
-        ) else (
-          nmake -nologo -f Make_mvc2.mak ^
-            FEATURES=${{ matrix.features }} ^
-            GUI=yes IME=yes ICONV=yes VIMDLL=yes
-        )
-        if not exist vim${{ matrix.bits }}.dll (
-          echo %COL_RED%Build failure.%COL_RESET%
-          exit 1
-        )
-
-    - name: Build (MinGW)
-      if: matrix.toolchain == 'mingw'
-      shell: msys2 {0}
-      run: |
-        cd src
-        if [ "${{ matrix.features }}" = "HUGE" ]; then
-          mingw32-make -f Make_ming.mak -j2 \
-            FEATURES=${{ matrix.features }} \
-            GUI=yes IME=yes ICONV=yes VIMDLL=yes \
-            DYNAMIC_LUA=yes LUA=${LUA_DIR} \
-            DYNAMIC_PYTHON=yes PYTHON=${PYTHON_DIR} \
-            DYNAMIC_PYTHON3=yes PYTHON3=${PYTHON3_DIR} \
-            STATIC_STDCPLUS=yes
-        else
-          mingw32-make -f Make_ming.mak -j2 \
-            FEATURES=${{ matrix.features }} \
-            GUI=yes IME=yes ICONV=yes VIMDLL=yes \
-            STATIC_STDCPLUS=yes
-        fi
-
-#    - name: Prepare Artifact
-#      shell: cmd
-#      run: |
-#        mkdir artifacts
-#        copy src\*vim.exe artifacts
-#        copy src\vim*.dll artifacts
-#
-#    - name: Upload Artifact
-#      uses: actions/upload-artifact@v1
-#      with:
-#        name: vim${{ matrix.bits }}-${{ matrix.toolchain }}
-#        path: ./artifacts
-
-    - name: Test
-      shell: cmd
-      timeout-minutes: 20
-      run: |
-        PATH %LUA_DIR%;C:\msys64\${{ matrix.msystem }}\bin;%PATH%;%PYTHON3_DIR%
-        call "%VCVARSALL%" ${{ matrix.vcarch }}
-        cd src
-        echo.
-        echo %COL_GREEN%vim version:%COL_RESET%
-        .\vim --version || exit 1
-
-        echo %COL_GREEN%Start testing vim in background.%COL_RESET%
-        start cmd /c "cd ..\src2\testdir & nmake -nologo -f Make_dos.mak VIMPROG=..\..\src\vim > nul & echo done>done.txt"
-
-        echo %COL_GREEN%Test gvim:%COL_RESET%
-        cd testdir
-        nmake -nologo -f Make_dos.mak VIMPROG=..\gvim || exit 1
-        cd ..
-
-        echo %COL_GREEN%Wait for vim tests to finish.%COL_RESET%
-        cd ..\src2\testdir
-        :: Wait about 10 minutes.
-        for /L %%i in (1,1,60) do (
-          if exist done.txt goto exitloop
-          timeout 10
-        )
-        set timeout=1
-        :exitloop
-
-        echo %COL_GREEN%Test results of vim:%COL_RESET%
-        if exist messages type messages
-        nmake -nologo -f Make_dos.mak report VIMPROG=..\..\src\vim || exit 1
-        if "%timeout%"=="1" (
-          echo %COL_RED%Timed out.%COL_RESET%
-          exit 1
-        )
diff -Nru vim-8.2.1913/.github/workflows/ci.yml vim-8.2.2434/.github/workflows/ci.yml
--- vim-8.2.1913/.github/workflows/ci.yml	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/.github/workflows/ci.yml	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,526 @@
+name: GitHub CI
+
+on:
+  push:
+    branches: ['**']
+  pull_request:
+
+jobs:
+  linux:
+    runs-on: ubuntu-latest
+
+    env:
+      CC: ${{ matrix.compiler }}
+      TEST: test
+      SRCDIR: ./src
+      LEAK_CFLAGS: -DEXITFREE
+      LOG_DIR: ${{ github.workspace }}/logs
+      TERM: xterm
+      DISPLAY: ':99'
+      DEBIAN_FRONTEND: noninteractive
+
+    strategy:
+      fail-fast: false
+      matrix:
+        features: [tiny, small, normal, huge]
+        compiler: [clang, gcc]
+        extra: [none]
+        include:
+          - features: tiny
+            compiler: clang
+            extra: nogui
+          - features: tiny
+            compiler: gcc
+            extra: nogui
+          - features: normal
+            shadow: ./src/shadow
+          - features: huge
+            coverage: true
+          - features: huge
+            compiler: gcc
+            coverage: true
+            extra: testgui
+          - features: huge
+            compiler: clang
+            extra: asan
+          - features: huge
+            compiler: gcc
+            coverage: true
+            extra: unittests
+          - features: normal
+            compiler: gcc
+            extra: vimtags
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install packages
+        run: |
+          sudo apt-get install -y \
+            autoconf \
+            lcov \
+            gettext \
+            libcanberra-dev \
+            libperl-dev \
+            python-dev \
+            python3-dev \
+            liblua5.3-dev \
+            lua5.3 \
+            ruby-dev \
+            tcl-dev \
+            cscope \
+            libgtk2.0-dev \
+            desktop-file-utils \
+            libtool-bin
+
+      - name: Install clang-11
+        if: matrix.compiler == 'clang'
+        run: |
+          wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
+          . /etc/lsb-release
+          sudo add-apt-repository -y "deb http://apt.llvm.org/${DISTRIB_CODENAME}/ llvm-toolchain-${DISTRIB_CODENAME}-11 main"
+          sudo apt-get install -y clang-11
+          sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-11 100
+          sudo update-alternatives --set clang /usr/bin/clang-11
+          sudo update-alternatives --install /usr/bin/llvm-cov llvm-cov /usr/bin/llvm-cov-11 100
+
+      - name: Set up environment
+        run: |
+          mkdir -p "${LOG_DIR}"
+          mkdir -p "${HOME}/bin"
+          echo "${HOME}/bin" >> $GITHUB_PATH
+          (
+          echo "LINUX_VERSION=$(uname -r)"
+          echo "NPROC=$(getconf _NPROCESSORS_ONLN)"
+          echo "SND_DUMMY_DIR=${HOME}/snd-dummy"
+          echo "TMPDIR=${{ runner.temp }}"
+
+          case "${{ matrix.features }}" in
+          tiny|small)
+            echo "TEST=testtiny"
+            if ${{ contains(matrix.extra, 'nogui') }}; then
+              echo "CONFOPT=--disable-gui"
+            fi
+            ;;
+          normal)
+            ;;
+          huge)
+            echo "TEST=scripttests test_libvterm"
+            echo "CONFOPT=--enable-perlinterp --enable-pythoninterp --enable-python3interp --enable-rubyinterp --enable-luainterp --enable-tclinterp"
+            ;;
+          esac
+
+          if ${{ matrix.coverage == true }}; then
+            echo "CFLAGS=--coverage -DUSE_GCOV_FLUSH"
+            echo "LDFLAGS=--coverage"
+          fi
+          if ${{ contains(matrix.extra, 'testgui') }}; then
+            echo "TEST=-C src testgui"
+          fi
+          if ${{ contains(matrix.extra, 'unittests') }}; then
+            echo "TEST=unittests"
+          fi
+          if ${{ contains(matrix.extra, 'asan') }}; then
+            echo "SANITIZER_CFLAGS=-g -O1 -DABORT_ON_INTERNAL_ERROR -DEXITFREE -fsanitize-recover=all -fsanitize=address -fsanitize=undefined -fno-omit-frame-pointer"
+            echo "ASAN_OPTIONS=print_stacktrace=1 log_path=${LOG_DIR}/asan"
+            echo "UBSAN_OPTIONS=print_stacktrace=1 log_path=${LOG_DIR}/ubsan"
+            echo "LSAN_OPTIONS=suppressions=${GITHUB_WORKSPACE}/src/testdir/lsan-suppress.txt"
+          fi
+          if ${{ contains(matrix.extra, 'vimtags') }}; then
+            echo "TEST=-C runtime/doc vimtags VIMEXE=../../${SRCDIR}/vim"
+          fi
+          ) >> $GITHUB_ENV
+
+      - name: Set up system
+        run: |
+          if [[ ${CC} = clang ]]; then
+            # Use llvm-cov instead of gcov when compiler is clang.
+            ln -fs /usr/bin/llvm-cov ${HOME}/bin/gcov
+          fi
+          # Setup lua5.3 manually since its package doesn't provide alternative.
+          # https://bugs.launchpad.net/ubuntu/+source/lua5.3/+bug/1707212
+          if [[ ${CONFOPT} =~ luainterp ]]; then
+            sudo update-alternatives --install /usr/bin/lua lua /usr/bin/lua5.3 10
+          fi
+          sudo sysctl -w net.ipv6.conf.lo.disable_ipv6=0
+          sudo usermod -a -G audio "${USER}"
+          sudo bash ci/setup-xvfb.sh
+
+      - name: Cache snd-dummy
+        uses: actions/cache@v2
+        with:
+          path: ${{ env.SND_DUMMY_DIR }}
+          key: linux-${{ env.LINUX_VERSION }}-snd-dummy
+
+      - name: Set up snd-dummy
+        run: |
+          if [[ ! -e ${SND_DUMMY_DIR}/snd-dummy.ko ]]; then
+            bash ci/build-snd-dummy.sh
+          fi
+          cd "${SND_DUMMY_DIR}"
+          sudo insmod soundcore.ko
+          sudo insmod snd.ko
+          sudo insmod snd-pcm.ko
+          sudo insmod snd-dummy.ko
+
+      - name: Check autoconf
+        if: contains(matrix.extra, 'unittests')
+        run: |
+          make -C src autoconf
+
+      - name: Set up shadow dir
+        if: matrix.shadow
+        run: |
+          make -C src shadow
+          echo "SRCDIR=${{ matrix.shadow }}" >> $GITHUB_ENV
+          echo "SHADOWOPT=-C ${{ matrix.shadow }}" >> $GITHUB_ENV
+
+      - name: Configure
+        run: |
+          ./configure --with-features=${{ matrix.features }} ${CONFOPT} --enable-fail-if-missing
+          # Append various warning flags to CFLAGS.
+          sed -i -f ci/config.mk.sed ${SRCDIR}/auto/config.mk
+          sed -i -f ci/config.mk.${CC}.sed ${SRCDIR}/auto/config.mk
+
+      - name: Build
+        if: (!contains(matrix.extra, 'unittests'))
+        run: |
+          make ${SHADOWOPT} -j${NPROC}
+
+      - name: Check version
+        if: (!contains(matrix.extra, 'unittests'))
+        run: |
+          "${SRCDIR}"/vim --version
+          "${SRCDIR}"/vim -u NONE -i NONE --not-a-term -esNX -V1 -S ci/if_ver-1.vim -c quit
+          "${SRCDIR}"/vim -u NONE -i NONE --not-a-term -esNX -V1 -S ci/if_ver-2.vim -c quit
+
+      - name: Test
+        timeout-minutes: 20
+        run: |
+          do_test() { sg audio "sg $(id -gn) '$*'"; }
+          do_test make ${SHADOWOPT} ${TEST}
+
+      - name: Coveralls
+        if: matrix.coverage && success() && github.event_name != 'pull_request'
+        env:
+          COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
+          COVERALLS_PARALLEL: true
+          TRAVIS_JOB_ID: ${{ github.run_id }}
+        run: |
+          sudo apt-get install -y python3-setuptools python3-wheel
+          # needed for https support for coveralls building cffi only works with gcc, not with clang
+          CC=gcc pip3 install --user cpp-coveralls pyopenssl ndg-httpsclient pyasn1
+          ~/.local/bin/coveralls -b "${SRCDIR}" -x .xs -e "${SRCDIR}"/if_perl.c -e "${SRCDIR}"/xxd -e "${SRCDIR}"/libvterm --encodings utf-8
+
+      - name: Codecov
+        if: matrix.coverage && success()
+        run: |
+          cd "${SRCDIR}"
+          bash <(curl -s https://codecov.io/bash) -F "${{ matrix.features }}-${{ matrix.compiler }}-${{ matrix.extra }}"
+
+      - name: ASan logs
+        if: contains(matrix.extra, 'asan') && !cancelled()
+        run: |
+          for f in $(grep -lR '#[[:digit:]]* *0x[[:digit:]a-fA-F]*' "${LOG_DIR}"); do
+            asan_symbolize-11 -l "$f"
+            false # in order to fail a job
+          done
+
+  coveralls:
+    runs-on: ubuntu-latest
+
+    needs: linux
+    if: always() && github.event_name != 'pull_request'
+
+    steps:
+      - name: Parallel finished
+        env:
+          COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
+        run: |
+          curl -k "https://coveralls.io/webhook?repo_token=${COVERALLS_REPO_TOKEN}" -d "payload[build_num]=${GITHUB_RUN_ID}&payload[status]=done"
+
+  macos:
+    runs-on: macos-latest
+
+    env:
+      CC: ${{ matrix.compiler }}
+      TEST: test
+      SRCDIR: ./src
+      LEAK_CFLAGS: -DEXITFREE
+      TERM: xterm
+
+    strategy:
+      fail-fast: false
+      matrix:
+        features: [tiny, huge]
+        compiler: [clang, gcc]
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install packages
+        env:
+          HOMEBREW_NO_AUTO_UPDATE: 1
+        run: |
+          brew install lua
+          echo "LUA_PREFIX=/usr/local" >> $GITHUB_ENV
+
+      - name: Set up environment
+        run: |
+          (
+          echo "NPROC=$(getconf _NPROCESSORS_ONLN)"
+          case "${{ matrix.features }}" in
+          tiny)
+            echo "TEST=testtiny"
+            echo "CONFOPT=--disable-gui"
+            ;;
+          huge)
+            echo "CONFOPT=--enable-perlinterp --enable-python3interp --enable-rubyinterp --enable-luainterp --enable-tclinterp"
+            ;;
+          esac
+          ) >> $GITHUB_ENV
+
+      - name: Configure
+        run: |
+          ./configure --with-features=${{ matrix.features }} ${CONFOPT} --enable-fail-if-missing
+          # Append various warning flags to CFLAGS.
+          # BSD sed needs backup extension specified.
+          sed -i.bak -f ci/config.mk.sed ${SRCDIR}/auto/config.mk
+          # On macOS, the entity of gcc is clang.
+          sed -i.bak -f ci/config.mk.clang.sed ${SRCDIR}/auto/config.mk
+
+      - name: Build
+        env:
+          LC_ALL: C
+        run: |
+          make -j${NPROC}
+
+      - name: Check version
+        run: |
+          "${SRCDIR}"/vim --version
+          "${SRCDIR}"/vim -u NONE -i NONE --not-a-term -esNX -V1 -S ci/if_ver-1.vim -c quit
+          "${SRCDIR}"/vim -u NONE -i NONE --not-a-term -esNX -V1 -S ci/if_ver-2.vim -c quit
+
+      - name: Test
+        timeout-minutes: 20
+        run: |
+          make ${TEST}
+
+  windows:
+    runs-on: windows-latest
+
+    env:
+      VCVARSALL: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat
+      # Interfaces
+      # Lua
+      LUA_VER: 54
+      LUA_VER_DOT: '5.4'
+      LUA_RELEASE: 5.4.0
+      LUA32_URL: https://downloads.sourceforge.net/luabinaries/lua-%LUA_RELEASE%_Win32_dllw6_lib.zip
+      LUA64_URL: https://downloads.sourceforge.net/luabinaries/lua-%LUA_RELEASE%_Win64_dllw6_lib.zip
+      LUA_DIR: D:\Lua
+      # Python 2
+      PYTHON_VER: 27
+      PYTHON_VER_DOT: '2.7'
+      # Python 3
+      PYTHON3_VER: 38
+      PYTHON3_VER_DOT: '3.8'
+      # Other dependencies
+      # winpty
+      WINPTY_URL: https://github.com/rprichard/winpty/releases/download/0.4.3/winpty-0.4.3-msvc2015.zip
+      # Escape sequences
+      COL_RED: "\x1b[31m"
+      COL_GREEN: "\x1b[32m"
+      COL_YELLOW: "\x1b[33m"
+      COL_RESET: "\x1b[m"
+
+    strategy:
+      fail-fast: false
+      matrix:
+        toolchain: [msvc, mingw]
+        arch: [x64, x86]
+        features: [HUGE, NORMAL]
+        include:
+          - arch: x64
+            vcarch: amd64
+            warch: x64
+            bits: 64
+            msystem: MINGW64
+            cygreg: registry
+            pyreg: ""
+          - arch: x86
+            vcarch: x86
+            warch: ia32
+            bits: 32
+            msystem: MINGW32
+            cygreg: registry32
+            pyreg: "-32"
+        exclude:
+          - toolchain: msvc
+            arch: x64
+            features: NORMAL
+          - toolchain: mingw
+            arch: x86
+            features: NORMAL
+
+    steps:
+      - name: Initalize
+        id: init
+        shell: bash
+        run: |
+          git config --global core.autocrlf input
+          python_dir=$(cat "/proc/${{ matrix.cygreg }}/HKEY_LOCAL_MACHINE/SOFTWARE/Python/PythonCore/${PYTHON_VER_DOT}/InstallPath/@")
+          python3_dir=$(cat "/proc/${{ matrix.cygreg }}/HKEY_LOCAL_MACHINE/SOFTWARE/Python/PythonCore/${PYTHON3_VER_DOT}${{ matrix.pyreg }}/InstallPath/@")
+          echo "PYTHON_DIR=$python_dir" >> $GITHUB_ENV
+          echo "PYTHON3_DIR=$python3_dir" >> $GITHUB_ENV
+
+      - uses: msys2/setup-msys2@v2
+        if: matrix.toolchain == 'mingw'
+        with:
+          msystem: ${{ matrix.msystem }}
+          release: false
+
+      - uses: actions/checkout@v2
+
+      - name: Create a list of download URLs
+        shell: cmd
+        run: |
+          type NUL > urls.txt
+          echo %LUA_RELEASE%>> urls.txt
+          echo %WINPTY_URL%>> urls.txt
+
+      - name: Cache downloaded files
+        uses: actions/cache@v2
+        with:
+          path: downloads
+          key: ${{ runner.os }}-${{ matrix.bits }}-${{ hashFiles('urls.txt') }}
+
+      - name: Download dependencies
+        shell: cmd
+        run: |
+          path C:\Program Files\7-Zip;%path%
+          if not exist downloads mkdir downloads
+
+          echo %COL_GREEN%Download Lua%COL_RESET%
+          call :downloadfile %LUA${{ matrix.bits }}_URL% downloads\lua.zip
+          7z x downloads\lua.zip -o%LUA_DIR% > nul || exit 1
+
+          echo %COL_GREEN%Download winpty%COL_RESET%
+          call :downloadfile %WINPTY_URL% downloads\winpty.zip
+          7z x -y downloads\winpty.zip -oD:\winpty > nul || exit 1
+          copy /Y D:\winpty\${{ matrix.warch }}\bin\winpty.dll        src\winpty${{ matrix.bits }}.dll
+          copy /Y D:\winpty\${{ matrix.warch }}\bin\winpty-agent.exe  src\
+
+          goto :eof
+
+          :downloadfile
+          :: call :downloadfile <URL> <localfile>
+          if not exist %2 (
+            curl -f -L %1 -o %2
+          )
+          if ERRORLEVEL 1 (
+            rem Retry once.
+            curl -f -L %1 -o %2 || exit 1
+          )
+          goto :eof
+
+      - name: Copy src directory to src2
+        shell: cmd
+        run: |
+          xcopy src src2\ /E > nul
+
+      - name: Build (MSVC)
+        if: matrix.toolchain == 'msvc'
+        shell: cmd
+        run: |
+          call "%VCVARSALL%" ${{ matrix.vcarch }}
+          cd src
+          :: Filter out the progress bar from the build log
+          sed -e "s/@<<$/@<< | sed -e 's#.*\\\\r.*##'/" Make_mvc.mak > Make_mvc2.mak
+          if "${{ matrix.features }}"=="HUGE" (
+            nmake -nologo -f Make_mvc2.mak ^
+              FEATURES=${{ matrix.features }} ^
+              GUI=yes IME=yes ICONV=yes VIMDLL=yes ^
+              DYNAMIC_LUA=yes LUA=%LUA_DIR% ^
+              DYNAMIC_PYTHON=yes PYTHON=%PYTHON_DIR% ^
+              DYNAMIC_PYTHON3=yes PYTHON3=%PYTHON3_DIR%
+          ) else (
+            nmake -nologo -f Make_mvc2.mak ^
+              FEATURES=${{ matrix.features }} ^
+              GUI=yes IME=yes ICONV=yes VIMDLL=yes
+          )
+          if not exist vim${{ matrix.bits }}.dll (
+            echo %COL_RED%Build failure.%COL_RESET%
+            exit 1
+          )
+
+      - name: Build (MinGW)
+        if: matrix.toolchain == 'mingw'
+        shell: msys2 {0}
+        run: |
+          cd src
+          if [ "${{ matrix.features }}" = "HUGE" ]; then
+            mingw32-make -f Make_ming.mak -j2 \
+              FEATURES=${{ matrix.features }} \
+              GUI=yes IME=yes ICONV=yes VIMDLL=yes \
+              DYNAMIC_LUA=yes LUA=${LUA_DIR} \
+              DYNAMIC_PYTHON=yes PYTHON=${PYTHON_DIR} \
+              DYNAMIC_PYTHON3=yes PYTHON3=${PYTHON3_DIR} \
+              STATIC_STDCPLUS=yes
+          else
+            mingw32-make -f Make_ming.mak -j2 \
+              FEATURES=${{ matrix.features }} \
+              GUI=yes IME=yes ICONV=yes VIMDLL=yes \
+              STATIC_STDCPLUS=yes
+          fi
+
+      #- name: Prepare Artifact
+      #  shell: cmd
+      #  run: |
+      #    mkdir artifacts
+      #    copy src\*vim.exe artifacts
+      #    copy src\vim*.dll artifacts
+      #
+      #- name: Upload Artifact
+      #  uses: actions/upload-artifact@v1
+      #  with:
+      #    name: vim${{ matrix.bits }}-${{ matrix.toolchain }}
+      #    path: ./artifacts
+
+      - name: Test
+        shell: cmd
+        timeout-minutes: 20
+        run: |
+          PATH %LUA_DIR%;C:\msys64\${{ matrix.msystem }}\bin;%PATH%;%PYTHON3_DIR%
+          call "%VCVARSALL%" ${{ matrix.vcarch }}
+          cd src
+          echo.
+          echo %COL_GREEN%vim version:%COL_RESET%
+          .\vim --version || exit 1
+
+          echo %COL_GREEN%Start testing vim in background.%COL_RESET%
+          start cmd /c "cd ..\src2\testdir & nmake -nologo -f Make_dos.mak VIMPROG=..\..\src\vim > nul & echo done>done.txt"
+
+          echo %COL_GREEN%Test gvim:%COL_RESET%
+          cd testdir
+          nmake -nologo -f Make_dos.mak VIMPROG=..\gvim || exit 1
+          cd ..
+
+          echo %COL_GREEN%Wait for vim tests to finish.%COL_RESET%
+          cd ..\src2\testdir
+          :: Wait about 10 minutes.
+          for /L %%i in (1,1,60) do (
+            if exist done.txt goto exitloop
+            timeout 10 > NUL 2>&1
+            if ERRORLEVEL 1 ping -n 11 localhost > NUL
+          )
+          set timeout=1
+          :exitloop
+
+          echo %COL_GREEN%Test results of vim:%COL_RESET%
+          if exist messages type messages
+          nmake -nologo -f Make_dos.mak report VIMPROG=..\..\src\vim || exit 1
+          if "%timeout%"=="1" (
+            echo %COL_RED%Timed out.%COL_RESET%
+            exit 1
+          )
diff -Nru vim-8.2.1913/.github/workflows/codeql-analysis.yml vim-8.2.2434/.github/workflows/codeql-analysis.yml
--- vim-8.2.1913/.github/workflows/codeql-analysis.yml	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/.github/workflows/codeql-analysis.yml	2021-01-30 22:05:11.000000000 +0000
@@ -31,15 +31,6 @@
     steps:
     - name: Checkout repository
       uses: actions/checkout@v2
-      with:
-        # We must fetch at least the immediate parents so that if this is
-        # a pull request then we can checkout the head.
-        fetch-depth: 2
-
-    # If this run was triggered by a pull request event, then checkout
-    # the head of the pull request instead of the merge commit.
-    - run: git checkout HEAD^2
-      if: ${{ github.event_name == 'pull_request' }}
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff -Nru vim-8.2.1913/README.md vim-8.2.2434/README.md
--- vim-8.2.1913/README.md	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/README.md	2021-01-30 22:05:11.000000000 +0000
@@ -1,15 +1,8 @@
-![Vim Logo](https://github.com/vim/vim/blob/master/runtime/vimlogo.gif)
+[![Vim Logo](https://github.com/vim/vim/raw/master/runtime/vimlogo.gif)](https://www.vim.org)
 
-[![Travis Build Status](https://travis-ci.org/vim/vim.svg?branch=master)](https://travis-ci.org/vim/vim)
-[![Appveyor Build status](https://ci.appveyor.com/api/projects/status/o2qht2kjm02sgghk?svg=true)](https://ci.appveyor.com/project/chrisbra/vim)
-[![Github Build status](https://github.com/vim/vim/workflows/GitHub%20CI/badge.svg)](https://github.com/vim/vim/actions?query=workflow%3A%22GitHub+CI%22)
-[![Cirrus Build Status](https://api.cirrus-ci.com/github/vim/vim.svg)](https://cirrus-ci.com/github/vim/vim)
-[![Coverage Status](https://codecov.io/gh/vim/vim/coverage.svg?branch=master)](https://codecov.io/gh/vim/vim?branch=master)
-[![Coverity Scan](https://scan.coverity.com/projects/241/badge.svg)](https://scan.coverity.com/projects/vim)
-[![Language Grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/vim/vim.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/vim/vim/context:cpp)
-[![Debian CI](https://badges.debian.net/badges/debian/testing/vim/version.svg)](https://buildd.debian.org/vim)
-[![Packages](https://repology.org/badge/tiny-repos/vim.svg)](https://repology.org/metapackage/vim)
-For translations of this README see the end.
+[![Github Build status](https://github.com/vim/vim/workflows/GitHub%20CI/badge.svg)](https://github.com/vim/vim/actions?query=workflow%3A%22GitHub+CI%22) [![Travis Build Status](https://travis-ci.com/vim/vim.svg?branch=master)](https://travis-ci.com/github/vim/vim) [![Appveyor Build status](https://ci.appveyor.com/api/projects/status/o2qht2kjm02sgghk?svg=true)](https://ci.appveyor.com/project/chrisbra/vim) [![Cirrus Build Status](https://api.cirrus-ci.com/github/vim/vim.svg)](https://cirrus-ci.com/github/vim/vim) [![Coverage Status](https://codecov.io/gh/vim/vim/coverage.svg?branch=master)](https://codecov.io/gh/vim/vim?branch=master) [![Coverity Scan](https://scan.coverity.com/projects/241/badge.svg)](https://scan.coverity.com/projects/vim) [![Language Grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/vim/vim.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/vim/vim/context:cpp) [![Debian CI](https://badges.debian.net/badges/debian/testing/vim/version.svg)](https://buildd.debian.org/vim) [![Packages](https://repology.org/badge/tiny-repos/vim.svg)](https://repology.org/metapackage/vim) [![Fossies codespell report](https://fossies.org/linux/test/vim-master.tar.gz/codespell.svg)](https://fossies.org/linux/test/vim-master.tar.gz/codespell.html)
+
+<sub>For translations of this README see the end.</sub>
 
 
 ## What is Vim? ##
diff -Nru vim-8.2.1913/README_VIM9.md vim-8.2.2434/README_VIM9.md
--- vim-8.2.1913/README_VIM9.md	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/README_VIM9.md	2021-01-30 22:05:11.000000000 +0000
@@ -159,18 +159,18 @@
 make that mistake (after writing JavaScript especially).  I think it is
 possible, if we make local variables shadow commands.  That should be OK,
 if you shadow a command you want to use, just rename the variable.
-Using "let" and "const" to declare a variable, like in JavaScript and
+Using "var" and "const" to declare a variable, like in JavaScript and
 TypeScript, can work:
 
 
 ``` vim
 def MyFunction(arg: number): number
-   let local = 1
-   let todo = arg
+   var local = 1
+   var todo = arg
    const ADD = 88
    while todo > 0
       local += ADD
-      --todo
+      todo -= 1
    endwhile
    return local
 enddef
@@ -192,7 +192,7 @@
 ``` vim
 vim9script  " Vim9 script syntax used here
 
-let local = 'local variable is not exported, script-local'
+var local = 'local variable is not exported, script-local'
 
 export def MyFunction()  " exported function
 ...
@@ -248,10 +248,10 @@
   return luaeval('sum')
 endfunc
 
-def VimNew()
-  let sum = 0
+def VimNew(): number
+  var sum = 0
   for i in range(1, 2999999)
-    let sum += i
+    sum += i
   endfor
   return sum
 enddef
@@ -277,7 +277,7 @@
 
 ``` vim
 def VimNew(): number
-  let totallen = 0
+  var totallen = 0
   for i in range(1, 100000)
     setline(i, '    ' .. getline(i))
     totallen += len(getline(i))
diff -Nru vim-8.2.1913/runtime/autoload/ccomplete.vim vim-8.2.2434/runtime/autoload/ccomplete.vim
--- vim-8.2.1913/runtime/autoload/ccomplete.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/autoload/ccomplete.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1,13 +1,13 @@
 " Vim completion script
 " Language:	C
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2020 Apr 08
+" Last Change:	2020 Nov 14
 
 let s:cpo_save = &cpo
 set cpo&vim
 
 " This function is used for the 'omnifunc' option.
-function! ccomplete#Complete(findstart, base)
+func ccomplete#Complete(findstart, base)
   if a:findstart
     " Locate the start of the item, including ".", "->" and "[...]".
     let line = getline('.')
@@ -244,7 +244,7 @@
   return map(res, 's:Tagline2item(v:val, brackets)')
 endfunc
 
-function! s:GetAddition(line, match, memarg, bracket)
+func s:GetAddition(line, match, memarg, bracket)
   " Guess if the item is an array.
   if a:bracket && match(a:line, a:match . '\s*\[') > 0
     return '['
@@ -260,13 +260,13 @@
     endif
   endif
   return ''
-endfunction
+endfunc
 
 " Turn the tag info "val" into an item for completion.
 " "val" is is an item in the list returned by taglist().
 " If it is a variable we may add "." or "->".  Don't do it for other types,
 " such as a typedef, by not including the info that s:GetAddition() uses.
-function! s:Tag2item(val)
+func s:Tag2item(val)
   let res = {'match': a:val['name']}
 
   let res['extra'] = s:Tagcmd2extra(a:val['cmd'], a:val['name'], a:val['filename'])
@@ -289,10 +289,10 @@
   endif
 
   return res
-endfunction
+endfunc
 
 " Use all the items in dictionary for the "info" entry.
-function! s:Dict2info(dict)
+func s:Dict2info(dict)
   let info = ''
   for k in sort(keys(a:dict))
     let info  .= k . repeat(' ', 10 - len(k))
@@ -307,7 +307,7 @@
 endfunc
 
 " Parse a tag line and return a dictionary with items like taglist()
-function! s:ParseTagline(line)
+func s:ParseTagline(line)
   let l = split(a:line, "\t")
   let d = {}
   if len(l) >= 3
@@ -334,12 +334,12 @@
   endif
 
   return d
-endfunction
+endfunc
 
 " Turn a match item "val" into an item for completion.
 " "val['match']" is the matching item.
 " "val['tagline']" is the tagline in which the last part was found.
-function! s:Tagline2item(val, brackets)
+func s:Tagline2item(val, brackets)
   let line = a:val['tagline']
   let add = s:GetAddition(line, a:val['match'], [a:val], a:brackets == '')
   let res = {'word': a:val['match'] . a:brackets . add }
@@ -377,10 +377,10 @@
     let res['menu'] = s:Tagcmd2extra(s, a:val['match'], matchstr(line, '[^\t]*\t\zs[^\t]*\ze\t'))
   endif
   return res
-endfunction
+endfunc
 
 " Turn a command from a tag line to something that is useful in the menu
-function! s:Tagcmd2extra(cmd, name, fname)
+func s:Tagcmd2extra(cmd, name, fname)
   if a:cmd =~ '^/^'
     " The command is a search command, useful to see what it is.
     let x = matchstr(a:cmd, '^/^\s*\zs.*\ze$/')
@@ -395,13 +395,13 @@
     let x = a:cmd . ' - ' . a:fname
   endif
   return x
-endfunction
+endfunc
 
 " Find composing type in "lead" and match items[0] with it.
 " Repeat this recursively for items[1], if it's there.
 " When resolving typedefs "depth" is used to avoid infinite recursion.
 " Return the list of matches.
-function! s:Nextitem(lead, items, depth, all)
+func s:Nextitem(lead, items, depth, all)
 
   " Use the text up to the variable name and split it in tokens.
   let tokens = split(a:lead, '\s\+\|\<')
@@ -485,7 +485,7 @@
   endfor
 
   return res
-endfunction
+endfunc
 
 
 " Search for members of structure "typename" in tags files.
@@ -493,7 +493,7 @@
 " Each match is a dictionary with "match" and "tagline" entries.
 " When "all" is non-zero find all, otherwise just return 1 if there is any
 " member.
-function! s:StructMembers(typename, items, all)
+func s:StructMembers(typename, items, all)
   " Todo: What about local structures?
   let fnames = join(map(tagfiles(), 'escape(v:val, " \\#%")'))
   if fnames == ''
@@ -586,12 +586,12 @@
 
   " Failed to find anything.
   return []
-endfunction
+endfunc
 
 " For matching members, find matches for following items.
 " When "all" is non-zero find all, otherwise just return 1 if there is any
 " member.
-function! s:SearchMembers(matches, items, all)
+func s:SearchMembers(matches, items, all)
   let res = []
   for i in range(len(a:matches))
     let typename = ''
diff -Nru vim-8.2.1913/runtime/autoload/dist/ft.vim vim-8.2.2434/runtime/autoload/dist/ft.vim
--- vim-8.2.1913/runtime/autoload/dist/ft.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/autoload/dist/ft.vim	2021-01-30 22:05:11.000000000 +0000
@@ -362,6 +362,10 @@
       setf aspvbs
     elseif lines =~ "<?"
       setf php
+    " Pascal supports // comments but they're vary rarely used for file
+    " headers so assume POV-Ray
+    elseif lines =~ '^\s*\%({\|(\*\)' || lines =~? s:ft_pascal_keywords
+      setf pascal
     else
       call dist#ft#FTasmsyntax()
       if exists("b:asmsyntax")
@@ -408,6 +412,9 @@
   setf progress
 endfunc
 
+let s:ft_pascal_comments = '^\s*\%({\|(\*\|//\)'
+let s:ft_pascal_keywords = '^\s*\%(program\|unit\|library\|uses\|begin\|procedure\|function\|const\|type\|var\)\>'
+
 func dist#ft#FTprogress_pascal()
   if exists("g:filetype_p")
     exe "setf " . g:filetype_p
@@ -419,8 +426,7 @@
   let lnum = 1
   while lnum <= 10 && lnum < line('$')
     let line = getline(lnum)
-    if line =~ '^\s*\(program\|unit\|procedure\|function\|const\|type\|var\)\>'
-	\ || line =~ '^\s*{' || line =~ '^\s*(\*'
+    if line =~ s:ft_pascal_comments || line =~? s:ft_pascal_keywords
       setf pascal
       return
     elseif line !~ '^\s*$' || line =~ '^/\*'
@@ -433,6 +439,19 @@
   setf progress
 endfunc
 
+func dist#ft#FTpp()
+  if exists("g:filetype_pp")
+    exe "setf " . g:filetype_pp
+  else
+    let line = getline(nextnonblank(1))
+    if line =~ s:ft_pascal_comments || line =~? s:ft_pascal_keywords
+      setf pascal
+    else
+      setf puppet
+    endif
+  endif
+endfunc
+
 func dist#ft#FTr()
   let max = line("$") > 50 ? 50 : line("$")
 
diff -Nru vim-8.2.1913/runtime/autoload/tar.vim vim-8.2.2434/runtime/autoload/tar.vim
--- vim-8.2.1913/runtime/autoload/tar.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/autoload/tar.vim	2021-01-30 22:05:11.000000000 +0000
@@ -163,7 +163,7 @@
 "   call Decho("1: exe silent r! gzip -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - ")
    exe "sil! r! gzip -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
 
-  elseif tarfile =~# '\.\(tgz\)$' || tarfile =~# '\.\(tbz\)$' || tarfile =~# '\.\(txz\)$'
+  elseif tarfile =~# '\.\(tgz\)$' || tarfile =~# '\.\(tbz\)$' || tarfile =~# '\.\(txz\)$' || tarfile =~# '\.\(tzs\)$'
    if has("unix") && executable("file")
     let filekind= system("file ".shellescape(tarfile,1)) =~ "bzip2"
    else
@@ -174,6 +174,8 @@
     exe "sil! r! bzip2 -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
    elseif filekind =~ "XZ"
     exe "sil! r! xz -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
+   elseif filekind =~ "Zstandard"
+    exe "sil! r! zstd --decompress --stdout -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
    else
     exe "sil! r! gzip -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
    endif
@@ -190,6 +192,8 @@
   elseif tarfile =~# '\.\(xz\|txz\)$'
 "   call Decho("3: exe silent r! xz --decompress --stdout -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - ")
    exe "sil! r! xz --decompress --stdout -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
+  elseif tarfile =~# '\.\(zst\|tzs\)$'
+   exe "sil! r! zstd --decompress --stdout -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
   else
    if tarfile =~ '^\s*-'
     " A file name starting with a dash is taken as an option.  Prepend ./ to avoid that.
@@ -302,6 +306,9 @@
   elseif  fname =~ '\.xz$' && executable("xzcat")
    let decmp= "|xzcat"
    let doro = 1
+  elseif  fname =~ '\.zst$' && executable("zstdcat")
+   let decmp= "|zstdcat"
+   let doro = 1
   else
    let decmp=""
    let doro = 0
@@ -331,6 +338,8 @@
     exe "sil! r! bzip2 -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
    elseif filekind =~ "XZ"
     exe "sil! r! xz -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
+   elseif filekind =~ "Zstandard"
+    exe "sil! r! zstd --decompress --stdout -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
    else
     exe "sil! r! gzip -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
    endif
@@ -452,6 +461,10 @@
    let tarfile = substitute(tarfile,'\.xz','','e')
    let compress= "xz -- ".shellescape(tarfile,0)
 "   call Decho("compress<".compress.">")
+  elseif tarfile =~# '\.zst'
+   call system("zstd --decompress -- ".shellescape(tarfile,0))
+   let tarfile = substitute(tarfile,'\.zst','','e')
+   let compress= "zstd -- ".shellescape(tarfile,0)
   elseif tarfile =~# '\.lzma'
    call system("lzma -d -- ".shellescape(tarfile,0))
    let tarfile = substitute(tarfile,'\.lzma','','e')
@@ -676,6 +689,28 @@
    else
     echo "***note*** successfully extracted ".fname
    endif
+
+  elseif filereadable(tarbase.".tzs")
+   let extractcmd= substitute(extractcmd,"-","--zstd","")
+"   call Decho("system(".extractcmd." ".shellescape(tarbase).".tzs ".shellescape(fname).")")
+   call system(extractcmd." ".shellescape(tarbase).".txz ".shellescape(fname))
+   if v:shell_error != 0
+    echohl Error | echo "***error*** ".extractcmd." ".tarbase.".tzs ".fname.": failed!" | echohl NONE
+"    call Decho("***error*** ".extractcmd." ".tarbase.".tzs ".fname.": failed!")
+   else
+    echo "***note*** successfully extracted ".fname
+   endif
+
+  elseif filereadable(tarbase.".tar.zst")
+   let extractcmd= substitute(extractcmd,"-","--zstd","")
+"   call Decho("system(".extractcmd." ".shellescape(tarbase).".tar.zst ".shellescape(fname).")")
+   call system(extractcmd." ".shellescape(tarbase).".tar.xz ".shellescape(fname))
+   if v:shell_error != 0
+    echohl Error | echo "***error*** ".extractcmd." ".tarbase.".tar.zst ".fname.": failed!" | echohl NONE
+"    call Decho("***error*** ".extractcmd." ".tarbase.".tar.zst ".fname.": failed!")
+   else
+    echo "***note*** successfully extracted ".fname
+   endif
   endif
 
   " restore option
diff -Nru vim-8.2.1913/runtime/compiler/fbc.vim vim-8.2.2434/runtime/compiler/fbc.vim
--- vim-8.2.1913/runtime/compiler/fbc.vim	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/runtime/compiler/fbc.vim	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,27 @@
+" Vim compiler file
+" Compiler:	FreeBASIC Compiler
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2015 Jan 10
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "fbc"
+
+if exists(":CompilerSet") != 2		" older Vim always used :setlocal
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+CompilerSet makeprg=fbc
+CompilerSet errorformat=%-G%.%#Too\ many\ errors\\,\ exiting,
+		       \%f(%l)\ %tarning\ %n(%\\d%\\+):\ %m,
+                       \%E%f(%l)\ error\ %n:\ %m,
+		       \%-Z%p^,
+		       \%-C%.%#,
+		       \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff -Nru vim-8.2.1913/runtime/compiler/ocaml.vim vim-8.2.2434/runtime/compiler/ocaml.vim
--- vim-8.2.1913/runtime/compiler/ocaml.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/compiler/ocaml.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1,11 +1,11 @@
 " Vim Compiler File
 " Compiler:    ocaml
 " Maintainer:  Markus Mottl <markus.mottl@gmail.com>
-" URL:         https://github.com/rgrinberg/vim-ocaml
+" URL:         https://github.com/ocaml/vim-ocaml
 " Last Change:
+"              2020 Mar 28 - Improved error format (Thomas Leonard)
 "              2017 Nov 26 - Improved error format (Markus Mottl)
 "              2013 Aug 27 - Added a new OCaml error format (Markus Mottl)
-"              2013 Jun 30 - Initial version (Marc Weber)
 "
 " Marc Weber's comments:
 " Setting makeprg doesn't make sense, because there is ocamlc, ocamlopt,
@@ -21,6 +21,7 @@
 "
 " So having it here makes people opt-in
 
+
 if exists("current_compiler")
     finish
 endif
@@ -30,6 +31,7 @@
 set cpo&vim
 
 CompilerSet errorformat =
+      \%EFile\ \"%f\"\\,\ lines\ %*\\d-%l\\,\ characters\ %c-%*\\d:,
       \%EFile\ \"%f\"\\,\ line\ %l\\,\ characters\ %c-%*\\d:,
       \%EFile\ \"%f\"\\,\ line\ %l\\,\ characters\ %c-%*\\d\ %.%#,
       \%EFile\ \"%f\"\\,\ line\ %l\\,\ character\ %c:%m,
diff -Nru vim-8.2.1913/runtime/compiler/tidy.vim vim-8.2.2434/runtime/compiler/tidy.vim
--- vim-8.2.1913/runtime/compiler/tidy.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/compiler/tidy.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1,7 +1,7 @@
 " Vim compiler file
 " Compiler:	HTML Tidy
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:	2016 Apr 21
+" Last Change:	2020 Sep 4
 
 if exists("current_compiler")
   finish
@@ -12,8 +12,15 @@
   command -nargs=* CompilerSet setlocal <args>
 endif
 
-CompilerSet makeprg=tidy\ -quiet\ -errors\ --gnu-emacs\ yes\ %:S
+let s:cpo_save = &cpo
+set cpo&vim
 
-" foo.html:8:1: Warning: inserting missing 'foobar' element
-" foo.html:9:2: Error: <foobar> is not recognized!
-CompilerSet errorformat=%f:%l:%c:\ %trror:%m,%f:%l:%c:\ %tarning:%m,%-G%.%#
+CompilerSet makeprg=tidy\ -quiet\ -errors\ --gnu-emacs\ yes
+CompilerSet errorformat=%f:%l:%c:\ %trror:\ %m,
+		       \%f:%l:%c:\ %tarning:\ %m,
+		       \%f:%l:%c:\ %tnfo:\ %m,
+		       \%f:%l:%c:\ %m,
+		       \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff -Nru vim-8.2.1913/runtime/compiler/zsh.vim vim-8.2.2434/runtime/compiler/zsh.vim
--- vim-8.2.1913/runtime/compiler/zsh.vim	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/runtime/compiler/zsh.vim	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,23 @@
+" Vim compiler file
+" Compiler:	Zsh
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2020 Sep 6
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "zsh"
+
+if exists(":CompilerSet") != 2		" older Vim always used :setlocal
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+CompilerSet makeprg=zsh\ -n\ --\ %:S
+CompilerSet errorformat=%f:\ line\ %l:\ %m,
+		       \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff -Nru vim-8.2.1913/runtime/doc/autocmd.txt vim-8.2.2434/runtime/doc/autocmd.txt
--- vim-8.2.1913/runtime/doc/autocmd.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/autocmd.txt	2021-01-30 22:05:11.000000000 +0000
@@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 8.2.  Last change: 2020 Oct 26
+*autocmd.txt*   For Vim version 8.2.  Last change: 2020 Dec 19
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -70,6 +70,11 @@
 The special pattern <buffer> or <buffer=N> defines a buffer-local autocommand.
 See |autocmd-buflocal|.
 
+If the `:autocmd` is in Vim9 script (a script that starts with `:vim9script`
+and in a `:def` function) then {cmd} will be executed as in Vim9
+script.  Thus this depends on where the autocmd is defined, not where it is
+triggered.
+
 Note: The ":autocmd" command can only be followed by another command when the
 '|' appears before {cmd}.  This works: >
 	:augroup mine | au! BufRead | augroup END
@@ -301,6 +306,9 @@
 |VimLeavePre|		before exiting Vim, before writing the viminfo file
 |VimLeave|		before exiting Vim, after writing the viminfo file
 
+|VimSuspend|		when suspending Vim
+|VimResume|		when Vim is resumed after being suspended
+
 	Terminal
 |TerminalOpen|		after a terminal buffer was created
 |TerminalWinOpen|	after a terminal buffer was created in a new window
@@ -551,12 +559,15 @@
 							*CmdlineEnter*
 CmdlineEnter			After moving the cursor to the command line,
 				where the user can type a command or search
-				string.
+				string; including non-interactive use of ":"
+				in a mapping, but not when using |<Cmd>|.
 				<afile> is set to a single character,
 				indicating the type of command-line.
 				|cmdwin-char|
 							*CmdlineLeave*
-CmdlineLeave			Before leaving the command line.
+CmdlineLeave			Before leaving the command line; including
+				non-interactive use of ":" in a mapping, but
+				not when using |<Cmd>|.
 				Also when abandoning the command line, after
 				typing CTRL-C or <Esc>.
 				When the commands result in an error the
@@ -840,6 +851,8 @@
 				when it's used.  The pattern is matched
 				against the function name.  Both <amatch> and
 				<afile> are set to the name of the function.
+				Not triggered when compiling a |Vim9|
+				function.
 				NOTE: When writing Vim scripts a better
 				alternative is to use an autoloaded function.
 				See |autoload-functions|.
@@ -1207,6 +1220,7 @@
 				To detect an abnormal exit use |v:dying|.
 				When v:dying is 2 or more this event is not
 				triggered.
+				To get the exit code use |v:exiting|.
 							*VimLeavePre*
 VimLeavePre			Before exiting Vim, just before writing the
 				.viminfo file.  This is executed only once,
@@ -1217,10 +1231,22 @@
 <				To detect an abnormal exit use |v:dying|.
 				When v:dying is 2 or more this event is not
 				triggered.
+				To get the exit code use |v:exiting|.
 							*VimResized*
 VimResized			After the Vim window was resized, thus 'lines'
 				and/or 'columns' changed.  Not when starting
 				up though.
+							*VimResume*
+VimResume			When the Vim instance is resumed after being
+				suspended and |VimSuspend| was triggered.
+				Useful for triggering |:checktime| and ensure
+				the buffers content did not change while Vim
+				was suspended: >
+	:autocmd VimResume * checktime
+<							*VimSuspend*
+VimSuspend			When the Vim instance is suspended.  Only when
+				CTRL-Z was typed inside Vim, not when the
+				SIGSTOP or SIGTSTP signal was sent to Vim.
 							*WinEnter*
 WinEnter			After entering another window.  Not done for
 				the first window, when Vim has just started.
diff -Nru vim-8.2.1913/runtime/doc/change.txt vim-8.2.2434/runtime/doc/change.txt
--- vim-8.2.1913/runtime/doc/change.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/change.txt	2021-01-30 22:05:11.000000000 +0000
@@ -1,4 +1,4 @@
-*change.txt*    For Vim version 8.2.  Last change: 2020 Aug 15
+*change.txt*    For Vim version 8.2.  Last change: 2021 Jan 21
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1631,24 +1631,31 @@
 readability.
 
 letter	 meaning when present in 'formatoptions'    ~
-
+							*fo-t*
 t	Auto-wrap text using textwidth
+							*fo-c*
 c	Auto-wrap comments using textwidth, inserting the current comment
 	leader automatically.
+							*fo-r*
 r	Automatically insert the current comment leader after hitting
 	<Enter> in Insert mode.
+							*fo-o*
 o	Automatically insert the current comment leader after hitting 'o' or
 	'O' in Normal mode.
+							*fo-q*
 q	Allow formatting of comments with "gq".
 	Note that formatting will not change blank lines or lines containing
 	only the comment leader.  A new paragraph starts after such a line,
 	or when the comment leader changes.
+							*fo-w*
 w	Trailing white space indicates a paragraph continues in the next line.
 	A line that ends in a non-white character ends a paragraph.
+							*fo-a*
 a	Automatic formatting of paragraphs.  Every time text is inserted or
 	deleted the paragraph will be reformatted.  See |auto-format|.
 	When the 'c' flag is present this only happens for recognized
 	comments.
+							*fo-n*
 n	When formatting text, recognize numbered lists.  This actually uses
 	the 'formatlistpat' option, thus any kind of list can be used.  The
 	indent of the text after the number is used for the next line.  The
@@ -1659,6 +1666,7 @@
 		1. the first item
 		   wraps
 		2. the second item
+<							*fo-2*
 2	When formatting text, use the indent of the second line of a paragraph
 	for the rest of the paragraph, instead of the indent of the first
 	line.  This supports paragraphs in which the first line has a
@@ -1668,36 +1676,46 @@
 		second line of the same paragraph
 		third line.
 <	This also works inside comments, ignoring the comment leader.
+							*fo-v*
 v	Vi-compatible auto-wrapping in insert mode: Only break a line at a
 	blank that you have entered during the current insert command.  (Note:
 	this is not 100% Vi compatible.  Vi has some "unexpected features" or
 	bugs in this area.  It uses the screen column instead of the line
 	column.)
+							*fo-b*
 b	Like 'v', but only auto-wrap if you enter a blank at or before
 	the wrap margin.  If the line was longer than 'textwidth' when you
 	started the insert, or you do not enter a blank in the insert before
 	reaching 'textwidth', Vim does not perform auto-wrapping.
+							*fo-l*
 l	Long lines are not broken in insert mode: When a line was longer than
 	'textwidth' when the insert command started, Vim does not
 	automatically format it.
+							*fo-m*
 m	Also break at a multibyte character above 255.  This is useful for
 	Asian text where every character is a word on its own.
+							*fo-M*
 M	When joining lines, don't insert a space before or after a multibyte
 	character.  Overrules the 'B' flag.
+							*fo-B*
 B	When joining lines, don't insert a space between two multibyte
 	characters.  Overruled by the 'M' flag.
+							*fo-1*
 1	Don't break a line after a one-letter word.  It's broken before it
 	instead (if possible).
+							*fo-]*
 ]	Respect textwidth rigorously. With this flag set, no line can be
 	longer than textwidth, unless line-break-prohibition rules make this
 	impossible.  Mainly for CJK scripts and works only if 'encoding' is
 	"utf-8".
+							*fo-j*
 j	Where it makes sense, remove a comment leader when joining lines.  For
 	example, joining:
 		int i;   // the index ~
 		         // in the list ~
 	Becomes:
 		int i;   // the index in the list ~
+							*fo-p*
 p	Don't break lines at single spaces that follow periods.  This is
 	intended to complement 'joinspaces' and |cpo-J|, for prose with
 	sentences separated by two spaces.  For example, with 'textwidth' set
@@ -1801,7 +1819,7 @@
 found here: |sort()|, |uniq()|.
 
 							*:sor* *:sort*
-:[range]sor[t][!] [b][f][i][n][o][r][u][x] [/{pattern}/]
+:[range]sor[t][!] [b][f][i][l][n][o][r][u][x] [/{pattern}/]
 			Sort lines in [range].  When no range is given all
 			lines are sorted.
 
@@ -1809,6 +1827,16 @@
 
 			With [i] case is ignored.
 
+			With [l] sort uses the current collation locale.
+			Implementation details: strcoll() is used to compare
+			strings. See |:language| to check or set the collation
+			locale. Example: >
+				:language collate en_US.UTF-8
+				:%sort l
+<			|v:collate| can also used to check the current locale.
+			Sorting using the locale typically ignores case.
+			This does not work properly on Mac.
+
 			Options [n][f][x][o][b] are mutually exclusive.
 
 			With [n] sorting is done on the first decimal number
@@ -1842,6 +1870,8 @@
 			When /{pattern}/ is specified and there is no [r] flag
 			the text matched with {pattern} is skipped, so that
 			you sort on what comes after the match.
+			'ignorecase' applies to the pattern, but 'smartcase'
+			is not used.
 			Instead of the slash any non-letter can be used.
 			For example, to sort on the second comma-separated
 			field: >
@@ -1875,8 +1905,7 @@
 Note that using `:sort` with `:global` doesn't sort the matching lines, it's
 quite useless.
 
-The details about sorting depend on the library function used.  There is no
-guarantee that sorting obeys the current locale.  You will have to try it out.
+`:sort` does not use the current locale unless the l flag is used.
 Vim does do a "stable" sort.
 
 The sorting can be interrupted, but if you interrupt it too late in the
diff -Nru vim-8.2.1913/runtime/doc/cmdline.txt vim-8.2.2434/runtime/doc/cmdline.txt
--- vim-8.2.1913/runtime/doc/cmdline.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/cmdline.txt	2021-01-30 22:05:11.000000000 +0000
@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 8.2.  Last change: 2020 Sep 14
+*cmdline.txt*   For Vim version 8.2.  Last change: 2020 Dec 26
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -849,6 +849,16 @@
 		file name n.  See |:oldfiles| or |v:oldfiles| to get the
 		number.							*E809*
 		{only when compiled with the |+eval| and |+viminfo| features}
+In |Vim9-script| # is used to start a comment, use %% for the alternate file
+name:
+	%	Is replaced with the current file name.
+	%%	Is replaced with the alternate file name.	*:_%%* *c_%%*
+	%%n	(where n is a number) is replaced with		*:_%%0* *:_%%n*
+		the file name of buffer n.  "%%0" is the same as "%%".   *c_%%n*
+	%%%	Is replaced with all names in the argument	*:_%%%* *c_%%%#*
+		list concatenated, separated by spaces.
+	%%<n	(where n is a number > 0) is replaced with old  *:_%%<* *c_%%<*
+		file name n.
 
 Note that these, except "#<n", give the file name as it was typed.  If an
 absolute path is needed (when using the file name from a different directory),
@@ -1086,7 +1096,7 @@
 In the command-line window the command line can be edited just like editing
 text in any window.  It is a special kind of window, because you cannot leave
 it in a normal way.
-{not available when compiled without the |+cmdline_hist| feature}
+{not available when compiled without the |+cmdwin| feature}
 
 
 OPEN						*c_CTRL-F* *q:* *q/* *q?*
diff -Nru vim-8.2.1913/runtime/doc/editing.txt vim-8.2.2434/runtime/doc/editing.txt
--- vim-8.2.1913/runtime/doc/editing.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/editing.txt	2021-01-30 22:05:11.000000000 +0000
@@ -1,4 +1,4 @@
-*editing.txt*   For Vim version 8.2.  Last change: 2020 Oct 23
+*editing.txt*   For Vim version 8.2.  Last change: 2021 Jan 08
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1014,7 +1014,7 @@
 
 							*write-permissions*
 When writing a new file the permissions are read-write.  For unix the mask is
-0666 with additionally umask applied.  When writing a file that was read Vim
+0o666 with additionally umask applied.  When writing a file that was read Vim
 will preserve the permissions, but clear the s-bit.
 
 							*write-readonly*
@@ -1033,7 +1033,7 @@
 lost the original file.
 
 						*DOS-format-write*
-If the 'fileformat' is "dos", <CR> <NL> is used for <EOL>.  This is default
+If the 'fileformat' is "dos", <CR><NL> is used for <EOL>.  This is default
 for Win32.  On other systems the message "[dos format]" is shown to remind you
 that an unusual <EOL> was used.
 						*Unix-format-write*
@@ -1419,8 +1419,8 @@
   the file.  It is also possible that you get an "out of memory" error when
   reading the file.
 - Make sure the 'binary' option is set BEFORE loading the
-  file.  Otherwise both <CR> <NL> and <NL> are considered to end a line
-  and when the file is written the <NL> will be replaced with <CR> <NL>.
+  file.  Otherwise both <CR><NL> and <NL> are considered to end a line
+  and when the file is written the <NL> will be replaced with <CR><NL>.
 - <Nul> characters are shown on the screen as ^@.  You can enter them with
   "CTRL-V CTRL-@" or "CTRL-V 000"
 - To insert a <NL> character in the file split a line.  When writing the
diff -Nru vim-8.2.1913/runtime/doc/eval.txt vim-8.2.2434/runtime/doc/eval.txt
--- vim-8.2.1913/runtime/doc/eval.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/eval.txt	2021-01-30 22:05:11.000000000 +0000
@@ -1,4 +1,4 @@
-*eval.txt*	For Vim version 8.2.  Last change: 2020 Oct 23
+*eval.txt*	For Vim version 8.2.  Last change: 2021 Jan 22
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -49,7 +49,7 @@
 							*Number* *Integer*
 Number		A 32 or 64 bit signed number.  |expr-number|
 		The number of bits is available in |v:numbersize|.
-		Examples:  -123  0x10  0177  0b1011
+		Examples:  -123  0x10  0177  0o177 0b1011
 
 Float		A floating point number. |floating-point-format| *Float*
 		{only when compiled with the |+float| feature}
@@ -97,9 +97,10 @@
 Conversion from a String to a Number only happens in legacy Vim script, not in
 Vim9 script.  It is done by converting the first digits to a number.
 Hexadecimal "0xf9", Octal "017" or "0o17", and Binary "0b10"
-numbers are recognized (NOTE: when using |scriptversion-4| octal with a
-leading "0" is not recognized).  If the String doesn't start with digits, the
-result is zero.
+numbers are recognized
+NOTE: when using |scriptversion-4| octal with a leading "0" is not recognized.
+The 0o notation requires patch 8.2.0886.
+If the String doesn't start with digits, the result is zero.
 Examples:
 	String "456"	-->	Number 456 ~
 	String "6bar"	-->	Number 6 ~
@@ -313,6 +314,9 @@
 	:let shortlist = mylist[2:2]	" List with one item: [3]
 	:let otherlist = mylist[:]	" make a copy of the List
 
+Notice that the last index is inclusive.  If you prefer using an exclusive
+index use the |slice()| method.
+
 If the first index is beyond the last item of the List or the second item is
 before the first item, the result is an empty list.  There is no error
 message.
@@ -1150,7 +1154,7 @@
 
 For '!' |TRUE| becomes |FALSE|, |FALSE| becomes |TRUE| (one).
 For '-' the sign of the number is changed.
-For '+' the number is unchanged.
+For '+' the number is unchanged.  Note: "++" has no effect.
 
 A String will be converted to a Number first.
 
@@ -1191,6 +1195,7 @@
 If the length of the String is less than the index, the result is an empty
 String.  A negative index always results in an empty string (reason: backward
 compatibility).  Use [-1:] to get the last byte or character.
+In Vim9 script a negative index is used like with a list: count from the end.
 
 If expr8 is a |List| then it results the item at index expr1.  See |list-index|
 for possible index values.  If the index is out of range this results in an
@@ -1215,6 +1220,9 @@
 In Vim9 script the indexes are character indexes.  To use byte indexes use
 |strpart()|.
 
+The item at index expr1b is included, it is inclusive.  For an exclusive index
+use the |slice()| function.
+
 If expr1a is omitted zero is used.  If expr1b is omitted the length of the
 string minus one is used.
 
@@ -1318,8 +1326,8 @@
 number
 ------
 number			number constant			*expr-number*
-				*hex-number* *octal-number* *binary-number*
 
+			*0x* *hex-number* *0o* *octal-number* *binary-number*
 Decimal, Hexadecimal (starting with 0x or 0X), Binary (starting with 0b or 0B)
 and Octal (starting with 0, 0o or 0O).
 
@@ -1572,7 +1580,7 @@
 
 Lambda expressions have internal names like '<lambda>42'.  If you get an error
 for a lambda expression, you can find what it is with the following command: >
-	:function {'<lambda>42'}
+	:function <lambda>42
 See also: |numbered-function|
 
 ==============================================================================
@@ -1850,6 +1858,13 @@
 <		Note: if another deadly signal is caught when v:dying is one,
 		VimLeave autocommands will not be executed.
 
+					*v:exiting* *exiting-variable*
+v:exiting	Vim exit code.  Normally zero, non-zero when something went
+		wrong.  The value is v:null before invoking the |VimLeavePre|
+		and |VimLeave| autocmds.  See |:q|, |:x| and |:cquit|.
+		Example: >
+			:au VimLeave * echo "Exit value is " .. v:exiting
+<
 					*v:echospace* *echospace-variable*
 v:echospace	Number of screen cells that can be used for an `:echo` message
 		in the last screen line before causing the |hit-enter-prompt|.
@@ -2067,6 +2082,12 @@
 		That is so that eval() can parse the string back to the same
 		value.  Read-only.
 
+					*v:numbermax* *numbermax-variable*
+v:numbermax	Maximum value of a number.
+
+					*v:numbermin* *numbermin-variable*
+v:numbermin	Minimum value of a number (negative)
+
 					*v:numbersize* *numbersize-variable*
 v:numbersize	Number of bits in a Number.  This is normally 64, but on some
 		systems it may be 32.
@@ -2468,10 +2489,13 @@
 changenr()			Number	current change number
 char2nr({expr} [, {utf8}])	Number	ASCII/UTF8 value of first char in {expr}
 charclass({string})		Number	character class of {string}
+charcol({expr})			Number	column number of cursor or mark
+charidx({string}, {idx} [, {countcc}])
+				Number  char index of byte {idx} in {string}
 chdir({dir})			String	change current working directory
 cindent({lnum})			Number	C indent for line {lnum}
 clearmatches([{win}])		none	clear all matches
-col({expr})			Number	column nr of cursor or mark
+col({expr})			Number	column byte index of cursor or mark
 complete({startcol}, {matches}) none	set Insert mode completion
 complete_add({expr})		Number	add completion match
 complete_check()		Number	check for key typed during completion
@@ -2512,6 +2536,9 @@
 expandcmd({expr})		String	expand {expr} like with `:edit`
 extend({expr1}, {expr2} [, {expr3}])
 				List/Dict insert items of {expr2} into {expr1}
+extendnew({expr1}, {expr2} [, {expr3}])
+				List/Dict like |extend()| but creates a new
+					List or Dictionary
 feedkeys({string} [, {mode}])	Number	add key sequence to typeahead buffer
 filereadable({file})		Number	|TRUE| if {file} is a readable file
 filewritable({file})		Number	|TRUE| if {file} is a writable file
@@ -2549,6 +2576,7 @@
 getchangelist([{expr}])		List	list of change list items
 getchar([expr])			Number	get one character from the user
 getcharmod()			Number	modifiers for the last typed character
+getcharpos({expr})		List	position of cursor, mark, etc.
 getcharsearch()			Dict	last character search
 getcmdline()			String	return the current command-line
 getcmdpos()			Number	return cursor position in command-line
@@ -2557,6 +2585,7 @@
 getcompletion({pat}, {type} [, {filtered}])
 				List	list of cmdline completion matches
 getcurpos([{winnr}])		List	position of the cursor
+getcursorcharpos([{winnr}])	List	character position of the cursor
 getcwd([{winnr} [, {tabnr}]])	String	get the current working directory
 getenv({name})			String	return environment variable
 getfontname([{name}])		String	name of font being used
@@ -2669,8 +2698,9 @@
 					rhs of mapping {name} in mode {mode}
 mapcheck({name} [, {mode} [, {abbr}]])
 				String	check for mappings matching {name}
-mapset({mode}, {abbr}, {dict})
-				none	restore mapping from |maparg()| result
+mapnew({expr1}, {expr2})	List/Dict  like |map()| but creates a new List
+					   or Dictionary
+mapset({mode}, {abbr}, {dict})	none	restore mapping from |maparg()| result
 match({expr}, {pat} [, {start} [, {count}]])
 				Number	position where {pat} matches in {expr}
 matchadd({group}, {pattern} [, {priority} [, {id} [, {dict}]]])
@@ -2757,6 +2787,7 @@
 rand([{expr}])			Number	get pseudo-random number
 range({expr} [, {max} [, {stride}]])
 				List	items from {expr} to {max}
+readblob({fname})		Blob	read a |Blob| from {fname}
 readdir({dir} [, {expr} [, {dict}]])
 				List	file names in {dir} selected by {expr}
 readdirex({dir} [, {expr} [, {dict}]])
@@ -2818,8 +2849,10 @@
 setbufvar({expr}, {varname}, {val})
 				none	set {varname} in buffer {expr} to {val}
 setcellwidths({list})		none	set character cell width overrides
+setcharpos({expr}, {list})	Number	set the {expr} position to {list}
 setcharsearch({dict})		Dict	set character search from {dict}
 setcmdpos({pos})		Number	set cursor position in command-line
+setcursorcharpos({list})	Number	move cursor to position in {list}
 setenv({name}, {val})		none	set environment variable
 setfperm({fname}, {mode})	Number	set {fname} file permissions to {mode}
 setline({lnum}, {line})		Number	set line {lnum} to {line}
@@ -2863,6 +2896,8 @@
 simplify({filename})		String	simplify filename as much as possible
 sin({expr})			Float	sine of {expr}
 sinh({expr})			Float	hyperbolic sine of {expr}
+slice({expr}, {start} [, {end}])  String, List or Blob
+					slice of a String, List or Blob
 sort({list} [, {func} [, {dict}]])
 				List	sort {list}, using {func} to compare
 sound_clear()			none	stop playing all sounds
@@ -2996,7 +3031,8 @@
 trim({text} [, {mask} [, {dir}]])
 				String	trim characters in {mask} from {text}
 trunc({expr})			Float	truncate Float {expr}
-type({name})			Number	type of variable {name}
+type({expr})			Number	type of value {expr}
+typename({expr})		String	representation of the type of {expr}
 undofile({name})		String	undo file name for {name}
 undotree()			List	undo file tree
 uniq({list} [, {func} [, {dict}]])
@@ -3472,8 +3508,8 @@
 		Return byte index of the {nr}'th character in the string
 		{expr}.  Use zero for the first character, it then returns
 		zero.
-		This function is only useful when there are multibyte
-		characters, otherwise the returned value is equal to {nr}.
+		If there are no multibyte characters the returned value is
+		equal to {nr}.
 		Composing characters are not counted separately, their byte
 		length is added to the preceding base character.  See
 		|byteidxcomp()| below for counting composing characters
@@ -3503,8 +3539,8 @@
 <		The first and third echo result in 3 ('e' plus composing
 		character is 3 bytes), the second echo results in 1 ('e' is
 		one byte).
-		Only works differently from byteidx() when 'encoding' is set to
-		a Unicode encoding.
+		Only works differently from byteidx() when 'encoding' is set
+		to a Unicode encoding.
 
 		Can also be used as a |method|: >
 			GetName()->byteidxcomp(idx)
@@ -3580,6 +3616,43 @@
 			other	specific Unicode class
 		The class is used in patterns and word motions.
 
+							*charcol()*
+charcol({expr})	Same as |col()| but returns the character index of the column
+		position given with {expr} instead of the byte position.
+
+		Example:
+		With the cursor on '세' in line 5 with text "여보세요": >
+			charcol('.')		returns 3
+			col('.')		returns 7
+
+<		Can also be used as a |method|: >
+			GetPos()->col()
+<
+							*charidx()*
+charidx({string}, {idx} [, {countcc}])
+		Return the character index of the byte at {idx} in {string}.
+		The index of the first character is zero.
+		If there are no multibyte characters the returned value is
+		equal to {idx}.
+		When {countcc} is omitted or zero, then composing characters
+		are not counted separately, their byte length is added to the
+		preceding base character.
+		When {countcc} is set to 1, then composing characters are
+		counted as separate characters.
+		Returns -1 if the arguments are invalid or if {idx} is greater
+		than the index of the last byte in {string}.  An error is
+		given if the first argument is not a string, the second
+		argument is not a number or when the third argument is present
+		and is not zero or one.
+		See |byteidx()| and |byteidxcomp()| for getting the byte index
+		from the character index.
+		Examples: >
+			echo charidx('a�b�c�', 3)		returns 1
+			echo charidx('a�b�c�', 6, 1)	returns 4
+			echo charidx('a�b�c�', 16)		returns -1
+<
+		Can also be used as a |method|: >
+			GetName()->charidx(idx)
 
 chdir({dir})						*chdir()*
 		Change the current working directory to {dir}.  The scope of
@@ -3645,7 +3718,8 @@
 		out of range then col() returns zero.
 		To get the line number use |line()|.  To get both use
 		|getpos()|.
-		For the screen column position use |virtcol()|.
+		For the screen column position use |virtcol()|.  For the
+		character position use |charcol()|.
 		Note that only marks in the current file can be used.
 		Examples: >
 			col(".")		column of cursor
@@ -3798,7 +3872,7 @@
 		not need to be the first letter: >
 			confirm("file has been modified", "&Save\nSave &All")
 <		For the console, the first letter of each choice is used as
-		the default shortcut key.
+		the default shortcut key.  Case is ignored.
 
 		The optional {default} argument is the number of the choice
 		that is made if the user hits <CR>.  Use 1 to make the first
@@ -3946,6 +4020,9 @@
 		This is like the return value of |getpos()| or |getcurpos()|,
 		but without the first item.
 
+		To position the cursor using the character count, use
+		|setcursorcharpos()|.
+
 		Does not change the jumplist.
 		If {lnum} is greater than the number of lines in the buffer,
 		the cursor will be positioned at the last line in the buffer.
@@ -4013,8 +4090,9 @@
 
 		A symbolic link itself is deleted, not what it points to.
 
-		The result is a Number, which is 0 if the delete operation was
-		successful and -1 when the deletion failed or partly failed.
+		The result is a Number, which is 0/false if the delete
+		operation was successful and -1/true when the deletion failed
+		or partly failed.
 
 		Use |remove()| to delete an item from a |List|.
 		To delete a line from the buffer use |:delete| or
@@ -4427,10 +4505,10 @@
 		|Dictionaries|.
 
 		If they are |Lists|: Append {expr2} to {expr1}.
-		If {expr3} is given insert the items of {expr2} before item
-		{expr3} in {expr1}.  When {expr3} is zero insert before the
-		first item.  When {expr3} is equal to len({expr1}) then
-		{expr2} is appended.
+		If {expr3} is given insert the items of {expr2} before the
+		item with index {expr3} in {expr1}.  When {expr3} is zero
+		insert before the first item.  When {expr3} is equal to
+		len({expr1}) then {expr2} is appended.
 		Examples: >
 			:echo sort(extend(mylist, [7, 5]))
 			:call extend(mylist, [2, 3], 1)
@@ -4462,6 +4540,13 @@
 			mylist->extend(otherlist)
 
 
+extendnew({expr1}, {expr2} [, {expr3}])			*extendnew()*
+		Like |extend()| but instead of adding items to {expr1} a new
+		List or Dictionary is created and returned.  {expr1} remains
+		unchanged.  Items can still be changed by {expr2}, if you
+		don't want that use |deepcopy()| first.
+
+
 feedkeys({string} [, {mode}])				*feedkeys()*
 		Characters in {string} are queued for processing as if they
 		come from a mapping or were typed by the user.
@@ -4732,7 +4817,8 @@
 			:echo fnamemodify("main.c", ":p:h")
 <		results in: >
 			/home/mool/vim/vim/src
-<		Note: Environment variables don't work in {fname}, use
+<		If {mods} is empty then {fname} is returned.
+		Note: Environment variables don't work in {fname}, use
 		|expand()| first then.
 
 		Can also be used as a |method|: >
@@ -5051,9 +5137,9 @@
 		The result is the value of option or local buffer variable
 		{varname} in buffer {expr}.  Note that the name without "b:"
 		must be used.
-		When {varname} is empty returns a dictionary with all the
+		When {varname} is empty returns a |Dictionary| with all the
 		buffer-local variables.
-		When {varname} is equal to "&" returns a dictionary with all
+		When {varname} is equal to "&" returns a |Dictionary| with all
 		the buffer-local options.
 		Otherwise, when {varname} starts with "&" returns the value of
 		a buffer-local option.
@@ -5135,7 +5221,10 @@
 		|xterm-bracketed-paste|.
 
 		There is no prompt, you will somehow have to make clear to the
-		user that a character has to be typed.
+		user that a character has to be typed.  The screen is not
+		redrawn, e.g. when resizing the window.  When using a popup
+		window it should work better with a |popup-filter|.
+
 		There is no mapping for the character.
 		Key codes are replaced, thus when the user presses the <Del>
 		key you get the code for the <Del> key, not the raw character
@@ -5181,6 +5270,20 @@
 		character itself are obtained.  Thus Shift-a results in "A"
 		without a modifier.
 
+							*getcharpos()*
+getcharpos({expr})
+		Get the position for {expr}. Same as |getpos()| but the column
+		number in the returned List is a character index instead of
+		a byte index.
+
+		Example:
+		With the cursor on '세' in line 5 with text "여보세요": >
+			getcharpos('.')		returns [0, 5, 3, 0]
+			getpos('.')		returns [0, 5, 7, 0]
+<
+		Can also be used as a |method|: >
+			GetMark()->getcharpos()
+
 getcharsearch()						*getcharsearch()*
 		Return the current character search information as a {dict}
 		with the following entries:
@@ -5306,8 +5409,11 @@
 		includes an extra "curswant" item in the list:
 		    [0, lnum, col, off, curswant] ~
 		The "curswant" number is the preferred column when moving the
-		cursor vertically.  Also see |getpos()|.
-		The first "bufnum" item is always zero.
+		cursor vertically.  Also see |getcursorcharpos()| and
+		|getpos()|.
+		The first "bufnum" item is always zero. The byte position of
+		the cursor is returned in 'col'. To get the character
+		position, use |getcursorcharpos()|.
 
 		The optional {winid} argument can specify the window.  It can
 		be the window number or the |window-ID|.  The last known
@@ -5321,7 +5427,24 @@
 			call setpos('.', save_cursor)
 <		Note that this only works within the window.  See
 		|winrestview()| for restoring more state.
-							*getcwd()*
+
+		Can also be used as a |method|: >
+			GetWinid()->getcurpos()
+
+<							*getcursorcharpos()*
+getcursorcharpos([{winid}])
+		Same as |getcurpos()| but the column number in the returned
+		List is a character index instead of a byte index.
+
+		Example:
+		With the cursor on '보' in line 3 with text "여보세요": >
+			getcursorcharpos()	returns [0, 3, 2, 0, 3]
+			getcurpos()		returns [0, 3, 4, 0, 3]
+
+<		Can also be used as a |method|: >
+			GetWinid()->getcursorcharpos()
+
+<							*getcwd()*
 getcwd([{winnr} [, {tabnr}]])
 		The result is a String, which is the name of the current
 		working directory.
@@ -5525,8 +5648,8 @@
 					|location-list-file-window| for more
 					details.
 
-		Returns a Dictionary with default values if there is no location
-		list for the window {nr}.
+		Returns a |Dictionary| with default values if there is no
+		location list for the window {nr}.
 		Returns an empty Dictionary if window {nr} does not exist.
 
 		Examples (See also |getqflist-examples|): >
@@ -5628,18 +5751,20 @@
 		Note that for '< and '> Visual mode matters: when it is "V"
 		(visual line mode) the column of '< is zero and the column of
 		'> is a large number.
+		The column number in the returned List is the byte position
+		within the line. To get the character position in the line,
+		use |getcharpos()|
 		This can be used to save and restore the position of a mark: >
 			let save_a_mark = getpos("'a")
 			...
 			call setpos("'a", save_a_mark)
-<		Also see |getcurpos()| and |setpos()|.
+<		Also see |getcharpos()|, |getcurpos()| and |setpos()|.
 
 		Can also be used as a |method|: >
 			GetMark()->getpos()
 
-
 getqflist([{what}])					*getqflist()*
-		Returns a list with all the current quickfix errors.  Each
+		Returns a |List| with all the current quickfix errors.  Each
 		list item is a dictionary with these entries:
 			bufnr	number of buffer that has the file name, use
 				bufname() to get the name
@@ -6104,8 +6229,8 @@
 
 
 has_key({dict}, {key})					*has_key()*
-		The result is a Number, which is 1 if |Dictionary| {dict} has
-		an entry with key {key}.  Zero otherwise.
+		The result is a Number, which is TRUE if |Dictionary| {dict}
+		has an entry with key {key}.  FALSE otherwise.
 
 		Can also be used as a |method|: >
 			mydict->has_key(key)
@@ -6148,16 +6273,16 @@
 			GetWinnr()->haslocaldir()
 
 hasmapto({what} [, {mode} [, {abbr}]])			*hasmapto()*
-		The result is a Number, which is 1 if there is a mapping that
-		contains {what} in somewhere in the rhs (what it is mapped to)
-		and this mapping exists in one of the modes indicated by
-		{mode}.
+		The result is a Number, which is TRUE if there is a mapping
+		that contains {what} in somewhere in the rhs (what it is
+		mapped to) and this mapping exists in one of the modes
+		indicated by {mode}.
 		When {abbr} is there and it is |TRUE| use abbreviations
 		instead of mappings.  Don't forget to specify Insert and/or
 		Command-line mode.
 		Both the global mappings and the mappings local to the current
 		buffer are checked for a match.
-		If no matching mapping is found 0 is returned.
+		If no matching mapping is found FALSE is returned.
 		The following characters are recognized in {mode}:
 			n	Normal mode
 			v	Visual and Select mode
@@ -6193,8 +6318,8 @@
 		character is sufficient.
 		If {item} does already exist in the history, it will be
 		shifted to become the newest entry.
-		The result is a Number: 1 if the operation was successful,
-		otherwise 0 is returned.
+		The result is a Number: TRUE if the operation was successful,
+		otherwise FALSE is returned.
 
 		Example: >
 			:call histadd("input", strftime("%Y %b %d"))
@@ -6217,8 +6342,8 @@
 		an index, see |:history-indexing|.  The respective entry will
 		be removed if it exists.
 
-		The result is a Number: 1 for a successful operation,
-		otherwise 0 is returned.
+		The result is TRUE for a successful operation, otherwise FALSE
+		is returned.
 
 		Examples:
 		Clear expression register history: >
@@ -6270,7 +6395,7 @@
 			GetHistory()->histnr()
 <
 hlexists({name})					*hlexists()*
-		The result is a Number, which is non-zero if a highlight group
+		The result is a Number, which is TRUE if a highlight group
 		called {name} exists.  This is when the group has been
 		defined in some way.  Not necessarily when highlighting has
 		been defined for it, it may also have been used for a syntax
@@ -6443,7 +6568,7 @@
 		Restore typeahead that was saved with a previous |inputsave()|.
 		Should be called the same number of times inputsave() is
 		called.  Calling it more often is harmless though.
-		Returns 1 when there is nothing to restore, 0 otherwise.
+		Returns TRUE when there is nothing to restore, FALSE otherwise.
 
 inputsave()						*inputsave()*
 		Preserve typeahead (also from mappings) and clear it, so that
@@ -6451,7 +6576,7 @@
 		followed by a matching inputrestore() after the prompt.  Can
 		be used several times, in which case there must be just as
 		many inputrestore() calls.
-		Returns 1 when out of memory, 0 otherwise.
+		Returns TRUE when out of memory, FALSE otherwise.
 
 inputsecret({prompt} [, {text}])			*inputsecret()*
 		This function acts much like the |input()| function with but
@@ -6927,7 +7052,7 @@
 
 listener_remove({id})					*listener_remove()*
 		Remove a listener previously added with listener_add().
-		Returns zero when {id} could not be found, one when {id} was
+		Returns FALSE when {id} could not be found, TRUE when {id} was
 		removed.
 
 		Can also be used as a |method|: >
@@ -6987,9 +7112,14 @@
 <		{only available when compiled with the |+lua| feature}
 
 map({expr1}, {expr2})					*map()*
-		{expr1} must be a |List| or a |Dictionary|.
+		{expr1} must be a |List|, |Blob| or |Dictionary|.
 		Replace each item in {expr1} with the result of evaluating
-		{expr2}.  {expr2} must be a |string| or |Funcref|.
+		{expr2}.  For a |Blob| each byte is replaced.
+		If the item type changes you may want to use |mapnew()| to
+		create a new List or Dictionary.  This is required when using
+		Vim9 script.
+
+		{expr2} must be a |string| or |Funcref|.
 
 		If {expr2} is a |string|, inside {expr2} |v:val| has the value
 		of the current item.  For a |Dictionary| |v:key| has the key
@@ -7024,11 +7154,11 @@
 		|Dictionary| to remain unmodified make a copy first: >
 			:let tlist = map(copy(mylist), ' v:val . "\t"')
 
-<		Returns {expr1}, the |List| or |Dictionary| that was filtered.
-		When an error is encountered while evaluating {expr2} no
-		further items in {expr1} are processed.  When {expr2} is a
-		Funcref errors inside a function are ignored, unless it was
-		defined with the "abort" flag.
+<		Returns {expr1}, the |List|, |Blob| or |Dictionary| that was
+		filtered.  When an error is encountered while evaluating
+		{expr2} no further items in {expr1} are processed.  When
+		{expr2} is a Funcref errors inside a function are ignored,
+		unless it was defined with the "abort" flag.
 
 		Can also be used as a |method|: >
 			mylist->map(expr2)
@@ -7137,7 +7267,14 @@
 			GetKey()->mapcheck('n')
 
 
-mapset({mode}, {abbr}, {dict})				*mapset()*
+mapnew({expr1}, {expr2})					*mapnew()*
+		Like |map()| but instead of replacing items in {expr1} a new
+		List or Dictionary is created and returned.  {expr1} remains
+		unchanged.  Items can still be changed by {expr2}, if you
+		don't want that use |deepcopy()| first.
+
+
+mapset({mode}, {abbr}, {dict})					*mapset()*
 		Restore a mapping from a dictionary returned by |maparg()|.
 		{mode} and {abbr} should be the same as for the call to
 		|maparg()|. *E460*
@@ -7363,7 +7500,7 @@
 
 
 matchfuzzy({list}, {str} [, {dict}])			*matchfuzzy()*
-		If {list} is a list of strings, then returns a list with all
+		If {list} is a list of strings, then returns a |List| with all
 		the strings in {list} that fuzzy match {str}. The strings in
 		the returned list are sorted based on the matching score.
 
@@ -7420,22 +7557,24 @@
 
 matchfuzzypos({list}, {str} [, {dict}])			*matchfuzzypos()*
 		Same as |matchfuzzy()|, but returns the list of matched
-		strings and the list of character positions where characters
-		in {str} matches.
+		strings, the list of character positions where characters
+		in {str} matches and a list of matching scores.  You can
+		use |byteidx()|to convert a character position to a byte
+		position.
 
 		If {str} matches multiple times in a string, then only the
 		positions for the best match is returned.
 
 		If there are no matching strings or there is an error, then a
-		list with two empty list items is returned.
+		list with three empty list items is returned.
 
 		Example: >
 			:echo matchfuzzypos(['testing'], 'tsg')
-<		results in [['testing'], [[0, 2, 6]]] >
+<		results in [['testing'], [[0, 2, 6]], [99]] >
 			:echo matchfuzzypos(['clay', 'lacy'], 'la')
-<		results in [['lacy', 'clay'], [[0, 1], [1, 2]]] >
+<		results in [['lacy', 'clay'], [[0, 1], [1, 2]], [153, 133]] >
 			:echo [{'text': 'hello', 'id' : 10}]->matchfuzzypos('ll', {'key' : 'text'})
-<		results in [{'id': 10, 'text': 'hello'}] [[2, 3]]
+<		results in [[{'id': 10, 'text': 'hello'}], [[2, 3]], [127]]
 
 matchlist({expr}, {pat} [, {start} [, {count}]])		*matchlist()*
 		Same as |match()|, but return a |List|.  The first item in the
@@ -7489,8 +7628,10 @@
 <
 
 							*max()*
-max({expr})	Return the maximum value of all items in {expr}.
-		{expr} can be a |List| or a |Dictionary|.  For a Dictionary,
+max({expr})	Return the maximum value of all items in {expr}. Example: >
+			echo max([apples, pears, oranges])
+
+<		{expr} can be a |List| or a |Dictionary|.  For a Dictionary,
 		it returns the maximum of all values in the Dictionary.
 		If {expr} is neither a List nor a Dictionary, or one of the
 		items in {expr} cannot be used as a Number this results in
@@ -7560,8 +7701,10 @@
 
 
 <							*min()*
-min({expr})	Return the minimum value of all items in {expr}.
-		{expr} can be a |List| or a |Dictionary|.  For a Dictionary,
+min({expr})	Return the minimum value of all items in {expr}. Example:  >
+			echo min([apples, pears, oranges])
+
+<		{expr} can be a |List| or a |Dictionary|.  For a Dictionary,
 		it returns the minimum of all values in the Dictionary.
 		If {expr} is neither a List nor a Dictionary, or one of the
 		items in {expr} cannot be used as a Number this results in
@@ -7578,13 +7721,13 @@
 		necessary.  Otherwise it must be "".
 
 		If {prot} is given it is used to set the protection bits of
-		the new directory.  The default is 0755 (rwxr-xr-x: r/w for
-		the user readable for others).  Use 0700 to make it unreadable
-		for others.  This is only used for the last part of {name}.
-		Thus if you create /tmp/foo/bar then /tmp/foo will be created
-		with 0755.
+		the new directory.  The default is 0o755 (rwxr-xr-x: r/w for
+		the user, readable for others).  Use 0o700 to make it
+		unreadable for others.  This is only used for the last part of
+		{name}.  Thus if you create /tmp/foo/bar then /tmp/foo will be
+		created with 0o755.
 		Example: >
-			:call mkdir($HOME . "/tmp/foo/bar", "p", 0700)
+			:call mkdir($HOME . "/tmp/foo/bar", "p", 0o700)
 
 <		This function is not available in the |sandbox|.
 
@@ -7592,8 +7735,8 @@
 		flag is passed (since patch 8.0.1708).  However, without the
 		"p" option the call will fail.
 
-		The function result is a Number, which is 1 if the call was
-		successful or 0 if the directory creation failed or partly
+		The function result is a Number, which is TRUE if the call was
+		successful or FALSE if the directory creation failed or partly
 		failed.
 
 		Not available on all systems.  To check use: >
@@ -8138,6 +8281,14 @@
 			:echo rand(seed)
 			:echo rand(seed) % 16  " random number 0 - 15
 <
+
+readblob({fname})					*readblob()*
+		Read file {fname} in binary mode and return a |Blob|.
+		When the file can't be opened an error message is given and
+		the result is an empty |Blob|.
+		Also see |readfile()| and |writefile()|.
+
+
 readdir({directory} [, {expr} [, {dict}]])			*readdir()*
 		Return a list with file and directory names in {directory}.
 		You can also use |glob()| if you don't need to do complicated
@@ -8252,6 +8403,7 @@
 		Can also be used as a |method|: >
 			GetDirName()->readdirex()
 <
+
 							*readfile()*
 readfile({fname} [, {type} [, {max}]])
 		Read file {fname} and return a |List|, each line of the file
@@ -8263,8 +8415,6 @@
 		- When the last line ends in a NL an extra empty list item is
 		  added.
 		- No CR characters are removed.
-		When {type} contains "B" a |Blob| is returned with the binary
-		data of the file unmodified.
 		Otherwise:
 		- CR characters that appear before a NL are removed.
 		- Whether the last line ends in a NL or not does not matter.
@@ -8282,6 +8432,9 @@
 		Note that without {max} the whole file is read into memory.
 		Also note that there is no recognition of encoding.  Read a
 		file into a buffer if you need to.
+		Deprecated (use |readblob()| instead): When {type} contains
+		"B" a |Blob| is returned with the binary data of the file
+		unmodified.
 		When the file can't be opened an error message is given and
 		the result is an empty list.
 		Also see |writefile()|.
@@ -8319,15 +8472,18 @@
 		Returns an empty string when not recording.  See |q|.
 
 reltime([{start} [, {end}]])				*reltime()*
-		Return an item that represents a time value.  The format of
-		the item depends on the system.  It can be passed to
-		|reltimestr()| to convert it to a string  or |reltimefloat()|
-		to convert to a Float.
-		Without an argument it returns the current time.
+		Return an item that represents a time value.  The item is a
+		list with items that depend on the system.  In Vim 9 script
+		list<any> can be used.
+		The item can be passed to |reltimestr()| to convert it to a
+		string or |reltimefloat()| to convert to a Float.
+
+		Without an argument reltime() returns the current time.
 		With one argument is returns the time passed since the time
 		specified in the argument.
 		With two arguments it returns the time passed between {start}
 		and {end}.
+
 		The {start} and {end} arguments must be values returned by
 		reltime().
 
@@ -8645,6 +8801,7 @@
 		the following mappings: >
 			nnoremap <expr> GG ":echom ".screencol()."\n"
 			nnoremap <silent> GG :echom screencol()<CR>
+			nnoremap GG <Cmd>echom screencol()<CR>
 <
 screenpos({winid}, {lnum}, {col})				*screenpos()*
 		The result is a Dict with the screen position of the text
@@ -8712,11 +8869,16 @@
 
 		'ignorecase', 'smartcase' and 'magic' are used.
 
-		When the 'z' flag is not given, searching always starts in
-		column zero and then matches before the cursor are skipped.
-		When the 'c' flag is present in 'cpo' the next search starts
-		after the match.  Without the 'c' flag the next search starts
-		one column further.
+		When the 'z' flag is not given, forward searching always
+		starts in column zero and then matches before the cursor are
+		skipped.  When the 'c' flag is present in 'cpo' the next
+		search starts after the match.  Without the 'c' flag the next
+		search starts one column further.  This matters for
+		overlapping matches.
+		When searching backwards and the 'z' flag is given then the
+		search starts in column zero, thus no match in the current
+		line will be found (unless wrapping around the end of the
+		file).
 
 		When the {stopline} argument is given then the search stops
 		after searching this line.  This is useful to restrict the
@@ -8898,7 +9060,7 @@
 						result.  if search exceeded
 						total count, "total" value
 						becomes `maxcount + 1`
-						(default: 0)
+						(default: 99)
 		  pos		|List|		`[lnum, col, off]` value
 						when recomputing the result.
 						this changes "current" result
@@ -9050,6 +9212,7 @@
 		Send a reply string to {clientid}.  The most recent {clientid}
 		that sent a string can be retrieved with expand("<client>").
 		{only available when compiled with the |+clientserver| feature}
+		Returns zero for success, -1 for failure.
 		Note:
 		This id has to be stored before the next command can be
 		received.  I.e. before returning from the received command and
@@ -9138,6 +9301,19 @@
 <		You can use the script $VIMRUNTIME/tools/emoji_list.vim to see
 		the effect for known emoji characters.
 
+setcharpos({expr}, {list})				*setcharpos()*
+		Same as |setpos()| but uses the specified column number as the
+		character index instead of the byte index in the line.
+
+		Example:
+		With the text "여보세요" in line 8: >
+			call setcharpos('.', [0, 8, 4, 0])
+<		positions the cursor on the fourth character 'ìš”'. >
+			call setpos('.', [0, 8, 4, 0])
+<		positions the cursor on the second character 'ë³´'.
+
+		Can also be used as a |method|: >
+			GetPosition()->setcharpos('.')
 
 setcharsearch({dict})					*setcharsearch()*
 		Set the current character search information to {dict},
@@ -9174,12 +9350,27 @@
 		before inserting the resulting text.
 		When the number is too big the cursor is put at the end of the
 		line.  A number smaller than one has undefined results.
-		Returns 0 when successful, 1 when not editing the command
-		line.
+		Returns FALSE when successful, TRUE when not editing the
+		command line.
 
 		Can also be used as a |method|: >
 			GetPos()->setcmdpos()
 
+setcursorcharpos({lnum}, {col} [, {off}])		*setcursorcharpos()*
+setcursorcharpos({list})
+		Same as |cursor()| but uses the specified column number as the
+		character index instead of the byte index in the line.
+
+		Example:
+		With the text "여보세요" in line 4: >
+			call setcursorcharpos(4, 3)
+<		positions the cursor on the third character '세'. >
+			call cursor(4, 3)
+<		positions the cursor on the first character 'ì—¬'.
+
+		Can also be used as a |method|: >
+			GetCursorPos()->setcursorcharpos()
+
 setenv({name}, {val})						*setenv()*
 		Set environment variable {name} to {val}.
 		When {val} is |v:null| the environment variable is deleted.
@@ -9219,8 +9410,8 @@
 		When {lnum} is just below the last line the {text} will be
 		added below the last line.
 
-		If this succeeds, 0 is returned.  If this fails (most likely
-		because {lnum} is invalid) 1 is returned.
+		If this succeeds, FALSE is returned.  If this fails (most likely
+		because {lnum} is invalid) TRUE is returned.
 
 		Example: >
 			:call setline(5, strftime("%c"))
@@ -9291,7 +9482,8 @@
 
 		"lnum" and "col" are the position in the buffer.  The first
 		column is 1.  Use a zero "lnum" to delete a mark.  If "col" is
-		smaller than 1 then 1 is used.
+		smaller than 1 then 1 is used. To use the character count
+		instead of the byte count, use |setcharpos()|.
 
 		The "off" number is only used when 'virtualedit' is set. Then
 		it is the offset in screen columns from the start of the
@@ -9311,7 +9503,7 @@
 		Returns 0 when the position could be set, -1 otherwise.
 		An error message is given if {expr} is invalid.
 
-		Also see |getpos()| and |getcurpos()|.
+		Also see |setcharpos()|, |getpos()| and |getcurpos()|.
 
 		This does not restore the preferred column for moving
 		vertically; if you set the cursor position with this, |j| and
@@ -9686,6 +9878,18 @@
 		{only available when compiled with the |+float| feature}
 
 
+slice({expr}, {start} [, {end}])			*slice()* 
+		Similar to using a |slice| "expr[start : end]", but "end" is
+		used exclusive.  And for a string the indexes are used as
+		character indexes instead of byte indexes, like in
+		|vim9script|.
+		When {end} is omitted the slice continues to the last item.
+		When {end} is -1 the last item is omitted.
+
+		Can also be used as a |method|: >
+			GetList()->slice(offset)
+
+
 sort({list} [, {func} [, {dict}]])			*sort()* *E702*
 		Sort the items in {list} in-place.  Returns {list}.
 
@@ -9700,8 +9904,25 @@
 		When {func} is given and it is '1' or 'i' then case is
 		ignored.
 
+		When {func} is given and it is 'l' then the current collation
+		locale is used for ordering. Implementation details: strcoll()
+		is used to compare strings. See |:language| check or set the
+		collation locale. |v:collate| can also be used to check the
+		current locale. Sorting using the locale typically ignores
+		case. Example: >
+			" ö is sorted similarly to o with English locale.
+			:language collate en_US.UTF8
+			:echo sort(['n', 'o', 'O', 'ö', 'p', 'z'], 'l')
+<			['n', 'o', 'O', 'ö', 'p', 'z'] ~
+>
+			" ö is sorted after z with Swedish locale.
+			:language collate sv_SE.UTF8
+			:echo sort(['n', 'o', 'O', 'ö', 'p', 'z'], 'l')
+<			['n', 'o', 'O', 'p', 'z', 'ö'] ~
+		This does not work properly on Mac.
+
 		When {func} is given and it is 'n' then all items will be
-		sorted numerical (Implementation detail: This uses the
+		sorted numerical (Implementation detail: this uses the
 		strtod() function to parse numbers, Strings, Lists, Dicts and
 		Funcrefs will be considered as being 0).
 
@@ -10613,7 +10834,7 @@
 
 
 taglist({expr} [, {filename}])				*taglist()*
-		Returns a list of tags matching the regular expression {expr}.
+		Returns a |List| of tags matching the regular expression {expr}.
 
 		If {filename} is passed it is used to prioritize the results
 		in the same way that |:tselect| does. See |tag-priority|.
@@ -10705,7 +10926,7 @@
 
 
 terminalprops()						*terminalprops()*
-		Returns a dictionary with properties of the terminal that Vim
+		Returns a |Dictionary| with properties of the terminal that Vim
 		detected from the response to |t_RV| request.  See
 		|v:termresponse| for the response itself.  If |v:termresponse|
 		is empty most values here will be 'u' for unknown.
@@ -10794,6 +11015,8 @@
 		function or a |Funcref|.  It is called with one argument, which
 		is the timer ID.  The callback is only invoked when Vim is
 		waiting for input.
+		If you want to show a message look at |popup_notification()|
+		to avoid interfering with what the user is doing.
 
 		{options} is a dictionary.  Supported entries:
 		   "repeat"	Number of times to repeat calling the
@@ -10946,6 +11169,14 @@
 <		Can also be used as a |method|: >
 			mylist->type()
 
+
+typename({expr})					*typename()*
+		Return a string representation of the type of {expr}.
+		Example: >
+			echo typename([1, 2, 3])
+			list<number>
+
+
 undofile({name})					*undofile()*
 		Return the name of the undo file that would be used for a file
 		with name {name} when writing.  This uses the 'undodir'
@@ -11103,16 +11334,18 @@
 			call win_execute(winid, 'set syntax=python')
 <		Doing the same with `setwinvar()` would not trigger
 		autocommands and not actually show syntax highlighting.
+
 							*E994*
 		Not all commands are allowed in popup windows.
-		When window {id} does not exist then no error is given.
+		When window {id} does not exist then no error is given and
+		an empty string is returned.
 
 		Can also be used as a |method|, the base is passed as the
 		second argument: >
 			GetCommand()->win_execute(winid)
 
 win_findbuf({bufnr})					*win_findbuf()*
-		Returns a list with |window-ID|s for windows that contain
+		Returns a |List| with |window-ID|s for windows that contain
 		buffer {bufnr}.  When there is none the list is empty.
 
 		Can also be used as a |method|: >
@@ -11153,7 +11386,7 @@
 win_gotoid({expr})					*win_gotoid()*
 		Go to window with ID {expr}.  This may also change the current
 		tabpage.
-		Return 1 if successful, 0 if the window cannot be found.
+		Return TRUE if successful, FALSE if the window cannot be found.
 
 		Can also be used as a |method|: >
 			GetWinid()->win_gotoid()
@@ -11586,7 +11819,7 @@
 mksession		Compiled with support for |:mksession|.
 modify_fname		Compiled with file name modifiers. |filename-modifiers|
 			(always true)
-mouse			Compiled with support mouse.
+mouse			Compiled with support for mouse.
 mouse_dec		Compiled with support for Dec terminal mouse.
 mouse_gpm		Compiled with support for gpm (Linux console mouse)
 mouse_gpm_enabled	GPM mouse is working
@@ -12871,7 +13104,7 @@
 :exe[cute] {expr1} ..	Executes the string that results from the evaluation
 			of {expr1} as an Ex command.
 			Multiple arguments are concatenated, with a space in
-			between.  To avoid the extra space use the "."
+			between.  To avoid the extra space use the ".."
 			operator to concatenate strings into one argument.
 			{expr1} is used as the processed command, command line
 			editing keys are not recognized.
diff -Nru vim-8.2.1913/runtime/doc/filetype.txt vim-8.2.2434/runtime/doc/filetype.txt
--- vim-8.2.1913/runtime/doc/filetype.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/filetype.txt	2021-01-30 22:05:11.000000000 +0000
@@ -1,4 +1,4 @@
-*filetype.txt*  For Vim version 8.2.  Last change: 2020 Sep 28
+*filetype.txt*  For Vim version 8.2.  Last change: 2021 Jan 21
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -147,6 +147,7 @@
 	*.w		g:filetype_w	|ft-cweb-syntax|
 	*.i		g:filetype_i	|ft-progress-syntax|
 	*.p		g:filetype_p	|ft-pascal-syntax|
+	*.pp		g:filetype_pp	|ft-pascal-syntax|
 	*.sh		g:bash_is_sh	|ft-sh-syntax|
 	*.tex		g:tex_flavor	|ft-tex-plugin|
 
@@ -563,16 +564,15 @@
 
 MAN					*ft-man-plugin* *:Man* *man.vim*
 
-Displays a manual page in a nice way.  Also see the user manual
-|find-manpage|.
-
-To start using the ":Man" command before any manual page was loaded, source
-this script from your startup vimrc file: >
+This plugin displays a manual page in a nice way.  See |find-manpage| in the
+user manual for more information.
 
+To start using the |:Man| command before any manual page has been loaded,
+source this script from your startup |vimrc| file: >
 	runtime ftplugin/man.vim
 
 Options:
-'iskeyword'	the '.' character is added to be able to use CTRL-] on the
+'iskeyword'	The '.' character is added to support the use of CTRL-] on the
 		manual page name.
 
 Commands:
@@ -582,24 +582,25 @@
 
 Global mapping:
 <Leader>K	Displays the manual page for the word under the cursor.
-<Plug>ManPreGetPage  idem, allows for using a mapping: >
-			nmap <F1> <Plug>ManPreGetPage<CR>
+<Plug>ManPreGetPage
+		idem, allows for using a mapping: >
+			nmap <F1> <Plug>ManPreGetPage
 
 Local mappings:
 CTRL-]		Jump to the manual page for the word under the cursor.
 CTRL-T		Jump back to the previous manual page.
-q		Same as ":quit"
+q		Same as the |:quit| command.
 
 To use a vertical split instead of horizontal: >
 	let g:ft_man_open_mode = 'vert'
 To use a new tab: >
 	let g:ft_man_open_mode = 'tab'
 
-To enable folding use this: >
-  	let g:ft_man_folding_enable = 1
-If you do not like the default folding, use an autocommand to add your desired
+To enable |folding|, use this: >
+	let g:ft_man_folding_enable = 1
+If you do not like the default folding, use an |autocommand| to add your desired
 folding style instead.  For example: >
-        autocmd FileType man setlocal foldmethod=indent foldenable
+	autocmd FileType man setlocal foldmethod=indent foldenable
 
 If you would like :Man {number} {name} to behave like man {number} {name} by
 not running man {name} if no page is found, then use this: >
@@ -612,7 +613,7 @@
 
 MANPAGER				      *manpager.vim*
 
-The :Man command allows you to turn Vim into a manpager (that syntax highlights
+The |:Man| command allows you to turn Vim into a manpager (that syntax highlights
 manpages and follows linked manpages on hitting CTRL-]).
 
 For bash,zsh,ksh or dash, add to the config file (.bashrc,.zshrc, ...)
diff -Nru vim-8.2.1913/runtime/doc/helphelp.txt vim-8.2.2434/runtime/doc/helphelp.txt
--- vim-8.2.1913/runtime/doc/helphelp.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/helphelp.txt	2021-01-30 22:05:11.000000000 +0000
@@ -1,4 +1,4 @@
-*helphelp.txt*	For Vim version 8.2.  Last change: 2020 Jul 27
+*helphelp.txt*	For Vim version 8.2.  Last change: 2020 Dec 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -92,9 +92,9 @@
 				:help k| only
 <			Note that a space before the '|' is seen as part of
 			the ":help" argument.
-			You can also use <LF> or <CR> to separate the help
+			You can also use <NL> or <CR> to separate the help
 			command from a following command.  You need to type
-			CTRL-V first to insert the <LF> or <CR>.  Example: >
+			CTRL-V first to insert the <NL> or <CR>.  Example: >
 				:help so<C-V><CR>only
 
 :h[elp]! [subject]	Like ":help", but in non-English help files prefer to
@@ -158,9 +158,31 @@
 will be opened.  Otherwise the specified tag is searched for in all "doc/tags"
 files in the directories specified in the 'runtimepath' option.
 
+If you would like to open the help in the current window, see this tip:
+|help-curwin|.
+
 The initial height of the help window can be set with the 'helpheight' option
 (default 20).
 
+When the help buffer is created, several local options are set to make sure
+the help text is displayed as it was intended:
+    'iskeyword'		nearly all ASCII chars except ' ', '*', '"' and '|'
+    'foldmethod'	"manual"
+    'tabstop'		8
+    'arabic'		off
+    'binary'		off
+    'buflisted'		off
+    'cursorbind'	off
+    'diff'		off
+    'foldenable'	off
+    'list'		off
+    'modifiable'	off
+    'number'		off
+    'relativenumber'	off
+    'rightleft'		off
+    'scrollbind'	off
+    'spell'		off
+
 Jump to specific subjects by using tags.  This can be done in two ways:
 - Use the "CTRL-]" command while standing on the name of a command or option.
   This only works when the tag is a keyword.  "<C-Leftmouse>" and
diff -Nru vim-8.2.1913/runtime/doc/index.txt vim-8.2.2434/runtime/doc/index.txt
--- vim-8.2.1913/runtime/doc/index.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/index.txt	2021-01-30 22:05:11.000000000 +0000
@@ -1,4 +1,4 @@
-*index.txt*     For Vim version 8.2.  Last change: 2020 Oct 05
+*index.txt*     For Vim version 8.2.  Last change: 2021 Jan 15
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1590,6 +1590,8 @@
 |:sign|		:sig[n]		manipulate signs
 |:silent|	:sil[ent]	run a command silently
 |:sleep|	:sl[eep]	do nothing for a few seconds
+|:sleep!|	:sl[eep]!	do nothing for a few seconds, without the
+				cursor visible
 |:slast|	:sla[st]	split window and go to last file in the
 				argument list
 |:smagic|	:sm[agic]	:substitute with 'magic'
diff -Nru vim-8.2.1913/runtime/doc/intro.txt vim-8.2.2434/runtime/doc/intro.txt
--- vim-8.2.1913/runtime/doc/intro.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/intro.txt	2021-01-30 22:05:11.000000000 +0000
@@ -1,4 +1,4 @@
-*intro.txt*     For Vim version 8.2.  Last change: 2020 Aug 15
+*intro.txt*     For Vim version 8.2.  Last change: 2020 Dec 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -434,7 +434,7 @@
 <CSI>		command sequence intro  ALT-Esc 155	*<CSI>*
 <xCSI>		CSI when typed in the GUI		*<xCSI>*
 
-<EOL>		end-of-line (can be <CR>, <LF> or <CR><LF>,
+<EOL>		end-of-line (can be <CR>, <NL> or <CR><NL>,
 		depends on system and 'fileformat')	*<EOL>*
 
 <Up>		cursor-up			*cursor-up* *cursor_up*
@@ -678,8 +678,8 @@
 Normal mode, without causing a beep like <Esc> would.  However, this does not
 work in Ex mode.  When used after a command that takes an argument, such as
 |f| or |m|, the timeout set with 'ttimeoutlen' applies.
-When focus is in a terminal window, CTRL-\ CTRL-N goes to Normal mode for only
-one command, see |t_CTRL-\_CTRL-N|.
+When focus is in a terminal window, CTRL-\ CTRL-N goes to Normal mode until an
+edit command is entered, see |t_CTRL-\_CTRL-N|.
 
 	*CTRL-\_CTRL-G* *i_CTRL-\_CTRL-G* *c_CTRL-\_CTRL-G* *v_CTRL-\_CTRL-G*
 The command CTRL-\ CTRL-G or <C-\><C-G> can be used to go to Insert mode when
diff -Nru vim-8.2.1913/runtime/doc/map.txt vim-8.2.2434/runtime/doc/map.txt
--- vim-8.2.1913/runtime/doc/map.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/map.txt	2021-01-30 22:05:11.000000000 +0000
@@ -1,4 +1,4 @@
-*map.txt*       For Vim version 8.2.  Last change: 2020 Oct 07
+*map.txt*       For Vim version 8.2.  Last change: 2020 Dec 10
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -271,7 +271,7 @@
 - The |:normal| command.
 - Moving the cursor is allowed, but it is restored afterwards.
 If you want the mapping to do any of these let the returned characters do
-that.
+that, or use a |<Cmd>| mapping instead.
 
 You can use getchar(), it consumes typeahead if there is any. E.g., if you
 have these mappings: >
@@ -303,6 +303,43 @@
 Note that using 0x80 as a single byte before other text does not work, it will
 be seen as a special key.
 
+						*<Cmd>* *:map-cmd*
+The special text <Cmd> begins a "command mapping", it executes the command
+directly without changing modes.  Where you might use ":...<CR>" in the
+{rhs} of a mapping, you can instead use "<Cmd>...<CR>".
+Example: >
+	noremap x <Cmd>echo mode(1)<CR>
+<
+This is more flexible than `:<C-U>` in Visual and Operator-pending mode, or
+`<C-O>:` in Insert mode, because the commands are executed directly in the
+current mode, instead of always going to Normal mode.  Visual mode is
+preserved, so tricks with |gv| are not needed.  Commands can be invoked
+directly in Command-line mode (which would otherwise require timer hacks).
+Example of using <Cmd> halfway Insert mode: >
+	nnoremap <F3> aText <Cmd>echo mode(1)<CR> Added<Esc>
+
+Unlike <expr> mappings, there are no special restrictions on the <Cmd>
+command: it is executed as if an (unrestricted) |autocommand| was invoked.
+
+Note:
+- Because <Cmd> avoids mode-changes it does not trigger |CmdlineEnter| and
+  |CmdlineLeave| events, because no user interaction is expected.
+- For the same reason, |keycodes| like <C-R><C-W> are interpreted as plain,
+  unmapped keys.
+- The command is not echo'ed, no need for <silent>.
+- In Visual mode  you can use `line('v')` and `col('v')` to get one end of the
+  Visual area, the cursor is at the other end.
+- In Select mode, |:map| and |:vmap| command mappings are executed in
+  Visual mode.  Use |:smap| to handle Select mode differently.
+
+							*E1135* *E1136*
+<Cmd> commands must terminate, that is, they must be followed by <CR> in the
+{rhs} of the mapping definition.  |Command-line| mode is never entered.
+
+							*E1137*
+<Cmd> commands can have only normal characters and cannot contain special
+characters like function keys.
+
 
 1.3 MAPPING AND MODES					*:map-modes*
 			*mapmode-nvo* *mapmode-n* *mapmode-v* *mapmode-o*
@@ -872,7 +909,7 @@
 1.12 MAPPING AN OPERATOR				*:map-operator*
 
 An operator is used before a {motion} command.  To define your own operator
-you must create mapping that first sets the 'operatorfunc' option and then
+you must create a mapping that first sets the 'operatorfunc' option and then
 invoke the |g@| operator.  After the user types the {motion} command the
 specified function will be called.
 
@@ -1204,9 +1241,9 @@
 
 If you need to get the script number to use in a complicated script, you can
 use this function: >
-	function s:SID()
-	  return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze_SID$')
-	endfun
+	func s:ScriptNumber()
+	  return matchstr(expand('<SID>'), '<SNR>\zs\d\+\ze_')
+	endfunc
 
 The "<SNR>" will be shown when listing functions and mappings.  This is useful
 to find out what they are defined to.
@@ -1284,15 +1321,15 @@
 See |:verbose-cmd| for more information.
 
 							*E174* *E182*
-:com[mand][!] [{attr}...] {cmd} {rep}
+:com[mand][!] [{attr}...] {cmd} {repl}
 			Define a user command.  The name of the command is
-			{cmd} and its replacement text is {rep}.  The command's
-			attributes (see below) are {attr}.  If the command
-			already exists, an error is reported, unless a ! is
-			specified, in which case the command is redefined.
-			There is one exception: When sourcing a script again,
-			a command that was previously defined in that script
-			will be silently replaced.
+			{cmd} and its replacement text is {repl}.  The
+			command's attributes (see below) are {attr}.  If the
+			command already exists, an error is reported, unless a
+			! is specified, in which case the command is
+			redefined.  There is one exception: When sourcing a
+			script again, a command that was previously defined in
+			that script will be silently replaced.
 
 
 :delc[ommand] {cmd}				*:delc* *:delcommand* *E184*
@@ -1502,11 +1539,11 @@
 
 Replacement text ~
 
-The replacement text for a user defined command is scanned for special escape
-sequences, using <...> notation.  Escape sequences are replaced with values
-from the entered command line, and all other text is copied unchanged.  The
-resulting string is executed as an Ex command.  To avoid the replacement use
-<lt> in place of the initial <.  Thus to include "<bang>" literally use
+The replacement text {repl} for a user defined command is scanned for special
+escape sequences, using <...> notation.  Escape sequences are replaced with
+values from the entered command line, and all other text is copied unchanged.
+The resulting string is executed as an Ex command.  To avoid the replacement
+use <lt> in place of the initial <.  Thus to include "<bang>" literally use
 "<lt>bang>".
 
 The valid escape sequences are
@@ -1632,6 +1669,11 @@
 This will invoke: >
 	:call Allargs("%s/foo/bar/ge|update")
 <
+If the command is defined in Vim9 script (a script that starts with
+`:vim9script` and in a `:def` function) then {repl} will be executed as in Vim9
+script.  Thus this depends on where the command is defined, not where it is
+used.
+
 When defining a user command in a script, it will be able to call functions
 local to the script and use mappings local to the script.  When the user
 invokes the user command, it will run in the context of the script it was
diff -Nru vim-8.2.1913/runtime/doc/message.txt vim-8.2.2434/runtime/doc/message.txt
--- vim-8.2.1913/runtime/doc/message.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/message.txt	2021-01-30 22:05:11.000000000 +0000
@@ -1,4 +1,4 @@
-*message.txt*   For Vim version 8.2.  Last change: 2020 Sep 07
+*message.txt*   For Vim version 8.2.  Last change: 2020 Dec 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -794,6 +794,9 @@
 -> Press <Enter> or <Space> to redraw the screen and continue, without that
    key being used otherwise.
 -> Press ':' or any other Normal mode command character to start that command.
+   Note that after an external command some special keys, such as the cursor
+   keys, may not work normally, because the terminal is still set to a state
+   for executing the external command.
 -> Press 'k', <Up>, 'u', 'b' or 'g' to scroll back in the messages.  This
    works the same way as at the |more-prompt|.  Only works when 'compatible'
    is off and 'more' is on.
diff -Nru vim-8.2.1913/runtime/doc/netbeans.txt vim-8.2.2434/runtime/doc/netbeans.txt
--- vim-8.2.1913/runtime/doc/netbeans.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/netbeans.txt	2021-01-30 22:05:11.000000000 +0000
@@ -1,4 +1,4 @@
-*netbeans.txt*  For Vim version 8.2.  Last change: 2020 Aug 15
+*netbeans.txt*  For Vim version 8.2.  Last change: 2020 Nov 02
 
 
 		  VIM REFERENCE MANUAL    by Gordon Prieur et al.
@@ -562,9 +562,10 @@
 		saved directly by the Vim Controller.
 		New in version 2.3.
 
-setReadOnly
-		Set a file as readonly
-		Implemented in version 2.3.
+setReadOnly readonly
+		When the boolean argument "readonly" is "T" for True, mark the
+		buffer as readonly, when it is "F" for False, mark it as not
+		readonly.  Implemented in version 2.3.
 
 setStyle	Not implemented.
 
diff -Nru vim-8.2.1913/runtime/doc/options.txt vim-8.2.2434/runtime/doc/options.txt
--- vim-8.2.1913/runtime/doc/options.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/options.txt	2021-01-30 22:05:11.000000000 +0000
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 8.2.  Last change: 2020 Oct 10
+*options.txt*	For Vim version 8.2.  Last change: 2021 Jan 08
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -438,7 +438,7 @@
 				  CTRL-?	CTRL-H
 				not CTRL-?	CTRL-?
 
-			(CTRL-? is 0177 octal, 0x7f hex)
+			(CTRL-? is 0o177 octal, 0x7f hex)
 
 			If your delete key terminal code is wrong, but the
 			code for backspace is alright, you can put this in
@@ -2801,6 +2801,7 @@
 	toggled each time the flag is given.  See |complex-change|.  See
 	also 'gdefault' option.
 	Switching this option on may break plugins!
+	This option is not used in |Vim9| script.
 
 					*'emoji'* *'emo'* *'noemoji'* *'noemo'*
 'emoji' 'emo'	boolean (default: on)
@@ -3121,7 +3122,7 @@
 			local to buffer
 	This gives the <EOL> of the current buffer, which is used for
 	reading/writing the buffer from/to a file:
-	    dos	    <CR> <NL>
+	    dos	    <CR><NL>
 	    unix    <NL>
 	    mac	    <CR>
 	When "dos" is used, CTRL-Z at the end of a file is ignored.
@@ -3272,7 +3273,7 @@
 	See the 'endofline' option.
 
 					*'fkmap'* *'fk'* *'nofkmap'* *'nofk'*
-'fkmap' 'fk'		boolean (default off)			*E198*
+'fkmap' 'fk'		boolean (default off)
 			global
 			{only available when compiled with the |+rightleft|
 			feature}
@@ -3570,6 +3571,7 @@
 	DEPRECATED: Setting this option may break plugins that are not aware
 	of this option.  Also, many users get confused that adding the /g flag
 	has the opposite effect of that it normally does.
+	This option is not used in |Vim9| script.
 
 						*'grepformat'* *'gfm'*
 'grepformat' 'gfm'	string	(default "%f:%l:%m,%f:%l%m,%f  %l%m")
@@ -4943,6 +4945,8 @@
 	Only switch it off when working with old Vi scripts.  In any other
 	situation write patterns that work when 'magic' is on.  Include "\M"
 	when you want to |/\M|.
+	In |Vim9| script the value of 'magic' is ignored, patterns behave like
+	it is always set.
 
 						*'makeef'* *'mef'*
 'makeef' 'mef'		string	(default: "")
@@ -5217,7 +5221,7 @@
 	NOTE: This option is set to the Vi default value when 'compatible' is
 	set and to the Vim default value when 'compatible' is reset.
 
-						*'mouse'* *E538*
+						*'mouse'*
 'mouse'			string	(default "", "a" for GUI and Win32,
 					set to "a" or "nvi" in |defaults.vim|)
 			global
@@ -6317,7 +6321,9 @@
 			local to window
 	Number of lines to scroll with CTRL-U and CTRL-D commands.  Will be
 	set to half the number of lines in the window when the window size
-	changes.  If you give a count to the CTRL-U or CTRL-D command it will
+	changes.  This may happen when enabling the |status-line| or
+	'tabline' option after setting the 'scroll' option.
+	If you give a count to the CTRL-U or CTRL-D command it will
 	be used as the new value for 'scroll'.  Reset to half the window
 	height with ":set scroll=0".
 
diff -Nru vim-8.2.1913/runtime/doc/os_vms.txt vim-8.2.2434/runtime/doc/os_vms.txt
--- vim-8.2.1913/runtime/doc/os_vms.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/os_vms.txt	2021-01-30 22:05:11.000000000 +0000
@@ -1,4 +1,4 @@
-*os_vms.txt*    For Vim version 8.2.  Last change: 2020 Jun 07
+*os_vms.txt*    For Vim version 8.2.  Last change: 2021 Jan 04
 
 
 		  VIM REFERENCE MANUAL
@@ -72,7 +72,7 @@
 4. Problems						*vms-problems*
 
 The code has been tested under Open VMS 6.2 - 8.2 on Alpha, VAX and IA64
-platforms with the DEC C compiler.  It should work without big problems.
+platforms with the DEC C compiler. It should work without major problems.
 If your system does not have some include libraries you can tune up in
 OS_VMS_CONF.H file.
 
@@ -765,6 +765,15 @@
 
 9. VMS related changes					*vms-changes*
 
+Version 8.2
+- make all changes needed for clean compile build of v8.2 on VMS on all platforms
+- fix the call mkdir bug (vicente_polo@yahoo.es) 
+- test on VSI OpenVMS Alpha and Itanium platforms
+- added LUA support
+- added XPM support - Motif GUI with toolbar on all platforms
+- XPM v3.4.11 libraries for IA64, AXP and VAX are added 
+- start integrating the new test scripts 
+
 Version 8.1
 - make necessary changes to build v8.1 on VMS
 
diff -Nru vim-8.2.1913/runtime/doc/pattern.txt vim-8.2.2434/runtime/doc/pattern.txt
--- vim-8.2.1913/runtime/doc/pattern.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/pattern.txt	2021-01-30 22:05:11.000000000 +0000
@@ -1,4 +1,4 @@
-*pattern.txt*   For Vim version 8.2.  Last change: 2020 Sep 01
+*pattern.txt*   For Vim version 8.2.  Last change: 2021 Jan 08
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -361,8 +361,8 @@
 						*/atom*
 5. An atom can be one of a long list of items.  Many atoms match one character
    in the text.  It is often an ordinary character or a character class.
-   Braces can be used to make a pattern into an atom.  The "\z(\)" construct
-   is only for syntax highlighting.
+   Parentheses can be used to make a pattern into an atom.  The "\z(\)"
+   construct is only for syntax highlighting.
 
    atom    ::=	    ordinary-atom		|/ordinary-atom|
 		or  \( pattern \)		|/\(|
@@ -394,15 +394,19 @@
 ==============================================================================
 3. Magic							*/magic*
 
-Some characters in the pattern are taken literally.  They match with the same
-character in the text.  When preceded with a backslash however, these
-characters get a special meaning.
+Some characters in the pattern, such as letters, are taken literally.  They
+match exactly the same character in the text.  When preceded with a backslash
+however, these characters may get a special meaning.  For example, "a" matches
+the letter "a", while "\a" matches any alphabetic character.
 
 Other characters have a special meaning without a backslash.  They need to be
-preceded with a backslash to match literally.
+preceded with a backslash to match literally.  For example "." matches any
+character while "\." matches a dot.
 
 If a character is taken literally or not depends on the 'magic' option and the
-items mentioned next.
+items in the pattern mentioned next.  The 'magic' option should always be set,
+but it can be switched off for Vi compatibility.  We mention the effect of
+'nomagic' here for completeness, but we recommend against using that.
 							*/\m* */\M*
 Use of "\m" makes the pattern after it be interpreted as if 'magic' is set,
 ignoring the actual value of the 'magic' option.
@@ -411,30 +415,28 @@
 Use of "\v" means that after it, all ASCII characters except '0'-'9', 'a'-'z',
 'A'-'Z' and '_' have special meaning: "very magic"
 
-Use of "\V" means that after it, only a backslash and terminating character
-(usually / or ?) have special meaning: "very nomagic"
+Use of "\V" means that after it, only a backslash and the terminating
+character (usually / or ?) have special meaning: "very nomagic"
 
 Examples:
 after:	  \v	   \m	    \M	     \V		matches ~
 		'magic' 'nomagic'
-	  $	   $	    $	     \$		matches end-of-line
-	  .	   .	    \.	     \.		matches any character
+	  a	   a	    a	     a		literal 'a'
+	  \a	   \a	    \a	     \a		any alphabetic character
+	  .	   .	    \.	     \.		any character
+	  \.	   \.	    .	     .		literal dot
+	  $	   $	    $	     \$		end-of-line
 	  *	   *	    \*	     \*		any number of the previous atom
 	  ~	   ~	    \~	     \~		latest substitute string
-	  ()	   \(\)     \(\)     \(\)	grouping into an atom
-	  |	   \|	    \|	     \|		separating alternatives
-	  \a	   \a	    \a	     \a		alphabetic character
+	  ()	   \(\)     \(\)     \(\)	group as an atom
+	  |	   \|	    \|	     \|		nothing: separates alternatives
 	  \\	   \\	    \\	     \\		literal backslash
-	  \.	   \.	    .	     .		literal dot
-	  \{	   {	    {	     {		literal '{'
-	  a	   a	    a	     a		literal 'a'
+	  \{	   {	    {	     {		literal curly brace
 
 {only Vim supports \m, \M, \v and \V}
 
-It is recommended to always keep the 'magic' option at the default setting,
-which is 'magic'.  This avoids portability problems.  To make a pattern immune
-to the 'magic' option being set or not, put "\m" or "\M" at the start of the
-pattern.
+If you want to you can make a pattern immune to the 'magic' option being set
+or not by putting "\m" or "\M" at the start of the pattern.
 
 ==============================================================================
 4. Overview of pattern items				*pattern-overview*
@@ -676,7 +678,7 @@
 
 	Note that using "\&" works the same as using "\@=": "foo\&.." is the
 	same as "\(foo\)\@=..".  But using "\&" is easier, you don't need the
-	braces.
+	parentheses.
 
 
 							*/\@!*
@@ -1069,8 +1071,8 @@
 
 []	(with 'nomagic': \[])		*/[]* */\[]* */\_[]* */collection*
 \_[]
-	A collection.  This is a sequence of characters enclosed in brackets.
-	It matches any single character in the collection.
+	A collection.  This is a sequence of characters enclosed in square
+	brackets.  It matches any single character in the collection.
 	Example		matches ~
 	[xyz]		any 'x', 'y' or 'z'
 	[a-zA-Z]$	any alphabetic character at the end of a line
@@ -1129,11 +1131,12 @@
 *[:ident:]*	  [:ident:]		identifier character (same as "\i")
 *[:keyword:]*	  [:keyword:]		keyword character (same as "\k")
 *[:fname:]*	  [:fname:]		file name character (same as "\f")
-	  The brackets in character class expressions are additional to the
-	  brackets delimiting a collection.  For example, the following is a
-	  plausible pattern for a UNIX filename: "[-./[:alnum:]_~]\+" That is,
-	  a list of at least one character, each of which is either '-', '.',
-	  '/', alphabetic, numeric, '_' or '~'.
+	  The square brackets in character class expressions are additional to
+	  the square brackets delimiting a collection.  For example, the
+	  following is a plausible pattern for a UNIX filename:
+	  "[-./[:alnum:]_~]\+".  That is, a list of at least one character,
+	  each of which is either '-', '.', '/', alphabetic, numeric, '_' or
+	  '~'.
 	  These items only work for 8-bit characters, except [:lower:] and
 	  [:upper:] also work for multibyte characters when using the new
 	  regexp engine.  See |two-engines|.  In the future these items may
@@ -1176,7 +1179,7 @@
 		\b	<BS>
 		\n	line break, see above |/[\n]|
 		\d123	decimal number of character
-		\o40	octal number of character up to 0377
+		\o40	octal number of character up to 0o377
 		\x20	hexadecimal number of character up to 0xff
 		\u20AC	hex. number of multibyte character up to 0xffff
 		\U1234	hex. number of multibyte character up to 0xffffffff
@@ -1214,7 +1217,8 @@
 \%d123	Matches the character specified with a decimal number.  Must be
 	followed by a non-digit.
 \%o40	Matches the character specified with an octal number up to 0377.
-	Numbers below 040 must be followed by a non-octal digit or a non-digit.
+	Numbers below 0o40 must be followed by a non-octal digit or a
+	non-digit.
 \%x2a	Matches the character specified with up to two hexadecimal characters.
 \%u20AC	Matches the character specified with up to four hexadecimal
 	characters.
diff -Nru vim-8.2.1913/runtime/doc/popup.txt vim-8.2.2434/runtime/doc/popup.txt
--- vim-8.2.1913/runtime/doc/popup.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/popup.txt	2021-01-30 22:05:11.000000000 +0000
@@ -1,4 +1,4 @@
-*popup.txt*  For Vim version 8.2.  Last change: 2020 Oct 17
+*popup.txt*  For Vim version 8.2.  Last change: 2021 Jan 21
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -101,7 +101,7 @@
 
 Normally the plugin that created the popup window is also in charge of closing
 it.  If somehow a popup hangs around, you can close all of them with: >
-	call popup_clear()
+	call popup_clear(1)
 Some popups, such as notifications, close after a specified time.  This can be
 set with the "time" property on `popup_create()`.
 Otherwise, a popup can be closed by clicking on the X in the top-right corner
@@ -309,8 +309,8 @@
 
 popup_filter_menu({id}, {key})				*popup_filter_menu()*
 		Filter that can be used for a popup. These keys can be used:
-		    j <Down>		select item below
-		    k <Up>		select item above
+		    j <Down> <C-N>	select item below
+		    k <Up> <C-P>	select item above
 		    <Space> <Enter>	accept current selection
 		    x Esc CTRL-C	cancel the menu
 		Other keys are ignored.
@@ -588,8 +588,6 @@
 
 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*  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 -Nru vim-8.2.1913/runtime/doc/repeat.txt vim-8.2.2434/runtime/doc/repeat.txt
--- vim-8.2.1913/runtime/doc/repeat.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/repeat.txt	2021-01-30 22:05:11.000000000 +0000
@@ -1,4 +1,4 @@
-*repeat.txt*    For Vim version 8.2.  Last change: 2020 Oct 09
+*repeat.txt*    For Vim version 8.2.  Last change: 2021 Jan 23
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -354,6 +354,14 @@
 			Vim version, or update Vim to a newer version.  See
 			|vimscript-version| for what changed between versions.
 
+:vim9[script] [noclear]				*:vim9* *:vim9script*
+			Marks a script file as containing |Vim9-script|
+			commands.  Also see |vim9-namespace|.
+			Must be the first command in the file.
+			For [noclear] see |vim9-reload|.
+			Without the |+eval| feature this changes the syntax
+			for some commands.
+			 
 						*:scr* *:scriptnames*
 :scr[iptnames]		List all sourced script names, in the order they were
 			first sourced.  The number is used for the script ID
@@ -891,8 +899,9 @@
 matches ".../plugin/explorer.vim" and "explorer.vim" in any other directory.
 
 The match for functions is done against the name as it's shown in the output
-of ":function".  For local functions this means that something like "<SNR>99_"
-is prepended.
+of ":function".  However, for local functions the script-specific prefix such
+as "<SNR>99_" is ignored to make it easier to match script-local functions
+without knowing the ID of the script.
 
 Note that functions are first loaded and later executed.  When they are loaded
 the "file" breakpoints are checked, when they are executed the "func"
@@ -947,10 +956,10 @@
 
 Profiling means that Vim measures the time that is spent on executing
 functions and/or scripts.  The |+profile| feature is required for this.
-It is only included when Vim was compiled with "huge" features.
+It is included when Vim was compiled with "huge" features.
 
 You can also use the |reltime()| function to measure time.  This only requires
-the |+reltime| feature, which is present more often.
+the |+reltime| feature, which is present in more builds.
 
 For profiling syntax highlighting see |:syntime|.
 
@@ -997,7 +1006,12 @@
 
 
 You must always start with a ":profile start fname" command.  The resulting
-file is written when Vim exits.  Here is an example of the output, with line
+file is written when Vim exits.  For example, to profile one specific
+function: >
+	profile start /tmp/vimprofile
+	profile func MyFunc
+
+Here is an example of the output, with line
 numbers prepended for the explanation:
 
   1 FUNCTION  Test2() ~
diff -Nru vim-8.2.1913/runtime/doc/sign.txt vim-8.2.2434/runtime/doc/sign.txt
--- vim-8.2.1913/runtime/doc/sign.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/sign.txt	2021-01-30 22:05:11.000000000 +0000
@@ -1,4 +1,4 @@
-*sign.txt*      For Vim version 8.2.  Last change: 2020 Aug 31
+*sign.txt*      For Vim version 8.2.  Last change: 2020 Oct 28
 
 
 		  VIM REFERENCE MANUAL    by Gordon Prieur
@@ -81,6 +81,10 @@
 independently of the sign group. The default priority for a sign is 10. The
 priority is assigned at the time of placing a sign.
 
+When two signs with the same priority are present, and one has an icon or text
+in the signcolumn while the other has line highlighting, then both are
+displayed.
+
 When the line on which the sign is placed is deleted, the sign is moved to the
 next line (or the last line of the buffer, if there is no next line).  When
 the delete is undone the sign does not move back.
@@ -458,11 +462,11 @@
 				entries
 
 		The dictionary for each sign contains the following entries:
-			group	sign group. Set to '' for the global group.
-			id	identifier of the sign
-			lnum	line number where the sign is placed
-			name	name of the defined sign
-			priority	sign priority
+			group	 sign group. Set to '' for the global group.
+			id	 identifier of the sign
+			lnum	 line number where the sign is placed
+			name	 name of the defined sign
+			priority sign priority
 
 		The returned signs in a buffer are ordered by their line
 		number and priority.
diff -Nru vim-8.2.1913/runtime/doc/starting.txt vim-8.2.2434/runtime/doc/starting.txt
--- vim-8.2.1913/runtime/doc/starting.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/starting.txt	2021-01-30 22:05:11.000000000 +0000
@@ -1,4 +1,4 @@
-*starting.txt*  For Vim version 8.2.  Last change: 2020 Sep 23
+*starting.txt*  For Vim version 8.2.  Last change: 2020 Dec 19
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -996,7 +996,7 @@
 
 MS-Windows line separators ~
 
-On MS-Windows, Vim assumes that all the vimrc files have <CR> <NL> pairs as
+On MS-Windows, Vim assumes that all the vimrc files have <CR><NL> pairs as
 line separators.  This will give problems if you have a file with only <NL>s
 and have a line like ":map xx yy^M".  The trailing ^M will be ignored.
 
diff -Nru vim-8.2.1913/runtime/doc/syntax.txt vim-8.2.2434/runtime/doc/syntax.txt
--- vim-8.2.1913/runtime/doc/syntax.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/syntax.txt	2021-01-30 22:05:11.000000000 +0000
@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 8.2.  Last change: 2020 Aug 15
+*syntax.txt*	For Vim version 8.2.  Last change: 2021 Jan 21
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -66,8 +66,8 @@
 will start soon.  See |'go-M'| about avoiding that.
 
 							*:syn-on* *:syntax-on*
-The `:syntax enable` command will keep your current color settings.  This
-allows using `:highlight` commands to set your preferred colors before or
+The `:syntax enable` command will keep most of your current color settings.
+This allows using `:highlight` commands to set your preferred colors before or
 after using this command.  If you want Vim to overrule your settings with the
 defaults, use: >
 	:syntax on
@@ -2335,11 +2335,12 @@
 
 PASCAL						*pascal.vim* *ft-pascal-syntax*
 
-Files matching "*.p" could be Progress or Pascal.  If the automatic detection
-doesn't work for you, or you don't edit Progress at all, use this in your
-startup vimrc: >
+Files matching "*.p" could be Progress or Pascal and those matching "*.pp"
+could be Puppet or Pascal.  If the automatic detection doesn't work for you,
+or you only edit Pascal files, use this in your startup vimrc: >
 
-   :let filetype_p = "pascal"
+   :let filetype_p  = "pascal"
+   :let filetype_pp = "pascal"
 
 The Pascal syntax file has been extended to take into account some extensions
 provided by Turbo Pascal, Free Pascal Compiler and GNU Pascal Compiler.
@@ -3006,7 +3007,7 @@
 (Adapted from the html.vim help text by Claudio Fleiner <claudio@fleiner.com>)
 
 
-		*ft-posix-synax* *ft-dash-syntax*
+		*ft-posix-syntax* *ft-dash-syntax*
 SH		*sh.vim*  *ft-sh-syntax*  *ft-bash-syntax*  *ft-ksh-syntax*
 
 This covers syntax highlighting for the older Unix (Bourne) sh, and newer
@@ -3183,6 +3184,7 @@
 
 
 TEX				*tex.vim* *ft-tex-syntax* *latex-syntax*
+				*syntax-tex* *syntax-latex*
 
 			Tex Contents~
 	Tex: Want Syntax Folding?			|tex-folding|
@@ -3199,6 +3201,7 @@
 	Tex: Selective Conceal Mode			|g:tex_conceal|
 	Tex: Controlling iskeyword			|g:tex_isk|
 	Tex: Fine Subscript and Superscript Control	|tex-supersub|
+	Tex: Match Check Control			|tex-matchcheck|
 
 				*tex-folding* *g:tex_fold_enabled*
  Tex: Want Syntax Folding? ~
@@ -3422,6 +3425,22 @@
 <	in ~/.vim/ftplugin/tex/tex.vim in order to avoid having inscrutable
 	utf-8 glyphs appear.
 
+					*tex-matchcheck* *g:tex_matchcheck*
+ Tex: Match Check Control~
+
+	Sometimes one actually wants mismatched parentheses, square braces,
+	and or curly braces; for example, \text{(1,10] is a range from but
+	not including 1 to and including 10}.  This wish, of course, conflicts
+	with the desire to provide delimiter mismatch detection.  To
+	accommodate these conflicting goals, syntax/tex.vim provides >
+		g:tex_matchcheck = '[({[]'
+<	which is shown along with its default setting.  So, if one doesn't
+	want [] and () to be checked for mismatches, try using >
+		let g:tex_matchcheck= '[{}]'
+<	If you don't want matching to occur inside bold and italicized
+	regions, >
+		let g:tex_excludematcher= 1
+<	will prevent the texMatcher group from being included in those regions.
 
 TF						*tf.vim* *ft-tf-syntax*
 
@@ -5305,6 +5324,12 @@
 Without the "default" in the C syntax file, the highlighting would be
 overruled when the syntax file is loaded.
 
+To have a link survive `:highlight clear`, which is useful if you have
+highlighting for a specific filetype and you want to keep it when selecting
+another color scheme, put a command like this in the
+"after/syntax/{filetype}.vim" file: >
+    highlight! default link cComment Question
+
 ==============================================================================
 15. Cleaning up						*:syn-clear* *E391*
 
diff -Nru vim-8.2.1913/runtime/doc/tags vim-8.2.2434/runtime/doc/tags
--- vim-8.2.1913/runtime/doc/tags	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/tags	2021-01-30 22:05:11.000000000 +0000
@@ -1045,6 +1045,8 @@
 't_da'	term.txt	/*'t_da'*
 't_db'	term.txt	/*'t_db'*
 't_dl'	term.txt	/*'t_dl'*
+'t_fd'	term.txt	/*'t_fd'*
+'t_fe'	term.txt	/*'t_fe'*
 't_fs'	term.txt	/*'t_fs'*
 't_k1'	term.txt	/*'t_k1'*
 't_k2'	term.txt	/*'t_k2'*
@@ -1783,6 +1785,8 @@
 09.2	usr_09.txt	/*09.2*
 09.3	usr_09.txt	/*09.3*
 09.4	usr_09.txt	/*09.4*
+0o	eval.txt	/*0o*
+0x	eval.txt	/*0x*
 10.1	usr_10.txt	/*10.1*
 10.2	usr_10.txt	/*10.2*
 10.3	usr_10.txt	/*10.3*
@@ -1994,6 +1998,7 @@
 :AdaTagFile	ft_ada.txt	/*:AdaTagFile*
 :AdaTypes	ft_ada.txt	/*:AdaTypes*
 :Arguments	terminal.txt	/*:Arguments*
+:Asm	terminal.txt	/*:Asm*
 :Break	terminal.txt	/*:Break*
 :Cfilter	quickfix.txt	/*:Cfilter*
 :Clear	terminal.txt	/*:Clear*
@@ -2072,6 +2077,11 @@
 :_#<	cmdline.txt	/*:_#<*
 :_#n	cmdline.txt	/*:_#n*
 :_%	cmdline.txt	/*:_%*
+:_%%	cmdline.txt	/*:_%%*
+:_%%%	cmdline.txt	/*:_%%%*
+:_%%0	cmdline.txt	/*:_%%0*
+:_%%<	cmdline.txt	/*:_%%<*
+:_%%n	cmdline.txt	/*:_%%n*
 :_%:	cmdline.txt	/*:_%:*
 :_%<	cmdline.txt	/*:_%<*
 :a	insert.txt	/*:a*
@@ -2125,6 +2135,7 @@
 :bad	windows.txt	/*:bad*
 :badd	windows.txt	/*:badd*
 :ball	windows.txt	/*:ball*
+:balt	windows.txt	/*:balt*
 :bar	cmdline.txt	/*:bar*
 :bd	windows.txt	/*:bd*
 :bdel	windows.txt	/*:bdel*
@@ -2724,6 +2735,7 @@
 :map-<unique>	map.txt	/*:map-<unique>*
 :map-alt-keys	map.txt	/*:map-alt-keys*
 :map-arguments	map.txt	/*:map-arguments*
+:map-cmd	map.txt	/*:map-cmd*
 :map-commands	map.txt	/*:map-commands*
 :map-expression	map.txt	/*:map-expression*
 :map-local	map.txt	/*:map-local*
@@ -3102,9 +3114,11 @@
 :sip	change.txt	/*:sip*
 :sir	change.txt	/*:sir*
 :sl	various.txt	/*:sl*
+:sl!	various.txt	/*:sl!*
 :sla	windows.txt	/*:sla*
 :slast	windows.txt	/*:slast*
 :sleep	various.txt	/*:sleep*
+:sleep!	various.txt	/*:sleep!*
 :sm	change.txt	/*:sm*
 :smagic	change.txt	/*:smagic*
 :smap	map.txt	/*:smap*
@@ -3387,8 +3401,8 @@
 :vie	editing.txt	/*:vie*
 :view	editing.txt	/*:view*
 :vim	quickfix.txt	/*:vim*
-:vim9	vim9.txt	/*:vim9*
-:vim9script	vim9.txt	/*:vim9script*
+:vim9	repeat.txt	/*:vim9*
+:vim9script	repeat.txt	/*:vim9script*
 :vimgrep	quickfix.txt	/*:vimgrep*
 :vimgrepa	quickfix.txt	/*:vimgrepa*
 :vimgrepadd	quickfix.txt	/*:vimgrepadd*
@@ -3506,6 +3520,7 @@
 <CSI>	intro.txt	/*<CSI>*
 <Char->	map.txt	/*<Char->*
 <Char>	map.txt	/*<Char>*
+<Cmd>	map.txt	/*<Cmd>*
 <CursorHold>	autocmd.txt	/*<CursorHold>*
 <D-	intro.txt	/*<D-*
 <D-c>	os_mac.txt	/*<D-c>*
@@ -3923,6 +3938,9 @@
 E1113	eval.txt	/*E1113*
 E112	eval.txt	/*E112*
 E113	eval.txt	/*E113*
+E1135	map.txt	/*E1135*
+E1136	map.txt	/*E1136*
+E1137	map.txt	/*E1137*
 E114	eval.txt	/*E114*
 E115	eval.txt	/*E115*
 E116	eval.txt	/*E116*
@@ -4014,7 +4032,6 @@
 E195	starting.txt	/*E195*
 E196	various.txt	/*E196*
 E197	mlang.txt	/*E197*
-E198	options.txt	/*E198*
 E199	cmdline.txt	/*E199*
 E20	motion.txt	/*E20*
 E200	autocmd.txt	/*E200*
@@ -4100,7 +4117,6 @@
 E275	textprop.txt	/*E275*
 E276	eval.txt	/*E276*
 E277	remote.txt	/*E277*
-E278	popup.txt	/*E278*
 E279	terminal.txt	/*E279*
 E28	syntax.txt	/*E28*
 E280	if_tcl.txt	/*E280*
@@ -4166,7 +4182,6 @@
 E338	editing.txt	/*E338*
 E339	message.txt	/*E339*
 E34	various.txt	/*E34*
-E340	vi_diff.txt	/*E340*
 E341	message.txt	/*E341*
 E342	message.txt	/*E342*
 E343	options.txt	/*E343*
@@ -4374,7 +4389,6 @@
 E535	options.txt	/*E535*
 E536	options.txt	/*E536*
 E537	options.txt	/*E537*
-E538	options.txt	/*E538*
 E539	options.txt	/*E539*
 E54	pattern.txt	/*E54*
 E540	options.txt	/*E540*
@@ -5145,10 +5159,14 @@
 VMS	os_vms.txt	/*VMS*
 Vi	intro.txt	/*Vi*
 View	starting.txt	/*View*
+Vim9	vim9.txt	/*Vim9*
+Vim9-script	vim9.txt	/*Vim9-script*
 VimEnter	autocmd.txt	/*VimEnter*
 VimLeave	autocmd.txt	/*VimLeave*
 VimLeavePre	autocmd.txt	/*VimLeavePre*
 VimResized	autocmd.txt	/*VimResized*
+VimResume	autocmd.txt	/*VimResume*
+VimSuspend	autocmd.txt	/*VimSuspend*
 Vimball-copyright	pi_vimball.txt	/*Vimball-copyright*
 Virtual-Replace-mode	insert.txt	/*Virtual-Replace-mode*
 VisVim	if_ole.txt	/*VisVim*
@@ -5554,6 +5572,10 @@
 c_#<	cmdline.txt	/*c_#<*
 c_#n	cmdline.txt	/*c_#n*
 c_%	cmdline.txt	/*c_%*
+c_%%	cmdline.txt	/*c_%%*
+c_%%%#	cmdline.txt	/*c_%%%#*
+c_%%<	cmdline.txt	/*c_%%<*
+c_%%n	cmdline.txt	/*c_%%n*
 c_<BS>	cmdline.txt	/*c_<BS>*
 c_<C-Left>	cmdline.txt	/*c_<C-Left>*
 c_<C-R>	cmdline.txt	/*c_<C-R>*
@@ -5737,8 +5759,10 @@
 characterwise-register	change.txt	/*characterwise-register*
 characterwise-visual	visual.txt	/*characterwise-visual*
 charclass()	eval.txt	/*charclass()*
+charcol()	eval.txt	/*charcol()*
 charconvert_from-variable	eval.txt	/*charconvert_from-variable*
 charconvert_to-variable	eval.txt	/*charconvert_to-variable*
+charidx()	eval.txt	/*charidx()*
 charity	uganda.txt	/*charity*
 charset	mbyte.txt	/*charset*
 charset-conversion	mbyte.txt	/*charset-conversion*
@@ -6249,6 +6273,7 @@
 exim	starting.txt	/*exim*
 exists()	eval.txt	/*exists()*
 exiting	starting.txt	/*exiting*
+exiting-variable	eval.txt	/*exiting-variable*
 exp()	eval.txt	/*exp()*
 expand()	eval.txt	/*expand()*
 expand-env	options.txt	/*expand-env*
@@ -6326,6 +6351,7 @@
 expression-syntax	eval.txt	/*expression-syntax*
 exrc	starting.txt	/*exrc*
 extend()	eval.txt	/*extend()*
+extendnew()	eval.txt	/*extendnew()*
 extension-removal	cmdline.txt	/*extension-removal*
 extensions-improvements	todo.txt	/*extensions-improvements*
 f	motion.txt	/*f*
@@ -6405,7 +6431,26 @@
 fname_out-variable	eval.txt	/*fname_out-variable*
 fnameescape()	eval.txt	/*fnameescape()*
 fnamemodify()	eval.txt	/*fnamemodify()*
+fo-1	change.txt	/*fo-1*
+fo-2	change.txt	/*fo-2*
+fo-B	change.txt	/*fo-B*
+fo-M	change.txt	/*fo-M*
+fo-]	change.txt	/*fo-]*
+fo-a	change.txt	/*fo-a*
+fo-b	change.txt	/*fo-b*
+fo-c	change.txt	/*fo-c*
+fo-j	change.txt	/*fo-j*
+fo-l	change.txt	/*fo-l*
+fo-m	change.txt	/*fo-m*
+fo-n	change.txt	/*fo-n*
+fo-o	change.txt	/*fo-o*
+fo-p	change.txt	/*fo-p*
+fo-q	change.txt	/*fo-q*
+fo-r	change.txt	/*fo-r*
+fo-t	change.txt	/*fo-t*
 fo-table	change.txt	/*fo-table*
+fo-v	change.txt	/*fo-v*
+fo-w	change.txt	/*fo-w*
 fold-behavior	fold.txt	/*fold-behavior*
 fold-colors	fold.txt	/*fold-colors*
 fold-commands	fold.txt	/*fold-commands*
@@ -6549,7 +6594,7 @@
 ft-php3-syntax	syntax.txt	/*ft-php3-syntax*
 ft-phtml-syntax	syntax.txt	/*ft-phtml-syntax*
 ft-plaintex-syntax	syntax.txt	/*ft-plaintex-syntax*
-ft-posix-synax	syntax.txt	/*ft-posix-synax*
+ft-posix-syntax	syntax.txt	/*ft-posix-syntax*
 ft-postscr-syntax	syntax.txt	/*ft-postscr-syntax*
 ft-ppwiz-syntax	syntax.txt	/*ft-ppwiz-syntax*
 ft-printcap-syntax	syntax.txt	/*ft-printcap-syntax*
@@ -6856,6 +6901,7 @@
 g:tex_flavor	filetype.txt	/*g:tex_flavor*
 g:tex_fold_enabled	syntax.txt	/*g:tex_fold_enabled*
 g:tex_isk	syntax.txt	/*g:tex_isk*
+g:tex_matchcheck	syntax.txt	/*g:tex_matchcheck*
 g:tex_no_error	syntax.txt	/*g:tex_no_error*
 g:tex_nospell	syntax.txt	/*g:tex_nospell*
 g:tex_stylish	syntax.txt	/*g:tex_stylish*
@@ -6929,6 +6975,7 @@
 getchangelist()	eval.txt	/*getchangelist()*
 getchar()	eval.txt	/*getchar()*
 getcharmod()	eval.txt	/*getcharmod()*
+getcharpos()	eval.txt	/*getcharpos()*
 getcharsearch()	eval.txt	/*getcharsearch()*
 getcmdline()	eval.txt	/*getcmdline()*
 getcmdpos()	eval.txt	/*getcmdpos()*
@@ -6936,6 +6983,7 @@
 getcmdwintype()	eval.txt	/*getcmdwintype()*
 getcompletion()	eval.txt	/*getcompletion()*
 getcurpos()	eval.txt	/*getcurpos()*
+getcursorcharpos()	eval.txt	/*getcursorcharpos()*
 getcwd()	eval.txt	/*getcwd()*
 getenv()	eval.txt	/*getenv()*
 getfontname()	eval.txt	/*getfontname()*
@@ -7136,6 +7184,7 @@
 hebrew.txt	hebrew.txt	/*hebrew.txt*
 help	helphelp.txt	/*help*
 help-context	help.txt	/*help-context*
+help-curwin	tips.txt	/*help-curwin*
 help-summary	usr_02.txt	/*help-summary*
 help-tags	tags	1
 help-translated	helphelp.txt	/*help-translated*
@@ -7745,6 +7794,7 @@
 mapmode-t	map.txt	/*mapmode-t*
 mapmode-v	map.txt	/*mapmode-v*
 mapmode-x	map.txt	/*mapmode-x*
+mapnew()	eval.txt	/*mapnew()*
 mapping	map.txt	/*mapping*
 mapping-functions	usr_41.txt	/*mapping-functions*
 mapset()	eval.txt	/*mapset()*
@@ -8236,9 +8286,12 @@
 notepad	gui_w32.txt	/*notepad*
 nr2char()	eval.txt	/*nr2char()*
 nroff.vim	syntax.txt	/*nroff.vim*
+null	vim9.txt	/*null*
 null-variable	eval.txt	/*null-variable*
 number_relativenumber	options.txt	/*number_relativenumber*
 numbered-function	eval.txt	/*numbered-function*
+numbermax-variable	eval.txt	/*numbermax-variable*
+numbermin-variable	eval.txt	/*numbermin-variable*
 numbersize-variable	eval.txt	/*numbersize-variable*
 o	insert.txt	/*o*
 o_CTRL-V	motion.txt	/*o_CTRL-V*
@@ -8649,6 +8702,7 @@
 read-messages	insert.txt	/*read-messages*
 read-only-share	editing.txt	/*read-only-share*
 read-stdin	version5.txt	/*read-stdin*
+readblob()	eval.txt	/*readblob()*
 readdir()	eval.txt	/*readdir()*
 readdirex()	eval.txt	/*readdirex()*
 readfile()	eval.txt	/*readfile()*
@@ -8847,8 +8901,10 @@
 setbufline()	eval.txt	/*setbufline()*
 setbufvar()	eval.txt	/*setbufvar()*
 setcellwidths()	eval.txt	/*setcellwidths()*
+setcharpos()	eval.txt	/*setcharpos()*
 setcharsearch()	eval.txt	/*setcharsearch()*
 setcmdpos()	eval.txt	/*setcmdpos()*
+setcursorcharpos()	eval.txt	/*setcursorcharpos()*
 setenv()	eval.txt	/*setenv()*
 setfperm()	eval.txt	/*setfperm()*
 setline()	eval.txt	/*setline()*
@@ -8912,6 +8968,7 @@
 skeleton	autocmd.txt	/*skeleton*
 skip_defaults_vim	starting.txt	/*skip_defaults_vim*
 slice	eval.txt	/*slice*
+slice()	eval.txt	/*slice()*
 slow-fast-terminal	term.txt	/*slow-fast-terminal*
 slow-start	starting.txt	/*slow-start*
 slow-terminal	term.txt	/*slow-terminal*
@@ -9167,8 +9224,10 @@
 syntax	syntax.txt	/*syntax*
 syntax-functions	usr_41.txt	/*syntax-functions*
 syntax-highlighting	syntax.txt	/*syntax-highlighting*
+syntax-latex	syntax.txt	/*syntax-latex*
 syntax-loading	syntax.txt	/*syntax-loading*
 syntax-printing	usr_06.txt	/*syntax-printing*
+syntax-tex	syntax.txt	/*syntax-tex*
 syntax.txt	syntax.txt	/*syntax.txt*
 syntax_cmd	syntax.txt	/*syntax_cmd*
 sys-file-list	help.txt	/*sys-file-list*
@@ -9305,6 +9364,8 @@
 t_f7	version4.txt	/*t_f7*
 t_f8	version4.txt	/*t_f8*
 t_f9	version4.txt	/*t_f9*
+t_fd	term.txt	/*t_fd*
+t_fe	term.txt	/*t_fe*
 t_float-variable	eval.txt	/*t_float-variable*
 t_fs	term.txt	/*t_fs*
 t_func-variable	eval.txt	/*t_func-variable*
@@ -9527,6 +9588,7 @@
 termdebug-starting	terminal.txt	/*termdebug-starting*
 termdebug-stepping	terminal.txt	/*termdebug-stepping*
 termdebug-variables	terminal.txt	/*termdebug-variables*
+termdebug_disasm_window	terminal.txt	/*termdebug_disasm_window*
 termdebug_map_K	terminal.txt	/*termdebug_map_K*
 termdebug_popup	terminal.txt	/*termdebug_popup*
 termdebug_shortcuts	terminal.txt	/*termdebug_shortcuts*
@@ -9603,6 +9665,7 @@
 tex-conceal	syntax.txt	/*tex-conceal*
 tex-error	syntax.txt	/*tex-error*
 tex-folding	syntax.txt	/*tex-folding*
+tex-matchcheck	syntax.txt	/*tex-matchcheck*
 tex-math	syntax.txt	/*tex-math*
 tex-morecommands	syntax.txt	/*tex-morecommands*
 tex-nospell	syntax.txt	/*tex-nospell*
@@ -9677,6 +9740,7 @@
 type-mistakes	tips.txt	/*type-mistakes*
 typecorr-settings	usr_41.txt	/*typecorr-settings*
 typecorr.txt	usr_41.txt	/*typecorr.txt*
+typename()	eval.txt	/*typename()*
 u	undo.txt	/*u*
 uganda	uganda.txt	/*uganda*
 uganda.txt	uganda.txt	/*uganda.txt*
@@ -9780,6 +9844,7 @@
 v:errors	eval.txt	/*v:errors*
 v:event	eval.txt	/*v:event*
 v:exception	eval.txt	/*v:exception*
+v:exiting	eval.txt	/*v:exiting*
 v:false	eval.txt	/*v:false*
 v:fcs_choice	eval.txt	/*v:fcs_choice*
 v:fcs_reason	eval.txt	/*v:fcs_reason*
@@ -9803,6 +9868,8 @@
 v:mouse_winid	eval.txt	/*v:mouse_winid*
 v:none	eval.txt	/*v:none*
 v:null	eval.txt	/*v:null*
+v:numbermax	eval.txt	/*v:numbermax*
+v:numbermin	eval.txt	/*v:numbermin*
 v:numbersize	eval.txt	/*v:numbersize*
 v:oldfiles	eval.txt	/*v:oldfiles*
 v:operator	eval.txt	/*v:operator*
@@ -10045,6 +10112,7 @@
 vim9	vim9.txt	/*vim9*
 vim9-classes	vim9.txt	/*vim9-classes*
 vim9-const	vim9.txt	/*vim9-const*
+vim9-curly	vim9.txt	/*vim9-curly*
 vim9-declaration	vim9.txt	/*vim9-declaration*
 vim9-declarations	usr_46.txt	/*vim9-declarations*
 vim9-differences	vim9.txt	/*vim9-differences*
@@ -10052,11 +10120,13 @@
 vim9-final	vim9.txt	/*vim9-final*
 vim9-gotchas	vim9.txt	/*vim9-gotchas*
 vim9-import	vim9.txt	/*vim9-import*
+vim9-namespace	vim9.txt	/*vim9-namespace*
 vim9-rationale	vim9.txt	/*vim9-rationale*
+vim9-reload	vim9.txt	/*vim9-reload*
 vim9-scopes	vim9.txt	/*vim9-scopes*
-vim9-script	vim9.txt	/*vim9-script*
 vim9-script-intro	usr_46.txt	/*vim9-script-intro*
 vim9-types	vim9.txt	/*vim9-types*
+vim9-user-command	vim9.txt	/*vim9-user-command*
 vim9.txt	vim9.txt	/*vim9.txt*
 vim9script	vim9.txt	/*vim9script*
 vim:	options.txt	/*vim:*
@@ -10274,6 +10344,7 @@
 xterm-copy-paste	term.txt	/*xterm-copy-paste*
 xterm-cursor-keys	term.txt	/*xterm-cursor-keys*
 xterm-end-home-keys	term.txt	/*xterm-end-home-keys*
+xterm-focus-event	term.txt	/*xterm-focus-event*
 xterm-function-keys	term.txt	/*xterm-function-keys*
 xterm-modifier-keys	term.txt	/*xterm-modifier-keys*
 xterm-mouse	options.txt	/*xterm-mouse*
diff -Nru vim-8.2.1913/runtime/doc/tagsrch.txt vim-8.2.2434/runtime/doc/tagsrch.txt
--- vim-8.2.1913/runtime/doc/tagsrch.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/tagsrch.txt	2021-01-30 22:05:11.000000000 +0000
@@ -1,4 +1,4 @@
-*tagsrch.txt*   For Vim version 8.2.  Last change: 2020 Apr 19
+*tagsrch.txt*   For Vim version 8.2.  Last change: 2020 Dec 19
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -556,7 +556,7 @@
 is the only format produced by traditional ctags implementations.  This is
 often used for functions that are global, also referenced in other files.
 
-The lines in the tags file can end in <LF> or <CR><LF>.  On the Macintosh <CR>
+The lines in the tags file can end in <NL> or <CR><NL>.  On the Macintosh <CR>
 also works.  The <CR> and <NL> characters can never appear inside a line.
 
 The second format is new.  It includes additional information in optional
diff -Nru vim-8.2.1913/runtime/doc/terminal.txt vim-8.2.2434/runtime/doc/terminal.txt
--- vim-8.2.1913/runtime/doc/terminal.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/terminal.txt	2021-01-30 22:05:11.000000000 +0000
@@ -1,4 +1,4 @@
-*terminal.txt*	For Vim version 8.2.  Last change: 2020 Sep 04
+*terminal.txt*	For Vim version 8.2.  Last change: 2021 Jan 04
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -123,12 +123,14 @@
 
 							*options-in-terminal*
 After opening the terminal window and setting 'buftype' to "terminal" the
-TerminalOpen autocommand event is triggered.  This makes it possible to set
-options specifically for the window and buffer.  Example: >
-   au TerminalOpen * if &buftype == 'terminal' | setlocal bufhidden=hide | endif
-The <abuf> is set to the terminal buffer, but if there is no window (hidden
-terminal) then setting options will happen in the wrong buffer, therefore the
-check for &buftype in the example.
+|TerminalWinOpen| autocommand event is triggered.  This makes it possible to set
+options specifically for the terminal window and buffer.  Example: >
+   au TerminalWinOpen * setlocal bufhidden=hide
+
+There is also the |TerminalOpen| event, but this may be triggered for a hidden
+terminal, and the current window and buffer may not be for the new terminal.
+You need to use <abuf>, which is set to the terminal buffer.  Example: >
+    au TerminalOpen * call setbufvar(+expand('<abuf>'), '&colorcolumn', 123)
 
 Mouse events (click and drag) are passed to the terminal.  Mouse move events
 are only passed when Vim itself is receiving them.  For a terminal that is
@@ -503,6 +505,8 @@
 			a	different attribute
 			+	missing position in first file
 			-	missing position in second file
+			>	cursor position in first file, not in second
+			<	cursor position in second file, not in first
 
 		Using the "s" key the top and bottom parts are swapped.  This
 		makes it easy to spot a difference.
@@ -738,6 +742,9 @@
 		The default is "Tapi_".  When {expr} is an empty string then
 		no |terminal-api| function can be used for {buf}.
 
+		When used as a method the base is used for {buf}: >
+			GetBufnr()->term_setapi({expr})
+
 term_setansicolors({buf}, {colors})			*term_setansicolors()*
 		Set the ANSI color palette used by terminal {buf}.
 		{colors} must be a List of 16 valid color names or hexadecimal
@@ -1323,6 +1330,8 @@
  *:Program*    jump to the window with the running program
  *:Source*     jump to the window with the source code, create it if there
 	     isn't one
+ *:Asm*	     jump to the window with the disassembly, create it if there
+	     isn't one
 
 
 Prompt mode ~
@@ -1345,6 +1354,12 @@
 The K key is normally mapped to :Evaluate. If you do not want this use: >
 	let g:termdebug_map_K = 0
 
+<
+						*termdebug_disasm_window*
+If you want the Asm window shown by default, set this to 1. Setting to
+any value greater than 1 will set the Asm window height to that value: >
+	let g:termdebug_disasm_window = 15
+<
 
 Communication ~
 						*termdebug-communication*
@@ -1411,16 +1426,18 @@
 
 Vim window width						*termdebug_wide*
 
-To change the width of the Vim window when debugging starts, and use a
-vertical split: >
-  let g:termdebug_wide = 163
-This will set &columns to 163 when `:Termdebug` is used.  The value is restored
-when quitting the debugger.
-If g:termdebug_wide is set and &columns is already larger than
-g:termdebug_wide then a vertical split will be used without changing &columns.
-Set it to 1 to get a vertical split without every changing &columns (useful
-for when the terminal can't be resized by Vim).
+To change the width of the Vim window when debugging starts and use a vertical
+split: >
+	let g:termdebug_wide = 163
+
+This will set 'columns' to 163 when `:Termdebug` is used.  The value is
+restored when quitting the debugger.
+
+If g:termdebug_wide is set and 'columns' is already a greater value, then a
+vertical split will be used without modifying 'columns'.
 
+Set g:termdebug_wide to 1 to use a vertical split without ever changing
+'columns'.  This is useful when the terminal can't be resized by Vim.
 
 
  vim:tw=78:ts=8:noet:ft=help:norl:
diff -Nru vim-8.2.1913/runtime/doc/term.txt vim-8.2.2434/runtime/doc/term.txt
--- vim-8.2.1913/runtime/doc/term.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/term.txt	2021-01-30 22:05:11.000000000 +0000
@@ -1,4 +1,4 @@
-*term.txt*      For Vim version 8.2.  Last change: 2020 Apr 12
+*term.txt*      For Vim version 8.2.  Last change: 2021 Jan 14
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -217,6 +217,10 @@
 Another speciality about these codes is that they are not overwritten by
 another code.  That is to avoid that the codes obtained from xterm directly
 |t_RV| overwrite them.
+
+Another special value is a termcap entry ending in "@;*X".  This is for cursor
+keys, which either use "CSI X" or "CSI 1 ; modifier X".  Thus the "@"
+stands for either "1" if a modifier follows, or nothing.
 							*xterm-scroll-region*
 The default termcap entry for xterm on Sun and other platforms does not
 contain the entry for scroll regions.  Add ":cs=\E[%i%d;%dr:" to the xterm
@@ -369,6 +373,10 @@
 	t_Ri	restore icon text from stack			*t_Ri* *'t_Ri'*
 	t_TE	end of "raw" mode				*t_TE* *'t_TE'*
 	t_TI	put terminal into "raw" mode 			*t_TI* *'t_TI'*
+	t_fd	disable focus-event tracking 			*t_fd* *'t_fd'*
+		|xterm-focus-event|
+	t_fe	enable focus-event tracking 			*t_fe* *'t_fe'*
+		|xterm-focus-event|
 
 Some codes have a start, middle and end part.  The start and end are defined
 by the termcap option, the middle part is text.
@@ -542,6 +550,16 @@
 value with the context menu (right mouse button while CTRL key is pressed),
 there should be a tick at allow-window-ops.
 
+							*xterm-focus-event*
+Some terminals including xterm support the focus event tracking feature.
+If this feature is enabled by the 't_fe' sequence, special key sequences are
+sent from the terminal to Vim every time the terminal gains or loses focus.
+Vim fires focus events (|FocusGained|/|FocusLost|) by handling them accordingly.
+Focus event tracking is disabled by a 't_fd' sequence when exiting "raw" mode.
+If you would like to disable this feature, add the following to your .vimrc:
+	`set t_fd=`
+	`set t_fe=`
+
 							*termcap-colors*
 Note about colors: The 't_Co' option tells Vim the number of colors available.
 When it is non-zero, the 't_AB' and 't_AF' options are used to set the color.
diff -Nru vim-8.2.1913/runtime/doc/testing.txt vim-8.2.2434/runtime/doc/testing.txt
--- vim-8.2.1913/runtime/doc/testing.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/testing.txt	2021-01-30 22:05:11.000000000 +0000
@@ -1,4 +1,4 @@
-*testing.txt*	For Vim version 8.2.  Last change: 2020 Sep 06
+*testing.txt*	For Vim version 8.2.  Last change: 2020 Dec 12
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -308,8 +308,11 @@
 		first reported error: >
 			assert_fails('cmd', ['E987:.*expected bool'])
 <		The second pattern, if present, is matched against the last
-		reported error.  To only match the last error use an empty
-		string for the first error: >
+		reported error.
+		If there is only one error then both patterns must match. This
+		can be used to check that there is only one error.
+		To only match the last error use an empty string for the first
+		error: >
 			assert_fails('cmd', ['', 'E987:'])
 <
 		If {msg} is empty then it is not used.  Do this to get the
diff -Nru vim-8.2.1913/runtime/doc/tips.txt vim-8.2.2434/runtime/doc/tips.txt
--- vim-8.2.1913/runtime/doc/tips.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/tips.txt	2021-01-30 22:05:11.000000000 +0000
@@ -1,4 +1,4 @@
-*tips.txt*      For Vim version 8.2.  Last change: 2009 Nov 07
+*tips.txt*      For Vim version 8.2.  Last change: 2020 Dec 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -30,6 +30,7 @@
 Hex editing					|hex-editing|
 Using <> notation in autocommands		|autocmd-<>|
 Highlighting matching parens			|match-parens|
+Opening help in the current window		|help-curwin|
 
 ==============================================================================
 Editing C programs					*C-editing*
@@ -530,4 +531,28 @@
 	autocmd InsertEnter * match none
 <
 
+==============================================================================
+Opening help in the current window				*help-curwin*
+
+By default, help is displayed in a split window.  If you prefer it opens in
+the current window, try this custom `:HelpCurwin` command:
+>
+	command -bar -nargs=? -complete=help HelpCurwin execute s:HelpCurwin(<q-args>)
+	let s:did_open_help = v:false
+	
+	function s:HelpCurwin(subject) abort
+	  let mods = 'silent noautocmd keepalt'
+	  if !s:did_open_help
+	    execute mods .. ' help'
+	    execute mods .. ' helpclose'
+	    let s:did_open_help = v:true
+	  endif
+	  if !getcompletion(a:subject, 'help')->empty()
+	    execute mods .. ' edit ' .. &helpfile
+	  endif
+	  return 'help ' .. a:subject
+	endfunction
+<
+
+
  vim:tw=78:ts=8:noet:ft=help:norl:
diff -Nru vim-8.2.1913/runtime/doc/todo.txt vim-8.2.2434/runtime/doc/todo.txt
--- vim-8.2.1913/runtime/doc/todo.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/todo.txt	2021-01-30 22:05:11.000000000 +0000
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 8.2.  Last change: 2020 Oct 26
+*todo.txt*      For Vim version 8.2.  Last change: 2021 Jan 25
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -38,65 +38,59 @@
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-Sign highlight in signcolumn disappears if there is line highlighting.
+test_autocmd failure in Windows: Something wrong with system()?
 
-Making everything work:
-- Test all  command modifiers.
-- Check many more builtin function arguments at compile time.
-- Closure arguments should be more strict, like any function call?
-- Invoke user command in a :def function
-- Make map() give an error if the resulting type is wrong.
-  Add mapnew() or mapcopy() to create a new List/Dict for the result, which
-  can have a different value type.
-- Error message for "'yes && 0" is "using String as a Number", should be "using
-  String as a Bool".
-- Run the same tests in :def and Vim9 script, like in Test_expr7_not()
-- In autocmd: use legacy syntax, not whatever the current script uses?
-- need to check type when a declaration specifies a type: #6507
-	let nr: number = 'asdf'
-- Make sure that in vim9script a function call without namespace only finds
-  the script-local function, not a global one.
-- Make sure that where a callback is expected a function can be used (without
-  quotes). E.g. sort() and map().  Also at the script level.
-- assignment to more complex lval: list[1][2][3] = 8
-  Also "list[0] += value".  test in Test_assign_dict_unknown_type().
-- ":put" with ISN_PUT does not handle range correctly, e.g. ":$-2put".
-  Add command to parse range at runtime?
-- When defining an :autocmd or :command, how to specify using Vim9 syntax?
-  - always do this when defined in a Vim9 script
-  - add some command modifier.
-- For an :autocmd and :command argument, if a following line starts with "|"
-  append it.  It's like line continuation. (#6702)
+Vim9 - Make everything work:
+- Add a test for profiling with nested function calls and lambda.
+- Expand `=expr` in :next, :argedit, :argadd, :argdelete, :drop
+- Expand `=expr` in :vimgrep, :vimgrepadd, :lvimgrep, :lvimgrepadd
+- Expand `=expr` in :mkspell
+- Unlet with range: "unlet list[a : b]"
 - Implement "export {one, two three}".
 - ISN_CHECKTYPE could use check_argtype()
+- Using a script variable inside a :def function doesn't work if the variable
+  is inside a block, see Test_nested_function().  Should it work?
 - give error for variable name:
-      let p = function('NoSuchFunc')
+      var p = function('NoSuchFunc')
+- Make closures work better:
+  - Create closure in a loop.  Need to make a list of them.
 - If a :def function is called with a function reference, compile it to get
   the function type.
 	def Filter(x: string, Cond: func(string): bool)
-	Filter(x, { v -> v =~ '^b' })
-- Expand `=expr` in :next, :argedit, :argadd, :argdelete, :drop
-- Expand `=expr` in :vimgrep, :vimgrepadd, :lvimgrep, :lvimgrepadd
-- Expand `=expr` in :mkspell
-- Test that a function defined inside a :def function is local to that
-  function, g: functions can be defined and script-local functions cannot be
-  defined.
-- Does this work already: can use func as reference:
-	def SomeFunc() ...
-	map(list, SomeFunc)
+	Filter(x, (v) => v =~ '^b')
+- Make inline function work, to be used as a funcref:
+       var Ref = (arg: type): type => {
+	    statement
+	    return expr
+	}
+       var Ref = (arg: type) => {
+	    statement
+	    statement
+	}
+- For builtin functions using tv_get_string*() use check_for_string() to be
+  more strict about the argument type.
+- Implement :lockvar and :unlockvar.  How about local variables?  Perhaps only
+  allow this for global variables.  Use :final or :const otherwise.
+- Allow function names that will be script-local to start with lower case
+  letter?  Or also require names with s: prefix to use upper case?
+  Also apply this function references "var ref = SomeFunc"
 - Support passing v:none to use the default argument value. (#6504)
+- Run the same tests in :def and Vim9 script, like in Test_expr7_not()
+- Check many more builtin function arguments at compile time.
 - make 0 == 'string' fail on the script level, like inside :def.
 - Check that when using a user function name without prefix, it does not find
   a global function.  Prefixing g: is required.
-- Compile: for [key, value] in items(map)
-- Assignment to dict doesn't work:
-      let ret: dict<string> = #{}
-      ret[i] = string(i)
-- Appending to dict item doesn't work:
-    let d[i] ..= value
+- Need the equivalent of get_lval() and set_var_lval() to implement assignment
+  to nested list and dict members.
+    - Assignment to dict doesn't work:
+	  var ret: dict<string> = #{}
+	  ret[i] = string(i)
+    - Appending to dict item doesn't work:
+	var d[i] ..= value
 - Using ".." at script level doesn't convert arguments to a string.
 - Compile replacement of :s command: s/pat/\=expr/
 - Compile redir to local variable: var_redir_start().
+- Implement type cast at the script level.
 - Compile builtin functions that access local variables:
     islocked()
 - When evaluating constants for script variables, some functions could work:
@@ -104,56 +98,60 @@
 - Implement "as Name" in "import Item as Name from ..."
 - Implement using imported items at script level from "import * as X" in
   eval_variable().  Should pass the ".xxx" that follows and return that.
-- Disallow unlet for local/script/imported vars
-- Make "++nr" work.
-- Make closures work:
-  - Create closure in a loop.  Need to make a list of them.
-  - nested closure only uses one context, not all (#7150)
+- Make "++nr" work.  "++g:count" doesn't work, thinks it is a range.
+- Reload: How to make sure type of script function hasn't changed?
 - expandcmd() with `=expr` in filename uses legacy expression.
 - eval_expr() in ex_cexpr()
 - eval_expr() call in dbg_parsearg() and debuggy_find()
-- has() is compiled as a constant, but some checks are dynamic.
-  Check for dynamic values, such as "gui_running".
-New syntax and functionality:
-Improve error checking:
-- "echo Func()" is an error if Func() does not return anything.
-Also:
-- For range: make table of first ASCII character with flag to quickly check if
-  it can be a Vim9 command. E.g. "+" can, but "." can't.
+- compile "skip" argument of searchpair()
+- compile "expr" and "call" expression of a channel in channel_exe_cmd()?
+- give an error for "echo Func()" if Func() does not return anything.
+- Using "windo echo expr" does not accept a line break inside "expr" (in a
+  :def function and at script level in a not executed block). #7681
+
+Once Vim9 is stable:
+- Change the help to prefer Vim9 syntax where appropriate
+- Use Vim9 for runtime files.
+    PR #7497 for autoload/ccomplete.vim
+- Add all the error numbers in a good place in documentation.
+- In the generic eval docs, point out the Vim9 syntax where it differs.
+
+Also for Vim9:
 - better implementation for partial and tests for that.
 - Make "g:imported = Export.exported" work in Vim9 script.
 - Make Foo.Bar() work to call the dict function. (#5676)
 - Error in any command in "vim9script" aborts sourcing.
 - Find a way to test expressions in legacy and Vim9 script without duplication
-- Test each level of expressions properly, with type checking
 - Test try/catch and throw better, also nested.
-  Test return inside try/finally jumps to finally and then returns.
-- Test: Function declared inside a :def function is local, disappears at the
-  end of the function.  Unless g: is used, just like with variables.
-- implement :type
-- import type declaration?
+  Test that return inside try/finally jumps to finally and then returns.
+- Test that a function defined inside a :def function is local to that
+  function, g: functions can be defined and script-local functions cannot be
+  defined.
+- compile options that are an expression, e.g. "expr:" in 'spellsuggest',
+  'foldexpr', 'foldtext', 'printexpr', 'diffexpr', 'patchexpr', 'charconvert',
+  'balloonexpr', 'includeexpr', 'indentexpr', 'formatexpr'.
+  Give an error if compilation fails. (#7625)
+  Use the location where the option was set for deciding whether it's to be
+  evaluated in Vim9 script context.
+- implement :type; import type declaration.
+- implement enum;  import enum.
 - Future work: See |vim9-classes|
-- implement enum
-- Make accessing varargs faster: arg[expr]
-	EVAL expr
-	LOADVARARG (varags idx)
+	Define the keywords and commands to make sure it will be backwards
+	compatible.
 - Make debugging work - at least per function.  Need to recompile a function
   to step through it line-by-line?  Evaluate the stack and variables on the
   stack?
-- Make profiling work - Add ISN_PROFILE instructions after every line?
 - List commands when 'verbose' is set or :verbose is used.
-Further improvements:
-- compile options that are an expression, e.g. "expr:" in 'spellsuggest',
-  'foldexpr', 'foldtext', 'printexpr', 'diffexpr', 'patchexpr', 'charconvert',
-  'balloonexpr', 'includeexpr', 'indentexpr', 'formatexpr'.
-- Make inline function work, to be used as a funcref:
-	let ref = def(arg: type): rettype
-	    body
-	enddef
+
+Further Vim9 improvements, possibly after launch:
+- For range: make table of first ASCII character with flag to quickly check if
+  it can be a Vim9 command. E.g. "+" can, but "." can't.
 - compile get_lambda_tv() in popup_add_timeout()
 - inline call to map() and filter()
-- compile "skip" argument of searchpair()
-- compile "expr" and "call" expression of a channel in channel_exe_cmd()?
+- Make accessing varargs faster: arg[expr]
+	EVAL expr
+	LOADVARARG (varargs idx)
+
 
 Popup windows:
 - Add a flag to make a popup window focusable?
@@ -161,7 +159,6 @@
 	     current window.
     ? - switch between current window and all popup windows
     Esc in popup window goes back to previous current window
-- Cursor not updated before a redraw, making it jump. (#5943)
 - Add a termcap entry for changing the cursor when it goes under the popup and
   back.  like t_SI and t_EI  (t_SU and t_EU, where "U" means under?)
 - With terminal in popup, allow for popup_hide() to temporarily hide it.?
@@ -186,11 +183,17 @@
 - Figure out the size and position better if wrapping inserts indent
 
 Text properties:
+- 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
+  "cc". (#7737)  "C" works OK.
 - :goto does not go to the right place when text properties are present.
   (#5930)
 - "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:
@@ -225,6 +228,7 @@
   with another Vim instance.
 
 Terminal emulator window:
+- Can escape a terminal popup with win_gotoid(), should be an error
 - No support for underline color, t_8u.
 - When in terminal-Normal mode when the job finishes, the cursor jumps to the
   end but the window is not updated.  This only happens when typing "a".
@@ -277,9 +281,15 @@
 Patch to implement the vimtutor with a plugin: #6414
 Was originally written by Felipe Morales.
 
+Adding "10" to 'spellsuggest' causes spell suggestions to become very slow.
+(#4087)  Did patch 8.2.2379 help?
+
+Patch to find Python dll using registry key. (#7540)
+
 Remove SPACE_IN_FILENAME ? It is only used for completion.
 
-Patch to use collation based sorting. (Christian Brabandt, #6229)
+Making breakat support multibyte characters (Yasuhiro Matsumoto, #6598)
+Scroll doesn't work correctly, why?
 
 Add 'termguiattr' option, use "gui=" attributes in the terminal?  Would work
 with 'termguicolors'. #1740
@@ -295,15 +305,24 @@
 This is useful e.g. when a popup was created that disables mappings, we need
 to return from vgetc() to make this happen.  #7011
 
-Making breakat support multibyte characters (Yasuhiro Matsumoto, #6598)
-Scroll doesn't work correctly, why?
-
 Expanding <mods> should put the tab number from cmdmod.tab before "tab".
 Any way to convert "$" back by using a special value? (#6901)
 
 Can we detect true color support?  https://gist.github.com/XVilka/8346728
 Try setting a color then request the current color, like using t_u7.
 
+Regexp to search for duplicate lines does not work correctly:
+/\(^.*\n\)\1  (Chris Morgan, #6239)
+
+Changing a capturing group to non-capturing changes the result: #7607
+    :echo matchstr('aaa bbb', '\(.\{-1,}\>\)\|.*')
+    aaa
+    :echo matchstr('aaa bbb', '\%(.\{-1,}\>\)\|.*')
+    aaa bbb
+Should also work without any group:
+    :echo matchstr('aaa bbb', '.\{-1,}\>\|.*')
+    aaa bbb  (should be aaa)
+
 Check out PR #543 (Roland Puntaier).
 Patch for multibyte characters in langmap and applying a mapping on them.
 (Christian Brabandt, 2015 Jun 12, update July 25)
@@ -326,6 +345,9 @@
     BufIsRenamed  (after buffer ID gets another name)
 The buffer list and windows are locked, no changes possible
 
+Add a ModeChanged autocommand that has an argument indicating the old and new
+mode, as what's returned from mode().  Also used for switching Terminal mode.
+
 Matchparen doesn't remove highlight after undo. (#7054)
 Is OK when syntax HL is active.
 
@@ -348,6 +370,8 @@
 
 Why does Test_invalid_sid() not work in the GUI?
 
+":pedit" ignores the local working directory when 'pvp' is set (#7267)
+
 Lua: updating wrong buffer when using newly created, unloaded buffer.
 (#6539)
 
@@ -384,9 +408,6 @@
 When 'lazyredraw' is set sometimes the title is not updated.
 (Jason Franklin, 2020 Feb 3)  Looks like a race condition.
 
-Regexp to search for duplicate lines does not work correctly:
-/\(^.*\n\)\1  (Chris Morgan, #6239)
-
 With bash ":make" does not set v:shell_error.  Possible solution: set
 'shellpipe' to "2>&1| tee %s; exit ${PIPESTATUS[0]}"  #5994
 
@@ -417,9 +438,6 @@
 
 Wrong error when using local arglist. (Harm te Hennepe, #6133)
 
-Request to support <Cmd> in mappings, similar to how Neovim does this.
-(Daniel Hahler, #4784)
-
 Test loose_clipboard() by selecting text before suspending.
 
 Undo puts cursor in wrong line after "cG<Esc>" undo.
@@ -441,9 +459,6 @@
 remains equal?  Then %argdel to clean it up.  Do try this with 'hidden' set.
 Also #5326: netrw buffers are not restored.
 
-Alternate file is not set in the session file.  Use setwintabvar("@#") ?
-(#6714)
-
 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)
 
@@ -461,9 +476,6 @@
 that entry is used.  But instead it's always added. (#6210)
 Add flag AL_FIND_ADD, if there is one argument find it in the list.
 
-Adding "10" to 'spellsuggest' causes spell suggestions to become very slow.
-(#4087)
-
 behavior of i_CTRl-R_CTRL-R differs from documentation. (Paul Desmond Parker,
 #5771)
 
@@ -538,14 +550,6 @@
 gvim window (with focus follows mouse), then the K_FOCUSLOST key is put in the
 input buffer. (#5302)
 
-xterm should be able to pass focus changes to Vim, so that Vim can check for
-buffers that changed.  Perhaps in misc.c, function selectwindow().
-Xterm 224 supports it!
-Patch to make FocusGained and FocusLost work in modern terminals. (Hayaki
-Saito, 2013 Apr 24) Update 2016 Aug 12.
-Also see issue #609.
-We could add the enable/disable sequences to t_ti/t_te or t_ks/t_ke.
-
 :buffer completion does not escape "+" properly and results in a regexp error.
 (#5467)
 
@@ -667,6 +671,38 @@
 'sessionoptions', making it impossible to have a session with a relative path.
 (#4450)
 
+Session file only contains local option values for buffers that are in a
+window, not other buffers. (#7532)
+
+Script generated by :mksession does not work well if there are windows with
+modified buffers
+  change "silent only" into "silent only!"
+  change "edit fname" of first buffer to "hide edit fname"
+  skip "badd fname" if "fname" is already in the buffer list
+  remove remark about unloading buffers from documentation
+
+When session file has name in argument list but the buffer was deleted, the
+buffer is not deleted when using the session file. (#1393)
+Should add the buffer in hidden state.
+
+When a session file is created and there are "nofile" buffers, these are not
+filled.  Need to trigger BufReadCmd autocommands.  Also handle deleting the
+initial empty buffer better. (ZyX, 2015 March 8)
+
+Setting the spell file in a session only reads the local additions, not the
+normal spell file. (Enno Nagel, 2014 Mar 29)
+
+Directory wrong in session file, caused by ":lcd" in BufEnter autocommand.
+(Felix Kater, 2009 Mar 3)
+
+Something wrong with session that has "cd" commands and "badd", in such a way
+that Vim doesn't find the edited file in the buffer list, causing the
+ATTENTION message?  (Tony Mechelynck, 2008 Dec 1)
+Also: swap files are in ~/tmp/  One has relative file name ".mozilla/...".
+
+'foldcolumn' in modeline applied to wrong window when using a session. (Teemu
+Likonen, March 19)
+
 When using a timer callback vgetc_busy is reset, allowing for using input().
 But in a channel callback this does not happen.  We need to do something
 similar to check_due_timer().  Also see #3809.
@@ -773,6 +809,7 @@
 
 Add buffer argument to undotree(). (#4001)
 
+Memory leak in test_debugger
 Using uninitialized value in test_crypt (can't explain why).
 Memory leak in test_terminal_fail
 TODO: be able to run all parts of test_alot with valgrind separately
@@ -855,13 +892,6 @@
 Win32 key codes are messy.  Mike Williams tried to fix that, but now old
 mappings no longer work.  Create a new terminal for the better solution?
 
-Script generated by :mksession does not work well if there are windows with
-modified buffers
-  change "silent only" into "silent only!"
-  change "edit fname" of first buffer to "hide edit fname"
-  skip "badd fname" if "fname" is already in the buffer list
-  remove remark about unloading buffers from documentation
-
 Compiler warnings (geeknik, 2017 Oct 26):
 - signed integer overflow in do_sub() (#2249)
 - signed integer overflow in get_address() (#2248)
@@ -903,9 +933,6 @@
 or asyncmake:
   https://github.com/yegappan/asyncmake
 
-Add a ModeChanged autocommand that has an argument indicating the old and new
-mode, as what's returned from mode().  Also used for switching Terminal mode.
-
 Add an option with file patterns, to be used when unloading a buffer: If there
 is a match, remove entries for the buffer from marks, jumplist, etc.  To be
 used for git temp files.
@@ -1067,7 +1094,7 @@
 Patch for improving detecting Ruby on Mac in configure. (Ilya Mikhaltsou, 2017
 Nov 21)
 
-When t_Co is changed from termresponse, the OptionSet autocmmand event isn't
+When t_Co is changed from termresponse, the OptionSet autocommand event isn't
 triggered.  Use the code from the end of set_num_option() in
 set_color_count().
 
@@ -1126,7 +1153,7 @@
 #2089)  Patch with possible solution by Björn Linse.
 
 The change list index is local to a buffer, but it doesn't make sense using it
-for another buffer.  (lacygoll) Copy w_changelistidx to wininfo_S and back.
+for another buffer.  (lacygoill) Copy w_changelistidx to wininfo_S and back.
 
 X11: Putting more than about 262040 characters of text on the clipboard and
 pasting it in another Vim doesn't work.  (Dominique Pelle, 2008 Aug 21-23)
@@ -1233,10 +1260,6 @@
 import can't be used in define option when include matches too.
 (Romain Lafourcade, 2017 Jun 18, #1519)
 
-When session file has name in argument list but the buffer was deleted, the
-buffer is not deleted when using the session file. (#1393)
-Should add the buffer in hidden state.
-
 Wrong diff highlighting with three files. (2016 Oct 20, #1186)
 Also get E749 on exit.
 Another example in #1309
@@ -1292,9 +1315,6 @@
 about /S and /D options (Ken Takata, 2016 Apr 13)
 Or point to nightly builds: https://github.com/vim/vim-win32-installer/releases
 
-Problem passing non-UTF-8 strings to Python 3. (Björn Linse, 2016 Sep 11,
-#1053)  With patch, does it work?
-
 ":sbr" docs state it respects 'switchbuf', but "vsplit" does not cause a
 vertical split. (Haldean Brown, 2017 Mar 1)
 
@@ -1352,6 +1372,9 @@
 sort() is not stable when using numeric/float sort (Nikolay Pavlov, 2016 Sep
 4#1038)
 
+sort() does not use 'smartcase' for the skip pattern, even though 'ignorecase'
+is used. (Filipe Brandenburger, #7322)
+
 +channel:
 - Add a in_cb, invoked when the write buffer has become empty. (Matteo Landi)
 - Add ch_readlines(): for a channel in NL mode, reads as many lines as are
@@ -1695,10 +1718,6 @@
 
 Patch to add a "literal" argument to bufnr().  (Olaf Dabrunz, 2015 Aug 4)
 
-When a session file is created and there are "nofile" buffers, these are not
-filled.  Need to trigger BufReadCmd autocommands.  Also handle deleting the
-initial empty buffer better. (ZyX, 2015 March 8)
-
 Extended file attributes lost on write (backupcopy=no).  Issue 306.
 
 Patch to add :lockjumps. (Carlo Baldassi, 2015 May 25)
@@ -1827,9 +1846,6 @@
 - Development work on plugins (although diff with distributed version would be
   useful).
 
-Setting the spell file in a session only reads the local additions, not the
-normal spell file. (Enno Nagel, 2014 Mar 29)
-
 When typing the first character of a command, e.g. "f", then using a menu, the
 menu item doesn't work.  Clear typeahead when using a menu?
 
@@ -2297,7 +2313,7 @@
 
 CreateFile and CreateFileW are used without sharing, filewritable() fails when
 the file was already open (e.g. script is being sourced).  Add FILE_SHARE_READ|
-FILE_SHARE_WRITE in mch_access()? (Phillippe Vaucher, 2010 Nov 2)
+FILE_SHARE_WRITE in mch_access()? (Philippe Vaucher, 2010 Nov 2)
 
 Is ~/bin (literally) in $PATH supposed to work?  (Paul, 2010 March 29)
 Looks like only bash can do it. (Yakov Lerner)
@@ -2478,9 +2494,6 @@
 height.  Also happens when there is another window in the frame, if it's not
 very high. (Yegappan Lakshmanan, 2010 Jul 22, Michael Peeters, 2010 Jul 22)
 
-Directory wrong in session file, caused by ":lcd" in BufEnter autocommand.
-(Felix Kater, 2009 Mar 3)
-
 Session file generates error upon loading, cause by --remote-silent-tab.
 (7tommm (ytommm) 2010 Nov 24)
 
@@ -2540,11 +2553,6 @@
 "gqip" in Insert mode has an off-by-one error, causing it to reflow text.
 (Raul Coronado, 2009 Nov 2)
 
-Something wrong with session that has "cd" commands and "badd", in such a way
-that Vim doesn't find the edited file in the buffer list, causing the
-ATTENTION message?  (Tony Mechelynck, 2008 Dec 1)
-Also: swap files are in ~/tmp/  One has relative file name ".mozilla/...".
-
 MS-Windows: editing the first, empty buffer, 'ffs' set to "unix,dos", ":enew"
 doesn't set 'ff' to "unix".  (Ben Fritz, 2008 Dec 5) Reusing the old buffer
 probably causes this.
@@ -2741,9 +2749,6 @@
 ":echoe" in catch block stops processing, while this doesn't happen outside of
 a catch block. (ZyX, 2011 Jun 2)
 
-'foldcolumn' in modeline applied to wrong window when using a session. (Teemu
-Likonen, March 19)
-
 Test 54 uses shell commands, that doesn't work on non-Unix systems.  Use some
 other way to test buffer-local autocommands.
 
@@ -4014,8 +4019,6 @@
     - if it can be undone (u/CTRL-R) and redone (.)
     - how it works for folded lines
     - how it works with multibyte characters
-9   In change.txt, remark about Javadoc isn't right.  Right alignment would
-    work too.
 8   Spread the windows commands over the other files.  For example, ":stag"
     should be with ":tag".  Cross-link with tags to avoid too much double
     text.
@@ -5472,7 +5475,7 @@
     not the <Space>.
 8   Give a warning when using CTRL-C in the lhs of a mapping.  It will never
     (?) work.
-7   Add <0x8f> (hex), <033> (octal) and <123> (decimal) to <> notation?
+7   Add <0x8f> (hex), <0o33> (octal) and <123> (decimal) to <> notation?
 7   When someone tries to unmap with a trailing space, and it fails, try
     unmapping without the trailing space.  Helps for ":unmap xx | unmap yy".
 6   Context-sensitive abbreviations: Specify syntax group(s) in which the
@@ -5933,7 +5936,7 @@
     losing the original when writing twice. (Slootman)
 7   On non-Unix machines, also overwrite the original file in some situations
     (file system full, it's a link on an NFS partition).
-7   When editing a file, check that it has been change outside of Vim more
+7   When editing a file, check that it has been changed outside of Vim more
     often, not only when writing over it.  E.g., at the time the swap file is
     flushed.  Or every ten seconds or so (use the time of day, check it before
     waiting for a character to be typed).
diff -Nru vim-8.2.1913/runtime/doc/undo.txt vim-8.2.2434/runtime/doc/undo.txt
--- vim-8.2.1913/runtime/doc/undo.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/undo.txt	2021-01-30 22:05:11.000000000 +0000
@@ -1,4 +1,4 @@
-*undo.txt*      For Vim version 8.2.  Last change: 2020 Oct 18
+*undo.txt*      For Vim version 8.2.  Last change: 2020 Nov 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -65,9 +65,9 @@
 the redo will not be possible anymore.
 
 'u' included, the Vi-compatible way:
-The undo command undoes the previous change, and also the previous undo command.
-The redo command repeats the previous undo command.  It does NOT repeat a
-change command, use "." for that.
+The undo command undoes the previous change, and also the previous undo
+command.  The redo command repeats the previous undo command.  It does NOT
+repeat a change command, use "." for that.
 
 Examples	Vim way			Vi-compatible way	~
 "uu"		two times undo		no-op
@@ -103,7 +103,7 @@
 
 	:undojoin | delete
 
-After this an "u" command will undo the delete command and the previous
+After this a "u" command will undo the delete command and the previous
 change.
 
 To do the opposite, break a change into two undo blocks, in Insert mode use
diff -Nru vim-8.2.1913/runtime/doc/usr_03.txt vim-8.2.2434/runtime/doc/usr_03.txt
--- vim-8.2.1913/runtime/doc/usr_03.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/usr_03.txt	2021-01-30 22:05:11.000000000 +0000
@@ -50,7 +50,7 @@
 
 	This is a line with example text ~
 	   <----<----x---->------------>
-	   2ge   ge     e       we
+	   2ge   ge     e       2e
 
 If you are at the last word of a line, the "w" command will take you to the
 first word in the next line.  Thus you can use this to move through a
diff -Nru vim-8.2.1913/runtime/doc/usr_23.txt vim-8.2.2434/runtime/doc/usr_23.txt
--- vim-8.2.1913/runtime/doc/usr_23.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/usr_23.txt	2021-01-30 22:05:11.000000000 +0000
@@ -1,4 +1,4 @@
-*usr_23.txt*	For Vim version 8.2.  Last change: 2006 Apr 24
+*usr_23.txt*	For Vim version 8.2.  Last change: 2020 Dec 19
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -28,9 +28,9 @@
 (carriage return, <CR>), another to move the paper up (line feed, <LF>).
    When computers came out, storage was expensive.  Some people decided that
 they did not need two characters for end-of-line.  The UNIX people decided
-they could use <Line Feed> only for end-of-line.  The Apple people
-standardized on <CR>.  The Microsoft Windows folks decided to keep
-the old <CR><LF>.
+they could use <New Line> or <NL> only for end-of-line.  The Apple people
+standardized on <CR>.  The Microsoft Windows folks decided to keep the old
+<CR><NL> (we use <NL> for line feed in the help text).
    This means that if you try to move a file from one system to another, you
 have line-break problems.  The Vim editor automatically recognizes the
 different file formats and handles things properly behind your back.
@@ -55,20 +55,20 @@
 
 The three names that Vim uses are:
 
-	unix		<LF>
-	dos		<CR><LF>
+	unix		<NL>
+	dos		<CR><NL>
 	mac		<CR>
 
 
 USING THE MAC FORMAT
 
-On Unix, <LF> is used to break a line.  It's not unusual to have a <CR>
+On Unix, <NL> is used to break a line.  It's not unusual to have a <CR>
 character halfway a line.  Incidentally, this happens quite often in Vi (and
 Vim) scripts.
    On the Macintosh, where <CR> is the line break character, it's possible to
-have a <LF> character halfway a line.
+have a <NL> character halfway a line.
    The result is that it's not possible to be 100% sure whether a file
-containing both <CR> and <LF> characters is a Mac or a Unix file.  Therefore,
+containing both <CR> and <NL> characters is a Mac or a Unix file.  Therefore,
 Vim assumes that on Unix you probably won't edit a Mac file, and doesn't check
 for this type of file.  To check for this format anyway, add "mac" to
 'fileformats': >
diff -Nru vim-8.2.1913/runtime/doc/usr_41.txt vim-8.2.2434/runtime/doc/usr_41.txt
--- vim-8.2.1913/runtime/doc/usr_41.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/usr_41.txt	2021-01-30 22:05:11.000000000 +0000
@@ -1,4 +1,4 @@
-*usr_41.txt*	For Vim version 8.2.  Last change: 2020 Aug 30
+*usr_41.txt*	For Vim version 8.2.  Last change: 2021 Jan 13
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -122,14 +122,14 @@
 decimal number, it will be interpreted as an octal number!
    The ":echo" command always prints decimal numbers.  Example: >
 
-	:echo 0x7f 036
+	:echo 0x7f 0o36
 <	127 30 ~
 
 A number is made negative with a minus sign.  This also works for hexadecimal,
 octal and binary numbers.  A minus sign is also used for subtraction.  Compare
 this with the previous example: >
 
-	:echo 0x7f -036
+	:echo 0x7f -0o36
 <	97 ~
 
 White space in an expression is ignored.  However, it's recommended to use it
@@ -137,7 +137,7 @@
 avoid the confusion with a negative number above, put a space between the
 minus sign and the following number: >
 
-	:echo 0x7f - 036
+	:echo 0x7f - 0o36
 
 ==============================================================================
 *41.2*	Variables
@@ -619,12 +619,15 @@
 	submatch()		get a specific match in ":s" and substitute()
 	strpart()		get part of a string using byte index
 	strcharpart()		get part of a string using char index
+	slice()			take a slice of a string, using char index in
+				Vim9 script
 	strgetchar()		get character from a string using char index
 	expand()		expand special keywords
 	expandcmd()		expand a command like done for `:edit`
 	iconv()			convert text from one encoding to another
 	byteidx()		byte index of a character in a string
 	byteidxcomp()		like byteidx() but count composing characters
+	charidx()		character index of a byte in a string
 	repeat()		repeat a string multiple times
 	eval()			evaluate a string expression
 	execute()		execute an Ex command and get the output
@@ -639,12 +642,15 @@
 	insert()		insert an item somewhere in a List
 	add()			append an item to a List
 	extend()		append a List to a List
+	extendnew()		make a new List and append items
 	remove()		remove one or more items from a List
 	copy()			make a shallow copy of a List
 	deepcopy()		make a full copy of a List
 	filter()		remove selected items from a List
 	map()			change each List item
+	mapnew()		make a new List with changed items
 	reduce()		reduce a List to a value
+	slice()			take a slice of a List
 	sort()			sort a List
 	reverse()		reverse the order of a List
 	uniq()			remove copies of repeated adjacent items
@@ -667,8 +673,10 @@
 	empty()			check if Dictionary is empty
 	remove()		remove an entry from a Dictionary
 	extend()		add entries from one Dictionary to another
+	extendnew()		make a new Dictionary and append items
 	filter()		remove selected entries from a Dictionary
 	map()			change each Dictionary entry
+	mapnew()		make a new Dictionary with changed items
 	keys()			get List of Dictionary keys
 	values()		get List of Dictionary values
 	items()			get List of Dictionary key-value pairs
@@ -715,7 +723,8 @@
 	srand()			initialize seed used by rand()
 
 Variables:						*var-functions*
-	type()			type of a variable
+	type()			type of a variable as a number
+	typename()		type of a variable as text
 	islocked()		check if a variable is locked
 	funcref()		get a Funcref for a function reference
 	function()		get a Funcref for a function name
@@ -750,6 +759,11 @@
 	screenchar()		get character code at a screen line/row
 	screenchars()		get character codes at a screen line/row
 	screenstring()		get string of characters at a screen line/row
+	charcol()		character number of the cursor or a mark
+	getcharpos()		get character position of cursor, mark, etc.
+	setcharpos()		set character position of cursor, mark, etc.
+	getcursorcharpos()	get character position of the cursor
+	setcursorcharpos()	set character position of the cursor
 
 Working with text in the current buffer:		*text-functions*
 	getline()		get a line or list of lines from the buffer
@@ -809,6 +823,7 @@
 	setenv()		set an environment variable
 	hostname()		name of the system
 	readfile()		read a file into a List of lines
+	readblob()		read a file into a Blob
 	readdir()		get a List of file names in a directory
 	readdirex()		get a List of file information in a directory
 	writefile()		write a List of lines or Blob into a file
@@ -1763,7 +1778,7 @@
 elsewhere, but form a nice checklist.
 
 The end-of-line character depends on the system.  For Unix a single <NL>
-character is used.  For MS-Windows and the like, <CR><LF> is used.  This is
+character is used.  For MS-Windows and the like, <CR><NL> is used.  This is
 important when using mappings that end in a <CR>.  See |:source_crnl|.
 
 
diff -Nru vim-8.2.1913/runtime/doc/various.txt vim-8.2.2434/runtime/doc/various.txt
--- vim-8.2.1913/runtime/doc/various.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/various.txt	2021-01-30 22:05:11.000000000 +0000
@@ -1,4 +1,4 @@
-*various.txt*   For Vim version 8.2.  Last change: 2020 Aug 20
+*various.txt*   For Vim version 8.2.  Last change: 2021 Jan 16
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -142,15 +142,17 @@
 				quit
 <
 							*:z* *E144*
-:{range}z[+-^.=]{count}	Display several lines of text surrounding the line
-			specified with {range}, or around the current line
-			if there is no {range}.  If there is a {count}, that's
-			how many lines you'll see; if there is no {count} and
-			only one window then twice the value of the 'scroll'
-			option is used, otherwise the current window height
-			minus 3 is used.
+:[range]z[+-^.=][count]	Display several lines of text surrounding the line
+			specified with [range], or around the current line
+			if there is no [range].
+
+			If there is a [count], that's how many lines you'll
+			see; if there is no [count] and only one window then
+			twice the value of the 'scroll' option is used,
+			otherwise the current window height minus 3 is used.
+			This is the value of "scr" in the table below.
 
-			If there is a {count} the 'window' option is set to
+			If there is a [count] the 'window' option is set to
 			its value.
 
 			:z can be used either alone or followed by any of
@@ -168,7 +170,7 @@
 			If the mark is "=", a line of dashes is printed
 			around the current line.
 
-:{range}z#[+-^.=]{count}				*:z#*
+:[range]z#[+-^.=][count]				*:z#*
 			Like ":z", but number the lines.
 
 							*:=*
@@ -409,7 +411,7 @@
 B  *+mouse_sgr*		Unix only: sgr mouse handling |sgr-mouse|
 B  *+mouse_urxvt*	Unix only: urxvt mouse handling |urxvt-mouse|
 N  *+mouse_xterm*	Unix only: xterm mouse handling |xterm-mouse|
-N  *+multi_byte*	16 and 32 bit characters |multibyte|
+T  *+multi_byte*	Unicode support, 16 and 32 bit characters |multibyte|
    *+multi_byte_ime*	Win32 input method for multibyte chars |multibyte-ime|
 N  *+multi_lang*	non-English language support |multi-lang|
 m  *+mzscheme*		Mzscheme interface |mzscheme|
@@ -705,12 +707,12 @@
 			not more than one line.
 
 [N]gs							*gs* *:sl* *:sleep*
-:[N]sl[eep] [N]	[m]	Do nothing for [N] seconds.  When [m] is included,
+:[N]sl[eep] [N][m]	Do nothing for [N] seconds.  When [m] is included,
 			sleep for [N] milliseconds.  The count for "gs" always
 			uses seconds.  The default is one second. >
 			     :sleep	     "sleep for one second
 			     :5sleep	     "sleep for five seconds
-			     :sleep 100m     "sleep for a hundred milliseconds
+			     :sleep 100m     "sleep for 100 milliseconds
 			     10gs	     "sleep for ten seconds
 <			Can be interrupted with CTRL-C (CTRL-Break on
 			MS-Windows).  "gs" stands for "goto sleep".
@@ -720,6 +722,9 @@
 			available when compiled with the |+netbeans_intg|
 			feature}
 
+							*:sl!* *:sleep!*
+:[N]sl[eep]! [N] [m]	Same as above, but hide the cursor
+
 							*:xrestore* *:xr*
 :xr[estore] [display]	Reinitializes the connection to the X11 server. Useful
 			after the X server restarts, e.g. when running Vim for
diff -Nru vim-8.2.1913/runtime/doc/version5.txt vim-8.2.2434/runtime/doc/version5.txt
--- vim-8.2.1913/runtime/doc/version5.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/version5.txt	2021-01-30 22:05:11.000000000 +0000
@@ -1,4 +1,4 @@
-*version5.txt*  For Vim version 8.2.  Last change: 2020 Sep 02
+*version5.txt*  For Vim version 8.2.  Last change: 2020 Dec 19
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -805,7 +805,7 @@
 Unix: Besides using CTRL-C, also use the INTR character from the tty settings.
 Somebody has INTR set to DEL.
 
-Allow a <LF> in a ":help" command argument to end the help command, so another
+Allow a <NL> in a ":help" command argument to end the help command, so another
 command can follow.
 
 Doing "%" on a line that starts with "   #if" didn't jump to matching "#else".
diff -Nru vim-8.2.1913/runtime/doc/version6.txt vim-8.2.2434/runtime/doc/version6.txt
--- vim-8.2.1913/runtime/doc/version6.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/version6.txt	2021-01-30 22:05:11.000000000 +0000
@@ -1331,7 +1331,7 @@
 executable()	Checks if a program or batch script can be executed.
 filewritable()	Checks if a file can be written. (Ron Aaron)
 foldclosed()	Find out if there is a closed fold. (Johannes Zellner).
-foldcloseend()	Find the end of a closed fold.
+foldclosedend()	Find the end of a closed fold.
 foldlevel()	Find out the foldlevel. (Johannes Zellner)
 foreground()	Move the GUI window to the foreground.
 getchar()	Get one character from the user.  Can be used to define a
@@ -9661,7 +9661,7 @@
 Files:	    src/os_unix.c
 
 Patch 6.2f.018
-Problem:    Mac OS X 10.2: OK is defined to zero in cursus.h while Vim uses
+Problem:    Mac OS X 10.2: OK is defined to zero in curses.h while Vim uses
 	    one.  Redefining it causes a warning message.
 Solution:   Undefine OK before defining it to one. (Taro Muraoka)
 Files:	    src/vim.h
diff -Nru vim-8.2.1913/runtime/doc/version8.txt vim-8.2.2434/runtime/doc/version8.txt
--- vim-8.2.1913/runtime/doc/version8.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/version8.txt	2021-01-30 22:05:11.000000000 +0000
@@ -1,4 +1,4 @@
-*version8.txt*  For Vim version 8.2.  Last change: 2020 Oct 25
+*version8.txt*  For Vim version 8.2.  Last change: 2020 Dec 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -76,7 +76,7 @@
 Also asynchronous are timers.  They can fire once or repeatedly and invoke a
 function to do any work.  For example: >
 	let tempTimer = timer_start(4000, 'CheckTemp')
-This will call the CheckTemp() function four seconds (4000 milli seconds)
+This will call the CheckTemp() function four seconds (4000 milliseconds)
 later.  See |timer_start()|.
 
 
@@ -3282,7 +3282,7 @@
 Files:	    src/os_mswin.c
 
 Patch 7.4.472
-Problem:    The "precedes" entry in 'listchar' will be drawn when 'showbreak'
+Problem:    The "precedes" entry in 'listchars' will be drawn when 'showbreak'
 	    is set and 'list' is not.
 Solution:   Only draw this character when 'list' is on. (Christian Brabandt)
 Files:	    src/screen.c
@@ -35835,7 +35835,7 @@
 Patch 8.1.1592
 Problem:    May start file dialog while exiting.
 Solution:   Ignore the "browse" modifier when exiting. (Ozaki Kiichi,
-            closes #4582
+            closes #4582)
 Files:	    src/ex_cmds.c, src/terminal.c
 
 Patch 8.1.1593
@@ -42557,7 +42557,7 @@
             src/testdir/dumps/Test_statusline_1.dump
 
 Patch 8.2.0236
-Problem:    MS-Windows uninstall doesn't delete vimtutur.bat.
+Problem:    MS-Windows uninstall doesn't delete vimtutor.bat.
 Solution:   Change directory before deletion. (Ken Takata, closes #5603)
 Files:      src/uninstall.c
 
@@ -46431,7 +46431,7 @@
 
 Patch 8.2.0854
 Problem:    Xxd cannot show offset as a decimal number.
-Solution:   Add the "-d" flag. (Aapo Rantalainen, closes #5616
+Solution:   Add the "-d" flag. (Aapo Rantalainen, closes #5616)
 Files:      src/testdir/test_xxd.vim, src/xxd/xxd.c
 
 Patch 8.2.0855
@@ -46661,7 +46661,7 @@
 Files:      src/gui_xim.c
 
 Patch 8.2.0890
-Problem:    No color in terminal window when 'termguicolor' is set.
+Problem:    No color in terminal window when 'termguicolors' is set.
 Solution:   Clear the underline color. (closes #6186)
 Files:      src/highlight.c
 
@@ -46728,7 +46728,7 @@
 
 Patch 8.2.0902
 Problem:    Using searchcount() in 'statusline' causes an error.
-Solution:   Avoid saving/restoring the search patten recursively.
+Solution:   Avoid saving/restoring the search pattern recursively.
             (closes #6194)
 Files:      src/search.c, src/testdir/test_search_stat.vim,
             src/testdir/dumps/Test_searchstat_4.dump
@@ -48832,7 +48832,7 @@
 Patch 8.2.1260
 Problem:    There is no good test for CursorHold.
 Solution:   Add a test.  Remove duplicated test. (Yegappan Lakshmanan,
-            closes #6503
+            closes #6503)
 Files:      src/testdir/test_autocmd.vim, src/testdir/test_buffer.vim,
             src/testdir/test_normal.vim
 
diff -Nru vim-8.2.1913/runtime/doc/vi_diff.txt vim-8.2.2434/runtime/doc/vi_diff.txt
--- vim-8.2.1913/runtime/doc/vi_diff.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/vi_diff.txt	2021-01-30 22:05:11.000000000 +0000
@@ -1,4 +1,4 @@
-*vi_diff.txt*   For Vim version 8.2.  Last change: 2020 Aug 15
+*vi_diff.txt*   For Vim version 8.2.  Last change: 2021 Jan 21
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -73,7 +73,7 @@
 Vim has only a few limits for the files that can be edited {Vi: can not handle
 <Nul> characters and characters above 128, has limited line length, many other
 limits}.
-							*E340*
+
 Maximum line length	   2147483647 characters.  Longer lines are split.
 Maximum number of lines	   2147483647 lines.
 Maximum file size	   2147483647 bytes (2 Gbyte) when a long integer is
diff -Nru vim-8.2.1913/runtime/doc/vim.1 vim-8.2.2434/runtime/doc/vim.1
--- vim-8.2.1913/runtime/doc/vim.1	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/vim.1	2021-01-30 22:05:11.000000000 +0000
@@ -459,6 +459,9 @@
 \-\-socketid {id}
 GTK GUI only: Use the GtkPlug mechanism to run gvim in another window.
 .TP
+\-\-startuptime {file}
+During startup write timing messages to the file {fname}.
+.TP
 \-\-version
 Print version information and exit.
 .SH ON-LINE HELP
diff -Nru vim-8.2.1913/runtime/doc/vim9.txt vim-8.2.2434/runtime/doc/vim9.txt
--- vim-8.2.1913/runtime/doc/vim9.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/vim9.txt	2021-01-30 22:05:11.000000000 +0000
@@ -1,4 +1,4 @@
-*vim9.txt*	For Vim version 8.2.  Last change: 2020 Oct 17
+*vim9.txt*	For Vim version 8.2.  Last change: 2021 Jan 23
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -6,7 +6,7 @@
 
 THIS IS STILL UNDER DEVELOPMENT - ANYTHING CAN BREAK - ANYTHING CAN CHANGE
 
-Vim9 script commands and expressions.			*vim9*
+Vim9 script commands and expressions.			*Vim9* *vim9*
 
 Most expression help is in |eval.txt|.  This file is about the new syntax and
 features in Vim9 script.
@@ -14,7 +14,7 @@
 THIS IS STILL UNDER DEVELOPMENT - ANYTHING CAN BREAK - ANYTHING CAN CHANGE
 
 
-1.  What is Vim9 script?		|vim9-script|
+1.  What is Vim9 script?		|Vim9-script|
 2.  Differences				|vim9-differences|
 3.  New style functions			|fast-functions|
 4.  Types				|vim9-types|
@@ -25,7 +25,7 @@
 
 ==============================================================================
 
-1. What is Vim9 script?					*vim9-script*
+1. What is Vim9 script?					*Vim9-script*
 
 THIS IS STILL UNDER DEVELOPMENT - ANYTHING CAN BREAK - ANYTHING CAN CHANGE
 
@@ -52,8 +52,9 @@
 - a script file where the first command is `vim9script`
 - an autocommand defined in the context of the above
 
-When using `:function` in a Vim9 script file the legacy syntax is used.
-However, this can be confusing and is therefore discouraged.
+When using `:function` in a Vim9 script file the legacy syntax is used, with
+the highest |scriptversion|.  However, this can be confusing and is therefore
+discouraged.
 
 Vim9 script and legacy Vim script can be mixed.  There is no requirement to
 rewrite old scripts, they keep working as before.  You may want to use a few
@@ -70,28 +71,29 @@
 Brief summary of the differences you will most often encounter when using Vim9
 script and `:def` functions; details are below:
 - Comments start with #, not ": >
-  	echo "hello"   # comment
+	echo "hello"   # comment
 - Using a backslash for line continuation is hardly ever needed: >
-  	echo "hello "
+	echo "hello "
 	     .. yourName
 	     .. ", how are you?"
 - White space is required in many places.
 - Assign values without `:let`, declare variables with `:var`: >
-  	var count = 0
+	var count = 0
 	count += 3
 - Constants can be declared with `:final` and `:const`: >
-  	final matches = []		  # add matches
+	final matches = []		  # add matches
 	const names = ['Betty', 'Peter']  # cannot be changed
 - `:final` cannot be used as an abbreviation of `:finally`.
 - Variables and functions are script-local by default.
 - Functions are declared with argument types and return type: >
 	def CallMe(count: number, message: string): bool
 - Call functions without `:call`: >
-  	writefile(['done'], 'file.txt')
+	writefile(['done'], 'file.txt')
 - You cannot use `:xit`, `:t`, `:append`, `:change`, `:insert` or curly-braces
   names.
 - A range before a command must be prefixed with a colon: >
-  	:%s/this/that
+	:%s/this/that
+- Unless mentioned specifically, the highest |scriptversion| is used.
 
 
 Comments starting with # ~
@@ -112,8 +114,13 @@
 	101 number
 
 To improve readability there must be a space between a command and the #
-that starts a comment.  Note that #{ is the start of a dictionary, therefore
-it does not start a comment.
+that starts a comment: >
+	var name = value # comment
+	var name = value# error!
+
+In legacy Vim script # is also used for the alternate file name.  In Vim9
+script you need to use %% instead.  Instead of ## use %%% (stands for all
+arguments).
 
 
 Vim9 functions ~
@@ -124,8 +131,8 @@
 Many errors are already found when compiling, before the function is executed.
 The syntax is strict, to enforce code that is easy to read and understand.
 
-Compilation is done when:
-- the function is first called
+Compilation is done when either of these is encountered:
+- the first time the function is called
 - when the `:defcompile` command is encountered in the script where the
   function was defined
 - `:disassemble` is used for the function.
@@ -133,8 +140,9 @@
   reference
 
 `:def` has no options like `:function` does: "range", "abort", "dict" or
-"closure".  A `:def` function always aborts on an error, does not get a range
-passed and cannot be a "dict" function.
+"closure".  A `:def` function always aborts on an error (unless `:silent!` was
+used for the command or inside a `:try` block), does not get a range passed
+cannot be a "dict" function, and can always be a closure.
 
 The argument types and return type need to be specified.  The "any" type can
 be used, type checking will then be done at runtime, like with legacy
@@ -187,6 +195,33 @@
 Vim9 script script-local functions are defined once when the script is sourced
 and cannot be deleted or replaced.
 
+When compiling a function and a function call is encountered for a function
+that is not (yet) defined, the |FuncUndefined| autocommand is not triggered.
+You can use an autoload function if needed, or call a legacy function and have
+|FuncUndefined| triggered there.
+
+
+Reloading a Vim9 script clears functions and variables by default ~
+							*vim9-reload*
+When loading a legacy Vim script a second time nothing is removed, the
+commands will replace existing variables and functions and create new ones.
+
+When loading a Vim9 script a second time all existing script-local functions
+and variables are deleted, thus you start with a clean slate.  This is useful
+if you are developing a plugin and want to try a new version.  If you renamed
+something you don't have to worry about the old name still hanging around.
+
+If you do want to keep items, use: >
+	vim9script noclear
+
+You want to use this in scripts that use a `finish` command to bail out at
+some point when loaded again.  E.g. when a buffer local option is set: >
+	vim9script noclear
+	setlocal completefunc=SomeFunc
+	if exists('*g:SomeFunc') | finish | endif
+	def g:SomeFunc()
+	....
+
 
 Variable declarations with :var, :final and :const ~
 						*vim9-declaration* *:var*
@@ -282,7 +317,7 @@
 	NAMES[0] = ["Jack"]     # Error!
 	NAMES[0][0] = "Jack"    # Error!
 	NAMES[1] = ["Emma"]     # Error!
-	Names[1][0] = "Emma"    # OK, now females[0] == "Emma"
+	NAMES[1][0] = "Emma"    # OK, now females[0] == "Emma"
 
 <							*E1092*
 Declaring more than one variable at a time, using the unpack notation, is
@@ -303,8 +338,7 @@
 	myList->add(123)
 	g:myList->add(123)
 	[1, 2, 3]->Process()
-	#{a: 1, b: 2}->Process()
-	{'a': 1, 'b': 2}->Process()
+	{a: 1, b: 2}->Process()
 	"foobar"->Process()
 	("foobar")->Process()
 	'foobar'->Process()
@@ -336,17 +370,61 @@
 number of arguments and any return type.  The function can be defined later.
 
 
+Lambda using => instead of -> ~
+
+In legacy script there can be confusion between using "->" for a method call
+and for a lambda.  Also, when a "{" is found the parser needs to figure out if
+it is the start of a lambda or a dictionary, which is now more complicated
+because of the use of argument types.
+
+To avoid these problems Vim9 script uses a different syntax for a lambda,
+which is similar to Javascript: >
+	var Lambda = (arg) => expression
+
+No line break is allowed in the arguments of a lambda up to and including the
+"=>".  This is OK: >
+	filter(list, (k, v) =>
+			v > 0)
+This does not work: >
+	filter(list, (k, v)
+			=> v > 0)
+This also does not work: >
+	filter(list, (k,
+			v) => v > 0)
+But you can use a backslash to concatenate the lines before parsing: >
+	filter(list, (k,
+		\	v)
+		\	=> v > 0)
+
+Additionally, a lambda can contain statements in {}: >
+	var Lambda = (arg) => {
+		g:was_called = 'yes'
+		return expression
+	    }
+NOT IMPLEMENTED YET
+
+							*vim9-curly*
+To avoid the "{" of a dictionary literal to be recognized as a statement block
+wrap it in parenthesis: >
+	var Lambda = (arg) => ({key: 42})
+
+Also when confused with the start of a command block: >
+	({
+	    key: value
+	 })->method()
+
+
 Automatic line continuation ~
 
 In many cases it is obvious that an expression continues on the next line.  In
-those cases there is no need to prefix the line with a backslash
-|line-continuation|.  For example, when a list spans multiple lines: >
+those cases there is no need to prefix the line with a backslash (see
+|line-continuation|).  For example, when a list spans multiple lines: >
 	var mylist = [
 		'one',
 		'two',
 		]
 And when a dict spans multiple lines: >
-	var mydict = #{
+	var mydict = {
 		one: 1,
 		two: 2,
 		}
@@ -362,7 +440,7 @@
 		   .. middle
 		   .. end
 	var total = start +
-	            end -
+		    end -
 		    correction
 	var result = positive
 			? PosFunc(arg)
@@ -377,6 +455,12 @@
 	var result = MyDict
 			.member
 
+For commands that have an argument that is a list of commands, the | character
+at the start of the line indicates line continuation: >
+	autocmd BufNewFile *.match if condition
+		|   echo 'match'
+		| endif
+
 <							*E1050*
 To make it possible for the operator at the start of the line to be
 recognized, it is required to put a colon before a range.  This will add
@@ -390,6 +474,9 @@
 	var result = start
 	:+ print
 
+Note that the colon is not required for the |+cmd| argument: >
+	edit +6 fname
+
 It is also possible to split a function header over multiple lines, in between
 arguments: >
 	def MyFunc(
@@ -397,6 +484,19 @@
 		separator = '-'
 		): string
 
+Since a continuation line cannot be easily recognized the parsing of commands
+has been made stricter.  E.g., because of the error in the first line, the
+second line is seen as a separate command: >
+	popup_create(some invalid expression, {
+	   exit_cb: Func})
+Now "exit_cb: Func})" is actually a valid command: save any changes to the
+file "_cb: Func})" and exit.  To avoid this kind of mistake in Vim9 script
+there must be white space between most command names and the argument.
+
+However, the argument of a command that is a command won't be recognized.  For
+example, after "windo echo expr" a line break inside "expr" will not be seen.
+
+
 Notes:
 - "enddef" cannot be used at the start of a continuation line, it ends the
   current function.
@@ -416,20 +516,39 @@
 <  This does not work: >
 	echo [1, 2]
 		[3, 4]
-- No line break is allowed in the arguments of a lambda, between the "{" and
-  "->".  This is OK: >
-	filter(list, {k, v ->
-			v > 0})
-<  This does not work: >
-	filter(list, {k,
-			v -> v > 0})
-
 
 No curly braces expansion ~
 
 |curly-braces-names| cannot be used.
 
 
+Dictionary literals ~
+
+Traditionally Vim has supported dictionary literals with a {} syntax: >
+	let dict = {'key': value}
+
+Later it became clear that using a simple text key is very common, thus
+literal dictionaries were introduced in a backwards compatible way: >
+	let dict = #{key: value}
+
+However, this #{} syntax is unlike any existing language.  As it turns out
+that using a literal key is much more common than using an expression, and
+considering that JavaScript uses this syntax, using the {} form for dictionary
+literals is considered a much more useful syntax.  In Vim9 script the {} form
+uses literal keys: >
+	var dict = {key: value}
+
+This works for alphanumeric characters, underscore and dash.  If you want to
+use another character, use a single or double quoted string: >
+	var dict = {'key with space': value}
+	var dict = {"key\twith\ttabs": value}
+	var dict = {'': value}  		# empty key
+
+In case the key needs to be an expression, square brackets can be used, just
+like in JavaScript: >
+	var dict = {["key" .. nr]: value}
+
+
 No :xit, :t, :append, :change or :insert ~
 
 These commands are too easily confused with local variable names.
@@ -442,6 +561,29 @@
 The 'ignorecase' option is not used for comparators that use strings.
 
 
+For loop ~
+
+Legacy Vim script has some tricks to make a for loop over a list handle
+deleting items at the current or previous item.  In Vim9 script it just uses
+the index, if items are deleted then items in the list will be skipped.
+Example legacy script: >
+	let l = [1, 2, 3, 4]
+	for i in l
+	   echo i
+	   call remove(l, index(l, i))
+	endfor
+Would echo:
+	1
+	2
+	3
+	4
+In compiled Vim9 script you get:
+	1
+	3
+Generally, you should not change the list that is iterated over.  Make a copy
+first if needed.
+
+
 White space ~
 
 Vim9 script enforces proper use of white space.  This is no longer allowed: >
@@ -457,17 +599,26 @@
 
 White space is required around most operators.
 
+White space is required in a sublist (list slice) around the ":", except at
+the start and end: >
+	otherlist = mylist[v : count]  	# v:count has a different meaning
+	otherlist = mylist[:]		# make a copy of the List
+	otherlist = mylist[v :]
+	otherlist = mylist[: v]
+
 White space is not allowed:
 - Between a function name and the "(": >
-	call Func (arg)	   # Error!
-	call Func
+	Func (arg)	   # Error!
+	Func
 	     \ (arg)	   # Error!
-	call Func(arg)	   # OK
-	call Func(
-	     \ arg)	   # OK
-	call Func(
-	     \ arg	   # OK
-	     \ )
+	Func
+	      (arg)	   # Error!
+	Func(arg)	   # OK
+	Func(
+	      arg)	   # OK
+	Func(
+	      arg	   # OK
+	      )
 
 
 Conditions and expressions ~
@@ -487,7 +638,7 @@
 empty list and dict is falsy:
 
 	type		truthy when ~
-	bool		v:true or 1
+	bool		true, v:true or 1
 	number		non-zero
 	float		non-zero
 	string		non-empty
@@ -495,11 +646,11 @@
 	list		non-empty (different from JavaScript)
 	dictionary	non-empty (different from JavaScript)
 	func		when there is a function name
-	special		v:true
+	special		true or v:true
 	job		when not NULL
 	channel		when not NULL
 	class		when not NULL
-	object		when not NULL (TODO: when isTrue() returns v:true)
+	object		when not NULL (TODO: when isTrue() returns true)
 
 The boolean operators "||" and "&&" expect the values to be boolean, zero or
 one: >
@@ -514,25 +665,37 @@
 
 When using "!" for inverting, there is no error for using any type and the
 result is a boolean.  "!!" can be used to turn any value into boolean: >
-	!'yes'	    		== false
+	!'yes'			== false
 	!![]			== false
-	!![1, 2, 3]    		== true
+	!![1, 2, 3]		== true
 
 When using "`.."` for string concatenation arguments of simple types are
 always converted to string: >
 	'hello ' .. 123  == 'hello 123'
-	'hello ' .. v:true  == 'hello v:true'
+	'hello ' .. v:true  == 'hello true'
 
 Simple types are string, float, special and bool.  For other types |string()|
 can be used.
-							*false* *true*
-In Vim9 script one can use "true" for v:true and "false" for v:false.
+							*false* *true* *null*
+In Vim9 script one can use "true" for v:true, "false" for v:false and "null"
+for v:null.  When converting a boolean to a string "false" and "true" are
+used, not "v:false" and "v:true" like in legacy script.  "v:none" is not
+changed, it is only used in JSON and has no equivalent in other languages.
 
-Indexing a string with [idx] or [idx, idx] uses character indexes instead of
+Indexing a string with [idx] or [idx : idx] uses character indexes instead of
 byte indexes. Example: >
 	echo 'bár'[1]
 In legacy script this results in the character 0xc3 (an illegal byte), in Vim9
 script this results in the string 'á'.
+A negative index is counting from the end, "[-1]" is the last character.
+To exclude the last character use |slice()|.
+If the index is out of range then an empty string results.
+
+In legacy script "++var" and "--var" would be silently accepted and have no
+effect.  This is an error in Vim9 script.
+
+Numbers starting with zero are not considered to be octal, only numbers
+starting with "0o" are octal: "0o744". |scriptversion-4|
 
 
 What to watch out for ~
@@ -542,21 +705,22 @@
 be made.  Here is a summary of what might be unexpected.
 
 Ex command ranges need to be prefixed with a colon. >
-	->		# legacy Vim: shifts the previous line to the right
-	->func()	# Vim9: method call in continuation line
-	:->		# Vim9: shifts the previous line to the right
+	->		  legacy Vim: shifts the previous line to the right
+	->func()	  Vim9: method call in a continuation line
+	:->		  Vim9: shifts the previous line to the right
 
-	%s/a/b		# legacy Vim: substitute on all lines
+	%s/a/b		  legacy Vim: substitute on all lines
 	x = alongname
-	     % another	# Vim9: line continuation without a backslash
-	:%s/a/b		# Vim9: substitute on all lines
-	'text'->func()	# Vim9: method call
-	:'t		# legacy Vim: jump to mark m
+	     % another	  Vim9: modulo operator in a continuation line
+	:%s/a/b		  Vim9: substitute on all lines
+	't		  legacy Vim: jump to mark t
+	'text'->func()	  Vim9: method call
+	:'t		  Vim9: jump to mark t
 
 Some Ex commands can be confused with assignments in Vim9 script: >
-	g:name = value  # assignment
-	g:pattern:cmd	# invalid command - ERROR
-	:g:pattern:cmd	# :global command
+	g:name = value    # assignment
+	g:pattern:cmd	  # invalid command - ERROR
+	:g:pattern:cmd	  # :global command
 
 Functions defined with `:def` compile the whole function.  Legacy functions
 can bail out, and the following lines are not parsed: >
@@ -571,12 +735,12 @@
 	  if !has('feature')
 	    return
 	  endif
-	  use-feature  # May give compilation error
+	  use-feature  # May give a compilation error
 	enddef
 For a workaround, split it in two functions: >
 	func Maybe()
 	  if has('feature')
-	    call MaybyInner()
+	    call MaybeInner()
 	  endif
 	endfunc
 	if has('feature')
@@ -591,12 +755,38 @@
 	    use-feature
 	  endif
 	enddef
+<							*vim9-user-command*
+Another side effect of compiling a function is that the presence of a user
+command is checked at compile time.  If the user command is defined later an
+error will result.  This works: >
+	command -nargs=1 MyCommand echom <q-args>
+	def Works()
+	  MyCommand 123
+	enddef
+This will give an error for "MyCommand" not being defined: >
+	def Works()
+	  command -nargs=1 MyCommand echom <q-args>
+	  MyCommand 123
+	enddef
+A workaround is to invoke the command indirectly with `:execute`: >
+	def Works()
+	  command -nargs=1 MyCommand echom <q-args>
+	  execute 'MyCommand 123'
+	enddef
+
 Note that for unrecognized commands there is no check for "|" and a following
 command.  This will give an error for missing `endif`: >
 	def Maybe()
 	  if has('feature') | use-feature | endif
 	enddef
 
+Other differences ~
+
+Patterns are used like 'magic' is set, unless explicitly overruled.
+The 'edcompatible' option value is not used.
+The 'gdefault' option value is not used.
+
+
 ==============================================================================
 
 3. New style functions					*fast-functions*
@@ -657,21 +847,30 @@
 			Note that for command line completion of {func} you
 			can prepend "s:" to find script-local functions.
 
+:disa[ssemble]! {func}	Like `:disassemble` but with the instructions used for
+			profiling.
+
 Limitations ~
 
 Local variables will not be visible to string evaluation.  For example: >
-	def EvalString(): list<string>
+	def MapList(): list<string>
 	  var list = ['aa', 'bb', 'cc', 'dd']
 	  return range(1, 2)->map('list[v:val]')
 	enddef
 
 The map argument is a string expression, which is evaluated without the
 function scope.  Instead, use a lambda: >
-	def EvalString(): list<string>
+	def MapList(): list<string>
 	  var list = ['aa', 'bb', 'cc', 'dd']
-	  return range(1, 2)->map({ _, v -> list[v] })
+	  return range(1, 2)->map(( _, v) => list[v])
 	enddef
 
+The same is true for commands that are not compiled, such as `:global`.
+For these the backtick expansion can be used.  Example: >
+	def Replace()
+	  var newText = 'blah'
+	  g/pattern/s/^/`=newText`/
+	enddef
 
 ==============================================================================
 
@@ -766,12 +965,14 @@
 This can be a problem when the "any" type is undesired and the actual type is
 expected to always be the same.  For example, when declaring a list: >
 	var l: list<number> = [1, g:two]
-This will give an error, because "g:two" has type "any".  To avoid this, use a
-type cast: >
+At compile time Vim doesn't know the type of "g:two" and the expression type
+becomes list<any>.  An instruction is generated to check the list type before
+doing the assignment, which is a bit inefficient.
+							*type-casting*
+To avoid this, use a type cast: >
 	var l: list<number> = [1, <number>g:two]
-<							*type-casting*
-The compiled code will then check that "g:two" is a number at runtime and give
-an error if it isn't.  This is called type casting.
+The compiled code will then only check that "g:two" is a number and give an
+error if it isn't.  This is called type casting.
 
 The syntax of a type cast is:  "<" {type} ">".  There cannot be white space
 after the "<" or before the ">" (to avoid them being confused with
@@ -813,6 +1014,12 @@
 - Using a string value when setting a number options.
 - Using a number where a string is expected.   *E1024*
 
+One consequence is that the item type of a list or dict given to map() must
+not change.  This will give an error in compiled code: >
+	map([1, 2, 3], (i, v) => 'item ' .. i)
+	E1012: Type mismatch; expected list<number> but got list<string>
+Instead use |mapnew()|.
+
 ==============================================================================
 
 5. Namespace, Import and Export
@@ -829,7 +1036,7 @@
 
 
 Namespace ~
-							*:vim9script* *:vim9*
+							*vim9-namespace*
 To recognize a file that can be imported the `vim9script` statement must
 appear as the first statement in the file.  It tells Vim to interpret the
 script in its own namespace, instead of the global namespace.  If a file
@@ -922,14 +1129,14 @@
 
 1. In the plugin define user commands, functions and/or mappings that refer to
    an autoload script. >
-   	command -nargs=1 SearchForStuff call searchfor#Stuff(<f-args>)
+	command -nargs=1 SearchForStuff searchfor#Stuff(<f-args>)
 
 <   This goes in .../plugin/anyname.vim.  "anyname.vim" can be freely chosen.
 
 2. In the autoload script do the actual work.  You can import items from
    other files to split up functionality in appropriate pieces. >
 	vim9script
-        import FilterFunc from "../import/someother.vim"
+	import FilterFunc from "../import/someother.vim"
 	def searchfor#Stuff(arg: string)
 	  var filtered = FilterFunc(arg)
 	  ...
@@ -1015,12 +1222,12 @@
 should be done at compile time.  Postponing it to runtime makes the execution
 slower and means mistakes are found only later.  For example, when
 encountering the "+" character and compiling this into a generic add
-instruction, at execution time the instruction would have to inspect the type
-of the arguments and decide what kind of addition to do.  And when the
-type is dictionary throw an error.  If the types are known to be numbers then
-an "add number" instruction can be used, which is faster.  The error can be
-given at compile time, no error handling is needed at runtime, since adding
-two numbers cannot fail.
+instruction, at runtime the instruction would have to inspect the type of the
+arguments and decide what kind of addition to do.  And when the type is
+dictionary throw an error.  If the types are known to be numbers then an "add
+number" instruction can be used, which is faster.  The error can be given at
+compile time, no error handling is needed at runtime, since adding two numbers
+cannot fail.
 
 The syntax for types, using <type> for compound types, is similar to Java.  It
 is easy to understand and widely used.  The type names are what were used in
@@ -1103,7 +1310,7 @@
 `:var`.  This is used in many languages.  The semantics might be slightly
 different, but it's easily recognized as a declaration.
 
-Using `:const`  for constants is common, but the semantics vary.  Some
+Using `:const`  for constants is common, but the semantics varies.  Some
 languages only make the variable immutable, others also make the value
 immutable.  Since "final" is well known from Java for only making the variable
 immutable we decided to use that.  And then `:const` can be used for making
@@ -1163,7 +1370,7 @@
 considered false.  Thus using a string for a condition would often not give an
 error and be considered false.  That is confusing.
 
-In Vim9 type checking is more strict to avoid mistakes.  Where a condition is
+In Vim9 type checking is stricter to avoid mistakes.  Where a condition is
 used, e.g. with the `:if` command and the `||` operator, only boolean-like
 values are accepted:
 	true:  `true`, `v:true`, `1`, `0 < 9`
diff -Nru vim-8.2.1913/runtime/doc/vim.man vim-8.2.2434/runtime/doc/vim.man
--- vim-8.2.1913/runtime/doc/vim.man	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/vim.man	2021-01-30 22:05:11.000000000 +0000
@@ -345,6 +345,9 @@
                    GTK  GUI only: Use the GtkPlug mechanism to run gvim in an�
                    other window.
 
+       --startuptime {file}
+                   During startup write timing messages to the file {fname}.
+
        --version   Print version information and exit.
 
 ON-LINE HELP
diff -Nru vim-8.2.1913/runtime/doc/windows.txt vim-8.2.2434/runtime/doc/windows.txt
--- vim-8.2.1913/runtime/doc/windows.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/doc/windows.txt	2021-01-30 22:05:11.000000000 +0000
@@ -1,4 +1,4 @@
-*windows.txt*   For Vim version 8.2.  Last change: 2020 Sep 02
+*windows.txt*   For Vim version 8.2.  Last change: 2020 Dec 18
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -205,11 +205,6 @@
 		This behaves like a ":split" first, and then an ":enew"
 		command.
 
-:[N]vne[w] [++opt] [+cmd] [file]			*:vne* *:vnew*
-		Like |:new|, but split vertically.  If 'equalalways' is set
-		and 'eadirection' isn't "ver" the windows will be spread out
-		horizontally, unless a width was specified.
-
 :[N]new [++opt] [+cmd] {file}
 :[N]sp[lit] [++opt] [+cmd] {file}			*:split_f*
 		Create a new window and start editing file {file} in it.  This
@@ -221,6 +216,11 @@
 		height).  Reduces the current window height to create room
 		(and others, if the 'equalalways' option is set).
 
+:[N]vne[w] [++opt] [+cmd] [file]			*:vne* *:vnew*
+		Like |:new|, but split vertically.  If 'equalalways' is set
+		and 'eadirection' isn't "ver" the windows will be spread out
+		horizontally, unless a width was specified.
+
 :[N]sv[iew] [++opt] [+cmd] [file]		*:sv* *:sview* *splitview*
 		Same as ":split", but set 'readonly' option for this buffer.
 
@@ -1119,6 +1119,11 @@
 		line when the buffer is first entered.  Note that other
 		commands after the + will be ignored.
 
+						 *:balt*
+:balt [+lnum] {fname}
+		Like `:badd` and also set the alternate file for the current
+		window to {fname}.
+
 :[N]bd[elete][!]			*:bd* *:bdel* *:bdelete* *E516*
 :bd[elete][!] [N]
 		Unload buffer [N] (default: current buffer) and delete it from
diff -Nru vim-8.2.1913/runtime/filetype.vim vim-8.2.2434/runtime/filetype.vim
--- vim-8.2.1913/runtime/filetype.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/filetype.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2020 Oct 24
+" Last Change:	2021 Jan 21
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -499,6 +499,9 @@
 " DOT
 au BufNewFile,BufRead *.dot,*.gv		setf dot
 
+" Dune
+au BufNewFile,BufRead jbuild,dune,dune-project,dune-workspace setf dune
+
 " Dylan - lid files
 au BufNewFile,BufRead *.lid			setf dylanlid
 
@@ -586,6 +589,9 @@
 " Factor
 au BufNewFile,BufRead *.factor			setf factor
 
+" Fennel
+autocmd BufRead,BufNewFile *.fnl 		setf fennel
+
 " Fetchmail RC file
 au BufNewFile,BufRead .fetchmailrc		setf fetchmail
 
@@ -627,6 +633,9 @@
 " Gedcom
 au BufNewFile,BufRead *.ged,lltxxxxx.txt	setf gedcom
 
+" Gift (Moodle)
+autocmd BufRead,BufNewFile *.gift 		setf gift
+
 " Git
 au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG	setf gitcommit
 au BufNewFile,BufRead *.git/config,.gitconfig,/etc/gitconfig	setf gitconfig
@@ -696,12 +705,15 @@
 au BufNewFile,BufRead *.haml			setf haml
 
 " Hamster Classic | Playground files
-au BufNewFile,BufRead *.hsc,*.hsm		setf hamster
+au BufNewFile,BufRead *.hsm	  		setf hamster
 
 " Haskell
-au BufNewFile,BufRead *.hs,*.hs-boot		setf haskell
+au BufNewFile,BufRead *.hs,*.hsc,*.hs-boot	setf haskell
 au BufNewFile,BufRead *.lhs			setf lhaskell
 au BufNewFile,BufRead *.chs			setf chaskell
+au BufNewFile,BufRead cabal.project		setf cabalproject
+au BufNewFile,BufRead $HOME/.cabal/config	setf cabalconfig
+au BufNewFile,BufRead cabal.config		setf cabalconfig
 
 " Haste
 au BufNewFile,BufRead *.ht			setf haste
@@ -1119,8 +1131,8 @@
 " NSIS
 au BufNewFile,BufRead *.nsi,*.nsh		setf nsis
 
-" OCAML
-au BufNewFile,BufRead *.ml,*.mli,*.mll,*.mly,.ocamlinit	setf ocaml
+" OCaml
+au BufNewFile,BufRead *.ml,*.mli,*.mll,*.mly,.ocamlinit,*.mlt,*.mlp,*.mlip,*.mli.cppo,*.ml.cppo setf ocaml
 
 " Occam
 au BufNewFile,BufRead *.occ			setf occam
@@ -1128,6 +1140,9 @@
 " Omnimark
 au BufNewFile,BufRead *.xom,*.xin		setf omnimark
 
+" OPAM
+au BufNewFile,BufRead opam,*.opam,*.opam.template setf opam
+
 " OpenROAD
 au BufNewFile,BufRead *.or			setf openroad
 
@@ -1161,8 +1176,11 @@
 " Password file
 au BufNewFile,BufRead */etc/passwd,*/etc/passwd-,*/etc/passwd.edit,*/etc/shadow,*/etc/shadow-,*/etc/shadow.edit,*/var/backups/passwd.bak,*/var/backups/shadow.bak setf passwd
 
-" Pascal (also *.p)
-au BufNewFile,BufRead *.pas,*.pp		setf pascal
+" Pascal (also *.p, *.pp, *.inc)
+au BufNewFile,BufRead *.pas			setf pascal
+
+" Pascal or Puppet manifest
+au BufNewFile,BufRead *.pp			call dist#ft#FTpp()
 
 " Delphi or Lazarus program file
 au BufNewFile,BufRead *.dpr,*.lpr		setf pascal
@@ -1252,7 +1270,7 @@
 " Povray configuration
 au BufNewFile,BufRead .povrayrc			setf povini
 
-" Povray, PHP or assembly
+" Povray, Pascal, PHP or assembly
 au BufNewFile,BufRead *.inc			call dist#ft#FTinc()
 
 " Printcap and Termcap
@@ -1261,13 +1279,19 @@
 au BufNewFile,BufRead *termcap
 	\ let b:ptcap_type = "term" | setf ptcap
 
-" PCCTS / ANTRL
-"au BufNewFile,BufRead *.g			setf antrl
+" PCCTS / ANTLR
+"au BufNewFile,BufRead *.g			setf antlr
 au BufNewFile,BufRead *.g			setf pccts
 
 " PPWizard
 au BufNewFile,BufRead *.it,*.ih			setf ppwiz
 
+" Puppet
+au BufNewFile,BufRead Puppetfile		setf ruby
+
+" Embedded Puppet
+au BufNewFile,BufRead *.epp			setf epuppet
+
 " Obj 3D file format
 " TODO: is there a way to avoid MS-Windows Object files?
 au BufNewFile,BufRead *.obj			setf obj
@@ -1305,6 +1329,7 @@
 
 " Google protocol buffers
 au BufNewFile,BufRead *.proto			setf proto
+au BufNewFile,BufRead *.pbtxt			setf pbtxt
 
 " Protocols
 au BufNewFile,BufRead */etc/protocols		setf protocols
@@ -1409,8 +1434,8 @@
 " RubyGems
 au BufNewFile,BufRead *.gemspec			setf ruby
 
-" Rust
-au BufNewFile,BufRead *.rs			setf rust
+" RBS (Ruby Signature)
+au BufNewFile,BufRead *.rbs			setf rbs
 
 " Rackup
 au BufNewFile,BufRead *.ru			setf ruby
@@ -1424,6 +1449,9 @@
 " Rantfile and Rakefile is like Ruby
 au BufNewFile,BufRead [rR]antfile,*.rant,[rR]akefile,*.rake	setf ruby
 
+" Rust
+au BufNewFile,BufRead *.rs			setf rust
+
 " S-lang (or shader language, or SmallLisp)
 au BufNewFile,BufRead *.sl			setf slang
 
@@ -1540,6 +1568,9 @@
 " Screen RC
 au BufNewFile,BufRead .screenrc,screenrc	setf screen
 
+" Sexplib
+au BufNewFile,BufRead *.sexp setf sexplib
+
 " Simula
 au BufNewFile,BufRead *.sim			setf simula
 
@@ -1600,6 +1631,9 @@
 au BufNewFile,BufRead *.hog,snort.conf,vision.conf	setf hog
 au BufNewFile,BufRead *.rules			call dist#ft#FTRules()
 
+" SPARQL queries
+au BufNewFile,BufRead *.rq,*.sparql		setf sparql
+
 " Spec (Linux RPM)
 au BufNewFile,BufRead *.spec			setf spec
 
@@ -1710,8 +1744,13 @@
 " Telix Salt
 au BufNewFile,BufRead *.slt			setf tsalt
 
-" Tera Term Language
-au BufRead,BufNewFile *.ttl			setf teraterm
+" Tera Term Language or Turtle
+au BufRead,BufNewFile *.ttl
+	\ if getline(1) =~ '^@\?\(prefix\|base\)' |
+	\   setf turtle |
+	\ else |
+	\   setf teraterm |
+	\ endif
 
 " Terminfo
 au BufNewFile,BufRead *.ti			setf terminfo
@@ -1721,7 +1760,7 @@
 au BufNewFile,BufRead *.tex			call dist#ft#FTtex()
 
 " ConTeXt
-au BufNewFile,BufRead *.mkii,*.mkiv,*.mkvi   setf context
+au BufNewFile,BufRead *.mkii,*.mkiv,*.mkvi,*.mkxl,*.mklx   setf context
 
 " Texinfo
 au BufNewFile,BufRead *.texinfo,*.texi,*.txi	setf texinfo
@@ -1738,6 +1777,9 @@
 " tmux configuration
 au BufNewFile,BufRead {.,}tmux*.conf		setf tmux
 
+" TOML
+au BufNewFile,BufRead *.toml			setf toml
+
 " TPP - Text Presentation Program
 au BufNewFile,BufReadPost *.tpp			setf tpp
 
@@ -1759,8 +1801,13 @@
 " TWIG files
 au BufNewFile,BufReadPost *.twig		setf twig
 
-" Typescript
-au BufNewFile,BufReadPost *.ts			setf typescript
+" Typescript or Qt translation file (which is XML)
+au BufNewFile,BufReadPost *.ts
+	\ if getline(1) =~ '<?xml' |
+	\   setf xml |
+	\ else |
+	\   setf typescript |
+	\ endif
 
 " TypeScript with React
 au BufNewFile,BufRead *.tsx			setf typescriptreact
@@ -2036,12 +2083,14 @@
 
 " Bazel build file
 if !has("fname_case")
-  au BufNewFile,BufRead *.BUILD,BUILD			setf bzl
+  au BufNewFile,BufRead *.BUILD,BUILD		setf bzl
 endif
 
 " BIND zone
 au BufNewFile,BufRead */named/db.*,*/bind/db.*	call s:StarSetf('bindzone')
 
+au BufNewFile,BufRead cabal.project.*		call s:StarSetf('cabalproject')
+
 " Calendar
 au BufNewFile,BufRead */.calendar/*,
 	\*/share/calendar/*/calendar.*,*/share/calendar/calendar.*
diff -Nru vim-8.2.1913/runtime/ftplugin/ada.vim vim-8.2.2434/runtime/ftplugin/ada.vim
--- vim-8.2.1913/runtime/ftplugin/ada.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/ftplugin/ada.vim	2021-01-30 22:05:11.000000000 +0000
@@ -159,40 +159,41 @@
 endif
 
 " Section: Commands, Mapping, Menus {{{1
-"
-call ada#Map_Popup (
-   \ 'Tag.List',
-   \  'l',
-   \ 'call ada#List_Tag ()')
-call ada#Map_Popup (
-   \'Tag.Jump',
-   \'j',
-   \'call ada#Jump_Tag ()')
-call ada#Map_Menu (
-   \'Tag.Create File',
-   \':AdaTagFile',
-   \'call ada#Create_Tags (''file'')')
-call ada#Map_Menu (
-   \'Tag.Create Dir',
-   \':AdaTagDir',
-   \'call ada#Create_Tags (''dir'')')
+if !exists(':AdaTagFile')
+  call ada#Map_Popup (
+     \ 'Tag.List',
+     \  'l',
+     \ 'call ada#List_Tag ()')
+  call ada#Map_Popup (
+     \'Tag.Jump',
+     \'j',
+     \'call ada#Jump_Tag ()')
+  call ada#Map_Menu (
+     \'Tag.Create File',
+     \':AdaTagFile',
+     \'call ada#Create_Tags (''file'')')
+  call ada#Map_Menu (
+     \'Tag.Create Dir',
+     \':AdaTagDir',
+     \'call ada#Create_Tags (''dir'')')
 
-call ada#Map_Menu (
-   \'Highlight.Toggle Space Errors',
-   \ ':AdaSpaces',
-   \'call ada#Switch_Syntax_Option (''space_errors'')')
-call ada#Map_Menu (
-   \'Highlight.Toggle Lines Errors',
-   \ ':AdaLines',
-   \'call ada#Switch_Syntax_Option (''line_errors'')')
-call ada#Map_Menu (
-   \'Highlight.Toggle Rainbow Color',
-   \ ':AdaRainbow',
-   \'call ada#Switch_Syntax_Option (''rainbow_color'')')
-call ada#Map_Menu (
-   \'Highlight.Toggle Standard Types',
-   \ ':AdaTypes',
-   \'call ada#Switch_Syntax_Option (''standard_types'')')
+  call ada#Map_Menu (
+     \'Highlight.Toggle Space Errors',
+     \ ':AdaSpaces',
+     \'call ada#Switch_Syntax_Option (''space_errors'')')
+  call ada#Map_Menu (
+     \'Highlight.Toggle Lines Errors',
+     \ ':AdaLines',
+     \'call ada#Switch_Syntax_Option (''line_errors'')')
+  call ada#Map_Menu (
+     \'Highlight.Toggle Rainbow Color',
+     \ ':AdaRainbow',
+     \'call ada#Switch_Syntax_Option (''rainbow_color'')')
+  call ada#Map_Menu (
+     \'Highlight.Toggle Standard Types',
+     \ ':AdaTypes',
+     \'call ada#Switch_Syntax_Option (''standard_types'')')
+endif
 
 " 1}}}
 " Reset cpoptions
diff -Nru vim-8.2.1913/runtime/ftplugin/awk.vim vim-8.2.2434/runtime/ftplugin/awk.vim
--- vim-8.2.1913/runtime/ftplugin/awk.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/ftplugin/awk.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1,7 +1,8 @@
 " Vim filetype plugin
-" Language:	awk, nawk, gawk, mawk
-" Maintainer:	Antonio Colombo <azc100@gmail.com>
-" Last Change:	2020 Sep 28
+" Language:		awk, nawk, gawk, mawk
+" Maintainer:		Doug Kearns <dougkearns@gmail.com>
+" Previous Maintainer:	Antonio Colombo <azc100@gmail.com>
+" Last Change:		2020 Sep 28
 
 " This plugin was prepared by Mark Sikora
 " This plugin was updated as proposed by Doug Kearns
diff -Nru vim-8.2.1913/runtime/ftplugin/basic.vim vim-8.2.2434/runtime/ftplugin/basic.vim
--- vim-8.2.1913/runtime/ftplugin/basic.vim	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/runtime/ftplugin/basic.vim	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,27 @@
+" Vim filetype plugin file
+" Language:	BASIC
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2015 Jan 10
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+setlocal comments=:REM,:'
+setlocal commentstring='\ %s
+setlocal formatoptions-=t formatoptions+=croql
+
+if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
+  let b:browsefilter = "BASIC Source Files (*.bas)\t*.bas\n" .
+		     \ "All Files (*.*)\t*.*\n"
+endif
+
+let b:undo_ftplugin = "setl fo< com< cms< sua<" .
+		    \ " | unlet! b:browsefilter"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff -Nru vim-8.2.1913/runtime/ftplugin/bzl.vim vim-8.2.2434/runtime/ftplugin/bzl.vim
--- vim-8.2.1913/runtime/ftplugin/bzl.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/ftplugin/bzl.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1,7 +1,7 @@
 " Vim filetype plugin file
 " Language:	Bazel (http://bazel.io)
 " Maintainer:	David Barnett (https://github.com/google/vim-ft-bzl)
-" Last Change:	2015 Aug 11
+" Last Change:	2021 Jan 19
 
 ""
 " @section Introduction, intro
@@ -51,6 +51,8 @@
 endif
 
 if exists('*BzlFoldText')
+  let &cpo = s:save_cpo
+  unlet s:save_cpo
   finish
 endif
 
diff -Nru vim-8.2.1913/runtime/ftplugin/css.vim vim-8.2.2434/runtime/ftplugin/css.vim
--- vim-8.2.1913/runtime/ftplugin/css.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/ftplugin/css.vim	2021-01-30 22:05:11.000000000 +0000
@@ -2,7 +2,7 @@
 " Language:		CSS
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
 " Previous Maintainer:	Nikolai Weibull <now@bitwi.se>
-" Latest Revision:	2008-07-09
+" Last Change:		2020 Dec 21
 
 if exists("b:did_ftplugin")
   finish
@@ -12,11 +12,12 @@
 let s:cpo_save = &cpo
 set cpo&vim
 
-let b:undo_ftplugin = "setl com< cms< inc< fo< ofu<"
+let b:undo_ftplugin = "setl com< cms< inc< fo< ofu< isk<"
 
 setlocal comments=s1:/*,mb:*,ex:*/ commentstring&
 setlocal formatoptions-=t formatoptions+=croql
 setlocal omnifunc=csscomplete#CompleteCSS
+setlocal iskeyword+=-
 
 let &l:include = '^\s*@import\s\+\%(url(\)\='
 
diff -Nru vim-8.2.1913/runtime/ftplugin/dune.vim vim-8.2.2434/runtime/ftplugin/dune.vim
--- vim-8.2.1913/runtime/ftplugin/dune.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/ftplugin/dune.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1,7 +1,7 @@
 " Language:    Dune buildsystem
 " Maintainer:  Markus Mottl        <markus.mottl@gmail.com>
 "              Anton Kochkov       <anton.kochkov@gmail.com>
-" URL:         https://github.com/rgrinberg/vim-ocaml
+" URL:         https://github.com/ocaml/vim-ocaml
 " Last Change:
 "              2018 Nov 3 - Added commentstring (Markus Mottl)
 "              2017 Sep 6 - Initial version (Etienne Millon)
diff -Nru vim-8.2.1913/runtime/ftplugin/erlang.vim vim-8.2.2434/runtime/ftplugin/erlang.vim
--- vim-8.2.1913/runtime/ftplugin/erlang.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/ftplugin/erlang.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1,87 +1,83 @@
 " Vim ftplugin file
-" Language:     Erlang
+" Language:     Erlang (http://www.erlang.org)
+" Maintainer:   Csaba Hoch <csaba.hoch@gmail.com>
 " Author:       Oscar Hellström <oscar@oscarh.net>
 " Contributors: Ricardo Catalinas Jiménez <jimenezrick@gmail.com>
 "               Eduardo Lopez (http://github.com/tapichu)
+"               Arvid Bjurklint (http://github.com/slarwise)
+" Last Update:  2021-Jan-08
 " License:      Vim license
-" Version:      2012/01/25
+" URL:          https://github.com/vim-erlang/vim-erlang-runtime
 
 if exists('b:did_ftplugin')
-	finish
-else
-	let b:did_ftplugin = 1
-endif
-
-if exists('s:did_function_definitions')
-	call s:SetErlangOptions()
-	finish
-else
-	let s:did_function_definitions = 1
+  finish
 endif
+let b:did_ftplugin = 1
 
 let s:cpo_save = &cpo
 set cpo&vim
 
-if !exists('g:erlang_keywordprg')
-	let g:erlang_keywordprg = 'erl -man'
-endif
+let &l:keywordprg = get(g:, 'erlang_keywordprg', 'erl -man')
 
-if !exists('g:erlang_folding')
-	let g:erlang_folding = 0
+if get(g:, 'erlang_folding', 0)
+  setlocal foldmethod=expr
+  setlocal foldexpr=GetErlangFold(v:lnum)
+  setlocal foldtext=ErlangFoldText()
 endif
 
+setlocal comments=:%%%,:%%,:%
+setlocal commentstring=%%s
+
+setlocal formatoptions+=ro
+
+setlocal suffixesadd=.erl,.hrl
+
+let &l:include = '^\s*-\%(include\|include_lib\)\s*("\zs\f*\ze")'
+let &l:define  = '^\s*-\%(define\|record\|type\|opaque\)'
+
 let s:erlang_fun_begin = '^\a\w*(.*$'
 let s:erlang_fun_end   = '^[^%]*\.\s*\(%.*\)\?$'
 
-function s:SetErlangOptions()
-	if g:erlang_folding
-		setlocal foldmethod=expr
-		setlocal foldexpr=GetErlangFold(v:lnum)
-		setlocal foldtext=ErlangFoldText()
-	endif
-
-	setlocal comments=:%%%,:%%,:%
-	setlocal commentstring=%%s
-
-	setlocal formatoptions+=ro
-	let &l:keywordprg = g:erlang_keywordprg
-endfunction
-
-function GetErlangFold(lnum)
-	let lnum = a:lnum
-	let line = getline(lnum)
-
-	if line =~ s:erlang_fun_end
-		return '<1'
-	endif
-
-	if line =~ s:erlang_fun_begin && foldlevel(lnum - 1) == 1
-		return '1'
-	endif
-
-	if line =~ s:erlang_fun_begin
-		return '>1'
-	endif
-
-	return '='
-endfunction
-
-function ErlangFoldText()
-	let line    = getline(v:foldstart)
-	let foldlen = v:foldend - v:foldstart + 1
-	let lines   = ' ' . foldlen . ' lines: ' . substitute(line, "[\ \t]*", '', '')
-	if foldlen < 10
-		let lines = ' ' . lines
-	endif
-	let retval = '+' . v:folddashes . lines
+if !exists('*GetErlangFold')
+  function GetErlangFold(lnum)
+    let lnum = a:lnum
+    let line = getline(lnum)
+
+    if line =~ s:erlang_fun_end
+      return '<1'
+    endif
+
+    if line =~ s:erlang_fun_begin && foldlevel(lnum - 1) == 1
+      return '1'
+    endif
+
+    if line =~ s:erlang_fun_begin
+      return '>1'
+    endif
 
-	return retval
-endfunction
+    return '='
+  endfunction
+endif
 
-call s:SetErlangOptions()
+if !exists('*ErlangFoldText')
+  function ErlangFoldText()
+    let line    = getline(v:foldstart)
+    let foldlen = v:foldend - v:foldstart + 1
+    let lines   = ' ' . foldlen . ' lines: ' . substitute(line, "[\ \t]*", '', '')
+    if foldlen < 10
+      let lines = ' ' . lines
+    endif
+    let retval = '+' . v:folddashes . lines
 
-let b:undo_ftplugin = "setlocal foldmethod< foldexpr< foldtext<"
-	\ . " comments< commentstring< formatoptions<"
+    return retval
+  endfunction
+endif
+
+let b:undo_ftplugin = "setlocal keywordprg< foldmethod< foldexpr< foldtext<"
+      \ . " comments< commentstring< formatoptions< suffixesadd< include<"
+      \ . " define<"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
+
+" vim: sw=2 et
diff -Nru vim-8.2.1913/runtime/ftplugin/framescript.vim vim-8.2.2434/runtime/ftplugin/framescript.vim
--- vim-8.2.1913/runtime/ftplugin/framescript.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/ftplugin/framescript.vim	2021-01-30 22:05:11.000000000 +0000
@@ -3,14 +3,14 @@
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2008-07-19
 
-let s:cpo_save = &cpo
-set cpo&vim
-
 if exists("b:did_ftplugin")
   finish
 endif
 let b:did_ftplugin = 1
 
+let s:cpo_save = &cpo
+set cpo&vim
+
 let b:undo_ftplugin = "setl com< cms< fo< inc< | unlet! b:matchwords"
 
 setlocal comments=s1:/*,mb:*,ex:*/,:// commentstring=/*\ %s\ */
diff -Nru vim-8.2.1913/runtime/ftplugin/freebasic.vim vim-8.2.2434/runtime/ftplugin/freebasic.vim
--- vim-8.2.1913/runtime/ftplugin/freebasic.vim	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/runtime/ftplugin/freebasic.vim	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:	FreeBasic
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2015 Jan 10
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+runtime! ftplugin/basic.vim
+
+" vim: ts=8
diff -Nru vim-8.2.1913/runtime/ftplugin/fstab.vim vim-8.2.2434/runtime/ftplugin/fstab.vim
--- vim-8.2.1913/runtime/ftplugin/fstab.vim	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/runtime/ftplugin/fstab.vim	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,19 @@
+" Vim ftplugin file
+" Language: fstab file
+" Maintainer: Radu Dineiu <radu.dineiu@gmail.com>
+" URL: https://raw.github.com/rid9/vim-fstab/master/ftplugin/fstab.vim
+" Last Change: 2021 Jan 02
+" Version: 1.0
+"
+" Credits:
+"   Subhaditya Nath <sn03.general@gmail.com>
+
+if exists("b:did_ftplugin")
+	finish
+endif
+let b:did_ftplugin = 1
+
+setlocal commentstring=#%s
+let b:undo_ftplugin = "setlocal commentstring<"
+
+" vim: ts=8 ft=vim
diff -Nru vim-8.2.1913/runtime/ftplugin/hamster.vim vim-8.2.2434/runtime/ftplugin/hamster.vim
--- vim-8.2.1913/runtime/ftplugin/hamster.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/ftplugin/hamster.vim	2021-01-30 22:05:11.000000000 +0000
@@ -2,7 +2,7 @@
 " Language:    Hamster Script
 " Version:     2.0.6.0
 " Maintainer:  David Fishburn <dfishburn dot vim at gmail dot com>
-" Last Change: 2017 Mar 18
+" Last Change: 2021 Jan 19
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -57,6 +57,9 @@
 endif
 
 setlocal ignorecase
+
 let &cpo = s:cpo_save
 unlet s:cpo_save
-setlocal cpo+=M		" makes \%( match \)
+
+" Disabled, 'cpo' is a global option.
+" setlocal cpo+=M		" makes \%( match \)
diff -Nru vim-8.2.1913/runtime/ftplugin/nroff.vim vim-8.2.2434/runtime/ftplugin/nroff.vim
--- vim-8.2.1913/runtime/ftplugin/nroff.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/ftplugin/nroff.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1,7 +1,9 @@
 " Vim filetype plugin
 " Language:	roff(7)
-" Maintainer:	Chris Spiegel <cspiegel@gmail.com>
-" Last Change:	2019 Apr 24
+" Maintainer:	Aman Verma
+" Homepage:	https://github.com/a-vrma/vim-nroff-ftplugin
+" Previous Maintainer:	Chris Spiegel <cspiegel@gmail.com>
+" Last Change:	2020 Nov 21
 
 if exists("b:did_ftplugin")
   finish
@@ -9,3 +11,7 @@
 let b:did_ftplugin = 1
 
 setlocal commentstring=.\\\"%s
+setlocal comments=:.\\\"
+setlocal sections+=Sh
+
+let b:undo_ftplugin = 'setlocal commentstring< comments< sections<'
diff -Nru vim-8.2.1913/runtime/ftplugin/ocaml.vim vim-8.2.2434/runtime/ftplugin/ocaml.vim
--- vim-8.2.1913/runtime/ftplugin/ocaml.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/ftplugin/ocaml.vim	2021-01-30 22:05:11.000000000 +0000
@@ -5,7 +5,7 @@
 "              Pierre Vittet       <pierre-vittet@pvittet.com>
 "              Stefano Zacchiroli  <zack@bononia.it>
 "              Vincent Aravantinos <firstname.name@imag.fr>
-" URL:         https://github.com/rgrinberg/vim-ocaml
+" URL:         https://github.com/ocaml/vim-ocaml
 " Last Change:
 "              2013 Oct 27 - Added commentstring (MM)
 "              2013 Jul 26 - load default compiler settings (MM)
@@ -38,7 +38,8 @@
 set cpo&vim
 
 " Comment string
-setlocal comments=
+setlocal comments=sr:(*\ ,mb:\ ,ex:*)
+setlocal comments^=sr:(**,mb:\ \ ,ex:*)
 setlocal commentstring=(*%s*)
 
 " Add mappings, unless the user didn't want this.
@@ -158,6 +159,8 @@
 " - Only definitions below, executed once -------------------------------------
 
 if exists("*OMLetFoldLevel")
+  let &cpoptions = s:cposet
+  unlet s:cposet
   finish
 endif
 
@@ -391,9 +394,9 @@
     endif
   endfun
 
-  " This variable contain a dictionnary of list. Each element of the dictionnary
-  " represent an annotation system. An annotation system is a list with :
-  " - annotation file name as it's key
+  " This variable contains a dictionary of lists. Each element of the dictionary
+  " represents an annotation system. An annotation system is a list with:
+  " - annotation file name as its key
   " - annotation file path as first element of the contained list
   " - build path as second element of the contained list
   " - annot_file_last_mod (contain the date of .annot file) as third element
@@ -521,7 +524,7 @@
   "c. link this stuff with what the user wants
   " ie. get the expression selected/under the cursor
 
-    let s:ocaml_word_char = '\w|[À-ÿ]|'''
+    let s:ocaml_word_char = '\w|[\xc0-\xff]|'''
 
       "In:  the current mode (eg. "visual", "normal", etc.)
       "Out: the borders of the expression we are looking for the type
@@ -634,7 +637,7 @@
   nnoremap <silent> <Plug>OCamlPrintType :<C-U>call Ocaml_print_type("normal")<CR>
   xnoremap <silent> <Plug>OCamlPrintType :<C-U>call Ocaml_print_type("visual")<CR>`<
 
-let &cpoptions=s:cposet
+let &cpoptions = s:cposet
 unlet s:cposet
 
 " vim:sw=2 fdm=indent
diff -Nru vim-8.2.1913/runtime/ftplugin/pbtxt.vim vim-8.2.2434/runtime/ftplugin/pbtxt.vim
--- vim-8.2.1913/runtime/ftplugin/pbtxt.vim	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/runtime/ftplugin/pbtxt.vim	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,21 @@
+" Vim filetype plugin file
+" Language:             Protobuf Text Format
+" Maintainer:           Lakshay Garg <lakshayg@outlook.in>
+" Last Change:          2020 Nov 17
+" Homepage:             https://github.com/lakshayg/vim-pbtxt
+
+if exists("b:did_ftplugin")
+  finish
+endif
+
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+setlocal commentstring=#\ %s
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: nowrap sw=2 sts=2 ts=8 noet
diff -Nru vim-8.2.1913/runtime/ftplugin/sexplib.vim vim-8.2.2434/runtime/ftplugin/sexplib.vim
--- vim-8.2.1913/runtime/ftplugin/sexplib.vim	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/runtime/ftplugin/sexplib.vim	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,15 @@
+" Vim filetype plugin file
+" Language:    Sexplib
+" Maintainer:  Markus Mottl        <markus.mottl@gmail.com>
+" URL:         https://github.com/ocaml/vim-ocaml
+" Last Change:
+"              2017 Apr 12 - First version (MM)
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin=1
+
+" Comment string
+setl commentstring=;\ %s
+setl comments=:;
diff -Nru vim-8.2.1913/runtime/ftplugin/spec.vim vim-8.2.2434/runtime/ftplugin/spec.vim
--- vim-8.2.1913/runtime/ftplugin/spec.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/ftplugin/spec.vim	2021-01-30 22:05:11.000000000 +0000
@@ -73,23 +73,23 @@
 		let chgline = -1
 		while (line <= line("$"))
 			let linestr = getline(line)
-			if (name == "" && linestr =~? '^Name:')
+			if name == "" && linestr =~? '^Name:'
 				let nameline = line
 				let name = substitute(strpart(linestr,5), '^[	 ]*\([^ 	]\+\)[		]*$','\1','')
-			elseif (ver == "" && linestr =~? '^Version:')
+			elseif ver == "" && linestr =~? '^Version:'
 				let verline = line
 				let ver = substitute(strpart(linestr,8), '^[	 ]*\([^ 	]\+\)[		]*$','\1','')
-			elseif (rel == "" && linestr =~? '^Release:')
+			elseif rel == "" && linestr =~? '^Release:'
 				let relline = line
 				let rel = substitute(strpart(linestr,8), '^[	 ]*\([^ 	]\+\)[		]*$','\1','')
-			elseif (linestr =~? '^%changelog')
+			elseif linestr =~? '^%changelog'
 				let chgline = line
 				execute line
 				break
 			endif
 			let line = line+1
 		endwhile
-		if (nameline != -1 && verline != -1 && relline != -1)
+		if nameline != -1 && verline != -1 && relline != -1
 			let include_release_info = exists("g:spec_chglog_release_info")
 			let name = s:ParseRpmVars(name, nameline)
 			let ver = s:ParseRpmVars(ver, verline)
@@ -100,20 +100,20 @@
 
 		call s:GetRelVer()
 
-		if (chgline == -1)
+		if chgline == -1
 			let option = confirm("Can't find %changelog. Create one? ","&End of file\n&Here\n&Cancel",3)
-			if (option == 1)
+			if option == 1
 				call append(line("$"),"")
 				call append(line("$"),"%changelog")
 				execute line("$")
 				let chgline = line(".")
-			elseif (option == 2)
+			elseif option == 2
 				call append(line("."),"%changelog")
 				normal j
-				chgline = line(".")
+				let chgline = line(".")
 			endif
 		endif
-		if (chgline != -1)
+		if chgline != -1
 			let tmptime = v:lc_time
 			language time C
 			let parsed_format = "* ".strftime(format)." - ".ver."-".rel
@@ -122,16 +122,16 @@
 			let wrong_format = 0
 			let wrong_release = 0
 			let insert_line = 0
-			if (getline(chgline+1) != parsed_format)
+			if getline(chgline+1) != parsed_format
 				let wrong_format = 1
 			endif
-			if (include_release_info && getline(chgline+2) != release_info)
+			if include_release_info && getline(chgline+2) != release_info
 				let wrong_release = 1
 			endif
-			if (wrong_format || wrong_release)
-				if (include_release_info && !wrong_release && !exists("g:spec_chglog_never_increase_release"))
+			if wrong_format || wrong_release
+				if include_release_info && !wrong_release && !exists("g:spec_chglog_never_increase_release")
 					let option = confirm("Increase release? ","&Yes\n&No",1)
-					if (option == 1)
+					if option == 1
 						execute relline
 						normal 

 						let rel = substitute(strpart(getline(relline),8), '^[	 ]*\([^ 	]\+\)[		]*$','\1','')
@@ -171,13 +171,13 @@
 	let ret = ""
 	while (1)
 		let start = match(a:str, "\%{", end+1)
-		if (start == -1)
+		if start == -1
 			let ret = ret . strpart(a:str, end+1)
 			break
 		endif
 		let ret = ret . strpart(a:str, end+1, start-(end+1))
 		let end = match(a:str, "}", start)
-		if (end == -1)
+		if end == -1
 			let ret = ret . strpart(a:str, start)
 			break
 		endif
@@ -185,7 +185,7 @@
 		execute a:strline
 		let definestr = "^[ \t]*%\\(define\\|global\\)[ \t]\\+".varname."[ \t]\\+\\(.*\\)$"
 		let linenum = search(definestr, "bW")
-		if (linenum != 0)
+		if linenum != 0
 			let ret = ret .  substitute(getline(linenum), definestr, "\\2", "")
 		endif
 	endwhile
diff -Nru vim-8.2.1913/runtime/ftplugin/swift.vim vim-8.2.2434/runtime/ftplugin/swift.vim
--- vim-8.2.1913/runtime/ftplugin/swift.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/ftplugin/swift.vim	2021-01-30 22:05:11.000000000 +0000
@@ -6,7 +6,16 @@
 " See https://swift.org/LICENSE.txt for license information
 " See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 "
-" Vim maintainer: Emir SARI <bitigchi@me.com>
+" Vim maintainer: 	Emir SARI <bitigchi@me.com>
+" Last Change:		2021 Jan 08
+
+" Only do this when not done yet for this buffer
+if exists("b:did_ftplugin")
+    finish
+endif
+
+let b:did_ftplugin = 1
+let b:undo_ftplugin = "setlocal comments< expandtab< tabstop< shiftwidth< smartindent<"
 
 setlocal comments=s1:/*,mb:*,ex:*/,:///,://
 setlocal expandtab
diff -Nru vim-8.2.1913/runtime/ftplugin/tidy.vim vim-8.2.2434/runtime/ftplugin/tidy.vim
--- vim-8.2.1913/runtime/ftplugin/tidy.vim	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/runtime/ftplugin/tidy.vim	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,32 @@
+" Vim filetype plugin file
+" Language:	HMTL Tidy Configuration
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2020 Sep 4
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+setlocal comments=:#,://
+setlocal commentstring=#\ %s
+setlocal formatoptions-=t formatoptions+=croql
+
+if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
+  let b:browsefilter = "HTML Tidy Files (tidyrc, .tidyrc, tidy.conf)\ttidyrc;.tidyrc;tidy.conf\n" .
+		     \ "HTML Files (*.html, *.htm)\t*.html;*.htm\n" .
+		     \ "XHTML Files (*.xhtml, *.xhtm)\t*.xhtml;*.xhtm\n" .
+		     \ "XML Files (*.xml)\t*.xml\n" .
+		     \ "All Files (*.*)\t*.*\n"
+endif
+
+let b:undo_ftplugin = "setl fo< com< cms<" .
+		    \ " | unlet! b:browsefilter"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: nowrap sw=2 sts=2 ts=8
diff -Nru vim-8.2.1913/runtime/ftplugin/vim.vim vim-8.2.2434/runtime/ftplugin/vim.vim
--- vim-8.2.1913/runtime/ftplugin/vim.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/ftplugin/vim.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1,7 +1,7 @@
 " Vim filetype plugin
 " Language:	Vim
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2020 Aug 14
+" Last Change:	2021 Jan 23
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -48,18 +48,23 @@
 " Use :help to lookup the keyword under the cursor with K.
 setlocal keywordprg=:help
 
-" Set 'comments' to format dashed lists in comments
-" Avoid that #{} starts a comment.
-setlocal com=sO:\"\ -,mO:\"\ \ ,sO:#\ -,mO:#\ \ ,eO:##,:\",b:#
+if "\n" .. getline(1, 10)->join("\n") =~# '\n\s*vim9\%[script]\>'
+  " Set 'comments' to format dashed lists in comments
+  setlocal com=sO:#\ -,mO:#\ \ ,eO:##,:#
+  " Comments starts with # in Vim9 script
+  setlocal commentstring=#%s
+else
+  setlocal com=sO:\"\ -,mO:\"\ \ ,:\"
+  " Comments starts with a double quote in legacy script
+  setlocal commentstring=\"%s
+endif
+
 
 " Format comments to be up to 78 characters long
 if &tw == 0
   setlocal tw=78
 endif
 
-" Comments start with a double quote; in Vim9 script # would also work
-setlocal commentstring=\"%s
-
 if !exists("no_plugin_maps") && !exists("no_vim_maps")
   let b:did_add_maps = 1
 
@@ -83,8 +88,13 @@
 " Let the matchit plugin know what items can be matched.
 if exists("loaded_matchit")
   let b:match_ignorecase = 0
+  " "func" can also be used as a type:
+  "   var Ref: func
+  " or to list functions:
+  "   func name
+  " require a parenthesis following, then there can be an "endfunc".
   let b:match_words =
-	\ '\<\%(fu\%[nction]\|def\)\>)\@!:\<retu\%[rn]\>:\<\%(endf\%[unction]\|enddef\)\>,' .
+	\ '\<\%(fu\%[nction]\|def\)\s\+\S\+(:\<retu\%[rn]\>:\<\%(endf\%[unction]\|enddef\)\>,' .
  	\ '\<\(wh\%[ile]\|for\)\>:\<brea\%[k]\>:\<con\%[tinue]\>:\<end\(w\%[hile]\|fo\%[r]\)\>,' .
 	\ '\<if\>:\<el\%[seif]\>:\<en\%[dif]\>,' .
 	\ '{:},' .
diff -Nru vim-8.2.1913/runtime/ftplugin/zsh.vim vim-8.2.2434/runtime/ftplugin/zsh.vim
--- vim-8.2.1913/runtime/ftplugin/zsh.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/ftplugin/zsh.vim	2021-01-30 22:05:11.000000000 +0000
@@ -2,7 +2,7 @@
 " Language:             Zsh shell script
 " Maintainer:           Christian Brabandt <cb@256bit.org>
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2020-01-10
+" Latest Revision:      2020-09-01
 " License:              Vim (see :h license)
 " Repository:           https://github.com/chrisbra/vim-zsh
 
@@ -19,20 +19,21 @@
 let b:undo_ftplugin = "setl com< cms< fo< "
 
 if executable('zsh')
- if !has('gui_running') && executable('less')
-   command! -buffer -nargs=1 RunHelp silent exe '!zsh -ic "autoload -Uz run-help; run-help <args> 2>/dev/null | LESS= less"' | redraw!
- elseif has('terminal')
-   command! -buffer -nargs=1 RunHelp silent exe ':term zsh -ic "autoload -Uz run-help; run-help <args>"'
- else
-   command! -buffer -nargs=1 RunHelp echo system('zsh -ic "autoload -Uz run-help; run-help <args> 2>/dev/null"')
- endif
+  if !has('gui_running') && executable('less')
+    command! -buffer -nargs=1 RunHelp silent exe '!MANPAGER= zsh -ic "autoload -Uz run-help; run-help <args> 2>/dev/null | LESS= less"' | redraw!
+  elseif has('terminal')
+    command! -buffer -nargs=1 RunHelp silent exe ':term zsh -ic "autoload -Uz run-help; run-help <args>"'
+  else
+    command! -buffer -nargs=1 RunHelp echo system('zsh -ic "autoload -Uz run-help; run-help <args> 2>/dev/null"')
+  endif
+  if !exists('current_compiler')
+    compiler zsh
+  endif
   setlocal keywordprg=:RunHelp
-  setlocal makeprg=zsh\ -n\ --\ %:S
-  setlocal errorformat=%f:\ line\ %l:\ %m
-  let b:undo_ftplugin .= 'keywordprg< errorformat< makeprg<'
+  let b:undo_ftplugin .= 'keywordprg<'
 endif
 
-let b:match_words = ',\<if\>:\<elif\>:\<else\>:\<fi\>'
+let b:match_words = '\<if\>:\<elif\>:\<else\>:\<fi\>'
       \ . ',\<case\>:^\s*([^)]*):\<esac\>'
       \ . ',\<\%(select\|while\|until\|repeat\|for\%(each\)\=\)\>:\<done\>'
 let b:match_skip = 's:comment\|string\|heredoc\|subst'
diff -Nru vim-8.2.1913/runtime/gvim.desktop vim-8.2.2434/runtime/gvim.desktop
--- vim-8.2.1913/runtime/gvim.desktop	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/gvim.desktop	2021-01-30 22:05:11.000000000 +0000
@@ -15,7 +15,7 @@
 GenericName[fr]=Éditeur de texte
 GenericName[ja]=テキストエディタ
 GenericName[ru]=Тек�товый редактор
-GenericName[sr]=Тек�т Едитор
+GenericName[sr]=Едитор тек�т
 GenericName[tr]=Metin Düzenleyici
 GenericName=Text Editor
 # Translators: This is the comment used in the Vim desktop file
@@ -24,7 +24,7 @@
 Comment[fr]=Éditer des fichiers texte
 Comment[ja]=テキストファイルを編集���
 Comment[ru]=Редактирование тек�товых файлов
-Comment[sr]=Уређивање тек�т фајлова
+Comment[sr]=Уређујте тек�т фајлове
 Comment[tr]=Metin dosyaları düzenleyin
 Comment=Edit text files
 # The translations should come from the po file. Leave them here for now, they will
@@ -112,7 +112,6 @@
 Icon[eo]=gvim
 Icon[fr]=gvim
 Icon[ru]=gvim
-Icon[sr]=gvim
 Icon=gvim
 Categories=Utility;TextEditor;
 StartupNotify=true
diff -Nru vim-8.2.1913/runtime/indent/dune.vim vim-8.2.2434/runtime/indent/dune.vim
--- vim-8.2.1913/runtime/indent/dune.vim	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/runtime/indent/dune.vim	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,13 @@
+" Vim indent file
+" Language: dune
+" Maintainers:  Markus Mottl         <markus.mottl@gmail.com>
+" URL:          https://github.com/ocaml/vim-ocaml
+" Last Change:  2021 Jan 01
+
+if exists("b:did_indent")
+ finish
+endif
+let b:did_indent = 1
+
+" dune format-dune-file uses 1 space to indent
+setlocal softtabstop=1 shiftwidth=1 expandtab
diff -Nru vim-8.2.1913/runtime/indent/fortran.vim vim-8.2.2434/runtime/indent/fortran.vim
--- vim-8.2.1913/runtime/indent/fortran.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/indent/fortran.vim	2021-01-30 22:05:11.000000000 +0000
@@ -74,11 +74,15 @@
 if (b:fortran_fixed_source == 1)
   setlocal indentexpr=FortranGetFixedIndent()
   if exists("*FortranGetFixedIndent")
+    let &cpoptions = s:cposet
+    unlet s:cposet
     finish
   endif
 else
   setlocal indentexpr=FortranGetFreeIndent()
   if exists("*FortranGetFreeIndent")
+    let &cpoptions = s:cposet
+    unlet s:cposet
     finish
   endif
 endif
@@ -213,7 +217,7 @@
   return ind
 endfunction
 
-let &cpoptions=s:cposet
+let &cpoptions = s:cposet
 unlet s:cposet
 
 " vim:sw=2 tw=130
diff -Nru vim-8.2.1913/runtime/indent/html.vim vim-8.2.2434/runtime/indent/html.vim
--- vim-8.2.1913/runtime/indent/html.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/indent/html.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1,7 +1,7 @@
 " Vim indent script for HTML
 " Maintainer:	Bram Moolenaar
 " Original Author: Andy Wokula <anwoku@yahoo.de>
-" Last Change:	2020 Jul 06
+" Last Change:	2020 Dec 11
 " Version:	1.0 "{{{
 " Description:	HTML indent script with cached state for faster indenting on a
 "		range of lines.
@@ -815,7 +815,7 @@
   let idx = match(prevtext, '^\s*\zs<!--')
   if idx >= 0
     " just below comment start, add a shiftwidth
-    return idx + shiftwidth()
+    return indent(prevlnum) + shiftwidth()
   endif
 
   " Some files add 4 spaces just below a TODO line.  It's difficult to detect
diff -Nru vim-8.2.1913/runtime/indent/ocaml.vim vim-8.2.2434/runtime/indent/ocaml.vim
--- vim-8.2.1913/runtime/indent/ocaml.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/indent/ocaml.vim	2021-01-30 22:05:11.000000000 +0000
@@ -3,7 +3,7 @@
 " Maintainers:  Jean-Francois Yuen   <jfyuen@happycoders.org>
 "               Mike Leary           <leary@nwlink.com>
 "               Markus Mottl         <markus.mottl@gmail.com>
-" URL:          http://www.ocaml.info/vim/indent/ocaml.vim
+" URL:          https://github.com/ocaml/vim-ocaml
 " Last Change:  2017 Jun 13
 "               2005 Jun 25 - Fixed multiple bugs due to 'else\nreturn ind' working
 "               2005 May 09 - Added an option to not indent OCaml-indents specially (MM)
@@ -30,7 +30,8 @@
 " Comment formatting
 if !exists("no_ocaml_comments")
  if (has("comments"))
-   setlocal comments=sr:(*,mb:*,ex:*)
+   setlocal comments=sr:(*\ ,mb:\ ,ex:*)
+   setlocal comments^=sr:(**,mb:\ \ ,ex:*)
    setlocal fo=cqort
  endif
 endif
diff -Nru vim-8.2.1913/runtime/indent/systemverilog.vim vim-8.2.2434/runtime/indent/systemverilog.vim
--- vim-8.2.1913/runtime/indent/systemverilog.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/indent/systemverilog.vim	2021-01-30 22:05:11.000000000 +0000
@@ -227,4 +227,4 @@
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim:sw=2
\ No newline at end of file
+" vim:sw=2
diff -Nru vim-8.2.1913/runtime/indent/testdir/vim.in vim-8.2.2434/runtime/indent/testdir/vim.in
--- vim-8.2.1913/runtime/indent/testdir/vim.in	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/indent/testdir/vim.in	2021-01-30 22:05:11.000000000 +0000
@@ -10,6 +10,11 @@
 \ 'some '
 \ 'string'
 
+if 1
+let x = [
+\ ]
+endif
+
 " END_INDENT
 
 " START_INDENT
@@ -22,7 +27,26 @@
 " END_INDENT
 
 " START_INDENT
+" INDENT_EXE let g:vim_indent_cont = 5
+
+let list = [
+\ 'one',
+\ 'two']
+
+" END_INDENT
+
+" START_INDENT
 " INDENT_EXE unlet g:vim_indent_cont
+
+let list = [
+'one',
+'two',
+]
+echo
+
+" END_INDENT
+
+" START_INDENT
 " INDENT_AT  this-line
 func Some()
 let f = x " this-line
diff -Nru vim-8.2.1913/runtime/indent/testdir/vim.ok vim-8.2.2434/runtime/indent/testdir/vim.ok
--- vim-8.2.1913/runtime/indent/testdir/vim.ok	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/indent/testdir/vim.ok	2021-01-30 22:05:11.000000000 +0000
@@ -10,6 +10,11 @@
 	    \ 'some '
 	    \ 'string'
 
+if 1
+    let x = [
+		\ ]
+endif
+
 " END_INDENT
 
 " START_INDENT
@@ -22,7 +27,26 @@
 " END_INDENT
 
 " START_INDENT
+" INDENT_EXE let g:vim_indent_cont = 5
+
+let list = [
+     \ 'one',
+     \ 'two']
+
+" END_INDENT
+
+" START_INDENT
 " INDENT_EXE unlet g:vim_indent_cont
+
+let list = [
+    'one',
+    'two',
+    ]
+echo
+
+" END_INDENT
+
+" START_INDENT
 " INDENT_AT  this-line
 func Some()
     let f = x " this-line
diff -Nru vim-8.2.1913/runtime/indent/vim.vim vim-8.2.2434/runtime/indent/vim.vim
--- vim-8.2.1913/runtime/indent/vim.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/indent/vim.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1,7 +1,7 @@
 " Vim indent file
 " Language:	Vim script
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2020 Sep 27
+" Last Change:	2021 Jan 21
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
@@ -38,6 +38,9 @@
   " Find a non-blank line above the current line.
   let lnum = prevnonblank(v:lnum - 1)
 
+  " The previous line, ignoring line continuation
+  let prev_text_end = lnum > 0 ? getline(lnum) : ''
+
   " If the current line doesn't start with '\' or '"\ ' and below a line that
   " starts with '\' or '"\ ', use the indent of the line above it.
   let cur_text = getline(v:lnum)
@@ -51,7 +54,10 @@
   if lnum == 0
     return 0
   endif
+
+  " the start of the previous line, skipping over line continuation
   let prev_text = getline(lnum)
+  let found_cont = 0
 
   " Add a 'shiftwidth' after :if, :while, :try, :catch, :finally, :function
   " and :else.  Add it three times for a line that starts with '\' or '"\ '
@@ -83,6 +89,7 @@
   endif
 
   if cur_text =~ s:lineContPat && v:lnum > 1 && prev_text !~ s:lineContPat
+    let found_cont = 1
     if exists("g:vim_indent_cont")
       let ind = ind + g:vim_indent_cont
     else
@@ -114,10 +121,50 @@
     endif
   endif
 
+  " For a line starting with "}" find the matching "{".  If it is at the start
+  " of the line align with it, probably end of a block.
+  " Use the mapped "%" from matchit to find the match, otherwise we may match
+  " a { inside a comment or string.
+  if cur_text =~ '^\s*}'
+    if maparg('%') != ''
+      exe v:lnum
+      silent! normal %
+      if line('.') < v:lnum && getline('.') =~ '^\s*{'
+	let ind = indent('.')
+      endif
+    else
+      " todo: use searchpair() to find a match
+    endif
+  endif
+
+  " Below a line starting with "}" find the matching "{".  If it is at the
+  " end of the line we must be below the end of a dictionary.
+  if prev_text =~ '^\s*}'
+    if maparg('%') != ''
+      exe lnum
+      silent! normal %
+      if line('.') == lnum || getline('.') !~ '^\s*{'
+	let ind = ind - shiftwidth()
+      endif
+    else
+      " todo: use searchpair() to find a match
+    endif
+  endif
+
+  " Below a line starting with "]" we must be below the end of a list.
+  if prev_text_end =~ '^\s*]'
+    let ind = ind - shiftwidth()
+  endif
+
+  " A line ending in "{"/"[} is most likely the start of a dict/list literal,
+  " indent the next line more.  Not for a continuation line.
+  if prev_text_end =~ '[{[]\s*$' && !found_cont
+    let ind = ind + shiftwidth()
+  endif
 
   " Subtract a 'shiftwidth' on a :endif, :endwhile, :catch, :finally, :endtry,
   " :endfun, :enddef, :else and :augroup END.
-  if cur_text =~ '^\s*\(ene\@!\|}\|cat\|finall\|el\|aug\%[roup]\s\+[eE][nN][dD]\)'
+  if cur_text =~ '^\s*\(ene\@!\|cat\|finall\|el\|aug\%[roup]\s\+[eE][nN][dD]\)'
     let ind = ind - shiftwidth()
   endif
 
diff -Nru vim-8.2.1913/runtime/indent/xml.vim vim-8.2.2434/runtime/indent/xml.vim
--- vim-8.2.1913/runtime/indent/xml.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/indent/xml.vim	2021-01-30 22:05:11.000000000 +0000
@@ -2,8 +2,9 @@
 " Maintainer: Christian Brabandt <cb@256bit.org>
 " Repository: https://github.com/chrisbra/vim-xml-ftplugin
 " Previous Maintainer: Johannes Zellner <johannes@zellner.org>
-" Last Changed: 2019 Dec 02
+" Last Changed: 2020 Nov 4th
 " Last Change:
+" 20200529 - Handle empty closing tags correctly
 " 20191202 - Handle docbk filetype
 " 20190726 - Correctly handle non-tagged data
 " 20190204 - correctly handle wrap tags
@@ -45,7 +46,7 @@
 endif
 
 if !exists('b:xml_indent_close')
-    let b:xml_indent_close = '.\{-}</'
+    let b:xml_indent_close = '.\{-}</\|/>.\{-}'
     " end pre tag, e.g. </address>
     " let b:xml_indent_close = '.\{-}</\(address\)\@!'
 endif
@@ -81,7 +82,7 @@
 
 " [-- return the sum of indents of a:lnum --]
 fun! <SID>XmlIndentSum(line, style, add)
-    if <SID>IsXMLContinuation(a:line) && a:style == 0
+    if <SID>IsXMLContinuation(a:line) && a:style == 0 && !<SID>IsXMLEmptyClosingTag(a:line)
         " no complete tag, add one additional indent level
         " but only for the current line
         return a:add + shiftwidth()
@@ -131,13 +132,25 @@
         endif
         let syn_name_end   = synIDattr(synID(a:lnum, strlen(curline) - 1, 1), 'name')
         let syn_name_start = synIDattr(synID(a:lnum, match(curline, '\S') + 1, 1), 'name')
+        let prev_syn_name_end   = synIDattr(synID(ptag, strlen(pline) - 1, 1), 'name')
+        " not needed (yet?)
+        " let prev_syn_name_start = synIDattr(synID(ptag, match(pline, '\S') + 1, 1), 'name')
     endif
 
     if syn_name_end =~ 'Comment' && syn_name_start =~ 'Comment'
         return <SID>XmlIndentComment(a:lnum)
     elseif empty(syn_name_start) && empty(syn_name_end) && a:use_syntax_check
         " non-xml tag content: use indent from 'autoindent'
-        return pind + shiftwidth()
+        if pline =~ b:xml_indent_close
+            return pind
+        elseif !empty(prev_syn_name_end)
+            " only indent by an extra shiftwidth, if the previous line ends
+            " with an XML like tag
+           return pind + shiftwidth()
+        else
+            " no extra indent, looks like a text continuation line
+           return pind
+        endif
     endif
 
     " Get indent from previous tag line
@@ -157,15 +170,28 @@
     return a:line !~ '>\s*$'
 endfunc
 
+func! <SID>IsXMLEmptyClosingTag(line)
+    " Checks whether the line ends with an empty closing tag such as <lb/>
+    return a:line =~? '<[^>]*/>\s*$'
+endfunc
+
 " return indent for a commented line,
 " the middle part might be indented one additional level
 func! <SID>XmlIndentComment(lnum)
-    let ptagopen = search(b:xml_indent_open, 'bnW')
+    let ptagopen = search('.\{-}<[:A-Z_a-z]\_[^/]\{-}>.\{-}', 'bnW')
     let ptagclose = search(b:xml_indent_close, 'bnW')
     if getline(a:lnum) =~ '<!--'
         " if previous tag was a closing tag, do not add
         " one additional level of indent
         if ptagclose > ptagopen && a:lnum > ptagclose
+            " If the previous tag was closed on the same line as it was
+            " declared, we should indent with its indent level.
+            if !<SID>IsXMLContinuation(getline(ptagclose))
+                return indent(ptagclose)
+            else
+                return indent(ptagclose) - shiftwidth()
+            endif
+        elseif ptagclose == ptagopen
             return indent(ptagclose)
         else
             " start of comment, add one indentation level
diff -Nru vim-8.2.1913/runtime/indent/yaml.vim vim-8.2.2434/runtime/indent/yaml.vim
--- vim-8.2.1913/runtime/indent/yaml.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/indent/yaml.vim	2021-01-30 22:05:11.000000000 +0000
@@ -2,16 +2,13 @@
 " Language:	YAML
 " Maintainer:	Nikolai Pavlov <zyx.vim@gmail.com>
 " Last Update:	Lukas Reineke
-" Last Change:	2020 Jun 07
+" Last Change:	2021 Jan 19
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
   finish
 endif
 
-let s:save_cpo = &cpo
-set cpo&vim
-
 let b:did_indent = 1
 
 setlocal indentexpr=GetYAMLIndent(v:lnum)
@@ -25,6 +22,9 @@
     finish
 endif
 
+let s:save_cpo = &cpo
+set cpo&vim
+
 function s:FindPrevLessIndentedLine(lnum, ...)
     let prevlnum = prevnonblank(a:lnum-1)
     let curindent = a:0 ? a:1 : indent(a:lnum)
diff -Nru vim-8.2.1913/runtime/keymap/korean-dubeolsik_utf-8.vim vim-8.2.2434/runtime/keymap/korean-dubeolsik_utf-8.vim
--- vim-8.2.1913/runtime/keymap/korean-dubeolsik_utf-8.vim	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/runtime/keymap/korean-dubeolsik_utf-8.vim	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,11237 @@
+" Maintainer: Jang Whemoon <palindrom615@gmail.com>
+" Last Change: Nov 24, 2020
+"
+"
+"
+" Unlike Japanese or Chinese, modern Korean texts do not depends on conversion
+" to Hanja (Chinese character). Thus, general Korean text totally can be
+" covered without help of IME but this keymap. 
+" 
+" BUT, simply mapping each letter of Hangul with sequence of alphabet 1 by 1
+" can fail to combine Hangul jamo (conconants and vowels) right.
+" For example, sequentially pressing `ㅅㅓㅇㅜㄹㄷ�ㅎ�ㄱㅛ` can not only be
+" combined as `서울대학�`, but alse `성ㅜㄹ댛�ㄱ�`, which is totally 
+" nonsense. 
+" Though combining Hangul is deterministic with law that each letter must be 
+" one of (consonant + vowel) or (consonant + vowel + consonant), there is no
+" way to apply such law without implementing input engine.
+"
+" Thus, user of this keymap should wait until previous hangul letter is
+" completed before typing next one. To reduce such inconvenience, I suggest to
+" set `timeoutlen` as their own value. (default value is 1000ms)
+scriptencoding utf-8
+
+let b:keymap_name = "ko"
+
+loadkeymap
+
+" Hangul jamo of 40 letters
+
+q	ã…‚
+w	ã…ˆ
+e	ã„·
+r	ㄱ
+t	ã……
+y	ã…›
+u	ã…•
+i	ã…‘
+o	ã…�
+p	ã…”
+a	ã…�
+s	ã„´
+d	ã…‡
+f	ㄹ
+g	ã…Ž
+h	ã…—
+j	ã…“
+k	ã…�
+l	ã…£
+z	ã…‹
+x	ㅌ
+c	ã…Š
+v	ã…�
+b	ã… 
+n	ㅜ
+m	ã…¡
+Q	ã…ƒ
+W	ã…‰
+E	ㄸ
+R	ㄲ
+T	ã…†
+O	ã…’
+P	ã…–
+
+" Hangul syllables of 11172 letters
+
+rk	ê°€
+ro	개
+ri	ê°¸
+rO	ê±”
+rj	ê±°
+rp	게
+ru	겨
+rP	계
+rh	ê³ 
+rhk	ê³¼
+rho	ê´˜
+rhl	ê´´
+ry	�
+rn	구
+rnj	궈
+rnp	궤
+rnl	ê·€
+rb	규
+rm	ê·¸
+rml	긔
+rl	기
+Rk	까
+Ro	깨
+Ri	꺄
+RO	꺠
+Rj	꺼
+Rp	께
+Ru	ê»´
+RP	�
+Rh	꼬
+Rhk	꽈
+Rho	꽤
+Rhl	ê¾€
+Ry	꾜
+Rn	꾸
+Rnj	ê¿”
+Rnp	ê¿°
+Rnl	뀌
+Rb	뀨
+Rm	�
+Rml	�
+Rl	�
+sk	나
+so	ë‚´
+si	�
+sO	냬
+sj	너
+sp	네
+su	ë…€
+sP	녜
+sh	ë…¸
+shk	놔
+sho	놰
+shl	뇌
+sy	뇨
+sn	누
+snj	눠
+snp	눼
+snl	뉘
+sb	뉴
+sm	�
+sml	늬
+sl	니
+ek	다
+eo	대
+ei	댜
+eO	댸
+ej	�
+ep	�
+eu	뎌
+eP	뎨
+eh	�
+ehk	�
+eho	�
+ehl	�
+ey	�
+en	�
+enj	둬
+enp	ë’ˆ
+enl	ë’¤
+eb	ë“€
+em	드
+eml	듸
+el	ë””
+Ek	ë”°
+Eo	때
+Ei	땨
+EO	ë–„
+Ej	ë– 
+Ep	ë–¼
+Eu	ë—˜
+EP	ë—´
+Eh	�
+Ehk	똬
+Eho	뙈
+Ehl	뙤
+Ey	뚀
+En	뚜
+Enj	뚸
+Enp	ë›”
+Enl	ë›°
+Eb	뜌
+Em	뜨
+Eml	�
+El	�
+fk	�
+fo	래
+fi	ëž´
+fO	�
+fj	러
+fp	ë ˆ
+fu	ë ¤
+fP	ë¡€
+fh	로
+fhk	롸
+fho	뢔
+fhl	뢰
+fy	료
+fn	루
+fnj	뤄
+fnp	뤠
+fnl	뤼
+fb	류
+fm	르
+fml	�
+fl	리
+ak	마
+ao	매
+ai	먀
+aO	먜
+aj	머
+ap	ë©”
+au	ë©°
+aP	몌
+ah	모
+ahk	ë«„
+aho	ë« 
+ahl	뫼
+ay	묘
+an	무
+anj	ë­�
+anp	ë­¬
+anl	뮈
+ab	뮤
+am	므
+aml	믜
+al	미
+qk	ë°”
+qo	ë°°
+qi	뱌
+qO	뱨
+qj	버
+qp	ë² 
+qu	ë²¼
+qP	볘
+qh	ë³´
+qhk	ë´�
+qho	ë´¬
+qhl	뵈
+qy	뵤
+qn	부
+qnj	붜
+qnp	붸
+qnl	ë·”
+qb	ë·°
+qm	브
+qml	븨
+ql	비
+Qk	ë¹ 
+Qo	ë¹¼
+Qi	뺘
+QO	뺴
+Qj	�
+Qp	뻬
+Qu	뼈
+QP	뼤
+Qh	ë½€
+Qhk	뽜
+Qho	뽸
+Qhl	ë¾”
+Qy	ë¾°
+Qn	뿌
+Qnj	뿨
+Qnp	쀄
+Qnl	쀠
+Qb	쀼
+Qm	�
+Qml	�
+Ql	�
+tk	사
+to	새
+ti	샤
+tO	ì„€
+tj	서
+tp	세
+tu	ì…”
+tP	ì…°
+th	소
+thk	솨
+tho	쇄
+thl	쇠
+ty	쇼
+tn	수
+tnj	숴
+tnp	�
+tnl	쉬
+tb	슈
+tm	스
+tml	ì‹€
+tl	시
+Tk	싸
+To	쌔
+Ti	쌰
+TO	�
+Tj	�
+Tp	쎄
+Tu	쎠
+TP	쎼
+Th	�
+Thk	�
+Tho	�
+Thl	�
+Ty	쑈
+Tn	쑤
+Tnj	ì’€
+Tnp	쒜
+Tnl	ì’¸
+Tb	ì“”
+Tm	ì“°
+Tml	씌
+Tl	씨
+dk	ì•„
+do	ì• 
+di	야
+dO	ì–˜
+dj	ì–´
+dp	ì—�
+du	ì—¬
+dP	예
+dh	오
+dhk	와
+dho	왜
+dhl	외
+dy	ìš”
+dn	ìš°
+dnj	워
+dnp	웨
+dnl	위
+db	유
+dm	으
+dml	�
+dl	�
+wk	�
+wo	재
+wi	쟈
+wO	쟤
+wj	ì €
+wp	제
+wu	ì ¸
+wP	ì¡”
+wh	ì¡°
+whk	좌
+who	좨
+whl	죄
+wy	죠
+wn	주
+wnj	줘
+wnp	줴
+wnl	�
+wb	쥬
+wm	즈
+wml	즤
+wl	지
+Wk	짜
+Wo	째
+Wi	쨔
+WO	쨰
+Wj	쩌
+Wp	쩨
+Wu	쪄
+WP	쪠
+Wh	쪼
+Whk	쫘
+Who	ì«´
+Whl	�
+Wy	쬬
+Wn	ì­ˆ
+Wnj	ì­¤
+Wnp	쮀
+Wnl	쮜
+Wb	쮸
+Wm	쯔
+Wml	쯰
+Wl	찌
+ck	ì°¨
+co	채
+ci	ì± 
+cO	ì±¼
+cj	처
+cp	ì²´
+cu	�
+cP	쳬
+ch	ì´ˆ
+chk	ì´¤
+cho	ìµ€
+chl	최
+cy	쵸
+cn	추
+cnj	춰
+cnp	췌
+cnl	ì·¨
+cb	츄
+cm	츠
+cml	츼
+cl	치
+zk	ì¹´
+zo	�
+zi	캬
+zO	컈
+zj	커
+zp	ì¼€
+zu	켜
+zP	켸
+zh	ì½”
+zhk	ì½°
+zho	쾌
+zhl	쾨
+zy	ì¿„
+zn	ì¿ 
+znj	쿼
+znp	퀘
+znl	퀴
+zb	�
+zm	�
+zml	킈
+zl	키
+xk	타
+xo	태
+xi	탸
+xO	í„”
+xj	í„°
+xp	테
+xu	í…¨
+xP	톄
+xh	토
+xhk	톼
+xho	퇘
+xhl	퇴
+xy	�
+xn	투
+xnj	퉈
+xnp	퉤
+xnl	튀
+xb	튜
+xm	트
+xml	í‹”
+xl	í‹°
+vk	파
+vo	패
+vi	�
+vO	�
+vj	�
+vp	페
+vu	펴
+vP	�
+vh	�
+vhk	�
+vho	�
+vhl	í‘€
+vy	표
+vn	푸
+vnj	í’”
+vnp	í’°
+vnl	퓌
+vb	퓨
+vm	프
+vml	í” 
+vl	피
+gk	하
+go	í•´
+gi	í–�
+gO	í–¬
+gj	í—ˆ
+gp	í—¤
+gu	혀
+gP	혜
+gh	호
+ghk	í™”
+gho	í™°
+ghl	회
+gy	효
+gn	후
+gnj	í› 
+gnp	훼
+gnl	휘
+gb	휴
+gm	�
+gml	�
+gl	히
+rkr	ê°�
+rkR	ê°‚
+rkrt	ê°ƒ
+rks	ê°„
+rksw	ê°…
+rksg	ê°†
+rke	ê°‡
+rkf	ê°ˆ
+rkfr	ê°‰
+rkfa	ê°Š
+rkfq	ê°‹
+rkft	갌
+rkfx	ê°�
+rkfv	ê°Ž
+rkfg	ê°�
+rka	ê°�
+rkq	ê°‘
+rkqt	ê°’
+rkt	ê°“
+rkT	ê°”
+rkd	ê°•
+rkw	ê°–
+rkc	ê°—
+rkz	ê°˜
+rkx	ê°™
+rkv	ê°š
+rkg	ê°›
+ror	ê°�
+roR	ê°ž
+rort	ê°Ÿ
+ros	ê° 
+rosw	ê°¡
+rosg	ê°¢
+roe	ê°£
+rof	ê°¤
+rofr	ê°¥
+rofa	ê°¦
+rofq	ê°§
+roft	ê°¨
+rofx	ê°©
+rofv	ê°ª
+rofg	ê°«
+roa	ê°¬
+roq	ê°­
+roqt	ê°®
+rot	ê°¯
+roT	ê°°
+rod	ê°±
+row	ê°²
+roc	ê°³
+roz	ê°´
+rox	ê°µ
+rov	ê°¶
+rog	ê°·
+rir	ê°¹
+riR	ê°º
+rirt	ê°»
+ris	ê°¼
+risw	ê°½
+risg	ê°¾
+rie	ê°¿
+rif	ê±€
+rifr	�
+rifa	걂
+rifq	걃
+rift	걄
+rifx	ê±…
+rifv	걆
+rifg	걇
+ria	걈
+riq	걉
+riqt	걊
+rit	걋
+riT	걌
+rid	�
+riw	걎
+ric	�
+riz	�
+rix	걑
+riv	ê±’
+rig	걓
+rOr	걕
+rOR	ê±–
+rOrt	ê±—
+rOs	걘
+rOsw	ê±™
+rOsg	걚
+rOe	ê±›
+rOf	걜
+rOfr	�
+rOfa	걞
+rOfq	걟
+rOft	ê± 
+rOfx	걡
+rOfv	ê±¢
+rOfg	ê±£
+rOa	걤
+rOq	ê±¥
+rOqt	걦
+rOt	걧
+rOT	걨
+rOd	걩
+rOw	걪
+rOc	걫
+rOz	걬
+rOx	ê±­
+rOv	ê±®
+rOg	걯
+rjr	ê±±
+rjR	ê±²
+rjrt	ê±³
+rjs	ê±´
+rjsw	ê±µ
+rjsg	걶
+rje	ê±·
+rjf	걸
+rjfr	ê±¹
+rjfa	걺
+rjfq	ê±»
+rjft	ê±¼
+rjfx	ê±½
+rjfv	ê±¾
+rjfg	걿
+rja	ê²€
+rjq	�
+rjqt	겂
+rjt	것
+rjT	겄
+rjd	ê²…
+rjw	겆
+rjc	겇
+rjz	겈
+rjx	겉
+rjv	겊
+rjg	겋
+rpr	�
+rpR	겎
+rprt	�
+rps	�
+rpsw	겑
+rpsg	ê²’
+rpe	겓
+rpf	ê²”
+rpfr	겕
+rpfa	ê²–
+rpfq	ê²—
+rpft	겘
+rpfx	ê²™
+rpfv	겚
+rpfg	ê²›
+rpa	겜
+rpq	�
+rpqt	겞
+rpt	겟
+rpT	ê² 
+rpd	겡
+rpw	ê²¢
+rpc	ê²£
+rpz	겤
+rpx	ê²¥
+rpv	겦
+rpg	겧
+rur	격
+ruR	겪
+rurt	겫
+rus	견
+rusw	ê²­
+rusg	ê²®
+rue	겯
+ruf	ê²°
+rufr	ê²±
+rufa	ê²²
+rufq	ê²³
+ruft	ê²´
+rufx	ê²µ
+rufv	겶
+rufg	ê²·
+rua	겸
+ruq	ê²¹
+ruqt	겺
+rut	ê²»
+ruT	ê²¼
+rud	ê²½
+ruw	ê²¾
+ruc	겿
+ruz	ê³€
+rux	�
+ruv	곂
+rug	곃
+rPr	ê³…
+rPR	곆
+rPrt	곇
+rPs	곈
+rPsw	곉
+rPsg	곊
+rPe	곋
+rPf	곌
+rPfr	�
+rPfa	곎
+rPfq	�
+rPft	�
+rPfx	곑
+rPfv	ê³’
+rPfg	곓
+rPa	ê³”
+rPq	곕
+rPqt	ê³–
+rPt	ê³—
+rPT	곘
+rPd	ê³™
+rPw	곚
+rPc	ê³›
+rPz	곜
+rPx	�
+rPv	곞
+rPg	곟
+rhr	곡
+rhR	ê³¢
+rhrt	ê³£
+rhs	곤
+rhsw	ê³¥
+rhsg	곦
+rhe	곧
+rhf	골
+rhfr	곩
+rhfa	곪
+rhfq	곫
+rhft	곬
+rhfx	ê³­
+rhfv	ê³®
+rhfg	곯
+rha	ê³°
+rhq	ê³±
+rhqt	ê³²
+rht	ê³³
+rhT	ê³´
+rhd	ê³µ
+rhw	곶
+rhc	ê³·
+rhz	곸
+rhx	ê³¹
+rhv	곺
+rhg	ê³»
+rhkr	ê³½
+rhkR	ê³¾
+rhkrt	곿
+rhks	ê´€
+rhksw	ê´�
+rhksg	ê´‚
+rhke	ê´ƒ
+rhkf	ê´„
+rhkfr	ê´…
+rhkfa	ê´†
+rhkfq	ê´‡
+rhkft	ê´ˆ
+rhkfx	ê´‰
+rhkfv	ê´Š
+rhkfg	ê´‹
+rhka	괌
+rhkq	ê´�
+rhkqt	ê´Ž
+rhkt	ê´�
+rhkT	ê´�
+rhkd	ê´‘
+rhkw	ê´’
+rhkc	ê´“
+rhkz	ê´”
+rhkx	ê´•
+rhkv	ê´–
+rhkg	ê´—
+rhor	ê´™
+rhoR	ê´š
+rhort	ê´›
+rhos	괜
+rhosw	ê´�
+rhosg	ê´ž
+rhoe	ê´Ÿ
+rhof	ê´ 
+rhofr	ê´¡
+rhofa	ê´¢
+rhofq	ê´£
+rhoft	ê´¤
+rhofx	ê´¥
+rhofv	ê´¦
+rhofg	ê´§
+rhoa	ê´¨
+rhoq	ê´©
+rhoqt	ê´ª
+rhot	ê´«
+rhoT	ê´¬
+rhod	ê´­
+rhow	ê´®
+rhoc	ê´¯
+rhoz	ê´°
+rhox	ê´±
+rhov	ê´²
+rhog	ê´³
+rhlr	ê´µ
+rhlR	ê´¶
+rhlrt	ê´·
+rhls	ê´¸
+rhlsw	ê´¹
+rhlsg	ê´º
+rhle	ê´»
+rhlf	ê´¼
+rhlfr	ê´½
+rhlfa	ê´¾
+rhlfq	ê´¿
+rhlft	êµ€
+rhlfx	�
+rhlfv	굂
+rhlfg	굃
+rhla	굄
+rhlq	êµ…
+rhlqt	굆
+rhlt	굇
+rhlT	굈
+rhld	굉
+rhlw	굊
+rhlc	굋
+rhlz	굌
+rhlx	�
+rhlv	굎
+rhlg	�
+ryr	굑
+ryR	êµ’
+ryrt	굓
+rys	êµ”
+rysw	굕
+rysg	êµ–
+rye	êµ—
+ryf	굘
+ryfr	êµ™
+ryfa	굚
+ryfq	êµ›
+ryft	굜
+ryfx	�
+ryfv	굞
+ryfg	굟
+rya	êµ 
+ryq	굡
+ryqt	êµ¢
+ryt	êµ£
+ryT	굤
+ryd	êµ¥
+ryw	굦
+ryc	굧
+ryz	굨
+ryx	굩
+ryv	굪
+ryg	굫
+rnr	êµ­
+rnR	êµ®
+rnrt	굯
+rns	êµ°
+rnsw	êµ±
+rnsg	êµ²
+rne	êµ³
+rnf	êµ´
+rnfr	êµµ
+rnfa	굶
+rnfq	êµ·
+rnft	굸
+rnfx	êµ¹
+rnfv	굺
+rnfg	êµ»
+rna	êµ¼
+rnq	êµ½
+rnqt	êµ¾
+rnt	굿
+rnT	궀
+rnd	�
+rnw	궂
+rnc	궃
+rnz	궄
+rnx	궅
+rnv	궆
+rng	궇
+rnjr	궉
+rnjR	궊
+rnjrt	궋
+rnjs	권
+rnjsw	�
+rnjsg	궎
+rnje	�
+rnjf	�
+rnjfr	궑
+rnjfa	궒
+rnjfq	궓
+rnjft	궔
+rnjfx	궕
+rnjfv	궖
+rnjfg	궗
+rnja	궘
+rnjq	궙
+rnjqt	궚
+rnjt	궛
+rnjT	궜
+rnjd	�
+rnjw	궞
+rnjc	궟
+rnjz	궠
+rnjx	궡
+rnjv	궢
+rnjg	궣
+rnpr	궥
+rnpR	궦
+rnprt	궧
+rnps	궨
+rnpsw	궩
+rnpsg	궪
+rnpe	궫
+rnpf	궬
+rnpfr	궭
+rnpfa	궮
+rnpfq	궯
+rnpft	궰
+rnpfx	궱
+rnpfv	궲
+rnpfg	궳
+rnpa	궴
+rnpq	궵
+rnpqt	궶
+rnpt	궷
+rnpT	궸
+rnpd	궹
+rnpw	궺
+rnpc	궻
+rnpz	궼
+rnpx	궽
+rnpv	궾
+rnpg	궿
+rnlr	ê·�
+rnlR	ê·‚
+rnlrt	ê·ƒ
+rnls	ê·„
+rnlsw	ê·…
+rnlsg	ê·†
+rnle	ê·‡
+rnlf	ê·ˆ
+rnlfr	ê·‰
+rnlfa	ê·Š
+rnlfq	ê·‹
+rnlft	귌
+rnlfx	ê·�
+rnlfv	ê·Ž
+rnlfg	ê·�
+rnla	ê·�
+rnlq	ê·‘
+rnlqt	ê·’
+rnlt	ê·“
+rnlT	ê·”
+rnld	ê·•
+rnlw	ê·–
+rnlc	ê·—
+rnlz	ê·˜
+rnlx	ê·™
+rnlv	ê·š
+rnlg	ê·›
+rbr	ê·�
+rbR	ê·ž
+rbrt	ê·Ÿ
+rbs	ê· 
+rbsw	ê·¡
+rbsg	ê·¢
+rbe	ê·£
+rbf	ê·¤
+rbfr	ê·¥
+rbfa	ê·¦
+rbfq	ê·§
+rbft	ê·¨
+rbfx	ê·©
+rbfv	ê·ª
+rbfg	ê·«
+rba	ê·¬
+rbq	ê·­
+rbqt	ê·®
+rbt	ê·¯
+rbT	ê·°
+rbd	ê·±
+rbw	ê·²
+rbc	ê·³
+rbz	ê·´
+rbx	ê·µ
+rbv	ê·¶
+rbg	ê··
+rmr	ê·¹
+rmR	ê·º
+rmrt	ê·»
+rms	ê·¼
+rmsw	ê·½
+rmsg	ê·¾
+rme	ê·¿
+rmf	글
+rmfr	�
+rmfa	긂
+rmfq	긃
+rmft	긄
+rmfx	긅
+rmfv	긆
+rmfg	긇
+rma	금
+rmq	급
+rmqt	긊
+rmt	긋
+rmT	긌
+rmd	�
+rmw	긎
+rmc	�
+rmz	�
+rmx	긑
+rmv	긒
+rmg	긓
+rmlr	긕
+rmlR	긖
+rmlrt	긗
+rmls	긘
+rmlsw	긙
+rmlsg	긚
+rmle	긛
+rmlf	긜
+rmlfr	�
+rmlfa	긞
+rmlfq	긟
+rmlft	긠
+rmlfx	긡
+rmlfv	긢
+rmlfg	긣
+rmla	긤
+rmlq	긥
+rmlqt	긦
+rmlt	긧
+rmlT	긨
+rmld	긩
+rmlw	긪
+rmlc	긫
+rmlz	긬
+rmlx	긭
+rmlv	긮
+rmlg	긯
+rlr	긱
+rlR	긲
+rlrt	긳
+rls	긴
+rlsw	긵
+rlsg	긶
+rle	긷
+rlf	길
+rlfr	긹
+rlfa	긺
+rlfq	긻
+rlft	긼
+rlfx	긽
+rlfv	긾
+rlfg	긿
+rla	ê¹€
+rlq	�
+rlqt	깂
+rlt	깃
+rlT	깄
+rld	ê¹…
+rlw	깆
+rlc	깇
+rlz	깈
+rlx	깉
+rlv	깊
+rlg	깋
+Rkr	�
+RkR	깎
+Rkrt	�
+Rks	�
+Rksw	깑
+Rksg	ê¹’
+Rke	깓
+Rkf	ê¹”
+Rkfr	깕
+Rkfa	ê¹–
+Rkfq	ê¹—
+Rkft	깘
+Rkfx	ê¹™
+Rkfv	깚
+Rkfg	ê¹›
+Rka	깜
+Rkq	�
+Rkqt	깞
+Rkt	깟
+RkT	ê¹ 
+Rkd	깡
+Rkw	ê¹¢
+Rkc	ê¹£
+Rkz	깤
+Rkx	ê¹¥
+Rkv	깦
+Rkg	깧
+Ror	깩
+RoR	깪
+Rort	깫
+Ros	깬
+Rosw	ê¹­
+Rosg	ê¹®
+Roe	깯
+Rof	ê¹°
+Rofr	ê¹±
+Rofa	ê¹²
+Rofq	ê¹³
+Roft	ê¹´
+Rofx	ê¹µ
+Rofv	깶
+Rofg	ê¹·
+Roa	깸
+Roq	ê¹¹
+Roqt	깺
+Rot	ê¹»
+RoT	ê¹¼
+Rod	ê¹½
+Row	ê¹¾
+Roc	깿
+Roz	꺀
+Rox	�
+Rov	꺂
+Rog	꺃
+Rir	꺅
+RiR	꺆
+Rirt	꺇
+Ris	꺈
+Risw	꺉
+Risg	꺊
+Rie	꺋
+Rif	꺌
+Rifr	�
+Rifa	꺎
+Rifq	�
+Rift	�
+Rifx	꺑
+Rifv	꺒
+Rifg	꺓
+Ria	꺔
+Riq	꺕
+Riqt	꺖
+Rit	꺗
+RiT	꺘
+Rid	꺙
+Riw	꺚
+Ric	꺛
+Riz	꺜
+Rix	�
+Riv	꺞
+Rig	꺟
+ROr	꺡
+ROR	꺢
+ROrt	꺣
+ROs	꺤
+ROsw	꺥
+ROsg	꺦
+ROe	꺧
+ROf	꺨
+ROfr	꺩
+ROfa	꺪
+ROfq	꺫
+ROft	꺬
+ROfx	꺭
+ROfv	꺮
+ROfg	꺯
+ROa	꺰
+ROq	꺱
+ROqt	꺲
+ROt	꺳
+ROT	꺴
+ROd	꺵
+ROw	꺶
+ROc	꺷
+ROz	꺸
+ROx	꺹
+ROv	꺺
+ROg	꺻
+Rjr	꺽
+RjR	꺾
+Rjrt	꺿
+Rjs	껀
+Rjsw	�
+Rjsg	껂
+Rje	껃
+Rjf	껄
+Rjfr	ê»…
+Rjfa	껆
+Rjfq	껇
+Rjft	껈
+Rjfx	껉
+Rjfv	껊
+Rjfg	껋
+Rja	껌
+Rjq	�
+Rjqt	껎
+Rjt	�
+RjT	�
+Rjd	껑
+Rjw	ê»’
+Rjc	껓
+Rjz	ê»”
+Rjx	껕
+Rjv	ê»–
+Rjg	ê»—
+Rpr	ê»™
+RpR	껚
+Rprt	ê»›
+Rps	껜
+Rpsw	�
+Rpsg	껞
+Rpe	껟
+Rpf	ê» 
+Rpfr	껡
+Rpfa	껢
+Rpfq	껣
+Rpft	껤
+Rpfx	껥
+Rpfv	껦
+Rpfg	껧
+Rpa	껨
+Rpq	껩
+Rpqt	껪
+Rpt	껫
+RpT	껬
+Rpd	ê»­
+Rpw	ê»®
+Rpc	껯
+Rpz	ê»°
+Rpx	ê»±
+Rpv	껲
+Rpg	껳
+Rur	껵
+RuR	껶
+Rurt	ê»·
+Rus	껸
+Rusw	껹
+Rusg	껺
+Rue	ê»»
+Ruf	껼
+Rufr	껽
+Rufa	껾
+Rufq	껿
+Ruft	ê¼€
+Rufx	�
+Rufv	꼂
+Rufg	꼃
+Rua	꼄
+Ruq	ê¼…
+Ruqt	꼆
+Rut	꼇
+RuT	꼈
+Rud	꼉
+Ruw	꼊
+Ruc	꼋
+Ruz	꼌
+Rux	�
+Ruv	꼎
+Rug	�
+RPr	꼑
+RPR	ê¼’
+RPrt	꼓
+RPs	ê¼”
+RPsw	꼕
+RPsg	ê¼–
+RPe	ê¼—
+RPf	꼘
+RPfr	ê¼™
+RPfa	꼚
+RPfq	ê¼›
+RPft	꼜
+RPfx	�
+RPfv	꼞
+RPfg	꼟
+RPa	ê¼ 
+RPq	꼡
+RPqt	ê¼¢
+RPt	ê¼£
+RPT	꼤
+RPd	ê¼¥
+RPw	꼦
+RPc	꼧
+RPz	꼨
+RPx	꼩
+RPv	꼪
+RPg	꼫
+Rhr	ê¼­
+RhR	ê¼®
+Rhrt	꼯
+Rhs	ê¼°
+Rhsw	ê¼±
+Rhsg	ê¼²
+Rhe	ê¼³
+Rhf	ê¼´
+Rhfr	ê¼µ
+Rhfa	꼶
+Rhfq	ê¼·
+Rhft	꼸
+Rhfx	ê¼¹
+Rhfv	꼺
+Rhfg	ê¼»
+Rha	ê¼¼
+Rhq	ê¼½
+Rhqt	ê¼¾
+Rht	꼿
+RhT	ê½€
+Rhd	�
+Rhw	꽂
+Rhc	꽃
+Rhz	꽄
+Rhx	ê½…
+Rhv	꽆
+Rhg	꽇
+Rhkr	꽉
+RhkR	꽊
+Rhkrt	꽋
+Rhks	꽌
+Rhksw	�
+Rhksg	꽎
+Rhke	�
+Rhkf	�
+Rhkfr	꽑
+Rhkfa	ê½’
+Rhkfq	꽓
+Rhkft	ê½”
+Rhkfx	꽕
+Rhkfv	ê½–
+Rhkfg	ê½—
+Rhka	꽘
+Rhkq	ê½™
+Rhkqt	꽚
+Rhkt	ê½›
+RhkT	꽜
+Rhkd	�
+Rhkw	꽞
+Rhkc	꽟
+Rhkz	ê½ 
+Rhkx	꽡
+Rhkv	ê½¢
+Rhkg	ê½£
+Rhor	ê½¥
+RhoR	꽦
+Rhort	꽧
+Rhos	꽨
+Rhosw	꽩
+Rhosg	꽪
+Rhoe	꽫
+Rhof	꽬
+Rhofr	ê½­
+Rhofa	ê½®
+Rhofq	꽯
+Rhoft	ê½°
+Rhofx	ê½±
+Rhofv	ê½²
+Rhofg	ê½³
+Rhoa	ê½´
+Rhoq	ê½µ
+Rhoqt	꽶
+Rhot	ê½·
+RhoT	꽸
+Rhod	ê½¹
+Rhow	꽺
+Rhoc	ê½»
+Rhoz	ê½¼
+Rhox	ê½½
+Rhov	ê½¾
+Rhog	꽿
+Rhlr	�
+RhlR	꾂
+Rhlrt	꾃
+Rhls	꾄
+Rhlsw	ê¾…
+Rhlsg	꾆
+Rhle	꾇
+Rhlf	꾈
+Rhlfr	꾉
+Rhlfa	꾊
+Rhlfq	꾋
+Rhlft	꾌
+Rhlfx	�
+Rhlfv	꾎
+Rhlfg	�
+Rhla	�
+Rhlq	꾑
+Rhlqt	ê¾’
+Rhlt	꾓
+RhlT	ê¾”
+Rhld	꾕
+Rhlw	ê¾–
+Rhlc	ê¾—
+Rhlz	꾘
+Rhlx	ê¾™
+Rhlv	꾚
+Rhlg	ê¾›
+Ryr	�
+RyR	꾞
+Ryrt	꾟
+Rys	ê¾ 
+Rysw	꾡
+Rysg	ê¾¢
+Rye	ê¾£
+Ryf	꾤
+Ryfr	ê¾¥
+Ryfa	꾦
+Ryfq	꾧
+Ryft	꾨
+Ryfx	꾩
+Ryfv	꾪
+Ryfg	꾫
+Rya	꾬
+Ryq	ê¾­
+Ryqt	ê¾®
+Ryt	꾯
+RyT	ê¾°
+Ryd	ê¾±
+Ryw	ê¾²
+Ryc	ê¾³
+Ryz	ê¾´
+Ryx	ê¾µ
+Ryv	꾶
+Ryg	ê¾·
+Rnr	ê¾¹
+RnR	꾺
+Rnrt	ê¾»
+Rns	ê¾¼
+Rnsw	ê¾½
+Rnsg	ê¾¾
+Rne	꾿
+Rnf	ê¿€
+Rnfr	�
+Rnfa	ê¿‚
+Rnfq	꿃
+Rnft	ê¿„
+Rnfx	ê¿…
+Rnfv	꿆
+Rnfg	꿇
+Rna	꿈
+Rnq	꿉
+Rnqt	ê¿Š
+Rnt	ê¿‹
+RnT	꿌
+Rnd	�
+Rnw	ê¿Ž
+Rnc	�
+Rnz	�
+Rnx	ê¿‘
+Rnv	ê¿’
+Rng	ê¿“
+Rnjr	ê¿•
+RnjR	ê¿–
+Rnjrt	ê¿—
+Rnjs	꿘
+Rnjsw	ê¿™
+Rnjsg	ê¿š
+Rnje	ê¿›
+Rnjf	꿜
+Rnjfr	�
+Rnjfa	ê¿ž
+Rnjfq	ê¿Ÿ
+Rnjft	ê¿ 
+Rnjfx	ê¿¡
+Rnjfv	ê¿¢
+Rnjfg	ê¿£
+Rnja	꿤
+Rnjq	ê¿¥
+Rnjqt	꿦
+Rnjt	꿧
+RnjT	꿨
+Rnjd	ê¿©
+Rnjw	꿪
+Rnjc	ê¿«
+Rnjz	꿬
+Rnjx	ê¿­
+Rnjv	ê¿®
+Rnjg	꿯
+Rnpr	꿱
+RnpR	꿲
+Rnprt	꿳
+Rnps	ê¿´
+Rnpsw	꿵
+Rnpsg	꿶
+Rnpe	ê¿·
+Rnpf	꿸
+Rnpfr	꿹
+Rnpfa	꿺
+Rnpfq	ê¿»
+Rnpft	꿼
+Rnpfx	꿽
+Rnpfv	꿾
+Rnpfg	ê¿¿
+Rnpa	뀀
+Rnpq	�
+Rnpqt	뀂
+Rnpt	뀃
+RnpT	뀄
+Rnpd	뀅
+Rnpw	뀆
+Rnpc	뀇
+Rnpz	뀈
+Rnpx	뀉
+Rnpv	뀊
+Rnpg	뀋
+Rnlr	�
+RnlR	뀎
+Rnlrt	�
+Rnls	�
+Rnlsw	뀑
+Rnlsg	뀒
+Rnle	뀓
+Rnlf	뀔
+Rnlfr	뀕
+Rnlfa	뀖
+Rnlfq	뀗
+Rnlft	뀘
+Rnlfx	뀙
+Rnlfv	뀚
+Rnlfg	뀛
+Rnla	뀜
+Rnlq	�
+Rnlqt	뀞
+Rnlt	뀟
+RnlT	뀠
+Rnld	뀡
+Rnlw	뀢
+Rnlc	뀣
+Rnlz	뀤
+Rnlx	뀥
+Rnlv	뀦
+Rnlg	뀧
+Rbr	뀩
+RbR	뀪
+Rbrt	뀫
+Rbs	뀬
+Rbsw	뀭
+Rbsg	뀮
+Rbe	뀯
+Rbf	뀰
+Rbfr	뀱
+Rbfa	뀲
+Rbfq	뀳
+Rbft	뀴
+Rbfx	뀵
+Rbfv	뀶
+Rbfg	뀷
+Rba	뀸
+Rbq	뀹
+Rbqt	뀺
+Rbt	뀻
+RbT	뀼
+Rbd	뀽
+Rbw	뀾
+Rbc	뀿
+Rbz	�
+Rbx	�
+Rbv	�
+Rbg	�
+Rmr	�
+RmR	�
+Rmrt	�
+Rms	�
+Rmsw	�
+Rmsg	�
+Rme	�
+Rmf	�
+Rmfr	�
+Rmfa	�
+Rmfq	�
+Rmft	�
+Rmfx	�
+Rmfv	�
+Rmfg	�
+Rma	�
+Rmq	�
+Rmqt	�
+Rmt	�
+RmT	�
+Rmd	�
+Rmw	�
+Rmc	�
+Rmz	�
+Rmx	�
+Rmv	�
+Rmg	�
+Rmlr	�
+RmlR	�
+Rmlrt	�
+Rmls	�
+Rmlsw	�
+Rmlsg	�
+Rmle	�
+Rmlf	�
+Rmlfr	�
+Rmlfa	�
+Rmlfq	�
+Rmlft	�
+Rmlfx	�
+Rmlfv	�
+Rmlfg	�
+Rmla	�
+Rmlq	�
+Rmlqt	�
+Rmlt	�
+RmlT	�
+Rmld	�
+Rmlw	�
+Rmlc	�
+Rmlz	�
+Rmlx	�
+Rmlv	�
+Rmlg	�
+Rlr	�
+RlR	�
+Rlrt	�
+Rls	ë‚€
+Rlsw	�
+Rlsg	ë‚‚
+Rle	낃
+Rlf	ë‚„
+Rlfr	ë‚…
+Rlfa	낆
+Rlfq	낇
+Rlft	낈
+Rlfx	낉
+Rlfv	ë‚Š
+Rlfg	ë‚‹
+Rla	낌
+Rlq	�
+Rlqt	ë‚Ž
+Rlt	�
+RlT	�
+Rld	ë‚‘
+Rlw	ë‚’
+Rlc	ë‚“
+Rlz	ë‚”
+Rlx	ë‚•
+Rlv	ë‚–
+Rlg	ë‚—
+skr	ë‚™
+skR	ë‚š
+skrt	ë‚›
+sks	난
+sksw	�
+sksg	ë‚ž
+ske	ë‚Ÿ
+skf	ë‚ 
+skfr	ë‚¡
+skfa	ë‚¢
+skfq	ë‚£
+skft	낤
+skfx	ë‚¥
+skfv	낦
+skfg	낧
+ska	남
+skq	ë‚©
+skqt	낪
+skt	ë‚«
+skT	났
+skd	ë‚­
+skw	ë‚®
+skc	낯
+skz	ë‚°
+skx	낱
+skv	낲
+skg	낳
+sor	낵
+soR	낶
+sort	ë‚·
+sos	낸
+sosw	낹
+sosg	낺
+soe	ë‚»
+sof	낼
+sofr	낽
+sofa	낾
+sofq	ë‚¿
+soft	냀
+sofx	�
+sofv	냂
+sofg	냃
+soa	냄
+soq	냅
+soqt	냆
+sot	냇
+soT	냈
+sod	냉
+sow	냊
+soc	냋
+soz	냌
+sox	�
+sov	냎
+sog	�
+sir	냑
+siR	냒
+sirt	냓
+sis	냔
+sisw	냕
+sisg	냖
+sie	냗
+sif	냘
+sifr	냙
+sifa	냚
+sifq	냛
+sift	냜
+sifx	�
+sifv	냞
+sifg	냟
+sia	냠
+siq	냡
+siqt	냢
+sit	냣
+siT	냤
+sid	냥
+siw	냦
+sic	냧
+siz	냨
+six	냩
+siv	냪
+sig	냫
+sOr	냭
+sOR	냮
+sOrt	냯
+sOs	냰
+sOsw	냱
+sOsg	냲
+sOe	냳
+sOf	냴
+sOfr	냵
+sOfa	냶
+sOfq	냷
+sOft	냸
+sOfx	냹
+sOfv	냺
+sOfg	냻
+sOa	냼
+sOq	냽
+sOqt	냾
+sOt	냿
+sOT	ë„€
+sOd	�
+sOw	ë„‚
+sOc	넃
+sOz	ë„„
+sOx	ë„…
+sOv	넆
+sOg	넇
+sjr	넉
+sjR	ë„Š
+sjrt	ë„‹
+sjs	넌
+sjsw	�
+sjsg	ë„Ž
+sje	�
+sjf	�
+sjfr	ë„‘
+sjfa	ë„’
+sjfq	ë„“
+sjft	ë„”
+sjfx	ë„•
+sjfv	ë„–
+sjfg	ë„—
+sja	넘
+sjq	ë„™
+sjqt	ë„š
+sjt	ë„›
+sjT	넜
+sjd	�
+sjw	ë„ž
+sjc	ë„Ÿ
+sjz	ë„ 
+sjx	ë„¡
+sjv	ë„¢
+sjg	ë„£
+spr	ë„¥
+spR	넦
+sprt	넧
+sps	넨
+spsw	ë„©
+spsg	넪
+spe	ë„«
+spf	넬
+spfr	ë„­
+spfa	ë„®
+spfq	넯
+spft	ë„°
+spfx	넱
+spfv	넲
+spfg	넳
+spa	ë„´
+spq	넵
+spqt	넶
+spt	ë„·
+spT	넸
+spd	넹
+spw	넺
+spc	ë„»
+spz	넼
+spx	넽
+spv	넾
+spg	ë„¿
+sur	ë…�
+suR	ë…‚
+surt	ë…ƒ
+sus	ë…„
+susw	ë……
+susg	ë…†
+sue	ë…‡
+suf	ë…ˆ
+sufr	ë…‰
+sufa	ë…Š
+sufq	ë…‹
+suft	녌
+sufx	ë…�
+sufv	ë…Ž
+sufg	ë…�
+sua	ë…�
+suq	ë…‘
+suqt	ë…’
+sut	ë…“
+suT	ë…”
+sud	ë…•
+suw	ë…–
+suc	ë…—
+suz	ë…˜
+sux	ë…™
+suv	ë…š
+sug	ë…›
+sPr	ë…�
+sPR	ë…ž
+sPrt	ë…Ÿ
+sPs	ë… 
+sPsw	ë…¡
+sPsg	ë…¢
+sPe	ë…£
+sPf	ë…¤
+sPfr	ë…¥
+sPfa	ë…¦
+sPfq	ë…§
+sPft	ë…¨
+sPfx	ë…©
+sPfv	ë…ª
+sPfg	ë…«
+sPa	ë…¬
+sPq	ë…­
+sPqt	ë…®
+sPt	ë…¯
+sPT	ë…°
+sPd	ë…±
+sPw	ë…²
+sPc	ë…³
+sPz	ë…´
+sPx	ë…µ
+sPv	ë…¶
+sPg	ë…·
+shr	ë…¹
+shR	ë…º
+shrt	ë…»
+shs	ë…¼
+shsw	ë…½
+shsg	ë…¾
+she	ë…¿
+shf	놀
+shfr	�
+shfa	놂
+shfq	놃
+shft	놄
+shfx	놅
+shfv	놆
+shfg	놇
+sha	놈
+shq	놉
+shqt	놊
+sht	놋
+shT	놌
+shd	�
+shw	놎
+shc	�
+shz	�
+shx	놑
+shv	높
+shg	놓
+shkr	놕
+shkR	놖
+shkrt	놗
+shks	놘
+shksw	놙
+shksg	놚
+shke	놛
+shkf	놜
+shkfr	�
+shkfa	놞
+shkfq	놟
+shkft	놠
+shkfx	놡
+shkfv	놢
+shkfg	놣
+shka	놤
+shkq	놥
+shkqt	놦
+shkt	놧
+shkT	놨
+shkd	놩
+shkw	놪
+shkc	놫
+shkz	놬
+shkx	놭
+shkv	놮
+shkg	놯
+shor	놱
+shoR	놲
+short	놳
+shos	놴
+shosw	놵
+shosg	놶
+shoe	놷
+shof	놸
+shofr	놹
+shofa	놺
+shofq	놻
+shoft	놼
+shofx	놽
+shofv	놾
+shofg	놿
+shoa	뇀
+shoq	�
+shoqt	뇂
+shot	뇃
+shoT	뇄
+shod	뇅
+show	뇆
+shoc	뇇
+shoz	뇈
+shox	뇉
+shov	뇊
+shog	뇋
+shlr	�
+shlR	뇎
+shlrt	�
+shls	�
+shlsw	뇑
+shlsg	뇒
+shle	뇓
+shlf	뇔
+shlfr	뇕
+shlfa	뇖
+shlfq	뇗
+shlft	뇘
+shlfx	뇙
+shlfv	뇚
+shlfg	뇛
+shla	뇜
+shlq	�
+shlqt	뇞
+shlt	뇟
+shlT	뇠
+shld	뇡
+shlw	뇢
+shlc	뇣
+shlz	뇤
+shlx	뇥
+shlv	뇦
+shlg	뇧
+syr	뇩
+syR	뇪
+syrt	뇫
+sys	뇬
+sysw	뇭
+sysg	뇮
+sye	뇯
+syf	뇰
+syfr	뇱
+syfa	뇲
+syfq	뇳
+syft	뇴
+syfx	뇵
+syfv	뇶
+syfg	뇷
+sya	뇸
+syq	뇹
+syqt	뇺
+syt	뇻
+syT	뇼
+syd	뇽
+syw	뇾
+syc	뇿
+syz	눀
+syx	�
+syv	눂
+syg	눃
+snr	눅
+snR	눆
+snrt	눇
+sns	눈
+snsw	눉
+snsg	눊
+sne	눋
+snf	눌
+snfr	�
+snfa	눎
+snfq	�
+snft	�
+snfx	눑
+snfv	눒
+snfg	눓
+sna	눔
+snq	눕
+snqt	눖
+snt	눗
+snT	눘
+snd	눙
+snw	눚
+snc	눛
+snz	눜
+snx	�
+snv	눞
+sng	눟
+snjr	눡
+snjR	눢
+snjrt	눣
+snjs	눤
+snjsw	눥
+snjsg	눦
+snje	눧
+snjf	눨
+snjfr	눩
+snjfa	눪
+snjfq	눫
+snjft	눬
+snjfx	눭
+snjfv	눮
+snjfg	눯
+snja	눰
+snjq	눱
+snjqt	눲
+snjt	눳
+snjT	눴
+snjd	눵
+snjw	눶
+snjc	눷
+snjz	눸
+snjx	눹
+snjv	눺
+snjg	눻
+snpr	눽
+snpR	눾
+snprt	눿
+snps	뉀
+snpsw	�
+snpsg	뉂
+snpe	뉃
+snpf	뉄
+snpfr	뉅
+snpfa	뉆
+snpfq	뉇
+snpft	뉈
+snpfx	뉉
+snpfv	뉊
+snpfg	뉋
+snpa	뉌
+snpq	�
+snpqt	뉎
+snpt	�
+snpT	�
+snpd	뉑
+snpw	뉒
+snpc	뉓
+snpz	뉔
+snpx	뉕
+snpv	뉖
+snpg	뉗
+snlr	뉙
+snlR	뉚
+snlrt	뉛
+snls	뉜
+snlsw	�
+snlsg	뉞
+snle	뉟
+snlf	뉠
+snlfr	뉡
+snlfa	뉢
+snlfq	뉣
+snlft	뉤
+snlfx	뉥
+snlfv	뉦
+snlfg	뉧
+snla	뉨
+snlq	뉩
+snlqt	뉪
+snlt	뉫
+snlT	뉬
+snld	뉭
+snlw	뉮
+snlc	뉯
+snlz	뉰
+snlx	뉱
+snlv	뉲
+snlg	뉳
+sbr	뉵
+sbR	뉶
+sbrt	뉷
+sbs	뉸
+sbsw	뉹
+sbsg	뉺
+sbe	뉻
+sbf	뉼
+sbfr	뉽
+sbfa	뉾
+sbfq	뉿
+sbft	늀
+sbfx	�
+sbfv	늂
+sbfg	늃
+sba	늄
+sbq	늅
+sbqt	늆
+sbt	늇
+sbT	늈
+sbd	늉
+sbw	늊
+sbc	늋
+sbz	늌
+sbx	�
+sbv	늎
+sbg	�
+smr	늑
+smR	늒
+smrt	늓
+sms	는
+smsw	늕
+smsg	늖
+sme	늗
+smf	늘
+smfr	늙
+smfa	늚
+smfq	늛
+smft	늜
+smfx	�
+smfv	늞
+smfg	늟
+sma	늠
+smq	늡
+smqt	늢
+smt	늣
+smT	늤
+smd	능
+smw	늦
+smc	늧
+smz	늨
+smx	늩
+smv	늪
+smg	늫
+smlr	늭
+smlR	늮
+smlrt	늯
+smls	늰
+smlsw	늱
+smlsg	늲
+smle	늳
+smlf	늴
+smlfr	늵
+smlfa	늶
+smlfq	늷
+smlft	늸
+smlfx	늹
+smlfv	늺
+smlfg	늻
+smla	늼
+smlq	늽
+smlqt	늾
+smlt	늿
+smlT	ë‹€
+smld	�
+smlw	ë‹‚
+smlc	닃
+smlz	ë‹„
+smlx	ë‹…
+smlv	닆
+smlg	닇
+slr	닉
+slR	ë‹Š
+slrt	ë‹‹
+sls	닌
+slsw	�
+slsg	ë‹Ž
+sle	�
+slf	�
+slfr	ë‹‘
+slfa	ë‹’
+slfq	ë‹“
+slft	ë‹”
+slfx	ë‹•
+slfv	ë‹–
+slfg	ë‹—
+sla	님
+slq	ë‹™
+slqt	ë‹š
+slt	ë‹›
+slT	닜
+sld	�
+slw	ë‹ž
+slc	ë‹Ÿ
+slz	ë‹ 
+slx	ë‹¡
+slv	ë‹¢
+slg	ë‹£
+ekr	ë‹¥
+ekR	닦
+ekrt	닧
+eks	단
+eksw	ë‹©
+eksg	닪
+eke	ë‹«
+ekf	달
+ekfr	ë‹­
+ekfa	ë‹®
+ekfq	닯
+ekft	ë‹°
+ekfx	닱
+ekfv	닲
+ekfg	닳
+eka	ë‹´
+ekq	답
+ekqt	닶
+ekt	ë‹·
+ekT	닸
+ekd	당
+ekw	닺
+ekc	ë‹»
+ekz	닼
+ekx	닽
+ekv	닾
+ekg	ë‹¿
+eor	�
+eoR	댂
+eort	댃
+eos	댄
+eosw	댅
+eosg	댆
+eoe	댇
+eof	댈
+eofr	댉
+eofa	댊
+eofq	댋
+eoft	댌
+eofx	�
+eofv	댎
+eofg	�
+eoa	�
+eoq	댑
+eoqt	댒
+eot	댓
+eoT	댔
+eod	댕
+eow	댖
+eoc	댗
+eoz	댘
+eox	댙
+eov	댚
+eog	댛
+eir	�
+eiR	댞
+eirt	댟
+eis	댠
+eisw	댡
+eisg	댢
+eie	댣
+eif	댤
+eifr	댥
+eifa	댦
+eifq	댧
+eift	댨
+eifx	댩
+eifv	댪
+eifg	댫
+eia	댬
+eiq	댭
+eiqt	댮
+eit	댯
+eiT	댰
+eid	댱
+eiw	댲
+eic	댳
+eiz	댴
+eix	댵
+eiv	댶
+eig	댷
+eOr	댹
+eOR	댺
+eOrt	댻
+eOs	댼
+eOsw	댽
+eOsg	댾
+eOe	댿
+eOf	�
+eOfr	�
+eOfa	�
+eOfq	�
+eOft	�
+eOfx	�
+eOfv	�
+eOfg	�
+eOa	�
+eOq	�
+eOqt	�
+eOt	�
+eOT	�
+eOd	�
+eOw	�
+eOc	�
+eOz	�
+eOx	�
+eOv	�
+eOg	�
+ejr	�
+ejR	�
+ejrt	�
+ejs	�
+ejsw	�
+ejsg	�
+eje	�
+ejf	�
+ejfr	�
+ejfa	�
+ejfq	�
+ejft	�
+ejfx	�
+ejfv	�
+ejfg	�
+eja	�
+ejq	�
+ejqt	�
+ejt	�
+ejT	�
+ejd	�
+ejw	�
+ejc	�
+ejz	�
+ejx	�
+ejv	�
+ejg	�
+epr	�
+epR	�
+eprt	�
+eps	�
+epsw	�
+epsg	�
+epe	�
+epf	�
+epfr	�
+epfa	�
+epfq	�
+epft	�
+epfx	�
+epfv	�
+epfg	�
+epa	뎀
+epq	�
+epqt	뎂
+ept	뎃
+epT	뎄
+epd	뎅
+epw	뎆
+epc	뎇
+epz	뎈
+epx	뎉
+epv	뎊
+epg	뎋
+eur	�
+euR	뎎
+eurt	�
+eus	�
+eusw	뎑
+eusg	뎒
+eue	뎓
+euf	뎔
+eufr	뎕
+eufa	뎖
+eufq	뎗
+euft	뎘
+eufx	뎙
+eufv	뎚
+eufg	뎛
+eua	뎜
+euq	�
+euqt	뎞
+eut	뎟
+euT	뎠
+eud	뎡
+euw	뎢
+euc	뎣
+euz	뎤
+eux	뎥
+euv	뎦
+eug	뎧
+ePr	뎩
+ePR	뎪
+ePrt	뎫
+ePs	뎬
+ePsw	뎭
+ePsg	뎮
+ePe	뎯
+ePf	뎰
+ePfr	뎱
+ePfa	뎲
+ePfq	뎳
+ePft	뎴
+ePfx	뎵
+ePfv	뎶
+ePfg	뎷
+ePa	뎸
+ePq	뎹
+ePqt	뎺
+ePt	뎻
+ePT	뎼
+ePd	뎽
+ePw	뎾
+ePc	뎿
+ePz	�
+ePx	�
+ePv	�
+ePg	�
+ehr	�
+ehR	�
+ehrt	�
+ehs	�
+ehsw	�
+ehsg	�
+ehe	�
+ehf	�
+ehfr	�
+ehfa	�
+ehfq	�
+ehft	�
+ehfx	�
+ehfv	�
+ehfg	�
+eha	�
+ehq	�
+ehqt	�
+eht	�
+ehT	�
+ehd	�
+ehw	�
+ehc	�
+ehz	�
+ehx	�
+ehv	�
+ehg	�
+ehkr	�
+ehkR	�
+ehkrt	�
+ehks	�
+ehksw	�
+ehksg	�
+ehke	�
+ehkf	�
+ehkfr	�
+ehkfa	�
+ehkfq	�
+ehkft	�
+ehkfx	�
+ehkfv	�
+ehkfg	�
+ehka	�
+ehkq	�
+ehkqt	�
+ehkt	�
+ehkT	�
+ehkd	�
+ehkw	�
+ehkc	�
+ehkz	�
+ehkx	�
+ehkv	�
+ehkg	�
+ehor	�
+ehoR	�
+ehort	�
+ehos	�
+ehosw	�
+ehosg	�
+ehoe	�
+ehof	�
+ehofr	�
+ehofa	�
+ehofq	�
+ehoft	�
+ehofx	�
+ehofv	�
+ehofg	�
+ehoa	�
+ehoq	�
+ehoqt	�
+ehot	�
+ehoT	�
+ehod	�
+ehow	�
+ehoc	�
+ehoz	�
+ehox	�
+ehov	�
+ehog	�
+ehlr	�
+ehlR	�
+ehlrt	�
+ehls	�
+ehlsw	�
+ehlsg	�
+ehle	�
+ehlf	�
+ehlfr	�
+ehlfa	�
+ehlfq	�
+ehlft	�
+ehlfx	�
+ehlfv	�
+ehlfg	�
+ehla	�
+ehlq	�
+ehlqt	�
+ehlt	�
+ehlT	�
+ehld	�
+ehlw	�
+ehlc	�
+ehlz	�
+ehlx	�
+ehlv	�
+ehlg	�
+eyr	�
+eyR	�
+eyrt	�
+eys	�
+eysw	�
+eysg	�
+eye	�
+eyf	�
+eyfr	�
+eyfa	�
+eyfq	�
+eyft	ë‘€
+eyfx	�
+eyfv	ë‘‚
+eyfg	둃
+eya	ë‘„
+eyq	ë‘…
+eyqt	둆
+eyt	둇
+eyT	둈
+eyd	둉
+eyw	ë‘Š
+eyc	ë‘‹
+eyz	둌
+eyx	�
+eyv	ë‘Ž
+eyg	�
+enr	ë‘‘
+enR	ë‘’
+enrt	ë‘“
+ens	ë‘”
+ensw	ë‘•
+ensg	ë‘–
+ene	ë‘—
+enf	둘
+enfr	ë‘™
+enfa	ë‘š
+enfq	ë‘›
+enft	둜
+enfx	�
+enfv	ë‘ž
+enfg	ë‘Ÿ
+ena	ë‘ 
+enq	ë‘¡
+enqt	ë‘¢
+ent	ë‘£
+enT	둤
+end	ë‘¥
+enw	둦
+enc	둧
+enz	둨
+enx	ë‘©
+env	둪
+eng	ë‘«
+enjr	ë‘­
+enjR	ë‘®
+enjrt	둯
+enjs	ë‘°
+enjsw	둱
+enjsg	둲
+enje	둳
+enjf	ë‘´
+enjfr	둵
+enjfa	둶
+enjfq	ë‘·
+enjft	둸
+enjfx	둹
+enjfv	둺
+enjfg	ë‘»
+enja	둼
+enjq	둽
+enjqt	둾
+enjt	ë‘¿
+enjT	ë’€
+enjd	ë’�
+enjw	ë’‚
+enjc	ë’ƒ
+enjz	ë’„
+enjx	ë’…
+enjv	ë’†
+enjg	ë’‡
+enpr	ë’‰
+enpR	ë’Š
+enprt	ë’‹
+enps	뒌
+enpsw	ë’�
+enpsg	ë’Ž
+enpe	ë’�
+enpf	ë’�
+enpfr	ë’‘
+enpfa	ë’’
+enpfq	ë’“
+enpft	ë’”
+enpfx	ë’•
+enpfv	ë’–
+enpfg	ë’—
+enpa	ë’˜
+enpq	ë’™
+enpqt	ë’š
+enpt	ë’›
+enpT	뒜
+enpd	ë’�
+enpw	ë’ž
+enpc	ë’Ÿ
+enpz	ë’ 
+enpx	ë’¡
+enpv	ë’¢
+enpg	ë’£
+enlr	ë’¥
+enlR	ë’¦
+enlrt	ë’§
+enls	ë’¨
+enlsw	ë’©
+enlsg	ë’ª
+enle	ë’«
+enlf	ë’¬
+enlfr	ë’­
+enlfa	ë’®
+enlfq	ë’¯
+enlft	ë’°
+enlfx	ë’±
+enlfv	ë’²
+enlfg	ë’³
+enla	ë’´
+enlq	ë’µ
+enlqt	ë’¶
+enlt	ë’·
+enlT	ë’¸
+enld	ë’¹
+enlw	ë’º
+enlc	ë’»
+enlz	ë’¼
+enlx	ë’½
+enlv	ë’¾
+enlg	ë’¿
+ebr	�
+ebR	ë“‚
+ebrt	듃
+ebs	ë“„
+ebsw	ë“…
+ebsg	듆
+ebe	듇
+ebf	듈
+ebfr	듉
+ebfa	ë“Š
+ebfq	ë“‹
+ebft	듌
+ebfx	�
+ebfv	ë“Ž
+ebfg	�
+eba	�
+ebq	ë“‘
+ebqt	ë“’
+ebt	ë““
+ebT	ë“”
+ebd	ë“•
+ebw	ë“–
+ebc	ë“—
+ebz	듘
+ebx	ë“™
+ebv	ë“š
+ebg	ë“›
+emr	�
+emR	ë“ž
+emrt	ë“Ÿ
+ems	ë“ 
+emsw	ë“¡
+emsg	ë“¢
+eme	ë“£
+emf	들
+emfr	ë“¥
+emfa	듦
+emfq	듧
+emft	듨
+emfx	ë“©
+emfv	듪
+emfg	ë“«
+ema	듬
+emq	ë“­
+emqt	ë“®
+emt	듯
+emT	ë“°
+emd	등
+emw	듲
+emc	듳
+emz	ë“´
+emx	듵
+emv	듶
+emg	ë“·
+emlr	듹
+emlR	듺
+emlrt	ë“»
+emls	듼
+emlsw	듽
+emlsg	듾
+emle	ë“¿
+emlf	딀
+emlfr	�
+emlfa	딂
+emlfq	딃
+emlft	딄
+emlfx	ë”…
+emlfv	딆
+emlfg	딇
+emla	딈
+emlq	딉
+emlqt	딊
+emlt	딋
+emlT	딌
+emld	�
+emlw	딎
+emlc	�
+emlz	�
+emlx	딑
+emlv	ë”’
+emlg	딓
+elr	딕
+elR	ë”–
+elrt	ë”—
+els	딘
+elsw	ë”™
+elsg	딚
+ele	ë”›
+elf	딜
+elfr	�
+elfa	딞
+elfq	딟
+elft	ë” 
+elfx	딡
+elfv	딢
+elfg	딣
+ela	딤
+elq	딥
+elqt	딦
+elt	딧
+elT	딨
+eld	딩
+elw	딪
+elc	딫
+elz	딬
+elx	ë”­
+elv	ë”®
+elg	딯
+Ekr	ë”±
+EkR	딲
+Ekrt	딳
+Eks	ë”´
+Eksw	딵
+Eksg	딶
+Eke	ë”·
+Ekf	딸
+Ekfr	딹
+Ekfa	딺
+Ekfq	ë”»
+Ekft	딼
+Ekfx	딽
+Ekfv	딾
+Ekfg	딿
+Eka	ë•€
+Ekq	�
+Ekqt	ë•‚
+Ekt	땃
+EkT	ë•„
+Ekd	ë•…
+Ekw	땆
+Ekc	땇
+Ekz	땈
+Ekx	땉
+Ekv	ë•Š
+Ekg	ë•‹
+Eor	�
+EoR	ë•Ž
+Eort	�
+Eos	�
+Eosw	ë•‘
+Eosg	ë•’
+Eoe	ë•“
+Eof	ë•”
+Eofr	ë••
+Eofa	ë•–
+Eofq	ë•—
+Eoft	땘
+Eofx	ë•™
+Eofv	ë•š
+Eofg	ë•›
+Eoa	땜
+Eoq	�
+Eoqt	ë•ž
+Eot	ë•Ÿ
+EoT	ë• 
+Eod	ë•¡
+Eow	ë•¢
+Eoc	ë•£
+Eoz	땤
+Eox	ë•¥
+Eov	땦
+Eog	땧
+Eir	ë•©
+EiR	땪
+Eirt	ë•«
+Eis	땬
+Eisw	ë•­
+Eisg	ë•®
+Eie	땯
+Eif	ë•°
+Eifr	땱
+Eifa	땲
+Eifq	땳
+Eift	ë•´
+Eifx	땵
+Eifv	땶
+Eifg	ë•·
+Eia	땸
+Eiq	땹
+Eiqt	땺
+Eit	ë•»
+EiT	땼
+Eid	땽
+Eiw	땾
+Eic	ë•¿
+Eiz	ë–€
+Eix	ë–�
+Eiv	ë–‚
+Eig	ë–ƒ
+EOr	ë–…
+EOR	ë–†
+EOrt	ë–‡
+EOs	ë–ˆ
+EOsw	ë–‰
+EOsg	ë–Š
+EOe	ë–‹
+EOf	떌
+EOfr	ë–�
+EOfa	ë–Ž
+EOfq	ë–�
+EOft	ë–�
+EOfx	ë–‘
+EOfv	ë–’
+EOfg	ë–“
+EOa	ë–”
+EOq	ë–•
+EOqt	ë––
+EOt	ë–—
+EOT	ë–˜
+EOd	ë–™
+EOw	ë–š
+EOc	ë–›
+EOz	떜
+EOx	ë–�
+EOv	ë–ž
+EOg	ë–Ÿ
+Ejr	ë–¡
+EjR	ë–¢
+Ejrt	ë–£
+Ejs	ë–¤
+Ejsw	ë–¥
+Ejsg	ë–¦
+Eje	ë–§
+Ejf	ë–¨
+Ejfr	ë–©
+Ejfa	ë–ª
+Ejfq	ë–«
+Ejft	ë–¬
+Ejfx	ë–­
+Ejfv	ë–®
+Ejfg	ë–¯
+Eja	ë–°
+Ejq	ë–±
+Ejqt	ë–²
+Ejt	ë–³
+EjT	ë–´
+Ejd	ë–µ
+Ejw	ë–¶
+Ejc	ë–·
+Ejz	ë–¸
+Ejx	ë–¹
+Ejv	ë–º
+Ejg	ë–»
+Epr	ë–½
+EpR	ë–¾
+Eprt	ë–¿
+Eps	ë—€
+Epsw	ë—�
+Epsg	ë—‚
+Epe	ë—ƒ
+Epf	ë—„
+Epfr	ë—…
+Epfa	ë—†
+Epfq	ë—‡
+Epft	ë—ˆ
+Epfx	ë—‰
+Epfv	ë—Š
+Epfg	ë—‹
+Epa	뗌
+Epq	ë—�
+Epqt	ë—Ž
+Ept	ë—�
+EpT	ë—�
+Epd	ë—‘
+Epw	ë—’
+Epc	ë—“
+Epz	ë—”
+Epx	ë—•
+Epv	ë—–
+Epg	ë——
+Eur	ë—™
+EuR	ë—š
+Eurt	ë—›
+Eus	뗜
+Eusw	ë—�
+Eusg	ë—ž
+Eue	ë—Ÿ
+Euf	ë— 
+Eufr	ë—¡
+Eufa	ë—¢
+Eufq	ë—£
+Euft	ë—¤
+Eufx	ë—¥
+Eufv	ë—¦
+Eufg	ë—§
+Eua	ë—¨
+Euq	ë—©
+Euqt	ë—ª
+Eut	ë—«
+EuT	ë—¬
+Eud	ë—­
+Euw	ë—®
+Euc	ë—¯
+Euz	ë—°
+Eux	ë—±
+Euv	ë—²
+Eug	ë—³
+EPr	ë—µ
+EPR	ë—¶
+EPrt	ë—·
+EPs	ë—¸
+EPsw	ë—¹
+EPsg	ë—º
+EPe	ë—»
+EPf	ë—¼
+EPfr	ë—½
+EPfa	ë—¾
+EPfq	ë—¿
+EPft	똀
+EPfx	�
+EPfv	똂
+EPfg	똃
+EPa	똄
+EPq	똅
+EPqt	똆
+EPt	똇
+EPT	똈
+EPd	똉
+EPw	똊
+EPc	똋
+EPz	똌
+EPx	�
+EPv	똎
+EPg	�
+Ehr	똑
+EhR	똒
+Ehrt	똓
+Ehs	똔
+Ehsw	똕
+Ehsg	똖
+Ehe	똗
+Ehf	똘
+Ehfr	똙
+Ehfa	똚
+Ehfq	똛
+Ehft	똜
+Ehfx	�
+Ehfv	똞
+Ehfg	똟
+Eha	똠
+Ehq	똡
+Ehqt	똢
+Eht	똣
+EhT	똤
+Ehd	똥
+Ehw	똦
+Ehc	똧
+Ehz	똨
+Ehx	똩
+Ehv	똪
+Ehg	똫
+Ehkr	똭
+EhkR	똮
+Ehkrt	똯
+Ehks	똰
+Ehksw	똱
+Ehksg	똲
+Ehke	똳
+Ehkf	똴
+Ehkfr	똵
+Ehkfa	똶
+Ehkfq	똷
+Ehkft	똸
+Ehkfx	똹
+Ehkfv	똺
+Ehkfg	똻
+Ehka	똼
+Ehkq	똽
+Ehkqt	똾
+Ehkt	똿
+EhkT	뙀
+Ehkd	�
+Ehkw	뙂
+Ehkc	뙃
+Ehkz	뙄
+Ehkx	ë™…
+Ehkv	뙆
+Ehkg	뙇
+Ehor	뙉
+EhoR	뙊
+Ehort	뙋
+Ehos	뙌
+Ehosw	�
+Ehosg	뙎
+Ehoe	�
+Ehof	�
+Ehofr	뙑
+Ehofa	ë™’
+Ehofq	뙓
+Ehoft	ë™”
+Ehofx	뙕
+Ehofv	ë™–
+Ehofg	ë™—
+Ehoa	뙘
+Ehoq	ë™™
+Ehoqt	뙚
+Ehot	ë™›
+EhoT	뙜
+Ehod	�
+Ehow	뙞
+Ehoc	뙟
+Ehoz	ë™ 
+Ehox	뙡
+Ehov	뙢
+Ehog	뙣
+Ehlr	뙥
+EhlR	뙦
+Ehlrt	뙧
+Ehls	뙨
+Ehlsw	뙩
+Ehlsg	뙪
+Ehle	뙫
+Ehlf	뙬
+Ehlfr	ë™­
+Ehlfa	ë™®
+Ehlfq	뙯
+Ehlft	ë™°
+Ehlfx	ë™±
+Ehlfv	뙲
+Ehlfg	뙳
+Ehla	ë™´
+Ehlq	뙵
+Ehlqt	뙶
+Ehlt	ë™·
+EhlT	뙸
+Ehld	뙹
+Ehlw	뙺
+Ehlc	ë™»
+Ehlz	뙼
+Ehlx	뙽
+Ehlv	뙾
+Ehlg	뙿
+Eyr	�
+EyR	ëš‚
+Eyrt	뚃
+Eys	ëš„
+Eysw	ëš…
+Eysg	뚆
+Eye	뚇
+Eyf	뚈
+Eyfr	뚉
+Eyfa	뚊
+Eyfq	ëš‹
+Eyft	뚌
+Eyfx	�
+Eyfv	뚎
+Eyfg	�
+Eya	�
+Eyq	ëš‘
+Eyqt	ëš’
+Eyt	ëš“
+EyT	ëš”
+Eyd	ëš•
+Eyw	ëš–
+Eyc	ëš—
+Eyz	뚘
+Eyx	ëš™
+Eyv	ëšš
+Eyg	ëš›
+Enr	�
+EnR	ëšž
+Enrt	뚟
+Ens	ëš 
+Ensw	ëš¡
+Ensg	뚢
+Ene	뚣
+Enf	뚤
+Enfr	뚥
+Enfa	뚦
+Enfq	뚧
+Enft	뚨
+Enfx	ëš©
+Enfv	뚪
+Enfg	ëš«
+Ena	뚬
+Enq	ëš­
+Enqt	ëš®
+Ent	뚯
+EnT	ëš°
+End	ëš±
+Enw	ëš²
+Enc	ëš³
+Enz	ëš´
+Enx	ëšµ
+Env	뚶
+Eng	ëš·
+Enjr	ëš¹
+EnjR	뚺
+Enjrt	ëš»
+Enjs	ëš¼
+Enjsw	ëš½
+Enjsg	ëš¾
+Enje	ëš¿
+Enjf	뛀
+Enjfr	�
+Enjfa	뛂
+Enjfq	뛃
+Enjft	뛄
+Enjfx	ë›…
+Enjfv	뛆
+Enjfg	뛇
+Enja	뛈
+Enjq	뛉
+Enjqt	뛊
+Enjt	뛋
+EnjT	뛌
+Enjd	�
+Enjw	뛎
+Enjc	�
+Enjz	�
+Enjx	뛑
+Enjv	ë›’
+Enjg	뛓
+Enpr	뛕
+EnpR	ë›–
+Enprt	ë›—
+Enps	뛘
+Enpsw	ë›™
+Enpsg	뛚
+Enpe	ë››
+Enpf	뛜
+Enpfr	�
+Enpfa	뛞
+Enpfq	뛟
+Enpft	ë› 
+Enpfx	뛡
+Enpfv	뛢
+Enpfg	뛣
+Enpa	뛤
+Enpq	뛥
+Enpqt	뛦
+Enpt	뛧
+EnpT	뛨
+Enpd	뛩
+Enpw	뛪
+Enpc	뛫
+Enpz	뛬
+Enpx	ë›­
+Enpv	ë›®
+Enpg	뛯
+Enlr	ë›±
+EnlR	뛲
+Enlrt	뛳
+Enls	ë›´
+Enlsw	뛵
+Enlsg	뛶
+Enle	ë›·
+Enlf	뛸
+Enlfr	뛹
+Enlfa	뛺
+Enlfq	ë›»
+Enlft	뛼
+Enlfx	뛽
+Enlfv	뛾
+Enlfg	뛿
+Enla	뜀
+Enlq	�
+Enlqt	뜂
+Enlt	뜃
+EnlT	뜄
+Enld	뜅
+Enlw	뜆
+Enlc	뜇
+Enlz	뜈
+Enlx	뜉
+Enlv	뜊
+Enlg	뜋
+Ebr	�
+EbR	뜎
+Ebrt	�
+Ebs	�
+Ebsw	뜑
+Ebsg	뜒
+Ebe	뜓
+Ebf	뜔
+Ebfr	뜕
+Ebfa	뜖
+Ebfq	뜗
+Ebft	뜘
+Ebfx	뜙
+Ebfv	뜚
+Ebfg	뜛
+Eba	뜜
+Ebq	�
+Ebqt	뜞
+Ebt	뜟
+EbT	뜠
+Ebd	뜡
+Ebw	뜢
+Ebc	뜣
+Ebz	뜤
+Ebx	뜥
+Ebv	뜦
+Ebg	뜧
+Emr	뜩
+EmR	뜪
+Emrt	뜫
+Ems	뜬
+Emsw	뜭
+Emsg	뜮
+Eme	뜯
+Emf	뜰
+Emfr	뜱
+Emfa	뜲
+Emfq	뜳
+Emft	뜴
+Emfx	뜵
+Emfv	뜶
+Emfg	뜷
+Ema	뜸
+Emq	뜹
+Emqt	뜺
+Emt	뜻
+EmT	뜼
+Emd	뜽
+Emw	뜾
+Emc	뜿
+Emz	�
+Emx	�
+Emv	�
+Emg	�
+Emlr	�
+EmlR	�
+Emlrt	�
+Emls	�
+Emlsw	�
+Emlsg	�
+Emle	�
+Emlf	�
+Emlfr	�
+Emlfa	�
+Emlfq	�
+Emlft	�
+Emlfx	�
+Emlfv	�
+Emlfg	�
+Emla	�
+Emlq	�
+Emlqt	�
+Emlt	�
+EmlT	�
+Emld	�
+Emlw	�
+Emlc	�
+Emlz	�
+Emlx	�
+Emlv	�
+Emlg	�
+Elr	�
+ElR	�
+Elrt	�
+Els	�
+Elsw	�
+Elsg	�
+Ele	�
+Elf	�
+Elfr	�
+Elfa	�
+Elfq	�
+Elft	�
+Elfx	�
+Elfv	�
+Elfg	�
+Ela	�
+Elq	�
+Elqt	�
+Elt	�
+ElT	�
+Eld	�
+Elw	�
+Elc	�
+Elz	�
+Elx	�
+Elv	�
+Elg	�
+fkr	�
+fkR	�
+fkrt	�
+fks	란
+fksw	�
+fksg	ëž‚
+fke	랃
+fkf	ëž„
+fkfr	ëž…
+fkfa	랆
+fkfq	랇
+fkft	랈
+fkfx	랉
+fkfv	랊
+fkfg	ëž‹
+fka	람
+fkq	�
+fkqt	랎
+fkt	�
+fkT	�
+fkd	ëž‘
+fkw	ëž’
+fkc	ëž“
+fkz	ëž”
+fkx	ëž•
+fkv	ëž–
+fkg	ëž—
+for	ëž™
+foR	ëžš
+fort	ëž›
+fos	랜
+fosw	�
+fosg	ëžž
+foe	랟
+fof	ëž 
+fofr	ëž¡
+fofa	랢
+fofq	랣
+foft	랤
+fofx	랥
+fofv	랦
+fofg	랧
+foa	램
+foq	ëž©
+foqt	랪
+fot	ëž«
+foT	랬
+fod	ëž­
+fow	ëž®
+foc	랯
+foz	ëž°
+fox	ëž±
+fov	ëž²
+fog	ëž³
+fir	ëžµ
+fiR	랶
+firt	ëž·
+fis	랸
+fisw	ëž¹
+fisg	랺
+fie	ëž»
+fif	ëž¼
+fifr	ëž½
+fifa	ëž¾
+fifq	ëž¿
+fift	럀
+fifx	�
+fifv	럂
+fifg	럃
+fia	럄
+fiq	럅
+fiqt	럆
+fit	럇
+fiT	럈
+fid	량
+fiw	럊
+fic	럋
+fiz	럌
+fix	�
+fiv	럎
+fig	�
+fOr	럑
+fOR	럒
+fOrt	럓
+fOs	럔
+fOsw	럕
+fOsg	럖
+fOe	럗
+fOf	럘
+fOfr	럙
+fOfa	럚
+fOfq	럛
+fOft	럜
+fOfx	�
+fOfv	럞
+fOfg	럟
+fOa	럠
+fOq	럡
+fOqt	럢
+fOt	럣
+fOT	럤
+fOd	럥
+fOw	럦
+fOc	럧
+fOz	럨
+fOx	럩
+fOv	럪
+fOg	럫
+fjr	럭
+fjR	럮
+fjrt	럯
+fjs	런
+fjsw	럱
+fjsg	럲
+fje	럳
+fjf	럴
+fjfr	럵
+fjfa	럶
+fjfq	럷
+fjft	럸
+fjfx	럹
+fjfv	럺
+fjfg	럻
+fja	럼
+fjq	럽
+fjqt	럾
+fjt	럿
+fjT	ë €
+fjd	ë �
+fjw	ë ‚
+fjc	ë ƒ
+fjz	ë „
+fjx	ë …
+fjv	ë †
+fjg	ë ‡
+fpr	ë ‰
+fpR	ë Š
+fprt	ë ‹
+fps	렌
+fpsw	ë �
+fpsg	ë Ž
+fpe	ë �
+fpf	ë �
+fpfr	ë ‘
+fpfa	ë ’
+fpfq	ë “
+fpft	ë ”
+fpfx	ë •
+fpfv	ë –
+fpfg	ë —
+fpa	ë ˜
+fpq	ë ™
+fpqt	ë š
+fpt	ë ›
+fpT	렜
+fpd	ë �
+fpw	ë ž
+fpc	ë Ÿ
+fpz	ë  
+fpx	ë ¡
+fpv	ë ¢
+fpg	ë £
+fur	ë ¥
+fuR	ë ¦
+furt	ë §
+fus	ë ¨
+fusw	ë ©
+fusg	ë ª
+fue	ë «
+fuf	ë ¬
+fufr	ë ­
+fufa	ë ®
+fufq	ë ¯
+fuft	ë °
+fufx	ë ±
+fufv	ë ²
+fufg	ë ³
+fua	ë ´
+fuq	ë µ
+fuqt	ë ¶
+fut	ë ·
+fuT	ë ¸
+fud	ë ¹
+fuw	ë º
+fuc	ë »
+fuz	ë ¼
+fux	ë ½
+fuv	ë ¾
+fug	ë ¿
+fPr	�
+fPR	ë¡‚
+fPrt	롃
+fPs	ë¡„
+fPsw	ë¡…
+fPsg	롆
+fPe	롇
+fPf	롈
+fPfr	롉
+fPfa	ë¡Š
+fPfq	ë¡‹
+fPft	롌
+fPfx	�
+fPfv	ë¡Ž
+fPfg	�
+fPa	�
+fPq	ë¡‘
+fPqt	ë¡’
+fPt	ë¡“
+fPT	ë¡”
+fPd	ë¡•
+fPw	ë¡–
+fPc	ë¡—
+fPz	롘
+fPx	ë¡™
+fPv	ë¡š
+fPg	ë¡›
+fhr	�
+fhR	ë¡ž
+fhrt	ë¡Ÿ
+fhs	ë¡ 
+fhsw	ë¡¡
+fhsg	ë¡¢
+fhe	ë¡£
+fhf	롤
+fhfr	ë¡¥
+fhfa	롦
+fhfq	롧
+fhft	롨
+fhfx	ë¡©
+fhfv	롪
+fhfg	ë¡«
+fha	롬
+fhq	ë¡­
+fhqt	ë¡®
+fht	롯
+fhT	ë¡°
+fhd	롱
+fhw	롲
+fhc	롳
+fhz	ë¡´
+fhx	롵
+fhv	롶
+fhg	ë¡·
+fhkr	롹
+fhkR	롺
+fhkrt	ë¡»
+fhks	롼
+fhksw	롽
+fhksg	롾
+fhke	ë¡¿
+fhkf	뢀
+fhkfr	�
+fhkfa	뢂
+fhkfq	뢃
+fhkft	뢄
+fhkfx	뢅
+fhkfv	뢆
+fhkfg	뢇
+fhka	뢈
+fhkq	뢉
+fhkqt	뢊
+fhkt	뢋
+fhkT	뢌
+fhkd	�
+fhkw	뢎
+fhkc	�
+fhkz	�
+fhkx	뢑
+fhkv	뢒
+fhkg	뢓
+fhor	뢕
+fhoR	뢖
+fhort	뢗
+fhos	뢘
+fhosw	뢙
+fhosg	뢚
+fhoe	뢛
+fhof	뢜
+fhofr	�
+fhofa	뢞
+fhofq	뢟
+fhoft	뢠
+fhofx	뢡
+fhofv	뢢
+fhofg	뢣
+fhoa	뢤
+fhoq	뢥
+fhoqt	뢦
+fhot	뢧
+fhoT	뢨
+fhod	뢩
+fhow	뢪
+fhoc	뢫
+fhoz	뢬
+fhox	뢭
+fhov	뢮
+fhog	뢯
+fhlr	뢱
+fhlR	뢲
+fhlrt	뢳
+fhls	뢴
+fhlsw	뢵
+fhlsg	뢶
+fhle	뢷
+fhlf	뢸
+fhlfr	뢹
+fhlfa	뢺
+fhlfq	뢻
+fhlft	뢼
+fhlfx	뢽
+fhlfv	뢾
+fhlfg	뢿
+fhla	룀
+fhlq	�
+fhlqt	룂
+fhlt	룃
+fhlT	룄
+fhld	룅
+fhlw	룆
+fhlc	룇
+fhlz	룈
+fhlx	룉
+fhlv	룊
+fhlg	룋
+fyr	�
+fyR	룎
+fyrt	�
+fys	�
+fysw	룑
+fysg	룒
+fye	룓
+fyf	룔
+fyfr	룕
+fyfa	룖
+fyfq	룗
+fyft	룘
+fyfx	룙
+fyfv	룚
+fyfg	룛
+fya	룜
+fyq	�
+fyqt	룞
+fyt	룟
+fyT	룠
+fyd	룡
+fyw	룢
+fyc	룣
+fyz	룤
+fyx	룥
+fyv	룦
+fyg	룧
+fnr	룩
+fnR	룪
+fnrt	룫
+fns	룬
+fnsw	룭
+fnsg	룮
+fne	룯
+fnf	룰
+fnfr	룱
+fnfa	룲
+fnfq	룳
+fnft	룴
+fnfx	룵
+fnfv	룶
+fnfg	룷
+fna	룸
+fnq	룹
+fnqt	룺
+fnt	룻
+fnT	룼
+fnd	룽
+fnw	룾
+fnc	룿
+fnz	뤀
+fnx	�
+fnv	뤂
+fng	뤃
+fnjr	뤅
+fnjR	뤆
+fnjrt	뤇
+fnjs	뤈
+fnjsw	뤉
+fnjsg	뤊
+fnje	뤋
+fnjf	뤌
+fnjfr	�
+fnjfa	뤎
+fnjfq	�
+fnjft	�
+fnjfx	뤑
+fnjfv	뤒
+fnjfg	뤓
+fnja	뤔
+fnjq	뤕
+fnjqt	뤖
+fnjt	뤗
+fnjT	뤘
+fnjd	뤙
+fnjw	뤚
+fnjc	뤛
+fnjz	뤜
+fnjx	�
+fnjv	뤞
+fnjg	뤟
+fnpr	뤡
+fnpR	뤢
+fnprt	뤣
+fnps	뤤
+fnpsw	뤥
+fnpsg	뤦
+fnpe	뤧
+fnpf	뤨
+fnpfr	뤩
+fnpfa	뤪
+fnpfq	뤫
+fnpft	뤬
+fnpfx	뤭
+fnpfv	뤮
+fnpfg	뤯
+fnpa	뤰
+fnpq	뤱
+fnpqt	뤲
+fnpt	뤳
+fnpT	뤴
+fnpd	뤵
+fnpw	뤶
+fnpc	뤷
+fnpz	뤸
+fnpx	뤹
+fnpv	뤺
+fnpg	뤻
+fnlr	뤽
+fnlR	뤾
+fnlrt	뤿
+fnls	륀
+fnlsw	�
+fnlsg	륂
+fnle	륃
+fnlf	륄
+fnlfr	륅
+fnlfa	륆
+fnlfq	륇
+fnlft	륈
+fnlfx	륉
+fnlfv	륊
+fnlfg	륋
+fnla	륌
+fnlq	�
+fnlqt	륎
+fnlt	�
+fnlT	�
+fnld	륑
+fnlw	륒
+fnlc	륓
+fnlz	륔
+fnlx	륕
+fnlv	륖
+fnlg	륗
+fbr	륙
+fbR	륚
+fbrt	륛
+fbs	륜
+fbsw	�
+fbsg	륞
+fbe	륟
+fbf	률
+fbfr	륡
+fbfa	륢
+fbfq	륣
+fbft	륤
+fbfx	륥
+fbfv	륦
+fbfg	륧
+fba	륨
+fbq	륩
+fbqt	륪
+fbt	륫
+fbT	륬
+fbd	륭
+fbw	륮
+fbc	륯
+fbz	륰
+fbx	륱
+fbv	륲
+fbg	륳
+fmr	륵
+fmR	륶
+fmrt	륷
+fms	른
+fmsw	륹
+fmsg	륺
+fme	륻
+fmf	를
+fmfr	륽
+fmfa	륾
+fmfq	륿
+fmft	릀
+fmfx	�
+fmfv	릂
+fmfg	릃
+fma	름
+fmq	릅
+fmqt	릆
+fmt	릇
+fmT	릈
+fmd	릉
+fmw	릊
+fmc	릋
+fmz	릌
+fmx	�
+fmv	릎
+fmg	�
+fmlr	릑
+fmlR	릒
+fmlrt	릓
+fmls	릔
+fmlsw	릕
+fmlsg	릖
+fmle	릗
+fmlf	릘
+fmlfr	릙
+fmlfa	릚
+fmlfq	릛
+fmlft	릜
+fmlfx	�
+fmlfv	릞
+fmlfg	릟
+fmla	릠
+fmlq	릡
+fmlqt	릢
+fmlt	릣
+fmlT	릤
+fmld	릥
+fmlw	릦
+fmlc	릧
+fmlz	릨
+fmlx	릩
+fmlv	릪
+fmlg	릫
+flr	릭
+flR	릮
+flrt	릯
+fls	린
+flsw	릱
+flsg	릲
+fle	릳
+flf	릴
+flfr	릵
+flfa	릶
+flfq	릷
+flft	릸
+flfx	릹
+flfv	릺
+flfg	릻
+fla	림
+flq	립
+flqt	릾
+flt	릿
+flT	맀
+fld	�
+flw	맂
+flc	맃
+flz	맄
+flx	맅
+flv	맆
+flg	맇
+akr	막
+akR	맊
+akrt	맋
+aks	만
+aksw	�
+aksg	많
+ake	�
+akf	�
+akfr	맑
+akfa	맒
+akfq	맓
+akft	맔
+akfx	맕
+akfv	맖
+akfg	맗
+aka	맘
+akq	맙
+akqt	맚
+akt	맛
+akT	맜
+akd	�
+akw	맞
+akc	맟
+akz	맠
+akx	맡
+akv	맢
+akg	맣
+aor	맥
+aoR	맦
+aort	맧
+aos	맨
+aosw	맩
+aosg	맪
+aoe	맫
+aof	맬
+aofr	맭
+aofa	맮
+aofq	맯
+aoft	맰
+aofx	맱
+aofv	맲
+aofg	맳
+aoa	맴
+aoq	맵
+aoqt	맶
+aot	맷
+aoT	맸
+aod	맹
+aow	맺
+aoc	맻
+aoz	맼
+aox	맽
+aov	맾
+aog	맿
+air	�
+aiR	먂
+airt	먃
+ais	먄
+aisw	먅
+aisg	먆
+aie	먇
+aif	먈
+aifr	먉
+aifa	먊
+aifq	먋
+aift	먌
+aifx	�
+aifv	먎
+aifg	�
+aia	�
+aiq	먑
+aiqt	먒
+ait	먓
+aiT	먔
+aid	먕
+aiw	먖
+aic	먗
+aiz	먘
+aix	먙
+aiv	먚
+aig	먛
+aOr	�
+aOR	먞
+aOrt	먟
+aOs	먠
+aOsw	먡
+aOsg	먢
+aOe	먣
+aOf	먤
+aOfr	먥
+aOfa	먦
+aOfq	먧
+aOft	먨
+aOfx	먩
+aOfv	먪
+aOfg	먫
+aOa	먬
+aOq	먭
+aOqt	먮
+aOt	먯
+aOT	먰
+aOd	먱
+aOw	먲
+aOc	먳
+aOz	먴
+aOx	먵
+aOv	먶
+aOg	먷
+ajr	먹
+ajR	먺
+ajrt	먻
+ajs	먼
+ajsw	먽
+ajsg	먾
+aje	먿
+ajf	ë©€
+ajfr	�
+ajfa	ë©‚
+ajfq	멃
+ajft	ë©„
+ajfx	ë©…
+ajfv	멆
+ajfg	멇
+aja	멈
+ajq	멉
+ajqt	ë©Š
+ajt	ë©‹
+ajT	멌
+ajd	�
+ajw	ë©Ž
+ajc	�
+ajz	�
+ajx	ë©‘
+ajv	ë©’
+ajg	ë©“
+apr	ë©•
+apR	ë©–
+aprt	ë©—
+aps	멘
+apsw	ë©™
+apsg	ë©š
+ape	ë©›
+apf	멜
+apfr	�
+apfa	ë©ž
+apfq	ë©Ÿ
+apft	ë© 
+apfx	ë©¡
+apfv	ë©¢
+apfg	ë©£
+apa	멤
+apq	ë©¥
+apqt	멦
+apt	멧
+apT	멨
+apd	ë©©
+apw	멪
+apc	ë©«
+apz	멬
+apx	ë©­
+apv	ë©®
+apg	멯
+aur	멱
+auR	멲
+aurt	멳
+aus	ë©´
+ausw	멵
+ausg	멶
+aue	ë©·
+auf	멸
+aufr	멹
+aufa	멺
+aufq	ë©»
+auft	멼
+aufx	멽
+aufv	멾
+aufg	ë©¿
+aua	몀
+auq	�
+auqt	몂
+aut	몃
+auT	몄
+aud	명
+auw	몆
+auc	몇
+auz	몈
+aux	몉
+auv	몊
+aug	몋
+aPr	�
+aPR	몎
+aPrt	�
+aPs	�
+aPsw	몑
+aPsg	몒
+aPe	몓
+aPf	몔
+aPfr	몕
+aPfa	몖
+aPfq	몗
+aPft	몘
+aPfx	몙
+aPfv	몚
+aPfg	몛
+aPa	몜
+aPq	�
+aPqt	몞
+aPt	몟
+aPT	몠
+aPd	몡
+aPw	몢
+aPc	몣
+aPz	몤
+aPx	몥
+aPv	몦
+aPg	몧
+ahr	목
+ahR	몪
+ahrt	몫
+ahs	몬
+ahsw	몭
+ahsg	몮
+ahe	몯
+ahf	몰
+ahfr	몱
+ahfa	몲
+ahfq	몳
+ahft	몴
+ahfx	몵
+ahfv	몶
+ahfg	몷
+aha	몸
+ahq	몹
+ahqt	몺
+aht	못
+ahT	몼
+ahd	몽
+ahw	몾
+ahc	몿
+ahz	ë«€
+ahx	�
+ahv	ë«‚
+ahg	뫃
+ahkr	ë«…
+ahkR	뫆
+ahkrt	뫇
+ahks	뫈
+ahksw	뫉
+ahksg	ë«Š
+ahke	ë«‹
+ahkf	뫌
+ahkfr	�
+ahkfa	ë«Ž
+ahkfq	�
+ahkft	�
+ahkfx	ë«‘
+ahkfv	ë«’
+ahkfg	ë«“
+ahka	ë«”
+ahkq	ë«•
+ahkqt	ë«–
+ahkt	ë«—
+ahkT	뫘
+ahkd	ë«™
+ahkw	ë«š
+ahkc	ë«›
+ahkz	뫜
+ahkx	�
+ahkv	ë«ž
+ahkg	ë«Ÿ
+ahor	ë«¡
+ahoR	ë«¢
+ahort	ë«£
+ahos	뫤
+ahosw	ë«¥
+ahosg	뫦
+ahoe	뫧
+ahof	뫨
+ahofr	ë«©
+ahofa	뫪
+ahofq	ë««
+ahoft	뫬
+ahofx	ë«­
+ahofv	ë«®
+ahofg	뫯
+ahoa	ë«°
+ahoq	뫱
+ahoqt	뫲
+ahot	뫳
+ahoT	ë«´
+ahod	뫵
+ahow	뫶
+ahoc	ë«·
+ahoz	뫸
+ahox	뫹
+ahov	뫺
+ahog	ë«»
+ahlr	뫽
+ahlR	뫾
+ahlrt	ë«¿
+ahls	묀
+ahlsw	�
+ahlsg	묂
+ahle	묃
+ahlf	묄
+ahlfr	묅
+ahlfa	묆
+ahlfq	묇
+ahlft	묈
+ahlfx	묉
+ahlfv	묊
+ahlfg	묋
+ahla	묌
+ahlq	�
+ahlqt	묎
+ahlt	�
+ahlT	�
+ahld	묑
+ahlw	묒
+ahlc	묓
+ahlz	묔
+ahlx	묕
+ahlv	묖
+ahlg	묗
+ayr	묙
+ayR	묚
+ayrt	묛
+ays	묜
+aysw	�
+aysg	묞
+aye	묟
+ayf	묠
+ayfr	묡
+ayfa	묢
+ayfq	묣
+ayft	묤
+ayfx	묥
+ayfv	묦
+ayfg	묧
+aya	묨
+ayq	묩
+ayqt	묪
+ayt	묫
+ayT	묬
+ayd	묭
+ayw	묮
+ayc	묯
+ayz	묰
+ayx	묱
+ayv	묲
+ayg	묳
+anr	묵
+anR	묶
+anrt	묷
+ans	문
+answ	묹
+ansg	묺
+ane	묻
+anf	물
+anfr	묽
+anfa	묾
+anfq	묿
+anft	ë­€
+anfx	ë­�
+anfv	ë­‚
+anfg	ë­ƒ
+ana	ë­„
+anq	ë­…
+anqt	ë­†
+ant	ë­‡
+anT	ë­ˆ
+and	ë­‰
+anw	ë­Š
+anc	ë­‹
+anz	뭌
+anx	ë­�
+anv	ë­Ž
+ang	ë­�
+anjr	ë­‘
+anjR	ë­’
+anjrt	ë­“
+anjs	ë­”
+anjsw	ë­•
+anjsg	ë­–
+anje	ë­—
+anjf	ë­˜
+anjfr	ë­™
+anjfa	ë­š
+anjfq	ë­›
+anjft	뭜
+anjfx	ë­�
+anjfv	ë­ž
+anjfg	ë­Ÿ
+anja	ë­ 
+anjq	ë­¡
+anjqt	ë­¢
+anjt	ë­£
+anjT	ë­¤
+anjd	ë­¥
+anjw	ë­¦
+anjc	ë­§
+anjz	ë­¨
+anjx	ë­©
+anjv	ë­ª
+anjg	ë­«
+anpr	ë­­
+anpR	ë­®
+anprt	ë­¯
+anps	ë­°
+anpsw	ë­±
+anpsg	ë­²
+anpe	ë­³
+anpf	ë­´
+anpfr	ë­µ
+anpfa	ë­¶
+anpfq	ë­·
+anpft	ë­¸
+anpfx	ë­¹
+anpfv	ë­º
+anpfg	ë­»
+anpa	ë­¼
+anpq	ë­½
+anpqt	ë­¾
+anpt	ë­¿
+anpT	뮀
+anpd	�
+anpw	뮂
+anpc	뮃
+anpz	뮄
+anpx	ë®…
+anpv	뮆
+anpg	뮇
+anlr	뮉
+anlR	뮊
+anlrt	뮋
+anls	뮌
+anlsw	�
+anlsg	뮎
+anle	�
+anlf	�
+anlfr	뮑
+anlfa	ë®’
+anlfq	뮓
+anlft	ë®”
+anlfx	뮕
+anlfv	ë®–
+anlfg	ë®—
+anla	뮘
+anlq	ë®™
+anlqt	뮚
+anlt	ë®›
+anlT	뮜
+anld	�
+anlw	뮞
+anlc	뮟
+anlz	ë® 
+anlx	뮡
+anlv	뮢
+anlg	뮣
+abr	뮥
+abR	뮦
+abrt	뮧
+abs	뮨
+absw	뮩
+absg	뮪
+abe	뮫
+abf	뮬
+abfr	ë®­
+abfa	ë®®
+abfq	뮯
+abft	ë®°
+abfx	ë®±
+abfv	뮲
+abfg	뮳
+aba	ë®´
+abq	뮵
+abqt	뮶
+abt	ë®·
+abT	뮸
+abd	뮹
+abw	뮺
+abc	ë®»
+abz	뮼
+abx	뮽
+abv	뮾
+abg	뮿
+amr	�
+amR	믂
+amrt	믃
+ams	믄
+amsw	믅
+amsg	믆
+ame	믇
+amf	믈
+amfr	믉
+amfa	믊
+amfq	믋
+amft	믌
+amfx	�
+amfv	믎
+amfg	�
+ama	�
+amq	믑
+amqt	믒
+amt	믓
+amT	믔
+amd	믕
+amw	믖
+amc	믗
+amz	믘
+amx	믙
+amv	믚
+amg	믛
+amlr	�
+amlR	믞
+amlrt	믟
+amls	믠
+amlsw	믡
+amlsg	믢
+amle	믣
+amlf	믤
+amlfr	믥
+amlfa	믦
+amlfq	믧
+amlft	믨
+amlfx	믩
+amlfv	믪
+amlfg	믫
+amla	믬
+amlq	믭
+amlqt	믮
+amlt	믯
+amlT	믰
+amld	믱
+amlw	믲
+amlc	믳
+amlz	믴
+amlx	믵
+amlv	믶
+amlg	믷
+alr	믹
+alR	믺
+alrt	믻
+als	민
+alsw	믽
+alsg	믾
+ale	믿
+alf	ë°€
+alfr	ë°�
+alfa	ë°‚
+alfq	ë°ƒ
+alft	ë°„
+alfx	ë°…
+alfv	ë°†
+alfg	ë°‡
+ala	ë°ˆ
+alq	ë°‰
+alqt	ë°Š
+alt	ë°‹
+alT	밌
+ald	ë°�
+alw	ë°Ž
+alc	ë°�
+alz	ë°�
+alx	ë°‘
+alv	ë°’
+alg	ë°“
+qkr	ë°•
+qkR	ë°–
+qkrt	ë°—
+qks	ë°˜
+qksw	ë°™
+qksg	ë°š
+qke	ë°›
+qkf	발
+qkfr	ë°�
+qkfa	ë°ž
+qkfq	ë°Ÿ
+qkft	ë° 
+qkfx	ë°¡
+qkfv	ë°¢
+qkfg	ë°£
+qka	ë°¤
+qkq	ë°¥
+qkqt	ë°¦
+qkt	ë°§
+qkT	ë°¨
+qkd	ë°©
+qkw	ë°ª
+qkc	ë°«
+qkz	ë°¬
+qkx	ë°­
+qkv	ë°®
+qkg	ë°¯
+qor	ë°±
+qoR	ë°²
+qort	ë°³
+qos	ë°´
+qosw	ë°µ
+qosg	ë°¶
+qoe	ë°·
+qof	ë°¸
+qofr	ë°¹
+qofa	ë°º
+qofq	ë°»
+qoft	ë°¼
+qofx	ë°½
+qofv	ë°¾
+qofg	ë°¿
+qoa	ë±€
+qoq	�
+qoqt	뱂
+qot	뱃
+qoT	뱄
+qod	ë±…
+qow	뱆
+qoc	뱇
+qoz	뱈
+qox	뱉
+qov	뱊
+qog	뱋
+qir	�
+qiR	뱎
+qirt	�
+qis	�
+qisw	뱑
+qisg	ë±’
+qie	뱓
+qif	ë±”
+qifr	뱕
+qifa	ë±–
+qifq	ë±—
+qift	뱘
+qifx	ë±™
+qifv	뱚
+qifg	ë±›
+qia	뱜
+qiq	�
+qiqt	뱞
+qit	뱟
+qiT	ë± 
+qid	뱡
+qiw	ë±¢
+qic	ë±£
+qiz	뱤
+qix	ë±¥
+qiv	뱦
+qig	뱧
+qOr	뱩
+qOR	뱪
+qOrt	뱫
+qOs	뱬
+qOsw	ë±­
+qOsg	ë±®
+qOe	뱯
+qOf	ë±°
+qOfr	ë±±
+qOfa	ë±²
+qOfq	ë±³
+qOft	ë±´
+qOfx	ë±µ
+qOfv	뱶
+qOfg	ë±·
+qOa	뱸
+qOq	ë±¹
+qOqt	뱺
+qOt	ë±»
+qOT	ë±¼
+qOd	ë±½
+qOw	ë±¾
+qOc	뱿
+qOz	ë²€
+qOx	�
+qOv	벂
+qOg	벃
+qjr	ë²…
+qjR	벆
+qjrt	벇
+qjs	번
+qjsw	벉
+qjsg	벊
+qje	벋
+qjf	벌
+qjfr	�
+qjfa	벎
+qjfq	�
+qjft	�
+qjfx	벑
+qjfv	ë²’
+qjfg	벓
+qja	ë²”
+qjq	법
+qjqt	ë²–
+qjt	ë²—
+qjT	벘
+qjd	ë²™
+qjw	벚
+qjc	ë²›
+qjz	벜
+qjx	�
+qjv	벞
+qjg	벟
+qpr	벡
+qpR	ë²¢
+qprt	ë²£
+qps	벤
+qpsw	ë²¥
+qpsg	벦
+qpe	벧
+qpf	벨
+qpfr	벩
+qpfa	벪
+qpfq	벫
+qpft	벬
+qpfx	ë²­
+qpfv	ë²®
+qpfg	벯
+qpa	ë²°
+qpq	ë²±
+qpqt	ë²²
+qpt	ë²³
+qpT	ë²´
+qpd	ë²µ
+qpw	벶
+qpc	ë²·
+qpz	벸
+qpx	ë²¹
+qpv	벺
+qpg	ë²»
+qur	ë²½
+quR	ë²¾
+qurt	벿
+qus	ë³€
+qusw	�
+qusg	볂
+que	볃
+quf	별
+qufr	ë³…
+qufa	볆
+qufq	볇
+quft	볈
+qufx	볉
+qufv	볊
+qufg	볋
+qua	볌
+quq	�
+quqt	볎
+qut	�
+quT	�
+qud	병
+quw	ë³’
+quc	볓
+quz	ë³”
+qux	볕
+quv	ë³–
+qug	ë³—
+qPr	ë³™
+qPR	볚
+qPrt	ë³›
+qPs	볜
+qPsw	�
+qPsg	볞
+qPe	볟
+qPf	ë³ 
+qPfr	볡
+qPfa	ë³¢
+qPfq	ë³£
+qPft	볤
+qPfx	ë³¥
+qPfv	볦
+qPfg	볧
+qPa	볨
+qPq	볩
+qPqt	볪
+qPt	볫
+qPT	볬
+qPd	ë³­
+qPw	ë³®
+qPc	볯
+qPz	ë³°
+qPx	ë³±
+qPv	ë³²
+qPg	ë³³
+qhr	ë³µ
+qhR	볶
+qhrt	ë³·
+qhs	본
+qhsw	ë³¹
+qhsg	볺
+qhe	ë³»
+qhf	ë³¼
+qhfr	ë³½
+qhfa	ë³¾
+qhfq	볿
+qhft	ë´€
+qhfx	ë´�
+qhfv	ë´‚
+qhfg	ë´ƒ
+qha	ë´„
+qhq	ë´…
+qhqt	ë´†
+qht	ë´‡
+qhT	ë´ˆ
+qhd	ë´‰
+qhw	ë´Š
+qhc	ë´‹
+qhz	봌
+qhx	ë´�
+qhv	ë´Ž
+qhg	ë´�
+qhkr	ë´‘
+qhkR	ë´’
+qhkrt	ë´“
+qhks	ë´”
+qhksw	ë´•
+qhksg	ë´–
+qhke	ë´—
+qhkf	ë´˜
+qhkfr	ë´™
+qhkfa	ë´š
+qhkfq	ë´›
+qhkft	봜
+qhkfx	ë´�
+qhkfv	ë´ž
+qhkfg	ë´Ÿ
+qhka	ë´ 
+qhkq	ë´¡
+qhkqt	ë´¢
+qhkt	ë´£
+qhkT	ë´¤
+qhkd	ë´¥
+qhkw	ë´¦
+qhkc	ë´§
+qhkz	ë´¨
+qhkx	ë´©
+qhkv	ë´ª
+qhkg	ë´«
+qhor	ë´­
+qhoR	ë´®
+qhort	ë´¯
+qhos	ë´°
+qhosw	ë´±
+qhosg	ë´²
+qhoe	ë´³
+qhof	ë´´
+qhofr	ë´µ
+qhofa	ë´¶
+qhofq	ë´·
+qhoft	ë´¸
+qhofx	ë´¹
+qhofv	ë´º
+qhofg	ë´»
+qhoa	ë´¼
+qhoq	ë´½
+qhoqt	ë´¾
+qhot	ë´¿
+qhoT	ëµ€
+qhod	�
+qhow	뵂
+qhoc	뵃
+qhoz	뵄
+qhox	ëµ…
+qhov	뵆
+qhog	뵇
+qhlr	뵉
+qhlR	뵊
+qhlrt	뵋
+qhls	뵌
+qhlsw	�
+qhlsg	뵎
+qhle	�
+qhlf	�
+qhlfr	뵑
+qhlfa	ëµ’
+qhlfq	뵓
+qhlft	ëµ”
+qhlfx	뵕
+qhlfv	ëµ–
+qhlfg	ëµ—
+qhla	뵘
+qhlq	ëµ™
+qhlqt	뵚
+qhlt	ëµ›
+qhlT	뵜
+qhld	�
+qhlw	뵞
+qhlc	뵟
+qhlz	ëµ 
+qhlx	뵡
+qhlv	ëµ¢
+qhlg	ëµ£
+qyr	ëµ¥
+qyR	뵦
+qyrt	뵧
+qys	뵨
+qysw	뵩
+qysg	뵪
+qye	뵫
+qyf	뵬
+qyfr	ëµ­
+qyfa	ëµ®
+qyfq	뵯
+qyft	ëµ°
+qyfx	ëµ±
+qyfv	ëµ²
+qyfg	ëµ³
+qya	ëµ´
+qyq	ëµµ
+qyqt	뵶
+qyt	ëµ·
+qyT	뵸
+qyd	ëµ¹
+qyw	뵺
+qyc	ëµ»
+qyz	ëµ¼
+qyx	ëµ½
+qyv	ëµ¾
+qyg	뵿
+qnr	�
+qnR	붂
+qnrt	붃
+qns	분
+qnsw	붅
+qnsg	붆
+qne	붇
+qnf	불
+qnfr	붉
+qnfa	붊
+qnfq	붋
+qnft	붌
+qnfx	�
+qnfv	붎
+qnfg	�
+qna	�
+qnq	붑
+qnqt	붒
+qnt	붓
+qnT	붔
+qnd	붕
+qnw	붖
+qnc	붗
+qnz	붘
+qnx	붙
+qnv	붚
+qng	붛
+qnjr	�
+qnjR	붞
+qnjrt	붟
+qnjs	붠
+qnjsw	붡
+qnjsg	붢
+qnje	붣
+qnjf	붤
+qnjfr	붥
+qnjfa	붦
+qnjfq	붧
+qnjft	붨
+qnjfx	붩
+qnjfv	붪
+qnjfg	붫
+qnja	붬
+qnjq	붭
+qnjqt	붮
+qnjt	붯
+qnjT	붰
+qnjd	붱
+qnjw	붲
+qnjc	붳
+qnjz	붴
+qnjx	붵
+qnjv	붶
+qnjg	붷
+qnpr	붹
+qnpR	붺
+qnprt	붻
+qnps	붼
+qnpsw	붽
+qnpsg	붾
+qnpe	붿
+qnpf	ë·€
+qnpfr	ë·�
+qnpfa	ë·‚
+qnpfq	ë·ƒ
+qnpft	ë·„
+qnpfx	ë·…
+qnpfv	ë·†
+qnpfg	ë·‡
+qnpa	ë·ˆ
+qnpq	ë·‰
+qnpqt	ë·Š
+qnpt	ë·‹
+qnpT	뷌
+qnpd	ë·�
+qnpw	ë·Ž
+qnpc	ë·�
+qnpz	ë·�
+qnpx	ë·‘
+qnpv	ë·’
+qnpg	ë·“
+qnlr	ë·•
+qnlR	ë·–
+qnlrt	ë·—
+qnls	ë·˜
+qnlsw	ë·™
+qnlsg	ë·š
+qnle	ë·›
+qnlf	뷜
+qnlfr	ë·�
+qnlfa	ë·ž
+qnlfq	ë·Ÿ
+qnlft	ë· 
+qnlfx	ë·¡
+qnlfv	ë·¢
+qnlfg	ë·£
+qnla	ë·¤
+qnlq	ë·¥
+qnlqt	ë·¦
+qnlt	ë·§
+qnlT	ë·¨
+qnld	ë·©
+qnlw	ë·ª
+qnlc	ë·«
+qnlz	ë·¬
+qnlx	ë·­
+qnlv	ë·®
+qnlg	ë·¯
+qbr	ë·±
+qbR	ë·²
+qbrt	ë·³
+qbs	ë·´
+qbsw	ë·µ
+qbsg	ë·¶
+qbe	ë··
+qbf	ë·¸
+qbfr	ë·¹
+qbfa	ë·º
+qbfq	ë·»
+qbft	ë·¼
+qbfx	ë·½
+qbfv	ë·¾
+qbfg	ë·¿
+qba	븀
+qbq	�
+qbqt	븂
+qbt	븃
+qbT	븄
+qbd	븅
+qbw	븆
+qbc	븇
+qbz	븈
+qbx	븉
+qbv	븊
+qbg	븋
+qmr	�
+qmR	븎
+qmrt	�
+qms	�
+qmsw	븑
+qmsg	븒
+qme	븓
+qmf	블
+qmfr	븕
+qmfa	븖
+qmfq	븗
+qmft	븘
+qmfx	븙
+qmfv	븚
+qmfg	븛
+qma	븜
+qmq	�
+qmqt	븞
+qmt	븟
+qmT	븠
+qmd	븡
+qmw	븢
+qmc	븣
+qmz	븤
+qmx	븥
+qmv	븦
+qmg	븧
+qmlr	븩
+qmlR	븪
+qmlrt	븫
+qmls	븬
+qmlsw	븭
+qmlsg	븮
+qmle	븯
+qmlf	븰
+qmlfr	븱
+qmlfa	븲
+qmlfq	븳
+qmlft	븴
+qmlfx	븵
+qmlfv	븶
+qmlfg	븷
+qmla	븸
+qmlq	븹
+qmlqt	븺
+qmlt	븻
+qmlT	븼
+qmld	븽
+qmlw	븾
+qmlc	븿
+qmlz	ë¹€
+qmlx	�
+qmlv	빂
+qmlg	빃
+qlr	ë¹…
+qlR	빆
+qlrt	빇
+qls	빈
+qlsw	빉
+qlsg	빊
+qle	빋
+qlf	빌
+qlfr	�
+qlfa	빎
+qlfq	�
+qlft	�
+qlfx	빑
+qlfv	ë¹’
+qlfg	빓
+qla	ë¹”
+qlq	빕
+qlqt	ë¹–
+qlt	ë¹—
+qlT	빘
+qld	ë¹™
+qlw	빚
+qlc	ë¹›
+qlz	빜
+qlx	�
+qlv	빞
+qlg	빟
+Qkr	빡
+QkR	ë¹¢
+Qkrt	ë¹£
+Qks	빤
+Qksw	ë¹¥
+Qksg	빦
+Qke	빧
+Qkf	빨
+Qkfr	빩
+Qkfa	빪
+Qkfq	빫
+Qkft	빬
+Qkfx	ë¹­
+Qkfv	ë¹®
+Qkfg	빯
+Qka	ë¹°
+Qkq	ë¹±
+Qkqt	ë¹²
+Qkt	ë¹³
+QkT	ë¹´
+Qkd	ë¹µ
+Qkw	빶
+Qkc	ë¹·
+Qkz	빸
+Qkx	ë¹¹
+Qkv	빺
+Qkg	ë¹»
+Qor	ë¹½
+QoR	ë¹¾
+Qort	빿
+Qos	뺀
+Qosw	�
+Qosg	뺂
+Qoe	뺃
+Qof	뺄
+Qofr	뺅
+Qofa	뺆
+Qofq	뺇
+Qoft	뺈
+Qofx	뺉
+Qofv	뺊
+Qofg	뺋
+Qoa	뺌
+Qoq	�
+Qoqt	뺎
+Qot	�
+QoT	�
+Qod	뺑
+Qow	뺒
+Qoc	뺓
+Qoz	뺔
+Qox	뺕
+Qov	뺖
+Qog	뺗
+Qir	뺙
+QiR	뺚
+Qirt	뺛
+Qis	뺜
+Qisw	�
+Qisg	뺞
+Qie	뺟
+Qif	뺠
+Qifr	뺡
+Qifa	뺢
+Qifq	뺣
+Qift	뺤
+Qifx	뺥
+Qifv	뺦
+Qifg	뺧
+Qia	뺨
+Qiq	뺩
+Qiqt	뺪
+Qit	뺫
+QiT	뺬
+Qid	뺭
+Qiw	뺮
+Qic	뺯
+Qiz	뺰
+Qix	뺱
+Qiv	뺲
+Qig	뺳
+QOr	뺵
+QOR	뺶
+QOrt	뺷
+QOs	뺸
+QOsw	뺹
+QOsg	뺺
+QOe	뺻
+QOf	뺼
+QOfr	뺽
+QOfa	뺾
+QOfq	뺿
+QOft	뻀
+QOfx	�
+QOfv	뻂
+QOfg	뻃
+QOa	뻄
+QOq	ë»…
+QOqt	뻆
+QOt	뻇
+QOT	뻈
+QOd	뻉
+QOw	뻊
+QOc	뻋
+QOz	뻌
+QOx	�
+QOv	뻎
+QOg	�
+Qjr	뻑
+QjR	ë»’
+Qjrt	뻓
+Qjs	ë»”
+Qjsw	뻕
+Qjsg	ë»–
+Qje	ë»—
+Qjf	뻘
+Qjfr	ë»™
+Qjfa	뻚
+Qjfq	ë»›
+Qjft	뻜
+Qjfx	�
+Qjfv	뻞
+Qjfg	뻟
+Qja	ë» 
+Qjq	뻡
+Qjqt	뻢
+Qjt	뻣
+QjT	뻤
+Qjd	뻥
+Qjw	뻦
+Qjc	뻧
+Qjz	뻨
+Qjx	뻩
+Qjv	뻪
+Qjg	뻫
+Qpr	ë»­
+QpR	ë»®
+Qprt	뻯
+Qps	ë»°
+Qpsw	ë»±
+Qpsg	뻲
+Qpe	뻳
+Qpf	ë»´
+Qpfr	뻵
+Qpfa	뻶
+Qpfq	ë»·
+Qpft	뻸
+Qpfx	뻹
+Qpfv	뻺
+Qpfg	ë»»
+Qpa	뻼
+Qpq	뻽
+Qpqt	뻾
+Qpt	뻿
+QpT	ë¼€
+Qpd	�
+Qpw	뼂
+Qpc	뼃
+Qpz	뼄
+Qpx	ë¼…
+Qpv	뼆
+Qpg	뼇
+Qur	뼉
+QuR	뼊
+Qurt	뼋
+Qus	뼌
+Qusw	�
+Qusg	뼎
+Que	�
+Quf	�
+Qufr	뼑
+Qufa	ë¼’
+Qufq	뼓
+Quft	ë¼”
+Qufx	뼕
+Qufv	ë¼–
+Qufg	ë¼—
+Qua	뼘
+Quq	ë¼™
+Quqt	뼚
+Qut	ë¼›
+QuT	뼜
+Qud	�
+Quw	뼞
+Quc	뼟
+Quz	ë¼ 
+Qux	뼡
+Quv	ë¼¢
+Qug	ë¼£
+QPr	ë¼¥
+QPR	뼦
+QPrt	뼧
+QPs	뼨
+QPsw	뼩
+QPsg	뼪
+QPe	뼫
+QPf	뼬
+QPfr	ë¼­
+QPfa	ë¼®
+QPfq	뼯
+QPft	ë¼°
+QPfx	ë¼±
+QPfv	ë¼²
+QPfg	ë¼³
+QPa	ë¼´
+QPq	ë¼µ
+QPqt	뼶
+QPt	ë¼·
+QPT	뼸
+QPd	ë¼¹
+QPw	뼺
+QPc	ë¼»
+QPz	ë¼¼
+QPx	ë¼½
+QPv	ë¼¾
+QPg	뼿
+Qhr	�
+QhR	뽂
+Qhrt	뽃
+Qhs	뽄
+Qhsw	ë½…
+Qhsg	뽆
+Qhe	뽇
+Qhf	뽈
+Qhfr	뽉
+Qhfa	뽊
+Qhfq	뽋
+Qhft	뽌
+Qhfx	�
+Qhfv	뽎
+Qhfg	�
+Qha	�
+Qhq	뽑
+Qhqt	ë½’
+Qht	뽓
+QhT	ë½”
+Qhd	뽕
+Qhw	ë½–
+Qhc	ë½—
+Qhz	뽘
+Qhx	ë½™
+Qhv	뽚
+Qhg	ë½›
+Qhkr	�
+QhkR	뽞
+Qhkrt	뽟
+Qhks	ë½ 
+Qhksw	뽡
+Qhksg	ë½¢
+Qhke	ë½£
+Qhkf	뽤
+Qhkfr	ë½¥
+Qhkfa	뽦
+Qhkfq	뽧
+Qhkft	뽨
+Qhkfx	뽩
+Qhkfv	뽪
+Qhkfg	뽫
+Qhka	뽬
+Qhkq	ë½­
+Qhkqt	ë½®
+Qhkt	뽯
+QhkT	ë½°
+Qhkd	ë½±
+Qhkw	ë½²
+Qhkc	ë½³
+Qhkz	ë½´
+Qhkx	ë½µ
+Qhkv	뽶
+Qhkg	ë½·
+Qhor	ë½¹
+QhoR	뽺
+Qhort	ë½»
+Qhos	ë½¼
+Qhosw	ë½½
+Qhosg	ë½¾
+Qhoe	뽿
+Qhof	ë¾€
+Qhofr	�
+Qhofa	뾂
+Qhofq	뾃
+Qhoft	뾄
+Qhofx	ë¾…
+Qhofv	뾆
+Qhofg	뾇
+Qhoa	뾈
+Qhoq	뾉
+Qhoqt	뾊
+Qhot	뾋
+QhoT	뾌
+Qhod	�
+Qhow	뾎
+Qhoc	�
+Qhoz	�
+Qhox	뾑
+Qhov	ë¾’
+Qhog	뾓
+Qhlr	뾕
+QhlR	ë¾–
+Qhlrt	ë¾—
+Qhls	뾘
+Qhlsw	ë¾™
+Qhlsg	뾚
+Qhle	ë¾›
+Qhlf	뾜
+Qhlfr	�
+Qhlfa	뾞
+Qhlfq	뾟
+Qhlft	ë¾ 
+Qhlfx	뾡
+Qhlfv	ë¾¢
+Qhlfg	ë¾£
+Qhla	뾤
+Qhlq	ë¾¥
+Qhlqt	뾦
+Qhlt	뾧
+QhlT	뾨
+Qhld	뾩
+Qhlw	뾪
+Qhlc	뾫
+Qhlz	뾬
+Qhlx	ë¾­
+Qhlv	ë¾®
+Qhlg	뾯
+Qyr	ë¾±
+QyR	ë¾²
+Qyrt	ë¾³
+Qys	ë¾´
+Qysw	ë¾µ
+Qysg	뾶
+Qye	ë¾·
+Qyf	뾸
+Qyfr	ë¾¹
+Qyfa	뾺
+Qyfq	ë¾»
+Qyft	ë¾¼
+Qyfx	ë¾½
+Qyfv	ë¾¾
+Qyfg	뾿
+Qya	ë¿€
+Qyq	�
+Qyqt	ë¿‚
+Qyt	뿃
+QyT	ë¿„
+Qyd	ë¿…
+Qyw	뿆
+Qyc	뿇
+Qyz	뿈
+Qyx	뿉
+Qyv	ë¿Š
+Qyg	ë¿‹
+Qnr	�
+QnR	ë¿Ž
+Qnrt	�
+Qns	�
+Qnsw	ë¿‘
+Qnsg	ë¿’
+Qne	ë¿“
+Qnf	ë¿”
+Qnfr	ë¿•
+Qnfa	ë¿–
+Qnfq	ë¿—
+Qnft	뿘
+Qnfx	ë¿™
+Qnfv	ë¿š
+Qnfg	ë¿›
+Qna	뿜
+Qnq	�
+Qnqt	ë¿ž
+Qnt	ë¿Ÿ
+QnT	ë¿ 
+Qnd	ë¿¡
+Qnw	ë¿¢
+Qnc	ë¿£
+Qnz	뿤
+Qnx	ë¿¥
+Qnv	뿦
+Qng	뿧
+Qnjr	ë¿©
+QnjR	뿪
+Qnjrt	ë¿«
+Qnjs	뿬
+Qnjsw	ë¿­
+Qnjsg	ë¿®
+Qnje	뿯
+Qnjf	ë¿°
+Qnjfr	뿱
+Qnjfa	뿲
+Qnjfq	뿳
+Qnjft	ë¿´
+Qnjfx	뿵
+Qnjfv	뿶
+Qnjfg	ë¿·
+Qnja	뿸
+Qnjq	뿹
+Qnjqt	뿺
+Qnjt	ë¿»
+QnjT	뿼
+Qnjd	뿽
+Qnjw	뿾
+Qnjc	ë¿¿
+Qnjz	쀀
+Qnjx	�
+Qnjv	쀂
+Qnjg	쀃
+Qnpr	쀅
+QnpR	쀆
+Qnprt	쀇
+Qnps	쀈
+Qnpsw	쀉
+Qnpsg	쀊
+Qnpe	쀋
+Qnpf	쀌
+Qnpfr	�
+Qnpfa	쀎
+Qnpfq	�
+Qnpft	�
+Qnpfx	쀑
+Qnpfv	쀒
+Qnpfg	쀓
+Qnpa	쀔
+Qnpq	쀕
+Qnpqt	쀖
+Qnpt	쀗
+QnpT	쀘
+Qnpd	쀙
+Qnpw	쀚
+Qnpc	쀛
+Qnpz	쀜
+Qnpx	�
+Qnpv	쀞
+Qnpg	쀟
+Qnlr	쀡
+QnlR	쀢
+Qnlrt	쀣
+Qnls	쀤
+Qnlsw	쀥
+Qnlsg	쀦
+Qnle	쀧
+Qnlf	쀨
+Qnlfr	쀩
+Qnlfa	쀪
+Qnlfq	쀫
+Qnlft	쀬
+Qnlfx	쀭
+Qnlfv	쀮
+Qnlfg	쀯
+Qnla	쀰
+Qnlq	쀱
+Qnlqt	쀲
+Qnlt	쀳
+QnlT	쀴
+Qnld	쀵
+Qnlw	쀶
+Qnlc	쀷
+Qnlz	쀸
+Qnlx	쀹
+Qnlv	쀺
+Qnlg	쀻
+Qbr	쀽
+QbR	쀾
+Qbrt	쀿
+Qbs	�
+Qbsw	�
+Qbsg	�
+Qbe	�
+Qbf	�
+Qbfr	�
+Qbfa	�
+Qbfq	�
+Qbft	�
+Qbfx	�
+Qbfv	�
+Qbfg	�
+Qba	�
+Qbq	�
+Qbqt	�
+Qbt	�
+QbT	�
+Qbd	�
+Qbw	�
+Qbc	�
+Qbz	�
+Qbx	�
+Qbv	�
+Qbg	�
+Qmr	�
+QmR	�
+Qmrt	�
+Qms	�
+Qmsw	�
+Qmsg	�
+Qme	�
+Qmf	�
+Qmfr	�
+Qmfa	�
+Qmfq	�
+Qmft	�
+Qmfx	�
+Qmfv	�
+Qmfg	�
+Qma	�
+Qmq	�
+Qmqt	�
+Qmt	�
+QmT	�
+Qmd	�
+Qmw	�
+Qmc	�
+Qmz	�
+Qmx	�
+Qmv	�
+Qmg	�
+Qmlr	�
+QmlR	�
+Qmlrt	�
+Qmls	�
+Qmlsw	�
+Qmlsg	�
+Qmle	�
+Qmlf	�
+Qmlfr	�
+Qmlfa	�
+Qmlfq	�
+Qmlft	ì‚€
+Qmlfx	�
+Qmlfv	ì‚‚
+Qmlfg	삃
+Qmla	ì‚„
+Qmlq	ì‚…
+Qmlqt	삆
+Qmlt	삇
+QmlT	삈
+Qmld	삉
+Qmlw	ì‚Š
+Qmlc	ì‚‹
+Qmlz	삌
+Qmlx	�
+Qmlv	ì‚Ž
+Qmlg	�
+Qlr	ì‚‘
+QlR	ì‚’
+Qlrt	ì‚“
+Qls	ì‚”
+Qlsw	ì‚•
+Qlsg	ì‚–
+Qle	ì‚—
+Qlf	삘
+Qlfr	ì‚™
+Qlfa	ì‚š
+Qlfq	ì‚›
+Qlft	삜
+Qlfx	�
+Qlfv	ì‚ž
+Qlfg	ì‚Ÿ
+Qla	ì‚ 
+Qlq	ì‚¡
+Qlqt	ì‚¢
+Qlt	ì‚£
+QlT	삤
+Qld	ì‚¥
+Qlw	삦
+Qlc	삧
+Qlz	삨
+Qlx	ì‚©
+Qlv	삪
+Qlg	ì‚«
+tkr	ì‚­
+tkR	ì‚®
+tkrt	삯
+tks	ì‚°
+tksw	삱
+tksg	삲
+tke	삳
+tkf	ì‚´
+tkfr	삵
+tkfa	삶
+tkfq	ì‚·
+tkft	삸
+tkfx	삹
+tkfv	삺
+tkfg	ì‚»
+tka	삼
+tkq	삽
+tkqt	삾
+tkt	ì‚¿
+tkT	샀
+tkd	�
+tkw	샂
+tkc	샃
+tkz	샄
+tkx	샅
+tkv	샆
+tkg	샇
+tor	색
+toR	샊
+tort	샋
+tos	샌
+tosw	�
+tosg	샎
+toe	�
+tof	�
+tofr	샑
+tofa	샒
+tofq	샓
+toft	샔
+tofx	샕
+tofv	샖
+tofg	샗
+toa	샘
+toq	샙
+toqt	샚
+tot	샛
+toT	샜
+tod	�
+tow	샞
+toc	샟
+toz	샠
+tox	샡
+tov	샢
+tog	샣
+tir	샥
+tiR	샦
+tirt	샧
+tis	샨
+tisw	샩
+tisg	샪
+tie	샫
+tif	샬
+tifr	샭
+tifa	샮
+tifq	샯
+tift	샰
+tifx	샱
+tifv	샲
+tifg	샳
+tia	샴
+tiq	샵
+tiqt	샶
+tit	샷
+tiT	샸
+tid	샹
+tiw	샺
+tic	샻
+tiz	샼
+tix	샽
+tiv	샾
+tig	샿
+tOr	�
+tOR	ì„‚
+tOrt	섃
+tOs	ì„„
+tOsw	ì„…
+tOsg	섆
+tOe	섇
+tOf	섈
+tOfr	섉
+tOfa	ì„Š
+tOfq	ì„‹
+tOft	섌
+tOfx	�
+tOfv	ì„Ž
+tOfg	�
+tOa	�
+tOq	ì„‘
+tOqt	ì„’
+tOt	ì„“
+tOT	ì„”
+tOd	ì„•
+tOw	ì„–
+tOc	ì„—
+tOz	섘
+tOx	ì„™
+tOv	ì„š
+tOg	ì„›
+tjr	�
+tjR	ì„ž
+tjrt	ì„Ÿ
+tjs	ì„ 
+tjsw	ì„¡
+tjsg	ì„¢
+tje	ì„£
+tjf	설
+tjfr	ì„¥
+tjfa	섦
+tjfq	섧
+tjft	섨
+tjfx	ì„©
+tjfv	섪
+tjfg	ì„«
+tja	섬
+tjq	ì„­
+tjqt	ì„®
+tjt	섯
+tjT	ì„°
+tjd	성
+tjw	섲
+tjc	섳
+tjz	ì„´
+tjx	섵
+tjv	섶
+tjg	ì„·
+tpr	섹
+tpR	섺
+tprt	ì„»
+tps	센
+tpsw	섽
+tpsg	섾
+tpe	ì„¿
+tpf	ì…€
+tpfr	ì…�
+tpfa	ì…‚
+tpfq	ì…ƒ
+tpft	ì…„
+tpfx	ì……
+tpfv	ì…†
+tpfg	ì…‡
+tpa	ì…ˆ
+tpq	ì…‰
+tpqt	ì…Š
+tpt	ì…‹
+tpT	셌
+tpd	ì…�
+tpw	ì…Ž
+tpc	ì…�
+tpz	ì…�
+tpx	ì…‘
+tpv	ì…’
+tpg	ì…“
+tur	ì…•
+tuR	ì…–
+turt	ì…—
+tus	ì…˜
+tusw	ì…™
+tusg	ì…š
+tue	ì…›
+tuf	셜
+tufr	ì…�
+tufa	ì…ž
+tufq	ì…Ÿ
+tuft	ì… 
+tufx	ì…¡
+tufv	ì…¢
+tufg	ì…£
+tua	ì…¤
+tuq	ì…¥
+tuqt	ì…¦
+tut	ì…§
+tuT	ì…¨
+tud	ì…©
+tuw	ì…ª
+tuc	ì…«
+tuz	ì…¬
+tux	ì…­
+tuv	ì…®
+tug	ì…¯
+tPr	ì…±
+tPR	ì…²
+tPrt	ì…³
+tPs	ì…´
+tPsw	ì…µ
+tPsg	ì…¶
+tPe	ì…·
+tPf	ì…¸
+tPfr	ì…¹
+tPfa	ì…º
+tPfq	ì…»
+tPft	ì…¼
+tPfx	ì…½
+tPfv	ì…¾
+tPfg	ì…¿
+tPa	솀
+tPq	�
+tPqt	솂
+tPt	솃
+tPT	솄
+tPd	솅
+tPw	솆
+tPc	솇
+tPz	솈
+tPx	솉
+tPv	솊
+tPg	솋
+thr	�
+thR	솎
+thrt	�
+ths	�
+thsw	솑
+thsg	솒
+the	솓
+thf	솔
+thfr	솕
+thfa	솖
+thfq	솗
+thft	솘
+thfx	솙
+thfv	솚
+thfg	솛
+tha	솜
+thq	�
+thqt	솞
+tht	솟
+thT	솠
+thd	송
+thw	솢
+thc	솣
+thz	솤
+thx	솥
+thv	솦
+thg	솧
+thkr	솩
+thkR	솪
+thkrt	솫
+thks	솬
+thksw	솭
+thksg	솮
+thke	솯
+thkf	솰
+thkfr	솱
+thkfa	솲
+thkfq	솳
+thkft	솴
+thkfx	솵
+thkfv	솶
+thkfg	솷
+thka	솸
+thkq	솹
+thkqt	솺
+thkt	솻
+thkT	솼
+thkd	솽
+thkw	솾
+thkc	솿
+thkz	쇀
+thkx	�
+thkv	쇂
+thkg	쇃
+thor	쇅
+thoR	쇆
+thort	쇇
+thos	쇈
+thosw	쇉
+thosg	쇊
+thoe	쇋
+thof	쇌
+thofr	�
+thofa	쇎
+thofq	�
+thoft	�
+thofx	쇑
+thofv	쇒
+thofg	쇓
+thoa	쇔
+thoq	쇕
+thoqt	쇖
+thot	쇗
+thoT	쇘
+thod	쇙
+thow	쇚
+thoc	쇛
+thoz	쇜
+thox	�
+thov	쇞
+thog	쇟
+thlr	쇡
+thlR	쇢
+thlrt	쇣
+thls	쇤
+thlsw	쇥
+thlsg	쇦
+thle	쇧
+thlf	쇨
+thlfr	쇩
+thlfa	쇪
+thlfq	쇫
+thlft	쇬
+thlfx	쇭
+thlfv	쇮
+thlfg	쇯
+thla	쇰
+thlq	쇱
+thlqt	쇲
+thlt	쇳
+thlT	쇴
+thld	쇵
+thlw	쇶
+thlc	쇷
+thlz	쇸
+thlx	쇹
+thlv	쇺
+thlg	쇻
+tyr	쇽
+tyR	쇾
+tyrt	쇿
+tys	숀
+tysw	�
+tysg	숂
+tye	숃
+tyf	숄
+tyfr	숅
+tyfa	숆
+tyfq	숇
+tyft	숈
+tyfx	숉
+tyfv	숊
+tyfg	숋
+tya	숌
+tyq	�
+tyqt	숎
+tyt	�
+tyT	�
+tyd	숑
+tyw	숒
+tyc	숓
+tyz	숔
+tyx	숕
+tyv	숖
+tyg	숗
+tnr	숙
+tnR	숚
+tnrt	숛
+tns	순
+tnsw	�
+tnsg	숞
+tne	숟
+tnf	술
+tnfr	숡
+tnfa	숢
+tnfq	숣
+tnft	숤
+tnfx	숥
+tnfv	숦
+tnfg	숧
+tna	숨
+tnq	숩
+tnqt	숪
+tnt	숫
+tnT	숬
+tnd	숭
+tnw	숮
+tnc	숯
+tnz	숰
+tnx	숱
+tnv	숲
+tng	숳
+tnjr	숵
+tnjR	숶
+tnjrt	숷
+tnjs	숸
+tnjsw	숹
+tnjsg	숺
+tnje	숻
+tnjf	숼
+tnjfr	숽
+tnjfa	숾
+tnjfq	숿
+tnjft	쉀
+tnjfx	�
+tnjfv	쉂
+tnjfg	쉃
+tnja	쉄
+tnjq	쉅
+tnjqt	쉆
+tnjt	쉇
+tnjT	쉈
+tnjd	쉉
+tnjw	쉊
+tnjc	쉋
+tnjz	쉌
+tnjx	�
+tnjv	쉎
+tnjg	�
+tnpr	쉑
+tnpR	쉒
+tnprt	쉓
+tnps	쉔
+tnpsw	쉕
+tnpsg	쉖
+tnpe	쉗
+tnpf	쉘
+tnpfr	쉙
+tnpfa	쉚
+tnpfq	쉛
+tnpft	쉜
+tnpfx	�
+tnpfv	쉞
+tnpfg	쉟
+tnpa	쉠
+tnpq	쉡
+tnpqt	쉢
+tnpt	쉣
+tnpT	쉤
+tnpd	쉥
+tnpw	쉦
+tnpc	쉧
+tnpz	쉨
+tnpx	쉩
+tnpv	쉪
+tnpg	쉫
+tnlr	쉭
+tnlR	쉮
+tnlrt	쉯
+tnls	쉰
+tnlsw	쉱
+tnlsg	쉲
+tnle	쉳
+tnlf	쉴
+tnlfr	쉵
+tnlfa	쉶
+tnlfq	쉷
+tnlft	쉸
+tnlfx	쉹
+tnlfv	쉺
+tnlfg	쉻
+tnla	쉼
+tnlq	쉽
+tnlqt	쉾
+tnlt	쉿
+tnlT	슀
+tnld	�
+tnlw	슂
+tnlc	슃
+tnlz	슄
+tnlx	슅
+tnlv	슆
+tnlg	슇
+tbr	슉
+tbR	슊
+tbrt	슋
+tbs	슌
+tbsw	�
+tbsg	슎
+tbe	�
+tbf	�
+tbfr	슑
+tbfa	슒
+tbfq	슓
+tbft	슔
+tbfx	슕
+tbfv	슖
+tbfg	슗
+tba	슘
+tbq	슙
+tbqt	슚
+tbt	슛
+tbT	슜
+tbd	�
+tbw	슞
+tbc	슟
+tbz	슠
+tbx	슡
+tbv	슢
+tbg	슣
+tmr	슥
+tmR	슦
+tmrt	슧
+tms	슨
+tmsw	슩
+tmsg	슪
+tme	슫
+tmf	슬
+tmfr	슭
+tmfa	슮
+tmfq	슯
+tmft	슰
+tmfx	슱
+tmfv	슲
+tmfg	슳
+tma	슴
+tmq	습
+tmqt	슶
+tmt	슷
+tmT	슸
+tmd	승
+tmw	슺
+tmc	슻
+tmz	슼
+tmx	슽
+tmv	슾
+tmg	슿
+tmlr	�
+tmlR	ì‹‚
+tmlrt	싃
+tmls	ì‹„
+tmlsw	ì‹…
+tmlsg	싆
+tmle	싇
+tmlf	싈
+tmlfr	싉
+tmlfa	ì‹Š
+tmlfq	ì‹‹
+tmlft	싌
+tmlfx	�
+tmlfv	ì‹Ž
+tmlfg	�
+tmla	�
+tmlq	ì‹‘
+tmlqt	ì‹’
+tmlt	ì‹“
+tmlT	ì‹”
+tmld	ì‹•
+tmlw	ì‹–
+tmlc	ì‹—
+tmlz	싘
+tmlx	ì‹™
+tmlv	ì‹š
+tmlg	ì‹›
+tlr	�
+tlR	ì‹ž
+tlrt	ì‹Ÿ
+tls	ì‹ 
+tlsw	ì‹¡
+tlsg	ì‹¢
+tle	ì‹£
+tlf	실
+tlfr	ì‹¥
+tlfa	싦
+tlfq	싧
+tlft	싨
+tlfx	ì‹©
+tlfv	싪
+tlfg	ì‹«
+tla	심
+tlq	ì‹­
+tlqt	ì‹®
+tlt	싯
+tlT	ì‹°
+tld	싱
+tlw	싲
+tlc	싳
+tlz	ì‹´
+tlx	싵
+tlv	싶
+tlg	ì‹·
+Tkr	싹
+TkR	싺
+Tkrt	ì‹»
+Tks	싼
+Tksw	싽
+Tksg	싾
+Tke	ì‹¿
+Tkf	쌀
+Tkfr	�
+Tkfa	쌂
+Tkfq	쌃
+Tkft	쌄
+Tkfx	쌅
+Tkfv	쌆
+Tkfg	쌇
+Tka	쌈
+Tkq	쌉
+Tkqt	쌊
+Tkt	쌋
+TkT	쌌
+Tkd	�
+Tkw	쌎
+Tkc	�
+Tkz	�
+Tkx	쌑
+Tkv	쌒
+Tkg	쌓
+Tor	쌕
+ToR	쌖
+Tort	쌗
+Tos	쌘
+Tosw	쌙
+Tosg	쌚
+Toe	쌛
+Tof	쌜
+Tofr	�
+Tofa	쌞
+Tofq	쌟
+Toft	쌠
+Tofx	쌡
+Tofv	쌢
+Tofg	쌣
+Toa	쌤
+Toq	쌥
+Toqt	쌦
+Tot	쌧
+ToT	쌨
+Tod	쌩
+Tow	쌪
+Toc	쌫
+Toz	쌬
+Tox	쌭
+Tov	쌮
+Tog	쌯
+Tir	쌱
+TiR	쌲
+Tirt	쌳
+Tis	쌴
+Tisw	쌵
+Tisg	쌶
+Tie	쌷
+Tif	쌸
+Tifr	쌹
+Tifa	쌺
+Tifq	쌻
+Tift	쌼
+Tifx	쌽
+Tifv	쌾
+Tifg	쌿
+Tia	�
+Tiq	�
+Tiqt	�
+Tit	�
+TiT	�
+Tid	�
+Tiw	�
+Tic	�
+Tiz	�
+Tix	�
+Tiv	�
+Tig	�
+TOr	�
+TOR	�
+TOrt	�
+TOs	�
+TOsw	�
+TOsg	�
+TOe	�
+TOf	�
+TOfr	�
+TOfa	�
+TOfq	�
+TOft	�
+TOfx	�
+TOfv	�
+TOfg	�
+TOa	�
+TOq	�
+TOqt	�
+TOt	�
+TOT	�
+TOd	�
+TOw	�
+TOc	�
+TOz	�
+TOx	�
+TOv	�
+TOg	�
+Tjr	�
+TjR	�
+Tjrt	�
+Tjs	�
+Tjsw	�
+Tjsg	�
+Tje	�
+Tjf	�
+Tjfr	�
+Tjfa	�
+Tjfq	�
+Tjft	�
+Tjfx	�
+Tjfv	�
+Tjfg	�
+Tja	�
+Tjq	�
+Tjqt	�
+Tjt	�
+TjT	�
+Tjd	�
+Tjw	�
+Tjc	�
+Tjz	쎀
+Tjx	�
+Tjv	쎂
+Tjg	쎃
+Tpr	쎅
+TpR	쎆
+Tprt	쎇
+Tps	쎈
+Tpsw	쎉
+Tpsg	쎊
+Tpe	쎋
+Tpf	쎌
+Tpfr	�
+Tpfa	쎎
+Tpfq	�
+Tpft	�
+Tpfx	쎑
+Tpfv	쎒
+Tpfg	쎓
+Tpa	쎔
+Tpq	쎕
+Tpqt	쎖
+Tpt	쎗
+TpT	쎘
+Tpd	쎙
+Tpw	쎚
+Tpc	쎛
+Tpz	쎜
+Tpx	�
+Tpv	쎞
+Tpg	쎟
+Tur	쎡
+TuR	쎢
+Turt	쎣
+Tus	쎤
+Tusw	쎥
+Tusg	쎦
+Tue	쎧
+Tuf	쎨
+Tufr	쎩
+Tufa	쎪
+Tufq	쎫
+Tuft	쎬
+Tufx	쎭
+Tufv	쎮
+Tufg	쎯
+Tua	쎰
+Tuq	쎱
+Tuqt	쎲
+Tut	쎳
+TuT	쎴
+Tud	쎵
+Tuw	쎶
+Tuc	쎷
+Tuz	쎸
+Tux	쎹
+Tuv	쎺
+Tug	쎻
+TPr	쎽
+TPR	쎾
+TPrt	쎿
+TPs	�
+TPsw	�
+TPsg	�
+TPe	�
+TPf	�
+TPfr	�
+TPfa	�
+TPfq	�
+TPft	�
+TPfx	�
+TPfv	�
+TPfg	�
+TPa	�
+TPq	�
+TPqt	�
+TPt	�
+TPT	�
+TPd	�
+TPw	�
+TPc	�
+TPz	�
+TPx	�
+TPv	�
+TPg	�
+Thr	�
+ThR	�
+Thrt	�
+Ths	�
+Thsw	�
+Thsg	�
+The	�
+Thf	�
+Thfr	�
+Thfa	�
+Thfq	�
+Thft	�
+Thfx	�
+Thfv	�
+Thfg	�
+Tha	�
+Thq	�
+Thqt	�
+Tht	�
+ThT	�
+Thd	�
+Thw	�
+Thc	�
+Thz	�
+Thx	�
+Thv	�
+Thg	�
+Thkr	�
+ThkR	�
+Thkrt	�
+Thks	�
+Thksw	�
+Thksg	�
+Thke	�
+Thkf	�
+Thkfr	�
+Thkfa	�
+Thkfq	�
+Thkft	�
+Thkfx	�
+Thkfv	�
+Thkfg	�
+Thka	�
+Thkq	�
+Thkqt	�
+Thkt	�
+ThkT	�
+Thkd	�
+Thkw	�
+Thkc	�
+Thkz	�
+Thkx	�
+Thkv	�
+Thkg	�
+Thor	�
+ThoR	�
+Thort	�
+Thos	�
+Thosw	�
+Thosg	�
+Thoe	�
+Thof	�
+Thofr	�
+Thofa	�
+Thofq	�
+Thoft	�
+Thofx	�
+Thofv	�
+Thofg	�
+Thoa	�
+Thoq	�
+Thoqt	�
+Thot	�
+ThoT	�
+Thod	�
+Thow	�
+Thoc	�
+Thoz	�
+Thox	�
+Thov	�
+Thog	�
+Thlr	�
+ThlR	�
+Thlrt	�
+Thls	�
+Thlsw	�
+Thlsg	�
+Thle	�
+Thlf	�
+Thlfr	�
+Thlfa	�
+Thlfq	�
+Thlft	�
+Thlfx	�
+Thlfv	�
+Thlfg	�
+Thla	�
+Thlq	�
+Thlqt	�
+Thlt	�
+ThlT	ì‘€
+Thld	�
+Thlw	ì‘‚
+Thlc	쑃
+Thlz	ì‘„
+Thlx	ì‘…
+Thlv	쑆
+Thlg	쑇
+Tyr	쑉
+TyR	ì‘Š
+Tyrt	ì‘‹
+Tys	쑌
+Tysw	�
+Tysg	ì‘Ž
+Tye	�
+Tyf	�
+Tyfr	ì‘‘
+Tyfa	ì‘’
+Tyfq	ì‘“
+Tyft	ì‘”
+Tyfx	ì‘•
+Tyfv	ì‘–
+Tyfg	ì‘—
+Tya	쑘
+Tyq	ì‘™
+Tyqt	ì‘š
+Tyt	ì‘›
+TyT	쑜
+Tyd	�
+Tyw	ì‘ž
+Tyc	ì‘Ÿ
+Tyz	ì‘ 
+Tyx	ì‘¡
+Tyv	ì‘¢
+Tyg	ì‘£
+Tnr	ì‘¥
+TnR	쑦
+Tnrt	쑧
+Tns	쑨
+Tnsw	ì‘©
+Tnsg	쑪
+Tne	ì‘«
+Tnf	쑬
+Tnfr	ì‘­
+Tnfa	ì‘®
+Tnfq	쑯
+Tnft	ì‘°
+Tnfx	쑱
+Tnfv	쑲
+Tnfg	쑳
+Tna	ì‘´
+Tnq	쑵
+Tnqt	쑶
+Tnt	ì‘·
+TnT	쑸
+Tnd	쑹
+Tnw	쑺
+Tnc	ì‘»
+Tnz	쑼
+Tnx	쑽
+Tnv	쑾
+Tng	ì‘¿
+Tnjr	ì’�
+TnjR	ì’‚
+Tnjrt	ì’ƒ
+Tnjs	ì’„
+Tnjsw	ì’…
+Tnjsg	ì’†
+Tnje	ì’‡
+Tnjf	ì’ˆ
+Tnjfr	ì’‰
+Tnjfa	ì’Š
+Tnjfq	ì’‹
+Tnjft	쒌
+Tnjfx	ì’�
+Tnjfv	ì’Ž
+Tnjfg	ì’�
+Tnja	ì’�
+Tnjq	ì’‘
+Tnjqt	ì’’
+Tnjt	ì’“
+TnjT	ì’”
+Tnjd	ì’•
+Tnjw	ì’–
+Tnjc	ì’—
+Tnjz	ì’˜
+Tnjx	ì’™
+Tnjv	ì’š
+Tnjg	ì’›
+Tnpr	ì’�
+TnpR	ì’ž
+Tnprt	ì’Ÿ
+Tnps	ì’ 
+Tnpsw	ì’¡
+Tnpsg	ì’¢
+Tnpe	ì’£
+Tnpf	ì’¤
+Tnpfr	ì’¥
+Tnpfa	ì’¦
+Tnpfq	ì’§
+Tnpft	ì’¨
+Tnpfx	ì’©
+Tnpfv	ì’ª
+Tnpfg	ì’«
+Tnpa	ì’¬
+Tnpq	ì’­
+Tnpqt	ì’®
+Tnpt	ì’¯
+TnpT	ì’°
+Tnpd	ì’±
+Tnpw	ì’²
+Tnpc	ì’³
+Tnpz	ì’´
+Tnpx	ì’µ
+Tnpv	ì’¶
+Tnpg	ì’·
+Tnlr	ì’¹
+TnlR	ì’º
+Tnlrt	ì’»
+Tnls	ì’¼
+Tnlsw	ì’½
+Tnlsg	ì’¾
+Tnle	ì’¿
+Tnlf	ì“€
+Tnlfr	�
+Tnlfa	ì“‚
+Tnlfq	쓃
+Tnlft	ì“„
+Tnlfx	ì“…
+Tnlfv	쓆
+Tnlfg	쓇
+Tnla	쓈
+Tnlq	쓉
+Tnlqt	ì“Š
+Tnlt	ì“‹
+TnlT	쓌
+Tnld	�
+Tnlw	ì“Ž
+Tnlc	�
+Tnlz	�
+Tnlx	ì“‘
+Tnlv	ì“’
+Tnlg	ì““
+Tbr	ì“•
+TbR	ì“–
+Tbrt	ì“—
+Tbs	쓘
+Tbsw	ì“™
+Tbsg	ì“š
+Tbe	ì“›
+Tbf	쓜
+Tbfr	�
+Tbfa	ì“ž
+Tbfq	ì“Ÿ
+Tbft	ì“ 
+Tbfx	ì“¡
+Tbfv	ì“¢
+Tbfg	ì“£
+Tba	쓤
+Tbq	ì“¥
+Tbqt	쓦
+Tbt	쓧
+TbT	쓨
+Tbd	ì“©
+Tbw	쓪
+Tbc	ì“«
+Tbz	쓬
+Tbx	ì“­
+Tbv	ì“®
+Tbg	쓯
+Tmr	쓱
+TmR	쓲
+Tmrt	쓳
+Tms	ì“´
+Tmsw	쓵
+Tmsg	쓶
+Tme	ì“·
+Tmf	쓸
+Tmfr	쓹
+Tmfa	쓺
+Tmfq	ì“»
+Tmft	쓼
+Tmfx	쓽
+Tmfv	쓾
+Tmfg	ì“¿
+Tma	씀
+Tmq	�
+Tmqt	씂
+Tmt	씃
+TmT	씄
+Tmd	ì”…
+Tmw	씆
+Tmc	씇
+Tmz	씈
+Tmx	씉
+Tmv	씊
+Tmg	씋
+Tmlr	�
+TmlR	씎
+Tmlrt	�
+Tmls	�
+Tmlsw	씑
+Tmlsg	ì”’
+Tmle	씓
+Tmlf	ì””
+Tmlfr	씕
+Tmlfa	ì”–
+Tmlfq	ì”—
+Tmlft	씘
+Tmlfx	ì”™
+Tmlfv	씚
+Tmlfg	ì”›
+Tmla	씜
+Tmlq	�
+Tmlqt	씞
+Tmlt	씟
+TmlT	ì” 
+Tmld	씡
+Tmlw	씢
+Tmlc	씣
+Tmlz	씤
+Tmlx	씥
+Tmlv	씦
+Tmlg	씧
+Tlr	씩
+TlR	씪
+Tlrt	씫
+Tls	씬
+Tlsw	ì”­
+Tlsg	ì”®
+Tle	씯
+Tlf	ì”°
+Tlfr	ì”±
+Tlfa	씲
+Tlfq	씳
+Tlft	ì”´
+Tlfx	씵
+Tlfv	씶
+Tlfg	ì”·
+Tla	씸
+Tlq	씹
+Tlqt	씺
+Tlt	ì”»
+TlT	씼
+Tld	씽
+Tlw	씾
+Tlc	씿
+Tlz	ì•€
+Tlx	�
+Tlv	ì•‚
+Tlg	앃
+dkr	ì•…
+dkR	앆
+dkrt	앇
+dks	안
+dksw	앉
+dksg	ì•Š
+dke	ì•‹
+dkf	알
+dkfr	�
+dkfa	ì•Ž
+dkfq	�
+dkft	�
+dkfx	ì•‘
+dkfv	ì•’
+dkfg	ì•“
+dka	ì•”
+dkq	ì••
+dkqt	ì•–
+dkt	ì•—
+dkT	았
+dkd	ì•™
+dkw	ì•š
+dkc	ì•›
+dkz	앜
+dkx	�
+dkv	ì•ž
+dkg	ì•Ÿ
+dor	ì•¡
+doR	ì•¢
+dort	ì•£
+dos	앤
+dosw	ì•¥
+dosg	앦
+doe	앧
+dof	앨
+dofr	ì•©
+dofa	앪
+dofq	ì•«
+doft	앬
+dofx	ì•­
+dofv	ì•®
+dofg	앯
+doa	ì•°
+doq	앱
+doqt	앲
+dot	앳
+doT	ì•´
+dod	앵
+dow	앶
+doc	ì•·
+doz	앸
+dox	앹
+dov	앺
+dog	ì•»
+dir	약
+diR	앾
+dirt	ì•¿
+dis	ì–€
+disw	ì–�
+disg	ì–‚
+die	ì–ƒ
+dif	ì–„
+difr	ì–…
+difa	ì–†
+difq	ì–‡
+dift	ì–ˆ
+difx	ì–‰
+difv	ì–Š
+difg	ì–‹
+dia	얌
+diq	ì–�
+diqt	ì–Ž
+dit	ì–�
+diT	ì–�
+did	ì–‘
+diw	ì–’
+dic	ì–“
+diz	ì–”
+dix	ì–•
+div	ì––
+dig	ì–—
+dOr	ì–™
+dOR	ì–š
+dOrt	ì–›
+dOs	얜
+dOsw	ì–�
+dOsg	ì–ž
+dOe	ì–Ÿ
+dOf	ì– 
+dOfr	ì–¡
+dOfa	ì–¢
+dOfq	ì–£
+dOft	ì–¤
+dOfx	ì–¥
+dOfv	ì–¦
+dOfg	ì–§
+dOa	ì–¨
+dOq	ì–©
+dOqt	ì–ª
+dOt	ì–«
+dOT	ì–¬
+dOd	ì–­
+dOw	ì–®
+dOc	ì–¯
+dOz	ì–°
+dOx	ì–±
+dOv	ì–²
+dOg	ì–³
+djr	ì–µ
+djR	ì–¶
+djrt	ì–·
+djs	ì–¸
+djsw	ì–¹
+djsg	ì–º
+dje	ì–»
+djf	ì–¼
+djfr	ì–½
+djfa	ì–¾
+djfq	ì–¿
+djft	ì—€
+djfx	ì—�
+djfv	ì—‚
+djfg	ì—ƒ
+dja	ì—„
+djq	ì—…
+djqt	ì—†
+djt	ì—‡
+djT	ì—ˆ
+djd	ì—‰
+djw	ì—Š
+djc	ì—‹
+djz	엌
+djx	ì—�
+djv	ì—Ž
+djg	ì—�
+dpr	ì—‘
+dpR	ì—’
+dprt	ì—“
+dps	ì—”
+dpsw	ì—•
+dpsg	ì—–
+dpe	ì——
+dpf	ì—˜
+dpfr	ì—™
+dpfa	ì—š
+dpfq	ì—›
+dpft	엜
+dpfx	ì—�
+dpfv	ì—ž
+dpfg	ì—Ÿ
+dpa	ì— 
+dpq	ì—¡
+dpqt	ì—¢
+dpt	ì—£
+dpT	ì—¤
+dpd	ì—¥
+dpw	ì—¦
+dpc	ì—§
+dpz	ì—¨
+dpx	ì—©
+dpv	ì—ª
+dpg	ì—«
+dur	ì—­
+duR	ì—®
+durt	ì—¯
+dus	ì—°
+dusw	ì—±
+dusg	ì—²
+due	ì—³
+duf	ì—´
+dufr	ì—µ
+dufa	ì—¶
+dufq	ì—·
+duft	ì—¸
+dufx	ì—¹
+dufv	ì—º
+dufg	ì—»
+dua	ì—¼
+duq	ì—½
+duqt	ì—¾
+dut	ì—¿
+duT	였
+dud	�
+duw	옂
+duc	옃
+duz	옄
+dux	옅
+duv	옆
+dug	옇
+dPr	옉
+dPR	옊
+dPrt	옋
+dPs	옌
+dPsw	�
+dPsg	옎
+dPe	�
+dPf	�
+dPfr	옑
+dPfa	옒
+dPfq	옓
+dPft	옔
+dPfx	옕
+dPfv	옖
+dPfg	옗
+dPa	옘
+dPq	옙
+dPqt	옚
+dPt	옛
+dPT	옜
+dPd	�
+dPw	옞
+dPc	옟
+dPz	옠
+dPx	옡
+dPv	옢
+dPg	옣
+dhr	옥
+dhR	옦
+dhrt	옧
+dhs	온
+dhsw	옩
+dhsg	옪
+dhe	옫
+dhf	올
+dhfr	옭
+dhfa	옮
+dhfq	옯
+dhft	옰
+dhfx	옱
+dhfv	옲
+dhfg	옳
+dha	옴
+dhq	옵
+dhqt	옶
+dht	옷
+dhT	옸
+dhd	옹
+dhw	옺
+dhc	옻
+dhz	옼
+dhx	옽
+dhv	옾
+dhg	옿
+dhkr	�
+dhkR	왂
+dhkrt	왃
+dhks	완
+dhksw	ì™…
+dhksg	왆
+dhke	왇
+dhkf	왈
+dhkfr	왉
+dhkfa	왊
+dhkfq	왋
+dhkft	왌
+dhkfx	�
+dhkfv	왎
+dhkfg	�
+dhka	�
+dhkq	왑
+dhkqt	ì™’
+dhkt	왓
+dhkT	ì™”
+dhkd	왕
+dhkw	ì™–
+dhkc	ì™—
+dhkz	왘
+dhkx	ì™™
+dhkv	왚
+dhkg	ì™›
+dhor	�
+dhoR	왞
+dhort	왟
+dhos	ì™ 
+dhosw	왡
+dhosg	왢
+dhoe	왣
+dhof	왤
+dhofr	왥
+dhofa	왦
+dhofq	왧
+dhoft	왨
+dhofx	왩
+dhofv	왪
+dhofg	왫
+dhoa	왬
+dhoq	ì™­
+dhoqt	ì™®
+dhot	왯
+dhoT	ì™°
+dhod	ì™±
+dhow	왲
+dhoc	왳
+dhoz	ì™´
+dhox	왵
+dhov	왶
+dhog	ì™·
+dhlr	왹
+dhlR	왺
+dhlrt	ì™»
+dhls	왼
+dhlsw	왽
+dhlsg	왾
+dhle	왿
+dhlf	욀
+dhlfr	�
+dhlfa	ìš‚
+dhlfq	욃
+dhlft	ìš„
+dhlfx	ìš…
+dhlfv	욆
+dhlfg	욇
+dhla	욈
+dhlq	욉
+dhlqt	욊
+dhlt	ìš‹
+dhlT	욌
+dhld	�
+dhlw	욎
+dhlc	�
+dhlz	�
+dhlx	ìš‘
+dhlv	ìš’
+dhlg	ìš“
+dyr	ìš•
+dyR	ìš–
+dyrt	ìš—
+dys	욘
+dysw	ìš™
+dysg	ìšš
+dye	ìš›
+dyf	욜
+dyfr	�
+dyfa	ìšž
+dyfq	욟
+dyft	ìš 
+dyfx	ìš¡
+dyfv	욢
+dyfg	욣
+dya	욤
+dyq	욥
+dyqt	욦
+dyt	욧
+dyT	욨
+dyd	ìš©
+dyw	욪
+dyc	ìš«
+dyz	욬
+dyx	ìš­
+dyv	ìš®
+dyg	욯
+dnr	ìš±
+dnR	ìš²
+dnrt	ìš³
+dns	ìš´
+dnsw	ìšµ
+dnsg	욶
+dne	ìš·
+dnf	울
+dnfr	ìš¹
+dnfa	욺
+dnfq	ìš»
+dnft	ìš¼
+dnfx	ìš½
+dnfv	ìš¾
+dnfg	ìš¿
+dna	움
+dnq	�
+dnqt	웂
+dnt	웃
+dnT	웄
+dnd	ì›…
+dnw	웆
+dnc	웇
+dnz	웈
+dnx	웉
+dnv	웊
+dng	웋
+dnjr	�
+dnjR	웎
+dnjrt	�
+dnjs	�
+dnjsw	웑
+dnjsg	ì›’
+dnje	웓
+dnjf	ì›”
+dnjfr	웕
+dnjfa	ì›–
+dnjfq	ì›—
+dnjft	웘
+dnjfx	ì›™
+dnjfv	웚
+dnjfg	ì››
+dnja	웜
+dnjq	�
+dnjqt	웞
+dnjt	웟
+dnjT	ì› 
+dnjd	웡
+dnjw	웢
+dnjc	웣
+dnjz	웤
+dnjx	웥
+dnjv	웦
+dnjg	웧
+dnpr	웩
+dnpR	웪
+dnprt	웫
+dnps	웬
+dnpsw	ì›­
+dnpsg	ì›®
+dnpe	웯
+dnpf	ì›°
+dnpfr	ì›±
+dnpfa	웲
+dnpfq	웳
+dnpft	ì›´
+dnpfx	웵
+dnpfv	웶
+dnpfg	ì›·
+dnpa	웸
+dnpq	웹
+dnpqt	웺
+dnpt	ì›»
+dnpT	웼
+dnpd	웽
+dnpw	웾
+dnpc	웿
+dnpz	윀
+dnpx	�
+dnpv	윂
+dnpg	윃
+dnlr	윅
+dnlR	윆
+dnlrt	윇
+dnls	윈
+dnlsw	윉
+dnlsg	윊
+dnle	윋
+dnlf	윌
+dnlfr	�
+dnlfa	윎
+dnlfq	�
+dnlft	�
+dnlfx	윑
+dnlfv	윒
+dnlfg	윓
+dnla	윔
+dnlq	윕
+dnlqt	윖
+dnlt	윗
+dnlT	윘
+dnld	윙
+dnlw	윚
+dnlc	윛
+dnlz	윜
+dnlx	�
+dnlv	윞
+dnlg	윟
+dbr	육
+dbR	윢
+dbrt	윣
+dbs	윤
+dbsw	윥
+dbsg	윦
+dbe	윧
+dbf	율
+dbfr	윩
+dbfa	윪
+dbfq	윫
+dbft	윬
+dbfx	윭
+dbfv	윮
+dbfg	윯
+dba	윰
+dbq	윱
+dbqt	윲
+dbt	윳
+dbT	윴
+dbd	융
+dbw	윶
+dbc	윷
+dbz	윸
+dbx	윹
+dbv	윺
+dbg	윻
+dmr	윽
+dmR	윾
+dmrt	윿
+dms	�
+dmsw	�
+dmsg	�
+dme	�
+dmf	�
+dmfr	�
+dmfa	�
+dmfq	�
+dmft	�
+dmfx	�
+dmfv	�
+dmfg	�
+dma	�
+dmq	�
+dmqt	�
+dmt	�
+dmT	�
+dmd	�
+dmw	�
+dmc	�
+dmz	�
+dmx	�
+dmv	�
+dmg	�
+dmlr	�
+dmlR	�
+dmlrt	�
+dmls	�
+dmlsw	�
+dmlsg	�
+dmle	�
+dmlf	�
+dmlfr	�
+dmlfa	�
+dmlfq	�
+dmlft	�
+dmlfx	�
+dmlfv	�
+dmlfg	�
+dmla	�
+dmlq	�
+dmlqt	�
+dmlt	�
+dmlT	�
+dmld	�
+dmlw	�
+dmlc	�
+dmlz	�
+dmlx	�
+dmlv	�
+dmlg	�
+dlr	�
+dlR	�
+dlrt	�
+dls	�
+dlsw	�
+dlsg	�
+dle	�
+dlf	�
+dlfr	�
+dlfa	�
+dlfq	�
+dlft	잀
+dlfx	�
+dlfv	ìž‚
+dlfg	잃
+dla	ìž„
+dlq	ìž…
+dlqt	잆
+dlt	잇
+dlT	있
+dld	잉
+dlw	잊
+dlc	ìž‹
+dlz	잌
+dlx	�
+dlv	잎
+dlg	�
+wkr	ìž‘
+wkR	ìž’
+wkrt	ìž“
+wks	ìž”
+wksw	ìž•
+wksg	ìž–
+wke	ìž—
+wkf	잘
+wkfr	ìž™
+wkfa	ìžš
+wkfq	ìž›
+wkft	잜
+wkfx	�
+wkfv	ìžž
+wkfg	잟
+wka	ìž 
+wkq	ìž¡
+wkqt	잢
+wkt	잣
+wkT	잤
+wkd	장
+wkw	잦
+wkc	잧
+wkz	잨
+wkx	ìž©
+wkv	잪
+wkg	ìž«
+wor	ìž­
+woR	ìž®
+wort	잯
+wos	ìž°
+wosw	ìž±
+wosg	ìž²
+woe	ìž³
+wof	ìž´
+wofr	ìžµ
+wofa	잶
+wofq	ìž·
+woft	잸
+wofx	ìž¹
+wofv	잺
+wofg	ìž»
+woa	ìž¼
+woq	ìž½
+woqt	ìž¾
+wot	ìž¿
+woT	쟀
+wod	�
+wow	쟂
+woc	쟃
+woz	쟄
+wox	쟅
+wov	쟆
+wog	쟇
+wir	쟉
+wiR	쟊
+wirt	쟋
+wis	쟌
+wisw	�
+wisg	쟎
+wie	�
+wif	�
+wifr	쟑
+wifa	쟒
+wifq	쟓
+wift	쟔
+wifx	쟕
+wifv	쟖
+wifg	쟗
+wia	쟘
+wiq	쟙
+wiqt	쟚
+wit	쟛
+wiT	쟜
+wid	�
+wiw	쟞
+wic	쟟
+wiz	쟠
+wix	쟡
+wiv	쟢
+wig	쟣
+wOr	쟥
+wOR	쟦
+wOrt	쟧
+wOs	쟨
+wOsw	쟩
+wOsg	쟪
+wOe	쟫
+wOf	쟬
+wOfr	쟭
+wOfa	쟮
+wOfq	쟯
+wOft	쟰
+wOfx	쟱
+wOfv	쟲
+wOfg	쟳
+wOa	쟴
+wOq	쟵
+wOqt	쟶
+wOt	쟷
+wOT	쟸
+wOd	쟹
+wOw	쟺
+wOc	쟻
+wOz	쟼
+wOx	쟽
+wOv	쟾
+wOg	쟿
+wjr	ì �
+wjR	ì ‚
+wjrt	ì ƒ
+wjs	ì „
+wjsw	ì …
+wjsg	ì †
+wje	ì ‡
+wjf	ì ˆ
+wjfr	ì ‰
+wjfa	ì Š
+wjfq	ì ‹
+wjft	젌
+wjfx	ì �
+wjfv	ì Ž
+wjfg	ì �
+wja	ì �
+wjq	ì ‘
+wjqt	ì ’
+wjt	ì “
+wjT	ì ”
+wjd	ì •
+wjw	ì –
+wjc	ì —
+wjz	ì ˜
+wjx	ì ™
+wjv	ì š
+wjg	ì ›
+wpr	ì �
+wpR	ì ž
+wprt	ì Ÿ
+wps	ì  
+wpsw	ì ¡
+wpsg	ì ¢
+wpe	ì £
+wpf	ì ¤
+wpfr	ì ¥
+wpfa	ì ¦
+wpfq	ì §
+wpft	ì ¨
+wpfx	ì ©
+wpfv	ì ª
+wpfg	ì «
+wpa	ì ¬
+wpq	ì ­
+wpqt	ì ®
+wpt	ì ¯
+wpT	ì °
+wpd	ì ±
+wpw	ì ²
+wpc	ì ³
+wpz	ì ´
+wpx	ì µ
+wpv	ì ¶
+wpg	ì ·
+wur	ì ¹
+wuR	ì º
+wurt	ì »
+wus	ì ¼
+wusw	ì ½
+wusg	ì ¾
+wue	ì ¿
+wuf	ì¡€
+wufr	�
+wufa	ì¡‚
+wufq	졃
+wuft	ì¡„
+wufx	ì¡…
+wufv	졆
+wufg	졇
+wua	졈
+wuq	졉
+wuqt	ì¡Š
+wut	ì¡‹
+wuT	졌
+wud	�
+wuw	ì¡Ž
+wuc	�
+wuz	�
+wux	ì¡‘
+wuv	ì¡’
+wug	ì¡“
+wPr	ì¡•
+wPR	ì¡–
+wPrt	ì¡—
+wPs	졘
+wPsw	ì¡™
+wPsg	ì¡š
+wPe	ì¡›
+wPf	졜
+wPfr	�
+wPfa	ì¡ž
+wPfq	ì¡Ÿ
+wPft	ì¡ 
+wPfx	ì¡¡
+wPfv	ì¡¢
+wPfg	ì¡£
+wPa	졤
+wPq	ì¡¥
+wPqt	졦
+wPt	졧
+wPT	졨
+wPd	ì¡©
+wPw	졪
+wPc	ì¡«
+wPz	졬
+wPx	ì¡­
+wPv	ì¡®
+wPg	졯
+whr	족
+whR	졲
+whrt	졳
+whs	ì¡´
+whsw	졵
+whsg	졶
+whe	ì¡·
+whf	졸
+whfr	졹
+whfa	졺
+whfq	ì¡»
+whft	졼
+whfx	졽
+whfv	졾
+whfg	ì¡¿
+wha	좀
+whq	�
+whqt	좂
+wht	좃
+whT	좄
+whd	종
+whw	좆
+whc	좇
+whz	좈
+whx	좉
+whv	좊
+whg	좋
+whkr	�
+whkR	좎
+whkrt	�
+whks	�
+whksw	좑
+whksg	좒
+whke	좓
+whkf	좔
+whkfr	좕
+whkfa	좖
+whkfq	좗
+whkft	좘
+whkfx	좙
+whkfv	좚
+whkfg	좛
+whka	좜
+whkq	�
+whkqt	좞
+whkt	좟
+whkT	좠
+whkd	좡
+whkw	좢
+whkc	좣
+whkz	좤
+whkx	좥
+whkv	좦
+whkg	좧
+whor	좩
+whoR	좪
+whort	좫
+whos	좬
+whosw	좭
+whosg	좮
+whoe	좯
+whof	좰
+whofr	좱
+whofa	좲
+whofq	좳
+whoft	좴
+whofx	좵
+whofv	좶
+whofg	좷
+whoa	좸
+whoq	좹
+whoqt	좺
+whot	좻
+whoT	좼
+whod	좽
+whow	좾
+whoc	좿
+whoz	죀
+whox	�
+whov	죂
+whog	죃
+whlr	죅
+whlR	죆
+whlrt	죇
+whls	죈
+whlsw	죉
+whlsg	죊
+whle	죋
+whlf	죌
+whlfr	�
+whlfa	죎
+whlfq	�
+whlft	�
+whlfx	죑
+whlfv	죒
+whlfg	죓
+whla	죔
+whlq	죕
+whlqt	죖
+whlt	죗
+whlT	죘
+whld	죙
+whlw	죚
+whlc	죛
+whlz	죜
+whlx	�
+whlv	죞
+whlg	죟
+wyr	죡
+wyR	죢
+wyrt	죣
+wys	죤
+wysw	죥
+wysg	죦
+wye	죧
+wyf	죨
+wyfr	죩
+wyfa	죪
+wyfq	죫
+wyft	죬
+wyfx	죭
+wyfv	죮
+wyfg	죯
+wya	죰
+wyq	죱
+wyqt	죲
+wyt	죳
+wyT	죴
+wyd	죵
+wyw	죶
+wyc	죷
+wyz	죸
+wyx	죹
+wyv	죺
+wyg	죻
+wnr	죽
+wnR	죾
+wnrt	죿
+wns	준
+wnsw	�
+wnsg	줂
+wne	줃
+wnf	줄
+wnfr	줅
+wnfa	줆
+wnfq	줇
+wnft	줈
+wnfx	줉
+wnfv	줊
+wnfg	줋
+wna	줌
+wnq	�
+wnqt	줎
+wnt	�
+wnT	�
+wnd	중
+wnw	줒
+wnc	줓
+wnz	줔
+wnx	줕
+wnv	줖
+wng	줗
+wnjr	줙
+wnjR	줚
+wnjrt	줛
+wnjs	줜
+wnjsw	�
+wnjsg	줞
+wnje	줟
+wnjf	줠
+wnjfr	줡
+wnjfa	줢
+wnjfq	줣
+wnjft	줤
+wnjfx	줥
+wnjfv	줦
+wnjfg	줧
+wnja	줨
+wnjq	줩
+wnjqt	줪
+wnjt	줫
+wnjT	줬
+wnjd	줭
+wnjw	줮
+wnjc	줯
+wnjz	줰
+wnjx	줱
+wnjv	줲
+wnjg	줳
+wnpr	줵
+wnpR	줶
+wnprt	줷
+wnps	줸
+wnpsw	줹
+wnpsg	줺
+wnpe	줻
+wnpf	줼
+wnpfr	줽
+wnpfa	줾
+wnpfq	줿
+wnpft	쥀
+wnpfx	�
+wnpfv	쥂
+wnpfg	쥃
+wnpa	쥄
+wnpq	쥅
+wnpqt	쥆
+wnpt	쥇
+wnpT	쥈
+wnpd	쥉
+wnpw	쥊
+wnpc	쥋
+wnpz	쥌
+wnpx	�
+wnpv	쥎
+wnpg	�
+wnlr	쥑
+wnlR	쥒
+wnlrt	쥓
+wnls	쥔
+wnlsw	쥕
+wnlsg	쥖
+wnle	쥗
+wnlf	쥘
+wnlfr	쥙
+wnlfa	쥚
+wnlfq	쥛
+wnlft	쥜
+wnlfx	�
+wnlfv	쥞
+wnlfg	쥟
+wnla	쥠
+wnlq	쥡
+wnlqt	쥢
+wnlt	쥣
+wnlT	쥤
+wnld	쥥
+wnlw	쥦
+wnlc	쥧
+wnlz	쥨
+wnlx	쥩
+wnlv	쥪
+wnlg	쥫
+wbr	쥭
+wbR	쥮
+wbrt	쥯
+wbs	쥰
+wbsw	쥱
+wbsg	쥲
+wbe	쥳
+wbf	쥴
+wbfr	쥵
+wbfa	쥶
+wbfq	쥷
+wbft	쥸
+wbfx	쥹
+wbfv	쥺
+wbfg	쥻
+wba	쥼
+wbq	쥽
+wbqt	쥾
+wbt	쥿
+wbT	즀
+wbd	�
+wbw	즂
+wbc	즃
+wbz	즄
+wbx	즅
+wbv	즆
+wbg	즇
+wmr	즉
+wmR	즊
+wmrt	즋
+wms	즌
+wmsw	�
+wmsg	즎
+wme	�
+wmf	�
+wmfr	즑
+wmfa	즒
+wmfq	즓
+wmft	즔
+wmfx	즕
+wmfv	즖
+wmfg	즗
+wma	즘
+wmq	즙
+wmqt	즚
+wmt	즛
+wmT	즜
+wmd	�
+wmw	즞
+wmc	즟
+wmz	즠
+wmx	즡
+wmv	즢
+wmg	즣
+wmlr	즥
+wmlR	즦
+wmlrt	즧
+wmls	즨
+wmlsw	즩
+wmlsg	즪
+wmle	즫
+wmlf	즬
+wmlfr	즭
+wmlfa	즮
+wmlfq	즯
+wmlft	즰
+wmlfx	즱
+wmlfv	즲
+wmlfg	즳
+wmla	즴
+wmlq	즵
+wmlqt	즶
+wmlt	즷
+wmlT	즸
+wmld	즹
+wmlw	즺
+wmlc	즻
+wmlz	즼
+wmlx	즽
+wmlv	즾
+wmlg	즿
+wlr	�
+wlR	짂
+wlrt	짃
+wls	진
+wlsw	짅
+wlsg	짆
+wle	짇
+wlf	질
+wlfr	짉
+wlfa	짊
+wlfq	짋
+wlft	짌
+wlfx	�
+wlfv	짎
+wlfg	�
+wla	�
+wlq	집
+wlqt	짒
+wlt	짓
+wlT	짔
+wld	징
+wlw	짖
+wlc	짗
+wlz	짘
+wlx	짙
+wlv	짚
+wlg	짛
+Wkr	�
+WkR	짞
+Wkrt	짟
+Wks	짠
+Wksw	짡
+Wksg	짢
+Wke	짣
+Wkf	짤
+Wkfr	짥
+Wkfa	짦
+Wkfq	짧
+Wkft	짨
+Wkfx	짩
+Wkfv	짪
+Wkfg	짫
+Wka	짬
+Wkq	짭
+Wkqt	짮
+Wkt	짯
+WkT	짰
+Wkd	짱
+Wkw	짲
+Wkc	짳
+Wkz	짴
+Wkx	짵
+Wkv	짶
+Wkg	짷
+Wor	짹
+WoR	짺
+Wort	짻
+Wos	짼
+Wosw	짽
+Wosg	짾
+Woe	짿
+Wof	쨀
+Wofr	�
+Wofa	쨂
+Wofq	쨃
+Woft	쨄
+Wofx	쨅
+Wofv	쨆
+Wofg	쨇
+Woa	쨈
+Woq	쨉
+Woqt	쨊
+Wot	쨋
+WoT	쨌
+Wod	�
+Wow	쨎
+Woc	�
+Woz	�
+Wox	쨑
+Wov	쨒
+Wog	쨓
+Wir	쨕
+WiR	쨖
+Wirt	쨗
+Wis	쨘
+Wisw	쨙
+Wisg	쨚
+Wie	쨛
+Wif	쨜
+Wifr	�
+Wifa	쨞
+Wifq	쨟
+Wift	쨠
+Wifx	쨡
+Wifv	쨢
+Wifg	쨣
+Wia	쨤
+Wiq	쨥
+Wiqt	쨦
+Wit	쨧
+WiT	쨨
+Wid	쨩
+Wiw	쨪
+Wic	쨫
+Wiz	쨬
+Wix	쨭
+Wiv	쨮
+Wig	쨯
+WOr	쨱
+WOR	쨲
+WOrt	쨳
+WOs	쨴
+WOsw	쨵
+WOsg	쨶
+WOe	쨷
+WOf	쨸
+WOfr	쨹
+WOfa	쨺
+WOfq	쨻
+WOft	쨼
+WOfx	쨽
+WOfv	쨾
+WOfg	쨿
+WOa	ì©€
+WOq	�
+WOqt	ì©‚
+WOt	쩃
+WOT	ì©„
+WOd	ì©…
+WOw	쩆
+WOc	쩇
+WOz	쩈
+WOx	쩉
+WOv	ì©Š
+WOg	ì©‹
+Wjr	�
+WjR	ì©Ž
+Wjrt	�
+Wjs	�
+Wjsw	ì©‘
+Wjsg	ì©’
+Wje	ì©“
+Wjf	ì©”
+Wjfr	ì©•
+Wjfa	ì©–
+Wjfq	ì©—
+Wjft	쩘
+Wjfx	ì©™
+Wjfv	ì©š
+Wjfg	ì©›
+Wja	쩜
+Wjq	�
+Wjqt	ì©ž
+Wjt	ì©Ÿ
+WjT	ì© 
+Wjd	ì©¡
+Wjw	ì©¢
+Wjc	ì©£
+Wjz	쩤
+Wjx	ì©¥
+Wjv	쩦
+Wjg	쩧
+Wpr	ì©©
+WpR	쩪
+Wprt	ì©«
+Wps	쩬
+Wpsw	ì©­
+Wpsg	ì©®
+Wpe	쩯
+Wpf	ì©°
+Wpfr	쩱
+Wpfa	쩲
+Wpfq	쩳
+Wpft	ì©´
+Wpfx	쩵
+Wpfv	쩶
+Wpfg	ì©·
+Wpa	쩸
+Wpq	쩹
+Wpqt	쩺
+Wpt	ì©»
+WpT	쩼
+Wpd	쩽
+Wpw	쩾
+Wpc	ì©¿
+Wpz	쪀
+Wpx	�
+Wpv	쪂
+Wpg	쪃
+Wur	쪅
+WuR	쪆
+Wurt	쪇
+Wus	쪈
+Wusw	쪉
+Wusg	쪊
+Wue	쪋
+Wuf	쪌
+Wufr	�
+Wufa	쪎
+Wufq	�
+Wuft	�
+Wufx	쪑
+Wufv	쪒
+Wufg	쪓
+Wua	쪔
+Wuq	쪕
+Wuqt	쪖
+Wut	쪗
+WuT	쪘
+Wud	쪙
+Wuw	쪚
+Wuc	쪛
+Wuz	쪜
+Wux	�
+Wuv	쪞
+Wug	쪟
+WPr	쪡
+WPR	쪢
+WPrt	쪣
+WPs	쪤
+WPsw	쪥
+WPsg	쪦
+WPe	쪧
+WPf	쪨
+WPfr	쪩
+WPfa	쪪
+WPfq	쪫
+WPft	쪬
+WPfx	쪭
+WPfv	쪮
+WPfg	쪯
+WPa	쪰
+WPq	쪱
+WPqt	쪲
+WPt	쪳
+WPT	쪴
+WPd	쪵
+WPw	쪶
+WPc	쪷
+WPz	쪸
+WPx	쪹
+WPv	쪺
+WPg	쪻
+Whr	쪽
+WhR	쪾
+Whrt	쪿
+Whs	ì«€
+Whsw	�
+Whsg	ì«‚
+Whe	쫃
+Whf	ì«„
+Whfr	ì«…
+Whfa	쫆
+Whfq	쫇
+Whft	쫈
+Whfx	쫉
+Whfv	ì«Š
+Whfg	ì«‹
+Wha	쫌
+Whq	�
+Whqt	ì«Ž
+Wht	�
+WhT	�
+Whd	ì«‘
+Whw	ì«’
+Whc	ì«“
+Whz	ì«”
+Whx	ì«•
+Whv	ì«–
+Whg	ì«—
+Whkr	ì«™
+WhkR	ì«š
+Whkrt	ì«›
+Whks	쫜
+Whksw	�
+Whksg	ì«ž
+Whke	ì«Ÿ
+Whkf	ì« 
+Whkfr	ì«¡
+Whkfa	ì«¢
+Whkfq	ì«£
+Whkft	쫤
+Whkfx	ì«¥
+Whkfv	쫦
+Whkfg	쫧
+Whka	쫨
+Whkq	ì«©
+Whkqt	쫪
+Whkt	ì««
+WhkT	쫬
+Whkd	ì«­
+Whkw	ì«®
+Whkc	쫯
+Whkz	ì«°
+Whkx	쫱
+Whkv	쫲
+Whkg	쫳
+Whor	쫵
+WhoR	쫶
+Whort	ì«·
+Whos	쫸
+Whosw	쫹
+Whosg	쫺
+Whoe	ì«»
+Whof	쫼
+Whofr	쫽
+Whofa	쫾
+Whofq	ì«¿
+Whoft	쬀
+Whofx	�
+Whofv	쬂
+Whofg	쬃
+Whoa	쬄
+Whoq	쬅
+Whoqt	쬆
+Whot	쬇
+WhoT	쬈
+Whod	쬉
+Whow	쬊
+Whoc	쬋
+Whoz	쬌
+Whox	�
+Whov	쬎
+Whog	�
+Whlr	쬑
+WhlR	쬒
+Whlrt	쬓
+Whls	쬔
+Whlsw	쬕
+Whlsg	쬖
+Whle	쬗
+Whlf	쬘
+Whlfr	쬙
+Whlfa	쬚
+Whlfq	쬛
+Whlft	쬜
+Whlfx	�
+Whlfv	쬞
+Whlfg	쬟
+Whla	쬠
+Whlq	쬡
+Whlqt	쬢
+Whlt	쬣
+WhlT	쬤
+Whld	쬥
+Whlw	쬦
+Whlc	쬧
+Whlz	쬨
+Whlx	쬩
+Whlv	쬪
+Whlg	쬫
+Wyr	쬭
+WyR	쬮
+Wyrt	쬯
+Wys	쬰
+Wysw	쬱
+Wysg	쬲
+Wye	쬳
+Wyf	쬴
+Wyfr	쬵
+Wyfa	쬶
+Wyfq	쬷
+Wyft	쬸
+Wyfx	쬹
+Wyfv	쬺
+Wyfg	쬻
+Wya	쬼
+Wyq	쬽
+Wyqt	쬾
+Wyt	쬿
+WyT	ì­€
+Wyd	ì­�
+Wyw	ì­‚
+Wyc	ì­ƒ
+Wyz	ì­„
+Wyx	ì­…
+Wyv	ì­†
+Wyg	ì­‡
+Wnr	ì­‰
+WnR	ì­Š
+Wnrt	ì­‹
+Wns	쭌
+Wnsw	ì­�
+Wnsg	ì­Ž
+Wne	ì­�
+Wnf	ì­�
+Wnfr	ì­‘
+Wnfa	ì­’
+Wnfq	ì­“
+Wnft	ì­”
+Wnfx	ì­•
+Wnfv	ì­–
+Wnfg	ì­—
+Wna	ì­˜
+Wnq	ì­™
+Wnqt	ì­š
+Wnt	ì­›
+WnT	쭜
+Wnd	ì­�
+Wnw	ì­ž
+Wnc	ì­Ÿ
+Wnz	ì­ 
+Wnx	ì­¡
+Wnv	ì­¢
+Wng	ì­£
+Wnjr	ì­¥
+WnjR	ì­¦
+Wnjrt	ì­§
+Wnjs	ì­¨
+Wnjsw	ì­©
+Wnjsg	ì­ª
+Wnje	ì­«
+Wnjf	ì­¬
+Wnjfr	ì­­
+Wnjfa	ì­®
+Wnjfq	ì­¯
+Wnjft	ì­°
+Wnjfx	ì­±
+Wnjfv	ì­²
+Wnjfg	ì­³
+Wnja	ì­´
+Wnjq	ì­µ
+Wnjqt	ì­¶
+Wnjt	ì­·
+WnjT	ì­¸
+Wnjd	ì­¹
+Wnjw	ì­º
+Wnjc	ì­»
+Wnjz	ì­¼
+Wnjx	ì­½
+Wnjv	ì­¾
+Wnjg	ì­¿
+Wnpr	�
+WnpR	쮂
+Wnprt	쮃
+Wnps	쮄
+Wnpsw	ì®…
+Wnpsg	쮆
+Wnpe	쮇
+Wnpf	쮈
+Wnpfr	쮉
+Wnpfa	쮊
+Wnpfq	쮋
+Wnpft	쮌
+Wnpfx	�
+Wnpfv	쮎
+Wnpfg	�
+Wnpa	�
+Wnpq	쮑
+Wnpqt	ì®’
+Wnpt	쮓
+WnpT	ì®”
+Wnpd	쮕
+Wnpw	ì®–
+Wnpc	ì®—
+Wnpz	쮘
+Wnpx	ì®™
+Wnpv	쮚
+Wnpg	ì®›
+Wnlr	�
+WnlR	쮞
+Wnlrt	쮟
+Wnls	ì® 
+Wnlsw	쮡
+Wnlsg	쮢
+Wnle	쮣
+Wnlf	쮤
+Wnlfr	쮥
+Wnlfa	쮦
+Wnlfq	쮧
+Wnlft	쮨
+Wnlfx	쮩
+Wnlfv	쮪
+Wnlfg	쮫
+Wnla	쮬
+Wnlq	ì®­
+Wnlqt	ì®®
+Wnlt	쮯
+WnlT	ì®°
+Wnld	ì®±
+Wnlw	쮲
+Wnlc	쮳
+Wnlz	ì®´
+Wnlx	쮵
+Wnlv	쮶
+Wnlg	ì®·
+Wbr	쮹
+WbR	쮺
+Wbrt	ì®»
+Wbs	쮼
+Wbsw	쮽
+Wbsg	쮾
+Wbe	쮿
+Wbf	쯀
+Wbfr	�
+Wbfa	쯂
+Wbfq	쯃
+Wbft	쯄
+Wbfx	쯅
+Wbfv	쯆
+Wbfg	쯇
+Wba	쯈
+Wbq	쯉
+Wbqt	쯊
+Wbt	쯋
+WbT	쯌
+Wbd	�
+Wbw	쯎
+Wbc	�
+Wbz	�
+Wbx	쯑
+Wbv	쯒
+Wbg	쯓
+Wmr	쯕
+WmR	쯖
+Wmrt	쯗
+Wms	쯘
+Wmsw	쯙
+Wmsg	쯚
+Wme	쯛
+Wmf	쯜
+Wmfr	�
+Wmfa	쯞
+Wmfq	쯟
+Wmft	쯠
+Wmfx	쯡
+Wmfv	쯢
+Wmfg	쯣
+Wma	쯤
+Wmq	쯥
+Wmqt	쯦
+Wmt	쯧
+WmT	쯨
+Wmd	쯩
+Wmw	쯪
+Wmc	쯫
+Wmz	쯬
+Wmx	쯭
+Wmv	쯮
+Wmg	쯯
+Wmlr	쯱
+WmlR	쯲
+Wmlrt	쯳
+Wmls	쯴
+Wmlsw	쯵
+Wmlsg	쯶
+Wmle	쯷
+Wmlf	쯸
+Wmlfr	쯹
+Wmlfa	쯺
+Wmlfq	쯻
+Wmlft	쯼
+Wmlfx	쯽
+Wmlfv	쯾
+Wmlfg	쯿
+Wmla	ì°€
+Wmlq	ì°�
+Wmlqt	ì°‚
+Wmlt	ì°ƒ
+WmlT	ì°„
+Wmld	ì°…
+Wmlw	ì°†
+Wmlc	ì°‡
+Wmlz	ì°ˆ
+Wmlx	ì°‰
+Wmlv	ì°Š
+Wmlg	ì°‹
+Wlr	ì°�
+WlR	ì°Ž
+Wlrt	ì°�
+Wls	ì°�
+Wlsw	ì°‘
+Wlsg	ì°’
+Wle	ì°“
+Wlf	ì°”
+Wlfr	ì°•
+Wlfa	ì°–
+Wlfq	ì°—
+Wlft	ì°˜
+Wlfx	ì°™
+Wlfv	ì°š
+Wlfg	ì°›
+Wla	찜
+Wlq	ì°�
+Wlqt	ì°ž
+Wlt	ì°Ÿ
+WlT	ì° 
+Wld	ì°¡
+Wlw	ì°¢
+Wlc	ì°£
+Wlz	ì°¤
+Wlx	ì°¥
+Wlv	ì°¦
+Wlg	ì°§
+ckr	ì°©
+ckR	ì°ª
+ckrt	ì°«
+cks	ì°¬
+cksw	ì°­
+cksg	ì°®
+cke	ì°¯
+ckf	ì°°
+ckfr	ì°±
+ckfa	ì°²
+ckfq	ì°³
+ckft	ì°´
+ckfx	ì°µ
+ckfv	ì°¶
+ckfg	ì°·
+cka	ì°¸
+ckq	ì°¹
+ckqt	ì°º
+ckt	ì°»
+ckT	ì°¼
+ckd	ì°½
+ckw	ì°¾
+ckc	ì°¿
+ckz	ì±€
+ckx	�
+ckv	챂
+ckg	챃
+cor	ì±…
+coR	챆
+cort	챇
+cos	챈
+cosw	챉
+cosg	챊
+coe	챋
+cof	챌
+cofr	�
+cofa	챎
+cofq	�
+coft	�
+cofx	챑
+cofv	ì±’
+cofg	챓
+coa	ì±”
+coq	챕
+coqt	ì±–
+cot	ì±—
+coT	챘
+cod	ì±™
+cow	챚
+coc	ì±›
+coz	챜
+cox	�
+cov	챞
+cog	챟
+cir	챡
+ciR	ì±¢
+cirt	ì±£
+cis	챤
+cisw	ì±¥
+cisg	챦
+cie	챧
+cif	챨
+cifr	챩
+cifa	챪
+cifq	챫
+cift	챬
+cifx	ì±­
+cifv	ì±®
+cifg	챯
+cia	ì±°
+ciq	ì±±
+ciqt	ì±²
+cit	ì±³
+ciT	ì±´
+cid	ì±µ
+ciw	챶
+cic	ì±·
+ciz	챸
+cix	ì±¹
+civ	챺
+cig	ì±»
+cOr	ì±½
+cOR	ì±¾
+cOrt	챿
+cOs	ì²€
+cOsw	�
+cOsg	첂
+cOe	첃
+cOf	첄
+cOfr	ì²…
+cOfa	첆
+cOfq	첇
+cOft	첈
+cOfx	첉
+cOfv	첊
+cOfg	첋
+cOa	첌
+cOq	�
+cOqt	첎
+cOt	�
+cOT	�
+cOd	첑
+cOw	ì²’
+cOc	첓
+cOz	ì²”
+cOx	첕
+cOv	ì²–
+cOg	ì²—
+cjr	ì²™
+cjR	첚
+cjrt	ì²›
+cjs	천
+cjsw	�
+cjsg	첞
+cje	첟
+cjf	ì² 
+cjfr	첡
+cjfa	ì²¢
+cjfq	ì²£
+cjft	첤
+cjfx	ì²¥
+cjfv	첦
+cjfg	첧
+cja	첨
+cjq	첩
+cjqt	첪
+cjt	첫
+cjT	첬
+cjd	ì²­
+cjw	ì²®
+cjc	첯
+cjz	ì²°
+cjx	ì²±
+cjv	ì²²
+cjg	ì²³
+cpr	ì²µ
+cpR	첶
+cprt	ì²·
+cps	첸
+cpsw	ì²¹
+cpsg	첺
+cpe	ì²»
+cpf	ì²¼
+cpfr	ì²½
+cpfa	ì²¾
+cpfq	첿
+cpft	ì³€
+cpfx	�
+cpfv	쳂
+cpfg	쳃
+cpa	쳄
+cpq	ì³…
+cpqt	쳆
+cpt	쳇
+cpT	쳈
+cpd	쳉
+cpw	쳊
+cpc	쳋
+cpz	쳌
+cpx	�
+cpv	쳎
+cpg	�
+cur	쳑
+cuR	ì³’
+curt	쳓
+cus	ì³”
+cusw	쳕
+cusg	ì³–
+cue	ì³—
+cuf	쳘
+cufr	ì³™
+cufa	쳚
+cufq	ì³›
+cuft	쳜
+cufx	�
+cufv	쳞
+cufg	쳟
+cua	ì³ 
+cuq	쳡
+cuqt	ì³¢
+cut	ì³£
+cuT	쳤
+cud	ì³¥
+cuw	쳦
+cuc	쳧
+cuz	쳨
+cux	쳩
+cuv	쳪
+cug	쳫
+cPr	ì³­
+cPR	ì³®
+cPrt	쳯
+cPs	ì³°
+cPsw	ì³±
+cPsg	ì³²
+cPe	ì³³
+cPf	ì³´
+cPfr	ì³µ
+cPfa	쳶
+cPfq	ì³·
+cPft	쳸
+cPfx	ì³¹
+cPfv	쳺
+cPfg	ì³»
+cPa	ì³¼
+cPq	ì³½
+cPqt	ì³¾
+cPt	쳿
+cPT	ì´€
+cPd	ì´�
+cPw	ì´‚
+cPc	ì´ƒ
+cPz	ì´„
+cPx	ì´…
+cPv	ì´†
+cPg	ì´‡
+chr	ì´‰
+chR	ì´Š
+chrt	ì´‹
+chs	촌
+chsw	ì´�
+chsg	ì´Ž
+che	ì´�
+chf	ì´�
+chfr	ì´‘
+chfa	ì´’
+chfq	ì´“
+chft	ì´”
+chfx	ì´•
+chfv	ì´–
+chfg	ì´—
+cha	ì´˜
+chq	ì´™
+chqt	ì´š
+cht	ì´›
+chT	촜
+chd	ì´�
+chw	ì´ž
+chc	ì´Ÿ
+chz	ì´ 
+chx	ì´¡
+chv	ì´¢
+chg	ì´£
+chkr	ì´¥
+chkR	ì´¦
+chkrt	ì´§
+chks	ì´¨
+chksw	ì´©
+chksg	ì´ª
+chke	ì´«
+chkf	ì´¬
+chkfr	ì´­
+chkfa	ì´®
+chkfq	ì´¯
+chkft	ì´°
+chkfx	ì´±
+chkfv	ì´²
+chkfg	ì´³
+chka	ì´´
+chkq	ì´µ
+chkqt	ì´¶
+chkt	ì´·
+chkT	ì´¸
+chkd	ì´¹
+chkw	ì´º
+chkc	ì´»
+chkz	ì´¼
+chkx	ì´½
+chkv	ì´¾
+chkg	ì´¿
+chor	�
+choR	쵂
+chort	쵃
+chos	쵄
+chosw	ìµ…
+chosg	쵆
+choe	쵇
+chof	쵈
+chofr	쵉
+chofa	쵊
+chofq	쵋
+choft	쵌
+chofx	�
+chofv	쵎
+chofg	�
+choa	�
+choq	쵑
+choqt	ìµ’
+chot	쵓
+choT	ìµ”
+chod	쵕
+chow	ìµ–
+choc	ìµ—
+choz	쵘
+chox	ìµ™
+chov	쵚
+chog	ìµ›
+chlr	�
+chlR	쵞
+chlrt	쵟
+chls	ìµ 
+chlsw	쵡
+chlsg	ìµ¢
+chle	ìµ£
+chlf	쵤
+chlfr	ìµ¥
+chlfa	쵦
+chlfq	쵧
+chlft	쵨
+chlfx	쵩
+chlfv	쵪
+chlfg	쵫
+chla	쵬
+chlq	ìµ­
+chlqt	ìµ®
+chlt	쵯
+chlT	ìµ°
+chld	ìµ±
+chlw	ìµ²
+chlc	ìµ³
+chlz	ìµ´
+chlx	ìµµ
+chlv	쵶
+chlg	ìµ·
+cyr	ìµ¹
+cyR	쵺
+cyrt	ìµ»
+cys	ìµ¼
+cysw	ìµ½
+cysg	ìµ¾
+cye	쵿
+cyf	춀
+cyfr	�
+cyfa	춂
+cyfq	춃
+cyft	춄
+cyfx	춅
+cyfv	춆
+cyfg	춇
+cya	춈
+cyq	춉
+cyqt	춊
+cyt	춋
+cyT	춌
+cyd	�
+cyw	춎
+cyc	�
+cyz	�
+cyx	춑
+cyv	춒
+cyg	춓
+cnr	축
+cnR	춖
+cnrt	춗
+cns	춘
+cnsw	춙
+cnsg	춚
+cne	춛
+cnf	출
+cnfr	�
+cnfa	춞
+cnfq	춟
+cnft	춠
+cnfx	춡
+cnfv	춢
+cnfg	춣
+cna	춤
+cnq	춥
+cnqt	춦
+cnt	춧
+cnT	춨
+cnd	충
+cnw	춪
+cnc	춫
+cnz	춬
+cnx	춭
+cnv	춮
+cng	춯
+cnjr	춱
+cnjR	춲
+cnjrt	춳
+cnjs	춴
+cnjsw	춵
+cnjsg	춶
+cnje	춷
+cnjf	춸
+cnjfr	춹
+cnjfa	춺
+cnjfq	춻
+cnjft	춼
+cnjfx	춽
+cnjfv	춾
+cnjfg	춿
+cnja	ì·€
+cnjq	ì·�
+cnjqt	ì·‚
+cnjt	ì·ƒ
+cnjT	ì·„
+cnjd	ì·…
+cnjw	ì·†
+cnjc	ì·‡
+cnjz	ì·ˆ
+cnjx	ì·‰
+cnjv	ì·Š
+cnjg	ì·‹
+cnpr	ì·�
+cnpR	ì·Ž
+cnprt	ì·�
+cnps	ì·�
+cnpsw	ì·‘
+cnpsg	ì·’
+cnpe	ì·“
+cnpf	ì·”
+cnpfr	ì·•
+cnpfa	ì·–
+cnpfq	ì·—
+cnpft	ì·˜
+cnpfx	ì·™
+cnpfv	ì·š
+cnpfg	ì·›
+cnpa	췜
+cnpq	ì·�
+cnpqt	ì·ž
+cnpt	ì·Ÿ
+cnpT	ì· 
+cnpd	ì·¡
+cnpw	ì·¢
+cnpc	ì·£
+cnpz	ì·¤
+cnpx	ì·¥
+cnpv	ì·¦
+cnpg	ì·§
+cnlr	ì·©
+cnlR	ì·ª
+cnlrt	ì·«
+cnls	ì·¬
+cnlsw	ì·­
+cnlsg	ì·®
+cnle	ì·¯
+cnlf	ì·°
+cnlfr	ì·±
+cnlfa	ì·²
+cnlfq	ì·³
+cnlft	ì·´
+cnlfx	ì·µ
+cnlfv	ì·¶
+cnlfg	ì··
+cnla	ì·¸
+cnlq	ì·¹
+cnlqt	ì·º
+cnlt	ì·»
+cnlT	ì·¼
+cnld	ì·½
+cnlw	ì·¾
+cnlc	ì·¿
+cnlz	츀
+cnlx	�
+cnlv	츂
+cnlg	츃
+cbr	츅
+cbR	츆
+cbrt	츇
+cbs	츈
+cbsw	츉
+cbsg	츊
+cbe	츋
+cbf	츌
+cbfr	�
+cbfa	츎
+cbfq	�
+cbft	�
+cbfx	츑
+cbfv	츒
+cbfg	츓
+cba	츔
+cbq	츕
+cbqt	츖
+cbt	츗
+cbT	츘
+cbd	츙
+cbw	츚
+cbc	츛
+cbz	츜
+cbx	�
+cbv	츞
+cbg	츟
+cmr	측
+cmR	츢
+cmrt	츣
+cms	츤
+cmsw	츥
+cmsg	츦
+cme	츧
+cmf	츨
+cmfr	츩
+cmfa	츪
+cmfq	츫
+cmft	츬
+cmfx	츭
+cmfv	츮
+cmfg	츯
+cma	츰
+cmq	츱
+cmqt	츲
+cmt	츳
+cmT	츴
+cmd	층
+cmw	츶
+cmc	츷
+cmz	츸
+cmx	츹
+cmv	츺
+cmg	츻
+cmlr	츽
+cmlR	츾
+cmlrt	츿
+cmls	ì¹€
+cmlsw	�
+cmlsg	칂
+cmle	칃
+cmlf	칄
+cmlfr	ì¹…
+cmlfa	칆
+cmlfq	칇
+cmlft	칈
+cmlfx	칉
+cmlfv	칊
+cmlfg	칋
+cmla	칌
+cmlq	�
+cmlqt	칎
+cmlt	�
+cmlT	�
+cmld	칑
+cmlw	ì¹’
+cmlc	칓
+cmlz	ì¹”
+cmlx	칕
+cmlv	ì¹–
+cmlg	ì¹—
+clr	ì¹™
+clR	칚
+clrt	ì¹›
+cls	친
+clsw	�
+clsg	칞
+cle	칟
+clf	ì¹ 
+clfr	칡
+clfa	ì¹¢
+clfq	ì¹£
+clft	칤
+clfx	ì¹¥
+clfv	칦
+clfg	칧
+cla	침
+clq	칩
+clqt	칪
+clt	칫
+clT	칬
+cld	ì¹­
+clw	ì¹®
+clc	칯
+clz	ì¹°
+clx	ì¹±
+clv	ì¹²
+clg	ì¹³
+zkr	ì¹µ
+zkR	칶
+zkrt	ì¹·
+zks	칸
+zksw	ì¹¹
+zksg	칺
+zke	ì¹»
+zkf	ì¹¼
+zkfr	ì¹½
+zkfa	ì¹¾
+zkfq	칿
+zkft	캀
+zkfx	�
+zkfv	캂
+zkfg	캃
+zka	캄
+zkq	캅
+zkqt	캆
+zkt	캇
+zkT	캈
+zkd	캉
+zkw	캊
+zkc	캋
+zkz	캌
+zkx	�
+zkv	캎
+zkg	�
+zor	캑
+zoR	캒
+zort	캓
+zos	캔
+zosw	캕
+zosg	캖
+zoe	캗
+zof	캘
+zofr	캙
+zofa	캚
+zofq	캛
+zoft	캜
+zofx	�
+zofv	캞
+zofg	캟
+zoa	캠
+zoq	캡
+zoqt	캢
+zot	캣
+zoT	캤
+zod	캥
+zow	캦
+zoc	캧
+zoz	캨
+zox	캩
+zov	캪
+zog	캫
+zir	캭
+ziR	캮
+zirt	캯
+zis	캰
+zisw	캱
+zisg	캲
+zie	캳
+zif	캴
+zifr	캵
+zifa	캶
+zifq	캷
+zift	캸
+zifx	캹
+zifv	캺
+zifg	캻
+zia	캼
+ziq	캽
+ziqt	캾
+zit	캿
+ziT	컀
+zid	�
+ziw	컂
+zic	컃
+ziz	컄
+zix	ì»…
+ziv	컆
+zig	컇
+zOr	컉
+zOR	컊
+zOrt	컋
+zOs	컌
+zOsw	�
+zOsg	컎
+zOe	�
+zOf	�
+zOfr	컑
+zOfa	ì»’
+zOfq	컓
+zOft	ì»”
+zOfx	컕
+zOfv	ì»–
+zOfg	ì»—
+zOa	컘
+zOq	ì»™
+zOqt	컚
+zOt	ì»›
+zOT	컜
+zOd	�
+zOw	컞
+zOc	컟
+zOz	ì» 
+zOx	컡
+zOv	컢
+zOg	컣
+zjr	컥
+zjR	컦
+zjrt	컧
+zjs	컨
+zjsw	컩
+zjsg	컪
+zje	컫
+zjf	컬
+zjfr	ì»­
+zjfa	ì»®
+zjfq	컯
+zjft	ì»°
+zjfx	ì»±
+zjfv	컲
+zjfg	컳
+zja	ì»´
+zjq	컵
+zjqt	컶
+zjt	ì»·
+zjT	컸
+zjd	컹
+zjw	컺
+zjc	ì»»
+zjz	컼
+zjx	컽
+zjv	컾
+zjg	컿
+zpr	�
+zpR	켂
+zprt	켃
+zps	켄
+zpsw	ì¼…
+zpsg	켆
+zpe	켇
+zpf	켈
+zpfr	켉
+zpfa	켊
+zpfq	켋
+zpft	켌
+zpfx	�
+zpfv	켎
+zpfg	�
+zpa	�
+zpq	켑
+zpqt	ì¼’
+zpt	켓
+zpT	ì¼”
+zpd	켕
+zpw	ì¼–
+zpc	ì¼—
+zpz	켘
+zpx	ì¼™
+zpv	켚
+zpg	ì¼›
+zur	�
+zuR	켞
+zurt	켟
+zus	ì¼ 
+zusw	켡
+zusg	ì¼¢
+zue	ì¼£
+zuf	켤
+zufr	ì¼¥
+zufa	켦
+zufq	켧
+zuft	켨
+zufx	켩
+zufv	켪
+zufg	켫
+zua	켬
+zuq	ì¼­
+zuqt	ì¼®
+zut	켯
+zuT	ì¼°
+zud	ì¼±
+zuw	ì¼²
+zuc	ì¼³
+zuz	ì¼´
+zux	ì¼µ
+zuv	켶
+zug	ì¼·
+zPr	ì¼¹
+zPR	켺
+zPrt	ì¼»
+zPs	ì¼¼
+zPsw	ì¼½
+zPsg	ì¼¾
+zPe	켿
+zPf	ì½€
+zPfr	�
+zPfa	콂
+zPfq	콃
+zPft	콄
+zPfx	ì½…
+zPfv	콆
+zPfg	콇
+zPa	콈
+zPq	콉
+zPqt	콊
+zPt	콋
+zPT	콌
+zPd	�
+zPw	콎
+zPc	�
+zPz	�
+zPx	콑
+zPv	ì½’
+zPg	콓
+zhr	콕
+zhR	ì½–
+zhrt	ì½—
+zhs	콘
+zhsw	ì½™
+zhsg	콚
+zhe	ì½›
+zhf	콜
+zhfr	�
+zhfa	콞
+zhfq	콟
+zhft	ì½ 
+zhfx	콡
+zhfv	ì½¢
+zhfg	ì½£
+zha	콤
+zhq	ì½¥
+zhqt	콦
+zht	콧
+zhT	콨
+zhd	콩
+zhw	콪
+zhc	콫
+zhz	콬
+zhx	ì½­
+zhv	ì½®
+zhg	콯
+zhkr	ì½±
+zhkR	ì½²
+zhkrt	ì½³
+zhks	ì½´
+zhksw	ì½µ
+zhksg	콶
+zhke	ì½·
+zhkf	콸
+zhkfr	ì½¹
+zhkfa	콺
+zhkfq	ì½»
+zhkft	ì½¼
+zhkfx	ì½½
+zhkfv	ì½¾
+zhkfg	콿
+zhka	ì¾€
+zhkq	�
+zhkqt	쾂
+zhkt	쾃
+zhkT	쾄
+zhkd	ì¾…
+zhkw	쾆
+zhkc	쾇
+zhkz	쾈
+zhkx	쾉
+zhkv	쾊
+zhkg	쾋
+zhor	�
+zhoR	쾎
+zhort	�
+zhos	�
+zhosw	쾑
+zhosg	ì¾’
+zhoe	쾓
+zhof	ì¾”
+zhofr	쾕
+zhofa	ì¾–
+zhofq	ì¾—
+zhoft	쾘
+zhofx	ì¾™
+zhofv	쾚
+zhofg	ì¾›
+zhoa	쾜
+zhoq	�
+zhoqt	쾞
+zhot	쾟
+zhoT	ì¾ 
+zhod	쾡
+zhow	ì¾¢
+zhoc	ì¾£
+zhoz	쾤
+zhox	ì¾¥
+zhov	쾦
+zhog	쾧
+zhlr	쾩
+zhlR	쾪
+zhlrt	쾫
+zhls	쾬
+zhlsw	ì¾­
+zhlsg	ì¾®
+zhle	쾯
+zhlf	ì¾°
+zhlfr	ì¾±
+zhlfa	ì¾²
+zhlfq	ì¾³
+zhlft	ì¾´
+zhlfx	ì¾µ
+zhlfv	쾶
+zhlfg	ì¾·
+zhla	쾸
+zhlq	ì¾¹
+zhlqt	쾺
+zhlt	ì¾»
+zhlT	ì¾¼
+zhld	ì¾½
+zhlw	ì¾¾
+zhlc	쾿
+zhlz	ì¿€
+zhlx	�
+zhlv	ì¿‚
+zhlg	쿃
+zyr	ì¿…
+zyR	쿆
+zyrt	쿇
+zys	쿈
+zysw	쿉
+zysg	ì¿Š
+zye	ì¿‹
+zyf	쿌
+zyfr	�
+zyfa	ì¿Ž
+zyfq	�
+zyft	�
+zyfx	ì¿‘
+zyfv	ì¿’
+zyfg	ì¿“
+zya	ì¿”
+zyq	ì¿•
+zyqt	ì¿–
+zyt	ì¿—
+zyT	쿘
+zyd	ì¿™
+zyw	ì¿š
+zyc	ì¿›
+zyz	쿜
+zyx	�
+zyv	ì¿ž
+zyg	ì¿Ÿ
+znr	ì¿¡
+znR	ì¿¢
+znrt	ì¿£
+zns	쿤
+znsw	ì¿¥
+znsg	쿦
+zne	쿧
+znf	쿨
+znfr	ì¿©
+znfa	쿪
+znfq	ì¿«
+znft	쿬
+znfx	ì¿­
+znfv	ì¿®
+znfg	쿯
+zna	ì¿°
+znq	쿱
+znqt	쿲
+znt	쿳
+znT	ì¿´
+znd	쿵
+znw	쿶
+znc	ì¿·
+znz	쿸
+znx	쿹
+znv	쿺
+zng	ì¿»
+znjr	쿽
+znjR	쿾
+znjrt	ì¿¿
+znjs	퀀
+znjsw	�
+znjsg	퀂
+znje	퀃
+znjf	퀄
+znjfr	퀅
+znjfa	퀆
+znjfq	퀇
+znjft	퀈
+znjfx	퀉
+znjfv	퀊
+znjfg	퀋
+znja	퀌
+znjq	�
+znjqt	퀎
+znjt	�
+znjT	�
+znjd	퀑
+znjw	퀒
+znjc	퀓
+znjz	퀔
+znjx	퀕
+znjv	퀖
+znjg	퀗
+znpr	퀙
+znpR	퀚
+znprt	퀛
+znps	퀜
+znpsw	�
+znpsg	퀞
+znpe	퀟
+znpf	퀠
+znpfr	퀡
+znpfa	퀢
+znpfq	퀣
+znpft	퀤
+znpfx	퀥
+znpfv	퀦
+znpfg	퀧
+znpa	퀨
+znpq	퀩
+znpqt	퀪
+znpt	퀫
+znpT	퀬
+znpd	퀭
+znpw	퀮
+znpc	퀯
+znpz	퀰
+znpx	퀱
+znpv	퀲
+znpg	퀳
+znlr	퀵
+znlR	퀶
+znlrt	퀷
+znls	퀸
+znlsw	퀹
+znlsg	퀺
+znle	퀻
+znlf	퀼
+znlfr	퀽
+znlfa	퀾
+znlfq	퀿
+znlft	�
+znlfx	�
+znlfv	�
+znlfg	�
+znla	�
+znlq	�
+znlqt	�
+znlt	�
+znlT	�
+znld	�
+znlw	�
+znlc	�
+znlz	�
+znlx	�
+znlv	�
+znlg	�
+zbr	�
+zbR	�
+zbrt	�
+zbs	�
+zbsw	�
+zbsg	�
+zbe	�
+zbf	�
+zbfr	�
+zbfa	�
+zbfq	�
+zbft	�
+zbfx	�
+zbfv	�
+zbfg	�
+zba	�
+zbq	�
+zbqt	�
+zbt	�
+zbT	�
+zbd	�
+zbw	�
+zbc	�
+zbz	�
+zbx	�
+zbv	�
+zbg	�
+zmr	�
+zmR	�
+zmrt	�
+zms	�
+zmsw	�
+zmsg	�
+zme	�
+zmf	�
+zmfr	�
+zmfa	�
+zmfq	�
+zmft	�
+zmfx	�
+zmfv	�
+zmfg	�
+zma	�
+zmq	�
+zmqt	�
+zmt	�
+zmT	í‚€
+zmd	�
+zmw	í‚‚
+zmc	킃
+zmz	í‚„
+zmx	í‚…
+zmv	킆
+zmg	킇
+zmlr	킉
+zmlR	í‚Š
+zmlrt	í‚‹
+zmls	킌
+zmlsw	�
+zmlsg	í‚Ž
+zmle	�
+zmlf	�
+zmlfr	í‚‘
+zmlfa	í‚’
+zmlfq	í‚“
+zmlft	í‚”
+zmlfx	í‚•
+zmlfv	í‚–
+zmlfg	í‚—
+zmla	킘
+zmlq	í‚™
+zmlqt	í‚š
+zmlt	í‚›
+zmlT	킜
+zmld	�
+zmlw	í‚ž
+zmlc	í‚Ÿ
+zmlz	í‚ 
+zmlx	í‚¡
+zmlv	í‚¢
+zmlg	í‚£
+zlr	í‚¥
+zlR	킦
+zlrt	킧
+zls	킨
+zlsw	í‚©
+zlsg	킪
+zle	í‚«
+zlf	킬
+zlfr	í‚­
+zlfa	í‚®
+zlfq	킯
+zlft	í‚°
+zlfx	킱
+zlfv	킲
+zlfg	킳
+zla	í‚´
+zlq	킵
+zlqt	킶
+zlt	í‚·
+zlT	킸
+zld	킹
+zlw	킺
+zlc	í‚»
+zlz	킼
+zlx	킽
+zlv	킾
+zlg	í‚¿
+xkr	�
+xkR	탂
+xkrt	탃
+xks	탄
+xksw	탅
+xksg	탆
+xke	탇
+xkf	탈
+xkfr	탉
+xkfa	탊
+xkfq	탋
+xkft	탌
+xkfx	�
+xkfv	탎
+xkfg	�
+xka	�
+xkq	탑
+xkqt	탒
+xkt	탓
+xkT	탔
+xkd	탕
+xkw	탖
+xkc	탗
+xkz	탘
+xkx	탙
+xkv	탚
+xkg	탛
+xor	�
+xoR	탞
+xort	탟
+xos	탠
+xosw	탡
+xosg	탢
+xoe	탣
+xof	탤
+xofr	탥
+xofa	탦
+xofq	탧
+xoft	탨
+xofx	탩
+xofv	탪
+xofg	탫
+xoa	탬
+xoq	탭
+xoqt	탮
+xot	탯
+xoT	탰
+xod	탱
+xow	탲
+xoc	탳
+xoz	탴
+xox	탵
+xov	탶
+xog	탷
+xir	탹
+xiR	탺
+xirt	탻
+xis	탼
+xisw	탽
+xisg	탾
+xie	탿
+xif	í„€
+xifr	�
+xifa	í„‚
+xifq	턃
+xift	í„„
+xifx	í„…
+xifv	턆
+xifg	턇
+xia	턈
+xiq	턉
+xiqt	í„Š
+xit	í„‹
+xiT	턌
+xid	�
+xiw	í„Ž
+xic	�
+xiz	�
+xix	í„‘
+xiv	í„’
+xig	í„“
+xOr	í„•
+xOR	í„–
+xOrt	í„—
+xOs	턘
+xOsw	í„™
+xOsg	í„š
+xOe	í„›
+xOf	턜
+xOfr	�
+xOfa	í„ž
+xOfq	í„Ÿ
+xOft	í„ 
+xOfx	í„¡
+xOfv	í„¢
+xOfg	í„£
+xOa	턤
+xOq	í„¥
+xOqt	턦
+xOt	턧
+xOT	턨
+xOd	í„©
+xOw	턪
+xOc	í„«
+xOz	턬
+xOx	í„­
+xOv	í„®
+xOg	턯
+xjr	턱
+xjR	턲
+xjrt	턳
+xjs	í„´
+xjsw	턵
+xjsg	턶
+xje	í„·
+xjf	털
+xjfr	턹
+xjfa	턺
+xjfq	í„»
+xjft	턼
+xjfx	턽
+xjfv	턾
+xjfg	í„¿
+xja	í…€
+xjq	í…�
+xjqt	í…‚
+xjt	í…ƒ
+xjT	í…„
+xjd	í……
+xjw	í…†
+xjc	í…‡
+xjz	í…ˆ
+xjx	í…‰
+xjv	í…Š
+xjg	í…‹
+xpr	í…�
+xpR	í…Ž
+xprt	í…�
+xps	í…�
+xpsw	í…‘
+xpsg	í…’
+xpe	í…“
+xpf	í…”
+xpfr	í…•
+xpfa	í…–
+xpfq	í…—
+xpft	í…˜
+xpfx	í…™
+xpfv	í…š
+xpfg	í…›
+xpa	템
+xpq	í…�
+xpqt	í…ž
+xpt	í…Ÿ
+xpT	í… 
+xpd	í…¡
+xpw	í…¢
+xpc	í…£
+xpz	í…¤
+xpx	í…¥
+xpv	í…¦
+xpg	í…§
+xur	í…©
+xuR	í…ª
+xurt	í…«
+xus	í…¬
+xusw	í…­
+xusg	í…®
+xue	í…¯
+xuf	í…°
+xufr	í…±
+xufa	í…²
+xufq	í…³
+xuft	í…´
+xufx	í…µ
+xufv	í…¶
+xufg	í…·
+xua	í…¸
+xuq	í…¹
+xuqt	í…º
+xut	í…»
+xuT	í…¼
+xud	í…½
+xuw	í…¾
+xuc	í…¿
+xuz	톀
+xux	�
+xuv	톂
+xug	톃
+xPr	톅
+xPR	톆
+xPrt	톇
+xPs	톈
+xPsw	톉
+xPsg	톊
+xPe	톋
+xPf	톌
+xPfr	�
+xPfa	톎
+xPfq	�
+xPft	�
+xPfx	톑
+xPfv	톒
+xPfg	톓
+xPa	톔
+xPq	톕
+xPqt	톖
+xPt	톗
+xPT	톘
+xPd	톙
+xPw	톚
+xPc	톛
+xPz	톜
+xPx	�
+xPv	톞
+xPg	톟
+xhr	톡
+xhR	톢
+xhrt	톣
+xhs	톤
+xhsw	톥
+xhsg	톦
+xhe	톧
+xhf	톨
+xhfr	톩
+xhfa	톪
+xhfq	톫
+xhft	톬
+xhfx	톭
+xhfv	톮
+xhfg	톯
+xha	톰
+xhq	톱
+xhqt	톲
+xht	톳
+xhT	톴
+xhd	통
+xhw	톶
+xhc	톷
+xhz	톸
+xhx	톹
+xhv	톺
+xhg	톻
+xhkr	톽
+xhkR	톾
+xhkrt	톿
+xhks	퇀
+xhksw	�
+xhksg	퇂
+xhke	퇃
+xhkf	퇄
+xhkfr	퇅
+xhkfa	퇆
+xhkfq	퇇
+xhkft	퇈
+xhkfx	퇉
+xhkfv	퇊
+xhkfg	퇋
+xhka	퇌
+xhkq	�
+xhkqt	퇎
+xhkt	�
+xhkT	�
+xhkd	퇑
+xhkw	퇒
+xhkc	퇓
+xhkz	퇔
+xhkx	퇕
+xhkv	퇖
+xhkg	퇗
+xhor	퇙
+xhoR	퇚
+xhort	퇛
+xhos	퇜
+xhosw	�
+xhosg	퇞
+xhoe	퇟
+xhof	퇠
+xhofr	퇡
+xhofa	퇢
+xhofq	퇣
+xhoft	퇤
+xhofx	퇥
+xhofv	퇦
+xhofg	퇧
+xhoa	퇨
+xhoq	퇩
+xhoqt	퇪
+xhot	퇫
+xhoT	퇬
+xhod	퇭
+xhow	퇮
+xhoc	퇯
+xhoz	퇰
+xhox	퇱
+xhov	퇲
+xhog	퇳
+xhlr	퇵
+xhlR	퇶
+xhlrt	퇷
+xhls	퇸
+xhlsw	퇹
+xhlsg	퇺
+xhle	퇻
+xhlf	퇼
+xhlfr	퇽
+xhlfa	퇾
+xhlfq	퇿
+xhlft	툀
+xhlfx	�
+xhlfv	툂
+xhlfg	툃
+xhla	툄
+xhlq	툅
+xhlqt	툆
+xhlt	툇
+xhlT	툈
+xhld	툉
+xhlw	툊
+xhlc	툋
+xhlz	툌
+xhlx	�
+xhlv	툎
+xhlg	�
+xyr	툑
+xyR	툒
+xyrt	툓
+xys	툔
+xysw	툕
+xysg	툖
+xye	툗
+xyf	툘
+xyfr	툙
+xyfa	툚
+xyfq	툛
+xyft	툜
+xyfx	�
+xyfv	툞
+xyfg	툟
+xya	툠
+xyq	툡
+xyqt	툢
+xyt	툣
+xyT	툤
+xyd	툥
+xyw	툦
+xyc	툧
+xyz	툨
+xyx	툩
+xyv	툪
+xyg	툫
+xnr	툭
+xnR	툮
+xnrt	툯
+xns	툰
+xnsw	툱
+xnsg	툲
+xne	툳
+xnf	툴
+xnfr	툵
+xnfa	툶
+xnfq	툷
+xnft	툸
+xnfx	툹
+xnfv	툺
+xnfg	툻
+xna	툼
+xnq	툽
+xnqt	툾
+xnt	툿
+xnT	퉀
+xnd	�
+xnw	퉂
+xnc	퉃
+xnz	퉄
+xnx	퉅
+xnv	퉆
+xng	퉇
+xnjr	퉉
+xnjR	퉊
+xnjrt	퉋
+xnjs	퉌
+xnjsw	�
+xnjsg	퉎
+xnje	�
+xnjf	�
+xnjfr	퉑
+xnjfa	퉒
+xnjfq	퉓
+xnjft	퉔
+xnjfx	퉕
+xnjfv	퉖
+xnjfg	퉗
+xnja	퉘
+xnjq	퉙
+xnjqt	퉚
+xnjt	퉛
+xnjT	퉜
+xnjd	�
+xnjw	퉞
+xnjc	퉟
+xnjz	퉠
+xnjx	퉡
+xnjv	퉢
+xnjg	퉣
+xnpr	퉥
+xnpR	퉦
+xnprt	퉧
+xnps	퉨
+xnpsw	퉩
+xnpsg	퉪
+xnpe	퉫
+xnpf	퉬
+xnpfr	퉭
+xnpfa	퉮
+xnpfq	퉯
+xnpft	퉰
+xnpfx	퉱
+xnpfv	퉲
+xnpfg	퉳
+xnpa	퉴
+xnpq	퉵
+xnpqt	퉶
+xnpt	퉷
+xnpT	퉸
+xnpd	퉹
+xnpw	퉺
+xnpc	퉻
+xnpz	퉼
+xnpx	퉽
+xnpv	퉾
+xnpg	퉿
+xnlr	�
+xnlR	튂
+xnlrt	튃
+xnls	튄
+xnlsw	튅
+xnlsg	튆
+xnle	튇
+xnlf	튈
+xnlfr	튉
+xnlfa	튊
+xnlfq	튋
+xnlft	튌
+xnlfx	�
+xnlfv	튎
+xnlfg	�
+xnla	�
+xnlq	튑
+xnlqt	튒
+xnlt	튓
+xnlT	튔
+xnld	튕
+xnlw	튖
+xnlc	튗
+xnlz	튘
+xnlx	튙
+xnlv	튚
+xnlg	튛
+xbr	�
+xbR	튞
+xbrt	튟
+xbs	튠
+xbsw	튡
+xbsg	튢
+xbe	튣
+xbf	튤
+xbfr	튥
+xbfa	튦
+xbfq	튧
+xbft	튨
+xbfx	튩
+xbfv	튪
+xbfg	튫
+xba	튬
+xbq	튭
+xbqt	튮
+xbt	튯
+xbT	튰
+xbd	튱
+xbw	튲
+xbc	튳
+xbz	튴
+xbx	튵
+xbv	튶
+xbg	튷
+xmr	특
+xmR	튺
+xmrt	튻
+xms	튼
+xmsw	튽
+xmsg	튾
+xme	튿
+xmf	í‹€
+xmfr	�
+xmfa	í‹‚
+xmfq	틃
+xmft	í‹„
+xmfx	í‹…
+xmfv	틆
+xmfg	틇
+xma	틈
+xmq	틉
+xmqt	í‹Š
+xmt	í‹‹
+xmT	틌
+xmd	�
+xmw	í‹Ž
+xmc	�
+xmz	�
+xmx	í‹‘
+xmv	í‹’
+xmg	í‹“
+xmlr	í‹•
+xmlR	í‹–
+xmlrt	í‹—
+xmls	틘
+xmlsw	í‹™
+xmlsg	í‹š
+xmle	í‹›
+xmlf	틜
+xmlfr	�
+xmlfa	í‹ž
+xmlfq	í‹Ÿ
+xmlft	í‹ 
+xmlfx	í‹¡
+xmlfv	í‹¢
+xmlfg	í‹£
+xmla	틤
+xmlq	í‹¥
+xmlqt	틦
+xmlt	틧
+xmlT	틨
+xmld	í‹©
+xmlw	틪
+xmlc	í‹«
+xmlz	틬
+xmlx	í‹­
+xmlv	í‹®
+xmlg	틯
+xlr	틱
+xlR	틲
+xlrt	틳
+xls	í‹´
+xlsw	틵
+xlsg	틶
+xle	í‹·
+xlf	틸
+xlfr	틹
+xlfa	틺
+xlfq	í‹»
+xlft	틼
+xlfx	틽
+xlfv	틾
+xlfg	í‹¿
+xla	팀
+xlq	�
+xlqt	팂
+xlt	팃
+xlT	팄
+xld	팅
+xlw	팆
+xlc	팇
+xlz	팈
+xlx	팉
+xlv	팊
+xlg	팋
+vkr	�
+vkR	팎
+vkrt	�
+vks	�
+vksw	팑
+vksg	팒
+vke	팓
+vkf	팔
+vkfr	팕
+vkfa	팖
+vkfq	팗
+vkft	팘
+vkfx	팙
+vkfv	팚
+vkfg	팛
+vka	팜
+vkq	�
+vkqt	팞
+vkt	팟
+vkT	팠
+vkd	팡
+vkw	팢
+vkc	팣
+vkz	팤
+vkx	팥
+vkv	팦
+vkg	팧
+vor	팩
+voR	팪
+vort	팫
+vos	팬
+vosw	팭
+vosg	팮
+voe	팯
+vof	팰
+vofr	팱
+vofa	팲
+vofq	팳
+voft	팴
+vofx	팵
+vofv	팶
+vofg	팷
+voa	팸
+voq	팹
+voqt	팺
+vot	팻
+voT	팼
+vod	팽
+vow	팾
+voc	팿
+voz	�
+vox	�
+vov	�
+vog	�
+vir	�
+viR	�
+virt	�
+vis	�
+visw	�
+visg	�
+vie	�
+vif	�
+vifr	�
+vifa	�
+vifq	�
+vift	�
+vifx	�
+vifv	�
+vifg	�
+via	�
+viq	�
+viqt	�
+vit	�
+viT	�
+vid	�
+viw	�
+vic	�
+viz	�
+vix	�
+viv	�
+vig	�
+vOr	�
+vOR	�
+vOrt	�
+vOs	�
+vOsw	�
+vOsg	�
+vOe	�
+vOf	�
+vOfr	�
+vOfa	�
+vOfq	�
+vOft	�
+vOfx	�
+vOfv	�
+vOfg	�
+vOa	�
+vOq	�
+vOqt	�
+vOt	�
+vOT	�
+vOd	�
+vOw	�
+vOc	�
+vOz	�
+vOx	�
+vOv	�
+vOg	�
+vjr	�
+vjR	�
+vjrt	�
+vjs	펀
+vjsw	�
+vjsg	펂
+vje	펃
+vjf	펄
+vjfr	펅
+vjfa	펆
+vjfq	펇
+vjft	펈
+vjfx	펉
+vjfv	펊
+vjfg	펋
+vja	펌
+vjq	�
+vjqt	펎
+vjt	�
+vjT	�
+vjd	펑
+vjw	펒
+vjc	펓
+vjz	펔
+vjx	펕
+vjv	펖
+vjg	펗
+vpr	펙
+vpR	펚
+vprt	펛
+vps	펜
+vpsw	�
+vpsg	펞
+vpe	펟
+vpf	펠
+vpfr	펡
+vpfa	펢
+vpfq	펣
+vpft	펤
+vpfx	펥
+vpfv	펦
+vpfg	펧
+vpa	펨
+vpq	펩
+vpqt	펪
+vpt	펫
+vpT	펬
+vpd	펭
+vpw	펮
+vpc	펯
+vpz	펰
+vpx	펱
+vpv	펲
+vpg	펳
+vur	펵
+vuR	펶
+vurt	펷
+vus	편
+vusw	펹
+vusg	펺
+vue	펻
+vuf	펼
+vufr	펽
+vufa	펾
+vufq	펿
+vuft	�
+vufx	�
+vufv	�
+vufg	�
+vua	�
+vuq	�
+vuqt	�
+vut	�
+vuT	�
+vud	�
+vuw	�
+vuc	�
+vuz	�
+vux	�
+vuv	�
+vug	�
+vPr	�
+vPR	�
+vPrt	�
+vPs	�
+vPsw	�
+vPsg	�
+vPe	�
+vPf	�
+vPfr	�
+vPfa	�
+vPfq	�
+vPft	�
+vPfx	�
+vPfv	�
+vPfg	�
+vPa	�
+vPq	�
+vPqt	�
+vPt	�
+vPT	�
+vPd	�
+vPw	�
+vPc	�
+vPz	�
+vPx	�
+vPv	�
+vPg	�
+vhr	�
+vhR	�
+vhrt	�
+vhs	�
+vhsw	�
+vhsg	�
+vhe	�
+vhf	�
+vhfr	�
+vhfa	�
+vhfq	�
+vhft	�
+vhfx	�
+vhfv	�
+vhfg	�
+vha	�
+vhq	�
+vhqt	�
+vht	�
+vhT	�
+vhd	�
+vhw	�
+vhc	�
+vhz	�
+vhx	�
+vhv	�
+vhg	�
+vhkr	�
+vhkR	�
+vhkrt	�
+vhks	�
+vhksw	�
+vhksg	�
+vhke	�
+vhkf	�
+vhkfr	�
+vhkfa	�
+vhkfq	�
+vhkft	�
+vhkfx	�
+vhkfv	�
+vhkfg	�
+vhka	�
+vhkq	�
+vhkqt	�
+vhkt	�
+vhkT	�
+vhkd	�
+vhkw	�
+vhkc	�
+vhkz	�
+vhkx	�
+vhkv	�
+vhkg	�
+vhor	�
+vhoR	�
+vhort	�
+vhos	�
+vhosw	�
+vhosg	�
+vhoe	�
+vhof	�
+vhofr	�
+vhofa	�
+vhofq	�
+vhoft	�
+vhofx	�
+vhofv	�
+vhofg	�
+vhoa	�
+vhoq	�
+vhoqt	�
+vhot	�
+vhoT	�
+vhod	�
+vhow	�
+vhoc	�
+vhoz	�
+vhox	�
+vhov	�
+vhog	�
+vhlr	�
+vhlR	í‘‚
+vhlrt	푃
+vhls	í‘„
+vhlsw	í‘…
+vhlsg	푆
+vhle	푇
+vhlf	푈
+vhlfr	푉
+vhlfa	í‘Š
+vhlfq	í‘‹
+vhlft	푌
+vhlfx	�
+vhlfv	í‘Ž
+vhlfg	�
+vhla	�
+vhlq	í‘‘
+vhlqt	í‘’
+vhlt	í‘“
+vhlT	í‘”
+vhld	í‘•
+vhlw	í‘–
+vhlc	í‘—
+vhlz	푘
+vhlx	í‘™
+vhlv	í‘š
+vhlg	í‘›
+vyr	�
+vyR	í‘ž
+vyrt	í‘Ÿ
+vys	í‘ 
+vysw	í‘¡
+vysg	í‘¢
+vye	í‘£
+vyf	푤
+vyfr	í‘¥
+vyfa	푦
+vyfq	푧
+vyft	푨
+vyfx	í‘©
+vyfv	푪
+vyfg	í‘«
+vya	푬
+vyq	í‘­
+vyqt	í‘®
+vyt	푯
+vyT	í‘°
+vyd	푱
+vyw	푲
+vyc	푳
+vyz	í‘´
+vyx	푵
+vyv	푶
+vyg	í‘·
+vnr	푹
+vnR	푺
+vnrt	í‘»
+vns	푼
+vnsw	푽
+vnsg	푾
+vne	í‘¿
+vnf	í’€
+vnfr	í’�
+vnfa	í’‚
+vnfq	í’ƒ
+vnft	í’„
+vnfx	í’…
+vnfv	í’†
+vnfg	í’‡
+vna	í’ˆ
+vnq	í’‰
+vnqt	í’Š
+vnt	í’‹
+vnT	풌
+vnd	í’�
+vnw	í’Ž
+vnc	í’�
+vnz	í’�
+vnx	í’‘
+vnv	í’’
+vng	í’“
+vnjr	í’•
+vnjR	í’–
+vnjrt	í’—
+vnjs	í’˜
+vnjsw	í’™
+vnjsg	í’š
+vnje	í’›
+vnjf	풜
+vnjfr	í’�
+vnjfa	í’ž
+vnjfq	í’Ÿ
+vnjft	í’ 
+vnjfx	í’¡
+vnjfv	í’¢
+vnjfg	í’£
+vnja	í’¤
+vnjq	í’¥
+vnjqt	í’¦
+vnjt	í’§
+vnjT	í’¨
+vnjd	í’©
+vnjw	í’ª
+vnjc	í’«
+vnjz	í’¬
+vnjx	í’­
+vnjv	í’®
+vnjg	í’¯
+vnpr	í’±
+vnpR	í’²
+vnprt	í’³
+vnps	í’´
+vnpsw	í’µ
+vnpsg	í’¶
+vnpe	í’·
+vnpf	í’¸
+vnpfr	í’¹
+vnpfa	í’º
+vnpfq	í’»
+vnpft	í’¼
+vnpfx	í’½
+vnpfv	í’¾
+vnpfg	í’¿
+vnpa	í“€
+vnpq	�
+vnpqt	í“‚
+vnpt	퓃
+vnpT	í“„
+vnpd	í“…
+vnpw	퓆
+vnpc	퓇
+vnpz	퓈
+vnpx	퓉
+vnpv	í“Š
+vnpg	í“‹
+vnlr	�
+vnlR	í“Ž
+vnlrt	�
+vnls	�
+vnlsw	í“‘
+vnlsg	í“’
+vnle	í““
+vnlf	í“”
+vnlfr	í“•
+vnlfa	í“–
+vnlfq	í“—
+vnlft	퓘
+vnlfx	í“™
+vnlfv	í“š
+vnlfg	í“›
+vnla	퓜
+vnlq	�
+vnlqt	í“ž
+vnlt	í“Ÿ
+vnlT	í“ 
+vnld	í“¡
+vnlw	í“¢
+vnlc	í“£
+vnlz	퓤
+vnlx	í“¥
+vnlv	퓦
+vnlg	퓧
+vbr	í“©
+vbR	퓪
+vbrt	í“«
+vbs	퓬
+vbsw	í“­
+vbsg	í“®
+vbe	퓯
+vbf	í“°
+vbfr	퓱
+vbfa	퓲
+vbfq	퓳
+vbft	í“´
+vbfx	퓵
+vbfv	퓶
+vbfg	í“·
+vba	퓸
+vbq	퓹
+vbqt	퓺
+vbt	í“»
+vbT	퓼
+vbd	퓽
+vbw	퓾
+vbc	í“¿
+vbz	픀
+vbx	�
+vbv	픂
+vbg	픃
+vmr	í”…
+vmR	픆
+vmrt	픇
+vms	픈
+vmsw	픉
+vmsg	픊
+vme	픋
+vmf	플
+vmfr	�
+vmfa	픎
+vmfq	�
+vmft	�
+vmfx	픑
+vmfv	í”’
+vmfg	픓
+vma	í””
+vmq	픕
+vmqt	í”–
+vmt	í”—
+vmT	픘
+vmd	í”™
+vmw	픚
+vmc	í”›
+vmz	픜
+vmx	�
+vmv	픞
+vmg	픟
+vmlr	픡
+vmlR	픢
+vmlrt	픣
+vmls	픤
+vmlsw	픥
+vmlsg	픦
+vmle	픧
+vmlf	픨
+vmlfr	픩
+vmlfa	픪
+vmlfq	픫
+vmlft	픬
+vmlfx	í”­
+vmlfv	í”®
+vmlfg	픯
+vmla	í”°
+vmlq	í”±
+vmlqt	픲
+vmlt	픳
+vmlT	í”´
+vmld	픵
+vmlw	픶
+vmlc	í”·
+vmlz	픸
+vmlx	픹
+vmlv	픺
+vmlg	í”»
+vlr	픽
+vlR	픾
+vlrt	픿
+vls	í•€
+vlsw	�
+vlsg	í•‚
+vle	핃
+vlf	í•„
+vlfr	í•…
+vlfa	핆
+vlfq	핇
+vlft	핈
+vlfx	핉
+vlfv	í•Š
+vlfg	í•‹
+vla	핌
+vlq	�
+vlqt	í•Ž
+vlt	�
+vlT	�
+vld	í•‘
+vlw	í•’
+vlc	í•“
+vlz	í•”
+vlx	í••
+vlv	í•–
+vlg	í•—
+gkr	í•™
+gkR	í•š
+gkrt	í•›
+gks	한
+gksw	�
+gksg	í•ž
+gke	í•Ÿ
+gkf	í• 
+gkfr	í•¡
+gkfa	í•¢
+gkfq	í•£
+gkft	핤
+gkfx	í•¥
+gkfv	핦
+gkfg	핧
+gka	함
+gkq	í•©
+gkqt	핪
+gkt	í•«
+gkT	핬
+gkd	í•­
+gkw	í•®
+gkc	핯
+gkz	í•°
+gkx	핱
+gkv	핲
+gkg	핳
+gor	핵
+goR	핶
+gort	í•·
+gos	핸
+gosw	핹
+gosg	핺
+goe	í•»
+gof	핼
+gofr	핽
+gofa	핾
+gofq	í•¿
+goft	í–€
+gofx	í–�
+gofv	í–‚
+gofg	í–ƒ
+goa	í–„
+goq	í–…
+goqt	í–†
+got	í–‡
+goT	í–ˆ
+god	í–‰
+gow	í–Š
+goc	í–‹
+goz	햌
+gox	í–�
+gov	í–Ž
+gog	í–�
+gir	í–‘
+giR	í–’
+girt	í–“
+gis	í–”
+gisw	í–•
+gisg	í––
+gie	í–—
+gif	í–˜
+gifr	í–™
+gifa	í–š
+gifq	í–›
+gift	햜
+gifx	í–�
+gifv	í–ž
+gifg	í–Ÿ
+gia	í– 
+giq	í–¡
+giqt	í–¢
+git	í–£
+giT	í–¤
+gid	í–¥
+giw	í–¦
+gic	í–§
+giz	í–¨
+gix	í–©
+giv	í–ª
+gig	í–«
+gOr	í–­
+gOR	í–®
+gOrt	í–¯
+gOs	í–°
+gOsw	í–±
+gOsg	í–²
+gOe	í–³
+gOf	í–´
+gOfr	í–µ
+gOfa	í–¶
+gOfq	í–·
+gOft	í–¸
+gOfx	í–¹
+gOfv	í–º
+gOfg	í–»
+gOa	í–¼
+gOq	í–½
+gOqt	í–¾
+gOt	í–¿
+gOT	í—€
+gOd	í—�
+gOw	í—‚
+gOc	í—ƒ
+gOz	í—„
+gOx	í—…
+gOv	í—†
+gOg	í—‡
+gjr	í—‰
+gjR	í—Š
+gjrt	í—‹
+gjs	헌
+gjsw	í—�
+gjsg	í—Ž
+gje	í—�
+gjf	í—�
+gjfr	í—‘
+gjfa	í—’
+gjfq	í—“
+gjft	í—”
+gjfx	í—•
+gjfv	í—–
+gjfg	í——
+gja	í—˜
+gjq	í—™
+gjqt	í—š
+gjt	í—›
+gjT	헜
+gjd	í—�
+gjw	í—ž
+gjc	í—Ÿ
+gjz	í— 
+gjx	í—¡
+gjv	í—¢
+gjg	í—£
+gpr	í—¥
+gpR	í—¦
+gprt	í—§
+gps	í—¨
+gpsw	í—©
+gpsg	í—ª
+gpe	í—«
+gpf	í—¬
+gpfr	í—­
+gpfa	í—®
+gpfq	í—¯
+gpft	í—°
+gpfx	í—±
+gpfv	í—²
+gpfg	í—³
+gpa	í—´
+gpq	í—µ
+gpqt	í—¶
+gpt	í—·
+gpT	í—¸
+gpd	í—¹
+gpw	í—º
+gpc	í—»
+gpz	í—¼
+gpx	í—½
+gpv	í—¾
+gpg	í—¿
+gur	�
+guR	혂
+gurt	혃
+gus	현
+gusw	혅
+gusg	혆
+gue	혇
+guf	혈
+gufr	혉
+gufa	혊
+gufq	혋
+guft	혌
+gufx	�
+gufv	혎
+gufg	�
+gua	�
+guq	협
+guqt	혒
+gut	혓
+guT	혔
+gud	형
+guw	혖
+guc	혗
+guz	혘
+gux	혙
+guv	혚
+gug	혛
+gPr	�
+gPR	혞
+gPrt	혟
+gPs	혠
+gPsw	혡
+gPsg	혢
+gPe	혣
+gPf	혤
+gPfr	혥
+gPfa	혦
+gPfq	혧
+gPft	혨
+gPfx	혩
+gPfv	혪
+gPfg	혫
+gPa	혬
+gPq	혭
+gPqt	혮
+gPt	혯
+gPT	혰
+gPd	혱
+gPw	혲
+gPc	혳
+gPz	혴
+gPx	혵
+gPv	혶
+gPg	혷
+ghr	혹
+ghR	혺
+ghrt	혻
+ghs	혼
+ghsw	혽
+ghsg	혾
+ghe	혿
+ghf	홀
+ghfr	�
+ghfa	홂
+ghfq	홃
+ghft	홄
+ghfx	í™…
+ghfv	홆
+ghfg	홇
+gha	홈
+ghq	홉
+ghqt	홊
+ght	홋
+ghT	홌
+ghd	�
+ghw	홎
+ghc	�
+ghz	�
+ghx	홑
+ghv	í™’
+ghg	홓
+ghkr	확
+ghkR	í™–
+ghkrt	í™—
+ghks	환
+ghksw	í™™
+ghksg	홚
+ghke	í™›
+ghkf	활
+ghkfr	�
+ghkfa	홞
+ghkfq	홟
+ghkft	í™ 
+ghkfx	홡
+ghkfv	홢
+ghkfg	홣
+ghka	홤
+ghkq	홥
+ghkqt	홦
+ghkt	홧
+ghkT	홨
+ghkd	황
+ghkw	홪
+ghkc	홫
+ghkz	홬
+ghkx	í™­
+ghkv	í™®
+ghkg	홯
+ghor	í™±
+ghoR	홲
+ghort	홳
+ghos	í™´
+ghosw	홵
+ghosg	홶
+ghoe	í™·
+ghof	홸
+ghofr	홹
+ghofa	홺
+ghofq	í™»
+ghoft	홼
+ghofx	홽
+ghofv	홾
+ghofg	홿
+ghoa	횀
+ghoq	�
+ghoqt	íš‚
+ghot	횃
+ghoT	íš„
+ghod	íš…
+ghow	횆
+ghoc	횇
+ghoz	횈
+ghox	횉
+ghov	횊
+ghog	íš‹
+ghlr	�
+ghlR	횎
+ghlrt	�
+ghls	�
+ghlsw	íš‘
+ghlsg	íš’
+ghle	íš“
+ghlf	íš”
+ghlfr	íš•
+ghlfa	íš–
+ghlfq	íš—
+ghlft	횘
+ghlfx	íš™
+ghlfv	íšš
+ghlfg	íš›
+ghla	횜
+ghlq	�
+ghlqt	íšž
+ghlt	횟
+ghlT	íš 
+ghld	íš¡
+ghlw	횢
+ghlc	횣
+ghlz	횤
+ghlx	횥
+ghlv	횦
+ghlg	횧
+gyr	íš©
+gyR	횪
+gyrt	íš«
+gys	횬
+gysw	íš­
+gysg	íš®
+gye	횯
+gyf	íš°
+gyfr	íš±
+gyfa	íš²
+gyfq	íš³
+gyft	íš´
+gyfx	íšµ
+gyfv	횶
+gyfg	íš·
+gya	횸
+gyq	íš¹
+gyqt	횺
+gyt	íš»
+gyT	íš¼
+gyd	íš½
+gyw	íš¾
+gyc	íš¿
+gyz	훀
+gyx	�
+gyv	훂
+gyg	훃
+gnr	í›…
+gnR	훆
+gnrt	훇
+gns	훈
+gnsw	훉
+gnsg	훊
+gne	훋
+gnf	훌
+gnfr	�
+gnfa	훎
+gnfq	�
+gnft	�
+gnfx	훑
+gnfv	í›’
+gnfg	훓
+gna	í›”
+gnq	훕
+gnqt	í›–
+gnt	í›—
+gnT	훘
+gnd	í›™
+gnw	훚
+gnc	í››
+gnz	훜
+gnx	�
+gnv	훞
+gng	훟
+gnjr	훡
+gnjR	훢
+gnjrt	훣
+gnjs	훤
+gnjsw	훥
+gnjsg	훦
+gnje	훧
+gnjf	훨
+gnjfr	훩
+gnjfa	훪
+gnjfq	훫
+gnjft	훬
+gnjfx	í›­
+gnjfv	í›®
+gnjfg	훯
+gnja	í›°
+gnjq	í›±
+gnjqt	훲
+gnjt	훳
+gnjT	í›´
+gnjd	훵
+gnjw	훶
+gnjc	í›·
+gnjz	훸
+gnjx	훹
+gnjv	훺
+gnjg	í›»
+gnpr	훽
+gnpR	훾
+gnprt	훿
+gnps	휀
+gnpsw	�
+gnpsg	휂
+gnpe	휃
+gnpf	휄
+gnpfr	휅
+gnpfa	휆
+gnpfq	휇
+gnpft	휈
+gnpfx	휉
+gnpfv	휊
+gnpfg	휋
+gnpa	휌
+gnpq	�
+gnpqt	휎
+gnpt	�
+gnpT	�
+gnpd	휑
+gnpw	휒
+gnpc	휓
+gnpz	휔
+gnpx	휕
+gnpv	휖
+gnpg	휗
+gnlr	휙
+gnlR	휚
+gnlrt	휛
+gnls	휜
+gnlsw	�
+gnlsg	휞
+gnle	휟
+gnlf	휠
+gnlfr	휡
+gnlfa	휢
+gnlfq	휣
+gnlft	휤
+gnlfx	휥
+gnlfv	휦
+gnlfg	휧
+gnla	휨
+gnlq	휩
+gnlqt	휪
+gnlt	휫
+gnlT	휬
+gnld	휭
+gnlw	휮
+gnlc	휯
+gnlz	휰
+gnlx	휱
+gnlv	휲
+gnlg	휳
+gbr	휵
+gbR	휶
+gbrt	휷
+gbs	휸
+gbsw	휹
+gbsg	휺
+gbe	휻
+gbf	휼
+gbfr	휽
+gbfa	휾
+gbfq	휿
+gbft	�
+gbfx	�
+gbfv	�
+gbfg	�
+gba	�
+gbq	�
+gbqt	�
+gbt	�
+gbT	�
+gbd	�
+gbw	�
+gbc	�
+gbz	�
+gbx	�
+gbv	�
+gbg	�
+gmr	�
+gmR	�
+gmrt	�
+gms	�
+gmsw	�
+gmsg	�
+gme	�
+gmf	�
+gmfr	�
+gmfa	�
+gmfq	�
+gmft	�
+gmfx	�
+gmfv	�
+gmfg	�
+gma	�
+gmq	�
+gmqt	�
+gmt	�
+gmT	�
+gmd	�
+gmw	�
+gmc	�
+gmz	�
+gmx	�
+gmv	�
+gmg	�
+gmlr	�
+gmlR	�
+gmlrt	�
+gmls	�
+gmlsw	�
+gmlsg	�
+gmle	�
+gmlf	�
+gmlfr	�
+gmlfa	�
+gmlfq	�
+gmlft	�
+gmlfx	�
+gmlfv	�
+gmlfg	�
+gmla	�
+gmlq	�
+gmlqt	�
+gmlt	�
+gmlT	힀
+gmld	�
+gmlw	íž‚
+gmlc	힃
+gmlz	íž„
+gmlx	íž…
+gmlv	힆
+gmlg	힇
+glr	힉
+glR	힊
+glrt	íž‹
+gls	힌
+glsw	�
+glsg	힎
+gle	�
+glf	�
+glfr	íž‘
+glfa	íž’
+glfq	íž“
+glft	íž”
+glfx	íž•
+glfv	íž–
+glfg	íž—
+gla	힘
+glq	íž™
+glqt	ížš
+glt	íž›
+glT	힜
+gld	�
+glw	ížž
+glc	힟
+glz	íž 
+glx	íž¡
+glv	힢
+glg	힣
diff -Nru vim-8.2.1913/runtime/keymap/korean.vim vim-8.2.2434/runtime/keymap/korean.vim
--- vim-8.2.1913/runtime/keymap/korean.vim	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/runtime/keymap/korean.vim	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,23 @@
+" Maintainer: Jang Whemoon <palindrom615@gmail.com>
+" Last Change: Nov 24, 2020
+"
+"
+"
+" Unlike Japanese or Chinese, modern Korean texts do not depends on conversion
+" to Hanja (Chinese character). Thus, general Korean text totally can be
+" covered without help of IME but this keymap. 
+" 
+" BUT, simply mapping each letter of Hangul with sequence of alphabet 1 by 1
+" can fail to combine Hangul jamo (conconants and vowels) right.
+" For example, sequentially pressing `ㅅㅓㅇㅜㄹㄷ�ㅎ�ㄱㅛ` can not only be
+" combined as `서울대학�`, but alse `성ㅜㄹ댛�ㄱ�`, which is totally 
+" nonsense. 
+" Though combining Hangul is deterministic with law that each letter must be 
+" one of (consonant + vowel) or (consonant + vowel + consonant), there is no
+" way to apply such law without implementing input engine.
+"
+" Thus, user of this keymap should wait until previous hangul letter is
+" completed before typing next one. To reduce such inconvenience, I suggest to
+" set `timeoutlen` with their own value. (default value is 1000ms)
+
+source <sfile>:p:h/korean-dubeolsik_utf-8.vim
diff -Nru vim-8.2.1913/runtime/lang/menu_tr.cp1254.vim vim-8.2.2434/runtime/lang/menu_tr.cp1254.vim
--- vim-8.2.1913/runtime/lang/menu_tr.cp1254.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/lang/menu_tr.cp1254.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1,3 +1,3 @@
 " Menu Translations:	Turkish
 
-source <sfile>:p:h/menu_tr_tr.cp1254.vim
\ No newline at end of file
+source <sfile>:p:h/menu_tr_tr.cp1254.vim
diff -Nru vim-8.2.1913/runtime/lang/menu_tr.iso_8859-9.vim vim-8.2.2434/runtime/lang/menu_tr.iso_8859-9.vim
--- vim-8.2.1913/runtime/lang/menu_tr.iso_8859-9.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/lang/menu_tr.iso_8859-9.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1,3 +1,3 @@
 " Menu Translations:	Turkish
 
-source <sfile>:p:h/menu_tr_tr.iso_8859-9.vim
\ No newline at end of file
+source <sfile>:p:h/menu_tr_tr.iso_8859-9.vim
diff -Nru vim-8.2.1913/runtime/macros/less.vim vim-8.2.2434/runtime/macros/less.vim
--- vim-8.2.1913/runtime/macros/less.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/macros/less.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1,6 +1,6 @@
 " Vim script to work like "less"
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2020 May 18
+" Last Change:	2020 Dec 17
 
 " Avoid loading this file twice, allow the user to define his own script.
 if exists("loaded_less")
@@ -35,8 +35,16 @@
   endwhile
 endif
 
-set nocp
-syntax on
+" we don't want 'compatible' here
+if &cp
+  set nocp
+endif
+
+" enable syntax highlighting if not done already
+if !get(g:, 'syntax_on', 0)
+  syntax enable
+endif
+
 set so=0
 set hlsearch
 set incsearch
diff -Nru vim-8.2.1913/runtime/optwin.vim vim-8.2.2434/runtime/optwin.vim
--- vim-8.2.1913/runtime/optwin.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/optwin.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1,7 +1,7 @@
 " These commands create the option window.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2020 Oct 23
+" Last Change:	2020 Oct 27
 
 " If there already is an option window, jump to that one.
 let buf = bufnr('option-window')
@@ -848,7 +848,7 @@
 endif
 call <SID>AddOption("tildeop", gettext("the \"~\" command behaves like an operator"))
 call <SID>BinOptionG("top", &top)
-call <SID>AddOption("operatorfunc", gettext("function called for the \"g@\"  operator"))
+call <SID>AddOption("operatorfunc", gettext("function called for the \"g@\" operator"))
 call <SID>OptionG("opfunc", &opfunc)
 call <SID>AddOption("showmatch", gettext("when inserting a bracket, briefly jump to its match"))
 call <SID>BinOptionG("sm", &sm)
@@ -1267,7 +1267,7 @@
 
 
 call <SID>Header(gettext("multi-byte characters"))
-call <SID>AddOption("encoding", gettext("character encoding used in Vim: \"latin1\", \"utf-8\"\n\"euc-jp\", \"big5\", etc."))
+call <SID>AddOption("encoding", gettext("character encoding used in Vim: \"latin1\", \"utf-8\",\n\"euc-jp\", \"big5\", etc."))
 call <SID>OptionG("enc", &enc)
 call <SID>AddOption("fileencoding", gettext("character encoding for the current file"))
 call append("$", "\t" .. s:local_to_buffer)
diff -Nru vim-8.2.1913/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim vim-8.2.2434/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
--- vim-8.2.1913/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim	2021-01-30 22:05:11.000000000 +0000
@@ -2,7 +2,7 @@
 "
 " Author: Bram Moolenaar
 " Copyright: Vim license applies, see ":help license"
-" Last Change: 2020 Oct 25
+" Last Change: 2021 Jan 03
 "
 " WORK IN PROGRESS - Only the basics work
 " Note: On MS-Windows you need a recent version of gdb.  The one included with
@@ -70,9 +70,14 @@
 endif
 
 let s:pc_id = 12
-let s:break_id = 13  " breakpoint number is added to this
+let s:asm_id = 13
+let s:break_id = 14  " breakpoint number is added to this
 let s:stopped = 1
 
+let s:parsing_disasm_msg = 0
+let s:asm_lines = []
+let s:asm_addr = ''
+
 " Take a breakpoint number as used by GDB and turn it into an integer.
 " The breakpoint may contain a dot: 123.4 -> 123004
 " The main breakpoint has a zero subid.
@@ -114,6 +119,7 @@
 
   let s:ptywin = 0
   let s:pid = 0
+  let s:asmwin = 0
 
   " Uncomment this line to write logging in "debuglog".
   " call ch_logfile('debuglog', 'w')
@@ -153,6 +159,14 @@
   else
     call s:StartDebug_term(a:dict)
   endif
+
+  if exists('g:termdebug_disasm_window')
+    if g:termdebug_disasm_window
+      let curwinid = win_getid(winnr())
+      call s:GotoAsmwinOrCreateIt()
+      call win_gotoid(curwinid)
+    endif
+  endif
 endfunc
 
 " Use when debugger didn't start or ended.
@@ -546,6 +560,14 @@
   return name
 endfunc
 
+" Extract the "addr" value from a gdb message with addr="0x0001234".
+func s:GetAsmAddr(msg)
+  if a:msg !~ 'addr='
+    return ''
+  endif
+  let addr = s:DecodeMessage(substitute(a:msg, '.*addr=', '', ''))
+  return addr
+endfunc
 func s:EndTermDebug(job, status)
   exe 'bwipe! ' . s:commbuf
   unlet s:gdbwin
@@ -609,6 +631,69 @@
   call ch_log("Returning from EndPromptDebug()")
 endfunc
 
+" Disassembly window - added by Michael Sartain
+"
+" - CommOutput: disassemble $pc
+" - CommOutput: &"disassemble $pc\n"
+" - CommOutput: ~"Dump of assembler code for function main(int, char**):\n"
+" - CommOutput: ~"   0x0000555556466f69 <+0>:\tpush   rbp\n"
+" ...
+" - CommOutput: ~"   0x0000555556467cd0:\tpop    rbp\n"
+" - CommOutput: ~"   0x0000555556467cd1:\tret    \n"
+" - CommOutput: ~"End of assembler dump.\n"
+" - CommOutput: ^done
+
+" - CommOutput: disassemble $pc
+" - CommOutput: &"disassemble $pc\n"
+" - CommOutput: &"No function contains specified address.\n"
+" - CommOutput: ^error,msg="No function contains specified address."
+func s:HandleDisasmMsg(msg)
+  if a:msg =~ '^\^done'
+    let curwinid = win_getid(winnr())
+    if win_gotoid(s:asmwin)
+      silent normal! gg0"_dG
+      call setline(1, s:asm_lines)
+      set nomodified
+      set filetype=asm
+
+      let lnum = search('^' . s:asm_addr)
+      if lnum != 0
+        exe 'sign unplace ' . s:asm_id
+        exe 'sign place ' . s:asm_id . ' line=' . lnum . ' name=debugPC'
+      endif
+
+      call win_gotoid(curwinid)
+    endif
+
+    let s:parsing_disasm_msg = 0
+    let s:asm_lines = []
+  elseif a:msg =~ '^\^error,msg='
+    if s:parsing_disasm_msg == 1
+      " Disassemble call ran into an error. This can happen when gdb can't
+      " find the function frame address, so let's try to disassemble starting
+      " at current PC
+      call s:SendCommand('disassemble $pc,+100')
+    endif
+    let s:parsing_disasm_msg = 0
+  elseif a:msg =~ '\&\"disassemble \$pc'
+    if a:msg =~ '+100'
+      " This is our second disasm attempt
+      let s:parsing_disasm_msg = 2
+    endif
+  else
+    let value = substitute(a:msg, '^\~\"[ ]*', '', '')
+    let value = substitute(value, '^=>[ ]*', '', '')
+    let value = substitute(value, '\\n\"
$', '', '')
+    let value = substitute(value, '\\n\"$', '', '')
+    let value = substitute(value, '
', '', '')
+    let value = substitute(value, '\\t', ' ', 'g')
+
+    if value != '' || !empty(s:asm_lines)
+      call add(s:asm_lines, value)
+    endif
+  endif
+endfunc
+
 " Handle a message received from gdb on the GDB/MI interface.
 func s:CommOutput(chan, msg)
   let msgs = split(a:msg, "\r")
@@ -618,7 +703,10 @@
     if msg[0] == "\n"
       let msg = msg[1:]
     endif
-    if msg != ''
+
+    if s:parsing_disasm_msg
+      call s:HandleDisasmMsg(msg)
+    elseif msg != ''
       if msg =~ '^\(\*stopped\|\*running\|=thread-selected\)'
 	call s:HandleCursor(msg)
       elseif msg =~ '^\^done,bkpt=' || msg =~ '^=breakpoint-created,'
@@ -631,6 +719,9 @@
 	call s:HandleEvaluate(msg)
       elseif msg =~ '^\^error,msg='
 	call s:HandleError(msg)
+      elseif msg =~ '^disassemble'
+        let s:parsing_disasm_msg = 1
+        let s:asm_lines = []
       endif
     endif
   endfor
@@ -671,6 +762,7 @@
   command Gdb call win_gotoid(s:gdbwin)
   command Program call s:GotoProgram()
   command Source call s:GotoSourcewinOrCreateIt()
+  command Asm call s:GotoAsmwinOrCreateIt()
   command Winbar call s:InstallWinbar()
 
   if !exists('g:termdebug_map_K') || g:termdebug_map_K
@@ -724,10 +816,15 @@
   delcommand Gdb
   delcommand Program
   delcommand Source
+  delcommand Asm
   delcommand Winbar
 
-  if exists('s:k_map_saved') && !empty(s:k_map_saved)
-    call mapset('n', 0, s:k_map_saved)
+  if exists('s:k_map_saved')
+    if empty(s:k_map_saved)
+      nunmap K
+    else
+      call mapset('n', 0, s:k_map_saved)
+    endif
     unlet s:k_map_saved
   endif
 
@@ -919,6 +1016,48 @@
   endif
 endfunc
 
+func s:GotoAsmwinOrCreateIt()
+  if !win_gotoid(s:asmwin)
+    if win_gotoid(s:sourcewin)
+      exe 'rightbelow new'
+    else
+      exe 'new'
+    endif
+
+    let s:asmwin = win_getid(winnr())
+
+    setlocal nowrap
+    setlocal number
+    setlocal noswapfile
+    setlocal buftype=nofile
+
+    let asmbuf = bufnr('Termdebug-asm-listing')
+    if asmbuf > 0
+      exe 'buffer' . asmbuf
+    else
+      exe 'file Termdebug-asm-listing'
+    endif
+
+    if exists('g:termdebug_disasm_window')
+      if g:termdebug_disasm_window > 1
+        exe 'resize ' . g:termdebug_disasm_window
+      endif
+    endif
+  endif
+
+  if s:asm_addr != ''
+    let lnum = search('^' . s:asm_addr)
+    if lnum == 0
+      if s:stopped
+        call s:SendCommand('disassemble $pc')
+      endif
+    else
+      exe 'sign unplace ' . s:asm_id
+      exe 'sign place ' . s:asm_id . ' line=' . lnum . ' name=debugPC'
+    endif
+  endif
+endfunc
+
 " Handle stopping and running message from gdb.
 " Will update the sign that shows the current position.
 func s:HandleCursor(msg)
@@ -937,6 +1076,27 @@
   else
     let fname = ''
   endif
+
+  if a:msg =~ 'addr='
+    let asm_addr = s:GetAsmAddr(a:msg)
+    if asm_addr != ''
+      let s:asm_addr = asm_addr
+
+      let curwinid = win_getid(winnr())
+      if win_gotoid(s:asmwin)
+        let lnum = search('^' . s:asm_addr)
+        if lnum == 0
+          call s:SendCommand('disassemble $pc')
+        else
+          exe 'sign unplace ' . s:asm_id
+          exe 'sign place ' . s:asm_id . ' line=' . lnum . ' name=debugPC'
+        endif
+
+        call win_gotoid(curwinid)
+      endif
+    endif
+  endif
+
   if a:msg =~ '^\(\*stopped\|=thread-selected\)' && filereadable(fname)
     let lnum = substitute(a:msg, '.*line="\([^"]*\)".*', '\1', '')
     if lnum =~ '^[0-9]*$'
@@ -1034,7 +1194,7 @@
 
 func s:PlaceSign(id, subid, entry)
   let nr = printf('%d.%d', a:id, a:subid)
-  exe 'sign place ' . s:Breakpoint2SignNumber(a:id, a:subid) . ' line=' . a:entry['lnum'] . ' name=debugBreakpoint' . nr . ' file=' . a:entry['fname']
+  exe 'sign place ' . s:Breakpoint2SignNumber(a:id, a:subid) . ' line=' . a:entry['lnum'] . ' name=debugBreakpoint' . nr . ' priority=110 file=' . a:entry['fname']
   let a:entry['placed'] = 1
 endfunc
 
diff -Nru vim-8.2.1913/runtime/plugin/tarPlugin.vim vim-8.2.2434/runtime/plugin/tarPlugin.vim
--- vim-8.2.1913/runtime/plugin/tarPlugin.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/plugin/tarPlugin.vim	2021-01-30 22:05:11.000000000 +0000
@@ -44,6 +44,8 @@
   au BufReadCmd   *.tar.lzma	call tar#Browse(expand("<amatch>"))
   au BufReadCmd   *.tar.xz		call tar#Browse(expand("<amatch>"))
   au BufReadCmd   *.txz			call tar#Browse(expand("<amatch>"))
+  au BufReadCmd   *.tar.zst		call tar#Browse(expand("<amatch>"))
+  au BufReadCmd   *.tzs			call tar#Browse(expand("<amatch>"))
 augroup END
 com! -nargs=? -complete=file Vimuntar call tar#Vimuntar(<q-args>)
 
diff -Nru vim-8.2.1913/runtime/scripts.vim vim-8.2.2434/runtime/scripts.vim
--- vim-8.2.1913/runtime/scripts.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/scripts.vim	2021-01-30 22:05:11.000000000 +0000
@@ -182,6 +182,14 @@
   elseif s:name =~# 'clojure'
     set ft=clojure
 
+    " Free Pascal
+  elseif s:name =~# 'instantfpc\>'
+    set ft=pascal
+
+    " Fennel
+  elseif s:name =~# 'fennel\>'
+    set ft=fennel
+
   endif
   unlet s:name
 
diff -Nru vim-8.2.1913/runtime/synmenu.vim vim-8.2.2434/runtime/synmenu.vim
--- vim-8.2.1913/runtime/synmenu.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/synmenu.vim	2021-01-30 22:05:11.000000000 +0000
@@ -404,6 +404,7 @@
 an 50.90.130 &Syntax.PQ.PApp :cal SetSyn("papp")<CR>
 an 50.90.140 &Syntax.PQ.Pascal :cal SetSyn("pascal")<CR>
 an 50.90.150 &Syntax.PQ.Password\ file :cal SetSyn("passwd")<CR>
+an 50.90.490 &Syntax.PQ.Pbtxt :cal SetSyn("pbtxt")<CR>
 an 50.90.160 &Syntax.PQ.PCCTS :cal SetSyn("pccts")<CR>
 an 50.90.170 &Syntax.PQ.PDF :cal SetSyn("pdf")<CR>
 an 50.90.180 &Syntax.PQ.Perl.Perl :cal SetSyn("perl")<CR>
diff -Nru vim-8.2.1913/runtime/syntax/abap.vim vim-8.2.2434/runtime/syntax/abap.vim
--- vim-8.2.1913/runtime/syntax/abap.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/syntax/abap.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1,7 +1,7 @@
 " Vim ABAP syntax file
 "    Language: SAP - ABAP/R4
 "  Maintainer: Marius Piedallu van Wyk <lailoken@gmail.com>
-" Last Change: 2018 Dec 12
+" Last Change: 2021 Jan 02
 "     Comment: Thanks to EPI-USE Labs for all your assistance. :)
 
 " Quit when a syntax file was already loaded
@@ -193,4 +193,4 @@
 
 let b:current_syntax = "abap"
 
-" vim: ts=8 sw=2
\ No newline at end of file
+" vim: ts=8 sw=2
diff -Nru vim-8.2.1913/runtime/syntax/aidl.vim vim-8.2.2434/runtime/syntax/aidl.vim
--- vim-8.2.1913/runtime/syntax/aidl.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/syntax/aidl.vim	2021-01-30 22:05:11.000000000 +0000
@@ -2,7 +2,7 @@
 " Language:	aidl (Android Interface Definition Language)
 "		https://developer.android.com/guide/components/aidl
 " Maintainer:	Dominique Pelle <dominique.pelle@tomtom.com>
-" LastChange:	2020/07/25
+" LastChange:	2020/12/03
 
 " Quit when a syntax file was already loaded.
 if exists("b:current_syntax")
@@ -12,7 +12,7 @@
 source <sfile>:p:h/java.vim
 
 syn keyword aidlParamDir in out inout
-syn keyword aidlKeyword oneway parcelable
+syn keyword aidlKeyword const oneway parcelable
 
 " Needed for the 'in', 'out', 'inout' keywords to be highlighted.
 syn cluster javaTop add=aidlParamDir
diff -Nru vim-8.2.1913/runtime/syntax/asmh8300.vim vim-8.2.2434/runtime/syntax/asmh8300.vim
--- vim-8.2.1913/runtime/syntax/asmh8300.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/syntax/asmh8300.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1,19 +1,21 @@
 " Vim syntax file
-" Language:	Hitachi H-8300h specific syntax for GNU Assembler
-" Maintainer:	Kevin Dahlhausen <kdahlhaus@yahoo.com>
-" Last Change:	2002 Sep 19
+" Language:		Hitachi H-8300h specific syntax for GNU Assembler
+" Maintainer:		Doug Kearns <dougkearns@gmail.com>
+" Previous Maintainer:	Kevin Dahlhausen <kdahlhaus@yahoo.com>
+" Last Change:		2020 Oct 31
 
-" quit when a syntax file was already loaded
 if exists("b:current_syntax")
   finish
 endif
 
+runtime! syntax/asm.vim
+
 syn case ignore
 
-syn match asmDirective "\.h8300[h]*"
+syn match asmDirective	"\.h8300[hs]n\="
 
 "h8300[h] registers
-syn match asmReg	"e\=r[0-7][lh]\="
+syn match asmRegister	"e\=r\o[lh]\="
 
 "h8300[h] opcodes - order is important!
 syn match asmOpcode "add\.[lbw]"
@@ -37,32 +39,20 @@
 syn match asmOpcode "shl[lr]\.[lbw]"
 syn match asmOpcode "sub\.[lbw]"
 syn match asmOpcode "xor\.[lbw]"
-syn keyword asmOpcode "andc" "band" "bcc" "bclr" "bcs" "beq" "bf" "bge" "bgt"
-syn keyword asmOpcode "bhi" "bhs" "biand" "bild" "bior" "bist" "bixor" "bmi"
-syn keyword asmOpcode "bne" "bnot" "bnp" "bor" "bpl" "bpt" "bra" "brn" "bset"
-syn keyword asmOpcode "bsr" "btst" "bst" "bt" "bvc" "bvs" "bxor" "cmp" "daa"
-syn keyword asmOpcode "das" "eepmov" "eepmovw" "inc" "jmp" "jsr" "ldc" "movfpe"
-syn keyword asmOpcode "movtpe" "mov" "nop" "orc" "rte" "rts" "sleep" "stc"
-syn keyword asmOpcode "sub" "trapa" "xorc"
-
-syn case match
-
 
-" Read the general asm syntax
-runtime! syntax/asm.vim
-
-
-" Define the default highlighting.
-" Only when an item doesn't have highlighting yet
+syn keyword asmOpcode andc band bcc bclr bcs beq bf bge bgt
+syn keyword asmOpcode bhi bhs biand bild bior bist bixor bmi
+syn keyword asmOpcode bne bnot bnp bor bpl bpt bra brn bset
+syn keyword asmOpcode bsr btst bst bt bvc bvs bxor cmp daa
+syn keyword asmOpcode das eepmov eepmovw inc jmp jsr ldc movfpe
+syn keyword asmOpcode movtpe mov nop orc rte rts sleep stc
+syn keyword asmOpcode sub trapa xorc
 
-hi def link asmOpcode  Statement
-hi def link asmRegister  Identifier
-
-" My default-color overrides:
-"hi asmOpcode ctermfg=yellow
-"hi asmReg	ctermfg=lightmagenta
+syn case match
 
+hi def link asmOpcode	Statement
+hi def link asmRegister	Identifier
 
 let b:current_syntax = "asmh8300"
 
-" vim: ts=8
+" vim: nowrap sw=2 sts=2 ts=8 noet
diff -Nru vim-8.2.1913/runtime/syntax/asm.vim vim-8.2.2434/runtime/syntax/asm.vim
--- vim-8.2.1913/runtime/syntax/asm.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/syntax/asm.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1,11 +1,10 @@
 " Vim syntax file
-" Language:	GNU Assembler
-" Maintainer:	Erik Wognsen <erik.wognsen@gmail.com>
-"		Previous maintainer:
-"		Kevin Dahlhausen <kdahlhaus@yahoo.com>
-" Last Change:	2014 Feb 04
-
-" Thanks to Ori Avtalion for feedback on the comment markers!
+" Language:		GNU Assembler
+" Maintainer:		Doug Kearns dougkearns@gmail.com
+" Previous Maintainers: Erik Wognsen <erik.wognsen@gmail.com>
+"			Kevin Dahlhausen <kdahlhaus@yahoo.com>
+" Contributors:		Ori Avtalion, Lakshay Garg
+" Last Change:		2020 Oct 31
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -34,29 +33,49 @@
 syn match asmType "\.string"
 syn match asmType "\.word"
 
-syn match asmLabel		"[a-z_][a-z0-9_]*:"he=e-1
 syn match asmIdentifier		"[a-z_][a-z0-9_]*"
+syn match asmLabel		"[a-z_][a-z0-9_]*:"he=e-1
 
 " Various #'s as defined by GAS ref manual sec 3.6.2.1
-" Technically, the first decNumber def is actually octal,
+" Technically, the first asmDecimal def is actually octal,
 " since the value of 0-7 octal is the same as 0-7 decimal,
 " I (Kevin) prefer to map it as decimal:
-syn match decNumber		"0\+[1-7]\=[\t\n$,; ]"
-syn match decNumber		"[1-9]\d*"
-syn match octNumber		"0[0-7][0-7]\+"
-syn match hexNumber		"0[xX][0-9a-fA-F]\+"
-syn match binNumber		"0[bB][0-1]*"
+syn match asmDecimal		"\<0\+[1-7]\=\>"	 display
+syn match asmDecimal		"\<[1-9]\d*\>"		 display
+syn match asmOctal		"\<0[0-7][0-7]\+\>"	 display
+syn match asmHexadecimal	"\<0[xX][0-9a-fA-F]\+\>" display
+syn match asmBinary		"\<0[bB][0-1]\+\>"	 display
+
+syn match asmFloat		"\<\d\+\.\d*\%(e[+-]\=\d\+\)\=\>" display
+syn match asmFloat		"\.\d\+\%(e[+-]\=\d\+\)\=\>"	  display
+syn match asmFloat		"\<\d\%(e[+-]\=\d\+\)\>"	  display
+syn match asmFloat		"[+-]\=Inf\>\|\<NaN\>"		  display
+
+syn match asmFloat		"\%(0[edfghprs]\)[+-]\=\d*\%(\.\d\+\)\%(e[+-]\=\d\+\)\="    display
+syn match asmFloat		"\%(0[edfghprs]\)[+-]\=\d\+\%(\.\d\+\)\=\%(e[+-]\=\d\+\)\=" display
+" Avoid fighting the hexadecimal match for unicorn-like '0x' prefixed floats
+syn match asmFloat		"\%(0x\)[+-]\=\d*\%(\.\d\+\)\%(e[+-]\=\d\+\)\="		    display
+
+" Allow all characters to be escaped (and in strings) as these vary across
+" architectures [See sec 3.6.1.1 Strings]
+syn match asmCharacterEscape	"\\."    contained
+syn match asmCharacter		"'\\\=." contains=asmCharacterEscape
+
+syn match asmStringEscape	"\\\_."			contained
+syn match asmStringEscape	"\\\%(\o\{3}\|00[89]\)"	contained display
+syn match asmStringEscape	"\\x\x\+"		contained display
 
-syn keyword asmTodo		contained TODO
+syn region asmString		start="\"" end="\"" skip="\\\\\|\\\"" contains=asmStringEscape
 
+syn keyword asmTodo		contained TODO FIXME XXX NOTE
 
 " GAS supports one type of multi line comments:
-syn region asmComment		start="/\*" end="\*/" contains=asmTodo
+syn region asmComment		start="/\*" end="\*/" contains=asmTodo,@Spell
 
 " GAS (undocumentedly?) supports C++ style comments. Unlike in C/C++ however,
 " a backslash ending a C++ style comment does not extend the comment to the
 " next line (hence the syntax region does not define 'skip="\\$"')
-syn region asmComment		start="//" end="$" keepend contains=asmTodo
+syn region asmComment		start="//" end="$" keepend contains=asmTodo,@Spell
 
 " Line comment characters depend on the target architecture and command line
 " options and some comments may double as logical line number directives or
@@ -69,7 +88,7 @@
 " frequently used features of the most popular architectures (and also the
 " non-GNU assembly languages that use this syntax file because their asm files
 " are also named *.asm), the following are used as line comment characters:
-syn match asmComment		"[#;!|].*" contains=asmTodo
+syn match asmComment		"[#;!|].*" contains=asmTodo,@Spell
 
 " Side effects of this include:
 " - When `;' is used to separate statements on the same line (many targets
@@ -96,35 +115,50 @@
 " with '.', including the GCC auto-generated '.L' labels.
 syn match asmDirective		"\.[A-Za-z][0-9A-Za-z-_]*"
 
-
 syn case match
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
 
 " The default methods for highlighting.  Can be overridden later
-hi def link asmSection	Special
-hi def link asmLabel	Label
-hi def link asmComment	Comment
-hi def link asmTodo	Todo
+hi def link asmSection		Special
+hi def link asmLabel		Label
+hi def link asmComment		Comment
+hi def link asmTodo		Todo
 hi def link asmDirective	Statement
 
-hi def link asmInclude	Include
-hi def link asmCond	PreCondit
-hi def link asmMacro	Macro
-
-hi def link hexNumber	Number
-hi def link decNumber	Number
-hi def link octNumber	Number
-hi def link binNumber	Number
+hi def link asmInclude		Include
+hi def link asmCond		PreCondit
+hi def link asmMacro		Macro
+
+if exists('g:asm_legacy_syntax_groups')
+  hi def link hexNumber		Number
+  hi def link decNumber		Number
+  hi def link octNumber		Number
+  hi def link binNumber		Number
+  hi def link asmHexadecimal	hexNumber
+  hi def link asmDecimal	decNumber
+  hi def link asmOctal		octNumber
+  hi def link asmBinary		binNumber
+else
+  hi def link asmHexadecimal	Number
+  hi def link asmDecimal	Number
+  hi def link asmOctal		Number
+  hi def link asmBinary		Number
+endif
+hi def link asmFloat		Float
 
-hi def link asmIdentifier	Identifier
-hi def link asmType	Type
+hi def link asmString		String
+hi def link asmStringEscape	Special
+hi def link asmCharacter	Character
+hi def link asmCharacterEscape	Special
 
+hi def link asmIdentifier	Identifier
+hi def link asmType		Type
 
 let b:current_syntax = "asm"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: ts=8
+" vim: nowrap sw=2 sts=2 ts=8 noet
diff -Nru vim-8.2.1913/runtime/syntax/awk.vim vim-8.2.2434/runtime/syntax/awk.vim
--- vim-8.2.1913/runtime/syntax/awk.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/syntax/awk.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1,7 +1,8 @@
 " Vim syntax file
-" Language:	awk, nawk, gawk, mawk
-" Maintainer:	Antonio Colombo <azc100@gmail.com>
-" Last Change:	2020 Aug 18
+" Language:		awk, nawk, gawk, mawk
+" Maintainer:		Doug Kearns <dougkearns@gmail.com>
+" Previous Maintainer:	Antonio Colombo <azc100@gmail.com>
+" Last Change:		2020 Aug 18
 
 " AWK  ref. is: Alfred V. Aho, Brian W. Kernighan, Peter J. Weinberger
 " The AWK Programming Language, Addison-Wesley, 1988
diff -Nru vim-8.2.1913/runtime/syntax/basic.vim vim-8.2.2434/runtime/syntax/basic.vim
--- vim-8.2.1913/runtime/syntax/basic.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/syntax/basic.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1,14 +1,16 @@
 " Vim syntax file
-" Language:	BASIC
-" Maintainer:	Allan Kelly <allan@fruitloaf.co.uk>
-" Last Change:  2011 Dec 25 by Thilo Six
+" Language:		BASIC
+" Maintainer:		Doug Kearns <dougkearns@gmail.com>
+" Previous Maintainer:	Allan Kelly <allan@fruitloaf.co.uk>
+" Contributors:		Thilo Six
+" Last Change:		2015 Jan 10
 
 " First version based on Micro$soft QBASIC circa 1989, as documented in
 " 'Learn BASIC Now' by Halvorson&Rygmyr. Microsoft Press 1989.
 " This syntax file not a complete implementation yet.  Send suggestions to the
 " maintainer.
 
-" quit when a syntax file was already loaded
+" Prelude {{{1
 if exists("b:current_syntax")
   finish
 endif
@@ -16,7 +18,7 @@
 let s:cpo_save = &cpo
 set cpo&vim
 
-" A bunch of useful BASIC keywords
+" Keywords {{{1
 syn keyword basicStatement	BEEP beep Beep BLOAD bload Bload BSAVE bsave Bsave
 syn keyword basicStatement	CALL call Call ABSOLUTE absolute Absolute
 syn keyword basicStatement	CHAIN chain Chain CHDIR chdir Chdir
@@ -116,32 +118,39 @@
 syn keyword basicFunction	SPACE$ space$ Space$ STR$ str$ Str$
 syn keyword basicFunction	STRING$ string$ String$ TIME$ time$ Time$
 syn keyword basicFunction	UCASE$ ucase$ Ucase$ VARPTR$ varptr$ Varptr$
-syn keyword basicTodo contained	TODO
 
-"integer number, or floating point number without a dot.
+" Numbers {{{1
+" Integer number, or floating point number without a dot.
 syn match  basicNumber		"\<\d\+\>"
-"floating point number, with dot
+" Floating point number, with dot
 syn match  basicNumber		"\<\d\+\.\d*\>"
-"floating point number, starting with a dot
+" Floating point number, starting with a dot
 syn match  basicNumber		"\.\d\+\>"
 
-" String and Character contstants
-syn match   basicSpecial contained "\\\d\d\d\|\\."
-syn region  basicString		  start=+"+  skip=+\\\\\|\\"+  end=+"+  contains=basicSpecial
+" String and Character constants {{{1
+syn match   basicSpecial	"\\\d\d\d\|\\." contained
+syn region  basicString		start=+"+  skip=+\\\\\|\\"+  end=+"+	contains=basicSpecial
 
-syn region  basicComment	start="REM" end="$" contains=basicTodo
-syn region  basicComment	start="^[ \t]*'" end="$" contains=basicTodo
+" Line numbers {{{1
 syn region  basicLineNumber	start="^\d" end="\s"
-syn match   basicTypeSpecifier  "[a-zA-Z0-9][\$%&!#]"ms=s+1
+
+" Data-type suffixes {{{1
+syn match   basicTypeSpecifier	"[a-zA-Z0-9][$%&!#]"ms=s+1
 " Used with OPEN statement
 syn match   basicFilenumber  "#\d\+"
-"syn sync ccomment basicComment
+
+" Mathematical operators {{{1
 " syn match   basicMathsOperator "[<>+\*^/\\=-]"
-syn match   basicMathsOperator   "-\|=\|[:<>+\*^/\\]\|AND\|OR"
+syn match   basicMathsOperator	 "-\|=\|[:<>+\*^/\\]\|AND\|OR"
 
-" Define the default highlighting.
-" Only when an item doesn't have highlighting yet
+" Comments {{{1
+syn keyword basicTodo		TODO FIXME XXX NOTE contained
+syn region  basicComment	start="^\s*\zsREM\>" start="\%(:\s*\)\@<=REM\>" end="$" contains=basicTodo
+syn region  basicComment	start="'"					end="$" contains=basicTodo
 
+"syn sync ccomment basicComment
+
+" Default Highlighting {{{1
 hi def link basicLabel		Label
 hi def link basicConditional	Conditional
 hi def link basicRepeat		Repeat
@@ -150,17 +159,18 @@
 hi def link basicError		Error
 hi def link basicStatement	Statement
 hi def link basicString		String
-hi def link basicComment		Comment
-hi def link basicSpecial		Special
+hi def link basicComment	Comment
+hi def link basicSpecial	Special
 hi def link basicTodo		Todo
-hi def link basicFunction		Identifier
-hi def link basicTypeSpecifier Type
-hi def link basicFilenumber basicTypeSpecifier
+hi def link basicFunction	Identifier
+hi def link basicTypeSpecifier	Type
+hi def link basicFilenumber	basicTypeSpecifier
 "hi basicMathsOperator term=bold cterm=bold gui=bold
 
-
+" Postscript {{{1
 let b:current_syntax = "basic"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-" vim: ts=8
+
+" vim: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
diff -Nru vim-8.2.1913/runtime/syntax/cabalconfig.vim vim-8.2.2434/runtime/syntax/cabalconfig.vim
--- vim-8.2.1913/runtime/syntax/cabalconfig.vim	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/runtime/syntax/cabalconfig.vim	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,30 @@
+" Vim syntax file
+" Language:		Cabal Config
+" Maintainer:		profunctor@pm.me
+" Last Change:		Marcin Szamotulski
+" Original Author:	Marcin Szamotulski
+
+if exists("b:current_syntax")
+  finish
+endif
+
+syn match CabalConfigSection /^\S[[:alpha:]]\+\%(-[[:alpha:]]\+\)*[^:]*$/
+syn region CabalConfigRegion matchgroup=CabalConfigKey start=/^\s*[[:alpha:]]\+\%(-[[:alpha:]]\+\)*:/ matchgroup=NONE end=/$/ contains=CabalConfigSeparator,CabalConfigKeyword,CabalConfigPath keepend
+syn match CabalConfigComment /^\s*--.*$/
+syn match CabalConfigValue /.*$/ contained
+syn match CabalConfigKey /[[:alpha:]]\+\%(-[[:alpha:]]\+\)*\ze:/
+syn keyword CabalConfigSeparator : contained
+syn match CabalConfigVariable /\$[[:alpha:]]\+/
+syn keyword CabalConfigKeyword True False ghc
+syn match CabalConfigPath /\%([[:alpha:]]\+:\)\?\%(\/[[:print:]]\+\)\+/
+
+hi def link CabalConfigComment Comment
+hi def link CabalConfigSection Title
+hi def link CabalConfigKey Statement
+hi def link CabalConfigSeparator NonText
+hi def link CabalConfigValue Normal
+hi def link CabalConfigVariable Identifier
+hi def link CabalConfigKeyword Keyword
+hi def link CabalConfigPath Directory
+
+let b:current_syntax = "cabal.config"
diff -Nru vim-8.2.1913/runtime/syntax/cabalproject.vim vim-8.2.2434/runtime/syntax/cabalproject.vim
--- vim-8.2.1913/runtime/syntax/cabalproject.vim	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/runtime/syntax/cabalproject.vim	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,28 @@
+" Vim syntax file
+" Language:		Cabal Project
+" Maintainer:		profunctor@pm.me
+" Last Change:		Marcin Szamotulski
+" Original Author:	Marcin Szamotulski
+
+if exists("b:current_syntax")
+  finish
+endif
+
+syn match CabalProjectComment /^\s*--.*/ contains=@Spell
+syn match CabalProjectField /^\w\%(\w\|-\)\+/ contains=@NoSpell
+
+syn keyword CabalProjectBoolean true false True False
+syn keyword CabalProjectCompiler ghc ghcjs jhc lhc uhc haskell-suite
+syn match CabalProjectNat /\<\d\+\>/
+syn keyword CabalProjectJobs $ncpus
+syn keyword CabalProjectProfilingLevel default none exported-functions toplevel-functions all-functions
+
+hi def link CabalProjectComment Comment
+hi def link CabalProjectField Statement
+hi def link CabalProjectBoolean Boolean
+hi def link CabalProjectCompiler Identifier
+hi def link CabalProjectNat Number
+hi def link CabalProjectJobs Number
+hi def link CabalProjectProfilingLevel Statement
+
+let b:current_syntax = "cabal.project"
diff -Nru vim-8.2.1913/runtime/syntax/cabal.vim vim-8.2.2434/runtime/syntax/cabal.vim
--- vim-8.2.1913/runtime/syntax/cabal.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/syntax/cabal.vim	2021-01-30 22:05:11.000000000 +0000
@@ -4,7 +4,7 @@
 " Maintainer:   Marcin Szamotulski <profunctor@pm.me>
 " Previous Maintainer:	Vincent Berthoux <twinside@gmail.com>
 " File Types:   .cabal
-" Last Change:  3 Oct 2020
+" Last Change:  21 Nov 2020
 " v1.5: Incorporated changes from
 "       https://github.com/sdiehl/haskell-vim-proto/blob/master/vim/syntax/cabal.vim
 "       Use `syn keyword` instead of `syn match`.
@@ -78,10 +78,13 @@
 	\ default-extensions
 	\ author
         \ autogen-modules
+        \ asm-sources
+        \ asm-options
 	\ branch
 	\ bug-reports
 	\ build-depends
 	\ build-tools
+        \ build-tools-depends
 	\ build-type
 	\ buildable
 	\ c-sources
@@ -89,33 +92,46 @@
 	\ category
 	\ cc-options
 	\ copyright
+        \ cmm-sources
+        \ cmm-options
 	\ cpp-options
+        \ cxx-sources
 	\ data-dir
 	\ data-files
 	\ default
+        \ default-extensions
 	\ description
 	\ executable
 	\ exposed-modules
 	\ exposed
 	\ extensions
-	\ extra-tmp-files
+        \ extra-bundled-libraries
 	\ extra-doc-files
+	\ extra-dynamic-library-flavours
+        \ extra-framework-dirs
+        \ extra-ghci-libraries
 	\ extra-lib-dirs
 	\ extra-libraries
+	\ extra-library-flavours
 	\ extra-source-files
-	\ exta-tmp-files
+	\ extra-tmp-files
 	\ for example
 	\ frameworks
 	\ ghc-options
 	\ ghc-prof-options
 	\ ghc-shared-options
+        \ ghcjs-options
+        \ ghcjs-prof-options
+        \ ghcjs-shared-options
 	\ homepage
+        \ hs-source-dir
 	\ hs-source-dirs
 	\ hugs-options
 	\ import
 	\ include-dirs
 	\ includes
 	\ install-includes
+        \ js-sources
 	\ ld-options
 	\ license
 	\ license-file
@@ -123,10 +139,13 @@
 	\ main-is
 	\ maintainer
 	\ manual
+        \ mixins
 	\ module
 	\ name
 	\ nhc98-options
 	\ other-extensions
+        \ other-language
+        \ other-languages
 	\ other-modules
 	\ package-url
 	\ pkgconfig-depends
diff -Nru vim-8.2.1913/runtime/syntax/cpp.vim vim-8.2.2434/runtime/syntax/cpp.vim
--- vim-8.2.1913/runtime/syntax/cpp.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/syntax/cpp.vim	2021-01-30 22:05:11.000000000 +0000
@@ -2,13 +2,16 @@
 " Language:	C++
 " Current Maintainer:	vim-jp (https://github.com/vim-jp/vim-cpp)
 " Previous Maintainer:	Ken Shan <ccshan@post.harvard.edu>
-" Last Change:	2019 Dec 18
+" Last Change:	2021 Jan 12
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
   finish
 endif
 
+" inform C syntax that the file was included from cpp.vim
+let b:filetype_in_cpp_family = 1
+
 " Read the C syntax to start with
 runtime! syntax/c.vim
 unlet b:current_syntax
diff -Nru vim-8.2.1913/runtime/syntax/cs.vim vim-8.2.2434/runtime/syntax/cs.vim
--- vim-8.2.1913/runtime/syntax/cs.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/syntax/cs.vim	2021-01-30 22:05:11.000000000 +0000
@@ -3,7 +3,7 @@
 " Maintainer:          Nick Jensen <nickspoon@gmail.com>
 " Former Maintainers:  Anduin Withers <awithers@anduin.com>
 "                      Johannes Zellner <johannes@zellner.org>
-" Last Change:         2020-01-27
+" Last Change:         2020-11-23
 " Filenames:           *.cs
 " License:             Vim (see :h license)
 " Repository:          https://github.com/nickspoons/vim-cs
@@ -18,7 +18,6 @@
 let s:save_cpo = &cpoptions
 set cpoptions&vim
 
-
 syn keyword	csType	bool byte char decimal double float int long object sbyte short string T uint ulong ushort var void dynamic
 syn keyword	csStorage	delegate enum interface namespace struct
 syn keyword	csRepeat	break continue do for foreach goto return while
@@ -27,7 +26,7 @@
 syn match	csOperatorError	display +::+
 syn match	csGlobal	display +global::+
 " user labels (see [1] 8.6 Statements)
-syn match	csLabel	display +^\s*\I\i*\s*:\([^:]\)\@=+
+syn match	csLabel	display +^\s*\I\i*\s*:\%([^:]\)\@=+
 syn keyword	csModifier	abstract const extern internal override private protected public readonly sealed static virtual volatile
 syn keyword	csConstant	false null true
 syn keyword	csException	try catch finally throw when
@@ -39,9 +38,10 @@
 syn keyword	csUnspecifiedKeyword	explicit implicit
 
 " Contextual Keywords
-syn match	csContextualStatement	/\<yield[[:space:]\n]\+\(return\|break\)/me=s+5
-syn match	csContextualStatement	/\<partial[[:space:]\n]\+\(class\|struct\|interface\)/me=s+7
-syn match	csContextualStatement	/\<\(get\|set\)\(;\|[[:space:]\n]*{\)/me=s+3
+syn match	csContextualStatement	/\<yield[[:space:]\n]\+\%(return\|break\)/me=s+5
+syn match	csContextualStatement	/\<partial[[:space:]\n]\+\%(class\|struct\|interface\)/me=s+7
+syn match	csContextualStatement	/\<\%(get\|set\)\%(;\|[[:space:]\n]*{\)/me=s+3
+syn match	csContextualStatement	/\<\%(get\|set\)\s*=>/me=s+3
 syn match	csContextualStatement	/\<where\>[^:]\+:/me=s+5
 
 " Operators
@@ -101,7 +101,7 @@
 syn spell default
 
 " [1] 9.5 Pre-processing directives
-syn region	csPreCondit	start="^\s*#\s*\(define\|undef\|if\|elif\|else\|endif\|line\|error\|warning\)" skip="\\$" end="$" contains=csComment keepend
+syn region	csPreCondit	start="^\s*#\s*\%(define\|undef\|if\|elif\|else\|endif\|line\|error\|warning\|pragma\)\>" skip="\\$" end="$" contains=csComment keepend
 syn region	csRegion	matchgroup=csPreCondit start="^\s*#\s*region.*$" end="^\s*#\s*endregion" transparent fold contains=TOP
 syn region	csSummary	start="^\s*/// <summary" end="^\%\(\s*///\)\@!" transparent fold keepend
 
@@ -120,25 +120,27 @@
 syn match	csSpecialCharError	"[^']" contained
 " [1] 9.4.4.4 Character literals
 syn match	csSpecialChar	+\\["\\'0abfnrtvx]+ contained display
+syn match	csUnicodeNumber	+\\x\x\{2,4}+ contained contains=csUnicodeSpecifier display
 syn match	csUnicodeNumber	+\\u\x\{4}+ contained contains=csUnicodeSpecifier display
 syn match	csUnicodeNumber	+\\U\x\{8}+ contained contains=csUnicodeSpecifier display
 syn match	csUnicodeSpecifier	+\\[uU]+ contained display
 
 syn region	csString	matchgroup=csQuote start=+"+  end=+"+ end=+$+ extend contains=csSpecialChar,csSpecialError,csUnicodeNumber,@Spell
-syn match	csCharacter	"'[^']*'" contains=csSpecialChar,csSpecialCharError display
+syn match	csCharacter	"'[^']*'" contains=csSpecialChar,csSpecialCharError,csUnicodeNumber display
 syn match	csCharacter	"'\\''" contains=csSpecialChar display
 syn match	csCharacter	"'[^\\]'" display
 syn match	csNumber	"\<0[0-7]*[lL]\=\>" display
-syn match	csNumber	"\<0[xX]\x\+[lL]\=\>" display
-syn match	csNumber	"\<\d\+[lL]\=\>" display
-syn match	csNumber	"\<\d\+\.\d*\%\([eE][-+]\=\d\+\)\=[fFdD]\=" display
-syn match	csNumber	"\.\d\+\%\([eE][-+]\=\d\+\)\=[fFdD]\=" display
-syn match	csNumber	"\<\d\+[eE][-+]\=\d\+[fFdD]\=\>" display
-syn match	csNumber	"\<\d\+\%\([eE][-+]\=\d\+\)\=[fFdD]\>" display
+syn match	csNumber	"\<0[xX][[:xdigit:]_]\+[lL]\=\>" display
+syn match	csNumber	"\<0[bB][01_]\+[lL]\=\>" display
+syn match	csNumber	"\<[[:digit:]_]\+[lL]\=\>" display
+syn match	csNumber	"\<[[:digit:]_]\+\.[[:digit:]_]*\%\([eE][-+]\=[[:digit:]_]\+\)\=[fFdDmM]\=" display
+syn match	csNumber	"\.[[:digit:]_]\+\%\([eE][-+]\=[[:digit:]_]\+\)\=[fFdDmM]\=" display
+syn match	csNumber	"\<[[:digit:]_]\+[eE][-+]\=[[:digit:]_]\+[fFdDmM]\=\>" display
+syn match	csNumber	"\<[[:digit:]_]\+\%\([eE][-+]\=[[:digit:]_]\+\)\=[fFdDmM]\>" display
 
-syn region	csInterpolatedString	matchgroup=csQuote start=+\$"+ end=+"+ end=+$+ extend contains=csInterpolation,csEscapedInterpolation,csSpecialChar,csSpecialError,csUnicodeNumber,@Spell
+syn region	csInterpolatedString	matchgroup=csQuote start=+\$"+ end=+"+ extend contains=csInterpolation,csEscapedInterpolation,csSpecialChar,csSpecialError,csUnicodeNumber,@Spell
 
-syn region	csInterpolation	matchgroup=csInterpolationDelimiter start=+{+ end=+}+ keepend contained contains=@csAll,csBracketed,csInterpolationAlign,csInterpolationFormat
+syn region	csInterpolation	matchgroup=csInterpolationDelimiter start=+{+ end=+}+ keepend contained contains=@csAll,csBraced,csBracketed,csInterpolationAlign,csInterpolationFormat
 syn match	csEscapedInterpolation	"{{" transparent contains=NONE display
 syn match	csEscapedInterpolation	"}}" transparent contains=NONE display
 syn region	csInterpolationAlign	matchgroup=csInterpolationAlignDel start=+,+ end=+}+ end=+:+me=e-1 contained contains=csNumber,csConstant,csCharacter,csParens,csOpSymbols,csString,csBracketed display
@@ -152,9 +154,10 @@
 
 syn region	csInterVerbString	matchgroup=csQuote start=+\$@"+ end=+"+ skip=+""+ extend contains=csInterpolation,csEscapedInterpolation,csSpecialChar,csSpecialError,csUnicodeNumber,csVerbatimQuote,@Spell
 
-syn region	csBracketed	matchgroup=csParens start=+(+ end=+)+ contained transparent contains=@csAll,csBracketed
+syn region	csBracketed	matchgroup=csParens start=+(+ end=+)+ extend contained transparent contains=@csAll,csBraced,csBracketed
+syn region	csBraced	matchgroup=csParens start=+{+ end=+}+ extend contained transparent contains=@csAll,csBraced,csBracketed
 
-syn cluster	csAll	contains=csCharacter,csClassType,csComment,csContextualStatement,csEndColon,csInterpolatedString,csIsType,csLabel,csLogicSymbols,csNewType,csConstant,csNumber,csOpSymbols,csOperatorError,csParens,csPreCondit,csRegion,csString,csSummary,csType,csUnicodeNumber,csUnicodeSpecifier,csVerbatimString,csUserType,csUserIdentifier,csUserInterface,csUserMethod
+syn cluster	csAll	contains=csCharacter,csClassType,csComment,csContextualStatement,csEndColon,csIsType,csLabel,csLogicSymbols,csNewType,csConstant,csNumber,csOpSymbols,csOperatorError,csParens,csPreCondit,csRegion,csString,csSummary,csType,csUnicodeNumber,csUnicodeSpecifier,csInterpolatedString,csVerbatimString,csInterVerbString,csUserType,csUserIdentifier,csUserInterface,csUserMethod
 
 " The default highlighting.
 hi def link	csType	Type
diff -Nru vim-8.2.1913/runtime/syntax/c.vim vim-8.2.2434/runtime/syntax/c.vim
--- vim-8.2.1913/runtime/syntax/c.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/syntax/c.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	C
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2020 Aug 28
+" Last Change:	2021 Jan 11
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -13,6 +13,9 @@
 
 let s:ft = matchstr(&ft, '^\([^.]\)\+')
 
+" check if this was included from cpp.vim
+let s:in_cpp_family = exists("b:filetype_in_cpp_family")
+
 " Optional embedded Autodoc parsing
 " To enable it add: let g:c_autodoc = 1
 " to your .vimrc
@@ -55,7 +58,7 @@
 endif
 
 " cCppString: same as cString, but ends at end of line
-if s:ft ==# "cpp" && !exists("cpp_no_cpp11") && !exists("c_no_cformat")
+if s:in_cpp_family && !exists("cpp_no_cpp11") && !exists("c_no_cformat")
   " ISO C++11
   syn region	cString		start=+\(L\|u\|u8\|U\|R\|LR\|u8R\|uR\|UR\)\="+ skip=+\\\\\|\\"+ end=+"+ contains=cSpecial,cFormat,@Spell extend
   syn region 	cCppString	start=+\(L\|u\|u8\|U\|R\|LR\|u8R\|uR\|UR\)\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=cSpecial,cFormat,@Spell
@@ -87,7 +90,7 @@
 syn match	cSpecialCharacter display "'\\x\x\{1,2}'"
 syn match	cSpecialCharacter display "L'\\x\x\+'"
 
-if (s:ft ==# "c" && !exists("c_no_c11")) || (s:ft ==# "cpp" && !exists("cpp_no_cpp11"))
+if (s:ft ==# "c" && !exists("c_no_c11")) || (s:in_cpp_family && !exists("cpp_no_cpp11"))
   " ISO C11 or ISO C++ 11
   if exists("c_no_cformat")
     syn region	cString		start=+\%(U\|u8\=\)"+ skip=+\\\\\|\\"+ end=+"+ contains=cSpecial,@Spell extend
@@ -130,7 +133,7 @@
 " But avoid matching <::.
 syn cluster	cParenGroup	contains=cParenError,cIncluded,cSpecial,cCommentSkip,cCommentString,cComment2String,@cCommentGroup,cCommentStartError,cUserLabel,cBitField,cOctalZero,@cCppOutInGroup,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom
 if exists("c_no_curly_error")
-  if s:ft ==# 'cpp' && !exists("cpp_no_cpp11")
+  if s:in_cpp_family && !exists("cpp_no_cpp11")
     syn region	cParen		transparent start='(' end=')' contains=ALLBUT,@cParenGroup,cCppParen,@cStringGroup,@Spell
     " cCppParen: same as cParen but ends at end-of-line; used in cDefine
     syn region	cCppParen	transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@cParenGroup,cParen,cString,@Spell
@@ -144,7 +147,7 @@
     syn match	cErrInParen	display contained "^[{}]\|^<%\|^%>"
   endif
 elseif exists("c_no_bracket_error")
-  if s:ft ==# 'cpp' && !exists("cpp_no_cpp11")
+  if s:in_cpp_family && !exists("cpp_no_cpp11")
     syn region	cParen		transparent start='(' end=')' contains=ALLBUT,@cParenGroup,cCppParen,@cStringGroup,@Spell
     " cCppParen: same as cParen but ends at end-of-line; used in cDefine
     syn region	cCppParen	transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@cParenGroup,cParen,cString,@Spell
@@ -158,7 +161,7 @@
     syn match	cErrInParen	display contained "[{}]\|<%\|%>"
   endif
 else
-  if s:ft ==# 'cpp' && !exists("cpp_no_cpp11")
+  if s:in_cpp_family && !exists("cpp_no_cpp11")
     syn region	cParen		transparent start='(' end=')' contains=ALLBUT,@cParenGroup,cCppParen,cErrInBracket,cCppBracket,@cStringGroup,@Spell
     " cCppParen: same as cParen but ends at end-of-line; used in cDefine
     syn region	cCppParen	transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@cParenGroup,cErrInBracket,cParen,cBracket,cString,@Spell
@@ -278,7 +281,7 @@
 if exists("c_gnu")
   syn keyword	cStorageClass	inline __attribute__
 endif
-if !exists("c_no_c99") && s:ft !=# 'cpp'
+if !exists("c_no_c99") && !s:in_cpp_family
   syn keyword	cStorageClass	inline restrict
 endif
 if !exists("c_no_c11")
@@ -420,7 +423,7 @@
 syn cluster	cLabelGroup	contains=cUserLabel
 syn match	cUserCont	display "^\s*\zs\I\i*\s*:$" contains=@cLabelGroup
 syn match	cUserCont	display ";\s*\zs\I\i*\s*:$" contains=@cLabelGroup
-if s:ft ==# 'cpp'
+if s:in_cpp_family
   syn match	cUserCont	display "^\s*\zs\%(class\|struct\|enum\)\@!\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup
   syn match	cUserCont	display ";\s*\zs\%(class\|struct\|enum\)\@!\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup
 else
diff -Nru vim-8.2.1913/runtime/syntax/debchangelog.vim vim-8.2.2434/runtime/syntax/debchangelog.vim
--- vim-8.2.1913/runtime/syntax/debchangelog.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/syntax/debchangelog.vim	2021-01-30 22:05:11.000000000 +0000
@@ -3,7 +3,7 @@
 " Maintainer:  Debian Vim Maintainers
 " Former Maintainers: Gerfried Fuchs <alfie@ist.org>
 "                     Wichert Akkerman <wakkerma@debian.org>
-" Last Change: 2020 Apr 27
+" Last Change: 2020 Nov 28
 " URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debchangelog.vim
 
 " Standard syntax initialization
@@ -21,20 +21,20 @@
 set cpo-=C
 let s:supported = [
       \ 'oldstable', 'stable', 'testing', 'unstable', 'experimental',
-      \ 'wheezy', 'jessie', 'stretch', 'buster', 'bullseye', 'bookworm',
-      \ 'sid', 'rc-buggy',
+      \ 'jessie', 'stretch', 'buster', 'bullseye', 'bookworm',
+      \ 'trixie', 'sid', 'rc-buggy',
       \
-      \ 'trusty', 'xenial', 'bionic', 'eoan', 'focal', 'groovy', 'devel'
+      \ 'trusty', 'xenial', 'bionic', 'focal', 'groovy', 'hirsute', 'devel'
       \ ]
 let s:unsupported = [
       \ 'frozen', 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato',
-      \ 'woody', 'sarge', 'etch', 'lenny', 'squeeze',
+      \ 'woody', 'sarge', 'etch', 'lenny', 'squeeze', 'wheezy',
       \
       \ 'warty', 'hoary', 'breezy', 'dapper', 'edgy', 'feisty',
       \ 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic', 'lucid',
       \ 'maverick', 'natty', 'oneiric', 'precise', 'quantal', 'raring', 'saucy',
       \ 'utopic', 'vivid', 'wily', 'yakkety', 'zesty', 'artful', 'cosmic',
-      \ 'disco'
+      \ 'disco', 'eoan'
       \ ]
 let &cpo=s:cpo
 
diff -Nru vim-8.2.1913/runtime/syntax/debcontrol.vim vim-8.2.2434/runtime/syntax/debcontrol.vim
--- vim-8.2.1913/runtime/syntax/debcontrol.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/syntax/debcontrol.vim	2021-01-30 22:05:11.000000000 +0000
@@ -3,7 +3,7 @@
 " Maintainer:  Debian Vim Maintainers
 " Former Maintainers: Gerfried Fuchs <alfie@ist.org>
 "                     Wichert Akkerman <wakkerma@debian.org>
-" Last Change: 2018 Aug 11
+" Last Change: 2020 Oct 26
 " URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debcontrol.vim
 
 " Standard syntax initialization
@@ -47,22 +47,24 @@
 
 unlet s:kernels s:archs s:pairs
 
+" Keep in sync with https://metadata.ftp-master.org/sections.822
+" curl -q https://metadata.ftp-master.debian.org/sections.822 2>/dev/null| grep-dctrl -n --not -FSection -sSection  / -
 let s:sections = [
       \ 'admin', 'cli-mono', 'comm', 'database', 'debian-installer', 'debug'
       \, 'devel', 'doc', 'editors', 'education', 'electronics', 'embedded'
-      \, 'fonts', 'games', 'gnome', 'gnustep', 'gnu-r', 'golang', 'graphics'
+      \, 'fonts', 'games', 'gnome', 'gnu-r', 'gnustep', 'golang', 'graphics'
       \, 'hamradio', 'haskell', 'httpd', 'interpreters', 'introspection'
-      \, 'java\%(script\)\=', 'kde', 'kernel', 'libs', 'libdevel', 'lisp'
-      \, 'localization', 'mail', 'math', 'metapackages', 'misc', 'net'
-      \, 'news', 'ocaml', 'oldlibs', 'otherosfs', 'perl', 'php', 'python'
-      \, 'ruby', 'rust', 'science', 'shells', 'sound', 'text', 'tex'
+      \, 'java', 'javascript', 'kde', 'kernel', 'libdevel', 'libs', 'lisp'
+      \, 'localization', 'mail', 'math', 'metapackages', 'misc', 'net', 'news'
+      \, 'ocaml', 'oldlibs', 'otherosfs', 'perl', 'php', 'python', 'raku'
+      \, 'ruby', 'rust', 'science', 'shells', 'sound', 'tasks', 'tex', 'text'
       \, 'utils', 'vcs', 'video', 'web', 'x11', 'xfce', 'zope'
       \ ]
 
 syn keyword debcontrolMultiArch contained no foreign allowed same
 syn match debcontrolName contained "[a-z0-9][a-z0-9+.-]\+"
 syn keyword debcontrolPriority contained extra important optional required standard
-exe 'syn match debcontrolSection contained "\%(\%(contrib\|non-free\|non-US/main\|non-US/contrib\|non-US/non-free\|restricted\|universe\|multiverse\)/\)\=\%('.join(s:sections, '\|').'\)"'
+exe 'syn match debcontrolSection contained "\%(\%(contrib\|non-free\|non-US/main\|non-US/contrib\|non-US/non-free\|restricted\|universe\|multiverse\)/\)\=\<\%('.join(s:sections, '\|').'\)\>"'
 syn keyword debcontrolPackageType contained udeb deb
 syn match debcontrolVariable contained "\${.\{-}}"
 syn keyword debcontrolDmUpload contained yes
diff -Nru vim-8.2.1913/runtime/syntax/debsources.vim vim-8.2.2434/runtime/syntax/debsources.vim
--- vim-8.2.1913/runtime/syntax/debsources.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/syntax/debsources.vim	2021-01-30 22:05:11.000000000 +0000
@@ -2,7 +2,7 @@
 " Language:     Debian sources.list
 " Maintainer:   Debian Vim Maintainers
 " Former Maintainer: Matthijs Mohlmann <matthijs@cacholong.nl>
-" Last Change: 2020 Apr 27
+" Last Change: 2020 Nov 28
 " URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debsources.vim
 
 " Standard syntax initialization
@@ -23,20 +23,20 @@
 set cpo-=C
 let s:supported = [
       \ 'oldstable', 'stable', 'testing', 'unstable', 'experimental',
-      \ 'wheezy', 'jessie', 'stretch', 'buster', 'bullseye', 'bookworm',
-      \ 'sid', 'rc-buggy',
+      \ 'jessie', 'stretch', 'buster', 'bullseye', 'bookworm',
+      \ 'trixie', 'sid', 'rc-buggy',
       \
-      \ 'trusty', 'xenial', 'bionic', 'eoan', 'focal', 'groovy', 'devel'
+      \ 'trusty', 'xenial', 'bionic', 'focal', 'groovy', 'hirsute', 'devel'
       \ ]
 let s:unsupported = [
       \ 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato',
-      \ 'woody', 'sarge', 'etch', 'lenny', 'squeeze',
+      \ 'woody', 'sarge', 'etch', 'lenny', 'squeeze', 'wheezy',
       \
       \ 'warty', 'hoary', 'breezy', 'dapper', 'edgy', 'feisty',
       \ 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic', 'lucid',
       \ 'maverick', 'natty', 'oneiric', 'precise', 'quantal', 'raring', 'saucy',
       \ 'utopic', 'vivid', 'wily', 'yakkety', 'zesty', 'artful', 'cosmic',
-      \ 'disco'
+      \ 'disco', 'eoan'
       \ ]
 let &cpo=s:cpo
 
diff -Nru vim-8.2.1913/runtime/syntax/diff.vim vim-8.2.2434/runtime/syntax/diff.vim
--- vim-8.2.1913/runtime/syntax/diff.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/syntax/diff.vim	2021-01-30 22:05:11.000000000 +0000
@@ -2,7 +2,7 @@
 " Language:	Diff (context or unified)
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
 "               Translations by Jakson Alves de Aquino.
-" Last Change:	2016 Apr 02
+" Last Change:	2020 Dec 30
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -346,11 +346,18 @@
 syn match diffLine	"^\d\+\(,\d\+\)\=[cda]\d\+\>.*"
 
 syn match diffFile	"^diff\>.*"
-syn match diffFile	"^+++ .*"
 syn match diffFile	"^Index: .*"
 syn match diffFile	"^==== .*"
-syn match diffOldFile	"^\*\*\* .*"
-syn match diffNewFile	"^--- .*"
+
+if search('^@@ -\S\+ +\S\+ @@', 'nw', '', 100)
+  " unified
+  syn match diffOldFile	"^--- .*"
+  syn match diffNewFile	"^+++ .*"
+else
+  " context / old style
+  syn match diffOldFile	"^\*\*\* .*"
+  syn match diffNewFile	"^--- .*"
+endif
 
 " Used by git
 syn match diffIndexLine	"^index \x\x\x\x.*"
diff -Nru vim-8.2.1913/runtime/syntax/doxygen.vim vim-8.2.2434/runtime/syntax/doxygen.vim
--- vim-8.2.1913/runtime/syntax/doxygen.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/syntax/doxygen.vim	2021-01-30 22:05:11.000000000 +0000
@@ -2,10 +2,10 @@
 " Language:     doxygen on top of c, cpp, idl, java, php
 " Maintainer:   Michael Geddes <vimmer@frog.wheelycreek.net>
 " Author:       Michael Geddes
-" Last Change: November 2017 (\throws by Candy Gumdrop)
-" Version:      1.27
+" Last Change: December 2020
+" Version:      1.30
 "
-" Copyright 2004-2017 Michael Geddes
+" Copyright 2004-2020 Michael Geddes
 " Please feel free to use, modify & distribute all or part of this script,
 " providing this copyright message remains.
 " I would appreciate being acknowledged in any derived scripts, and would
@@ -170,7 +170,7 @@
 
   fun! s:DxyCreateSmallSpecial( kword, name )
 
-    let mx='[-:0-9A-Za-z_%=&+*/!~>|]\@<!\([-0-9A-Za-z_%=+*/!~>|#]\+[-0-9A-Za-z_%=+*/!~>|]\@!\|\\[\\<>&.]@\|[.,][0-9a-zA-Z_]\@=\|::\|([^)]*)\|&[0-9a-zA-Z]\{2,7};\)\+'
+    let mx='[-:0-9A-Za-z_%=&+*/!~>|]\@<!\([-0-9A-Za-z_%=+*/!~>|#]\+[-0-9A-Za-z_%=+*/!~>|]\@!\|\\[\\<>&.]@\|[.,]\w\@=\|::\|([^)]*)\|&[0-9a-zA-Z]\{2,7};\)\+'
     exe 'syn region doxygenSpecial'.a:name.'Word contained start=+'.a:kword.'+ end=+\(\_s\+'.mx.'\)\@<=[-a-zA-Z_0-9+*/^%|~!=&\\]\@!+ skipwhite contains=doxygenContinueCommentWhite,doxygen'.a:name.'Word'
     exe 'syn match doxygen'.a:name.'Word contained "\_s\@<='.mx.'" contains=doxygenHtmlSpecial,@Spell keepend'
   endfun
@@ -186,7 +186,7 @@
   syn match doxygenSmallSpecial contained +[@\\]\(\<[npcbea]\>\|\<em\>\|\<ref\>\|\<link\>\|f\$\|[$\\&<>#]\)\@=+ nextgroup=doxygenOtherLink,doxygenHyperLink,doxygenHashLink,doxygenFormula,doxygenSymbol,doxygenSpecial.*Word
 
   " Now for special characters
-  syn match doxygenSpecial contained +[@\\]\(\<[npcbea]\>\|\<em\>\|\<ref\|\<link\>\>\|\<f\$\|[$\\&<>#]\)\@!+ nextgroup=doxygenParam,doxygenRetval,doxygenBriefWord,doxygenBold,doxygenBOther,doxygenOther,doxygenOtherTODO,doxygenOtherWARN,doxygenOtherBUG,doxygenPage,doxygenGroupDefine,doxygenCodeRegion,doxygenVerbatimRegion,doxygenDotRegion
+  syn match doxygenSpecial contained +[@\\]\(\<[npcbea]\>\|\<em\>\|\<ref\|\<link\>\>\|\<f\$\|[$\\&<>#]\)\@!+ nextgroup=doxygenParam,doxygenTParam,doxygenRetval,doxygenBriefWord,doxygenBold,doxygenBOther,doxygenOther,doxygenOtherTODO,doxygenOtherWARN,doxygenOtherBUG,doxygenPage,doxygenGroupDefine,doxygenCodeRegion,doxygenVerbatimRegion,doxygenDotRegion
   " doxygenOtherLink,doxygenSymbol,doxygenFormula,doxygenErrorSpecial,doxygenSpecial.*Word
   "
   syn match doxygenGroupDefine contained +@\@<=[{}]+
@@ -199,13 +199,14 @@
   syn keyword doxygenParam contained param nextgroup=doxygenParamName,doxygenParamDirection skipwhite
   syn keyword doxygenTParam contained tparam nextgroup=doxygenParamName skipwhite
   syn match doxygenParamName contained +[A-Za-z0-9_:]\++ nextgroup=doxygenSpecialMultilineDesc skipwhite
-  syn keyword doxygenRetval contained retval throw throws exception nextgroup=doxygenParamName skipwhite
+  syn keyword doxygenRetval contained retval throw throws exception nextgroup=doxygenReturnValue skipwhite
+  syn match doxygenReturnValue contained +\S\++ nextgroup=doxygenSpecialMultilineDesc skipwhite
 
   " Match one line identifiers.
   syn keyword doxygenOther contained addindex anchor
   \ dontinclude endhtmlonly endlatexonly showinitializer hideinitializer
-  \ example htmlonly image include includelineno ingroup internal latexonly line
-  \ overload relates relatesalso sa skip skipline
+  \ example htmlonly image include includelineno ingroup latexonly line
+  \ overload relates related relatesalso relatedalso sa skip skipline
   \ until verbinclude version addtogroup htmlinclude copydoc dotfile
   \ xmlonly endxmlonly
   \ nextgroup=doxygenSpecialOnelineDesc copybrief copydetails copyright dir extends
@@ -241,8 +242,8 @@
 
   syn keyword doxygenOther contained par nextgroup=doxygenHeaderLine
   syn region doxygenHeaderLine start=+.+ end=+^+ contained skipwhite nextgroup=doxygenSpecialMultilineDesc
-
-  syn keyword doxygenOther contained arg author authors date deprecated li return returns see invariant note post pre remarks since test nextgroup=doxygenSpecialMultilineDesc
+  " Match the start of other multiline comments.
+  syn keyword doxygenOther contained arg author authors date deprecated li return returns result see invariant note post pre remarks since test internal nextgroup=doxygenSpecialMultilineDesc
   syn keyword doxygenOtherTODO contained todo attention nextgroup=doxygenSpecialMultilineDesc
   syn keyword doxygenOtherWARN contained warning nextgroup=doxygenSpecialMultilineDesc
   syn keyword doxygenOtherBUG contained bug nextgroup=doxygenSpecialMultilineDesc
@@ -256,7 +257,7 @@
   syn match doxygenContinueLinkComment contained +^\s*\*\=[^/]+me=e-1 nextgroup=doxygenLinkRest
   syn match doxygenLinkError "\*/" contained
   " #Link hilighting.
-  syn match doxygenHashLink /\([a-zA-Z_][0-9a-zA-Z_]*\)\?#\(\.[0-9a-zA-Z_]\@=\|[a-zA-Z0-9_]\+\|::\|()\)\+/ contained contains=doxygenHashSpecial
+  syn match doxygenHashLink /\(\h\w*\)\?#\(\.\w\@=\|\w\+\|::\|()\)\+/ contained contains=doxygenHashSpecial
   syn match doxygenHashSpecial /#/ contained
   syn match doxygenHyperLink /\(\s\|^\s*\*\?\)\@<=\(http\|https\|ftp\):\/\/[-0-9a-zA-Z_?&=+#%/.!':;@~]\+/ contained
 
@@ -264,12 +265,12 @@
   syn match doxygenPage "[\\@]page\>"me=s+1 contained skipwhite nextgroup=doxygenPagePage
   syn keyword doxygenPagePage page contained skipwhite nextgroup=doxygenPageIdent
   syn region doxygenPageDesc  start=+.\++ end=+$+ contained skipwhite contains=doxygenSmallSpecial,@doxygenHtmlGroup keepend skipwhite skipnl nextgroup=doxygenBody
-  syn match doxygenPageIdent "\<[a-zA-Z_0-9]\+\>" contained nextgroup=doxygenPageDesc
+  syn match doxygenPageIdent "\<\w\+\>" contained nextgroup=doxygenPageDesc
 
   " Handle section
   syn keyword doxygenOther defgroup section subsection subsubsection weakgroup contained skipwhite nextgroup=doxygenSpecialIdent
   syn region doxygenSpecialSectionDesc  start=+.\++ end=+$+ contained skipwhite contains=doxygenSmallSpecial,@doxygenHtmlGroup keepend skipwhite skipnl nextgroup=doxygenContinueCommentWhite
-  syn match doxygenSpecialIdent "\<[a-zA-Z_0-9]\+\>" contained nextgroup=doxygenSpecialSectionDesc
+  syn match doxygenSpecialIdent "\<\w\+\>" contained nextgroup=doxygenSpecialSectionDesc
 
   " Does the one-line description for the one-line type identifiers.
   syn region doxygenSpecialTypeOnelineDesc  start=+.\++ end=+$+ contained skipwhite contains=doxygenSmallSpecial,@doxygenHtmlGroup keepend
@@ -421,7 +422,7 @@
             if &guifont == ''
               let font="font='FreeSerif 12'"
             else
-              let font="font='".substitute(&guifont, '^.\{-}\([0-9]\+\)$', 'FreeSerif \1','')."'"
+              let font="font='".substitute(&guifont, '^.\{-}\(\d\+\)$', 'FreeSerif \1','')."'"
             endif
 
           elseif has('gui_win32') || has('gui_win16') || has('gui_win95')
@@ -475,6 +476,7 @@
           SynColor doxygenSpecialHeading cterm=bold ctermfg=LightBlue guifg=LightBlue gui=bold
           SynColor doxygenPrev ctermfg=LightGreen guifg=LightGreen
         endif
+        SynLink  doxygenValue doxygenParamName
       else
         SynLink doxygenComment SpecialComment
         SynLink doxygenBrief Statement
@@ -486,7 +488,10 @@
         SynLink doxygenSpecialOnelineDesc Statement
         SynLink doxygenSpecialHeading Statement
         SynLink doxygenPrev SpecialComment
+        SynLink doxygenValue Constant
       endif
+      SynLink doxygenTParam doxygenParam
+
     endfun
 
     call s:Doxygen_Hilights()
@@ -550,6 +555,7 @@
     SynLink doxygenLinkRest               doxygenSpecialMultilineDesc
     SynLink doxygenHyperLink              doxygenLinkWord
     SynLink doxygenHashLink               doxygenLinkWord
+    SynLink doxygenReturnValue            doxygenValue
 
     SynLink doxygenPage                   doxygenSpecial
     SynLink doxygenPagePage               doxygenBOther
diff -Nru vim-8.2.1913/runtime/syntax/dune.vim vim-8.2.2434/runtime/syntax/dune.vim
--- vim-8.2.1913/runtime/syntax/dune.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/syntax/dune.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1,7 +1,8 @@
+" Vim syntax file
 " Language:    Dune buildsystem
 " Maintainer:  Markus Mottl        <markus.mottl@gmail.com>
 "              Anton Kochkov       <anton.kochkov@gmail.com>
-" URL:         https://github.com/rgrinberg/vim-ocaml
+" URL:         https://github.com/ocaml/vim-ocaml
 " Last Change:
 "              2019 Feb 27 - Add newer keywords to the syntax (Simon Cruanes)
 "              2018 May 8 - Check current_syntax (Kawahara Satoru)
@@ -28,7 +29,7 @@
 syn keyword lispKey javascript_files flags ocamlc_flags ocamlopt_flags pps staged_pps
 syn keyword lispKey library_flags c_flags c_library_flags kind package action
 syn keyword lispKey deps targets locks fallback
-syn keyword lispKey inline_tests tests names
+syn keyword lispKey inline_tests tests test names
 
 syn keyword lispAtom true false
 
diff -Nru vim-8.2.1913/runtime/syntax/fstab.vim vim-8.2.2434/runtime/syntax/fstab.vim
--- vim-8.2.1913/runtime/syntax/fstab.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/syntax/fstab.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language: fstab file
 " Maintainer: Radu Dineiu <radu.dineiu@gmail.com>
-" URL: https://raw.github.com/rid9/vim-fstab/master/fstab.vim
-" Last Change: 2020 Aug 06
+" URL: https://raw.github.com/rid9/vim-fstab/master/syntax/fstab.vim
+" Last Change: 2020 Dec 30
 " Version: 1.4
 "
 " Credits:
diff -Nru vim-8.2.1913/runtime/syntax/gift.vim vim-8.2.2434/runtime/syntax/gift.vim
--- vim-8.2.1913/runtime/syntax/gift.vim	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/runtime/syntax/gift.vim	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,216 @@
+" Vim syntax file
+"
+" Language:        Moodle GIFT (General Import Format Template)
+" Maintainer:      Selim Temizer (http://selimtemizer.com)
+" Creation:        November 28, 2020
+" Latest Revision: December 21, 2020
+" Note:            The order of entities in this file is important!
+
+if version < 600
+  syntax clear
+elseif exists("b:current_syntax")
+  finish
+endif
+
+
+setlocal conceallevel=1
+
+"-----------------------------------------------
+" GIFT entities
+
+syn match giftS        "\~"          contained                    "GIFT special characters
+syn match giftS         "="          contained
+syn match giftS         "#"          contained
+syn match giftS         "{"          contained
+syn match giftS         "}"          contained
+syn match giftS         ":"          contained
+
+syn match giftES     "\\\~"          contained  conceal  cchar=~  "GIFT escaped special characters
+syn match giftES      "\\="          contained  conceal  cchar==
+syn match giftES      "\\#"          contained  conceal  cchar=#
+syn match giftES      "\\{"          contained  conceal  cchar={
+syn match giftES      "\\}"          contained  conceal  cchar=}
+syn match giftES      "\\:"          contained  conceal  cchar=:
+
+syn match giftEN      "\\n"          contained  conceal  cchar=n  "GIFT escaped newline
+
+syn match giftFormat  "\[html]"      contained                    "GIFT formats
+syn match giftFormat  "\[plain]"     contained
+syn match giftFormat  "\[moodle]"    contained
+syn match giftFormat  "\[markdown]"  contained
+
+"--------------------------------------------------------
+" HTML entities
+
+syn match giftH            "<"       contained                    "HTML characters that might need to be handled/escaped
+syn match giftH            ">"       contained
+syn match giftH            "&"       contained
+
+syn match giftEH        "&lt;"       contained  conceal  cchar=<  "HTML escaped characters
+syn match giftEH        "&gt;"       contained  conceal  cchar=>
+syn match giftEH       "&amp;"       contained  conceal  cchar=&
+syn match giftEH      "&nbsp;"       contained  conceal  cchar=_
+
+"-------------------------------------------------------
+" Answer components: Feedback and general feedback
+
+syn match giftFB           "#\_.\{-}\(\_^\|[^\\]\)\ze\(=\|\~\|#\|####\|}\)"           contained  contains=giftF       "Feedback block
+syn match giftF         "#\zs\_.\{-}\(\_^\|[^\\]\)\ze\(=\|\~\|#\|####\|}\)"           contained  contains=@giftCEF    "Feedback
+
+syn match giftGFB          "####\_.\{-}\(\_^\|[^\\]\)\ze}"                            contained  contains=giftGF      "General feedback block
+syn match giftGF        "####\zs\_.\{-}\(\_^\|[^\\]\)\ze}"                            contained  contains=@giftCEF    "General feedback
+
+"------------------------------------------------------
+" Answer components: Other components
+
+syn keyword giftTF      T TRUE F FALSE                                                contained
+
+syn match   giftNum1    "[-+]\=[.0-9]\+"                                              contained                       "Something matching a number
+
+syn match   giftNum2    "[-+]\=[.0-9]\+\s*:\s*[-+]\=[.0-9]\+"                         contained  contains=giftNum2D   "Number with error margin
+syn match   giftNum2D                    ":"                                          contained                       "Associated delimiter
+
+syn match   giftNum3    "[-+]\=[.0-9]\+\s*\.\.\s*[-+]\=[.0-9]\+"                      contained  contains=giftNum3D   "Number as min/max range
+syn match   giftNum3D                    "\.\."                                       contained                       "Associated delimiter
+
+syn match   giftWeightB    "%-*[0-9]\{1,2}\.\?[0-9]*%"                                contained  contains=giftWeight  "Weight block
+syn match   giftWeight  "%\zs-*[0-9]\{1,2}\.\?[0-9]*\ze%"                             contained                       "Weight
+
+"-----------------------------------------------------
+" Answer choices
+
+syn match giftWrongNum  "\~\zs\_.\{-}\(\_^\|[^\\]\)\ze\(####\|}\)"                    contained  contains=@giftCEFF             "Wrong numeric choice
+syn match giftRightNum   "=\zs\_.\{-}\(\_^\|[^\\]\)\ze\(=\|\~\|####\|}\)"             contained  contains=@giftCEFFW,@giftNums  "Right numeric choice
+
+syn match giftWrong     "\~\zs\_.\{-}\(\_^\|[^\\]\)\ze\(=\|\~\|####\|}\)"             contained  contains=@giftCEFFW            "Wrong choice
+syn match giftRight      "=\zs\_.\{-}\(\ze->\|\(\_^\|[^\\]\)\ze\(=\|\~\|####\|}\)\)"  contained  contains=@giftCEFFW            "Right choice
+syn match giftMatchB                "->\_.\{-}\(\_^\|[^\\]\)\ze\(=\|\~\|####\|}\)"    contained  contains=giftMatch             "Match choice block
+syn match giftMatch              "->\zs\_.\{-}\(\_^\|[^\\]\)\ze\(=\|\~\|####\|}\)"    contained  contains=@giftCE               "Match choice
+
+"----------------------------------------------------
+" Answer
+
+syn match giftAnswer      "{\_.\{-}\(\_^\|[^\\]\)}"                                   contained  keepend  contains=@giftA     "General answer
+syn match giftAnswer      "{}"                                                        contained                               "Minimal answer
+
+syn match giftAnswerNum      "{\_[[:space:]]*#\_[^#]\_.\{-}\(\_^\|[^\\]\)}"           contained  keepend  contains=@giftANum  "Numeric answer
+syn match giftAnswerNumD  "{\zs\_[[:space:]]*#"                                       contained                               "Associated delimiter
+
+"---------------------------------------------------
+" Question
+
+" The first pattern matches the last question at the end of the file (in case there is no empty line coming after).
+" However, it slows down parsing (and especially scrolling up), therefore it is commented out.
+
+"syn match giftQuestion  "[^{[:space:]]\_.\{-}\%$"                                               keepend  contains=@giftCEF,giftAnswer,giftAnswerNum
+ syn match giftQuestion  "[^{[:space:]]\_.\{-}\n\(\s*\n\)\+"                                     keepend  contains=@giftCEF,giftAnswer,giftAnswerNum
+
+"--------------------------------------------------
+" Question name
+
+syn match giftName       "::\_.\{-}::"                                                           contains=@giftCE,giftNameD  "Question name
+syn match giftNameD      "::"                                                         contained                              "Associated delimiter
+
+"-------------------------------------------------
+" Category
+
+syn match giftCategoryB  "^\s*\$CATEGORY:.*\n\+"                                                 contains=giftCategory       "Category block
+syn match giftCategory   "^\s*\$CATEGORY:\zs.*\ze\n"                                  contained                              "Category
+
+"------------------------------------------------
+" Comments (may need to be the last entity)
+
+syn keyword giftTodo     FIXME TODO NOTE FIX XXX                                      contained
+
+syn match   giftIdB         "\[id:\(\\]\|[^][:cntrl:]]\)\+]"                          contained  contains=giftId             "Id block
+syn match   giftId       "\[id:\zs\(\\]\|[^][:cntrl:]]\)\+\ze]"                       contained                              "Id
+
+syn match   giftTagB        "\[tag:\(\\]\|[^]<>`[:cntrl:]]\)\+]"                      contained  contains=giftTag            "Tag block
+syn match   giftTag      "\[tag:\zs\(\\]\|[^]<>`[:cntrl:]]\)\+\ze]"                   contained                              "Tag
+
+syn match   giftComment  "^\s*//.*"                                                              contains=giftTodo,giftIdB,giftTagB
+
+"-----------------------------------------------
+" Clusters
+
+"Comments and entities (to be escaped)
+syn cluster giftCE    contains=giftComment,giftS,giftES,giftEN,giftH,giftEH
+
+"The above plus format
+syn cluster giftCEF   contains=@giftCE,giftFormat
+
+"The above plus feedback block
+syn cluster giftCEFF  contains=@giftCEF,giftFB
+
+"The above plus weight block
+syn cluster giftCEFFW contains=@giftCEFF,giftWeightB
+
+"Possible numerical representations
+syn cluster giftNums  contains=giftNum1,giftNum2,giftNum3
+
+"Possible contents of answers
+syn cluster giftA     contains=giftComment,giftTF,giftWrong,giftRight,giftMatchB,giftFB,giftGFB
+
+"Possible contents of numerical answers
+syn cluster giftANum  contains=giftAnswerNumD,giftComment,@giftNums,giftWrongNum,giftRightNum,giftFB,giftGFB
+
+"-----------------------------------------------
+
+let b:current_syntax = "gift"
+
+"-----------------------------------------------
+
+hi Conceal   ctermbg=NONE ctermfg=Blue       guibg=NONE guifg=Blue
+hi Feedback  ctermbg=NONE ctermfg=DarkCyan   guibg=NONE guifg=DarkCyan
+hi GFeedback ctermbg=NONE ctermfg=DarkGreen  guibg=NONE guifg=DarkGreen
+hi WeightB   ctermbg=NONE ctermfg=DarkYellow guibg=NONE guifg=DarkYellow
+
+"-----------------------------------------------
+
+hi def link giftS          Error
+hi def link giftES         Conceal
+hi def link giftEN         Conceal
+hi def link giftFormat     LineNr
+
+hi def link giftH          Error
+hi def link giftEH         Conceal
+
+hi def link giftFB         PreProc
+hi def link giftF          Feedback
+hi def link giftGFB        Title
+hi def link giftGF         GFeedback
+
+hi def link giftTF         Question
+hi def link giftNum1       Question
+hi def link giftNum2       Question
+hi def link giftNum2D      Special
+hi def link giftNum3       Question
+hi def link giftNum3D      Special
+hi def link giftWeightB    WeightB
+hi def link giftWeight     Identifier
+
+hi def link giftWrongNum   Constant
+hi def link giftRightNum   Question
+hi def link giftWrong      Constant
+hi def link giftRight      Question
+hi def link giftMatchB     ModeMsg
+hi def link giftMatch      Constant
+
+hi def link giftAnswer     MoreMsg
+hi def link giftAnswerNum  MoreMsg
+hi def link giftAnswerNumD Identifier
+
+hi def link giftQuestion   Identifier
+
+hi def link giftName       PreProc
+hi def link giftNameD      Directory
+
+hi def link giftCategoryB  LineNr
+hi def link giftCategory   Directory
+
+hi def link giftTodo       Todo
+hi def link giftIdB        LineNr
+hi def link giftId         Title
+hi def link giftTagB       LineNr
+hi def link giftTag        Constant
+hi def link giftComment    Comment
diff -Nru vim-8.2.1913/runtime/syntax/lex.vim vim-8.2.2434/runtime/syntax/lex.vim
--- vim-8.2.1913/runtime/syntax/lex.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/syntax/lex.vim	2021-01-30 22:05:11.000000000 +0000
@@ -122,7 +122,7 @@
  syn region lexPatComment	fold	start="//"	end="$"		skipnl	contained	contains=cTodo	skipwhite	nextgroup=lexPatComment,lexPat,@Spell
  syn region lexPatComment	fold	start="/\*"	end="\*/"	skipnl	contained	contains=cTodo	skipwhite	nextgroup=lexPatComment,lexPat,@Spell
 else
- syn region lexPatTagZoneStart		matchgroup=lexPatTag		start='{'	end='^}'	skipnl	skipwhitecontained	contains=lexPatTag,lexPatTagZone,lexPatComment,lexPat,lexPatSep,lexPatInclude
+ syn region lexPatTagZoneStart		matchgroup=lexPatTag		start='{'	end='^}'	skipnl	skipwhite	contained	contains=lexPatTag,lexPatTagZone,lexPatComment,lexPat,lexPatSep,lexPatInclude
  syn region lexPatComment		start="//"	end="$"		skipnl	contained	contains=cTodo	skipwhite	nextgroup=lexPatComment,lexPat,@Spell
  syn region lexPatComment		start="/\*"	end="\*/"	skipnl	contained	contains=cTodo	skipwhite	nextgroup=lexPatComment,lexPat,@Spell
 endif
diff -Nru vim-8.2.1913/runtime/syntax/ocaml.vim vim-8.2.2434/runtime/syntax/ocaml.vim
--- vim-8.2.1913/runtime/syntax/ocaml.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/syntax/ocaml.vim	2021-01-30 22:05:11.000000000 +0000
@@ -4,7 +4,7 @@
 " Maintainers:  Markus Mottl      <markus.mottl@gmail.com>
 "               Karl-Heinz Sylla  <Karl-Heinz.Sylla@gmd.de>
 "               Issac Trotts      <ijtrotts@ucdavis.edu>
-" URL:          https://github.com/rgrinberg/vim-ocaml
+" URL:          https://github.com/ocaml/vim-ocaml
 " Last Change:
 "               2018 Nov 08 - Improved highlighting of operators (Maëlan)
 "               2018 Apr 22 - Improved support for PPX (Andrey Popp)
@@ -18,14 +18,20 @@
 " can be distinguished from begin/end, which is used for indentation,
 " and folding. (David Baelde)
 
-" quit when a syntax file was already loaded
+" Quit when a syntax file was already loaded
 if exists("b:current_syntax") && b:current_syntax == "ocaml"
   finish
 endif
 
+let s:keepcpo = &cpo
+set cpo&vim
+
 " ' can be used in OCaml identifiers
 setlocal iskeyword+='
 
+" ` is part of the name of polymorphic variants
+setlocal iskeyword+=`
+
 " OCaml is case sensitive.
 syn case match
 
@@ -123,7 +129,7 @@
 syn region   ocamlModSpec matchgroup=ocamlKeyword start="\<module\>" matchgroup=ocamlModule end="\<\u\(\w\|'\)*\>" contained contains=@ocamlAllErrs,ocamlComment skipwhite skipempty nextgroup=ocamlModTRWith,ocamlMPRestr
 
 " "open"
-syn region   ocamlNone matchgroup=ocamlKeyword start="\<open\>" matchgroup=ocamlModule end="\<\u\(\w\|'\)*\( *\. *\u\(\w\|'\)*\)*\>" contains=@ocamlAllErrs,ocamlComment
+syn match   ocamlKeyword "\<open\>" skipwhite skipempty nextgroup=ocamlFullMod
 
 " "include"
 syn match    ocamlKeyword "\<include\>" skipwhite skipempty nextgroup=ocamlModParam,ocamlFullMod
@@ -225,7 +231,18 @@
 syn match    ocamlAngle        "<"
 syn match    ocamlAngle        ">"
 " Custom indexing operators:
-syn match    ocamlIndexingOp   "\.[~?!:|&$%=>@^/*+-][~?!.:|&$%<=>@^*/+-]*\(()\|\[]\|{}\)\(<-\)\?"
+syn region   ocamlIndexing matchgroup=ocamlIndexingOp
+  \ start="\.[~?!:|&$%=>@^/*+-][~?!.:|&$%<=>@^*/+-]*\_s*("
+  \ end=")\(\_s*<-\)\?"
+  \ contains=ALLBUT,@ocamlContained,ocamlParenErr
+syn region   ocamlIndexing matchgroup=ocamlIndexingOp
+  \ start="\.[~?!:|&$%=>@^/*+-][~?!.:|&$%<=>@^*/+-]*\_s*\["
+  \ end="]\(\_s*<-\)\?"
+  \ contains=ALLBUT,@ocamlContained,ocamlBrackErr
+syn region   ocamlIndexing matchgroup=ocamlIndexingOp
+  \ start="\.[~?!:|&$%=>@^/*+-][~?!.:|&$%<=>@^*/+-]*\_s*{"
+  \ end="}\(\_s*<-\)\?"
+  \ contains=ALLBUT,@ocamlContained,ocamlBraceErr
 " Extension operators (has to be declared before regular infix operators):
 syn match    ocamlExtensionOp          "#[#~?!.:|&$%<=>@^*/+-]\+"
 " Infix and prefix operators:
@@ -283,7 +300,6 @@
 syn sync match ocamlSigSync     groupthere ocamlSig     "\<end\>"
 
 " Define the default highlighting.
-" Only when an item doesn't have highlighting yet
 
 hi def link ocamlBraceErr	   Error
 hi def link ocamlBrackErr	   Error
@@ -308,14 +324,17 @@
 hi def link ocamlObject	   Include
 hi def link ocamlModule	   Include
 hi def link ocamlModParam1    Include
+hi def link ocamlGenMod       Include
 hi def link ocamlModType	   Include
 hi def link ocamlMPRestr3	   Include
 hi def link ocamlFullMod	   Include
+hi def link ocamlFuncWith	   Include
+hi def link ocamlModParam     Include
 hi def link ocamlModTypeRestr Include
 hi def link ocamlWith	   Include
 hi def link ocamlMTDef	   Include
-hi def link ocamlSigEncl    ocamlModule
-hi def link ocamlStructEncl ocamlModule
+hi def link ocamlSigEncl	   ocamlModule
+hi def link ocamlStructEncl	   ocamlModule
 
 hi def link ocamlScript	   Include
 
@@ -326,24 +345,25 @@
 hi def link ocamlMPRestr2	   Keyword
 hi def link ocamlKeyword	   Keyword
 hi def link ocamlMethod	   Include
+hi def link ocamlArrow	   Keyword
 hi def link ocamlKeyChar	   Keyword
 hi def link ocamlAnyVar	   Keyword
 hi def link ocamlTopStop	   Keyword
 
-hi def link ocamlRefAssign  ocamlKeyChar
-hi def link ocamlEqual	    ocamlKeyChar
-hi def link ocamlStar	    ocamlInfixOp
-hi def link ocamlAngle	    ocamlInfixOp
-hi def link ocamlCons	    ocamlInfixOp
-
-hi def link ocamlPrefixOp	ocamlOperator
-hi def link ocamlInfixOp	ocamlOperator
-hi def link ocamlExtensionOp	ocamlOperator
-hi def link ocamlIndexingOp	ocamlOperator
+hi def link ocamlRefAssign    ocamlKeyChar
+hi def link ocamlEqual        ocamlKeyChar
+hi def link ocamlStar         ocamlInfixOp
+hi def link ocamlAngle        ocamlInfixOp
+hi def link ocamlCons         ocamlInfixOp
+
+hi def link ocamlPrefixOp       ocamlOperator
+hi def link ocamlInfixOp        ocamlOperator
+hi def link ocamlExtensionOp    ocamlOperator
+hi def link ocamlIndexingOp     ocamlOperator
 
 if exists("ocaml_highlight_operators")
     hi def link ocamlInfixOpKeyword ocamlOperator
-    hi def link ocamlOperator	    Operator
+    hi def link ocamlOperator       Operator
 else
     hi def link ocamlInfixOpKeyword Keyword
 endif
@@ -353,7 +373,7 @@
 hi def link ocamlNumber	   Number
 hi def link ocamlFloat	   Float
 hi def link ocamlString	   String
-hi def link ocamlQuotedStringDelim  Identifier
+hi def link ocamlQuotedStringDelim Identifier
 
 hi def link ocamlLabel	   Identifier
 
@@ -363,8 +383,11 @@
 
 hi def link ocamlEncl	   Keyword
 
-hi def link ocamlPpxEncl    ocamlEncl
+hi def link ocamlPpxEncl       ocamlEncl
 
 let b:current_syntax = "ocaml"
 
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
 " vim: ts=8
diff -Nru vim-8.2.1913/runtime/syntax/opam.vim vim-8.2.2434/runtime/syntax/opam.vim
--- vim-8.2.1913/runtime/syntax/opam.vim	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/runtime/syntax/opam.vim	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,38 @@
+" Vim syntax file
+" Language:    OPAM - OCaml package manager
+" Maintainer:  Markus Mottl        <markus.mottl@gmail.com>
+" URL:         https://github.com/ocaml/vim-ocaml
+" Last Change:
+"              2020 Dec 31 - Added header (Markus Mottl)
+
+if exists("b:current_syntax")
+  finish
+endif
+
+" need %{vars}%
+" env: [[CAML_LD_LIBRARY_PATH = "%{lib}%/stublibs"]]
+syn keyword opamKeyword1 remove depends pin-depends depopts conflicts env packages patches version maintainer tags license homepage authors doc install author available name depexts substs synopsis description
+syn match opamKeyword2 "\v(bug-reports|post-messages|ocaml-version|opam-version|dev-repo|build-test|build-doc|build)"
+
+syn keyword opamTodo FIXME NOTE NOTES TODO XXX contained
+syn match opamComment "#.*$" contains=opamTodo,@Spell
+syn match opamOperator ">\|<\|=\|<=\|>="
+
+syn region opamInterpolate start=/%{/ end=/}%/ contained
+syn region opamString start=/"/ end=/"/ contains=opamInterpolate
+syn region opamSeq start=/\[/ end=/\]/ contains=ALLBUT,opamKeyword1,opamKeyword2
+syn region opamExp start=/{/ end=/}/ contains=ALLBUT,opamKeyword1,opamKeyword2
+
+hi link opamKeyword1 Keyword
+hi link opamKeyword2 Keyword
+
+hi link opamString String
+hi link opamExp Function
+hi link opamSeq Statement
+hi link opamOperator Operator
+hi link opamComment Comment
+hi link opamInterpolate Identifier
+
+let b:current_syntax = "opam"
+
+" vim: ts=2 sw=2
diff -Nru vim-8.2.1913/runtime/syntax/pbtxt.vim vim-8.2.2434/runtime/syntax/pbtxt.vim
--- vim-8.2.1913/runtime/syntax/pbtxt.vim	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/runtime/syntax/pbtxt.vim	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,44 @@
+" Vim syntax file
+" Language:             Protobuf Text Format
+" Maintainer:           Lakshay Garg <lakshayg@outlook.in>
+" Last Change:          2020 Nov 17
+" Homepage:             https://github.com/lakshayg/vim-pbtxt
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn case ignore
+
+syn keyword pbtxtTodo     TODO FIXME contained
+syn keyword pbtxtBool     true false contained
+
+syn match   pbtxtInt      display   "\<\(0\|[1-9]\d*\)\>"
+syn match   pbtxtHex      display   "\<0[xX]\x\+\>"
+syn match   pbtxtFloat    display   "\(0\|[1-9]\d*\)\=\.\d*"
+syn match   pbtxtMessage  display   "^\s*\w\+\s*{"me=e-1
+syn match   pbtxtField    display   "^\s*\w\+:"me=e-1
+syn match   pbtxtEnum     display   ":\s*\a\w\+"ms=s+1   contains=pbtxtBool
+syn region  pbtxtString   start=+"+ skip=+\\"+ end=+"+   contains=@Spell
+syn region  pbtxtComment  start="#" end="$"      keepend contains=pbtxtTodo,@Spell
+
+hi def link pbtxtTodo     Todo
+hi def link pbtxtBool     Boolean
+hi def link pbtxtInt      Number
+hi def link pbtxtHex      Number
+hi def link pbtxtFloat    Float
+hi def link pbtxtMessage  Structure
+hi def link pbtxtField    Identifier
+hi def link pbtxtEnum     Define
+hi def link pbtxtString   String
+hi def link pbtxtComment  Comment
+
+let b:current_syntax = "pbtxt"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: nowrap sw=2 sts=2 ts=8 noet
diff -Nru vim-8.2.1913/runtime/syntax/php.vim vim-8.2.2434/runtime/syntax/php.vim
--- vim-8.2.1913/runtime/syntax/php.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/syntax/php.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language: php PHP 3/4/5/7/8
 " Maintainer: Tyson Andre <tysonandre775@hotmail.com>
-" Last Change: Sep 07, 2020
-" URL: https://github.com/TysonAndre/vim-syntax
+" Last Change: Dec 22, 2020
+" URL: https://github.com/TysonAndre/php-vim-syntax
 " Former Maintainers: 
 "         Jason Woofenden <jason@jasonwoof.com>
 "         Peter Hodge <toomuchphp-vim@yahoo.com>
@@ -149,7 +149,7 @@
 syn keyword phpMethods name specified value create_attribute create_cdata_section create_comment create_element_ns create_element create_entity_reference create_processing_instruction create_text_node doctype document_element dump_file dump_mem get_element_by_id get_elements_by_tagname html_dump_mem xinclude entities internal_subset name notations public_id system_id get_attribute_node get_attribute get_elements_by_tagname has_attribute remove_attribute set_attribute tagname add_namespace append_child append_sibling attributes child_nodes clone_node dump_node first_child get_content has_attributes has_child_nodes insert_before is_blank_node last_child next_sibling node_name node_type node_value owner_document parent_node prefix previous_sibling remove_child replace_child replace_node set_content set_name set_namespace unlink_node data target process result_dump_file result_dump_mem contained
 syn keyword phpFunctions dotnet_load contained
 syn keyword phpFunctions debug_backtrace debug_print_backtrace error_log error_reporting restore_error_handler set_error_handler trigger_error user_error contained
-syn keyword phpFunctions enchant_broker_describe enchant_broker_dict_exists enchant_broker_free enchant_broker_free_dict enchant_broker_get_dict_path enchant_broker_get_error enchant_broker_init enchant_broker_list_dicts enchant_broker_request_dict enchant_broker_request_pwl_dict enchant_broker_set_dict_path enchant_broker_set_ordering enchant_dict_add_to_personal enchant_dict_add_to_session enchant_dict_check enchant_dict_describe enchant_dict_get_error enchant_dict_is_in_session enchant_dict_quick_check enchant_dict_store_replacement enchant_dict_suggest contained
+syn keyword phpFunctions enchant_broker_describe enchant_broker_dict_exists enchant_broker_free enchant_broker_free_dict enchant_broker_get_dict_path enchant_broker_get_error enchant_broker_init enchant_broker_list_dicts enchant_broker_request_dict enchant_broker_request_pwl_dict enchant_broker_set_dict_path enchant_broker_set_ordering enchant_dict_add enchant_dict_add_to_personal enchant_dict_add_to_session enchant_dict_check enchant_dict_describe enchant_dict_get_error enchant_dict_is_added enchant_dict_is_in_session enchant_dict_quick_check enchant_dict_store_replacement enchant_dict_suggest contained
 syn keyword phpFunctions escapeshellarg escapeshellcmd exec passthru proc_close proc_get_status proc_nice proc_open proc_terminate shell_exec system contained
 syn keyword phpFunctions fam_cancel_monitor fam_close fam_monitor_collection fam_monitor_directory fam_monitor_file fam_next_event fam_open fam_pending fam_resume_monitor fam_suspend_monitor contained
 syn keyword phpFunctions fbsql_affected_rows fbsql_autocommit fbsql_change_user fbsql_close fbsql_commit fbsql_connect fbsql_create_blob fbsql_create_clob fbsql_create_db fbsql_data_seek fbsql_database_password fbsql_database fbsql_db_query fbsql_db_status fbsql_drop_db fbsql_errno fbsql_error fbsql_fetch_array fbsql_fetch_assoc fbsql_fetch_field fbsql_fetch_lengths fbsql_fetch_object fbsql_fetch_row fbsql_field_flags fbsql_field_len fbsql_field_name fbsql_field_seek fbsql_field_table fbsql_field_type fbsql_free_result fbsql_get_autostart_info fbsql_hostname fbsql_insert_id fbsql_list_dbs fbsql_list_fields fbsql_list_tables fbsql_next_result fbsql_num_fields fbsql_num_rows fbsql_password fbsql_pconnect fbsql_query fbsql_read_blob fbsql_read_clob fbsql_result fbsql_rollback fbsql_select_db fbsql_set_lob_mode fbsql_set_transaction fbsql_start_db fbsql_stop_db fbsql_tablename fbsql_username fbsql_warnings contained
@@ -171,11 +171,11 @@
 syn keyword phpFunctions iconv_get_encoding iconv_mime_decode_headers iconv_mime_decode iconv_mime_encode iconv_set_encoding iconv_strlen iconv_strpos iconv_strrpos iconv_substr iconv ob_iconv_handler contained
 syn keyword phpFunctions ifx_affected_rows ifx_blobinfile_mode ifx_byteasvarchar ifx_close ifx_connect ifx_copy_blob ifx_create_blob ifx_create_char ifx_do ifx_error ifx_errormsg ifx_fetch_row ifx_fieldproperties ifx_fieldtypes ifx_free_blob ifx_free_char ifx_free_result ifx_get_blob ifx_get_char ifx_getsqlca ifx_htmltbl_result ifx_nullformat ifx_num_fields ifx_num_rows ifx_pconnect ifx_prepare ifx_query ifx_textasvarchar ifx_update_blob ifx_update_char ifxus_close_slob ifxus_create_slob ifxus_free_slob ifxus_open_slob ifxus_read_slob ifxus_seek_slob ifxus_tell_slob ifxus_write_slob contained
 syn keyword phpFunctions igbinary_serialize igbinary_unserialize contained
-syn keyword phpFunctions exif_imagetype exif_read_data exif_thumbnail gd_info getimagesize image_type_to_mime_type image2wbmp imagealphablending imageantialias imagearc imagechar imagecharup imagecolorallocate imagecolorallocatealpha imagecolorat imagecolorclosest imagecolorclosestalpha imagecolorclosesthwb imagecolordeallocate imagecolorexact imagecolorexactalpha imagecolormatch imagecolorresolve imagecolorresolvealpha imagecolorset imagecolorsforindex imagecolorstotal imagecolortransparent imagecopy imagecopymerge imagecopymergegray imagecopyresampled imagecopyresized imagecreate imagecreatefromgd2 imagecreatefromgd2part imagecreatefromgd imagecreatefromgif imagecreatefromjpeg imagecreatefrompng imagecreatefromstring imagecreatefromwbmp imagecreatefromxbm imagecreatefromxpm imagecreatetruecolor imagedashedline imagedestroy imageellipse imagefill imagefilledarc imagefilledellipse imagefilledpolygon imagefilledrectangle imagefilltoborder imagefontheight imagefontwidth imageftbbox imagefttext imagegammacorrect imagegd2 imagegd imagegif imageinterlace imageistruecolor imagejpeg imageline imageloadfont imagepalettecopy imagepng imagepolygon imagepsbbox imagepscopyfont imagepsencodefont imagepsextendfont imagepsfreefont imagepsloadfont imagepsslantfont imagepstext imagerectangle imagerotate imagesavealpha imagesetbrush imagesetpixel imagesetstyle imagesetthickness imagesettile imagestring imagestringup imagesx imagesy imagetruecolortopalette imagettfbbox imagettftext imagetypes imagewbmp iptcembed iptcparse jpeg2wbmp png2wbmp read_exif_data exif_tagname imageaffine imageaffinematrixconcat imageaffinematrixget imagebmp imageconvolution imagecreatefrombmp imagecreatefromtga imagecrop imagecropauto imagefilter imageflip imagegetclip imagelayereffect imageopenpolygon imagepalettetotruecolor imageresolution imagescale imagesetclip imagesetinterpolation imagexbm contained
+syn keyword phpFunctions exif_imagetype exif_read_data exif_thumbnail gd_info getimagesize image_type_to_mime_type image2wbmp imagealphablending imageantialias imagearc imagechar imagecharup imagecolorallocate imagecolorallocatealpha imagecolorat imagecolorclosest imagecolorclosestalpha imagecolorclosesthwb imagecolordeallocate imagecolorexact imagecolorexactalpha imagecolormatch imagecolorresolve imagecolorresolvealpha imagecolorset imagecolorsforindex imagecolorstotal imagecolortransparent imagecopy imagecopymerge imagecopymergegray imagecopyresampled imagecopyresized imagecreate imagecreatefromgd2 imagecreatefromgd2part imagecreatefromgd imagecreatefromgif imagecreatefromjpeg imagecreatefrompng imagecreatefromstring imagecreatefromwbmp imagecreatefromxbm imagecreatefromxpm imagecreatetruecolor imagedashedline imagedestroy imageellipse imagefill imagefilledarc imagefilledellipse imagefilledpolygon imagefilledrectangle imagefilltoborder imagefontheight imagefontwidth imageftbbox imagefttext imagegammacorrect imagegd2 imagegd imagegif imageinterlace imageistruecolor imagejpeg imageline imageloadfont imagepalettecopy imagepng imagepolygon imagepsbbox imagepscopyfont imagepsencodefont imagepsextendfont imagepsfreefont imagepsloadfont imagepsslantfont imagepstext imagerectangle imagerotate imagesavealpha imagesetbrush imagesetpixel imagesetstyle imagesetthickness imagesettile imagestring imagestringup imagesx imagesy imagetruecolortopalette imagettfbbox imagettftext imagetypes imagewbmp iptcembed iptcparse jpeg2wbmp png2wbmp read_exif_data exif_tagname imageaffine imageaffinematrixconcat imageaffinematrixget imagebmp imageconvolution imagecreatefrombmp imagecreatefromtga imagecrop imagecropauto imagefilter imageflip imagegetclip imagegetinterpolation imagelayereffect imageopenpolygon imagepalettetotruecolor imageresolution imagescale imagesetclip imagesetinterpolation imagexbm contained
 syn keyword phpFunctions imap_8bit imap_alerts imap_append imap_base64 imap_binary imap_body imap_bodystruct imap_check imap_clearflag_full imap_close imap_createmailbox imap_delete imap_deletemailbox imap_errors imap_expunge imap_fetch_overview imap_fetchbody imap_fetchheader imap_fetchstructure imap_get_quota imap_get_quotaroot imap_getacl imap_getmailboxes imap_getsubscribed imap_header imap_headerinfo imap_headers imap_last_error imap_list imap_listmailbox imap_listscan imap_listsubscribed imap_lsub imap_mail_compose imap_mail_copy imap_mail_move imap_mail imap_mailboxmsginfo imap_mime_header_decode imap_msgno imap_num_msg imap_num_recent imap_open imap_ping imap_qprint imap_renamemailbox imap_reopen imap_rfc822_parse_adrlist imap_rfc822_parse_headers imap_rfc822_write_address imap_scanmailbox imap_search imap_set_quota imap_setacl imap_setflag_full imap_sort imap_status imap_subscribe imap_thread imap_timeout imap_uid imap_undelete imap_unsubscribe imap_utf7_decode imap_utf7_encode imap_utf8 contained
 syn keyword phpFunctions assert_options assert dl extension_loaded get_cfg_var get_current_user get_defined_constants get_extension_funcs get_include_path get_included_files get_loaded_extensions get_magic_quotes_gpc get_magic_quotes_runtime get_required_files getenv getlastmod getmygid getmyinode getmypid getmyuid getopt getrusage ini_alter ini_get_all ini_get ini_restore ini_set main memory_get_usage php_ini_scanned_files php_logo_guid php_sapi_name php_uname phpcredits phpinfo phpversion putenv restore_include_path set_include_path set_magic_quotes_runtime set_time_limit version_compare zend_logo_guid zend_version contained
 syn keyword phpFunctions ingres_autocommit ingres_close ingres_commit ingres_connect ingres_fetch_array ingres_fetch_object ingres_fetch_row ingres_field_length ingres_field_name ingres_field_nullable ingres_field_precision ingres_field_scale ingres_field_type ingres_num_fields ingres_num_rows ingres_pconnect ingres_query ingres_rollback contained
-syn keyword phpFunctions collator_asort collator_compare collator_create collator_get_attribute collator_get_error_code collator_get_error_message collator_get_locale collator_get_sort_key collator_get_strength collator_set_attribute collator_set_strength collator_sort collator_sort_with_sort_keys datefmt_create datefmt_format datefmt_format_object datefmt_get_calendar datefmt_get_calendar_object datefmt_get_datetype datefmt_get_error_code datefmt_get_error_message datefmt_get_locale datefmt_get_pattern datefmt_get_timetype datefmt_get_timezone datefmt_get_timezone_id datefmt_is_lenient datefmt_localtime datefmt_parse datefmt_set_calendar datefmt_set_lenient datefmt_set_pattern datefmt_set_timezone grapheme_extract grapheme_stripos grapheme_stristr grapheme_strlen grapheme_strpos grapheme_strripos grapheme_strrpos grapheme_strstr grapheme_substr idn_to_ascii idn_to_utf8 intl_error_name intl_get_error_code intl_get_error_message intl_is_failure intlcal_add intlcal_after intlcal_before intlcal_clear intlcal_create_instance intlcal_equals intlcal_field_difference intlcal_from_date_time intlcal_get intlcal_get_actual_maximum intlcal_get_actual_minimum intlcal_get_available_locales intlcal_get_day_of_week_type intlcal_get_error_code intlcal_get_error_message intlcal_get_first_day_of_week intlcal_get_greatest_minimum intlcal_get_keyword_values_for_locale intlcal_get_least_maximum intlcal_get_locale intlcal_get_maximum intlcal_get_minimal_days_in_first_week intlcal_get_minimum intlcal_get_now intlcal_get_repeated_wall_time_option intlcal_get_skipped_wall_time_option intlcal_get_time intlcal_get_time_zone intlcal_get_type intlcal_get_weekend_transition intlcal_in_daylight_time intlcal_is_equivalent_to intlcal_is_lenient intlcal_is_set intlcal_is_weekend intlcal_roll intlcal_set intlcal_set_first_day_of_week intlcal_set_lenient intlcal_set_minimal_days_in_first_week intlcal_set_repeated_wall_time_option intlcal_set_skipped_wall_time_option intlcal_set_time intlcal_set_time_zone intlcal_to_date_time intlgregcal_create_instance intlgregcal_get_gregorian_change intlgregcal_is_leap_year intlgregcal_set_gregorian_change intltz_count_equivalent_ids intltz_create_default intltz_create_enumeration intltz_create_time_zone intltz_create_time_zone_id_enumeration intltz_from_date_time_zone intltz_get_canonical_id intltz_get_display_name intltz_get_dst_savings intltz_get_equivalent_id intltz_get_error_code intltz_get_error_message intltz_get_gmt intltz_get_id intltz_get_offset intltz_get_raw_offset intltz_get_region intltz_get_tz_data_version intltz_get_unknown intltz_has_same_rules intltz_to_date_time_zone intltz_use_daylight_time locale_accept_from_http locale_canonicalize locale_compose locale_filter_matches locale_get_all_variants locale_get_default locale_get_display_language locale_get_display_name locale_get_display_region locale_get_display_script locale_get_display_variant locale_get_keywords locale_get_primary_language locale_get_region locale_get_script locale_lookup locale_parse locale_set_default msgfmt_create msgfmt_format msgfmt_format_message msgfmt_get_error_code msgfmt_get_error_message msgfmt_get_locale msgfmt_get_pattern msgfmt_parse msgfmt_parse_message msgfmt_set_pattern normalizer_is_normalized normalizer_normalize numfmt_create numfmt_format numfmt_format_currency numfmt_get_attribute numfmt_get_error_code numfmt_get_error_message numfmt_get_locale numfmt_get_pattern numfmt_get_symbol numfmt_get_text_attribute numfmt_parse numfmt_parse_currency numfmt_set_attribute numfmt_set_pattern numfmt_set_symbol numfmt_set_text_attribute resourcebundle_count resourcebundle_create resourcebundle_get resourcebundle_get_error_code resourcebundle_get_error_message resourcebundle_locales transliterator_create transliterator_create_from_rules transliterator_create_inverse transliterator_get_error_code transliterator_get_error_message transliterator_list_ids transliterator_transliterate contained
+syn keyword phpFunctions collator_asort collator_compare collator_create collator_get_attribute collator_get_error_code collator_get_error_message collator_get_locale collator_get_sort_key collator_get_strength collator_set_attribute collator_set_strength collator_sort collator_sort_with_sort_keys datefmt_create datefmt_format datefmt_format_object datefmt_get_calendar datefmt_get_calendar_object datefmt_get_datetype datefmt_get_error_code datefmt_get_error_message datefmt_get_locale datefmt_get_pattern datefmt_get_timetype datefmt_get_timezone datefmt_get_timezone_id datefmt_is_lenient datefmt_localtime datefmt_parse datefmt_set_calendar datefmt_set_lenient datefmt_set_pattern datefmt_set_timezone grapheme_extract grapheme_stripos grapheme_stristr grapheme_strlen grapheme_strpos grapheme_strripos grapheme_strrpos grapheme_strstr grapheme_substr idn_to_ascii idn_to_utf8 intl_error_name intl_get_error_code intl_get_error_message intl_is_failure intlcal_add intlcal_after intlcal_before intlcal_clear intlcal_create_instance intlcal_equals intlcal_field_difference intlcal_from_date_time intlcal_get intlcal_get_actual_maximum intlcal_get_actual_minimum intlcal_get_available_locales intlcal_get_day_of_week_type intlcal_get_error_code intlcal_get_error_message intlcal_get_first_day_of_week intlcal_get_greatest_minimum intlcal_get_keyword_values_for_locale intlcal_get_least_maximum intlcal_get_locale intlcal_get_maximum intlcal_get_minimal_days_in_first_week intlcal_get_minimum intlcal_get_now intlcal_get_repeated_wall_time_option intlcal_get_skipped_wall_time_option intlcal_get_time intlcal_get_time_zone intlcal_get_type intlcal_get_weekend_transition intlcal_in_daylight_time intlcal_is_equivalent_to intlcal_is_lenient intlcal_is_set intlcal_is_weekend intlcal_roll intlcal_set intlcal_set_first_day_of_week intlcal_set_lenient intlcal_set_minimal_days_in_first_week intlcal_set_repeated_wall_time_option intlcal_set_skipped_wall_time_option intlcal_set_time intlcal_set_time_zone intlcal_to_date_time intlgregcal_create_instance intlgregcal_get_gregorian_change intlgregcal_is_leap_year intlgregcal_set_gregorian_change intltz_count_equivalent_ids intltz_create_default intltz_create_enumeration intltz_create_time_zone intltz_create_time_zone_id_enumeration intltz_from_date_time_zone intltz_get_canonical_id intltz_get_display_name intltz_get_dst_savings intltz_get_equivalent_id intltz_get_error_code intltz_get_error_message intltz_get_id_for_windows_id intltz_get_windows_id intltz_get_gmt intltz_get_id intltz_get_offset intltz_get_raw_offset intltz_get_region intltz_get_tz_data_version intltz_get_unknown intltz_has_same_rules intltz_to_date_time_zone intltz_use_daylight_time locale_accept_from_http locale_canonicalize locale_compose locale_filter_matches locale_get_all_variants locale_get_default locale_get_display_language locale_get_display_name locale_get_display_region locale_get_display_script locale_get_display_variant locale_get_keywords locale_get_primary_language locale_get_region locale_get_script locale_lookup locale_parse locale_set_default msgfmt_create msgfmt_format msgfmt_format_message msgfmt_get_error_code msgfmt_get_error_message msgfmt_get_locale msgfmt_get_pattern msgfmt_parse msgfmt_parse_message msgfmt_set_pattern normalizer_get_raw_decomposition normalizer_is_normalized normalizer_normalize numfmt_create numfmt_format numfmt_format_currency numfmt_get_attribute numfmt_get_error_code numfmt_get_error_message numfmt_get_locale numfmt_get_pattern numfmt_get_symbol numfmt_get_text_attribute numfmt_parse numfmt_parse_currency numfmt_set_attribute numfmt_set_pattern numfmt_set_symbol numfmt_set_text_attribute resourcebundle_count resourcebundle_create resourcebundle_get resourcebundle_get_error_code resourcebundle_get_error_message resourcebundle_locales transliterator_create transliterator_create_from_rules transliterator_create_inverse transliterator_get_error_code transliterator_get_error_message transliterator_list_ids transliterator_transliterate contained
 syn keyword phpFunctions ircg_channel_mode ircg_disconnect ircg_fetch_error_msg ircg_get_username ircg_html_encode ircg_ignore_add ircg_ignore_del ircg_is_conn_alive ircg_join ircg_kick ircg_lookup_format_messages ircg_msg ircg_nick ircg_nickname_escape ircg_nickname_unescape ircg_notice ircg_part ircg_pconnect ircg_register_format_messages ircg_set_current ircg_set_file ircg_set_on_die ircg_topic ircg_whois contained
 syn keyword phpFunctions java_last_exception_clear java_last_exception_get contained
 syn keyword phpFunctions json_decode json_encode json_last_error json_last_error_msg contained
@@ -212,13 +212,13 @@
 syn keyword phpFunctions ocibindbyname ocicancel ocicloselob ocicollappend ocicollassign ocicollassignelem ocicollgetelem ocicollmax ocicollsize ocicolltrim ocicolumnisnull ocicolumnname ocicolumnprecision ocicolumnscale ocicolumnsize ocicolumntype ocicolumntyperaw ocicommit ocidefinebyname ocierror ociexecute ocifetch ocifetchinto ocifetchstatement ocifreecollection ocifreecursor ocifreedesc ocifreestatement ociinternaldebug ociloadlob ocilogoff ocilogon ocinewcollection ocinewcursor ocinewdescriptor ocinlogon ocinumcols ociparse ociplogon ociresult ocirollback ocirowcount ocisavelob ocisavelobfile ociserverversion ocisetprefetch ocistatementtype ociwritelobtofile ociwritetemporarylob contained
 syn keyword phpFunctions odbc_autocommit odbc_binmode odbc_close_all odbc_close odbc_columnprivileges odbc_columns odbc_commit odbc_connect odbc_cursor odbc_data_source odbc_do odbc_error odbc_errormsg odbc_exec odbc_execute odbc_fetch_array odbc_fetch_into odbc_fetch_object odbc_fetch_row odbc_field_len odbc_field_name odbc_field_num odbc_field_precision odbc_field_scale odbc_field_type odbc_foreignkeys odbc_free_result odbc_gettypeinfo odbc_longreadlen odbc_next_result odbc_num_fields odbc_num_rows odbc_pconnect odbc_prepare odbc_primarykeys odbc_procedurecolumns odbc_procedures odbc_result_all odbc_result odbc_rollback odbc_setoption odbc_specialcolumns odbc_statistics odbc_tableprivileges odbc_tables contained
 syn keyword phpFunctions opcache_reset opcache_invalidate opcache_compile_file opcache_is_script_cached opcache_get_configuration opcache_get_status contained
-syn keyword phpFunctions openssl_cipher_iv_length openssl_csr_export_to_file openssl_csr_export openssl_csr_get_public_key openssl_csr_get_subject openssl_csr_new openssl_csr_sign openssl_decrypt openssl_dh_compute_key openssl_digest openssl_encrypt openssl_error_string openssl_free_key openssl_get_cert_locations openssl_get_cipher_methods openssl_get_md_methods openssl_get_privatekey openssl_get_publickey openssl_open openssl_pbkdf2 openssl_pkcs12_export_to_file openssl_pkcs12_export openssl_pkcs12_read openssl_pkcs7_decrypt openssl_pkcs7_encrypt openssl_pkcs7_sign openssl_pkcs7_verify openssl_pkey_export_to_file openssl_pkey_export openssl_pkey_free openssl_pkey_get_details openssl_pkey_get_private openssl_pkey_get_public openssl_pkey_new openssl_private_decrypt openssl_private_encrypt openssl_public_decrypt openssl_public_encrypt openssl_random_pseudo_bytes openssl_seal openssl_sign openssl_spki_export_challenge openssl_spki_export openssl_spki_new openssl_spki_verify openssl_verify openssl_x509_check_private_key openssl_x509_checkpurpose openssl_x509_export_to_file openssl_x509_export openssl_x509_fingerprint openssl_x509_free openssl_x509_parse openssl_x509_read openssl_get_curve_names openssl_pkcs7_read openssl_pkey_derive openssl_x509_verify contained
+syn keyword phpFunctions openssl_cipher_iv_length openssl_cms_decrypt openssl_cms_encrypt openssl_cms_read openssl_cms_sign openssl_cms_verify openssl_csr_export_to_file openssl_csr_export openssl_csr_get_public_key openssl_csr_get_subject openssl_csr_new openssl_csr_sign openssl_decrypt openssl_dh_compute_key openssl_digest openssl_encrypt openssl_error_string openssl_free_key openssl_get_cert_locations openssl_get_cipher_methods openssl_get_md_methods openssl_get_privatekey openssl_get_publickey openssl_open openssl_pbkdf2 openssl_pkcs12_export_to_file openssl_pkcs12_export openssl_pkcs12_read openssl_pkcs7_decrypt openssl_pkcs7_encrypt openssl_pkcs7_sign openssl_pkcs7_verify openssl_pkey_export_to_file openssl_pkey_export openssl_pkey_free openssl_pkey_get_details openssl_pkey_get_private openssl_pkey_get_public openssl_pkey_new openssl_private_decrypt openssl_private_encrypt openssl_public_decrypt openssl_public_encrypt openssl_random_pseudo_bytes openssl_seal openssl_sign openssl_spki_export_challenge openssl_spki_export openssl_spki_new openssl_spki_verify openssl_verify openssl_x509_check_private_key openssl_x509_checkpurpose openssl_x509_export_to_file openssl_x509_export openssl_x509_fingerprint openssl_x509_free openssl_x509_parse openssl_x509_read openssl_get_curve_names openssl_pkcs7_read openssl_pkey_derive openssl_x509_verify contained
 syn keyword phpFunctions ora_bind ora_close ora_columnname ora_columnsize ora_columntype ora_commit ora_commitoff ora_commiton ora_do ora_error ora_errorcode ora_exec ora_fetch_into ora_fetch ora_getcolumn ora_logoff ora_logon ora_numcols ora_numrows ora_open ora_parse ora_plogon ora_rollback contained
 syn keyword phpFunctions flush ob_clean ob_end_clean ob_end_flush ob_flush ob_get_clean ob_get_contents ob_get_flush ob_get_length ob_get_level ob_get_status ob_gzhandler ob_implicit_flush ob_list_handlers ob_start output_add_rewrite_var output_reset_rewrite_vars contained
 syn keyword phpFunctions overload contained
 syn keyword phpFunctions ovrimos_close ovrimos_commit ovrimos_connect ovrimos_cursor ovrimos_exec ovrimos_execute ovrimos_fetch_into ovrimos_fetch_row ovrimos_field_len ovrimos_field_name ovrimos_field_num ovrimos_field_type ovrimos_free_result ovrimos_longreadlen ovrimos_num_fields ovrimos_num_rows ovrimos_prepare ovrimos_result_all ovrimos_result ovrimos_rollback contained
 syn keyword phpFunctions pcntl_exec pcntl_fork pcntl_signal pcntl_waitpid pcntl_wexitstatus pcntl_wifexited pcntl_wifsignaled pcntl_wifstopped pcntl_wstopsig pcntl_wtermsig pcntl_alarm pcntl_async_signals pcntl_errno pcntl_get_last_error pcntl_getpriority pcntl_setpriority pcntl_signal_dispatch pcntl_signal_get_handler pcntl_sigprocmask pcntl_sigtimedwait pcntl_sigwaitinfo pcntl_strerror pcntl_unshare pcntl_wait pcntl_wifcontinued contained
-syn keyword phpFunctions preg_filter preg_grep preg_last_error preg_match_all preg_match preg_quote preg_replace_callback preg_replace_callback_array preg_replace preg_split contained
+syn keyword phpFunctions preg_filter preg_grep preg_last_error preg_last_error_msg preg_match_all preg_match preg_quote preg_replace_callback preg_replace_callback_array preg_replace preg_split contained
 syn keyword phpFunctions pdo_drivers contained
 syn keyword phpFunctions pdf_add_annotation pdf_add_bookmark pdf_add_launchlink pdf_add_locallink pdf_add_note pdf_add_outline pdf_add_pdflink pdf_add_thumbnail pdf_add_weblink pdf_arc pdf_arcn pdf_attach_file pdf_begin_page pdf_begin_pattern pdf_begin_template pdf_circle pdf_clip pdf_close_image pdf_close_pdi_page pdf_close_pdi pdf_close pdf_closepath_fill_stroke pdf_closepath_stroke pdf_closepath pdf_concat pdf_continue_text pdf_curveto pdf_delete pdf_end_page pdf_end_pattern pdf_end_template pdf_endpath pdf_fill_stroke pdf_fill pdf_findfont pdf_get_buffer pdf_get_font pdf_get_fontname pdf_get_fontsize pdf_get_image_height pdf_get_image_width pdf_get_majorversion pdf_get_minorversion pdf_get_parameter pdf_get_pdi_parameter pdf_get_pdi_value pdf_get_value pdf_initgraphics pdf_lineto pdf_makespotcolor pdf_moveto pdf_new pdf_open_CCITT pdf_open_file pdf_open_gif pdf_open_image_file pdf_open_image pdf_open_jpeg pdf_open_memory_image pdf_open_pdi_page pdf_open_pdi pdf_open_png pdf_open_tiff pdf_open pdf_place_image pdf_place_pdi_page pdf_rect pdf_restore pdf_rotate pdf_save pdf_scale pdf_set_border_color pdf_set_border_dash pdf_set_border_style pdf_set_char_spacing pdf_set_duration pdf_set_font pdf_set_horiz_scaling pdf_set_info_author pdf_set_info_creator pdf_set_info_keywords pdf_set_info_subject pdf_set_info_title pdf_set_info pdf_set_leading pdf_set_parameter pdf_set_text_matrix pdf_set_text_pos pdf_set_text_rendering pdf_set_text_rise pdf_set_value pdf_set_word_spacing pdf_setcolor pdf_setdash pdf_setflat pdf_setfont pdf_setgray_fill pdf_setgray_stroke pdf_setgray pdf_setlinecap pdf_setlinejoin pdf_setlinewidth pdf_setmatrix pdf_setmiterlimit pdf_setpolydash pdf_setrgbcolor_fill pdf_setrgbcolor_stroke pdf_setrgbcolor pdf_show_boxed pdf_show_xy pdf_show pdf_skew pdf_stringwidth pdf_stroke pdf_translate contained
 syn keyword phpFunctions pfpro_cleanup pfpro_init pfpro_process_raw pfpro_process pfpro_version contained
@@ -242,13 +242,14 @@
 syn keyword phpFunctions sqlite_array_query sqlite_busy_timeout sqlite_changes sqlite_close sqlite_column sqlite_create_aggregate sqlite_create_function sqlite_current sqlite_error_string sqlite_escape_string sqlite_fetch_array sqlite_fetch_single sqlite_fetch_string sqlite_field_name sqlite_has_more sqlite_last_error sqlite_last_insert_rowid sqlite_libencoding sqlite_libversion sqlite_next sqlite_num_fields sqlite_num_rows sqlite_open sqlite_popen sqlite_query sqlite_rewind sqlite_seek sqlite_udf_decode_binary sqlite_udf_encode_binary sqlite_unbuffered_query contained
 syn keyword phpFunctions stream_context_create stream_context_get_options stream_context_set_option stream_context_set_params stream_copy_to_stream stream_filter_append stream_filter_prepend stream_filter_register stream_get_contents stream_get_filters stream_get_line stream_get_meta_data stream_get_transports stream_get_wrappers stream_register_wrapper stream_select stream_set_blocking stream_set_timeout stream_set_write_buffer stream_socket_accept stream_socket_client stream_socket_get_name stream_socket_recvfrom stream_socket_sendto stream_socket_server stream_wrapper_register contained
 syn keyword phpFunctions addcslashes addslashes bin2hex chop chr chunk_split convert_cyr_string count_chars crc32 crypt explode fprintf get_html_translation_table hebrev hebrevc html_entity_decode htmlentities htmlspecialchars implode join levenshtein localeconv ltrim md5_file md5 metaphone money_format nl_langinfo nl2br number_format ord parse_str print printf quoted_printable_decode quotemeta rtrim setlocale sha1_file sha1 similar_text soundex sprintf sscanf str_ireplace str_pad str_repeat str_replace str_rot13 str_shuffle str_split str_word_count strcasecmp strchr strcmp strcoll strcspn strip_tags stripcslashes stripos stripslashes stristr strlen strnatcasecmp strnatcmp strncasecmp strncmp strpos strrchr strrev strripos strrpos strspn strstr strtok strtolower strtoupper strtr substr_compare substr_count substr_replace substr trim ucfirst ucwords vprintf vsprintf wordwrap contained
+syn keyword phpFunctions fdiv get_debug_type getdir str_contains str_ends_with str_starts_with
 syn keyword phpFunctions swf_actiongeturl swf_actiongotoframe swf_actiongotolabel swf_actionnextframe swf_actionplay swf_actionprevframe swf_actionsettarget swf_actionstop swf_actiontogglequality swf_actionwaitforframe swf_addbuttonrecord swf_addcolor swf_closefile swf_definebitmap swf_definefont swf_defineline swf_definepoly swf_definerect swf_definetext swf_endbutton swf_enddoaction swf_endshape swf_endsymbol swf_fontsize swf_fontslant swf_fonttracking swf_getbitmapinfo swf_getfontinfo swf_getframe swf_labelframe swf_lookat swf_modifyobject swf_mulcolor swf_nextid swf_oncondition swf_openfile swf_ortho2 swf_ortho swf_perspective swf_placeobject swf_polarview swf_popmatrix swf_posround swf_pushmatrix swf_removeobject swf_rotate swf_scale swf_setfont swf_setframe swf_shapearc swf_shapecurveto3 swf_shapecurveto swf_shapefillbitmapclip swf_shapefillbitmaptile swf_shapefilloff swf_shapefillsolid swf_shapelinesolid swf_shapelineto swf_shapemoveto swf_showframe swf_startbutton swf_startdoaction swf_startshape swf_startsymbol swf_textwidth swf_translate swf_viewport contained
 syn keyword phpFunctions sybase_affected_rows sybase_close sybase_connect sybase_data_seek sybase_deadlock_retry_count sybase_fetch_array sybase_fetch_assoc sybase_fetch_field sybase_fetch_object sybase_fetch_row sybase_field_seek sybase_free_result sybase_get_last_message sybase_min_client_severity sybase_min_error_severity sybase_min_message_severity sybase_min_server_severity sybase_num_fields sybase_num_rows sybase_pconnect sybase_query sybase_result sybase_select_db sybase_set_message_handler sybase_unbuffered_query contained
 syn keyword phpFunctions tidy_access_count tidy_clean_repair tidy_config_count tidy_diagnose tidy_error_count tidy_get_body tidy_get_config tidy_get_error_buffer tidy_get_head tidy_get_html_ver tidy_get_html tidy_get_output tidy_get_release tidy_get_root tidy_get_status tidy_getopt tidy_is_xhtml tidy_load_config tidy_parse_file tidy_parse_string tidy_repair_file tidy_repair_string tidy_reset_config tidy_save_config tidy_set_encoding tidy_setopt tidy_warning_count tidy_is_xml tidy_get_opt_doc contained
 syn keyword phpMethods attributes children get_attr get_nodes has_children has_siblings is_asp is_comment is_html is_jsp is_jste is_text is_xhtml is_xml next prev tidy_node contained
 syn keyword phpFunctions token_get_all token_name contained
 syn keyword phpFunctions base64_decode base64_encode get_meta_tags http_build_query parse_url rawurldecode rawurlencode urldecode urlencode contained
-syn keyword phpFunctions doubleval empty floatval get_defined_vars get_resource_type gettype import_request_variables intval is_array is_bool is_callable is_double is_float is_int is_integer is_long is_null is_numeric is_object is_real is_resource is_scalar is_string isset print_r serialize settype strval unserialize unset var_dump var_export contained
+syn keyword phpFunctions doubleval empty floatval get_defined_vars get_resource_id get_resource_type gettype import_request_variables intval is_array is_bool is_callable is_double is_float is_int is_integer is_long is_null is_numeric is_object is_real is_resource is_scalar is_string isset print_r serialize settype strval unserialize unset var_dump var_export contained
 syn keyword phpFunctions get_called_class property_exists interface_exists trait_exists class_alias get_mangled_object_vars set_exception_handler restore_exception_handler get_declared_traits get_declared_interfaces get_resources gc_mem_caches gc_collect_cycles gc_enabled gc_enable gc_disable gc_status contained
 syn keyword phpFunctions vpopmail_add_alias_domain_ex vpopmail_add_alias_domain vpopmail_add_domain_ex vpopmail_add_domain vpopmail_add_user vpopmail_alias_add vpopmail_alias_del_domain vpopmail_alias_del vpopmail_alias_get_all vpopmail_alias_get vpopmail_auth_user vpopmail_del_domain_ex vpopmail_del_domain vpopmail_del_user vpopmail_error vpopmail_passwd vpopmail_set_user_quota contained
 syn keyword phpFunctions w32api_deftype w32api_init_dtype w32api_invoke_function w32api_register_function w32api_set_call_method contained
@@ -282,7 +283,7 @@
 syn keyword phpKeyword var const contained
 
 " Type
-syn keyword phpType void bool boolean int integer real double float string array object NULL callable iterable contained
+syn keyword phpType void bool boolean int integer real double float string array object NULL callable iterable mixed contained
 
 " Structure
 syn keyword phpStructure namespace extends implements instanceof parent self contained
@@ -296,6 +297,7 @@
 syn match phpOperator "||\|\<x\=or\>" contained display
 syn match phpRelation "[!=<>]=" contained display
 syn match phpRelation "[<>]" contained display
+syn match phpRelation "<=>" contained display
 " PHP 8.0 adds the nullsafe operator ?-> for property access and method calls.
 syn match phpMemberSelector "?\?->" contained display
 syn match phpVarSelector "\$" contained display
@@ -313,10 +315,14 @@
     syn match phpInterpSimpleError "?\?->[^a-zA-Z_]" contained display
     " make sure these stay above the correct DollarCurlies so they don't take priority
     syn match phpInterpBogusDollarCurley "${[^}]*}" contained display " fallback (if nothing else matches)
-  syn match phpinterpSimpleBracketsInner "\w\+" contained
-  syn match phpInterpSimpleBrackets "\[\h\w*]" contained contains=phpBrackets,phpInterpSimpleBracketsInner
-  syn match phpInterpSimpleBrackets "\[\d\+]" contained contains=phpBrackets,phpInterpSimpleBracketsInner
-  syn match phpInterpSimpleBrackets "\[0[xX]\x\+]" contained contains=phpBrackets,phpInterpSimpleBracketsInner
+  syn match phpInterpSimpleBracketsInner "\w\+" contained
+  syn match phpInterpSimpleBracketsInner "\$\h\w*" contained
+  syn match phpInterpSimpleBrackets "\[\$\?\h\w*]" contained contains=phpBrackets,phpInterpSimpleBracketsInner
+  " -0x1 and -123 refer to the string offsets '-0x1' and '-123' of array keys
+  " TODO: Support [1_2], [-0b1_10_1], etc (also literal strings).
+  syn match phpInterpSimpleBrackets "\[-\?\d\+]" contained contains=phpBrackets,phpInterpSimpleBracketsInner
+  syn match phpInterpSimpleBrackets "\[-\?0[xX]\x\+]" contained contains=phpBrackets,phpInterpSimpleBracketsInner
+  syn match phpInterpSimpleBrackets "\[-\?0[bB][01]\+]" contained contains=phpBrackets,phpInterpSimpleBracketsInner
   syn match phpInterpSimple "\$\h\w*\(\[[^]]*\]\|?\?->\h\w*\)\?" contained contains=phpInterpSimpleBrackets,phpIdentifier,phpInterpSimpleError,phpMethods,phpMemberSelector display
   syn match phpInterpVarname "\h\w*" contained
   syn match phpInterpMethodName "\h\w*" contained " default color
@@ -515,7 +521,10 @@
 hi def link phpSpecialFunction phpOperator
 
 " Highlighting for PHP5's built-in classes
-" - built-in classes harvested from get_declared_classes() in 5.1.4
+" Note: Some of the names have inconsistent cases. 
+" Those are probably the actual name in reflection and should not be changed in
+" this file.
+" (CURLFile and CurlShareHandle, XMLReader and XmlParser, etc)
 syntax keyword phpClasses containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar
   \ stdClass __PHP_Incomplete_Class php_user_filter AssertionError Directory ArrayObject
   \ Exception ErrorException LogicException BadFunctionCallException BadMethodCallException DomainException
@@ -527,22 +536,34 @@
   \ RecursiveRegexIterator RecursiveTreeIterator RegexIterator SplDoublyLinkedList 
   \ SplFixedArray SplHeap SplMaxHeap SplMinHeap SplPriorityQueue SplQueue SplStack
   \ InvalidArgumentException LengthException OutOfRangeException RuntimeException OutOfBoundsException
+  \ Attribute InternalIterator Stringable UnhandledMatchError ValueError WeakMap
   \ OverflowException RangeException UnderflowException UnexpectedValueException
   \ PDO PDOException PDOStatement PDORow
   \ Reflection ReflectionFunction ReflectionParameter ReflectionMethod ReflectionClass
   \ ReflectionObject ReflectionProperty ReflectionExtension ReflectionException
   \ ReflectionClassConstant ReflectionFunctionAbstract ReflectionGenerator ReflectionNamedType 
   \ ReflectionReference ReflectionType ReflectionZendExtension
+  \ ReflectionAttribute ReflectionUnionType
   \ SplFileInfo SplFileObject SplTempFileObject SplObjectStorage
   \ XMLWriter LibXMLError XMLReader SimpleXMLElement SimpleXMLIterator
+  \ XmlParser
+  \ DeflateContext InflateContext
   \ DOMException DOMStringList DOMNameList DOMDomError DOMErrorHandler
   \ DOMImplementation DOMImplementationList DOMImplementationSource
   \ DOMNode DOMNameSpaceNode DOMDocumentFragment DOMDocument DOMNodeList DOMNamedNodeMap
   \ DOMCharacterData DOMAttr DOMElement DOMText DOMComment DOMTypeinfo DOMUserDataHandler
   \ DOMLocator DOMConfiguration DOMCdataSection DOMDocumentType DOMNotation DOMEntity
   \ DOMEntityReference DOMProcessingInstruction DOMStringExtend DOMXPath
+  \ DOMChildNode DOMParentNode
+  \ EnchantBroker EnchantDictionary 
+  \ GdImage
+  \ OpenSSLAsymmetricKey OpenSSLCertificate OpenSSLCertificateSigningRequest
+  \ Shmop
+  \ AddressInfo Socket
+  \ SysvMessageQueue SysvSemaphore SysvSharedMemory
+  \ PhpToken
   \ APCIterator APCuIterator
-  \ CURLFile
+  \ CURLFile CurlHandle CurlMultiHandle CurlShareHandle
   \ DateInterval DatePeriod DateTime DateTimeImmutable DateTimeZone
   \ finfo
   \ GMP
@@ -566,7 +587,6 @@
   \ Iterator IteratorAggregate RecursiveIterator OuterIterator SeekableIterator
   \ Traversable ArrayAccess Serializable Countable SplObserver SplSubject Reflector
   \ Throwable DateTimeInterface JsonSerializable SessionHandlerInterface SessionIdInterface SessionUpdateTimestampHandlerInterface
-  \
 
 hi def link phpInterfaces phpConstant
 
@@ -604,6 +624,7 @@
   " highlight comparison operators differently
   syntax match phpComparison "\v[=!]\=\=?" contained containedin=phpRegion
   syntax match phpComparison "\v[=<>-]@<![<>]\=?[<>]@!" contained containedin=phpRegion
+  syntax match phpComparison "<=>" contained containedin=phpRegion
 
   " highlight the 'instanceof' operator as a comparison operator rather than a structure
   syntax case ignore
diff -Nru vim-8.2.1913/runtime/syntax/prolog.vim vim-8.2.2434/runtime/syntax/prolog.vim
--- vim-8.2.1913/runtime/syntax/prolog.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/syntax/prolog.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:    PROLOG
 " Maintainer:  Anton Kochkov <anton.kochkov@gmail.com>
-" Last Change: 2019 Aug 29
+" Last Change: 2021 Jan 05
 
 " There are two sets of highlighting in here:
 " If the "prolog_highlighting_clean" variable exists, it is rather sparse.
@@ -21,16 +21,16 @@
 " Very simple highlighting for comments, clause heads and
 " character codes.  It respects prolog strings and atoms.
 
-syn region   prologCComment start=+/\*+ end=+\*/+
-syn match    prologComment  +%.*+
+syn region   prologCComment start=+/\*+ end=+\*/+ contains=@Spell
+syn match    prologComment  +%.*+ contains=@Spell
 
 if !exists("prolog_highlighting_no_keyword")
   syn keyword  prologKeyword  module meta_predicate multifile dynamic
 endif
 syn match    prologCharCode +0'\\\=.+
-syn region   prologString   start=+"+ skip=+\\\\\|\\"+ end=+"+
+syn region   prologString   start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=@Spell
 syn region   prologAtom     start=+'+ skip=+\\\\\|\\'+ end=+'+
-syn region   prologClause   matchgroup=prologClauseHead start=+^\s*[a-z]\w*+ matchgroup=Normal end=+\.\s\|\.$+ contains=ALLBUT,prologClause
+syn region   prologClause   matchgroup=prologClauseHead start=+^\s*[a-z]\w*+ matchgroup=Normal end=+\.\s\|\.$+ contains=ALLBUT,prologClause contains=@NoSpell
 
 if !exists("prolog_highlighting_clean")
 
diff -Nru vim-8.2.1913/runtime/syntax/proto.vim vim-8.2.2434/runtime/syntax/proto.vim
--- vim-8.2.1913/runtime/syntax/proto.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/syntax/proto.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1,26 +1,36 @@
-" syntax file for Protocol Buffers - Google's data interchange format
-"
+" Protocol Buffers - Google's data interchange format
 " Copyright 2008 Google Inc.  All rights reserved.
+" https://developers.google.com/protocol-buffers/
 "
-" Permission is hereby granted, free of charge, to any person obtaining a copy
-" of this software and associated documentation files (the "Software"), to deal
-" in the Software without restriction, including without limitation the rights
-" to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-" copies of the Software, and to permit persons to whom the Software is
-" furnished to do so, subject to the following conditions:
-"
-" The above copyright notice and this permission notice shall be included in
-" all copies or substantial portions of the Software.
+" Redistribution and use in source and binary forms, with or without
+" modification, are permitted provided that the following conditions are
+" met:
 "
-" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-" OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-" THE SOFTWARE.
+"     * Redistributions of source code must retain the above copyright
+" notice, this list of conditions and the following disclaimer.
+"     * Redistributions in binary form must reproduce the above
+" copyright notice, this list of conditions and the following disclaimer
+" in the documentation and/or other materials provided with the
+" distribution.
+"     * Neither the name of Google Inc. nor the names of its
+" contributors may be used to endorse or promote products derived from
+" this software without specific prior written permission.
 "
-" http://code.google.com/p/protobuf/
+" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+" "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+" LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+" A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+" OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+" LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+" OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+" This is the Vim syntax file for Google Protocol Buffers as found at
+" https://github.com/protocolbuffers/protobuf
+" Last update: 2020 Oct 29
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -33,10 +43,10 @@
 syn cluster protoCommentGrp contains=protoTodo
 
 syn keyword protoSyntax     syntax import option
-syn keyword protoStructure  package message group
+syn keyword protoStructure  package message group oneof
 syn keyword protoRepeat     optional required repeated
 syn keyword protoDefault    default
-syn keyword protoExtend     extend extensions to max
+syn keyword protoExtend     extend extensions to max reserved
 syn keyword protoRPC        service rpc returns
 
 syn keyword protoType      int32 int64 uint32 uint64 sint32 sint64
@@ -48,10 +58,10 @@
 syn match   protoInt     /-\?\<\d\+\>/
 syn match   protoInt     /\<0[xX]\x+\>/
 syn match   protoFloat   /\<-\?\d*\(\.\d*\)\?/
-syn region  protoComment start="\/\*" end="\*\/" contains=@protoCommentGrp
-syn region  protoComment start="//" skip="\\$" end="$" keepend contains=@protoCommentGrp
-syn region  protoString  start=/"/ skip=/\\./ end=/"/
-syn region  protoString  start=/'/ skip=/\\./ end=/'/
+syn region  protoComment start="\/\*" end="\*\/" contains=@pbCommentGrp,@Spell
+syn region  protoComment start="//" skip="\\$" end="$" keepend contains=@pbCommentGrp,@Spell
+syn region  protoString  start=/"/ skip=/\\./ end=/"/ contains=@Spell
+syn region  protoString  start=/'/ skip=/\\./ end=/'/ contains=@Spell
 
 hi def link protoTodo         Todo
 
diff -Nru vim-8.2.1913/runtime/syntax/sexplib.vim vim-8.2.2434/runtime/syntax/sexplib.vim
--- vim-8.2.1913/runtime/syntax/sexplib.vim	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/runtime/syntax/sexplib.vim	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,88 @@
+" Vim syntax file
+" Language:     S-expressions as used in Sexplib
+" Filenames:    *.sexp
+" Maintainers:  Markus Mottl      <markus.mottl@gmail.com>
+" URL:          https://github.com/ocaml/vim-ocaml
+" Last Change:  2020 Dec 31 - Updated header for Vim contribution (MM)
+"               2017 Apr 11 - Improved matching of negative numbers (MM)
+"               2012 Jun 20 - Fixed a block comment highlighting bug (MM)
+
+" For version 5.x: Clear all syntax items
+" For version 6.x: Quit when a syntax file was already loaded
+if version < 600
+  syntax clear
+elseif exists("b:current_syntax") && b:current_syntax == "sexplib"
+  finish
+endif
+
+" Sexplib is case sensitive.
+syn case match
+
+" Comments
+syn keyword  sexplibTodo contained TODO FIXME XXX NOTE
+syn region   sexplibBlockComment matchgroup=sexplibComment start="#|" matchgroup=sexplibComment end="|#" contains=ALLBUT,sexplibQuotedAtom,sexplibUnquotedAtom,sexplibEncl,sexplibComment
+syn match    sexplibSexpComment "#;" skipwhite skipempty nextgroup=sexplibQuotedAtomComment,sexplibUnquotedAtomComment,sexplibListComment,sexplibComment
+syn region   sexplibQuotedAtomComment start=+"+ skip=+\\\\\|\\"+ end=+"+ contained
+syn match    sexplibUnquotedAtomComment /\([^;()" \t#|]\|#[^;()" \t|]\||[^;()" \t#]\)[^;()" \t]*/ contained
+syn region   sexplibListComment matchgroup=sexplibComment start="(" matchgroup=sexplibComment end=")" contained contains=ALLBUT,sexplibEncl,sexplibString,sexplibQuotedAtom,sexplibUnquotedAtom,sexplibTodo,sexplibNumber,sexplibFloat
+syn match    sexplibComment ";.*" contains=sexplibTodo
+
+" Atoms
+syn match    sexplibUnquotedAtom /\([^;()" \t#|]\|#[^;()" \t|]\||[^;()" \t#]\)[^;()" \t]*/
+syn region   sexplibQuotedAtom    start=+"+ skip=+\\\\\|\\"+ end=+"+
+syn match    sexplibNumber        "-\=\<\d\(_\|\d\)*[l|L|n]\?\>"
+syn match    sexplibNumber        "-\=\<0[x|X]\(\x\|_\)\+[l|L|n]\?\>"
+syn match    sexplibNumber        "-\=\<0[o|O]\(\o\|_\)\+[l|L|n]\?\>"
+syn match    sexplibNumber        "-\=\<0[b|B]\([01]\|_\)\+[l|L|n]\?\>"
+syn match    sexplibFloat         "-\=\<\d\(_\|\d\)*\.\?\(_\|\d\)*\([eE][-+]\=\d\(_\|\d\)*\)\=\>"
+
+" Lists
+syn region   sexplibEncl transparent matchgroup=sexplibEncl start="(" matchgroup=sexplibEncl end=")" contains=ALLBUT,sexplibParenErr
+
+" Errors
+syn match    sexplibUnquotedAtomErr /\([^;()" \t#|]\|#[^;()" \t|]\||[^;()" \t#]\)[^;()" \t]*\(#|\||#\)[^;()" \t]*/
+syn match    sexplibParenErr ")"
+
+" Synchronization
+syn sync minlines=50
+syn sync maxlines=500
+
+" Define the default highlighting.
+" For version 5.7 and earlier: only when not done already
+" For version 5.8 and later: only when an item doesn't have highlighting yet
+if version >= 508 || !exists("did_sexplib_syntax_inits")
+  if version < 508
+    let did_sexplib_syntax_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+
+  HiLink sexplibParenErr            Error
+  HiLink sexplibUnquotedAtomErr     Error
+
+  HiLink sexplibComment             Comment
+  HiLink sexplibSexpComment         Comment
+  HiLink sexplibQuotedAtomComment   Include
+  HiLink sexplibUnquotedAtomComment Comment
+  HiLink sexplibBlockComment        Comment
+  HiLink sexplibListComment         Comment
+
+  HiLink sexplibBoolean             Boolean
+  HiLink sexplibCharacter           Character
+  HiLink sexplibNumber              Number
+  HiLink sexplibFloat               Float
+  HiLink sexplibUnquotedAtom        Identifier
+  HiLink sexplibEncl                Identifier
+  HiLink sexplibQuotedAtom          Keyword
+
+  HiLink sexplibTodo                Todo
+
+  HiLink sexplibEncl                Keyword
+
+  delcommand HiLink
+endif
+
+let b:current_syntax = "sexplib"
+
+" vim: ts=8
diff -Nru vim-8.2.1913/runtime/syntax/sh.vim vim-8.2.2434/runtime/syntax/sh.vim
--- vim-8.2.1913/runtime/syntax/sh.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/syntax/sh.vim	2021-01-30 22:05:11.000000000 +0000
@@ -2,11 +2,11 @@
 " Language:		shell (sh) Korn shell (ksh) bash (sh)
 " Maintainer:		Charles E. Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
 " Previous Maintainer:	Lennart Schultz <Lennart.Schultz@ecmwf.int>
-" Last Change:		Aug 10, 2020
-" Version:		193
+" Last Change:		Nov 24, 2020
+" Version:		196
 " URL:		http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SH
 " For options and settings, please use:      :help ft-sh-syntax
-" This file includes many ideas from Eric Brunet (eric.brunet@ens.fr)
+" This file includes many ideas from Eric Brunet (eric.brunet@ens.fr) and heredoc fixes from Felipe Contreras
 
 " quit when a syntax file was already loaded {{{1
 if exists("b:current_syntax")
@@ -137,7 +137,10 @@
 syn cluster shArithParenList	contains=shArithmetic,shCaseEsac,shComment,shDeref,shDo,shDerefSimple,shEcho,shEscape,shNumber,shOperator,shPosnParm,shExSingleQuote,shExDoubleQuote,shHereString,shRedir,shSingleQuote,shDoubleQuote,shStatement,shVariable,shAlias,shTest,shCtrlSeq,shSpecial,shParen,bashSpecialVariables,bashStatement,shIf,shFor,shFunctionKey,shFunctionOne,shFunctionTwo
 syn cluster shArithList	contains=@shArithParenList,shParenError
 syn cluster shCaseEsacList	contains=shCaseStart,shCaseLabel,shCase,shCaseBar,shCaseIn,shComment,shDeref,shDerefSimple,shCaseCommandSub,shCaseExSingleQuote,shCaseSingleQuote,shCaseDoubleQuote,shCtrlSeq,@shErrorList,shStringSpecial,shCaseRange
-syn cluster shCaseList	contains=@shCommandSubList,shCaseEsac,shColon,shCommandSub,shCommandSubBQ,shComment,shDo,shEcho,shExpr,shFor,shForPP,shHereDoc,shIf,shHereString,shRedir,shSetList,shSource,shStatement,shVariable,shCtrlSeq
+syn cluster shCaseList	contains=@shCommandSubList,shCaseEsac,shColon,shCommandSub,shCommandSubBQ,shComment,shDo,shEcho,shExpr,shFor,shHereDoc,shIf,shHereString,shRedir,shSetList,shSource,shStatement,shVariable,shCtrlSeq
+if exists("b:is_kornshell") || exists("b:is_bash")
+ syn cluster shCaseList	add=shForPP
+endif
 syn cluster shCommandSubList	contains=shAlias,shArithmetic,shCmdParenRegion,shCommandSub,shComment,shCtrlSeq,shDeref,shDerefSimple,shDoubleQuote,shEcho,shEscape,shExDoubleQuote,shExpr,shExSingleQuote,shHereDoc,shNumber,shOperator,shOption,shPosnParm,shHereString,shRedir,shSingleQuote,shSpecial,shStatement,shSubSh,shTest,shVariable
 syn cluster shCurlyList	contains=shNumber,shComma,shDeref,shDerefSimple,shDerefSpecial
 " COMBAK: removing shEscape fromshDblQuoteList fails ksh04:43
@@ -149,15 +152,17 @@
 syn cluster shExprList2	contains=@shExprList1,@shCaseList,shTest
 syn cluster shFunctionList	contains=@shCommandSubList,shCaseEsac,shColon,shComment,shDo,shEcho,shExpr,shFor,shHereDoc,shIf,shOption,shHereString,shRedir,shSetList,shSource,shStatement,shVariable,shOperator,shCtrlSeq
 if exists("b:is_kornshell") || exists("b:is_bash")
- syn cluster shFunctionList	add=shRepeat
- syn cluster shFunctionList	add=shDblBrace,shDblParen
+ syn cluster shFunctionList	add=shRepeat,shDblBrace,shDblParen,shForPP
 endif
 syn cluster shHereBeginList	contains=@shCommandSubList
 syn cluster shHereList	contains=shBeginHere,shHerePayload
 syn cluster shHereListDQ	contains=shBeginHere,@shDblQuoteList,shHerePayload
 syn cluster shIdList	contains=shCommandSub,shCommandSubBQ,shWrapLineOperator,shSetOption,shComment,shDeref,shDerefSimple,shHereString,shNumber,shOperator,shRedir,shExSingleQuote,shExDoubleQuote,shSingleQuote,shDoubleQuote,shExpr,shCtrlSeq,shStringSpecial,shAtExpr
 syn cluster shIfList	contains=@shLoopList,shDblBrace,shDblParen,shFunctionKey,shFunctionOne,shFunctionTwo
-syn cluster shLoopList	contains=@shCaseList,@shErrorList,shCaseEsac,shConditional,shDblBrace,shExpr,shFor,shForPP,shIf,shOption,shSet,shTest,shTestOpr,shTouch
+syn cluster shLoopList	contains=@shCaseList,@shErrorList,shCaseEsac,shConditional,shDblBrace,shExpr,shFor,shIf,shOption,shSet,shTest,shTestOpr,shTouch
+if exists("b:is_kornshell") || exists("b:is_bash")
+ syn cluster shLoopoList	add=shForPP
+endif
 syn cluster shPPSLeftList	contains=shAlias,shArithmetic,shCmdParenRegion,shCommandSub,shCtrlSeq,shDeref,shDerefSimple,shDoubleQuote,shEcho,shEscape,shExDoubleQuote,shExpr,shExSingleQuote,shHereDoc,shNumber,shOperator,shOption,shPosnParm,shHereString,shRedir,shSingleQuote,shSpecial,shStatement,shSubSh,shTest,shVariable
 syn cluster shPPSRightList	contains=shComment,shDeref,shDerefSimple,shEscape,shPosnParm
 syn cluster shSubShList	contains=@shCommandSubList,shCommandSubBQ,shCaseEsac,shColon,shCommandSub,shComment,shDo,shEcho,shExpr,shFor,shIf,shHereString,shRedir,shSetList,shSource,shStatement,shVariable,shCtrlSeq,shOperator
@@ -256,7 +261,9 @@
 ShFoldIfDoFor syn region shDo	transparent	matchgroup=shConditional start="\<do\>" matchgroup=shConditional end="\<done\>"			contains=@shLoopList
 ShFoldIfDoFor syn region shIf	transparent	matchgroup=shConditional start="\<if\_s" matchgroup=shConditional skip=+-fi\>+ end="\<;\_s*then\>" end="\<fi\>"	contains=@shIfList
 ShFoldIfDoFor syn region shFor		matchgroup=shLoop start="\<for\ze\_s\s*\%(((\)\@!" end="\<in\>" end="\<do\>"me=e-2			contains=@shLoopList,shDblParen skipwhite nextgroup=shCurlyIn
-ShFoldIfDoFor syn region shForPP	matchgroup=shLoop start='\<for\>\_s*((' end='))' contains=@shForList
+if exists("b:is_kornshell") || exists("b:is_bash")
+ ShFoldIfDoFor syn region shForPP	matchgroup=shLoop start='\<for\>\_s*((' end='))' contains=@shForList
+endif
 
 if exists("b:is_kornshell") || exists("b:is_bash") || exists("b:is_posix")
  syn cluster shCaseList	add=shRepeat
@@ -396,23 +403,23 @@
 
 " Here Documents: {{{1
 " =========================================
-"  Note : shHereDoc0[137] only had shDblQuoteList contained
-ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc01 start="<<\s*\\\=\z([^ \t|>]\+\)"		matchgroup=shHereDoc01 end="^\z1\s*$"	contains=@shDblQuoteList
-ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc02 start="<<\s*\"\z([^"]\+\)\""		matchgroup=shHereDoc02 end="^\z1\s*$"
-ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc03 start="<<-\s*\z([^ \t|>]\+\)"		matchgroup=shHereDoc03 end="^\s*\z1\s*$"	contains=@shDblQuoteList
-ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc04 start="<<-\s*'\z([^']\+\)'"		matchgroup=shHereDoc04 end="^\s*\z1\s*$"
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc01 start="<<\s*\z([^ \t|>]\+\)"		matchgroup=shHereDoc01 end="^\z1\s*$"	contains=@shDblQuoteList
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc02 start="<<-\s*\z([^ \t|>]\+\)"		matchgroup=shHereDoc02 end="^\s*\z1\s*$"	contains=@shDblQuoteList
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc03 start="<<\s*\\\z([^ \t|>]\+\)"		matchgroup=shHereDoc03 end="^\z1\s*$"
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc04 start="<<-\s*\\\z([^ \t|>]\+\)"		matchgroup=shHereDoc04 end="^\s*\z1\s*$"
 ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc05 start="<<\s*'\z([^']\+\)'"		matchgroup=shHereDoc05 end="^\z1\s*$"
-ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc06 start="<<-\s*\"\z([^"]\+\)\""		matchgroup=shHereDoc06 end="^\s*\z1\s*$"
-ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc07 start="<<\s*\\\_$\_s*\z([^ \t'"|>]\+\)"	matchgroup=shHereDoc07 end="^\z1\s*$"
-ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc08 start="<<\s*\\\_$\_s*'\z([^\t|>]\+\)'"	matchgroup=shHereDoc08 end="^\z1\s*$"
-ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc09 start="<<\s*\\\_$\_s*\"\z([^\t|>]\+\)\""	matchgroup=shHereDoc09 end="^\z1\s*$"
-ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc10 start="<<-\s*\\\_$\_s*\z([^ \t|>]\+\)"	matchgroup=shHereDoc10 end="^\s*\z1\s*$"
-ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc11 start="<<-\s*\\\_$\_s*\\\z([^ \t|>]\+\)"	matchgroup=shHereDoc11 end="^\s*\z1\s*$"        contains=@shDblQuoteList
-ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc12 start="<<-\s*\\\_$\_s*'\z([^']\+\)'"		matchgroup=shHereDoc12 end="^\s*\z1\s*$"
-ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc13 start="<<-\s*\\\_$\_s*\"\z([^"]\+\)\""	matchgroup=shHereDoc13 end="^\s*\z1\s*$"
-ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc14 start="<<\\\z([^ \t|>]\+\)"		matchgroup=shHereDoc14 end="^\z1\s*$"           contains=@shDblQuoteList
-ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc15 start="<<-\s*\\\z([^ \t|>]\+\)"		matchgroup=shHereDoc15 end="^\s*\z1\s*$"        contains=@shDblQuoteList
-ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc16 start="<<-\s*\\\z([^ \t|>]\+\)"		matchgroup=shHereDoc15 end="^\s*\z1\s*$"        contains=@shDblQuoteList
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc06 start="<<-\s*'\z([^']\+\)'"		matchgroup=shHereDoc06 end="^\s*\z1\s*$"
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc07 start="<<\s*\"\z([^"]\+\)\""		matchgroup=shHereDoc07 end="^\z1\s*$"
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc08 start="<<-\s*\"\z([^"]\+\)\""		matchgroup=shHereDoc08 end="^\s*\z1\s*$"
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc09 start="<<\s*\\\_$\_s*\z([^ \t|>]\+\)"		matchgroup=shHereDoc09 end="^\z1\s*$"	contains=@shDblQuoteList
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc10 start="<<-\s*\\\_$\_s*\z([^ \t|>]\+\)"	matchgroup=shHereDoc10 end="^\s*\z1\s*$"	contains=@shDblQuoteList
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc11 start="<<\s*\\\_$\_s*\\\z([^ \t|>]\+\)"	matchgroup=shHereDoc11 end="^\z1\s*$"
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc12 start="<<-\s*\\\_$\_s*\\\z([^ \t|>]\+\)"	matchgroup=shHereDoc12 end="^\s*\z1\s*$"
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc13 start="<<\s*\\\_$\_s*'\z([^']\+\)'"		matchgroup=shHereDoc13 end="^\z1\s*$"
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc14 start="<<-\s*\\\_$\_s*'\z([^']\+\)'"		matchgroup=shHereDoc14 end="^\s*\z1\s*$"
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc15 start="<<\s*\\\_$\_s*\"\z([^"]\+\)\""		matchgroup=shHereDoc15 end="^\z1\s*$"
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc16 start="<<-\s*\\\_$\_s*\"\z([^"]\+\)\""	matchgroup=shHereDoc16 end="^\s*\z1\s*$"
+
 
 " Here Strings: {{{1
 " =============
@@ -424,7 +431,7 @@
 " Identifiers: {{{1
 "=============
 syn match  shSetOption	"\s\zs[-+][a-zA-Z0-9]\+\>"	contained
-syn match  shVariable	"\<\([bwglsav]:\)\=[a-zA-Z0-9.!@_%+,]*\ze="	nextgroup=shVarAssign
+syn match  shVariable	"\<\h\w*\ze="			nextgroup=shVarAssign
 syn match  shVarAssign	"="		contained	nextgroup=shCmdParenRegion,shPattern,shDeref,shDerefSimple,shDoubleQuote,shExDoubleQuote,shSingleQuote,shExSingleQuote,shVar
 syn match  shVar	contained	"\h\w*"
 syn region shAtExpr	contained	start="@(" end=")" contains=@shIdList
@@ -756,6 +763,7 @@
  hi def link shHereDoc13		shRedir
  hi def link shHereDoc14		shRedir
  hi def link shHereDoc15		shRedir
+ hi def link shHereDoc16		shRedir
 endif
 
 " Delete shell folding commands {{{1
diff -Nru vim-8.2.1913/runtime/syntax/sil.vim vim-8.2.2434/runtime/syntax/sil.vim
--- vim-8.2.1913/runtime/syntax/sil.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/syntax/sil.vim	2021-01-30 22:05:11.000000000 +0000
@@ -36,6 +36,7 @@
       \ c
       \ method
       \ objc_method
+      \ sil_differentiability_witness
       \ thick
       \ thin
       \ witness_method
diff -Nru vim-8.2.1913/runtime/syntax/sml.vim vim-8.2.2434/runtime/syntax/sml.vim
--- vim-8.2.1913/runtime/syntax/sml.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/syntax/sml.vim	2021-01-30 22:05:11.000000000 +0000
@@ -3,13 +3,16 @@
 " Filenames:    *.sml *.sig
 " Maintainers:  Markus Mottl            <markus.mottl@gmail.com>
 "               Fabrizio Zeno Cornelli  <zeno@filibusta.crema.unimi.it>
-" URL:          http://www.ocaml.info/vim/syntax/sml.vim
-" Last Change:  2006 Oct 23 - Fixed character highlighting bug (MM)
-"               2002 Jun 02 - Fixed small typo  (MM)
-"               2001 Nov 20 - Fixed small highlighting bug with modules (MM)
+" Last Change:  2019 Oct 01 - Only spell check strings & comments (Chuan Wei Foo)
+"               2015 Aug 31 - Fixed opening of modules (Ramana Kumar)
+"               2006 Oct 23 - Fixed character highlighting bug (MM)
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
+
+" Disable spell checking of syntax.
+syn spell notoplevel
+
   finish
 endif
 
@@ -52,7 +55,7 @@
 
 
 " Comments
-syn region   smlComment start="(\*" end="\*)" contains=smlComment,smlTodo
+syn region   smlComment start="(\*" end="\*)" contains=smlComment,smlTodo,@Spell
 syn keyword  smlTodo contained TODO FIXME XXX
 
 
@@ -82,7 +85,7 @@
 syn region   smlModSpec matchgroup=smlKeyword start="\<structure\>" matchgroup=smlModule end="\<\u\(\w\|'\)*\>" contained contains=@smlAllErrs,smlComment skipwhite skipempty nextgroup=smlModTRWith,smlMPRestr
 
 " "open"
-syn region   smlNone matchgroup=smlKeyword start="\<open\>" matchgroup=smlModule end="\<\u\(\w\|'\)*\(\.\u\(\w\|'\)*\)*\>" contains=@smlAllErrs,smlComment
+syn region   smlNone matchgroup=smlKeyword start="\<open\>" matchgroup=smlModule end="\<\w\(\w\|'\)*\(\.\w\(\w\|'\)*\)*\>" contains=@smlAllErrs,smlComment
 
 " "structure" - somewhat complicated stuff ;-)
 syn region   smlModule matchgroup=smlKeyword start="\<\(structure\|functor\)\>" matchgroup=smlModule end="\<\u\(\w\|'\)*\>" contains=@smlAllErrs,smlComment skipwhite skipempty nextgroup=smlPreDef
@@ -136,7 +139,7 @@
 
 syn match    smlCharacter    +#"\\""\|#"."\|#"\\\d\d\d"+
 syn match    smlCharErr      +#"\\\d\d"\|#"\\\d"+
-syn region   smlString       start=+"+ skip=+\\\\\|\\"+ end=+"+
+syn region   smlString       start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=@Spell
 
 syn match    smlFunDef       "=>"
 syn match    smlRefAssign    ":="
@@ -149,9 +152,9 @@
 syn match    smlKeyChar      "\*"
 syn match    smlKeyChar      "="
 
-syn match    smlNumber	      "\<-\=\d\+\>"
-syn match    smlNumber	      "\<-\=0[x|X]\x\+\>"
-syn match    smlReal	      "\<-\=\d\+\.\d*\([eE][-+]\=\d\+\)\=[fl]\=\>"
+syn match    smlNumber        "\<-\=\d\+\>"
+syn match    smlNumber        "\<-\=0[x|X]\x\+\>"
+syn match    smlReal          "\<-\=\d\+\.\d*\([eE][-+]\=\d\+\)\=[fl]\=\>"
 
 " Synchronization
 syn sync minlines=20
@@ -167,49 +170,49 @@
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
 
-hi def link smlBraceErr	 Error
-hi def link smlBrackErr	 Error
-hi def link smlParenErr	 Error
+hi def link smlBraceErr     Error
+hi def link smlBrackErr     Error
+hi def link smlParenErr     Error
 
-hi def link smlCommentErr	 Error
+hi def link smlCommentErr   Error
 
-hi def link smlEndErr	 Error
-hi def link smlThenErr	 Error
+hi def link smlEndErr       Error
+hi def link smlThenErr      Error
 
-hi def link smlCharErr	 Error
+hi def link smlCharErr      Error
 
-hi def link smlComment	 Comment
+hi def link smlComment      Comment
 
-hi def link smlModPath	 Include
-hi def link smlModule	 Include
-hi def link smlModParam1	 Include
-hi def link smlModType	 Include
-hi def link smlMPRestr3	 Include
-hi def link smlFullMod	 Include
+hi def link smlModPath      Include
+hi def link smlModule       Include
+hi def link smlModParam1    Include
+hi def link smlModType      Include
+hi def link smlMPRestr3     Include
+hi def link smlFullMod      Include
 hi def link smlModTypeRestr Include
-hi def link smlWith	 Include
-hi def link smlMTDef	 Include
+hi def link smlWith         Include
+hi def link smlMTDef        Include
 
 hi def link smlConstructor  Constant
 
-hi def link smlModPreRHS	 Keyword
-hi def link smlMPRestr2	 Keyword
-hi def link smlKeyword	 Keyword
-hi def link smlFunDef	 Keyword
-hi def link smlRefAssign	 Keyword
-hi def link smlKeyChar	 Keyword
-hi def link smlAnyVar	 Keyword
-hi def link smlTopStop	 Keyword
-hi def link smlOperator	 Keyword
-
-hi def link smlBoolean	 Boolean
-hi def link smlCharacter	 Character
-hi def link smlNumber	 Number
-hi def link smlReal	 Float
-hi def link smlString	 String
-hi def link smlType	 Type
-hi def link smlTodo	 Todo
-hi def link smlEncl	 Keyword
+hi def link smlModPreRHS    Keyword
+hi def link smlMPRestr2     Keyword
+hi def link smlKeyword      Keyword
+hi def link smlFunDef       Keyword
+hi def link smlRefAssign    Keyword
+hi def link smlKeyChar      Keyword
+hi def link smlAnyVar       Keyword
+hi def link smlTopStop      Keyword
+hi def link smlOperator     Keyword
+
+hi def link smlBoolean      Boolean
+hi def link smlCharacter    Character
+hi def link smlNumber       Number
+hi def link smlReal         Float
+hi def link smlString       String
+hi def link smlType         Type
+hi def link smlTodo         Todo
+hi def link smlEncl         Keyword
 
 
 let b:current_syntax = "sml"
diff -Nru vim-8.2.1913/runtime/syntax/sshdconfig.vim vim-8.2.2434/runtime/syntax/sshdconfig.vim
--- vim-8.2.1913/runtime/syntax/sshdconfig.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/syntax/sshdconfig.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1,13 +1,14 @@
 " Vim syntax file
 " Language:	OpenSSH server configuration file (sshd_config)
 " Author:	David Necas (Yeti)
-" Maintainer:	Dominik Fischer <d dot f dot fischer at web dot de>
+" Maintainer:	Jakub Jelen <jakuje at gmail dot com>
+" Previous Maintainer:	Dominik Fischer <d dot f dot fischer at web dot de>
 " Contributor:	Thilo Six
 " Contributor:  Leonard Ehrenfried <leonard.ehrenfried@web.de>	
 " Contributor:  Karsten Hopp <karsten@redhat.com>
 " Originally:	2009-07-09
-" Last Change:	2019-05-31
-" SSH Version:	7.9p1
+" Last Change:	2020-10-20
+" SSH Version:	8.4p1
 "
 
 " Setup
@@ -79,16 +80,24 @@
 
 syn keyword sshdconfigHostKeyAlgo ssh-ed25519
 syn match sshdconfigHostKeyAlgo "\<ssh-ed25519-cert-v01@openssh\.com\>"
+syn match sshdconfigHostKeyAlgo "\<sk-ssh-ed25519@openssh\.com\>"
+syn match sshdconfigHostKeyAlgo "\<sk-ssh-ed25519-cert-v01@openssh\.com\>"
 syn keyword sshdconfigHostKeyAlgo ssh-rsa
+syn keyword sshdconfigHostKeyAlgo rsa-sha2-256
+syn keyword sshdconfigHostKeyAlgo rsa-sha2-512
 syn keyword sshdconfigHostKeyAlgo ssh-dss
 syn keyword sshdconfigHostKeyAlgo ecdsa-sha2-nistp256
 syn keyword sshdconfigHostKeyAlgo ecdsa-sha2-nistp384
 syn keyword sshdconfigHostKeyAlgo ecdsa-sha2-nistp521
 syn match sshdconfigHostKeyAlgo "\<ssh-rsa-cert-v01@openssh\.com\>"
+syn match sshdconfigHostKeyAlgo "\<rsa-sha2-256-cert-v01@openssh\.com\>"
+syn match sshdconfigHostKeyAlgo "\<rsa-sha2-512-cert-v01@openssh\.com\>"
 syn match sshdconfigHostKeyAlgo "\<ssh-dss-cert-v01@openssh\.com\>"
 syn match sshdconfigHostKeyAlgo "\<ecdsa-sha2-nistp256-cert-v01@openssh\.com\>"
 syn match sshdconfigHostKeyAlgo "\<ecdsa-sha2-nistp384-cert-v01@openssh\.com\>"
 syn match sshdconfigHostKeyAlgo "\<ecdsa-sha2-nistp521-cert-v01@openssh\.com\>"
+syn match sshdconfigHostKeyAlgo "\<sk-ecdsa-sha2-nistp256@openssh\.com\>"
+syn match sshdconfigHostKeyAlgo "\<sk-ecdsa-sha2-nistp256-cert-v01@openssh\.com\>"
 
 syn keyword sshdconfigRootLogin prohibit-password without-password forced-commands-only
 
@@ -108,12 +117,17 @@
 
 syn keyword sshdconfigKexAlgo diffie-hellman-group1-sha1
 syn keyword sshdconfigKexAlgo diffie-hellman-group14-sha1
+syn keyword sshdconfigKexAlgo diffie-hellman-group14-sha256
+syn keyword sshdconfigKexAlgo diffie-hellman-group16-sha512
+syn keyword sshdconfigKexAlgo diffie-hellman-group18-sha512
 syn keyword sshdconfigKexAlgo diffie-hellman-group-exchange-sha1
 syn keyword sshdconfigKexAlgo diffie-hellman-group-exchange-sha256
 syn keyword sshdconfigKexAlgo ecdh-sha2-nistp256
 syn keyword sshdconfigKexAlgo ecdh-sha2-nistp384
 syn keyword sshdconfigKexAlgo ecdh-sha2-nistp521
+syn keyword sshdconfigKexAlgo curve25519-sha256
 syn match sshdconfigKexAlgo "\<curve25519-sha256@libssh\.org\>"
+syn match sshdconfigKexAlgo "\<sntrup4591761x25519-sha512@tinyssh\.org\>"
 
 syn keyword sshdconfigTunnel	point-to-point ethernet
 
@@ -187,6 +201,7 @@
 syn keyword sshdconfigKeyword IPQoS
 syn keyword sshdconfigKeyword IgnoreRhosts
 syn keyword sshdconfigKeyword IgnoreUserKnownHosts
+syn keyword sshdconfigKeyword Include
 syn keyword sshdconfigKeyword KbdInteractiveAuthentication
 syn keyword sshdconfigKeyword KerberosAuthentication
 syn keyword sshdconfigKeyword KerberosGetAFSToken
@@ -221,11 +236,13 @@
 syn keyword sshdconfigKeyword Protocol
 syn keyword sshdconfigKeyword PubkeyAcceptedKeyTypes
 syn keyword sshdconfigKeyword PubkeyAuthentication
+syn keyword sshdconfigKeyword PubkeyAuthOptions
 syn keyword sshdconfigKeyword RSAAuthentication
 syn keyword sshdconfigKeyword RekeyLimit
 syn keyword sshdconfigKeyword RevokedKeys
 syn keyword sshdconfigKeyword RDomain
 syn keyword sshdconfigKeyword RhostsRSAAuthentication
+syn keyword sshdconfigKeyword SecurityKeyProvider
 syn keyword sshdconfigKeyword ServerKeyBits
 syn keyword sshdconfigKeyword SetEnv
 syn keyword sshdconfigKeyword ShowPatchLevel
diff -Nru vim-8.2.1913/runtime/syntax/swift.vim vim-8.2.2434/runtime/syntax/swift.vim
--- vim-8.2.1913/runtime/syntax/swift.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/syntax/swift.vim	2021-01-30 22:05:11.000000000 +0000
@@ -21,10 +21,11 @@
 set cpo&vim
 
 syn keyword swiftKeyword
-      \ associatedtype
       \ break
+      \ case
       \ catch
       \ continue
+      \ default
       \ defer
       \ do
       \ else
@@ -43,6 +44,10 @@
 syn match swiftMultiwordKeyword
       \ "indirect case"
 
+syn keyword swiftCoreTypes
+      \ Any
+      \ AnyObject
+
 syn keyword swiftImport skipwhite skipempty nextgroup=swiftImportModule
       \ import
 
@@ -93,10 +98,13 @@
       \ class
       \ enum
       \ extension
+      \ operator
+      \ precedencegroup
       \ protocol
       \ struct
 
 syn keyword swiftTypeAliasDefinition skipwhite skipempty nextgroup=swiftTypeAliasName
+      \ associatedtype
       \ typealias
 
 syn match swiftMultiwordTypeDefinition skipwhite skipempty nextgroup=swiftTypeName
@@ -202,7 +210,7 @@
       \ /[0-9]\+/
 
 syn match swiftPreproc
-      \ /#\(\<file\>\|\<line\>\|\<function\>\)/
+      \ /#\(\<column\>\|\<dsohandle\>\|\<file\>\|\<line\>\|\<function\>\)/
 syn match swiftPreproc
       \ /^\s*#\(\<if\>\|\<else\>\|\<elseif\>\|\<endif\>\|\<error\>\|\<warning\>\)/
 syn region swiftPreprocFalse
@@ -213,9 +221,9 @@
 
 syn keyword swiftTodo MARK TODO FIXME contained
 
-syn match swiftCastOp skipwhite skipempty nextgroup=swiftType
+syn match swiftCastOp skipwhite skipempty nextgroup=swiftType,swiftCoreTypes
       \ "\<is\>"
-syn match swiftCastOp skipwhite skipempty nextgroup=swiftType
+syn match swiftCastOp skipwhite skipempty nextgroup=swiftType,swiftCoreTypes
       \ "\<as\>[!?]\?"
 
 syn match swiftNilOps
@@ -228,6 +236,7 @@
 hi def link swiftImportModule Title
 hi def link swiftImportComponent Identifier
 hi def link swiftKeyword Statement
+hi def link swiftCoreTypes Type
 hi def link swiftMultiwordKeyword Statement
 hi def link swiftTypeDefinition Define
 hi def link swiftMultiwordTypeDefinition Define
diff -Nru vim-8.2.1913/runtime/syntax/tidy.vim vim-8.2.2434/runtime/syntax/tidy.vim
--- vim-8.2.1913/runtime/syntax/tidy.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/syntax/tidy.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1,8 +1,9 @@
 " Vim syntax file
-" Language:	HMTL Tidy configuration file (/etc/tidyrc ~/.tidyrc)
+" Language:	HMTL Tidy Configuration
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:	2016 Apr 24
+" Last Change:	2020 Sep 4
 
+" Preamble {{{1
 if exists("b:current_syntax")
   finish
 endif
@@ -12,10 +13,15 @@
 
 syn iskeyword @,48-57,-,_
 
+" Values {{{1
+syn match tidyWordSeparator	contained ",\|\s" nextgroup=tidyWord   skipwhite skipnl
+syn match tidyMuteIDSeparator	contained ",\|\s" nextgroup=tidyMuteID skipwhite skipnl
+
 syn case ignore
 syn keyword	tidyBoolean	contained t[rue] f[alse] y[es] n[o] 1 0
 syn keyword	tidyAutoBoolean	contained t[rue] f[alse] y[es] n[o] 1 0 auto
 syn case match
+syn keyword	tidyCustomTags	contained no blocklevel empty inline pre
 syn keyword	tidyDoctype	contained html5 omit auto strict loose transitional user
 syn keyword	tidyEncoding	contained raw ascii latin0 latin1 utf8 iso2022 mac win1252 ibm858 utf16le utf16be utf16 big5 shiftjis
 syn keyword	tidyNewline	contained LF CRLF CR
@@ -24,36 +30,148 @@
 syn keyword	tidySorter	contained alpha none
 syn region	tidyString	contained start=+"+ skip=+\\\\\|\\"+ end=+"+ oneline
 syn region	tidyString	contained start=+'+ skip=+\\\\\|\\'+ end=+'+ oneline
-syn match	tidyTags	contained "\<\w\+\(\s*,\s*\w\+\)*\>"
+" Tag and attribute lists
+syn match	tidyWord	contained "\<\k\+\>:\@!" nextgroup=tidyWordSeparator skipwhite skipnl
 
-syn keyword tidyBooleanOption add-xml-decl add-xml-pi add-xml-space
-	\ anchor-as-name ascii-chars assume-xml-procins bare break-before-br
-	\ clean coerce-endtags decorate-inferred-ul drop-empty-paras
-	\ drop-empty-elements drop-font-tags drop-proprietary-attributes
-	\ enclose-block-text enclose-text escape-cdata escape-scripts
-	\ fix-backslash fix-bad-comments fix-uri force-output gdoc gnu-emacs
-	\ hide-comments hide-endtags indent-attributes indent-cdata
-	\ indent-with-tabs input-xml join-classes join-styles keep-time
-	\ language literal-attributes logical-emphasis lower-literals markup
-	\ merge-emphasis ncr numeric-entities omit-optional-tags output-html
-	\ output-xhtml output-xml preserve-entities punctuation-wrap quiet
-	\ quote-ampersand quote-marks quote-nbsp raw replace-color show-info
-	\ show-warnings skip-nested split strict-tags-attributes tidy-mark
-	\ uppercase-attributes uppercase-tags word-2000 wrap-asp
-	\ wrap-attributes wrap-jste wrap-php wrap-script-literals
-	\ wrap-sections write-back
+" Mute Message IDs {{{2
+syn keyword tidyMuteID ADDED_MISSING_CHARSET ANCHOR_DUPLICATED
+	\ ANCHOR_NOT_UNIQUE APOS_UNDEFINED APPLET_MISSING_ALT AREA_MISSING_ALT
+	\ ASCII_REQUIRES_DESCRIPTION ASSOCIATE_LABELS_EXPLICITLY
+	\ ASSOCIATE_LABELS_EXPLICITLY_FOR ASSOCIATE_LABELS_EXPLICITLY_ID
+	\ ATTRIBUTE_IS_NOT_ALLOWED ATTRIBUTE_VALUE_REPLACED
+	\ ATTR_VALUE_NOT_LCASE AUDIO_MISSING_TEXT_AIFF AUDIO_MISSING_TEXT_AU
+	\ AUDIO_MISSING_TEXT_RA AUDIO_MISSING_TEXT_RM AUDIO_MISSING_TEXT_SND
+	\ AUDIO_MISSING_TEXT_WAV BACKSLASH_IN_URI BAD_ATTRIBUTE_VALUE
+	\ BAD_ATTRIBUTE_VALUE_REPLACED BAD_CDATA_CONTENT BAD_SUMMARY_HTML5
+	\ BAD_SURROGATE_LEAD BAD_SURROGATE_PAIR BAD_SURROGATE_TAIL
+	\ CANT_BE_NESTED COERCE_TO_ENDTAG COLOR_CONTRAST_ACTIVE_LINK
+	\ COLOR_CONTRAST_LINK COLOR_CONTRAST_TEXT COLOR_CONTRAST_VISITED_LINK
+	\ CONTENT_AFTER_BODY CUSTOM_TAG_DETECTED DATA_TABLE_MISSING_HEADERS
+	\ DATA_TABLE_MISSING_HEADERS_COLUMN DATA_TABLE_MISSING_HEADERS_ROW
+	\ DATA_TABLE_REQUIRE_MARKUP_COLUMN_HEADERS
+	\ DATA_TABLE_REQUIRE_MARKUP_ROW_HEADERS DISCARDING_UNEXPECTED
+	\ DOCTYPE_AFTER_TAGS DOCTYPE_MISSING DUPLICATE_FRAMESET
+	\ ELEMENT_NOT_EMPTY ELEMENT_VERS_MISMATCH_ERROR
+	\ ELEMENT_VERS_MISMATCH_WARN ENCODING_MISMATCH
+	\ ENSURE_PROGRAMMATIC_OBJECTS_ACCESSIBLE_APPLET
+	\ ENSURE_PROGRAMMATIC_OBJECTS_ACCESSIBLE_EMBED
+	\ ENSURE_PROGRAMMATIC_OBJECTS_ACCESSIBLE_OBJECT
+	\ ENSURE_PROGRAMMATIC_OBJECTS_ACCESSIBLE_SCRIPT ESCAPED_ILLEGAL_URI
+	\ FILE_CANT_OPEN FILE_CANT_OPEN_CFG FILE_NOT_FILE FIXED_BACKSLASH
+	\ FOUND_STYLE_IN_BODY FRAME_MISSING_LONGDESC FRAME_MISSING_NOFRAMES
+	\ FRAME_MISSING_TITLE FRAME_SRC_INVALID FRAME_TITLE_INVALID_NULL
+	\ FRAME_TITLE_INVALID_SPACES HEADERS_IMPROPERLY_NESTED
+	\ HEADER_USED_FORMAT_TEXT ID_NAME_MISMATCH ILLEGAL_NESTING
+	\ ILLEGAL_URI_CODEPOINT ILLEGAL_URI_REFERENCE
+	\ IMAGE_MAP_SERVER_SIDE_REQUIRES_CONVERSION
+	\ IMG_ALT_SUSPICIOUS_FILENAME IMG_ALT_SUSPICIOUS_FILE_SIZE
+	\ IMG_ALT_SUSPICIOUS_PLACEHOLDER IMG_ALT_SUSPICIOUS_TOO_LONG
+	\ IMG_BUTTON_MISSING_ALT IMG_MAP_CLIENT_MISSING_TEXT_LINKS
+	\ IMG_MAP_SERVER_REQUIRES_TEXT_LINKS IMG_MISSING_ALT IMG_MISSING_DLINK
+	\ IMG_MISSING_LONGDESC IMG_MISSING_LONGDESC_DLINK
+	\ INFORMATION_NOT_CONVEYED_APPLET INFORMATION_NOT_CONVEYED_IMAGE
+	\ INFORMATION_NOT_CONVEYED_INPUT INFORMATION_NOT_CONVEYED_OBJECT
+	\ INFORMATION_NOT_CONVEYED_SCRIPT INSERTING_AUTO_ATTRIBUTE
+	\ INSERTING_TAG INVALID_ATTRIBUTE INVALID_NCR INVALID_SGML_CHARS
+	\ INVALID_UTF16 INVALID_UTF8 INVALID_XML_ID JOINING_ATTRIBUTE
+	\ LANGUAGE_INVALID LANGUAGE_NOT_IDENTIFIED
+	\ LAYOUT_TABLES_LINEARIZE_PROPERLY LAYOUT_TABLE_INVALID_MARKUP
+	\ LINK_TEXT_MISSING LINK_TEXT_NOT_MEANINGFUL
+	\ LINK_TEXT_NOT_MEANINGFUL_CLICK_HERE LINK_TEXT_TOO_LONG
+	\ LIST_USAGE_INVALID_LI LIST_USAGE_INVALID_OL LIST_USAGE_INVALID_UL
+	\ MALFORMED_COMMENT MALFORMED_COMMENT_DROPPING MALFORMED_COMMENT_EOS
+	\ MALFORMED_COMMENT_WARN MALFORMED_DOCTYPE METADATA_MISSING
+	\ METADATA_MISSING_REDIRECT_AUTOREFRESH MISMATCHED_ATTRIBUTE_ERROR
+	\ MISMATCHED_ATTRIBUTE_WARN MISSING_ATTRIBUTE MISSING_ATTR_VALUE
+	\ MISSING_DOCTYPE MISSING_ENDTAG_BEFORE MISSING_ENDTAG_FOR
+	\ MISSING_ENDTAG_OPTIONAL MISSING_IMAGEMAP MISSING_QUOTEMARK
+	\ MISSING_QUOTEMARK_OPEN MISSING_SEMICOLON MISSING_SEMICOLON_NCR
+	\ MISSING_STARTTAG MISSING_TITLE_ELEMENT MOVED_STYLE_TO_HEAD
+	\ MULTIMEDIA_REQUIRES_TEXT NESTED_EMPHASIS NESTED_QUOTATION
+	\ NEWLINE_IN_URI NEW_WINDOWS_REQUIRE_WARNING_BLANK
+	\ NEW_WINDOWS_REQUIRE_WARNING_NEW NOFRAMES_CONTENT
+	\ NOFRAMES_INVALID_CONTENT NOFRAMES_INVALID_LINK
+	\ NOFRAMES_INVALID_NO_VALUE NON_MATCHING_ENDTAG OBJECT_MISSING_ALT
+	\ OBSOLETE_ELEMENT OPTION_REMOVED OPTION_REMOVED_APPLIED
+	\ OPTION_REMOVED_UNAPPLIED POTENTIAL_HEADER_BOLD
+	\ POTENTIAL_HEADER_ITALICS POTENTIAL_HEADER_UNDERLINE
+	\ PREVIOUS_LOCATION PROGRAMMATIC_OBJECTS_REQUIRE_TESTING_APPLET
+	\ PROGRAMMATIC_OBJECTS_REQUIRE_TESTING_EMBED
+	\ PROGRAMMATIC_OBJECTS_REQUIRE_TESTING_OBJECT
+	\ PROGRAMMATIC_OBJECTS_REQUIRE_TESTING_SCRIPT PROPRIETARY_ATTRIBUTE
+	\ PROPRIETARY_ATTR_VALUE PROPRIETARY_ELEMENT REMOVED_HTML5
+	\ REMOVE_AUTO_REDIRECT REMOVE_AUTO_REFRESH REMOVE_BLINK_MARQUEE
+	\ REMOVE_FLICKER_ANIMATED_GIF REMOVE_FLICKER_APPLET
+	\ REMOVE_FLICKER_EMBED REMOVE_FLICKER_OBJECT REMOVE_FLICKER_SCRIPT
+	\ REPEATED_ATTRIBUTE REPLACE_DEPRECATED_HTML_APPLET
+	\ REPLACE_DEPRECATED_HTML_BASEFONT REPLACE_DEPRECATED_HTML_CENTER
+	\ REPLACE_DEPRECATED_HTML_DIR REPLACE_DEPRECATED_HTML_FONT
+	\ REPLACE_DEPRECATED_HTML_ISINDEX REPLACE_DEPRECATED_HTML_MENU
+	\ REPLACE_DEPRECATED_HTML_S REPLACE_DEPRECATED_HTML_STRIKE
+	\ REPLACE_DEPRECATED_HTML_U REPLACING_ELEMENT REPLACING_UNEX_ELEMENT
+	\ SCRIPT_MISSING_NOSCRIPT SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_CLICK
+	\ SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_DOWN
+	\ SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_MOVE
+	\ SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_OUT
+	\ SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_OVER
+	\ SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_UP SKIPOVER_ASCII_ART
+	\ SPACE_PRECEDING_XMLDECL STRING_ARGUMENT_BAD STRING_CONTENT_LOOKS
+	\ STRING_DOCTYPE_GIVEN STRING_MISSING_MALFORMED STRING_MUTING_TYPE
+	\ STRING_NO_SYSID STRING_UNKNOWN_OPTION
+	\ STYLESHEETS_REQUIRE_TESTING_LINK
+	\ STYLESHEETS_REQUIRE_TESTING_STYLE_ATTR
+	\ STYLESHEETS_REQUIRE_TESTING_STYLE_ELEMENT
+	\ STYLE_SHEET_CONTROL_PRESENTATION SUSPECTED_MISSING_QUOTE
+	\ TABLE_MAY_REQUIRE_HEADER_ABBR TABLE_MAY_REQUIRE_HEADER_ABBR_NULL
+	\ TABLE_MAY_REQUIRE_HEADER_ABBR_SPACES TABLE_MISSING_CAPTION
+	\ TABLE_MISSING_SUMMARY TABLE_SUMMARY_INVALID_NULL
+	\ TABLE_SUMMARY_INVALID_PLACEHOLDER TABLE_SUMMARY_INVALID_SPACES
+	\ TAG_NOT_ALLOWED_IN TEXT_EQUIVALENTS_REQUIRE_UPDATING_APPLET
+	\ TEXT_EQUIVALENTS_REQUIRE_UPDATING_OBJECT
+	\ TEXT_EQUIVALENTS_REQUIRE_UPDATING_SCRIPT TOO_MANY_ELEMENTS
+	\ TOO_MANY_ELEMENTS_IN TRIM_EMPTY_ELEMENT UNESCAPED_AMPERSAND
+	\ UNEXPECTED_ENDTAG UNEXPECTED_ENDTAG_ERR UNEXPECTED_ENDTAG_IN
+	\ UNEXPECTED_END_OF_FILE UNEXPECTED_END_OF_FILE_ATTR
+	\ UNEXPECTED_EQUALSIGN UNEXPECTED_GT UNEXPECTED_QUOTEMARK
+	\ UNKNOWN_ELEMENT UNKNOWN_ELEMENT_LOOKS_CUSTOM UNKNOWN_ENTITY
+	\ USING_BR_INPLACE_OF VENDOR_SPECIFIC_CHARS WHITE_IN_URI
+	\ XML_DECLARATION_DETECTED XML_ID_SYNTAX
+	\ contained nextgroup=tidyMuteIDSeparator skipwhite skipnl
+
+" Options {{{1
+syn keyword tidyCustomTagsOption custom-tags contained nextgroup=tidyCustomTagsDelimiter
+syn match tidyCustomTagsDelimiter ":" nextgroup=tidyCustomTags contained skipwhite
+
+syn keyword tidyBooleanOption add-meta-charset add-xml-decl
+	\ add-xml-pi add-xml-space anchor-as-name ascii-chars
+	\ assume-xml-procins bare break-before-br clean coerce-endtags
+	\ decorate-inferred-ul drop-empty-paras drop-empty-elements
+	\ drop-font-tags drop-proprietary-attributes enclose-block-text
+	\ enclose-text escape-cdata escape-scripts fix-backslash
+	\ fix-style-tags fix-uri force-output gdoc gnu-emacs hide-comments
+	\ hide-endtags indent-attributes indent-cdata indent-with-tabs
+	\ input-xml join-classes join-styles keep-tabs keep-time language
+	\ literal-attributes logical-emphasis lower-literals markup
+	\ merge-emphasis mute-id ncr numeric-entities omit-optional-tags
+	\ output-html output-xhtml output-xml preserve-entities
+	\ punctuation-wrap quiet quote-ampersand quote-marks quote-nbsp raw
+	\ replace-color show-filename show-info show-meta-change show-warnings
+	\ skip-nested split strict-tags-attributes tidy-mark
+	\ uppercase-attributes uppercase-tags warn-proprietary-attributes
+	\ word-2000 wrap-asp wrap-attributes wrap-jste wrap-php
+	\ wrap-script-literals wrap-sections write-back
 	\ contained nextgroup=tidyBooleanDelimiter
 
 syn match tidyBooleanDelimiter ":" nextgroup=tidyBoolean contained skipwhite
 
-syn keyword tidyAutoBooleanOption indent merge-divs merge-spans output-bom show-body-only vertical-space contained nextgroup=tidyAutoBooleanDelimiter
+syn keyword tidyAutoBooleanOption fix-bad-comments indent merge-divs merge-spans output-bom show-body-only vertical-space contained nextgroup=tidyAutoBooleanDelimiter
 syn match tidyAutoBooleanDelimiter ":" nextgroup=tidyAutoBoolean contained skipwhite
 
 syn keyword tidyCSSSelectorOption css-prefix contained nextgroup=tidyCSSSelectorDelimiter
 syn match tidyCSSSelectorDelimiter ":" nextgroup=tidyCSSSelector contained skipwhite
 
 syn keyword tidyDoctypeOption doctype contained nextgroup=tidyDoctypeDelimiter
-syn match tidyDoctypeDelimiter ":" nextgroup=tidyDoctype contained skipwhite
+syn match tidyDoctypeDelimiter ":" nextgroup=tidyDoctype,tidyString contained skipwhite
 
 syn keyword tidyEncodingOption char-encoding input-encoding output-encoding contained nextgroup=tidyEncodingDelimiter
 syn match tidyEncodingDelimiter ":" nextgroup=tidyEncoding contained skipwhite
@@ -67,8 +185,11 @@
 syn keyword tidyNewlineOption newline contained nextgroup=tidyNewlineDelimiter
 syn match tidyNewlineDelimiter ":" nextgroup=tidyNewline contained skipwhite
 
+syn keyword tidyAttributesOption priority-attributes contained nextgroup=tidyAttributesDelimiter
+syn match tidyAttributesDelimiter ":" nextgroup=tidyWord contained skipwhite
+
 syn keyword tidyTagsOption new-blocklevel-tags new-empty-tags new-inline-tags new-pre-tags contained nextgroup=tidyTagsDelimiter
-syn match tidyTagsDelimiter ":" nextgroup=tidyTags contained skipwhite
+syn match tidyTagsDelimiter ":" nextgroup=tidyWord contained skipwhite
 
 syn keyword tidyRepeatOption repeated-attributes contained nextgroup=tidyRepeatDelimiter
 syn match tidyRepeatDelimiter ":" nextgroup=tidyRepeat contained skipwhite
@@ -79,57 +200,77 @@
 syn keyword tidyStringOption alt-text error-file gnu-emacs-file output-file contained nextgroup=tidyStringDelimiter
 syn match tidyStringDelimiter ":" nextgroup=tidyString contained skipwhite
 
+syn keyword tidyMuteOption mute contained nextgroup=tidyMuteDelimiter
+syn match tidyMuteDelimiter ":" nextgroup=tidyMuteID contained skipwhite
+
 syn cluster tidyOptions contains=tidy.*Option
 
+" Option line anchor {{{1
 syn match tidyStart "^" nextgroup=@tidyOptions
+" Long standing bug - option lines (except the first) with leading whitespace
+" are silently ignored.
+syn match tidyErrorStart '^\s\+\ze\S'
 
+" Comments {{{1
 syn match	tidyComment	"^\s*//.*$" contains=tidyTodo
 syn match	tidyComment	"^\s*#.*$"  contains=tidyTodo
 syn keyword	tidyTodo	TODO NOTE FIXME XXX contained
 
+" Default highlighting {{{1
+hi def link tidyAttributesOption	Identifier
 hi def link tidyAutoBooleanOption	Identifier
 hi def link tidyBooleanOption		Identifier
 hi def link tidyCSSSelectorOption	Identifier
+hi def link tidyCustomTagsOption	Identifier
 hi def link tidyDoctypeOption		Identifier
 hi def link tidyEncodingOption		Identifier
 hi def link tidyIntegerOption		Identifier
+hi def link tidyMuteOption		Identifier
 hi def link tidyNameOption		Identifier
 hi def link tidyNewlineOption		Identifier
-hi def link tidyTagsOption		Identifier
 hi def link tidyRepeatOption		Identifier
 hi def link tidySorterOption		Identifier
 hi def link tidyStringOption		Identifier
+hi def link tidyTagsOption		Identifier
 
+hi def link tidyAttributesDelimiter	Special
 hi def link tidyAutoBooleanDelimiter	Special
 hi def link tidyBooleanDelimiter	Special
 hi def link tidyCSSSelectorDelimiter	Special
+hi def link tidyCustomTagsDelimiter	Special
 hi def link tidyDoctypeDelimiter	Special
 hi def link tidyEncodingDelimiter	Special
 hi def link tidyIntegerDelimiter	Special
+hi def link tidyMuteDelimiter		Special
 hi def link tidyNameDelimiter		Special
 hi def link tidyNewlineDelimiter	Special
-hi def link tidyTagsDelimiter		Special
 hi def link tidyRepeatDelimiter		Special
 hi def link tidySorterDelimiter		Special
 hi def link tidyStringDelimiter		Special
+hi def link tidyTagsDelimiter		Special
 
 hi def link tidyAutoBoolean		Boolean
 hi def link tidyBoolean			Boolean
+hi def link tidyCustomTags		Constant
 hi def link tidyDoctype			Constant
 hi def link tidyEncoding		Constant
+hi def link tidyMuteID			Constant
 hi def link tidyNewline			Constant
-hi def link tidyTags			Constant
 hi def link tidyNumber			Number
 hi def link tidyRepeat			Constant
 hi def link tidySorter			Constant
 hi def link tidyString			String
+hi def link tidyWord			Constant
 
 hi def link tidyComment			Comment
 hi def link tidyTodo			Todo
 
+hi def link tidyErrorStart		Error
+
+" Postscript {{{1
 let b:current_syntax = "tidy"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: ts=8
+" vim: ts=8 fdm=marker
diff -Nru vim-8.2.1913/runtime/syntax/typescriptcommon.vim vim-8.2.2434/runtime/syntax/typescriptcommon.vim
--- vim-8.2.1913/runtime/syntax/typescriptcommon.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/syntax/typescriptcommon.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:     TypeScript and TypeScriptReact
 " Maintainer:   Bram Moolenaar, Herrington Darkholme
-" Last Change:	2019 Nov 30
+" Last Change:	2020 Oct 27
 " Based On:     Herrington Darkholme's yats.vim
 " Changes:      See https:github.com/HerringtonDarkholme/yats.vim
 " Credits:      See yats.vim on github
@@ -21,15 +21,14 @@
   setlocal iskeyword+=$
   " syntax cluster htmlJavaScript                 contains=TOP
 endif
+" For private field added from TypeScript 3.8
+setlocal iskeyword+=#
 
 " lowest priority on least used feature
 syntax match   typescriptLabel                /[a-zA-Z_$]\k*:/he=e-1 contains=typescriptReserved nextgroup=@typescriptStatement skipwhite skipempty
 
 " other keywords like return,case,yield uses containedin
 syntax region  typescriptBlock                 matchgroup=typescriptBraces start=/{/ end=/}/ contains=@typescriptStatement,@typescriptComments fold
-
-
-"runtime syntax/basic/identifiers.vim
 syntax cluster afterIdentifier contains=
   \ typescriptDotNotation,
   \ typescriptFuncCallArg,
@@ -60,7 +59,56 @@
 syntax region  typescriptEventFuncCallArg      contained matchgroup=typescriptParens start=/(/ end=/)/ contains=@typescriptEventExpression
 syntax region  typescriptEventString           contained start=/\z(["']\)/  skip=/\\\\\|\\\z1\|\\\n/  end=/\z1\|$/ contains=typescriptASCII,@events
 
-"runtime syntax/basic/literal.vim
+syntax region  typescriptDestructureString
+  \ start=/\z(["']\)/  skip=/\\\\\|\\\z1\|\\\n/  end=/\z1\|$/
+  \ contains=typescriptASCII
+  \ nextgroup=typescriptDestructureAs
+  \ contained skipwhite skipempty
+
+syntax cluster typescriptVariableDeclarations
+  \ contains=typescriptVariableDeclaration,@typescriptDestructures
+
+syntax match typescriptVariableDeclaration /[A-Za-z_$]\k*/
+  \ nextgroup=typescriptTypeAnnotation,typescriptAssign
+  \ contained skipwhite skipempty
+
+syntax cluster typescriptDestructureVariables contains=
+  \ typescriptRestOrSpread,
+  \ typescriptDestructureComma,
+  \ typescriptDestructureLabel,
+  \ typescriptDestructureVariable,
+  \ @typescriptDestructures
+
+syntax match typescriptDestructureVariable    /[A-Za-z_$]\k*/ contained
+  \ nextgroup=typescriptDefaultParam
+  \ contained skipwhite skipempty
+
+syntax match typescriptDestructureLabel       /[A-Za-z_$]\k*\ze\_s*:/
+  \ nextgroup=typescriptDestructureAs
+  \ contained skipwhite skipempty
+
+syntax match typescriptDestructureAs /:/
+  \ nextgroup=typescriptDestructureVariable,@typescriptDestructures
+  \ contained skipwhite skipempty
+
+syntax match typescriptDestructureComma /,/ contained
+
+syntax cluster typescriptDestructures contains=
+  \ typescriptArrayDestructure,
+  \ typescriptObjectDestructure
+
+syntax region typescriptArrayDestructure matchgroup=typescriptBraces
+  \ start=/\[/ end=/]/
+  \ contains=@typescriptDestructureVariables,@typescriptComments
+  \ nextgroup=typescriptTypeAnnotation,typescriptAssign
+  \ transparent contained skipwhite skipempty fold
+
+syntax region typescriptObjectDestructure matchgroup=typescriptBraces
+  \ start=/{/ end=/}/
+  \ contains=typescriptDestructureString,@typescriptDestructureVariables,@typescriptComments
+  \ nextgroup=typescriptTypeAnnotation,typescriptAssign
+  \ transparent contained skipwhite skipempty fold
+
 "Syntax in the JavaScript code
 
 " String
@@ -77,15 +125,15 @@
   \ contains=typescriptSpecial,@Spell
   \ extend
 
-syntax match   typescriptSpecial            contained "\v\\%(x\x\x|u%(\x{4}|\{\x{4,5}})|c\u|.)"
+syntax match   typescriptSpecial            contained "\v\\%(x\x\x|u%(\x{4}|\{\x{1,6}})|c\u|.)"
 
 " From vim runtime
 " <https://github.com/vim/vim/blob/master/runtime/syntax/javascript.vim#L48>
-syntax region  typescriptRegexpString          start=+/[^/*]+me=e-1 skip=+\\\\\|\\/+ end=+/[gimuy]\{0,5\}\s*$+ end=+/[gimuy]\{0,5\}\s*[;.,)\]}]+me=e-1 nextgroup=typescriptDotNotation oneline
+syntax region  typescriptRegexpString          start=+/[^/*]+me=e-1 skip=+\\\\\|\\/+ end=+/[gimuy]\{0,5\}\s*$+ end=+/[gimuy]\{0,5\}\s*[;.,)\]}:]+me=e-1 nextgroup=typescriptDotNotation oneline
 
 syntax region  typescriptTemplate
   \ start=/`/  skip=/\\\\\|\\`\|\n/  end=/`\|$/
-  \ contains=typescriptTemplateSubstitution
+  \ contains=typescriptTemplateSubstitution,typescriptSpecial,@Spell
   \ nextgroup=@typescriptSymbols
   \ skipwhite skipempty
 
@@ -100,18 +148,16 @@
 syntax match typescriptNumber /\<0[bB][01][01_]*\>/        nextgroup=@typescriptSymbols skipwhite skipempty
 syntax match typescriptNumber /\<0[oO][0-7][0-7_]*\>/       nextgroup=@typescriptSymbols skipwhite skipempty
 syntax match typescriptNumber /\<0[xX][0-9a-fA-F][0-9a-fA-F_]*\>/ nextgroup=@typescriptSymbols skipwhite skipempty
-syntax match typescriptNumber /\d[0-9_]*\.\d[0-9_]*\|\d[0-9_]*\|\.\d[0-9]*/
-  \ nextgroup=typescriptExponent,@typescriptSymbols skipwhite skipempty
-syntax match typescriptExponent /[eE][+-]\=\d[0-9]*\>/
-  \ nextgroup=@typescriptSymbols skipwhite skipempty contained
+syntax match typescriptNumber /\<\%(\d[0-9_]*\%(\.\d[0-9_]*\)\=\|\.\d[0-9_]*\)\%([eE][+-]\=\d[0-9_]*\)\=\>/
+  \ nextgroup=typescriptSymbols skipwhite skipempty
 
-
-" runtime syntax/basic/object.vim
 syntax region  typescriptObjectLiteral         matchgroup=typescriptBraces
   \ start=/{/ end=/}/
-  \ contains=@typescriptComments,typescriptObjectLabel,typescriptStringProperty,typescriptComputedPropertyName
+  \ contains=@typescriptComments,typescriptObjectLabel,typescriptStringProperty,typescriptComputedPropertyName,typescriptObjectAsyncKeyword
   \ fold contained
 
+syntax keyword typescriptObjectAsyncKeyword async contained
+
 syntax match   typescriptObjectLabel  contained /\k\+\_s*/
   \ nextgroup=typescriptObjectColon,@typescriptCallImpl
   \ skipwhite skipempty
@@ -136,7 +182,6 @@
 
 syntax match typescriptObjectColon contained /:/ nextgroup=@typescriptValue skipwhite skipempty
 
-"runtime syntax/basic/symbols.vim
 " + - ^ ~
 syntax match typescriptUnaryOp /[+\-~!]/
  \ nextgroup=@typescriptValue
@@ -153,10 +198,12 @@
 syntax match   typescriptBinaryOp contained />\(>>=\|>>\|>=\|>\|=\)\?/ nextgroup=@typescriptValue skipwhite skipempty
 " 4: <<=, <<, <=, <
 syntax match   typescriptBinaryOp contained /<\(<=\|<\|=\)\?/ nextgroup=@typescriptValue skipwhite skipempty
-" 3: ||, |=, |
-syntax match   typescriptBinaryOp contained /|\(|\|=\)\?/ nextgroup=@typescriptValue skipwhite skipempty
-" 3: &&, &=, &
-syntax match   typescriptBinaryOp contained /&\(&\|=\)\?/ nextgroup=@typescriptValue skipwhite skipempty
+" 3: ||, |=, |, ||=
+syntax match   typescriptBinaryOp contained /||\?=\?/ nextgroup=@typescriptValue skipwhite skipempty
+" 4: &&, &=, &, &&=
+syntax match   typescriptBinaryOp contained /&&\?=\?/ nextgroup=@typescriptValue skipwhite skipempty
+" 2: ??, ??=
+syntax match   typescriptBinaryOp contained /??=\?/ nextgroup=@typescriptValue skipwhite skipempty
 " 2: *=, *
 syntax match   typescriptBinaryOp contained /\*=\?/ nextgroup=@typescriptValue skipwhite skipempty
 " 2: %=, %
@@ -177,11 +224,18 @@
 syntax cluster typescriptSymbols               contains=typescriptBinaryOp,typescriptKeywordOp,typescriptTernary,typescriptAssign,typescriptCastKeyword
 
 " runtime syntax/basic/reserved.vim
-
-"runtime syntax/basic/keyword.vim
 "Import
-syntax keyword typescriptImport                from as import
+syntax keyword typescriptImport                from as
+syntax keyword typescriptImport                import
+  \ nextgroup=typescriptImportType
+  \ skipwhite
+syntax keyword typescriptImportType            type
+  \ contained
 syntax keyword typescriptExport                export
+  \ nextgroup=typescriptExportType
+  \ skipwhite
+syntax match typescriptExportType              /\<type\s*{\@=/
+  \ contained skipwhite skipempty skipnl
 syntax keyword typescriptModule                namespace module
 
 "this
@@ -199,16 +253,12 @@
   \ nextgroup=@afterIdentifier
 
 syntax keyword typescriptVariable              let var
-  \ nextgroup=typescriptVariableDeclaration
-  \ skipwhite skipempty skipnl
+  \ nextgroup=@typescriptVariableDeclarations
+  \ skipwhite skipempty
 
 syntax keyword typescriptVariable const
-  \ nextgroup=typescriptEnum,typescriptVariableDeclaration
-  \ skipwhite
-
-syntax match typescriptVariableDeclaration /[A-Za-z_$]\k*/
-  \ nextgroup=typescriptTypeAnnotation,typescriptAssign
-  \ contained skipwhite skipempty skipnl
+  \ nextgroup=typescriptEnum,@typescriptVariableDeclarations
+  \ skipwhite skipempty
 
 syntax region typescriptEnum matchgroup=typescriptEnumKeyword start=/enum / end=/\ze{/
   \ nextgroup=typescriptBlock
@@ -271,7 +321,6 @@
   \ typescriptEnumKeyword,typescriptEnum,
   \ typescriptModule
 
-"runtime syntax/basic/doc.vim
 "Syntax coloring for Node.js shebang line
 syntax match   shellbang "^#!.*node\>"
 syntax match   shellbang "^#!.*iojs\>"
@@ -279,8 +328,9 @@
 
 "JavaScript comments
 syntax keyword typescriptCommentTodo TODO FIXME XXX TBD
+syntax match typescriptMagicComment "@ts-\%(ignore\|expect-error\)\>"
 syntax match   typescriptLineComment "//.*"
-  \ contains=@Spell,typescriptCommentTodo,typescriptRef
+  \ contains=@Spell,typescriptCommentTodo,typescriptRef,typescriptMagicComment
 syntax region  typescriptComment
   \ start="/\*"  end="\*/"
   \ contains=@Spell,typescriptCommentTodo extend
@@ -349,24 +399,27 @@
 
 syntax cluster typescriptDocs                  contains=typescriptDocParamType,typescriptDocNamedParamType,typescriptDocParam
 
-if main_syntax == "typescript"
+if exists("main_syntax") && main_syntax == "typescript"
   syntax sync clear
   syntax sync ccomment typescriptComment minlines=200
 endif
 
 syntax case match
 
-"runtime syntax/basic/type.vim
 " Types
 syntax match typescriptOptionalMark /?/ contained
 
+syntax cluster typescriptTypeParameterCluster contains=
+  \ typescriptTypeParameter,
+  \ typescriptGenericDefault
+
 syntax region typescriptTypeParameters matchgroup=typescriptTypeBrackets
   \ start=/</ end=/>/
-  \ contains=typescriptTypeParameter
+  \ contains=@typescriptTypeParameterCluster
   \ contained
 
 syntax match typescriptTypeParameter /\K\k*/
-  \ nextgroup=typescriptConstraint,typescriptGenericDefault
+  \ nextgroup=typescriptConstraint
   \ contained skipwhite skipnl
 
 syntax keyword typescriptConstraint extends
@@ -409,6 +462,7 @@
   \ typescriptTupleType,
   \ typescriptTypeQuery,
   \ typescriptStringLiteralType,
+  \ typescriptTemplateLiteralType,
   \ typescriptReadonlyArrayKeyword,
   \ typescriptAssertType
 
@@ -417,6 +471,17 @@
   \ nextgroup=typescriptUnion
   \ skipwhite skipempty
 
+syntax region  typescriptTemplateLiteralType contained
+  \ start=/`/  skip=/\\\\\|\\`\|\n/  end=/`\|$/
+  \ contains=typescriptTemplateSubstitutionType
+  \ nextgroup=typescriptTypeOperator
+  \ skipwhite skipempty
+
+syntax region  typescriptTemplateSubstitutionType matchgroup=typescriptTemplateSB
+  \ start=/\${/ end=/}/
+  \ contains=@typescriptType
+  \ contained
+
 syntax region typescriptParenthesizedType matchgroup=typescriptParens
   \ start=/(/ end=/)/
   \ contains=@typescriptType
@@ -439,7 +504,7 @@
   \ start=/{/ end=/}/
   \ contains=@typescriptTypeMember,typescriptEndColons,@typescriptComments,typescriptAccessibilityModifier,typescriptReadonlyModifier
   \ nextgroup=@typescriptTypeOperator
-  \ contained skipwhite fold
+  \ contained skipwhite skipnl fold
 
 syntax cluster typescriptTypeMember contains=
   \ @typescriptCallSignature,
@@ -447,16 +512,21 @@
   \ typescriptIndexSignature,
   \ @typescriptMembers
 
+syntax match typescriptTupleLable /\K\k*?\?:/
+    \ contained
+
 syntax region typescriptTupleType matchgroup=typescriptBraces
   \ start=/\[/ end=/\]/
-  \ contains=@typescriptType,@typescriptComments
+  \ contains=@typescriptType,@typescriptComments,typescriptRestOrSpread,typescriptTupleLable
   \ contained skipwhite
 
 syntax cluster typescriptTypeOperator
-  \ contains=typescriptUnion,typescriptTypeBracket
+  \ contains=typescriptUnion,typescriptTypeBracket,typescriptConstraint,typescriptConditionalType
 
 syntax match typescriptUnion /|\|&/ contained nextgroup=@typescriptPrimaryType skipwhite skipempty
 
+syntax match typescriptConditionalType /?\|:/ contained nextgroup=@typescriptPrimaryType skipwhite skipempty
+
 syntax cluster typescriptFunctionType contains=typescriptGenericFunc,typescriptFuncType
 syntax region typescriptGenericFunc matchgroup=typescriptTypeBrackets
   \ start=/</ end=/>/
@@ -511,6 +581,7 @@
 syntax cluster typescriptParameterList contains=
   \ typescriptTypeAnnotation,
   \ typescriptAccessibilityModifier,
+  \ typescriptReadonlyModifier,
   \ typescriptOptionalMark,
   \ typescriptRestOrSpread,
   \ typescriptFuncComma,
@@ -550,10 +621,9 @@
   \ nextgroup=@typescriptPrimaryType
   \ skipwhite
 
+
 " extension
 if get(g:, 'yats_host_keyword', 1)
-  "runtime syntax/yats.vim
-  "runtime syntax/yats/typescript.vim
   syntax keyword typescriptGlobal containedin=typescriptIdentifierName Function Boolean
   syntax keyword typescriptGlobal containedin=typescriptIdentifierName Error EvalError
   syntax keyword typescriptGlobal containedin=typescriptIdentifierName InternalError
@@ -584,7 +654,6 @@
   syntax cluster props add=typescriptGlobalMethod
   hi def link typescriptGlobalMethod Structure
 
-  "runtime syntax/yats/es6-number.vim
   syntax keyword typescriptGlobal containedin=typescriptIdentifierName Number nextgroup=typescriptGlobalNumberDot,typescriptFuncCallArg
   syntax match   typescriptGlobalNumberDot /\./ contained nextgroup=typescriptNumberStaticProp,typescriptNumberStaticMethod,typescriptProp
   syntax keyword typescriptNumberStaticProp contained EPSILON MAX_SAFE_INTEGER MAX_VALUE
@@ -599,7 +668,6 @@
   syntax cluster props add=typescriptNumberMethod
   hi def link typescriptNumberMethod Keyword
 
-  "runtime syntax/yats/es6-string.vim
   syntax keyword typescriptGlobal containedin=typescriptIdentifierName String nextgroup=typescriptGlobalStringDot,typescriptFuncCallArg
   syntax match   typescriptGlobalStringDot /\./ contained nextgroup=typescriptStringStaticMethod,typescriptProp
   syntax keyword typescriptStringStaticMethod contained fromCharCode fromCodePoint raw nextgroup=typescriptFuncCallArg
@@ -615,7 +683,6 @@
   syntax cluster props add=typescriptStringMethod
   hi def link typescriptStringMethod Keyword
 
-  "runtime syntax/yats/es6-array.vim
   syntax keyword typescriptGlobal containedin=typescriptIdentifierName Array nextgroup=typescriptGlobalArrayDot,typescriptFuncCallArg
   syntax match   typescriptGlobalArrayDot /\./ contained nextgroup=typescriptArrayStaticMethod,typescriptProp
   syntax keyword typescriptArrayStaticMethod contained from isArray of nextgroup=typescriptFuncCallArg
@@ -629,7 +696,6 @@
   syntax cluster props add=typescriptArrayMethod
   hi def link typescriptArrayMethod Keyword
 
-  "runtime syntax/yats/es6-object.vim
   syntax keyword typescriptGlobal containedin=typescriptIdentifierName Object nextgroup=typescriptGlobalObjectDot,typescriptFuncCallArg
   syntax match   typescriptGlobalObjectDot /\./ contained nextgroup=typescriptObjectStaticMethod,typescriptProp
   syntax keyword typescriptObjectStaticMethod contained create defineProperties defineProperty nextgroup=typescriptFuncCallArg
@@ -646,7 +712,6 @@
   syntax cluster props add=typescriptObjectMethod
   hi def link typescriptObjectMethod Keyword
 
-  "runtime syntax/yats/es6-symbol.vim
   syntax keyword typescriptGlobal containedin=typescriptIdentifierName Symbol nextgroup=typescriptGlobalSymbolDot,typescriptFuncCallArg
   syntax match   typescriptGlobalSymbolDot /\./ contained nextgroup=typescriptSymbolStaticProp,typescriptSymbolStaticMethod,typescriptProp
   syntax keyword typescriptSymbolStaticProp contained length iterator match replace
@@ -657,13 +722,11 @@
   syntax keyword typescriptSymbolStaticMethod contained for keyFor nextgroup=typescriptFuncCallArg
   hi def link typescriptSymbolStaticMethod Keyword
 
-  "runtime syntax/yats/es6-function.vim
   syntax keyword typescriptGlobal containedin=typescriptIdentifierName Function
   syntax keyword typescriptFunctionMethod contained apply bind call nextgroup=typescriptFuncCallArg
   syntax cluster props add=typescriptFunctionMethod
   hi def link typescriptFunctionMethod Keyword
 
-  "runtime syntax/yats/es6-math.vim
   syntax keyword typescriptGlobal containedin=typescriptIdentifierName Math nextgroup=typescriptGlobalMathDot,typescriptFuncCallArg
   syntax match   typescriptGlobalMathDot /\./ contained nextgroup=typescriptMathStaticProp,typescriptMathStaticMethod,typescriptProp
   syntax keyword typescriptMathStaticProp contained E LN10 LN2 LOG10E LOG2E PI SQRT1_2
@@ -677,7 +740,6 @@
   syntax keyword typescriptMathStaticMethod contained sinh sqrt tan tanh trunc nextgroup=typescriptFuncCallArg
   hi def link typescriptMathStaticMethod Keyword
 
-  "runtime syntax/yats/es6-date.vim
   syntax keyword typescriptGlobal containedin=typescriptIdentifierName Date nextgroup=typescriptGlobalDateDot,typescriptFuncCallArg
   syntax match   typescriptGlobalDateDot /\./ contained nextgroup=typescriptDateStaticMethod,typescriptProp
   syntax keyword typescriptDateStaticMethod contained UTC now parse nextgroup=typescriptFuncCallArg
@@ -699,13 +761,11 @@
   syntax cluster props add=typescriptDateMethod
   hi def link typescriptDateMethod Keyword
 
-  "runtime syntax/yats/es6-json.vim
   syntax keyword typescriptGlobal containedin=typescriptIdentifierName JSON nextgroup=typescriptGlobalJSONDot,typescriptFuncCallArg
   syntax match   typescriptGlobalJSONDot /\./ contained nextgroup=typescriptJSONStaticMethod,typescriptProp
   syntax keyword typescriptJSONStaticMethod contained parse stringify nextgroup=typescriptFuncCallArg
   hi def link typescriptJSONStaticMethod Keyword
 
-  "runtime syntax/yats/es6-regexp.vim
   syntax keyword typescriptGlobal containedin=typescriptIdentifierName RegExp nextgroup=typescriptGlobalRegExpDot,typescriptFuncCallArg
   syntax match   typescriptGlobalRegExpDot /\./ contained nextgroup=typescriptRegExpStaticProp,typescriptProp
   syntax keyword typescriptRegExpStaticProp contained lastIndex
@@ -717,7 +777,6 @@
   syntax cluster props add=typescriptRegExpMethod
   hi def link typescriptRegExpMethod Keyword
 
-  "runtime syntax/yats/es6-map.vim
   syntax keyword typescriptGlobal containedin=typescriptIdentifierName Map WeakMap
   syntax keyword typescriptES6MapProp contained size
   syntax cluster props add=typescriptES6MapProp
@@ -727,7 +786,6 @@
   syntax cluster props add=typescriptES6MapMethod
   hi def link typescriptES6MapMethod Keyword
 
-  "runtime syntax/yats/es6-set.vim
   syntax keyword typescriptGlobal containedin=typescriptIdentifierName Set WeakSet
   syntax keyword typescriptES6SetProp contained size
   syntax cluster props add=typescriptES6SetProp
@@ -737,7 +795,6 @@
   syntax cluster props add=typescriptES6SetMethod
   hi def link typescriptES6SetMethod Keyword
 
-  "runtime syntax/yats/es6-proxy.vim
   syntax keyword typescriptGlobal containedin=typescriptIdentifierName Proxy
   syntax keyword typescriptProxyAPI contained getOwnPropertyDescriptor getOwnPropertyNames
   syntax keyword typescriptProxyAPI contained defineProperty deleteProperty freeze seal
@@ -745,7 +802,6 @@
   syntax keyword typescriptProxyAPI contained iterate ownKeys apply construct
   hi def link typescriptProxyAPI Keyword
 
-  "runtime syntax/yats/es6-promise.vim
   syntax keyword typescriptGlobal containedin=typescriptIdentifierName Promise nextgroup=typescriptGlobalPromiseDot,typescriptFuncCallArg
   syntax match   typescriptGlobalPromiseDot /\./ contained nextgroup=typescriptPromiseStaticMethod,typescriptProp
   syntax keyword typescriptPromiseStaticMethod contained resolve reject all race nextgroup=typescriptFuncCallArg
@@ -754,7 +810,6 @@
   syntax cluster props add=typescriptPromiseMethod
   hi def link typescriptPromiseMethod Keyword
 
-  "runtime syntax/yats/es6-reflect.vim
   syntax keyword typescriptGlobal containedin=typescriptIdentifierName Reflect
   syntax keyword typescriptReflectMethod contained apply construct defineProperty deleteProperty nextgroup=typescriptFuncCallArg
   syntax keyword typescriptReflectMethod contained enumerate get getOwnPropertyDescriptor nextgroup=typescriptFuncCallArg
@@ -763,14 +818,12 @@
   syntax cluster props add=typescriptReflectMethod
   hi def link typescriptReflectMethod Keyword
 
-  "runtime syntax/yats/ecma-402.vim
   syntax keyword typescriptGlobal containedin=typescriptIdentifierName Intl
   syntax keyword typescriptIntlMethod contained Collator DateTimeFormat NumberFormat nextgroup=typescriptFuncCallArg
   syntax keyword typescriptIntlMethod contained PluralRules nextgroup=typescriptFuncCallArg
   syntax cluster props add=typescriptIntlMethod
   hi def link typescriptIntlMethod Keyword
 
-  "runtime syntax/yats/node.vim
   syntax keyword typescriptNodeGlobal containedin=typescriptIdentifierName global process
   syntax keyword typescriptNodeGlobal containedin=typescriptIdentifierName console Buffer
   syntax keyword typescriptNodeGlobal containedin=typescriptIdentifierName module exports
@@ -788,7 +841,6 @@
   syntax keyword typescriptTestGlobal containedin=typescriptIdentifierName afterAll
   syntax keyword typescriptTestGlobal containedin=typescriptIdentifierName expect assert
 
-  "runtime syntax/yats/web.vim
   syntax keyword typescriptBOM containedin=typescriptIdentifierName AbortController
   syntax keyword typescriptBOM containedin=typescriptIdentifierName AbstractWorker AnalyserNode
   syntax keyword typescriptBOM containedin=typescriptIdentifierName App Apps ArrayBuffer
@@ -1038,7 +1090,6 @@
   syntax keyword typescriptBOM containedin=typescriptIdentifierName XMLHttpRequestEventTarget
   hi def link typescriptBOM Structure
 
-  "runtime syntax/yats/web-window.vim
   syntax keyword typescriptBOMWindowProp containedin=typescriptIdentifierName applicationCache
   syntax keyword typescriptBOMWindowProp containedin=typescriptIdentifierName closed
   syntax keyword typescriptBOMWindowProp containedin=typescriptIdentifierName Components
@@ -1145,7 +1196,6 @@
   syntax keyword typescriptBOMWindowCons containedin=typescriptIdentifierName XMLSerializer
   hi def link typescriptBOMWindowCons Structure
 
-  "runtime syntax/yats/web-navigator.vim
   syntax keyword typescriptBOMNavigatorProp contained battery buildID connection cookieEnabled
   syntax keyword typescriptBOMNavigatorProp contained doNotTrack maxTouchPoints oscpu
   syntax keyword typescriptBOMNavigatorProp contained productSub push serviceWorker
@@ -1164,7 +1214,6 @@
   syntax cluster props add=typescriptServiceWorkerMethod
   hi def link typescriptServiceWorkerMethod Keyword
 
-  "runtime syntax/yats/web-location.vim
   syntax keyword typescriptBOMLocationProp contained href protocol host hostname port
   syntax keyword typescriptBOMLocationProp contained pathname search hash username password
   syntax keyword typescriptBOMLocationProp contained origin
@@ -1174,7 +1223,6 @@
   syntax cluster props add=typescriptBOMLocationMethod
   hi def link typescriptBOMLocationMethod Keyword
 
-  "runtime syntax/yats/web-history.vim
   syntax keyword typescriptBOMHistoryProp contained length current next previous state
   syntax keyword typescriptBOMHistoryProp contained scrollRestoration
   syntax cluster props add=typescriptBOMHistoryProp
@@ -1183,7 +1231,6 @@
   syntax cluster props add=typescriptBOMHistoryMethod
   hi def link typescriptBOMHistoryMethod Keyword
 
-  "runtime syntax/yats/web-console.vim
   syntax keyword typescriptGlobal containedin=typescriptIdentifierName console
   syntax keyword typescriptConsoleMethod contained count dir error group groupCollapsed nextgroup=typescriptFuncCallArg
   syntax keyword typescriptConsoleMethod contained groupEnd info log time timeEnd trace nextgroup=typescriptFuncCallArg
@@ -1191,7 +1238,6 @@
   syntax cluster props add=typescriptConsoleMethod
   hi def link typescriptConsoleMethod Keyword
 
-  "runtime syntax/yats/web-xhr.vim
   syntax keyword typescriptXHRGlobal containedin=typescriptIdentifierName XMLHttpRequest
   hi def link typescriptXHRGlobal Structure
   syntax keyword typescriptXHRProp contained onreadystatechange readyState response
@@ -1204,7 +1250,6 @@
   syntax cluster props add=typescriptXHRMethod
   hi def link typescriptXHRMethod Keyword
 
-  "runtime syntax/yats/web-blob.vim
   syntax keyword typescriptGlobal containedin=typescriptIdentifierName Blob BlobBuilder
   syntax keyword typescriptGlobal containedin=typescriptIdentifierName File FileReader
   syntax keyword typescriptGlobal containedin=typescriptIdentifierName FileReaderSync
@@ -1236,7 +1281,6 @@
   syntax keyword typescriptURLStaticMethod contained createObjectURL revokeObjectURL nextgroup=typescriptFuncCallArg
   hi def link typescriptURLStaticMethod Keyword
 
-  "runtime syntax/yats/web-crypto.vim
   syntax keyword typescriptCryptoGlobal containedin=typescriptIdentifierName crypto
   hi def link typescriptCryptoGlobal Structure
   syntax keyword typescriptSubtleCryptoMethod contained encrypt decrypt sign verify nextgroup=typescriptFuncCallArg
@@ -1250,7 +1294,6 @@
   syntax cluster props add=typescriptCryptoMethod
   hi def link typescriptCryptoMethod Keyword
 
-  "runtime syntax/yats/web-fetch.vim
   syntax keyword typescriptGlobal containedin=typescriptIdentifierName Headers Request
   syntax keyword typescriptGlobal containedin=typescriptIdentifierName Response
   syntax keyword typescriptGlobalMethod containedin=typescriptIdentifierName fetch nextgroup=typescriptFuncCallArg
@@ -1274,7 +1317,6 @@
   syntax cluster props add=typescriptResponseMethod
   hi def link typescriptResponseMethod Keyword
 
-  "runtime syntax/yats/web-service-worker.vim
   syntax keyword typescriptServiceWorkerProp contained controller ready
   syntax cluster props add=typescriptServiceWorkerProp
   hi def link typescriptServiceWorkerProp Keyword
@@ -1287,7 +1329,6 @@
   syntax cluster props add=typescriptCacheMethod
   hi def link typescriptCacheMethod Keyword
 
-  "runtime syntax/yats/web-encoding.vim
   syntax keyword typescriptEncodingGlobal containedin=typescriptIdentifierName TextEncoder
   syntax keyword typescriptEncodingGlobal containedin=typescriptIdentifierName TextDecoder
   hi def link typescriptEncodingGlobal Structure
@@ -1298,21 +1339,18 @@
   syntax cluster props add=typescriptEncodingMethod
   hi def link typescriptEncodingMethod Keyword
 
-  "runtime syntax/yats/web-geo.vim
   syntax keyword typescriptGlobal containedin=typescriptIdentifierName Geolocation
   syntax keyword typescriptGeolocationMethod contained getCurrentPosition watchPosition nextgroup=typescriptFuncCallArg
   syntax keyword typescriptGeolocationMethod contained clearWatch nextgroup=typescriptFuncCallArg
   syntax cluster props add=typescriptGeolocationMethod
   hi def link typescriptGeolocationMethod Keyword
 
-  "runtime syntax/yats/web-network.vim
   syntax keyword typescriptGlobal containedin=typescriptIdentifierName NetworkInformation
   syntax keyword typescriptBOMNetworkProp contained downlink downlinkMax effectiveType
   syntax keyword typescriptBOMNetworkProp contained rtt type
   syntax cluster props add=typescriptBOMNetworkProp
   hi def link typescriptBOMNetworkProp Keyword
 
-  "runtime syntax/yats/web-payment.vim
   syntax keyword typescriptGlobal containedin=typescriptIdentifierName PaymentRequest
   syntax keyword typescriptPaymentMethod contained show abort canMakePayment nextgroup=typescriptFuncCallArg
   syntax cluster props add=typescriptPaymentMethod
@@ -1340,7 +1378,6 @@
   syntax cluster props add=typescriptPaymentShippingOptionProp
   hi def link typescriptPaymentShippingOptionProp Keyword
 
-  "runtime syntax/yats/dom-node.vim
   syntax keyword typescriptDOMNodeProp contained attributes baseURI baseURIObject childNodes
   syntax keyword typescriptDOMNodeProp contained firstChild lastChild localName namespaceURI
   syntax keyword typescriptDOMNodeProp contained nextSibling nodeName nodePrincipal
@@ -1364,7 +1401,6 @@
   syntax keyword typescriptDOMNodeType contained DOCUMENT_FRAGMENT_NODE NOTATION_NODE
   hi def link typescriptDOMNodeType Keyword
 
-  "runtime syntax/yats/dom-elem.vim
   syntax keyword typescriptDOMElemAttrs contained accessKey clientHeight clientLeft
   syntax keyword typescriptDOMElemAttrs contained clientTop clientWidth id innerHTML
   syntax keyword typescriptDOMElemAttrs contained length onafterscriptexecute onbeforescriptexecute
@@ -1387,7 +1423,6 @@
   syntax keyword typescriptDOMElemFuncs contained getAttribute
   hi def link typescriptDOMElemFuncs Keyword
 
-  "runtime syntax/yats/dom-document.vim
   syntax keyword typescriptDOMDocProp contained activeElement body cookie defaultView
   syntax keyword typescriptDOMDocProp contained designMode dir domain embeds forms head
   syntax keyword typescriptDOMDocProp contained images lastModified links location plugins
@@ -1419,7 +1454,6 @@
   syntax cluster props add=typescriptDOMDocMethod
   hi def link typescriptDOMDocMethod Keyword
 
-  "runtime syntax/yats/dom-event.vim
   syntax keyword typescriptDOMEventTargetMethod contained addEventListener removeEventListener nextgroup=typescriptEventFuncCallArg
   syntax keyword typescriptDOMEventTargetMethod contained dispatchEvent waitUntil nextgroup=typescriptEventFuncCallArg
   syntax cluster props add=typescriptDOMEventTargetMethod
@@ -1480,7 +1514,6 @@
   syntax cluster props add=typescriptDOMEventMethod
   hi def link typescriptDOMEventMethod Keyword
 
-  "runtime syntax/yats/dom-storage.vim
   syntax keyword typescriptDOMStorage contained sessionStorage localStorage
   hi def link typescriptDOMStorage Keyword
   syntax keyword typescriptDOMStorageProp contained length
@@ -1491,7 +1524,6 @@
   syntax cluster props add=typescriptDOMStorageMethod
   hi def link typescriptDOMStorageMethod Keyword
 
-  "runtime syntax/yats/dom-form.vim
   syntax keyword typescriptDOMFormProp contained acceptCharset action elements encoding
   syntax keyword typescriptDOMFormProp contained enctype length method name target
   syntax cluster props add=typescriptDOMFormProp
@@ -1500,7 +1532,6 @@
   syntax cluster props add=typescriptDOMFormMethod
   hi def link typescriptDOMFormMethod Keyword
 
-  "runtime syntax/yats/css.vim
   syntax keyword typescriptDOMStyle contained alignContent alignItems alignSelf animation
   syntax keyword typescriptDOMStyle contained animationDelay animationDirection animationDuration
   syntax keyword typescriptDOMStyle contained animationFillMode animationIterationCount
@@ -1575,8 +1606,6 @@
 
 
   let typescript_props = 1
-
-  "runtime syntax/yats/event.vim
   syntax keyword typescriptAnimationEvent contained animationend animationiteration
   syntax keyword typescriptAnimationEvent contained animationstart beginEvent endEvent
   syntax keyword typescriptAnimationEvent contained repeatEvent
@@ -1710,14 +1739,12 @@
 endif
 
 " patch
-"runtime syntax/basic/patch.vim
 " patch for generated code
 syntax keyword typescriptGlobal Promise
   \ nextgroup=typescriptGlobalPromiseDot,typescriptFuncCallArg,typescriptTypeArguments oneline
 syntax keyword typescriptGlobal Map WeakMap
   \ nextgroup=typescriptGlobalPromiseDot,typescriptFuncCallArg,typescriptTypeArguments oneline
 
-"runtime syntax/basic/members.vim
 syntax keyword typescriptConstructor           contained constructor
   \ nextgroup=@typescriptCallSignature
   \ skipwhite skipempty
@@ -1725,7 +1752,7 @@
 
 syntax cluster memberNextGroup contains=typescriptMemberOptionality,typescriptTypeAnnotation,@typescriptCallSignature
 
-syntax match typescriptMember /\K\k*/
+syntax match typescriptMember /#\?\K\k*/
   \ nextgroup=@memberNextGroup
   \ contained skipwhite
 
@@ -1765,7 +1792,6 @@
   \ nextgroup=@memberNextGroup
   \ skipwhite skipempty
 
-"runtime syntax/basic/class.vim
 "don't add typescriptMembers to nextgroup, let outer scope match it
 " so we won't match abstract method outside abstract class
 syntax keyword typescriptAbstract              abstract
@@ -1781,7 +1807,7 @@
 
 syntax region typescriptClassTypeParameter
   \ start=/</ end=/>/
-  \ contains=typescriptTypeParameter
+  \ contains=@typescriptTypeParameterCluster
   \ nextgroup=typescriptClassBlock,typescriptClassExtends
   \ contained skipwhite skipnl
 
@@ -1813,7 +1839,7 @@
   \ skipwhite skipnl
 syntax region typescriptInterfaceTypeParameter
   \ start=/</ end=/>/
-  \ contains=typescriptTypeParameter
+  \ contains=@typescriptTypeParameterCluster
   \ nextgroup=typescriptObjectType,typescriptInterfaceExtends
   \ contained
   \ skipwhite skipnl
@@ -1832,7 +1858,6 @@
 
 syntax match typescriptInterfaceComma /,/ contained nextgroup=typescriptInterfaceHeritage skipwhite skipnl
 
-"runtime syntax/basic/cluster.vim
 "Block VariableStatement EmptyStatement ExpressionStatement IfStatement IterationStatement ContinueStatement BreakStatement ReturnStatement WithStatement LabelledStatement SwitchStatement ThrowStatement TryStatement DebuggerStatement
 syntax cluster typescriptStatement
   \ contains=typescriptBlock,typescriptVariable,
@@ -1872,7 +1897,6 @@
 
 syntax cluster typescriptEventExpression       contains=typescriptArrowFuncDef,typescriptParenExp,@typescriptValue,typescriptRegexpString,@typescriptEventTypes,typescriptOperator,typescriptGlobal,jsxRegion
 
-"runtime syntax/basic/function.vim
 syntax keyword typescriptAsyncFuncKeyword      async
   \ nextgroup=typescriptFuncKeyword,typescriptArrowFuncDef
   \ skipwhite
@@ -1894,7 +1918,7 @@
   \ skipwhite
 
 " destructuring ({ a: ee }) =>
-syntax match   typescriptArrowFuncDef          contained /({\_[^}]*}\(:\_[^)]\)\?)\s*=>/
+syntax match   typescriptArrowFuncDef          contained /(\(\s*\({\_[^}]*}\|\k\+\)\(:\_[^)]\)\?,\?\)\+)\s*=>/
   \ contains=typescriptArrowFuncArg,typescriptArrowFunc
   \ nextgroup=@typescriptExpression,typescriptBlock
   \ skipwhite skipempty
@@ -1913,7 +1937,7 @@
   \ skipwhite skipempty
 
 " TODO: optimize this pattern
-syntax region   typescriptArrowFuncDef          contained start=/(\_[^)]*):/ end=/=>/
+syntax region   typescriptArrowFuncDef          contained start=/(\_[^(^)]*):/ end=/=>/
   \ contains=typescriptArrowFuncArg,typescriptArrowFunc,typescriptTypeAnnotation
   \ nextgroup=@typescriptExpression,typescriptBlock
   \ skipwhite skipempty keepend
@@ -1925,7 +1949,7 @@
 syntax region typescriptReturnAnnotation contained start=/:/ end=/{/me=e-1 contains=@typescriptType nextgroup=typescriptBlock
 
 
-syntax region typescriptFuncImpl contained start=/function/ end=/{/me=e-1
+syntax region typescriptFuncImpl contained start=/function\>/ end=/{/me=e-1
   \ contains=typescriptFuncKeyword
   \ nextgroup=typescriptBlock
 
@@ -1941,9 +1965,8 @@
   \ nextgroup=typescriptReturnAnnotation,typescriptBlock
   \ contained skipwhite skipnl
 
-"runtime syntax/basic/decorator.vim
 syntax match typescriptDecorator /@\([_$a-zA-Z][_$a-zA-Z0-9]*\.\)*[_$a-zA-Z][_$a-zA-Z0-9]*\>/
-  \ nextgroup=typescriptArgumentList,typescriptTypeArguments
+  \ nextgroup=typescriptFuncCallArg,typescriptTypeArguments
   \ contains=@_semantic,typescriptDotNotation
 
 " Define the default highlighting.
@@ -1957,6 +1980,7 @@
 hi def link typescriptLineComment          Comment
 hi def link typescriptDocComment           Comment
 hi def link typescriptCommentTodo          Todo
+hi def link typescriptMagicComment         SpecialComment
 hi def link typescriptRef                  Include
 hi def link typescriptDocNotation          SpecialComment
 hi def link typescriptDocTags              SpecialComment
@@ -1970,9 +1994,11 @@
 hi def link typescriptString               String
 hi def link typescriptSpecial              Special
 hi def link typescriptStringLiteralType    String
+hi def link typescriptTemplateLiteralType  String
 hi def link typescriptStringMember         String
 hi def link typescriptTemplate             String
 hi def link typescriptEventString          String
+hi def link typescriptDestructureString    String
 hi def link typescriptASCII                Special
 hi def link typescriptTemplateSB           Label
 hi def link typescriptRegexpString         String
@@ -1986,6 +2012,7 @@
 hi def link typescriptBranch               Conditional
 hi def link typescriptIdentifier           Structure
 hi def link typescriptVariable             Identifier
+hi def link typescriptDestructureVariable  PreProc
 hi def link typescriptEnumKeyword          Identifier
 hi def link typescriptRepeat               Repeat
 hi def link typescriptForOperator          Repeat
@@ -1997,14 +2024,17 @@
 hi def link typescriptType                 Type
 hi def link typescriptNull                 Boolean
 hi def link typescriptNumber               Number
-hi def link typescriptExponent             Number
 hi def link typescriptBoolean              Boolean
 hi def link typescriptObjectLabel          typescriptLabel
+hi def link typescriptDestructureLabel     Function
 hi def link typescriptLabel                Label
+hi def link typescriptTupleLable           Label
 hi def link typescriptStringProperty       String
 hi def link typescriptImport               Special
+hi def link typescriptImportType           Special
 hi def link typescriptAmbientDeclaration   Special
 hi def link typescriptExport               Special
+hi def link typescriptExportType           Special
 hi def link typescriptModule               Special
 hi def link typescriptTry                  Special
 hi def link typescriptExceptions           Special
@@ -2013,6 +2043,7 @@
 hi def link typescriptMethodAccessor       Operator
 
 hi def link typescriptAsyncFuncKeyword     Keyword
+hi def link typescriptObjectAsyncKeyword   Keyword
 hi def link typescriptAsyncFor             Keyword
 hi def link typescriptFuncKeyword          Keyword
 hi def link typescriptAsyncFunc            Keyword
diff -Nru vim-8.2.1913/runtime/syntax/vim.vim vim-8.2.2434/runtime/syntax/vim.vim
--- vim-8.2.1913/runtime/syntax/vim.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/syntax/vim.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	Vim 8.0 script
 " Maintainer:	Charles E. Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
-" Last Change:	October 06, 2020
-" Version:	8.0-45
+" Last Change:	December 14, 2020
+" Version:	8.0-47
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_VIM
 " Automatically generated keyword lists: {{{1
 
@@ -19,12 +19,12 @@
 syn cluster vimCommentGroup	contains=vimTodo,@Spell
 
 " regular vim commands {{{2
-syn keyword vimCommand contained	a ar[gs] argl[ocal] ba[ll] bm[odified] breaka[dd] bun[load] cabc[lear] cal[l] cc cf[ile] changes cla[st] cnew[er] com cope[n] cscope debug delep dell diffg[et] dig[raphs] do dsp[lit] echom[sg] enddef eval f[ile] fina[lly] foldd[oopen] go[to] ha[rdcopy] hid[e] ij[ump] inor j[oin] keepj[umps] lab[ove] lat lc[d] le[ft] lg[etfile] lhi[story] lmapc[lear] loadkeymap lpf[ile] luafile mak[e] mks[ession] mzf[ile] nmapc[lear] nos[wapfile] opt[ions] pe[rl] pre[serve] promptr[epl] ptl[ast] pw[d] pydo pyxfile red[o] res[ize] ru[ntime] sI sIp sav[eas] sbm[odified] sce scripte[ncoding] setg[lobal] sgc sgr sign sl[eep] smile sor[t] spellr[epall] srI srn startr[eplace] sunme syn ta[g] tabf[ind] tabo[nly] tcd tf[irst] tln tmapc[lear] try una[bbreviate] unlo[ckvar] ve[rsion] vim9 vmapc[lear] wa[ll] winp[os] wundo xme xr[estore]
-syn keyword vimCommand contained	ab arga[dd] argu[ment] bad[d] bn[ext] breakd[el] bw[ipeout] cabo[ve] cat[ch] ccl[ose] cfdo chd[ir] class cnf[ile] comc[lear] cp[revious] cstag debugg[reedy] deletel delm[arks] diffo[ff] dir doau e[dit] echon endf[unction] ex files fini[sh] folddoc[losed] gr[ep] helpc[lose] his[tory] il[ist] interface ju[mps] keepp[atterns] lad[dexpr] later lch[dir] lefta[bove] lgetb[uffer] ll lne[xt] loc[kmarks] lr[ewind] lv[imgrep] marks mksp[ell] n[ext] noa nu[mber] ownsyntax ped[it] prev[ious] ps[earch] ptn[ext] py3 pyf[ile] q[uit] redi[r] ret[ab] rub[y] sIc sIr sbN[ext] sbn[ext] scg scriptv[ersion] setl[ocal] sge sh[ell] sil[ent] sla[st] sn[ext] sp[lit] spellr[rare] src srp stj[ump] sunmenu sync tab tabfir[st] tabp[revious] tch[dir] th[row] tlnoremenu tn[ext] ts[elect] undoj[oin] uns[ilent] verb[ose] vim9script vne[w] wh[ile] wn[ext] wv[iminfo] xmenu xunme
-syn keyword vimCommand contained	abc[lear] argd[elete] as[cii] bd[elete] bo[tright] breakl[ist] cN[ext] cad[dbuffer] cb[uffer] cd cfir[st] che[ckpath] cle[arjumps] cnor comp[iler] cpf[ile] cun def deletep delp diffp[atch] disa[ssemble] doaut ea el[se] endfo[r] exi[t] filet fir[st] foldo[pen] grepa[dd] helpf[ind] i imapc[lear] intro k lN[ext] laddb[uffer] lb[uffer] lcl[ose] lex[pr] lgete[xpr] lla[st] lnew[er] lockv[ar] ls lvimgrepa[dd] mat[ch] mkv[imrc] nb[key] noautocmd o[pen] p[rint] perld[o] pro ptN[ext] ptp[revious] py3do python3 qa[ll] redr[aw] retu[rn] rubyd[o] sIe sN[ext] sb[uffer] sbp[revious] sci scs sf[ind] sgi si sim[alt] sm[agic] sno[magic] spe[llgood] spellu[ndo] sre[wind] st[op] stopi[nsert] sus[pend] syncbind tabN[ext] tabl[ast] tabr[ewind] tcld[o] tj[ump] tlu tno[remap] tu[nmenu] undol[ist] up[date] vert[ical] vim[grep] vs[plit] win[size] wp[revious] x[it] xnoreme xunmenu
-syn keyword vimCommand contained	abo[veleft] argdo au bel[owright] bp[revious] bro[wse] cNf[ile] cadde[xpr] cbe[fore] cdo cg[etfile] checkt[ime] clo[se] co[py] con[tinue] cq[uit] cuna[bbrev] defc[ompile] deletl dep diffpu[t] dj[ump] dp earlier elsei[f] endt[ry] exp filetype fix[del] for gui helpg[rep] ia imp is[earch] kee[pmarks] lNf[ile] laddf[ile] lbe[fore] lcs lf[ile] lgr[ep] lli[st] lnf[ile] lol[der] lt[ag] lw[indow] menut[ranslate] mkvie[w] nbc[lose] noh[lsearch] ol[dfiles] pa[ckadd] po[p] prof[ile] pta[g] ptr[ewind] py3f[ile] pythonx quita[ll] redraws[tatus] rew[ind] rubyf[ile] sIg sa[rgument] sba[ll] sbr[ewind] scl scscope sfir[st] sgl sic sin sm[ap] snoreme spelld[ump] spellw[rong] srg sta[g] sts[elect] sv[iew] syntime tabc[lose] tabm[ove] tabs tclf[ile] tl[ast] tlunmenu to[pleft] tunma[p] unh[ide] v vi[sual] vimgrepa[dd] wN[ext] winc[md] wq xa[ll] xnoremenu xwininfo
-syn keyword vimCommand contained	addd arge[dit] bN[ext] bf[irst] br[ewind] bufdo c[hange] caddf[ile] cbel[ow] ce[nter] cgetb[uffer] chi[story] cmapc[lear] col[der] conf[irm] cr[ewind] cw[indow] delc[ommand] deletp di[splay] diffs[plit] dl dr[op] ec em[enu] endw[hile] export filt[er] fo[ld] fu[nction] gvim helpt[ags] iabc[lear] import isp[lit] keepa l[ist] laf[ter] lbel[ow] lcscope lfdo lgrepa[dd] lma lo[adview] lop[en] lua m[ove] mes[sages] mod[e] nbs[tart] nor omapc[lear] packl[oadall] popu[p] profd[el] ptf[irst] pts[elect] py3f[ile] pyx r[ead] redrawt[abline] ri[ght] rundo sIl sal[l] sbf[irst] sc scp se[t] sg sgn sie sip sme snoremenu spelli[nfo] spr[evious] sri star[tinsert] substitutepattern sw[apname] t tabd[o] tabn[ext] tags te[aroff] tlm tm[enu] tp[revious] type unl var vie[w] viu[sage] w[rite] windo wqa[ll] xmapc[lear] xprop y[ank]
-syn keyword vimCommand contained	al[l] argg[lobal] b[uffer] bl[ast] brea[k] buffers ca caf[ter] cbo[ttom] cex[pr] cgete[xpr] cl[ist] cn[ext] colo[rscheme] cons[t] cs d[elete] delel delf[unction] dif[fupdate] difft[his] dli[st] ds[earch] echoe[rr] en[dif] ene[w] exu[sage] fin[d] foldc[lose] g h[elp] hi if in iuna[bbrev] keepalt la[st] lan[guage] lbo[ttom] ld[o] lfir[st] lh[elpgrep] lmak[e] loadk lp[revious] luado ma[rk] mk[exrc] mz[scheme] new nore on[ly] pc[lose] pp[op] promptf[ind] ptj[ump] pu[t] py[thon] pyxdo rec[over] reg[isters] rightb[elow] rv[iminfo] sIn san[dbox] sbl[ast] scI scr[iptnames] setf[iletype] sgI sgp sig sir smenu so[urce] spellr[are] sr srl startg[replace] sun[hide] sy tN[ext] tabe[dit] tabnew tc[l] ter[minal] tlmenu tma[p] tr[ewind] u[ndo]
+syn keyword vimCommand contained	a ar[gs] argl[ocal] ba[ll] bl[ast] brea[k] buffers ca caf[ter] cbo[ttom] cex[pr] cgete[xpr] cl[ist] cn[ext] colo[rscheme] cons[t] cs d[elete] delel delf[unction] dif[fupdate] difft[his] dli[st] ds[earch] echoe[rr] en[dif] ene[w] exu[sage] fin[d] foldc[lose] g h[elp] hi if in iuna[bbrev] keepalt la[st] lan[guage] lbo[ttom] ld[o] lfir[st] lh[elpgrep] lmak[e] loadk lp[revious] luado ma[rk] mk[exrc] mz[scheme] new nore on[ly] pc[lose] pp[op] promptf[ind] ptj[ump] pu[t] py[thon] pyxdo rec[over] reg[isters] rightb[elow] rv[iminfo] sIn san[dbox] sbl[ast] scI scr[iptnames] setf[iletype] sgI sgp sig sir smenu so[urce] spellr[are] sr srl startg[replace] sun[hide] sy tN[ext] tabe[dit] tabnew tc[l] ter[minal] tlmenu tma[p] tr[ewind] u[ndo] unlo[ckvar] ve[rsion] vim9 vmapc[lear] wa[ll] winp[os] wundo xme xr[estore]
+syn keyword vimCommand contained	ab arga[dd] argu[ment] bad[d] bm[odified] breaka[dd] bun[load] cabc[lear] cal[l] cc cf[ile] changes cla[st] cnew[er] com cope[n] cscope debug delep dell diffg[et] dig[raphs] do dsp[lit] echom[sg] enddef eval f[ile] fina[lly] foldd[oopen] go[to] ha[rdcopy] hid[e] ij[ump] inor j[oin] keepj[umps] lab[ove] lat lc[d] le[ft] lg[etfile] lhi[story] lmapc[lear] loadkeymap lpf[ile] luafile mak[e] mks[ession] mzf[ile] nmapc[lear] nos[wapfile] opt[ions] pe[rl] pre[serve] promptr[epl] ptl[ast] pw[d] pydo pyxfile red[o] res[ize] ru[ntime] sI sIp sav[eas] sbm[odified] sce scripte[ncoding] setg[lobal] sgc sgr sign sl[eep] smile sor[t] spellr[epall] srI srn startr[eplace] sunme syn ta[g] tabf[ind] tabo[nly] tcd tf[irst] tln tmapc[lear] try una[bbreviate] uns[ilent] verb[ose] vim9script vne[w] wh[ile] wn[ext] wv[iminfo] xmenu xunme
+syn keyword vimCommand contained	abc[lear] argd[elete] as[cii] balt bn[ext] breakd[el] bw[ipeout] cabo[ve] cat[ch] ccl[ose] cfdo chd[ir] class cnf[ile] comc[lear] cp[revious] cstag debugg[reedy] deletel delm[arks] diffo[ff] dir doau e[dit] echon endf[unction] ex files fini[sh] folddoc[losed] gr[ep] helpc[lose] his[tory] il[ist] interface ju[mps] keepp[atterns] lad[dexpr] later lch[dir] lefta[bove] lgetb[uffer] ll lne[xt] loc[kmarks] lr[ewind] lv[imgrep] marks mksp[ell] n[ext] noa nu[mber] ownsyntax ped[it] prev[ious] ps[earch] ptn[ext] py3 pyf[ile] q[uit] redi[r] ret[ab] rub[y] sIc sIr sbN[ext] sbn[ext] scg scriptv[ersion] setl[ocal] sge sh[ell] sil[ent] sla[st] sn[ext] sp[lit] spellr[rare] src srp stj[ump] sunmenu sync tab tabfir[st] tabp[revious] tch[dir] th[row] tlnoremenu tn[ext] ts[elect] undoj[oin] up[date] vert[ical] vim[grep] vs[plit] win[size] wp[revious] x[it] xnoreme xunmenu
+syn keyword vimCommand contained	abo[veleft] argdo au bd[elete] bo[tright] breakl[ist] cN[ext] cad[dbuffer] cb[uffer] cd cfir[st] che[ckpath] cle[arjumps] cnor comp[iler] cpf[ile] cun def deletep delp diffp[atch] disa[ssemble] doaut ea el[se] endfo[r] exi[t] filet fir[st] foldo[pen] grepa[dd] helpf[ind] i imapc[lear] intro k lN[ext] laddb[uffer] lb[uffer] lcl[ose] lex[pr] lgete[xpr] lla[st] lnew[er] lockv[ar] ls lvimgrepa[dd] mat[ch] mkv[imrc] nb[key] noautocmd o[pen] p[rint] perld[o] pro ptN[ext] ptp[revious] py3do python3 qa[ll] redr[aw] retu[rn] rubyd[o] sIe sN[ext] sb[uffer] sbp[revious] sci scs sf[ind] sgi si sim[alt] sm[agic] sno[magic] spe[llgood] spellu[ndo] sre[wind] st[op] stopi[nsert] sus[pend] syncbind tabN[ext] tabl[ast] tabr[ewind] tcld[o] tj[ump] tlu tno[remap] tu[nmenu] undol[ist] v vi[sual] vimgrepa[dd] wN[ext] winc[md] wq xa[ll] xnoremenu xwininfo
+syn keyword vimCommand contained	addd arge[dit] bN[ext] bel[owright] bp[revious] bro[wse] cNf[ile] cadde[xpr] cbe[fore] cdo cg[etfile] checkt[ime] clo[se] co[py] con[tinue] cq[uit] cuna[bbrev] defc[ompile] deletl dep diffpu[t] dj[ump] dp earlier elsei[f] endt[ry] exp filetype fix[del] for gui helpg[rep] ia imp is[earch] kee[pmarks] lNf[ile] laddf[ile] lbe[fore] lcs lf[ile] lgr[ep] lli[st] lnf[ile] lol[der] lt[ag] lw[indow] menut[ranslate] mkvie[w] nbc[lose] noh[lsearch] ol[dfiles] pa[ckadd] po[p] prof[ile] pta[g] ptr[ewind] py3f[ile] pythonx quita[ll] redraws[tatus] rew[ind] rubyf[ile] sIg sa[rgument] sba[ll] sbr[ewind] scl scscope sfir[st] sgl sic sin sm[ap] snoreme spelld[ump] spellw[rong] srg sta[g] sts[elect] sv[iew] syntime tabc[lose] tabm[ove] tabs tclf[ile] tl[ast] tlunmenu to[pleft] tunma[p] unh[ide] var vie[w] viu[sage] w[rite] windo wqa[ll] xmapc[lear] xprop y[ank]
+syn keyword vimCommand contained	al[l] argg[lobal] b[uffer] bf[irst] br[ewind] bufdo c[hange] caddf[ile] cbel[ow] ce[nter] cgetb[uffer] chi[story] cmapc[lear] col[der] conf[irm] cr[ewind] cw[indow] delc[ommand] deletp di[splay] diffs[plit] dl dr[op] ec em[enu] endw[hile] export filt[er] fo[ld] fu[nction] gvim helpt[ags] iabc[lear] import isp[lit] keepa l[ist] laf[ter] lbel[ow] lcscope lfdo lgrepa[dd] lma lo[adview] lop[en] lua m[ove] mes[sages] mod[e] nbs[tart] nor omapc[lear] packl[oadall] popu[p] profd[el] ptf[irst] pts[elect] py3f[ile] pyx r[ead] redrawt[abline] ri[ght] rundo sIl sal[l] sbf[irst] sc scp se[t] sg sgn sie sip sme snoremenu spelli[nfo] spr[evious] sri star[tinsert] substitutepattern sw[apname] t tabd[o] tabn[ext] tags te[aroff] tlm tm[enu] tp[revious] type unl
 syn match   vimCommand contained	"\<z[-+^.=]\=\>"
 syn keyword vimStdPlugin contained	Arguments Break Cfilter Clear Continue DiffOrig Evaluate Finish Gdb Lfilter Man N[ext] Over P[rint] Program Run S Source Step Stop Termdebug TermdebugCommand TOhtml Winbar XMLent XMLns
 
@@ -66,8 +66,8 @@
 
 " AutoCmd Events {{{2
 syn case ignore
-syn keyword vimAutoEvent contained	BufAdd BufDelete BufFilePost BufHidden BufNew BufRead BufReadPost BufUnload BufWinLeave BufWipeout BufWrite BufWriteCmd BufWritePost BufWritePre CmdlineChanged CmdlineEnter CmdlineLeave CmdUndefined CmdwinEnter CmdwinLeave ColorScheme ColorSchemePre CompleteChanged CompleteDone CompleteDonePre CursorHold CursorHoldI CursorMoved CursorMovedI DiffUpdated DirChanged EncodingChanged ExitPre FileAppendCmd FileAppendPost FileAppendPre FileChangedRO FileChangedShell FileChangedShellPost FileEncoding FileReadCmd FileReadPost FileReadPre FileType FileWriteCmd FileWritePost FileWritePre FilterReadPost FilterReadPre FilterWritePost FilterWritePre FocusGained FocusLost FuncUndefined GUIEnter GUIFailed InsertChange InsertCharPre InsertEnter InsertLeave MenuPopup OptionSet QuickFixCmdPost QuickFixCmdPre QuitPre RemoteReply SafeState SafeStateAgain SessionLoadPost ShellCmdPost ShellFilterPost SigUSR1 SourceCmd SourcePost SourcePre SpellFileMissing StdinReadPost StdinReadPre SwapExists Syntax TabClosed TabEnter TabLeave TabNew TermChanged TerminalOpen TerminalWinOpen TermResponse TextChanged TextChangedI TextChangedP TextYankPost User VimEnter VimLeave VimLeavePre VimResized WinEnter WinLeave WinNew
-syn keyword vimAutoEvent contained	BufCreate BufEnter BufFilePre BufLeave BufNewFile BufReadCmd BufReadPre BufWinEnter
+syn keyword vimAutoEvent contained	BufAdd BufDelete BufFilePost BufHidden BufNew BufRead BufReadPost BufUnload BufWinLeave BufWrite BufWritePost CmdlineChanged CmdlineEnter CmdlineLeave CmdUndefined CmdwinEnter CmdwinLeave ColorScheme ColorSchemePre CompleteChanged CompleteDone CompleteDonePre CursorHold CursorHoldI CursorMoved CursorMovedI DiffUpdated DirChanged EncodingChanged ExitPre FileAppendCmd FileAppendPost FileAppendPre FileChangedRO FileChangedShell FileChangedShellPost FileEncoding FileReadCmd FileReadPost FileReadPre FileType FileWriteCmd FileWritePost FileWritePre FilterReadPost FilterReadPre FilterWritePost FilterWritePre FocusGained FocusLost FuncUndefined GUIEnter GUIFailed InsertChange InsertCharPre InsertEnter InsertLeave InsertLeavePre MenuPopup OptionSet QuickFixCmdPost QuickFixCmdPre QuitPre RemoteReply SafeState SafeStateAgain SessionLoadPost ShellCmdPost ShellFilterPost SigUSR1 SourceCmd SourcePost SourcePre SpellFileMissing StdinReadPost StdinReadPre SwapExists Syntax TabClosed TabEnter TabLeave TabNew TermChanged TerminalOpen TerminalWinOpen TermResponse TextChanged TextChangedI TextChangedP TextYankPost User VimEnter VimLeave VimLeavePre VimResized VimResume VimSuspend WinEnter WinLeave WinNew
+syn keyword vimAutoEvent contained	BufCreate BufEnter BufFilePre BufLeave BufNewFile BufReadCmd BufReadPre BufWinEnter BufWipeout BufWriteCmd BufWritePre
 
 " Highlight commonly used Groupnames {{{2
 syn keyword vimGroup contained	Comment Constant String Character Number Boolean Float Identifier Function Statement Conditional Repeat Label Operator Keyword Exception PreProc Include Define Macro PreCondit Type StorageClass Structure Typedef Special SpecialChar Tag Delimiter SpecialComment Debug Underlined Ignore Error Todo
@@ -78,11 +78,12 @@
 syn case match
 
 " Function Names {{{2
-syn keyword vimFuncName contained	abs appendbufline asin assert_fails assert_notmatch balloon_gettext bufadd bufname byteidx char2nr chdir ch_info ch_readblob ch_status complete_add cos debugbreak diff_filler escape exepath extend finddir fmod foldlevel function getbufvar getcmdline getcurpos getfsize getline getpid getregtype gettext getwinvar has_key histget iconv inputlist interrupt isnan job_start js_encode libcall list2str log mapcheck matcharg matchlist min nr2char popup_beval popup_filter_menu popup_getpos popup_move pow prompt_setinterrupt prop_list prop_type_get pyeval readdirex reltime remote_peek rename rubyeval screenpos searchdecl serverlist setcmdpos setmatches settabwinvar shiftwidth sign_place simplify soundfold spellsuggest str2float strdisplaywidth strlen strwidth synconcealed system tagfiles term_dumpdiff term_getattr term_getsize term_list term_setkill test_alloc_fail test_getvalue test_null_function test_option_not_set test_settime timer_pause toupper undofile visualmode win_execute winheight winnr win_splitmove
-syn keyword vimFuncName contained	acos argc assert_beeps assert_false assert_report balloon_show bufexists bufnr byteidxcomp charclass ch_evalexpr ch_log ch_readraw cindent complete_check cosh deepcopy diff_hlID eval exists feedkeys findfile fnameescape foldtext garbagecollect getchangelist getcmdpos getcwd getftime getloclist getpos gettabinfo getwininfo glob haslocaldir histnr indent inputrestore invert items job_status json_decode libcallnr listener_add log10 mapset matchdelete matchstr mkdir or popup_clear popup_filter_yesno popup_hide popup_notification prevnonblank prompt_setprompt prop_remove prop_type_list pyxeval readfile reltimefloat remote_read repeat screenattr screenrow searchpair setbufline setenv setpos settagstack sign_define sign_placelist sin sound_playevent split str2list strftime strpart submatch synID systemlist taglist term_dumpload term_getcursor term_getstatus term_scrape term_setrestore test_autochdir test_ignore_error test_null_job test_override test_srand_seed timer_start tr undotree wildmenumode win_findbuf win_id2tabwin winrestcmd winwidth
-syn keyword vimFuncName contained	add argidx assert_equal assert_inrange assert_true balloon_split buflisted bufwinid call ch_canread ch_evalraw ch_logfile ch_sendexpr clearmatches complete_info count delete echoraw eventhandler exp filereadable flatten fnamemodify foldtextresult get getchar getcmdtype getenv getftype getmarklist getqflist gettabvar getwinpos glob2regpat hasmapto hlexists index inputsave isdirectory job_getchannel job_stop json_encode line listener_flush luaeval match matchend matchstrpos mode pathshorten popup_close popup_findinfo popup_list popup_setoptions printf prop_add prop_type_add pum_getpos rand reduce reltimestr remote_send resolve screenchar screenstring searchpairpos setbufvar setfperm setqflist setwinvar sign_getdefined sign_undefine sinh sound_playfile sqrt str2nr strgetchar strptime substitute synIDattr tabpagebuflist tan term_dumpwrite term_getjob term_gettitle term_sendkeys term_setsize test_feedinput test_null_blob test_null_list test_refcount test_unknown timer_stop trim uniq winbufnr win_getid win_id2win winrestview wordcount
-syn keyword vimFuncName contained	and arglistid assert_equalfile assert_match atan browse bufload bufwinnr ceil ch_close ch_getbufnr ch_open ch_sendraw col confirm cscope_connection deletebufline empty executable expand filewritable float2nr foldclosed foreground getbufinfo getcharmod getcmdwintype getfontname getimstatus getmatches getreg gettabwinvar getwinposx globpath histadd hlID input inputsecret isinf job_info join keys line2byte listener_remove map matchadd matchfuzzy max mzeval perleval popup_create popup_findpreview popup_locate popup_settext prompt_getprompt prop_clear prop_type_change pumvisible range reg_executing remote_expr remote_startserver reverse screenchars search searchpos setcellwidths setline setreg sha256 sign_getplaced sign_unplace sort sound_stop srand strcharpart stridx strridx swapinfo synIDtrans tabpagenr tanh term_getaltscreen term_getline term_gettty term_setansicolors term_start test_garbagecollect_now test_null_channel test_null_partial test_scrollbar test_void timer_stopall trunc values wincol win_gettype winlayout winsaveview writefile
-syn keyword vimFuncName contained	append argv assert_exception assert_notequal atan2 browsedir bufloaded byte2line changenr ch_close_in ch_getjob ch_read ch_setoptions complete copy cursor did_filetype environ execute expandcmd filter floor foldclosedend funcref getbufline getcharsearch getcompletion getfperm getjumplist getmousepos getreginfo gettagstack getwinposy has histdel hostname inputdialog insert islocked job_setoptions js_decode len lispindent localtime maparg matchaddpos matchfuzzypos menu_info nextnonblank popup_atcursor popup_dialog popup_getoptions popup_menu popup_show prompt_setcallback prop_find prop_type_delete py3eval readdir reg_recording remote_foreground remove round screencol searchcount server2client setcharsearch setloclist settabvar shellescape sign_jump sign_unplacelist sound_clear spellbadword state strchars string strtrans swapname synstack tabpagewinnr tempname term_getansicolors term_getscrolled terminalprops term_setapi term_wait test_garbagecollect_soon test_null_dict test_null_string test_setmouse timer_info tolower type virtcol windowsversion win_gotoid winline win_screenpos xor
+syn keyword vimFuncName contained	abs argc assert_beeps assert_false assert_report balloon_show bufexists bufnr byteidxcomp charclass ch_evalexpr ch_log ch_readraw cindent complete_check cosh deepcopy diff_hlID eval exists feedkeys findfile fnameescape foldtext garbagecollect getchangelist getcmdpos getcwd getftime getloclist getpos gettabinfo getwininfo glob haslocaldir histnr indent inputrestore invert items job_status json_decode libcallnr listener_add log10 mapnew matcharg matchlist min nr2char popup_beval popup_filter_menu popup_getpos popup_move pow prompt_setinterrupt prop_list prop_type_get pyeval readdirex reltime remote_peek rename rubyeval screenpos searchdecl serverlist setcmdpos setmatches settabwinvar shiftwidth sign_place simplify soundfold spellsuggest str2float strdisplaywidth strlen strwidth synconcealed system tagfiles term_dumpdiff term_getattr term_getsize term_list term_setkill test_alloc_fail test_getvalue test_null_function test_option_not_set test_settime timer_pause toupper undofile visualmode win_execute winheight winnr win_splitmove
+syn keyword vimFuncName contained	acos argidx assert_equal assert_inrange assert_true balloon_split buflisted bufwinid call ch_canread ch_evalraw ch_logfile ch_sendexpr clearmatches complete_info count delete echoraw eventhandler exp filereadable flatten fnamemodify foldtextresult get getchar getcmdtype getenv getftype getmarklist getqflist gettabvar getwinpos glob2regpat hasmapto hlexists index inputsave isdirectory job_getchannel job_stop json_encode line listener_flush luaeval mapset matchdelete matchstr mkdir or popup_clear popup_filter_yesno popup_hide popup_notification prevnonblank prompt_setprompt prop_remove prop_type_list pyxeval readfile reltimefloat remote_read repeat screenattr screenrow searchpair setbufline setenv setpos settagstack sign_define sign_placelist sin sound_playevent split str2list strftime strpart submatch synID systemlist taglist term_dumpload term_getcursor term_getstatus term_scrape term_setrestore test_autochdir test_ignore_error test_null_job test_override test_srand_seed timer_start tr undotree wildmenumode win_findbuf win_id2tabwin winrestcmd winwidth
+syn keyword vimFuncName contained	add arglistid assert_equalfile assert_match atan browse bufload bufwinnr ceil ch_close ch_getbufnr ch_open ch_sendraw col confirm cscope_connection deletebufline empty executable expand filewritable float2nr foldclosed foreground getbufinfo getcharmod getcmdwintype getfontname getimstatus getmatches getreg gettabwinvar getwinposx globpath histadd hlID input inputsecret isinf job_info join keys line2byte listener_remove map match matchend matchstrpos mode pathshorten popup_close popup_findinfo popup_list popup_setoptions printf prop_add prop_type_add pum_getpos rand reduce reltimestr remote_send resolve screenchar screenstring searchpairpos setbufvar setfperm setqflist setwinvar sign_getdefined sign_undefine sinh sound_playfile sqrt str2nr strgetchar strptime substitute synIDattr tabpagebuflist tan term_dumpwrite term_getjob term_gettitle term_sendkeys term_setsize test_feedinput test_null_blob test_null_list test_refcount test_unknown timer_stop trim uniq winbufnr win_getid win_id2win winrestview wordcount
+syn keyword vimFuncName contained	and argv assert_exception assert_notequal atan2 browsedir bufloaded byte2line changenr ch_close_in ch_getjob ch_read ch_setoptions complete copy cursor did_filetype environ execute expandcmd filter floor foldclosedend funcref getbufline getcharsearch getcompletion getfperm getjumplist getmousepos getreginfo gettagstack getwinposy has histdel hostname inputdialog insert islocked job_setoptions js_decode len lispindent localtime maparg matchadd matchfuzzy max mzeval perleval popup_create popup_findpreview popup_locate popup_settext prompt_getprompt prop_clear prop_type_change pumvisible range reg_executing remote_expr remote_startserver reverse screenchars search searchpos setcellwidths setline setreg sha256 sign_getplaced sign_unplace sort sound_stop srand strcharpart stridx strridx swapinfo synIDtrans tabpagenr tanh term_getaltscreen term_getline term_gettty term_setansicolors term_start test_garbagecollect_now test_null_channel test_null_partial test_scrollbar test_void timer_stopall trunc values wincol win_gettype winlayout winsaveview writefile
+syn keyword vimFuncName contained	append asin assert_fails assert_notmatch balloon_gettext bufadd bufname byteidx char2nr chdir ch_info ch_readblob ch_status complete_add cos debugbreak diff_filler escape exepath extend finddir fmod foldlevel function getbufvar getcmdline getcurpos getfsize getline getpid getregtype gettext getwinvar has_key histget iconv inputlist interrupt isnan job_start js_encode libcall list2str log mapcheck matchaddpos matchfuzzypos menu_info nextnonblank popup_atcursor popup_dialog popup_getoptions popup_menu popup_show prompt_setcallback prop_find prop_type_delete py3eval readdir reg_recording remote_foreground remove round screencol searchcount server2client setcharsearch setloclist settabvar shellescape sign_jump sign_unplacelist sound_clear spellbadword state strchars string strtrans swapname synstack tabpagewinnr tempname term_getansicolors term_getscrolled terminalprops term_setapi term_wait test_garbagecollect_soon test_null_dict test_null_string test_setmouse timer_info tolower type virtcol windowsversion win_gotoid winline win_screenpos xor
+syn keyword vimFuncName contained	appendbufline
 
 "--- syntax here and above generated by mkvimvim ---
 " Special Vim Highlighting (not automatic) {{{1
@@ -169,10 +170,13 @@
 
 " Numbers {{{2
 " =======
-syn match vimNumber	"\<\d\+\%(\.\d\+\%([eE][+-]\=\d\+\)\=\)\=" skipwhite nextgroup=vimGlobal,vimSubst,vimCommand,vimComment,vim9Comment
-syn match vimNumber	"-\d\+\%(\.\d\+\%([eE][+-]\=\d\+\)\=\)\="  skipwhite nextgroup=vimGlobal,vimSubst,vimCommand,vimComment,vim9Comment
-syn match vimNumber	"\<0[xX]\x\+"		       skipwhite nextgroup=vimGlobal,vimSubst,vimCommand,vimComment,vim9Comment
-syn match vimNumber	"\%(^\|\A\)\zs#\x\{6}"             	       skipwhite nextgroup=vimGlobal,vimSubst,vimCommand,vimComment,vim9Comment
+syn match vimNumber	'\<\d\+\%(\.\d\+\%([eE][+-]\=\d\+\)\=\)\=' skipwhite nextgroup=vimGlobal,vimSubst,vimCommand,vimComment,vim9Comment
+syn match vimNumber	'-\d\+\%(\.\d\+\%([eE][+-]\=\d\+\)\=\)\='  skipwhite nextgroup=vimGlobal,vimSubst,vimCommand,vimComment,vim9Comment
+syn match vimNumber	'\<0[xX]\x\+'		       skipwhite nextgroup=vimGlobal,vimSubst,vimCommand,vimComment,vim9Comment
+syn match vimNumber	'\%(^\|\A\)\zs#\x\{6}'             	       skipwhite nextgroup=vimGlobal,vimSubst,vimCommand,vimComment,vim9Comment
+syn match vimNumber	'\<0[zZ][a-zA-Z0-9.]\+'                    skipwhite nextgroup=vimGlobal,vimSubst,vimCommand,vimComment,vim9Comment
+syn match vimNumber	'0[0-7]\+'		       skipwhite nextgroup=vimGlobal,vimSubst,vimCommand,vimComment,vim9Comment           
+syn match vimNumber	'0b[01]\+'		       skipwhite nextgroup=vimGlobal,vimSubst,vimCommand,vimComment,vim9Comment           
 
 " All vimCommands are contained by vimIsCommand. {{{2
 syn match vimCmdSep	"[:|]\+"	skipwhite nextgroup=vimAddress,vimAutoCmd,vimEcho,vimIsCommand,vimExtCmd,vimFilter,vimLet,vimMap,vimMark,vimSet,vimSyntax,vimUserCmd
@@ -228,7 +232,7 @@
 syn match	vimOper	"\(\<is\|\<isnot\)[?#]\{0,2}\>"			skipwhite nextgroup=vimString,vimSpecFile
 syn match	vimOper	"||\|&&\|[-+.!]"				skipwhite nextgroup=vimString,vimSpecFile
 syn region	vimOperParen 	matchgroup=vimParenSep	start="(" end=")" contains=vimoperStar,@vimOperGroup
-syn region	vimOperParen	matchgroup=vimSep		start="{" end="}" contains=@vimOperGroup nextgroup=vimVar,vimFuncVar
+syn region	vimOperParen	matchgroup=vimSep		start="#\={" end="}" contains=@vimOperGroup nextgroup=vimVar,vimFuncVar
 if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_noopererror")
  syn match	vimOperError	")"
 endif
@@ -383,12 +387,12 @@
 syn region	vimSet		matchgroup=vimCommand start="\<\%(setl\%[ocal]\|setg\%[lobal]\|se\%[t]\)\>" skip="\%(\\\\\)*\\." end="$" end="|" matchgroup=vimNotation end="<[cC][rR]>" keepend oneline contains=vimSetEqual,vimOption,vimErrSetting,vimComment,vim9Comment,vimSetString,vimSetMod
 syn region	vimSetEqual	contained	start="[=:]\|[-+^]=" skip="\\\\\|\\\s" end="[| \t]\|$"me=e-1	contains=vimCtrlChar,vimSetSep,vimNotation,vimEnvvar oneline
 syn region	vimSetString	contained	start=+="+hs=s+1	skip=+\\\\\|\\"+  end=+"+		contains=vimCtrlChar
-syn match	vimSetSep	contained	"[,:]" skipwhite nextgroup=vimCommand
+syn match	vimSetSep	contained	"[,:]"
 syn match	vimSetMod	contained	"&vim\=\|[!&?<]\|all&"
 
 " Let: {{{2
 " ===
-syn keyword	vimLet	let var	unl[et]	skipwhite nextgroup=vimVar,vimFuncVar,vimLetHereDoc
+syn keyword	vimLet	let	unl[et]	skipwhite nextgroup=vimVar,vimFuncVar,vimLetHereDoc
 VimFoldh syn region vimLetHereDoc	matchgroup=vimLetHereDocStart start='=<<\s\+\%(trim\>\)\=\s*\z(\L\S*\)'	matchgroup=vimLetHereDocStop end='^\s*\z1\s*$'	contains=vimComment,vim9Comment
 
 " Abbreviations: {{{2
@@ -442,7 +446,7 @@
 " Angle-Bracket Notation: (tnx to Michael Geddes) {{{2
 " ======================
 syn case ignore
-syn match	vimNotation	"\%#=1\(\\\|<lt>\)\=<\([scamd]-\)\{0,4}x\=\(f\d\{1,2}\|[^ \t:]\|cr\|lf\|linefeed\|return\|k\=del\%[ete]\|bs\|backspace\|tab\|esc\|right\|left\|help\|undo\|insert\|ins\|mouse\|k\=home\|k\=end\|kplus\|kminus\|kdivide\|kmultiply\|kenter\|kpoint\|space\|k\=\(page\)\=\(\|down\|up\|k\d\>\)\)>" contains=vimBracket
+syn match	vimNotation	"\%#=1\(\\\|<lt>\)\=<\([scamd]-\)\{0,4}x\=\(f\d\{1,2}\|[^ \t:]\|cmd\|cr\|lf\|linefeed\|return\|k\=del\%[ete]\|bs\|backspace\|tab\|esc\|right\|left\|help\|undo\|insert\|ins\|mouse\|k\=home\|k\=end\|kplus\|kminus\|kdivide\|kmultiply\|kenter\|kpoint\|space\|k\=\(page\)\=\(\|down\|up\|k\d\>\)\)>" contains=vimBracket
 syn match	vimNotation	"\%#=1\(\\\|<lt>\)\=<\([scam2-4]-\)\{0,4}\(right\|left\|middle\)\(mouse\)\=\(drag\|release\)\=>"	contains=vimBracket
 syn match	vimNotation	"\%#=1\(\\\|<lt>\)\=<\(bslash\|plug\|sid\|space\|bar\|nop\|nul\|lt\)>"			contains=vimBracket
 syn match	vimNotation	'\(\\\|<lt>\)\=<C-R>[0-9a-z"%#:.\-=]'he=e-1				contains=vimBracket
@@ -637,7 +641,7 @@
 " Beginners - Patterns that involve ^ {{{2
 " =========
 syn match	vimLineComment	+^[ \t:]*".*$+	contains=@vimCommentGroup,vimCommentString,vimCommentTitle
-syn match	vim9LineComment	+^[ \t]*#.*$+	contains=@vimCommentGroup,vimCommentString,vimCommentTitle
+syn match	vim9LineComment	+^[ \t:]\+#.*$+	contains=@vimCommentGroup,vimCommentString,vimCommentTitle
 syn match	vimCommentTitle	'"\s*\%([sS]:\|\h\w*#\)\=\u\w*\(\s\+\u\w*\)*:'hs=s+1	contained contains=vimCommentTitleLeader,vimTodo,@vimCommentGroup
 syn match	vimContinue	"^\s*\\"
 syn region	vimString	start="^\s*\\\z(['"]\)" skip='\\\\\|\\\z1' end="\z1" oneline keepend contains=@vimStringGroup,vimContinue
diff -Nru vim-8.2.1913/runtime/syntax/zsh.vim vim-8.2.2434/runtime/syntax/zsh.vim
--- vim-8.2.1913/runtime/syntax/zsh.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/syntax/zsh.vim	2021-01-30 22:05:11.000000000 +0000
@@ -2,7 +2,7 @@
 " Language:             Zsh shell script
 " Maintainer:           Christian Brabandt <cb@256bit.org>
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2020-01-23
+" Latest Revision:      2020-11-21
 " License:              Vim (see :h license)
 " Repository:           https://github.com/chrisbra/vim-zsh
 
@@ -14,7 +14,7 @@
 set cpo&vim
 
 function! s:ContainedGroup()
-	" needs 7.4.2008 for execute() function
+  " needs 7.4.2008 for execute() function
   let result='TOP'
     " vim-pandoc syntax defines the @langname cluster for embedded syntax languages
     " However, if no syntax is defined yet, `syn list @zsh` will return
@@ -41,16 +41,6 @@
     setlocal foldmethod=syntax
 endif
 
-syn keyword zshTodo             contained TODO FIXME XXX NOTE
-
-syn region  zshComment          oneline start='\%(^\|\s\+\)#' end='$'
-                                \ contains=zshTodo,@Spell fold
-
-syn region  zshComment          start='^\s*#' end='^\%(\s*#\)\@!'
-                                \ contains=zshTodo,@Spell fold
-
-syn match   zshPreProc          '^\%1l#\%(!\|compdef\|autoload\).*$'
-
 syn match   zshPOSIXQuoted      '\\[xX][0-9a-fA-F]\{1,2}'
 syn match   zshPOSIXQuoted      '\\[0-7]\{1,3}'
 syn match   zshPOSIXQuoted      '\\u[0-9a-fA-F]\{1,4}'
@@ -188,11 +178,13 @@
       \ \%(\%(\<no_\?\)\?casematch\>\)\|\%(\%(no_\?\)\?case_match\>\)\|
       \ \%(\%(\<no_\?\)\?cbases\>\)\|\%(\%(no_\?\)\?c_bases\>\)\|
       \ \%(\%(\<no_\?\)\?cdablevars\>\)\|\%(\%(no_\?\)\?cdable_vars\>\)\|\%(\%(no_\?\)\?cd_able_vars\>\)\|
+      \ \%(\%(\<no_\?\)\?cdsilent\>\)\|\%(\%(no_\?\)\?cd_silent\>\)\|\%(\%(no_\?\)\?cd_silent\>\)\|
       \ \%(\%(\<no_\?\)\?chasedots\>\)\|\%(\%(no_\?\)\?chase_dots\>\)\|
       \ \%(\%(\<no_\?\)\?chaselinks\>\)\|\%(\%(no_\?\)\?chase_links\>\)\|
       \ \%(\%(\<no_\?\)\?checkjobs\>\)\|\%(\%(no_\?\)\?check_jobs\>\)\|
       \ \%(\%(\<no_\?\)\?checkrunningjobs\>\)\|\%(\%(no_\?\)\?check_running_jobs\>\)\|
       \ \%(\%(\<no_\?\)\?clobber\>\)\|
+      \ \%(\%(\<no_\?\)\?clobberempty\>\)\|\%(\%(no_\?\)\?clobber_empty\>\)\|
       \ \%(\%(\<no_\?\)\?combiningchars\>\)\|\%(\%(no_\?\)\?combining_chars\>\)\|
       \ \%(\%(\<no_\?\)\?completealiases\>\)\|\%(\%(no_\?\)\?complete_aliases\>\)\|
       \ \%(\%(\<no_\?\)\?completeinword\>\)\|\%(\%(no_\?\)\?complete_in_word\>\)\|
@@ -333,6 +325,7 @@
       \ \%(\%(\<no_\?\)\?shnullcmd\>\)\|\%(\%(no_\?\)\?sh_nullcmd\>\)\|
       \ \%(\%(\<no_\?\)\?shoptionletters\>\)\|\%(\%(no_\?\)\?sh_option_letters\>\)\|
       \ \%(\%(\<no_\?\)\?shortloops\>\)\|\%(\%(no_\?\)\?short_loops\>\)\|
+      \ \%(\%(\<no_\?\)\?shortrepeat\>\)\|\%(\%(no_\?\)\?short_repeat\>\)\|
       \ \%(\%(\<no_\?\)\?shwordsplit\>\)\|\%(\%(no_\?\)\?sh_word_split\>\)\|
       \ \%(\%(\<no_\?\)\?singlecommand\>\)\|\%(\%(no_\?\)\?single_command\>\)\|
       \ \%(\%(\<no_\?\)\?singlelinezle\>\)\|\%(\%(no_\?\)\?single_line_zle\>\)\|
@@ -351,6 +344,8 @@
       \ \%(\%(\<no_\?\)\?xtrace\>\)\|
       \ \%(\%(\<no_\?\)\?zle\>\)/ nextgroup=zshOption,zshComment skipwhite contained
 
+syn case match
+
 syn keyword zshTypes            float integer local typeset declare private readonly
 
 " XXX: this may be too much
@@ -368,7 +363,7 @@
 syn region  zshParentheses      transparent start='(' skip='\\)' end=')' fold
 syn region  zshGlob             start='(#' end=')'
 syn region  zshMathSubst        matchgroup=zshSubstDelim transparent
-                                \ start='\$((' skip='\\)' end='))'
+                                \ start='\%(\$\?\)[<=>]\@<!((' skip='\\)' end='))'
                                 \ contains=zshParentheses,@zshSubst,zshNumber,
                                 \ @zshDerefs,zshString keepend fold
 " The ms=s+1 prevents matching zshBrackets several times on opening brackets
@@ -385,6 +380,16 @@
 syn sync    match zshHereDocSync    grouphere   NONE '<<-\=\s*\%(\\\=\S\+\|\(["']\)\S\+\1\)'
 syn sync    match zshHereDocEndSync groupthere  NONE '^\s*EO\a\+\>'
 
+syn keyword zshTodo             contained TODO FIXME XXX NOTE
+
+syn region  zshComment          oneline start='\%(^\|\s\+\)#' end='$'
+                                \ contains=zshTodo,@Spell fold
+
+syn region  zshComment          start='^\s*#' end='^\%(\s*#\)\@!'
+                                \ contains=zshTodo,@Spell fold
+
+syn match   zshPreProc          '^\%1l#\%(!\|compdef\|autoload\).*$'
+
 hi def link zshTodo             Todo
 hi def link zshComment          Comment
 hi def link zshPreProc          PreProc
diff -Nru vim-8.2.1913/runtime/tools/emoji_list.vim vim-8.2.2434/runtime/tools/emoji_list.vim
--- vim-8.2.1913/runtime/tools/emoji_list.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/tools/emoji_list.vim	2021-01-30 22:05:11.000000000 +0000
@@ -9,9 +9,9 @@
 
 " Use a compiled Vim9 function for speed
 def DoIt()
-  let lnum = 1
+  var lnum = 1
   for c in range(0x100, 0x1ffff)
-    let cs = nr2char(c)
+    var cs = nr2char(c)
     if charclass(cs) == 3
       setline(lnum, '|' .. cs .. '| ' .. strwidth(cs))
       lnum += 1
diff -Nru vim-8.2.1913/runtime/tutor/tutor vim-8.2.2434/runtime/tutor/tutor
--- vim-8.2.1913/runtime/tutor/tutor	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/tutor/tutor	2021-01-30 22:05:11.000000000 +0000
@@ -319,7 +319,7 @@
 --->  6)  Sugar is sweet
 --->  7)  And so are you.
 
-Doubling to operate on a line also works for operators mentioned below
+Doubling to operate on a line also works for operators mentioned below.
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			 Lesson 2.7: THE UNDO COMMAND
@@ -433,7 +433,7 @@
 ---> This line has a few words that need changing using the change operator.
 
 Notice that  ce  deletes the word and places you in Insert mode.
-             cc  does the same for the whole line
+             cc  does the same for the whole line.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -804,7 +804,7 @@
       b)
 
   NOTE: You can also use  y  as an operator:  yw  yanks one word,
-        yy  yanks the whole line, then  p  puts that line
+        yy  yanks the whole line, then  p  puts that line.
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			    Lesson 6.5: SET OPTION
 
diff -Nru vim-8.2.1913/runtime/tutor/tutor.fr vim-8.2.2434/runtime/tutor/tutor.fr
--- vim-8.2.1913/runtime/tutor/tutor.fr	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/tutor/tutor.fr	2021-01-30 22:05:11.000000000 +0000
@@ -906,9 +906,9 @@
      soit appuyé.
 
   6. Taper  ":set xxx"  active l'option "xxx". Quelques options sont :
-        'ic'  'ingnorecase' pour ignorer la casse lors des recherches.
-        'is'  'incsearch'   pour montrer les appariements partiels.
-        'hls' 'hlsearch'    pour mettre en surbrillance les appariements.
+        'ic'  'ignorecase' pour ignorer la casse lors des recherches.
+        'is'  'incsearch'  pour montrer les appariements partiels.
+        'hls' 'hlsearch'   pour mettre en surbrillance les appariements.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff -Nru vim-8.2.1913/runtime/tutor/tutor.fr.utf-8 vim-8.2.2434/runtime/tutor/tutor.fr.utf-8
--- vim-8.2.1913/runtime/tutor/tutor.fr.utf-8	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/tutor/tutor.fr.utf-8	2021-01-30 22:05:11.000000000 +0000
@@ -906,9 +906,9 @@
      soit appuyé.
 
   6. Taper  ":set xxx"  active l'option "xxx". Quelques options sont :
-        'ic'  'ingnorecase' pour ignorer la casse lors des recherches.
-        'is'  'incsearch'   pour montrer les appariements partiels.
-        'hls' 'hlsearch'    pour mettre en surbrillance les appariements.
+        'ic'  'ignorecase' pour ignorer la casse lors des recherches.
+        'is'  'incsearch'  pour montrer les appariements partiels.
+        'hls' 'hlsearch'   pour mettre en surbrillance les appariements.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff -Nru vim-8.2.1913/runtime/tutor/tutor.ko vim-8.2.2434/runtime/tutor/tutor.ko
--- vim-8.2.1913/runtime/tutor/tutor.ko	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/tutor/tutor.ko	2021-01-30 22:05:11.000000000 +0000
@@ -907,7 +907,7 @@
   
   5. <TAB> � 눌러 ":edit" 명령어를 완성해 봅니다. 
   
-  6. �제 빈칸 하나를 추가한 뒤, 존재 파� �름� 앞 부분� 입력합니다:  :edit FIL
+  6. �제 빈칸 하나를 추가한 뒤, 존재하는 파� �름� 앞 부분� 입력합니다:  :edit FIL
 
   7. <TAB> � 눌러 파� �름� 완성 시킵니다. 
   
diff -Nru vim-8.2.1913/runtime/tutor/tutor.ko.euc vim-8.2.2434/runtime/tutor/tutor.ko.euc
--- vim-8.2.1913/runtime/tutor/tutor.ko.euc	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/tutor/tutor.ko.euc	2021-01-30 22:05:11.000000000 +0000
@@ -907,7 +907,7 @@
   
   5. <TAB> À» ´­·¯ ":edit" ¸í·É¾î¸¦ ¿Ï¼ºÇØ º¾´Ï´Ù. 
   
-  6. ÀÌÁ¦ ºóÄ­ Çϳª¸¦ Ãß°¡ÇÑ µÚ, Á¸Àç ÆÄÀÏ À̸§À» ¾Õ ºÎºÐÀ» ÀÔ·ÂÇÕ´Ï´Ù:  :edit FIL
+  6. ÀÌÁ¦ ºóÄ­ Çϳª¸¦ Ãß°¡ÇÑ µÚ, Á¸ÀçÇÏ´Â ÆÄÀÏ À̸§ÀÇ ¾Õ ºÎºÐÀ» ÀÔ·ÂÇÕ´Ï´Ù:  :edit FIL
 
   7. <TAB> À» ´­·¯ ÆÄÀÏ À̸§À» ¿Ï¼º ½Ãŵ´Ï´Ù. 
   
diff -Nru vim-8.2.1913/runtime/tutor/tutor.ko.utf-8 vim-8.2.2434/runtime/tutor/tutor.ko.utf-8
--- vim-8.2.1913/runtime/tutor/tutor.ko.utf-8	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/tutor/tutor.ko.utf-8	2021-01-30 22:05:11.000000000 +0000
@@ -907,7 +907,7 @@
   
   5. <TAB> � 눌러 ":edit" 명령어를 완성해 봅니다. 
   
-  6. �제 빈칸 하나를 추가한 뒤, 존재 파� �름� 앞 부분� 입력합니다:  :edit FIL
+  6. �제 빈칸 하나를 추가한 뒤, 존재하는 파� �름� 앞 부분� 입력합니다:  :edit FIL
 
   7. <TAB> � 눌러 파� �름� 완성 시킵니다. 
   
diff -Nru vim-8.2.1913/runtime/tutor/tutor.utf-8 vim-8.2.2434/runtime/tutor/tutor.utf-8
--- vim-8.2.1913/runtime/tutor/tutor.utf-8	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/tutor/tutor.utf-8	2021-01-30 22:05:11.000000000 +0000
@@ -319,7 +319,7 @@
 --->  6)  Sugar is sweet
 --->  7)  And so are you.
 
-Doubling to operate on a line also works for operators mentioned below
+Doubling to operate on a line also works for operators mentioned below.
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			 Lesson 2.7: THE UNDO COMMAND
@@ -433,7 +433,7 @@
 ---> This line has a few words that need changing using the change operator.
 
 Notice that  ce  deletes the word and places you in Insert mode.
-             cc  does the same for the whole line
+             cc  does the same for the whole line.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -804,7 +804,7 @@
       b)
 
   NOTE: You can also use  y  as an operator:  yw  yanks one word,
-        yy  yanks the whole line, then  p  puts that line
+        yy  yanks the whole line, then  p  puts that line.
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			    Lesson 6.5: SET OPTION
 
diff -Nru vim-8.2.1913/runtime/vim.desktop vim-8.2.2434/runtime/vim.desktop
--- vim-8.2.1913/runtime/vim.desktop	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/runtime/vim.desktop	2021-01-30 22:05:11.000000000 +0000
@@ -15,7 +15,7 @@
 GenericName[fr]=Éditeur de texte
 GenericName[ja]=テキストエディタ
 GenericName[ru]=Тек�товый редактор
-GenericName[sr]=Тек�т Едитор
+GenericName[sr]=Едитор тек�т
 GenericName[tr]=Metin Düzenleyici
 GenericName=Text Editor
 # Translators: This is the comment used in the Vim desktop file
@@ -24,7 +24,7 @@
 Comment[fr]=Éditer des fichiers texte
 Comment[ja]=テキストファイルを編集���
 Comment[ru]=Редактирование тек�товых файлов
-Comment[sr]=Уређивање тек�т фајлова
+Comment[sr]=Уређујте тек�т фајлове
 Comment[tr]=Metin dosyaları düzenleyin
 Comment=Edit text files
 # The translations should come from the po file. Leave them here for now, they will
@@ -112,7 +112,6 @@
 Icon[eo]=gvim
 Icon[fr]=gvim
 Icon[ru]=gvim
-Icon[sr]=gvim
 Icon=gvim
 Categories=Utility;TextEditor;
 StartupNotify=false
diff -Nru vim-8.2.1913/src/arglist.c vim-8.2.2434/src/arglist.c
--- vim-8.2.1913/src/arglist.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/arglist.c	2021-01-30 22:05:11.000000000 +0000
@@ -17,12 +17,29 @@
 #define AL_ADD	2
 #define AL_DEL	3
 
+// This flag is set whenever the argument list is being changed and calling a
+// function that might trigger an autocommand.
+static int arglist_locked = FALSE;
+
+    static int
+check_arglist_locked(void)
+{
+    if (arglist_locked)
+    {
+	emsg(_(e_cannot_change_arglist_recursively));
+	return FAIL;
+    }
+    return OK;
+}
+
 /*
  * Clear an argument list: free all file names and reset it to zero entries.
  */
     void
 alist_clear(alist_T *al)
 {
+    if (check_arglist_locked() == FAIL)
+	return;
     while (--al->al_ga.ga_len >= 0)
 	vim_free(AARGLIST(al)[al->al_ga.ga_len].ae_fname);
     ga_clear(&al->al_ga);
@@ -126,14 +143,9 @@
     int		fnum_len)
 {
     int		i;
-    static int  recursive = 0;
 
-    if (recursive)
-    {
-	emsg(_(e_au_recursive));
+    if (check_arglist_locked() == FAIL)
 	return;
-    }
-    ++recursive;
 
     alist_clear(al);
     if (ga_grow(&al->al_ga, count) == OK)
@@ -152,7 +164,11 @@
 	    // May set buffer name of a buffer previously used for the
 	    // argument list, so that it's re-used by alist_add.
 	    if (fnum_list != NULL && i < fnum_len)
+	    {
+		arglist_locked = TRUE;
 		buf_set_name(fnum_list[i], files[i]);
+		arglist_locked = FALSE;
+	    }
 
 	    alist_add(al, files[i], use_curbuf ? 2 : 1);
 	    ui_breakcheck();
@@ -163,8 +179,6 @@
 	FreeWild(count, files);
     if (al == &global_alist)
 	arg_had_last = FALSE;
-
-    --recursive;
 }
 
 /*
@@ -179,6 +193,10 @@
 {
     if (fname == NULL)		// don't add NULL file names
 	return;
+    if (check_arglist_locked() == FAIL)
+	return;
+    arglist_locked = TRUE;
+
 #ifdef BACKSLASH_IN_FILENAME
     slash_adjust(fname);
 #endif
@@ -187,6 +205,8 @@
 	AARGLIST(al)[al->al_ga.ga_len].ae_fnum =
 	    buflist_add(fname, BLN_LISTED | (set_fnum == 2 ? BLN_CURBUF : 0));
     ++al->al_ga.ga_len;
+
+    arglist_locked = FALSE;
 }
 
 #if defined(BACKSLASH_IN_FILENAME) || defined(PROTO)
@@ -295,10 +315,10 @@
 	return FAIL;
     if (wig == TRUE)
 	i = expand_wildcards(ga.ga_len, (char_u **)ga.ga_data,
-					fcountp, fnamesp, EW_FILE|EW_NOTFOUND);
+			     fcountp, fnamesp, EW_FILE|EW_NOTFOUND|EW_NOTWILD);
     else
 	i = gen_expand_wildcards(ga.ga_len, (char_u **)ga.ga_data,
-					fcountp, fnamesp, EW_FILE|EW_NOTFOUND);
+			     fcountp, fnamesp, EW_FILE|EW_NOTFOUND|EW_NOTWILD);
 
     ga_clear(&ga);
     return i;
@@ -334,7 +354,8 @@
     int		i;
     int		old_argcount = ARGCOUNT;
 
-    if (ga_grow(&ALIST(curwin)->al_ga, count) == OK)
+    if (check_arglist_locked() != FAIL
+	    && ga_grow(&ALIST(curwin)->al_ga, count) == OK)
     {
 	if (after < 0)
 	    after = 0;
@@ -343,6 +364,7 @@
 	if (after < ARGCOUNT)
 	    mch_memmove(&(ARGLIST[after + count]), &(ARGLIST[after]),
 				       (ARGCOUNT - after) * sizeof(aentry_T));
+	arglist_locked = TRUE;
 	for (i = 0; i < count; ++i)
 	{
 	    int flags = BLN_LISTED | (will_edit ? BLN_CURBUF : 0);
@@ -350,6 +372,7 @@
 	    ARGLIST[after + i].ae_fname = files[i];
 	    ARGLIST[after + i].ae_fnum = buflist_add(files[i], flags);
 	}
+	arglist_locked = FALSE;
 	ALIST(curwin)->al_ga.ga_len += count;
 	if (old_argcount > 0 && curwin->w_arg_idx >= after)
 	    curwin->w_arg_idx += count;
@@ -382,6 +405,9 @@
     int		match;
     int		arg_escaped = TRUE;
 
+    if (check_arglist_locked() == FAIL)
+	return FAIL;
+
     // Set default argument for ":argadd" command.
     if (what == AL_ADD && *str == NUL)
     {
@@ -409,7 +435,7 @@
 	    p = file_pat_to_reg_pat(p, NULL, NULL, FALSE);
 	    if (p == NULL)
 		break;
-	    regmatch.regprog = vim_regcomp(p, p_magic ? RE_MAGIC : 0);
+	    regmatch.regprog = vim_regcomp(p, magic_isset() ? RE_MAGIC : 0);
 	    if (regmatch.regprog == NULL)
 	    {
 		vim_free(p);
@@ -776,6 +802,9 @@
     int		i;
     int		n;
 
+    if (check_arglist_locked() == FAIL)
+	return;
+
     if (eap->addr_count > 0 || *eap->arg == NUL)
     {
 	// ":argdel" works like ":.argdel"
@@ -884,6 +913,13 @@
     win_T	*new_curwin = NULL;
     tabpage_T	*new_curtab = NULL;
 
+#ifdef FEAT_CMDWIN
+    if (cmdwin_type != 0)
+    {
+	emsg(_(e_cmdwin));
+	return;
+    }
+#endif
     if (ARGCOUNT <= 0)
     {
 	// Don't give an error message.  We don't want it when the ":all"
diff -Nru vim-8.2.1913/src/auto/configure vim-8.2.2434/src/auto/configure
--- vim-8.2.1913/src/auto/configure	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/auto/configure	2021-01-30 22:05:11.000000000 +0000
@@ -4510,9 +4510,9 @@
   CLANG_VERSION=`expr $CLANG_MAJOR '*' 1000000 '+' $CLANG_MINOR '*' 1000 '+' $CLANG_REVISION`
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CLANG_VERSION" >&5
 $as_echo "$CLANG_VERSION" >&6; }
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking if clang supports -fno-strength-reduce" >&5
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking if clang supports -fno-strength-reduce" >&5
 $as_echo_n "checking if clang supports -fno-strength-reduce... " >&6; }
-  if test "$CLANG_VERSION" -ge 500002075 ; then
+  if test "$CLANG_MAJOR" -ge 10 -o "$CLANG_VERSION" -ge 500002075 ; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
     CFLAGS=`echo "$CFLAGS" | sed -e 's/-fno-strength-reduce/ /'`
@@ -5006,9 +5006,9 @@
 fi
 
 if test "$zOSUnix" = "yes"; then
-    QUOTESED="sed -e 's/[\\\\\"]/\\\\\\\\&/g' -e 's/\\\\\\\\\"/\"/' -e 's/\\\\\\\\\";\$\$/\";/'"
+    QUOTESED="sed -e 's/[\\\\\"]/\\\\\\\\&/g' -e 's/\\\\\\\\\"/\"/' -e 's/\\\\\\\\\";\$\$/\";/' -e 's/  */ /g'"
 else
-    QUOTESED="sed -e 's/[\\\\\"]/\\\\&/g' -e 's/\\\\\"/\"/' -e 's/\\\\\";\$\$/\";/'"
+    QUOTESED="sed -e 's/[\\\\\"]/\\\\&/g' -e 's/\\\\\"/\"/' -e 's/\\\\\";\$\$/\";/' -e 's/  */ /g'"
 fi
 
 
@@ -5479,7 +5479,7 @@
 	  inc_path="$vi_cv_path_lua_pfx/include"
 	  for dir in "$inc_path"/moonjit-[0-9]* ; do
 	    if test -d "$dir" ; then
-	      lua_suf=`basename '$dir'`
+	      lua_suf=`basename "$dir"`
 	      lua_suf="/$lua_suf"
 	      break
 	    fi
@@ -7617,8 +7617,7 @@
 	librubyarg=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['LIBRUBYARG'])"`
 	librubya=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['LIBRUBY_A'])"`
 	rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['libdir'])"`
-	if test -f "$rubylibdir/$librubya"; then
-	  librubyarg="$librubyarg"
+	if test -f "$rubylibdir/$librubya" || expr "$librubyarg" : "-lruby"; then
 	  RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
 	elif test "$librubyarg" = "libruby.a"; then
 	  	  librubyarg="-lruby"
@@ -7652,6 +7651,9 @@
 	  RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby_soname\\\" $RUBY_CFLAGS"
 	  RUBY_LIBS=
 	fi
+	if test "X$CLANG_VERSION" != "X" -a "$rubyversion" -ge 30; then
+	  RUBY_CFLAGS="$RUBY_CFLAGS -fdeclspec"
+	fi
       else
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found; disabling Ruby" >&5
 $as_echo "not found; disabling Ruby" >&6; }
@@ -9559,6 +9561,8 @@
 	     sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'`
     }
     else
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK -dev package" >&5
+$as_echo_n "checking for GTK -dev package... " >&6; }
       no_gtk=yes
     fi
 
@@ -9812,6 +9816,8 @@
 	     sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'`
     }
     else
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK -dev package" >&5
+$as_echo_n "checking for GTK -dev package... " >&6; }
       no_gtk=yes
     fi
 
@@ -12350,10 +12356,18 @@
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+// These should be in stdlib.h, but it depends on _XOPEN_SOURCE.
+char *ptsname(int);
+int unlockpt(int);
+int grantpt(int);
+
 int
 main ()
 {
-ptsname(0);grantpt(0);unlockpt(0);
+
+		ptsname(0);
+		grantpt(0);
+		unlockpt(0);
   ;
   return 0;
 }
@@ -14853,6 +14867,8 @@
 $as_echo "no" >&6; }
 fi
 
+LDFLAGS=`echo "$LDFLAGS" | sed -e 's/-L /-L/g'`
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking linker --as-needed support" >&5
 $as_echo_n "checking linker --as-needed support... " >&6; }
 LINK_AS_NEEDED=
diff -Nru vim-8.2.1913/src/autocmd.c vim-8.2.2434/src/autocmd.c
--- vim-8.2.1913/src/autocmd.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/autocmd.c	2021-01-30 22:05:11.000000000 +0000
@@ -55,9 +55,7 @@
     char	    once;		// "One shot": removed after execution
     char	    nested;		// If autocommands nest here.
     char	    last;		// last command in list
-#ifdef FEAT_EVAL
     sctx_T	    script_ctx;		// script context where defined
-#endif
     struct AutoCmd  *next;		// next AutoCmd in list
 } AutoCmd;
 
@@ -191,6 +189,8 @@
     {"WinLeave",	EVENT_WINLEAVE},
     {"VimResized",	EVENT_VIMRESIZED},
     {"TextYankPost",	EVENT_TEXTYANKPOST},
+    {"VimSuspend",	EVENT_VIMSUSPEND},
+    {"VimResume",	EVENT_VIMRESUME},
     {NULL,		(event_T)0}
 };
 
@@ -956,11 +956,14 @@
     last_group = AUGROUP_ERROR;		// for listing the group name
     if (*arg == '*' || *arg == NUL || *arg == '|')
     {
-	for (event = (event_T)0; (int)event < (int)NUM_EVENTS;
-					    event = (event_T)((int)event + 1))
-	    if (do_autocmd_event(event, pat,
-				 once, nested, cmd, forceit, group) == FAIL)
-		break;
+	if (!forceit && *cmd != NUL)
+	    emsg(_(e_cannot_define_autocommands_for_all_events));
+	else
+	    for (event = (event_T)0; (int)event < (int)NUM_EVENTS;
+					     event = (event_T)((int)event + 1))
+		if (do_autocmd_event(event, pat,
+				    once, nested, cmd, forceit, group) == FAIL)
+		    break;
     }
     else
     {
@@ -1247,8 +1250,8 @@
 	    if (ac == NULL)
 		return FAIL;
 	    ac->cmd = vim_strsave(cmd);
-#ifdef FEAT_EVAL
 	    ac->script_ctx = current_sctx;
+#ifdef FEAT_EVAL
 	    ac->script_ctx.sc_lnum += SOURCING_LNUM;
 #endif
 	    if (ac->cmd == NULL)
@@ -1433,9 +1436,9 @@
 	// window.  Expect a few side effects...
 	win = curwin;
 
-    aco->save_curwin = curwin;
+    aco->save_curwin_id = curwin->w_id;
     aco->save_curbuf = curbuf;
-    aco->save_prevwin = prevwin;
+    aco->save_prevwin_id = prevwin == NULL ? 0 : prevwin->w_id;
     if (win != NULL)
     {
 	// There is a window for "buf" in the current tab page, make it the
@@ -1481,7 +1484,7 @@
 	curwin = aucmd_win;
     }
     curbuf = buf;
-    aco->new_curwin = curwin;
+    aco->new_curwin_id = curwin->w_id;
     set_bufref(&aco->new_curbuf, curbuf);
 }
 
@@ -1493,7 +1496,8 @@
 aucmd_restbuf(
     aco_save_T	*aco)		// structure holding saved values
 {
-    int dummy;
+    int	    dummy;
+    win_T   *save_curwin;
 
     if (aco->use_aucmd_win)
     {
@@ -1533,8 +1537,9 @@
 	(void)win_comp_pos();   // recompute window positions
 	unblock_autocmds();
 
-	if (win_valid(aco->save_curwin))
-	    curwin = aco->save_curwin;
+	save_curwin = win_find_by_id(aco->save_curwin_id);
+	if (save_curwin != NULL)
+	    curwin = save_curwin;
 	else
 	    // Hmm, original window disappeared.  Just use the first one.
 	    curwin = firstwin;
@@ -1543,9 +1548,7 @@
 	// May need to restore insert mode for a prompt buffer.
 	entering_window(curwin);
 #endif
-
-	if (win_valid(aco->save_prevwin))
-	    prevwin = aco->save_prevwin;
+	prevwin = win_find_by_id(aco->save_prevwin_id);
 #ifdef FEAT_EVAL
 	vars_clear(&aucmd_win->w_vars->dv_hashtab);  // free all w: variables
 	hash_init(&aucmd_win->w_vars->dv_hashtab);   // re-use the hashtab
@@ -1571,13 +1574,15 @@
     }
     else
     {
-	// restore curwin
-	if (win_valid(aco->save_curwin))
+	// Restore curwin.  Use the window ID, a window may have been closed
+	// and the memory re-used for another one.
+	save_curwin = win_find_by_id(aco->save_curwin_id);
+	if (save_curwin != NULL)
 	{
 	    // Restore the buffer which was previously edited by curwin, if
 	    // it was changed, we are still the same window and the buffer is
 	    // valid.
-	    if (curwin == aco->new_curwin
+	    if (curwin->w_id == aco->new_curwin_id
 		    && curbuf != aco->new_curbuf.br_buf
 		    && bufref_valid(&aco->new_curbuf)
 		    && aco->new_curbuf.br_buf->b_ml.ml_mfp != NULL)
@@ -1592,10 +1597,9 @@
 		++curbuf->b_nwindows;
 	    }
 
-	    curwin = aco->save_curwin;
+	    curwin = save_curwin;
 	    curbuf = curwin->w_buffer;
-	    if (win_valid(aco->save_prevwin))
-		prevwin = aco->save_prevwin;
+	    prevwin = win_find_by_id(aco->save_prevwin_id);
 	    // In case the autocommand moves the cursor to a position that
 	    // does not exist in curbuf.
 	    check_cursor();
@@ -1816,8 +1820,8 @@
     static int	nesting = 0;
     AutoPatCmd	patcmd;
     AutoPat	*ap;
-#ifdef FEAT_EVAL
     sctx_T	save_current_sctx;
+#ifdef FEAT_EVAL
     funccal_entry_T funccal_entry;
     char_u	*save_cmdarg;
     long	save_cmdbang;
@@ -2026,9 +2030,9 @@
     estack_push(ETYPE_AUCMD, NULL, 0);
     ESTACK_CHECK_SETUP
 
-#ifdef FEAT_EVAL
     save_current_sctx = current_sctx;
 
+#ifdef FEAT_EVAL
 # ifdef FEAT_PROFILE
     if (do_profiling == PROF_YES)
 	prof_child_enter(&wait_time); // doesn't count for the caller itself
@@ -2135,8 +2139,8 @@
     autocmd_fname_full = save_autocmd_fname_full;
     autocmd_bufnr = save_autocmd_bufnr;
     autocmd_match = save_autocmd_match;
-#ifdef FEAT_EVAL
     current_sctx = save_current_sctx;
+#ifdef FEAT_EVAL
     restore_funccal();
 # ifdef FEAT_PROFILE
     if (do_profiling == PROF_YES)
@@ -2367,9 +2371,7 @@
     if (ac->once)
 	au_del_cmd(ac);
     autocmd_nested = ac->nested;
-#ifdef FEAT_EVAL
     current_sctx = ac->script_ctx;
-#endif
     if (ac->last)
 	acp->nextcmd = NULL;
     else
diff -Nru vim-8.2.1913/src/buffer.c vim-8.2.2434/src/buffer.c
--- vim-8.2.1913/src/buffer.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/buffer.c	2021-01-30 22:05:11.000000000 +0000
@@ -492,8 +492,10 @@
  * supposed to close the window but autocommands close all other windows.
  *
  * When "ignore_abort" is TRUE don't abort even when aborting() returns TRUE.
+ *
+ * Return TRUE when we got to the end and b_nwindows was decremented.
  */
-    void
+    int
 close_buffer(
     win_T	*win,		// if not NULL, set b_last_cursor
     buf_T	*buf,
@@ -540,7 +542,7 @@
 	    if (wipe_buf || unload_buf)
 	    {
 		if (!can_unload_buffer(buf))
-		    return;
+		    return FALSE;
 
 		// Wiping out or unloading a terminal buffer kills the job.
 		free_terminal(buf);
@@ -552,6 +554,11 @@
 		unload_buf = FALSE;
 	    }
 	}
+	else if (buf->b_p_bh[0] == 'h' && !del_buf)
+	{
+	    // Hide a terminal buffer.
+	    unload_buf = FALSE;
+	}
 	else
 	{
 	    // A terminal buffer is wiped out if the job has finished.
@@ -566,7 +573,7 @@
     // Disallow deleting the buffer when it is locked (already being closed or
     // halfway a command that relies on it). Unloading is allowed.
     if ((del_buf || wipe_buf) && !can_unload_buffer(buf))
-	return;
+	return FALSE;
 
     // check no autocommands closed the window
     if (win != NULL && win_valid_any_tab(win))
@@ -595,7 +602,7 @@
 	    // Autocommands deleted the buffer.
 aucmd_abort:
 	    emsg(_(e_auabort));
-	    return;
+	    return FALSE;
 	}
 	--buf->b_locked;
 	if (abort_if_last && one_window())
@@ -620,7 +627,7 @@
 #ifdef FEAT_EVAL
 	// autocmds may abort script processing
 	if (!ignore_abort && aborting())
-	    return;
+	    return FALSE;
 #endif
     }
 
@@ -648,7 +655,7 @@
     // Return when a window is displaying the buffer or when it's not
     // unloaded.
     if (buf->b_nwindows > 0 || !unload_buf)
-	return;
+	return FALSE;
 
     // Always remove the buffer when there is no file name.
     if (buf->b_ffname == NULL)
@@ -678,11 +685,11 @@
 
     // Autocommands may have deleted the buffer.
     if (!bufref_valid(&bufref))
-	return;
+	return FALSE;
 #ifdef FEAT_EVAL
     // autocmds may abort script processing
     if (!ignore_abort && aborting())
-	return;
+	return FALSE;
 #endif
 
     /*
@@ -693,7 +700,7 @@
      * deleted buffer.
      */
     if (buf == curbuf && !is_curbuf)
-	return;
+	return FALSE;
 
     if (win_valid_any_tab(win) && win->w_buffer == buf)
 	win->w_buffer = NULL;  // make sure we don't use the buffer now
@@ -750,6 +757,7 @@
 	    buf->b_p_bl = FALSE;
     }
     // NOTE: at this point "curbuf" may be invalid!
+    return TRUE;
 }
 
 /*
@@ -2154,7 +2162,7 @@
 	if (top_file_num < 0)		// wrap around (may cause duplicates)
 	{
 	    emsg(_("W14: Warning: List of file names overflow"));
-	    if (emsg_silent == 0)
+	    if (emsg_silent == 0 && !in_assert_fails)
 	    {
 		out_flush();
 		ui_delay(3001L, TRUE);	// make sure it is noticed
@@ -2556,12 +2564,15 @@
     char_u	*p;
     int		toggledollar;
 
-    if (pattern_end == pattern + 1 && (*pattern == '%' || *pattern == '#'))
+    // "%" is current file, "%%" or "#" is alternate file
+    if ((pattern_end == pattern + 1 && (*pattern == '%' || *pattern == '#'))
+	    || (in_vim9script() && pattern_end == pattern + 2
+				    && pattern[0] == '%' && pattern[1] == '%'))
     {
-	if (*pattern == '%')
-	    match = curbuf->b_fnum;
-	else
+	if (*pattern == '#' || pattern_end == pattern + 2)
 	    match = curwin->w_alt_fnum;
+	else
+	    match = curbuf->b_fnum;
 #ifdef FEAT_DIFF
 	if (diffmode && !diff_mode_buf(buflist_findnr(match)))
 	    match = -1;
@@ -2600,7 +2611,7 @@
 		p = pat;
 		if (*p == '^' && !(attempt & 1))	 // add/remove '^'
 		    ++p;
-		regmatch.regprog = vim_regcomp(p, p_magic ? RE_MAGIC : 0);
+		regmatch.regprog = vim_regcomp(p, magic_isset() ? RE_MAGIC : 0);
 		if (regmatch.regprog == NULL)
 		{
 		    vim_free(pat);
@@ -5366,9 +5377,8 @@
     int		vers;
     int		end;
     int		retval = OK;
-#ifdef FEAT_EVAL
     sctx_T	save_current_sctx;
-#endif
+
     ESTACK_CHECK_DECLARATION
 
     prev = -1;
@@ -5452,22 +5462,22 @@
 	    if (*s != NUL)		// skip over an empty "::"
 	    {
 		int secure_save = secure;
-#ifdef FEAT_EVAL
+
 		save_current_sctx = current_sctx;
+		current_sctx.sc_version = 1;
+#ifdef FEAT_EVAL
 		current_sctx.sc_sid = SID_MODELINE;
 		current_sctx.sc_seq = 0;
 		current_sctx.sc_lnum = lnum;
-		current_sctx.sc_version = 1;
 #endif
+
 		// Make sure no risky things are executed as a side effect.
 		secure = 1;
 
 		retval = do_set(s, OPT_MODELINE | OPT_LOCAL | flags);
 
 		secure = secure_save;
-#ifdef FEAT_EVAL
 		current_sctx = save_current_sctx;
-#endif
 		if (retval == FAIL)		// stop if error found
 		    break;
 	    }
@@ -5648,11 +5658,22 @@
     }
 
     if (buf->b_fname == NULL)
-	return (char_u *)_("[No Name]");
+	return buf_get_fname(buf);
     return NULL;
 }
 
 /*
+ * Get "buf->b_fname", use "[No Name]" if it is NULL.
+ */
+    char_u *
+buf_get_fname(buf_T *buf)
+{
+    if (buf->b_fname == NULL)
+	return (char_u *)_("[No Name]");
+    return buf->b_fname;
+}
+
+/*
  * Set 'buflisted' for curbuf to "on" and trigger autocommands if it changed.
  */
     void
diff -Nru vim-8.2.1913/src/bufwrite.c vim-8.2.2434/src/bufwrite.c
--- vim-8.2.1913/src/bufwrite.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/bufwrite.c	2021-01-30 22:05:11.000000000 +0000
@@ -2031,7 +2031,7 @@
 	    if (end == 0
 		    || (lnum == end
 			&& (write_bin || !buf->b_p_fixeol)
-			&& (lnum == buf->b_no_eol_lnum
+			&& ((write_bin && lnum == buf->b_no_eol_lnum)
 			    || (lnum == buf->b_ml.ml_line_count
 							   && !buf->b_p_eol))))
 	    {
@@ -2138,7 +2138,7 @@
     if (!checking_conversion)
     {
 #if defined(UNIX) && defined(HAVE_FSYNC)
-	// On many journalling file systems there is a bug that causes both the
+	// On many journaling file systems there is a bug that causes both the
 	// original and the backup file to be lost when halting the system
 	// right after writing the file.  That's because only the meta-data is
 	// journalled.  Syncing the file slows down the system, but assures it
@@ -2579,6 +2579,12 @@
 #endif
     }
 
+#ifdef FEAT_VIMINFO
+    // Make sure marks will be written out to the viminfo file later, even when
+    // the file is new.
+    curbuf->b_marks_read = TRUE;
+#endif
+
     got_int |= prev_got_int;
 
     return retval;
diff -Nru vim-8.2.1913/src/change.c vim-8.2.2434/src/change.c
--- vim-8.2.1913/src/change.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/change.c	2021-01-30 22:05:11.000000000 +0000
@@ -115,7 +115,7 @@
 	    // Wait two seconds, to make sure the user reads this unexpected
 	    // message.  Since we could be anywhere, call wait_return() now,
 	    // and don't let the emsg() set msg_scroll.
-	    if (need_wait_return && emsg_silent == 0)
+	    if (need_wait_return && emsg_silent == 0 && !in_assert_fails)
 	    {
 		out_flush();
 		ui_delay(2002L, TRUE);
diff -Nru vim-8.2.1913/src/charset.c vim-8.2.2434/src/charset.c
--- vim-8.2.1913/src/charset.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/charset.c	2021-01-30 22:05:11.000000000 +0000
@@ -1594,6 +1594,12 @@
     return (c == '0' || c == '1');
 }
 
+    static int
+vim_isodigit(int c)
+{
+    return (c >= '0' && c <= '7');
+}
+
 /*
  * Vim's own character class functions.  These exist because many library
  * islower()/toupper() etc. do not work properly: they crash when used with
@@ -1831,7 +1837,7 @@
 	    // binary
 	    ptr += 2;
 	else if ((what & STR2NR_OOCT)
-		&& (pre == 'O' || pre == 'o') && vim_isbdigit(ptr[2])
+		&& (pre == 'O' || pre == 'o') && vim_isodigit(ptr[2])
 		&& (maxlen == 0 || maxlen > 2))
 	    // octal with prefix "0o"
 	    ptr += 2;
diff -Nru vim-8.2.1913/src/cindent.c vim-8.2.2434/src/cindent.c
--- vim-8.2.1913/src/cindent.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/cindent.c	2021-01-30 22:05:11.000000000 +0000
@@ -2121,7 +2121,7 @@
     }
 
     // #defines and so on go at the left when included in 'cinkeys',
-    // exluding pragmas when customized in 'cinoptions'
+    // excluding pragmas when customized in 'cinoptions'
     if (*theline == '#' && (*linecopy == '#' || in_cinkeys('#', ' ', TRUE)))
     {
 	char_u *directive = skipwhite(theline + 1);
diff -Nru vim-8.2.1913/src/clipboard.c vim-8.2.2434/src/clipboard.c
--- vim-8.2.1913/src/clipboard.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/clipboard.c	2021-01-30 22:05:11.000000000 +0000
@@ -2025,6 +2025,9 @@
 		    && get_y_register(STAR_REGISTER)->y_array != NULL))
 	    return;
 
+	// Avoid triggering autocmds such as TextYankPost.
+	block_autocmds();
+
 	// Get the text between clip_star.start & clip_star.end
 	old_y_previous = get_y_previous();
 	old_y_current = get_y_current();
@@ -2044,6 +2047,8 @@
 	ca.count1 = 1;
 	ca.retval = CA_NO_ADJ_OP_END;
 	do_pending_operator(&ca, 0, TRUE);
+
+	// restore things
 	set_y_previous(old_y_previous);
 	set_y_current(old_y_current);
 	curwin->w_cursor = old_cursor;
@@ -2054,6 +2059,8 @@
 	curbuf->b_op_end = old_op_end;
 	VIsual = old_visual;
 	VIsual_mode = old_visual_mode;
+
+	unblock_autocmds();
     }
     else if (!is_clipboard_needs_update())
     {
diff -Nru vim-8.2.1913/src/cmdexpand.c vim-8.2.2434/src/cmdexpand.c
--- vim-8.2.1913/src/cmdexpand.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/cmdexpand.c	2021-01-30 22:05:11.000000000 +0000
@@ -1049,7 +1049,7 @@
 		++p;
     }
 
-    // If the cursor is touching the command, and it ends in an alpha-numeric
+    // If the cursor is touching the command, and it ends in an alphanumeric
     // character, complete the command name.
     if (*p == NUL && ASCII_ISALNUM(p[-1]))
 	return NULL;
@@ -1391,7 +1391,7 @@
 		if (*arg != NUL)
 		{
 		    xp->xp_context = EXPAND_NOTHING;
-		    arg = skip_regexp(arg + 1, *arg, p_magic);
+		    arg = skip_regexp(arg + 1, *arg, magic_isset());
 		}
 	    }
 	    return find_nextcmd(arg);
@@ -1429,7 +1429,7 @@
 	    {
 		// skip "from" part
 		++arg;
-		arg = skip_regexp(arg, delim, p_magic);
+		arg = skip_regexp(arg, delim, magic_isset());
 	    }
 	    // skip "to" part
 	    while (arg[0] != NUL && arg[0] != delim)
@@ -2077,7 +2077,7 @@
 	pat = tofree;
     }
 
-    regmatch.regprog = vim_regcomp(pat, p_magic ? RE_MAGIC : 0);
+    regmatch.regprog = vim_regcomp(pat, magic_isset() ? RE_MAGIC : 0);
     if (regmatch.regprog == NULL)
 	return FAIL;
 
@@ -2680,7 +2680,10 @@
 	// Hitting <Down> after "emenu Name.": complete submenu
 	if (c == K_DOWN && cclp->cmdpos > 0
 		&& cclp->cmdbuff[cclp->cmdpos - 1] == '.')
+	{
 	    c = p_wc;
+	    KeyTyped = TRUE;  // in case the key was mapped
+	}
 	else if (c == K_UP)
 	{
 	    // Hitting <Up>: Remove one submenu name in front of the
@@ -2714,6 +2717,7 @@
 	    if (i > 0)
 		cmdline_del(cclp, i);
 	    c = p_wc;
+	    KeyTyped = TRUE;  // in case the key was mapped
 	    xp->xp_context = EXPAND_NOTHING;
 	}
     }
@@ -2738,6 +2742,7 @@
 	{
 	    // go down a directory
 	    c = p_wc;
+	    KeyTyped = TRUE;  // in case the key was mapped
 	}
 	else if (STRNCMP(xp->xp_pattern, upseg + 1, 3) == 0 && c == K_DOWN)
 	{
@@ -2763,6 +2768,7 @@
 	    {
 		cmdline_del(cclp, j - 2);
 		c = p_wc;
+		KeyTyped = TRUE;  // in case the key was mapped
 	    }
 	}
 	else if (c == K_UP)
diff -Nru vim-8.2.1913/src/configure.ac vim-8.2.2434/src/configure.ac
--- vim-8.2.1913/src/configure.ac	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/configure.ac	2021-01-30 22:05:11.000000000 +0000
@@ -127,8 +127,9 @@
   dnl change the constant 500002075 below appropriately.  To get the
   dnl integer corresponding to a version number, refer to the
   dnl definition of CLANG_VERSION above.
+  dnl Clang 11 reports "11", assume Clang 10 and later work like this.
   AC_MSG_CHECKING(if clang supports -fno-strength-reduce)
-  if test "$CLANG_VERSION" -ge 500002075 ; then
+  if test "$CLANG_MAJOR" -ge 10 -o "$CLANG_VERSION" -ge 500002075 ; then
     AC_MSG_RESULT(no)
     CFLAGS=`echo "$CFLAGS" | sed -e 's/-fno-strength-reduce/ /'`
   else
@@ -437,9 +438,9 @@
 
 dnl Set QUOTESED. Needs additional backslashes on zOS
 if test "$zOSUnix" = "yes"; then
-    QUOTESED="sed -e 's/[[\\\\\"]]/\\\\\\\\&/g' -e 's/\\\\\\\\\"/\"/' -e 's/\\\\\\\\\";\$\$/\";/'"
+    QUOTESED="sed -e 's/[[\\\\\"]]/\\\\\\\\&/g' -e 's/\\\\\\\\\"/\"/' -e 's/\\\\\\\\\";\$\$/\";/' -e 's/  */ /g'"
 else
-    QUOTESED="sed -e 's/[[\\\\\"]]/\\\\&/g' -e 's/\\\\\"/\"/' -e 's/\\\\\";\$\$/\";/'"
+    QUOTESED="sed -e 's/[[\\\\\"]]/\\\\&/g' -e 's/\\\\\"/\"/' -e 's/\\\\\";\$\$/\";/' -e 's/  */ /g'"
 fi
 AC_SUBST(QUOTESED)
 
@@ -632,7 +633,7 @@
 	  inc_path="$vi_cv_path_lua_pfx/include"
 	  for dir in "$inc_path"/moonjit-[[0-9]]* ; do
 	    if test -d "$dir" ; then
-	      lua_suf=`basename '$dir'`
+	      lua_suf=`basename "$dir"`
 	      lua_suf="/$lua_suf"
 	      break
 	    fi
@@ -1965,8 +1966,7 @@
 	librubyarg=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG[['LIBRUBYARG']])"`
 	librubya=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG[['LIBRUBY_A']])"`
 	rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG[['libdir']])"`
-	if test -f "$rubylibdir/$librubya"; then
-	  librubyarg="$librubyarg"
+	if test -f "$rubylibdir/$librubya" || expr "$librubyarg" : "-lruby"; then
 	  RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
 	elif test "$librubyarg" = "libruby.a"; then
 	  dnl required on Mac OS 10.3 where libruby.a doesn't exist
@@ -2002,6 +2002,9 @@
 	  RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby_soname\\\" $RUBY_CFLAGS"
 	  RUBY_LIBS=
 	fi
+	if test "X$CLANG_VERSION" != "X" -a "$rubyversion" -ge 30; then
+	  RUBY_CFLAGS="$RUBY_CFLAGS -fdeclspec"
+	fi
       else
 	AC_MSG_RESULT(not found; disabling Ruby)
       fi
@@ -2581,6 +2584,9 @@
 	     sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
     }
     else
+      dnl Put some text before the "no" to hint at installing the gtk-dev
+      dnl packages.
+      AC_MSG_CHECKING(for GTK -dev package)
       no_gtk=yes
     fi
 
@@ -3593,7 +3599,15 @@
 
 AC_MSG_CHECKING(for SVR4 ptys)
 if test -c /dev/ptmx ; then
-  AC_TRY_LINK([], [ptsname(0);grantpt(0);unlockpt(0);],
+  AC_TRY_LINK([
+// These should be in stdlib.h, but it depends on _XOPEN_SOURCE.
+char *ptsname(int);
+int unlockpt(int);
+int grantpt(int);
+	       ], [
+		ptsname(0);
+		grantpt(0);
+		unlockpt(0);],
 	AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SVR4_PTYS),
 	AC_MSG_RESULT(no))
 else
@@ -4459,6 +4473,10 @@
   AC_MSG_RESULT(no)
 fi
 
+dnl $LDFLAGS is passed to glibtool in libvterm, it doesn't like a space
+dnl between "-L" and the path that follows.
+LDFLAGS=`echo "$LDFLAGS" | sed -e 's/-L /-L/g'`
+
 dnl link.sh tries to avoid overlinking in a hackish way.
 dnl At least GNU ld supports --as-needed which provides the same functionality
 dnl at linker level. Let's use it.
diff -Nru vim-8.2.1913/src/debugger.c vim-8.2.2434/src/debugger.c
--- vim-8.2.1913/src/debugger.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/debugger.c	2021-01-30 22:05:11.000000000 +0000
@@ -864,7 +864,7 @@
  */
     static linenr_T
 debuggy_find(
-    int		file,	    // TRUE for a file, FALSE for a function
+    int		is_file,    // TRUE for a file, FALSE for a function
     char_u	*fname,	    // file or function name
     linenr_T	after,	    // after this line number
     garray_T	*gap,	    // either &dbg_breakp or &prof_ga
@@ -873,20 +873,25 @@
     struct debuggy *bp;
     int		i;
     linenr_T	lnum = 0;
-    char_u	*name = fname;
+    char_u	*name = NULL;
+    char_u	*short_name = fname;
     int		prev_got_int;
 
     // Return quickly when there are no breakpoints.
     if (gap->ga_len == 0)
 	return (linenr_T)0;
 
-    // Replace K_SNR in function name with "<SNR>".
-    if (!file && fname[0] == K_SPECIAL)
+    // For a script-local function remove the prefix, so that
+    // "profile func Func" matches "Func" in any script.  Otherwise it's very
+    // difficult to profile/debug a script-local function.  It may match a
+    // function in the wrong script, but that is much better than not being
+    // able to profile/debug a function in a script with unknown ID.
+    // Also match a script-specific name.
+    if (!is_file && fname[0] == K_SPECIAL)
     {
+	short_name = vim_strchr(fname, '_') + 1;
 	name = alloc(STRLEN(fname) + 3);
-	if (name == NULL)
-	    name = fname;
-	else
+	if (name != NULL)
 	{
 	    STRCPY(name, "<SNR>");
 	    STRCPY(name + 5, fname + 3);
@@ -898,8 +903,8 @@
 	// Skip entries that are not useful or are for a line that is beyond
 	// an already found breakpoint.
 	bp = &DEBUGGY(gap, i);
-	if (((bp->dbg_type == DBG_FILE) == file &&
-		bp->dbg_type != DBG_EXPR && (
+	if (((bp->dbg_type == DBG_FILE) == is_file
+		    && bp->dbg_type != DBG_EXPR && (
 #ifdef FEAT_PROFILE
 		gap == &prof_ga ||
 #endif
@@ -910,7 +915,10 @@
 	    // while matching should abort it.
 	    prev_got_int = got_int;
 	    got_int = FALSE;
-	    if (vim_regexec_prog(&bp->dbg_prog, FALSE, name, (colnr_T)0))
+	    if ((name != NULL
+		   && vim_regexec_prog(&bp->dbg_prog, FALSE, name, (colnr_T)0))
+		    || vim_regexec_prog(&bp->dbg_prog, FALSE,
+						       short_name, (colnr_T)0))
 	    {
 		lnum = bp->dbg_lnum;
 		if (fp != NULL)
diff -Nru vim-8.2.1913/src/dict.c vim-8.2.2434/src/dict.c
--- vim-8.2.1913/src/dict.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/dict.c	2021-01-30 22:05:11.000000000 +0000
@@ -22,6 +22,7 @@
 
 /*
  * Allocate an empty header for a dictionary.
+ * Caller should take care of the reference count.
  */
     dict_T *
 dict_alloc(void)
@@ -106,10 +107,13 @@
 dict_free_contents(dict_T *d)
 {
     hashtab_free_contents(&d->dv_hashtab);
+    free_type(d->dv_type);
+    d->dv_type = NULL;
 }
 
 /*
  * Clear hashtab "ht" and dict items it contains.
+ * If "ht" is not freed then you should call hash_init() next!
  */
     void
 hashtab_free_contents(hashtab_T *ht)
@@ -781,19 +785,30 @@
 }
 
 /*
+ * Advance over a literal key, including "-".  If the first character is not a
+ * literal key character then "key" is returned.
+ */
+    char_u *
+skip_literal_key(char_u *key)
+{
+    char_u *p;
+
+    for (p = key; ASCII_ISALNUM(*p) || *p == '_' || *p == '-'; ++p)
+	;
+    return p;
+}
+
+/*
  * Get the key for #{key: val} into "tv" and advance "arg".
  * Return FAIL when there is no valid key.
  */
     static int
-get_literal_key(char_u **arg, typval_T *tv)
+get_literal_key_tv(char_u **arg, typval_T *tv)
 {
-    char_u *p;
+    char_u *p = skip_literal_key(*arg);
 
-    if (!ASCII_ISALNUM(**arg) && **arg != '_' && **arg != '-')
+    if (p == *arg)
 	return FAIL;
-
-    for (p = *arg; ASCII_ISALNUM(*p) || *p == '_' || *p == '-'; ++p)
-	;
     tv->v_type = VAR_STRING;
     tv->vval.v_string = vim_strnsave(*arg, p - *arg);
 
@@ -802,6 +817,47 @@
 }
 
 /*
+ * Get a literal key for a Vim9 dict:
+ * {"name": value},
+ * {'name': value},
+ * {name: value} use "name" as a literal key
+ * Return the key in allocated memory or NULL in the case of an error.
+ * "arg" is advanced to just after the key.
+ */
+    char_u *
+get_literal_key(char_u **arg)
+{
+    char_u	*key;
+    char_u	*end;
+    typval_T	rettv;
+
+    if (**arg == '\'')
+    {
+	if (eval_lit_string(arg, &rettv, TRUE) == FAIL)
+	    return NULL;
+	key = rettv.vval.v_string;
+    }
+    else if (**arg == '"')
+    {
+	if (eval_string(arg, &rettv, TRUE) == FAIL)
+	    return NULL;
+	key = rettv.vval.v_string;
+    }
+    else
+    {
+	end = skip_literal_key(*arg);
+	if (end == *arg)
+	{
+	    semsg(_(e_invalid_key_str), *arg);
+	    return NULL;
+	}
+	key = vim_strnsave(*arg, end - *arg);
+	*arg = end;
+    }
+    return key;
+}
+
+/*
  * Allocate a variable for a Dictionary and fill it from "*arg".
  * "*arg" points to the "{".
  * "literal" is TRUE for #{key: val}
@@ -849,10 +905,38 @@
     *arg = skipwhite_and_linebreak(*arg + 1, evalarg);
     while (**arg != '}' && **arg != NUL)
     {
-	if ((literal
-		? get_literal_key(arg, &tvkey)
-		: eval1(arg, &tvkey, evalarg)) == FAIL)	// recursive!
-	    goto failret;
+	int	has_bracket = vim9script && **arg == '[';
+
+	if (literal)
+	{
+	    if (get_literal_key_tv(arg, &tvkey) == FAIL)
+		goto failret;
+	}
+	else if (vim9script && !has_bracket)
+	{
+	    tvkey.vval.v_string = get_literal_key(arg);
+	    if (tvkey.vval.v_string == NULL)
+		goto failret;
+	    tvkey.v_type = VAR_STRING;
+	}
+	else
+	{
+	    if (has_bracket)
+		*arg = skipwhite(*arg + 1);
+	    if (eval1(arg, &tvkey, evalarg) == FAIL)	// recursive!
+		goto failret;
+	    if (has_bracket)
+	    {
+		*arg = skipwhite(*arg);
+		if (**arg != ']')
+		{
+		    emsg(_(e_missing_matching_bracket_after_dict_key));
+		    clear_tv(&tvkey);
+		    return FAIL;
+		}
+		++*arg;
+	    }
+	}
 
 	// the colon should come right after the key, but this wasn't checked
 	// previously, so only require it in Vim9 script.
@@ -869,6 +953,11 @@
 	}
 	if (evaluate)
 	{
+	    if (vim9script && check_for_string(&tvkey) == FAIL)
+	    {
+		clear_tv(&tvkey);
+		goto failret;
+	    }
 	    key = tv_get_string_buf_chk(&tvkey, buf);
 	    if (key == NULL)
 	    {
@@ -943,7 +1032,8 @@
 
     if (**arg != '}')
     {
-	semsg(_(e_missing_dict_end), *arg);
+	if (evalarg != NULL)
+	    semsg(_(e_missing_dict_end), *arg);
 failret:
 	if (d != NULL)
 	    dict_free(d);
@@ -970,6 +1060,12 @@
     hashitem_T	*hi2;
     int		todo;
     char_u	*arg_errmsg = (char_u *)N_("extend() argument");
+    type_T	*type;
+
+    if (d1->dv_type != NULL && d1->dv_type->tt_member != NULL)
+	type = d1->dv_type->tt_member;
+    else
+	type = NULL;
 
     todo = (int)d2->dv_hashtab.ht_used;
     for (hi2 = d2->dv_hashtab.ht_array; todo > 0; ++hi2)
@@ -986,9 +1082,14 @@
 			&& HI2DI(hi2)->di_tv.v_type == VAR_FUNC
 			&& var_wrong_func_name(hi2->hi_key, di1 == NULL))
 		    break;
-		if (!valid_varname(hi2->hi_key))
+		if (!valid_varname(hi2->hi_key, TRUE))
 		    break;
 	    }
+
+	    if (type != NULL
+		     && check_typval_type(type, &HI2DI(hi2)->di_tv, 0) == FAIL)
+		break;
+
 	    if (di1 == NULL)
 	    {
 		di1 = dictitem_copy(HI2DI(hi2));
diff -Nru vim-8.2.1913/src/drawline.c vim-8.2.2434/src/drawline.c
--- vim-8.2.1913/src/drawline.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/drawline.c	2021-01-30 22:05:11.000000000 +0000
@@ -641,7 +641,7 @@
 	    else
 		tocol = MAXCOL;
 	    // do at least one character; happens when past end of line
-	    if (fromcol == tocol)
+	    if (fromcol == tocol && search_match_endcol)
 		tocol = fromcol + 1;
 	    area_highlighting = TRUE;
 	    vi_attr = HL_ATTR(HLF_I);
@@ -1873,6 +1873,7 @@
 			char_u	*prev_ptr, *p;
 			int	len;
 			hlf_T	spell_hlf = HLF_COUNT;
+
 			if (has_mbyte)
 			{
 			    prev_ptr = ptr - mb_l;
@@ -2445,15 +2446,18 @@
 		&& conceal_cursor_line(wp)
 		&& (int)wp->w_virtcol <= vcol + n_skip)
 	{
-#  ifdef FEAT_RIGHTLEFT
+# ifdef FEAT_RIGHTLEFT
 	    if (wp->w_p_rl)
 		wp->w_wcol = wp->w_width - col + boguscols - 1;
 	    else
-#  endif
+# endif
 		wp->w_wcol = col - boguscols;
 	    wp->w_wrow = row;
 	    did_wcol = TRUE;
 	    curwin->w_valid |= VALID_WCOL|VALID_WROW|VALID_VIRTCOL;
+# ifdef FEAT_PROP_POPUP
+	    curwin->w_flags &= ~(WFLAG_WCOL_OFF_ADDED | WFLAG_WROW_OFF_ADDED);
+# endif
 	}
 #endif
 
@@ -2778,10 +2782,14 @@
 	// Also highlight the 'colorcolumn' if 'breakindent' and/or 'showbreak'
 	// options are set
 	vcol_save_attr = -1;
-	if ((draw_state == WL_LINE ||
+	if (((draw_state == WL_LINE ||
 	     draw_state == WL_BRI ||
 	     draw_state == WL_SBR) && !lnum_in_visual_area
 		&& search_attr == 0 && area_attr == 0)
+# ifdef FEAT_DIFF
+			&& filler_todo <= 0
+# endif
+		)
 	{
 	    if (wp->w_p_cuc && VCOL_HLC == (long)wp->w_virtcol
 						 && lnum != wp->w_cursor.lnum)
diff -Nru vim-8.2.1913/src/edit.c vim-8.2.2434/src/edit.c
--- vim-8.2.1913/src/edit.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/edit.c	2021-01-30 22:05:11.000000000 +0000
@@ -196,6 +196,10 @@
 #endif
 	ins_apply_autocmds(EVENT_INSERTENTER);
 
+	// Check for changed highlighting, e.g. for ModeMsg.
+	if (need_highlight_changed)
+	    highlight_changed();
+
 	// Make sure the cursor didn't move.  Do call check_cursor_col() in
 	// case the text was modified.  Since Insert mode was not started yet
 	// a call to check_cursor_col() may move the cursor, especially with
@@ -1031,6 +1035,15 @@
 	case K_IGNORE:	// Something mapped to nothing
 	    break;
 
+	case K_COMMAND:		// <Cmd>command<CR>
+	    do_cmdline(NULL, getcmdkeycmd, NULL, 0);
+#ifdef FEAT_TERMINAL
+	    if (term_use_loop())
+		// Started a terminal that gets the input, exit Insert mode.
+		goto doESCkey;
+#endif
+	    break;
+
 	case K_CURSORHOLD:	// Didn't type something for a while.
 	    ins_apply_autocmds(EVENT_CURSORHOLDI);
 	    did_cursorhold = TRUE;
@@ -1525,7 +1538,6 @@
 {
     int		c;
     int		did_putchar = FALSE;
-    int		prev_mod_mask = mod_mask;
 
     // may need to redraw when no more chars available now
     ins_redraw(FALSE);
@@ -1541,7 +1553,9 @@
     add_to_showcmd_c(Ctrl_V);
 #endif
 
-    c = get_literal();
+    // Do not change any modifyOtherKeys ESC sequence to a normal key for
+    // CTRL-SHIFT-V.
+    c = get_literal(mod_mask & MOD_MASK_SHIFT);
     if (did_putchar)
 	// when the line fits in 'columns' the '^' is at the start of the next
 	// line and will not removed by the redraw
@@ -1550,11 +1564,6 @@
     clear_showcmd();
 #endif
 
-    if ((c == ESC || c == CSI) && !(prev_mod_mask & MOD_MASK_SHIFT))
-	// Using CTRL-V: Change any modifyOtherKeys ESC sequence to a normal
-	// key.  Don't do this for CTRL-SHIFT-V.
-	c = decodeModifyOtherKeys(c);
-
     insert_special(c, FALSE, TRUE);
 #ifdef FEAT_RIGHTLEFT
     revins_chars++;
@@ -1581,7 +1590,7 @@
     // Recognize:
     // form 0: {lead}{key};{modifier}u
     // form 1: {lead}27;{modifier};{key}~
-    if ((c == CSI || (c == ESC && *p == '[')) && typebuf.tb_len >= 4)
+    if (typebuf.tb_len >= 4 && (c == CSI || (c == ESC && *p == '[')))
     {
 	idx = (*p == '[');
 	if (p[idx] == '2' && p[idx + 1] == '7' && p[idx + 2] == ';')
@@ -1836,9 +1845,11 @@
  * A one, two or three digit decimal number is interpreted as its byte value.
  * If one or two digits are entered, the next character is given to vungetc().
  * For Unicode a character > 255 may be returned.
+ * If "noReduceKeys" is TRUE do not change any modifyOtherKeys ESC sequence
+ * into a normal key, return ESC.
  */
     int
-get_literal(void)
+get_literal(int noReduceKeys)
 {
     int		cc;
     int		nc;
@@ -1869,6 +1880,9 @@
     for (;;)
     {
 	nc = plain_vgetc();
+	if ((nc == ESC || nc == CSI) && !noReduceKeys)
+	    nc = decodeModifyOtherKeys(nc);
+
 #ifdef FEAT_CMDL_INFO
 	if (!(State & CMDLINE) && MB_BYTE2LEN_CHECK(nc) == 1)
 	    add_to_showcmd(nc);
@@ -3803,8 +3817,7 @@
 {
     if (State & VREPLACE_FLAG)
 	restart_edit = 'V';
-    else
-	if (State & REPLACE_FLAG)
+    else if (State & REPLACE_FLAG)
 	restart_edit = 'R';
     else
 	restart_edit = 'I';
@@ -3946,8 +3959,11 @@
 #endif
 		((curwin->w_cursor.lnum == 1 && curwin->w_cursor.col == 0)
 		    || (!can_bs(BS_START)
-			&& (arrow_used
-			    || (curwin->w_cursor.lnum == Insstart_orig.lnum
+			&& ((arrow_used
+#ifdef FEAT_JOB_CHANNEL
+				&& !bt_prompt(curbuf)
+#endif
+			) || (curwin->w_cursor.lnum == Insstart_orig.lnum
 				&& curwin->w_cursor.col <= Insstart_orig.col)))
 		    || (!can_bs(BS_INDENT) && !arrow_used && ai_col > 0
 					 && curwin->w_cursor.col <= ai_col)
diff -Nru vim-8.2.1913/src/errors.h vim-8.2.2434/src/errors.h
--- vim-8.2.1913/src/errors.h	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/errors.h	2021-01-30 22:05:11.000000000 +0000
@@ -16,27 +16,35 @@
 EXTERN char e_undefined_variable_char_str[]
 	INIT(= N_("E121: Undefined variable: %c:%s"));
 #endif
+EXTERN char e_ambiguous_use_of_user_defined_command[]
+	INIT(= N_("E464: Ambiguous use of user-defined command"));
 EXTERN char e_invalid_command[]
 	INIT(= N_("E476: Invalid command"));
 #ifdef FEAT_EVAL
 EXTERN char e_invalid_command_str[]
 	INIT(= N_("E476: Invalid command: %s"));
+EXTERN char e_list_value_has_more_items_than_targets[]
+	INIT(= N_("E710: List value has more items than targets"));
+EXTERN char e_list_value_does_not_have_enough_items[]
+	INIT(= N_("E711: List value does not have enough items"));
 EXTERN char e_cannot_slice_dictionary[]
 	INIT(= N_("E719: Cannot slice a Dictionary"));
 EXTERN char e_assert_fails_second_arg[]
 	INIT(= N_("E856: \"assert_fails()\" second argument must be a string or a list with one or two strings"));
 EXTERN char e_cannot_index_special_variable[]
 	INIT(= N_("E909: Cannot index a special variable"));
-EXTERN char e_missing_let_str[]
-	INIT(= N_("E1100: Missing :let: %s"));
+#endif
+EXTERN char e_command_not_supported_in_vim9_script_missing_var_str[]
+	INIT(= N_("E1100: Command not supported in Vim9 script (missing :var?): %s"));
+#ifdef FEAT_EVAL
 EXTERN char e_variable_not_found_str[]
 	INIT(= N_("E1001: Variable not found: %s"));
 EXTERN char e_syntax_error_at_str[]
 	INIT(= N_("E1002: Syntax error at %s"));
 EXTERN char e_missing_return_value[]
 	INIT(= N_("E1003: Missing return value"));
-EXTERN char e_white_space_required_before_and_after_str[]
-	INIT(= N_("E1004: White space required before and after '%s'"));
+EXTERN char e_white_space_required_before_and_after_str_at_str[]
+	INIT(= N_("E1004: White space required before and after '%s' at \"%s\""));
 EXTERN char e_too_many_argument_types[]
 	INIT(= N_("E1005: Too many argument types"));
 EXTERN char e_str_is_used_as_argument[]
@@ -57,7 +65,7 @@
 	INIT(= N_("E1013: Argument %d: type mismatch, expected %s but got %s"));
 EXTERN char e_invalid_key_str[]
 	INIT(= N_("E1014: Invalid key: %s"));
-EXTERN char e_name_expected[]
+EXTERN char e_name_expected_str[]
 	INIT(= N_("E1015: Name expected: %s"));
 EXTERN char e_cannot_declare_a_scope_variable[]
 	INIT(= N_("E1016: Cannot declare a %s variable: %s"));
@@ -76,7 +84,7 @@
 EXTERN char e_type_or_initialization_required[]
 	INIT(= N_("E1022: Type or initialization required"));
 EXTERN char e_using_number_as_bool_nr[]
-	INIT(= N_("E1023: Using a Number as a Bool: %d"));
+	INIT(= N_("E1023: Using a Number as a Bool: %lld"));
 EXTERN char e_using_number_as_string[]
 	INIT(= N_("E1024: Using a Number as a String"));
 EXTERN char e_using_rcurly_outside_if_block_scope[]
@@ -89,8 +97,8 @@
 	INIT(= N_("E1028: Compiling :def function failed"));
 EXTERN char e_expected_str_but_got_str[]
 	INIT(= N_("E1029: Expected %s but got %s"));
-EXTERN char e_using_string_as_number[]
-	INIT(= N_("E1030: Using a String as a Number"));
+EXTERN char e_using_string_as_number_str[]
+	INIT(= N_("E1030: Using a String as a Number: \"%s\""));
 EXTERN char e_cannot_use_void_value[]
 	INIT(= N_("E1031: Cannot use void value"));
 EXTERN char e_missing_catch_or_finally[]
@@ -109,8 +117,10 @@
 	INIT(= N_("E1038: \"vim9script\" can only be used in a script"));
 EXTERN char e_vim9script_must_be_first_command_in_script[]
 	INIT(= N_("E1039: \"vim9script\" must be the first command in a script"));
+#endif
 EXTERN char e_cannot_use_scriptversion_after_vim9script[]
 	INIT(= N_("E1040: Cannot use :scriptversion after :vim9script"));
+#ifdef FEAT_EVAL
 EXTERN char e_redefining_script_item_str[]
 	INIT(= N_("E1041: Redefining script item %s"));
 EXTERN char e_export_can_only_be_used_in_vim9script[]
@@ -129,8 +139,8 @@
 	INIT(= N_("E1048: Item not found in script: %s"));
 EXTERN char e_item_not_exported_in_script_str[]
 	INIT(= N_("E1049: Item not exported in script: %s"));
-EXTERN char e_colon_required_before_a_range[]
-	INIT(= N_("E1050: Colon required before a range"));
+EXTERN char e_colon_required_before_range_str[]
+	INIT(= N_("E1050: Colon required before a range: %s"));
 EXTERN char e_wrong_argument_type_for_plus[]
 	INIT(= N_("E1051: Wrong argument type for +"));
 EXTERN char e_cannot_declare_an_option[]
@@ -286,4 +296,56 @@
 	INIT(= N_("E1130: Cannot add to null list"));
 EXTERN char e_cannot_add_to_null_blob[]
 	INIT(= N_("E1131: Cannot add to null blob"));
+EXTERN char e_missing_function_argument[]
+	INIT(= N_("E1132: Missing function argument"));
+EXTERN char e_cannot_extend_null_dict[]
+	INIT(= N_("E1133: Cannot extend a null dict"));
+EXTERN char e_cannot_extend_null_list[]
+	INIT(= N_("E1134: Cannot extend a null list"));
+EXTERN char e_using_string_as_bool_str[]
+	INIT(= N_("E1135: Using a String as a Bool: \"%s\""));
 #endif
+EXTERN char e_cmd_mapping_must_end_with_cr[]
+	INIT(=N_("E1135: <Cmd> mapping must end with <CR>"));
+EXTERN char e_cmd_mapping_must_end_with_cr_before_second_cmd[]
+	INIT(=N_("E1136: <Cmd> mapping must end with <CR> before second <Cmd>"));
+EXTERN char e_cmd_maping_must_not_include_str_key[]
+	INIT(= N_("E1137: <Cmd> mapping must not include %s key"));
+EXTERN char e_using_bool_as_number[]
+	INIT(= N_("E1138: Using a Bool as a Number"));
+EXTERN char e_missing_matching_bracket_after_dict_key[]
+	INIT(= N_("E1139: Missing matching bracket after dict key"));
+EXTERN char e_for_argument_must_be_sequence_of_lists[]
+	INIT(= N_("E1140: For argument must be a sequence of lists"));
+EXTERN char e_indexable_type_required[]
+	INIT(= N_("E1141: Indexable type required"));
+EXTERN char e_non_empty_string_required[]
+	INIT(= N_("E1142: Non-empty string required"));
+EXTERN char e_empty_expression_str[]
+	INIT(= N_("E1143: Empty expression: \"%s\""));
+EXTERN char e_command_not_followed_by_white_space_str[]
+	INIT(= N_("E1144: Command is not followed by white space: %s"));
+EXTERN char e_missing_heredoc_end_marker_str[]
+	INIT(= N_("E1145: Missing heredoc end marker: %s"));
+EXTERN char e_command_not_recognized_str[]
+	INIT(= N_("E1146: Command not recognized: %s"));
+EXTERN char e_list_not_set[]
+	INIT(= N_("E1147: List not set"));
+EXTERN char e_cannot_index_str[]
+	INIT(= N_("E1148: Cannot index a %s"));
+EXTERN char e_script_variable_invalid_after_reload_in_function_str[]
+	INIT(= N_("E1149: Script variable is invalid after reload in function %s"));
+EXTERN char e_script_variable_type_changed[]
+	INIT(= N_("E1150: Script variable type changed"));
+EXTERN char e_mismatched_endfunction[]
+	INIT(= N_("E1151: Mismatched endfunction"));
+EXTERN char e_mismatched_enddef[]
+	INIT(= N_("E1152: Mismatched enddef"));
+EXTERN char e_invalid_operation_for_bool[]
+	INIT(= N_("E1153: Invalid operation for bool"));
+EXTERN char e_divide_by_zero[]
+	INIT(= N_("E1154: Divide by zero"));
+EXTERN char e_cannot_define_autocommands_for_all_events[]
+	INIT(= N_("E1155: Cannot define autocommands for ALL events"));
+EXTERN char e_cannot_change_arglist_recursively[]
+	INIT(= N_("E1156: Cannot change the argument list recursively"));
diff -Nru vim-8.2.1913/src/evalbuffer.c vim-8.2.2434/src/evalbuffer.c
--- vim-8.2.1913/src/evalbuffer.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/evalbuffer.c	2021-01-30 22:05:11.000000000 +0000
@@ -68,7 +68,7 @@
     save_magic = p_magic;
     p_magic = TRUE;
     save_cpo = p_cpo;
-    p_cpo = (char_u *)"";
+    p_cpo = empty_option;
 
     buf = buflist_findnr(buflist_findpat(name, name + STRLEN(name),
 						    TRUE, FALSE, curtab_only));
@@ -807,6 +807,9 @@
 switch_buffer(bufref_T *save_curbuf, buf_T *buf)
 {
     block_autocmds();
+#ifdef FEAT_FOLDING
+    ++disable_fold_update;
+#endif
     set_bufref(save_curbuf, curbuf);
     --curbuf->b_nwindows;
     curbuf = buf;
@@ -821,6 +824,9 @@
 restore_buffer(bufref_T *save_curbuf)
 {
     unblock_autocmds();
+#ifdef FEAT_FOLDING
+    --disable_fold_update;
+#endif
     // Check for valid buffer, just in case.
     if (bufref_valid(save_curbuf))
     {
diff -Nru vim-8.2.1913/src/eval.c vim-8.2.2434/src/eval.c
--- vim-8.2.1913/src/eval.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/eval.c	2021-01-30 22:05:11.000000000 +0000
@@ -57,14 +57,21 @@
 
 /*
  * Return "n1" divided by "n2", taking care of dividing by zero.
+ * If "failed" is not NULL set it to TRUE when dividing by zero fails.
  */
 	varnumber_T
-num_divide(varnumber_T n1, varnumber_T n2)
+num_divide(varnumber_T n1, varnumber_T n2, int *failed)
 {
     varnumber_T	result;
 
-    if (n2 == 0)	// give an error message?
+    if (n2 == 0)
     {
+	if (in_vim9script())
+	{
+	    emsg(_(e_divide_by_zero));
+	    if (failed != NULL)
+		*failed = TRUE;
+	}
 	if (n1 == 0)
 	    result = VARNUM_MIN; // similar to NaN
 	else if (n1 < 0)
@@ -80,11 +87,17 @@
 
 /*
  * Return "n1" modulus "n2", taking care of dividing by zero.
+ * If "failed" is not NULL set it to TRUE when dividing by zero fails.
  */
 	varnumber_T
-num_modulus(varnumber_T n1, varnumber_T n2)
+num_modulus(varnumber_T n1, varnumber_T n2, int *failed)
 {
-    // Give an error when n2 is 0?
+    if (n2 == 0 && in_vim9script())
+    {
+	emsg(_(e_divide_by_zero));
+	if (failed != NULL)
+	    *failed = TRUE;
+    }
     return (n2 == 0) ? 0 : (n1 % n2);
 }
 
@@ -467,56 +480,82 @@
 }
 
 /*
- * Top level evaluation function, returning a string.  Does not handle line
- * breaks.
+ * Convert "tv" to a string.
  * When "convert" is TRUE convert a List into a sequence of lines and convert
  * a Float to a String.
- * Return pointer to allocated memory, or NULL for failure.
+ * Returns an allocated string (NULL when out of memory).
  */
     char_u *
-eval_to_string(
-    char_u	*arg,
-    int		convert)
+typval2string(typval_T *tv, int convert)
 {
-    typval_T	tv;
-    char_u	*retval;
     garray_T	ga;
+    char_u	*retval;
 #ifdef FEAT_FLOAT
     char_u	numbuf[NUMBUFLEN];
 #endif
 
-    if (eval0(arg, &tv, NULL, &EVALARG_EVALUATE) == FAIL)
-	retval = NULL;
-    else
+    if (convert && tv->v_type == VAR_LIST)
     {
-	if (convert && tv.v_type == VAR_LIST)
+	ga_init2(&ga, (int)sizeof(char), 80);
+	if (tv->vval.v_list != NULL)
 	{
-	    ga_init2(&ga, (int)sizeof(char), 80);
-	    if (tv.vval.v_list != NULL)
-	    {
-		list_join(&ga, tv.vval.v_list, (char_u *)"\n", TRUE, FALSE, 0);
-		if (tv.vval.v_list->lv_len > 0)
-		    ga_append(&ga, NL);
-	    }
-	    ga_append(&ga, NUL);
-	    retval = (char_u *)ga.ga_data;
+	    list_join(&ga, tv->vval.v_list, (char_u *)"\n", TRUE, FALSE, 0);
+	    if (tv->vval.v_list->lv_len > 0)
+		ga_append(&ga, NL);
 	}
+	ga_append(&ga, NUL);
+	retval = (char_u *)ga.ga_data;
+    }
 #ifdef FEAT_FLOAT
-	else if (convert && tv.v_type == VAR_FLOAT)
-	{
-	    vim_snprintf((char *)numbuf, NUMBUFLEN, "%g", tv.vval.v_float);
-	    retval = vim_strsave(numbuf);
-	}
+    else if (convert && tv->v_type == VAR_FLOAT)
+    {
+	vim_snprintf((char *)numbuf, NUMBUFLEN, "%g", tv->vval.v_float);
+	retval = vim_strsave(numbuf);
+    }
 #endif
-	else
-	    retval = vim_strsave(tv_get_string(&tv));
+    else
+	retval = vim_strsave(tv_get_string(tv));
+    return retval;
+}
+
+/*
+ * Top level evaluation function, returning a string.  Does not handle line
+ * breaks.
+ * When "convert" is TRUE convert a List into a sequence of lines and convert
+ * a Float to a String.
+ * Return pointer to allocated memory, or NULL for failure.
+ */
+    char_u *
+eval_to_string_eap(
+    char_u	*arg,
+    int		convert,
+    exarg_T	*eap)
+{
+    typval_T	tv;
+    char_u	*retval;
+    evalarg_T	evalarg;
+
+    fill_evalarg_from_eap(&evalarg, eap, eap != NULL && eap->skip);
+    if (eval0(arg, &tv, NULL, &evalarg) == FAIL)
+	retval = NULL;
+    else
+    {
+	retval = typval2string(&tv, convert);
 	clear_tv(&tv);
     }
-    clear_evalarg(&EVALARG_EVALUATE, NULL);
+    clear_evalarg(&evalarg, NULL);
 
     return retval;
 }
 
+    char_u *
+eval_to_string(
+    char_u	*arg,
+    int		convert)
+{
+    return eval_to_string_eap(arg, convert, NULL);
+}
+
 /*
  * Call eval_to_string() without using current local variables and using
  * textwinlock.  When "use_sandbox" is TRUE use the sandbox.
@@ -644,10 +683,27 @@
 }
 
 /*
+ * Call Vim script function like call_func_retnr() and drop the result.
+ * Returns FAIL when calling the function fails.
+ */
+    int
+call_func_noret(
+    char_u      *func,
+    int		argc,
+    typval_T	*argv)
+{
+    typval_T	rettv;
+
+    if (call_vim_function(func, argc, argv, &rettv) == FAIL)
+	return FAIL;
+    clear_tv(&rettv);
+    return OK;
+}
+
+/*
  * Call Vim script function "func" and return the result as a string.
+ * Uses "argv" and "argc" as call_func_retnr().
  * Returns NULL when calling the function fails.
- * Uses argv[0] to argv[argc - 1] for the function arguments. argv[argc] should
- * have type VAR_UNKNOWN.
  */
     void *
 call_func_retstr(
@@ -668,8 +724,7 @@
 
 /*
  * Call Vim script function "func" and return the result as a List.
- * Uses argv[0] to argv[argc - 1] for the function arguments. argv[argc] should
- * have type VAR_UNKNOWN.
+ * Uses "argv" and "argc" as call_func_retnr().
  * Returns NULL when there is something wrong.
  */
     void *
@@ -694,8 +749,10 @@
 
 #ifdef FEAT_FOLDING
 /*
- * Evaluate 'foldexpr'.  Returns the foldlevel, and any character preceding
- * it in "*cp".  Doesn't give error messages.
+ * Evaluate "arg", which is 'foldexpr'.
+ * Note: caller must set "curwin" to match "arg".
+ * Returns the foldlevel, and any character preceding it in "*cp".  Doesn't
+ * give error messages.
  */
     int
 eval_foldexpr(char_u *arg, int *cp)
@@ -780,15 +837,16 @@
     listitem_T	*ni;
     char_u	*key = NULL;
     int		len;
-    hashtab_T	*ht;
+    hashtab_T	*ht = NULL;
     int		quiet = flags & GLV_QUIET;
+    int		writing;
 
     // Clear everything in "lp".
     CLEAR_POINTER(lp);
 
-    if (skip)
+    if (skip || (flags & GLV_COMPILING))
     {
-	// When skipping just find the end of the name.
+	// When skipping or compiling just find the end of the name.
 	lp->ll_name = name;
 	lp->ll_name_end = find_name_end(name, NULL, NULL,
 						      FNE_INCL_BR | fne_flags);
@@ -841,7 +899,9 @@
 		char_u	 *tp = skipwhite(p + 1);
 
 		// parse the type after the name
-		lp->ll_type = parse_type(&tp, &si->sn_type_list);
+		lp->ll_type = parse_type(&tp, &si->sn_type_list, !quiet);
+		if (lp->ll_type == NULL && !quiet)
+		    return NULL;
 		lp->ll_name_end = tp;
 	    }
 	}
@@ -853,16 +913,23 @@
 
     cc = *p;
     *p = NUL;
-    // Only pass &ht when we would write to the variable, it prevents autoload
-    // as well.
-    v = find_var(lp->ll_name, (flags & GLV_READ_ONLY) ? NULL : &ht,
-						      flags & GLV_NO_AUTOLOAD);
+    // When we would write to the variable pass &ht and prevent autoload.
+    writing = !(flags & GLV_READ_ONLY);
+    v = find_var(lp->ll_name, writing ? &ht : NULL,
+					 (flags & GLV_NO_AUTOLOAD) || writing);
     if (v == NULL && !quiet)
 	semsg(_(e_undefined_variable_str), lp->ll_name);
     *p = cc;
     if (v == NULL)
 	return NULL;
 
+    if (in_vim9script() && (flags & GLV_NO_DECL) == 0)
+    {
+	if (!quiet)
+	    semsg(_(e_variable_already_declared), lp->ll_name);
+	return NULL;
+    }
+
     /*
      * Loop until no more [idx] or .key is following.
      */
@@ -1038,7 +1105,7 @@
 		wrong = (lp->ll_dict->dv_scope == VAR_DEF_SCOPE
 			       && rettv->v_type == VAR_FUNC
 			       && var_wrong_func_name(key, lp->ll_di == NULL))
-			|| !valid_varname(key);
+			|| !valid_varname(key, TRUE);
 		if (len != -1)
 		    key[len] = prevval;
 		if (wrong)
@@ -1300,7 +1367,7 @@
 	{
 	    typval_T tv;
 
-	    if (flags & ASSIGN_CONST)
+	    if (flags & (ASSIGN_CONST | ASSIGN_FINAL))
 	    {
 		emsg(_(e_cannot_mod));
 		*endp = cc;
@@ -1338,7 +1405,7 @@
 	listitem_T *ll_li = lp->ll_li;
 	int	    ll_n1 = lp->ll_n1;
 
-	if (flags & ASSIGN_CONST)
+	if (flags & (ASSIGN_CONST | ASSIGN_FINAL))
 	{
 	    emsg(_("E996: Cannot lock a range"));
 	    return;
@@ -1386,18 +1453,18 @@
 	    ++lp->ll_n1;
 	}
 	if (ri != NULL)
-	    emsg(_("E710: List value has more items than target"));
+	    emsg(_(e_list_value_has_more_items_than_targets));
 	else if (lp->ll_empty2
 		? (lp->ll_li != NULL && lp->ll_li->li_next != NULL)
 		: lp->ll_n1 != lp->ll_n2)
-	    emsg(_("E711: List value has not enough items"));
+	    emsg(_(e_list_value_does_not_have_enough_items));
     }
     else
     {
 	/*
 	 * Assign to a List or Dictionary item.
 	 */
-	if (flags & ASSIGN_CONST)
+	if (flags & (ASSIGN_CONST | ASSIGN_FINAL))
 	{
 	    emsg(_("E996: Cannot lock a list or dict"));
 	    return;
@@ -1459,6 +1526,7 @@
     varnumber_T	n;
     char_u	numbuf[NUMBUFLEN];
     char_u	*s;
+    int		failed = FALSE;
 
     // Can't do anything with a Funcref, Dict, v:true on the right.
     if (tv2->v_type != VAR_FUNC && tv2->v_type != VAR_DICT
@@ -1542,8 +1610,10 @@
 			    case '+': n += tv_get_number(tv2); break;
 			    case '-': n -= tv_get_number(tv2); break;
 			    case '*': n *= tv_get_number(tv2); break;
-			    case '/': n = num_divide(n, tv_get_number(tv2)); break;
-			    case '%': n = num_modulus(n, tv_get_number(tv2)); break;
+			    case '/': n = num_divide(n, tv_get_number(tv2),
+							       &failed); break;
+			    case '%': n = num_modulus(n, tv_get_number(tv2),
+							       &failed); break;
 			}
 			clear_tv(tv1);
 			tv1->v_type = VAR_NUMBER;
@@ -1562,7 +1632,7 @@
 		    tv1->v_type = VAR_STRING;
 		    tv1->vval.v_string = s;
 		}
-		return OK;
+		return failed ? FAIL : OK;
 
 	    case VAR_FLOAT:
 #ifdef FEAT_FLOAT
@@ -1712,7 +1782,7 @@
 {
     forinfo_T	*fi = (forinfo_T *)fi_void;
     int		result;
-    int		flag = in_vim9script() ?  ASSIGN_NO_DECL : 0;
+    int		flag = in_vim9script() ? ASSIGN_DECL : 0;
     listitem_T	*item;
 
     if (fi->fi_blob != NULL)
@@ -1870,6 +1940,24 @@
 	    while ((c = *++arg) != NUL && (c == ' ' || c == '\t'))
 		/* skip */ ;
     }
+
+    // ":exe one two" completes "two"
+    if ((cmdidx == CMD_execute
+		|| cmdidx == CMD_echo
+		|| cmdidx == CMD_echon
+		|| cmdidx == CMD_echomsg)
+	    && xp->xp_context == EXPAND_EXPRESSION)
+    {
+	for (;;)
+	{
+	    char_u *n = skiptowhite(arg);
+
+	    if (n == arg || IS_WHITE_OR_NUL(*skipwhite(n)))
+		break;
+	    arg = skipwhite(n);
+	}
+    }
+
     xp->xp_pattern = arg;
 }
 
@@ -1886,7 +1974,7 @@
 
     // avoid 'l' flag in 'cpoptions'
     save_cpo = p_cpo;
-    p_cpo = (char_u *)"";
+    p_cpo = empty_option;
     regmatch.regprog = vim_regcomp(pat, RE_MAGIC + RE_STRING);
     if (regmatch.regprog != NULL)
     {
@@ -1918,13 +2006,15 @@
     int		len = name_len;
     partial_T	*partial;
     int		ret = OK;
+    type_T	*type = NULL;
 
     if (!evaluate)
 	check_vars(s, len);
 
     // If "s" is the name of a variable of type VAR_FUNC
     // use its contents.
-    s = deref_func_name(s, &len, &partial, !evaluate);
+    s = deref_func_name(s, &len, &partial,
+				    in_vim9script() ? &type : NULL, !evaluate);
 
     // Need to make a copy, in case evaluating the arguments makes
     // the name invalid.
@@ -1942,6 +2032,7 @@
 	funcexe.evaluate = evaluate;
 	funcexe.partial = partial;
 	funcexe.basetv = basetv;
+	funcexe.check_type = type;
 	ret = get_func_tv(s, len, rettv, arg, evalarg, &funcexe);
     }
     vim_free(s);
@@ -2145,7 +2236,13 @@
 		&& called_emsg == called_emsg_before
 		&& (flags & EVAL_CONSTANT) == 0)
 	    semsg(_(e_invexpr2), arg);
-	ret = FAIL;
+
+	// Some of the expression may not have been consumed.  Do not check for
+	// a next command to avoid more errors, unless "|" is following, which
+	// could only be a command separator.
+	if (eap != NULL && skipwhite(p)[0] == '|' && skipwhite(p)[1] != '|')
+	    eap->nextcmd = check_nextcmd(p);
+	return FAIL;
     }
 
     if (eap != NULL)
@@ -2589,7 +2686,7 @@
 {
     char_u	*p;
     int		getnext;
-    exptype_T	type = EXPR_UNKNOWN;
+    exprtype_T	type = EXPR_UNKNOWN;
     int		len = 2;
     int		type_is = FALSE;
 
@@ -2758,10 +2855,11 @@
 	int	    vim9script = in_vim9script();
 
 	// "." is only string concatenation when scriptversion is 1
+	// "+=" and "-=" are assignment
 	p = eval_next_non_blank(*arg, evalarg, &getnext);
 	op = *p;
 	concat = op == '.' && (*(p + 1) == '.' || current_sctx.sc_version < 2);
-	if (op != '+' && op != '-' && !concat)
+	if ((op != '+' && op != '-' && !concat) || p[1] == '=')
 	    break;
 
 	evaluate = evalarg == NULL ? 0 : (evalarg->eval_flags & EVAL_EVALUATE);
@@ -3111,12 +3209,16 @@
 	    else
 #endif
 	    {
+		int	    failed = FALSE;
+
 		if (op == '*')
 		    n1 = n1 * n2;
 		else if (op == '/')
-		    n1 = num_divide(n1, n2);
+		    n1 = num_divide(n1, n2, &failed);
 		else
-		    n1 = num_modulus(n1, n2);
+		    n1 = num_modulus(n1, n2, &failed);
+		if (failed)
+		    return FAIL;
 
 		rettv->v_type = VAR_NUMBER;
 		rettv->vval.v_number = n1;
@@ -3127,6 +3229,28 @@
     return OK;
 }
 
+    int
+eval_leader(char_u **arg, int vim9)
+{
+    char_u	*s = *arg;
+    char_u	*p = *arg;
+
+    while (*p == '!' || *p == '-' || *p == '+')
+    {
+	char_u *n = skipwhite(p + 1);
+
+	// ++, --, -+ and +- are not accepted in Vim9 script
+	if (vim9 && (*p == '-' || *p == '+') && (*n == '-' || *n == '+'))
+	{
+	    semsg(_(e_invexpr2), s);
+	    return FAIL;
+	}
+	p = n;
+    }
+    *arg = p;
+    return OK;
+}
+
 /*
  * Handle sixth level expression:
  *  number		number constant
@@ -3182,8 +3306,8 @@
      * Skip '!', '-' and '+' characters.  They are handled later.
      */
     start_leader = *arg;
-    while (**arg == '!' || **arg == '-' || **arg == '+')
-	*arg = skipwhite(*arg + 1);
+    if (eval_leader(arg, in_vim9script()) == FAIL)
+	return FAIL;
     end_leader = *arg;
 
     if (**arg == '.' && (!isdigit(*(*arg + 1))
@@ -3242,7 +3366,7 @@
     /*
      * Dictionary: #{key: val, key: val}
      */
-    case '#':	if ((*arg)[1] == '{')
+    case '#':	if (!in_vim9script() && (*arg)[1] == '{')
 		{
 		    ++*arg;
 		    ret = eval_dict(arg, rettv, evalarg, TRUE);
@@ -3255,7 +3379,10 @@
      * Lambda: {arg, arg -> expr}
      * Dictionary: {'key': val, 'key': val}
      */
-    case '{':	ret = get_lambda_tv(arg, rettv, evalarg);
+    case '{':	if (in_vim9script())
+		    ret = NOTDONE;
+		else
+		    ret = get_lambda_tv(arg, rettv, in_vim9script(), evalarg);
 		if (ret == NOTDONE)
 		    ret = eval_dict(arg, rettv, evalarg, FALSE);
 		break;
@@ -3288,8 +3415,13 @@
 
     /*
      * nested expression: (expression).
+     * lambda: (arg) => expr
      */
-    case '(':	{
+    case '(':	ret = NOTDONE;
+		if (in_vim9script())
+		    ret = get_lambda_tv(arg, rettv, TRUE, evalarg);
+		if (ret == NOTDONE)
+		{
 		    *arg = skipwhite_and_linebreak(*arg + 1, evalarg);
 		    ret = eval1(arg, rettv, evalarg);	// recursive!
 
@@ -3344,12 +3476,19 @@
 		    ret = OK;
 		}
 		else if (len == 5 && in_vim9script()
-						&& STRNCMP(s, "false", 4) == 0)
+						&& STRNCMP(s, "false", 5) == 0)
 		{
 		    rettv->v_type = VAR_BOOL;
 		    rettv->vval.v_number = VVAL_FALSE;
 		    ret = OK;
 		}
+		else if (len == 4 && in_vim9script()
+						&& STRNCMP(s, "null", 4) == 0)
+		{
+		    rettv->v_type = VAR_SPECIAL;
+		    rettv->vval.v_number = VVAL_NULL;
+		    ret = OK;
+		}
 		else
 		    ret = eval_variable(s, len, rettv, NULL, TRUE, FALSE);
 	    }
@@ -3427,7 +3566,15 @@
 		}
 #ifdef FEAT_FLOAT
 		if (rettv->v_type == VAR_FLOAT)
-		    f = !f;
+		{
+		    if (in_vim9script())
+		    {
+			rettv->v_type = VAR_BOOL;
+			val = f == 0.0 ? VVAL_TRUE : VVAL_FALSE;
+		    }
+		    else
+			f = !f;
+		}
 		else
 #endif
 		{
@@ -3524,7 +3671,7 @@
 
 /*
  * Evaluate "->method()".
- * "*arg" points to the '-'.
+ * "*arg" points to "method".
  * Returns FAIL or OK. "*arg" is advanced to after the ')'.
  */
     static int
@@ -3539,11 +3686,26 @@
     typval_T	base = *rettv;
     int		ret;
 
-    // Skip over the ->.
-    *arg += 2;
     rettv->v_type = VAR_UNKNOWN;
 
-    ret = get_lambda_tv(arg, rettv, evalarg);
+    if (**arg == '{')
+    {
+	// ->{lambda}()
+	ret = get_lambda_tv(arg, rettv, FALSE, evalarg);
+    }
+    else
+    {
+	// ->(lambda)()
+	++*arg;
+	ret = eval1(arg, rettv, evalarg);
+	*arg = skipwhite_and_linebreak(*arg, evalarg);
+	if (**arg != ')')
+	{
+	    emsg(_(e_missing_close));
+	    ret = FAIL;
+	}
+	++*arg;
+    }
     if (ret != OK)
 	return FAIL;
     else if (**arg != '(')
@@ -3571,7 +3733,7 @@
 
 /*
  * Evaluate "->method()".
- * "*arg" points to the '-'.
+ * "*arg" points to "method".
  * Returns FAIL or OK. "*arg" is advanced to after the ')'.
  */
     static int
@@ -3589,8 +3751,6 @@
     int		evaluate = evalarg != NULL
 				      && (evalarg->eval_flags & EVAL_EVALUATE);
 
-    // Skip over the ->.
-    *arg += 2;
     rettv->v_type = VAR_UNKNOWN;
 
     name = *arg;
@@ -3651,6 +3811,7 @@
     int		range = FALSE;
     char_u	*key = NULL;
     int		keylen = -1;
+    int		vim9 = in_vim9script();
 
     if (check_can_index(rettv, evaluate, verbose) == FAIL)
 	return FAIL;
@@ -3681,6 +3842,13 @@
 	    empty1 = TRUE;
 	else if (eval1(arg, &var1, evalarg) == FAIL)	// recursive!
 	    return FAIL;
+	else if (vim9 && **arg == ':')
+	{
+	    semsg(_(e_white_space_required_before_and_after_str_at_str),
+								    ":", *arg);
+	    clear_tv(&var1);
+	    return FAIL;
+	}
 	else if (evaluate && tv_get_string_chk(&var1) == NULL)
 	{
 	    // not a number or string
@@ -3695,7 +3863,16 @@
 	if (**arg == ':')
 	{
 	    range = TRUE;
-	    *arg = skipwhite_and_linebreak(*arg + 1, evalarg);
+	    ++*arg;
+	    if (vim9 && !IS_WHITE_OR_NUL(**arg) && **arg != ']')
+	    {
+		semsg(_(e_white_space_required_before_and_after_str_at_str),
+								":", *arg - 1);
+		if (!empty1)
+		    clear_tv(&var1);
+		return FAIL;
+	    }
+	    *arg = skipwhite_and_linebreak(*arg, evalarg);
 	    if (**arg == ']')
 		empty2 = TRUE;
 	    else if (eval1(arg, &var2, evalarg) == FAIL)	// recursive!
@@ -3731,8 +3908,9 @@
     if (evaluate)
     {
 	int res = eval_index_inner(rettv, range,
-		empty1 ? NULL : &var1, empty2 ? NULL : &var2,
+		empty1 ? NULL : &var1, empty2 ? NULL : &var2, FALSE,
 		key, keylen, verbose);
+
 	if (!empty1)
 	    clear_tv(&var1);
 	if (range)
@@ -3792,9 +3970,26 @@
 }
 
 /*
+ * slice() function
+ */
+    void
+f_slice(typval_T *argvars, typval_T *rettv)
+{
+    if (check_can_index(argvars, TRUE, FALSE) == OK)
+    {
+	copy_tv(argvars, rettv);
+	eval_index_inner(rettv, TRUE, argvars + 1,
+		argvars[2].v_type == VAR_UNKNOWN ? NULL : argvars + 2,
+		TRUE, NULL, 0, FALSE);
+    }
+}
+
+/*
  * Apply index or range to "rettv".
  * "var1" is the first index, NULL for [:expr].
  * "var2" is the second index, NULL for [expr] and [expr: ]
+ * "exclusive" is TRUE for slice(): second index is exclusive, use character
+ * index for string.
  * Alternatively, "key" is not NULL, then key[keylen] is the dict index.
  */
     int
@@ -3803,12 +3998,13 @@
 	int	    is_range,
 	typval_T    *var1,
 	typval_T    *var2,
+	int	    exclusive,
 	char_u	    *key,
 	int	    keylen,
 	int	    verbose)
 {
-    long	n1, n2 = 0;
-    long	len;
+    varnumber_T	    n1, n2 = 0;
+    long	    len;
 
     n1 = 0;
     if (var1 != NULL && rettv->v_type != VAR_DICT)
@@ -3822,10 +4018,10 @@
 		emsg(_(e_cannot_slice_dictionary));
 	    return FAIL;
 	}
-	if (var2 == NULL)
-	    n2 = -1;
-	else
+	if (var2 != NULL)
 	    n2 = tv_get_number(var2);
+	else
+	    n2 = VARNUM_MAX;
     }
 
     switch (rettv->v_type)
@@ -3848,10 +4044,10 @@
 		char_u	*s = tv_get_string(rettv);
 
 		len = (long)STRLEN(s);
-		if (in_vim9script())
+		if (in_vim9script() || exclusive)
 		{
 		    if (is_range)
-			s = string_slice(s, n1, n2);
+			s = string_slice(s, n1, n2, exclusive);
 		    else
 			s = char_from_string(s, n1);
 		}
@@ -3869,6 +4065,8 @@
 			n2 = len + n2;
 		    else if (n2 >= len)
 			n2 = len;
+		    if (exclusive)
+			--n2;
 		    if (n1 >= len || n2 < 0 || n1 > n2)
 			s = NULL;
 		    else
@@ -3905,7 +4103,9 @@
 		if (n2 < 0)
 		    n2 = len + n2;
 		else if (n2 >= len)
-		    n2 = len - 1;
+		    n2 = len - (exclusive ? 0 : 1);
+		if (exclusive)
+		    --n2;
 		if (n1 >= len || n2 < 0 || n1 > n2)
 		{
 		    clear_tv(rettv);
@@ -3957,9 +4157,9 @@
 	    if (var1 == NULL)
 		n1 = 0;
 	    if (var2 == NULL)
-		n2 = -1;
+		n2 = VARNUM_MAX;
 	    if (list_slice_or_index(rettv->vval.v_list,
-				    is_range, n1, n2, rettv, verbose) == FAIL)
+			  is_range, n1, n2, exclusive, rettv, verbose) == FAIL)
 		return FAIL;
 	    break;
 
@@ -4605,7 +4805,7 @@
  * "numbuf" is used for a number.
  * When "copyID" is not NULL replace recursive lists and dicts with "...".
  * When both "echo_style" and "composite_val" are FALSE, put quotes around
- * stings as "string()", otherwise does not put quotes around strings, as
+ * strings as "string()", otherwise does not put quotes around strings, as
  * ":echo" displays values.
  * When "restore_copyID" is FALSE, repeated items in dictionaries and lists
  * are replaced with "...".
@@ -4908,6 +5108,74 @@
 #endif
 
 /*
+ * Convert the specified byte index of line 'lnum' in buffer 'buf' to a
+ * character index.  Works only for loaded buffers. Returns -1 on failure.
+ * The index of the first byte and the first character is zero.
+ */
+    int
+buf_byteidx_to_charidx(buf_T *buf, int lnum, int byteidx)
+{
+    char_u	*str;
+    char_u	*t;
+    int		count;
+
+    if (buf == NULL || buf->b_ml.ml_mfp == NULL)
+	return -1;
+
+    if (lnum > buf->b_ml.ml_line_count)
+	lnum = buf->b_ml.ml_line_count;
+
+    str = ml_get_buf(buf, lnum, FALSE);
+    if (str == NULL)
+	return -1;
+
+    if (*str == NUL)
+	return 0;
+
+    // count the number of characters
+    t = str;
+    for (count = 0; *t != NUL && t <= str + byteidx; count++)
+	t += mb_ptr2len(t);
+
+    // In insert mode, when the cursor is at the end of a non-empty line,
+    // byteidx points to the NUL character immediately past the end of the
+    // string. In this case, add one to the character count.
+    if (*t == NUL && byteidx != 0 && t == str + byteidx)
+	count++;
+
+    return count - 1;
+}
+
+/*
+ * Convert the specified character index of line 'lnum' in buffer 'buf' to a
+ * byte index.  Works only for loaded buffers. Returns -1 on failure.
+ * The index of the first byte and the first character is zero.
+ */
+    int
+buf_charidx_to_byteidx(buf_T *buf, int lnum, int charidx)
+{
+    char_u	*str;
+    char_u	*t;
+
+    if (buf == NULL || buf->b_ml.ml_mfp == NULL)
+	return -1;
+
+    if (lnum > buf->b_ml.ml_line_count)
+	lnum = buf->b_ml.ml_line_count;
+
+    str = ml_get_buf(buf, lnum, FALSE);
+    if (str == NULL)
+	return -1;
+
+    // Convert the character offset to a byte offset
+    t = str;
+    while (*t != NUL && --charidx > 0)
+	t += mb_ptr2len(t);
+
+    return t - str;
+}
+
+/*
  * Translate a String variable into a position.
  * Returns NULL when there is an error.
  */
@@ -4915,7 +5183,8 @@
 var2fpos(
     typval_T	*varp,
     int		dollar_lnum,	// TRUE when $ is last line
-    int		*fnum)		// set to fnum for '0, 'A, etc.
+    int		*fnum,		// set to fnum for '0, 'A, etc.
+    int		charcol)	// return character column
 {
     char_u		*name;
     static pos_T	pos;
@@ -4937,7 +5206,10 @@
 	pos.lnum = list_find_nr(l, 0L, &error);
 	if (error || pos.lnum <= 0 || pos.lnum > curbuf->b_ml.ml_line_count)
 	    return NULL;	// invalid line number
-	len = (long)STRLEN(ml_get(pos.lnum));
+	if (charcol)
+	    len = (long)mb_charlen(ml_get(pos.lnum));
+	else
+	    len = (long)STRLEN(ml_get(pos.lnum));
 
 	// Get the column number
 	// We accept "$" for the column number: last column.
@@ -4972,18 +5244,29 @@
     if (name == NULL)
 	return NULL;
     if (name[0] == '.')				// cursor
-	return &curwin->w_cursor;
+    {
+	pos = curwin->w_cursor;
+	if (charcol)
+	    pos.col = buf_byteidx_to_charidx(curbuf, pos.lnum, pos.col);
+	return &pos;
+    }
     if (name[0] == 'v' && name[1] == NUL)	// Visual start
     {
 	if (VIsual_active)
-	    return &VIsual;
-	return &curwin->w_cursor;
+	    pos = VIsual;
+	else
+	    pos = curwin->w_cursor;
+	if (charcol)
+	    pos.col = buf_byteidx_to_charidx(curbuf, pos.lnum, pos.col);
+	return &pos;
     }
     if (name[0] == '\'')			// mark
     {
 	pp = getmark_buf_fnum(curbuf, name[1], FALSE, fnum);
 	if (pp == NULL || pp == (pos_T *)-1 || pp->lnum <= 0)
 	    return NULL;
+	if (charcol)
+	    pp->col = buf_byteidx_to_charidx(curbuf, pp->lnum, pp->col);
 	return pp;
     }
 
@@ -5018,7 +5301,10 @@
 	else
 	{
 	    pos.lnum = curwin->w_cursor.lnum;
-	    pos.col = (colnr_T)STRLEN(ml_get_curline());
+	    if (charcol)
+		pos.col = (colnr_T)mb_charlen(ml_get_curline());
+	    else
+		pos.col = (colnr_T)STRLEN(ml_get_curline());
 	}
 	return &pos;
     }
@@ -5038,7 +5324,8 @@
     typval_T	*arg,
     pos_T	*posp,
     int		*fnump,
-    colnr_T	*curswantp)
+    colnr_T	*curswantp,
+    int		charcol)
 {
     list_T	*l = arg->vval.v_list;
     long	i = 0;
@@ -5070,6 +5357,18 @@
     n = list_find_nr(l, i++, NULL);	// col
     if (n < 0)
 	return FAIL;
+    // If character position is specified, then convert to byte position
+    if (charcol)
+    {
+	buf_T	*buf;
+
+	// Get the text for the specified line in a loaded buffer
+	buf = buflist_findnr(fnump == NULL ? curbuf->b_fnum : *fnump);
+	if (buf == NULL || buf->b_ml.ml_mfp == NULL)
+	    return FAIL;
+
+	n = buf_charidx_to_byteidx(buf, posp->lnum, n) + 1;
+    }
     posp->col = n;
 
     n = list_find_nr(l, i, NULL);	// off
@@ -5403,97 +5702,6 @@
 }
 
 /*
- * Return the character "str[index]" where "index" is the character index.  If
- * "index" is out of range NULL is returned.
- */
-    char_u *
-char_from_string(char_u *str, varnumber_T index)
-{
-    size_t	    nbyte = 0;
-    varnumber_T	    nchar = index;
-    size_t	    slen;
-
-    if (str == NULL || index < 0)
-	return NULL;
-    slen = STRLEN(str);
-    while (nchar > 0 && nbyte < slen)
-    {
-	nbyte += MB_CPTR2LEN(str + nbyte);
-	--nchar;
-    }
-    if (nbyte >= slen)
-	return NULL;
-    return vim_strnsave(str + nbyte, MB_CPTR2LEN(str + nbyte));
-}
-
-/*
- * Get the byte index for character index "idx" in string "str" with length
- * "str_len".
- * If going over the end return "str_len".
- * If "idx" is negative count from the end, -1 is the last character.
- * When going over the start return -1.
- */
-    static long
-char_idx2byte(char_u *str, size_t str_len, varnumber_T idx)
-{
-    varnumber_T nchar = idx;
-    size_t	nbyte = 0;
-
-    if (nchar >= 0)
-    {
-	while (nchar > 0 && nbyte < str_len)
-	{
-	    nbyte += MB_CPTR2LEN(str + nbyte);
-	    --nchar;
-	}
-    }
-    else
-    {
-	nbyte = str_len;
-	while (nchar < 0 && nbyte > 0)
-	{
-	    --nbyte;
-	    nbyte -= mb_head_off(str, str + nbyte);
-	    ++nchar;
-	}
-	if (nchar < 0)
-	    return -1;
-    }
-    return (long)nbyte;
-}
-
-/*
- * Return the slice "str[first:last]" using character indexes.
- * Return NULL when the result is empty.
- */
-    char_u *
-string_slice(char_u *str, varnumber_T first, varnumber_T last)
-{
-    long	start_byte, end_byte;
-    size_t	slen;
-
-    if (str == NULL)
-	return NULL;
-    slen = STRLEN(str);
-    start_byte = char_idx2byte(str, slen, first);
-    if (start_byte < 0)
-	start_byte = 0; // first index very negative: use zero
-    if (last == -1)
-	end_byte = (long)slen;
-    else
-    {
-	end_byte = char_idx2byte(str, slen, last);
-	if (end_byte >= 0 && end_byte < (long)slen)
-	    // end index is inclusive
-	    end_byte += MB_CPTR2LEN(str + end_byte);
-    }
-
-    if (start_byte >= (long)slen || end_byte <= start_byte)
-	return NULL;
-    return vim_strnsave(str + start_byte, end_byte - start_byte);
-}
-
-/*
  * Handle:
  * - expr[expr], expr[expr:expr] subscript
  * - ".name" lookup
@@ -5553,11 +5761,11 @@
 	}
 	else if (p[0] == '-' && p[1] == '>')
 	{
-	    *arg = p;
+	    *arg = skipwhite(p + 2);
 	    if (ret == OK)
 	    {
-		if ((*arg)[2] == '{')
-		    // expr->{lambda}()
+		if ((**arg == '{' && !in_vim9script()) || **arg == '(')
+		    // expr->{lambda}() or expr->(lambda)()
 		    ret = eval_lambda(arg, rettv, evalarg, verbose);
 		else
 		    // expr->name()
@@ -6089,8 +6297,14 @@
     if (p_cpo == empty_option)
 	p_cpo = save_cpo;
     else
+    {
 	// Darn, evaluating {sub} expression or {expr} changed the value.
+	// If it's still empty it was changed and restored, need to restore in
+	// the complicated way.
+	if (*p_cpo == NUL)
+	    set_option_value((char_u *)"cpo", 0L, save_cpo, 0);
 	free_string_option(save_cpo);
+    }
 
     return ret;
 }
diff -Nru vim-8.2.1913/src/evalfunc.c vim-8.2.2434/src/evalfunc.c
--- vim-8.2.1913/src/evalfunc.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/evalfunc.c	2021-01-30 22:05:11.000000000 +0000
@@ -47,6 +47,8 @@
 #endif
 static void f_changenr(typval_T *argvars, typval_T *rettv);
 static void f_char2nr(typval_T *argvars, typval_T *rettv);
+static void f_charcol(typval_T *argvars, typval_T *rettv);
+static void f_charidx(typval_T *argvars, typval_T *rettv);
 static void f_col(typval_T *argvars, typval_T *rettv);
 static void f_confirm(typval_T *argvars, typval_T *rettv);
 static void f_copy(typval_T *argvars, typval_T *rettv);
@@ -86,12 +88,14 @@
 static void f_garbagecollect(typval_T *argvars, typval_T *rettv);
 static void f_get(typval_T *argvars, typval_T *rettv);
 static void f_getchangelist(typval_T *argvars, typval_T *rettv);
+static void f_getcharpos(typval_T *argvars, typval_T *rettv);
 static void f_getcharsearch(typval_T *argvars, typval_T *rettv);
 static void f_getenv(typval_T *argvars, typval_T *rettv);
 static void f_getfontname(typval_T *argvars, typval_T *rettv);
 static void f_getjumplist(typval_T *argvars, typval_T *rettv);
 static void f_getpid(typval_T *argvars, typval_T *rettv);
 static void f_getcurpos(typval_T *argvars, typval_T *rettv);
+static void f_getcursorcharpos(typval_T *argvars, typval_T *rettv);
 static void f_getpos(typval_T *argvars, typval_T *rettv);
 static void f_getreg(typval_T *argvars, typval_T *rettv);
 static void f_getreginfo(typval_T *argvars, typval_T *rettv);
@@ -189,7 +193,9 @@
 static void f_searchpair(typval_T *argvars, typval_T *rettv);
 static void f_searchpairpos(typval_T *argvars, typval_T *rettv);
 static void f_searchpos(typval_T *argvars, typval_T *rettv);
+static void f_setcharpos(typval_T *argvars, typval_T *rettv);
 static void f_setcharsearch(typval_T *argvars, typval_T *rettv);
+static void f_setcursorcharpos(typval_T *argvars, typval_T *rettv);
 static void f_setenv(typval_T *argvars, typval_T *rettv);
 static void f_setfperm(typval_T *argvars, typval_T *rettv);
 static void f_setpos(typval_T *argvars, typval_T *rettv);
@@ -269,6 +275,7 @@
     int		arg_count;	// actual argument count
     type_T	**arg_types;	// list of argument types
     int		arg_idx;	// current argument index (first arg is zero)
+    cctx_T	*arg_cctx;
 } argcontext_T;
 
 // A function to check one argument type.  The first argument is the type to
@@ -276,6 +283,25 @@
 // E.g. if "arg_idx" is 1, then (type - 1) is the first argument type.
 typedef int (*argcheck_T)(type_T *, argcontext_T *);
 
+/*
+ * Call need_type() to check an argument type.
+ */
+    static int
+check_arg_type(
+	type_T		*expected,
+	type_T		*actual,
+	argcontext_T	*context)
+{
+    // TODO: would be useful to know if "actual" is a constant and pass it to
+    // need_type() to get a compile time error if possible.
+    return need_type(actual, expected,
+	    context->arg_idx - context->arg_count, context->arg_idx + 1,
+	    context->arg_cctx, FALSE, FALSE);
+}
+
+/*
+ * Check "type" is a float or a number.
+ */
     static int
 arg_float_or_nr(type_T *type, argcontext_T *context)
 {
@@ -286,12 +312,39 @@
     return FAIL;
 }
 
+/*
+ * Check "type" is a number.
+ */
     static int
 arg_number(type_T *type, argcontext_T *context)
 {
-    return check_type(&t_number, type, TRUE, context->arg_idx + 1);
+    return check_arg_type(&t_number, type, context);
+}
+
+/*
+ * Check "type" is a string.
+ */
+    static int
+arg_string(type_T *type, argcontext_T *context)
+{
+    return check_arg_type(&t_string, type, context);
 }
 
+/*
+ * Check "type" is a bool or number 0 or 1.
+ */
+    static int
+arg_bool(type_T *type, argcontext_T *context)
+{
+    if (type->tt_type == VAR_ANY
+		   || type->tt_type == VAR_NUMBER || type->tt_type == VAR_BOOL)
+	return OK;
+    return check_arg_type(&t_bool, type, context);
+}
+
+/*
+ * Check "type" is a list or a blob.
+ */
     static int
 arg_list_or_blob(type_T *type, argcontext_T *context)
 {
@@ -303,7 +356,47 @@
 }
 
 /*
- * Check the type is an item of the list or blob of the previous arg.
+ * Check "type" is a list or a dict.
+ */
+    static int
+arg_list_or_dict(type_T *type, argcontext_T *context)
+{
+    if (type->tt_type == VAR_ANY
+		     || type->tt_type == VAR_LIST || type->tt_type == VAR_DICT)
+	return OK;
+    arg_type_mismatch(&t_list_any, type, context->arg_idx + 1);
+    return FAIL;
+}
+
+/*
+ * Check "type" is the same type as the previous argument.
+ * Must not be used for the first argcheck_T entry.
+ */
+    static int
+arg_same_as_prev(type_T *type, argcontext_T *context)
+{
+    type_T *prev_type = context->arg_types[context->arg_idx - 1];
+
+    return check_arg_type(prev_type, type, context);
+}
+
+/*
+ * Check "type" is the same basic type as the previous argument, checks list or
+ * dict vs other type, but not member type.
+ * Must not be used for the first argcheck_T entry.
+ */
+    static int
+arg_same_struct_as_prev(type_T *type, argcontext_T *context)
+{
+    type_T *prev_type = context->arg_types[context->arg_idx - 1];
+
+    if (prev_type->tt_type != context->arg_types[context->arg_idx]->tt_type)
+	return check_arg_type(prev_type, type, context);
+    return OK;
+}
+
+/*
+ * Check "type" is an item of the list or blob of the previous arg.
  * Must not be used for the first argcheck_T entry.
  */
     static int
@@ -320,13 +413,33 @@
 	// probably VAR_ANY, can't check
 	return OK;
 
-    return check_type(expected, type, TRUE, context->arg_idx + 1);
+    return check_arg_type(expected, type, context);
 }
 
 /*
+ * Check "type" which is the third argument of extend().
+ */
+    static int
+arg_extend3(type_T *type, argcontext_T *context)
+{
+    type_T *first_type = context->arg_types[context->arg_idx - 2];
+
+    if (first_type->tt_type == VAR_LIST)
+	return arg_number(type, context);
+    if (first_type->tt_type == VAR_DICT)
+	return arg_string(type, context);
+    return OK;
+}
+
+
+/*
  * Lists of functions that check the argument types of a builtin function.
  */
+argcheck_T arg3_string_nr_bool[] = {arg_string, arg_number, arg_bool};
 argcheck_T arg1_float_or_nr[] = {arg_float_or_nr};
+argcheck_T arg2_listblob_item[] = {arg_list_or_blob, arg_item_of_prev};
+argcheck_T arg23_extend[] = {arg_list_or_dict, arg_same_as_prev, arg_extend3};
+argcheck_T arg23_extendnew[] = {arg_list_or_dict, arg_same_struct_as_prev, arg_extend3};
 argcheck_T arg3_insert[] = {arg_list_or_blob, arg_item_of_prev, arg_number};
 
 /*
@@ -349,6 +462,11 @@
     return &t_bool;
 }
     static type_T *
+ret_number_bool(int argcount UNUSED, type_T **argtypes UNUSED)
+{
+    return &t_number_bool;
+}
+    static type_T *
 ret_number(int argcount UNUSED, type_T **argtypes UNUSED)
 {
     return &t_number;
@@ -389,6 +507,13 @@
     return &t_dict_any;
 }
     static type_T *
+ret_job_info(int argcount, type_T **argtypes UNUSED)
+{
+    if (argcount == 0)
+	return &t_list_job;
+    return &t_dict_any;
+}
+    static type_T *
 ret_dict_number(int argcount UNUSED, type_T **argtypes UNUSED)
 {
     return &t_dict_number;
@@ -418,7 +543,6 @@
 {
     return &t_job;
 }
-
     static type_T *
 ret_first_arg(int argcount, type_T **argtypes)
 {
@@ -426,6 +550,18 @@
 	return argtypes[0];
     return &t_void;
 }
+// for map(): returns first argument but item type may differ
+    static type_T *
+ret_first_cont(int argcount UNUSED, type_T **argtypes)
+{
+    if (argtypes[0]->tt_type == VAR_LIST)
+	return &t_list_any;
+    if (argtypes[0]->tt_type == VAR_DICT)
+	return &t_dict_any;
+    if (argtypes[0]->tt_type == VAR_BLOB)
+	return argtypes[0];
+    return &t_any;
+}
 
 /*
  * Used for getqflist(): returns list if there is no argument, dict if there is
@@ -567,14 +703,14 @@
 			ret_any,	    FLOAT_FUNC(f_abs)},
     {"acos",		1, 1, FEARG_1,	    NULL,
 			ret_float,	    FLOAT_FUNC(f_acos)},
-    {"add",		2, 2, FEARG_1,	    NULL,
+    {"add",		2, 2, FEARG_1,	    NULL /* arg2_listblob_item */,
 			ret_first_arg,	    f_add},
     {"and",		2, 2, FEARG_1,	    NULL,
 			ret_number,	    f_and},
     {"append",		2, 2, FEARG_2,	    NULL,
-			ret_number,	    f_append},
+			ret_number_bool,    f_append},
     {"appendbufline",	3, 3, FEARG_3,	    NULL,
-			ret_number,	    f_appendbufline},
+			ret_number_bool,    f_appendbufline},
     {"argc",		0, 1, 0,	    NULL,
 			ret_number,	    f_argc},
     {"argidx",		0, 0, 0,	    NULL,
@@ -586,29 +722,29 @@
     {"asin",		1, 1, FEARG_1,	    NULL,
 			ret_float,	    FLOAT_FUNC(f_asin)},
     {"assert_beeps",	1, 2, FEARG_1,	    NULL,
-			ret_number,	    f_assert_beeps},
+			ret_number_bool,    f_assert_beeps},
     {"assert_equal",	2, 3, FEARG_2,	    NULL,
-			ret_number,	    f_assert_equal},
+			ret_number_bool,    f_assert_equal},
     {"assert_equalfile", 2, 3, FEARG_1,	    NULL,
-			ret_number,	    f_assert_equalfile},
+			ret_number_bool,    f_assert_equalfile},
     {"assert_exception", 1, 2, 0,	    NULL,
-			ret_number,	    f_assert_exception},
+			ret_number_bool,    f_assert_exception},
     {"assert_fails",	1, 5, FEARG_1,	    NULL,
-			ret_number,	    f_assert_fails},
+			ret_number_bool,    f_assert_fails},
     {"assert_false",	1, 2, FEARG_1,	    NULL,
-			ret_number,	    f_assert_false},
+			ret_number_bool,    f_assert_false},
     {"assert_inrange",	3, 4, FEARG_3,	    NULL,
-			ret_number,	    f_assert_inrange},
+			ret_number_bool,    f_assert_inrange},
     {"assert_match",	2, 3, FEARG_2,	    NULL,
-			ret_number,	    f_assert_match},
+			ret_number_bool,    f_assert_match},
     {"assert_notequal",	2, 3, FEARG_2,	    NULL,
-			ret_number,	    f_assert_notequal},
+			ret_number_bool,    f_assert_notequal},
     {"assert_notmatch",	2, 3, FEARG_2,	    NULL,
-			ret_number,	    f_assert_notmatch},
+			ret_number_bool,    f_assert_notmatch},
     {"assert_report",	1, 1, FEARG_1,	    NULL,
-			ret_number,	    f_assert_report},
+			ret_number_bool,    f_assert_report},
     {"assert_true",	1, 2, FEARG_1,	    NULL,
-			ret_number,	    f_assert_true},
+			ret_number_bool,    f_assert_true},
     {"atan",		1, 1, FEARG_1,	    NULL,
 			ret_float,	    FLOAT_FUNC(f_atan)},
     {"atan2",		2, 2, FEARG_1,	    NULL,
@@ -644,19 +780,19 @@
     {"bufadd",		1, 1, FEARG_1,	    NULL,
 			ret_number,	    f_bufadd},
     {"bufexists",	1, 1, FEARG_1,	    NULL,
-			ret_number,	    f_bufexists},
+			ret_number_bool,    f_bufexists},
     {"buffer_exists",	1, 1, FEARG_1,	    NULL,	// obsolete
-			ret_number,	    f_bufexists},
+			ret_number_bool,    f_bufexists},
     {"buffer_name",	0, 1, FEARG_1,	    NULL,	// obsolete
 			ret_string,	    f_bufname},
     {"buffer_number",	0, 1, FEARG_1,	    NULL,	// obsolete
 			ret_number,	    f_bufnr},
     {"buflisted",	1, 1, FEARG_1,	    NULL,
-			ret_number,	    f_buflisted},
+			ret_number_bool,    f_buflisted},
     {"bufload",		1, 1, FEARG_1,	    NULL,
 			ret_void,	    f_bufload},
     {"bufloaded",	1, 1, FEARG_1,	    NULL,
-			ret_number,	    f_bufloaded},
+			ret_number_bool,    f_bufloaded},
     {"bufname",		0, 1, FEARG_1,	    NULL,
 			ret_string,	    f_bufname},
     {"bufnr",		0, 2, FEARG_1,	    NULL,
@@ -676,7 +812,7 @@
     {"ceil",		1, 1, FEARG_1,	    NULL,
 			ret_float,	    FLOAT_FUNC(f_ceil)},
     {"ch_canread",	1, 1, FEARG_1,	    NULL,
-			ret_number,	    JOB_FUNC(f_ch_canread)},
+			ret_number_bool,    JOB_FUNC(f_ch_canread)},
     {"ch_close",	1, 1, FEARG_1,	    NULL,
 			ret_void,	    JOB_FUNC(f_ch_close)},
     {"ch_close_in",	1, 1, FEARG_1,	    NULL,
@@ -717,6 +853,10 @@
 			ret_number,	    f_char2nr},
     {"charclass",	1, 1, FEARG_1,	    NULL,
 			ret_number,	    f_charclass},
+    {"charcol",		1, 1, FEARG_1,	    NULL,
+			ret_number,	    f_charcol},
+    {"charidx",		2, 3, FEARG_1,	    NULL,
+			ret_number,	    f_charidx},
     {"chdir",		1, 1, FEARG_1,	    NULL,
 			ret_string,	    f_chdir},
     {"cindent",		1, 1, FEARG_1,	    NULL,
@@ -730,7 +870,7 @@
     {"complete_add",	1, 1, FEARG_1,	    NULL,
 			ret_number,	    f_complete_add},
     {"complete_check",	0, 0, 0,	    NULL,
-			ret_number,	    f_complete_check},
+			ret_number_bool,    f_complete_check},
     {"complete_info",	0, 1, FEARG_1,	    NULL,
 			ret_dict_any,	    f_complete_info},
     {"confirm",		1, 4, FEARG_1,	    NULL,
@@ -758,19 +898,19 @@
     {"deepcopy",	1, 2, FEARG_1,	    NULL,
 			ret_first_arg,	    f_deepcopy},
     {"delete",		1, 2, FEARG_1,	    NULL,
-			ret_number,	    f_delete},
+			ret_number_bool,    f_delete},
     {"deletebufline",	2, 3, FEARG_1,	    NULL,
-			ret_number,	    f_deletebufline},
+			ret_number_bool,    f_deletebufline},
     {"did_filetype",	0, 0, 0,	    NULL,
-			ret_number,	    f_did_filetype},
+			ret_number_bool,    f_did_filetype},
     {"diff_filler",	1, 1, FEARG_1,	    NULL,
 			ret_number,	    f_diff_filler},
     {"diff_hlID",	2, 2, FEARG_1,	    NULL,
 			ret_number,	    f_diff_hlID},
     {"echoraw",		1, 1, FEARG_1,	    NULL,
-			ret_number,	    f_echoraw},
+			ret_void,	    f_echoraw},
     {"empty",		1, 1, FEARG_1,	    NULL,
-			ret_number,	    f_empty},
+			ret_number_bool,    f_empty},
     {"environ",		0, 0, 0,	    NULL,
 			ret_dict_string,    f_environ},
     {"escape",		2, 2, FEARG_1,	    NULL,
@@ -778,7 +918,7 @@
     {"eval",		1, 1, FEARG_1,	    NULL,
 			ret_any,	    f_eval},
     {"eventhandler",	0, 0, 0,	    NULL,
-			ret_number,	    f_eventhandler},
+			ret_number_bool,    f_eventhandler},
     {"executable",	1, 1, FEARG_1,	    NULL,
 			ret_number,	    f_executable},
     {"execute",		1, 2, FEARG_1,	    NULL,
@@ -786,21 +926,23 @@
     {"exepath",		1, 1, FEARG_1,	    NULL,
 			ret_string,	    f_exepath},
     {"exists",		1, 1, FEARG_1,	    NULL,
-			ret_number,	    f_exists},
+			ret_number_bool,    f_exists},
     {"exp",		1, 1, FEARG_1,	    NULL,
 			ret_float,	    FLOAT_FUNC(f_exp)},
     {"expand",		1, 3, FEARG_1,	    NULL,
 			ret_any,	    f_expand},
     {"expandcmd",	1, 1, FEARG_1,	    NULL,
 			ret_string,	    f_expandcmd},
-    {"extend",		2, 3, FEARG_1,	    NULL,
+    {"extend",		2, 3, FEARG_1,	    arg23_extend,
 			ret_first_arg,	    f_extend},
+    {"extendnew",	2, 3, FEARG_1,	    arg23_extendnew,
+			ret_first_cont,	    f_extendnew},
     {"feedkeys",	1, 2, FEARG_1,	    NULL,
 			ret_void,	    f_feedkeys},
     {"file_readable",	1, 1, FEARG_1,	    NULL,	// obsolete
-			ret_number,	    f_filereadable},
+			ret_number_bool,    f_filereadable},
     {"filereadable",	1, 1, FEARG_1,	    NULL,
-			ret_number,	    f_filereadable},
+			ret_number_bool,    f_filereadable},
     {"filewritable",	1, 1, FEARG_1,	    NULL,
 			ret_number,	    f_filewritable},
     {"filter",		2, 2, FEARG_1,	    NULL,
@@ -853,6 +995,8 @@
 			ret_number,	    f_getchar},
     {"getcharmod",	0, 0, 0,	    NULL,
 			ret_number,	    f_getcharmod},
+    {"getcharpos",	1, 1, FEARG_1,	    NULL,
+			ret_list_number,    f_getcharpos},
     {"getcharsearch",	0, 0, 0,	    NULL,
 			ret_dict_any,	    f_getcharsearch},
     {"getcmdline",	0, 0, 0,	    NULL,
@@ -867,6 +1011,8 @@
 			ret_list_string,    f_getcompletion},
     {"getcurpos",	0, 1, FEARG_1,	    NULL,
 			ret_list_number,    f_getcurpos},
+    {"getcursorcharpos",	0, 1, FEARG_1,	    NULL,
+			ret_list_number,    f_getcursorcharpos},
     {"getcwd",		0, 2, FEARG_1,	    NULL,
 			ret_string,	    f_getcwd},
     {"getenv",		1, 1, FEARG_1,	    NULL,
@@ -882,7 +1028,7 @@
     {"getftype",	1, 1, FEARG_1,	    NULL,
 			ret_string,	    f_getftype},
     {"getimstatus",	0, 0, 0,	    NULL,
-			ret_number,	    f_getimstatus},
+			ret_number_bool,    f_getimstatus},
     {"getjumplist",	0, 2, FEARG_1,	    NULL,
 			ret_list_any,	    f_getjumplist},
     {"getline",		1, 2, FEARG_1,	    NULL,
@@ -934,21 +1080,21 @@
     {"globpath",	2, 5, FEARG_2,	    NULL,
 			ret_any,	    f_globpath},
     {"has",		1, 2, 0,	    NULL,
-			ret_number,	    f_has},
+			ret_number_bool,    f_has},
     {"has_key",		2, 2, FEARG_1,	    NULL,
-			ret_number,	    f_has_key},
+			ret_number_bool,    f_has_key},
     {"haslocaldir",	0, 2, FEARG_1,	    NULL,
 			ret_number,	    f_haslocaldir},
     {"hasmapto",	1, 3, FEARG_1,	    NULL,
-			ret_number,	    f_hasmapto},
+			ret_number_bool,    f_hasmapto},
     {"highlightID",	1, 1, FEARG_1,	    NULL,	// obsolete
 			ret_number,	    f_hlID},
     {"highlight_exists",1, 1, FEARG_1,	    NULL,	// obsolete
-			ret_number,	    f_hlexists},
+			ret_number_bool,    f_hlexists},
     {"histadd",		2, 2, FEARG_2,	    NULL,
-			ret_number,	    f_histadd},
+			ret_number_bool,    f_histadd},
     {"histdel",		1, 2, FEARG_1,	    NULL,
-			ret_number,	    f_histdel},
+			ret_number_bool,    f_histdel},
     {"histget",		1, 2, FEARG_1,	    NULL,
 			ret_string,	    f_histget},
     {"histnr",		1, 1, FEARG_1,	    NULL,
@@ -956,7 +1102,7 @@
     {"hlID",		1, 1, FEARG_1,	    NULL,
 			ret_number,	    f_hlID},
     {"hlexists",	1, 1, FEARG_1,	    NULL,
-			ret_number,	    f_hlexists},
+			ret_number_bool,    f_hlexists},
     {"hostname",	0, 0, 0,	    NULL,
 			ret_string,	    f_hostname},
     {"iconv",		3, 3, FEARG_1,	    NULL,
@@ -972,9 +1118,9 @@
     {"inputlist",	1, 1, FEARG_1,	    NULL,
 			ret_number,	    f_inputlist},
     {"inputrestore",	0, 0, 0,	    NULL,
-			ret_number,	    f_inputrestore},
+			ret_number_bool,    f_inputrestore},
     {"inputsave",	0, 0, 0,	    NULL,
-			ret_number,	    f_inputsave},
+			ret_number_bool,    f_inputsave},
     {"inputsecret",	1, 2, FEARG_1,	    NULL,
 			ret_string,	    f_inputsecret},
     {"insert",		2, 3, FEARG_1,	    arg3_insert,
@@ -984,19 +1130,19 @@
     {"invert",		1, 1, FEARG_1,	    NULL,
 			ret_number,	    f_invert},
     {"isdirectory",	1, 1, FEARG_1,	    NULL,
-			ret_number,	    f_isdirectory},
+			ret_number_bool,    f_isdirectory},
     {"isinf",		1, 1, FEARG_1,	    NULL,
 			ret_number,	    MATH_FUNC(f_isinf)},
     {"islocked",	1, 1, FEARG_1,	    NULL,
-			ret_number,	    f_islocked},
+			ret_number_bool,    f_islocked},
     {"isnan",		1, 1, FEARG_1,	    NULL,
-			ret_number,	    MATH_FUNC(f_isnan)},
+			ret_number_bool,    MATH_FUNC(f_isnan)},
     {"items",		1, 1, FEARG_1,	    NULL,
 			ret_list_any,	    f_items},
     {"job_getchannel",	1, 1, FEARG_1,	    NULL,
 			ret_channel,	    JOB_FUNC(f_job_getchannel)},
     {"job_info",	0, 1, FEARG_1,	    NULL,
-			ret_dict_any,	    JOB_FUNC(f_job_info)},
+			ret_job_info,	    JOB_FUNC(f_job_info)},
     {"job_setoptions",	2, 2, FEARG_1,	    NULL,
 			ret_void,	    JOB_FUNC(f_job_setoptions)},
     {"job_start",	1, 2, FEARG_1,	    NULL,
@@ -1004,7 +1150,7 @@
     {"job_status",	1, 1, FEARG_1,	    NULL,
 			ret_string,	    JOB_FUNC(f_job_status)},
     {"job_stop",	1, 2, FEARG_1,	    NULL,
-			ret_number,	    JOB_FUNC(f_job_stop)},
+			ret_number_bool,    JOB_FUNC(f_job_stop)},
     {"join",		1, 2, FEARG_1,	    NULL,
 			ret_string,	    f_join},
     {"js_decode",	1, 1, FEARG_1,	    NULL,
@@ -1038,7 +1184,7 @@
     {"listener_flush",	0, 1, FEARG_1,	    NULL,
 			ret_void,	    f_listener_flush},
     {"listener_remove",	1, 1, FEARG_1,	    NULL,
-			ret_number,	    f_listener_remove},
+			ret_number_bool,    f_listener_remove},
     {"localtime",	0, 0, 0,	    NULL,
 			ret_number,	    f_localtime},
     {"log",		1, 1, FEARG_1,	    NULL,
@@ -1054,11 +1200,13 @@
 #endif
 			},
     {"map",		2, 2, FEARG_1,	    NULL,
-			ret_any,	    f_map},
+			ret_first_cont,	    f_map},
     {"maparg",		1, 4, FEARG_1,	    NULL,
 			ret_maparg,	    f_maparg},
     {"mapcheck",	1, 3, FEARG_1,	    NULL,
 			ret_string,	    f_mapcheck},
+    {"mapnew",		2, 2, FEARG_1,	    NULL,
+			ret_first_cont,	    f_mapnew},
     {"mapset",		3, 3, FEARG_1,	    NULL,
 			ret_void,	    f_mapset},
     {"match",		2, 4, FEARG_1,	    NULL,
@@ -1070,7 +1218,7 @@
     {"matcharg",	1, 1, FEARG_1,	    NULL,
 			ret_list_string,    f_matcharg},
     {"matchdelete",	1, 2, FEARG_1,	    NULL,
-			ret_number,	    f_matchdelete},
+			ret_number_bool,    f_matchdelete},
     {"matchend",	2, 4, FEARG_1,	    NULL,
 			ret_number,	    f_matchend},
     {"matchfuzzy",	2, 3, FEARG_1,	    NULL,
@@ -1084,7 +1232,7 @@
     {"matchstrpos",	2, 4, FEARG_1,	    NULL,
 			ret_list_any,	    f_matchstrpos},
     {"max",		1, 1, FEARG_1,	    NULL,
-			ret_any,	    f_max},
+			ret_number,	    f_max},
     {"menu_info",	1, 2, FEARG_1,	    NULL,
 			ret_dict_any,
 #ifdef FEAT_MENU
@@ -1094,9 +1242,9 @@
 #endif
 			},
     {"min",		1, 1, FEARG_1,	    NULL,
-			ret_any,	    f_min},
+			ret_number,	    f_min},
     {"mkdir",		1, 3, FEARG_1,	    NULL,
-			ret_number,	    f_mkdir},
+			ret_number_bool,    f_mkdir},
     {"mode",		0, 1, FEARG_1,	    NULL,
 			ret_string,	    f_mode},
     {"mzeval",		1, 1, FEARG_1,	    NULL,
@@ -1202,7 +1350,7 @@
     {"pum_getpos",	0, 0, 0,	    NULL,
 			ret_dict_number,    f_pum_getpos},
     {"pumvisible",	0, 0, 0,	    NULL,
-			ret_number,	    f_pumvisible},
+			ret_number_bool,    f_pumvisible},
     {"py3eval",		1, 1, FEARG_1,	    NULL,
 			ret_any,
 #ifdef FEAT_PYTHON3
@@ -1231,12 +1379,14 @@
 			ret_number,	    f_rand},
     {"range",		1, 3, FEARG_1,	    NULL,
 			ret_list_number,    f_range},
+    {"readblob",	1, 1, FEARG_1,	    NULL,
+			ret_blob,	    f_readblob},
     {"readdir",		1, 3, FEARG_1,	    NULL,
 			ret_list_string,    f_readdir},
     {"readdirex",	1, 3, FEARG_1,	    NULL,
 			ret_list_dict_any,  f_readdirex},
     {"readfile",	1, 3, FEARG_1,	    NULL,
-			ret_any,	    f_readfile},
+			ret_list_string,    f_readfile},
     {"reduce",		2, 3, FEARG_1,	    NULL,
 			ret_any,	    f_reduce},
     {"reg_executing",	0, 0, 0,	    NULL,
@@ -1264,7 +1414,7 @@
     {"remove",		2, 3, FEARG_1,	    NULL,
 			ret_remove,	    f_remove},
     {"rename",		2, 2, FEARG_1,	    NULL,
-			ret_number,	    f_rename},
+			ret_number_bool,    f_rename},
     {"repeat",		2, 2, FEARG_1,	    NULL,
 			ret_first_arg,	    f_repeat},
     {"resolve",		1, 1, FEARG_1,	    NULL,
@@ -1300,7 +1450,7 @@
     {"searchcount",	0, 1, FEARG_1,	    NULL,
 			ret_dict_any,	    f_searchcount},
     {"searchdecl",	1, 3, FEARG_1,	    NULL,
-			ret_number,	    f_searchdecl},
+			ret_number_bool,    f_searchdecl},
     {"searchpair",	3, 7, 0,	    NULL,
 			ret_number,	    f_searchpair},
     {"searchpairpos",	3, 7, 0,	    NULL,
@@ -1308,41 +1458,45 @@
     {"searchpos",	1, 5, FEARG_1,	    NULL,
 			ret_list_number,    f_searchpos},
     {"server2client",	2, 2, FEARG_1,	    NULL,
-			ret_number,	    f_server2client},
+			ret_number_bool,    f_server2client},
     {"serverlist",	0, 0, 0,	    NULL,
 			ret_string,	    f_serverlist},
     {"setbufline",	3, 3, FEARG_3,	    NULL,
-			ret_number,	    f_setbufline},
+			ret_number_bool,    f_setbufline},
     {"setbufvar",	3, 3, FEARG_3,	    NULL,
 			ret_void,	    f_setbufvar},
     {"setcellwidths",	1, 1, FEARG_1,	    NULL,
 			ret_void,	    f_setcellwidths},
+    {"setcharpos",	2, 2, FEARG_2,	    NULL,
+			ret_number_bool,    f_setcharpos},
     {"setcharsearch",	1, 1, FEARG_1,	    NULL,
 			ret_void,	    f_setcharsearch},
     {"setcmdpos",	1, 1, FEARG_1,	    NULL,
-			ret_number,	    f_setcmdpos},
+			ret_number_bool,    f_setcmdpos},
+    {"setcursorcharpos", 1, 3, FEARG_1,	    NULL,
+			ret_number_bool,    f_setcursorcharpos},
     {"setenv",		2, 2, FEARG_2,	    NULL,
 			ret_void,	    f_setenv},
     {"setfperm",	2, 2, FEARG_1,	    NULL,
-			ret_number,	    f_setfperm},
+			ret_number_bool,    f_setfperm},
     {"setline",		2, 2, FEARG_2,	    NULL,
-			ret_number,	    f_setline},
+			ret_number_bool,    f_setline},
     {"setloclist",	2, 4, FEARG_2,	    NULL,
-			ret_number,	    f_setloclist},
+			ret_number_bool,    f_setloclist},
     {"setmatches",	1, 2, FEARG_1,	    NULL,
-			ret_number,	    f_setmatches},
+			ret_number_bool,    f_setmatches},
     {"setpos",		2, 2, FEARG_2,	    NULL,
-			ret_number,	    f_setpos},
+			ret_number_bool,    f_setpos},
     {"setqflist",	1, 3, FEARG_1,	    NULL,
-			ret_number,	    f_setqflist},
+			ret_number_bool,    f_setqflist},
     {"setreg",		2, 3, FEARG_2,	    NULL,
-			ret_number,	    f_setreg},
+			ret_number_bool,    f_setreg},
     {"settabvar",	3, 3, FEARG_3,	    NULL,
 			ret_void,	    f_settabvar},
     {"settabwinvar",	4, 4, FEARG_4,	    NULL,
 			ret_void,	    f_settabwinvar},
     {"settagstack",	2, 3, FEARG_2,	    NULL,
-			ret_number,	    f_settagstack},
+			ret_number_bool,    f_settagstack},
     {"setwinvar",	3, 3, FEARG_3,	    NULL,
 			ret_void,	    f_setwinvar},
     {"sha256",		1, 1, FEARG_1,	    NULL,
@@ -1370,9 +1524,9 @@
     {"sign_placelist",	1, 1, FEARG_1,	    NULL,
 			ret_list_number,    SIGN_FUNC(f_sign_placelist)},
     {"sign_undefine",	0, 1, FEARG_1,	    NULL,
-			ret_number,	    SIGN_FUNC(f_sign_undefine)},
+			ret_number_bool,    SIGN_FUNC(f_sign_undefine)},
     {"sign_unplace",	1, 2, FEARG_1,	    NULL,
-			ret_number,	    SIGN_FUNC(f_sign_unplace)},
+			ret_number_bool,    SIGN_FUNC(f_sign_unplace)},
     {"sign_unplacelist", 1, 2, FEARG_1,	    NULL,
 			ret_list_number,    SIGN_FUNC(f_sign_unplacelist)},
     {"simplify",	1, 1, FEARG_1,	    NULL,
@@ -1381,6 +1535,8 @@
 			ret_float,	    FLOAT_FUNC(f_sin)},
     {"sinh",		1, 1, FEARG_1,	    NULL,
 			ret_float,	    FLOAT_FUNC(f_sinh)},
+    {"slice",		2, 3, FEARG_1,	    NULL,
+			ret_first_arg,	    f_slice},
     {"sort",		1, 3, FEARG_1,	    NULL,
 			ret_first_arg,	    f_sort},
     {"sound_clear",	0, 0, 0,	    NULL,
@@ -1409,7 +1565,7 @@
 			ret_float,	    FLOAT_FUNC(f_str2float)},
     {"str2list",	1, 2, FEARG_1,	    NULL,
 			ret_list_number,    f_str2list},
-    {"str2nr",		1, 3, FEARG_1,	    NULL,
+    {"str2nr",		1, 3, FEARG_1,	    arg3_string_nr_bool,
 			ret_number,	    f_str2nr},
     {"strcharpart",	2, 3, FEARG_1,	    NULL,
 			ret_string,	    f_strcharpart},
@@ -1625,6 +1781,8 @@
 			ret_float,	    FLOAT_FUNC(f_trunc)},
     {"type",		1, 1, FEARG_1,	    NULL,
 			ret_number,	    f_type},
+    {"typename",	1, 1, FEARG_1,	    NULL,
+			ret_string,	    f_typename},
     {"undofile",	1, 1, FEARG_1,	    NULL,
 			ret_string,	    f_undofile},
     {"undotree",	0, 0, 0,	    NULL,
@@ -1648,7 +1806,7 @@
     {"win_gettype",	0, 1, FEARG_1,	    NULL,
 			ret_string,	    f_win_gettype},
     {"win_gotoid",	1, 1, FEARG_1,	    NULL,
-			ret_number,	    f_win_gotoid},
+			ret_number_bool,    f_win_gotoid},
     {"win_id2tabwin",	1, 1, FEARG_1,	    NULL,
 			ret_list_number,    f_win_id2tabwin},
     {"win_id2win",	1, 1, FEARG_1,	    NULL,
@@ -1656,7 +1814,7 @@
     {"win_screenpos",	1, 1, FEARG_1,	    NULL,
 			ret_list_number,    f_win_screenpos},
     {"win_splitmove",   2, 3, FEARG_1,	    NULL,
-			ret_number,	    f_win_splitmove},
+			ret_number_bool,    f_win_splitmove},
     {"winbufnr",	1, 1, FEARG_1,	    NULL,
 			ret_number,	    f_winbufnr},
     {"wincol",		0, 0, 0,	    NULL,
@@ -1676,13 +1834,13 @@
     {"winrestview",	1, 1, FEARG_1,	    NULL,
 			ret_void,	    f_winrestview},
     {"winsaveview",	0, 0, 0,	    NULL,
-			ret_dict_any,	    f_winsaveview},
+			ret_dict_number,    f_winsaveview},
     {"winwidth",	1, 1, FEARG_1,	    NULL,
 			ret_number,	    f_winwidth},
     {"wordcount",	0, 0, 0,	    NULL,
 			ret_dict_number,    f_wordcount},
     {"writefile",	2, 3, FEARG_1,	    NULL,
-			ret_number,	    f_writefile},
+			ret_number_bool,    f_writefile},
     {"xor",		2, 2, FEARG_1,	    NULL,
 			ret_number,	    f_xor},
 };
@@ -1703,7 +1861,11 @@
     {
 	name = get_user_func_name(xp, idx);
 	if (name != NULL)
+	{
+	    if (*name != '<' && STRNCMP("g:", xp->xp_pattern, 2) == 0)
+		return cat_prefix_varname('g', name);
 	    return name;
+	}
     }
     if (++intidx < (int)(sizeof(global_functions) / sizeof(funcentry_T)))
     {
@@ -1804,7 +1966,11 @@
  * Return FAIL and gives an error message when a type is wrong.
  */
     int
-internal_func_check_arg_types(type_T **types, int idx, int argcount)
+internal_func_check_arg_types(
+	type_T	**types,
+	int	idx,
+	int	argcount,
+	cctx_T	*cctx)
 {
     argcheck_T	*argchecks = global_functions[idx].f_argcheck;
     int		i;
@@ -1815,6 +1981,7 @@
 
 	context.arg_count = argcount;
 	context.arg_types = types;
+	context.arg_cctx = cctx;
 	for (i = 0; i < argcount; ++i)
 	    if (argchecks[i] != NULL)
 	    {
@@ -1838,6 +2005,15 @@
 }
 
 /*
+ * Return TRUE if "idx" is for the map() function.
+ */
+    int
+internal_func_is_map(int idx)
+{
+    return global_functions[idx].f_func == f_map;
+}
+
+/*
  * Check the argument count to use for internal function "idx".
  * Returns -1 for failure, 0 if no method base accepted, 1 if method base is
  * first argument, 2 if method base is second argument, etc.  9 if method base
@@ -2346,34 +2522,19 @@
 	rettv->vval.v_number = tv_get_string(&argvars[0])[0];
 }
 
-    win_T *
-get_optional_window(typval_T *argvars, int idx)
-{
-    win_T   *win = curwin;
-
-    if (argvars[idx].v_type != VAR_UNKNOWN)
-    {
-	win = find_win_by_nr_or_id(&argvars[idx]);
-	if (win == NULL)
-	{
-	    emsg(_(e_invalwindow));
-	    return NULL;
-	}
-    }
-    return win;
-}
-
 /*
- * "col(string)" function
+ * Get the current cursor column and store it in 'rettv'. If 'charcol' is TRUE,
+ * returns the character index of the column. Otherwise, returns the byte index
+ * of the column.
  */
     static void
-f_col(typval_T *argvars, typval_T *rettv)
+get_col(typval_T *argvars, typval_T *rettv, int charcol)
 {
     colnr_T	col = 0;
     pos_T	*fp;
     int		fnum = curbuf->b_fnum;
 
-    fp = var2fpos(&argvars[0], FALSE, &fnum);
+    fp = var2fpos(&argvars[0], FALSE, &fnum, charcol);
     if (fp != NULL && fnum == curbuf->b_fnum)
     {
 	if (fp->col == MAXCOL)
@@ -2408,6 +2569,92 @@
 }
 
 /*
+ * "charcol()" function
+ */
+    static void
+f_charcol(typval_T *argvars, typval_T *rettv)
+{
+    get_col(argvars, rettv, TRUE);
+}
+
+/*
+ * "charidx()" function
+ */
+    static void
+f_charidx(typval_T *argvars, typval_T *rettv)
+{
+    char_u	*str;
+    varnumber_T	idx;
+    varnumber_T	countcc = FALSE;
+    char_u	*p;
+    int		len;
+    int		(*ptr2len)(char_u *);
+
+    rettv->vval.v_number = -1;
+
+    if (argvars[0].v_type != VAR_STRING || argvars[1].v_type != VAR_NUMBER
+	    || (argvars[2].v_type != VAR_UNKNOWN
+					   && argvars[2].v_type != VAR_NUMBER))
+    {
+	emsg(_(e_invarg));
+	return;
+    }
+
+    str = tv_get_string_chk(&argvars[0]);
+    idx = tv_get_number_chk(&argvars[1], NULL);
+    if (str == NULL || idx < 0)
+	return;
+
+    if (argvars[2].v_type != VAR_UNKNOWN)
+	countcc = tv_get_bool(&argvars[2]);
+    if (countcc < 0 || countcc > 1)
+    {
+	semsg(_(e_using_number_as_bool_nr), countcc);
+	return;
+    }
+
+    if (enc_utf8 && countcc)
+	ptr2len = utf_ptr2len;
+    else
+	ptr2len = mb_ptr2len;
+
+    for (p = str, len = 0; p <= str + idx; len++)
+    {
+	if (*p == NUL)
+	    return;
+	p += ptr2len(p);
+    }
+
+    rettv->vval.v_number = len > 0 ? len - 1 : 0;
+}
+
+    win_T *
+get_optional_window(typval_T *argvars, int idx)
+{
+    win_T   *win = curwin;
+
+    if (argvars[idx].v_type != VAR_UNKNOWN)
+    {
+	win = find_win_by_nr_or_id(&argvars[idx]);
+	if (win == NULL)
+	{
+	    emsg(_(e_invalwindow));
+	    return NULL;
+	}
+    }
+    return win;
+}
+
+/*
+ * "col(string)" function
+ */
+    static void
+f_col(typval_T *argvars, typval_T *rettv)
+{
+    get_col(argvars, rettv, FALSE);
+}
+
+/*
  * "confirm(message, buttons[, default [, type]])" function
  */
     static void
@@ -2505,26 +2752,24 @@
 #endif
 
 /*
- * "cursor(lnum, col)" function, or
- * "cursor(list)"
- *
- * Moves the cursor to the specified line and column.
- * Returns 0 when the position could be set, -1 otherwise.
+ * Set the cursor position.
+ * If 'charcol' is TRUE, then use the column number as a character offet.
+ * Otherwise use the column number as a byte offset.
  */
     static void
-f_cursor(typval_T *argvars, typval_T *rettv)
+set_cursorpos(typval_T *argvars, typval_T *rettv, int charcol)
 {
     long	line, col;
     long	coladd = 0;
     int		set_curswant = TRUE;
 
     rettv->vval.v_number = -1;
-    if (argvars[1].v_type == VAR_UNKNOWN)
+    if (argvars[0].v_type == VAR_LIST)
     {
 	pos_T	    pos;
 	colnr_T	    curswant = -1;
 
-	if (list2fpos(argvars, &pos, NULL, &curswant) == FAIL)
+	if (list2fpos(argvars, &pos, NULL, &curswant, charcol) == FAIL)
 	{
 	    emsg(_(e_invarg));
 	    return;
@@ -2538,13 +2783,25 @@
 	    set_curswant = FALSE;
 	}
     }
-    else
+    else if ((argvars[0].v_type == VAR_NUMBER ||
+					argvars[0].v_type == VAR_STRING)
+	    && (argvars[1].v_type == VAR_NUMBER ||
+					argvars[1].v_type == VAR_STRING))
     {
 	line = tv_get_lnum(argvars);
+	if (line < 0)
+	    semsg(_(e_invarg2), tv_get_string(&argvars[0]));
 	col = (long)tv_get_number_chk(&argvars[1], NULL);
+	if (charcol)
+	    col = buf_charidx_to_byteidx(curbuf, line, col) + 1;
 	if (argvars[2].v_type != VAR_UNKNOWN)
 	    coladd = (long)tv_get_number_chk(&argvars[2], NULL);
     }
+    else
+    {
+	emsg(_(e_invarg));
+	return;
+    }
     if (line < 0 || col < 0 || coladd < 0)
 	return;		// type error; errmsg already given
     if (line > 0)
@@ -2563,6 +2820,19 @@
     rettv->vval.v_number = 0;
 }
 
+/*
+ * "cursor(lnum, col)" function, or
+ * "cursor(list)"
+ *
+ * Moves the cursor to the specified line and column.
+ * Returns 0 when the position could be set, -1 otherwise.
+ */
+    static void
+f_cursor(typval_T *argvars, typval_T *rettv)
+{
+    set_cursorpos(argvars, rettv, FALSE);
+}
+
 #ifdef MSWIN
 /*
  * "debugbreak()" function
@@ -2596,11 +2866,11 @@
     static void
 f_deepcopy(typval_T *argvars, typval_T *rettv)
 {
-    int		noref = 0;
+    varnumber_T	noref = 0;
     int		copyID;
 
     if (argvars[1].v_type != VAR_UNKNOWN)
-	noref = (int)tv_get_bool_chk(&argvars[1], NULL);
+	noref = tv_get_bool_chk(&argvars[1], NULL);
     if (noref < 0 || noref > 1)
 	semsg(_(e_using_number_as_bool_nr), noref);
     else
@@ -3367,7 +3637,8 @@
     {
 	name = s;
 	trans_name = trans_function_name(&name, &is_global, FALSE,
-	     TFN_INT | TFN_QUIET | TFN_NO_AUTOLOAD | TFN_NO_DEREF, NULL, NULL);
+	     TFN_INT | TFN_QUIET | TFN_NO_AUTOLOAD | TFN_NO_DEREF,
+							     NULL, NULL, NULL);
 	if (*name != NUL)
 	    s = NULL;
     }
@@ -3756,6 +4027,88 @@
 #endif
 }
 
+    static void
+getpos_both(
+    typval_T	*argvars,
+    typval_T	*rettv,
+    int		getcurpos,
+    int		charcol)
+{
+    pos_T	*fp = NULL;
+    pos_T	pos;
+    win_T	*wp = curwin;
+    list_T	*l;
+    int		fnum = -1;
+
+    if (rettv_list_alloc(rettv) == OK)
+    {
+	l = rettv->vval.v_list;
+	if (getcurpos)
+	{
+	    if (argvars[0].v_type != VAR_UNKNOWN)
+	    {
+		wp = find_win_by_nr_or_id(&argvars[0]);
+		if (wp != NULL)
+		    fp = &wp->w_cursor;
+	    }
+	    else
+		fp = &curwin->w_cursor;
+	    if (fp != NULL && charcol)
+	    {
+		pos = *fp;
+		pos.col =
+		    buf_byteidx_to_charidx(wp->w_buffer, pos.lnum, pos.col);
+		fp = &pos;
+	    }
+	}
+	else
+	    fp = var2fpos(&argvars[0], TRUE, &fnum, charcol);
+	if (fnum != -1)
+	    list_append_number(l, (varnumber_T)fnum);
+	else
+	    list_append_number(l, (varnumber_T)0);
+	list_append_number(l, (fp != NULL) ? (varnumber_T)fp->lnum
+							    : (varnumber_T)0);
+	list_append_number(l, (fp != NULL)
+		     ? (varnumber_T)(fp->col == MAXCOL ? MAXCOL : fp->col + 1)
+							    : (varnumber_T)0);
+	list_append_number(l, (fp != NULL) ? (varnumber_T)fp->coladd :
+							      (varnumber_T)0);
+	if (getcurpos)
+	{
+	    int	    save_set_curswant = curwin->w_set_curswant;
+	    colnr_T save_curswant = curwin->w_curswant;
+	    colnr_T save_virtcol = curwin->w_virtcol;
+
+	    if (wp == curwin)
+		update_curswant();
+	    list_append_number(l, wp == NULL ? 0 : wp->w_curswant == MAXCOL
+		    ?  (varnumber_T)MAXCOL : (varnumber_T)wp->w_curswant + 1);
+
+	    // Do not change "curswant", as it is unexpected that a get
+	    // function has a side effect.
+	    if (wp == curwin && save_set_curswant)
+	    {
+		curwin->w_set_curswant = save_set_curswant;
+		curwin->w_curswant = save_curswant;
+		curwin->w_virtcol = save_virtcol;
+		curwin->w_valid &= ~VALID_VIRTCOL;
+	    }
+	}
+    }
+    else
+	rettv->vval.v_number = FALSE;
+}
+
+/*
+ * "getcharpos()" function
+ */
+    static void
+f_getcharpos(typval_T *argvars UNUSED, typval_T *rettv)
+{
+    getpos_both(argvars, rettv, FALSE, TRUE);
+}
+
 /*
  * "getcharsearch()" function
  */
@@ -3888,77 +4241,19 @@
     rettv->vval.v_number = mch_get_pid();
 }
 
-    static void
-getpos_both(
-    typval_T	*argvars,
-    typval_T	*rettv,
-    int		getcurpos)
-{
-    pos_T	*fp = NULL;
-    win_T	*wp = curwin;
-    list_T	*l;
-    int		fnum = -1;
-
-    if (rettv_list_alloc(rettv) == OK)
-    {
-	l = rettv->vval.v_list;
-	if (getcurpos)
-	{
-	    if (argvars[0].v_type != VAR_UNKNOWN)
-	    {
-		wp = find_win_by_nr_or_id(&argvars[0]);
-		if (wp != NULL)
-		    fp = &wp->w_cursor;
-	    }
-	    else
-		fp = &curwin->w_cursor;
-	}
-	else
-	    fp = var2fpos(&argvars[0], TRUE, &fnum);
-	if (fnum != -1)
-	    list_append_number(l, (varnumber_T)fnum);
-	else
-	    list_append_number(l, (varnumber_T)0);
-	list_append_number(l, (fp != NULL) ? (varnumber_T)fp->lnum
-							    : (varnumber_T)0);
-	list_append_number(l, (fp != NULL)
-		     ? (varnumber_T)(fp->col == MAXCOL ? MAXCOL : fp->col + 1)
-							    : (varnumber_T)0);
-	list_append_number(l, (fp != NULL) ? (varnumber_T)fp->coladd :
-							      (varnumber_T)0);
-	if (getcurpos)
-	{
-	    int	    save_set_curswant = curwin->w_set_curswant;
-	    colnr_T save_curswant = curwin->w_curswant;
-	    colnr_T save_virtcol = curwin->w_virtcol;
-
-	    if (wp == curwin)
-		update_curswant();
-	    list_append_number(l, wp == NULL ? 0 : wp->w_curswant == MAXCOL
-		    ?  (varnumber_T)MAXCOL : (varnumber_T)wp->w_curswant + 1);
-
-	    // Do not change "curswant", as it is unexpected that a get
-	    // function has a side effect.
-	    if (wp == curwin && save_set_curswant)
-	    {
-		curwin->w_set_curswant = save_set_curswant;
-		curwin->w_curswant = save_curswant;
-		curwin->w_virtcol = save_virtcol;
-		curwin->w_valid &= ~VALID_VIRTCOL;
-	    }
-	}
-    }
-    else
-	rettv->vval.v_number = FALSE;
-}
-
 /*
  * "getcurpos()" function
  */
     static void
 f_getcurpos(typval_T *argvars, typval_T *rettv)
 {
-    getpos_both(argvars, rettv, TRUE);
+    getpos_both(argvars, rettv, TRUE, FALSE);
+}
+
+    static void
+f_getcursorcharpos(typval_T *argvars, typval_T *rettv)
+{
+    getpos_both(argvars, rettv, TRUE, TRUE);
 }
 
 /*
@@ -3967,7 +4262,7 @@
     static void
 f_getpos(typval_T *argvars, typval_T *rettv)
 {
-    getpos_both(argvars, rettv, FALSE);
+    getpos_both(argvars, rettv, FALSE, FALSE);
 }
 
 /*
@@ -4369,6 +4664,13 @@
 		},
 	{"cmdline_compl", 1},
 	{"cmdline_hist", 1},
+	{"cmdwin",
+#ifdef FEAT_CMDWIN
+		1
+#else
+		0
+#endif
+		},
 	{"comments", 1},
 	{"conceal",
 #ifdef FEAT_CONCEAL
@@ -5423,6 +5725,73 @@
 }
 
 /*
+ * Return TRUE if "feature" can change later.
+ * Also when checking for the feature has side effects, such as loading a DLL.
+ */
+    int
+dynamic_feature(char_u *feature)
+{
+    return (feature == NULL
+#if defined(FEAT_BEVAL) && defined(FEAT_GUI_MSWIN)
+	    || STRICMP(feature, "balloon_multiline") == 0
+#endif
+#if defined(FEAT_GUI) && defined(FEAT_BROWSE)
+	    || (STRICMP(feature, "browse") == 0 && !gui.in_use)
+#endif
+#ifdef VIMDLL
+	    || STRICMP(feature, "filterpipe") == 0
+#endif
+#if defined(FEAT_GUI) && !defined(ALWAYS_USE_GUI) && !defined(VIMDLL)
+	    // this can only change on Unix where the ":gui" command could be
+	    // used.
+	    || (STRICMP(feature, "gui_running") == 0 && !gui.in_use)
+#endif
+#if defined(USE_ICONV) && defined(DYNAMIC_ICONV)
+	    || STRICMP(feature, "iconv") == 0
+#endif
+#ifdef DYNAMIC_LUA
+	    || STRICMP(feature, "lua") == 0
+#endif
+#ifdef FEAT_MOUSE_GPM
+	    || (STRICMP(feature, "mouse_gpm_enabled") == 0 && !gpm_enabled())
+#endif
+#ifdef DYNAMIC_MZSCHEME
+	    || STRICMP(feature, "mzscheme") == 0
+#endif
+#ifdef FEAT_NETBEANS_INTG
+	    || STRICMP(feature, "netbeans_enabled") == 0
+#endif
+#ifdef DYNAMIC_PERL
+	    || STRICMP(feature, "perl") == 0
+#endif
+#ifdef DYNAMIC_PYTHON
+	    || STRICMP(feature, "python") == 0
+#endif
+#ifdef DYNAMIC_PYTHON3
+	    || STRICMP(feature, "python3") == 0
+#endif
+#if defined(DYNAMIC_PYTHON) || defined(DYNAMIC_PYTHON3)
+	    || STRICMP(feature, "pythonx") == 0
+#endif
+#ifdef DYNAMIC_RUBY
+	    || STRICMP(feature, "ruby") == 0
+#endif
+#ifdef FEAT_SYN_HL
+	    || STRICMP(feature, "syntax_items") == 0
+#endif
+#ifdef DYNAMIC_TCL
+	    || STRICMP(feature, "tcl") == 0
+#endif
+	    // once "starting" is zero it will stay that way
+	    || (STRICMP(feature, "vim_starting") == 0 && starting != 0)
+	    || STRICMP(feature, "multi_byte_encoding") == 0
+#if defined(FEAT_TERMINAL) && defined(MSWIN)
+	    || STRICMP(feature, "conpty") == 0
+#endif
+	    );
+}
+
+/*
  * "haslocaldir()" function
  */
     static void
@@ -5985,14 +6354,14 @@
 									 == OK)
 	    {
 		check_cursor();
-		fp = var2fpos(&argvars[0], TRUE, &fnum);
+		fp = var2fpos(&argvars[0], TRUE, &fnum, FALSE);
 	    }
 	    restore_win_noblock(save_curwin, save_curtab, TRUE);
 	}
     }
     else
 	// use current window
-	fp = var2fpos(&argvars[0], TRUE, &fnum);
+	fp = var2fpos(&argvars[0], TRUE, &fnum, FALSE);
 
     if (fp != NULL)
 	lnum = fp->lnum;
@@ -6119,7 +6488,7 @@
 
     // Make 'cpoptions' empty, the 'l' flag should not be used here.
     save_cpo = p_cpo;
-    p_cpo = (char_u *)"";
+    p_cpo = empty_option;
 
     rettv->vval.v_number = -1;
     if (type == MATCH_LIST || type == MATCH_POS)
@@ -6812,7 +7181,7 @@
     static UINT32_T	gx, gy, gz, gw;
     static int	initialized = FALSE;
     listitem_T	*lx, *ly, *lz, *lw;
-    UINT32_T	x, y, z, w, t, result;
+    UINT32_T	x = 0, y, z, w, t, result;
 
     if (argvars[0].v_type == VAR_UNKNOWN)
     {
@@ -7827,8 +8196,14 @@
     if (p_cpo == empty_option)
 	p_cpo = save_cpo;
     else
+    {
 	// Darn, evaluating the {skip} expression changed the value.
+	// If it's still empty it was changed and restored, need to restore in
+	// the complicated way.
+	if (*p_cpo == NUL)
+	    set_option_value((char_u *)"cpo", 0L, save_cpo, 0);
 	free_string_option(save_cpo);
+    }
 
     return retval;
 }
@@ -7861,6 +8236,60 @@
 	list_append_number(rettv->vval.v_list, (varnumber_T)n);
 }
 
+/*
+ * Set the cursor or mark position.
+ * If 'charpos' is TRUE, then use the column number as a character offet.
+ * Otherwise use the column number as a byte offset.
+ */
+    static void
+set_position(typval_T *argvars, typval_T *rettv, int charpos)
+{
+    pos_T	pos;
+    int		fnum;
+    char_u	*name;
+    colnr_T	curswant = -1;
+
+    rettv->vval.v_number = -1;
+
+    name = tv_get_string_chk(argvars);
+    if (name != NULL)
+    {
+	if (list2fpos(&argvars[1], &pos, &fnum, &curswant, charpos) == OK)
+	{
+	    if (pos.col != MAXCOL && --pos.col < 0)
+		pos.col = 0;
+	    if ((name[0] == '.' && name[1] == NUL))
+	    {
+		// set cursor; "fnum" is ignored
+		curwin->w_cursor = pos;
+		if (curswant >= 0)
+		{
+		    curwin->w_curswant = curswant - 1;
+		    curwin->w_set_curswant = FALSE;
+		}
+		check_cursor();
+		rettv->vval.v_number = 0;
+	    }
+	    else if (name[0] == '\'' && name[1] != NUL && name[2] == NUL)
+	    {
+		// set mark
+		if (setmark_pos(name[1], &pos, fnum) == OK)
+		    rettv->vval.v_number = 0;
+	    }
+	    else
+		emsg(_(e_invarg));
+	}
+    }
+}
+/*
+ * "setcharpos()" function
+ */
+    static void
+f_setcharpos(typval_T *argvars, typval_T *rettv)
+{
+    set_position(argvars, rettv, TRUE);
+}
+
     static void
 f_setcharsearch(typval_T *argvars, typval_T *rettv UNUSED)
 {
@@ -7903,6 +8332,15 @@
 }
 
 /*
+ * "setcursorcharpos" function
+ */
+    static void
+f_setcursorcharpos(typval_T *argvars, typval_T *rettv)
+{
+    set_cursorpos(argvars, rettv, TRUE);
+}
+
+/*
  * "setenv()" function
  */
     static void
@@ -7961,41 +8399,7 @@
     static void
 f_setpos(typval_T *argvars, typval_T *rettv)
 {
-    pos_T	pos;
-    int		fnum;
-    char_u	*name;
-    colnr_T	curswant = -1;
-
-    rettv->vval.v_number = -1;
-    name = tv_get_string_chk(argvars);
-    if (name != NULL)
-    {
-	if (list2fpos(&argvars[1], &pos, &fnum, &curswant) == OK)
-	{
-	    if (pos.col != MAXCOL && --pos.col < 0)
-		pos.col = 0;
-	    if (name[0] == '.' && name[1] == NUL)
-	    {
-		// set cursor; "fnum" is ignored
-		curwin->w_cursor = pos;
-		if (curswant >= 0)
-		{
-		    curwin->w_curswant = curswant - 1;
-		    curwin->w_set_curswant = FALSE;
-		}
-		check_cursor();
-		rettv->vval.v_number = 0;
-	    }
-	    else if (name[0] == '\'' && name[1] != NUL && name[2] == NUL)
-	    {
-		// set mark
-		if (setmark_pos(name[1], &pos, fnum) == OK)
-		    rettv->vval.v_number = 0;
-	    }
-	    else
-		emsg(_(e_invarg));
-	}
-    }
+    set_position(argvars, rettv, FALSE);
 }
 
 /*
@@ -8526,7 +8930,7 @@
 
     // Make 'cpoptions' empty, the 'l' flag should not be used here.
     save_cpo = p_cpo;
-    p_cpo = (char_u *)"";
+    p_cpo = empty_option;
 
     str = tv_get_string(&argvars[0]);
     if (argvars[1].v_type != VAR_UNKNOWN)
@@ -8685,7 +9089,7 @@
 	    what |= STR2NR_QUOTE;
     }
 
-    p = skipwhite(tv_get_string(&argvars[0]));
+    p = skipwhite(tv_get_string_strict(&argvars[0]));
     isneg = (*p == '-');
     if (*p == '+' || *p == '-')
 	p = skipwhite(p + 1);
@@ -8806,12 +9210,12 @@
 f_strchars(typval_T *argvars, typval_T *rettv)
 {
     char_u		*s = tv_get_string(&argvars[0]);
-    int			skipcc = FALSE;
+    varnumber_T		skipcc = FALSE;
     varnumber_T		len = 0;
     int			(*func_mb_ptr2char_adv)(char_u **pp);
 
     if (argvars[1].v_type != VAR_UNKNOWN)
-	skipcc = (int)tv_get_bool(&argvars[1]);
+	skipcc = tv_get_bool(&argvars[1]);
     if (skipcc < 0 || skipcc > 1)
 	semsg(_(e_using_number_as_bool_nr), skipcc);
     else
@@ -9743,7 +10147,7 @@
     int		fnum = curbuf->b_fnum;
     int		len;
 
-    fp = var2fpos(&argvars[0], FALSE, &fnum);
+    fp = var2fpos(&argvars[0], FALSE, &fnum, FALSE);
     if (fp != NULL && fp->lnum <= curbuf->b_ml.ml_line_count
 						    && fnum == curbuf->b_fnum)
     {
diff -Nru vim-8.2.1913/src/evalvars.c vim-8.2.2434/src/evalvars.c
--- vim-8.2.1913/src/evalvars.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/evalvars.c	2021-01-30 22:05:11.000000000 +0000
@@ -122,6 +122,8 @@
     {VV_NAME("true",		 VAR_BOOL), VV_RO},
     {VV_NAME("none",		 VAR_SPECIAL), VV_RO},
     {VV_NAME("null",		 VAR_SPECIAL), VV_RO},
+    {VV_NAME("numbermax",	 VAR_NUMBER), VV_RO},
+    {VV_NAME("numbermin",	 VAR_NUMBER), VV_RO},
     {VV_NAME("numbersize",	 VAR_NUMBER), VV_RO},
     {VV_NAME("vim_did_enter",	 VAR_NUMBER), VV_RO},
     {VV_NAME("testing",		 VAR_NUMBER), 0},
@@ -146,6 +148,7 @@
     {VV_NAME("echospace",	 VAR_NUMBER), VV_RO},
     {VV_NAME("argv",		 VAR_LIST), VV_RO},
     {VV_NAME("collate",		 VAR_STRING), VV_RO},
+    {VV_NAME("exiting",		 VAR_SPECIAL), VV_RO},
 };
 
 // shorthand
@@ -218,6 +221,7 @@
 
     set_vim_var_nr(VV_SEARCHFORWARD, 1L);
     set_vim_var_nr(VV_HLSEARCH, 1L);
+    set_vim_var_nr(VV_EXITING, VVAL_NULL);
     set_vim_var_dict(VV_COMPLETED_ITEM, dict_alloc_lock(VAR_FIXED));
     set_vim_var_list(VV_ERRORS, list_alloc());
     set_vim_var_dict(VV_EVENT, dict_alloc_lock(VAR_FIXED));
@@ -226,6 +230,8 @@
     set_vim_var_nr(VV_TRUE, VVAL_TRUE);
     set_vim_var_nr(VV_NONE, VVAL_NONE);
     set_vim_var_nr(VV_NULL, VVAL_NULL);
+    set_vim_var_nr(VV_NUMBERMAX, VARNUM_MAX);
+    set_vim_var_nr(VV_NUMBERMIN, VARNUM_MIN);
     set_vim_var_nr(VV_NUMBERSIZE, sizeof(varnumber_T) * 8);
 
     set_vim_var_nr(VV_TYPE_NUMBER,  VAR_TYPE_NUMBER);
@@ -736,25 +742,27 @@
     int		first = TRUE;
     int		concat;
     int		has_assign;
-    int		flags = eap->cmdidx == CMD_const ? ASSIGN_CONST : 0;
+    int		flags = 0;
     int		vim9script = in_vim9script();
 
     if (eap->cmdidx == CMD_final && !vim9script)
     {
-	    // In legacy Vim script ":final" is short for ":finally".
-	    ex_finally(eap);
-	    return;
+	// In legacy Vim script ":final" is short for ":finally".
+	ex_finally(eap);
+	return;
     }
     if (eap->cmdidx == CMD_let && vim9script)
     {
 	emsg(_(e_cannot_use_let_in_vim9_script));
 	return;
     }
-    if (eap->cmdidx == CMD_const && !vim9script && !eap->forceit)
-	// In legacy Vim script ":const" works like ":final".
-	eap->cmdidx = CMD_final;
 
-    // detect Vim9 assignment without ":let" or ":const"
+    if (eap->cmdidx == CMD_const)
+	flags |= ASSIGN_CONST;
+    else if (eap->cmdidx == CMD_final)
+	flags |= ASSIGN_FINAL;
+
+    // Vim9 assignment without ":let", ":const" or ":final"
     if (eap->arg == eap->cmd)
 	flags |= ASSIGN_NO_DECL;
 
@@ -780,7 +788,7 @@
 	{
 	    if (vim9script)
 	    {
-		// Vim9 declaration ":let var: type"
+		// Vim9 declaration ":var name: type"
 		arg = vim9_declare_scriptvar(eap, arg);
 	    }
 	    else
@@ -830,6 +838,8 @@
 	i = FAIL;
 	if (has_assign || concat)
 	{
+	    int cur_lnum;
+
 	    op[0] = '=';
 	    op[1] = NUL;
 	    if (*expr != '=')
@@ -859,7 +869,8 @@
 						   || !IS_WHITE_OR_NUL(*expr)))
 	    {
 		vim_strncpy(op, expr - len, len);
-		semsg(_(e_white_space_required_before_and_after_str), op);
+		semsg(_(e_white_space_required_before_and_after_str_at_str),
+								   op, argend);
 		i = FAIL;
 	    }
 
@@ -873,10 +884,15 @@
 		evalarg.eval_cookie = eap->cookie;
 	    }
 	    expr = skipwhite_and_linebreak(expr, &evalarg);
+	    cur_lnum = SOURCING_LNUM;
 	    i = eval0(expr, &rettv, eap, &evalarg);
 	    if (eap->skip)
 		--emsg_skip;
 	    clear_evalarg(&evalarg, eap);
+
+	    // Restore the line number so that any type error is given for the
+	    // declaration, not the expression.
+	    SOURCING_LNUM = cur_lnum;
 	}
 	if (eap->skip)
 	{
@@ -907,7 +923,7 @@
     int		copy,		// copy values from "tv", don't move
     int		semicolon,	// from skip_var_list()
     int		var_count,	// from skip_var_list()
-    int		flags,		// ASSIGN_CONST, ASSIGN_NO_DECL
+    int		flags,		// ASSIGN_FINAL, ASSIGN_CONST, etc.
     char_u	*op)
 {
     char_u	*arg = arg_start;
@@ -1014,7 +1030,7 @@
 	for (;;)
 	{
 	    p = skipwhite(p + 1);	// skip whites after '[', ';' or ','
-	    s = skip_var_one(p, FALSE);
+	    s = skip_var_one(p, include_type);
 	    if (s == p)
 	    {
 		if (!silent)
@@ -1056,17 +1072,21 @@
     char_u *
 skip_var_one(char_u *arg, int include_type)
 {
-    char_u *end;
+    char_u	*end;
+    int		vim9 = in_vim9script();
 
     if (*arg == '@' && arg[1] != NUL)
 	return arg + 2;
     end = find_name_end(*arg == '$' || *arg == '&' ? arg + 1 : arg,
 				   NULL, NULL, FNE_INCL_BR | FNE_CHECK_START);
-    if (include_type && in_vim9script())
+
+    // "a: type" is declaring variable "a" with a type, not "a:".
+    // Same for "s: type".
+    if (vim9 && end == arg + 2 && end[-1] == ':')
+	--end;
+
+    if (include_type && vim9)
     {
-	// "a: type" is declaring variable "a" with a type, not "a:".
-	if (end == arg + 2 && end[-1] == ':')
-	    --end;
 	if (*end == ':')
 	    end = skip_type(skipwhite(end + 1), FALSE);
     }
@@ -1262,7 +1282,7 @@
     char_u	*arg,		// points to variable name
     typval_T	*tv,		// value to assign to variable
     int		copy,		// copy value from "tv"
-    int		flags,		// ASSIGN_CONST, ASSIGN_NO_DECL
+    int		flags,		// ASSIGN_CONST, ASSIGN_FINAL, etc.
     char_u	*endchars,	// valid chars after variable name  or NULL
     char_u	*op)		// "+", "-", "."  or NULL
 {
@@ -1274,7 +1294,8 @@
     int		opt_flags;
     char_u	*tofree = NULL;
 
-    if (in_vim9script() && (flags & ASSIGN_NO_DECL) == 0
+    if (in_vim9script() && (flags & (ASSIGN_NO_DECL | ASSIGN_DECL)) == 0
+			&& (flags & (ASSIGN_CONST | ASSIGN_FINAL)) == 0
 				  && vim_strchr((char_u *)"$@&", *arg) != NULL)
     {
 	vim9_declare_error(arg);
@@ -1284,7 +1305,7 @@
     // ":let $VAR = expr": Set environment variable.
     if (*arg == '$')
     {
-	if (flags & ASSIGN_CONST)
+	if (flags & (ASSIGN_CONST | ASSIGN_FINAL))
 	{
 	    emsg(_("E996: Cannot lock an environment variable"));
 	    return NULL;
@@ -1336,7 +1357,7 @@
     // ":let &g:option = expr": Set global option value.
     else if (*arg == '&')
     {
-	if (flags & ASSIGN_CONST)
+	if (flags & (ASSIGN_CONST | ASSIGN_FINAL))
 	{
 	    emsg(_(e_const_option));
 	    return NULL;
@@ -1349,7 +1370,7 @@
 	else
 	{
 	    long	n = 0;
-	    int		opt_type;
+	    getoption_T	opt_type;
 	    long	numval;
 	    char_u	*stringval = NULL;
 	    char_u	*s = NULL;
@@ -1359,10 +1380,19 @@
 	    *p = NUL;
 
 	    opt_type = get_option_value(arg, &numval, &stringval, opt_flags);
-	    if ((opt_type == 1 || opt_type == -1)
+	    if ((opt_type == gov_bool
+			|| opt_type == gov_number
+			|| opt_type == gov_hidden_bool
+			|| opt_type == gov_hidden_number)
 			     && (tv->v_type != VAR_STRING || !in_vim9script()))
-		// number, possibly hidden
-		n = (long)tv_get_number(tv);
+	    {
+		if (opt_type == gov_bool || opt_type == gov_hidden_bool)
+		    // bool, possibly hidden
+		    n = (long)tv_get_bool(tv);
+		else
+		    // number, possibly hidden
+		    n = (long)tv_get_number(tv);
+	    }
 
 	    // Avoid setting a string option to the text "v:false" or similar.
 	    // In Vim9 script also don't convert a number to string.
@@ -1372,8 +1402,9 @@
 
 	    if (op != NULL && *op != '=')
 	    {
-		if ((opt_type == 1 && *op == '.')
-			|| (opt_type == 0 && *op != '.'))
+		if (((opt_type == gov_bool || opt_type == gov_number)
+								 && *op == '.')
+			|| (opt_type == gov_string && *op != '.'))
 		{
 		    semsg(_(e_letwrong), op);
 		    failed = TRUE;  // don't set the value
@@ -1381,18 +1412,23 @@
 		}
 		else
 		{
-		    if (opt_type == 1)  // number
+		    // number, in legacy script also bool
+		    if (opt_type == gov_number
+				 || (opt_type == gov_bool && !in_vim9script()))
 		    {
 			switch (*op)
 			{
 			    case '+': n = numval + n; break;
 			    case '-': n = numval - n; break;
 			    case '*': n = numval * n; break;
-			    case '/': n = (long)num_divide(numval, n); break;
-			    case '%': n = (long)num_modulus(numval, n); break;
+			    case '/': n = (long)num_divide(numval, n,
+							       &failed); break;
+			    case '%': n = (long)num_modulus(numval, n,
+							       &failed); break;
 			}
 		    }
-		    else if (opt_type == 0 && stringval != NULL && s != NULL)
+		    else if (opt_type == gov_string
+					     && stringval != NULL && s != NULL)
 		    {
 			// string
 			s = concat_str(stringval, s);
@@ -1404,7 +1440,7 @@
 
 	    if (!failed)
 	    {
-		if (opt_type != 0 || s != NULL)
+		if (opt_type != gov_string || s != NULL)
 		{
 		    set_option_value(arg, n, s, opt_flags);
 		    arg_end = p;
@@ -1420,7 +1456,7 @@
     // ":let @r = expr": Set register contents.
     else if (*arg == '@')
     {
-	if (flags & ASSIGN_CONST)
+	if (flags & (ASSIGN_CONST | ASSIGN_FINAL))
 	{
 	    emsg(_("E996: Cannot lock a register"));
 	    return NULL;
@@ -1462,7 +1498,9 @@
     {
 	lval_T	lv;
 
-	p = get_lval(arg, tv, &lv, FALSE, FALSE, 0, FNE_CHECK_START);
+	p = get_lval(arg, tv, &lv, FALSE, FALSE,
+		(flags & (ASSIGN_NO_DECL | ASSIGN_DECL))
+					   ? GLV_NO_DECL : 0, FNE_CHECK_START);
 	if (p != NULL && lv.ll_name != NULL)
 	{
 	    if (endchars != NULL && vim_strchr(endchars,
@@ -1552,7 +1590,7 @@
 	{
 	    // Parse the name and find the end.
 	    name_end = get_lval(arg, NULL, &lv, TRUE, eap->skip || error,
-						   glv_flags, FNE_CHECK_START);
+				     glv_flags | GLV_NO_DECL, FNE_CHECK_START);
 	    if (lv.ll_name == NULL)
 		error = TRUE;	    // error but continue parsing
 	    if (name_end == NULL || (!VIM_ISWHITE(*name_end)
@@ -1661,10 +1699,20 @@
     dict_T	*d;
     dictitem_T	*di;
 
+    // can't :unlet a script variable in Vim9 script
     if (in_vim9script() && check_vim9_unlet(name) == FAIL)
 	return FAIL;
 
     ht = find_var_ht(name, &varname);
+
+    // can't :unlet a script variable in Vim9 script from a function
+    if (ht == get_script_local_ht()
+	    && SCRIPT_ID_VALID(current_sctx.sc_sid)
+	    && SCRIPT_ITEM(current_sctx.sc_sid)->sn_version
+							 == SCRIPT_VERSION_VIM9
+	    && check_vim9_unlet(name) == FAIL)
+	return FAIL;
+
     if (ht != NULL && *varname != NUL)
     {
 	d = get_current_funccal_dict(ht);
@@ -1921,7 +1969,7 @@
 /*
  * Function to concatenate a prefix and a variable name.
  */
-    static char_u *
+    char_u *
 cat_prefix_varname(int prefix, char_u *name)
 {
     int		len;
@@ -2045,10 +2093,10 @@
 {
     switch (nr)
     {
-	case VVAL_FALSE: return "v:false";
-	case VVAL_TRUE:  return "v:true";
+	case VVAL_FALSE: return in_vim9script() ? "false" : "v:false";
+	case VVAL_TRUE:  return in_vim9script() ? "true" : "v:true";
+	case VVAL_NULL:  return in_vim9script() ? "null" : "v:null";
 	case VVAL_NONE:  return "v:none";
-	case VVAL_NULL:  return "v:null";
     }
     internal_error("get_var_special_name()");
     return "42";
@@ -2515,7 +2563,7 @@
 		    rettv->vval.v_string = vim_strsave(import->imp_funcname);
 		}
 	    }
-	    else if (import->imp_all)
+	    else if (import->imp_flags & IMP_FLAGS_STAR)
 	    {
 		emsg("Sorry, 'import * as X' not implemented yet");
 		ret = FAIL;
@@ -2553,7 +2601,22 @@
 	    ret = FAIL;
 	}
 	else if (rettv != NULL)
+	{
+	    // If a list or dict variable wasn't initialized, do it now.
+	    if (tv->v_type == VAR_DICT && tv->vval.v_dict == NULL)
+	    {
+		tv->vval.v_dict = dict_alloc();
+		if (tv->vval.v_dict != NULL)
+		    ++tv->vval.v_dict->dv_refcount;
+	    }
+	    else if (tv->v_type == VAR_LIST && tv->vval.v_list == NULL)
+	    {
+		tv->vval.v_list = list_alloc();
+		if (tv->vval.v_list != NULL)
+		    ++tv->vval.v_list->lv_refcount;
+	    }
 	    copy_tv(tv, rettv);
+	}
     }
 
     name[len] = cc;
@@ -2593,8 +2656,7 @@
  * Find variable "name" in the list of variables.
  * Return a pointer to it if found, NULL if not found.
  * Careful: "a:0" variables don't have a name.
- * When "htp" is not NULL we are writing to the variable, set "htp" to the
- * hashtab_T used.
+ * When "htp" is not NULL  set "htp" to the hashtab_T used.
  */
     dictitem_T *
 find_var(char_u *name, hashtab_T **htp, int no_autoload)
@@ -2608,12 +2670,32 @@
 	*htp = ht;
     if (ht == NULL)
 	return NULL;
-    ret = find_var_in_ht(ht, *name, varname, no_autoload || htp != NULL);
+    ret = find_var_in_ht(ht, *name, varname, no_autoload);
     if (ret != NULL)
 	return ret;
 
     // Search in parent scope for lambda
-    return find_var_in_scoped_ht(name, no_autoload || htp != NULL);
+    ret = find_var_in_scoped_ht(name, no_autoload);
+    if (ret != NULL)
+	return ret;
+
+    // in Vim9 script items without a scope can be script-local
+    if (in_vim9script() && name[0] != NUL && name[1] != ':')
+    {
+	ht = get_script_local_ht();
+	if (ht != NULL)
+	{
+	    ret = find_var_in_ht(ht, *name, varname, no_autoload);
+	    if (ret != NULL)
+	    {
+		if (htp != NULL)
+		    *htp = ht;
+		return ret;
+	    }
+	}
+    }
+
+    return NULL;
 }
 
 /*
@@ -2683,19 +2765,23 @@
 
 /*
  * Look for "name[len]" in script-local variables.
- * Return a non-NULL pointer when found, NULL when not found.
+ * Return OK when found, FAIL when not found.
  */
-    void *
-lookup_scriptvar(char_u *name, size_t len, cctx_T *dummy UNUSED)
+    int
+lookup_scriptvar(
+	char_u	*name,
+	size_t	len,
+	void	*lvar UNUSED,
+	cctx_T	*dummy UNUSED)
 {
     hashtab_T	*ht = get_script_local_ht();
     char_u	buffer[30];
     char_u	*p;
-    void	*res;
+    int		res;
     hashitem_T	*hi;
 
     if (ht == NULL)
-	return NULL;
+	return FAIL;
     if (len < sizeof(buffer) - 1)
     {
 	// avoid an alloc/free for short names
@@ -2706,20 +2792,19 @@
     {
 	p = vim_strnsave(name, len);
 	if (p == NULL)
-	    return NULL;
+	    return FAIL;
     }
 
     hi = hash_find(ht, p);
-    res = HASHITEM_EMPTY(hi) ? NULL : hi;
+    res = HASHITEM_EMPTY(hi) ? FAIL : OK;
 
     // if not script-local, then perhaps imported
-    if (res == NULL && find_imported(p, 0, NULL) != NULL)
-	res = p;
+    if (res == FAIL && find_imported(p, 0, NULL) != NULL)
+	res = OK;
 
     if (p != buffer)
 	vim_free(p);
-    // Don't return "buffer", gcc complains.
-    return res == NULL ? NULL : IObuff;
+    return res;
 }
 
 /*
@@ -2990,7 +3075,7 @@
     typval_T	*tv,
     int		copy)	    // make copy of value in "tv"
 {
-    set_var_const(name, NULL, tv, copy, ASSIGN_NO_DECL);
+    set_var_const(name, NULL, tv, copy, ASSIGN_DECL);
 }
 
 /*
@@ -3004,7 +3089,7 @@
     type_T	*type,
     typval_T	*tv_arg,
     int		copy,	    // make copy of value in "tv"
-    int		flags)	    // ASSIGN_CONST, ASSIGN_NO_DECL
+    int		flags)	    // ASSIGN_CONST, ASSIGN_FINAL, etc.
 {
     typval_T	*tv = tv_arg;
     typval_T	bool_tv;
@@ -3024,7 +3109,8 @@
 
     if (vim9script
 	    && !is_script_local
-	    && (flags & ASSIGN_NO_DECL) == 0
+	    && (flags & (ASSIGN_NO_DECL | ASSIGN_DECL)) == 0
+	    && (flags & (ASSIGN_CONST | ASSIGN_FINAL)) == 0
 	    && name[1] == ':')
     {
 	vim9_declare_error(name);
@@ -3054,7 +3140,7 @@
     {
 	if ((di->di_flags & DI_FLAGS_RELOAD) == 0)
 	{
-	    if (flags & ASSIGN_CONST)
+	    if (flags & (ASSIGN_CONST | ASSIGN_FINAL))
 	    {
 		emsg(_(e_cannot_mod));
 		goto failed;
@@ -3062,7 +3148,7 @@
 
 	    if (is_script_local && vim9script)
 	    {
-		if ((flags & ASSIGN_NO_DECL) == 0)
+		if ((flags & (ASSIGN_NO_DECL | ASSIGN_DECL)) == 0)
 		{
 		    semsg(_(e_redefining_script_item_str), name);
 		    goto failed;
@@ -3073,19 +3159,20 @@
 		    goto failed;
 	    }
 
-	    // Check in this order for backwards compatibility:
-	    // - Whether the variable is read-only
-	    // - Whether the variable value is locked
-	    // - Whether the variable is locked
-	    if (var_check_ro(di->di_flags, name, FALSE)
-			    || value_check_lock(di->di_tv.v_lock, name, FALSE)
-			    || var_check_lock(di->di_flags, name, FALSE))
+	    if (var_check_permission(di, name) == FAIL)
 		goto failed;
 	}
 	else
+	{
 	    // can only redefine once
 	    di->di_flags &= ~DI_FLAGS_RELOAD;
 
+	    // A Vim9 script-local variable is also present in sn_all_vars and
+	    // sn_var_vals.  It may set "type" from "tv".
+	    if (is_script_local && vim9script)
+		update_vim9_script_var(FALSE, di, flags, tv, &type);
+	}
+
 	// existing variable, need to clear the value
 
 	// Handle setting internal di: variables separately where needed to
@@ -3135,8 +3222,15 @@
 
 	clear_tv(&di->di_tv);
     }
-    else		    // add a new variable
+    else
     {
+	// add a new variable
+	if (vim9script && is_script_local && (flags & ASSIGN_NO_DECL))
+	{
+	    semsg(_(e_unknown_variable_str), name);
+	    goto failed;
+	}
+
 	// Can't add "v:" or "a:" variable.
 	if (ht == &vimvarht || ht == get_funccal_args_ht())
 	{
@@ -3144,8 +3238,10 @@
 	    goto failed;
 	}
 
-	// Make sure the variable name is valid.
-	if (!valid_varname(varname))
+	// Make sure the variable name is valid.  In Vim9 script an autoload
+	// variable must be prefixed with "g:".
+	if (!valid_varname(varname, !vim9script
+					       || STRNCMP(name, "g:", 2) == 0))
 	    goto failed;
 
 	di = alloc(sizeof(dictitem_T) + STRLEN(varname));
@@ -3158,13 +3254,13 @@
 	    goto failed;
 	}
 	di->di_flags = DI_FLAGS_ALLOC;
-	if (flags & ASSIGN_CONST)
+	if (flags & (ASSIGN_CONST | ASSIGN_FINAL))
 	    di->di_flags |= DI_FLAGS_LOCK;
 
 	// A Vim9 script-local variable is also added to sn_all_vars and
-	// sn_var_vals.
+	// sn_var_vals. It may set "type" from "tv".
 	if (is_script_local && vim9script)
-	    add_vim9_script_var(di, tv, type);
+	    update_vim9_script_var(TRUE, di, flags, tv, &type);
     }
 
     if (copy || tv->v_type == VAR_NUMBER || tv->v_type == VAR_FLOAT)
@@ -3176,7 +3272,16 @@
 	init_tv(tv);
     }
 
-    // ":const var = val" locks the value
+    if (vim9script && type != NULL)
+    {
+	if (type->tt_type == VAR_DICT && di->di_tv.vval.v_dict != NULL)
+	    di->di_tv.vval.v_dict->dv_type = alloc_type(type);
+	else if (type->tt_type == VAR_LIST && di->di_tv.vval.v_list != NULL)
+	    di->di_tv.vval.v_list->lv_type = alloc_type(type);
+    }
+
+    // ":const var = value" locks the value
+    // ":final var = value" locks "var"
     if (flags & ASSIGN_CONST)
 	// Like :lockvar! name: lock the value and what it contains, but only
 	// if the reference count is up to one.  That locks only literal
@@ -3189,6 +3294,22 @@
 }
 
 /*
+ * Check in this order for backwards compatibility:
+ * - Whether the variable is read-only
+ * - Whether the variable value is locked
+ * - Whether the variable is locked
+ */
+    int
+var_check_permission(dictitem_T *di, char_u *name)
+{
+    if (var_check_ro(di->di_flags, name, FALSE)
+		    || value_check_lock(di->di_tv.v_lock, name, FALSE)
+		    || var_check_lock(di->di_flags, name, FALSE))
+	return FAIL;
+    return OK;
+}
+
+/*
  * Return TRUE if di_flags "flags" indicates variable "name" is read-only.
  * Also give an error message.
  */
@@ -3298,17 +3419,17 @@
 }
 
 /*
- * Check if a variable name is valid.
+ * Check if a variable name is valid.  When "autoload" is true "#" is allowed.
  * Return FALSE and give an error if not.
  */
     int
-valid_varname(char_u *varname)
+valid_varname(char_u *varname, int autoload)
 {
     char_u *p;
 
     for (p = varname; *p != NUL; ++p)
 	if (!eval_isnamec1(*p) && (p == varname || !VIM_ISDIGIT(*p))
-						   && *p != AUTOLOAD_CHAR)
+					 && !(autoload && *p == AUTOLOAD_CHAR))
 	{
 	    semsg(_(e_illvar), varname);
 	    return FALSE;
@@ -3408,9 +3529,17 @@
     char_u	nbuf[NUMBUFLEN];
     int		error = FALSE;
 
-    if (!in_vim9script() || varp->v_type != VAR_STRING)
-	numval = (long)tv_get_number_chk(varp, &error);
-    strval = tv_get_string_buf_chk(varp, nbuf);
+    if (varp->v_type == VAR_BOOL)
+    {
+	numval = (long)varp->vval.v_number;
+	strval = (char_u *)"0";  // avoid using "false"
+    }
+    else
+    {
+	if (!in_vim9script() || varp->v_type != VAR_STRING)
+	    numval = (long)tv_get_number_chk(varp, &error);
+	strval = tv_get_string_buf_chk(varp, nbuf);
+    }
     if (!error && strval != NULL)
 	set_option_value(varname, numval, strval, OPT_LOCAL);
 }
diff -Nru vim-8.2.1913/src/evalwindow.c vim-8.2.2434/src/evalwindow.c
--- vim-8.2.1913/src/evalwindow.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/evalwindow.c	2021-01-30 22:05:11.000000000 +0000
@@ -673,6 +673,10 @@
     win_T	*save_curwin;
     tabpage_T	*save_curtab;
 
+    // Return an empty string if something fails.
+    rettv->v_type = VAR_STRING;
+    rettv->vval.v_string = NULL;
+
     if (wp != NULL && tp != NULL)
     {
 	pos_T	curpos = wp->w_cursor;
@@ -1010,9 +1014,9 @@
     ga_init2(&ga, (int)sizeof(char), 70);
     FOR_ALL_WINDOWS(wp)
     {
-	sprintf((char *)buf, "%dresize %d|", winnr, wp->w_height);
+	sprintf((char *)buf, ":%dresize %d|", winnr, wp->w_height);
 	ga_concat(&ga, buf);
-	sprintf((char *)buf, "vert %dresize %d|", winnr, wp->w_width);
+	sprintf((char *)buf, "vert :%dresize %d|", winnr, wp->w_width);
 	ga_concat(&ga, buf);
 	++winnr;
     }
diff -Nru vim-8.2.1913/src/ex_cmdidxs.h vim-8.2.2434/src/ex_cmdidxs.h
--- vim-8.2.1913/src/ex_cmdidxs.h	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/ex_cmdidxs.h	2021-01-30 22:05:11.000000000 +0000
@@ -7,30 +7,30 @@
 {
   /* a */ 0,
   /* b */ 19,
-  /* c */ 42,
-  /* d */ 108,
-  /* e */ 133,
-  /* f */ 156,
-  /* g */ 173,
-  /* h */ 179,
-  /* i */ 188,
-  /* j */ 207,
-  /* k */ 209,
-  /* l */ 214,
-  /* m */ 276,
-  /* n */ 294,
-  /* o */ 314,
-  /* p */ 326,
-  /* q */ 365,
-  /* r */ 368,
-  /* s */ 388,
-  /* t */ 457,
-  /* u */ 502,
-  /* v */ 513,
-  /* w */ 533,
-  /* x */ 547,
-  /* y */ 557,
-  /* z */ 558
+  /* c */ 43,
+  /* d */ 109,
+  /* e */ 134,
+  /* f */ 157,
+  /* g */ 174,
+  /* h */ 180,
+  /* i */ 189,
+  /* j */ 208,
+  /* k */ 210,
+  /* l */ 215,
+  /* m */ 277,
+  /* n */ 295,
+  /* o */ 315,
+  /* p */ 327,
+  /* q */ 366,
+  /* r */ 369,
+  /* s */ 389,
+  /* t */ 458,
+  /* u */ 503,
+  /* v */ 514,
+  /* w */ 534,
+  /* x */ 548,
+  /* y */ 558,
+  /* z */ 559
 };
 
 /*
@@ -42,7 +42,7 @@
 static const unsigned char cmdidxs2[26][26] =
 { /*         a   b   c   d   e   f   g   h   i   j   k   l   m   n   o   p   q   r   s   t   u   v   w   x   y   z */
   /* a */ {  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  5,  6,  0,  0,  0,  7, 15,  0, 16,  0,  0,  0,  0,  0 },
-  /* b */ {  2,  0,  0,  4,  5,  7,  0,  0,  0,  0,  0,  8,  9, 10, 11, 12,  0, 13,  0,  0,  0,  0, 22,  0,  0,  0 },
+  /* b */ {  2,  0,  0,  5,  6,  8,  0,  0,  0,  0,  0,  9, 10, 11, 12, 13,  0, 14,  0,  0,  0,  0, 23,  0,  0,  0 },
   /* c */ {  3, 12, 16, 18, 20, 22, 25,  0,  0,  0,  0, 33, 37, 40, 46, 56, 58, 59, 60,  0, 62,  0, 65,  0,  0,  0 },
   /* d */ {  0,  0,  0,  0,  0,  0,  0,  0,  8, 18,  0, 19,  0,  0, 20,  0,  0, 22, 23,  0,  0,  0,  0,  0,  0,  0 },
   /* e */ {  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  7,  9, 10,  0,  0,  0,  0,  0,  0,  0, 17,  0, 18,  0,  0 },
@@ -69,4 +69,4 @@
   /* z */ {  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0 }
 };
 
-static const int command_count = 573;
+static const int command_count = 574;
diff -Nru vim-8.2.1913/src/ex_cmds.c vim-8.2.2434/src/ex_cmds.c
--- vim-8.2.1913/src/ex_cmds.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/ex_cmds.c	2021-01-30 22:05:11.000000000 +0000
@@ -277,6 +277,7 @@
 static char_u	*sortbuf1;
 static char_u	*sortbuf2;
 
+static int	sort_lc;	// sort using locale
 static int	sort_ic;	// ignore case
 static int	sort_nr;	// sort on number
 static int	sort_rx;	// sort on regex instead of skipping it
@@ -307,7 +308,13 @@
     } st_u;
 } sorti_T;
 
-static int sort_compare(const void *s1, const void *s2);
+    static int
+string_compare(const void *s1, const void *s2)
+{
+    if (sort_lc)
+	return strcoll((char *)s1, (char *)s2);
+    return sort_ic ? STRICMP(s1, s2) : STRCMP(s1, s2);
+}
 
     static int
 sort_compare(const void *s1, const void *s2)
@@ -350,8 +357,7 @@
 		     l2.st_u.line.end_col_nr - l2.st_u.line.start_col_nr + 1);
 	sortbuf2[l2.st_u.line.end_col_nr - l2.st_u.line.start_col_nr] = 0;
 
-	result = sort_ic ? STRICMP(sortbuf1, sortbuf2)
-						 : STRCMP(sortbuf1, sortbuf2);
+	result = string_compare(sortbuf1, sortbuf2);
     }
 
     // If two lines have the same value, preserve the original line order.
@@ -398,7 +404,7 @@
     if (nrs == NULL)
 	goto sortend;
 
-    sort_abort = sort_ic = sort_rx = sort_nr = 0;
+    sort_abort = sort_ic = sort_lc = sort_rx = sort_nr = 0;
 #ifdef FEAT_FLOAT
     sort_flt = 0;
 #endif
@@ -409,6 +415,8 @@
 	    ;
 	else if (*p == 'i')
 	    sort_ic = TRUE;
+	else if (*p == 'l')
+	    sort_lc = TRUE;
 	else if (*p == 'r')
 	    sort_rx = TRUE;
 	else if (*p == 'n')
@@ -614,8 +622,7 @@
 	    change_occurred = TRUE;
 
 	s = ml_get(get_lnum);
-	if (!unique || i == 0
-		|| (sort_ic ? STRICMP(s, sortbuf1) : STRCMP(s, sortbuf1)) != 0)
+	if (!unique || i == 0 || string_compare(s, sortbuf1) != 0)
 	{
 	    // Copy the line into a buffer, it may become invalid in
 	    // ml_append(). And it's needed for "unique".
@@ -1247,6 +1254,16 @@
 		if (read_linecount >= linecount)
 		    // move all marks from old lines to new lines
 		    mark_adjust(line1, line2, linecount, 0L);
+		else if (save_cmod_flags & CMOD_LOCKMARKS)
+		{
+		    // Move marks from the lines below the new lines down by
+		    // the number of lines lost.
+		    // Move marks from the lines that will be deleted to the
+		    // new lines and below.
+		    mark_adjust(line2 + 1, (linenr_T)MAXLNUM,
+					       linecount - read_linecount, 0L);
+		    mark_adjust(line1, line2, linecount, 0L);
+		}
 		else
 		{
 		    // move marks from old lines to new lines, delete marks
@@ -1343,8 +1360,8 @@
 #endif
 #ifdef MSWIN
     int		winstart = FALSE;
-    int		keep_termcap = FALSE;
 #endif
+    int		keep_termcap = !termcap_active;
 
     /*
      * Disallow shell commands for "rvim".
@@ -1378,9 +1395,7 @@
     msg_putchar('\r');			// put cursor at start of line
     if (!autocmd_busy)
     {
-#ifdef MSWIN
 	if (!keep_termcap)
-#endif
 	    stoptermcap();
     }
 #ifdef MSWIN
@@ -1471,9 +1486,7 @@
 	}
 #endif // FEAT_GUI_MSWIN
 
-#ifdef MSWIN
 	if (!keep_termcap)	// if keep_termcap is TRUE didn't stop termcap
-#endif
 	    starttermcap();	// start termcap if not done by wait_return()
 
 	/*
@@ -2442,6 +2455,7 @@
  *	 ECMD_OLDBUF: use existing buffer if it exists
  *	ECMD_FORCEIT: ! used for Ex command
  *	 ECMD_ADDBUF: don't edit, just add to buffer list
+ *	 ECMD_ALTBUF: like ECMD_ADDBUF and also set the alternate file
  *   oldwin: Should be "curwin" when editing a new buffer in the current
  *	     window, NULL when splitting the window first.  When not NULL info
  *	     of the previous buffer for "oldwin" is stored.
@@ -2538,7 +2552,8 @@
 	    fname_case(sfname, 0);   // set correct case for sfname
 #endif
 
-	if ((flags & ECMD_ADDBUF) && (ffname == NULL || *ffname == NUL))
+	if ((flags & (ECMD_ADDBUF | ECMD_ALTBUF))
+					 && (ffname == NULL || *ffname == NUL))
 	    goto theend;
 
 	if (ffname == NULL)
@@ -2567,7 +2582,7 @@
      */
     if (  ((!other_file && !(flags & ECMD_OLDBUF))
 	    || (curbuf->b_nwindows == 1
-		&& !(flags & (ECMD_HIDE | ECMD_ADDBUF))))
+		&& !(flags & (ECMD_HIDE | ECMD_ADDBUF | ECMD_ALTBUF))))
 	&& check_changed(curbuf, (p_awa ? CCGD_AW : 0)
 			       | (other_file ? 0 : CCGD_MULTWIN)
 			       | ((flags & ECMD_FORCEIT) ? CCGD_FORCEIT : 0)
@@ -2616,7 +2631,7 @@
      */
     if (other_file)
     {
-	if (!(flags & ECMD_ADDBUF))
+	if (!(flags & (ECMD_ADDBUF | ECMD_ALTBUF)))
 	{
 	    if ((cmdmod.cmod_flags & CMOD_KEEPALT) == 0)
 		curwin->w_alt_fnum = curbuf->b_fnum;
@@ -2628,11 +2643,12 @@
 	    buf = buflist_findnr(fnum);
 	else
 	{
-	    if (flags & ECMD_ADDBUF)
+	    if (flags & (ECMD_ADDBUF | ECMD_ALTBUF))
 	    {
 		// Default the line number to zero to avoid that a wininfo item
 		// is added for the current window.
 		linenr_T	tlnum = 0;
+		buf_T		*newbuf;
 
 		if (command != NULL)
 		{
@@ -2640,10 +2656,12 @@
 		    if (tlnum <= 0)
 			tlnum = 1L;
 		}
-		// Add BLN_NOCURWIN to avoid a new wininfo items is assocated
+		// Add BLN_NOCURWIN to avoid a new wininfo items are associated
 		// with the current window.
-		(void)buflist_new(ffname, sfname, tlnum,
+		newbuf = buflist_new(ffname, sfname, tlnum,
 						    BLN_LISTED | BLN_NOCURWIN);
+		if (newbuf != NULL && (flags & ECMD_ALTBUF))
+		    curwin->w_alt_fnum = newbuf->b_fnum;
 		goto theend;
 	    }
 	    buf = buflist_new(ffname, sfname, 0L,
@@ -2692,6 +2710,12 @@
 	 */
 	if (buf != curbuf)
 	{
+#ifdef FEAT_CMDWIN
+	    int save_cmdwin_type = cmdwin_type;
+
+	    // BufLeave applies to the old buffer.
+	    cmdwin_type = 0;
+#endif
 	    /*
 	     * Be careful: The autocommands may delete any buffer and change
 	     * the current buffer.
@@ -2706,6 +2730,9 @@
 		new_name = vim_strsave(buf->b_fname);
 	    set_bufref(&au_new_curbuf, buf);
 	    apply_autocmds(EVENT_BUFLEAVE, NULL, NULL, FALSE, curbuf);
+#ifdef FEAT_CMDWIN
+	    cmdwin_type = save_cmdwin_type;
+#endif
 	    if (!bufref_valid(&au_new_curbuf))
 	    {
 		// new buffer has been deleted
@@ -2724,6 +2751,8 @@
 	    else
 	    {
 		win_T	    *the_curwin = curwin;
+		int	    did_decrement;
+		buf_T	    *was_curbuf = curbuf;
 
 		// Set the w_closing flag to avoid that autocommands close the
 		// window.  And set b_locked for the same reason.
@@ -2736,7 +2765,7 @@
 		// Close the link to the current buffer. This will set
 		// oldwin->w_buffer to NULL.
 		u_sync(FALSE);
-		close_buffer(oldwin, curbuf,
+		did_decrement = close_buffer(oldwin, curbuf,
 			 (flags & ECMD_HIDE) ? 0 : DOBUF_UNLOAD, FALSE, FALSE);
 
 		the_curwin->w_closing = FALSE;
@@ -2758,7 +2787,15 @@
 		    goto theend;
 		}
 		if (buf == curbuf)		// already in new buffer
+		{
+		    // close_buffer() has decremented the window count,
+		    // increment it again here and restore w_buffer.
+		    if (did_decrement && buf_valid(was_curbuf))
+			++was_curbuf->b_nwindows;
+		    if (win_valid_any_tab(oldwin) && oldwin->w_buffer == NULL)
+			oldwin->w_buffer = was_curbuf;
 		    auto_buf = TRUE;
+		}
 		else
 		{
 #ifdef FEAT_SYN_HL
@@ -2801,7 +2838,7 @@
     }
     else // !other_file
     {
-	if ((flags & ECMD_ADDBUF) || check_fname() == FAIL)
+	if ((flags & (ECMD_ADDBUF | ECMD_ALTBUF)) || check_fname() == FAIL)
 	    goto theend;
 
 	oldbuf = (flags & ECMD_OLDBUF);
@@ -3101,7 +3138,7 @@
 #endif
 
     if (command != NULL)
-	do_cmdline(command, NULL, NULL, DOCMD_VERBOSE);
+	do_cmdline(command, NULL, NULL, DOCMD_VERBOSE|DOCMD_RANGEOK);
 
 #ifdef FEAT_KEYMAP
     if (curbuf->b_kmap_state & KEYMAP_INIT)
@@ -3649,7 +3686,8 @@
 	    which_pat = RE_LAST;	    // use last used regexp
 	    delimiter = *cmd++;		    // remember delimiter character
 	    pat = cmd;			    // remember start of search pat
-	    cmd = skip_regexp_ex(cmd, delimiter, p_magic, &eap->arg, NULL);
+	    cmd = skip_regexp_ex(cmd, delimiter, magic_isset(),
+							&eap->arg, NULL, NULL);
 	    if (cmd[0] == delimiter)	    // end delimiter found
 		*cmd++ = NUL;		    // replace it with a NUL
 	}
@@ -3718,6 +3756,8 @@
     {
 	linenr_T    joined_lines_count;
 
+	if (eap->skip)
+	    return;
 	curwin->w_cursor.lnum = eap->line1;
 	if (*cmd == 'l')
 	    eap->flags = EXFLAG_LIST;
@@ -3741,7 +3781,7 @@
 	}
 
 	if ((cmdmod.cmod_flags & CMOD_KEEPPATTERNS) == 0)
-	    save_re_pat(RE_SUBST, pat, p_magic);
+	    save_re_pat(RE_SUBST, pat, magic_isset());
 	// put pattern in history
 	add_to_history(HIST_SEARCH, pat, TRUE, NUL);
 
@@ -3755,6 +3795,15 @@
 	++cmd;
     else
     {
+#ifdef FEAT_EVAL
+	if (in_vim9script())
+	{
+	    // ignore 'gdefault' and 'edcompatible'
+	    subflags.do_all = FALSE;
+	    subflags.do_ask = FALSE;
+	}
+	else
+#endif
 	if (!p_ed)
 	{
 	    if (p_gd)		// default is global on
@@ -3875,7 +3924,7 @@
      * But don't do it when it starts with "\=", then it's an expression.
      */
     if (!(sub[0] == '\\' && sub[1] == '='))
-	sub = regtilde(sub, p_magic);
+	sub = regtilde(sub, magic_isset());
 
     /*
      * Check for a match on each line.
@@ -4120,6 +4169,7 @@
 			{
 			    char_u *orig_line = NULL;
 			    int    len_change = 0;
+			    int	   save_p_lz = p_lz;
 #ifdef FEAT_FOLDING
 			    int save_p_fen = curwin->w_p_fen;
 
@@ -4130,6 +4180,9 @@
 			    temp = RedrawingDisabled;
 			    RedrawingDisabled = 0;
 
+			    // avoid calling update_screen() in vgetorpeek()
+			    p_lz = FALSE;
+
 			    if (new_start != NULL)
 			    {
 				// There already was a substitution, we would
@@ -4205,6 +4258,7 @@
 			    msg_didout = FALSE;	// don't scroll up
 			    msg_col = 0;
 			    gotocmdline(TRUE);
+			    p_lz = save_p_lz;
 
 			    // restore the line
 			    if (orig_line != NULL)
@@ -4287,7 +4341,7 @@
 		// get length of substitution part
 		sublen = vim_regsub_multi(&regmatch,
 				    sub_firstlnum - regmatch.startpos[0].lnum,
-				    sub, sub_firstline, FALSE, p_magic, TRUE);
+			       sub, sub_firstline, FALSE, magic_isset(), TRUE);
 #ifdef FEAT_EVAL
 		// If getting the substitute string caused an error, don't do
 		// the replacement.
@@ -4391,7 +4445,7 @@
 
 		(void)vim_regsub_multi(&regmatch,
 				    sub_firstlnum - regmatch.startpos[0].lnum,
-					   sub, new_end, TRUE, p_magic, TRUE);
+				      sub, new_end, TRUE, magic_isset(), TRUE);
 		sub_nsubs++;
 		did_sub = TRUE;
 
@@ -4824,7 +4878,7 @@
 	if (delim)
 	    ++cmd;		// skip delimiter if there is one
 	pat = cmd;		// remember start of pattern
-	cmd = skip_regexp_ex(cmd, delim, p_magic, &eap->arg, NULL);
+	cmd = skip_regexp_ex(cmd, delim, magic_isset(), &eap->arg, NULL, NULL);
 	if (cmd[0] == delim)		    // end delimiter found
 	    *cmd++ = NUL;		    // replace it with a NUL
     }
@@ -5139,6 +5193,15 @@
 	    {
 		goto_tabpage_win(tp, wp);
 		curwin->w_arg_idx = 0;
+		if (!bufIsChanged(curbuf))
+		{
+		    int save_ar = curbuf->b_p_ar;
+
+		    // reload the file if it is newer
+		    curbuf->b_p_ar = TRUE;
+		    buf_check_timestamp(curbuf, FALSE);
+		    curbuf->b_p_ar = save_ar;
+		}
 		return;
 	    }
 	}
diff -Nru vim-8.2.1913/src/ex_cmds.h vim-8.2.2434/src/ex_cmds.h
--- vim-8.2.1913/src/ex_cmds.h	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/ex_cmds.h	2021-01-30 22:05:11.000000000 +0000
@@ -55,6 +55,7 @@
 #define EX_LOCK_OK  0x1000000	// command can be executed when textlock is
 				// set; when missing disallows editing another
 				// buffer when curbuf_lock is set
+#define EX_NONWHITE_OK 0x2000000  // command can be followed by non-white
 
 #define EX_FILES (EX_XFILE | EX_EXTRA)	// multiple extra files allowed
 #define EX_FILE1 (EX_FILES | EX_NOSPC)	// 1 file, defaults to current file
@@ -178,6 +179,9 @@
 EXCMD(CMD_badd,		"badd",		ex_edit,
 	EX_NEEDARG|EX_FILE1|EX_CMDARG|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
 	ADDR_NONE),
+EXCMD(CMD_balt,		"balt",		ex_edit,
+	EX_NEEDARG|EX_FILE1|EX_CMDARG|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
+	ADDR_NONE),
 EXCMD(CMD_bdelete,	"bdelete",	ex_bunload,
 	EX_BANG|EX_RANGE|EX_BUFNAME|EX_COUNT|EX_EXTRA|EX_TRLBAR,
 	ADDR_BUFFERS),
@@ -485,7 +489,7 @@
 	EX_BANG|EX_EXTRA|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
 	ADDR_NONE),
 EXCMD(CMD_disassemble,	"disassemble",	ex_disassemble,
-	EX_EXTRA|EX_NEEDARG|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
+	EX_BANG|EX_EXTRA|EX_NEEDARG|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
 	ADDR_NONE),
 EXCMD(CMD_djump,	"djump",	ex_findpat,
 	EX_BANG|EX_RANGE|EX_DFLALL|EX_WHOLEFOLD|EX_EXTRA,
@@ -629,7 +633,7 @@
 	EX_EXTRA|EX_BANG|EX_SBOXOK|EX_CMDWIN|EX_LOCK_OK,
 	ADDR_NONE),
 EXCMD(CMD_global,	"global",	ex_global,
-	EX_RANGE|EX_WHOLEFOLD|EX_BANG|EX_EXTRA|EX_DFLALL|EX_SBOXOK|EX_CMDWIN|EX_LOCK_OK,
+	EX_RANGE|EX_WHOLEFOLD|EX_BANG|EX_EXTRA|EX_DFLALL|EX_SBOXOK|EX_CMDWIN|EX_LOCK_OK|EX_NONWHITE_OK,
 	ADDR_LINES),
 EXCMD(CMD_goto,		"goto",		ex_goto,
 	EX_RANGE|EX_COUNT|EX_TRLBAR|EX_SBOXOK|EX_CMDWIN|EX_LOCK_OK,
@@ -926,10 +930,10 @@
 	EX_RANGE|EX_FILE1|EX_NEEDARG|EX_CMDWIN|EX_LOCK_OK|EX_RESTRICT,
 	ADDR_LINES),
 EXCMD(CMD_lvimgrep,	"lvimgrep",	ex_vimgrep,
-	EX_RANGE|EX_BANG|EX_NEEDARG|EX_EXTRA|EX_NOTRLCOM|EX_TRLBAR|EX_XFILE,
+	EX_RANGE|EX_BANG|EX_NEEDARG|EX_EXTRA|EX_NOTRLCOM|EX_TRLBAR|EX_XFILE|EX_LOCK_OK,
 	ADDR_OTHER),
 EXCMD(CMD_lvimgrepadd,	"lvimgrepadd",	ex_vimgrep,
-	EX_RANGE|EX_BANG|EX_NEEDARG|EX_EXTRA|EX_NOTRLCOM|EX_TRLBAR|EX_XFILE,
+	EX_RANGE|EX_BANG|EX_NEEDARG|EX_EXTRA|EX_NOTRLCOM|EX_TRLBAR|EX_XFILE|EX_LOCK_OK,
 	ADDR_OTHER),
 EXCMD(CMD_lwindow,	"lwindow",	ex_cwindow,
 	EX_RANGE|EX_COUNT|EX_TRLBAR,
@@ -1274,7 +1278,7 @@
 	EX_BANG|EX_FILE1|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
 	ADDR_NONE),
 EXCMD(CMD_substitute,	"substitute",	ex_substitute,
-	EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_CMDWIN|EX_LOCK_OK,
+	EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_CMDWIN|EX_LOCK_OK|EX_NONWHITE_OK,
 	ADDR_LINES),
 EXCMD(CMD_sNext,	"sNext",	ex_previous,
 	EX_EXTRA|EX_RANGE|EX_COUNT|EX_BANG|EX_CMDARG|EX_ARGOPT|EX_TRLBAR,
@@ -1361,13 +1365,13 @@
 	EX_NEEDARG|EX_EXTRA|EX_BANG|EX_NOTRLCOM|EX_SBOXOK|EX_CMDWIN|EX_LOCK_OK,
 	ADDR_NONE),
 EXCMD(CMD_sleep,	"sleep",	ex_sleep,
-	EX_RANGE|EX_COUNT|EX_EXTRA|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
+	EX_BANG|EX_RANGE|EX_COUNT|EX_EXTRA|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
 	ADDR_OTHER),
 EXCMD(CMD_slast,	"slast",	ex_last,
 	EX_EXTRA|EX_BANG|EX_CMDARG|EX_ARGOPT|EX_TRLBAR,
 	ADDR_NONE),
 EXCMD(CMD_smagic,	"smagic",	ex_submagic,
-	EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_CMDWIN|EX_LOCK_OK,
+	EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_CMDWIN|EX_LOCK_OK|EX_NONWHITE_OK,
 	ADDR_LINES),
 EXCMD(CMD_smap,		"smap",		ex_map,
 	EX_EXTRA|EX_TRLBAR|EX_NOTRLCOM|EX_CTRLV|EX_CMDWIN|EX_LOCK_OK,
@@ -1382,7 +1386,7 @@
 	EX_RANGE|EX_BANG|EX_FILES|EX_CMDARG|EX_ARGOPT|EX_TRLBAR,
 	ADDR_OTHER),
 EXCMD(CMD_snomagic,	"snomagic",	ex_submagic,
-	EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_CMDWIN|EX_LOCK_OK,
+	EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_CMDWIN|EX_LOCK_OK|EX_NONWHITE_OK,
 	ADDR_LINES),
 EXCMD(CMD_snoremap,	"snoremap",	ex_map,
 	EX_EXTRA|EX_TRLBAR|EX_NOTRLCOM|EX_CTRLV|EX_CMDWIN|EX_LOCK_OK,
@@ -1649,7 +1653,7 @@
 	EX_RANGE|EX_WHOLEFOLD|EX_BANG|EX_FILE1|EX_ARGOPT|EX_DFLALL|EX_TRLBAR,
 	ADDR_LINES),
 EXCMD(CMD_vglobal,	"vglobal",	ex_global,
-	EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_DFLALL|EX_CMDWIN|EX_LOCK_OK,
+	EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_DFLALL|EX_CMDWIN|EX_LOCK_OK|EX_NONWHITE_OK,
 	ADDR_LINES),
 EXCMD(CMD_var,		"var",		ex_var,
 	EX_EXTRA|EX_NOTRLCOM|EX_SBOXOK|EX_CMDWIN|EX_LOCK_OK,
@@ -1670,13 +1674,13 @@
 	EX_BANG|EX_FILE1|EX_CMDARG|EX_ARGOPT|EX_TRLBAR,
 	ADDR_NONE),
 EXCMD(CMD_vimgrep,	"vimgrep",	ex_vimgrep,
-	EX_RANGE|EX_BANG|EX_NEEDARG|EX_EXTRA|EX_NOTRLCOM|EX_TRLBAR|EX_XFILE,
+	EX_RANGE|EX_BANG|EX_NEEDARG|EX_EXTRA|EX_NOTRLCOM|EX_TRLBAR|EX_XFILE|EX_LOCK_OK,
 	ADDR_OTHER),
 EXCMD(CMD_vimgrepadd,	"vimgrepadd",	ex_vimgrep,
-	EX_RANGE|EX_BANG|EX_NEEDARG|EX_EXTRA|EX_NOTRLCOM|EX_TRLBAR|EX_XFILE,
+	EX_RANGE|EX_BANG|EX_NEEDARG|EX_EXTRA|EX_NOTRLCOM|EX_TRLBAR|EX_XFILE|EX_LOCK_OK,
 	ADDR_OTHER),
 EXCMD(CMD_vim9script,	"vim9script",	ex_vim9script,
-	EX_CMDWIN|EX_LOCK_OK,
+	EX_WORD1|EX_CMDWIN|EX_LOCK_OK,
 	ADDR_NONE),
 EXCMD(CMD_viusage,	"viusage",	ex_viusage,
 	EX_TRLBAR,
@@ -1789,16 +1793,16 @@
 
 // commands that don't start with a letter
 EXCMD(CMD_bang,		"!",		ex_bang,
-	EX_RANGE|EX_WHOLEFOLD|EX_BANG|EX_FILES|EX_CMDWIN|EX_LOCK_OK,
+	EX_RANGE|EX_WHOLEFOLD|EX_BANG|EX_FILES|EX_CMDWIN|EX_LOCK_OK|EX_NONWHITE_OK,
 	ADDR_LINES),
 EXCMD(CMD_pound,	"#",		ex_print,
 	EX_RANGE|EX_WHOLEFOLD|EX_COUNT|EX_FLAGS|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
 	ADDR_LINES),
 EXCMD(CMD_and,		"&",		ex_substitute,
-	EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_CMDWIN|EX_LOCK_OK|EX_MODIFY,
+	EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_CMDWIN|EX_LOCK_OK|EX_MODIFY|EX_NONWHITE_OK,
 	ADDR_LINES),
 EXCMD(CMD_star,		"*",		ex_at,
-	EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
+	EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK|EX_NONWHITE_OK,
 	ADDR_LINES),
 EXCMD(CMD_lshift,	"<",		ex_operators,
 	EX_RANGE|EX_WHOLEFOLD|EX_COUNT|EX_FLAGS|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK|EX_MODIFY,
@@ -1810,7 +1814,7 @@
 	EX_RANGE|EX_WHOLEFOLD|EX_COUNT|EX_FLAGS|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK|EX_MODIFY,
 	ADDR_LINES),
 EXCMD(CMD_at,		"@",		ex_at,
-	EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
+	EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK|EX_NONWHITE_OK,
 	ADDR_LINES),
 EXCMD(CMD_block,	"{{{{{{{{",	ex_block,  // not found normally
 	0,
@@ -1819,7 +1823,7 @@
 	EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
 	ADDR_NONE),
 EXCMD(CMD_tilde,	"~",		ex_substitute,
-	EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_CMDWIN|EX_LOCK_OK|EX_MODIFY,
+	EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_CMDWIN|EX_LOCK_OK|EX_MODIFY|EX_NONWHITE_OK,
 	ADDR_LINES),
 
 // commands that start with an uppercase letter
diff -Nru vim-8.2.1913/src/ex_docmd.c vim-8.2.2434/src/ex_docmd.c
--- vim-8.2.1913/src/ex_docmd.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/ex_docmd.c	2021-01-30 22:05:11.000000000 +0000
@@ -274,7 +274,6 @@
 # define ex_continue		ex_ni
 # define ex_debug		ex_ni
 # define ex_debuggreedy		ex_ni
-# define ex_def			ex_ni
 # define ex_defcompile		ex_ni
 # define ex_delfunction		ex_ni
 # define ex_disassemble		ex_ni
@@ -305,7 +304,6 @@
 # define ex_try			ex_ni
 # define ex_unlet		ex_ni
 # define ex_unlockvar		ex_ni
-# define ex_vim9script		ex_ni
 # define ex_while		ex_ni
 # define ex_import		ex_ni
 # define ex_export		ex_ni
@@ -596,6 +594,17 @@
 }
 
 /*
+ * Execute the "+cmd" argument of "edit +cmd fname" and the like.
+ * This allows for using a range without ":" in Vim9 script.
+ */
+    int
+do_cmd_argument(char_u *cmd)
+{
+    return do_cmdline(cmd, NULL, NULL,
+		      DOCMD_VERBOSE|DOCMD_NOWAIT|DOCMD_KEYTYPED|DOCMD_RANGEOK);
+}
+
+/*
  * do_cmdline(): execute one Ex command line
  *
  * 1. Execute "cmdline" when it is not NULL.
@@ -687,11 +696,8 @@
     ++call_depth;
 
 #ifdef FEAT_EVAL
+    CLEAR_FIELD(cstack);
     cstack.cs_idx = -1;
-    cstack.cs_looplevel = 0;
-    cstack.cs_trylevel = 0;
-    cstack.cs_emsg_silent_list = NULL;
-    cstack.cs_lflags = 0;
     ga_init2(&lines_ga, (int)sizeof(wcmd_T), 10);
 
     real_cookie = getline_cookie(fgetline, cookie);
@@ -747,6 +753,9 @@
      * cancel the whole command line, and any if/endif or loop.
      * If force_abort is set, we cancel everything.
      */
+#ifdef FEAT_EVAL
+    did_emsg_cumul += did_emsg;
+#endif
     did_emsg = FALSE;
 
     /*
@@ -778,7 +787,12 @@
 		&& !(getline_is_func && func_has_abort(real_cookie))
 #endif
 							)
+	{
+#ifdef FEAT_EVAL
+	    did_emsg_cumul += did_emsg;
+#endif
 	    did_emsg = FALSE;
+	}
 
 	/*
 	 * 1. If repeating a line in a loop, get a line from lines_ga.
@@ -849,7 +863,7 @@
 	    if (do_profiling == PROF_YES)
 	    {
 		if (getline_is_func)
-		    func_line_start(real_cookie);
+		    func_line_start(real_cookie, SOURCING_LNUM);
 		else if (getline_equal(fgetline, cookie, getsourceline))
 		    script_line_start();
 	    }
@@ -872,7 +886,8 @@
 #else
 		    0
 #endif
-		    , TRUE)) == NULL)
+		    , in_vim9script() ? GETLINE_CONCAT_CONTBAR
+					       : GETLINE_CONCAT_CONT)) == NULL)
 	    {
 		// Don't call wait_return for aborted command line.  The NULL
 		// returned for the end of a sourced file or executed function
@@ -982,7 +997,7 @@
 	 *    "cmdline_copy" can change, e.g. for '%' and '#' expansion.
 	 */
 	++recursive;
-	next_cmdline = do_one_cmd(&cmdline_copy, flags & DOCMD_VERBOSE,
+	next_cmdline = do_one_cmd(&cmdline_copy, flags,
 #ifdef FEAT_EVAL
 				&cstack,
 #endif
@@ -1026,7 +1041,10 @@
 	if (did_emsg && !force_abort
 		&& getline_equal(fgetline, cookie, get_func_line)
 					      && !func_has_abort(real_cookie))
+	{
+	    // did_emsg_cumul is not set here
 	    did_emsg = FALSE;
+	}
 
 	if (cstack.cs_looplevel > 0)
 	{
@@ -1247,7 +1265,7 @@
 	 */
 	if (did_throw)
 	{
-	    void	*p = NULL;
+	    char	*p = NULL;
 	    msglist_T	*messages = NULL, *next;
 
 	    /*
@@ -1262,7 +1280,7 @@
 		    vim_snprintf((char *)IObuff, IOSIZE,
 			    _("E605: Exception not caught: %s"),
 			    current_exception->value);
-		    p = vim_strsave(IObuff);
+		    p = (char *)vim_strsave(IObuff);
 		    break;
 		case ET_ERROR:
 		    messages = current_exception->messages;
@@ -1662,7 +1680,7 @@
 {
 #ifdef FEAT_EVAL
     if (in_vim9script())
-	return p[0] == '#' && p[1] != '{' && !starts_with_colon;
+	return p[0] == '#' && !starts_with_colon;
 #endif
     return *p == '"';
 }
@@ -1675,7 +1693,8 @@
 /*
  * Execute one Ex command.
  *
- * If 'sourcing' is TRUE, the command will be included in the error message.
+ * If "flags" has DOCMD_VERBOSE, the command will be included in the error
+ * message.
  *
  * 1. skip comment lines and leading space
  * 2. handle command modifiers
@@ -1698,7 +1717,7 @@
     static char_u *
 do_one_cmd(
     char_u	**cmdlinep,
-    int		sourcing,
+    int		flags,
 #ifdef FEAT_EVAL
     cstack_T	*cstack,
 #endif
@@ -1719,7 +1738,9 @@
 #ifdef FEAT_EVAL
     int		may_have_range;
     int		vim9script = in_vim9script();
+    int		did_set_expr_line = FALSE;
 #endif
+    int		sourcing = flags & DOCMD_VERBOSE;
 
     CLEAR_FIELD(ea);
     ea.line1 = 1;
@@ -1781,24 +1802,44 @@
  */
     cmd = ea.cmd;
 #ifdef FEAT_EVAL
-    // In Vim9 script a colon is required before the range.
-    may_have_range = !vim9script || starts_with_colon;
+    // In Vim9 script a colon is required before the range.  This may also be
+    // after command modifiers.
+    if (vim9script && (flags & DOCMD_RANGEOK) == 0)
+    {
+	may_have_range = FALSE;
+	for (p = ea.cmd; p >= *cmdlinep; --p)
+	{
+	    if (*p == ':')
+		may_have_range = TRUE;
+	    if (p < ea.cmd && !VIM_ISWHITE(*p))
+		break;
+	}
+    }
+    else
+	may_have_range = TRUE;
     if (may_have_range)
 #endif
 	ea.cmd = skip_range(ea.cmd, TRUE, NULL);
 
 #ifdef FEAT_EVAL
-    if (vim9script && !starts_with_colon)
+    if (vim9script && !may_have_range)
     {
 	if (ea.cmd == cmd + 1 && *cmd == '$')
 	    // should be "$VAR = val"
 	    --ea.cmd;
-	else if (ea.cmd > cmd)
+	p = find_ex_command(&ea, NULL, lookup_scriptvar, NULL);
+	if (ea.cmdidx == CMD_SIZE)
 	{
-	    emsg(_(e_colon_required_before_a_range));
-	    goto doend;
+	    char_u *ar = skip_range(ea.cmd, TRUE, NULL);
+
+	    // If a ':' before the range is missing, give a clearer error
+	    // message.
+	    if (ar > ea.cmd)
+	    {
+		semsg(_(e_colon_required_before_range_str), ea.cmd);
+		goto doend;
+	    }
 	}
-	p = find_ex_command(&ea, NULL, lookup_scriptvar, NULL);
     }
     else
 #endif
@@ -1981,7 +2022,7 @@
     if (p == NULL)
     {
 	if (!ea.skip)
-	    errormsg = _("E464: Ambiguous use of user-defined command");
+	    errormsg = _(e_ambiguous_use_of_user_defined_command);
 	goto doend;
     }
     // Check for wrong commands.
@@ -2315,8 +2356,9 @@
 	    // for '=' register: accept the rest of the line as an expression
 	    if (ea.arg[-1] == '=' && ea.arg[0] != NUL)
 	    {
-		set_expr_line(vim_strsave(ea.arg));
+		set_expr_line(vim_strsave(ea.arg), &ea);
 		ea.arg += STRLEN(ea.arg);
+		did_set_expr_line = TRUE;
 	    }
 #endif
 	    ea.arg = skipwhite(ea.arg);
@@ -2549,7 +2591,7 @@
     // Set flag that any command was executed, used by ex_vim9script().
     if (getline_equal(ea.getline, ea.cookie, getsourceline)
 						    && current_sctx.sc_sid > 0)
-	SCRIPT_ITEM(current_sctx.sc_sid)->sn_had_command = TRUE;
+	SCRIPT_ITEM(current_sctx.sc_sid)->sn_state = SN_STATE_HAD_COMMAND;
 
     /*
      * If the command just executed called do_cmdline(), any throw or ":return"
@@ -2595,6 +2637,9 @@
     do_errthrow(cstack,
 	    (ea.cmdidx != CMD_SIZE && !IS_USER_CMDIDX(ea.cmdidx))
 			? cmdnames[(int)ea.cmdidx].cmd_name : (char_u *)NULL);
+
+    if (did_set_expr_line)
+	set_expr_line(NULL, NULL);
 #endif
 
     undo_cmdmod(&cmdmod);
@@ -2690,6 +2735,28 @@
 	}
 
 	p = skip_range(eap->cmd, TRUE, NULL);
+
+	// In Vim9 script a variable can shadow a command modifier:
+	//   verbose = 123
+	//   verbose += 123
+	//   silent! verbose = func()
+	//   verbose.member = 2
+	//   verbose[expr] = 2
+	// But not:
+	//   verbose [a, b] = list
+	if (in_vim9script())
+	{
+	    char_u *s, *n;
+
+	    for (s = p; ASCII_ISALPHA(*s); ++s)
+		;
+	    n = skipwhite(s);
+	    if (vim_strchr((char_u *)".=", *n) != NULL
+		    || *s == '['
+		    || (*n != NUL && n[1] == '='))
+		break;
+	}
+
 	switch (*p)
 	{
 	    // When adding an entry, also modify cmd_exists().
@@ -2758,7 +2825,7 @@
 			    }
 #ifdef FEAT_EVAL
 			    // Avoid that "filter(arg)" is recognized.
-			    if (in_vim9script() && !VIM_ISWHITE(*p))
+			    if (in_vim9script() && !VIM_ISWHITE(p[-1]))
 				break;
 #endif
 			    if (skip_only)
@@ -3223,7 +3290,7 @@
 find_ex_command(
 	exarg_T *eap,
 	int	*full UNUSED,
-	void	*(*lookup)(char_u *, size_t, cctx_T *) UNUSED,
+	int	(*lookup)(char_u *, size_t, void *, cctx_T *) UNUSED,
 	cctx_T	*cctx UNUSED)
 {
     int		len;
@@ -3243,8 +3310,9 @@
 	if (vim_strchr((char_u *)"{('[\"@", *p) != NULL
 	       || ((p = to_name_const_end(pskip)) > eap->cmd && *p != NUL))
 	{
-	    int oplen;
-	    int heredoc;
+	    int	    oplen;
+	    int	    heredoc;
+	    char_u  *swp = skipwhite(p);
 
 	    if (
 		// "(..." is an expression.
@@ -3262,7 +3330,7 @@
 			 || eap->cmd[1] == ':'
 			    )
 			    // "varname->func()" is an expression.
-			: (*p == '-' && p[1] == '>')))
+			: (*swp == '-' && swp[1] == '>')))
 	    {
 		if (*eap->cmd == '{' && ends_excmd(*skipwhite(eap->cmd + 1)))
 		{
@@ -3284,9 +3352,15 @@
 
 		// When followed by "=" or "+=" then it is an assignment.
 		++emsg_silent;
-		if (skip_expr(&after, NULL) == OK
-				  && (*after == '='
-				      || (*after != NUL && after[1] == '=')))
+		if (*after == '.')
+		    after = skipwhite(after + 1);
+		if (skip_expr(&after, NULL) == OK)
+		    after = skipwhite(after);
+		else
+		    after = (char_u *)"";
+		if (*after == '=' || (*after != NUL && after[1] == '=')
+					 || (after[0] == '.' && after[1] == '.'
+							   && after[2] == '='))
 		    eap->cmdidx = CMD_var;
 		else
 		    eap->cmdidx = CMD_eval;
@@ -3304,7 +3378,14 @@
 	    if (*eap->cmd == '[')
 	    {
 		p = to_name_const_end(eap->cmd);
-		if (p == eap->cmd || *skipwhite(p) != '=')
+		if (p == eap->cmd && *p == '[')
+		{
+		    int count = 0;
+		    int	semicolon = FALSE;
+
+		    p = skip_var_list(eap->cmd, TRUE, &count, &semicolon, TRUE);
+		}
+		if (p == NULL || p == eap->cmd || *skipwhite(p) != '=')
 		{
 		    eap->cmdidx = CMD_eval;
 		    return eap->cmd;
@@ -3328,7 +3409,7 @@
 			|| *eap->cmd == '&'
 			|| *eap->cmd == '$'
 			|| *eap->cmd == '@'
-			|| lookup(eap->cmd, p - eap->cmd, cctx) != NULL)
+			|| lookup(eap->cmd, p - eap->cmd, NULL, cctx) == OK)
 		{
 		    eap->cmdidx = CMD_var;
 		    return eap->cmd;
@@ -3446,6 +3527,11 @@
 		break;
 	    }
 
+	// Not not recognize ":*" as the star command unless '*' is in
+	// 'cpoptions'.
+	if (eap->cmdidx == CMD_star && vim_strchr(p_cpo, CPO_STAR) == NULL)
+	    p = eap->cmd;
+
 	// Look for a user defined command as a last resort.  Let ":Print" be
 	// overruled by a user defined command.
 	if ((eap->cmdidx == CMD_SIZE || eap->cmdidx == CMD_Print)
@@ -3456,7 +3542,7 @@
 		++p;
 	    p = find_ucmd(eap, p, full, NULL, NULL);
 	}
-	if (p == eap->cmd)
+	if (p == NULL || p == eap->cmd)
 	    eap->cmdidx = CMD_SIZE;
     }
 
@@ -3464,6 +3550,18 @@
     if (eap->cmdidx == CMD_final && p - eap->cmd == 4)
 	eap->cmdidx = CMD_finally;
 
+#ifdef FEAT_EVAL
+    if (eap->cmdidx < CMD_SIZE
+	    && in_vim9script()
+	    && !IS_WHITE_OR_NUL(*p) && *p != '\n' && *p != '!'
+	    && (eap->cmdidx < 0 ||
+		(cmdnames[eap->cmdidx].cmd_argt & EX_NONWHITE_OK) == 0))
+    {
+	semsg(_(e_command_not_followed_by_white_space_str), eap->cmd);
+	eap->cmdidx = CMD_SIZE;
+    }
+#endif
+
     return p;
 }
 
@@ -3875,7 +3973,7 @@
 		}
 		if (skip)	// skip "/pat/"
 		{
-		    cmd = skip_regexp(cmd, c, (int)p_magic);
+		    cmd = skip_regexp(cmd, c, magic_isset());
 		    if (*cmd == c)
 			++cmd;
 		}
@@ -4716,7 +4814,6 @@
 		|| (*p == '#'
 		    && in_vim9script()
 		    && !(eap->argt & EX_NOTRLCOM)
-		    && p[1] != '{'
 		    && p > eap->cmd && VIM_ISWHITE(p[-1]))
 #endif
 		|| *p == '|' || *p == '\n')
@@ -4969,7 +5066,7 @@
 	else
 	    goto_buffer(eap, DOBUF_FIRST, FORWARD, (int)eap->line2);
 	if (eap->do_ecmd_cmd != NULL)
-	    do_cmdline_cmd(eap->do_ecmd_cmd);
+	    do_cmd_argument(eap->do_ecmd_cmd);
     }
 }
 
@@ -4982,7 +5079,7 @@
 {
     goto_buffer(eap, DOBUF_MOD, FORWARD, (int)eap->line2);
     if (eap->do_ecmd_cmd != NULL)
-	do_cmdline_cmd(eap->do_ecmd_cmd);
+	do_cmd_argument(eap->do_ecmd_cmd);
 }
 
 /*
@@ -4997,7 +5094,7 @@
 
     goto_buffer(eap, DOBUF_CURRENT, FORWARD, (int)eap->line2);
     if (eap->do_ecmd_cmd != NULL)
-	do_cmdline_cmd(eap->do_ecmd_cmd);
+	do_cmd_argument(eap->do_ecmd_cmd);
 }
 
 /*
@@ -5014,7 +5111,7 @@
 
     goto_buffer(eap, DOBUF_CURRENT, BACKWARD, (int)eap->line2);
     if (eap->do_ecmd_cmd != NULL)
-	do_cmdline_cmd(eap->do_ecmd_cmd);
+	do_cmd_argument(eap->do_ecmd_cmd);
 }
 
 /*
@@ -5031,7 +5128,7 @@
 
     goto_buffer(eap, DOBUF_FIRST, FORWARD, 0);
     if (eap->do_ecmd_cmd != NULL)
-	do_cmdline_cmd(eap->do_ecmd_cmd);
+	do_cmd_argument(eap->do_ecmd_cmd);
 }
 
 /*
@@ -5046,12 +5143,12 @@
 
     goto_buffer(eap, DOBUF_LAST, BACKWARD, 0);
     if (eap->do_ecmd_cmd != NULL)
-	do_cmdline_cmd(eap->do_ecmd_cmd);
+	do_cmd_argument(eap->do_ecmd_cmd);
 }
 
 /*
  * Check if "c" ends an Ex command.
- * In Vim9 script does not check for white space before # or #{.
+ * In Vim9 script does not check for white space before #.
  */
     int
 ends_excmd(int c)
@@ -5800,6 +5897,7 @@
     {
 	if (!eap->forceit)
 	    autowrite_all();
+	apply_autocmds(EVENT_VIMSUSPEND, NULL, NULL, FALSE, NULL);
 	windgoto((int)Rows - 1, 0);
 	out_char('\n');
 	out_flush();
@@ -5817,6 +5915,7 @@
 	scroll_start();		// scroll screen before redrawing
 	redraw_later_clear();
 	shell_resized();	// may have resized window
+	apply_autocmds(EVENT_VIMRESUME, NULL, NULL, FALSE, NULL);
     }
 }
 
@@ -6458,9 +6557,9 @@
     {
 	// ":open /pattern/": put cursor in column found with pattern
 	++eap->arg;
-	p = skip_regexp(eap->arg, '/', p_magic);
+	p = skip_regexp(eap->arg, '/', magic_isset());
 	*p = NUL;
-	regmatch.regprog = vim_regcomp(eap->arg, p_magic ? RE_MAGIC : 0);
+	regmatch.regprog = vim_regcomp(eap->arg, magic_isset() ? RE_MAGIC : 0);
 	if (regmatch.regprog != NULL)
 	{
 	    regmatch.rm_ic = p_ic;
@@ -6481,7 +6580,7 @@
 }
 
 /*
- * ":edit", ":badd", ":visual".
+ * ":edit", ":badd", ":balt", ":visual".
  */
     static void
 ex_edit(exarg_T *eap)
@@ -6585,7 +6684,8 @@
 	else if (eap->cmdidx == CMD_enew)
 	    readonlymode = FALSE;   // 'readonly' doesn't make sense in an
 				    // empty buffer
-	setpcmark();
+	if (eap->cmdidx != CMD_balt && eap->cmdidx != CMD_badd)
+	    setpcmark();
 	if (do_ecmd(0, (eap->cmdidx == CMD_enew ? NULL : eap->arg),
 		    NULL, eap,
 		    // ":edit" goes to first line if Vi compatible
@@ -6596,7 +6696,8 @@
 		    + (eap->forceit ? ECMD_FORCEIT : 0)
 		      // after a split we can use an existing buffer
 		    + (old_curwin != NULL ? ECMD_OLDBUF : 0)
-		    + (eap->cmdidx == CMD_badd ? ECMD_ADDBUF : 0 )
+		    + (eap->cmdidx == CMD_badd ? ECMD_ADDBUF : 0)
+		    + (eap->cmdidx == CMD_balt ? ECMD_ALTBUF : 0)
 		    , old_curwin == NULL ? curwin : NULL) == FAIL)
 	{
 	    // Editing the file failed.  If the window was split, close it.
@@ -6639,7 +6740,7 @@
     else
     {
 	if (eap->do_ecmd_cmd != NULL)
-	    do_cmdline_cmd(eap->do_ecmd_cmd);
+	    do_cmd_argument(eap->do_ecmd_cmd);
 #ifdef FEAT_TITLE
 	n = curwin->w_arg_idx_invalid;
 #endif
@@ -7122,14 +7223,17 @@
 	case NUL: len *= 1000L; break;
 	default: semsg(_(e_invarg2), eap->arg); return;
     }
-    do_sleep(len);
+
+    // Hide the cursor if invoked with !
+    do_sleep(len, eap->forceit);
 }
 
 /*
  * Sleep for "msec" milliseconds, but keep checking for a CTRL-C every second.
+ * Hide the cursor if "hide_cursor" is TRUE.
  */
     void
-do_sleep(long msec)
+do_sleep(long msec, int hide_cursor)
 {
     long	done = 0;
     long	wait_now;
@@ -7141,7 +7245,11 @@
     ELAPSED_INIT(start_tv);
 # endif
 
-    cursor_on();
+    if (hide_cursor)
+        cursor_off();
+    else
+        cursor_on();
+
     out_flush_cursor(FALSE, FALSE);
     while (!got_int && done < msec)
     {
@@ -7450,11 +7558,12 @@
     static void
 ex_submagic(exarg_T *eap)
 {
-    int		magic_save = p_magic;
+    optmagic_T saved = magic_overruled;
 
-    p_magic = (eap->cmdidx == CMD_smagic);
+    magic_overruled = eap->cmdidx == CMD_smagic
+					  ? OPTION_MAGIC_ON : OPTION_MAGIC_OFF;
     ex_substitute(eap);
-    p_magic = magic_save;
+    magic_overruled = saved;
 }
 
 /*
@@ -7929,9 +8038,12 @@
     sst->save_opcount = opcount;
     sst->save_reg_executing = reg_executing;
 
-    msg_scroll = FALSE;	    // no msg scrolling in Normal mode
-    restart_edit = 0;	    // don't go to Insert mode
-    p_im = FALSE;	    // don't use 'insertmode'
+    msg_scroll = FALSE;		    // no msg scrolling in Normal mode
+    restart_edit = 0;		    // don't go to Insert mode
+    p_im = FALSE;		    // don't use 'insertmode'
+
+    sst->save_script_version = current_sctx.sc_version;
+    current_sctx.sc_version = 1;    // not in Vim9 script
 
     /*
      * Save the current typeahead.  This is required to allow using ":normal"
@@ -7955,6 +8067,7 @@
     opcount = sst->save_opcount;
     reg_executing = sst->save_reg_executing;
     msg_didout |= sst->save_msg_didout;	// don't reset msg_didout now
+    current_sctx.sc_version = sst->save_script_version;
 
     // Restore the state (needed when called from a function executed for
     // 'indentexpr'). Update the mouse and cursor, they may have changed.
@@ -8122,6 +8235,9 @@
 	    restart_edit = 'i';
 	curwin->w_curswant = 0;	    // avoid MAXCOL
     }
+
+    if (VIsual_active)
+	showmode();
 }
 
 /*
@@ -8244,7 +8360,7 @@
     {
 	whole = FALSE;
 	++eap->arg;
-	p = skip_regexp(eap->arg, '/', p_magic);
+	p = skip_regexp(eap->arg, '/', magic_isset());
 	if (*p)
 	{
 	    *p++ = NUL;
@@ -8446,18 +8562,19 @@
 /*
  * Evaluate cmdline variables.
  *
- * change '%'	    to curbuf->b_ffname
- *	  '#'	    to curwin->w_altfile
- *	  '<cword>' to word under the cursor
- *	  '<cWORD>' to WORD under the cursor
- *	  '<cexpr>' to C-expression under the cursor
- *	  '<cfile>' to path name under the cursor
- *	  '<sfile>' to sourced file name
- *	  '<stack>' to call stack
- *	  '<slnum>' to sourced file line number
- *	  '<afile>' to file name for autocommand
- *	  '<abuf>'  to buffer number for autocommand
- *	  '<amatch>' to matching name for autocommand
+ * change "%"	    to curbuf->b_ffname
+ *	  "#"	    to curwin->w_alt_fnum
+ *	  "%%"	    to curwin->w_alt_fnum in Vim9 script
+ *	  "<cword>" to word under the cursor
+ *	  "<cWORD>" to WORD under the cursor
+ *	  "<cexpr>" to C-expression under the cursor
+ *	  "<cfile>" to path name under the cursor
+ *	  "<sfile>" to sourced file name
+ *	  "<stack>" to call stack
+ *	  "<slnum>" to sourced file line number
+ *	  "<afile>" to file name for autocommand
+ *	  "<abuf>"  to buffer number for autocommand
+ *	  "<amatch>" to matching name for autocommand
  *
  * When an error is detected, "errormsg" is set to a non-NULL pointer (may be
  * "" for error without a message) and NULL is returned.
@@ -8538,47 +8655,60 @@
      */
     else
     {
+	int off = 0;
+
 	switch (spec_idx)
 	{
-	case SPEC_PERC:		// '%': current file
-		if (curbuf->b_fname == NULL)
-		{
-		    result = (char_u *)"";
-		    valid = 0;	    // Must have ":p:h" to be valid
-		}
-		else
+	case SPEC_PERC:
+#ifdef FEAT_EVAL
+		if (!in_vim9script() || src[1] != '%')
+#endif
 		{
-		    result = curbuf->b_fname;
-		    tilde_file = STRCMP(result, "~") == 0;
+		    // '%': current file
+		    if (curbuf->b_fname == NULL)
+		    {
+			result = (char_u *)"";
+			valid = 0;	    // Must have ":p:h" to be valid
+		    }
+		    else
+		    {
+			result = curbuf->b_fname;
+			tilde_file = STRCMP(result, "~") == 0;
+		    }
+		    break;
 		}
-		break;
-
+#ifdef FEAT_EVAL
+		// "%%" alternate file
+		off = 1;
+#endif
+		// FALLTHROUGH
 	case SPEC_HASH:		// '#' or "#99": alternate file
-		if (src[1] == '#')  // "##": the argument list
+		if (off == 0 ? src[1] == '#' : src[2] == '%')
 		{
+		    // "##" or "%%%": the argument list
 		    result = arg_all();
 		    resultbuf = result;
-		    *usedlen = 2;
+		    *usedlen = off + 2;
 		    if (escaped != NULL)
 			*escaped = TRUE;
 		    skip_mod = TRUE;
 		    break;
 		}
-		s = src + 1;
+		s = src + off + 1;
 		if (*s == '<')		// "#<99" uses v:oldfiles
 		    ++s;
 		i = (int)getdigits(&s);
-		if (s == src + 2 && src[1] == '-')
+		if (s == src + off + 2 && src[off + 1] == '-')
 		    // just a minus sign, don't skip over it
 		    s--;
 		*usedlen = (int)(s - src); // length of what we expand
 
-		if (src[1] == '<' && i != 0)
+		if (src[off + 1] == '<' && i != 0)
 		{
-		    if (*usedlen < 2)
+		    if (*usedlen < off + 2)
 		    {
 			// Should we give an error message for #<text?
-			*usedlen = 1;
+			*usedlen = off + 1;
 			return NULL;
 		    }
 #ifdef FEAT_EVAL
@@ -8596,8 +8726,8 @@
 		}
 		else
 		{
-		    if (i == 0 && src[1] == '<' && *usedlen > 1)
-			*usedlen = 1;
+		    if (i == 0 && src[off + 1] == '<' && *usedlen > off + 1)
+			*usedlen = off + 1;
 		    buf = buflist_findnr(i);
 		    if (buf == NULL)
 		    {
diff -Nru vim-8.2.1913/src/ex_eval.c vim-8.2.2434/src/ex_eval.c
--- vim-8.2.1913/src/ex_eval.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/ex_eval.c	2021-01-30 22:05:11.000000000 +0000
@@ -606,6 +606,8 @@
 {
     char_u		*saved_IObuff;
 
+    if (current_exception == excp)
+	current_exception = NULL;
     if (excp == NULL)
     {
 	internal_error("discard_exception()");
@@ -654,10 +656,7 @@
 discard_current_exception(void)
 {
     if (current_exception != NULL)
-    {
 	discard_exception(current_exception, FALSE);
-	current_exception = NULL;
-    }
     did_throw = FALSE;
     need_rethrow = FALSE;
 }
@@ -921,6 +920,13 @@
 	cstack->cs_block_id[cstack->cs_idx] = ++si->sn_last_block_id;
 	si->sn_current_block_id = si->sn_last_block_id;
     }
+    else
+    {
+	// Just in case in_vim9script() does not return the same value when the
+	// block ends.
+	cstack->cs_script_var_len[cstack->cs_idx] = 0;
+	cstack->cs_block_id[cstack->cs_idx] = 0;
+    }
 }
 
     static void
@@ -1696,7 +1702,7 @@
 		    *end = NUL;
 		}
 		save_cpo  = p_cpo;
-		p_cpo = (char_u *)"";
+		p_cpo = empty_option;
 		// Disable error messages, it will make current_exception
 		// invalid.
 		++emsg_off;
@@ -2284,8 +2290,8 @@
 				// Cancel the pending exception.  This is in the
 				// finally clause, so that the stack of the
 				// caught exceptions is not involved.
-				discard_exception((except_T *)
-					cstack->cs_exception[idx],
+				discard_exception(
+					(except_T *)cstack->cs_exception[idx],
 					FALSE);
 			    }
 			    else
diff -Nru vim-8.2.1913/src/ex_getln.c vim-8.2.2434/src/ex_getln.c
--- vim-8.2.1913/src/ex_getln.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/ex_getln.c	2021-01-30 22:05:11.000000000 +0000
@@ -52,6 +52,9 @@
 static int	cmdline_paste(int regname, int literally, int remcr);
 static void	redrawcmdprompt(void);
 static int	ccheck_abbr(int);
+#ifdef FEAT_SEARCH_EXTRA
+static int	empty_pattern_magic(char_u *pat, size_t len, magic_T magic_val);
+#endif
 
 #ifdef FEAT_CMDWIN
 static int	open_cmdwin(void);
@@ -89,15 +92,34 @@
  * as a trailing \|, which can happen while typing a pattern.
  */
     static int
-empty_pattern(char_u *p)
+empty_pattern(char_u *p, int delim)
 {
-    size_t n = STRLEN(p);
+    size_t	n = STRLEN(p);
+    magic_T	magic_val = MAGIC_ON;
+
+    if (n > 0)
+	(void) skip_regexp_ex(p, delim, magic_isset(), NULL, NULL, &magic_val);
+    else
+	return TRUE;
+
+    return empty_pattern_magic(p, n, magic_val);
+}
 
+    static int
+empty_pattern_magic(char_u *p, size_t len, magic_T magic_val)
+{
     // remove trailing \v and the like
-    while (n >= 2 && p[n - 2] == '\\'
-			  && vim_strchr((char_u *)"mMvVcCZ", p[n - 1]) != NULL)
-	n -= 2;
-    return n == 0 || (n >= 2 && p[n - 2] == '\\' && p[n - 1] == '|');
+    while (len >= 2 && p[len - 2] == '\\'
+                        && vim_strchr((char_u *)"mMvVcCZ", p[len - 1]) != NULL)
+       len -= 2;
+
+    // true, if the pattern is empty, or the pattern ends with \| and magic is
+    // set (or it ends with '|' and very magic is set)
+    return len == 0 || (len > 1
+	    && ((p[len - 2] == '\\'
+				 && p[len - 1] == '|' && magic_val == MAGIC_ON)
+		|| (p[len - 2] != '\\'
+			     && p[len - 1] == '|' && magic_val == MAGIC_ALL)));
 }
 
 // Struct to store the viewstate during 'incsearch' highlighting.
@@ -142,22 +164,24 @@
 typedef struct {
     pos_T	search_start;	// where 'incsearch' starts searching
     pos_T	save_cursor;
+    int		winid;		// window where this state is valid
     viewstate_T	init_viewstate;
     viewstate_T	old_viewstate;
     pos_T	match_start;
     pos_T	match_end;
     int		did_incsearch;
     int		incsearch_postponed;
-    int		magic_save;
+    optmagic_T	magic_overruled_save;
 } incsearch_state_T;
 
     static void
 init_incsearch_state(incsearch_state_T *is_state)
 {
+    is_state->winid = curwin->w_id;
     is_state->match_start = curwin->w_cursor;
     is_state->did_incsearch = FALSE;
     is_state->incsearch_postponed = FALSE;
-    is_state->magic_save = p_magic;
+    is_state->magic_overruled_save = magic_overruled;
     CLEAR_POS(&is_state->match_end);
     is_state->save_cursor = curwin->w_cursor;  // may be restored later
     is_state->search_start = curwin->w_cursor;
@@ -205,6 +229,7 @@
     pos_T	save_cursor;
     int		use_last_pat;
     int		retval = FALSE;
+    magic_T     magic = 0;
 
     *skiplen = 0;
     *patlen = ccline.cmdlen;
@@ -250,9 +275,9 @@
 	    || STRNCMP(cmd, "vglobal", p - cmd) == 0)
     {
 	if (*cmd == 's' && cmd[1] == 'm')
-	    p_magic = TRUE;
+	    magic_overruled = OPTION_MAGIC_ON;
 	else if (*cmd == 's' && cmd[1] == 'n')
-	    p_magic = FALSE;
+	    magic_overruled = OPTION_MAGIC_OFF;
     }
     else if (STRNCMP(cmd, "sort", MAX(p - cmd, 3)) == 0)
     {
@@ -286,7 +311,7 @@
     p = skipwhite(p);
     delim = (delim_optional && vim_isIDc(*p)) ? ' ' : *p++;
     *search_delim = delim;
-    end = skip_regexp(p, delim, p_magic);
+    end = skip_regexp_ex(p, delim, magic_isset(), NULL, NULL, &magic);
 
     use_last_pat = end == p && *end == delim;
 
@@ -300,7 +325,7 @@
 	int  empty;
 
 	*end = NUL;
-	empty = empty_pattern(p);
+	empty = empty_pattern_magic(p, STRLEN(p), magic);
 	*end = c;
 	if (empty)
 	    goto theend;
@@ -370,7 +395,7 @@
 	search_first_line = 0;
 	search_last_line = MAXLNUM;
 
-	p_magic = is_state->magic_save;
+	magic_overruled = is_state->magic_overruled_save;
 
 	validate_cursor();	// needed for TAB
 	redraw_all_later(SOME_VALID);
@@ -533,7 +558,8 @@
     {
 	next_char = ccline.cmdbuff[skiplen + patlen];
 	ccline.cmdbuff[skiplen + patlen] = NUL;
-	if (empty_pattern(ccline.cmdbuff) && !no_hlsearch)
+	if (empty_pattern(ccline.cmdbuff + skiplen, search_delim)
+							       && !no_hlsearch)
 	{
 	    redraw_all_later(SOME_VALID);
 	    set_no_hlsearch(TRUE);
@@ -711,7 +737,7 @@
 	    if (p_ic && p_scs && !pat_has_uppercase(ccline.cmdbuff + skiplen))
 		*c = MB_TOLOWER(*c);
 	    if (*c == search_delim || vim_strchr((char_u *)(
-			       p_magic ? "\\~^$.*[" : "\\^$"), *c) != NULL)
+			     magic_isset() ? "\\~^$.*[" : "\\^$"), *c) != NULL)
 	    {
 		// put a backslash before special characters
 		stuffcharReadbuff(*c);
@@ -1703,13 +1729,17 @@
 	// Trigger SafeState if nothing is pending.
 	may_trigger_safestate(xpc.xp_numfiles <= 0);
 
-	cursorcmd();		// set the cursor on the right spot
-
 	// Get a character.  Ignore K_IGNORE and K_NOP, they should not do
 	// anything, such as stop completion.
 	do
+	{
+	    cursorcmd();		// set the cursor on the right spot
 	    c = safe_vgetc();
-	while (c == K_IGNORE || c == K_NOP);
+	} while (c == K_IGNORE || c == K_NOP);
+
+	if (c == K_COMMAND
+		   && do_cmdline(NULL, getcmdkeycmd, NULL, DOCMD_NOWAIT) == OK)
+	    goto cmdline_changed;
 
 	if (KeyTyped)
 	{
@@ -2200,13 +2230,14 @@
 	case Ctrl_V:
 	case Ctrl_Q:
 		{
-		    int	 prev_mod_mask = mod_mask;
-
 		    ignore_drag_release = TRUE;
 		    putcmdline('^', TRUE);
-		    no_reduce_keys = TRUE;  //  don't merge modifyOtherKeys
-		    c = get_literal();	    // get next (two) character(s)
-		    no_reduce_keys = FALSE;
+
+		    // Get next (two) character(s).  Do not change any
+		    // modifyOtherKeys ESC sequence to a normal key for
+		    // CTRL-SHIFT-V.
+		    c = get_literal(mod_mask & MOD_MASK_SHIFT);
+
 		    do_abbr = FALSE;	    // don't do abbreviation now
 		    extra_char = NUL;
 		    // may need to remove ^ when composing char was typed
@@ -2217,13 +2248,6 @@
 			msg_putchar(' ');
 			cursorcmd();
 		    }
-
-		    if ((c == ESC || c == CSI)
-					  && !(prev_mod_mask & MOD_MASK_SHIFT))
-			// Using CTRL-V: Change any modifyOtherKeys ESC
-			// sequence to a normal key.  Don't do this for
-			// CTRL-SHIFT-V.
-			c = decodeModifyOtherKeys(c);
 		}
 
 		break;
@@ -2323,6 +2347,11 @@
 #endif
 
 cmdline_changed:
+#ifdef FEAT_SEARCH_EXTRA
+	// If the window changed incremental search state is not valid.
+	if (is_state.winid != curwin->w_id)
+	    init_incsearch_state(&is_state);
+#endif
 	// Trigger CmdlineChanged autocommands.
 	trigger_cmd_autocmd(cmdline_type, EVENT_CMDLINECHANGED);
 
@@ -4176,15 +4205,18 @@
     // Don't let quitting the More prompt make this fail.
     got_int = FALSE;
 
+    // Set "cmdwin_type" before any autocommands may mess things up.
+    cmdwin_type = get_cmdline_type();
+
     // Create the command-line buffer empty.
     if (do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, ECMD_HIDE, NULL) == FAIL)
     {
 	// Some autocommand messed it up?
 	win_close(curwin, TRUE);
 	ga_clear(&winsizes);
+	cmdwin_type = 0;
 	return Ctrl_C;
     }
-    cmdwin_type = get_cmdline_type();
 
     apply_autocmds(EVENT_BUFFILEPRE, NULL, NULL, FALSE, curbuf);
     (void)setfname(curbuf, (char_u *)"[Command Line]", NULL, TRUE);
@@ -4364,10 +4396,15 @@
 	// Avoid command-line window first character being concealed.
 	curwin->w_p_cole = 0;
 # endif
+	// First go back to the original window.
 	wp = curwin;
 	set_bufref(&bufref, curbuf);
 	win_goto(old_curwin);
-	win_close(wp, TRUE);
+
+	// win_goto() may trigger an autocommand that already closes the
+	// cmdline window.
+	if (win_valid(wp))
+	    win_close(wp, TRUE);
 
 	// win_close() may have already wiped the buffer when 'bh' is
 	// set to 'wipe'
diff -Nru vim-8.2.1913/src/feature.h vim-8.2.2434/src/feature.h
--- vim-8.2.1913/src/feature.h	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/feature.h	2021-01-30 22:05:11.000000000 +0000
@@ -937,7 +937,7 @@
  * +mouse_sgr		Unix only: Include code for for SGR-styled mouse.
  * +mouse_sysmouse	Unix only: Include code for FreeBSD and DragonFly
  *			console mouse handling.
- * +mouse_urxvt		Unix only: Include code for for urxvt mosue handling.
+ * +mouse_urxvt		Unix only: Include code for for urxvt mouse handling.
  * +mouse		Any mouse support (any of the above enabled).
  *			Always included, since either FEAT_MOUSE_XTERM or
  *			DOS_MOUSE is defined.
@@ -1089,11 +1089,11 @@
 /*
  * +ARP			Amiga only. Use arp.library, DOS 2.0 is not required.
  */
-#if !defined(NO_ARP) && !defined(__amigaos4__)
+#if defined(AMIGA) && !defined(NO_ARP) && !defined(__amigaos4__) \
+	&& !defined(__MORPHOS__) && !defined(__AROS__)
 # define FEAT_ARP
 #endif
 
-
 /*
  * +ole			Win32 OLE automation: Use Makefile.ovc.
  */
diff -Nru vim-8.2.1913/src/fileio.c vim-8.2.2434/src/fileio.c
--- vim-8.2.1913/src/fileio.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/fileio.c	2021-01-30 22:05:11.000000000 +0000
@@ -16,10 +16,13 @@
 #if defined(__TANDEM)
 # include <limits.h>		// for SSIZE_MAX
 #endif
-#if defined(UNIX) && defined(FEAT_EVAL)
+#if (defined(UNIX) || defined(VMS)) && defined(FEAT_EVAL)
 # include <pwd.h>
 # include <grp.h>
 #endif
+#if defined(VMS) && defined(HAVE_XOS_R_H)
+# include <x11/xos_r.h>
+#endif
 
 // Is there any system that doesn't have access()?
 #define USE_MCH_ACCESS
@@ -338,7 +341,7 @@
 
     if (!read_stdin && !read_buffer && !read_fifo)
     {
-#ifdef UNIX
+#if defined(UNIX) || defined(VMS)
 	/*
 	 * On Unix it is possible to read a directory, so we have to
 	 * check for it before the mch_open().
@@ -2280,6 +2283,7 @@
     else
     {
 	int fdflags = fcntl(fd, F_GETFD);
+
 	if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0)
 	    (void)fcntl(fd, F_SETFD, fdflags | FD_CLOEXEC);
     }
@@ -4208,7 +4212,7 @@
 			msg_puts_attr(mesg2, HL_ATTR(HLF_W) + MSG_HIST);
 		    msg_clr_eos();
 		    (void)msg_end();
-		    if (emsg_silent == 0)
+		    if (emsg_silent == 0 && !in_assert_fails)
 		    {
 			out_flush();
 #ifdef FEAT_GUI
@@ -4622,11 +4626,13 @@
 	    q = (char_u*)pw->pw_name;
 	if (dict_add_string(item, "user", q) == FAIL)
 	    goto theend;
+#  if !defined(VMS) || (defined(VMS) && defined(HAVE_XOS_R_H))
 	gr = getgrgid(st.st_gid);
 	if (gr == NULL)
 	    q = (char_u*)"";
 	else
 	    q = (char_u*)gr->gr_name;
+#  endif
 	if (dict_add_string(item, "group", q) == FAIL)
 	    goto theend;
     }
@@ -5167,17 +5173,24 @@
 # ifdef MSWIN
     WCHAR	wszTempFile[_MAX_PATH + 1];
     WCHAR	buf4[4];
+    WCHAR	*chartab = L"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
     char_u	*retval;
     char_u	*p;
+    long	i;
 
     wcscpy(itmp, L"");
     if (GetTempPathW(_MAX_PATH, wszTempFile) == 0)
     {
 	wszTempFile[0] = L'.';	// GetTempPathW() failed, use current dir
-	wszTempFile[1] = NUL;
+	wszTempFile[1] = L'\\';
+	wszTempFile[2] = NUL;
     }
     wcscpy(buf4, L"VIM");
-    buf4[2] = extra_char;   // make it "VIa", "VIb", etc.
+
+    // randomize the name to avoid collisions
+    i = mch_get_pid() + extra_char;
+    buf4[1] = chartab[i % 36];
+    buf4[2] = chartab[101 * i % 36];
     if (GetTempFileNameW(wszTempFile, buf4, 0, itmp) == 0)
 	return NULL;
     if (!keep)
diff -Nru vim-8.2.1913/src/filepath.c vim-8.2.2434/src/filepath.c
--- vim-8.2.1913/src/filepath.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/filepath.c	2021-01-30 22:05:11.000000000 +0000
@@ -861,10 +861,11 @@
     void
 f_executable(typval_T *argvars, typval_T *rettv)
 {
-    char_u *name = tv_get_string(&argvars[0]);
+    if (in_vim9script() && check_for_string(&argvars[0]) == FAIL)
+	return;
 
     // Check in $PATH and also check directly if there is a directory name.
-    rettv->vval.v_number = mch_can_exe(name, NULL, TRUE);
+    rettv->vval.v_number = mch_can_exe(tv_get_string(&argvars[0]), NULL, TRUE);
 }
 
 /*
@@ -875,6 +876,8 @@
 {
     char_u *p = NULL;
 
+    if (in_vim9script() && check_for_nonempty_string(&argvars[0]) == FAIL)
+	return;
     (void)mch_can_exe(tv_get_string(&argvars[0]), &p, TRUE);
     rettv->v_type = VAR_STRING;
     rettv->vval.v_string = p;
@@ -890,6 +893,8 @@
     char_u	*p;
     int		n;
 
+    if (in_vim9script() && check_for_string(&argvars[0]) == FAIL)
+	return;
 #ifndef O_NONBLOCK
 # define O_NONBLOCK 0
 #endif
@@ -913,6 +918,8 @@
     void
 f_filewritable(typval_T *argvars, typval_T *rettv)
 {
+    if (in_vim9script() && check_for_string(&argvars[0]) == FAIL)
+	return;
     rettv->vval.v_number = filewritable(tv_get_string(&argvars[0]));
 }
 
@@ -935,6 +942,8 @@
 
     rettv->vval.v_string = NULL;
     rettv->v_type = VAR_STRING;
+    if (in_vim9script() && check_for_nonempty_string(&argvars[0]) == FAIL)
+	return;
 
 #ifdef FEAT_SEARCHPATH
     fname = tv_get_string(&argvars[0]);
@@ -1010,18 +1019,22 @@
     char_u	*fname;
     char_u	*mods;
     int		usedlen = 0;
-    int		len;
+    int		len = 0;
     char_u	*fbuf = NULL;
     char_u	buf[NUMBUFLEN];
 
+    if (in_vim9script() && (check_for_string(&argvars[0]) == FAIL
+	    || check_for_string(&argvars[1]) == FAIL))
+	return;
     fname = tv_get_string_chk(&argvars[0]);
     mods = tv_get_string_buf_chk(&argvars[1], buf);
-    if (fname == NULL || mods == NULL)
+    if (mods == NULL || fname == NULL)
 	fname = NULL;
     else
     {
 	len = (int)STRLEN(fname);
-	(void)modify_fname(mods, FALSE, &usedlen, &fname, &fbuf, &len);
+	if (mods != NULL && *mods != NUL)
+	    (void)modify_fname(mods, FALSE, &usedlen, &fname, &fbuf, &len);
     }
 
     rettv->v_type = VAR_STRING;
@@ -1122,6 +1135,8 @@
     char_u	*perm = NULL;
     char_u	permbuf[] = "---------";
 
+    if (in_vim9script() && check_for_string(&argvars[0]) == FAIL)
+	return;
     fname = tv_get_string(&argvars[0]);
 
     rettv->v_type = VAR_STRING;
@@ -1139,10 +1154,10 @@
     char_u	*fname;
     stat_T	st;
 
-    fname = tv_get_string(&argvars[0]);
-
-    rettv->v_type = VAR_NUMBER;
+    if (in_vim9script() && check_for_string(&argvars[0]) == FAIL)
+	return;
 
+    fname = tv_get_string(&argvars[0]);
     if (mch_stat((char *)fname, &st) >= 0)
     {
 	if (mch_isdir(fname))
@@ -1169,8 +1184,9 @@
     char_u	*fname;
     stat_T	st;
 
+    if (in_vim9script() && check_for_string(&argvars[0]) == FAIL)
+	return;
     fname = tv_get_string(&argvars[0]);
-
     if (mch_stat((char *)fname, &st) >= 0)
 	rettv->vval.v_number = (varnumber_T)st.st_mtime;
     else
@@ -1214,6 +1230,8 @@
     stat_T	st;
     char_u	*type = NULL;
 
+    if (in_vim9script() && check_for_string(&argvars[0]) == FAIL)
+	return;
     fname = tv_get_string(&argvars[0]);
 
     rettv->v_type = VAR_STRING;
@@ -1622,11 +1640,11 @@
 /*
  * "readfile()" function
  */
-    void
-f_readfile(typval_T *argvars, typval_T *rettv)
+    static void
+read_file_or_blob(typval_T *argvars, typval_T *rettv, int always_blob)
 {
     int		binary = FALSE;
-    int		blob = FALSE;
+    int		blob = always_blob;
     int		failed = FALSE;
     char_u	*fname;
     FILE	*fd;
@@ -1778,7 +1796,8 @@
 
 			if (dest < buf)
 			{
-			    adjust_prevlen = (int)(buf - dest); // must be 1 or 2
+			    // must be 1 or 2
+			    adjust_prevlen = (int)(buf - dest);
 			    dest = buf;
 			}
 			if (readlen > p - buf + 1)
@@ -1849,6 +1868,24 @@
 }
 
 /*
+ * "readblob()" function
+ */
+    void
+f_readblob(typval_T *argvars, typval_T *rettv)
+{
+    read_file_or_blob(argvars, rettv, TRUE);
+}
+
+/*
+ * "readfile()" function
+ */
+    void
+f_readfile(typval_T *argvars, typval_T *rettv)
+{
+    read_file_or_blob(argvars, rettv, FALSE);
+}
+
+/*
  * "resolve()" function
  */
     void
diff -Nru vim-8.2.1913/src/fold.c vim-8.2.2434/src/fold.c
--- vim-8.2.1913/src/fold.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/fold.c	2021-01-30 22:05:11.000000000 +0000
@@ -640,7 +640,10 @@
 		break;
 	    }
 	}
-	i = (int)(fp - (fold_T *)gap->ga_data);
+	if (gap->ga_len == 0)
+	    i = 0;
+	else
+	    i = (int)(fp - (fold_T *)gap->ga_data);
     }
 
     if (ga_grow(gap, 1) == OK)
@@ -902,6 +905,8 @@
 	// that moves the cursor is used.
 	lnum_off = 0;
 	gap = &curwin->w_folds;
+	if (gap->ga_len == 0)
+	    break;
 	use_level = FALSE;
 	maybe_small = FALSE;
 	lnum_found = curwin->w_cursor.lnum;
@@ -911,7 +916,7 @@
 	{
 	    if (!foldFind(gap, curwin->w_cursor.lnum - lnum_off, &fp))
 	    {
-		if (!updown)
+		if (!updown || gap->ga_len == 0)
 		    break;
 
 		// When moving up, consider a fold above the cursor; when
diff -Nru vim-8.2.1913/src/getchar.c vim-8.2.2434/src/getchar.c
--- vim-8.2.1913/src/getchar.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/getchar.c	2021-01-30 22:05:11.000000000 +0000
@@ -2155,7 +2155,8 @@
 
     // Do not handle messages while redrawing, because it may cause buffers to
     // change or be wiped while they are being redrawn.
-    if (updating_screen)
+    // Also bail out when parsing messages was explicitly disabled.
+    if (updating_screen || dont_parse_messages)
 	return;
 
     // If memory allocation fails during startup we'll exit but curbuf or
@@ -2263,7 +2264,7 @@
 }
 
 /*
- * Check if typebuf.tb_buf[] contains a modifer plus key that can be changed
+ * Check if typebuf.tb_buf[] contains a modifier plus key that can be changed
  * into just a key, apply that.
  * Check from typebuf.tb_buf[typebuf.tb_off] to typebuf.tb_buf[typebuf.tb_off
  * + "max_offset"].
@@ -2579,11 +2580,10 @@
 						    typebuf.tb_off] == RM_YES))
 		&& !*timedout)
 	{
-	    keylen = check_termcode(max_mlen + 1,
-					       NULL, 0, NULL);
+	    keylen = check_termcode(max_mlen + 1, NULL, 0, NULL);
 
-	    // If no termcode matched but 'pastetoggle' matched partially it's
-	    // like an incomplete key sequence.
+	    // If no termcode matched but 'pastetoggle' matched partially
+	    // it's like an incomplete key sequence.
 	    if (keylen == 0 && save_keylen == KEYLEN_PART_KEY)
 		keylen = KEYLEN_PART_KEY;
 
@@ -3618,3 +3618,104 @@
 	    );
 }
 #endif
+
+/*
+ * Function passed to do_cmdline() to get the command after a <Cmd> key from
+ * typeahead.
+ */
+    char_u *
+getcmdkeycmd(
+	int		promptc UNUSED,
+	void		*cookie UNUSED,
+	int		indent UNUSED,
+	getline_opt_T	do_concat UNUSED)
+{
+    garray_T	line_ga;
+    int		c1 = -1;
+    int		c2;
+    int		cmod = 0;
+    int		aborted = FALSE;
+
+    ga_init2(&line_ga, 1, 32);
+
+    // no mapping for these characters
+    no_mapping++;
+
+    got_int = FALSE;
+    while (c1 != NUL && !aborted)
+    {
+	if (ga_grow(&line_ga, 32) != OK)
+	{
+	    aborted = TRUE;
+	    break;
+	}
+
+	if (vgetorpeek(FALSE) == NUL)
+	{
+	    // incomplete <Cmd> is an error, because there is not much the user
+	    // could do in this state.
+	    emsg(_(e_cmd_mapping_must_end_with_cr));
+	    aborted = TRUE;
+	    break;
+	}
+
+	// Get one character at a time.
+	c1 = vgetorpeek(TRUE);
+
+	// Get two extra bytes for special keys
+	if (c1 == K_SPECIAL)
+	{
+	    c1 = vgetorpeek(TRUE);
+	    c2 = vgetorpeek(TRUE);
+	    if (c1 == KS_MODIFIER)
+	    {
+		cmod = c2;
+		continue;
+	    }
+	    c1 = TO_SPECIAL(c1, c2);
+	}
+	if (c1 == Ctrl_V)
+	{
+	    // CTRL-V is followed by octal, hex or other characters, reverses
+	    // what AppendToRedobuffLit() does.
+	    no_reduce_keys = TRUE;  //  don't merge modifyOtherKeys
+	    c1 = get_literal(TRUE);
+	    no_reduce_keys = FALSE;
+	}
+
+	if (got_int)
+	    aborted = TRUE;
+	else if (c1 == '\r' || c1 == '\n')
+	    c1 = NUL;  // end the line
+	else if (c1 == ESC)
+	    aborted = TRUE;
+	else if (c1 == K_COMMAND)
+	{
+	    // give a nicer error message for this special case
+	    emsg(_(e_cmd_mapping_must_end_with_cr_before_second_cmd));
+	    aborted = TRUE;
+	}
+	else if (IS_SPECIAL(c1))
+	{
+	    if (c1 == K_SNR)
+		ga_concat(&line_ga, (char_u *)"<SNR>");
+	    else
+	    {
+		semsg(e_cmd_maping_must_not_include_str_key,
+					       get_special_key_name(c1, cmod));
+		aborted = TRUE;
+	    }
+	}
+	else
+	    ga_append(&line_ga, (char)c1);
+
+	cmod = 0;
+    }
+
+    no_mapping--;
+
+    if (aborted)
+	ga_clear(&line_ga);
+
+    return (char_u *)line_ga.ga_data;
+}
diff -Nru vim-8.2.1913/src/globals.h vim-8.2.2434/src/globals.h
--- vim-8.2.1913/src/globals.h	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/globals.h	2021-01-30 22:05:11.000000000 +0000
@@ -221,7 +221,6 @@
 EXTERN int	emsg_severe INIT(= FALSE);  // use message of next of several
 					    // emsg() calls for throw
 // used by assert_fails()
-EXTERN int	emsg_assert_fails_used INIT(= FALSE);
 EXTERN char_u	*emsg_assert_fails_msg INIT(= NULL);
 EXTERN long	emsg_assert_fails_lnum INIT(= 0);
 EXTERN char_u	*emsg_assert_fails_context INIT(= NULL);
@@ -231,6 +230,10 @@
 EXTERN int	did_emsg;		    // set by emsg() when the message
 					    // is displayed or thrown
 #ifdef FEAT_EVAL
+EXTERN int	did_emsg_def;		    // set by emsg() when emsg_silent
+					    // is set before calling a function
+EXTERN int	did_emsg_cumul;		    // cumulative did_emsg, increased
+					    // when did_emsg is reset.
 EXTERN int	called_vim_beep;	    // set if vim_beep() is called
 EXTERN int	did_uncaught_emsg;	    // emsg() was called and did not
 					    // cause an exception
@@ -287,6 +290,14 @@
 // line number in the message source or zero
 #define SOURCING_LNUM (((estack_T *)exestack.ga_data)[exestack.ga_len - 1].es_lnum)
 
+// Script CTX being sourced or was sourced to define the current function.
+EXTERN sctx_T	current_sctx
+#ifdef FEAT_EVAL
+    INIT4(0, 0, 0, 0);
+#else
+    INIT(= {0});
+#endif
+
 #ifdef FEAT_EVAL
 // whether inside compile_def_function()
 EXTERN int	estack_compiling INIT(= FALSE);
@@ -389,9 +400,6 @@
 EXTERN int	want_garbage_collect INIT(= FALSE);
 EXTERN int	garbage_collect_at_exit INIT(= FALSE);
 
-// Script CTX being sourced or was sourced to define the current function.
-EXTERN sctx_T	current_sctx INIT4(0, 0, 0, 0);
-
 
 // Commonly used types.
 EXTERN type_T t_unknown INIT6(VAR_UNKNOWN, 0, 0, TTFLAG_STATIC, NULL, NULL);
@@ -400,6 +408,7 @@
 EXTERN type_T t_bool INIT6(VAR_BOOL, 0, 0, TTFLAG_STATIC, NULL, NULL);
 EXTERN type_T t_special INIT6(VAR_SPECIAL, 0, 0, TTFLAG_STATIC, NULL, NULL);
 EXTERN type_T t_number INIT6(VAR_NUMBER, 0, 0, TTFLAG_STATIC, NULL, NULL);
+EXTERN type_T t_number_bool INIT6(VAR_NUMBER, 0, 0, TTFLAG_STATIC|TTFLAG_BOOL_OK, NULL, NULL);
 EXTERN type_T t_float INIT6(VAR_FLOAT, 0, 0, TTFLAG_STATIC, NULL, NULL);
 EXTERN type_T t_string INIT6(VAR_STRING, 0, 0, TTFLAG_STATIC, NULL, NULL);
 EXTERN type_T t_blob INIT6(VAR_BLOB, 0, 0, TTFLAG_STATIC, NULL, NULL);
@@ -424,6 +433,7 @@
 EXTERN type_T t_list_bool INIT6(VAR_LIST, 0, 0, TTFLAG_STATIC, &t_bool, NULL);
 EXTERN type_T t_list_number INIT6(VAR_LIST, 0, 0, TTFLAG_STATIC, &t_number, NULL);
 EXTERN type_T t_list_string INIT6(VAR_LIST, 0, 0, TTFLAG_STATIC, &t_string, NULL);
+EXTERN type_T t_list_job INIT6(VAR_LIST, 0, 0, TTFLAG_STATIC, &t_job, NULL);
 EXTERN type_T t_list_dict_any INIT6(VAR_LIST, 0, 0, TTFLAG_STATIC, &t_dict_any, NULL);
 
 EXTERN type_T t_dict_bool INIT6(VAR_DICT, 0, 0, TTFLAG_STATIC, &t_bool, NULL);
@@ -582,6 +592,12 @@
 // ('lines' and 'rows') must not be changed.
 EXTERN int	updating_screen INIT(= FALSE);
 
+#ifdef MESSAGE_QUEUE
+// While closing windows or buffers messages should not be handled to avoid
+// using invalid windows or buffers.
+EXTERN int	dont_parse_messages INIT(= FALSE);
+#endif
+
 #ifdef FEAT_MENU
 // The root of the menu hierarchy.
 EXTERN vimmenu_T	*root_menu INIT(= NULL);
@@ -1127,9 +1143,15 @@
 
 EXTERN int	msg_silent INIT(= 0);	// don't print messages
 EXTERN int	emsg_silent INIT(= 0);	// don't print error messages
+#ifdef FEAT_EVAL
+EXTERN int	emsg_silent_def INIT(= 0);  // value of emsg_silent when a :def
+					    // function is called
+#endif
 EXTERN int	emsg_noredir INIT(= 0);	// don't redirect error messages
 EXTERN int	cmd_silent INIT(= FALSE); // don't echo the command line
 
+EXTERN int	in_assert_fails INIT(= FALSE);	// assert_fails() active
+
 EXTERN int	swap_exists_action INIT(= SEA_NONE);
 					// For dialog when swap file already
 					// exists.
@@ -1698,7 +1720,7 @@
 EXTERN char e_toomanyarg[]	INIT(= N_("E118: Too many arguments for function: %s"));
 EXTERN char e_toofewarg[]	INIT(= N_("E119: Not enough arguments for function: %s"));
 EXTERN char e_func_deleted[]	INIT(= N_("E933: Function was deleted: %s"));
-EXTERN char e_dictkey[]		INIT(= N_("E716: Key not present in Dictionary: %s"));
+EXTERN char e_dictkey[]		INIT(= N_("E716: Key not present in Dictionary: \"%s\""));
 EXTERN char e_listreq[]		INIT(= N_("E714: List required"));
 EXTERN char e_listblobreq[]	INIT(= N_("E897: List or Blob required"));
 EXTERN char e_list_end[]	INIT(= N_("E697: Missing end of List ']': %s"));
@@ -1923,3 +1945,7 @@
 
 #define FOR_ALL_LIST_ITEMS(l, li) \
     for ((li) = (l)->lv_first; (li) != NULL; (li) = (li)->li_next)
+
+// While executing a regexp and set to OPTION_MAGIC_ON or OPTION_MAGIC_OFF this
+// overrules p_magic.  Otherwise set to OPTION_MAGIC_NOT_SET.
+EXTERN optmagic_T magic_overruled INIT(= OPTION_MAGIC_NOT_SET);
diff -Nru vim-8.2.1913/src/gui_at_fs.c vim-8.2.2434/src/gui_at_fs.c
--- vim-8.2.1913/src/gui_at_fs.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/gui_at_fs.c	2021-01-30 22:05:11.000000000 +0000
@@ -179,9 +179,9 @@
 static void SFdrawList(int n, int doScroll);
 static void SFclearList(int n, int doScroll);
 static char SFstatChar(stat_T *statBuf);
-static void SFmotionList(Widget w, int n, XMotionEvent *event);
+static void SFmotionList(Widget w, XtPointer np, XMotionEvent *event, Boolean *cont);
 static void SFvSliderMovedCallback(Widget w, int n, int nw);
-static Boolean SFworkProc(void);
+static Boolean SFworkProc(void *);
 static int SFcompareEntries(const void *p, const void *q);
 
 ////////////////// xstat.h
@@ -798,19 +798,22 @@
 
     static void
 SFbuttonPressList(
-    Widget		w UNUSED,
-    int			n UNUSED,
-    XButtonPressedEvent	*event UNUSED)
+    Widget	w UNUSED,
+    XtPointer	np UNUSED,
+    XEvent	*event UNUSED,
+    Boolean	*cont UNUSED)
 {
     SFbuttonPressed = 1;
 }
 
     static void
 SFbuttonReleaseList(
-    Widget		 w,
-    int			 n,
-    XButtonReleasedEvent *event)
+    Widget	w UNUSED,
+    XtPointer	np,
+    XEvent	*event UNUSED,
+    Boolean	*cont UNUSED)
 {
+    long	n = (long)np;
     SFDir	*dir;
 
     SFbuttonPressed = 0;
@@ -823,7 +826,7 @@
 	dir = &(SFdirs[SFdirPtr + n]);
 	SFreplaceText(dir,
 		       dir->entries[dir->vOrigin + SFcurrentInvert[n]].shown);
-	SFmotionList(w, n, (XMotionEvent *) event);
+	SFmotionList(w, (XtPointer)(long)n, (XMotionEvent *)event, 0);
     }
 }
 
@@ -1600,9 +1603,14 @@
 }
 
     static void
-SFenterList(Widget w UNUSED, int n, XEnterWindowEvent *event)
+SFenterList(
+    Widget	w UNUSED,
+    XtPointer	np,
+    XEvent	*event,
+    Boolean	*cont UNUSED)
 {
-    int			nw;
+    long	n = (long)np;
+    int		nw;
 
     // sanity
     if (SFcurrentInvert[n] != -1)
@@ -1620,8 +1628,14 @@
 }
 
     static void
-SFleaveList(Widget w UNUSED, int n, XEvent *event UNUSED)
+SFleaveList(
+    Widget	w UNUSED,
+    XtPointer	np,
+    XEvent	*event UNUSED,
+    Boolean	*cont UNUSED)
 {
+    long	n = (long)np;
+
     if (SFcurrentInvert[n] != -1)
     {
 	SFinvertEntry(n);
@@ -1630,8 +1644,13 @@
 }
 
     static void
-SFmotionList(Widget w UNUSED, int n, XMotionEvent *event)
+SFmotionList(
+    Widget	    w UNUSED,
+    XtPointer	    np,
+    XMotionEvent    *event UNUSED,
+    Boolean	    *cont UNUSED)
 {
+    long	n = (long)np;
     int		nw;
 
     nw = SFnewInvertEntry(n, event);
@@ -1954,7 +1973,7 @@
 }
 
     static Boolean
-SFworkProc(void)
+SFworkProc(void *arg UNUSED)
 {
     SFDir	*dir;
     SFEntry	*entry;
diff -Nru vim-8.2.1913/src/gui.c vim-8.2.2434/src/gui.c
--- vim-8.2.1913/src/gui.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/gui.c	2021-01-30 22:05:11.000000000 +0000
@@ -2412,21 +2412,13 @@
 
     if (highlight_mask & (HL_INVERSE | HL_STANDOUT))
     {
-#if defined(AMIGA)
-	gui_mch_set_colors(bg_color, fg_color);
-#else
 	gui_mch_set_fg_color(bg_color);
 	gui_mch_set_bg_color(fg_color);
-#endif
     }
     else
     {
-#if defined(AMIGA)
-	gui_mch_set_colors(fg_color, bg_color);
-#else
 	gui_mch_set_fg_color(fg_color);
 	gui_mch_set_bg_color(bg_color);
-#endif
     }
     gui_mch_set_sp_color(sp_color);
 
diff -Nru vim-8.2.1913/src/gui_dwrite.cpp vim-8.2.2434/src/gui_dwrite.cpp
--- vim-8.2.1913/src/gui_dwrite.cpp	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/gui_dwrite.cpp	2021-01-30 22:05:11.000000000 +0000
@@ -239,7 +239,8 @@
 	if (mItems[n].pTextFormat != item.pTextFormat)
 	{
 	    SafeRelease(&mItems[n].pTextFormat);
-	    item.pTextFormat->AddRef();
+	    if (item.pTextFormat != NULL)
+		item.pTextFormat->AddRef();
 	}
 	mItems[n] = item;
 	slide(n);
diff -Nru vim-8.2.1913/src/gui_gtk_vms.h vim-8.2.2434/src/gui_gtk_vms.h
--- vim-8.2.1913/src/gui_gtk_vms.h	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/gui_gtk_vms.h	2021-01-30 22:05:11.000000000 +0000
@@ -435,6 +435,7 @@
 #define XmRemoveProtocolCallback XMREMOVEPROTOCOLCALLBACK
 #define XmRepTypeGetId XMREPTYPEGETID
 #define XmRepTypeGetRecord XMREPTYPEGETRECORD
+#define XmRepTypeInstallTearOffModelCon XMREPTYPEINSTALLTEAROFFMODELCON
 #define XmRepTypeRegister XMREPTYPEREGISTER
 #define XmRepTypeValidValue XMREPTYPEVALIDVALUE
 #define XmScrollBarSetValues XMSCROLLBARSETVALUES
@@ -722,17 +723,6 @@
 // R5 or earlier
 #define _XtRegisterWindow _XTREGISTERWINDOW
 #define _XtUnregisterWindow _XTUNREGISTERWINDOW
-// original code is fixed so we don't need this now
-#if 0
-#define XtRegisterDrawable(display,drawable,widget) \
-{  extern void _XtRegisterWindow(Window,Widget); \
-   _XtRegisterWindow(drawable,widget); \
-}
-#define XtUnregisterDrawable(display,drawable) \
-{  extern void _XtUnregisterWindow(Window,Widget); \
-   _XtUnregisterWindow(drawable,XtWindowToWidget(display,drawable)); \
-}
-#endif
 #else
 // R6 or later
 #define XtRegisterDrawable XTREGISTERDRAWABLE
diff -Nru vim-8.2.1913/src/gui_gtk_x11.c vim-8.2.2434/src/gui_gtk_x11.c
--- vim-8.2.1913/src/gui_gtk_x11.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/gui_gtk_x11.c	2021-01-30 22:05:11.000000000 +0000
@@ -3816,11 +3816,11 @@
 #if !GTK_CHECK_VERSION(3,0,0)
     gtk_widget_set_events(gui.formwin, GDK_EXPOSURE_MASK);
 #endif
-
-    gui.drawarea = gtk_drawing_area_new();
 #if GTK_CHECK_VERSION(3,22,2)
-    gtk_widget_set_name(gui.drawarea, "vim-gui-drawarea");
+    gtk_widget_set_name(gui.formwin, "vim-gtk-form");
 #endif
+
+    gui.drawarea = gtk_drawing_area_new();
 #if GTK_CHECK_VERSION(3,0,0)
     gui.surface = NULL;
     gui.by_signal = FALSE;
@@ -4031,18 +4031,21 @@
     void
 gui_mch_new_colors(void)
 {
-    if (gui.drawarea != NULL && gtk_widget_get_window(gui.drawarea) != NULL)
+    if (gui.drawarea != NULL
+#if GTK_CHECK_VERSION(3,22,2)
+	    && gui.formwin != NULL
+#endif
+	    && gtk_widget_get_window(gui.drawarea) != NULL)
     {
 #if !GTK_CHECK_VERSION(3,22,2)
 	GdkWindow * const da_win = gtk_widget_get_window(gui.drawarea);
 #endif
-
 #if GTK_CHECK_VERSION(3,22,2)
-	GtkStyleContext * const context
-	    = gtk_widget_get_style_context(gui.drawarea);
+	GtkStyleContext * const context =
+				     gtk_widget_get_style_context(gui.formwin);
 	GtkCssProvider * const provider = gtk_css_provider_new();
 	gchar * const css = g_strdup_printf(
-		"widget#vim-gui-drawarea {\n"
+		"widget#vim-gtk-form {\n"
 		"  background-color: #%.2lx%.2lx%.2lx;\n"
 		"}\n",
 		 (gui.back_pixel >> 16) & 0xff,
diff -Nru vim-8.2.1913/src/gui.h vim-8.2.2434/src/gui.h
--- vim-8.2.1913/src/gui.h	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/gui.h	2021-01-30 22:05:11.000000000 +0000
@@ -24,7 +24,8 @@
 #  ifdef MIN
 #   undef MIN
 #  endif
-# endif
+#  include "gui_gtk_vms.h"
+# endif // VMS
 # include <X11/Intrinsic.h>
 # include <gtk/gtk.h>
 #endif
diff -Nru vim-8.2.1913/src/gui_haiku.cc vim-8.2.2434/src/gui_haiku.cc
--- vim-8.2.1913/src/gui_haiku.cc	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/gui_haiku.cc	2021-01-30 22:05:11.000000000 +0000
@@ -3411,7 +3411,7 @@
 	thread_id tid = gui.vimWindow->Thread();
 	gui.vimWindow->Lock();
 	gui.vimWindow->Quit();
-	// Wait until it is truely gone
+	// Wait until it is truly gone
 	int32 exitcode;
 	wait_for_thread(tid, &exitcode);
     }
diff -Nru vim-8.2.1913/src/gui_motif.c vim-8.2.2434/src/gui_motif.c
--- vim-8.2.1913/src/gui_motif.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/gui_motif.c	2021-01-30 22:05:11.000000000 +0000
@@ -1242,7 +1242,6 @@
     }
     else
     {
-	// Test_colorscheme()
 	if (menu->xpm_fname != NULL)
 	{
 	    XtSetArg(args[n], XmNpixmapFile, menu->xpm_fname); n++;
@@ -3526,7 +3525,7 @@
 	char_u	*save_cpo = p_cpo;
 
 	// No need to be Vi compatible here.
-	p_cpo = (char_u *)"";
+	p_cpo = empty_option;
 	u_undo(1);
 	p_cpo = save_cpo;
 	gui_update_screen();
diff -Nru vim-8.2.1913/src/gui_w32.c vim-8.2.2434/src/gui_w32.c
--- vim-8.2.1913/src/gui_w32.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/gui_w32.c	2021-01-30 22:05:11.000000000 +0000
@@ -2134,7 +2134,10 @@
 		break;
 	    }
 	    else if (input_available()
-		    || MsgWaitForMultipleObjects(0, NULL, FALSE, 100,
+		    // TODO: The 10 msec is a compromise between laggy response
+		    // and consuming more CPU time.  Better would be to handle
+		    // channel messages when they arrive.
+		    || MsgWaitForMultipleObjects(0, NULL, FALSE, 10,
 						  QS_ALLINPUT) != WAIT_TIMEOUT)
 		break;
 	}
@@ -2986,6 +2989,42 @@
 }
 
 /*
+ * Check if the specified point is on-screen. (multi-monitor aware)
+ */
+    static BOOL
+is_point_onscreen(int x, int y)
+{
+    POINT   pt = {x, y};
+
+    return MonitorFromPoint(pt, MONITOR_DEFAULTTONULL) != NULL;
+}
+
+/*
+ * Check if the whole area of the specified window is on-screen.
+ *
+ * Note about DirectX: Windows 10 1809 or above no longer maintains image of
+ * the window portion that is off-screen.  Scrolling by DWriteContext_Scroll()
+ * only works when the whole window is on-screen.
+ */
+    static BOOL
+is_window_onscreen(HWND hwnd)
+{
+    RECT    rc;
+
+    GetWindowRect(hwnd, &rc);
+
+    if (!is_point_onscreen(rc.left, rc.top))
+	return FALSE;
+    if (!is_point_onscreen(rc.left, rc.bottom))
+	return FALSE;
+    if (!is_point_onscreen(rc.right, rc.top))
+	return FALSE;
+    if (!is_point_onscreen(rc.right, rc.bottom))
+	return FALSE;
+    return TRUE;
+}
+
+/*
  * Return flags used for scrolling.
  * The SW_INVALIDATE is required when part of the window is covered or
  * off-screen. Refer to MS KB Q75236.
@@ -2996,15 +3035,12 @@
     HWND	hwnd;
     RECT	rcVim, rcOther, rcDest;
 
-    GetWindowRect(s_hwnd, &rcVim);
-
-    // Check if the window is partly above or below the screen.  We don't care
-    // about partly left or right of the screen, it is not relevant when
-    // scrolling up or down.
-    if (rcVim.top < 0 || rcVim.bottom > GetSystemMetrics(SM_CYFULLSCREEN))
+    // Check if the window is (partly) off-screen.
+    if (!is_window_onscreen(s_hwnd))
 	return SW_INVALIDATE;
 
     // Check if there is an window (partly) on top of us.
+    GetWindowRect(s_hwnd, &rcVim);
     for (hwnd = s_hwnd; (hwnd = GetWindow(hwnd, GW_HWNDPREV)) != (HWND)0; )
 	if (IsWindowVisible(hwnd))
 	{
@@ -3046,14 +3082,17 @@
     rc.bottom = FILL_Y(gui.scroll_region_bot + 1);
 
 #if defined(FEAT_DIRECTX)
-    if (IS_ENABLE_DIRECTX())
+    if (IS_ENABLE_DIRECTX() && is_window_onscreen(s_hwnd))
     {
 	DWriteContext_Scroll(s_dwc, 0, -num_lines * gui.char_height, &rc);
-	DWriteContext_Flush(s_dwc);
     }
     else
 #endif
     {
+#if defined(FEAT_DIRECTX)
+	if (IS_ENABLE_DIRECTX())
+	    DWriteContext_Flush(s_dwc);
+#endif
 	intel_gpu_workaround();
 	ScrollWindowEx(s_textArea, 0, -num_lines * gui.char_height,
 				    &rc, &rc, NULL, NULL, get_scroll_flags());
@@ -3088,14 +3127,17 @@
     rc.bottom = FILL_Y(gui.scroll_region_bot + 1);
 
 #if defined(FEAT_DIRECTX)
-    if (IS_ENABLE_DIRECTX())
+    if (IS_ENABLE_DIRECTX() && is_window_onscreen(s_hwnd))
     {
 	DWriteContext_Scroll(s_dwc, 0, num_lines * gui.char_height, &rc);
-	DWriteContext_Flush(s_dwc);
     }
     else
 #endif
     {
+#if defined(FEAT_DIRECTX)
+	if (IS_ENABLE_DIRECTX())
+	    DWriteContext_Flush(s_dwc);
+#endif
 	intel_gpu_workaround();
 	// The SW_INVALIDATE is required when part of the window is covered or
 	// off-screen.  How do we avoid it when it's not needed?
@@ -8419,7 +8461,7 @@
     TOOLINFOW	*pti;
     int		ToolInfoSize;
 
-    if (multiline_balloon_available() == TRUE)
+    if (multiline_balloon_available())
 	ToolInfoSize = sizeof(TOOLINFOW_NEW);
     else
 	ToolInfoSize = sizeof(TOOLINFOW);
@@ -8442,7 +8484,7 @@
     pti->hinst = 0; // Don't use string resources
     pti->uId = ID_BEVAL_TOOLTIP;
 
-    if (multiline_balloon_available() == TRUE)
+    if (multiline_balloon_available())
     {
 	RECT rect;
 	TOOLINFOW_NEW *ptin = (TOOLINFOW_NEW *)pti;
diff -Nru vim-8.2.1913/src/gui_x11.c vim-8.2.2434/src/gui_x11.c
--- vim-8.2.1913/src/gui_x11.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/gui_x11.c	2021-01-30 22:05:11.000000000 +0000
@@ -95,8 +95,8 @@
  * normal font (current_fontset == NULL, use gui.text_gc and gui.back_gc).
  */
 static XFontSet current_fontset = NULL;
-
-#define XDrawString(dpy, win, gc, x, y, str, n) \
+# if !defined(XDrawString)
+#  define XDrawString(dpy, win, gc, x, y, str, n) \
 	do \
 	{ \
 	    if (current_fontset != NULL) \
@@ -104,8 +104,9 @@
 	    else \
 		XDrawString(dpy, win, gc, x, y, str, n); \
 	} while (0)
-
-#define XDrawString16(dpy, win, gc, x, y, str, n) \
+# endif
+# if !defined(XDrawString16)
+#  define XDrawString16(dpy, win, gc, x, y, str, n) \
 	do \
 	{ \
 	    if (current_fontset != NULL) \
@@ -113,8 +114,9 @@
 	    else \
 		XDrawString16(dpy, win, gc, x, y, (XChar2b *)str, n); \
 	} while (0)
-
-#define XDrawImageString16(dpy, win, gc, x, y, str, n) \
+# endif
+# if !defined(XDrawImageString16)
+#  define XDrawImageString16(dpy, win, gc, x, y, str, n) \
 	do \
 	{ \
 	    if (current_fontset != NULL) \
@@ -122,7 +124,7 @@
 	    else \
 		XDrawImageString16(dpy, win, gc, x, y, (XChar2b *)str, n); \
 	} while (0)
-
+# endif
 static int check_fontset_sanity(XFontSet fs);
 static int fontset_width(XFontSet fs);
 static int fontset_ascent(XFontSet fs);
diff -Nru vim-8.2.1913/src/gui_xmdlg.c vim-8.2.2434/src/gui_xmdlg.c
--- vim-8.2.1913/src/gui_xmdlg.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/gui_xmdlg.c	2021-01-30 22:05:11.000000000 +0000
@@ -497,7 +497,7 @@
     }
 
     /*
-     * Now loop trough the remaining lists and set them up.
+     * Now loop through the remaining lists and set them up.
      */
     for (idx = (int)NAME; idx < (int)NONE; ++idx)
     {
diff -Nru vim-8.2.1913/src/gui_xmebw.c vim-8.2.2434/src/gui_xmebw.c
--- vim-8.2.1913/src/gui_xmebw.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/gui_xmebw.c	2021-01-30 22:05:11.000000000 +0000
@@ -69,6 +69,20 @@
     _XmDrawHighlight(a, b, c, d, e, f, g, h, LineSolid)
 #endif
 
+// Older VMS systems do not have xos_r.h and cannot haldle XtProcessLocking
+#if defined(VMS)
+# if defined(HAVE_XOS_R_H)
+#  define XTPROCESS_LOCK XtProcessLock()
+#  define XTPROCESS_UNLOCK XtProcessUnlock()
+# else
+#  define XTPROCESS_LOCK
+#  define XTPROCESS_UNLOCK
+# endif
+#else
+# define XTPROCESS_LOCK XtProcessLock()
+# define XTPROCESS_UNLOCK XtProcessUnlock()
+#endif
+
 /*
  * Motif internals we have to cheat around with.
  */
@@ -714,9 +728,9 @@
     {
 	XtExposeProc expose;
 
-	XtProcessLock();
+	XTPROCESS_LOCK;
 	expose = xmLabelClassRec.core_class.expose;
-	XtProcessUnlock();
+	XTPROCESS_UNLOCK;
 	(*expose)((Widget) eb, event, region);
     }
 
@@ -809,9 +823,9 @@
 	_XmPrimitiveEnter((Widget) eb, event, NULL, NULL);
 	if (eb->pushbutton.armed == TRUE)
 	{
-	    XtProcessLock();
+	    XTPROCESS_LOCK;
 	    expose = XtClass(eb)->core_class.expose;
-	    XtProcessUnlock();
+	    XTPROCESS_UNLOCK;
 	    (*expose) (wid, event, (Region) NULL);
 	}
 
@@ -887,9 +901,9 @@
 	{
 	    XtExposeProc expose;
 	    eb->pushbutton.armed = FALSE;
-	    XtProcessLock();
+	    XTPROCESS_LOCK;
 	    expose = XtClass(eb)->core_class.expose;
-	    XtProcessUnlock();
+	    XTPROCESS_UNLOCK;
 	    (*expose) (wid, event, (Region)NULL);
 	    draw_unhighlight(eb);
 	    draw_pixmap(eb, event, NULL);
@@ -973,9 +987,9 @@
     // Invoke Label's Resize procedure.
     {
 	XtWidgetProc resize;
-	XtProcessLock();
+	XTPROCESS_LOCK;
 	resize = xmLabelClassRec.core_class.resize;
-	XtProcessUnlock();
+	XTPROCESS_UNLOCK;
 
 	(* resize) ((Widget) newtb);
     }
@@ -988,9 +1002,9 @@
     XmEnhancedButtonWidget  eb = (XmEnhancedButtonWidget)ebw;
     XtWidgetProc	    resize;
 
-    XtProcessLock();
+    XTPROCESS_LOCK;
     resize = xmLabelClassRec.core_class.resize;
-    XtProcessUnlock();
+    XTPROCESS_UNLOCK;
 
     // Create a bitmap for stippling (Drawable resources are cheap).
     if (STIPPLE_BITMAP == None)
diff -Nru vim-8.2.1913/src/GvimExt/gvimext.cpp vim-8.2.2434/src/GvimExt/gvimext.cpp
--- vim-8.2.1913/src/GvimExt/gvimext.cpp	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/GvimExt/gvimext.cpp	2021-01-30 22:05:11.000000000 +0000
@@ -161,7 +161,6 @@
 static int dyn_libintl_init(char *dir);
 static void dyn_libintl_end(void);
 
-static wchar_t *oldenv = NULL;
 static HINSTANCE hLibintlDLL = 0;
 static char *(*dyn_libintl_gettext)(const char *) = null_libintl_gettext;
 static char *(*dyn_libintl_textdomain)(const char *) = null_libintl_textdomain;
@@ -205,17 +204,17 @@
     if (buf != NULL && buf2 != NULL)
     {
 	GetEnvironmentVariableW(L"PATH", buf, len);
-#ifdef _WIN64
+# ifdef _WIN64
 	_snwprintf(buf2, len2, L"%S\\GvimExt64;%s", dir, buf);
-#else
+# else
 	_snwprintf(buf2, len2, L"%S\\GvimExt32;%s", dir, buf);
-#endif
+# endif
 	SetEnvironmentVariableW(L"PATH", buf2);
 	hLibintlDLL = LoadLibrary(GETTEXT_DLL);
-#ifdef GETTEXT_DLL_ALT
+# ifdef GETTEXT_DLL_ALT
 	if (!hLibintlDLL)
 	    hLibintlDLL = LoadLibrary(GETTEXT_DLL_ALT);
-#endif
+# endif
 	SetEnvironmentVariableW(L"PATH", buf);
     }
     free(buf);
@@ -273,56 +272,7 @@
 dyn_gettext_load(void)
 {
     char    szBuff[BUFSIZE];
-    char    szLang[BUFSIZE];
     DWORD   len;
-    HKEY    keyhandle;
-    int	    gotlang = 0;
-
-    strcpy(szLang, "LANG=");
-
-    // First try getting the language from the registry, this can be
-    // used to overrule the system language.
-    if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, "Software\\Vim\\Gvim", 0,
-				       KEY_READ, &keyhandle) == ERROR_SUCCESS)
-    {
-	len = BUFSIZE;
-	if (RegQueryValueEx(keyhandle, "lang", 0, NULL, (BYTE*)szBuff, &len)
-							     == ERROR_SUCCESS)
-	{
-	    szBuff[len] = 0;
-	    strcat(szLang, szBuff);
-	    gotlang = 1;
-	}
-	RegCloseKey(keyhandle);
-    }
-
-    if (!gotlang && getenv("LANG") == NULL)
-    {
-	// Get the language from the system.
-	// Could use LOCALE_SISO639LANGNAME, but it's not in Win95.
-	// LOCALE_SABBREVLANGNAME gives us three letters, like "enu", we use
-	// only the first two.
-	len = GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SABBREVLANGNAME,
-						    (LPTSTR)szBuff, BUFSIZE);
-	if (len >= 2 && _strnicmp(szBuff, "en", 2) != 0)
-	{
-	    // There are a few exceptions (probably more)
-	    if (_strnicmp(szBuff, "cht", 3) == 0
-					  || _strnicmp(szBuff, "zht", 3) == 0)
-		strcpy(szBuff, "zh_TW");
-	    else if (_strnicmp(szBuff, "chs", 3) == 0
-					  || _strnicmp(szBuff, "zhc", 3) == 0)
-		strcpy(szBuff, "zh_CN");
-	    else if (_strnicmp(szBuff, "jp", 2) == 0)
-		strcpy(szBuff, "ja");
-	    else
-		szBuff[2] = 0;	// truncate to two-letter code
-	    strcat(szLang, szBuff);
-	    gotlang = 1;
-	}
-    }
-    if (gotlang)
-	putenv(szLang);
 
     // Try to locate the runtime files.  The path is used to find libintl.dll
     // and the vim.mo files.
@@ -378,10 +328,8 @@
 inc_cRefThisDLL()
 {
 #ifdef FEAT_GETTEXT
-    if (g_cRefThisDll == 0) {
+    if (g_cRefThisDll == 0)
 	dyn_gettext_load();
-	oldenv = GetEnvironmentStringsW();
-    }
 #endif
     InterlockedIncrement((LPLONG)&g_cRefThisDll);
 }
@@ -390,13 +338,8 @@
 dec_cRefThisDLL()
 {
 #ifdef FEAT_GETTEXT
-    if (InterlockedDecrement((LPLONG)&g_cRefThisDll) == 0) {
+    if (InterlockedDecrement((LPLONG)&g_cRefThisDll) == 0)
 	dyn_gettext_free();
-	if (oldenv != NULL) {
-	    FreeEnvironmentStringsW(oldenv);
-	    oldenv = NULL;
-	}
-    }
 #else
     InterlockedDecrement((LPLONG)&g_cRefThisDll);
 #endif
@@ -967,8 +910,8 @@
 			NULL,		// Process handle not inheritable.
 			NULL,		// Thread handle not inheritable.
 			FALSE,		// Set handle inheritance to FALSE.
-			oldenv == NULL ? 0 : CREATE_UNICODE_ENVIRONMENT,
-			oldenv,		// Use unmodified environment block.
+			0,		// No creation flags.
+			NULL,		// Use parent's environment block.
 			NULL,		// Use parent's starting directory.
 			&si,		// Pointer to STARTUPINFO structure.
 			&pi)		// Pointer to PROCESS_INFORMATION structure.
@@ -1057,8 +1000,8 @@
 		NULL,		// Process handle not inheritable.
 		NULL,		// Thread handle not inheritable.
 		FALSE,		// Set handle inheritance to FALSE.
-		oldenv == NULL ? 0 : CREATE_UNICODE_ENVIRONMENT,
-		oldenv,		// Use unmodified environment block.
+		0,		// No creation flags.
+		NULL,		// Use parent's environment block.
 		NULL,		// Use parent's starting directory.
 		&si,		// Pointer to STARTUPINFO structure.
 		&pi)		// Pointer to PROCESS_INFORMATION structure.
diff -Nru vim-8.2.1913/src/GvimExt/Make_ming.mak vim-8.2.2434/src/GvimExt/Make_ming.mak
--- vim-8.2.1913/src/GvimExt/Make_ming.mak	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/GvimExt/Make_ming.mak	2021-01-30 22:05:11.000000000 +0000
@@ -49,8 +49,8 @@
 endif
 CXX := $(CROSS_COMPILE)g++
 WINDRES := $(CROSS_COMPILE)windres
-WINDRES_CXX = $(CXX)
-WINDRES_FLAGS = --preprocessor="$(WINDRES_CXX) -E -xc" -DRC_INVOKED
+# this used to have --preprocessor, but it's no longer supported
+WINDRES_FLAGS =
 LIBS :=  -luuid -lgdi32
 RES  := gvimext.res
 DEFFILE = gvimext_ming.def
diff -Nru vim-8.2.1913/src/help.c vim-8.2.2434/src/help.c
--- vim-8.2.1913/src/help.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/help.c	2021-01-30 22:05:11.000000000 +0000
@@ -325,7 +325,7 @@
     char_u	*s, *d;
     int		i;
     // Specific tags that either have a specific replacement or won't go
-    // throught the generic rules.
+    // through the generic rules.
     static char *(except_tbl[][2]) = {
 	{"*",		"star"},
 	{"g*",		"gstar"},
@@ -647,6 +647,8 @@
 
     // Always set these options after jumping to a help tag, because the
     // user may have an autocommand that gets in the way.
+    // When adding an option here, also update the help file helphelp.txt.
+
     // Accept all ASCII chars for keywords, except ' ', '*', '"', '|', and
     // latin1 word characters (for translated help files).
     // Only set it when needed, buf_init_chartab() is some work.
diff -Nru vim-8.2.1913/src/if_mzsch.c vim-8.2.2434/src/if_mzsch.c
--- vim-8.2.1913/src/if_mzsch.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/if_mzsch.c	2021-01-30 22:05:11.000000000 +0000
@@ -1712,7 +1712,7 @@
     Vim_Prim	    *prim = (Vim_Prim *)data;
     long	    value;
     char	    *strval;
-    int		    rc;
+    getoption_T	    rc;
     Scheme_Object   *rval = NULL;
     Scheme_Object   *name = NULL;
     int		    opt_flags = 0;
@@ -1754,27 +1754,30 @@
 	    scheme_wrong_type(prim->name, "vim-buffer/window", 1, argc, argv);
     }
 
-    rc = get_option_value(BYTE_STRING_VALUE(name), &value, (char_u **)&strval, opt_flags);
+    rc = get_option_value(BYTE_STRING_VALUE(name), &value, (char_u **)&strval,
+								    opt_flags);
     curbuf = save_curb;
     curwin = save_curw;
 
     switch (rc)
     {
-    case 1:
+    case gov_bool:
+    case gov_number:
 	MZ_GC_UNREG();
 	return scheme_make_integer_value(value);
-    case 0:
+    case gov_string:
 	rval = scheme_make_byte_string(strval);
 	MZ_GC_CHECK();
 	vim_free(strval);
 	MZ_GC_UNREG();
 	return rval;
-    case -1:
-    case -2:
+    case gov_hidden_bool:
+    case gov_hidden_number:
+    case gov_hidden_string:
 	MZ_GC_UNREG();
 	raise_vim_exn(_("hidden option"));
 	//NOTREACHED
-    case -3:
+    case gov_unknown:
 	MZ_GC_UNREG();
 	raise_vim_exn(_("unknown option"));
 	//NOTREACHED
diff -Nru vim-8.2.1913/src/if_ole.cpp vim-8.2.2434/src/if_ole.cpp
--- vim-8.2.1913/src/if_ole.cpp	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/if_ole.cpp	2021-01-30 22:05:11.000000000 +0000
@@ -635,7 +635,7 @@
     LPOLESTR wGUID = NULL;
     StringFromCLSID(guid, &wGUID);
 
-    // Covert from wide characters to non-wide
+    // Convert from wide characters to non-wide
     wcstombs(GUID, wGUID, length);
 
     // Free memory
diff -Nru vim-8.2.1913/src/if_perl.xs vim-8.2.2434/src/if_perl.xs
--- vim-8.2.1913/src/if_perl.xs	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/if_perl.xs	2021-01-30 22:05:11.000000000 +0000
@@ -44,12 +44,13 @@
 # define PERL_NO_INLINE_FUNCTIONS
 #endif
 
-/* Work around for using MSVC and ActivePerl 5.18. */
 #ifdef _MSC_VER
+// Work around for using MSVC and ActivePerl 5.18.
 # define __inline__ __inline
-
 // Work around for using MSVC and Strawberry Perl 5.30.
 # define __builtin_expect(expr, val) (expr)
+// Work around for using MSVC and Strawberry Perl 5.32.
+# define NO_THREAD_SAFE_LOCALE
 #endif
 
 #ifdef __GNUC__
diff -Nru vim-8.2.1913/src/if_py_both.h vim-8.2.2434/src/if_py_both.h
--- vim-8.2.1913/src/if_py_both.h	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/if_py_both.h	2021-01-30 22:05:11.000000000 +0000
@@ -130,10 +130,11 @@
     {
 	PyObject	*bytes;
 
-	if (!(bytes = PyUnicode_AsEncodedString(obj, ENC_OPT, NULL)))
+	if (!(bytes = PyUnicode_AsEncodedString(obj, ENC_OPT,
+							   ERRORS_ENCODE_ARG)))
 	    return NULL;
 
-	if(PyBytes_AsStringAndSize(bytes, (char **) &str, NULL) == -1
+	if (PyBytes_AsStringAndSize(bytes, (char **) &str, NULL) == -1
 		|| str == NULL)
 	{
 	    Py_DECREF(bytes);
@@ -4243,7 +4244,8 @@
     }
     else if (PyUnicode_Check(obj))
     {
-	if (!(bytes = PyUnicode_AsEncodedString(obj, ENC_OPT, NULL)))
+	if (!(bytes = PyUnicode_AsEncodedString(obj, ENC_OPT,
+							   ERRORS_ENCODE_ARG)))
 	    return NULL;
 
 	if (PyBytes_AsStringAndSize(bytes, &str, &len) == -1
@@ -6290,11 +6292,11 @@
 	PyObject	*bytes;
 	char_u	*str;
 
-	bytes = PyUnicode_AsEncodedString(obj, ENC_OPT, NULL);
+	bytes = PyUnicode_AsEncodedString(obj, ENC_OPT, ERRORS_ENCODE_ARG);
 	if (bytes == NULL)
 	    return -1;
 
-	if(PyBytes_AsStringAndSize(bytes, (char **) &str, NULL) == -1)
+	if (PyBytes_AsStringAndSize(bytes, (char **) &str, NULL) == -1)
 	    return -1;
 	if (str == NULL)
 	    return -1;
diff -Nru vim-8.2.1913/src/if_python3.c vim-8.2.2434/src/if_python3.c
--- vim-8.2.1913/src/if_python3.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/if_python3.c	2021-01-30 22:05:11.000000000 +0000
@@ -81,12 +81,15 @@
 // Python 3 does not support CObjects, always use Capsules
 #define PY_USE_CAPSULE
 
+#define ERRORS_DECODE_ARG CODEC_ERROR_HANDLER
+#define ERRORS_ENCODE_ARG ERRORS_DECODE_ARG
+
 #define PyInt Py_ssize_t
 #ifndef PyString_Check
 # define PyString_Check(obj) PyUnicode_Check(obj)
 #endif
 #define PyString_FromString(repr) \
-    PyUnicode_Decode(repr, STRLEN(repr), ENC_OPT, NULL)
+    PyUnicode_Decode(repr, STRLEN(repr), ENC_OPT, ERRORS_DECODE_ARG)
 #define PyString_FromFormat PyUnicode_FromFormat
 #ifndef PyInt_Check
 # define PyInt_Check(obj) PyLong_Check(obj)
@@ -668,6 +671,65 @@
 #  define PyType_HasFeature(t,f) py3_PyType_HasFeature(t,f)
 # endif
 
+# ifdef MSWIN
+/*
+ * Look up the library "libname" using the InstallPath registry key.
+ * Return NULL when failed.  Return an allocated string when successful.
+ */
+    static char *
+py3_get_system_libname(const char *libname)
+{
+    const char	*cp = libname;
+    char	subkey[128];
+    HKEY	hKey;
+    char	installpath[MAXPATHL];
+    LONG	len = sizeof(installpath);
+    LSTATUS	rc;
+    size_t	sysliblen;
+    char	*syslibname;
+
+    while (*cp != '\0')
+    {
+	if (*cp == ':' || *cp == '\\' || *cp == '/')
+	{
+	    // Bail out if "libname" contains path separator, assume it is
+	    // an absolute path.
+	    return NULL;
+	}
+	++cp;
+    }
+    vim_snprintf(subkey, sizeof(subkey),
+#  ifdef _WIN64
+		 "Software\\Python\\PythonCore\\%d.%d\\InstallPath",
+#  else
+		 "Software\\Python\\PythonCore\\%d.%d-32\\InstallPath",
+#  endif
+		 PY_MAJOR_VERSION, PY_MINOR_VERSION);
+    if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, subkey, 0, KEY_QUERY_VALUE, &hKey)
+							      != ERROR_SUCCESS)
+	return NULL;
+    rc = RegQueryValueA(hKey, NULL, installpath, &len);
+    RegCloseKey(hKey);
+    if (ERROR_SUCCESS != rc)
+	return NULL;
+    cp = installpath + len;
+    // Just in case registry value contains null terminators.
+    while (cp > installpath && *(cp-1) == '\0')
+	--cp;
+    // Remove trailing path separators.
+    while (cp > installpath && (*(cp-1) == '\\' || *(cp-1) == '/'))
+	--cp;
+    // Ignore if InstallPath is effectively empty.
+    if (cp <= installpath)
+	return NULL;
+    sysliblen = (cp - installpath) + 1 + STRLEN(libname) + 1;
+    syslibname = alloc(sysliblen);
+    vim_snprintf(syslibname, sysliblen, "%.*s\\%s",
+				(int)(cp - installpath), installpath, libname);
+    return syslibname;
+}
+# endif
+
 /*
  * Load library and get all pointers.
  * Parameter 'libname' provides name of DLL.
@@ -698,6 +760,20 @@
 	return OK;
     hinstPy3 = load_dll(libname);
 
+# ifdef MSWIN
+    if (!hinstPy3)
+    {
+	// Attempt to use the path from InstallPath as stored in the registry.
+	char *syslibname = py3_get_system_libname(libname);
+
+	if (syslibname != NULL)
+	{
+	    hinstPy3 = load_dll(syslibname);
+	    vim_free(syslibname);
+	}
+    }
+# endif
+
     if (!hinstPy3)
     {
 	if (verbose)
@@ -1088,8 +1164,8 @@
     // PyRun_SimpleString expects a UTF-8 string. Wrong encoding may cause
     // SyntaxError (unicode error).
     cmdstr = PyUnicode_Decode(cmd, strlen(cmd),
-					(char *)ENC_OPT, CODEC_ERROR_HANDLER);
-    cmdbytes = PyUnicode_AsEncodedString(cmdstr, "utf-8", CODEC_ERROR_HANDLER);
+					(char *)ENC_OPT, ERRORS_DECODE_ARG);
+    cmdbytes = PyUnicode_AsEncodedString(cmdstr, "utf-8", ERRORS_ENCODE_ARG);
     Py_XDECREF(cmdstr);
 
     run(PyBytes_AsString(cmdbytes), arg, &pygilstate);
@@ -1745,7 +1821,7 @@
     }
     *p = '\0';
 
-    result = PyUnicode_Decode(tmp, len, (char *)ENC_OPT, CODEC_ERROR_HANDLER);
+    result = PyUnicode_Decode(tmp, len, (char *)ENC_OPT, ERRORS_DECODE_ARG);
 
     vim_free(tmp);
     return result;
diff -Nru vim-8.2.1913/src/if_python.c vim-8.2.2434/src/if_python.c
--- vim-8.2.1913/src/if_python.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/if_python.c	2021-01-30 22:05:11.000000000 +0000
@@ -69,6 +69,10 @@
 # undef PY_SSIZE_T_CLEAN
 #endif
 
+// these are NULL for Python 2
+#define ERRORS_DECODE_ARG NULL
+#define ERRORS_ENCODE_ARG ERRORS_DECODE_ARG
+
 #undef main // Defined in python.h - aargh
 #undef HAVE_FCNTL_H // Clash with os_win32.h
 
diff -Nru vim-8.2.1913/src/if_ruby.c vim-8.2.2434/src/if_ruby.c
--- vim-8.2.1913/src/if_ruby.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/if_ruby.c	2021-01-30 22:05:11.000000000 +0000
@@ -32,8 +32,9 @@
 # define RUBYEXTERN extern
 #endif
 
-#if defined(DYNAMIC_RUBY) && RUBY_VERSION >= 24
-# define USE_RUBY_INTEGER
+// suggested by Ariya Mizutani
+#if (_MSC_VER == 1200)
+# undef _WIN32_WINNT
 #endif
 
 #ifdef DYNAMIC_RUBY
@@ -42,6 +43,10 @@
  * definition.  This function use these variables.  But we want function to
  * use dll_* variables.
  */
+# if RUBY_VERSION >= 24
+#  define USE_RUBY_INTEGER
+# endif
+
 # define rb_cFalseClass		(*dll_rb_cFalseClass)
 # define rb_cFixnum		(*dll_rb_cFixnum)
 # if defined(USE_RUBY_INTEGER)
@@ -54,6 +59,7 @@
 # define rb_cString		(*dll_rb_cString)
 # define rb_cSymbol		(*dll_rb_cSymbol)
 # define rb_cTrueClass		(*dll_rb_cTrueClass)
+
 # if RUBY_VERSION >= 18
 /*
  * On ver 1.8, all Ruby functions are exported with "__declspec(dllimport)"
@@ -64,40 +70,41 @@
 #  define RUBY_EXPORT
 # endif
 
-#endif  // ifdef DYNAMIC_RUBY
-
-// suggested by Ariya Mizutani
-#if (_MSC_VER == 1200)
-# undef _WIN32_WINNT
-#endif
-
-#if defined(DYNAMIC_RUBY) && RUBY_VERSION >= 19
+# if RUBY_VERSION >= 19
 // Ruby 1.9 defines a number of static functions which use rb_num2long and
 // rb_int2big
-# define rb_num2long rb_num2long_stub
-# define rb_int2big rb_int2big_stub
-#endif
+#  define rb_num2long rb_num2long_stub
+#  define rb_int2big rb_int2big_stub
 
-#if defined(DYNAMIC_RUBY) && RUBY_VERSION >= 19 \
-	&& VIM_SIZEOF_INT < VIM_SIZEOF_LONG
+#  if RUBY_VERSION >= 30 || VIM_SIZEOF_INT < VIM_SIZEOF_LONG
 // Ruby 1.9 defines a number of static functions which use rb_fix2int and
 // rb_num2int if VIM_SIZEOF_INT < VIM_SIZEOF_LONG (64bit)
-# define rb_fix2int rb_fix2int_stub
-# define rb_num2int rb_num2int_stub
-#endif
+#   define rb_fix2int rb_fix2int_stub
+#   define rb_num2int rb_num2int_stub
+#  endif
+# endif
 
-#if defined(DYNAMIC_RUBY) && RUBY_VERSION == 21
+# if RUBY_VERSION == 21
 // Ruby 2.1 adds new GC called RGenGC and RARRAY_PTR uses
 // rb_gc_writebarrier_unprotect_promoted if USE_RGENGC
-# define rb_gc_writebarrier_unprotect_promoted rb_gc_writebarrier_unprotect_promoted_stub
-#endif
-#if defined(DYNAMIC_RUBY) && RUBY_VERSION >= 22
-# define rb_gc_writebarrier_unprotect rb_gc_writebarrier_unprotect_stub
-#endif
+#  define rb_gc_writebarrier_unprotect_promoted rb_gc_writebarrier_unprotect_promoted_stub
+# endif
 
-#if defined(DYNAMIC_RUBY) && RUBY_VERSION >= 26
-# define rb_ary_detransient rb_ary_detransient_stub
-#endif
+# if RUBY_VERSION >= 22
+#  define rb_gc_writebarrier_unprotect rb_gc_writebarrier_unprotect_stub
+# endif
+
+# if RUBY_VERSION >= 26
+#  define rb_ary_detransient rb_ary_detransient_stub
+# endif
+
+# if RUBY_VERSION >= 30
+#  define rb_check_type rb_check_type_stub
+#  define rb_num2uint rb_num2uint_stub
+#  define ruby_malloc_size_overflow ruby_malloc_size_overflow_stub
+# endif
+
+#endif  // ifdef DYNAMIC_RUBY
 
 // On macOS pre-installed Ruby defines "SIZEOF_TIME_T" as "SIZEOF_LONG" so it
 // conflicts with the definition in config.h then causes a macro-redefined
@@ -232,7 +239,9 @@
 # define rb_assoc_new			dll_rb_assoc_new
 # define rb_cObject			(*dll_rb_cObject)
 # define rb_class_new_instance		dll_rb_class_new_instance
-# define rb_check_type			dll_rb_check_type
+# if RUBY_VERSION < 30
+#  define rb_check_type			dll_rb_check_type
+# endif
 # ifdef USE_TYPEDDATA
 #  define rb_check_typeddata		dll_rb_check_typeddata
 # endif
@@ -283,7 +292,9 @@
 #   define rb_fix2int			dll_rb_fix2int
 #   define rb_num2int			dll_rb_num2int
 #  endif
-#  define rb_num2uint			dll_rb_num2uint
+#  if RUBY_VERSION < 30
+#   define rb_num2uint			dll_rb_num2uint
+#  endif
 # endif
 # define rb_num2dbl			dll_rb_num2dbl
 # define rb_lastline_get			dll_rb_lastline_get
@@ -501,7 +512,7 @@
 static VALUE (*dll_rb_enc_str_new) (const char*, long, rb_encoding*);
 static VALUE (*dll_rb_sprintf) (const char*, ...);
 static VALUE (*dll_rb_require) (const char*);
-static void* (*ruby_options)(int, char**);
+static void* (*dll_ruby_options)(int, char**);
 # endif
 
 # if defined(USE_RGENGC) && USE_RGENGC
@@ -512,28 +523,38 @@
 #  endif
 # endif
 
-# if (RUBY_VERSION >= 19) && !defined(PROTO)
-#  if RUBY_VERSION >= 22
+# if RUBY_VERSION >= 30
+NORETURN(static void (*dll_ruby_malloc_size_overflow)(size_t, size_t));
+# endif
+
+# if RUBY_VERSION >= 26
+void rb_ary_detransient_stub(VALUE x);
+# endif
+
+// Do not generate a prototype here, VALUE isn't always defined.
+# ifndef PROTO
+#  if RUBY_VERSION >= 19
+#   if RUBY_VERSION >= 22
     long
 rb_num2long_stub(VALUE x)
-#  else
+#   else
     SIGNED_VALUE
 rb_num2long_stub(VALUE x)
-#  endif
+#   endif
 {
     return dll_rb_num2long(x);
 }
-#  if RUBY_VERSION >= 26
+#   if RUBY_VERSION >= 26
     VALUE
 rb_int2big_stub(intptr_t x)
-#  else
+#   else
     VALUE
 rb_int2big_stub(SIGNED_VALUE x)
-#  endif
+#   endif
 {
     return dll_rb_int2big(x);
 }
-#  if (RUBY_VERSION >= 19) && (VIM_SIZEOF_INT < VIM_SIZEOF_LONG)
+#   if VIM_SIZEOF_INT < VIM_SIZEOF_LONG
     long
 rb_fix2int_stub(VALUE x)
 {
@@ -544,50 +565,67 @@
 {
     return dll_rb_num2int(x);
 }
-#  endif
-#  if RUBY_VERSION >= 20
+#   endif
+#   if RUBY_VERSION >= 20
     VALUE
 rb_float_new_in_heap(double d)
 {
     return dll_rb_float_new(d);
 }
-#   if RUBY_VERSION >= 22
+#    if RUBY_VERSION >= 22
     unsigned long
 rb_num2ulong(VALUE x)
-#   else
+#    else
     VALUE
 rb_num2ulong(VALUE x)
-#   endif
+#    endif
 {
     return (long)RSHIFT((SIGNED_VALUE)(x),1);
 }
+#   endif
 #  endif
-# endif
-
-   // Do not generate a prototype here, VALUE isn't always defined.
-# if defined(USE_RGENGC) && USE_RGENGC && !defined(PROTO)
-#  if RUBY_VERSION == 21
+#  if defined(USE_RGENGC) && USE_RGENGC
+#   if RUBY_VERSION == 21
     void
 rb_gc_writebarrier_unprotect_promoted_stub(VALUE obj)
 {
     dll_rb_gc_writebarrier_unprotect_promoted(obj);
 }
-#  else
+#   else
     void
 rb_gc_writebarrier_unprotect_stub(VALUE obj)
 {
     dll_rb_gc_writebarrier_unprotect(obj);
 }
+#   endif
 #  endif
-# endif
-
-# if RUBY_VERSION >= 26
+#  if RUBY_VERSION >= 26
     void
 rb_ary_detransient_stub(VALUE x)
 {
     dll_rb_ary_detransient(x);
 }
-# endif
+#  endif
+#  if RUBY_VERSION >= 30
+    void
+rb_check_type_stub(VALUE obj, int t)
+{
+    dll_rb_check_type(obj, t);
+}
+#   if VIM_SIZEOF_INT < VIM_SIZEOF_LONG // 64 bits only
+    unsigned long
+rb_num2uint_stub(VALUE x)
+{
+    return dll_rb_num2uint(x);
+}
+#   endif
+    void
+ruby_malloc_size_overflow_stub(size_t x, size_t y)
+{
+    dll_ruby_malloc_size_overflow(x, y);
+}
+#  endif
+# endif // ifndef PROTO
 
 static HINSTANCE hinstRuby = NULL; // Instance of ruby.dll
 
@@ -744,6 +782,9 @@
     {"rb_gc_writebarrier_unprotect", (RUBY_PROC*)&dll_rb_gc_writebarrier_unprotect},
 #  endif
 # endif
+# if RUBY_VERSION >= 30
+    {"ruby_malloc_size_overflow", (RUBY_PROC*)&dll_ruby_malloc_size_overflow},
+# endif
     {"", NULL},
 };
 
@@ -826,13 +867,11 @@
 vim_str2rb_enc_str(const char *s)
 {
 #if RUBY_VERSION >= 19
-    int isnum;
     long lval;
     char_u *sval;
     rb_encoding *enc;
 
-    isnum = get_option_value((char_u *)"enc", &lval, &sval, 0);
-    if (isnum == 0)
+    if (get_option_value((char_u *)"enc", &lval, &sval, 0) == gov_string)
     {
 	enc = rb_enc_find((char *)sval);
 	vim_free(sval);
@@ -847,14 +886,12 @@
 eval_enc_string_protect(const char *str, int *state)
 {
 #if RUBY_VERSION >= 19
-    int isnum;
     long lval;
     char_u *sval;
     rb_encoding *enc;
     VALUE v;
 
-    isnum = get_option_value((char_u *)"enc", &lval, &sval, 0);
-    if (isnum == 0)
+    if (get_option_value((char_u *)"enc", &lval, &sval, 0) == gov_string)
     {
 	enc = rb_enc_find((char *)sval);
 	vim_free(sval);
@@ -1300,13 +1337,19 @@
 }
 
     static VALUE
-buffer_s_current(void)
+buffer_s_current(VALUE self UNUSED)
+{
+    return buffer_new(curbuf);
+}
+
+    static VALUE
+buffer_s_current_getter(ID id UNUSED, VALUE *x UNUSED)
 {
     return buffer_new(curbuf);
 }
 
     static VALUE
-buffer_s_count(void)
+buffer_s_count(VALUE self UNUSED)
 {
     buf_T *b;
     int n = 0;
@@ -1566,7 +1609,13 @@
 }
 
     static VALUE
-window_s_current(void)
+window_s_current(VALUE self UNUSED)
+{
+    return window_new(curwin);
+}
+
+    static VALUE
+window_s_current_getter(ID id UNUSED, VALUE *x UNUSED)
 {
     return window_new(curwin);
 }
@@ -1576,7 +1625,7 @@
  *    SegPhault - 03/07/05
  */
     static VALUE
-line_s_current(void)
+line_s_current(VALUE self UNUSED)
 {
     return get_buffer_line(curbuf, curwin->w_cursor.lnum);
 }
@@ -1588,13 +1637,13 @@
 }
 
     static VALUE
-current_line_number(void)
+current_line_number(VALUE self UNUSED)
 {
     return INT2FIX((int)curwin->w_cursor.lnum);
 }
 
     static VALUE
-window_s_count(void)
+window_s_count(VALUE self UNUSED)
 {
     win_T	*w;
     int n = 0;
@@ -1794,8 +1843,8 @@
     rb_define_method(cVimWindow, "cursor", window_cursor, 0);
     rb_define_method(cVimWindow, "cursor=", window_set_cursor, 1);
 
-    rb_define_virtual_variable("$curbuf", buffer_s_current, 0);
-    rb_define_virtual_variable("$curwin", window_s_current, 0);
+    rb_define_virtual_variable("$curbuf", buffer_s_current_getter, 0);
+    rb_define_virtual_variable("$curwin", window_s_current_getter, 0);
 }
 
     void
@@ -1811,7 +1860,7 @@
     dict_T *d = (dict_T *)arg;
     dictitem_T *di;
 
-    di = dictitem_alloc((char_u *)RSTRING_PTR(RSTRING(rb_obj_as_string(key))));
+    di = dictitem_alloc((char_u *)RSTRING_PTR(rb_obj_as_string(key)));
     if (di == NULL || ruby_convert_to_vim_value(val, &di->di_tv) != OK
 						     || dict_add(d, di) != OK)
     {
diff -Nru vim-8.2.1913/src/if_tcl.c vim-8.2.2434/src/if_tcl.c
--- vim-8.2.1913/src/if_tcl.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/if_tcl.c	2021-01-30 22:05:11.000000000 +0000
@@ -1281,7 +1281,7 @@
 {
     int		err, nobjs, idx;
     char_u	*option;
-    int		isnum;
+    getoption_T	gov;
     long	lval;
     char_u	*sval;
     Tcl_Obj	*resobj;
@@ -1298,15 +1298,16 @@
 
     option = (char_u *)Tcl_GetStringFromObj(objv[objn], NULL);
     ++objn;
-    isnum = get_option_value(option, &lval, &sval, 0);
+    gov = get_option_value(option, &lval, &sval, 0);
     err = TCL_OK;
-    switch (isnum)
+    switch (gov)
     {
-	case 0:
+	case gov_string:
 	    Tcl_SetResult(interp, (char *)sval, TCL_VOLATILE);
 	    vim_free(sval);
 	    break;
-	case 1:
+	case gov_bool:
+	case gov_number:
 	    resobj = Tcl_NewLongObj(lval);
 	    Tcl_SetObjResult(interp, resobj);
 	    break;
@@ -1316,7 +1317,7 @@
     }
     if (nobjs == 2)
     {
-	if (isnum)
+	if (gov != gov_string)
 	{
 	    sval = NULL;    // avoid compiler warning
 	    err = Tcl_GetIndexFromObj(interp, objv[objn], optkw, "", 0, &idx);
@@ -1326,17 +1327,19 @@
 		err = Tcl_GetLongFromObj(interp, objv[objn], &lval);
 	    }
 	    else
-	    switch (idx)
 	    {
-		case OPT_ON:
-		    lval = 1;
-		    break;
-		case OPT_OFF:
-		    lval = 0;
-		    break;
-		case OPT_TOGGLE:
-		    lval = !lval;
-		    break;
+		switch (idx)
+		{
+		    case OPT_ON:
+			lval = 1;
+			break;
+		    case OPT_OFF:
+			lval = 0;
+			break;
+		    case OPT_TOGGLE:
+			lval = !lval;
+			break;
+		}
 	    }
 	}
 	else
diff -Nru vim-8.2.1913/src/insexpand.c vim-8.2.2434/src/insexpand.c
--- vim-8.2.1913/src/insexpand.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/insexpand.c	2021-01-30 22:05:11.000000000 +0000
@@ -121,7 +121,6 @@
 
 static char e_hitend[] = N_("Hit end of paragraph");
 # ifdef FEAT_COMPL_FUNC
-static char e_complwin[] = N_("E839: Completion function changed window");
 static char e_compldel[] = N_("E840: Completion function deleted text");
 # endif
 
@@ -298,7 +297,7 @@
 	msg_attr(dict_opt ? _("'dictionary' option is empty")
 			  : _("'thesaurus' option is empty"),
 							      HL_ATTR(HLF_E));
-	if (emsg_silent == 0)
+	if (emsg_silent == 0 && !in_assert_fails)
 	{
 	    vim_beep(BO_COMPL);
 	    setcursor();
@@ -1020,7 +1019,7 @@
 
 #if defined(FEAT_EVAL)
     // Dirty hard-coded hack: remove any matchparen highlighting.
-    do_cmdline_cmd((char_u *)"if exists('g:loaded_matchparen')|3match none|endif");
+    do_cmdline_cmd((char_u *)"if exists('g:loaded_matchparen')|:3match none|endif");
 #endif
 
     // Update the screen later, before drawing the popup menu over it.
@@ -1216,7 +1215,7 @@
     }
     else
     {
-	regmatch.regprog = vim_regcomp(pat, p_magic ? RE_MAGIC : 0);
+	regmatch.regprog = vim_regcomp(pat, magic_isset() ? RE_MAGIC : 0);
 	if (regmatch.regprog == NULL)
 	    goto theend;
     }
@@ -1298,6 +1297,7 @@
 	fp = mch_fopen((char *)files[i], "r");  // open dictionary file
 	if (flags != DICT_EXACT)
 	{
+	    msg_hist_off = TRUE;	// reset in msg_trunc_attr()
 	    vim_snprintf((char *)IObuff, IOSIZE,
 			      _("Scanning dictionary: %s"), (char *)files[i]);
 	    (void)msg_trunc_attr((char *)IObuff, TRUE, HL_ATTR(HLF_R));
@@ -1822,7 +1822,7 @@
 
     // Ignore end of Select mode mapping and mouse scroll buttons.
     if (c == K_SELECT || c == K_MOUSEDOWN || c == K_MOUSEUP
-	    || c == K_MOUSELEFT || c == K_MOUSERIGHT)
+	    || c == K_MOUSELEFT || c == K_MOUSERIGHT || c == K_COMMAND)
 	return retval;
 
 #ifdef FEAT_PROP_POPUP
@@ -2198,8 +2198,6 @@
     typval_T	args[3];
     char_u	*funcname;
     pos_T	pos;
-    win_T	*curwin_save;
-    buf_T	*curbuf_save;
     typval_T	rettv;
     int		save_State = State;
 
@@ -2215,11 +2213,10 @@
     args[2].v_type = VAR_UNKNOWN;
 
     pos = curwin->w_cursor;
-    curwin_save = curwin;
-    curbuf_save = curbuf;
-    // Lock the text to avoid weird things from happening.  Do allow switching
-    // to another window temporarily.
-    ++textlock;
+    // Lock the text to avoid weird things from happening.  Also disallow
+    // switching to another window, it should not be needed and may end up in
+    // Insert mode in another buffer.
+    ++textwinlock;
 
     // Call a function, which returns a list or dict.
     if (call_vim_function(funcname, 2, args, &rettv) == OK)
@@ -2242,13 +2239,8 @@
 		break;
 	}
     }
-    --textlock;
+    --textwinlock;
 
-    if (curwin_save != curwin || curbuf_save != curbuf)
-    {
-	emsg(_(e_complwin));
-	goto theend;
-    }
     curwin->w_cursor = pos;	// restore the cursor position
     validate_cursor();
     if (!EQUAL_POS(curwin->w_cursor, pos))
@@ -2778,6 +2770,7 @@
 		    dict = ins_buf->b_fname;
 		    dict_f = DICT_EXACT;
 		}
+		msg_hist_off = TRUE;	// reset in msg_trunc_attr()
 		vim_snprintf((char *)IObuff, IOSIZE, _("Scanning: %s"),
 			ins_buf->b_fname == NULL
 			    ? buf_spname(ins_buf)
@@ -2812,6 +2805,7 @@
 #endif
 		else if (*e_cpt == ']' || *e_cpt == 't')
 		{
+		    msg_hist_off = TRUE;	// reset in msg_trunc_attr()
 		    type = CTRL_X_TAGS;
 		    vim_snprintf((char *)IObuff, IOSIZE, _("Scanning tags."));
 		    (void)msg_trunc_attr((char *)IObuff, TRUE, HL_ATTR(HLF_R));
@@ -3223,7 +3217,7 @@
 	return -1;
 
     if (compl_leader != NULL
-			&& (compl_shown_match->cp_flags & CP_ORIGINAL_TEXT) == 0)
+		      && (compl_shown_match->cp_flags & CP_ORIGINAL_TEXT) == 0)
     {
 	// Set "compl_shown_match" to the actually shown match, it may differ
 	// when "compl_leader" is used to omit some of the matches.
@@ -3423,9 +3417,11 @@
 		    MB_PTR_ADV(s);
 		}
 	    }
+	    msg_hist_off = TRUE;
 	    vim_snprintf((char *)IObuff, IOSIZE, "%s %s%s", lead,
 				s > compl_shown_match->cp_fname ? "<" : "", s);
 	    msg((char *)IObuff);
+	    msg_hist_off = FALSE;
 	    redraw_cmdline = FALSE;	    // don't overwrite!
 	}
     }
@@ -3623,7 +3619,7 @@
 		    // line (probably) wrapped, set compl_startpos to the
 		    // first non_blank in the line, if it is not a wordchar
 		    // include it to get a better pattern, but then we don't
-		    // want the "\\<" prefix, check it bellow
+		    // want the "\\<" prefix, check it below
 		    compl_col = (colnr_T)getwhitecols(line);
 		    compl_startpos.col = compl_col;
 		    compl_startpos.lnum = curwin->w_cursor.lnum;
@@ -3837,8 +3833,6 @@
 	    int		col;
 	    char_u	*funcname;
 	    pos_T	pos;
-	    win_T	*curwin_save;
-	    buf_T	*curbuf_save;
 	    int		save_State = State;
 
 	    // Call 'completefunc' or 'omnifunc' and get pattern length as a
@@ -3860,16 +3854,11 @@
 	    args[1].vval.v_string = (char_u *)"";
 	    args[2].v_type = VAR_UNKNOWN;
 	    pos = curwin->w_cursor;
-	    curwin_save = curwin;
-	    curbuf_save = curbuf;
+	    ++textwinlock;
 	    col = call_func_retnr(funcname, 2, args);
+	    --textwinlock;
 
 	    State = save_State;
-	    if (curwin_save != curwin || curbuf_save != curbuf)
-	    {
-		emsg(_(e_complwin));
-		return FAIL;
-	    }
 	    curwin->w_cursor = pos;	// restore the cursor position
 	    validate_cursor();
 	    if (!EQUAL_POS(curwin->w_cursor, pos))
@@ -4105,9 +4094,13 @@
 	    if (edit_submode_extra != NULL)
 	    {
 		if (!p_smd)
+		{
+		    msg_hist_off = TRUE;
 		    msg_attr((char *)edit_submode_extra,
 			    edit_submode_highl < HLF_COUNT
 			    ? HL_ATTR(edit_submode_highl) : 0);
+		    msg_hist_off = FALSE;
+		}
 	    }
 	    else
 		msg_clr_cmdline();	// necessary for "noshowmode"
@@ -4166,7 +4159,7 @@
 		    break;
 		// FALLTHROUGH
 	    case '~':
-		if (!p_magic)	// quote these only if magic is set
+		if (!magic_isset())	// quote these only if magic is set
 		    break;
 		// FALLTHROUGH
 	    case '\\':
diff -Nru vim-8.2.1913/src/INSTALLmac.txt vim-8.2.2434/src/INSTALLmac.txt
--- vim-8.2.1913/src/INSTALLmac.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/INSTALLmac.txt	2021-01-30 22:05:11.000000000 +0000
@@ -3,7 +3,7 @@
 This file contains instructions for compiling Vim. If you already have an
 executable version of Vim, you don't need this.
 
-First, make sure you've installed Xcode or CommandLineToots.  If not, open a
+First, make sure you've installed Xcode or CommandLineTools.  If not, open a
 terminal and do
 
 	$ make --version
diff -Nru vim-8.2.1913/src/INSTALLpc.txt vim-8.2.2434/src/INSTALLpc.txt
--- vim-8.2.1913/src/INSTALLpc.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/INSTALLpc.txt	2021-01-30 22:05:11.000000000 +0000
@@ -264,11 +264,6 @@
 "Microsoft Windows SDK for Windows 7 and .NET Framework 3.5 SP1"
 You don't need the examples and documentation.
 
-If you get an error that Win32.mak can't be found, you have to set the
-variable SDK_INCLUDE_DIR.  For example, on Windows 10, installation of MSVC
-puts include files in the following directory:
-    set SDK_INCLUDE_DIR=C:\Program Files\Microsoft SDKs\Windows\v6.0A\Include
-
 
 2. MSYS2 with MinGW
 ===================
@@ -385,7 +380,7 @@
 Once you have downloaded the compiler binaries, unpack them on your hard disk
 somewhere, and put them on your PATH.  Go to the Control Panel, (Performance
 and Maintenance), System, Advanced, and edit the environment from there.  If
-you use the standalone MinGW-w64 compiler, the path may depends on your
+you use the standalone MinGW-w64 compiler, the path may depend on your
 installation.  If you use msys2 compilers, set your installed paths (normally
 one of the following):
 
diff -Nru vim-8.2.1913/src/INSTALLvms.txt vim-8.2.2434/src/INSTALLvms.txt
--- vim-8.2.1913/src/INSTALLvms.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/INSTALLvms.txt	2021-01-30 22:05:11.000000000 +0000
@@ -9,12 +9,12 @@
 If you skip settings described here, then you will get the default Vim
 behavior as it is documented, which should be fine for most users.
 
-The file "feature.h" can be edited to match your preferences, but this files
+The file "feature.h" can be edited to match your preferences, but this file
 does not describe possibilities hidden in feature.h acrobatics, however
-parameters from MAKE_VMS.MMS actively uses and sets up parameters in relation
+parameters from MAKE_VMS.MMS actively use and set up parameters in relation
 with feature.h
 
-More information and case analysis you can found in os_vms.txt
+More information and case analysis you can find in os_vms.txt
 ([runtime.doc]os_vms.txt or :help vms from vim prompt)
 
 Contents:
@@ -145,7 +145,7 @@
 
 	Parameter name	: VIM_XIM
 	Description	: X Input Method. For entering special languages
-			  like chinese and Japanese. Please define just
+			  like Chinese and Japanese. Please define just
 			  one: VIM_XIM or VIM_HANGULIN
 	Options:	: YES - Build with support
 			  Uncommented - build without support.
@@ -210,7 +210,7 @@
      XXD.EXE you should change to subdirectory <.CTAGS> or <.XXD> and build
      them separately.
 
-5.2. In these directories you can found one make file for VMS as well.
+5.2. In these directories you can find one make file for VMS as well.
      Please read the detailed build instructions in the related *.MMS file.
 
 6.   Deployment
@@ -300,7 +300,7 @@
      So far it works just on Alpha and IA64. More information at:
      http://www.openvms.compaq.com/openvms/products/ips/gtk.html
 
-     You need also the OpenVMS Porting Library:
+     You also need the OpenVMS Porting Library:
      http://www.openvms.compaq.com/openvms/products/ips/porting.html
 
      Source code for GTK and porting library that is used to build
@@ -346,7 +346,7 @@
 
      Edit PERL_INC = to point to perl includes directory where is extern.h
 
-     Build as usually.
+     Build as usual.
 
 7.4  PYTHON
 
@@ -358,7 +358,7 @@
      python.h is located.
      Enable Python feature at make_vms.mms with VIM_PYTHON = YES
 
-     Build as usually.
+     Build as usual.
 
 7.5  TCL
 
@@ -371,13 +371,13 @@
 
      Edit TCL_INC = to point to TCL includes directory where is tcl.h
 
-     Build as usually.
+     Build as usual.
 
 8.   Notes
 
 8.1. New Compaq C compiler
 
-     If you are using Compaq C compiler V6.2 or newer, Informational messages
+     If you are using Compaq C compiler V6.2 or newer, informational messages
      of the type QUESTCOMPARE will be displayed. You should ignore those
      messages ; they are generated only because some test comparisons are done
      with variables which type vary depending on the OS. Under VMS, those are
diff -Nru vim-8.2.1913/src/INSTALLx.txt vim-8.2.2434/src/INSTALLx.txt
--- vim-8.2.1913/src/INSTALLx.txt	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/INSTALLx.txt	2021-01-30 22:05:11.000000000 +0000
@@ -131,14 +131,6 @@
 	Whether the "toupper" C library function works correctly. Set to "yes"
 	if you know it's broken, otherwise set to "no".
 
-vim_cv_tty_group:
-	The default group of pseudo terminals. Either set to the numeric value
-	of your tty group or to "world" if they are world accessible.
-
-vim_cv_tty_mode:
-	The default mode of pseudo terminals if they are not world accessible.
-	Most probably the value "0620".
-
 
 4. EXAMPLE:
 ===========
@@ -153,7 +145,6 @@
 vim_cv_tgetent=zero \
 vim_cv_terminfo=yes \
 vim_cv_toupper_broken=no \
-vim_cv_tty_group=world \
 ./configure \
 	--build=i586-linux \
 	--host=armeb-xscale-linux-gnu \
diff -Nru vim-8.2.1913/src/job.c vim-8.2.2434/src/job.c
--- vim-8.2.1913/src/job.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/job.c	2021-01-30 22:05:11.000000000 +0000
@@ -887,6 +887,11 @@
 }
 #endif
 
+// Unix uses argv[] for the command, other systems use a string.
+#if defined(UNIX)
+# define USE_ARGV
+#endif
+
 #if !defined(USE_ARGV) || defined(PROTO)
 /*
  * Escape one argument for an external command.
@@ -1269,9 +1274,7 @@
     char	**argv = NULL;
     int		argc = 0;
     int		i;
-#if defined(UNIX)
-# define USE_ARGV
-#else
+#ifndef USE_ARGV
     garray_T	ga;
 #endif
     jobopt_T	opt;
@@ -1628,7 +1631,7 @@
 
     if (cmdchar_todo == 'A')
 	coladvance((colnr_T)MAXCOL);
-    if (cmdchar_todo == 'I' || curwin->w_cursor.col <= (int)STRLEN(prompt))
+    if (curwin->w_cursor.col < (int)STRLEN(prompt))
 	curwin->w_cursor.col = (int)STRLEN(prompt);
     // Make sure the cursor is in a valid position.
     check_cursor();
diff -Nru vim-8.2.1913/src/keymap.h vim-8.2.2434/src/keymap.h
--- vim-8.2.1913/src/keymap.h	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/keymap.h	2021-01-30 22:05:11.000000000 +0000
@@ -274,6 +274,7 @@
     , KE_FOCUSLOST = 99		// focus lost
     , KE_MOUSEMOVE = 100	// mouse moved with no button down
     , KE_CANCEL = 101		// return from vgetc()
+    , KE_COMMAND = 102		// <Cmd> special key
 };
 
 /*
@@ -449,11 +450,11 @@
 #define K_RIGHTMOUSE	TERMCAP2KEY(KS_EXTRA, KE_RIGHTMOUSE)
 #define K_RIGHTDRAG	TERMCAP2KEY(KS_EXTRA, KE_RIGHTDRAG)
 #define K_RIGHTRELEASE	TERMCAP2KEY(KS_EXTRA, KE_RIGHTRELEASE)
-#define K_X1MOUSE       TERMCAP2KEY(KS_EXTRA, KE_X1MOUSE)
-#define K_X1MOUSE       TERMCAP2KEY(KS_EXTRA, KE_X1MOUSE)
+#define K_X1MOUSE	TERMCAP2KEY(KS_EXTRA, KE_X1MOUSE)
+#define K_X1MOUSE	TERMCAP2KEY(KS_EXTRA, KE_X1MOUSE)
 #define K_X1DRAG	TERMCAP2KEY(KS_EXTRA, KE_X1DRAG)
 #define K_X1RELEASE     TERMCAP2KEY(KS_EXTRA, KE_X1RELEASE)
-#define K_X2MOUSE       TERMCAP2KEY(KS_EXTRA, KE_X2MOUSE)
+#define K_X2MOUSE	TERMCAP2KEY(KS_EXTRA, KE_X2MOUSE)
 #define K_X2DRAG	TERMCAP2KEY(KS_EXTRA, KE_X2DRAG)
 #define K_X2RELEASE     TERMCAP2KEY(KS_EXTRA, KE_X2RELEASE)
 
@@ -477,6 +478,8 @@
 
 #define K_CURSORHOLD	TERMCAP2KEY(KS_EXTRA, KE_CURSORHOLD)
 
+#define K_COMMAND	TERMCAP2KEY(KS_EXTRA, KE_COMMAND)
+
 // Bits for modifier mask
 // 0x01 cannot be used, because the modifier must be 0x02 or higher
 #define MOD_MASK_SHIFT	    0x02
diff -Nru vim-8.2.1913/src/libvterm/Makefile vim-8.2.2434/src/libvterm/Makefile
--- vim-8.2.1913/src/libvterm/Makefile	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/libvterm/Makefile	2021-01-30 22:05:11.000000000 +0000
@@ -78,7 +78,7 @@
 	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(CFLAGS) -o $@ -c $<
 
 t/harness: t/harness.lo $(LIBRARY)
-	$(LIBTOOL) --mode=link --tag=CC $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+	$(LIBTOOL) --mode=link --tag=CC $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) -static
 
 .PHONY: test
 test: $(LIBRARY) t/harness
diff -Nru vim-8.2.1913/src/libvterm/t/run-test.pl vim-8.2.2434/src/libvterm/t/run-test.pl
--- vim-8.2.1913/src/libvterm/t/run-test.pl	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/libvterm/t/run-test.pl	2021-01-30 22:05:11.000000000 +0000
@@ -8,7 +8,7 @@
 use POSIX qw( WIFEXITED WEXITSTATUS WIFSIGNALED WTERMSIG );
 
 my $VALGRIND = 0;
-my $EXECUTABLE = "t/.libs/harness";
+my $EXECUTABLE = "t/harness";
 GetOptions(
    'valgrind|v+' => \$VALGRIND,
    'executable|e=s' => \$EXECUTABLE,
@@ -17,7 +17,6 @@
 
 my ( $hin, $hout, $hpid );
 {
-   local $ENV{LD_LIBRARY_PATH} = ".libs";
    my @command = $EXECUTABLE;
    unshift @command, "valgrind", "--tool=memcheck", "--leak-check=yes", "--num-callers=25", "--log-file=valgrind.out", "--error-exitcode=126" if $VALGRIND;
 
diff -Nru vim-8.2.1913/src/list.c vim-8.2.2434/src/list.c
--- vim-8.2.1913/src/list.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/list.c	2021-01-30 22:05:11.000000000 +0000
@@ -270,6 +270,7 @@
     if (l->lv_used_next != NULL)
 	l->lv_used_next->lv_used_prev = l->lv_used_prev;
 
+    free_type(l->lv_type);
     vim_free(l);
 }
 
@@ -689,13 +690,17 @@
 /*
  * Insert typval_T "tv" in list "l" before "item".
  * If "item" is NULL append at the end.
- * Return FAIL when out of memory.
+ * Return FAIL when out of memory or the type is wrong.
  */
     int
 list_insert_tv(list_T *l, typval_T *tv, listitem_T *item)
 {
-    listitem_T	*ni = listitem_alloc();
+    listitem_T	*ni;
 
+    if (l->lv_type != NULL && l->lv_type->tt_member != NULL
+		    && check_typval_type(l->lv_type->tt_member, tv, 0) == FAIL)
+	return FAIL;
+    ni = listitem_alloc();
     if (ni == NULL)
 	return FAIL;
     copy_tv(tv, &ni->li_tv);
@@ -867,6 +872,7 @@
     if (l == NULL)
 	return FAIL;
     tv->v_type = VAR_LIST;
+    tv->v_lock = 0;
     tv->vval.v_list = l;
     if (l1 == NULL)
 	++l->lv_refcount;
@@ -899,14 +905,15 @@
 list_slice_or_index(
 	    list_T	*list,
 	    int		range,
-	    long	n1_arg,
-	    long	n2_arg,
+	    varnumber_T	n1_arg,
+	    varnumber_T	n2_arg,
+	    int		exclusive,
 	    typval_T	*rettv,
 	    int		verbose)
 {
     long	len = list_len(list);
-    long	n1 = n1_arg;
-    long	n2 = n2_arg;
+    varnumber_T	n1 = n1_arg;
+    varnumber_T	n2 = n2_arg;
     typval_T	var1;
 
     if (n1 < 0)
@@ -918,7 +925,7 @@
 	if (!range)
 	{
 	    if (verbose)
-		semsg(_(e_listidx), n1);
+		semsg(_(e_listidx), (long)n1_arg);
 	    return FAIL;
 	}
 	n1 = n1 < 0 ? 0 : len;
@@ -930,7 +937,9 @@
 	if (n2 < 0)
 	    n2 = len + n2;
 	else if (n2 >= len)
-	    n2 = len - 1;
+	    n2 = len - (exclusive ? 0 : 1);
+	if (exclusive)
+	    --n2;
 	if (n2 < 0 || n2 + 1 < n1)
 	    n2 = -1;
 	l = list_slice(list, n1, n2);
@@ -1264,7 +1273,7 @@
 	had_comma = **arg == ',';
 	if (had_comma)
 	{
-	    if (vim9script && !IS_WHITE_OR_NUL((*arg)[1]))
+	    if (vim9script && !IS_WHITE_OR_NUL((*arg)[1]) && (*arg)[1] != ']')
 	    {
 		semsg(_(e_white_space_required_after_str), ",");
 		goto failret;
@@ -1443,7 +1452,7 @@
     listitem_T	*item, *item2;
     listitem_T	*li;
     int		error = FALSE;
-    int		idx;
+    long	idx;
 
     if ((l = argvars[0].vval.v_list) == NULL
 			     || value_check_lock(l->lv_lock, arg_errmsg, TRUE))
@@ -1466,7 +1475,7 @@
 	else
 	{
 	    // Remove range of items, return list with values.
-	    int end = (long)tv_get_number_chk(&argvars[2], &error);
+	    long end = (long)tv_get_number_chk(&argvars[2], &error);
 
 	    if (error)
 		;		// type error: do nothing
@@ -1516,6 +1525,7 @@
 typedef struct
 {
     int		item_compare_ic;
+    int		item_compare_lc;
     int		item_compare_numeric;
     int		item_compare_numbers;
 #ifdef FEAT_FLOAT
@@ -1594,10 +1604,10 @@
 	p2 = (char_u *)"";
     if (!sortinfo->item_compare_numeric)
     {
-	if (sortinfo->item_compare_ic)
-	    res = STRICMP(p1, p2);
+	if (sortinfo->item_compare_lc)
+	    res = strcoll((char *)p1, (char *)p2);
 	else
-	    res = STRCMP(p1, p2);
+	    res = sortinfo->item_compare_ic ? STRICMP(p1, p2): STRCMP(p1, p2);
     }
     else
     {
@@ -1706,6 +1716,7 @@
 	    goto theend;	// short list sorts pretty quickly
 
 	info.item_compare_ic = FALSE;
+	info.item_compare_lc = FALSE;
 	info.item_compare_numeric = FALSE;
 	info.item_compare_numbers = FALSE;
 #ifdef FEAT_FLOAT
@@ -1773,6 +1784,11 @@
 			info.item_compare_func = NULL;
 			info.item_compare_ic = TRUE;
 		    }
+		    else if (STRCMP(info.item_compare_func, "l") == 0)
+		    {
+			info.item_compare_func = NULL;
+			info.item_compare_lc = TRUE;
+		    }
 		}
 	    }
 
@@ -1896,38 +1912,42 @@
     do_sort_uniq(argvars, rettv, FALSE);
 }
 
+typedef enum {
+    FILTERMAP_FILTER,
+    FILTERMAP_MAP,
+    FILTERMAP_MAPNEW
+} filtermap_T;
+
 /*
  * Handle one item for map() and filter().
+ * Sets v:val to "tv".  Caller must set v:key.
  */
     static int
-filter_map_one(typval_T *tv, typval_T *expr, int map, int *remp)
+filter_map_one(
+	typval_T	*tv,	    // original value
+	typval_T	*expr,	    // callback
+	filtermap_T	filtermap,
+	typval_T	*newtv,	    // for map() and mapnew(): new value
+	int		*remp)	    // for filter(): remove flag
 {
-    typval_T	rettv;
     typval_T	argv[3];
     int		retval = FAIL;
 
     copy_tv(tv, get_vim_var_tv(VV_VAL));
     argv[0] = *get_vim_var_tv(VV_KEY);
     argv[1] = *get_vim_var_tv(VV_VAL);
-    if (eval_expr_typval(expr, argv, 2, &rettv) == FAIL)
+    if (eval_expr_typval(expr, argv, 2, newtv) == FAIL)
 	goto theend;
-    if (map)
-    {
-	// map(): replace the list item value
-	clear_tv(tv);
-	rettv.v_lock = 0;
-	*tv = rettv;
-    }
-    else
+    if (filtermap == FILTERMAP_FILTER)
     {
 	int	    error = FALSE;
 
 	// filter(): when expr is zero remove the item
 	if (in_vim9script())
-	    *remp = !tv2bool(&rettv);
+	    *remp = !tv2bool(newtv);
 	else
-	    *remp = (tv_get_number_chk(&rettv, &error) == 0);
-	clear_tv(&rettv);
+	    *remp = (tv_get_number_chk(newtv, &error) == 0);
+	clear_tv(newtv);
 	// On type error, nothing has been removed; return FAIL to stop the
 	// loop.  The error message was given by tv_get_number_chk().
 	if (error)
@@ -1943,7 +1963,7 @@
  * Implementation of map() and filter().
  */
     static void
-filter_map(typval_T *argvars, typval_T *rettv, int map)
+filter_map(typval_T *argvars, typval_T *rettv, filtermap_T filtermap)
 {
     typval_T	*expr;
     listitem_T	*li, *nli;
@@ -1955,36 +1975,67 @@
     blob_T	*b = NULL;
     int		rem;
     int		todo;
-    char_u	*ermsg = (char_u *)(map ? "map()" : "filter()");
-    char_u	*arg_errmsg = (char_u *)(map ? N_("map() argument")
-				   : N_("filter() argument"));
+    char_u	*ermsg = (char_u *)(filtermap == FILTERMAP_MAP ? "map()"
+				  : filtermap == FILTERMAP_MAPNEW ? "mapnew()"
+				  : "filter()");
+    char_u	*arg_errmsg = (char_u *)(filtermap == FILTERMAP_MAP
+							 ? N_("map() argument")
+				       : filtermap == FILTERMAP_MAPNEW
+						      ? N_("mapnew() argument")
+						    : N_("filter() argument"));
     int		save_did_emsg;
     int		idx = 0;
+    type_T	*type = NULL;
+    garray_T	type_list;
 
-    // Always return the first argument, also on failure.
-    copy_tv(&argvars[0], rettv);
+    // map() and filter() return the first argument, also on failure.
+    if (filtermap != FILTERMAP_MAPNEW)
+	copy_tv(&argvars[0], rettv);
+    if (filtermap == FILTERMAP_MAP && in_vim9script())
+    {
+	// Check that map() does not change the type of the dict.
+	ga_init2(&type_list, sizeof(type_T *), 10);
+	type = typval2type(argvars, &type_list);
+    }
 
     if (argvars[0].v_type == VAR_BLOB)
     {
+	if (filtermap == FILTERMAP_MAPNEW)
+	{
+	    rettv->v_type = VAR_BLOB;
+	    rettv->vval.v_blob = NULL;
+	}
 	if ((b = argvars[0].vval.v_blob) == NULL)
-	    return;
+	    goto theend;
     }
     else if (argvars[0].v_type == VAR_LIST)
     {
+	if (filtermap == FILTERMAP_MAPNEW)
+	{
+	    rettv->v_type = VAR_LIST;
+	    rettv->vval.v_list = NULL;
+	}
 	if ((l = argvars[0].vval.v_list) == NULL
-	      || (!map && value_check_lock(l->lv_lock, arg_errmsg, TRUE)))
-	    return;
+	      || (filtermap == FILTERMAP_FILTER
+			    && value_check_lock(l->lv_lock, arg_errmsg, TRUE)))
+	    goto theend;
     }
     else if (argvars[0].v_type == VAR_DICT)
     {
+	if (filtermap == FILTERMAP_MAPNEW)
+	{
+	    rettv->v_type = VAR_DICT;
+	    rettv->vval.v_dict = NULL;
+	}
 	if ((d = argvars[0].vval.v_dict) == NULL
-	      || (!map && value_check_lock(d->dv_lock, arg_errmsg, TRUE)))
-	    return;
+	      || (filtermap == FILTERMAP_FILTER
+			    && value_check_lock(d->dv_lock, arg_errmsg, TRUE)))
+	    goto theend;
     }
     else
     {
 	semsg(_(e_listdictblobarg), ermsg);
-	return;
+	goto theend;
     }
 
     expr = &argvars[1];
@@ -2007,8 +2058,16 @@
 	if (argvars[0].v_type == VAR_DICT)
 	{
 	    int	    prev_lock = d->dv_lock;
+	    dict_T  *d_ret = NULL;
+
+	    if (filtermap == FILTERMAP_MAPNEW)
+	    {
+		if (rettv_dict_alloc(rettv) == FAIL)
+		    goto theend;
+		d_ret = rettv->vval.v_dict;
+	    }
 
-	    if (map && d->dv_lock == 0)
+	    if (filtermap != FILTERMAP_FILTER && d->dv_lock == 0)
 		d->dv_lock = VAR_LOCKED;
 	    ht = &d->dv_hashtab;
 	    hash_lock(ht);
@@ -2017,22 +2076,50 @@
 	    {
 		if (!HASHITEM_EMPTY(hi))
 		{
-		    int r;
+		    int		r;
+		    typval_T	newtv;
 
 		    --todo;
 		    di = HI2DI(hi);
-		    if (map && (value_check_lock(di->di_tv.v_lock,
+		    if (filtermap == FILTERMAP_MAP
+					 && (value_check_lock(di->di_tv.v_lock,
 							   arg_errmsg, TRUE)
 				|| var_check_ro(di->di_flags,
 							   arg_errmsg, TRUE)))
 			break;
 		    set_vim_var_string(VV_KEY, di->di_key, -1);
-		    r = filter_map_one(&di->di_tv, expr, map, &rem);
+		    r = filter_map_one(&di->di_tv, expr, filtermap,
+								 &newtv, &rem);
 		    clear_tv(get_vim_var_tv(VV_KEY));
 		    if (r == FAIL || did_emsg)
+		    {
+			clear_tv(&newtv);
 			break;
-		    if (!map && rem)
+		    }
+		    if (filtermap == FILTERMAP_MAP)
+		    {
+			if (type != NULL && check_typval_type(type->tt_member,
+							    &newtv, 0) == FAIL)
+			{
+			    clear_tv(&newtv);
+			    break;
+			}
+			// map(): replace the dict item value
+			clear_tv(&di->di_tv);
+			newtv.v_lock = 0;
+			di->di_tv = newtv;
+		    }
+		    else if (filtermap == FILTERMAP_MAPNEW)
 		    {
+			// mapnew(): add the item value to the new dict
+			r = dict_add_tv(d_ret, (char *)di->di_key, &newtv);
+			clear_tv(&newtv);
+			if (r == FAIL)
+			    break;
+		    }
+		    else if (filtermap == FILTERMAP_FILTER && rem)
+		    {
+			// filter(false): remove the item from the dict
 			if (var_check_fixed(di->di_flags, arg_errmsg, TRUE)
 			    || var_check_ro(di->di_flags, arg_errmsg, TRUE))
 			    break;
@@ -2048,27 +2135,39 @@
 	    int		i;
 	    typval_T	tv;
 	    varnumber_T	val;
+	    blob_T	*b_ret = b;
+
+	    if (filtermap == FILTERMAP_MAPNEW)
+	    {
+		if (blob_copy(b, rettv) == FAIL)
+		    goto theend;
+		b_ret = rettv->vval.v_blob;
+	    }
 
 	    // set_vim_var_nr() doesn't set the type
 	    set_vim_var_type(VV_KEY, VAR_NUMBER);
 
 	    for (i = 0; i < b->bv_ga.ga_len; i++)
 	    {
+		typval_T newtv;
+
 		tv.v_type = VAR_NUMBER;
 		val = blob_get(b, i);
 		tv.vval.v_number = val;
 		set_vim_var_nr(VV_KEY, idx);
-		if (filter_map_one(&tv, expr, map, &rem) == FAIL || did_emsg)
+		if (filter_map_one(&tv, expr, filtermap, &newtv, &rem) == FAIL
+								   || did_emsg)
 		    break;
-		if (tv.v_type != VAR_NUMBER)
+		if (newtv.v_type != VAR_NUMBER)
 		{
+		    clear_tv(&newtv);
 		    emsg(_(e_invalblob));
 		    break;
 		}
-		if (map)
+		if (filtermap != FILTERMAP_FILTER)
 		{
-		    if (tv.vval.v_number != val)
-			blob_set(b, i, tv.vval.v_number);
+		    if (newtv.vval.v_number != val)
+			blob_set(b_ret, i, newtv.vval.v_number);
 		}
 		else if (rem)
 		{
@@ -2084,27 +2183,123 @@
 	}
 	else // argvars[0].v_type == VAR_LIST
 	{
-	    int prev_lock = l->lv_lock;
+	    int	    prev_lock = l->lv_lock;
+	    list_T  *l_ret = NULL;
 
+	    if (filtermap == FILTERMAP_MAPNEW)
+	    {
+		if (rettv_list_alloc(rettv) == FAIL)
+		    goto theend;
+		l_ret = rettv->vval.v_list;
+	    }
 	    // set_vim_var_nr() doesn't set the type
 	    set_vim_var_type(VV_KEY, VAR_NUMBER);
 
-	    CHECK_LIST_MATERIALIZE(l);
-	    if (map && l->lv_lock == 0)
+	    if (filtermap != FILTERMAP_FILTER && l->lv_lock == 0)
 		l->lv_lock = VAR_LOCKED;
-	    for (li = l->lv_first; li != NULL; li = nli)
+
+	    if (l->lv_first == &range_list_item)
 	    {
-		if (map && value_check_lock(li->li_tv.v_lock, arg_errmsg, TRUE))
-		    break;
-		nli = li->li_next;
-		set_vim_var_nr(VV_KEY, idx);
-		if (filter_map_one(&li->li_tv, expr, map, &rem) == FAIL
-								  || did_emsg)
-		    break;
-		if (!map && rem)
-		    listitem_remove(l, li);
-		++idx;
+		varnumber_T	val = l->lv_u.nonmat.lv_start;
+		int		len = l->lv_len;
+		int		stride = l->lv_u.nonmat.lv_stride;
+
+		// List from range(): loop over the numbers
+		if (filtermap != FILTERMAP_MAPNEW)
+		{
+		    l->lv_first = NULL;
+		    l->lv_u.mat.lv_last = NULL;
+		    l->lv_len = 0;
+		    l->lv_u.mat.lv_idx_item = NULL;
+		}
+
+		for (idx = 0; idx < len; ++idx)
+		{
+		    typval_T tv;
+		    typval_T newtv;
+
+		    tv.v_type = VAR_NUMBER;
+		    tv.v_lock = 0;
+		    tv.vval.v_number = val;
+		    set_vim_var_nr(VV_KEY, idx);
+		    if (filter_map_one(&tv, expr, filtermap, &newtv, &rem)
+								       == FAIL)
+			break;
+		    if (did_emsg)
+		    {
+			clear_tv(&newtv);
+			break;
+		    }
+		    if (filtermap != FILTERMAP_FILTER)
+		    {
+			if (filtermap == FILTERMAP_MAP && type != NULL
+					  && check_typval_type(type->tt_member,
+							    &newtv, 0) == FAIL)
+			{
+			    clear_tv(&newtv);
+			    break;
+			}
+			// map(), mapnew(): always append the new value to the
+			// list
+			if (list_append_tv_move(filtermap == FILTERMAP_MAP
+						  ? l : l_ret, &newtv) == FAIL)
+			    break;
+		    }
+		    else if (!rem)
+		    {
+			// filter(): append the list item value when not rem
+			if (list_append_tv_move(l, &tv) == FAIL)
+			    break;
+		    }
+
+		    val += stride;
+		}
 	    }
+	    else
+	    {
+		// Materialized list: loop over the items
+		for (li = l->lv_first; li != NULL; li = nli)
+		{
+		    typval_T newtv;
+
+		    if (filtermap == FILTERMAP_MAP && value_check_lock(
+					   li->li_tv.v_lock, arg_errmsg, TRUE))
+			break;
+		    nli = li->li_next;
+		    set_vim_var_nr(VV_KEY, idx);
+		    if (filter_map_one(&li->li_tv, expr, filtermap,
+				&newtv, &rem) == FAIL)
+			break;
+		    if (did_emsg)
+		    {
+			clear_tv(&newtv);
+			break;
+		    }
+		    if (filtermap == FILTERMAP_MAP)
+		    {
+			if (type != NULL && check_typval_type(type->tt_member,
+							    &newtv, 0) == FAIL)
+			{
+			    clear_tv(&newtv);
+			    break;
+			}
+			// map(): replace the list item value
+			clear_tv(&li->li_tv);
+			newtv.v_lock = 0;
+			li->li_tv = newtv;
+		    }
+		    else if (filtermap == FILTERMAP_MAPNEW)
+		    {
+			// mapnew(): append the list item value
+			if (list_append_tv_move(l_ret, &newtv) == FAIL)
+			    break;
+		    }
+		    else if (filtermap == FILTERMAP_FILTER && rem)
+			listitem_remove(l, li);
+		    ++idx;
+		}
+	    }
+
 	    l->lv_lock = prev_lock;
 	}
 
@@ -2113,6 +2308,10 @@
 
 	did_emsg |= save_did_emsg;
     }
+
+theend:
+    if (type != NULL)
+	clear_type_list(&type_list);
 }
 
 /*
@@ -2121,7 +2320,7 @@
     void
 f_filter(typval_T *argvars, typval_T *rettv)
 {
-    filter_map(argvars, rettv, FALSE);
+    filter_map(argvars, rettv, FILTERMAP_FILTER);
 }
 
 /*
@@ -2130,7 +2329,16 @@
     void
 f_map(typval_T *argvars, typval_T *rettv)
 {
-    filter_map(argvars, rettv, TRUE);
+    filter_map(argvars, rettv, FILTERMAP_MAP);
+}
+
+/*
+ * "mapnew()" function
+ */
+    void
+f_mapnew(typval_T *argvars, typval_T *rettv)
+{
+    filter_map(argvars, rettv, FILTERMAP_MAPNEW);
 }
 
 /*
@@ -2280,14 +2488,11 @@
 }
 
 /*
- * "extend(list, list [, idx])" function
- * "extend(dict, dict [, action])" function
+ * "extend()" or "extendnew()" function.  "is_new" is TRUE for extendnew().
  */
-    void
-f_extend(typval_T *argvars, typval_T *rettv)
+    static void
+extend(typval_T *argvars, typval_T *rettv, char_u *arg_errmsg, int is_new)
 {
-    char_u      *arg_errmsg = (char_u *)N_("extend() argument");
-
     if (argvars[0].v_type == VAR_LIST && argvars[1].v_type == VAR_LIST)
     {
 	list_T		*l1, *l2;
@@ -2296,10 +2501,22 @@
 	int		error = FALSE;
 
 	l1 = argvars[0].vval.v_list;
+	if (l1 == NULL)
+	{
+	    emsg(_(e_cannot_extend_null_list));
+	    return;
+	}
 	l2 = argvars[1].vval.v_list;
-	if (l1 != NULL && !value_check_lock(l1->lv_lock, arg_errmsg, TRUE)
-		&& l2 != NULL)
+	if ((is_new || !value_check_lock(l1->lv_lock, arg_errmsg, TRUE))
+								 && l2 != NULL)
 	{
+	    if (is_new)
+	    {
+		l1 = list_copy(l1, FALSE, get_copyID());
+		if (l1 == NULL)
+		    return;
+	    }
+
 	    if (argvars[2].v_type != VAR_UNKNOWN)
 	    {
 		before = (long)tv_get_number_chk(&argvars[2], &error);
@@ -2322,7 +2539,14 @@
 		item = NULL;
 	    list_extend(l1, l2, item);
 
-	    copy_tv(&argvars[0], rettv);
+	    if (is_new)
+	    {
+		rettv->v_type = VAR_LIST;
+		rettv->vval.v_list = l1;
+		rettv->v_lock = FALSE;
+	    }
+	    else
+		copy_tv(&argvars[0], rettv);
 	}
     }
     else if (argvars[0].v_type == VAR_DICT && argvars[1].v_type == VAR_DICT)
@@ -2332,10 +2556,22 @@
 	int	i;
 
 	d1 = argvars[0].vval.v_dict;
+	if (d1 == NULL)
+	{
+	    emsg(_(e_cannot_extend_null_dict));
+	    return;
+	}
 	d2 = argvars[1].vval.v_dict;
-	if (d1 != NULL && !value_check_lock(d1->dv_lock, arg_errmsg, TRUE)
-		&& d2 != NULL)
+	if ((is_new || !value_check_lock(d1->dv_lock, arg_errmsg, TRUE))
+								 && d2 != NULL)
 	{
+	    if (is_new)
+	    {
+		d1 = dict_copy(d1, FALSE, get_copyID());
+		if (d1 == NULL)
+		    return;
+	    }
+
 	    // Check the third argument.
 	    if (argvars[2].v_type != VAR_UNKNOWN)
 	    {
@@ -2358,11 +2594,42 @@
 
 	    dict_extend(d1, d2, action);
 
-	    copy_tv(&argvars[0], rettv);
+	    if (is_new)
+	    {
+		rettv->v_type = VAR_DICT;
+		rettv->vval.v_dict = d1;
+		rettv->v_lock = FALSE;
+	    }
+	    else
+		copy_tv(&argvars[0], rettv);
 	}
     }
     else
-	semsg(_(e_listdictarg), "extend()");
+	semsg(_(e_listdictarg), is_new ? "extendnew()" : "extend()");
+}
+
+/*
+ * "extend(list, list [, idx])" function
+ * "extend(dict, dict [, action])" function
+ */
+    void
+f_extend(typval_T *argvars, typval_T *rettv)
+{
+    char_u      *errmsg = (char_u *)N_("extend() argument");
+
+    extend(argvars, rettv, errmsg, FALSE);
+}
+
+/*
+ * "extendnew(list, list [, idx])" function
+ * "extendnew(dict, dict [, action])" function
+ */
+    void
+f_extendnew(typval_T *argvars, typval_T *rettv)
+{
+    char_u      *errmsg = (char_u *)N_("extendnew() argument");
+
+    extend(argvars, rettv, errmsg, TRUE);
 }
 
 /*
@@ -2519,7 +2786,7 @@
 }
 
 /*
- * "reduce(list, { accumlator, element -> value } [, initial])" function
+ * "reduce(list, { accumulator, element -> value } [, initial])" function
  */
     void
 f_reduce(typval_T *argvars, typval_T *rettv)
@@ -2545,8 +2812,11 @@
     }
     else
 	func_name = tv_get_string(&argvars[1]);
-    if (*func_name == NUL)
-	return;		// type error or empty name
+    if (func_name == NULL || *func_name == NUL)
+    {
+	emsg(_(e_missing_function_argument));
+	return;
+    }
 
     vim_memset(&funcexe, 0, sizeof(funcexe));
     funcexe.evaluate = TRUE;
diff -Nru vim-8.2.1913/src/macros.h vim-8.2.2434/src/macros.h
--- vim-8.2.1913/src/macros.h	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/macros.h	2021-01-30 22:05:11.000000000 +0000
@@ -158,10 +158,9 @@
 # define mch_access(n, p)	access(vms_fixfilename(n), (p))
 				// see mch_open() comment
 # define mch_fopen(n, p)	fopen(vms_fixfilename(n), (p))
-# define mch_fstat(n, p)	fstat(vms_fixfilename(n), (p))
-	// VMS does not have lstat()
+# define mch_fstat(n, p)	fstat((n), (p))
+# undef HAVE_LSTAT	        // VMS does not have lstat()
 # define mch_stat(n, p)		stat(vms_fixfilename(n), (p))
-# define mch_rmdir(n)		rmdir(vms_fixfilename(n))
 #else
 # ifndef MSWIN
 #   define mch_access(n, p)	access((n), (p))
diff -Nru vim-8.2.1913/src/main.c vim-8.2.2434/src/main.c
--- vim-8.2.1913/src/main.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/main.c	2021-01-30 22:05:11.000000000 +0000
@@ -432,6 +432,13 @@
     if (p_lpl)
     {
 	char_u *rtp_copy = NULL;
+	char_u *plugin_pattern = (char_u *)
+# if defined(VMS) || defined(AMIGA) // VMS and Amiga don't handle the "**".
+		"plugin/*.vim"
+# else
+		"plugin/**/*.vim"
+# endif
+		;
 
 	// First add all package directories to 'runtimepath', so that their
 	// autoload directories can be found.  Only if not done already with a
@@ -444,12 +451,7 @@
 	    add_pack_start_dirs();
 	}
 
-	source_in_path(rtp_copy == NULL ? p_rtp : rtp_copy,
-# ifdef VMS	// Somehow VMS doesn't handle the "**".
-		(char_u *)"plugin/*.vim",
-# else
-		(char_u *)"plugin/**/*.vim",
-# endif
+	source_in_path(rtp_copy == NULL ? p_rtp : rtp_copy, plugin_pattern,
 		DIP_ALL | DIP_NOAFTER, NULL);
 	TIME_MSG("loading plugins");
 	vim_free(rtp_copy);
@@ -460,13 +462,8 @@
 	    load_start_packages();
 	TIME_MSG("loading packages");
 
-# ifdef VMS	// Somehow VMS doesn't handle the "**".
-	source_runtime((char_u *)"plugin/*.vim", DIP_ALL | DIP_AFTER);
-# else
-	source_runtime((char_u *)"plugin/**/*.vim", DIP_ALL | DIP_AFTER);
-# endif
+	source_runtime(plugin_pattern, DIP_ALL | DIP_AFTER);
 	TIME_MSG("loading after plugins");
-
     }
 #endif
 
@@ -1508,7 +1505,8 @@
 
 
 /*
- * Exit properly.
+ * Exit properly.  This is the only way to exit Vim after startup has
+ * succeeded.  We are certain to exit here, no way to abort it.
  */
     void
 getout(int exitval)
@@ -1524,6 +1522,11 @@
     if (exmode_active)
 	exitval += ex_exitval;
 
+#ifdef FEAT_EVAL
+    set_vim_var_type(VV_EXITING, VAR_NUMBER);
+    set_vim_var_nr(VV_EXITING, exitval);
+#endif
+
     // Position the cursor on the last screen line, below all the text
 #ifdef FEAT_GUI
     if (!gui.in_use)
@@ -2706,7 +2709,6 @@
     set_buflisted(TRUE);
 
     // Create memfile and read from stdin.
-    // This will also dup stdin from stderr to read commands from.
     (void)open_buffer(TRUE, NULL, 0);
 
     no_wait_return = FALSE;
@@ -2714,6 +2716,14 @@
     TIME_MSG("reading stdin");
 
     check_swap_exists_action();
+
+#if !(defined(AMIGA) || defined(MACOS_X))
+    // Dup stdin from stderr to read commands from, so that shell commands
+    // work.
+    // TODO: why is this needed, even though readfile() has done this?
+    close(0);
+    vim_ignored = dup(2);
+#endif
 }
 
 /*
@@ -3259,9 +3269,8 @@
     int		is_viminit) // when TRUE, called for VIMINIT
 {
     char_u	*initstr;
-#ifdef FEAT_EVAL
     sctx_T	save_current_sctx;
-#endif
+
     ESTACK_CHECK_DECLARATION
 
     if ((initstr = mch_getenv(env)) != NULL && *initstr != NUL)
@@ -3270,20 +3279,19 @@
 	    vimrc_found(NULL, NULL);
 	estack_push(ETYPE_ENV, env, 0);
 	ESTACK_CHECK_SETUP
-#ifdef FEAT_EVAL
 	save_current_sctx = current_sctx;
+	current_sctx.sc_version = 1;
+#ifdef FEAT_EVAL
 	current_sctx.sc_sid = SID_ENV;
 	current_sctx.sc_seq = 0;
 	current_sctx.sc_lnum = 0;
-	current_sctx.sc_version = 1;
 #endif
+
 	do_cmdline_cmd(initstr);
 
 	ESTACK_CHECK_NOW
 	estack_pop();
-#ifdef FEAT_EVAL
 	current_sctx = save_current_sctx;
-#endif
 	return OK;
     }
     return FAIL;
diff -Nru vim-8.2.1913/src/Make_cyg_ming.mak vim-8.2.2434/src/Make_cyg_ming.mak
--- vim-8.2.1913/src/Make_cyg_ming.mak	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/Make_cyg_ming.mak	2021-01-30 22:05:11.000000000 +0000
@@ -220,7 +220,6 @@
 else
 WINDRES := windres
 endif
-WINDRES_CC = $(CC)
 
 # Get the default ARCH.
 ifndef ARCH
@@ -514,7 +513,8 @@
 
 CFLAGS = -I. -Iproto $(DEFINES) -pipe -march=$(ARCH) -Wall
 CXXFLAGS = -std=gnu++11
-WINDRES_FLAGS = --preprocessor="$(WINDRES_CC) -E -xc" -DRC_INVOKED
+# This used to have --preprocessor, but it's no longer supported
+WINDRES_FLAGS =
 EXTRA_LIBS =
 
 ifdef GETTEXT
@@ -1055,17 +1055,23 @@
 uninstall.exe: uninstall.c dosinst.h version.h
 	$(CC) $(CFLAGS) -o uninstall.exe uninstall.c $(LIB) -lole32
 
+$(OBJ): | $(OUTDIR)
+
+$(EXEOBJG): | $(OUTDIR)
+
+$(EXEOBJC): | $(OUTDIR)
+
 ifeq ($(VIMDLL),yes)
-$(TARGET): $(OUTDIR) $(OBJ)
+$(TARGET): $(OBJ)
 	$(LINK) $(CFLAGS) $(LFLAGS) -o $@ $(OBJ) $(LIB) -lole32 -luuid -lgdi32 $(LUA_LIB) $(MZSCHEME_LIBDIR) $(MZSCHEME_LIB) $(PYTHONLIB) $(PYTHON3LIB) $(RUBYLIB)
 
-$(GVIMEXE): $(OUTDIR) $(EXEOBJG) $(VIMDLLBASE).dll
+$(GVIMEXE): $(EXEOBJG) $(VIMDLLBASE).dll
 	$(CC) -L. $(EXELFLAGS) -mwindows -o $@ $(EXEOBJG) -l$(VIMDLLBASE)
 
-$(VIMEXE): $(OUTDIR) $(EXEOBJC) $(VIMDLLBASE).dll
+$(VIMEXE): $(EXEOBJC) $(VIMDLLBASE).dll
 	$(CC) -L. $(EXELFLAGS) -o $@ $(EXEOBJC) -l$(VIMDLLBASE)
 else
-$(TARGET): $(OUTDIR) $(OBJ)
+$(TARGET): $(OBJ)
 	$(LINK) $(CFLAGS) $(LFLAGS) -o $@ $(OBJ) $(LIB) -lole32 -luuid $(LUA_LIB) $(MZSCHEME_LIBDIR) $(MZSCHEME_LIB) $(PYTHONLIB) $(PYTHON3LIB) $(RUBYLIB)
 endif
 
@@ -1280,7 +1286,7 @@
 	$(CC) -c $(CFLAGS) $< -o $@
 
 
-$(PATHDEF_SRC): Make_cyg_ming.mak Make_cyg.mak Make_ming.mak
+$(PATHDEF_SRC): Make_cyg_ming.mak Make_cyg.mak Make_ming.mak | $(OUTDIR)
 ifneq (sh.exe, $(SHELL))
 	@echo creating $(PATHDEF_SRC)
 	@echo '/* pathdef.c */' > $(PATHDEF_SRC)
diff -Nru vim-8.2.1913/src/Makefile vim-8.2.2434/src/Makefile
--- vim-8.2.1913/src/Makefile	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/Makefile	2021-01-30 22:05:11.000000000 +0000
@@ -2293,11 +2293,13 @@
 	$(VALGRIND) ./$(MESSAGE_TEST_TARGET) || exit 1; echo $* passed;
 
 # Run the libvterm tests.
-# This currently doesn't work on Mac, only run on Linux for now.
+# This works only on GNU make, not on BSD make.
+# Libtool requires "gcc".
 test_libvterm:
-	@if test `uname` = "Linux"; then \
-		cd libvterm; $(MAKE) -f Makefile test \
-			CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"; \
+	@if $(MAKE) --version 2>/dev/null | grep -qs "GNU Make"; then \
+	  if test -x "/usr/bin/gcc"; then \
+	    cd libvterm; $(MAKE) -f Makefile test CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"; \
+	  fi \
 	fi
 
 # Run individual OLD style test.
diff -Nru vim-8.2.1913/src/Make_mvc.mak vim-8.2.2434/src/Make_mvc.mak
--- vim-8.2.1913/src/Make_mvc.mak	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/Make_mvc.mak	2021-01-30 22:05:11.000000000 +0000
@@ -15,11 +15,7 @@
 # This will build the console version of Vim with no additional interfaces.
 # To add features, define any of the following:
 #
-# 	For MSVC 11, if you want to include Win32.mak, you need to specify
-# 	where the file is, e.g.:
-# 	   SDK_INCLUDE_DIR="C:\Program Files\Microsoft SDKs\Windows\v7.1\Include"
-#
-#	!!!!  After changing features do "nmake clean" first  !!!!
+#	!!!!  After changing any features do "nmake clean" first  !!!!
 #
 #	Feature Set: FEATURES=[TINY, SMALL, NORMAL, BIG, HUGE] (default is HUGE)
 #
@@ -209,9 +205,6 @@
 OBJDIR = $(OBJDIR)d
 !endif
 
-# If you include Win32.mak, it requires that CPU be set appropriately.
-# To cross-compile for Win64, set CPU=AMD64 or CPU=IA64.
-
 !ifdef PROCESSOR_ARCHITECTURE
 # We're on Windows NT or using VC 6+
 ! ifdef CPU
@@ -251,18 +244,7 @@
 MAKEFLAGS_GVIMEXT = DEBUG=yes
 !endif
 
-
-# Get all sorts of useful, standard macros from the Platform SDK,
-# if SDK_INCLUDE_DIR is set or USE_WIN32MAK is set to "yes".
-
-!ifdef SDK_INCLUDE_DIR
-! include $(SDK_INCLUDE_DIR)\Win32.mak
-!elseif "$(USE_WIN32MAK)"=="yes"
-! include <Win32.mak>
-!else
 link = link
-!endif
-
 
 # Check VC version.
 !if [echo MSVCVER=_MSC_VER> msvcver.c && $(CC) /EP msvcver.c > msvcver.~ 2> nul]
diff -Nru vim-8.2.1913/src/Make_vms.mms vim-8.2.2434/src/Make_vms.mms
--- vim-8.2.1913/src/Make_vms.mms	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/Make_vms.mms	2021-01-30 22:05:11.000000000 +0000
@@ -2,7 +2,7 @@
 # Makefile for Vim on OpenVMS
 #
 # Maintainer:   Zoltan Arpadffy <arpadffy@polarhome.com>
-# Last change:  2020 Aug 13
+# Last change:  2021 Jan 04
 #
 # This script has been tested on VMS 6.2 to 8.4 on DEC Alpha, VAX and IA64
 # with MMS and MMK
@@ -38,13 +38,13 @@
 # GUI or terminal mode executable.
 # Comment out if you want just the character terminal mode only.
 # GUI with Motif
-GUI = YES
+# GUI = YES
 
 # GUI with GTK
 # If you have GTK installed you might want to enable this option.
 # NOTE: you will need to properly define GTK_DIR below
-# NOTE: since Vim 7.3 GTK 2+ is used that is not ported to VMS, 
-#       therefore this option should not be used  
+# NOTE: since Vim 7.3 GTK 2+ is used that is not ported to VMS,
+#       therefore this option should not be used
 # GTK = YES
 
 # GUI/Motif with XPM
@@ -59,7 +59,7 @@
 
 # Uncomment if want a debug version. Resulting executable is DVIM.EXE
 # Development purpose only! Normally, it should not be defined. !!!
-# DEBUG = YES 
+# DEBUG = YES
 
 # Languages support for Perl, Python, TCL etc.
 # If you don't need it really, leave them behind the comment.
@@ -68,6 +68,7 @@
 # VIM_PERL   = YES
 # VIM_PYTHON = YES
 # VIM_RUBY   = YES
+# VIM_LUA    = YES
 
 # X Input Method.  For entering special languages like chinese and
 # Japanese.
@@ -97,7 +98,7 @@
 .IFDEF MMSVAX
 .IFDEF DECC	     # VAX with DECC
 CC_DEF  = cc # /decc # some versions require /decc switch but when it is not required /ver might fail
-PREFIX  = /prefix=all
+PREFIX  = /prefix=all/name=(upper,short)
 OPTIMIZE= /noopt     # do not optimize on VAX. The compiler has hard time with crypto functions
 .ELSE		     # VAX with VAXC
 CC_DEF	= cc
@@ -107,7 +108,7 @@
 .ENDIF
 .ELSE		     # AXP and IA64 with DECC
 CC_DEF  = cc
-PREFIX  = /prefix=all
+PREFIX  = /prefix=all/name=(upper,short)
 OPTIMIZE= /opt
 .ENDIF
 
@@ -165,7 +166,7 @@
 GTK_DIR  = DKA0:[WORK.GTK1210.]
 DEFS     = "HAVE_CONFIG_H","FEAT_GUI_GTK"
 LIBS     = ,OS_VMS_GTK.OPT/OPT
-GUI_FLAG = /name=(as_is,short)/float=ieee/ieee=denorm
+GUI_FLAG = /float=ieee/ieee=denorm
 GUI_SRC  = gui.c gui_gtk.c gui_gtk_f.c gui_gtk_x11.c gui_beval.c pty.c
 GUI_OBJ  = gui.obj gui_gtk.obj gui_gtk_f.obj gui_gtk_x11.obj gui_beval.obj pty.obj
 GUI_INC  = ,"/gtk_root/gtk","/gtk_root/glib"
@@ -177,9 +178,10 @@
 .IFDEF XPM
 DEFS     = "HAVE_CONFIG_H","FEAT_GUI_MOTIF","HAVE_XPM"
 XPM_INC  = ,[.xpm.include]
+XPM_LIB  = ,OS_VMS_XPM.OPT/OPT
 .ELSE
 DEFS     = "HAVE_CONFIG_H","FEAT_GUI_MOTIF"
-XPM_INC  = 
+XPM_INC  =
 .ENDIF
 LIBS     = ,OS_VMS_MOTIF.OPT/OPT
 GUI_FLAG =
@@ -236,6 +238,15 @@
 RUBY_INC =
 .ENDIF
 
+.IFDEF VIM_LUA
+# LUA related setup.
+LUA_DEF = ,"FEAT_LUA"
+LUA_SRC = if_lua.c
+LUA_OBJ = if_lua.obj
+LUA_LIB = ,OS_VMS_LUA.OPT/OPT
+LUA_INC = ,LUA$ROOT:[INCLUDE]
+.ENDIF
+
 .IFDEF VIM_XIM
 # XIM related setup.
 .IFDEF GUI
@@ -246,7 +257,7 @@
 .IFDEF VIM_MZSCHEME
 # MZSCHEME related setup
 MZSCH_DEF = ,"FEAT_MZSCHEME"
-MZSCH_SRC = if_mzsch.c 
+MZSCH_SRC = if_mzsch.c
 MZSCH_OBJ = if_mzsch.obj
 .ENDIF
 
@@ -257,7 +268,7 @@
 
 # XDIFF related setup.
 XDIFF_SRC = xdiffi.c,xemit.c,xprepare.c,xutils.c,xhistogram.c,xpatience.c
-XDIFF_OBJ = xdiffi.obj,xemit.obj,xprepare.obj,xutils.obj,xhistogram.obj,xpatience.obj 
+XDIFF_OBJ = xdiffi.obj,xemit.obj,xprepare.obj,xutils.obj,xhistogram.obj,xpatience.obj
 XDIFF_INC = ,[.xdiff]
 
 ######################################################################
@@ -274,7 +285,7 @@
 .SUFFIXES : .obj .c
 
 ALL_CFLAGS = /def=($(MODEL_DEF)$(DEFS)$(DEBUG_DEF)$(PERL_DEF)$(PYTHON_DEF) -
- $(TCL_DEF)$(RUBY_DEF)$(XIM_DEF)$(TAG_DEF)$(MZSCH_DEF) -
+ $(TCL_DEF)$(RUBY_DEF)$(LUA_DEF)$(XIM_DEF)$(TAG_DEF)$(MZSCH_DEF) -
  $(ICONV_DEF)) -
  $(CFLAGS)$(GUI_FLAG) -
  /include=($(C_INC)$(GUI_INC_DIR)$(GUI_INC)$(PERL_INC)$(PYTHON_INC) -
@@ -285,14 +296,14 @@
 # as $(GUI_INC) - replaced with $(GUI_INC_VER)
 # Otherwise should not be any other difference.
 ALL_CFLAGS_VER = /def=($(MODEL_DEF)$(DEFS)$(DEBUG_DEF)$(PERL_DEF)$(PYTHON_DEF) -
- $(TCL_DEF)$(RUBY_DEF)$(XIM_DEF)$(TAG_DEF)$(MZSCH_DEF) - 
+ $(TCL_DEF)$(RUBY_DEF)$(LUA_DEF)$(XIM_DEF)$(TAG_DEF)$(MZSCH_DEF) -
  $(ICONV_DEF)) -
  $(CFLAGS)$(GUI_FLAG) -
  /include=($(C_INC)$(GUI_INC_DIR)$(GUI_INC_VER)$(PERL_INC)$(PYTHON_INC) -
  $(TCL_INC)$(XDIFF_INC)$(XPM_INC))
 
-ALL_LIBS = $(LIBS) $(GUI_LIB_DIR) $(GUI_LIB) \
-	   $(PERL_LIB) $(PYTHON_LIB) $(TCL_LIB) $(RUBY_LIB)
+ALL_LIBS = $(LIBS) $(GUI_LIB_DIR) $(GUI_LIB) $(XPM_LIB)\
+	   $(PERL_LIB) $(PYTHON_LIB) $(TCL_LIB) $(RUBY_LIB) $(LUA_LIB)
 
 SRC = \
 	arabic.c \
@@ -407,6 +418,7 @@
 	$(PYTHON_SRC) \
 	$(TCL_SRC) \
 	$(RUBY_SRC) \
+	$(LUA_SRC) \
 	$(MZSCH_SRC) \
 	$(XDIFF_SRC)
 
@@ -524,11 +536,12 @@
 	$(PYTHON_OBJ) \
 	$(TCL_OBJ) \
 	$(RUBY_OBJ) \
+	$(LUA_OBJ) \
 	$(MZSCH_OBJ) \
 	$(XDIFF_OBJ)
 
 # Default target is making the executable
-all : [.auto]config.h mmk_compat motif_env gtk_env perl_env python_env tcl_env ruby_env $(TARGET)
+all : [.auto]config.h mmk_compat motif_env gtk_env perl_env python_env tcl_env ruby_env lua_env $(TARGET)
 	! $@
 
 [.auto]config.h : $(CONFIG_H)
@@ -546,6 +559,7 @@
 	-@ if "''F$SEARCH("pathdef.c")'" .NES. "" then delete/noconfirm/nolog pathdef.c;*
 	-@ if "''F$SEARCH("if_perl.c")'" .NES. "" then delete/noconfirm/nolog if_perl.c;*
 	-@ if "''F$SEARCH("*.opt")'" .NES. "" then delete/noconfirm/nolog *.opt;*
+	-@ if "''F$SEARCH("*.dmp")'" .NES. "" then delete/noconfirm/nolog *.dmp;*
 
 # Link the target
 $(TARGET) : $(OBJ)
@@ -599,6 +613,18 @@
 motif_env :
 .IFDEF XPM
 	-@ write sys$output "using DECW/Motif/XPM environment."
+        -@ write sys$output "creating OS_VMS_XPM.OPT file."
+	-@ open/write opt_file OS_VMS_XPM.OPT
+.IFDEF MMSVAX
+	-@ write opt_file "[.xpm.vms.vax]libxpm.olb/lib"
+.ENDIF
+.IFDEF MMSALPHA
+	-@ write opt_file "[.xpm.vms.axp]libxpm.olb/lib"
+.ENDIF
+.IFDEF MMSIA64
+	-@ write opt_file "[.xpm.vms.ia64]libxpm.olb/lib"
+.ENDIF
+	-@ close opt_file
 .ELSE
 	-@ write sys$output "using DECW/Motif environment."
 .ENDIF
@@ -695,11 +721,24 @@
 	-@ !
 .ENDIF
 
+.IFDEF VIM_LUA
+lua_env :
+	-@ write sys$output "using LUA environment:"
+	-@ write sys$output "    include path: ""$(LUA_INC)"""
+	-@ write sys$output "creating OS_VMS_LUA.OPT file."
+	-@ open/write opt_file OS_VMS_LUA.OPT
+	-@ write opt_file "LUA$ROOT:[LIB]LUA$SHR.EXE /share"
+	-@ close opt_file
+.ELSE
+lua_env :
+	-@ !
+.ENDIF
+
 arabic.obj : arabic.c vim.h
 arglist.obj : arglist.c vim.h [.auto]config.h feature.h os_unix.h
 autocmd.obj : autocmd.c vim.h [.auto]config.h feature.h os_unix.h
 blowfish.obj : blowfish.c vim.h [.auto]config.h feature.h os_unix.h
-blob.obj : blob.c vim.h [.auto]config.h feature.h os_unix.h	
+blob.obj : blob.c vim.h [.auto]config.h feature.h os_unix.h
 buffer.obj : buffer.c vim.h [.auto]config.h feature.h os_unix.h \
  ascii.h keymap.h term.h macros.h structs.h regexp.h \
  gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
@@ -859,7 +898,7 @@
 if_mzsch.obj : if_mzsch.c vim.h [.auto]config.h feature.h os_unix.h \
  ascii.h keymap.h term.h macros.h option.h structs.h \
  regexp.h gui.h beval.h [.proto]gui_beval.pro ex_cmds.h proto.h \
- errors.h globals.h if_mzsch.h 
+ errors.h globals.h if_mzsch.h
 indent.obj : indent.c vim.h [.auto]config.h feature.h os_unix.h
 insexpand.obj : insexpand.c vim.h [.auto]config.h feature.h os_unix.h
 json.obj : json.c vim.h [.auto]config.h feature.h os_unix.h   \
@@ -1153,6 +1192,8 @@
  ascii.h keymap.h term.h macros.h structs.h regexp.h \
  gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
  errors.h globals.h version.h
+if_lua.obj : if_lua.c vim.h [.auto]config.h feature.h os_unix.h \
+ errors.h globals.h version.h
 beval.obj : beval.c vim.h [.auto]config.h feature.h os_unix.h \
  ascii.h keymap.h term.h macros.h structs.h regexp.h \
  gui.h beval.h option.h ex_cmds.h proto.h \
@@ -1172,4 +1213,4 @@
 xprepare.obj : [.xdiff]xprepare.c [.xdiff]xinclude.h [.auto]config.h vim.h feature.h os_unix.h
 xutils.obj : [.xdiff]xutils.c [.xdiff]xinclude.h [.auto]config.h vim.h feature.h os_unix.h
 xhistogram.obj : [.xdiff]xhistogram.c [.xdiff]xinclude.h [.auto]config.h vim.h feature.h os_unix.h
-xpatience.obj : [.xdiff]xpatience.c [.xdiff]xinclude.h [.auto]config.h vim.h feature.h os_unix.h	
+xpatience.obj : [.xdiff]xpatience.c [.xdiff]xinclude.h [.auto]config.h vim.h feature.h os_unix.h
diff -Nru vim-8.2.1913/src/map.c vim-8.2.2434/src/map.c
--- vim-8.2.1913/src/map.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/map.c	2021-01-30 22:05:11.000000000 +0000
@@ -1639,8 +1639,7 @@
  * Returns NULL when out of memory.
  */
     char_u *
-vim_strsave_escape_csi(
-    char_u *p)
+vim_strsave_escape_csi(char_u *p)
 {
     char_u	*res;
     char_u	*s, *d;
@@ -2222,7 +2221,7 @@
     if (did_simplify)
     {
 	// When the lhs is being simplified the not-simplified keys are
-	// preferred for priting, like in do_map().
+	// preferred for printing, like in do_map().
 	// The "rhs" and "buffer_local" values are not expected to change.
 	mp_simplified = mp;
 	(void)replace_termcodes(keys, &alt_keys_buf,
@@ -2476,7 +2475,7 @@
     char_u	*s;
     char_u	*cpo_save = p_cpo;
 
-    p_cpo = (char_u *)"";	// Allow <> notation
+    p_cpo = empty_option;	// Allow <> notation
     s = vim_strsave(map);
     if (s != NULL)
     {
diff -Nru vim-8.2.1913/src/mark.c vim-8.2.2434/src/mark.c
--- vim-8.2.1913/src/mark.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/mark.c	2021-01-30 22:05:11.000000000 +0000
@@ -140,9 +140,6 @@
     int		i;
     xfmark_T	*fm;
 #endif
-#ifdef JUMPLIST_ROTATE
-    xfmark_T	tempmark;
-#endif
 
     // for :global the mark is set only once
     if (global_busy || listcmd_busy || (cmdmod.cmod_flags & CMOD_KEEPJUMPS))
@@ -152,24 +149,6 @@
     curwin->w_pcmark = curwin->w_cursor;
 
 #ifdef FEAT_JUMPLIST
-# ifdef JUMPLIST_ROTATE
-    /*
-     * If last used entry is not at the top, put it at the top by rotating
-     * the stack until it is (the newer entries will be at the bottom).
-     * Keep one entry (the last used one) at the top.
-     */
-    if (curwin->w_jumplistidx < curwin->w_jumplistlen)
-	++curwin->w_jumplistidx;
-    while (curwin->w_jumplistidx < curwin->w_jumplistlen)
-    {
-	tempmark = curwin->w_jumplist[curwin->w_jumplistlen - 1];
-	for (i = curwin->w_jumplistlen - 1; i > 0; --i)
-	    curwin->w_jumplist[i] = curwin->w_jumplist[i - 1];
-	curwin->w_jumplist[0] = tempmark;
-	++curwin->w_jumplistidx;
-    }
-# endif
-
     // If jumplist is full: remove oldest entry
     if (++curwin->w_jumplistlen > JUMPLISTSIZE)
     {
diff -Nru vim-8.2.1913/src/mbyte.c vim-8.2.2434/src/mbyte.c
--- vim-8.2.1913/src/mbyte.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/mbyte.c	2021-01-30 22:05:11.000000000 +0000
@@ -4299,7 +4299,7 @@
     return count;
 }
 
-#if defined(FEAT_SPELL) || defined(PROTO)
+#if (defined(FEAT_SPELL) || defined(FEAT_EVAL)) || defined(PROTO)
 /*
  * Like mb_charlen() but for a string with specified length.
  */
@@ -5551,13 +5551,8 @@
     void
 f_charclass(typval_T *argvars, typval_T *rettv UNUSED)
 {
-    if (argvars[0].v_type != VAR_STRING
-	    || argvars[0].vval.v_string == NULL
-	    || *argvars[0].vval.v_string == NUL)
-    {
-	emsg(_(e_stringreq));
+    if (check_for_string(&argvars[0]) == FAIL)
 	return;
-    }
     rettv->vval.v_number = mb_get_class(argvars[0].vval.v_string);
 }
 #endif
diff -Nru vim-8.2.1913/src/memfile.c vim-8.2.2434/src/memfile.c
--- vim-8.2.1913/src/memfile.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/memfile.c	2021-01-30 22:05:11.000000000 +0000
@@ -507,17 +507,6 @@
 	mf_ins_free(mfp, hp);	// put *hp in the free list
 }
 
-#if defined(__MORPHOS__) && defined(__libnix__)
-// function is missing in MorphOS libnix version
-extern unsigned long *__stdfiledes;
-
-    static unsigned long
-fdtofh(int filedescriptor)
-{
-    return __stdfiledes[filedescriptor];
-}
-#endif
-
 /*
  * Sync the memory file *mfp to disk.
  * Flags:
diff -Nru vim-8.2.1913/src/memline.c vim-8.2.2434/src/memline.c
--- vim-8.2.1913/src/memline.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/memline.c	2021-01-30 22:05:11.000000000 +0000
@@ -1690,7 +1690,17 @@
 	}
 	else
 	    msg(_("Recovery completed. Buffer contents equals file contents."));
-	msg_puts(_("\nYou may want to delete the .swp file now.\n\n"));
+	msg_puts(_("\nYou may want to delete the .swp file now."));
+#if defined(UNIX) || defined(MSWIN)
+	if (mch_process_running(char_to_long(b0p->b0_pid)))
+	{
+	    // Warn there could be an active Vim on the same file, the user may
+	    // want to kill it.
+	    msg_puts(_("\nNote: process STILL RUNNING: "));
+	    msg_outnum(char_to_long(b0p->b0_pid));
+	}
+#endif
+	msg_puts("\n\n");
 	cmdline_row = msg_row;
     }
 #ifdef FEAT_CRYPT
@@ -2230,14 +2240,31 @@
 	ret = FALSE;
 
 #if defined(UNIX) || defined(MSWIN)
+    // Host name must be known and must equal the current host name, otherwise
+    // comparing pid is meaningless.
+    if (*(b0.b0_hname) == NUL)
+    {
+	ret = FALSE;
+    }
+    else
+    {
+	char_u	    hostname[B0_HNAME_SIZE];
+
+	mch_get_host_name(hostname, B0_HNAME_SIZE);
+	hostname[B0_HNAME_SIZE - 1] = NUL;
+	b0.b0_hname[B0_HNAME_SIZE - 1] = NUL; // in case of corruption
+	if (STRICMP(b0.b0_hname, hostname) != 0)
+	    ret = FALSE;
+    }
+
     // process must be known and not be running
     pid = char_to_long(b0.b0_pid);
     if (pid == 0L || mch_process_running(pid))
 	ret = FALSE;
 #endif
 
-    // TODO: Should we check if the swap file was created on the current
-    // system?  And the current user?
+    // We do not check the user, it should be irrelevant for whether the swap
+    // file is still useful.
 
     close(fd);
     return ret;
@@ -5535,7 +5562,7 @@
 		     && buf->b_ml.ml_line_count - line <= 1)
 	{
 	    /*
-	     * We are in the last chunk and it is cheap to crate a new one
+	     * We are in the last chunk and it is cheap to create a new one
 	     * after this. Do it now to avoid the loop above later on
 	     */
 	    curchnk = buf->b_ml.ml_chunksize + curix + 1;
@@ -5674,6 +5701,10 @@
 
     while ((lnum != 0 && curline < lnum) || (offset != 0 && size < offset))
     {
+#ifdef FEAT_PROP_POPUP
+	size_t textprop_total = 0;
+#endif
+
 	if (curline > buf->b_ml.ml_line_count
 		|| (hp = ml_find_line(buf, curline, ML_FIND)) == NULL)
 	    return -1;
@@ -5695,18 +5726,16 @@
 	}
 	else
 	{
-#ifdef FEAT_PROP_POPUP
-	    size_t textprop_total = 0;
-	    size_t textprop_size = 0;
-	    char_u *l1, *l2;
-#endif
-
 	    extra = 0;
 	    for (;;)
 	    {
 #ifdef FEAT_PROP_POPUP
+		size_t textprop_size = 0;
+
 		if (buf->b_has_textprop)
 		{
+		    char_u *l1, *l2;
+
 		    // compensate for the extra bytes taken by textprops
 		    l1 = (char_u *)dp + ((dp->db_index[idx]) & DB_INDEX_MASK);
 		    l2 = (char_u *)dp + (idx == 0 ? dp->db_txt_end
@@ -5736,7 +5765,7 @@
 	    }
 	}
 #ifdef FEAT_PROP_POPUP
-	if (buf->b_has_textprop)
+	if (buf->b_has_textprop && lnum != 0)
 	{
 	    int i;
 
@@ -5744,12 +5773,18 @@
 	    // lengths.
 	    len = 0;
 	    for (i = start_idx; i <= idx; ++i)
-		len += (int)STRLEN((char_u *)dp
-				    + ((dp->db_index[i]) & DB_INDEX_MASK)) + 1;
+	    {
+		char_u *p = (char_u *)dp + ((dp->db_index[i]) & DB_INDEX_MASK);
+		len += (int)STRLEN(p) + 1;
+	    }
 	}
 	else
 #endif
-	    len = text_end - ((dp->db_index[idx]) & DB_INDEX_MASK);
+	    len = text_end - ((dp->db_index[idx]) & DB_INDEX_MASK)
+#ifdef FEAT_PROP_POPUP
+				- (long)textprop_total
+#endif
+				;
 	size += len;
 	if (offset != 0 && size >= offset)
 	{
@@ -5759,7 +5794,11 @@
 		*offp = offset - size + len;
 	    else
 		*offp = offset - size + len
-		     - (text_end - ((dp->db_index[idx - 1]) & DB_INDEX_MASK));
+		     - (text_end - ((dp->db_index[idx - 1]) & DB_INDEX_MASK))
+#ifdef FEAT_PROP_POPUP
+		     + (long)textprop_total
+#endif
+		     ;
 	    curline += idx - start_idx + extra;
 	    if (curline > buf->b_ml.ml_line_count)
 		return -1;	// exactly one byte beyond the end
diff -Nru vim-8.2.1913/src/menu.c vim-8.2.2434/src/menu.c
--- vim-8.2.1913/src/menu.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/menu.c	2021-01-30 22:05:11.000000000 +0000
@@ -2310,11 +2310,7 @@
     if (idx < 0)
     {
 	// Use the Insert mode entry when returning to Insert mode.
-	if (restart_edit
-#ifdef FEAT_EVAL
-		&& !current_sctx.sc_sid
-#endif
-		)
+	if (restart_edit && !current_sctx.sc_sid)
 	{
 	    idx = MENU_INDEX_INSERT;
 	}
@@ -2384,11 +2380,7 @@
 	// When executing a script or function execute the commands right now.
 	// Also for the window toolbar.
 	// Otherwise put them in the typeahead buffer.
-	if (eap == NULL
-#ifdef FEAT_EVAL
-		|| current_sctx.sc_sid != 0
-#endif
-	   )
+	if (eap == NULL || current_sctx.sc_sid != 0)
 	{
 	    save_state_T save_state;
 
diff -Nru vim-8.2.1913/src/message.c vim-8.2.2434/src/message.c
--- vim-8.2.1913/src/message.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/message.c	2021-01-30 22:05:11.000000000 +0000
@@ -659,7 +659,7 @@
 	    return TRUE;
 	}
 
-	if (emsg_assert_fails_used && emsg_assert_fails_msg == NULL)
+	if (in_assert_fails && emsg_assert_fails_msg == NULL)
 	{
 	    emsg_assert_fails_msg = vim_strsave(s);
 	    emsg_assert_fails_lnum = SOURCING_LNUM;
@@ -697,6 +697,12 @@
 		}
 		redir_write(s, -1);
 	    }
+#ifdef FEAT_EVAL
+	    // Only increment did_emsg_def when :silent! wasn't used inside the
+	    // :def function.
+	    if (emsg_silent == emsg_silent_def)
+		++did_emsg_def;
+#endif
 #ifdef FEAT_JOB_CHANNEL
 	    ch_log(NULL, "ERROR silent: %s", (char *)s);
 #endif
@@ -1859,7 +1865,11 @@
 	else if (has_mbyte && (l = (*mb_ptr2len)(s)) > 1)
 	{
 	    col += (*mb_ptr2cells)(s);
-	    if (lcs_nbsp != NUL && list
+	    if (l >= MB_MAXBYTES)
+	    {
+		STRCPY(buf, "?");
+	    }
+	    else if (lcs_nbsp != NUL && list
 		    && (mb_ptr2char(s) == 160
 			|| mb_ptr2char(s) == 0x202f))
 	    {
diff -Nru vim-8.2.1913/src/misc1.c vim-8.2.2434/src/misc1.c
--- vim-8.2.1913/src/misc1.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/misc1.c	2021-01-30 22:05:11.000000000 +0000
@@ -1063,7 +1063,7 @@
     called_vim_beep = TRUE;
 #endif
 
-    if (emsg_silent == 0)
+    if (emsg_silent == 0 && !in_assert_fails)
     {
 	if (!((bo_flags & val) || (bo_flags & BO_ALL)))
 	{
@@ -2568,6 +2568,7 @@
  * But don't allow a space in the path, so that this works:
  *   "/usr/bin/csh --rcfile ~/.cshrc"
  * But don't do that for Windows, it's common to have a space in the path.
+ * Returns NULL when out of memory.
  */
     char_u *
 get_isolated_shell_name(void)
diff -Nru vim-8.2.1913/src/misc2.c vim-8.2.2434/src/misc2.c
--- vim-8.2.1913/src/misc2.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/misc2.c	2021-01-30 22:05:11.000000000 +0000
@@ -1131,7 +1131,7 @@
     free_signs();
 # endif
 # ifdef FEAT_EVAL
-    set_expr_line(NULL);
+    set_expr_line(NULL, NULL);
 # endif
 # ifdef FEAT_DIFF
     if (curtab != NULL)
@@ -2530,6 +2530,9 @@
     {K_PLUG,		(char_u *)"Plug"},
     {K_CURSORHOLD,	(char_u *)"CursorHold"},
     {K_IGNORE,		(char_u *)"Ignore"},
+    {K_COMMAND,		(char_u *)"Cmd"},
+    {K_FOCUSGAINED,	(char_u *)"FocusGained"},
+    {K_FOCUSLOST,	(char_u *)"FocusLost"},
     {0,			NULL}
     // NOTE: When adding a long name update MAX_KEY_NAME_LEN.
 };
diff -Nru vim-8.2.1913/src/mouse.c vim-8.2.2434/src/mouse.c
--- vim-8.2.1913/src/mouse.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/mouse.c	2021-01-30 22:05:11.000000000 +0000
@@ -2929,10 +2929,12 @@
 
     // skip line number and fold column in front of the line
     col -= win_col_off(win);
-    if (col < 0)
+    if (col <= 0)
     {
 #ifdef FEAT_NETBEANS_INTG
-	netbeans_gutter_click(lnum);
+	// if mouse is clicked on the gutter, then inform the netbeans server
+	if (*colp < win_col_off(win))
+	    netbeans_gutter_click(lnum);
 #endif
 	col = 0;
     }
diff -Nru vim-8.2.1913/src/move.c vim-8.2.2434/src/move.c
--- vim-8.2.1913/src/move.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/move.c	2021-01-30 22:05:11.000000000 +0000
@@ -196,6 +196,7 @@
     // the cursor line.
     if (!screen_valid(TRUE) || curwin->w_height == 0)
     {
+	check_cursor_lnum();
 	curwin->w_topline = curwin->w_cursor.lnum;
 	curwin->w_botline = curwin->w_topline;
 	curwin->w_valid |= VALID_BOTLINE|VALID_BOTLINE_AP;
@@ -540,6 +541,8 @@
 #endif
     // Approximate the value of w_botline
     wp->w_botline += lnum - wp->w_topline;
+    if (wp->w_botline > wp->w_buffer->b_ml.ml_line_count + 1)
+	wp->w_botline = wp->w_buffer->b_ml.ml_line_count + 1;
     wp->w_topline = lnum;
     wp->w_topline_was_set = TRUE;
 #ifdef FEAT_DIFF
@@ -594,8 +597,17 @@
     void
 validate_botline(void)
 {
-    if (!(curwin->w_valid & VALID_BOTLINE))
-	comp_botline(curwin);
+    validate_botline_win(curwin);
+}
+
+/*
+ * Make sure the value of wp->w_botline is valid.
+ */
+    void
+validate_botline_win(win_T *wp)
+{
+    if (!(wp->w_valid & VALID_BOTLINE))
+	comp_botline(wp);
 }
 
 /*
@@ -867,6 +879,9 @@
 	curwin->w_wcol = col;
 
 	curwin->w_valid |= VALID_WCOL;
+#ifdef FEAT_PROP_POPUP
+	curwin->w_flags &= ~WFLAG_WCOL_OFF_ADDED;
+#endif
     }
 }
 
@@ -1179,7 +1194,10 @@
     {
 	curwin->w_wrow += popup_top_extra(curwin);
 	curwin->w_wcol += popup_left_extra(curwin);
+	curwin->w_flags |= WFLAG_WCOL_OFF_ADDED + WFLAG_WROW_OFF_ADDED;
     }
+    else
+	curwin->w_flags &= ~(WFLAG_WCOL_OFF_ADDED + WFLAG_WROW_OFF_ADDED);
 #endif
 
     // now w_leftcol is valid, avoid check_cursor_moved() thinking otherwise
@@ -1240,7 +1258,7 @@
 	    // character is left or right of the window
 	    row = scol = ccol = ecol = 0;
     }
-    *rowp = wp->w_winrow + row + rowoff;
+    *rowp = W_WINROW(wp) + row + rowoff;
     *scolp = scol + coloff;
     *ccolp = ccol + coloff;
     *ecolp = ecol + coloff;
diff -Nru vim-8.2.1913/src/netbeans.c vim-8.2.2434/src/netbeans.c
--- vim-8.2.1913/src/netbeans.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/netbeans.c	2021-01-30 22:05:11.000000000 +0000
@@ -572,7 +572,7 @@
 	buf = buf_list[i];
 	vim_free(buf.displayname);
 	vim_free(buf.signmap);
-	if (buf.bufp != NULL)
+	if (buf.bufp != NULL && buf_valid(buf.bufp))
 	{
 	    buf.bufp->b_netbeans_file = FALSE;
 	    buf.bufp->b_was_netbeans_file = FALSE;
@@ -1943,15 +1943,13 @@
 	    if (STRLEN(fg) > MAX_COLOR_LENGTH || STRLEN(bg) > MAX_COLOR_LENGTH)
 	    {
 		emsg("E532: highlighting color name too long in defineAnnoType");
-		vim_free(typeName);
+		VIM_CLEAR(typeName);
 		parse_error = TRUE;
 	    }
 	    else if (typeName != NULL && tooltip != NULL && glyphFile != NULL)
 		addsigntype(buf, typeNum, typeName, tooltip, glyphFile, fg, bg);
-	    else
-		vim_free(typeName);
 
-	    // don't free typeName; it's used directly in addsigntype()
+	    vim_free(typeName);
 	    vim_free(fg);
 	    vim_free(bg);
 	    vim_free(tooltip);
@@ -3240,7 +3238,7 @@
 	    }
 	}
 
-	globalsignmap[i] = (char *)typeName;
+	globalsignmap[i] = (char *)vim_strsave(typeName);
 	globalsignmapused = i + 1;
     }
 
diff -Nru vim-8.2.1913/src/normal.c vim-8.2.2434/src/normal.c
--- vim-8.2.1913/src/normal.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/normal.c	2021-01-30 22:05:11.000000000 +0000
@@ -375,6 +375,7 @@
 #endif
     {K_CURSORHOLD, nv_cursorhold, NV_KEEPREG,		0},
     {K_PS,	nv_edit,	0,			0},
+    {K_COMMAND,	nv_colon,	0,			0},
 };
 
 // Number of commands in nv_cmds[].
@@ -629,7 +630,7 @@
 	    }
 	    else
 		ca.count0 = ca.count0 * 10 + (c - '0');
-	    if (ca.count0 < 0)	    // got too large!
+	    if (ca.count0 < 0)	    // overflow
 		ca.count0 = 999999999L;
 #ifdef FEAT_EVAL
 	    // Set v:count here, when called from main() and not a stuffed
@@ -700,6 +701,8 @@
 	    ca.count0 *= ca.opcount;
 	else
 	    ca.count0 = ca.opcount;
+	if (ca.count0 < 0)	    // overflow
+	    ca.count0 = 999999999L;
     }
 
     /*
@@ -992,7 +995,7 @@
 		// something different from CTRL-N.  Can't be avoided.
 		while ((c = vpeekc()) <= 0 && towait > 0L)
 		{
-		    do_sleep(towait > 50L ? 50L : towait);
+		    do_sleep(towait > 50L ? 50L : towait, FALSE);
 		    towait -= 50L;
 		}
 		if (c > 0)
@@ -1154,6 +1157,7 @@
 	    && stuff_empty()
 	    && typebuf_typed()
 	    && emsg_silent == 0
+	    && !in_assert_fails
 	    && !did_wait_return
 	    && oap->op_type == OP_NOP)
     {
@@ -1323,6 +1327,26 @@
     }
 }
 
+#if defined(FEAT_CLIPBOARD) && defined(FEAT_EVAL)
+/*
+ * Call yank_do_autocmd() for "regname".
+ */
+    static void
+call_yank_do_autocmd(int regname)
+{
+    oparg_T	oa;
+    yankreg_T	*reg;
+
+    clear_oparg(&oa);
+    oa.regname = regname;
+    oa.op_type = OP_YANK;
+    oa.is_VIsual = TRUE;
+    reg = get_register(regname, TRUE);
+    yank_do_autocmd(&oa, reg);
+    free_register(reg);
+}
+#endif
+
 /*
  * End Visual mode.
  * This function should ALWAYS be called to end Visual mode, except from
@@ -1340,6 +1364,18 @@
      */
     if (clip_star.available && clip_star.owned)
 	clip_auto_select();
+
+# if defined(FEAT_EVAL)
+    // Emit a TextYankPost for the automatic copy of the selection into the
+    // star and/or plus register.
+    if (has_textyankpost())
+    {
+	if (clip_isautosel_star())
+	    call_yank_do_autocmd('*');
+	if (clip_isautosel_plus())
+	    call_yank_do_autocmd('+');
+    }
+# endif
 #endif
 
     VIsual_active = FALSE;
@@ -2536,12 +2572,6 @@
 	    else
 	    {
 		// to previous line
-		if (curwin->w_cursor.lnum == 1)
-		{
-		    retval = FAIL;
-		    break;
-		}
-		--curwin->w_cursor.lnum;
 #ifdef FEAT_FOLDING
 		// Move to the start of a closed fold.  Don't do that when
 		// 'foldopen' contains "all": it will open in a moment.
@@ -2549,6 +2579,13 @@
 		    (void)hasFolding(curwin->w_cursor.lnum,
 						&curwin->w_cursor.lnum, NULL);
 #endif
+		if (curwin->w_cursor.lnum == 1)
+		{
+		    retval = FAIL;
+		    break;
+		}
+		--curwin->w_cursor.lnum;
+
 		linelen = linetabsize(ml_get_curline());
 		if (linelen > width1)
 		    curwin->w_curswant += (((linelen - width1 - 1) / width2)
@@ -3311,10 +3348,11 @@
     static void
 nv_colon(cmdarg_T *cap)
 {
-    int	    old_p_im;
-    int	    cmd_result;
+    int	old_p_im;
+    int	cmd_result;
+    int	is_cmdkey = cap->cmdchar == K_COMMAND;
 
-    if (VIsual_active)
+    if (VIsual_active && !is_cmdkey)
 	nv_operator(cap);
     else
     {
@@ -3324,7 +3362,7 @@
 	    cap->oap->motion_type = MCHAR;
 	    cap->oap->inclusive = FALSE;
 	}
-	else if (cap->count0)
+	else if (cap->count0 && !is_cmdkey)
 	{
 	    // translate "count:" into ":.,.+(count - 1)"
 	    stuffcharReadbuff('.');
@@ -3342,7 +3380,7 @@
 	old_p_im = p_im;
 
 	// get a command line and execute it
-	cmd_result = do_cmdline(NULL, getexline, NULL,
+	cmd_result = do_cmdline(NULL, is_cmdkey ? getcmdkeycmd : getexline, NULL,
 			    cap->oap->op_type != OP_NOP ? DOCMD_KEEPLINE : 0);
 
 	// If 'insertmode' changed, enter or exit Insert mode
@@ -3703,9 +3741,9 @@
     else
     {
 	if (cmdchar == '*')
-	    aux_ptr = (char_u *)(p_magic ? "/.*~[^$\\" : "/^$\\");
+	    aux_ptr = (char_u *)(magic_isset() ? "/.*~[^$\\" : "/^$\\");
 	else if (cmdchar == '#')
-	    aux_ptr = (char_u *)(p_magic ? "/?.*~[^$\\" : "/?^$\\");
+	    aux_ptr = (char_u *)(magic_isset() ? "/?.*~[^$\\" : "/?^$\\");
 	else if (tag_cmd)
 	{
 	    if (curbuf->b_help)
@@ -4739,6 +4777,8 @@
 	    else
 		curwin->w_cursor.lnum = (curbuf->b_ml.ml_line_count *
 						    cap->count0 + 99L) / 100L;
+	    if (curwin->w_cursor.lnum < 1)
+		curwin->w_cursor.lnum = 1;
 	    if (curwin->w_cursor.lnum > curbuf->b_ml.ml_line_count)
 		curwin->w_cursor.lnum = curbuf->b_ml.ml_line_count;
 	    beginline(BL_SOL | BL_FIX);
@@ -4892,7 +4932,7 @@
     if (cap->nchar == Ctrl_V)
     {
 	had_ctrl_v = Ctrl_V;
-	cap->nchar = get_literal();
+	cap->nchar = get_literal(FALSE);
 	// Don't redo a multibyte character with CTRL-V.
 	if (cap->nchar > DEL)
 	    had_ctrl_v = NUL;
@@ -5173,7 +5213,7 @@
 	else
 	{
 	    if (cap->extra_char == Ctrl_V)	// get another character
-		cap->extra_char = get_literal();
+		cap->extra_char = get_literal(FALSE);
 	    stuffcharReadbuff(cap->extra_char);
 	    stuffcharReadbuff(ESC);
 	    if (virtual_active())
@@ -5337,7 +5377,7 @@
 nv_subst(cmdarg_T *cap)
 {
 #ifdef FEAT_TERMINAL
-    // When showing output of term_dumpdiff() swap the top and botom.
+    // When showing output of term_dumpdiff() swap the top and bottom.
     if (term_swap_diff() == OK)
 	return;
 #endif
@@ -5752,7 +5792,7 @@
     clearop(cap->oap);
     if (VIsual_active)
 	end_visual_mode();		// stop Visual mode
-    do_cmdline_cmd((char_u *)"st");
+    do_cmdline_cmd((char_u *)"stop");
 }
 
 /*
@@ -5922,13 +5962,8 @@
      */
     case 'j':
     case K_DOWN:
-	// with 'nowrap' it works just like the normal "j" command; also when
-	// in a closed fold
-	if (!curwin->w_p_wrap
-#ifdef FEAT_FOLDING
-		|| hasFolding(curwin->w_cursor.lnum, NULL, NULL)
-#endif
-		)
+	// with 'nowrap' it works just like the normal "j" command.
+	if (!curwin->w_p_wrap)
 	{
 	    oap->motion_type = MLINE;
 	    i = cursor_down(cap->count1, oap->op_type == OP_NOP);
@@ -5941,13 +5976,8 @@
 
     case 'k':
     case K_UP:
-	// with 'nowrap' it works just like the normal "k" command; also when
-	// in a closed fold
-	if (!curwin->w_p_wrap
-#ifdef FEAT_FOLDING
-		|| hasFolding(curwin->w_cursor.lnum, NULL, NULL)
-#endif
-	   )
+	// with 'nowrap' it works just like the normal "k" command.
+	if (!curwin->w_p_wrap)
 	{
 	    oap->motion_type = MLINE;
 	    i = cursor_up(cap->count1, oap->op_type == OP_NOP);
@@ -6195,7 +6225,7 @@
      * "gs": Goto sleep.
      */
     case 's':
-	do_sleep(cap->count1 * 1000L);
+	do_sleep(cap->count1 * 1000L, FALSE);
 	break;
 
     /*
diff -Nru vim-8.2.1913/src/ops.c vim-8.2.2434/src/ops.c
--- vim-8.2.1913/src/ops.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/ops.c	2021-01-30 22:05:11.000000000 +0000
@@ -9,7 +9,7 @@
 
 /*
  * ops.c: implementation of various operators: op_shift, op_delete, op_tilde,
- *	  op_change, op_yank, do_put, do_join
+ *	  op_change, op_yank, do_join
  */
 
 #include "vim.h"
@@ -938,6 +938,7 @@
 	    curwin->w_cursor = curpos;	// restore curwin->w_cursor
 	    (void)do_join(2, FALSE, FALSE, FALSE, FALSE);
 	}
+	auto_format(FALSE, TRUE);
     }
 
     msgmore(curbuf->b_ml.ml_line_count - old_lcount);
@@ -3298,7 +3299,7 @@
 	// function.
 	virtual_op = MAYBE;
 
-	(void)call_func_retnr(p_opfunc, 1, argv);
+	(void)call_func_noret(p_opfunc, 1, argv);
 
 	virtual_op = save_virtual_op;
 	if (cmdmod.cmod_flags & CMOD_LOCKMARKS)
@@ -3465,8 +3466,9 @@
 	if ((redo_yank || oap->op_type != OP_YANK)
 		&& ((!VIsual_active || oap->motion_force)
 		    // Also redo Operator-pending Visual mode mappings
-		    || (VIsual_active && cap->cmdchar == ':'
-						 && oap->op_type != OP_COLON))
+		    || (VIsual_active
+			  && (cap->cmdchar == ':' || cap->cmdchar == K_COMMAND)
+						  && oap->op_type != OP_COLON))
 		&& cap->cmdchar != 'D'
 #ifdef FEAT_FOLDING
 		&& oap->op_type != OP_FOLD
@@ -3490,7 +3492,7 @@
 		    AppendToRedobuffLit(cap->searchbuf, -1);
 		AppendToRedobuff(NL_STR);
 	    }
-	    else if (cap->cmdchar == ':')
+	    else if (cap->cmdchar == ':' || cap->cmdchar == K_COMMAND)
 	    {
 		// do_cmdline() has stored the first typed line in
 		// "repeat_cmdline".  When several lines are typed repeating
@@ -3688,7 +3690,7 @@
 			    get_op_char(oap->op_type),
 			    get_extra_op_char(oap->op_type),
 			    oap->motion_force, cap->cmdchar, cap->nchar);
-		else if (cap->cmdchar != ':')
+		else if (cap->cmdchar != ':' && cap->cmdchar != K_COMMAND)
 		{
 		    int nchar = oap->op_type == OP_REPLACE ? cap->nchar : NUL;
 
@@ -3870,9 +3872,10 @@
 	    else
 	    {
 		(void)op_delete(oap);
-		if (oap->motion_type == MLINE && has_format_option(FO_AUTO))
-		    u_save_cursor();	    // cursor line wasn't saved yet
-		auto_format(FALSE, TRUE);
+		// save cursor line for undo if it wasn't saved yet
+		if (oap->motion_type == MLINE && has_format_option(FO_AUTO)
+						      && u_save_cursor() == OK)
+		    auto_format(FALSE, TRUE);
 	    }
 	    break;
 
diff -Nru vim-8.2.1913/src/option.c vim-8.2.2434/src/option.c
--- vim-8.2.1913/src/option.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/option.c	2021-01-30 22:05:11.000000000 +0000
@@ -3834,13 +3834,15 @@
  * Get the value for an option.
  *
  * Returns:
- * Number or Toggle option: 1, *numval gets value.
- *	     String option: 0, *stringval gets allocated string.
- * Hidden Number or Toggle option: -1.
- *	     hidden String option: -2.
- *		   unknown option: -3.
+ * Number option: gov_number, *numval gets value.
+ * Toggle option: gov_bool,   *numval gets value.
+ * String option: gov_string, *stringval gets allocated string.
+ * Hidden Number option: gov_hidden_number.
+ * Hidden Toggle option: gov_hidden_bool.
+ * Hidden String option: gov_hidden_string.
+ * Unknown option: gov_unknown.
  */
-    int
+    getoption_T
 get_option_value(
     char_u	*name,
     long	*numval,
@@ -3851,16 +3853,17 @@
     char_u	*varp;
 
     opt_idx = findoption(name);
-    if (opt_idx < 0)		    // unknown option
+    if (opt_idx < 0)		    // option not in the table
     {
 	int key;
 
 	if (STRLEN(name) == 4 && name[0] == 't' && name[1] == '_'
-		&& (key = find_key_option(name, FALSE)) != 0)
+				  && (key = find_key_option(name, FALSE)) != 0)
 	{
 	    char_u key_name[2];
 	    char_u *p;
 
+	    // check for a terminal option
 	    if (key < 0)
 	    {
 		key_name[0] = KEY2TERMCAP0(key);
@@ -3876,10 +3879,10 @@
 	    {
 		if (stringval != NULL)
 		    *stringval = vim_strsave(p);
-		return 0;
+		return gov_string;
 	    }
 	}
-	return -3;
+	return gov_unknown;
     }
 
     varp = get_varp_scope(&(options[opt_idx]), opt_flags);
@@ -3887,7 +3890,7 @@
     if (options[opt_idx].flags & P_STRING)
     {
 	if (varp == NULL)		    // hidden option
-	    return -2;
+	    return gov_hidden_string;
 	if (stringval != NULL)
 	{
 #ifdef FEAT_CRYPT
@@ -3899,11 +3902,12 @@
 #endif
 		*stringval = vim_strsave(*(char_u **)(varp));
 	}
-	return 0;
+	return gov_string;
     }
 
     if (varp == NULL)		    // hidden option
-	return -1;
+	return (options[opt_idx].flags & P_NUM)
+					 ? gov_hidden_number : gov_hidden_bool;
     if (options[opt_idx].flags & P_NUM)
 	*numval = *(long *)varp;
     else
@@ -3915,7 +3919,7 @@
 	else
 	    *numval = (long) *(int *)varp;
     }
-    return 1;
+    return (options[opt_idx].flags & P_NUM) ? gov_number : gov_bool;
 }
 #endif
 
@@ -6996,3 +7000,22 @@
     return OK;
 }
 #endif
+
+/*
+ * Get the value of 'magic' adjusted for Vim9 script.
+ */
+    int
+magic_isset(void)
+{
+    switch (magic_overruled)
+    {
+	case OPTION_MAGIC_ON:      return TRUE;
+	case OPTION_MAGIC_OFF:     return FALSE;
+	case OPTION_MAGIC_NOT_SET: break;
+    }
+#ifdef FEAT_EVAL
+    if (in_vim9script())
+	return TRUE;
+#endif
+    return p_magic;
+}
diff -Nru vim-8.2.1913/src/optiondefs.h vim-8.2.2434/src/optiondefs.h
--- vim-8.2.1913/src/optiondefs.h	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/optiondefs.h	2021-01-30 22:05:11.000000000 +0000
@@ -2957,6 +2957,8 @@
     p_term("t_EC", T_CEC)
     p_term("t_EI", T_CEI)
     p_term("t_fs", T_FS)
+    p_term("t_fd", T_FD)
+    p_term("t_fe", T_FE)
     p_term("t_GP", T_CGP)
     p_term("t_IE", T_CIE)
     p_term("t_IS", T_CIS)
diff -Nru vim-8.2.1913/src/option.h vim-8.2.2434/src/option.h
--- vim-8.2.1913/src/option.h	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/option.h	2021-01-30 22:05:11.000000000 +0000
@@ -60,6 +60,17 @@
 #define P_RWINONLY   0x10000000L // only redraw current window
 #define P_MLE	     0x20000000L // under control of 'modelineexpr'
 
+// Returned by get_option_value().
+typedef enum {
+    gov_unknown,
+    gov_bool,
+    gov_number,
+    gov_string,
+    gov_hidden_bool,
+    gov_hidden_number,
+    gov_hidden_string
+} getoption_T;
+
 /*
  * Default values for 'errorformat'.
  * The "%f|%l| %m" one is used for when the contents of the quickfix window is
diff -Nru vim-8.2.1913/src/os_mswin.c vim-8.2.2434/src/os_mswin.c
--- vim-8.2.1913/src/os_mswin.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/os_mswin.c	2021-01-30 22:05:11.000000000 +0000
@@ -387,21 +387,13 @@
     int
 mch_isFullName(char_u *fname)
 {
-    // WinNT and later can use _MAX_PATH wide characters for a pathname, which
-    // means that the maximum pathname is _MAX_PATH * 3 bytes when 'enc' is
-    // UTF-8.
-    char szName[_MAX_PATH * 3 + 1];
-
-    // A name like "d:/foo" and "//server/share" is absolute
-    if ((fname[0] && fname[1] == ':' && (fname[2] == '/' || fname[2] == '\\'))
-	    || (fname[0] == fname[1] && (fname[0] == '/' || fname[0] == '\\')))
-	return TRUE;
-
-    // A name that can't be made absolute probably isn't absolute.
-    if (mch_FullName(fname, (char_u *)szName, sizeof(szName) - 1, FALSE) == FAIL)
-	return FALSE;
-
-    return pathcmp((const char *)fname, (const char *)szName, -1) == 0;
+    // A name like "d:/foo" and "//server/share" is absolute.  "d:foo" is not.
+    // Another way to check is to use mch_FullName() and see if the result is
+    // the same as the name or mch_FullName() fails.  However, this has quite a
+    // bit of overhead, so let's not do that.
+    return ((ASCII_ISALPHA(fname[0]) && fname[1] == ':'
+				      && (fname[2] == '/' || fname[2] == '\\'))
+	    || (fname[0] == fname[1] && (fname[0] == '/' || fname[0] == '\\')));
 }
 
 /*
diff -Nru vim-8.2.1913/src/os_unix.c vim-8.2.2434/src/os_unix.c
--- vim-8.2.1913/src/os_unix.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/os_unix.c	2021-01-30 22:05:11.000000000 +0000
@@ -5273,8 +5273,10 @@
 	    {
 		long delay_msec = 1;
 
-		out_str(T_CTE);	// possibly disables modifyOtherKeys, so that
-				// the system can recognize CTRL-C
+		if (tmode == TMODE_RAW)
+		    // possibly disables modifyOtherKeys, so that the system
+		    // can recognize CTRL-C
+		    out_str(T_CTE);
 
 		/*
 		 * Similar to the loop above, but only handle X events, no
@@ -5316,7 +5318,9 @@
 			delay_msec = 10;
 		}
 
-		out_str(T_CTI);	// possibly enables modifyOtherKeys again
+		if (tmode == TMODE_RAW)
+		    // possibly enables modifyOtherKeys again
+		    out_str(T_CTI);
 	    }
 # endif
 
diff -Nru vim-8.2.1913/src/os_unix.h vim-8.2.2434/src/os_unix.h
--- vim-8.2.1913/src/os_unix.h	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/os_unix.h	2021-01-30 22:05:11.000000000 +0000
@@ -73,8 +73,9 @@
 // always use unlink() to remove files
 #ifndef PROTO
 # ifdef VMS
-#  define mch_remove(x) delete((char *)(x))
-#  define vim_mkdir(x, y) mkdir((char *)(x), y)
+#  define vim_mkdir(x, y) mkdir((char *)vms_fixfilename(x), y)
+#  define mch_rmdir(x)  delete((char *)vms_fixfilename(x))
+#  define mch_remove(x) delete((char *)vms_fixfilename(x))
 # else
 #  define vim_mkdir(x, y) mkdir((char *)(x), y)
 #  define mch_rmdir(x) rmdir((char *)(x))
@@ -199,10 +200,11 @@
 # include <libdef.h>
 # include <libdtdef.h>
 
-# ifdef FEAT_GUI_GTK
-#  include "gui_gtk_vms.h"
+# if defined(FEAT_GUI_MOTIF)
+#  define XFree XFREE
+#  define XmRepTypeInstallTearOffModelCon XMREPTYPEINSTALLTEAROFFMODELCON
 # endif
-#endif
+#endif // VMS
 
 #ifdef HAVE_FLOCK
 # include <sys/file.h>
diff -Nru vim-8.2.1913/src/os_vms.c vim-8.2.2434/src/os_vms.c
--- vim-8.2.1913/src/os_vms.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/os_vms.c	2021-01-30 22:05:11.000000000 +0000
@@ -672,9 +672,18 @@
     else if (strchr(instring,'"') == NULL)	// password in the path?
     {
 	// Seems it is a regular file, let guess that it is pure Unix fspec
-	if (decc$to_vms(instring, vms_fspec_proc, 0, 0) <= 0)
-	    // No... it must be mixed
+        if ( (strchr(instring,'[') == NULL) && (strchr(instring,'<') == NULL) &&
+	     (strchr(instring,']') == NULL) && (strchr(instring,'>') == NULL) &&
+	     (strchr(instring,':') == NULL) )
+	{
+	    // It must be a truly unix fspec
+	    decc$to_vms(instring, vms_fspec_proc, 0, 0);
+	}
+	else
+	{
+	    // It is a mixed fspec
 	    vms_unix_mixed_filespec(instring, buf);
+	}
     }
     else
 	// we have a password in the path
diff -Nru vim-8.2.1913/src/os_vms_conf.h vim-8.2.2434/src/os_vms_conf.h
--- vim-8.2.1913/src/os_vms_conf.h	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/os_vms_conf.h	2021-01-30 22:05:11.000000000 +0000
@@ -146,6 +146,7 @@
 #undef	HAVE_SYS_POLL_H
 #undef  HAVE_FCHDIR
 #undef  HAVE_LSTAT
+#undef  HAVE_STDINT_H
 
 // Hardware specific
 #ifdef  VAX
@@ -155,8 +156,12 @@
 #undef  HAVE_STRINGS_H
 #undef  HAVE_SIGSETJMP
 #undef  HAVE_ISNAN
+#undef  HAVE_XOS_R_H
 #define HAVE_NO_LONG_LONG
 #define VIM_SIZEOF_LONG 4
+#define LONG_LONG_MIN  (-2147483647-1)
+#define LONG_LONG_MAX  (2147483647)
+#define ULONG_LONG_MAX (4294967295U)
 #else // AXP and IA64
 #define HAVE_GETTIMEOFDAY
 #define HAVE_USLEEP
@@ -164,7 +169,12 @@
 #define HAVE_STRINGS_H
 #define HAVE_SIGSETJMP
 #define HAVE_ISNAN
+#define HAVE_XOS_R_H
+#define HAVE_NO_LONG_LONG
 #define VIM_SIZEOF_LONG 8
+#define LONG_LONG_MIN  (-9223372036854775807-1)
+#define LONG_LONG_MAX  (9223372036854775807)
+#define ULONG_LONG_MAX (18446744073709551615U)
 #endif
 
 // Compiler specific
@@ -177,7 +187,7 @@
 #define BROKEN_LOCALE
 #undef  DYNAMIC_ICONV
 #undef	HAVE_STRFTIME
-#else
+#else   // DECC
 #define HAVE_SELECT
 #define HAVE_FCNTL_H
 #define HAVE_UNISTD_H 1
@@ -198,7 +208,10 @@
 
 // GUI support defines
 #if defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_GTK)
+#define X_INCLUDE_GRP_H             // To use getgrgid
+#define XUSE_MTSAFE_API
 #define HAVE_X11
+#define WANT_X11
 #ifdef HAVE_XPM
 #define HAVE_X11_XPM_H
 #endif
diff -Nru vim-8.2.1913/src/os_win32.c vim-8.2.2434/src/os_win32.c
--- vim-8.2.1913/src/os_win32.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/os_win32.c	2021-01-30 22:05:11.000000000 +0000
@@ -860,6 +860,12 @@
 }
 #endif
 
+#ifdef _MSC_VER
+// Suppress the deprecation warning for using GetVersionEx().
+// It is needed for implementing "windowsversion()".
+# pragma warning(push)
+# pragma warning(disable: 4996)
+#endif
 /*
  * Set "win8_or_later" and fill in "windowsVersion" if possible.
  */
@@ -890,6 +896,9 @@
 	done = TRUE;
     }
 }
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif
 
 #if !defined(FEAT_GUI_MSWIN) || defined(VIMDLL)
 
@@ -1588,26 +1597,14 @@
 	{
 	    DWORD dwWaitTime = dwEndTime - dwNow;
 
-# ifdef FEAT_JOB_CHANNEL
-	    // Check channel while waiting for input.
-	    if (dwWaitTime > 100)
-	    {
-		dwWaitTime = 100;
-		// If there is readahead then parse_queued_messages() timed out
-		// and we should call it again soon.
-		if (channel_any_readahead())
-		    dwWaitTime = 10;
-	    }
-# endif
-# ifdef FEAT_BEVAL_GUI
-	    if (p_beval && dwWaitTime > 100)
-		// The 'balloonexpr' may indirectly invoke a callback while
-		// waiting for a character, need to check often.
-		dwWaitTime = 100;
-# endif
+	    // Don't wait for more than 11 msec to avoid dropping characters,
+	    // check channel while waiting for input and handle a callback from
+	    // 'balloonexpr'.
+	    if (dwWaitTime > 11)
+		dwWaitTime = 11;
+
 # ifdef FEAT_MZSCHEME
-	    if (mzthreads_allowed() && p_mzq > 0
-				    && (msec < 0 || (long)dwWaitTime > p_mzq))
+	    if (mzthreads_allowed() && p_mzq > 0 && (long)dwWaitTime > p_mzq)
 		dwWaitTime = p_mzq; // don't wait longer than 'mzquantum'
 # endif
 # ifdef FEAT_TIMERS
@@ -3532,7 +3529,10 @@
 
 	wn = enc_to_utf16(fname, NULL);
 	if (wn == NULL)
+	{
+	    vim_free(p);
 	    return NULL;
+	}
 
 	// Try to retrieve the entire security descriptor.
 	err = GetNamedSecurityInfoW(
@@ -7113,13 +7113,12 @@
 /*
  * SUB STREAM (aka info stream) handling:
  *
- * NTFS can have sub streams for each file.  Normal contents of file is
- * stored in the main stream, and extra contents (author information and
- * title and so on) can be stored in sub stream.  After Windows 2000, user
- * can access and store those informations in sub streams via explorer's
- * property menuitem in right click menu.  Those informations in sub streams
- * were lost when copying only the main stream.  So we have to copy sub
- * streams.
+ * NTFS can have sub streams for each file.  The normal contents of a file is
+ * stored in the main stream, and extra contents (author information, title and
+ * so on) can be stored in a sub stream.  After Windows 2000, the user can
+ * access and store this information in sub streams via an explorer's property
+ * menu item in the right click menu.  This information in sub streams was lost
+ * when copying only the main stream.  Therefore we have to copy sub streams.
  *
  * Incomplete explanation:
  *	http://msdn.microsoft.com/library/en-us/dnw2k/html/ntfs5.asp
diff -Nru vim-8.2.1913/src/po/de.po vim-8.2.2434/src/po/de.po
--- vim-8.2.1913/src/po/de.po	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/po/de.po	2021-01-30 22:05:11.000000000 +0000
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: Vim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-06 12:56+0200\n"
+"POT-Creation-Date: 2020-11-23 13:13+0100\n"
 "PO-Revision-Date: 2008-05-24 17:26+0200\n"
 "Last-Translator: Christian Brabandt <cb@256bit.org>\n"
 "Language-Team: German\n"
@@ -30,6 +30,9 @@
 msgid "E165: Cannot go beyond last file"
 msgstr "E165: Kann nicht über die letzte Datei hinausgehen"
 
+msgid "E610: No argument to delete"
+msgstr "E610: Fehlendes zu löschendes Argument"
+
 msgid "E249: window layout changed unexpectedly"
 msgstr "E249: Fensterlayout änderte sich unerwartet"
 
@@ -71,7 +74,7 @@
 
 #, c-format
 msgid "E680: <buffer=%d>: invalid buffer number "
-msgstr "E680: <buffer=%d>: Ungültige Puffernummer "
+msgstr "E680: <buffer=%d>: Ungültige Buffernummer "
 
 msgid "E217: Can't execute autocommands for ALL events"
 msgstr "E217: Autokommandos können nicht für ALL Ereignisse ausgeführt werden"
@@ -119,64 +122,64 @@
 msgstr "E855: Autokommandos führten zu einem Abbruch."
 
 msgid "E82: Cannot allocate any buffer, exiting..."
-msgstr "E82: Kann keinen Puffer zuweisen; beende..."
+msgstr "E82: Kann keinen Buffer zuweisen; beende..."
 
 msgid "E83: Cannot allocate buffer, using other one..."
-msgstr "E83: Kann den Puffer nicht zuweisen; benutze einen anderen..."
+msgstr "E83: Kann den Buffer nicht zuweisen; benutze einen anderen..."
 
 msgid "E931: Buffer cannot be registered"
-msgstr "E931: Puffer kann nicht registriert werden."
+msgstr "E931: Buffer kann nicht registriert werden."
 
 #, c-format
 msgid "E937: Attempt to delete a buffer that is in use: %s"
-msgstr "E937: Versuch, Puffer %s zu löschen, der noch benutzt wird."
+msgstr "E937: Versuch, Buffer %s zu löschen, der noch benutzt wird."
 
 msgid "E515: No buffers were unloaded"
-msgstr "E515: Kein Puffer wurde entladen."
+msgstr "E515: Kein Buffer wurde entladen."
 
 msgid "E516: No buffers were deleted"
-msgstr "E516: Kein Puffer wurde gelöscht."
+msgstr "E516: Kein Buffer wurde gelöscht."
 
 msgid "E517: No buffers were wiped out"
-msgstr "E517: Kein Puffer wurde vollständig gelöscht."
+msgstr "E517: Kein Buffer wurde vollständig gelöscht."
 
 #, c-format
 msgid "%d buffer unloaded"
 msgid_plural "%d buffers unloaded"
-msgstr[0] "%d Puffer entladen"
-msgstr[1] "%d Puffer entladen"
+msgstr[0] "%d Buffer entladen"
+msgstr[1] "%d Buffer entladen"
 
 #, c-format
 msgid "%d buffer deleted"
 msgid_plural "%d buffers deleted"
-msgstr[0] "%d Puffer gelöscht"
-msgstr[1] "%d Puffer gelöscht"
+msgstr[0] "%d Buffer gelöscht"
+msgstr[1] "%d Buffer gelöscht"
 
 #, c-format
 msgid "%d buffer wiped out"
 msgid_plural "%d buffers wiped out"
-msgstr[0] "%d Puffer vollständig gelöscht"
-msgstr[1] "%d Puffer vollständig gelöscht"
+msgstr[0] "%d Buffer vollständig gelöscht"
+msgstr[1] "%d Buffer vollständig gelöscht"
 
 msgid "E90: Cannot unload last buffer"
-msgstr "E90: Kann letzten Puffer nicht entladen"
+msgstr "E90: Kann letzten Buffer nicht entladen"
 
 msgid "E84: No modified buffer found"
-msgstr "E84: Keinen veränderter Puffer gefunden"
+msgstr "E84: Keinen veränderter Buffer gefunden"
 
 msgid "E85: There is no listed buffer"
-msgstr "E85: Es gibt keine angezeigten Puffer."
+msgstr "E85: Es gibt keine angezeigten Buffer."
 
 msgid "E87: Cannot go beyond last buffer"
-msgstr "E87: Kann nicht über den letzten Puffer hinaus gehen."
+msgstr "E87: Kann nicht über den letzten Buffer hinaus gehen."
 
 msgid "E88: Cannot go before first buffer"
-msgstr "E88: Kann nicht vor den ersten Puffer gehen."
+msgstr "E88: Kann nicht vor den ersten Buffer gehen."
 
 #, c-format
 msgid "E89: No write since last change for buffer %d (add ! to override)"
 msgstr ""
-"E89: Puffer %d seit der letzten Änderung nicht gesichert (erzwinge mit !)"
+"E89: Buffer %d seit der letzten Änderung nicht gesichert (erzwinge mit !)"
 
 msgid "E948: Job still running (add ! to end the job)"
 msgstr "E948: Job läuft noch (Beenden mit !)"
@@ -195,7 +198,7 @@
 
 #, c-format
 msgid "E92: Buffer %d not found"
-msgstr "E92: Puffer %d nicht gefunden."
+msgstr "E92: Buffer %d nicht gefunden."
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -203,14 +206,14 @@
 
 #, c-format
 msgid "E94: No matching buffer for %s"
-msgstr "E94: Kein übereinstimmender Puffer für %s."
+msgstr "E94: Kein übereinstimmender Buffer für %s."
 
 #, c-format
 msgid "line %ld"
 msgstr "Zeile %ld"
 
 msgid "E95: Buffer with this name already exists"
-msgstr "E95: Ein Puffer mit diesem Namen existiert bereits."
+msgstr "E95: Ein Buffer mit diesem Namen existiert bereits."
 
 msgid " [Modified]"
 msgstr " [Verändert]"
@@ -283,11 +286,11 @@
 msgstr "[Neue Datei]"
 
 msgid "E676: No matching autocommands for acwrite buffer"
-msgstr "E676: Keine übereinstimmenden Autokommandos für acwrite Puffer"
+msgstr "E676: Keine übereinstimmenden Autokommandos für acwrite Buffer"
 
 msgid "E203: Autocommands deleted or unloaded buffer to be written"
 msgstr ""
-"E203: Autokommandos haben den zu schreibenden Puffer gelöscht oder entladen"
+"E203: Autokommandos haben den zu schreibenden Buffer gelöscht oder entladen"
 
 msgid "E204: Autocommand changed number of lines in unexpected way"
 msgstr ""
@@ -295,10 +298,10 @@
 "verändert"
 
 msgid "NetBeans disallows writes of unmodified buffers"
-msgstr "NetBeans verweigert das Schreiben von unveränderten Puffern."
+msgstr "NetBeans verweigert das Schreiben von unveränderten Buffern."
 
 msgid "Partial writes disallowed for NetBeans buffers"
-msgstr "Partielles Schreiben für NetBeans Puffer verweigert"
+msgstr "Partielles Schreiben für NetBeans Buffer verweigert"
 
 msgid "is a directory"
 msgstr "ist ein Verzeichnis"
@@ -457,19 +460,6 @@
 "E912: Kann ch_evalexpr()/ch_sendexpr() nicht mit einem Raw oder NL Channel "
 "benutzen."
 
-msgid "E920: _io file requires _name to be set"
-msgstr "E920: Für _io Datei muss _name gesetzt ist."
-
-msgid "E915: in_io buffer requires in_buf or in_name to be set"
-msgstr "E915: Für in_io Puffer muss in_buf oder in_name gesetzt sein."
-
-#, c-format
-msgid "E918: buffer must be loaded: %s"
-msgstr "E918: Puffer muss geladen sein: %s."
-
-msgid "E916: not a valid job"
-msgstr "E916: kein gültiger Job"
-
 msgid "No display"
 msgstr "Keine Anzeige"
 
@@ -592,12 +582,12 @@
 
 #, c-format
 msgid "E96: Cannot diff more than %d buffers"
-msgstr "E96: Kann Diff für mehr als %d Puffer nicht erstellen."
+msgstr "E96: Kann Diff für mehr als %d Buffer nicht erstellen."
 
 #, c-format
 msgid "Not enough memory to use internal diff for buffer \"%s\""
 msgstr ""
-"Nicht genügend Speicher vorhanden, um Puffer \"%s\" mit internem "
+"Nicht genügend Speicher vorhanden, um Buffer \"%s\" mit internem "
 "Diffalgorithmus zu nutzen."
 
 msgid "E810: Cannot read or write temp files"
@@ -622,27 +612,27 @@
 msgstr "E959: Ungültiges Diff-Format"
 
 msgid "E99: Current buffer is not in diff mode"
-msgstr "E99: Aktueller Puffer ist nicht im Diff-Modus."
+msgstr "E99: Aktueller Buffer ist nicht im Diff-Modus."
 
 msgid "E793: No other buffer in diff mode is modifiable"
-msgstr "E793: Kein weiterer Puffer im diff-Modues ist modifizierbar."
+msgstr "E793: Kein weiterer Buffer im diff-Modues ist modifizierbar."
 
 msgid "E100: No other buffer in diff mode"
-msgstr "E100: Kein weiterer Puffer ist im Diff-Modus."
+msgstr "E100: Kein weiterer Buffer ist im Diff-Modus."
 
 msgid "E101: More than two buffers in diff mode, don't know which one to use"
-msgstr "E101: Mehrdeutigkeit: Mehr als zwei Puffer im Diff-Modus."
+msgstr "E101: Mehrdeutigkeit: Mehr als zwei Buffer im Diff-Modus."
 
 #, c-format
 msgid "E102: Can't find buffer \"%s\""
-msgstr "E102: Kann Puffer \"%s\" nicht finden."
+msgstr "E102: Kann Buffer \"%s\" nicht finden."
 
 #, c-format
 msgid "E103: Buffer \"%s\" is not in diff mode"
-msgstr "E103: Puffer \"%s\" ist nicht im Diff-Modus."
+msgstr "E103: Buffer \"%s\" ist nicht im Diff-Modus."
 
 msgid "E787: Buffer changed unexpectedly"
-msgstr "E787: Puffer änderte sich unerwartet."
+msgstr "E787: Buffer änderte sich unerwartet."
 
 msgid "E104: Escape not allowed in digraph"
 msgstr "E104: <Escape> ist in einem Digraphen nicht erlaubt."
@@ -731,9 +721,6 @@
 msgid "E791: Empty keymap entry"
 msgstr "E791: Leerer keymap Eintrag"
 
-msgid "E719: Cannot use [:] with a Dictionary"
-msgstr "E719: Kann [:] nicht mit einem Dictionary verwenden"
-
 msgid "E689: Can only index a List, Dictionary or Blob"
 msgstr "E689: Kann nur Listen, Dictionary oder Blob indizieren"
 
@@ -749,12 +736,6 @@
 msgid "E996: Cannot lock a range"
 msgstr "E996: Kann Bereich nicht sperren"
 
-msgid "E710: List value has more items than target"
-msgstr "E710: Listenwert hat mehr Einträge als das Ziel."
-
-msgid "E711: List value has not enough items"
-msgstr "E711: Listenwert hat nicht genügend Einträge."
-
 msgid "E996: Cannot lock a list or dict"
 msgstr "E996: Kann List oder Dictionary nicht sperren"
 
@@ -764,9 +745,6 @@
 msgid "E695: Cannot index a Funcref"
 msgstr "E695: Kann keine Funktionsreferenz indizieren."
 
-msgid "E909: Cannot index a special variable"
-msgstr "E909: Kann Spezialvariable nicht indexieren."
-
 msgid "Not enough memory to set references, garbage collection aborted!"
 msgstr ""
 "Nicht genügend Speicher um Referenzen zu setzen, Garbagecollection "
@@ -790,7 +768,7 @@
 
 #, c-format
 msgid "E158: Invalid buffer name: %s"
-msgstr "E158: ungültige Puffernummer: %s"
+msgstr "E158: ungültige Buffernummer: %s"
 
 msgid "&Ok"
 msgstr "&Ok"
@@ -853,7 +831,7 @@
 msgid "E990: Missing end marker '%s'"
 msgstr "E990: Fehlende Endmarkierung nach '%s'"
 
-msgid "E985: .= is not supported with script version 2"
+msgid "E985: .= is not supported with script version >= 2"
 msgstr "E985: .= wird mit Scriptversion 2 nicht mehr unterstützt."
 
 msgid "E687: Less targets than List items"
@@ -882,13 +860,6 @@
 msgid "E743: variable nested too deep for (un)lock"
 msgstr "E743: Variable ist zu tief verschachtelt zum (ent)sperren."
 
-msgid "E1063: type mismatch for v: variable"
-msgstr "E1063: Typendiskrepanz für v: Variable"
-
-#, c-format
-msgid "E1041: Redefining script item %s"
-msgstr "E1041: Neudefinition von Scriptelement %s"
-
 #, c-format
 msgid "E963: setting %s to value with wrong type"
 msgstr "E963: %s auf Wert mit falschem Typ gesetzt"
@@ -958,7 +929,7 @@
 msgstr "%ld Zeilen gefiltert"
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
-msgstr "E135: *Filter*-Autokommandos dürfen den aktuellen Puffer nicht ändern"
+msgstr "E135: *Filter*-Autokommandos dürfen den aktuellen Buffer nicht ändern"
 
 msgid "[No write since last change]\n"
 msgstr "[Nicht geschrieben seit der letzten Änderung]\n"
@@ -970,7 +941,7 @@
 msgstr "Partielle Datei schreiben?"
 
 msgid "E140: Use ! to write partial buffer"
-msgstr "E140: Zum Schreiben von partiellen Puffern ! verwenden"
+msgstr "E140: Zum Schreiben von partiellen Buffern ! verwenden"
 
 #, c-format
 msgid "Overwrite existing file \"%s\"?"
@@ -986,7 +957,7 @@
 
 #, c-format
 msgid "E141: No file name for buffer %ld"
-msgstr "E141: Kein Dateiname für Puffer %ld"
+msgstr "E141: Kein Dateiname für Buffer %ld"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr ""
@@ -1020,7 +991,7 @@
 
 #, c-format
 msgid "E143: Autocommands unexpectedly deleted new buffer %s"
-msgstr "E143: Autokommandos löschten unerwartet neuen Puffer %s"
+msgstr "E143: Autokommandos löschten unerwartet neuen Buffer %s"
 
 msgid "E144: non-numeric argument to :z"
 msgstr "E144: Nicht-numerisches Argument für :z"
@@ -1078,46 +1049,6 @@
 msgid "Pattern not found: %s"
 msgstr "Muster nicht gefunden: %s"
 
-msgid "E478: Don't panic!"
-msgstr "E478: Nur keine Panik!"
-
-#, c-format
-msgid "E661: Sorry, no '%s' help for %s"
-msgstr "E661: Schade, keine '%s' Hilfe für %s"
-
-#, c-format
-msgid "E149: Sorry, no help for %s"
-msgstr "E149: Schade, keine Hilfe für %s"
-
-#, c-format
-msgid "Sorry, help file \"%s\" not found"
-msgstr "Hilfe-Datei \"%s\" nicht gefunden"
-
-#, c-format
-msgid "E151: No match: %s"
-msgstr "E151: Kein Treffer: %s"
-
-#, c-format
-msgid "E152: Cannot open %s for writing"
-msgstr "E152: %s kann nicht zum Schreiben geöffnet werden."
-
-#, c-format
-msgid "E153: Unable to open %s for reading"
-msgstr "E153: %s kann nicht zum Lesen geöffnet werden."
-
-#, c-format
-msgid "E670: Mix of help file encodings within a language: %s"
-msgstr ""
-"E670: Mischung von Kodierungen einer Hilfedatei innerhalb einer Sprache: %s"
-
-#, c-format
-msgid "E154: Duplicate tag \"%s\" in file %s/%s"
-msgstr "E154: Doppelter Tag \"%s\" in der Datei %s/%s"
-
-#, c-format
-msgid "E150: Not a directory: %s"
-msgstr "E150: Kein Verzeichnis: %s"
-
 msgid "No old files"
 msgstr "Keine Alt-Dateien"
 
@@ -1127,15 +1058,15 @@
 
 #, c-format
 msgid "E947: Job still running in buffer \"%s\""
-msgstr "E947: Job noch aktiv in Puffer \"%s\""
+msgstr "E947: Job noch aktiv in Buffer \"%s\""
 
 #, c-format
 msgid "E162: No write since last change for buffer \"%s\""
-msgstr "E162: Puffer \"%s\" wurde seit der letzten Änderung nicht geschrieben."
+msgstr "E162: Buffer \"%s\" wurde seit der letzten Änderung nicht geschrieben."
 
 msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
 msgstr ""
-"Achtung: Unerwartetet einen andren Puffer geöffnet (überprüfen Sie die "
+"Achtung: Unerwartetet einen andren Buffer geöffnet (überprüfen Sie die "
 "Autokommandos)"
 
 #, c-format
@@ -1152,14 +1083,6 @@
 msgstr ""
 "W21: Erforderliche Python Version 3.x nicht unterstützt, ignoriere Datei: %s"
 
-#, c-format
-msgid "Current %slanguage: \"%s\""
-msgstr "Momentane %sSprache: \"%s\""
-
-#, c-format
-msgid "E197: Cannot set language to \"%s\""
-msgstr "E197: Sprache kann nicht auf \"%s\" gesetzt werden"
-
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
 msgstr ""
 "Ex-Modus. Geben Sie \"visual\" ein, um zum Normal-Modus zurückzukehren."
@@ -1202,16 +1125,16 @@
 msgid "E494: Use w or w>>"
 msgstr "E494: Verwenden Sie w oder w>>"
 
+msgid "E943: Command table needs to be updated, run 'make cmdidxs'"
+msgstr ""
+"E943: Befehlstabelle muss aktualisiert werden, führe 'make cmdidxs' aus"
+
 msgid ""
 "INTERNAL: Cannot use EX_DFLALL with ADDR_NONE, ADDR_UNSIGNED or ADDR_QUICKFIX"
 msgstr ""
 "INTERN: Kann EX_DFLALL nicht zusammen mit ADDR_NONE, ADDR_UNSIGNED oder "
 "ADDR_QUICKFIX nutzen"
 
-msgid "E943: Command table needs to be updated, run 'make cmdidxs'"
-msgstr ""
-"E943: Befehlstabelle muss aktualisiert werden, führe 'make cmdidxs' aus"
-
 msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: Der Befehl ist in dieser Version nicht implementiert"
 
@@ -1261,7 +1184,7 @@
 
 msgid "E747: Cannot change directory, buffer is modified (add ! to override)"
 msgstr ""
-"E747: Kann das Verzeichnis nicht wechseln, da der Puffer verändert wurde "
+"E747: Kann das Verzeichnis nicht wechseln, da der Buffer verändert wurde "
 "(erzwinge mit !)"
 
 msgid "E186: No previous directory"
@@ -1321,7 +1244,7 @@
 msgstr "E495: Kein Autokommando-Dateiname zur Ersetzung mit \"<afile>\""
 
 msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
-msgstr "E496: Keine Autokommando-Puffernummer zur Ersetzung mit \"<abuf>\""
+msgstr "E496: Keine Autokommando-Buffernummer zur Ersetzung mit \"<abuf>\""
 
 msgid "E497: no autocommand match name to substitute for \"<amatch>\""
 msgstr ""
@@ -1330,6 +1253,9 @@
 msgid "E498: no :source file name to substitute for \"<sfile>\""
 msgstr "E498: kein :source Dateiname zur Ersetzung mit \"<sfile>\""
 
+msgid "E489: no call stack to substitute for \"<stack>\""
+msgstr "E489: kein CallStack zur Ersetzung mit \"<stack>\" vorhanden"
+
 msgid "E842: no line number to use for \"<slnum>\""
 msgstr "E842: Keine Zeilennummer für  \"<slnum>\" vorhanden."
 
@@ -1414,6 +1340,9 @@
 msgid "E733: Using :endwhile with :for"
 msgstr "E733: Nutzung von :endwhile mit :for"
 
+msgid "E579: block nesting too deep"
+msgstr "E579: Block Schachtelung zu tief"
+
 msgid "E601: :try nesting too deep"
 msgstr "E601: :try Schachtelung zu tief"
 
@@ -1427,16 +1356,16 @@
 msgstr "E193: :endfunction außerhalb einer Funktion"
 
 msgid "E788: Not allowed to edit another buffer now"
-msgstr "E788: Einen weiteren Puffer zu editieren ist im Moment nicht erlaubt"
+msgstr "E788: Einen weiteren Buffer zu editieren ist im Moment nicht erlaubt"
 
 msgid "E811: Not allowed to change buffer information now"
-msgstr "E811: Puffer Information darf momentan nicht geändert werden."
+msgstr "E811: Buffer Information darf momentan nicht geändert werden."
 
 msgid "E199: Active window or buffer deleted"
-msgstr "E199: Aktives Fenster oder Puffer gelöscht"
+msgstr "E199: Aktives Fenster oder Buffer gelöscht"
 
 msgid "E812: Autocommands changed buffer or buffer name"
-msgstr "E812: Autokommandos veränderten Puffer oder Puffername."
+msgstr "E812: Autokommandos veränderten Buffer oder Buffername."
 
 msgid "Illegal file name"
 msgstr "Unzulässiger Dateiname"
@@ -1461,7 +1390,7 @@
 
 msgid "E201: *ReadPre autocommands must not change current buffer"
 msgstr ""
-"E201: *ReadPre Autokommandos dürfen nicht den aktuellen Puffer wechseln"
+"E201: *ReadPre Autokommandos dürfen nicht den aktuellen Buffer wechseln"
 
 msgid "Vim: Reading from stdin...\n"
 msgstr "Vim: Lese von stdin...\n"
@@ -1556,7 +1485,7 @@
 msgstr "E210: Fehler beim Lesen von \"%s\""
 
 msgid "E246: FileChangedShell autocommand deleted buffer"
-msgstr "E246: FileChangedShell-Autokommando löschte Puffer"
+msgstr "E246: FileChangedShell-Autokommando löschte Buffer"
 
 #, c-format
 msgid "E211: File \"%s\" no longer available"
@@ -1567,7 +1496,7 @@
 "W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
 "well"
 msgstr ""
-"W12: Achtung: Datei \"%s\" wurde verändert und der Puffer wurde in Vim "
+"W12: Achtung: Datei \"%s\" wurde verändert und der Buffer wurde in Vim "
 "ebenfalls verändert"
 
 msgid "See \":help W12\" for more info."
@@ -1767,15 +1696,15 @@
 "E232: BalloonEval kann nicht sowohl mit \"message\" als auch \"callback\" "
 "erzeugt werden"
 
-msgid "_Cancel"
-msgstr "_Abbrechen"
-
 msgid "_Save"
 msgstr "_Speichern"
 
 msgid "_Open"
 msgstr "_Öffnen"
 
+msgid "_Cancel"
+msgstr "_Abbrechen"
+
 msgid "_OK"
 msgstr "_OK"
 
@@ -2101,6 +2030,46 @@
 msgid "Print job sent."
 msgstr "Druckauftrag abgeschickt"
 
+msgid "E478: Don't panic!"
+msgstr "E478: Nur keine Panik!"
+
+#, c-format
+msgid "E661: Sorry, no '%s' help for %s"
+msgstr "E661: Schade, keine '%s' Hilfe für %s"
+
+#, c-format
+msgid "E149: Sorry, no help for %s"
+msgstr "E149: Schade, keine Hilfe für %s"
+
+#, c-format
+msgid "Sorry, help file \"%s\" not found"
+msgstr "Hilfe-Datei \"%s\" nicht gefunden"
+
+#, c-format
+msgid "E151: No match: %s"
+msgstr "E151: Kein Treffer: %s"
+
+#, c-format
+msgid "E152: Cannot open %s for writing"
+msgstr "E152: %s kann nicht zum Schreiben geöffnet werden."
+
+#, c-format
+msgid "E153: Unable to open %s for reading"
+msgstr "E153: %s kann nicht zum Lesen geöffnet werden."
+
+#, c-format
+msgid "E670: Mix of help file encodings within a language: %s"
+msgstr ""
+"E670: Mischung von Kodierungen einer Hilfedatei innerhalb einer Sprache: %s"
+
+#, c-format
+msgid "E154: Duplicate tag \"%s\" in file %s/%s"
+msgstr "E154: Doppelter Tag \"%s\" in der Datei %s/%s"
+
+#, c-format
+msgid "E150: Not a directory: %s"
+msgstr "E150: Kein Verzeichnis: %s"
+
 msgid "E679: recursive loop loading syncolor.vim"
 msgstr "E679: Rekursive Schleife beim Laden von syncolor.vim"
 
@@ -2367,7 +2336,7 @@
 msgstr "Fensterindex außerhalb des zulässigen Bereichs"
 
 msgid "couldn't open buffer"
-msgstr "konnte Puffer nicht öffnen"
+msgstr "konnte Buffer nicht öffnen"
 
 msgid "cannot delete line"
 msgstr "Zeile kann nicht gelöscht werden"
@@ -2391,7 +2360,7 @@
 msgstr "Vim Fehler"
 
 msgid "buffer is invalid"
-msgstr "ungültiger Puffer"
+msgstr "ungültiger Buffer"
 
 msgid "window is invalid"
 msgstr "ungültiges Fenster"
@@ -2457,7 +2426,7 @@
 msgstr "E273: Unbekannter longjmp Status %d"
 
 msgid "invalid buffer number"
-msgstr "ungültige Puffernummer"
+msgstr "ungültige Buffernummer"
 
 msgid "not implemented yet"
 msgstr "nicht implementiert"
@@ -2492,12 +2461,12 @@
 
 msgid "cannot create buffer/window command: object is being deleted"
 msgstr ""
-"Puffer/Fenster-Befehl kann nicht ausgeführt werden: das Objekt wird gelöscht"
+"Buffer/Fenster-Befehl kann nicht ausgeführt werden: das Objekt wird gelöscht"
 
 msgid ""
 "cannot register callback command: buffer/window is already being deleted"
 msgstr ""
-"kann keinen Callback-Befehl registrieren: Puffer/Fenster ist bereits gelöscht"
+"kann keinen Callback-Befehl registrieren: Buffer/Fenster ist bereits gelöscht"
 
 msgid ""
 "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-dev@vim."
@@ -2508,7 +2477,7 @@
 
 msgid "cannot register callback command: buffer/window reference not found"
 msgstr ""
-"kann keinen Callback-Befehl registrieren: Puffer/Fenster-Referenz nicht "
+"kann keinen Callback-Befehl registrieren: Buffer/Fenster-Referenz nicht "
 "gefunden"
 
 msgid ""
@@ -2650,6 +2619,19 @@
 msgid "match %d"
 msgstr "Treffer %d"
 
+msgid "E920: _io file requires _name to be set"
+msgstr "E920: Für _io Datei muss _name gesetzt ist."
+
+msgid "E915: in_io buffer requires in_buf or in_name to be set"
+msgstr "E915: Für in_io Buffer muss in_buf oder in_name gesetzt sein."
+
+#, c-format
+msgid "E918: buffer must be loaded: %s"
+msgstr "E918: Buffer muss geladen sein: %s."
+
+msgid "E916: not a valid job"
+msgstr "E916: kein gültiger Job"
+
 #, c-format
 msgid "E491: json decode error at '%s'"
 msgstr "E491: JSON Dekodierungsfehler in Zeile '%s'"
@@ -2687,6 +2669,9 @@
 msgid "map() argument"
 msgstr "map() Argument"
 
+msgid "mapnew() argument"
+msgstr "mapnew() Argument"
+
 msgid "filter() argument"
 msgstr "filter() Argument"
 
@@ -2702,6 +2687,14 @@
 msgid "reverse() argument"
 msgstr "reverse() Argument"
 
+#, c-format
+msgid "Current %slanguage: \"%s\""
+msgstr "Momentane %sSprache: \"%s\""
+
+#, c-format
+msgid "E197: Cannot set language to \"%s\""
+msgstr "E197: Sprache kann nicht auf \"%s\" gesetzt werden"
+
 msgid "Unknown option argument"
 msgstr "Unbekanntes Optionsargument"
 
@@ -3431,16 +3424,21 @@
 "und \"diff\" mit der Original-Datei ausführen, um Änderungen zu prüfen)"
 
 msgid "Recovery completed. Buffer contents equals file contents."
-msgstr "Recovery durchgeführt. Pufferinhalt entspricht Dateiinhalt."
+msgstr "Recovery durchgeführt. Bufferinhalt entspricht Dateiinhalt."
 
 msgid ""
 "\n"
-"You may want to delete the .swp file now.\n"
-"\n"
+"You may want to delete the .swp file now."
 msgstr ""
 "\n"
-"Sie können die Swap Datei jetzt löschen.\n"
+"Sie können die Swap Datei .swp jetzt löschen."
+
+msgid ""
+"\n"
+"Note: process STILL RUNNING: "
+msgstr ""
 "\n"
+" (Prozess LÄUFT NOCH)"
 
 msgid "Using crypt key from swap file for the text file.\n"
 msgstr "Benutze den Schlüssel der Swap Datei für die Textdatei.\n"
@@ -3553,7 +3551,7 @@
 
 #, c-format
 msgid "E316: ml_get: cannot find line %ld in buffer %d %s"
-msgstr "E316: ml_get: kann Zeile %ld in Puffer %d %s nicht finden"
+msgstr "E316: ml_get: kann Zeile %ld in Buffer %d %s nicht finden"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: Zeiger Block id falsch 3"
@@ -3747,6 +3745,10 @@
 msgstr "E337: Menü nicht gefunden - überprüfe Menü-Namen"
 
 #, c-format
+msgid "Error detected while compiling %s:"
+msgstr "Fehler beim Ausführen von %s:"
+
+#, c-format
 msgid "Error detected while processing %s:"
 msgstr "Fehler beim Ausführen von \"%s\":"
 
@@ -3813,11 +3815,12 @@
 
 msgid "Type number and <Enter> or click with the mouse (q or empty cancels): "
 msgstr ""
-"Bitte Nummer und <Enter> eingeben oder mit der Maus auswählen "
-"(abbrechen mit q oder <Enter>): "
+"Bitte Nummer und <Enter> eingeben oder mit der Maus auswählen (abbrechen mit "
+"q oder <Enter>): "
 
 msgid "Type number and <Enter> (q or empty cancels): "
-msgstr "Gewünschte Nummer und <Enter> eingeben (abbrechen mit q oder <Enter>): "
+msgstr ""
+"Gewünschte Nummer und <Enter> eingeben (abbrechen mit q oder <Enter>): "
 
 #, c-format
 msgid "%ld more line"
@@ -3894,7 +3897,7 @@
 
 #, c-format
 msgid "E658: NetBeans connection lost for buffer %d"
-msgstr "E658: Verbindung zu NetBeans für Puffer %d verloren"
+msgstr "E658: Verbindung zu NetBeans für Buffer %d verloren"
 
 msgid "E838: netbeans is not supported with this GUI"
 msgstr "E838: netbeans wird nicht unterstützt mit dieser GUI."
@@ -4098,7 +4101,6 @@
 msgid "E540: Unclosed expression sequence"
 msgstr "E540: Nicht-geschlossene Ausdrucksfolge"
 
-
 msgid "E542: unbalanced groups"
 msgstr "E542: Unausgewogene Gruppen"
 
@@ -4401,7 +4403,7 @@
 msgstr "E861: Kann kein zweites Popup mit Terminal öffen"
 
 msgid "E450: buffer number, text or a list required"
-msgstr "E450: Puffernummer, Text oder Liste erforderlich"
+msgstr "E450: Buffernummer, Text oder Liste erforderlich"
 
 #, c-format
 msgid "E997: Tabpage not found: %d"
@@ -4423,6 +4425,9 @@
 msgid "E553: No more items"
 msgstr "E553: Keine weiteren Einträge"
 
+msgid "E925: Current quickfix list was changed"
+msgstr "E925: Aktuelle Quickfix Liste wurde geändert."
+
 msgid "E926: Current location list was changed"
 msgstr "E926: Aktuelle Positionsliste wurde geändert."
 
@@ -4458,9 +4463,6 @@
 msgid "E924: Current window was closed"
 msgstr "E924: Aktuelles Fenster wurde geschlossen."
 
-msgid "E925: Current quickfix was changed"
-msgstr "E925: Aktuelle Quickfix wurde geändert."
-
 #, c-format
 msgid "(%d of %d)%s%s: "
 msgstr "(%d aus %d)%s%s: "
@@ -4495,7 +4497,7 @@
 msgstr "Kann nicht sowohl Liste und ein \"what\" Argument haben"
 
 msgid "E681: Buffer is not loaded"
-msgstr "E681: Puffer ist nicht geladen"
+msgstr "E681: Buffer ist nicht geladen"
 
 msgid "E777: String or List expected"
 msgstr "E777: Zeichenkette oder Liste erwartet"
@@ -4846,9 +4848,6 @@
 msgid "E984: :scriptversion used outside of a sourced file"
 msgstr "E984: :scriptversion außerhalb einer eingelesenen Datei"
 
-msgid "E1040: Cannot use :scriptversion after :vim9script"
-msgstr "E1040: :scriptversion kann nicht nach :vim9script verwendet werden"
-
 #, c-format
 msgid "E999: scriptversion not supported: %d"
 msgstr "E999: scriptversion nicht unterstützt: %d"
@@ -4966,7 +4965,7 @@
 msgstr "E157: Ungültige Zeichen-ID: %d"
 
 msgid "E934: Cannot jump to a buffer that does not have a name"
-msgstr "E934: Kann nicht zu einem Puffer ohne Namen springen."
+msgstr "E934: Kann nicht zu einem Buffer ohne Namen springen."
 
 #, c-format
 msgid "E160: Unknown sign command: %s"
@@ -4992,7 +4991,7 @@
 "Achtung: Kann Wortliste \"%s.%s.spl\" oder \"%s.ascii.spl\" nicht finden"
 
 msgid "E797: SpellFileMissing autocommand deleted buffer"
-msgstr "E797: SpellFileMissing-Autokommando löschte Puffer"
+msgstr "E797: SpellFileMissing-Autokommando löschte Buffer"
 
 #, c-format
 msgid "Warning: region %s not supported"
@@ -5354,7 +5353,7 @@
 msgstr "E390: Unerlaubtes Argument: %s"
 
 msgid "No Syntax items defined for this buffer"
-msgstr "Keine Syntax-Elemente für diesen Puffer definiert"
+msgstr "Keine Syntax-Elemente für diesen Buffer definiert"
 
 msgid "'redrawtime' exceeded, syntax highlighting disabled"
 msgstr "'redrawtime' überschritten, Syntaxhighlighting deaktiviert"
@@ -5404,6 +5403,9 @@
 msgid "no syncing"
 msgstr "keine Synchronisation"
 
+msgid "syncing starts at the first line"
+msgstr "Synchronisation beginnt in der ersten Zeile"
+
 msgid "syncing starts "
 msgstr "Synchronisation beginnt "
 
@@ -5435,6 +5437,9 @@
 msgid "E392: No such syntax cluster: %s"
 msgstr "E392: Kein solcher Syntax-Cluster: %s"
 
+msgid "from the first line"
+msgstr " aus der ersten Zeile"
+
 msgid "minimal "
 msgstr "minimal "
 
@@ -5693,7 +5698,7 @@
 msgstr "E953: Datei existiert bereits: %s"
 
 msgid "E955: Not a terminal buffer"
-msgstr "E955: Kein Terminal Puffer"
+msgstr "E955: Kein Terminal Buffer"
 
 msgid "E982: ConPTY is not available"
 msgstr "E982: ConPTY ist nicht verfügbar"
@@ -5714,7 +5719,7 @@
 msgstr "E965: Fehlender Eigenschaften Typname"
 
 msgid "E275: Cannot add text property to unloaded buffer"
-msgstr "E275: Kann Texteigenschaft nicht einem entladenen Puffer hinzufügen"
+msgstr "E275: Kann Texteigenschaft nicht einem entladenen Buffer hinzufügen"
 
 msgid "E967: text property info corrupted"
 msgstr "E967: Texteigenschaft-Info beschädigt"
@@ -5758,6 +5763,9 @@
 msgid "E728: Using a Dictionary as a Number"
 msgstr "E728: Dictionary als Zahl verwendet."
 
+msgid "E611: Using a Special as a Number"
+msgstr "E611: Special als Zahl verwendet."
+
 msgid "E910: Using a Job as a Number"
 msgstr "E910: Job als Zahl verwendet."
 
@@ -6065,17 +6073,6 @@
 msgid "E853: Duplicate argument name: %s"
 msgstr "E853: Doppelter Argumentname: %s"
 
-#, c-format
-msgid "E1059: No white space allowed before colon: %s"
-msgstr "E1059: Keine Leerzeichen erlaubt vor : %s"
-
-#, c-format
-msgid "E1077: Missing argument type for %s"
-msgstr "E1077: Fehlender Argumenttyp für %s"
-
-msgid "E1055: Missing name after ..."
-msgstr "E1055: Fehlender Name nach ..."
-
 msgid "E989: Non-default argument follows default argument"
 msgstr "E989: Nicht-default Argument folgt auf default Argument"
 
@@ -6154,17 +6151,10 @@
 msgstr "E862: g: kann hier nicht genutzt werden"
 
 #, c-format
-msgid "E1056: expected a type: %s"
-msgstr "E1056: Typ erwartet: %s"
-
-#, c-format
 msgid "E932: Closure function should not be at top level: %s"
 msgstr ""
 "E932: Closure Funktion kann nicht auf äussersten Level definiert sein: %s"
 
-msgid "E1057: Missing :enddef"
-msgstr "E1057: Fehlendes :enddef"
-
 msgid "E126: Missing :endfunction"
 msgstr "E126: Fehlendes :endfunction"
 
@@ -6176,9 +6166,6 @@
 msgid "W22: Text found after :endfunction: %s"
 msgstr "W22: Überschüssiger Text nach :endfunction: %s"
 
-msgid "E1058: function nesting too deep"
-msgstr "E1058: Funktions-Schachtelung zu tief"
-
 #, c-format
 msgid "E707: Function name conflicts with variable: %s"
 msgstr "E707: Funktionsname kollidiert mit Variable: %s"
@@ -6196,10 +6183,6 @@
 msgid "E131: Cannot delete function %s: It is in use"
 msgstr "E131: Funktion %s kann nicht gelöscht werden: sie ist in Verwendung"
 
-#, c-format
-msgid "E1084: Cannot delete Vim9 script function %s"
-msgstr "E1084: Vim9 Funktion %s kann nicht gelöscht werden"
-
 msgid "E133: :return not inside a function"
 msgstr "E133: :return außerhalb einer Funktion"
 
@@ -6365,12 +6348,6 @@
 msgid "with GUI."
 msgstr "mit GUI."
 
-msgid "with Carbon GUI."
-msgstr "mit Carbon GUI."
-
-msgid "with Cocoa GUI."
-msgstr "mit Cocoa GUI."
-
 msgid "  Features included (+) or not (-):\n"
 msgstr " Ein- (+) oder ausschließlich (-) der Eigenschaften:\n"
 
@@ -6499,322 +6476,61 @@
 msgid "menu  Help->Sponsor/Register  for information    "
 msgstr "Menü   Hilfe->Sponsor/Register  für mehr Informationen    "
 
-#, c-format
-msgid "E1001: variable not found: %s"
-msgstr "E1001: Variable nicht gefunden: %s"
+msgid "[end of lines]"
+msgstr "[Zeilenende]"
 
-#, c-format
-msgid "E1002: Syntax error at %s"
-msgstr "E1002: Syntaxfehler bei %s"
+msgid "global"
+msgstr "global"
 
-#, c-format
-msgid "E1006: %s is used as an argument"
-msgstr "E1006: %s wird als Argument verwendet"
+msgid "buffer"
+msgstr "Buffer"
 
-msgid "E1031: Cannot use void value"
-msgstr "E1031: Kann nicht void Wert verwenden"
+msgid "window"
+msgstr "Fenster"
 
-#, c-format
-msgid "E1013: type mismatch, expected %s but got %s"
-msgstr "E1013: Typendiskrepanz, erwartete %s erhielt jedoch %s"
+msgid "tab"
+msgstr "Reiter"
+
+msgid ""
+"\n"
+"# Buffer list:\n"
+msgstr ""
+"\n"
+"# Liste der Buffer:\n"
 
 #, c-format
-msgid "E1013: argument %d: type mismatch, expected %s but got %s"
-msgstr "E1013: Argument %d: Typendiskrepanz, erwartete %s erhielt jedoch %s"
+msgid ""
+"\n"
+"# %s History (newest to oldest):\n"
+msgstr ""
+"\n"
+"# %s Geschichte (neueste bis älteste):\n"
 
-msgid "E1051: wrong argument type for +"
-msgstr "E1051: Falscher Argumenttyp für +"
+msgid "Command Line"
+msgstr "Befehlszeile"
 
-#, c-format
-msgid "E1036: %c requires number or float arguments"
-msgstr "E1036: %c benötigt Nummer oder Float als Argument"
+msgid "Search String"
+msgstr "Suchausdruck"
 
-msgid "E1035: % requires number arguments"
-msgstr "E1035: % benötigt numerische Argumente"
+msgid "Expression"
+msgstr "Ausdruck"
 
-#, c-format
-msgid "E1037: Cannot use \"%s\" with %s"
-msgstr "E1037: Kann nicht \"%s\" mit %s verwenden"
+msgid "Input Line"
+msgstr "Eingabe-Zeile"
 
-#, c-format
-msgid "E1072: Cannot compare %s with %s"
-msgstr "E1072: Kann %s nicht mit %s vergleichen"
+msgid "Debug Line"
+msgstr "Debug-Zeile"
+
+msgid ""
+"\n"
+"# Bar lines, copied verbatim:\n"
+msgstr ""
+"\n"
+"# |-Zeilen, wortwörtlich kopiert:\n"
 
 #, c-format
-msgid "E1085: Not a callable type: %s"
-msgstr "E1085: Kein aufrufbarer Typ: %s"
-
-msgid "E1008: Missing <type>"
-msgstr "E1008: Fehlendes <type>"
-
-msgid "E1009: Missing > after type"
-msgstr "E1009: Fehlendes '>' nach Typ"
-
-msgid "E1076: This Vim is not compiled with float support"
-msgstr "E1076: Vim wurde nicht mit der \"float\"-Eigenschaft übersetzt."
-
-msgid "E1007: mandatory argument after optional argument"
-msgstr "E1007: obligatories Argument nach optionalem Argument"
-
-msgid "E740: Too many argument types"
-msgstr "E740: Zu viele Argumenttypen"
-
-#, c-format
-msgid "E1010: Type not recognized: %s"
-msgstr "E1010: Unbekannter Typ: %s"
-
-#, c-format
-msgid "E1060: expected dot after name: %s"
-msgstr "E1060: erwarte Punkt nach Name: %s"
-
-msgid "E1074: no white space allowed after dot"
-msgstr "E1074: Keine Leerzeichen nach Punkt erlaubt"
-
-#, c-format
-msgid "E1050: Item not found: %s"
-msgstr "E1050: Element nicht gefunden: %s"
-
-#, c-format
-msgid "E1011: name too long: %s"
-msgstr "E1011: Name zu lang: %s"
-
-#, c-format
-msgid "E1014: Invalid key: %s"
-msgstr "E1014: Ungültiger Schlüssel: %s"
-
-msgid "[end of lines]"
-msgstr "[Zeilenende]"
-
-#, c-format
-msgid "E1015: Name expected: %s"
-msgstr "E1015: Name erwartet: %s"
-
-msgid "E1096: Returning a value in a function without a return type"
-msgstr "E1096: Rückgabe eines Wertes einer Funktion ohne Rückgabetyp"
-
-msgid "E1003: Missing return value"
-msgstr "E1003: Fehlender Returnwert"
-
-msgid "global"
-msgstr "global"
-
-msgid "buffer"
-msgstr "Puffer"
-
-msgid "window"
-msgstr "Fenster"
-
-msgid "tab"
-msgstr "Reiter"
-
-msgid "E1092: Cannot use a list for a declaration"
-msgstr "E1092: Kann Liste nicht als Deklaration verwenden"
-
-#, c-format
-msgid "E1052: Cannot declare an option: %s"
-msgstr "E1052: Kann keine Option deklarieren: %s"
-
-#, c-format
-msgid "E1066: Cannot declare a register: %s"
-msgstr "E1066: Kann kein Register deklarieren: %s"
-
-#, c-format
-msgid "E1034: Cannot use reserved name %s"
-msgstr "E1034: Kann reservierten Namen nicht benutzen %s"
-
-#, c-format
-msgid "E1017: Variable already declared: %s"
-msgstr "E1017: Variable bereits deklariert: %s"
-
-#, c-format
-msgid "E1018: Cannot assign to a constant: %s"
-msgstr "E1018: Kann nicht einer Konstante zuweisen: %s"
-
-#, c-format
-msgid "E1054: Variable already declared in the script: %s"
-msgstr "E1054: Variable bereits in Script %s deklariert"
-
-#, c-format
-msgid "E1082: Cannot use a namespaced variable: %s"
-msgstr "E1082: Kann eine Variable im Namesraum nicht verwenden: %s"
-
-#, c-format
-msgid "E1089: unknown variable: %s"
-msgstr "E1089: Unbekannte Variable: %s"
-
-msgid "E1019: Can only concatenate to string"
-msgstr "E1019: Kann nur zu einer Zeichenkette verkettet werden"
-
-#, c-format
-msgid "E1020: cannot use an operator on a new variable: %s"
-msgstr "E1020: kann Operator nicht auf eine neue Variable %s anwenden"
-
-msgid "E1087: cannot use an index when declaring a variable"
-msgstr "E1087: Kann Index nicht verwenden, wenn eine Variable deklariert wird"
-
-#, c-format
-msgid "E1088: cannot use an index on %s"
-msgstr "E1088: Kann Index auf: %s nicht verwenden"
-
-#, c-format
-msgid "E1090: Cannot assign to argument %s"
-msgstr "E1090: Kann dem Argument nicht zuweisen %s"
-
-#, c-format
-msgid "E1081: Cannot unlet %s"
-msgstr "E1081: Kann Variable nicht entfernen %s"
-
-#, c-format
-msgid "E1023: variable already defined: %s"
-msgstr "E1023: Variable existiert bereits: %s"
-
-msgid "E1033: catch unreachable after catch-all"
-msgstr "E1033: catch unerreichbar nach catch-all"
-
-#, c-format
-msgid "E1067: Separator mismatch: %s"
-msgstr "E1067: Separator-Unstimmigkeit %s"
-
-msgid "E1032: missing :catch or :finally"
-msgstr "E1032: fehlendes :catch oder :finally"
-
-msgid "E1083: missing backtick"
-msgstr "E1083: Fehlender Backtick"
-
-#, c-format
-msgid "E488: Trailing characters: %s"
-msgstr "E488: Überschüssige Zeichen: %s"
-
-msgid "E1025: using } outside of a block scope"
-msgstr "E1025: } außerhalb eines Blockbereichs verwendet"
-
-msgid "E1095: Unreachable code after :return"
-msgstr "E1095: Nicht erreichbarer Code nach :return"
-
-msgid "E1086: Cannot use :function inside :def"
-msgstr "E1086: Kann :function nicht innerhalb von :def verwenden"
-
-msgid "E1026: Missing }"
-msgstr "E1026: Fehlendes }"
-
-msgid "E1027: Missing return statement"
-msgstr "E1027: Fehlende Return Anweisung"
-
-msgid "E1028: compile_def_function failed"
-msgstr "E1028: compile_def_function fehlgeschlagen"
-
-#, c-format
-msgid "E1091: Function is not compiled: %s"
-msgstr "E1091: Funktion ist nicht kompiliert: %s"
-
-#, c-format
-msgid "E121: Undefined variable: %c:%s"
-msgstr "E121: Undefinierte Variable: %c:%s"
-
-#, c-format
-msgid "E1029: Expected %s but got %s"
-msgstr "E1029: Erwartete %s, aber erhielt %s"
-
-#, c-format
-msgid "E1093: Expected %d items but got %d"
-msgstr "E1093: Erwartete %d Einträge, aber erhielt %d"
-
-#, c-format
-msgid "E1061: Cannot find function %s"
-msgstr "E1061: Funktion %s nicht gefunden"
-
-#, c-format
-msgid "E1062: Function %s is not compiled"
-msgstr "E1062: Funktion %s ist nicht kompiliert"
-
-msgid "E1030: Using a String as a Number"
-msgstr "E1030: Verwende Zeichenkette als Nummer"
-
-msgid "E1042: export can only be used in vim9script"
-msgstr "E1042: export kann nur für Vim9script verwendet werden"
-
-msgid "E1038: vim9script can only be used in a script"
-msgstr "E1038: vim9script kann nur innerhalb eines Scripts verwendet werden"
-
-msgid "E1039: vim9script must be the first command in a script"
-msgstr "E1039: vim9script muss erster Befehl in einem Script sein"
-
-msgid "E1044: export with invalid argument"
-msgstr "E1044: export mit ungültigem Argument"
-
-msgid "E1043: Invalid command after :export"
-msgstr "E1043: Ungültiger Befehl nach :export"
-
-msgid "E1094: import can only be used in a script"
-msgstr "E1094: import kann nur innerhalb eines Scripts verwendet werden"
-
-#, c-format
-msgid "E1049: Item not exported in script: %s"
-msgstr "E1049: Element nicht exportiert in Script: %s"
-
-#, c-format
-msgid "E1048: Item not found in script: %s"
-msgstr "E1048: Element nicht in Script %s gefunden"
-
-msgid "E1047: syntax error in import"
-msgstr "E1047: Syntaxfehler in import"
-
-msgid "E1046: Missing comma in import"
-msgstr "E1046: Fehlendes Komma in import"
-
-msgid "E1045: Missing \"as\" after *"
-msgstr "E1045: Fehlendes \"as\" nach *"
-
-msgid "E1070: Missing \"from\""
-msgstr "E1070: Fehlendes \"from\""
-
-msgid "E1071: Invalid string after \"from\""
-msgstr "E1071: Ungültige Zeichenkette nach \"from\""
-
-#, c-format
-msgid "E1053: Could not import \"%s\""
-msgstr "E1053: Konnte \"%s\" nicht importieren"
-
-msgid ""
-"\n"
-"# Buffer list:\n"
-msgstr ""
-"\n"
-"# Liste der Puffer:\n"
-
-#, c-format
-msgid ""
-"\n"
-"# %s History (newest to oldest):\n"
-msgstr ""
-"\n"
-"# %s Geschichte (neueste bis älteste):\n"
-
-msgid "Command Line"
-msgstr "Befehlszeile"
-
-msgid "Search String"
-msgstr "Suchausdruck"
-
-msgid "Expression"
-msgstr "Ausdruck"
-
-msgid "Input Line"
-msgstr "Eingabe-Zeile"
-
-msgid "Debug Line"
-msgstr "Debug-Zeile"
-
-msgid ""
-"\n"
-"# Bar lines, copied verbatim:\n"
-msgstr ""
-"\n"
-"# |-Zeilen, wortwörtlich kopiert:\n"
-
-#, c-format
-msgid "%sviminfo: %s in line: "
-msgstr "%sviminfo: %s in Zeile: "
+msgid "%sviminfo: %s in line: "
+msgstr "%sviminfo: %s in Zeile: "
 
 msgid "E136: viminfo: Too many errors, skipping rest of file"
 msgstr "E136: viminfo: Zu viele Fehler; überspringe Rest der Datei"
@@ -6947,7 +6663,7 @@
 
 #, c-format
 msgid "E92: Buffer %ld not found"
-msgstr "E92: Puffer %ld nicht gefunden."
+msgstr "E92: Buffer %ld nicht gefunden."
 
 msgid "E441: There is no preview window"
 msgstr "E441: Es gibt kein Vorschaufenster"
@@ -7020,928 +6736,2758 @@
 msgid "Path length too long!"
 msgstr "Die Länge des Pfads ist zu groß!"
 
-msgid "--No lines in buffer--"
-msgstr "--Keine Zeilen im Puffer--"
+#, c-format
+msgid "E121: Undefined variable: %s"
+msgstr "E121: Undefinierte Variable: %s"
 
-msgid "E470: Command aborted"
-msgstr "E470: Befehl abgebrochen"
+#, c-format
+msgid "E121: Undefined variable: %c:%s"
+msgstr "E121: Undefinierte Variable: %c:%s"
 
-msgid "E471: Argument required"
-msgstr "E471: Argument benötigt"
+msgid "E476: Invalid command"
+msgstr "E476: Ungültiger Befehl"
 
-msgid "E10: \\ should be followed by /, ? or &"
-msgstr "E10: \\ sollte von /, ? oder & gefolgt werden"
+#, c-format
+msgid "E476: Invalid command: %s"
+msgstr "E476: Ungültiger Befehl: %s"
 
-msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
-msgstr "E11: Ungültig im Kommandozeilenfenster; <CR> führt aus, CTRL-C beendet"
+msgid "E710: List value has more items than targets"
+msgstr "E710: Listenwert hat mehr Einträge als das Ziel"
 
-msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
-msgstr ""
-"E12: Befehl nicht zulässig vom exrc/vimrc in der momentanen Verzeichnis- "
-"oder Tag-Suche"
+msgid "E711: List value does not have enough items"
+msgstr "E711: Listenwert hat nicht genügend Einträge"
 
-msgid "E171: Missing :endif"
-msgstr "E171: Fehlendes :endif"
+msgid "E719: Cannot slice a Dictionary"
+msgstr "E719: Kann Slice [:] nicht mit einem Dictionary verwenden"
 
-msgid "E603: :catch without :try"
-msgstr "E603: :catch ohne :try"
+msgid ""
+"E856: \"assert_fails()\" second argument must be a string or a list with one "
+"or two strings"
+msgstr ""
+"E856: \"assert_fails()\" zweites Argument muss eine Zeichenkette oder eine Liste  "
+"von ein oder zwei Zeichenketten sein"
 
-msgid "E606: :finally without :try"
-msgstr "E606: :finally ohne :try"
+msgid "E909: Cannot index a special variable"
+msgstr "E909: Kann Spezialvariable nicht indexieren."
 
-msgid "E607: multiple :finally"
-msgstr "E607: Mehrere :finally"
+#, c-format
+msgid "E1100: Missing :var: %s"
+msgstr "E1100: Fehlende Variable: %s"
 
-msgid "E600: Missing :endtry"
-msgstr "E600: Fehlendes :endtry"
+#, c-format
+msgid "E1001: Variable not found: %s"
+msgstr "E1001: Variable nicht gefunden: %s"
 
-msgid "E602: :endtry without :try"
-msgstr "E602: :endtry ohne :try"
+#, c-format
+msgid "E1002: Syntax error at %s"
+msgstr "E1002: Syntaxfehler bei %s"
 
-msgid "E170: Missing :endwhile"
-msgstr "E170: fehlendes :endwhile"
+msgid "E1003: Missing return value"
+msgstr "E1003: Fehlender Returnwert"
 
-msgid "E170: Missing :endfor"
-msgstr "E170: Fehlendes :endfor"
+#, c-format
+msgid "E1004: White space required before and after '%s'"
+msgstr "E1004: Leerzeichen vor und nach '%s' benötigt"
 
-msgid "E588: :endwhile without :while"
-msgstr "E588: :endwhile ohne :while"
+msgid "E1005: Too many argument types"
+msgstr "E1005: Zu viele Argumenttypen"
 
-msgid "E588: :endfor without :for"
-msgstr "E588: :endfor ohne :for"
+#, c-format
+msgid "E1006: %s is used as an argument"
+msgstr "E1006: %s wird als Argument verwendet"
 
-msgid "E13: File exists (add ! to override)"
-msgstr "E13: Datei existiert bereits (erzwinge mit !)"
+msgid "E1007: Mandatory argument after optional argument"
+msgstr "E1007: obligatorisches Argument nach optionalem Argument"
 
-msgid "E472: Command failed"
-msgstr "E472: Befehl fehlgeschlagen"
+msgid "E1008: Missing <type>"
+msgstr "E1008: Fehlendes <type>"
+
+msgid "E1009: Missing > after type"
+msgstr "E1009: Fehlendes '>' nach Typ"
 
 #, c-format
-msgid "E234: Unknown fontset: %s"
-msgstr "E234: Unbekannter Fontset: %s"
+msgid "E1010: Type not recognized: %s"
+msgstr "E1010: Unbekannter Typ: %s"
 
 #, c-format
-msgid "E235: Unknown font: %s"
-msgstr "E235: Unbekannte Schriftart: %s"
+msgid "E1011: Name too long: %s"
+msgstr "E1011: Name zu lang: %s"
 
 #, c-format
-msgid "E236: Font \"%s\" is not fixed-width"
-msgstr "E236: Schriftart \"%s\" hat keine feste Breite"
+msgid "E1012: Type mismatch; expected %s but got %s"
+msgstr "E1012: Typendiskrepanz, erwartete %s erhielt jedoch %s"
 
-msgid "E473: Internal error"
-msgstr "E473: Interner Fehler"
+#, c-format
+msgid "E1013: Argument %d: type mismatch, expected %s but got %s"
+msgstr "E1013: Argument %d: Typendiskrepanz, erwartete %s erhielt jedoch %s"
 
 #, c-format
-msgid "E685: Internal error: %s"
-msgstr "E685: Interner Fehler: %s"
+msgid "E1014: Invalid key: %s"
+msgstr "E1014: Ungültiger Schlüssel: %s"
 
-msgid "Interrupted"
-msgstr "Unterbrochen"
+#, c-format
+msgid "E1015: Name expected: %s"
+msgstr "E1015: Name erwartet: %s"
 
-msgid "E474: Invalid argument"
-msgstr "E474: Ungültiges Argument"
+#, c-format
+msgid "E1016: Cannot declare a %s variable: %s"
+msgstr "E1016: Kann eine %s Variable nicht deklarieren: %s"
 
 #, c-format
-msgid "E475: Invalid argument: %s"
-msgstr "E475: Ungültiges Argument: %s"
+msgid "E1016: Cannot declare an environment variable: %s"
+msgstr "E1016: Kann eine Umgebungsvariable nicht deklarieren: %s"
 
 #, c-format
-msgid "E983: Duplicate argument: %s"
-msgstr "E983: Doppeltes Argument: %s"
+msgid "E1017: Variable already declared: %s"
+msgstr "E1017: Variable bereits deklariert: %s"
 
 #, c-format
-msgid "E475: Invalid value for argument %s"
-msgstr "E475: Ungültiger Wert für Argument: %s"
+msgid "E1018: Cannot assign to a constant: %s"
+msgstr "E1018: Kann nicht einer Konstante zuweisen: %s"
+
+msgid "E1019: Can only concatenate to string"
+msgstr "E1019: Kann nur zu einer Zeichenkette verkettet werden"
 
 #, c-format
-msgid "E475: Invalid value for argument %s: %s"
-msgstr "E475: Ungültiger Wert für Argument %s: %s"
+msgid "E1020: Cannot use an operator on a new variable: %s"
+msgstr "E1020: kann Operator nicht auf eine neue Variable %s anwenden"
+
+msgid "E1021: Const requires a value"
+msgstr "E1021: const erfordert einen Wert"
+
+msgid "E1022: Type or initialization required"
+msgstr "E1022: Typ oder Initialisierung erforderlich"
 
 #, c-format
-msgid "E15: Invalid expression: %s"
-msgstr "E15: ungültiger Ausdruck: %s"
+msgid "E1023: Using a Number as a Bool: %d"
+msgstr "E1023: Zahl: %d als Bool verwendet"
 
-msgid "E16: Invalid range"
-msgstr "E16: Ungültiger Bereich"
+msgid "E1024: Using a Number as a String"
+msgstr "E1024: Zahl als String verwendet"
 
-msgid "E476: Invalid command"
-msgstr "E476: Ungültiger Befehl"
+msgid "E1025: Using } outside of a block scope"
+msgstr "E1025: } außerhalb eines Blockbereichs verwendet"
+
+msgid "E1026: Missing }"
+msgstr "E1026: Fehlendes }"
+
+msgid "E1027: Missing return statement"
+msgstr "E1027: Fehlende Return Anweisung"
+
+msgid "E1028: Compiling :def function failed"
+msgstr "E1028: Kompilieren von :def Funktion fehlgeschlagen"
 
 #, c-format
-msgid "E17: \"%s\" is a directory"
-msgstr "E17: \"%s\" ist ein Verzeichnis"
+msgid "E1029: Expected %s but got %s"
+msgstr "E1029: Erwartete %s, aber erhielt %s"
 
-msgid "E756: Spell checking is not possible"
-msgstr "E756: Rechtschreibprüfung ist nicht möglich"
+#, c-format
+msgid "E1030: Using a String as a Number: \"%s\""
+msgstr "E1030: Verwende Zeichenkette als Nummer: \"%s\""
+
+msgid "E1031: Cannot use void value"
+msgstr "E1031: Kann nicht void Wert verwenden"
+
+msgid "E1032: Missing :catch or :finally"
+msgstr "E1032: fehlendes :catch oder :finally"
+
+msgid "E1033: Catch unreachable after catch-all"
+msgstr "E1033: catch unerreichbar nach catch-all"
 
 #, c-format
-msgid "E364: Library call failed for \"%s()\""
-msgstr "E364: Bibliotheksaufruf für \"%s()\" schlug fehl"
+msgid "E1034: Cannot use reserved name %s"
+msgstr "E1034: Kann reservierten Namen nicht benutzen %s"
 
-msgid "E667: Fsync failed"
-msgstr "E667: Fsync fehlgeschlagen"
+msgid "E1035: % requires number arguments"
+msgstr "E1035: % benötigt numerische Argumente"
 
 #, c-format
-msgid "E448: Could not load library function %s"
-msgstr "E448: Bibliotheksfunktion %s konnte nicht geladen werden"
+msgid "E1036: %c requires number or float arguments"
+msgstr "E1036: %c benötigt Nummer oder Float als Argument"
 
-msgid "E19: Mark has invalid line number"
-msgstr "E19: Markierung hat ungültige Zeilennummer"
+#, c-format
+msgid "E1037: Cannot use \"%s\" with %s"
+msgstr "E1037: Kann nicht \"%s\" mit %s verwenden"
 
-msgid "E20: Mark not set"
-msgstr "E20: Markierung nicht gesetzt"
+msgid "E1038: \"vim9script\" can only be used in a script"
+msgstr "E1038: \"vim9script\" kann nur innerhalb eines Scripts verwendet werden"
 
-msgid "E21: Cannot make changes, 'modifiable' is off"
-msgstr "E21: Kann keine Änderungen machen, 'modifiable' ist aus"
+msgid "E1039: \"vim9script\" must be the first command in a script"
+msgstr "E1039: \"vim9script\" muss erster Befehl in einem Script sein"
 
-msgid "E22: Scripts nested too deep"
-msgstr "E22: Skript ist zu tief verschachtelt"
+msgid "E1040: Cannot use :scriptversion after :vim9script"
+msgstr "E1040: :scriptversion kann nicht nach :vim9script verwendet werden"
 
-msgid "E23: No alternate file"
-msgstr "E23: Keine alternative Datei"
+#, c-format
+msgid "E1041: Redefining script item %s"
+msgstr "E1041: Neudefinition von Scriptelement %s"
 
-msgid "E24: No such abbreviation"
-msgstr "E24: Diese Kurzform nicht gefunden"
+msgid "E1042: Export can only be used in vim9script"
+msgstr "E1042: Export kann nur für Vim9script verwendet werden"
 
-msgid "E477: No ! allowed"
-msgstr "E477: Kein ! erlaubt"
+msgid "E1043: Invalid command after :export"
+msgstr "E1043: Ungültiger Befehl nach :export"
 
-msgid "E25: GUI cannot be used: Not enabled at compile time"
-msgstr ""
-"E25: GUI kann nicht benutzt werden: wurde zum Zeitpunkt des Übersetzens "
-"nicht eingeschaltet."
+msgid "E1044: Export with invalid argument"
+msgstr "E1044: export mit ungültigem Argument"
 
-msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
-msgstr ""
-"E26: Hebräisch kann nicht benutzt werden: wurde zum Zeitpunkt des "
-"Übersetzens nicht eingeschaltet.\n"
+msgid "E1045: Missing \"as\" after *"
+msgstr "E1045: Fehlendes \"as\" nach *"
 
-msgid "E27: Farsi support has been removed\n"
-msgstr "E27: Farsi Unterstützung wurde entfernt\n"
+msgid "E1046: Missing comma in import"
+msgstr "E1046: Fehlendes Komma in import"
 
-msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
-msgstr ""
-"E800: Arabisch kann nicht benutzt werden: wurde zum Zeitpunkt des "
-"Übersetzens nicht eingeschaltet.\n"
+msgid "E1047: Syntax error in import"
+msgstr "E1047: Syntaxfehler in import"
 
 #, c-format
-msgid "E28: No such highlight group name: %s"
-msgstr "E28: Hervorhebungsgruppe existiert nicht: %s"
+msgid "E1048: Item not found in script: %s"
+msgstr "E1048: Element nicht in Script %s gefunden"
 
-msgid "E29: No inserted text yet"
-msgstr "E29: Noch kein eingefügter Text"
+#, c-format
+msgid "E1049: Item not exported in script: %s"
+msgstr "E1049: Element nicht exportiert in Script: %s"
 
-msgid "E30: No previous command line"
-msgstr "E30: Keine vorherige Befehlszeile"
+msgid "E1050: Colon required before a range"
+msgstr "E1050: Doppelpunkt vor einem Bereich benötigt"
 
-msgid "E31: No such mapping"
-msgstr "E31: Kein Mapping gefunden"
+msgid "E1051: Wrong argument type for +"
+msgstr "E1051: Falscher Argumenttyp für +"
 
-msgid "E479: No match"
-msgstr "E479: Kein Treffer"
+#, c-format
+msgid "E1052: Cannot declare an option: %s"
+msgstr "E1052: Kann keine Option deklarieren: %s"
 
 #, c-format
-msgid "E480: No match: %s"
-msgstr "E480: Kein Treffer: %s"
+msgid "E1053: Could not import \"%s\""
+msgstr "E1053: Konnte \"%s\" nicht importieren"
 
-msgid "E32: No file name"
-msgstr "E32: Kein Dateiname"
+#, c-format
+msgid "E1054: Variable already declared in the script: %s"
+msgstr "E1054: Variable bereits in Script %s deklariert"
 
-msgid "E33: No previous substitute regular expression"
-msgstr "E33: Kein vorheriger regulärer Ersetzungsausdruck"
+msgid "E1055: Missing name after ..."
+msgstr "E1055: Fehlender Name nach ..."
 
-msgid "E34: No previous command"
-msgstr "E34: Kein vorheriger Befehl"
+#, c-format
+msgid "E1056: Expected a type: %s"
+msgstr "E1056: Typ erwartet: %s"
 
-msgid "E35: No previous regular expression"
-msgstr "E35: Keine vorheriger regulärer Ausdruck"
+msgid "E1057: Missing :enddef"
+msgstr "E1057: Fehlendes :enddef"
 
-msgid "E481: No range allowed"
-msgstr "E481: Kein Bereich erlaubt"
+msgid "E1058: Function nesting too deep"
+msgstr "E1058: Funktions-Schachtelung zu tief"
 
-msgid "E36: Not enough room"
-msgstr "E36: Zu wenig Platz"
+#, c-format
+msgid "E1059: No white space allowed before colon: %s"
+msgstr "E1059: Keine Leerzeichen erlaubt vor : %s"
 
 #, c-format
-msgid "E247: no registered server named \"%s\""
-msgstr "E247: Kein registrierter Servername \"%s\""
+msgid "E1060: Expected dot after name: %s"
+msgstr "E1060: erwarte Punkt nach Name: %s"
+
+#, c-format
+msgid "E1061: Cannot find function %s"
+msgstr "E1061: Funktion %s nicht gefunden"
+
+msgid "E1062: Cannot index a Number"
+msgstr "E1062: Kann Index nicht mit Zahl verwenden"
+
+msgid "E1063: Type mismatch for v: variable"
+msgstr "E1063: Typendiskrepanz für v: Variable"
+
+#, c-format
+msgid "E1066: Cannot declare a register: %s"
+msgstr "E1066: Kann kein Register deklarieren: %s"
+
+#, c-format
+msgid "E1067: Separator mismatch: %s"
+msgstr "E1067: Separator-Unstimmigkeit %s"
+
+#, c-format
+msgid "E1068: No white space allowed before '%s'"
+msgstr "E1068: Keine Leerzeichen vor '%s' erlaubt"
+
+#, c-format
+msgid "E1069: White space required after '%s'"
+msgstr "E1069: Leerzeichen benötigt nach '%s'"
+
+msgid "E1070: Missing \"from\""
+msgstr "E1070: Fehlendes \"from\""
+
+msgid "E1071: Invalid string after \"from\""
+msgstr "E1071: Ungültige Zeichenkette nach \"from\""
+
+#, c-format
+msgid "E1072: Cannot compare %s with %s"
+msgstr "E1072: Kann %s nicht mit %s vergleichen"
+
+#, c-format
+msgid "E1073: Name already defined: %s"
+msgstr "E1073: Name existiert bereits: %s"
+
+msgid "E1074: No white space allowed after dot"
+msgstr "E1074: Keine Leerzeichen nach Punkt erlaubt"
+
+#, c-format
+msgid "E1075: Namespace not supported: %s"
+msgstr "E1075: Namespace nicht unterstützt: %s"
+
+msgid "E1076: This Vim is not compiled with float support"
+msgstr "E1076: Vim wurde nicht mit der \"float\"-Eigenschaft übersetzt."
+
+#, c-format
+msgid "E1077: Missing argument type for %s"
+msgstr "E1077: Fehlender Argumenttyp für %s"
+
+#, c-format
+msgid "E1081: Cannot unlet %s"
+msgstr "E1081: Kann Variable nicht entfernen %s"
+
+#, c-format
+msgid "E1082: Cannot use a namespaced variable: %s"
+msgstr "E1082: Kann eine Variable im Namesraum nicht verwenden: %s"
+
+msgid "E1083: Missing backtick"
+msgstr "E1083: Fehlender Backtick:"
+
+#, c-format
+msgid "E1084: Cannot delete Vim9 script function %s"
+msgstr "E1084: Vim9 Funktion %s kann nicht gelöscht werden"
+
+#, c-format
+msgid "E1085: Not a callable type: %s"
+msgstr "E1085: Kein aufrufbarer Typ: %s"
+
+msgid "E1086: Cannot use :function inside :def"
+msgstr "E1086: Kann :function nicht innerhalb von :def verwenden"
+
+msgid "E1087: Cannot use an index when declaring a variable"
+msgstr "E1087: Kann Index nicht verwenden, wenn eine Variable deklariert wird"
+
+#, c-format
+msgid "E1089: Unknown variable: %s"
+msgstr "E1089: Unbekannte Variable: %s"
+
+#, c-format
+msgid "E1090: Cannot assign to argument %s"
+msgstr "E1090: Kann dem Argument nicht zuweisen %s"
+
+#, c-format
+msgid "E1091: Function is not compiled: %s"
+msgstr "E1091: Funktion ist nicht kompiliert: %s"
+
+msgid "E1092: Cannot use a list for a declaration"
+msgstr "E1092: Kann Liste nicht als Deklaration verwenden"
+
+#, c-format
+msgid "E1093: Expected %d items but got %d"
+msgstr "E1093: Erwartete %d Einträge, aber erhielt %d"
+
+msgid "E1094: Import can only be used in a script"
+msgstr "E1094: import kann nur innerhalb eines Scripts verwendet werden"
+
+msgid "E1095: Unreachable code after :return"
+msgstr "E1095: Nicht erreichbarer Code nach :return"
+
+msgid "E1096: Returning a value in a function without a return type"
+msgstr "E1096: Rückgabe eines Wertes einer Funktion ohne Rückgabetyp"
+
+msgid "E1097: Line incomplete"
+msgstr "E1097: Zeile unvollständig"
+
+#, c-format
+msgid "E1099: Unknown error while executing %s"
+msgstr "E1099: Unbekannter Fehler beim Ausführen von %s"
+
+#, c-format
+msgid "E1101: Cannot declare a script variable in a function: %s"
+msgstr "E1101: Kann eine Scriptvariable nicht in einer Funktion deklarieren:  %s"
+
+#, c-format
+msgid "E1102: Lambda function not found: %s"
+msgstr "E1102: Lambdafunktion nicht gefunden: %s"
+
+msgid "E1103: Dictionary not set"
+msgstr "E1103: Dictionary nicht gesetzt"
+
+msgid "E1104: Missing >"
+msgstr "E1104: Fehlendes >"
+
+#, c-format
+msgid "E1105: Cannot convert %s to string"
+msgstr "E1105: kann %s nicht in Zeichenkette umwandeln"
+
+msgid "E1106: One argument too many"
+msgstr "E1106: Ein Argument zu viel"
+
+#, c-format
+msgid "E1106: %d arguments too many"
+msgstr "E1106: %d Argumente zu viel"
+
+msgid "E1107: String, List, Dict or Blob required"
+msgstr "E1107: Zeichenkette, Liste, Dictionary oder Blob benötigt"
+
+#, c-format
+msgid "E1108: Item not found: %s"
+msgstr "E1108: Element nicht gefunden: %s"
+
+#, c-format
+msgid "E1109: List item %d is not a List"
+msgstr "E1109: Listenwert %d ist keine Liste"
+
+#, c-format
+msgid "E1110: List item %d does not contain 3 numbers"
+msgstr "E1110: Listenwert %d enthält keine 3 Zahlen"
+
+#, c-format
+msgid "E1111: List item %d range invalid"
+msgstr "E1111: Listenwert %d Bereich ungültig"
+
+#, c-format
+msgid "E1112: List item %d cell width invalid"
+msgstr "E1112: Listenwert %d Zellbreite ungültig"
+
+#, c-format
+msgid "E1113: Overlapping ranges for 0x%lx"
+msgstr "E1113: Überlappender Bereich für 0x%lx"
+
+msgid "E1114: Only values of 0x100 and higher supported"
+msgstr "E1114: Nur Werte oberhalb 0x100 unterstützt"
+
+msgid "E1115: \"assert_fails()\" fourth argument must be a number"
+msgstr "E1115: \"assert_fails()\" viertes Argument muss eine Zahl sein"
+
+msgid "E1116: \"assert_fails()\" fifth argument must be a string"
+msgstr "E1116: \"assert_fails()\" fünftes Argument muss eine Zahl sein"
+
+msgid "E1117: Cannot use ! with nested :def"
+msgstr "E1117: Kann nicht ! innerhalb verschachtelter :def verwenden"
+
+msgid "E1118: Cannot change list"
+msgstr "E1118: Kann Liste nicht ändern"
+
+msgid "E1119: Cannot change list item"
+msgstr "E1119: Kann Listenwert nicht ändern"
+
+msgid "E1120: Cannot change dict"
+msgstr "E1120: Kann Dictionary nicht ändern"
+
+msgid "E1121: Cannot change dict item"
+msgstr "E1121: Kann Dictionarywert nicht ändern"
+
+#, c-format
+msgid "E1122: Variable is locked: %s"
+msgstr "E1122: Variable ist gesperrt: %s"
+
+#, c-format
+msgid "E1123: Missing comma before argument: %s"
+msgstr "E1123: Fehlendes Komma vor Argument: %s"
+
+#, c-format
+msgid "E1124: \"%s\" cannot be used in legacy Vim script"
+msgstr "E1124: \"%s\" kann nicht innerhalb von Legacy Vim Script verwendet werden"
+
+msgid "E1125: Final requires a value"
+msgstr "E1125: Final benötigt einen Wert"
+
+msgid "E1126: Cannot use :let in Vim9 script"
+msgstr "E1126: Kann :let nicht in Vim9 Script verwenden"
+
+msgid "E1127: Missing name after dot"
+msgstr "E1127: Fehlender Name nach Punkt"
+
+msgid "E1128: } without {"
+msgstr "E1128: } ohne { verwendet"
+
+msgid "E1129: Throw with empty string"
+msgstr "E1129: throw mit leerer Zeichenkette"
+
+msgid "E1130: Cannot add to null list"
+msgstr "E1130: Kann nicht zu Null-Liste hinzufügen"
+
+msgid "E1131: Cannot add to null blob"
+msgstr "E1131: Kann nicht zu Null-Blob hinzufügen"
+
+msgid "E1132: Missing function argument"
+msgstr "E1132: Fehlendes Funktionsargument"
+
+msgid "E1133: Cannot extend a null dict"
+msgstr "E1133: Kann Null-Dictionary nicht erweitern"
+
+msgid "E1134: Cannot extend a null list"
+msgstr "E1134: Kann Null-Liste nicht erweitern"
+
+#, c-format
+msgid "E1135: Using a String as a Bool: \"%s\""
+msgstr "E1135: Verwende Zeichenkette als Bool: \"%s\""
+
+msgid "E1135: <Cmd> mapping must end with <CR>"
+msgstr "E1135: <Cmd> Mapping muss mit <CR> enden"
+
+msgid "E1136: <Cmd> mapping must end with <CR> before second <Cmd>"
+msgstr "E1136: <Cmd> Mapping muss mit <CR> vor weiterem <Cmd> enden"
+
+#, c-format
+msgid "E1137: <Cmd> mapping must not include %s key"
+msgstr "E1137: <Cmd> Mapping darf %s Taste nicht enthalten"
+
+msgid "E1138: Using a Bool as a Number"
+msgstr "E1138: Bool als Zahl verwendet"
+
+msgid "E1139: Missing matching bracket after dict key"
+msgstr "E1139: Fehlende zugehörige eckige Klammer nach Dict Schlüssel"
+
+msgid "E1140: For argument must be a sequence of lists"
+msgstr "E1140: Argument muss eine Folge von Listen sein."
+
+msgid "--No lines in buffer--"
+msgstr "--Keine Zeilen im Buffer--"
+
+msgid "E470: Command aborted"
+msgstr "E470: Befehl abgebrochen"
+
+msgid "E471: Argument required"
+msgstr "E471: Argument benötigt"
+
+msgid "E10: \\ should be followed by /, ? or &"
+msgstr "E10: \\ sollte von /, ? oder & gefolgt werden"
+
+msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
+msgstr "E11: Ungültig im Kommandozeilen-Fenster; <CR> führt aus, CTRL-C beendet"
+
+msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
+msgstr ""
+"E12: Befehl nicht zulässig vom exrc/vimrc in der momentanen Verzeichnis- "
+"oder Tag-Suche"
+
+msgid "E171: Missing :endif"
+msgstr "E171: Fehlendes :endif"
+
+msgid "E603: :catch without :try"
+msgstr "E603: :catch ohne :try"
+
+msgid "E606: :finally without :try"
+msgstr "E606: :finally ohne :try"
+
+msgid "E607: multiple :finally"
+msgstr "E607: Mehrere :finally"
+
+msgid "E600: Missing :endtry"
+msgstr "E600: Fehlendes :endtry"
+
+msgid "E602: :endtry without :try"
+msgstr "E602: :endtry ohne :try"
+
+msgid "E170: Missing :endwhile"
+msgstr "E170: fehlendes :endwhile"
+
+msgid "E170: Missing :endfor"
+msgstr "E170: Fehlendes :endfor"
+
+msgid "E588: :endwhile without :while"
+msgstr "E588: :endwhile ohne :while"
+
+msgid "E588: :endfor without :for"
+msgstr "E588: :endfor ohne :for"
+
+msgid "E13: File exists (add ! to override)"
+msgstr "E13: Datei existiert bereits (erzwinge mit !)"
+
+msgid "E472: Command failed"
+msgstr "E472: Befehl fehlgeschlagen"
+
+#, c-format
+msgid "E234: Unknown fontset: %s"
+msgstr "E234: Unbekannter Fontset: %s"
+
+#, c-format
+msgid "E235: Unknown font: %s"
+msgstr "E235: Unbekannte Schriftart: %s"
+
+#, c-format
+msgid "E236: Font \"%s\" is not fixed-width"
+msgstr "E236: Schriftart \"%s\" hat keine feste Breite"
+
+msgid "E473: Internal error"
+msgstr "E473: Interner Fehler"
+
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: Interner Fehler: %s"
+
+msgid "Interrupted"
+msgstr "Unterbrochen"
+
+msgid "E474: Invalid argument"
+msgstr "E474: Ungültiges Argument"
+
+#, c-format
+msgid "E475: Invalid argument: %s"
+msgstr "E475: Ungültiges Argument: %s"
+
+#, c-format
+msgid "E983: Duplicate argument: %s"
+msgstr "E983: Doppeltes Argument: %s"
+
+#, c-format
+msgid "E475: Invalid value for argument %s"
+msgstr "E475: Ungültiger Wert für Argument: %s"
+
+#, c-format
+msgid "E475: Invalid value for argument %s: %s"
+msgstr "E475: Ungültiger Wert für Argument %s: %s"
+
+#, c-format
+msgid "E15: Invalid expression: %s"
+msgstr "E15: ungültiger Ausdruck: %s"
+
+msgid "E16: Invalid range"
+msgstr "E16: Ungültiger Bereich"
+
+#, c-format
+msgid "E17: \"%s\" is a directory"
+msgstr "E17: \"%s\" ist ein Verzeichnis"
+
+msgid "E756: Spell checking is not possible"
+msgstr "E756: Rechtschreibprüfung ist nicht möglich"
+
+#, c-format
+msgid "E364: Library call failed for \"%s()\""
+msgstr "E364: Bibliotheksaufruf für \"%s()\" schlug fehl"
+
+msgid "E667: Fsync failed"
+msgstr "E667: Fsync fehlgeschlagen"
+
+#, c-format
+msgid "E448: Could not load library function %s"
+msgstr "E448: Bibliotheksfunktion %s konnte nicht geladen werden"
+
+msgid "E19: Mark has invalid line number"
+msgstr "E19: Markierung hat ungültige Zeilennummer"
+
+msgid "E20: Mark not set"
+msgstr "E20: Markierung nicht gesetzt"
+
+msgid "E21: Cannot make changes, 'modifiable' is off"
+msgstr "E21: Kann keine Änderungen machen, 'modifiable' ist aus"
+
+msgid "E22: Scripts nested too deep"
+msgstr "E22: Skript ist zu tief verschachtelt"
+
+msgid "E23: No alternate file"
+msgstr "E23: Keine alternative Datei"
+
+msgid "E24: No such abbreviation"
+msgstr "E24: Diese Kurzform nicht gefunden"
+
+msgid "E477: No ! allowed"
+msgstr "E477: Kein ! erlaubt"
+
+msgid "E25: GUI cannot be used: Not enabled at compile time"
+msgstr ""
+"E25: GUI kann nicht benutzt werden: wurde zum Zeitpunkt des Übersetzens "
+"nicht eingeschaltet."
+
+msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
+msgstr ""
+"E26: Hebräisch kann nicht benutzt werden: wurde zum Zeitpunkt des "
+"Übersetzens nicht eingeschaltet.\n"
+
+msgid "E27: Farsi support has been removed\n"
+msgstr "E27: Farsi Unterstützung wurde entfernt\n"
+
+msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
+msgstr ""
+"E800: Arabisch kann nicht benutzt werden: wurde zum Zeitpunkt des "
+"Übersetzens nicht eingeschaltet.\n"
+
+#, c-format
+msgid "E28: No such highlight group name: %s"
+msgstr "E28: Hervorhebungsgruppe existiert nicht: %s"
+
+msgid "E29: No inserted text yet"
+msgstr "E29: Noch kein eingefügter Text"
+
+msgid "E30: No previous command line"
+msgstr "E30: Keine vorherige Befehlszeile"
+
+msgid "E31: No such mapping"
+msgstr "E31: Kein Mapping gefunden"
+
+msgid "E479: No match"
+msgstr "E479: Kein Treffer"
+
+#, c-format
+msgid "E480: No match: %s"
+msgstr "E480: Kein Treffer: %s"
+
+msgid "E32: No file name"
+msgstr "E32: Kein Dateiname"
+
+msgid "E33: No previous substitute regular expression"
+msgstr "E33: Kein vorheriger regulärer Ersetzungsausdruck"
+
+msgid "E34: No previous command"
+msgstr "E34: Kein vorheriger Befehl"
+
+msgid "E35: No previous regular expression"
+msgstr "E35: Keine vorheriger regulärer Ausdruck"
+
+msgid "E481: No range allowed"
+msgstr "E481: Kein Bereich erlaubt"
+
+msgid "E36: Not enough room"
+msgstr "E36: Zu wenig Platz"
+
+#, c-format
+msgid "E247: no registered server named \"%s\""
+msgstr "E247: Kein registrierter Servername \"%s\""
+
+#, c-format
+msgid "E482: Can't create file %s"
+msgstr "E482: Kann Datei %s nicht erzeugen"
+
+msgid "E483: Can't get temp file name"
+msgstr "E483: Kann den Namen der temporären Datei nicht ermitteln"
+
+#, c-format
+msgid "E484: Can't open file %s"
+msgstr "E484: Kann die Datei %s nicht öffnen"
+
+#, c-format
+msgid "E485: Can't read file %s"
+msgstr "E485: Kann Datei %s nicht lesen"
+
+msgid "E38: Null argument"
+msgstr "E38: Null-Argument"
+
+msgid "E39: Number expected"
+msgstr "E39: Nummer erwartet"
+
+#, c-format
+msgid "E40: Can't open errorfile %s"
+msgstr "E40: Fehlerdatei %s kann nicht geöffnet werden"
+
+msgid "E233: cannot open display"
+msgstr "E233: Display kann nicht geöffnet werden"
+
+msgid "E41: Out of memory!"
+msgstr "E41: Speicher erschöpft!"
+
+msgid "Pattern not found"
+msgstr "Muster nicht gefunden"
+
+#, c-format
+msgid "E486: Pattern not found: %s"
+msgstr "E486: Muster nicht gefunden: %s"
+
+msgid "E487: Argument must be positive"
+msgstr "E487: Argument muss positiv sein"
+
+msgid "E459: Cannot go back to previous directory"
+msgstr "E459: Kann nicht ins vorhergehende Verzeichnis wechseln"
+
+msgid "E42: No Errors"
+msgstr "E42: Keine Fehler"
+
+msgid "E776: No location list"
+msgstr "E776: Keine Positionsliste"
+
+msgid "E43: Damaged match string"
+msgstr "E43: Beschädigter Suchausdruck"
+
+msgid "E44: Corrupted regexp program"
+msgstr "E44: schadhaftes regexp Programm"
+
+msgid "E45: 'readonly' option is set (add ! to override)"
+msgstr "E45: Die Option 'readonly' ist gesetzt (erzwinge mit !)"
+
+#, c-format
+msgid "E734: Wrong variable type for %s="
+msgstr "E734: Falscher Variablentyp für %s="
+
+#, c-format
+msgid "E461: Illegal variable name: %s"
+msgstr "E461: Unzulässiger Variablenname: %s"
+
+msgid "E995: Cannot modify existing variable"
+msgstr "E995: Kann existierende Variable nicht ändern"
+
+#, c-format
+msgid "E46: Cannot change read-only variable \"%s\""
+msgstr "E46: Variable \"%s\" kann nur gelesen werden"
+
+#, c-format
+msgid "E794: Cannot set variable in the sandbox: \"%s\""
+msgstr "E794: Variable kann nicht in der Sandbox gesetzt werden: \"%s\""
+
+msgid "E928: String required"
+msgstr "E928: String wird benötigt."
+
+msgid "E713: Cannot use empty key for Dictionary"
+msgstr "E713: Der Schlüssel für das Dictionary darf nicht leer sein"
+
+msgid "E715: Dictionary required"
+msgstr "E715: Dictionary benötigt"
+
+#, c-format
+msgid "E684: list index out of range: %ld"
+msgstr "E684: Index der Liste außerhalb des zulässigen Bereichs: %ld"
+
+#, c-format
+msgid "E979: Blob index out of range: %ld"
+msgstr "E979: Blobindex außerhalb des Bereichs: %ld"
+
+msgid "E978: Invalid operation for Blob"
+msgstr "E978: Unzulässige Operation für Blob"
+
+#, c-format
+msgid "E118: Too many arguments for function: %s"
+msgstr "E118: Zu viele Argumente für Funktion: %s"
+
+#, c-format
+msgid "E119: Not enough arguments for function: %s"
+msgstr "E119: Zu wenige Argumente für Funktion: %s"
+
+#, c-format
+msgid "E933: Function was deleted: %s"
+msgstr "E933: Funktion wurde gelöscht: %s"
+
+#, c-format
+msgid "E716: Key not present in Dictionary: \"%s\""
+msgstr "E716: Schlüssel \"%s\" nicht im Dictionary vorhanden."
+
+msgid "E714: List required"
+msgstr "E714: Liste benötigt"
+
+msgid "E897: List or Blob required"
+msgstr "E897: Liste oder Blob benötigt"
+
+#, c-format
+msgid "E697: Missing end of List ']': %s"
+msgstr "E697: Fehlendes Ende der Liste ']': %s"
+
+#, c-format
+msgid "E712: Argument of %s must be a List or Dictionary"
+msgstr "E712: Argument von %s muss eine Liste oder ein Dictionary sein."
+
+#, c-format
+msgid "E896: Argument of %s must be a List, Dictionary or Blob"
+msgstr "E896: Argument von %s muss eine Liste, Dictionary oder ein Blob sein."
+
+msgid "E804: Cannot use '%' with Float"
+msgstr "E804: Kann '%' mit Floats benutzen."
+
+msgid "E908: using an invalid value as a String"
+msgstr "E908: Ungültiger Wert als String verwendet."
+
+msgid "E996: Cannot lock an option"
+msgstr "E996: Kann Option nicht sperren"
+
+#, c-format
+msgid "E113: Unknown option: %s"
+msgstr "E113: Unbekannte Option: %s"
+
+msgid "E18: Unexpected characters in :let"
+msgstr "E18: Unerwartete Zeichen in :let"
+
+#, c-format
+msgid "E998: Reduce of an empty %s with no initial value"
+msgstr "E998: Reduzierung einer leeren %s ohne initialen Anfangswert"
+
+#, c-format
+msgid "E857: Dictionary key \"%s\" required"
+msgstr "E857: Dictionary Schlüssel \"%s\" benötigt"
+
+msgid "E47: Error while reading errorfile"
+msgstr "E47: Fehler während des Lesens der Fehlerdatei"
+
+msgid "E48: Not allowed in sandbox"
+msgstr "E48: In einer Sandbox nicht erlaubt"
+
+msgid "E523: Not allowed here"
+msgstr "E523: Hier nicht erlaubt"
+
+msgid "E578: Not allowed to change text here"
+msgstr "E578: Nicht erlaubt Text hier zu ändern"
+
+msgid "E565: Not allowed to change text or change window"
+msgstr "E565: Es ist nicht erlaubt Text oder Fenster zu ändern"
+
+msgid "E359: Screen mode setting not supported"
+msgstr "E359: Bildschirm-Modus wird nicht unterstützt"
+
+msgid "E49: Invalid scroll size"
+msgstr "E49: Ungültige Scroll-Größe"
+
+msgid "E91: 'shell' option is empty"
+msgstr "E91: Die Option 'shell' ist leer"
+
+msgid "E255: Couldn't read in sign data!"
+msgstr "E255: Fehler -- Sign-Daten konnten nicht gelesen werden"
+
+msgid "E72: Close error on swap file"
+msgstr "E72: Fehler beim Schließen der Auslagerungsdatei"
+
+msgid "E73: tag stack empty"
+msgstr "E73: Tag Stack leer."
+
+msgid "E74: Command too complex"
+msgstr "E74: Befehl zu komplex"
+
+msgid "E75: Name too long"
+msgstr "E75: Name zu lang"
+
+msgid "E76: Too many ["
+msgstr "E76: Zu viele ["
+
+msgid "E77: Too many file names"
+msgstr "E77: Zu viele Dateinamen"
+
+msgid "E488: Trailing characters"
+msgstr "E488: Überschüssige Zeichen"
+
+#, c-format
+msgid "E488: Trailing characters: %s"
+msgstr "E488: Überschüssige Zeichen: %s"
+
+msgid "E78: Unknown mark"
+msgstr "E78: Unbekannte Markierung"
+
+msgid "E79: Cannot expand wildcards"
+msgstr "E79: Kann die Platzhalter nicht erweitern"
+
+msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
+msgstr "E591: 'winheight' darf nicht kleiner sein als 'winminheight'"
+
+msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
+msgstr "E592: 'winwidth' darf nicht kleiner sein als 'winminwidth'"
+
+msgid "E80: Error while writing"
+msgstr "E80: Fehler während des Schreibens"
+
+msgid "E939: Positive count required"
+msgstr "E939: Positive Zahl benötigt"
+
+msgid "E81: Using <SID> not in a script context"
+msgstr "E81: <SID> wurde nicht in einer Skript-Umgebung benutzt"
+
+#, c-format
+msgid "E107: Missing parentheses: %s"
+msgstr "E107: Fehlende Klammern: %s"
+
+msgid "E110: Missing ')'"
+msgstr "E110: Fehlendes ')'"
+
+#, c-format
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: Fehlender Doppelpunkt im Dictionary: %s"
+
+#, c-format
+msgid "E721: Duplicate key in Dictionary: \"%s\""
+msgstr "E721: Doppelter Schlüssel im Dictionary: \"%s\""
+
+#, c-format
+msgid "E722: Missing comma in Dictionary: %s"
+msgstr "E722: Fehlendes Komma im Dictionary: %s"
+
+#, c-format
+msgid "E723: Missing end of Dictionary '}': %s"
+msgstr "E723: Fehlendes Ende des Dictionary '}': %s"
+
+msgid "E449: Invalid expression received"
+msgstr "E449: Ungültiger Ausdruck"
+
+msgid "E463: Region is guarded, cannot modify"
+msgstr "E463: Region ist geschützt; keine Änderung möglich"
+
+msgid "E744: NetBeans does not allow changes in read-only files"
+msgstr "E744: NetBeans erlaubt keine Änderungen in schreibgeschützten Dateien"
+
+msgid "E363: pattern uses more memory than 'maxmempattern'"
+msgstr "E363: Muster benötigt mehr Speicher als 'maxmempattern'"
+
+msgid "E749: empty buffer"
+msgstr "E749: Leerer Buffer"
+
+#, c-format
+msgid "E86: Buffer %ld does not exist"
+msgstr "E86: Buffer %ld existiert nicht."
+
+msgid "E682: Invalid search pattern or delimiter"
+msgstr "E682: Ungültiges Suchmuster oder Trennzeichen"
+
+msgid "E139: File is loaded in another buffer"
+msgstr "E139: Datei ist in einem anderen Buffer geladen"
+
+#, c-format
+msgid "E764: Option '%s' is not set"
+msgstr "E764: Option '%s' ist nicht gesetzt"
+
+msgid "E850: Invalid register name"
+msgstr "E850: Ungültiger Register Name"
+
+msgid "E806: using Float as a String"
+msgstr "E806: Float als String benutzt."
+
+#, c-format
+msgid "E919: Directory not found in '%s': \"%s\""
+msgstr "E919: Verzeichnis nicht gefunden in '%s': \"%s\""
+
+msgid "E952: Autocommand caused recursive behavior"
+msgstr "E952: Autokommando verursachten Rekursion"
+
+msgid "E813: Cannot close autocmd or popup window"
+msgstr ""
+"E813: Autokommando-Fenster oder Popup-Fenster kann nicht geschlossen werden"
+
+msgid "E328: Menu only exists in another mode"
+msgstr "E328: Menü existiert nur in anderen Modi"
+
+msgid "E957: Invalid window number"
+msgstr "E957: Ungültige Fensternummer"
+
+#, c-format
+msgid "E686: Argument of %s must be a List"
+msgstr "E686: Argument von %s muss eine Liste sein."
+
+msgid "E109: Missing ':' after '?'"
+msgstr "E109: Fehlender ':' nach '?'"
+
+msgid "E690: Missing \"in\" after :for"
+msgstr "E690: Fehlendes \"in\" nach :for"
+
+#, c-format
+msgid "E117: Unknown function: %s"
+msgstr "E117: Unbekannte Funktion: %s"
+
+msgid "E111: Missing ']'"
+msgstr "E111: Fehlende ']'"
+
+msgid "E581: :else without :if"
+msgstr "E581: :else ohne :if"
+
+msgid "E582: :elseif without :if"
+msgstr "E582: :elseif ohne :if"
+
+msgid "E580: :endif without :if"
+msgstr "E580: :endif ohne :if"
+
+msgid "E586: :continue without :while or :for"
+msgstr "E586: :continue ohne :while or :for"
+
+msgid "E587: :break without :while or :for"
+msgstr "E587: :break ohne :while oder :for"
+
+msgid "E274: No white space allowed before parenthesis"
+msgstr "E274: Keine Leerzeichen vor Klammern erlaubt"
+
+#, c-format
+msgid "E940: Cannot lock or unlock variable %s"
+msgstr "E940: Kann Variable \"%s\" nicht sperren bzw. entsperren."
+
+#, c-format
+msgid "E254: Cannot allocate color %s"
+msgstr "E254: Kann die Farbe %s nicht zuweisen."
+
+msgid "search hit TOP, continuing at BOTTOM"
+msgstr "Suche erreichte den ANFANG und wurde am ENDE fortgesetzt"
+
+msgid "search hit BOTTOM, continuing at TOP"
+msgstr "Suche erreichte das ENDE und wurde am ANFANG fortgesetzt"
+
+msgid " line "
+msgstr " Zeile "
+
+#, c-format
+msgid "Need encryption key for \"%s\""
+msgstr "Geben Sie bitte den Schlüssel für \"%s\" ein: "
+
+msgid "empty keys are not allowed"
+msgstr "Leerer Schlüssel nicht erlaubt"
+
+msgid "dictionary is locked"
+msgstr "Dictionary ist gesperrt"
+
+msgid "list is locked"
+msgstr "Liste ist gesperrt"
+
+#, c-format
+msgid "failed to add key '%s' to dictionary"
+msgstr "Konnte Schlüssel '%s' zu Dictionary nicht hinzufügen."
+
+#, c-format
+msgid "index must be int or slice, not %s"
+msgstr "Index muss eine Int oder Slice sein, nicht %s"
+
+#, c-format
+msgid "expected str() or unicode() instance, but got %s"
+msgstr "erwartete str() oder unicode() Instanz, erhielt jedoch %s"
+
+#, c-format
+msgid "expected bytes() or str() instance, but got %s"
+msgstr "Erwartete bytes() oder str() Instanz, erhielt jedoch %s"
+
+#, c-format
+msgid ""
+"expected int(), long() or something supporting coercing to long(), but got %s"
+msgstr ""
+"erwartete int(), long() or etwas was sich zu long() wandeln lässt, erhielt "
+"jedoch %s"
+
+#, c-format
+msgid "expected int() or something supporting coercing to int(), but got %s"
+msgstr ""
+"erwartete int() oder etwas was sich zu int() wandeln lässt, erhielt jedoch %s"
+
+msgid "value is too large to fit into C int type"
+msgstr "Wert zu groß für einen C Integerwert"
+
+msgid "value is too small to fit into C int type"
+msgstr "Wert zu klein für einen C Integerwert"
+
+msgid "number must be greater than zero"
+msgstr "Nummer muss größer als 0 sein"
+
+msgid "number must be greater or equal to zero"
+msgstr "Nummer muss größer gleich 0 sein"
+
+msgid "can't delete OutputObject attributes"
+msgstr "OutputObject-Attribute können nicht gelöscht werden"
+
+#, c-format
+msgid "invalid attribute: %s"
+msgstr "unzulässiges Attribut: %s"
+
+msgid "E264: Python: Error initialising I/O objects"
+msgstr "E264: Python: Fehler bei der Initialisierung von I/O Objekten"
+
+msgid "failed to change directory"
+msgstr "Verzeichniswechsel fehlgeschlagen"
+
+#, c-format
+msgid "expected 3-tuple as imp.find_module() result, but got %s"
+msgstr ""
+"erwartete 3 Tuple als Ergebnis von imp.find_module(), erhielt jedoch %s"
+
+#, c-format
+msgid "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
+msgstr ""
+"erwartete 3 Tuple als Ergebnis von find_module(), but erhielt Tuple der "
+"Größe %d"
+
+msgid "internal error: imp.find_module returned tuple with NULL"
+msgstr "interner Fehler: imp.find_module gab Tuple mit NULL zurück"
+
+msgid "cannot delete vim.Dictionary attributes"
+msgstr "kann vim.Dictionary Attribute nicht löschen"
+
+msgid "cannot modify fixed dictionary"
+msgstr "Kann festes Dictionary nicht ändern"
+
+#, c-format
+msgid "cannot set attribute %s"
+msgstr "Kann nicht Attribut %s setzen"
+
+msgid "hashtab changed during iteration"
+msgstr "Hashtab veränderte sich während der Initialisierung"
+
+#, c-format
+msgid "expected sequence element of size 2, but got sequence of size %d"
+msgstr ""
+"erwartete Sequenz Element der Größe 2, erhielt jedoch Sequenz der Größe %d"
+
+msgid "list constructor does not accept keyword arguments"
+msgstr "Listen Konstruktor akzeptiert keine Keyword Argumente"
+
+msgid "list index out of range"
+msgstr "Listen Index außerhalb des gültigen Bereichs"
+
+#, c-format
+msgid "internal error: failed to get Vim list item %d"
+msgstr "interner Fehler: Zugriff auf Vim Listobjekt %d fehlgeschlagen"
+
+msgid "slice step cannot be zero"
+msgstr "Slice Schritt kann nicht Null sein"
+
+#, c-format
+msgid "attempt to assign sequence of size greater than %d to extended slice"
+msgstr ""
+"Versuch der Zuweisung von Sequenzgröße größer als %d zu erweiterten Slice"
+
+#, c-format
+msgid "internal error: no Vim list item %d"
+msgstr "interner Fehler: Kein Vim Listobjekt %d"
+
+msgid "internal error: not enough list items"
+msgstr "interner Fehler: nicht genügend Listobjekte"
+
+msgid "internal error: failed to add item to list"
+msgstr "interner Fehler: konnte Objekt nicht Liste hinzufügen"
+
+#, c-format
+msgid "attempt to assign sequence of size %d to extended slice of size %d"
+msgstr ""
+"Versuch der Zuweisung von Sequenzgröße %d zu erweiterten Slice der Größe %d"
+
+msgid "failed to add item to list"
+msgstr "Hinzufügen von Objekt zu Liste fehlgeschlagen"
+
+msgid "cannot delete vim.List attributes"
+msgstr "kann vim.List Attribute nicht löschen"
+
+msgid "cannot modify fixed list"
+msgstr "kann feste Liste nicht modifizieren"
+
+#, c-format
+msgid "unnamed function %s does not exist"
+msgstr "Unbenannte Funktion %s existiert nicht"
+
+#, c-format
+msgid "function %s does not exist"
+msgstr "Funktion %s existiert nicht"
+
+#, c-format
+msgid "failed to run function %s"
+msgstr "Fehler beim Ausführen der Funktion %s"
+
+msgid "unable to get option value"
+msgstr "konnte Optionswert nicht erhalten"
+
+msgid "internal error: unknown option type"
+msgstr "interner Fehler: unbekannter Optionstyp"
+
+msgid "problem while switching windows"
+msgstr "Problem beim Wechseln der Fenster"
+
+#, c-format
+msgid "unable to unset global option %s"
+msgstr "Konnte globale Option %s nicht aufheben"
+
+#, c-format
+msgid "unable to unset option %s which does not have global value"
+msgstr "konnte Option %s nicht aufheben, da sie keinen globalen Wert hat"
+
+msgid "attempt to refer to deleted tab page"
+msgstr "Versuch, Bezug auf einen gelöschten Reiter zu nehmen"
+
+msgid "no such tab page"
+msgstr "kein solcher Reiter vorhanden"
+
+msgid "attempt to refer to deleted window"
+msgstr "Versuch, Bezug auf eine gelöschtes Fenster zu nehmen"
+
+msgid "readonly attribute: buffer"
+msgstr "nur-Lesen Attribut: Buffer"
+
+msgid "cursor position outside buffer"
+msgstr "Cursor Position außerhalb des Buffers"
+
+msgid "no such window"
+msgstr "ungültiges Fenster"
+
+msgid "attempt to refer to deleted buffer"
+msgstr "Versuch, Bezug auf einen gelöschten Buffer zu nehmen"
+
+msgid "failed to rename buffer"
+msgstr "Umbenennen des Buffers fehlgeschlagen"
+
+msgid "mark name must be a single character"
+msgstr "Markierung muss ein einzelner Buchstabe sein"
+
+#, c-format
+msgid "expected vim.Buffer object, but got %s"
+msgstr "erwartete vim.Buffer Objekt, erhielt jedoch %s"
+
+#, c-format
+msgid "failed to switch to buffer %d"
+msgstr "Wechsel zu Buffer %d fehlgeschlagen"
+
+#, c-format
+msgid "expected vim.Window object, but got %s"
+msgstr "erwartete vim.Window Objekt, erhielt jedoch %s"
+
+msgid "failed to find window in the current tab page"
+msgstr "konnte Fenster im aktuellen Reiter nicht finden"
+
+msgid "did not switch to the specified window"
+msgstr "konnte nicht zu spezifizierten Fenster wechseln"
+
+#, c-format
+msgid "expected vim.TabPage object, but got %s"
+msgstr "erwartete vim.TabPage Objekt, erhielt jedoch %s"
+
+msgid "did not switch to the specified tab page"
+msgstr "konnte nicht zu spezifiziertem Reiter wechseln"
+
+msgid "failed to run the code"
+msgstr "Ausführen des Codes fehlgeschlagen."
+
+msgid "E858: Eval did not return a valid python object"
+msgstr "E858: Eval hat kein gültiges Pythonobjekt zurückgegeben"
+
+msgid "E859: Failed to convert returned python object to a Vim value"
+msgstr ""
+"E859: Konvertierung von zurückgegebenen Pythonobjekt zu Vim Wert "
+"fehlgeschlagen"
+
+#, c-format
+msgid "unable to convert %s to a Vim dictionary"
+msgstr "konnte nicht %s zu Vim Dictionary konvertieren"
+
+#, c-format
+msgid "unable to convert %s to a Vim list"
+msgstr "konnte %s nicht zu Vim Liste konvertieren"
+
+#, c-format
+msgid "unable to convert %s to a Vim structure"
+msgstr "konnte %s nicht zu Vim Struktur konvertieren"
+
+msgid "internal error: NULL reference passed"
+msgstr "interner Fehler: NULL Referenz übermittelt"
+
+msgid "internal error: invalid value type"
+msgstr "interner Fehler: ungültiger Werttyp"
+
+msgid ""
+"Failed to set path hook: sys.path_hooks is not a list\n"
+"You should now do the following:\n"
+"- append vim.path_hook to sys.path_hooks\n"
+"- append vim.VIM_SPECIAL_PATH to sys.path\n"
+msgstr ""
+"Fehler beim setzen des Path hooks: sys.path_hooks ist keine Liste\n"
+"Sie sollten jetzt eine der folgenden Alternativen tun:\n"
+"- vim.path_hook zu sys.path_hooks hinzufügen\n"
+"- vim.VIM_SPECIAL_PATH zu sys.path hinzufügen\n"
+
+msgid ""
+"Failed to set path: sys.path is not a list\n"
+"You should now append vim.VIM_SPECIAL_PATH to sys.path"
+msgstr ""
+"Fehler beim setzen des Pfades: sys.path ist keine Liste\n"
+"Fügen Sie vim.VIM_SPECIAL_PATH zu sys.path hinzu"
+
+msgid ""
+"Vim macro files (*.vim)\t*.vim\n"
+"All Files (*.*)\t*.*\n"
+msgstr ""
+"Vim Dateien (*.vim)\t*.vim\n"
+"Alle Dateien (*.*)\t*.*\n"
+
+msgid "All Files (*.*)\t*.*\n"
+msgstr "Alle Dateien (*.*)\t*.*\n"
+
+msgid ""
+"All Files (*.*)\t*.*\n"
+"C source (*.c, *.h)\t*.c;*.h\n"
+"C++ source (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"VB code (*.bas, *.frm)\t*.bas;*.frm\n"
+"Vim files (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+msgstr ""
+"Alle Dateien (*.*)\t*.*\n"
+"C Quellcode (*.c, *.h)\t*.c;*.h\n"
+"C++ Quellcode (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"VB Quellcode (*.bas, *.frm)\t*.bas;*.frm\n"
+"Vim Dateien (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+
+msgid ""
+"Vim macro files (*.vim)\t*.vim\n"
+"All Files (*)\t*\n"
+msgstr ""
+"Vim Dateien (*.vim)\t*.vim\n"
+"Alle Dateien (*)\t*\n"
+
+msgid "All Files (*)\t*\n"
+msgstr "Alle Dateien (*)\t*\n"
+
+msgid ""
+"All Files (*)\t*\n"
+"C source (*.c, *.h)\t*.c;*.h\n"
+"C++ source (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"Vim files (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+msgstr ""
+"Alle Dateien (*)\t*\n"
+"C Quellcode (*.c, *.h)\t*.c;*.h\n"
+"C++ Quellcode (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"Vim Dateien (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+
+msgid "GVim"
+msgstr "GVim"
+
+msgid "Text Editor"
+msgstr "Texteditor"
+
+msgid "Edit text files"
+msgstr "Textdateien bearbeiten"
+
+msgid "Text;editor;"
+msgstr "Text;Editor;"
+
+msgid "gvim"
+msgstr "gvim"
+
+msgid "Vim"
+msgstr "Vim"
+
+msgid "(local to window)"
+msgstr "(lokal zum Fenster)"
+
+msgid "(local to buffer)"
+msgstr "(lokal zum Buffer)"
+
+msgid "(global or local to buffer)"
+msgstr "(global oder lokal zum Buffer)"
+
+msgid ""
+"\" Each \"set\" line shows the current value of an option (on the left)."
+msgstr ""
+"\" Jede \"set\" Zeile zeigt den aktuellen Werte der Option auf der linken Seite."
+
+msgid "\" Hit <Enter> on a \"set\" line to execute it."
+msgstr "\" Drücke <Enter> auf einer \"set\" Zeile zum auführen."
+
+msgid "\"            A boolean option will be toggled."
+msgstr "\"           Eine Bool-Option wird umgeschaltet."
+
+msgid ""
+"\"            For other options you can edit the value before hitting "
+"<Enter>."
+msgstr ""
+"\"            Andere Optionen können editiert werden vor den Drücken von "
+"<Enter>."
+
+msgid "\" Hit <Enter> on a help line to open a help window on this option."
+msgstr "\" Drücke <Enter> auf einer Hilfe-Zeile um die zugehörige Hilfe dieser Option anzuzeigen."
+
+msgid "\" Hit <Enter> on an index line to jump there."
+msgstr "\" Drücke <Enter> auf einer Index Zeile um dorthin zu springen."
+
+msgid "\" Hit <Space> on a \"set\" line to refresh it."
+msgstr "\" Drücke <Space> auf einer \"set\" Zeile um sie zu aktualisieren."
+
+msgid "important"
+msgstr "wichtig"
+
+msgid "behave very Vi compatible (not advisable)"
+msgstr "sich sehr Vi kompatibel verhalten (nicht ratsam)"
+
+msgid "list of flags to specify Vi compatibility"
+msgstr "Liste Flags um Vi-Kompatibilität zu spezifizieren"
+
+msgid "use Insert mode as the default mode"
+msgstr "nutze Einfüge-Modus als Standard Modus"
+
+msgid "paste mode, insert typed text literally"
+msgstr "Paste Modus, um getippten Text literal einzufügen"
+
+msgid "key sequence to toggle paste mode"
+msgstr "Tastenkombination zum Umschalten des Paste Modus"
+
+msgid "list of directories used for runtime files and plugins"
+msgstr "Liste von Verzeichnissen für die Runtime Dateien und Plugins"
+
+msgid "list of directories used for plugin packages"
+msgstr "Liste von Verzeichnissen für die Plugin Pakete"
+
+msgid "name of the main help file"
+msgstr "Dateiname der Haupthilfe"
+
+msgid "moving around, searching and patterns"
+msgstr "Bewegen, Suchen und Muster"
+
+msgid "list of flags specifying which commands wrap to another line"
+msgstr "Liste von Flags zum Definieren welche Befehle zur nächsten Zeile umbrechen"
+
+msgid ""
+"many jump commands move the cursor to the first non-blank\n"
+"character of a line"
+msgstr ""
+"viele Sprungbefehle bewegen den Cursor zum ersten Nicht-Leerzeichen\n"
+"einer Zeile"
+
+msgid "nroff macro names that separate paragraphs"
+msgstr "nroff Makros die Absätze trennen"
+
+msgid "nroff macro names that separate sections"
+msgstr "nroff Makros die Abschnitte trennen"
+
+msgid "list of directory names used for file searching"
+msgstr "Liste von Verzeichnissen zum Suchen von Dateien"
+
+msgid "list of directory names used for :cd"
+msgstr "Liste von Verzeichnissen für :cd Befehl"
+
+msgid "change to directory of file in buffer"
+msgstr "Ins Verzeichnis der zugehörigen Datei wechseln"
+
+msgid "search commands wrap around the end of the buffer"
+msgstr "Such-Befehle beginne von vorn am Ende des Buffers"
+
+msgid "show match for partly typed search command"
+msgstr "Zeige Übereinstimmung für eingetippten Suchbefehl"
+
+msgid "change the way backslashes are used in search patterns"
+msgstr "Ändert die Art wie Backslashes in Suchmustern verwendet werden"
+
+msgid "select the default regexp engine used"
+msgstr "Wählt die Standard-Regexp-Engine aus "
+
+msgid "ignore case when using a search pattern"
+msgstr "Groß-/Kleinbuchstaben ignorieren bei der Suche"
+
+msgid "override 'ignorecase' when pattern has upper case characters"
+msgstr "'ignorecase' Option aufheben, wenn Muster mit Großbuchstaben beginnt"
+
+msgid "what method to use for changing case of letters"
+msgstr "Welche Methode verwendet werden soll zum Ändern von Groß-/Kleinbuchstaben"
+
+msgid "maximum amount of memory in Kbyte used for pattern matching"
+msgstr "Maximaler zu nutzender Speichers für die Suche in Kbyte"
+
+msgid "pattern for a macro definition line"
+msgstr "Muster um eine Makrodefinition zu finden"
+
+msgid "pattern for an include-file line"
+msgstr "Muster um eine \"include\" Zeile zu finden"
+
+msgid "expression used to transform an include line to a file name"
+msgstr "Ausdruck um eine \"include\" Zeile zu einem Dateinamen umzuwandeln"
+
+msgid "tags"
+msgstr "tags"
+
+msgid "use binary searching in tags files"
+msgstr "Binärsuche für die Suche in Tags-Dateien verwenden"
+
+msgid "number of significant characters in a tag name or zero"
+msgstr "Anzahl signifikanter Buchstaben in einem Tagnamen (oder Null)"
+
+msgid "list of file names to search for tags"
+msgstr "Liste an Dateinamen zum Suchen für Tags"
+
+msgid ""
+"how to handle case when searching in tags files:\n"
+"\"followic\" to follow 'ignorecase', \"ignore\" or \"match\""
+msgstr ""
+"wie Unterschiede in Groß-/Kleinschreibung für die Suche in Tag-Dateien:\n"
+"\"followic\" folgt 'ignorecase' Option, \"ignore\" oder \"match\""
+
+msgid "file names in a tags file are relative to the tags file"
+msgstr "Dateinamen in einer Tags-Datei sind relativ zur selbigen"
+
+msgid "a :tag command will use the tagstack"
+msgstr "ein :tag Befehl nutzt den Tagstack"
+
+msgid "when completing tags in Insert mode show more info"
+msgstr "beim vervollständigen von Tags im Einfüge-Modus weitere Infos anzeigen"
+
+msgid "a function to be used to perform tag searches"
+msgstr "eine Funktion für die Tag-Suche verwenden"
+
+msgid "command for executing cscope"
+msgstr "Befehl zum Ausführen von cscope"
+
+msgid "use cscope for tag commands"
+msgstr "Benutze cscope für tag Befehle"
+
+msgid "0 or 1; the order in which \":cstag\" performs a search"
+msgstr "0 oder 1; Reihenfolge wie \":cstag\" eine Suche durchführt"
+
+msgid "give messages when adding a cscope database"
+msgstr "Nachricht geben, wenn eine cscope-Datenbank hinzugefügt wird"
+
+msgid "how many components of the path to show"
+msgstr "wie viele Komponenten des Pfades anzuzeigen"
+
+msgid "when to open a quickfix window for cscope"
+msgstr "Ob das Quickfix Fenster für cscope zu nutzen ist"
+
+msgid "file names in a cscope file are relative to that file"
+msgstr "Dateinamen in einer cscope Datei sind relativ zu dieser"
+
+msgid "displaying text"
+msgstr "anzuzeigender Text"
+
+msgid "number of lines to scroll for CTRL-U and CTRL-D"
+msgstr "Anzahl zu scrollender Zeilen für CTRL-U und CTRL-D"
+
+msgid "number of screen lines to show around the cursor"
+msgstr "Anzahl anzuzeigender Zeilen um den Cursor herum"
+
+msgid "long lines wrap"
+msgstr "lange Zeilen umbrechen"
+
+msgid "wrap long lines at a character in 'breakat'"
+msgstr "lange Zeilen an Zeichen in 'breakat' umbrechen"
+
+msgid "preserve indentation in wrapped text"
+msgstr "Einrückungen beibehalten in umbrochenen Text"
+
+msgid "adjust breakindent behaviour"
+msgstr "breakindent Verhalten anpassen"
+
+msgid "which characters might cause a line break"
+msgstr "welche Zeichen einen Zeilenumbruch verursachen können"
+
+msgid "string to put before wrapped screen lines"
+msgstr "Zeichenkette die vor einem Zeilenbumbruch angezeigt wird"
+
+msgid "minimal number of columns to scroll horizontally"
+msgstr "minimale Spaltenanzahl zum horizontalen Scrollen "
+
+msgid "minimal number of columns to keep left and right of the cursor"
+msgstr "minimale anzuzeigende Spaltenanzahl rechts und links des Cursor"
+
+msgid ""
+"include \"lastline\" to show the last line even if it doesn't fit\n"
+"include \"uhex\" to show unprintable characters as a hex number"
+msgstr ""
+"füge \"lastline\" hinzu um die letzte Zeile anzuzeigen, auch wenn sie nicht passt\n"
+"füge \"uhex\" hinzu um nicht druckbare Zeichen als Hex-Wert anzuzeigen"
+
+msgid "characters to use for the status line, folds and filler lines"
+msgstr "zu verwendende Zeichen für die Statuszeile, Folds und Füllzeilen"
+
+msgid "number of lines used for the command-line"
+msgstr "Anzahl zu verwendender Zeilen für die Commandline"
+
+msgid "width of the display"
+msgstr "Anzahl an Spalten des Displays"
+
+msgid "number of lines in the display"
+msgstr "Anzahl an Zeilen des Displays"
+
+msgid "number of lines to scroll for CTRL-F and CTRL-B"
+msgstr "Anzahl zu scrollender Zeilen für CTRL-F und CTRL-B"
+
+msgid "don't redraw while executing macros"
+msgstr "währed der Ausführung von Makros nicht neu zeichnen"
+
+msgid "timeout for 'hlsearch' and :match highlighting in msec"
+msgstr "Timeout für 'hlsearch' und :match Highlights in msec"
+
+msgid ""
+"delay in msec for each char written to the display\n"
+"(for debugging)"
+msgstr ""
+"Verzögerung in msec für jedes zu zeichnendes Zeichen\n"
+"(zum Debuggen)"
+
+msgid "show <Tab> as ^I and end-of-line as $"
+msgstr "zeige <Tab> als ^I und Zeilenende als $"
+
+msgid "list of strings used for list mode"
+msgstr "Liste an Zeichenketten für die Nutzung des List Modus"
+
+msgid "show the line number for each line"
+msgstr "Zeilennummerierung anzeigen"
+
+msgid "show the relative line number for each line"
+msgstr "relative Zeilennummerierung anzeigen"
+
+msgid "number of columns to use for the line number"
+msgstr "zu verwendede Spaltenanzahl für die Zeilennummerierung"
+
+msgid "controls whether concealable text is hidden"
+msgstr "ob verdeckter Text anzuzeigen ist"
+
+msgid "modes in which text in the cursor line can be concealed"
+msgstr "Modi in denen Text innhalb der Cursorzeile verdeckt werden kann"
+
+msgid "syntax, highlighting and spelling"
+msgstr "Syntax, Hervorhebung und Rechtschreibprüfung"
+
+msgid "\"dark\" or \"light\"; the background color brightness"
+msgstr "\"dark\" oder \"light\"; die Helligkeit des Hintergrunds"
+
+msgid "type of file; triggers the FileType event when set"
+msgstr "Dateityp; löst das FileType Autokommando aus"
+
+msgid "name of syntax highlighting used"
+msgstr "Name der zu verwendenen Syntax Hervorhebung"
+
+msgid "maximum column to look for syntax items"
+msgstr "maximale Spaltenanzahl, in der nach Syntaxelementen gesucht werden soll"
+
+msgid "which highlighting to use for various occasions"
+msgstr "welche Hervorherbung für unterschiedlice Gelegenheiten genutzt werden soll"
+
+msgid "highlight all matches for the last used search pattern"
+msgstr "Hervorhebung des letzten Suchmuchsters"
+
+msgid "highlight group to use for the window"
+msgstr "für das Fenster zu verwendende Hervorhebungsgruppe"
+
+msgid "use GUI colors for the terminal"
+msgstr "GUI Farben im Terminal nutzen"
+
+msgid "highlight the screen column of the cursor"
+msgstr "Cursorspalte hervorheben"
+
+msgid "highlight the screen line of the cursor"
+msgstr "Cursorzeile hervorheben"
+
+msgid "specifies which area 'cursorline' highlights"
+msgstr "angeben wo 'cursorline' hervorhebt"
+
+msgid "columns to highlight"
+msgstr "extra hervorzuhebende Spalten"
+
+msgid "highlight spelling mistakes"
+msgstr "Rechtschreibfehler hervorheben"
+
+msgid "list of accepted languages"
+msgstr "Liste zu prüfender Sprachen"
+
+msgid "file that \"zg\" adds good words to"
+msgstr "Datei zu der \"zg\" richtige Wörter hinzufügt"
+
+msgid "pattern to locate the end of a sentence"
+msgstr "Muster um Ende eines Satzes zu finden"
+
+msgid "flags to change how spell checking works"
+msgstr "Flags, welche die Rechtschreibprüfung beeinflussen"
+
+msgid "methods used to suggest corrections"
+msgstr "Methoden um Korrekturen vorzuschlagen"
+
+msgid "amount of memory used by :mkspell before compressing"
+msgstr "Speichermenge die von :mkspell vor der Komprimierung verwendet wird"
+
+msgid "multiple windows"
+msgstr "mehrere Fenster"
+
+msgid "0, 1 or 2; when to use a status line for the last window"
+msgstr "0, 1 oder 2; wann eine Statuszeile verwendet wird"
+
+msgid "alternate format to be used for a status line"
+msgstr "Format das für die Statuszeile verwendet wird"
+
+msgid "make all windows the same size when adding/removing windows"
+msgstr "alle Fenster gleich groß machen, wenn ein neues Fenster hinzukommt oder entfernt wird"
+
+msgid "in which direction 'equalalways' works: \"ver\", \"hor\" or \"both\""
+msgstr "für welche Richtung 'equalalways' verwendet wird: \"ver\", \"hor\" oder \"both\""
+
+msgid "minimal number of lines used for the current window"
+msgstr "minimal zu verwendende Zeilenanzahl für aktuelles Fenster"
+
+msgid "minimal number of lines used for any window"
+msgstr "minmal zu verwendende Zeilenanzahl für alle Fenster"
+
+msgid "keep the height of the window"
+msgstr "aktuelle Größe des Fenster beibehalten"
+
+msgid "keep the width of the window"
+msgstr "aktuelle Breite des Fensters beibehalten"
+
+msgid "minimal number of columns used for the current window"
+msgstr "minimale Spaltenanzahl für das aktuelle Fenster"
+
+msgid "minimal number of columns used for any window"
+msgstr "minimale Spaltenanzahl für alle Fenster"
+
+msgid "initial height of the help window"
+msgstr "initiale Größe des Hilfefensters "
+
+msgid "use a popup window for preview"
+msgstr "ein Popup-Fenster als Vorschaufenster nutzen"
+
+msgid "default height for the preview window"
+msgstr "Standard Höhe für das Vorschaufenster"
+
+msgid "identifies the preview window"
+msgstr "identifiziert ein Vorschaufenster"
+
+msgid "don't unload a buffer when no longer shown in a window"
+msgstr "Buffer nicht entladen, wenn er nicht länger in einem Fenster angezeigt wird"
+
+msgid ""
+"\"useopen\" and/or \"split\"; which window to use when jumping\n"
+"to a buffer"
+msgstr ""
+"\"useopen\" und/oder/or \"split\"; welches Fenster beim Springen zum Buffer zu verwenden ist"
+
+msgid "a new window is put below the current one"
+msgstr "neues Fenster wird unter dem aktuellen geöffnet"
+
+msgid "a new window is put right of the current one"
+msgstr "neues Fenster wird rechts neben dem aktuellen geöffnet"
+
+msgid "this window scrolls together with other bound windows"
+msgstr "dieses Fenster scrollt zusammen mit anderen verbundenen Fenstern"
+
+msgid "\"ver\", \"hor\" and/or \"jump\"; list of options for 'scrollbind'"
+msgstr "\"ver\", \"hor\" und/oder \"jump\"; Liste von Optionen für 'scrollbind'"
+
+msgid "this window's cursor moves together with other bound windows"
+msgstr "Cursor des aktuellen Fensters bewegt sich gleichzeitig mit anderen verbundenen Fenstern"
+
+msgid "size of a terminal window"
+msgstr "Größe des Terminal Fensters"
+
+msgid "key that precedes Vim commands in a terminal window"
+msgstr "Taste, die anderen Vim Befehlen im Terminalfenster vorausgeht"
+
+msgid "max number of lines to keep for scrollback in a terminal window"
+msgstr "maximale zu behaltende Zeilenanzahl für das Zurückscrollen im Terminalfenster"
+
+msgid "type of pty to use for a terminal window"
+msgstr "Typ des zu verwendenen ptys für das Terminalfenster"
+
+msgid "name of the winpty dynamic library"
+msgstr "Name der winpty-dynamischen Bibliothek"
+
+msgid "multiple tab pages"
+msgstr "mehrere Tab Seiten"
+
+msgid "0, 1 or 2; when to use a tab pages line"
+msgstr "0, 1, oder 2; wann eine Tabseitenzeile verwendet wird"
+
+msgid "maximum number of tab pages to open for -p and \"tab all\""
+msgstr "maximale Anzahl an zu öffnenden Tabseiten (für -p und \"tab all\")"
+
+msgid "custom tab pages line"
+msgstr "benutzerdefinierte Tabseitenzeile"
+
+msgid "custom tab page label for the GUI"
+msgstr "benutzerdefinierte Tabseitenbeschriftung für die GUI"
+
+msgid "custom tab page tooltip for the GUI"
+msgstr "benutzerdefinierter Tabseiten-Tooltip für die GUI"
+
+msgid "terminal"
+msgstr "Terminal"
+
+msgid "name of the used terminal"
+msgstr "Name des zu verwendenen Terminals"
+
+msgid "alias for 'term'"
+msgstr "Alias für 'term'"
+
+msgid "check built-in termcaps first"
+msgstr "eingebautes Termcap zuerst prüfen"
+
+msgid "terminal connection is fast"
+msgstr "schnelle Terminalverbindung"
+
+msgid "terminal that requires extra redrawing"
+msgstr "Terminal benötigt zusätzliche Redraws"
+
+msgid "recognize keys that start with <Esc> in Insert mode"
+msgstr "erkennt Tasten die mit <Esc> in Einfüge-Modus anfangen"
+
+msgid "minimal number of lines to scroll at a time"
+msgstr "minimale gleichzeitig zu scrollende Zeilenanzahl"
+
+msgid "maximum number of lines to use scrolling instead of redrawing"
+msgstr "maximal zu scrollende Zeilenanzahl bevor neu gezeichnet wird"
+
+msgid "specifies what the cursor looks like in different modes"
+msgstr "definiert wie der Cursor in unterschiedlichen Modi aussieht"
+
+msgid "show info in the window title"
+msgstr "zeige Infos im Fenstertitel"
+
+msgid "percentage of 'columns' used for the window title"
+msgstr "für den Fentertitel zu verwendender Prozentsatz"
+
+msgid "when not empty, string to be used for the window title"
+msgstr "wenn nicht leer, Zeichenkette, die im Fenstertitel angezeigt wird"
+
+msgid "string to restore the title to when exiting Vim"
+msgstr "Zeichenkette zum Wiederherstellen des Fenstertitels beim Beenden"
+
+msgid "set the text of the icon for this window"
+msgstr "den Symboltext für das Fenster setzen"
+
+msgid "when not empty, text for the icon of this window"
+msgstr "wenn nicht leer, Symboltext des Fensters setzen"
+
+msgid "restore the screen contents when exiting Vim"
+msgstr "den Bildschirminhalt beim Beenden wiederherstellen"
+
+msgid "using the mouse"
+msgstr "Mausnutzung"
+
+msgid "list of flags for using the mouse"
+msgstr "Liste an Flags zur Nutzung der Maus"
+
+msgid "the window with the mouse pointer becomes the current one"
+msgstr "das Fenster mit dem Mauszeiger wird das aktuelle"
+
+msgid "the window with the mouse pointer scrolls with the mouse wheel"
+msgstr "das Fenster mit dem Mauszeiger wird mit der Maus gescrollt"
+
+msgid "hide the mouse pointer while typing"
+msgstr "den Mauszeiger beim Tippen verstecken"
+
+msgid ""
+"\"extend\", \"popup\" or \"popup_setpos\"; what the right\n"
+"mouse button is used for"
+msgstr ""
+"\"extend\", \"popup\" oder \"popup_setpos\"; wofür die rechte\n"
+"Maustaste genutzt wird"
+
+msgid "maximum time in msec to recognize a double-click"
+msgstr "maximale Anzahl in msec um einen Doppelclick zu erkennen"
+
+msgid "\"xterm\", \"xterm2\", \"sgr\", etc.; type of mouse"
+msgstr "\"xterm\", \"xterm2\", \"sgr\", etc.; Maustyp"
+
+msgid "what the mouse pointer looks like in different modes"
+msgstr "wie der Mauszeiger in unterschiedliechen Modi aussieht"
+
+msgid "GUI"
+msgstr "GUI"
+
+msgid "list of font names to be used in the GUI"
+msgstr "Liste an zu verwendenden Schriften für die GUI"
+
+msgid "pair of fonts to be used, for multibyte editing"
+msgstr "zu verwendende Schriftartenpaar für die Multibyte-Bearbeitung"
+
+msgid "list of font names to be used for double-wide characters"
+msgstr "Liste der zu verwendenden Schriftarten für doppelt-breite Zeichen"
+
+msgid "use smooth, antialiased fonts"
+msgstr "glatte, antialiasierte Schriften verwenden"
+
+msgid "list of flags that specify how the GUI works"
+msgstr "Liste von Flags, die das Verhalten der GUI beeinflußen"
+
+msgid "\"icons\", \"text\" and/or \"tooltips\"; how to show the toolbar"
+msgstr "\"icons\", \"text\" und/oder \"tooltips\"; wie die Toolbar angezeigt wird"
+
+msgid "size of toolbar icons"
+msgstr "Größe der Toolbar Icons"
+
+msgid "room (in pixels) left above/below the window"
+msgstr "reservierter Platz (in Pixel) oberhalb/unterhalb des Fensters"
+
+msgid "options for text rendering"
+msgstr "Optionen zum Textrendering"
+
+msgid "use a pseudo-tty for I/O to external commands"
+msgstr "ein Pseudo-TTY für I/O zu externen Befehlen verwenden"
+
+msgid ""
+"\"last\", \"buffer\" or \"current\": which directory used for the file "
+"browser"
+msgstr ""
+"\"last\", \"buffer\" oder \"current\": zu nutzendes Verzeichnis für den Dateibrowser"
+
+msgid "language to be used for the menus"
+msgstr "zu verwendende Sprache für die Menüs"
+
+msgid "maximum number of items in one menu"
+msgstr "maximale Anzahl an Elementen in einem Menü"
+
+msgid "\"no\", \"yes\" or \"menu\"; how to use the ALT key"
+msgstr "\"no\", \"yes\" oder \"menu\"; wie die ALT Taste genutzt wird"
+
+msgid "number of pixel lines to use between characters"
+msgstr "Anzahl an zu nutzenden Pixelzeilen zwischen Zeichen"
+
+msgid "delay in milliseconds before a balloon may pop up"
+msgstr "Verzögerung in msec bevor ein Ballon erscheint"
+
+msgid "use balloon evaluation in the GUI"
+msgstr "verwende die Ballon-eval Funktion in der GUI"
+
+msgid "use balloon evaluation in the terminal"
+msgstr "verwende die Ballon-eval Funktion im Terminal"
+
+msgid "expression to show in balloon eval"
+msgstr "Textausdruck, der bei der Verwendung des Ballons angezeigt werden soll"
+
+msgid "printing"
+msgstr "Drucken"
+
+msgid "list of items that control the format of :hardcopy output"
+msgstr "Anzahl an Elementen die das Format der :hardcopy Ausgabe steuern"
+
+msgid "name of the printer to be used for :hardcopy"
+msgstr "zu verwendender Druckername"
+
+msgid "expression used to print the PostScript file for :hardcopy"
+msgstr "Ausdruck der zum Drucken der PostScriptdatei für :hardcopy genutzt wird"
+
+msgid "name of the font to be used for :hardcopy"
+msgstr "Schriftname, der für :hardcopy genutzt wird"
+
+msgid "format of the header used for :hardcopy"
+msgstr "Format der Kopfzeile die für :hardcopy verwendet wird"
+
+msgid "encoding used to print the PostScript file for :hardcopy"
+msgstr "zum Drucken der PostScriptdatei verwendete Kodierung für :hardcopy"
+
+msgid "the CJK character set to be used for CJK output from :hardcopy"
+msgstr "der für die CJK-Ausgabe zu verwendende CJK-Zeichensatz von :hardcopy"
+
+msgid "list of font names to be used for CJK output from :hardcopy"
+msgstr "List an Schriftarten die für die CJK-Ausgabe von :hardcopy genutzt wird"
+
+msgid "messages and info"
+msgstr "Meldungen und Informationen"
+
+msgid "add 's' flag in 'shortmess' (don't show search message)"
+msgstr "füge 's' Flag in 'shortmess' hinzu (keine Suchmeldung anzeigen)"
+
+msgid "list of flags to make messages shorter"
+msgstr "Liste an Flags um Meldungen kürzer auszugeben"
+
+msgid "show (partial) command keys in the status line"
+msgstr "zeige (partielle) Befehlstasten in der Statuszeile"
+
+msgid "display the current mode in the status line"
+msgstr "zeige aktuellen Modus in der Statuszeile"
+
+msgid "show cursor position below each window"
+msgstr "zeige Cursor Position unter jedem Fenster"
+
+msgid "alternate format to be used for the ruler"
+msgstr "alternatives Format für die 'ruler' Option"
+
+msgid "threshold for reporting number of changed lines"
+msgstr "Schwellwert für die Meldung der Anzeige geänderter Zeilen"
+
+msgid "the higher the more messages are given"
+msgstr "je höher desto mehr Meldungen werden ausgegeben"
+
+msgid "file to write messages in"
+msgstr "Datei in die Meldungen geschrieben werden"
+
+msgid "pause listings when the screen is full"
+msgstr "halte Auflistung von Meldungen an, wenn der Bildschirm voll ist"
+
+msgid "start a dialog when a command fails"
+msgstr "führe einen Dialog aus, wenn ein Befehl fehlschlägt"
+
+msgid "ring the bell for error messages"
+msgstr "bei Fehlermeldungen piepen"
+
+msgid "use a visual bell instead of beeping"
+msgstr "nutze eine grafische Klingel"
+
+msgid "do not ring the bell for these reasons"
+msgstr "aus den folgenden Gründen nicht piepen"
+
+msgid "list of preferred languages for finding help"
+msgstr "Liste der bevorzugten Sprachen für die Hilfe"
+
+msgid "selecting text"
+msgstr "Textauswahl"
+
+msgid "\"old\", \"inclusive\" or \"exclusive\"; how selecting text behaves"
+msgstr "\"old\", \"inclusive\" oder \"exclusive\"; wie sich die Textauswahl verhält"
+
+msgid ""
+"\"mouse\", \"key\" and/or \"cmd\"; when to start Select mode\n"
+"instead of Visual mode"
+msgstr ""
+"\"mouse\", \"key\" und/oder \"cmd\"; wann Select Modus\n"
+"anstelle von Visual Modus genutzt wird"
+
+msgid ""
+"\"unnamed\" to use the * register like unnamed register\n"
+"\"autoselect\" to always put selected text on the clipboard"
+msgstr ""
+"\"unnamed\" nutzt das * Register wie das unbenannte Register\n"
+"\"autoselect\" ausgewählten Text automatisch in der Zwischenablage speichern"
+
+msgid "\"startsel\" and/or \"stopsel\"; what special keys can do"
+msgstr "\"startsel\" und/oder \"stopsel\"; was bestimmte Tasten machen"
+
+msgid "editing text"
+msgstr "Textbearbeitung"
+
+msgid "maximum number of changes that can be undone"
+msgstr "maximale Anzahl an Änderungen, die rückgängig gemacht werden können"
+
+msgid "automatically save and restore undo history"
+msgstr "automatisches Sichern und Wiederherstellen der Undo-Historie"
+
+msgid "list of directories for undo files"
+msgstr "Verzeichnisliste für Undo-Dateien"
+
+msgid "maximum number lines to save for undo on a buffer reload"
+msgstr "maximale Anzahl zu speichernder Zeilen beim neu laden des Buffers"
+
+msgid "changes have been made and not written to a file"
+msgstr "Änderungen wurde gemacht und nicht in die Datei zurück geschrieben"
+
+msgid "buffer is not to be written"
+msgstr "Buffer soll nicht geschrieben werden"
+
+msgid "changes to the text are possible"
+msgstr "Änderungen am Text sind möglich"
+
+msgid "line length above which to break a line"
+msgstr "Zeilenlänge ab wann umgebrochen wird"
+
+msgid "margin from the right in which to break a line"
+msgstr "Rand von rechts an dem eine Zeile umbrochen wird"
+
+msgid "specifies what <BS>, CTRL-W, etc. can do in Insert mode"
+msgstr "definiert, wie sich <BS>, CTRL-W etc. im Einfüge-Modus verhält"
+
+msgid "definition of what comment lines look like"
+msgstr "Definition einer Kommentarzeile"
+
+msgid "list of flags that tell how automatic formatting works"
+msgstr "Liste von Flags, die automatisches Formatieren beeinflußen"
+
+msgid "pattern to recognize a numbered list"
+msgstr "Muster um eine Aufzählungsliste zu erkennen"
+
+msgid "expression used for \"gq\" to format lines"
+msgstr "Ausdruck für \"gq\" zur Formatierung von Zeilen"
+
+msgid "specifies how Insert mode completion works for CTRL-N and CTRL-P"
+msgstr "legt fest, wie Vervollständigen im Einfüge-Modus mit CTRL-N und CTRL-P funktioniert"
+
+msgid "whether to use a popup menu for Insert mode completion"
+msgstr "ob ein Popup-Menü bei der Verfollständigen im Einfüge-Modus genutzt wird"
+
+msgid "options for the Insert mode completion info popup"
+msgstr "Optionen für das Popup bei der Einfüge-Modus Vervollständigung"
+
+msgid "maximum height of the popup menu"
+msgstr "maximale Höhe des Popup-Menüs"
+
+msgid "minimum width of the popup menu"
+msgstr "minimale Breite des Popup-Menüs"
+
+msgid "user defined function for Insert mode completion"
+msgstr "benutzerdefinierte Funktion für Vervollständigung im Einfüge-Modus"
+
+msgid "function for filetype-specific Insert mode completion"
+msgstr "Funktion für Dateityp-spezifische Vervollständigung im Einfüge-Modus"
 
-#, c-format
-msgid "E482: Can't create file %s"
-msgstr "E482: Kann Datei %s nicht erzeugen"
+msgid "list of dictionary files for keyword completion"
+msgstr "Liste von Wörterbuchdateien für Keyword-Vervollständigung"
 
-msgid "E483: Can't get temp file name"
-msgstr "E483: Kann den Namen der temporären Datei nicht ermitteln"
+msgid "list of thesaurus files for keyword completion"
+msgstr "List von Thesaurusdateien für Keyword-Vervollständigung"
 
-#, c-format
-msgid "E484: Can't open file %s"
-msgstr "E484: Kann die Datei %s nicht öffnen"
+msgid "adjust case of a keyword completion match"
+msgstr "Groß-/Kleinschreibung für Keyword-Vervollständigung anpassen"
 
-#, c-format
-msgid "E485: Can't read file %s"
-msgstr "E485: Kann Datei %s nicht lesen"
+msgid "enable entering digraphs with c1 <BS> c2"
+msgstr "erlaubt das Eingeben von Digraphs mittels c1 <BS> c2"
 
-msgid "E38: Null argument"
-msgstr "E38: Null-Argument"
+msgid "the \"~\" command behaves like an operator"
+msgstr "der \"~\" Befehl verhält sich wie ein Operator"
 
-msgid "E39: Number expected"
-msgstr "E39: Nummer erwartet"
+msgid "function called for the \"g@\" operator"
+msgstr "aufzurufende Funktion für den \"g@\" Operator"
 
-#, c-format
-msgid "E40: Can't open errorfile %s"
-msgstr "E40: Fehlerdatei %s kann nicht geöffnet werden"
+msgid "when inserting a bracket, briefly jump to its match"
+msgstr "bei der Eingabe von Klammern, kurz zur zugehörigen Klammer springen"
 
-msgid "E233: cannot open display"
-msgstr "E233: Display kann nicht geöffnet werden"
+msgid "tenth of a second to show a match for 'showmatch'"
+msgstr "Anzahl an Zentelsekunden um zugehörige Klammer anzuzeigen"
 
-msgid "E41: Out of memory!"
-msgstr "E41: Speicher erschöpft!"
+msgid "list of pairs that match for the \"%\" command"
+msgstr "Liste an zugehörigen Paaren für den \"%\" Befehl"
 
-msgid "Pattern not found"
-msgstr "Muster nicht gefunden"
+msgid "use two spaces after '.' when joining a line"
+msgstr "nutze zwei Leerzeichen nach einem '.' beim Verbinden einer Zeile"
 
-#, c-format
-msgid "E486: Pattern not found: %s"
-msgstr "E486: Muster nicht gefunden: %s"
+msgid ""
+"\"alpha\", \"octal\", \"hex\", \"bin\" and/or \"unsigned\"; number formats\n"
+"recognized for CTRL-A and CTRL-X commands"
+msgstr ""
+"\"alpha\", \"octal\", \"hex\", \"bin\" und/oder \"unsigned\"; zu erkennende Zahlenformate\n"
+"für CTRL-A und CTRL-X Befehle"
 
-msgid "E487: Argument must be positive"
-msgstr "E487: Argument muss positiv sein"
+msgid "tabs and indenting"
+msgstr "Tabs und Einrückungen"
 
-msgid "E459: Cannot go back to previous directory"
-msgstr "E459: Kann nicht ins vorhergehende Verzeichnis wechseln"
+msgid "number of spaces a <Tab> in the text stands for"
+msgstr "Anzahl an Leerzeichen für einen <Tab> im Text"
 
-msgid "E42: No Errors"
-msgstr "E42: Keine Fehler"
+msgid "number of spaces used for each step of (auto)indent"
+msgstr "zu nutzende Anzahl an Leerzeichen je Einrückungsebene"
 
-msgid "E776: No location list"
-msgstr "E776: Keine Positionsliste"
+msgid "list of number of spaces a tab counts for"
+msgstr "Anzahl an Leerzeichen für einen <Tab>"
 
-msgid "E43: Damaged match string"
-msgstr "E43: Beschädigter Suchausdruck"
+msgid "list of number of spaces a soft tabsstop counts for"
+msgstr "Anzahl an Leerzeichen für einen Soft-Tabstop"
 
-msgid "E44: Corrupted regexp program"
-msgstr "E44: schadhaftes regexp Programm"
+msgid "a <Tab> in an indent inserts 'shiftwidth' spaces"
+msgstr "ein <Tab> beim Einrücken fügt 'shiftwidth' Leerzeichen ein"
 
-msgid "E45: 'readonly' option is set (add ! to override)"
-msgstr "E45: Die Option 'readonly' ist gesetzt (erzwinge mit !)"
+msgid "if non-zero, number of spaces to insert for a <Tab>"
+msgstr "wenn ungleich 0, Anzahl an einzufügenden Leerzeichen für einen <Tab>"
 
-#, c-format
-msgid "E121: Undefined variable: %s"
-msgstr "E121: Undefinierte Variable: %s"
+msgid "round to 'shiftwidth' for \"<<\" and \">>\""
+msgstr "runde Einrückung zum nächsten 'shiftwidth' für \"<<\" und \">>\""
 
-#, c-format
-msgid "E734: Wrong variable type for %s="
-msgstr "E734: Falscher Variablentyp für %s="
+msgid "expand <Tab> to spaces in Insert mode"
+msgstr "ersetze <Tab> durch Leerzeichen im Einfüge-Modus"
 
-#, c-format
-msgid "E461: Illegal variable name: %s"
-msgstr "E461: Unzulässiger Variablenname: %s"
+msgid "automatically set the indent of a new line"
+msgstr "automatisches Einrücken neuer Zeilen"
 
-msgid "E995: Cannot modify existing variable"
-msgstr "E995: Kann existierende Variable nicht ändern"
+msgid "do clever autoindenting"
+msgstr "cleveres automatisches Einrücken vornehmen"
 
-#, c-format
-msgid "E46: Cannot change read-only variable \"%s\""
-msgstr "E46: Variable \"%s\" kann nur gelesen werden"
+msgid "enable specific indenting for C code"
+msgstr "erlaube C-Code spezifisches Einrücken"
 
-#, c-format
-msgid "E794: Cannot set variable in the sandbox: \"%s\""
-msgstr "E794: Variable kann nicht in der Sandbox gesetzt werden: \"%s\""
+msgid "options for C-indenting"
+msgstr "Optionen für C-Code spezifisches Einrücken"
 
-msgid "E928: String required"
-msgstr "E928: String wird benötigt."
+msgid "keys that trigger C-indenting in Insert mode"
+msgstr "Tasten, die C-Code Einrücken im Einfüge-Modus auslösen"
 
-msgid "E713: Cannot use empty key for Dictionary"
-msgstr "E713: Der Schlüssel für das Dictionary darf nicht leer sein"
+msgid "list of words that cause more C-indent"
+msgstr "Liste an Wörtern, die ein eweiteres C-Code Einrücken auslösen"
 
-msgid "E715: Dictionary required"
-msgstr "E715: Dictionary benötigt"
+msgid "expression used to obtain the indent of a line"
+msgstr "Ausdruck um den Einzug einer Zeile zu erhalten"
 
-#, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: Index der Liste außerhalb des zulässigen Bereichs: %ld"
+msgid "keys that trigger indenting with 'indentexpr' in Insert mode"
+msgstr "Tasten, die das Einrücken von 'indentexpr' im Einfüge-Modus auslösen"
 
-#, c-format
-msgid "E979: Blob index out of range: %ld"
-msgstr "E979: Blobindex außerhalb des Bereichs: %ld"
+msgid "copy whitespace for indenting from previous line"
+msgstr "Einfügen von Leerzeichen aus der vorherigen Zeile kopieren"
 
-msgid "E978: Invalid operation for Blob"
-msgstr "E978: Unzulässige Operation für Blob"
+msgid "preserve kind of whitespace when changing indent"
+msgstr "Art von Leerzeichen beim Ändern des Einzugs beibehalten"
 
-#, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: Zu viele Argumente für Funktion: %s"
+msgid "enable lisp mode"
+msgstr "aktiviere Lisp Modus"
 
-#, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: Zu wenige Argumente für Funktion: %s"
+msgid "words that change how lisp indenting works"
+msgstr "Wörter, die die Funktionsweise des Lisp-Einzugs ändern"
 
-#, c-format
-msgid "E933: Function was deleted: %s"
-msgstr "E933: Funktion wurde gelöscht: %s"
+msgid "folding"
+msgstr "Faltung"
 
-#, c-format
-msgid "E716: Key not present in Dictionary: %s"
-msgstr "E716: Schlüssel %s nicht im Dictionary vorhanden."
+msgid "unset to display all folds open"
+msgstr "ausschalten um alle Faltungen zu öffnen"
 
-msgid "E714: List required"
-msgstr "E714: Liste benötigt"
+msgid "folds with a level higher than this number will be closed"
+msgstr "Faltungen eines höheren Levels werden geschlossen"
 
-msgid "E1090: List, Dict or Blob required"
-msgstr "E1090: Liste, Dictionary oder Blob benötigt"
+msgid "value for 'foldlevel' when starting to edit a file"
+msgstr "Wert von 'foldlevel' beim Start des Editierens einer Datei"
 
-msgid "E897: List or Blob required"
-msgstr "E897: Liste oder Blob benötigt"
+msgid "width of the column used to indicate folds"
+msgstr "Breite der Spalte die Faltungen anzeigt"
 
-#, c-format
-msgid "E697: Missing end of List ']': %s"
-msgstr "E697: Fehlendes Ende der Liste ']': %s"
+msgid "expression used to display the text of a closed fold"
+msgstr "Ausdruck, der verwendet wird, um den Text einer geschlossene Faltung anzuzeigen"
 
-#, c-format
-msgid "E712: Argument of %s must be a List or Dictionary"
-msgstr "E712: Argument von %s muss eine Liste oder ein Dictionary sein."
+msgid "set to \"all\" to close a fold when the cursor leaves it"
+msgstr "setze auf \"all\" um eine Faltung zu schließen, wenn der Cursor sie verlässt"
 
-#, c-format
-msgid "E896: Argument of %s must be a List, Dictionary or Blob"
-msgstr "E896: Argument von %s muss eine Liste, Dictionary oder ein Blob sein."
+msgid "specifies for which commands a fold will be opened"
+msgstr "definiert für welche Befehle eine Faltung geöffnet wird"
 
-msgid "E804: Cannot use '%' with Float"
-msgstr "E804: Kann '%' mit Floats benutzen."
+msgid "minimum number of screen lines for a fold to be closed"
+msgstr "minimale Anzahl an Bildschirmzeilen damit Faltung geschlossen wird"
 
-msgid "E908: using an invalid value as a String"
-msgstr "E908: Ungültiger Wert als String verwendet."
+msgid "template for comments; used to put the marker in"
+msgstr "Template für Kommentare; wird verwendet um Faltungs-Marker einzufügen"
 
-msgid "E996: Cannot lock an option"
-msgstr "E996: Kann Option nicht sperren"
+msgid ""
+"folding type: \"manual\", \"indent\", \"expr\", \"marker\",\n"
+"\"syntax\" or \"diff\""
+msgstr ""
+"Faltungstypen: \"manual\", \"indent\", \"expr\", \"marker\",\n"
+"\"syntax\" oder \"diff\""
 
-#, c-format
-msgid "E113: Unknown option: %s"
-msgstr "E113: Unbekannte Option: %s"
+msgid "expression used when 'foldmethod' is \"expr\""
+msgstr "Ausdruck der genutzt wird, wenn 'foldmethod' \"expr\" ist"
 
-msgid "E18: Unexpected characters in :let"
-msgstr "E18: Unerwartete Zeichen in :let"
+msgid "used to ignore lines when 'foldmethod' is \"indent\""
+msgstr "wird genutzt um Zeilen zu ignorieren wenn 'foldmethod' \"indent\" ist"
 
-#, c-format
-msgid "E998: Reduce of an empty %s with no initial value"
-msgstr "E998: Reduzierung einer leeren %s ohne initialen Anfangswert"
+msgid "markers used when 'foldmethod' is \"marker\""
+msgstr "genutzte Marker wenn 'foldmethod' \"marker\" ist"
 
-#, c-format
-msgid "E857: Dictionary key \"%s\" required"
-msgstr "E857: Dictionary Schlüssel \"%s\" benötigt"
+msgid "maximum fold depth for when 'foldmethod' is \"indent\" or \"syntax\""
+msgstr "maximale Faltungstiefe, wenn 'foldmethod' \"indent\" oder \"syntax\" ist"
 
-msgid "E47: Error while reading errorfile"
-msgstr "E47: Fehler während des Lesens der Fehlerdatei"
+msgid "diff mode"
+msgstr "Diff Modus"
 
-msgid "E48: Not allowed in sandbox"
-msgstr "E48: In einer Sandbox nicht erlaubt"
+msgid "use diff mode for the current window"
+msgstr "nutze Diff Modus im aktuellen Fenster"
 
-msgid "E523: Not allowed here"
-msgstr "E523: Hier nicht erlaubt"
+msgid "options for using diff mode"
+msgstr "Optionen für den Diff Modus"
 
-msgid "E578: Not allowed to change text here"
-msgstr "E578: Nicht erlaubt Text hier zu ändern"
+msgid "expression used to obtain a diff file"
+msgstr "Ausdrücke um einen Diff zu erhalten"
 
-msgid "E565: Not allowed to change text or change window"
-msgstr "E565: Es ist nicht erlaubt Text oder Fenster zu ändern"
+msgid "expression used to patch a file"
+msgstr "verwendeter Ausdruck um einen Datei zu patchen"
 
-msgid "E359: Screen mode setting not supported"
-msgstr "E359: Bildschirm-Modus wird nicht unterstützt"
+msgid "mapping"
+msgstr "Mapping"
 
-msgid "E49: Invalid scroll size"
-msgstr "E49: Ungültige Scroll-Größe"
+msgid "maximum depth of mapping"
+msgstr "maximale Tiefe eins Mappings"
 
-msgid "E91: 'shell' option is empty"
-msgstr "E91: Die Option 'shell' ist leer"
+msgid "recognize mappings in mapped keys"
+msgstr "erkenne Mappings in gemappten Tasten"
 
-msgid "E255: Couldn't read in sign data!"
-msgstr "E255: Fehler -- Sign-Daten konnten nicht gelesen werden"
+msgid "allow timing out halfway into a mapping"
+msgstr "erlaube Timeouts von Mappings"
 
-msgid "E72: Close error on swap file"
-msgstr "E72: Fehler beim Schließen der Auslagerungsdatei"
+msgid "allow timing out halfway into a key code"
+msgstr "erlaube Timeouts von Tasten"
 
-msgid "E73: tag stack empty"
-msgstr "E73: Tag Stack leer."
+msgid "time in msec for 'timeout'"
+msgstr "Zeit in msec für 'timeout'"
 
-msgid "E74: Command too complex"
-msgstr "E74: Befehl zu komplex"
+msgid "time in msec for 'ttimeout'"
+msgstr "Zeit in msec für 'ttimeout'"
 
-msgid "E75: Name too long"
-msgstr "E75: Name zu lang"
+msgid "reading and writing files"
+msgstr "Lesen und Schreiben von Dateien"
 
-msgid "E76: Too many ["
-msgstr "E76: Zu viele ["
+msgid "enable using settings from modelines when reading a file"
+msgstr "erlaube das Setzen von Optionen in Modelines beim Lesen einer Datei"
 
-msgid "E77: Too many file names"
-msgstr "E77: Zu viele Dateinamen"
+msgid "allow setting expression options from a modeline"
+msgstr "erlaube das Setzen von Ausdrucks-Optionen ('*expr') aus einer Modeline"
 
-msgid "E488: Trailing characters"
-msgstr "E488: Überschüssige Zeichen"
+msgid "number of lines to check for modelines"
+msgstr "zu checkende Zeilenanzahl für Modelines"
 
-msgid "E78: Unknown mark"
-msgstr "E78: Unbekannte Markierung"
+msgid "binary file editing"
+msgstr "binäres Dateibearbeiten"
 
-msgid "E79: Cannot expand wildcards"
-msgstr "E79: Kann die Platzhalter nicht erweitern"
+msgid "last line in the file has an end-of-line"
+msgstr "letzte Zeile einer Datei hat ein Zeilenendezeichen"
 
-msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
-msgstr "E591: 'winheight' darf nicht kleiner sein als 'winminheight'"
+msgid "fixes missing end-of-line at end of text file"
+msgstr "behebt ein fehlendes Zeilenendezeichen am Ende einer Textdatei"
 
-msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
-msgstr "E592: 'winwidth' darf nicht kleiner sein als 'winminwidth'"
+msgid "prepend a Byte Order Mark to the file"
+msgstr "Byte Order Mark am Anfang einer Datei hinzufügen"
 
-msgid "E80: Error while writing"
-msgstr "E80: Fehler während des Schreibens"
+msgid "end-of-line format: \"dos\", \"unix\" or \"mac\""
+msgstr "Zeilenendezeichenformat: \"dos\", \"unix\" oder \"mac\""
 
-msgid "E939: Positive count required"
-msgstr "E939: Positive Zahl benötigt"
+msgid "list of file formats to look for when editing a file"
+msgstr "List von zu erkennenden Zeilenformaten beim Bearbeiten einer Datei"
 
-msgid "E81: Using <SID> not in a script context"
-msgstr "E81: <SID> wurde nicht in einer Skript-Umgebung benutzt"
+msgid "obsolete, use 'fileformat'"
+msgstr "veraltet, verwende 'fileformat'"
 
-#, c-format
-msgid "E107: Missing parentheses: %s"
-msgstr "E107: Fehlende Klammern: %s"
+msgid "obsolete, use 'fileformats'"
+msgstr "veraltet, verwende 'fileformats'"
 
-msgid "E110: Missing ')'"
-msgstr "E110: Fehlendes ')'"
+msgid "writing files is allowed"
+msgstr "Schreiben von Dateien ist erlaubt"
 
-#, c-format
-msgid "E720: Missing colon in Dictionary: %s"
-msgstr "E720: Fehlender Doppelpunkt im Dictionary: %s"
+msgid "write a backup file before overwriting a file"
+msgstr "eine Backupdatei vor dem Überschreiben anlegen"
 
-#, c-format
-msgid "E721: Duplicate key in Dictionary: \"%s\""
-msgstr "E721: Doppelter Schlüssel im Dictionary: \"%s\""
+msgid "keep a backup after overwriting a file"
+msgstr "behalte Backup nach dem Überschreiben einer Datei"
 
-#, c-format
-msgid "E722: Missing comma in Dictionary: %s"
-msgstr "E722: Fehlendes Komma im Dictionary: %s"
+msgid "patterns that specify for which files a backup is not made"
+msgstr "Muster, das angibt für welche Dateien kein Backup erstellt wird"
 
-#, c-format
-msgid "E723: Missing end of Dictionary '}': %s"
-msgstr "E723: Fehlendes Ende des Dictionary '}': %s"
+msgid "whether to make the backup as a copy or rename the existing file"
+msgstr "ob ein Backup als Kopie oder die vorhandene Datei umbenannt werden soll"
 
-msgid "E449: Invalid expression received"
-msgstr "E449: Ungültiger Ausdruck"
+msgid "list of directories to put backup files in"
+msgstr "Liste an Verzeichnissen, wo Backupdateien gespeichert werden"
 
-msgid "E463: Region is guarded, cannot modify"
-msgstr "E463: Region ist geschützt; keine Änderung möglich"
+msgid "file name extension for the backup file"
+msgstr "Dateiendung für die Backupdatei"
 
-msgid "E744: NetBeans does not allow changes in read-only files"
-msgstr "E744: NetBeans erlaubt keine Änderungen in schreibgeschützten Dateien"
+msgid "automatically write a file when leaving a modified buffer"
+msgstr "Datei automatisch schreiben beim Verlassen eines geänderten Buffers"
 
-msgid "E363: pattern uses more memory than 'maxmempattern'"
-msgstr "E363: Muster benötigt mehr Speicher als 'maxmempattern'"
+msgid "as 'autowrite', but works with more commands"
+msgstr "wie 'autowrite', aber funktioniert mit mehr Befehlen"
 
-msgid "E749: empty buffer"
-msgstr "E749: Leerer Puffer"
+msgid "always write without asking for confirmation"
+msgstr "immer schreiben, ohne nach einer Bestätigung zu fragen"
 
-#, c-format
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: Puffer %ld existiert nicht."
+msgid "automatically read a file when it was modified outside of Vim"
+msgstr "Datei automatisch lesen wenn sie außerhalb von Vim geändert wurde"
 
-msgid "E682: Invalid search pattern or delimiter"
-msgstr "E682: Ungültiges Suchmuster oder Trennzeichen"
+msgid "keep oldest version of a file; specifies file name extension"
+msgstr "älteste Version einer Datei behalten; definiert Dateiendung"
 
-msgid "E139: File is loaded in another buffer"
-msgstr "E139: Datei ist in einem anderen Puffer geladen"
+msgid "forcibly sync the file to disk after writing it"
+msgstr "nach dem Schreiben die Datei zwangsweise mit der Festplatte synchronisieren"
 
-#, c-format
-msgid "E764: Option '%s' is not set"
-msgstr "E764: Option '%s' ist nicht gesetzt"
+msgid "use 8.3 file names"
+msgstr "nutze 8.3 Dateinamen"
 
-msgid "E850: Invalid register name"
-msgstr "E850: Ungültiger Register Name"
+msgid "encryption method for file writing: zip, blowfish or blowfish2"
+msgstr "Verschlüsselungsmethode: zip, blowfish oder blowfish2"
 
-msgid "E806: using Float as a String"
-msgstr "E806: Float als String benutzt."
+msgid "the swap file"
+msgstr "Keine Auslagerungsdatei"
 
-#, c-format
-msgid "E919: Directory not found in '%s': \"%s\""
-msgstr "E919: Verzeichnis nicht gefunden in '%s': \"%s\""
+msgid "list of directories for the swap file"
+msgstr "Liste an Verzeichnissen, wo Auslagerungsdateien gespeichert werden"
 
-msgid "E952: Autocommand caused recursive behavior"
-msgstr "E952: Autokommando verursachten Rekursion"
+msgid "use a swap file for this buffer"
+msgstr "eine Auslagerungsdatei für diesen Buffer nutzen"
 
-msgid "E813: Cannot close autocmd or popup window"
-msgstr ""
-"E813: Autokommando-Fenster oder Popup-Fenster kann nicht geschlossen werden"
+msgid "\"sync\", \"fsync\" or empty; how to flush a swap file to disk"
+msgstr "\"sync\", \"fsync\" oder leer; wie eine Auslagerungsdatei auf Festplatte geschrieben wird"
 
-msgid "E328: Menu only exists in another mode"
-msgstr "E328: Menü existiert nur in anderen Modi"
+msgid "number of characters typed to cause a swap file update"
+msgstr "Anzahl eingegebenen Zeichen nachdem eine Auslagerungsdatei aktualisiert wird"
 
-msgid "E957: Invalid window number"
-msgstr "E957: Ungültige Fensternummer"
+msgid "time in msec after which the swap file will be updated"
+msgstr "Zeit in msec nachdem eine Auslagerungsdatei aktualisiert wird"
 
-#, c-format
-msgid "E686: Argument of %s must be a List"
-msgstr "E686: Argument von %s muss eine Liste sein."
+msgid "maximum amount of memory in Kbyte used for one buffer"
+msgstr "maximale Speichermenge in Kilobyte für einen Buffer"
 
-msgid "E109: Missing ':' after '?'"
-msgstr "E109: Fehlender ':' nach '?'"
+msgid "maximum amount of memory in Kbyte used for all buffers"
+msgstr "maximale Speichermenge in Kilobyte für alle Buffer"
 
-msgid "E690: Missing \"in\" after :for"
-msgstr "E690: Fehlendes \"in\" nach :for"
+msgid "command line editing"
+msgstr "Befehlszeile"
 
-#, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: Unbekannte Funktion: %s"
+msgid "how many command lines are remembered"
+msgstr "wie viele Befehle gespeichert werden"
 
-msgid "E111: Missing ']'"
-msgstr "E111: Fehlende ']'"
+msgid "key that triggers command-line expansion"
+msgstr "Taste, welche die Kommandozeilen-Vervollständigung auslöst"
 
-msgid "E581: :else without :if"
-msgstr "E581: :else ohne :if"
+msgid "like 'wildchar' but can also be used in a mapping"
+msgstr "wie 'wildchar' aber für Makros"
 
-msgid "E582: :elseif without :if"
-msgstr "E582: :elseif ohne :if"
+msgid "specifies how command line completion works"
+msgstr "definiert wie die Kommandozeilen-Vervollständigung funktioniert"
 
-msgid "E580: :endif without :if"
-msgstr "E580: :endif ohne :if"
+msgid "empty or \"tagfile\" to list file name of matching tags"
+msgstr "leer oder \"tagfile\" um Dateinamen von passenden Tags anzuzeigen"
 
-msgid "E586: :continue without :while or :for"
-msgstr "E586: :continue ohne :while or :for"
+msgid "list of file name extensions that have a lower priority"
+msgstr "Liste von Dateieindungen mit einer geringen Priorität"
 
-msgid "E587: :break without :while or :for"
-msgstr "E587: :break ohne :while oder :for"
+msgid "list of file name extensions added when searching for a file"
+msgstr "Liste von zusätzlichen Dateiendungen wenn Dateien gesucht werden"
 
-msgid "E274: No white space allowed before parenthesis"
-msgstr "E274: Keine Leerzeichen vor Klammern erlaubt"
+msgid "list of patterns to ignore files for file name completion"
+msgstr "Liste an zu ignorierenden Dateimustern für die Dateinamens-Vervollständigung"
 
-#, c-format
-msgid "E1004: white space required before and after '%s'"
-msgstr "E1004: Leerzeichen vor und nach '%s' benötigt"
+msgid "ignore case when using file names"
+msgstr "Groß-/Kleinschreibung bei Dateinamen ignorieren"
 
-#, c-format
-msgid "E1069: white space required after '%s'"
-msgstr "E1069: Leerzeichen benötigt nach '%s'"
+msgid "ignore case when completing file names"
+msgstr "Groß-/Kleinschreibug bei Dateinamens-Vervollständigung ignorieren"
 
-#, c-format
-msgid "E1068: No white space allowed before '%s'"
-msgstr "E1068: Keine Leerzeichen vor '%s' erlaubt"
+msgid "command-line completion shows a list of matches"
+msgstr "Kommandozeilen-Vervollständigung zeigt Vorschläge an"
 
-#, c-format
-msgid "E940: Cannot lock or unlock variable %s"
-msgstr "E940: Kann Variable \"%s\" nicht sperren bzw. entsperren."
+msgid "key used to open the command-line window"
+msgstr "Taste um das Kommandozeilen-Fenster zu öffnen"
 
-msgid "E1021: const requires a value"
-msgstr "E1021: const erfordert einen Wert"
+msgid "height of the command-line window"
+msgstr "Höhe des Kommandozeilen-Fensters"
 
-msgid "E1022: type or initialization required"
-msgstr "E1022: Typ oder Initialisierung erforderlich"
+msgid "executing external commands"
+msgstr "externe Befehle ausführen"
 
-#, c-format
-msgid "E1016: Cannot declare a %s variable: %s"
-msgstr "E1016: Kann eine %s Variable nicht deklarieren: %s"
+msgid "name of the shell program used for external commands"
+msgstr "Name der Shell zum Ausführen externer Befehle"
 
-#, c-format
-msgid "E1016: Cannot declare an environment variable: %s"
-msgstr "E1016: Kann eine Umgebungsvariable nicht deklarieren: %s"
+msgid "when to use the shell or directly execute a command"
+msgstr "wann eine Shell oder direkt der Befehl ausgeführt wird"
 
-msgid "E1050: Colon required before a range"
-msgstr "E1050: Doppelpunkt vor einem Bereich benötigt"
+msgid "character(s) to enclose a shell command in"
+msgstr "Zeichen zum Einschließen eines Shell-Befehls"
 
-#, c-format
-msgid "E254: Cannot allocate color %s"
-msgstr "E254: Kann die Farbe %s nicht zuweisen."
+msgid "like 'shellquote' but include the redirection"
+msgstr "wie 'shellquote', aber schließen auch die Umleitung ein"
 
-msgid "search hit TOP, continuing at BOTTOM"
-msgstr "Suche erreichte den ANFANG und wurde am ENDE fortgesetzt"
+msgid "characters to escape when 'shellxquote' is ("
+msgstr "Zeichen, die zu escapen sind, wenn 'shellxquote' \"(\" ist"
 
-msgid "search hit BOTTOM, continuing at TOP"
-msgstr "Suche erreichte das ENDE und wurde am ANFANG fortgesetzt"
+msgid "argument for 'shell' to execute a command"
+msgstr "Argument für 'shell' um ein Befehl auszuführen"
 
-msgid " line "
-msgstr " Zeile "
+msgid "used to redirect command output to a file"
+msgstr "verwendet um Befehl in eine Datei umzuleiten"
 
-#, c-format
-msgid "Need encryption key for \"%s\""
-msgstr "Geben Sie bitte den Schlüssel für \"%s\" ein: "
+msgid "use a temp file for shell commands instead of using a pipe"
+msgstr "nutzt eine temporäre Datei für Shell-Befehle anstatt einer Pipe"
 
-msgid "empty keys are not allowed"
-msgstr "Leerer Schlüssel nicht erlaubt"
+msgid "program used for \"=\" command"
+msgstr "zu verwendendes Programm für \"=\" Befehl"
 
-msgid "dictionary is locked"
-msgstr "Dictionary ist gesperrt"
+msgid "program used to format lines with \"gq\" command"
+msgstr "zu verwendendes Programm für \"gq\" Befehl"
 
-msgid "list is locked"
-msgstr "Liste ist gesperrt"
+msgid "program used for the \"K\" command"
+msgstr "zu verwendendes Programm für \"K\" Befehl"
 
-#, c-format
-msgid "failed to add key '%s' to dictionary"
-msgstr "Konnte Schlüssel '%s' zu Dictionary nicht hinzufügen."
+msgid "warn when using a shell command and a buffer has changes"
+msgstr "warne wenn ein Shell-Befehl genutzt wird und ein Buffer Änderung hat"
 
-#, c-format
-msgid "index must be int or slice, not %s"
-msgstr "Index muss eine Int oder Slice sein, nicht %s"
+msgid "running make and jumping to errors (quickfix)"
+msgstr "Make aufrufen und zu Fehler springen (Quickfix)"
 
-#, c-format
-msgid "expected str() or unicode() instance, but got %s"
-msgstr "erwartete str() oder unicode() Instanz, erhielt jedoch %s"
+msgid "name of the file that contains error messages"
+msgstr "Dateiname der Datei mit den Fehlermeldungen"
 
-#, c-format
-msgid "expected bytes() or str() instance, but got %s"
-msgstr "Erwartete bytes() oder str() Instanz, erhielt jedoch %s"
+msgid "list of formats for error messages"
+msgstr "Liste an Formaten für Fehlermeldungen"
 
-#, c-format
-msgid ""
-"expected int(), long() or something supporting coercing to long(), but got %s"
-msgstr ""
-"erwartete int(), long() or etwas was sich zu long() wandeln lässt, erhielt "
-"jedoch %s"
+msgid "program used for the \":make\" command"
+msgstr "zu verwendendes Programm für \":make\" Befehl"
 
-#, c-format
-msgid "expected int() or something supporting coercing to int(), but got %s"
-msgstr ""
-"erwartete int() oder etwas was sich zu int() wandeln lässt, erhielt jedoch %s"
+msgid "string used to put the output of \":make\" in the error file"
+msgstr "Zeichenkette um Ausgabe von \":make\" in Fehlerdatei umzuleiten"
 
-msgid "value is too large to fit into C int type"
-msgstr "Wert zu groß für einen C Integerwert"
+msgid "name of the errorfile for the 'makeprg' command"
+msgstr "Name der Fehlerdatei für 'makeprg' Befehl"
 
-msgid "value is too small to fit into C int type"
-msgstr "Wert zu klein für einen C Integerwert"
+msgid "program used for the \":grep\" command"
+msgstr "zu verwendendes Programm für \":grep\" Befehl"
 
-msgid "number must be greater than zero"
-msgstr "Nummer muss größer als 0 sein"
+msgid "list of formats for output of 'grepprg'"
+msgstr "Liste an Formaten für die Ausgabe von 'grepprg'"
 
-msgid "number must be greater or equal to zero"
-msgstr "Nummer muss größer gleich 0 sein"
+msgid "encoding of the \":make\" and \":grep\" output"
+msgstr "Kodierung von \":make\" und \":grep\" Ausgabe"
 
-msgid "can't delete OutputObject attributes"
-msgstr "OutputObject-Attribute können nicht gelöscht werden"
+msgid "function to display text in the quickfix window"
+msgstr "Funktion um Text im Quickfix Fenster anzuzeigen"
 
-#, c-format
-msgid "invalid attribute: %s"
-msgstr "unzulässiges Attribut: %s"
+msgid "system specific"
+msgstr "System spezifisch"
 
-msgid "E264: Python: Error initialising I/O objects"
-msgstr "E264: Python: Fehler bei der Initialisierung von I/O Objekten"
+msgid "use forward slashes in file names; for Unix-like shells"
+msgstr "nutze (vorwärts) Schrägstriche in Dateinamen; für Unix-artige Shells"
 
-msgid "failed to change directory"
-msgstr "Verzeichniswechsel fehlgeschlagen"
+msgid "specifies slash/backslash used for completion"
+msgstr "spezifiziert Slash/Backslash für Vervollständigung"
 
-#, c-format
-msgid "expected 3-tuple as imp.find_module() result, but got %s"
-msgstr ""
-"erwartete 3 Tuple als Ergebnis von imp.find_module(), erhielt jedoch %s"
+msgid "language specific"
+msgstr "Sprachspezifisch"
 
-#, c-format
-msgid "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
-msgstr ""
-"erwartete 3 Tuple als Ergebnis von find_module(), but erhielt Tuple der "
-"Größe %d"
+msgid "specifies the characters in a file name"
+msgstr "spezifiziert Zeichen in einem Dateinamen"
 
-msgid "internal error: imp.find_module returned tuple with NULL"
-msgstr "interner Fehler: imp.find_module gab Tuple mit NULL zurück"
+msgid "specifies the characters in an identifier"
+msgstr "spezifiziert Zeichen in einer Kennung (identifier)"
 
-msgid "cannot delete vim.Dictionary attributes"
-msgstr "kann vim.Dictionary Attribute nicht löschen"
+msgid "specifies the characters in a keyword"
+msgstr "spezifiziert Zeichen in einem Keyword"
 
-msgid "cannot modify fixed dictionary"
-msgstr "Kann festes Dictionary nicht ändern"
+msgid "specifies printable characters"
+msgstr "spezifiziert druckbare Zeichen"
 
-#, c-format
-msgid "cannot set attribute %s"
-msgstr "Kann nicht Attribut %s setzen"
+msgid "specifies escape characters in a string"
+msgstr "spezifiziert Escape-Zeichen einer Zeichenkette"
 
-msgid "hashtab changed during iteration"
-msgstr "Hashtab veränderte sich während der Initialisierung"
+msgid "display the buffer right-to-left"
+msgstr "den Inhalt eines Buffers von rechts nach links anzeigen"
 
-#, c-format
-msgid "expected sequence element of size 2, but got sequence of size %d"
-msgstr ""
-"erwartete Sequenz Element der Größe 2, erhielt jedoch Sequenz der Größe %d"
+msgid "when to edit the command-line right-to-left"
+msgstr "wann die Kommandozeile von rechts nach links zu bearbeiten ist"
 
-msgid "list constructor does not accept keyword arguments"
-msgstr "Listen Konstruktor akzeptiert keine Keyword Argumente"
+msgid "insert characters backwards"
+msgstr "Zeichen rückwärts einfügen"
 
-msgid "list index out of range"
-msgstr "Listen Index außerhalb des gültigen Bereichs"
+msgid "allow CTRL-_ in Insert and Command-line mode to toggle 'revins'"
+msgstr "erlaubt CTRL-_ im Einfüge- und Kommandozeilen-Modus"
 
-#, c-format
-msgid "internal error: failed to get Vim list item %d"
-msgstr "interner Fehler: Zugriff auf Vim Listobjekt %d fehlgeschlagen"
+msgid "the ASCII code for the first letter of the Hebrew alphabet"
+msgstr "der ASCII Code für den ersten Buchstaben des hebräischen Alphabets"
 
-msgid "slice step cannot be zero"
-msgstr "Slice Schritt kann nicht Null sein"
+msgid "use Hebrew keyboard mapping"
+msgstr "hebräische Tastaturbelegung nutzen"
 
-#, c-format
-msgid "attempt to assign sequence of size greater than %d to extended slice"
-msgstr ""
-"Versuch der Zuweisung von Sequenzgröße größer als %d zu erweiterten Slice"
+msgid "use phonetic Hebrew keyboard mapping"
+msgstr "phonetische hebräische Tastaturbelegung nutzen"
 
-#, c-format
-msgid "internal error: no Vim list item %d"
-msgstr "interner Fehler: Kein Vim Listobjekt %d"
+msgid "prepare for editing Arabic text"
+msgstr "beginne Bearbeitung von arabischen Text"
 
-msgid "internal error: not enough list items"
-msgstr "interner Fehler: nicht genügend Listobjekte"
+msgid "perform shaping of Arabic characters"
+msgstr "Formen arabischer Zeichen durchführen"
 
-msgid "internal error: failed to add item to list"
-msgstr "interner Fehler: konnte Objekt nicht Liste hinzufügen"
+msgid "terminal will perform bidi handling"
+msgstr "Terminal führt Bidi-Handhabung durch"
 
-#, c-format
-msgid "attempt to assign sequence of size %d to extended slice of size %d"
-msgstr ""
-"Versuch der Zuweisung von Sequenzgröße %d zu erweiterten Slice der Größe %d"
+msgid "name of a keyboard mapping"
+msgstr "Name einer Tastatusbelegung"
 
-msgid "failed to add item to list"
-msgstr "Hinzufügen von Objekt zu Liste fehlgeschlagen"
+msgid "list of characters that are translated in Normal mode"
+msgstr "Liste von Zeichen, die im Normal-Modus übersetzt werden"
 
-msgid "cannot delete vim.List attributes"
-msgstr "kann vim.List Attribute nicht löschen"
+msgid "apply 'langmap' to mapped characters"
+msgstr "'langmap' auf gemappted Zeichen anwenden"
 
-msgid "cannot modify fixed list"
-msgstr "kann feste Liste nicht modifizieren"
+msgid "when set never use IM; overrules following IM options"
+msgstr "wenn gesetzt, nutzt kein IM, überstimmt folgende IM Optionen"
 
-#, c-format
-msgid "unnamed function %s does not exist"
-msgstr "Unbenannte Funktion %s existiert nicht"
+msgid "in Insert mode: 1: use :lmap; 2: use IM; 0: neither"
+msgstr "im Einfüge-Modus: 1: nutzt :lmap; 2: nutzt IM; 0: keine"
 
-#, c-format
-msgid "function %s does not exist"
-msgstr "Funktion %s existiert nicht"
+msgid "input method style, 0: on-the-spot, 1: over-the-spot"
+msgstr "Eingabemethode: 0: On-the-spot, 1: Over-the-spot"
 
-#, c-format
-msgid "failed to run function %s"
-msgstr "Fehler beim Ausführen der Funktion %s"
+msgid "entering a search pattern: 1: use :lmap; 2: use IM; 0: neither"
+msgstr "Eingabe eines Suchmusters: 1: nutzt :lmap; 2: nutzt IM; 0: keine"
 
-msgid "unable to get option value"
-msgstr "konnte Optionswert nicht erhalten"
+msgid "when set always use IM when starting to edit a command line"
+msgstr "wenn gesetzt, nutzt immer IM beim Bearbeiten der Kommandozeile"
 
-msgid "internal error: unknown option type"
-msgstr "interner Fehler: unbekannter Optionstyp"
+msgid "function to obtain IME status"
+msgstr "Funktion um den IME Status zu erhalten"
 
-msgid "problem while switching windows"
-msgstr "Problem beim Wechseln der Fenster"
+msgid "function to enable/disable IME"
+msgstr "Funktion um IME zu aktivieren/deaktivieren"
 
-#, c-format
-msgid "unable to unset global option %s"
-msgstr "Konnte globale Option %s nicht aufheben"
+msgid "multi-byte characters"
+msgstr "Multi-Byte Zeichen"
 
-#, c-format
-msgid "unable to unset option %s which does not have global value"
-msgstr "konnte Option %s nicht aufheben, da sie keinen globalen Wert hat"
+msgid ""
+"character encoding used in Vim: \"latin1\", \"utf-8\",\n"
+"\"euc-jp\", \"big5\", etc."
+msgstr ""
+"in Vim genutzte Zeichenkodierung: \"latin1\", \"utf-8\",\n"
+"\"euc-jp\", \"big5\", etc."
 
-msgid "attempt to refer to deleted tab page"
-msgstr "Versuch, Bezug auf einen gelöschten Reiter zu nehmen"
+msgid "character encoding for the current file"
+msgstr "Zeichenkodierung der aktuellen Datei"
 
-msgid "no such tab page"
-msgstr "kein solcher Reiter vorhanden"
+msgid "automatically detected character encodings"
+msgstr "automatisch erkannte Zeichenkodierung"
 
-msgid "attempt to refer to deleted window"
-msgstr "Versuch, Bezug auf eine gelöschtes Fenster zu nehmen"
+msgid "character encoding used by the terminal"
+msgstr "Zeichenkodierung des Terminals"
 
-msgid "readonly attribute: buffer"
-msgstr "nur-Lesen Attribut: Puffer"
+msgid "expression used for character encoding conversion"
+msgstr "zur Zeichenkonvertierung zu nutzender Ausdruck"
 
-msgid "cursor position outside buffer"
-msgstr "Cursor Position außerhalb des Puffers"
+msgid "delete combining (composing) characters on their own"
+msgstr "kombinierende (composing) Zeichen einzeln löschen"
 
-msgid "no such window"
-msgstr "ungültiges Fenster"
+msgid "maximum number of combining (composing) characters displayed"
+msgstr "maximale Anzahl an anzuzeigenden kombinierenden (composing) Zeichen"
 
-msgid "attempt to refer to deleted buffer"
-msgstr "Versuch, Bezug auf einen gelöschten Puffer zu nehmen"
+msgid "key that activates the X input method"
+msgstr "Taste, die die X-Eingabemethode aktiviert"
 
-msgid "failed to rename buffer"
-msgstr "Umbenennen des Puffers fehlgeschlagen"
+msgid "width of ambiguous width characters"
+msgstr "Breite von ambiguous-width Zeichen"
 
-msgid "mark name must be a single character"
-msgstr "Markierung muss ein einzelner Buchstabe sein"
+msgid "emoji characters are full width"
+msgstr "Emoji Zeichen haben volle Breite"
 
-#, c-format
-msgid "expected vim.Buffer object, but got %s"
-msgstr "erwartete vim.Puffer Objekt, erhielt jedoch %s"
+msgid "various"
+msgstr "Verschiedenes"
 
-#, c-format
-msgid "failed to switch to buffer %d"
-msgstr "Wechsel zu Puffer %d fehlgeschlagen"
+msgid ""
+"when to use virtual editing: \"block\", \"insert\", \"all\"\n"
+"and/or \"onemore\""
+msgstr ""
+"Wann virtuelles Bearbeiteni genutzt wird: \"block\", \"insert\", \"all\"\n"
+"und/oder \"onemore\""
 
-#, c-format
-msgid "expected vim.Window object, but got %s"
-msgstr "erwartete vim.Window Objekt, erhielt jedoch %s"
+msgid "list of autocommand events which are to be ignored"
+msgstr "Liste von zu ignorierenden Autokommando Ereignisse"
 
-msgid "failed to find window in the current tab page"
-msgstr "konnte Fenster im aktuellen Reiter nicht finden"
+msgid "load plugin scripts when starting up"
+msgstr "Lade Plugins beim Start"
 
-msgid "did not switch to the specified window"
-msgstr "konnte nicht zu spezifizierten Fenster wechseln"
+msgid "enable reading .vimrc/.exrc/.gvimrc in the current directory"
+msgstr "erlaube das Lesen von .vimrc/.exrc/.gvimrc im aktuellen Verzeichnis"
 
-#, c-format
-msgid "expected vim.TabPage object, but got %s"
-msgstr "erwartete vim.TabPage Objekt, erhielt jedoch %s"
+msgid "safer working with script files in the current directory"
+msgstr "sicheres Arbeiten von Script Dateien im aktuellen Verzeichnis"
 
-msgid "did not switch to the specified tab page"
-msgstr "konnte nicht zu spezifiziertem Reiter wechseln"
+msgid "use the 'g' flag for \":substitute\""
+msgstr "nutze das 'g' Flag für \":substitute\""
 
-msgid "failed to run the code"
-msgstr "Ausführen des Codes fehlgeschlagen."
+msgid "'g' and 'c' flags of \":substitute\" toggle"
+msgstr "'g' und 'c' Flags für \":substitute\" umschalten"
 
-msgid "E858: Eval did not return a valid python object"
-msgstr "E858: Eval hat kein gültiges Pythonobjekt zurückgegeben"
+msgid "allow reading/writing devices"
+msgstr "erlaube Lesen/Schreiben von Geräten"
 
-msgid "E859: Failed to convert returned python object to a Vim value"
-msgstr ""
-"E859: Konvertierung von zurückgegebenen Pythonobjekt zu Vim Wert "
-"fehlgeschlagen"
+msgid "maximum depth of function calls"
+msgstr "maximale Tiefe von Funktionsaufrufen"
 
-#, c-format
-msgid "unable to convert %s to a Vim dictionary"
-msgstr "konnte nicht %s zu Vim Dictionary konvertieren"
+msgid "list of words that specifies what to put in a session file"
+msgstr "Liste von Wörtern, die konfigurieren, was in einer Session Datei gespeichert wird"
 
-#, c-format
-msgid "unable to convert %s to a Vim list"
-msgstr "konnte %s nicht zu Vim Liste konvertieren"
+msgid "list of words that specifies what to save for :mkview"
+msgstr "Liste von Wörtern, die konfigurieren, was in einer Datei für :mkview gespeichert wird"
 
-#, c-format
-msgid "unable to convert %s to a Vim structure"
-msgstr "konnte %s nicht zu Vim Struktur konvertieren"
+msgid "directory where to store files with :mkview"
+msgstr "Verzeichnis in dem Dateien für :mkview gespeichert werden"
 
-msgid "internal error: NULL reference passed"
-msgstr "interner Fehler: NULL Referenz übermittelt"
+msgid "list that specifies what to write in the viminfo file"
+msgstr "Liste die definiert, was in der Viminfo Datei gespeichert wird"
 
-msgid "internal error: invalid value type"
-msgstr "interner Fehler: ungültiger Werttyp"
+msgid "file name used for the viminfo file"
+msgstr "Dateiname für die Viminfo Datei"
 
-msgid ""
-"Failed to set path hook: sys.path_hooks is not a list\n"
-"You should now do the following:\n"
-"- append vim.path_hook to sys.path_hooks\n"
-"- append vim.VIM_SPECIAL_PATH to sys.path\n"
-msgstr ""
-"Fehler beim setzen des Path hooks: sys.path_hooks ist keine Liste\n"
-"Sie sollten jetzt eine der folgenden Alternativen tun:\n"
-"- vim.path_hook zu sys.path_hooks hinzufügen\n"
-"- vim.VIM_SPECIAL_PATH zu sys.path hinzufügen\n"
+msgid "what happens with a buffer when it's no longer in a window"
+msgstr "was passiert, wenn ein Buffer nicht länger in einem Fenster angezeigt wird"
 
-msgid ""
-"Failed to set path: sys.path is not a list\n"
-"You should now append vim.VIM_SPECIAL_PATH to sys.path"
-msgstr ""
-"Fehler beim setzen des Pfades: sys.path ist keine Liste\n"
-"Fügen Sie vim.VIM_SPECIAL_PATH zu sys.path hinzu"
+msgid "empty, \"nofile\", \"nowrite\", \"quickfix\", etc.: type of buffer"
+msgstr "leer, \"nofile\", \"nowrite\", \"quickfix\", etc: Buffertyp"
 
-msgid ""
-"Vim macro files (*.vim)\t*.vim\n"
-"All Files (*.*)\t*.*\n"
-msgstr ""
-"Vim Dateien (*.vim)\t*.vim\n"
-"Alle Dateien (*.*)\t*.*\n"
+msgid "whether the buffer shows up in the buffer list"
+msgstr "ob der Buffer in der Bufferliste angezeigt wird"
 
-msgid "All Files (*.*)\t*.*\n"
-msgstr "Alle Dateien (*.*)\t*.*\n"
+msgid "set to \"msg\" to see all error messages"
+msgstr "setze auf \"msg\" um alle Fehlermeldungen zu sehen"
 
-msgid ""
-"All Files (*.*)\t*.*\n"
-"C source (*.c, *.h)\t*.c;*.h\n"
-"C++ source (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
-"VB code (*.bas, *.frm)\t*.bas;*.frm\n"
-"Vim files (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
-msgstr ""
-"Alle Dateien (*.*)\t*.*\n"
-"C Quellcode (*.c, *.h)\t*.c;*.h\n"
-"C++ Quellcode (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
-"VB Quellcode (*.bas, *.frm)\t*.bas;*.frm\n"
-"Vim Dateien (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+msgid "whether to show the signcolumn"
+msgstr "ob die Zeichenspalte (signcolumn) angezeigt wird"
 
-msgid ""
-"Vim macro files (*.vim)\t*.vim\n"
-"All Files (*)\t*\n"
-msgstr ""
-"Vim Dateien (*.vim)\t*.vim\n"
-"Alle Dateien (*)\t*\n"
+msgid "interval in milliseconds between polls for MzScheme threads"
+msgstr "Intervall in Millisekunden zwischen Abrufen der MzScheme Threads"
 
-msgid "All Files (*)\t*\n"
-msgstr "Alle Dateien (*)\t*\n"
+msgid "name of the Lua dynamic library"
+msgstr "Name der dynamischen Lua Bibliothek"
 
-msgid ""
-"All Files (*)\t*\n"
-"C source (*.c, *.h)\t*.c;*.h\n"
-"C++ source (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
-"Vim files (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
-msgstr ""
-"Alle Dateien (*)\t*\n"
-"C Quellcode (*.c, *.h)\t*.c;*.h\n"
-"C++ Quellcode (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
-"Vim Dateien (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+msgid "name of the Perl dynamic library"
+msgstr "Name der dynamischen Perl Bibliothek"
 
-msgid "GVim"
-msgstr "GVim"
+msgid "whether to use Python 2 or 3"
+msgstr "ob Python 2 oder 3 verwendet wird"
 
-msgid "Text Editor"
-msgstr "Texteditor"
+msgid "name of the Python 2 dynamic library"
+msgstr "Name der dynamischen Python 2 Bibliothek"
 
-msgid "Edit text files"
-msgstr "Textdateien bearbeiten"
+msgid "name of the Python 2 home directory"
+msgstr "Name des Python 2 Home-Verzeichnis"
 
-msgid "Text;editor;"
-msgstr "Text;Editor;"
+msgid "name of the Python 3 dynamic library"
+msgstr "Name der dynamischen Python 3 Bibliothek"
 
-msgid "gvim"
-msgstr "gvim"
+msgid "name of the Python 3 home directory"
+msgstr "Name des Python 3 Home-Verzeichnis"
 
-msgid "Vim"
-msgstr "Vim"
+msgid "name of the Ruby dynamic library"
+msgstr "Name der dynamischen Ruby Bibliothek"
+
+msgid "name of the Tcl dynamic library"
+msgstr "Name der dynamischen Tcl Bibliothek"
 
+msgid "name of the MzScheme dynamic library"
+msgstr "Name der dynamischen MzScheme Bibliothek"
 
+msgid "name of the MzScheme GC dynamic library"
+msgstr "Name der dynamischen MzScheme GC Bibliothek"
diff -Nru vim-8.2.1913/src/po/fr.po vim-8.2.2434/src/po/fr.po
--- vim-8.2.1913/src/po/fr.po	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/po/fr.po	2021-01-30 22:05:11.000000000 +0000
@@ -6,14 +6,14 @@
 #  FIRST AUTHOR  DindinX         <David.Odin@bigfoot.com>    2000.
 # SECOND AUTHOR  Adrien Beau     <version.francaise@free.fr> 2002, 2003.
 #  THIRD AUTHOR  David Blanchet  <david.blanchet@free.fr>    2006, 2008.
-# FOURTH AUTHOR  Dominique Pellé <dominique.pelle@gmail.com> 2008, 2019.
+# FOURTH AUTHOR  Dominique Pellé <dominique.pelle@gmail.com> 2008, 2020.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Vim 8.1\n"
+"Project-Id-Version: Vim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-07 11:35+0100\n"
-"PO-Revision-Date: 2019-12-07 12:32+0100\n"
+"POT-Creation-Date: 2020-12-25 13:48+0100\n"
+"PO-Revision-Date: 2020-12-29 10:49+0100\n"
 "Last-Translator: Dominique Pellé <dominique.pelle@gmail.com>\n"
 "Language-Team: French\n"
 "Language: fr\n"
@@ -31,6 +31,9 @@
 msgid "E165: Cannot go beyond last file"
 msgstr "E165: Impossible d'aller au-delà du dernier fichier"
 
+msgid "E610: No argument to delete"
+msgstr "E610: Aucun argument à supprimer"
+
 msgid "E249: window layout changed unexpectedly"
 msgstr "E249: l'arrangement de fenêtre a été changé inopinément"
 
@@ -232,9 +235,6 @@
 msgid "[Not edited]"
 msgstr "[Non édité]"
 
-msgid "[New file]"
-msgstr "[Nouveau fichier]"
-
 msgid "[Read errors]"
 msgstr "[Erreurs de lecture]"
 
@@ -305,6 +305,12 @@
 msgid "Do you really want to write to it"
 msgstr "Voulez-vous vraiment écrire dedans"
 
+msgid "[New]"
+msgstr "[Nouveau]"
+
+msgid "[New File]"
+msgstr "[Nouveau fichier]"
+
 msgid "E676: No matching autocommands for acwrite buffer"
 msgstr "E676: Pas d'autocommande correspondante pour le tampon acwrite"
 
@@ -401,12 +407,6 @@
 msgid "[Device]"
 msgstr "[Périph.]"
 
-msgid "[New]"
-msgstr "[Nouveau]"
-
-msgid "[New File]"
-msgstr "[Nouveau fichier]"
-
 msgid " [a]"
 msgstr " [a]"
 
@@ -447,12 +447,16 @@
 msgid "E902: Cannot connect to port"
 msgstr "E902: Impossible de se connecter au port"
 
+msgid "E898: socket() in channel_connect()"
+msgstr "E898: socket() dans channel_connect()"
+
+#, c-format
+msgid "E901: getaddrinfo() in channel_open(): %s"
+msgstr "E901: getaddrinfo() dans channel_open(): %s"
+
 msgid "E901: gethostbyname() in channel_open()"
 msgstr "E901: gethostbyname() dans channel_open()"
 
-msgid "E898: socket() in channel_open()"
-msgstr "E898: socket() dans channel_open()"
-
 msgid "E903: received command with non-string argument"
 msgstr "E903: commande reçue avec un argument qui n'est pas une chaîne"
 
@@ -486,18 +490,49 @@
 "E912: Impossible d'utiliser ch_evalexpr()/ch_sendexpr() avec un canal brut "
 "ou nl"
 
-msgid "E920: _io file requires _name to be set"
-msgstr "E920: fichier _io nécessite _name"
+msgid "No display"
+msgstr "Aucun display"
 
-msgid "E915: in_io buffer requires in_buf or in_name to be set"
-msgstr "E915: tampon in_io nécessite in_buf ou in_name "
+msgid ": Send failed.\n"
+msgstr " : L'envoi a échoué.\n"
+
+msgid ": Send failed. Trying to execute locally\n"
+msgstr " : L'envoi a échoué. Tentative d'exécution locale\n"
 
 #, c-format
-msgid "E918: buffer must be loaded: %s"
-msgstr "E918: le tampon doit être chargé : %s"
+msgid "%d of %d edited"
+msgstr "%d édités sur %d"
 
-msgid "E916: not a valid job"
-msgstr "E916: tâche invalide"
+msgid "No display: Send expression failed.\n"
+msgstr "Aucun display : L'envoi de l'expression a échoué.\n"
+
+msgid ": Send expression failed.\n"
+msgstr " : L'envoi de l'expression a échoué.\n"
+
+msgid "E240: No connection to the X server"
+msgstr "E240: Pas de connexion au serveur X"
+
+# AB - La version française est meilleure que la version anglaise.
+#, c-format
+msgid "E241: Unable to send to %s"
+msgstr "E241: L'envoi au serveur %s a échoué"
+
+msgid "E277: Unable to read a server reply"
+msgstr "E277: Impossible de lire la réponse du serveur"
+
+msgid "E941: already started a server"
+msgstr "E941: serveur déjà démarré"
+
+msgid "E942: +clientserver feature not available"
+msgstr "E942: La fonctionnalité +clientserver n'est pas disponible"
+
+# AB - La version française est meilleure que la version anglaise.
+msgid "E258: Unable to send to client"
+msgstr "E258: La réponse n'a pas pu être envoyée au client"
+
+# DB - Message de débogage.
+msgid "Used CUT_BUFFER0 instead of empty selection"
+msgstr "CUT_BUFFER0 utilisé plutôt qu'une sélection vide"
 
 # DB - TODO : Pas compris le message ni comment le déclencher malgré une visite
 #      dans le code.
@@ -579,22 +614,6 @@
 msgid "%3d  expr %s"
 msgstr "%3d  expr %s"
 
-#, c-format
-msgid "E720: Missing colon in Dictionary: %s"
-msgstr "E720: Il manque ':' dans le Dictionnaire %s"
-
-#, c-format
-msgid "E721: Duplicate key in Dictionary: \"%s\""
-msgstr "E721: Clé dupliquée dans le Dictionnaire : %s"
-
-#, c-format
-msgid "E722: Missing comma in Dictionary: %s"
-msgstr "E722: Il manque une virgule dans le Dictionnaire : %s"
-
-#, c-format
-msgid "E723: Missing end of Dictionary '}': %s"
-msgstr "E723: Il manque '}' à la fin du Dictionnaire : %s"
-
 msgid "extend() argument"
 msgstr "argument de extend()"
 
@@ -748,18 +767,6 @@
 msgid "E791: Empty keymap entry"
 msgstr "E791: Entrée du descripteur de clavier (keymap) vide"
 
-msgid "E111: Missing ']'"
-msgstr "E111: ']' manquant"
-
-msgid "E719: Cannot use [:] with a Dictionary"
-msgstr "E719: Utilisation de [:] impossible avec un Dictionnaire"
-
-msgid "E806: using Float as a String"
-msgstr "E806: Utilisation d'un Flottant comme une Chaîne"
-
-msgid "E274: No white space allowed before parenthesis"
-msgstr "E274: espace interdite avant une parenthèse"
-
 msgid "E689: Can only index a List, Dictionary or Blob"
 msgstr "E689: Seul une Liste, un Dictionnaire ou un Blob peut être indexé"
 
@@ -775,64 +782,15 @@
 msgid "E996: Cannot lock a range"
 msgstr "E996: Impossible de verrouiller une plage"
 
-msgid "E710: List value has more items than target"
-msgstr "E710: La Liste a plus d'éléments que la destination"
-
-msgid "E711: List value has not enough items"
-msgstr "E711: La Liste n'a pas assez d'éléments"
-
 msgid "E996: Cannot lock a list or dict"
 msgstr "E996: Impossible de verrouiller une liste ou un dictionnaire"
 
-msgid "E690: Missing \"in\" after :for"
-msgstr "E690: \"in\" manquant après :for"
-
-# AB - Je suis partagé entre la concision d'une traduction assez littérale et
-#      la lourdeur d'une traduction plus correcte.
-msgid "E109: Missing ':' after '?'"
-msgstr "E109: Il manque ':' après '?'"
-
-msgid "E804: Cannot use '%' with Float"
-msgstr "E804: Impossible d'utiliser '%' avec un Flottant"
-
-msgid "E973: Blob literal should have an even number of hex characters"
-msgstr ""
-"E973: Un littéral de Blob doit avoir un nombre pair de caractères "
-"hexadécimaux"
-
-msgid "E110: Missing ')'"
-msgstr "E110: ')' manquant"
-
 msgid "E260: Missing name after ->"
 msgstr "E260: Nom manquant après ->"
 
 msgid "E695: Cannot index a Funcref"
 msgstr "E695: Impossible d'indexer une Funcref"
 
-msgid "E909: Cannot index a special variable"
-msgstr "E909: Impossible d'indexer une variable spéciale"
-
-# AB - La version française est meilleure que la version anglaise.
-#, c-format
-msgid "E112: Option name missing: %s"
-msgstr "E112: Il manque un nom d'option après %s"
-
-#, c-format
-msgid "E113: Unknown option: %s"
-msgstr "E113: Option inconnue : %s"
-
-# AB - La version française est meilleure que la version anglaise, qui est
-#      erronée, d'ailleurs : il s'agit d'une "double quote" et non d'une
-#      "quote".
-#, c-format
-msgid "E114: Missing quote: %s"
-msgstr "E114: Il manque \" à la fin de %s"
-
-# AB - La version française est meilleure que la version anglaise.
-#, c-format
-msgid "E115: Missing quote: %s"
-msgstr "E115: Il manque ' à la fin de %s"
-
 msgid "Not enough memory to set references, garbage collection aborted!"
 msgstr ""
 "Pas assez de mémoire pour les références, arrêt du ramassage de miètes !"
@@ -840,66 +798,6 @@
 msgid "E724: variable nested too deep for displaying"
 msgstr "E724: variable trop imbriquée pour être affichée"
 
-msgid "E805: Using a Float as a Number"
-msgstr "E805: Utilisation d'un Flottant comme un Nombre"
-
-msgid "E703: Using a Funcref as a Number"
-msgstr "E703: Utilisation d'une Funcref comme un Nombre"
-
-msgid "E745: Using a List as a Number"
-msgstr "E745: Utilisation d'une Liste comme un Nombre"
-
-msgid "E728: Using a Dictionary as a Number"
-msgstr "E728: Utilisation d'un Dictionnaire comme un Nombre"
-
-msgid "E910: Using a Job as a Number"
-msgstr "E910: Utilisation d'une Tâche comme un Nombre"
-
-msgid "E913: Using a Channel as a Number"
-msgstr "E913: Utilisation d'un Canal comme un Nombre"
-
-msgid "E974: Using a Blob as a Number"
-msgstr "E974: Utilisation d'un Blob comme un Nombre"
-
-msgid "E891: Using a Funcref as a Float"
-msgstr "E891: Utilisation d'une Funcref comme un Flottant"
-
-msgid "E892: Using a String as a Float"
-msgstr "E892: Utilisation d'une Chaîne comme un Flottant"
-
-msgid "E893: Using a List as a Float"
-msgstr "E893: Utilisation d'une Liste comme un Flottant"
-
-msgid "E894: Using a Dictionary as a Float"
-msgstr "E894: Utilisation d'un Dictionnaire comme un Flottant"
-
-msgid "E907: Using a special value as a Float"
-msgstr "E907: Utilisation d'une valeur spéciale comme un Flottant"
-
-msgid "E911: Using a Job as a Float"
-msgstr "E911: Utilisation d'une Tâche comme un Flottant"
-
-msgid "E914: Using a Channel as a Float"
-msgstr "E914: Utilisation d'un Canal comme un Flottant"
-
-msgid "E975: Using a Blob as a Float"
-msgstr "E975: Utilisation d'un Blob comme un Flottant"
-
-msgid "E729: using Funcref as a String"
-msgstr "E729: Utilisation d'une Funcref comme une Chaîne"
-
-msgid "E730: using List as a String"
-msgstr "E730: Utilisation d'une Liste comme une Chaîne"
-
-msgid "E731: using Dictionary as a String"
-msgstr "E731: Utilisation d'un Dictionnaire comme une Chaîne"
-
-msgid "E976: using Blob as a String"
-msgstr "E976: Utilisation d'un Blob comme une Chaîne"
-
-msgid "E908: using an invalid value as a String"
-msgstr "E908: Utilisation d'une valeur invalide comme une Chaîne"
-
 msgid "E698: variable nested too deep for making a copy"
 msgstr "E698: variable trop imbriquée pour en faire une copie"
 
@@ -911,27 +809,6 @@
 "\n"
 "\tModifié la dernière fois dans "
 
-msgid " line "
-msgstr " ligne "
-
-msgid "E977: Can only compare Blob with Blob"
-msgstr "E977: Un Blob ne peut être comparé qu'avec un Blob"
-
-msgid "E691: Can only compare List with List"
-msgstr "E691: Une Liste ne peut être comparée qu'avec une Liste"
-
-msgid "E692: Invalid operation for List"
-msgstr "E692: Opération invalide avec les Liste"
-
-msgid "E735: Can only compare Dictionary with Dictionary"
-msgstr "E735: Un Dictionnaire ne peut être comparé qu'avec un Dictionnaire"
-
-msgid "E736: Invalid operation for Dictionary"
-msgstr "E736: Opération invalide avec les Dictionnaires"
-
-msgid "E694: Invalid operation for Funcrefs"
-msgstr "E694: Opération invalide avec les Funcrefs"
-
 msgid "E808: Number or Float required"
 msgstr "E808: Nombre ou Flottant requis"
 
@@ -984,41 +861,14 @@
 msgid "E727: Start past end"
 msgstr "E727: Début au-delà de la fin"
 
-msgid "E240: No connection to the X server"
-msgstr "E240: Pas de connexion au serveur X"
-
-# AB - La version française est meilleure que la version anglaise.
-#, c-format
-msgid "E241: Unable to send to %s"
-msgstr "E241: L'envoi au serveur %s a échoué"
-
-msgid "E277: Unable to read a server reply"
-msgstr "E277: Impossible de lire la réponse du serveur"
-
-msgid "E941: already started a server"
-msgstr "E941: serveur déjà démarré"
-
-msgid "E942: +clientserver feature not available"
-msgstr "E942: La fonctionnalité +clientserver n'est pas disponible"
-
-# AB - La version française est meilleure que la version anglaise.
-msgid "E258: Unable to send to client"
-msgstr "E258: La réponse n'a pas pu être envoyée au client"
-
 #, c-format
 msgid "E962: Invalid action: '%s'"
 msgstr "E962: Action invalide : « %s »"
 
-msgid "(Invalid)"
-msgstr "(Invalide)"
-
 #, c-format
 msgid "E935: invalid submatch number: %d"
 msgstr "E935: numéro de submatch invalide : %d"
 
-msgid "E18: Unexpected characters in :let"
-msgstr "E18: Caractères inattendus avant '='"
-
 msgid "E991: cannot use =<< here"
 msgstr "E991: Impossible d'utiliser =<< ici"
 
@@ -1032,8 +882,8 @@
 msgid "E990: Missing end marker '%s'"
 msgstr "E990: Marqueur de fin manquant « %s »"
 
-msgid "E985: .= is not supported with script version 2"
-msgstr "E985: .= non supporté avec la version de script 2"
+msgid "E985: .= is not supported with script version >= 2"
+msgstr "E985: .= non supporté avec la version de script >= 2"
 
 # DB - todo : trouver mieux que "destinations".
 msgid "E687: Less targets than List items"
@@ -1043,8 +893,8 @@
 msgid "E688: More targets than List items"
 msgstr "E688: Plus de destinations que d'éléments dans la Liste"
 
-msgid "Double ; in list of variables"
-msgstr "Double ; dans une liste de variables"
+msgid "E452: Double ; in list of variables"
+msgstr "E452: Double ; dans une liste de variables"
 
 #, c-format
 msgid "E738: Can't list variables for %s"
@@ -1053,9 +903,6 @@
 msgid "E996: Cannot lock an environment variable"
 msgstr "E996: Impossible de verrouiller une variable d'environnement"
 
-msgid "E996: Cannot lock an option"
-msgstr "E996: Impossible de verrouiller une option"
-
 msgid "E996: Cannot lock a register"
 msgstr "E996: Impossible de verrouiller un registre"
 
@@ -1063,10 +910,6 @@
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: Variable inexistante : %s"
 
-#, c-format
-msgid "E940: Cannot lock or unlock variable %s"
-msgstr "E940: Impossible de (dé)verrouiller la variable %s"
-
 msgid "E743: variable nested too deep for (un)lock"
 msgstr "E743: variable trop imbriquée pour la (dé)verrouiller"
 
@@ -1290,51 +1133,6 @@
 msgid "Pattern not found: %s"
 msgstr "Motif introuvable : %s"
 
-# This message should *so* be E42!
-msgid "E478: Don't panic!"
-msgstr "E478: Pas de panique !"
-
-#, c-format
-msgid "E661: Sorry, no '%s' help for %s"
-msgstr "E661: Désolé, aucune aide en langue '%s' pour %s"
-
-#, c-format
-msgid "E149: Sorry, no help for %s"
-msgstr "E149: Désolé, aucune aide pour %s"
-
-#, c-format
-msgid "Sorry, help file \"%s\" not found"
-msgstr "Désolé, le fichier d'aide \"%s\" est introuvable"
-
-#, c-format
-msgid "E151: No match: %s"
-msgstr "E151: Aucune correspondance : %s"
-
-#, c-format
-msgid "E152: Cannot open %s for writing"
-msgstr "E152: Impossible d'ouvrir %s en écriture"
-
-#, c-format
-msgid "E153: Unable to open %s for reading"
-msgstr "E153: Impossible d'ouvrir %s en lecture"
-
-#, c-format
-msgid "E670: Mix of help file encodings within a language: %s"
-msgstr "E670: Encodages différents dans les fichiers d'aide en langue %s"
-
-# AB - L'étiquette la plus longue fait 27 caractères. Le nom de fichier le plus
-#      long fait 12 caractères. Il faudrait donc idéalement faire une
-#      traduction de 40 caractères ou moins. Ce qui est loin d'être le cas
-#      présent.
-# DB - Suggestion.
-#, c-format
-msgid "E154: Duplicate tag \"%s\" in file %s/%s"
-msgstr "E154: Marqueur \"%s\" dupliqué dans le fichier %s/%s"
-
-#, c-format
-msgid "E150: Not a directory: %s"
-msgstr "E150: %s n'est pas un répertoire"
-
 msgid "No old files"
 msgstr "Aucun vieux fichier"
 
@@ -1369,16 +1167,6 @@
 msgid "W21: Required python version 3.x not supported, ignoring file: %s"
 msgstr "W21: Python 3.x non supporté, fichier %s ignoré"
 
-# DB - Le premier %s est, au choix : "time ", "ctype " ou "messages ",
-#      sans qu'il soit possible de les traduire.
-#, c-format
-msgid "Current %slanguage: \"%s\""
-msgstr "Langue courante pour %s : \"%s\""
-
-#, c-format
-msgid "E197: Cannot set language to \"%s\""
-msgstr "E197: Impossible de choisir la langue \"%s\""
-
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
 msgstr "Mode Ex activé. Tapez \"visual\" pour passer en mode Normal."
 
@@ -1420,15 +1208,16 @@
 msgid "E494: Use w or w>>"
 msgstr "E494: Utilisez w ou w>>"
 
-msgid ""
-"INTERNAL: Cannot use EX_DFLALL with ADDR_NONE, ADDR_UNSIGNED or ADDR_QUICKFIX"
-msgstr ""
-"INTERNE: Impossible d'utiliser EX_DFLALL avec ADDR_NONE, ADDR_UNSIGNED ou ADDR_QUICKFIX"
-
 msgid "E943: Command table needs to be updated, run 'make cmdidxs'"
 msgstr ""
 "E943: La table des commandes doit être mise à jour, lancez 'make cmdidxs'"
 
+msgid ""
+"INTERNAL: Cannot use EX_DFLALL with ADDR_NONE, ADDR_UNSIGNED or ADDR_QUICKFIX"
+msgstr ""
+"INTERNE: Impossible d'utiliser EX_DFLALL avec ADDR_NONE, ADDR_UNSIGNED ou "
+"ADDR_QUICKFIX"
+
 msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: Désolé, cette commande n'est pas disponible dans cette version"
 
@@ -1616,15 +1405,6 @@
 msgid "E579: :if nesting too deep"
 msgstr "E579: Imbrication de :if trop importante"
 
-msgid "E580: :endif without :if"
-msgstr "E580: :endif sans :if"
-
-msgid "E581: :else without :if"
-msgstr "E581: :else sans :if"
-
-msgid "E582: :elseif without :if"
-msgstr "E582: :elseif sans :if"
-
 msgid "E583: multiple :else"
 msgstr "E583: Il ne peut y avoir qu'un seul :else"
 
@@ -1634,35 +1414,23 @@
 msgid "E585: :while/:for nesting too deep"
 msgstr "E585: Imbrication de :while ou :for trop importante"
 
-msgid "E586: :continue without :while or :for"
-msgstr "E586: :continue sans :while ou :for"
-
-msgid "E587: :break without :while or :for"
-msgstr "E587: :break sans :while ou :for"
-
 msgid "E732: Using :endfor with :while"
 msgstr "E732: Utilisation de :endfor avec :while"
 
 msgid "E733: Using :endwhile with :for"
 msgstr "E733: Utilisation de :endwhile avec :for"
 
+msgid "E579: block nesting too deep"
+msgstr "E579: Imbrication de bloc trop importante"
+
 msgid "E601: :try nesting too deep"
 msgstr "E601: Imbrication de :try trop importante"
 
-msgid "E603: :catch without :try"
-msgstr "E603: :catch sans :try"
-
 msgid "E604: :catch after :finally"
 msgstr "E604: :catch après :finally"
 
-msgid "E606: :finally without :try"
-msgstr "E606: :finally sans :try"
-
-msgid "E607: multiple :finally"
-msgstr "E607: Il ne peut y avoir qu'un seul :finally"
-
-msgid "E602: :endtry without :try"
-msgstr "E602: :endtry sans :try"
+msgid "E193: :enddef not inside a function"
+msgstr "E193: :enddef en dehors d'une fonction"
 
 msgid "E193: :endfunction not inside a function"
 msgstr "E193: :endfunction en dehors d'une fonction"
@@ -1776,10 +1544,10 @@
 msgstr[1] "%ld lignes, "
 
 #, c-format
-msgid "%lld character"
-msgid_plural "%lld characters"
-msgstr[0] "%lld caractère"
-msgstr[1] "%lld caractères"
+msgid "%lld byte"
+msgid_plural "%lld bytes"
+msgstr[0] "%lld octet"
+msgstr[1] "%lld octets"
 
 msgid "[noeol]"
 msgstr "[noeol]"
@@ -1867,6 +1635,9 @@
 msgid "E655: Too many symbolic links (cycle?)"
 msgstr "E655: Trop de liens symboliques (cycle ?)"
 
+msgid "writefile() first argument must be a List or a Blob"
+msgstr "le premier argument de writefile() doit être une Liste ou un Blob"
+
 # DB : Les trois messages qui suivent sont des titres de boîtes
 #      de dialogue par défaut.
 msgid "Select Directory dialog"
@@ -1881,6 +1652,9 @@
 msgid "E338: Sorry, no file browser in console mode"
 msgstr "E338: Désolé, pas de sélecteur de fichiers en mode console"
 
+msgid "no matches"
+msgstr "aucune correspondance"
+
 msgid "E854: path too long for completion"
 msgstr "E854: chemin trop long pour complètement"
 
@@ -1968,10 +1742,6 @@
 msgid "E599: Value of 'imactivatekey' is invalid"
 msgstr "E599: Valeur de 'imactivatekey' invalide"
 
-#, c-format
-msgid "E254: Cannot allocate color %s"
-msgstr "E254: Impossible d'allouer la couleur %s"
-
 msgid "No match at cursor, finding next"
 msgstr "Aucune correspondance sous le curseur, recherche de la suivante"
 
@@ -2006,15 +1776,15 @@
 msgid "E232: Cannot create BalloonEval with both message and callback"
 msgstr "E232: Impossible de créer un BalloonEval avec message ET callback"
 
-msgid "_Cancel"
-msgstr "_Annuler"
-
 msgid "_Save"
 msgstr "_Enregistrer"
 
 msgid "_Open"
 msgstr "_Ouvrir"
 
+msgid "_Cancel"
+msgstr "_Annuler"
+
 msgid "_OK"
 msgstr "_Ok"
 
@@ -2159,7 +1929,9 @@
 msgstr "E243: Argument non supporté : \"-%s\" ; Utilisez la version OLE."
 
 msgid "E988: GUI cannot be used. Cannot execute gvim.exe."
-msgstr "E988: L'interface graphique ne peut pas être utilisée. Impossible d'exécuter gvim.exe."
+msgstr ""
+"E988: L'interface graphique ne peut pas être utilisée. Impossible d'exécuter "
+"gvim.exe."
 
 msgid "E672: Unable to open window inside MDI application"
 msgstr "E672: Impossible d'ouvrir une fenêtre dans une application MDI"
@@ -2207,6 +1979,27 @@
 msgid "Font%d width: %d"
 msgstr "Largeur de Font%d : %d"
 
+msgid "E284: Cannot set IC values"
+msgstr "E284: Impossible de régler les valeurs IC"
+
+msgid "E285: Failed to create input context"
+msgstr "E285: Échec de la création du contexte de saisie"
+
+msgid "E286: Failed to open input method"
+msgstr "E286: Échec de l'ouverture de la méthode de saisie"
+
+msgid "E287: Warning: Could not set destroy callback to IM"
+msgstr ""
+"E287: Alerte : Impossible d'inscrire le callback de destruction dans la MS"
+
+msgid "E288: input method doesn't support any style"
+msgstr "E288: la méthode de saisie ne supporte aucun style"
+
+msgid "E289: input method doesn't support my preedit type"
+msgstr ""
+"E289: le type de préédition de Vim n'est pas supporté par la méthode de "
+"saisie"
+
 # DB - todo : Pas certain de mon coup, ici...
 msgid "Invalid font specification"
 msgstr "La spécification de la police est invalide"
@@ -2336,6 +2129,51 @@
 msgid "Print job sent."
 msgstr "Tâche d'impression envoyée."
 
+# This message should *so* be E42!
+msgid "E478: Don't panic!"
+msgstr "E478: Pas de panique !"
+
+#, c-format
+msgid "E661: Sorry, no '%s' help for %s"
+msgstr "E661: Désolé, aucune aide en langue '%s' pour %s"
+
+#, c-format
+msgid "E149: Sorry, no help for %s"
+msgstr "E149: Désolé, aucune aide pour %s"
+
+#, c-format
+msgid "Sorry, help file \"%s\" not found"
+msgstr "Désolé, le fichier d'aide \"%s\" est introuvable"
+
+#, c-format
+msgid "E151: No match: %s"
+msgstr "E151: Aucune correspondance : %s"
+
+#, c-format
+msgid "E152: Cannot open %s for writing"
+msgstr "E152: Impossible d'ouvrir %s en écriture"
+
+#, c-format
+msgid "E153: Unable to open %s for reading"
+msgstr "E153: Impossible d'ouvrir %s en lecture"
+
+#, c-format
+msgid "E670: Mix of help file encodings within a language: %s"
+msgstr "E670: Encodages différents dans les fichiers d'aide en langue %s"
+
+# AB - L'étiquette la plus longue fait 27 caractères. Le nom de fichier le plus
+#      long fait 12 caractères. Il faudrait donc idéalement faire une
+#      traduction de 40 caractères ou moins. Ce qui est loin d'être le cas
+#      présent.
+# DB - Suggestion.
+#, c-format
+msgid "E154: Duplicate tag \"%s\" in file %s/%s"
+msgstr "E154: Marqueur \"%s\" dupliqué dans le fichier %s/%s"
+
+#, c-format
+msgid "E150: Not a directory: %s"
+msgstr "E150: %s n'est pas un répertoire"
+
 msgid "E679: recursive loop loading syncolor.vim"
 msgstr "E679: boucle récursive lors du chargement de syncolor.vim"
 
@@ -2376,6 +2214,9 @@
 msgid "E420: BG color unknown"
 msgstr "E420: Couleur d'arrière-plan inconnue"
 
+msgid "E453: UL color unknown"
+msgstr "E453: Couleur d'UL inconnue"
+
 #, c-format
 msgid "E421: Color name or number not recognized: %s"
 msgstr "E421: Nom ou numéro de couleur non reconnu : %s"
@@ -2401,29 +2242,6 @@
 msgid "E849: Too many highlight and syntax groups"
 msgstr "E849: Trop de groupes de surbrillance et de syntaxe"
 
-#, c-format
-msgid "E799: Invalid ID: %d (must be greater than or equal to 1)"
-msgstr "E799: ID invalide : %d (doit être plus grand ou égal à 1)"
-
-#, c-format
-msgid "E801: ID already taken: %d"
-msgstr "E801: ID déjà pris : %d"
-
-msgid "E290: List or number required"
-msgstr "E290: Liste ou nombre requis"
-
-#, c-format
-msgid "E802: Invalid ID: %d (must be greater than or equal to 1)"
-msgstr "E802: ID invalide : %d (doit être plus grand ou égal à 1)"
-
-#, c-format
-msgid "E803: ID not found: %d"
-msgstr "E803: ID introuvable : %d"
-
-#, c-format
-msgid "E798: ID is reserved for \":match\": %d"
-msgstr "E798: ID est réservé pour \":match\" : %d"
-
 msgid "Add a new database"
 msgstr "Ajouter une base de données"
 
@@ -2939,6 +2757,23 @@
 msgid "match %d"
 msgstr "Correspondance %d"
 
+msgid "E920: _io file requires _name to be set"
+msgstr "E920: fichier _io nécessite _name"
+
+msgid "E915: in_io buffer requires in_buf or in_name to be set"
+msgstr "E915: tampon in_io nécessite in_buf ou in_name "
+
+#, c-format
+msgid "E918: buffer must be loaded: %s"
+msgstr "E918: le tampon doit être chargé : %s"
+
+msgid "E916: not a valid job"
+msgstr "E916: tâche invalide"
+
+#, c-format
+msgid "E491: json decode error at '%s'"
+msgstr "E491: Erreur de décodage json près de '%s'"
+
 #, c-format
 msgid "E938: Duplicate key in JSON: \"%s\""
 msgstr "E938: Clé dupliquée dans le document JSON : \"%s\""
@@ -2947,14 +2782,16 @@
 msgid "E899: Argument of %s must be a List or Blob"
 msgstr "E899: L'argument de %s doit être une Liste ou un Blob"
 
+msgid "E900: maxdepth must be non-negative number"
+msgstr "E900: maxdepth doit être un nombre positif"
+
+msgid "flatten() argument"
+msgstr "argument de flatten()"
+
 #, c-format
 msgid "E696: Missing comma in List: %s"
 msgstr "E696: Il manque une virgule dans la Liste %s"
 
-#, c-format
-msgid "E697: Missing end of List ']': %s"
-msgstr "E697: Il manque ']' à la fin de la Liste %s"
-
 msgid "sort() argument"
 msgstr "argument de sort()"
 
@@ -2970,6 +2807,9 @@
 msgid "map() argument"
 msgstr "argument de map()"
 
+msgid "mapnew() argument"
+msgstr "argument de mapnew()"
+
 msgid "filter() argument"
 msgstr "argument de filter()"
 
@@ -2985,6 +2825,16 @@
 msgid "reverse() argument"
 msgstr "argument de reverse()"
 
+# DB - Le premier %s est, au choix : "time ", "ctype " ou "messages ",
+#      sans qu'il soit possible de les traduire.
+#, c-format
+msgid "Current %slanguage: \"%s\""
+msgstr "Langue courante pour %s : \"%s\""
+
+#, c-format
+msgid "E197: Cannot set language to \"%s\""
+msgstr "E197: Impossible de choisir la langue \"%s\""
+
 msgid "Unknown option argument"
 msgstr "Option inconnue"
 
@@ -3405,25 +3255,6 @@
 msgid "--windowid <HWND>\tOpen Vim inside another win32 widget"
 msgstr "--windowid <HWND>\tOuvrir Vim dans un autre widget win32"
 
-msgid "No display"
-msgstr "Aucun display"
-
-msgid ": Send failed.\n"
-msgstr " : L'envoi a échoué.\n"
-
-msgid ": Send failed. Trying to execute locally\n"
-msgstr " : L'envoi a échoué. Tentative d'exécution locale\n"
-
-#, c-format
-msgid "%d of %d edited"
-msgstr "%d édités sur %d"
-
-msgid "No display: Send expression failed.\n"
-msgstr "Aucun display : L'envoi de l'expression a échoué.\n"
-
-msgid ": Send expression failed.\n"
-msgstr " : L'envoi de l'expression a échoué.\n"
-
 #, c-format
 msgid "E224: global abbreviation already exists for %s"
 msgstr "E224: une abréviation globale existe déjà pour %s"
@@ -3449,6 +3280,9 @@
 msgid "E228: makemap: Illegal mode"
 msgstr "E228: makemap : mode invalide"
 
+msgid "E460: entries missing in mapset() dict argument"
+msgstr "E460: entrées manquantes dans l'argument dict de mapset()"
+
 #, c-format
 msgid "E357: 'langmap': Matching character missing for %s"
 msgstr "E357: 'langmap' : Aucun caractère correspondant pour %s"
@@ -3485,29 +3319,31 @@
 "\n"
 "modif  ligne col fichier/texte"
 
-msgid "E543: Not a valid codepage"
-msgstr "E543: Page de codes non valide"
+#, c-format
+msgid "E799: Invalid ID: %d (must be greater than or equal to 1)"
+msgstr "E799: ID invalide : %d (doit être plus grand ou égal à 1)"
 
-msgid "E284: Cannot set IC values"
-msgstr "E284: Impossible de régler les valeurs IC"
+#, c-format
+msgid "E801: ID already taken: %d"
+msgstr "E801: ID déjà pris : %d"
 
-msgid "E285: Failed to create input context"
-msgstr "E285: Échec de la création du contexte de saisie"
+msgid "E290: List or number required"
+msgstr "E290: Liste ou nombre requis"
 
-msgid "E286: Failed to open input method"
-msgstr "E286: Échec de l'ouverture de la méthode de saisie"
+#, c-format
+msgid "E802: Invalid ID: %d (must be greater than or equal to 1)"
+msgstr "E802: ID invalide : %d (doit être plus grand ou égal à 1)"
 
-msgid "E287: Warning: Could not set destroy callback to IM"
-msgstr ""
-"E287: Alerte : Impossible d'inscrire le callback de destruction dans la MS"
+#, c-format
+msgid "E803: ID not found: %d"
+msgstr "E803: ID introuvable : %d"
 
-msgid "E288: input method doesn't support any style"
-msgstr "E288: la méthode de saisie ne supporte aucun style"
+#, c-format
+msgid "E798: ID is reserved for \":match\": %d"
+msgstr "E798: ID est réservé pour \":match\" : %d"
 
-msgid "E289: input method doesn't support my preedit type"
-msgstr ""
-"E289: le type de préédition de Vim n'est pas supporté par la méthode de "
-"saisie"
+msgid "E543: Not a valid codepage"
+msgstr "E543: Page de codes non valide"
 
 msgid "E293: block was not locked"
 msgstr "E293: le bloc n'était pas verrouillé"
@@ -3715,12 +3551,17 @@
 
 msgid ""
 "\n"
-"You may want to delete the .swp file now.\n"
-"\n"
+"You may want to delete the .swp file now."
 msgstr ""
 "\n"
-"Il est conseillé d'effacer maintenant le fichier .swp.\n"
+"Il est conseillé d'effacer maintenant le fichier .swp."
+
+msgid ""
+"\n"
+"Note: process STILL RUNNING: "
+msgstr ""
 "\n"
+"Note : processus EN COURS D'EXECUTION : "
 
 msgid "Using crypt key from swap file for the text file.\n"
 msgstr ""
@@ -3742,9 +3583,6 @@
 msgid "      -- none --\n"
 msgstr "     -- aucun --\n"
 
-msgid "%a %b %d %H:%M:%S %Y"
-msgstr "%a %b %d %H:%M:%S %Y"
-
 msgid "          owned by: "
 msgstr "      propriété de : "
 
@@ -4030,6 +3868,10 @@
 msgstr "E337: Menu introuvable - vérifiez les noms des menus"
 
 #, c-format
+msgid "Error detected while compiling %s:"
+msgstr "Erreur détectée lors de la compilation %s"
+
+#, c-format
 msgid "Error detected while processing %s:"
 msgstr "Erreur détectée en traitant %s :"
 
@@ -4094,11 +3936,12 @@
 msgid "E767: Too many arguments to printf()"
 msgstr "E767: Trop d'arguments pour printf()"
 
-msgid "Type number and <Enter> or click with mouse (empty cancels): "
-msgstr "Tapez un nombre et <Entrée> ou cliquez avec la souris (rien annule) :"
+msgid "Type number and <Enter> or click with the mouse (q or empty cancels): "
+msgstr ""
+"Tapez un nombre et <Entrée> ou cliquez avec la souris (q ou rien annule) :"
 
-msgid "Type number and <Enter> (empty cancels): "
-msgstr "Tapez un nombre et <Entrée> (rien annule) :"
+msgid "Type number and <Enter> (q or empty cancels): "
+msgstr "Tapez un nombre et <Entrée> (q ou rien annule) :"
 
 #, c-format
 msgid "%ld more line"
@@ -4121,12 +3964,6 @@
 msgid "E677: Error writing temp file"
 msgstr "E677: Erreur lors de l'écriture du fichier temporaire"
 
-#, c-format
-msgid "%ld second ago"
-msgid_plural "%ld seconds ago"
-msgstr[0] "il y a %ld seconde"
-msgstr[1] "il y a %ld secondes"
-
 msgid "ERROR: "
 msgstr "ERREUR : "
 
@@ -4245,6 +4082,12 @@
 msgstr[1] "%ld lignes modifiées"
 
 #, c-format
+msgid "%d line changed"
+msgid_plural "%d lines changed"
+msgstr[0] "%d ligne modifiée"
+msgstr[1] "%d lignes modifiées"
+
+#, c-format
 msgid "%ld Cols; "
 msgstr "%ld Colonnes ; "
 
@@ -4295,7 +4138,8 @@
 msgstr "E520: Non autorisé dans une ligne de mode"
 
 msgid "E992: Not allowed in a modeline when 'modelineexpr' is off"
-msgstr "E992: Non autorisé dans une ligne de mode avec 'modelineexpr' désélectionnée"
+msgstr ""
+"E992: Non autorisé dans une ligne de mode avec 'modelineexpr' désélectionnée"
 
 msgid "E846: Key code not set"
 msgstr "E846: Le code de touche n'est pas configuré"
@@ -4380,7 +4224,6 @@
 msgid "E540: Unclosed expression sequence"
 msgstr "E540: '}' manquant"
 
-
 msgid "E542: unbalanced groups"
 msgstr "E542: parenthèses non équilibrées"
 
@@ -4426,7 +4269,8 @@
 msgstr "E528: Une valeur ' doit être spécifiée"
 
 msgid "E595: 'showbreak' contains unprintable or wide character"
-msgstr "E595: 'showbreak' contient des caractères à largeur double ou non imprimables"
+msgstr ""
+"E595: 'showbreak' contient des caractères à largeur double ou non imprimables"
 
 msgid "E596: Invalid font(s)"
 msgstr "E596: Police(s) invalide(s)"
@@ -4681,8 +4525,11 @@
 msgid "shell returned %d"
 msgstr "le shell a retourné %d"
 
-msgid "E278: Cannot put a terminal buffer in a popup window"
-msgstr "E278: Impossible de mettre un tampon de terminal dans une fenêtre contextuelle"
+msgid "E861: Cannot open a second popup with a terminal"
+msgstr "E861: Impossible d'ouvrir une seconde fenêtre contextuelle avec un terminal"
+
+msgid "E450: buffer number, text or a list required"
+msgstr "E450: numéro de tampon, texte ou une liste requis"
 
 #, c-format
 msgid "E997: Tabpage not found: %d"
@@ -4695,16 +4542,21 @@
 msgid "E994: Not allowed in a popup window"
 msgstr "E994: Opération interdite dans une fenêtre contextuelle"
 
+msgid "E863: Not allowed for a terminal in a popup window"
+msgstr "E863: Opération interdite pour un terminal  dans une fenêtre contextuelle"
+
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: Utilisez d'abord \":profile start {nomfichier}\""
 
 msgid "E553: No more items"
 msgstr "E553: Plus d'éléments"
 
+msgid "E925: Current quickfix list was changed"
+msgstr "E925: La liste quickfix courante a changé"
+
 msgid "E926: Current location list was changed"
 msgstr "E926: La liste d'emplacements courante a changé"
 
-#, c-format
 msgid "E372: Too many %%%c in format string"
 msgstr "E372: Trop de %%%c dans la chaîne de format"
 
@@ -4736,9 +4588,6 @@
 msgid "E924: Current window was closed"
 msgstr "E924: La fenêtre courante doit être fermée"
 
-msgid "E925: Current quickfix was changed"
-msgstr "E925: Le quickfix courant a changé"
-
 #, c-format
 msgid "(%d of %d)%s%s: "
 msgstr "(%d sur %d)%s%s : "
@@ -4769,6 +4618,9 @@
 msgid "Cannot open file \"%s\""
 msgstr "Impossible d'ouvrir le fichier \"%s\""
 
+msgid "cannot have both a list and a \"what\" argument"
+msgstr "impossible d'avoir une liste et un argument \"what\" en même temps"
+
 msgid "E681: Buffer is not loaded"
 msgstr "E681: le tampon n'est pas chargé"
 
@@ -4823,6 +4675,10 @@
 msgstr "E956: Impossible d'utiliser le motif récursivement"
 
 #, c-format
+msgid "E654: missing delimiter after search pattern: %s"
+msgstr "E654: il manque un délimiteur après le motif de recherche : %s"
+
+#, c-format
 msgid "E554: Syntax error in %s{...}"
 msgstr "E554: Erreur de syntaxe dans %s{...}"
 
@@ -4904,13 +4760,13 @@
 msgid "E877: (NFA regexp) Invalid character class: %d"
 msgstr "E877: (regexp NFA) Classe de caractère invalide : %d"
 
+msgid "E951: \\% value too large"
+msgstr "E951: valeur \\% trop grande"
+
 #, c-format
 msgid "E867: (NFA) Unknown operator '\\z%c'"
 msgstr "E867: (NFA) Opérateur inconnu '\\z%c'"
 
-msgid "E951: \\% value too large"
-msgstr "E951: valeur \\% trop grande"
-
 #, c-format
 msgid "E867: (NFA) Unknown operator '\\%%%c'"
 msgstr "E867: (NFA) Opérateur inconnu '\\%%%c'"
@@ -5259,9 +5115,6 @@
 msgid " (not supported)"
 msgstr " (non supporté)"
 
-msgid "E756: Spell checking is not enabled"
-msgstr "E756: La vérification orthographique n'est pas activée"
-
 #, c-format
 msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
 msgstr "Alerte : Liste de mots \"%s_%s.spl\" ou \"%s_ascii.spl\" introuvable"
@@ -5509,32 +5362,36 @@
 msgstr "Lecture de la liste de mots %s..."
 
 #, c-format
-msgid "Duplicate /encoding= line ignored in %s line %d: %s"
-msgstr "Ligne /encoding= en double ignorée dans %s ligne %d : %s"
+msgid "Conversion failure for word in %s line %ld: %s"
+msgstr "Échec de conversion du mot dans %s ligne %ld : %s"
+
+#, c-format
+msgid "Duplicate /encoding= line ignored in %s line %ld: %s"
+msgstr "Ligne /encoding= en double ignorée dans %s ligne %ld : %s"
 
 #, c-format
-msgid "/encoding= line after word ignored in %s line %d: %s"
-msgstr "Ligne /encoding= après des mots ignorée dans %s ligne %d : %s"
+msgid "/encoding= line after word ignored in %s line %ld: %s"
+msgstr "Ligne /encoding= après des mots ignorée dans %s ligne %ld : %s"
 
 #, c-format
-msgid "Duplicate /regions= line ignored in %s line %d: %s"
-msgstr "Ligne /regions= en double ignorée dans %s ligne %d : %s"
+msgid "Duplicate /regions= line ignored in %s line %ld: %s"
+msgstr "Ligne /regions= en double ignorée dans %s ligne %ld : %s"
 
 #, c-format
-msgid "Too many regions in %s line %d: %s"
-msgstr "Trop de régions dans %s ligne %d : %s"
+msgid "Too many regions in %s line %ld: %s"
+msgstr "Trop de régions dans %s ligne %ld : %s"
 
 #, c-format
-msgid "/ line ignored in %s line %d: %s"
-msgstr "Ligne / ignorée dans %s ligne %d : %s"
+msgid "/ line ignored in %s line %ld: %s"
+msgstr "Ligne / ignorée dans %s ligne %ld : %s"
 
 #, c-format
-msgid "Invalid region nr in %s line %d: %s"
-msgstr "Numéro de région invalide dans %s ligne %d : %s"
+msgid "Invalid region nr in %s line %ld: %s"
+msgstr "Numéro de région invalide dans %s ligne %ld : %s"
 
 #, c-format
-msgid "Unrecognized flags in %s line %d: %s"
-msgstr "Drapeaux non reconnus dans %s ligne %d : %s"
+msgid "Unrecognized flags in %s line %ld: %s"
+msgstr "Drapeaux non reconnus dans %s ligne %ld : %s"
 
 #, c-format
 msgid "Ignored %d words with non-ASCII characters"
@@ -5544,8 +5401,8 @@
 msgstr "E845: mémoire insuffisante, liste de mots peut-être incomplète"
 
 #, c-format
-msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
-msgstr "%d noeuds compressés sur %d ; %d (%d%%) restants "
+msgid "Compressed %s: %ld of %ld nodes; %ld (%ld%%) remaining"
+msgstr "Compressé %s : %ld/%ld noeuds ; %ld (%ld%%) restants"
 
 msgid "Reading back spell file..."
 msgstr "Relecture du fichier orthographique"
@@ -5626,6 +5483,10 @@
 msgid " < \"%.*s\""
 msgstr " < \"%.*s\""
 
+#, c-format
+msgid "E390: Illegal argument: %s"
+msgstr "E390: Argument invalide : %s"
+
 msgid "No Syntax items defined for this buffer"
 msgstr "Aucun élément de syntaxe défini pour ce tampon"
 
@@ -5638,22 +5499,12 @@
 msgid "syntax conceal off"
 msgstr "\"syntax conceal\" désactivée"
 
-#, c-format
-msgid "E390: Illegal argument: %s"
-msgstr "E390: Argument invalide : %s"
-
 msgid "syntax case ignore"
 msgstr "syntaxe ignore la casse"
 
 msgid "syntax case match"
 msgstr "syntaxe respecte la casse"
 
-msgid "syntax spell toplevel"
-msgstr "contrôle orthographique dans le texte sans groupe syntaxique"
-
-msgid "syntax spell notoplevel"
-msgstr "pas de contrôle orthographique dans le texte sans groupe syntaxique"
-
 msgid "syntax spell default"
 msgstr ""
 "contrôle orthographique dans le texte sans groupe syntaxique, sauf si @Spell/"
@@ -5675,9 +5526,11 @@
 msgid "no syncing"
 msgstr "Aucune synchronisation"
 
-# DB - Les deux messages qui suivent vont ensemble.
+msgid "syncing starts at the first line"
+msgstr "la synchronisation débute à la première ligne"
+
 msgid "syncing starts "
-msgstr "La synchronisation débute "
+msgstr "la synchronisation débute "
 
 msgid " lines before top line"
 msgstr " lignes avant la ligne du haut"
@@ -5707,6 +5560,9 @@
 msgid "E392: No such syntax cluster: %s"
 msgstr "E392: Aucune grappe de syntaxe %s"
 
+msgid "from the first line"
+msgstr "à partir de la première ligne"
+
 msgid "minimal "
 msgstr "minimum "
 
@@ -5987,7 +5843,8 @@
 msgstr "E965: nom du type de propriété absent"
 
 msgid "E275: Cannot add text property to unloaded buffer"
-msgstr "E275: Impossible d'ajouter des propriétés de texte à un tampon déchargé"
+msgstr ""
+"E275: Impossible d'ajouter des propriétés de texte à un tampon déchargé"
 
 msgid "E967: text property info corrupted"
 msgstr "E967: information de propriété de texte corrompu"
@@ -5995,6 +5852,9 @@
 msgid "E968: Need at least one of 'id' or 'type'"
 msgstr "E968: Au moins « id » ou « type » sont nécessaires"
 
+msgid "E860: Need 'id' and 'type' with 'both'"
+msgstr "E860: 'id' et 'type' requis avec 'both'"
+
 #, c-format
 msgid "E969: Property type %s already defined"
 msgstr "E969: Type de propriété %s déjà défini"
@@ -6003,16 +5863,127 @@
 msgid "E970: Unknown highlight group name: '%s'"
 msgstr "E970: Nom de groupe de surbrillance inconnu : « %s »"
 
+msgid "(Invalid)"
+msgstr "(Invalide)"
+
+msgid "%a %b %d %H:%M:%S %Y"
+msgstr "%a %b %d %H:%M:%S %Y"
+
+#, c-format
+msgid "%ld second ago"
+msgid_plural "%ld seconds ago"
+msgstr[0] "il y a %ld seconde"
+msgstr[1] "il y a %ld secondes"
+
+msgid "E805: Using a Float as a Number"
+msgstr "E805: Utilisation d'un Flottant comme un Nombre"
+
+msgid "E703: Using a Funcref as a Number"
+msgstr "E703: Utilisation d'une Funcref comme un Nombre"
+
+msgid "E745: Using a List as a Number"
+msgstr "E745: Utilisation d'une Liste comme un Nombre"
+
+msgid "E728: Using a Dictionary as a Number"
+msgstr "E728: Utilisation d'un Dictionnaire comme un Nombre"
+
+msgid "E611: Using a Special as a Number"
+msgstr "E611: Utilisation d'une valeur Spéciale comme Nombre"
+
+msgid "E910: Using a Job as a Number"
+msgstr "E910: Utilisation d'une Tâche comme un Nombre"
+
+msgid "E913: Using a Channel as a Number"
+msgstr "E913: Utilisation d'un Canal comme un Nombre"
+
+msgid "E974: Using a Blob as a Number"
+msgstr "E974: Utilisation d'un Blob comme un Nombre"
+
+msgid "E891: Using a Funcref as a Float"
+msgstr "E891: Utilisation d'une Funcref comme un Flottant"
+
+msgid "E892: Using a String as a Float"
+msgstr "E892: Utilisation d'une Chaîne comme un Flottant"
+
+msgid "E893: Using a List as a Float"
+msgstr "E893: Utilisation d'une Liste comme un Flottant"
+
+msgid "E894: Using a Dictionary as a Float"
+msgstr "E894: Utilisation d'un Dictionnaire comme un Flottant"
+
+msgid "E362: Using a boolean value as a Float"
+msgstr "E362: Utilisation d'une valeur Booléenne comme un Flottant"
+
+msgid "E907: Using a special value as a Float"
+msgstr "E907: Utilisation d'une valeur spéciale comme un Flottant"
+
+msgid "E911: Using a Job as a Float"
+msgstr "E911: Utilisation d'une Tâche comme un Flottant"
+
+msgid "E914: Using a Channel as a Float"
+msgstr "E914: Utilisation d'un Canal comme un Flottant"
+
+msgid "E975: Using a Blob as a Float"
+msgstr "E975: Utilisation d'un Blob comme un Flottant"
+
+msgid "E729: using Funcref as a String"
+msgstr "E729: Utilisation d'une Funcref comme une Chaîne"
+
+msgid "E730: using List as a String"
+msgstr "E730: Utilisation d'une Liste comme une Chaîne"
+
+msgid "E731: using Dictionary as a String"
+msgstr "E731: Utilisation d'un Dictionnaire comme une Chaîne"
+
+msgid "E976: using Blob as a String"
+msgstr "E976: Utilisation d'un Blob comme une Chaîne"
+
+msgid "E977: Can only compare Blob with Blob"
+msgstr "E977: Un Blob ne peut être comparé qu'avec un Blob"
+
+msgid "E691: Can only compare List with List"
+msgstr "E691: Une Liste ne peut être comparée qu'avec une Liste"
+
+msgid "E692: Invalid operation for List"
+msgstr "E692: Opération invalide avec les Liste"
+
+msgid "E735: Can only compare Dictionary with Dictionary"
+msgstr "E735: Un Dictionnaire ne peut être comparé qu'avec un Dictionnaire"
+
+msgid "E736: Invalid operation for Dictionary"
+msgstr "E736: Opération invalide avec les Dictionnaires"
+
+msgid "E694: Invalid operation for Funcrefs"
+msgstr "E694: Opération invalide avec les Funcrefs"
+
+# AB - La version française est meilleure que la version anglaise.
+#, c-format
+msgid "E112: Option name missing: %s"
+msgstr "E112: Il manque un nom d'option après %s"
+
+msgid "E973: Blob literal should have an even number of hex characters"
+msgstr ""
+"E973: Un littéral de Blob doit avoir un nombre pair de caractères "
+"hexadécimaux"
+
+# AB - La version française est meilleure que la version anglaise, qui est
+#      erronée, d'ailleurs : il s'agit d'une "double quote" et non d'une
+#      "quote".
+#, c-format
+msgid "E114: Missing quote: %s"
+msgstr "E114: Il manque \" à la fin de %s"
+
+# AB - La version française est meilleure que la version anglaise.
+#, c-format
+msgid "E115: Missing quote: %s"
+msgstr "E115: Il manque ' à la fin de %s"
+
 msgid "new shell started\n"
 msgstr "nouveau shell démarré\n"
 
 msgid "Vim: Error reading input, exiting...\n"
 msgstr "Vim : Erreur lors de la lecture de l'entrée, sortie...\n"
 
-# DB - Message de débogage.
-msgid "Used CUT_BUFFER0 instead of empty selection"
-msgstr "CUT_BUFFER0 utilisé plutôt qu'une sélection vide"
-
 msgid "E881: Line count changed unexpectedly"
 msgstr "E881: Le nombre de lignes a été changé inopinément"
 
@@ -6233,7 +6204,13 @@
 msgstr "E853: Nom d'argument dupliqué : %s"
 
 msgid "E989: Non-default argument follows default argument"
-msgstr "E989: Argument sans valeur par défaut ne peut pas suivre un argument avec valeur par défaut"
+msgstr ""
+"E989: Argument sans valeur par défaut ne peut pas suivre un argument avec "
+"valeur par défaut"
+
+#, c-format
+msgid "E451: Expected }: %s"
+msgstr "E451: signe } attendu : %s"
 
 #, c-format
 msgid "E740: Too many arguments for function %s"
@@ -6273,22 +6250,10 @@
 msgstr "E699: Trop d'arguments"
 
 #, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: Fonction inconnue : %s"
-
-#, c-format
 msgid "E276: Cannot use function as a method: %s"
 msgstr "E276: Impossible d'utiliser une fonction comme méthode : %s"
 
 #, c-format
-msgid "E933: Function was deleted: %s"
-msgstr "E933: La fonction a été effacée : %s"
-
-#, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: La fonction %s n'a pas reçu assez d'arguments"
-
-#, c-format
 msgid "E120: Using <SID> not in a script context: %s"
 msgstr "E120: <SID> utilisé en dehors d'un script : %s"
 
@@ -6310,6 +6275,9 @@
 "E884: Le nom de la fonction ne peut pas contenir le caractère deux-points : "
 "%s"
 
+msgid "E454: function list was modified"
+msgstr "E454: la liste de fonctions a été modifiée"
+
 #, c-format
 msgid "E123: Undefined function: %s"
 msgstr "E123: Fonction non définie : %s"
@@ -6333,6 +6301,10 @@
 msgstr "E126: Il manque :endfunction"
 
 #, c-format
+msgid "W1001: Text found after :enddef: %s"
+msgstr "W1001: Texte trouvé après :enddef : %s"
+
+#, c-format
 msgid "W22: Text found after :endfunction: %s"
 msgstr "W22: Texte trouvé après :endfunction : %s"
 
@@ -6513,18 +6485,15 @@
 msgid "with X11-Athena GUI."
 msgstr "avec interface graphique X11-Athena."
 
+msgid "with Haiku GUI."
+msgstr "avec interface graphique Haiku."
+
 msgid "with Photon GUI."
 msgstr "avec interface graphique Photon."
 
 msgid "with GUI."
 msgstr "avec une interface graphique."
 
-msgid "with Carbon GUI."
-msgstr "avec interface graphique Carbon."
-
-msgid "with Cocoa GUI."
-msgstr "avec interface graphique Cocoa."
-
 msgid "  Features included (+) or not (-):\n"
 msgstr "  Fonctionnalités incluses (+) ou non (-) :\n"
 
@@ -6535,16 +6504,16 @@
 msgstr "     fichier vimrc utilisateur : \""
 
 msgid " 2nd user vimrc file: \""
-msgstr " 2me fichier vimrc utilisateur : \""
+msgstr "  2e fichier vimrc utilisateur : \""
 
 msgid " 3rd user vimrc file: \""
-msgstr " 3me fichier vimrc utilisateur : \""
+msgstr "  3e fichier vimrc utilisateur : \""
 
 msgid "      user exrc file: \""
 msgstr "      fichier exrc utilisateur : \""
 
 msgid "  2nd user exrc file: \""
-msgstr "  2me fichier exrc utilisateur : \""
+msgstr "   2e fichier exrc utilisateur : \""
 
 msgid "  system gvimrc file: \""
 msgstr "        fichier gvimrc système : \""
@@ -6553,10 +6522,10 @@
 msgstr "    fichier gvimrc utilisateur : \""
 
 msgid "2nd user gvimrc file: \""
-msgstr "2me fichier gvimrc utilisateur : \""
+msgstr " 2e fichier gvimrc utilisateur : \""
 
 msgid "3rd user gvimrc file: \""
-msgstr "3me fichier gvimrc utilisateur : \""
+msgstr " 3e fichier gvimrc utilisateur : \""
 
 msgid "       defaults file: \""
 msgstr " fichier de valeurs par défaut : \""
@@ -6657,6 +6626,21 @@
 msgid "menu  Help->Sponsor/Register  for information    "
 msgstr "menu  Aide->Sponsor/Enregistrement pour plus d'info"
 
+msgid "[end of lines]"
+msgstr "[fin des lignes]"
+
+msgid "global"
+msgstr "global"
+
+msgid "buffer"
+msgstr "tampon"
+
+msgid "window"
+msgstr "fenêtre"
+
+msgid "tab"
+msgstr "onglet"
+
 msgid ""
 "\n"
 "# Buffer list:\n"
@@ -6807,8 +6791,8 @@
 # DB - ... dont les valeurs possibles sont les messages
 #      qui suivent.
 #, c-format
-msgid "Reading viminfo file \"%s\"%s%s%s"
-msgstr "Lecture du fichier viminfo \"%s\"%s%s%s"
+msgid "Reading viminfo file \"%s\"%s%s%s%s"
+msgstr "Lecture du fichier viminfo \"%s\"%s%s%s%s"
 
 # AB - Ce texte fait partie d'un message de débogage.
 # DB - Voir ci-dessus.
@@ -6883,9 +6867,6 @@
 msgid "E444: Cannot close last window"
 msgstr "E444: Impossible de fermer la dernière fenêtre"
 
-msgid "E813: Cannot close autocmd or popup window"
-msgstr "E813: Impossible de fermer la fenêtre des autocommandes ou contextuelle"
-
 msgid "E814: Cannot close window, only autocmd window would remain"
 msgstr ""
 "E814: Impossible de fermer la fenêtre, seule la fenêtre des autocommandes "
@@ -6894,6 +6875,9 @@
 msgid "E445: Other window contains changes"
 msgstr "E445: Les modifications de l'autre fenêtre n'ont pas été enregistrées"
 
+msgid "E366: Not allowed to enter a popup window"
+msgstr "E366: Interdit d'entrer dans une fenêtre contextuelle"
+
 #, c-format
 msgid "E370: Could not load library %s"
 msgstr "E370: Impossible de charger la bibliothèque %s"
@@ -6938,37 +6922,398 @@
 msgid "Path length too long!"
 msgstr "Le chemin est trop long !"
 
-# msgstr "--Pas de lignes dans le tampon--"
-# DB - todo : ou encore : msgstr "--Aucune ligne dans le tampon--"
-msgid "--No lines in buffer--"
-msgstr "--Le tampon est vide--"
+#, c-format
+msgid "E121: Undefined variable: %s"
+msgstr "E121: Variable non définie : %s"
 
-msgid "E470: Command aborted"
-msgstr "E470: Commande annulée"
+#, c-format
+msgid "E121: Undefined variable: %c:%s"
+msgstr "E121: Variable non définie : %c:%s"
 
-msgid "E471: Argument required"
-msgstr "E471: Argument requis"
+msgid "E476: Invalid command"
+msgstr "E476: Commande invalide"
 
-msgid "E10: \\ should be followed by /, ? or &"
-msgstr "E10: \\ devrait être suivi de /, ? ou &"
+#, c-format
+msgid "E476: Invalid command: %s"
+msgstr "E476: Commande invalide : %s"
 
-msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
-msgstr ""
-"E11: Invalide dans la fenêtre ligne-de-commande ; <CR> exécute, CTRL-C quitte"
+msgid "E710: List value has more items than targets"
+msgstr "E710: La Liste a plus d'éléments que la destination"
 
-msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
-msgstr ""
-"E12: commande non autorisée depuis un exrc/vimrc dans répertoire courant ou "
-"une recherche de marqueur"
+msgid "E711: List value does not have enough items"
+msgstr "E711: La Liste n'a pas assez d'éléments"
 
-msgid "E171: Missing :endif"
-msgstr "E171: :endif manquant"
+msgid "E719: Cannot slice a Dictionary"
+msgstr "E719: Utilisation de [:] impossible avec un Dictionnaire"
 
-msgid "E600: Missing :endtry"
-msgstr "E600: :endtry manquant"
+msgid ""
+"E856: \"assert_fails()\" second argument must be a string or a list with one "
+"or two strings"
+msgstr "E856: le second argument d'\"assert_fails()\" doit être une chaîne ou une liste avec une ou deux chaînes"
 
-msgid "E170: Missing :endwhile"
-msgstr "E170: :endwhile manquant"
+msgid "E909: Cannot index a special variable"
+msgstr "E909: Impossible d'indexer une variable spéciale"
+
+#, c-format
+msgid "E1100: Missing :var: %s"
+msgstr "E1100: Il manque :var: %s"
+
+#, c-format
+msgid "E1001: Variable not found: %s"
+msgstr "E1001: Variable introuvable: %s"
+
+#, c-format
+msgid "E1002: Syntax error at %s"
+msgstr "E1002: Erreur de syntaxe dans %s"
+
+msgid "E1003: Missing return value"
+msgstr "E1003: Valeur de retour manquante"
+
+#, c-format
+msgid "E1004: White space required before and after '%s'"
+msgstr "E1004: Espace requise avant et après '%s'"
+
+msgid "E1005: Too many argument types"
+msgstr "E1005: Trop de types d'arguments"
+
+#, c-format
+msgid "E1006: %s is used as an argument"
+msgstr "E1006: %s est utilisé comme argument"
+
+msgid "E1007: Mandatory argument after optional argument"
+msgstr "E1007: Argument obligatoire après un argument optionnel"
+
+msgid "E1008: Missing <type>"
+msgstr "E1008: <type> manquant"
+
+msgid "E1009: Missing > after type"
+msgstr "E1009: Il manque > après type"
+
+#, c-format
+msgid "E1010: Type not recognized: %s"
+msgstr "E1010: Type non reconnu : %s"
+
+#, c-format
+msgid "E1011: Name too long: %s"
+msgstr "E1011: Nom trop long : %s"
+
+#, c-format
+msgid "E1012: Type mismatch; expected %s but got %s"
+msgstr "E1012: Type inconsistant ; attendu %s mais reçu %s"
+
+#, c-format
+msgid "E1013: Argument %d: type mismatch, expected %s but got %s"
+msgstr "E1013: Argument %d : type inconsistant, attendu %s mais reçu %s"
+
+#, c-format
+msgid "E1014: Invalid key: %s"
+msgstr "E1014: clé invalide : %s"
+
+#, c-format
+msgid "E1015: Name expected: %s"
+msgstr "E1015: Nom attendu : %s"
+
+#, c-format
+msgid "E1016: Cannot declare a %s variable: %s"
+msgstr "E1016: Impossible de déclarer variable %s : %s"
+
+#, c-format
+msgid "E1016: Cannot declare an environment variable: %s"
+msgstr "E1016: Impossible de déclarer une variable d'environnement : %s"
+
+#, c-format
+msgid "E1017: Variable already declared: %s"
+msgstr "E1017: Variable déjà déclarée : %s"
+
+#, c-format
+msgid "E1018: Cannot assign to a constant: %s"
+msgstr "E1018: Impossible d'assigner à une constante : %s"
+
+msgid "E1019: Can only concatenate to string"
+msgstr "E1019: Seules les chaînes peuvent être concaténées"
+
+#, c-format
+msgid "E1020: Cannot use an operator on a new variable: %s"
+msgstr "E1020: Impossible d'utiliser un opérateur sur une nouvelle variable : %s"
+
+msgid "E1021: Const requires a value"
+msgstr "E1021: Const nécessite une valeur"
+
+msgid "E1022: Type or initialization required"
+msgstr "E1022: Type ou initialisation requis"
+
+#, c-format
+msgid "E1023: Using a Number as a Bool: %d"
+msgstr "E1023: Utilisation d'un Nombre comme un Booléen : %d"
+
+msgid "E1024: Using a Number as a String"
+msgstr "E1024: Utilisation d'un Nombre comme une Chaîne"
+
+msgid "E1025: Using } outside of a block scope"
+msgstr "E1025: Utilisation de } hors d'un bloc de portée"
+
+msgid "E1026: Missing }"
+msgstr "E1026: } manquant"
+
+msgid "E1027: Missing return statement"
+msgstr "E1027: commande 'return' manquante"
+
+msgid "E1028: Compiling :def function failed"
+msgstr "E1028: Compilation de function :def a échoué"
+
+#, c-format
+msgid "E1029: Expected %s but got %s"
+msgstr "E1029: %s attendu mais %s reçu"
+
+#, c-format
+msgid "E1030: Using a String as a Number: \"%s\""
+msgstr "E1030: Utilisation d'une Chaîne comme Nombre : \"%s\""
+
+msgid "E1031: Cannot use void value"
+msgstr "E1031: Impossible d'utiliser une valeur 'void'"
+
+msgid "E1032: Missing :catch or :finally"
+msgstr "E1032: :catch ou :finally manquant"
+
+#, c-format
+msgid "E1034: Cannot use reserved name %s"
+msgstr "E1034: Impossible d'utiliser le nom réservé %s"
+
+msgid "E1035: % requires number arguments"
+msgstr "E1035: % nécessite des arguments numériques"
+
+#, c-format
+msgid "E1036: %c requires number or float arguments"
+msgstr "E1036: %c nécessite des arguments numériques ou flottants"
+
+#, c-format
+msgid "E1037: Cannot use \"%s\" with %s"
+msgstr "E1037: Impossible d'utiliser \"%s\" avec %s"
+
+msgid "E1038: \"vim9script\" can only be used in a script"
+msgstr "E1038: \"vim9script\" ne peut être utilisé que dans un script"
+
+msgid "E1039: \"vim9script\" must be the first command in a script"
+msgstr "E1039: \"vim9script\" doit être la première commande dans un script"
+
+msgid "E1040: Cannot use :scriptversion after :vim9script"
+msgstr "E1040: Impossible d'utiliser :scriptversion après :vim9script"
+
+#, c-format
+msgid "E1041: Redefining script item %s"
+msgstr "E1041: Redéfinition de l'élément de script %s"
+
+msgid "E1042: Export can only be used in vim9script"
+msgstr "E1042: Export ne peut être utilisé que dans vim9script"
+
+msgid "E1043: Invalid command after :export"
+msgstr "E1043: Commande invalide après :export"
+
+msgid "E1044: Export with invalid argument"
+msgstr "E1044: Export avec argument invalide"
+
+msgid "E1045: Missing \"as\" after *"
+msgstr "E1045: \"as\" manquant après *"
+
+msgid "E1046: Missing comma in import"
+msgstr "E1046: virgule manquante dans import"
+
+msgid "E1047: Syntax error in import"
+msgstr "E1047: Erreur de syntaxe dans import" 
+
+#, c-format
+msgid "E1048: Item not found in script: %s"
+msgstr "E1048: Élément non trouvé dans le script : %s"
+
+#, c-format
+msgid "E1049: Item not exported in script: %s"
+msgstr "E1049: Élément non exporté dans le script : %s"
+
+#, c-format
+msgid "E1052: Cannot declare an option: %s"
+msgstr "E1052: Impossible de déclarer un option : %s"
+
+#, c-format
+msgid "E1053: Could not import \"%s\""
+msgstr "E1053: Impossible d'importer \"%s\""
+
+#, c-format
+msgid "E1054: Variable already declared in the script: %s"
+msgstr "E1054: Variable déjà déclarée dans le script : %s"
+
+msgid "E1055: Missing name after ..."
+msgstr "E1055: Nom manquant après ..."
+
+#, c-format
+msgid "E1056: Expected a type: %s"
+msgstr "E1056: Type attendu : %s"
+
+msgid "E1057: Missing :enddef"
+msgstr "E1057: :enddef manquant"
+
+msgid "E1058: Function nesting too deep"
+msgstr "E1058: Fonctions trop imbriquées"
+
+#, c-format
+msgid "E1059: No white space allowed before colon: %s"
+msgstr "E1059: Espace interdite avant les deux-points : %s"
+
+#, c-format
+msgid "E1060: Expected dot after name: %s"
+msgstr "E1060: point attendu après le nom : %s"
+
+#, c-format
+msgid "E1061: Cannot find function %s"
+msgstr "E1061: Impossible de trouver la fonction : %s"
+
+msgid "E1062: Cannot index a Number"
+msgstr "E1062: Impossible d'indexer un Nombre"
+
+msgid "E1063: Type mismatch for v: variable"
+msgstr "E1063: Type inconsistant pour la variable v:"
+
+#, c-format
+msgid "E1066: Cannot declare a register: %s"
+msgstr "E1066: Impossible déclarer un registre : %s"
+
+#, c-format
+msgid "E1067: Separator mismatch: %s"
+msgstr "E1067: Séparateur inconsistant : %s"
+
+#, c-format
+msgid "E1068: No white space allowed before '%s'"
+msgstr "E1068: Espace interdite avant '%s'"
+
+#, c-format
+msgid "E1069: White space required after '%s'"
+msgstr "E1069: Espace interdite après '%s'"
+
+msgid "E1070: Missing \"from\""
+msgstr "E1070: \"from\" manquant"
+
+msgid "E1071: Invalid string after \"from\""
+msgstr "E1071: Chaîne invalide après \"from\""
+
+#, c-format
+msgid "E1072: Cannot compare %s with %s"
+msgstr "E1072: Impossible de comparer %s avec %s"
+
+#, c-format
+msgid "E1073: Name already defined: %s"
+msgstr "E1073: Nom déjà défini : %s"
+
+msgid "E1074: No white space allowed after dot"
+msgstr "E1074: Espace interdite après un point"
+
+#, c-format
+msgid "E1084: Cannot delete Vim9 script function %s"
+msgstr "E1084: Impossible de supprimer la fonction %s du script vim9"
+
+msgid "E1086: Cannot use :function inside :def"
+msgstr "E1086: Impossible d'utiliser :function dans :def"
+
+msgid "E1119: Cannot change list item"
+msgstr "E1119: Impossible de changer un élément de liste"
+
+msgid "E1120: Cannot change dict"
+msgstr "E1120: Impossible de changer un dictionnaire"
+
+msgid "E1121: Cannot change dict item"
+msgstr "E1121: Impossible de changer un élément de dictionnaire"
+
+#, c-format
+msgid "E1122: Variable is locked: %s"
+msgstr "E1122: Variable verrouillée : %s"
+
+#, c-format
+msgid "E1123: Missing comma before argument: %s"
+msgstr "E1123: Virgule manquante avant un argument : %s"
+
+msgid "E1127: Missing name after dot"
+msgstr "E1127: Nom manquant après un point"
+
+msgid "E1128: } without {"
+msgstr "E1128: } sans {"
+
+msgid "E1130: Cannot add to null list"
+msgstr "E1130: Impossible d'ajouter à une liste nulle"
+
+msgid "E1131: Cannot add to null blob"
+msgstr "E1131: Impossible d'ajouter à un Blob nul"
+
+msgid "E1132: Missing function argument"
+msgstr "E1132: Argument de fonction manquant"
+
+msgid "E1133: Cannot extend a null dict"
+msgstr "E1133: Impossible d'étendre un dictionnaire nul"
+
+#, c-format
+msgid "E1135: Using a String as a Bool: \"%s\""
+msgstr "E1135: Utilisation d'une Chaîne comme un Booléen : \"%s\""
+
+msgid "E1138: Using a Bool as a Number"
+msgstr "E1138: Utilisation d'un Booléen comme un Nombre"
+
+msgid "E1141: Indexable type required"
+msgstr "E1141: Type indexable requis"
+
+msgid "E1142: Non-empty string required"
+msgstr "E1142: Chaîne non vide requise"
+
+#, c-format
+msgid "E1143: Empty expression: \"%s\""
+msgstr "E1143: Expression vide : \"%s\""
+
+#, c-format
+msgid "E1146: Command not recognized: %s"
+msgstr "E1146: Commande non reconnue : %s"
+
+#, c-format
+msgid "E1148: Cannot index a %s"
+msgstr "E1148: Impossible d'indexer %s"
+
+# DB - todo : ou encore : msgstr "--Aucune ligne dans le tampon--"
+msgid "--No lines in buffer--"
+msgstr "--Le tampon est vide--"
+
+msgid "E470: Command aborted"
+msgstr "E470: Commande annulée"
+
+msgid "E471: Argument required"
+msgstr "E471: Argument requis"
+
+msgid "E10: \\ should be followed by /, ? or &"
+msgstr "E10: \\ devrait être suivi de /, ? ou &"
+
+msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
+msgstr ""
+"E11: Invalide dans la fenêtre ligne-de-commande ; <CR> exécute, CTRL-C quitte"
+
+msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
+msgstr ""
+"E12: commande non autorisée depuis un exrc/vimrc dans répertoire courant ou "
+"une recherche de marqueur"
+
+msgid "E171: Missing :endif"
+msgstr "E171: :endif manquant"
+
+msgid "E603: :catch without :try"
+msgstr "E603: :catch sans :try"
+
+msgid "E606: :finally without :try"
+msgstr "E606: :finally sans :try"
+
+msgid "E607: multiple :finally"
+msgstr "E607: Il ne peut y avoir qu'un seul :finally"
+
+msgid "E600: Missing :endtry"
+msgstr "E600: :endtry manquant"
+
+msgid "E602: :endtry without :try"
+msgstr "E602: :endtry sans :try"
+
+msgid "E170: Missing :endwhile"
+msgstr "E170: :endwhile manquant"
 
 msgid "E170: Missing :endfor"
 msgstr "E170: :endfor manquant"
@@ -7033,13 +7378,13 @@
 msgid "E16: Invalid range"
 msgstr "E16: Plage invalide"
 
-msgid "E476: Invalid command"
-msgstr "E476: Commande invalide"
-
 #, c-format
 msgid "E17: \"%s\" is a directory"
 msgstr "E17: \"%s\" est un répertoire"
 
+msgid "E756: Spell checking is not possible"
+msgstr "E756: La vérification orthographique n'est pas possible"
+
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
 msgstr "E364: L'appel à la bibliothèque a échoué pour \"%s()\""
@@ -7187,10 +7532,6 @@
 msgstr "E45: L'option 'readonly' est activée (ajoutez ! pour passer outre)"
 
 #, c-format
-msgid "E121: Undefined variable: %s"
-msgstr "E121: Variable non définie : %s"
-
-#, c-format
 msgid "E734: Wrong variable type for %s="
 msgstr "E734: Type de variable erroné avec %s="
 
@@ -7236,8 +7577,16 @@
 msgstr "E118: La fonction %s a reçu trop d'arguments"
 
 #, c-format
-msgid "E716: Key not present in Dictionary: %s"
-msgstr "E716: La clé %s n'existe pas dans le Dictionnaire"
+msgid "E119: Not enough arguments for function: %s"
+msgstr "E119: La fonction %s n'a pas reçu assez d'arguments"
+
+#, c-format
+msgid "E933: Function was deleted: %s"
+msgstr "E933: La fonction a été effacée : %s"
+
+#, c-format
+msgid "E716: Key not present in Dictionary: \"%s\""
+msgstr "E716: La clé n'existe pas dans le Dictionnaire : \"%s\""
 
 msgid "E714: List required"
 msgstr "E714: Liste requise"
@@ -7246,6 +7595,10 @@
 msgstr "E897: Liste ou Blob requis"
 
 #, c-format
+msgid "E697: Missing end of List ']': %s"
+msgstr "E697: Il manque ']' à la fin de la Liste %s"
+
+#, c-format
 msgid "E712: Argument of %s must be a List or Dictionary"
 msgstr "E712: L'argument de %s doit être une Liste ou un Dictionnaire"
 
@@ -7253,6 +7606,26 @@
 msgid "E896: Argument of %s must be a List, Dictionary or Blob"
 msgstr "E896: L'argument de %s doit être une Liste, Dictionnaire ou un Blob"
 
+msgid "E804: Cannot use '%' with Float"
+msgstr "E804: Impossible d'utiliser '%' avec un Flottant"
+
+msgid "E908: using an invalid value as a String"
+msgstr "E908: Utilisation d'une valeur invalide comme une Chaîne"
+
+msgid "E996: Cannot lock an option"
+msgstr "E996: Impossible de verrouiller une option"
+
+#, c-format
+msgid "E113: Unknown option: %s"
+msgstr "E113: Option inconnue : %s"
+
+msgid "E18: Unexpected characters in :let"
+msgstr "E18: Caractères inattendus avant '='"
+
+#, c-format
+msgid "E857: Dictionary key \"%s\" required"
+msgstr "E857: Clé de Dictionnaire \"%s\" requis"
+
 msgid "E47: Error while reading errorfile"
 msgstr "E47: Erreur lors de la lecture du fichier d'erreurs"
 
@@ -7260,7 +7633,13 @@
 msgstr "E48: Opération interdite dans le bac à sable"
 
 msgid "E523: Not allowed here"
-msgstr "E523: Interdit à cet endroit"
+msgstr "E523: Interdit ici"
+
+msgid "E578: Not allowed to change text here"
+msgstr "E578: Interdit de changer le texte ici"
+
+msgid "E565: Not allowed to change text or change window"
+msgstr "E565: Interdit de changer le texte ou la fenêtre"
 
 msgid "E359: Screen mode setting not supported"
 msgstr "E359: Choix du mode d'écran non supporté"
@@ -7295,6 +7674,10 @@
 msgid "E488: Trailing characters"
 msgstr "E488: Caractères surnuméraires"
 
+#, c-format
+msgid "E488: Trailing characters: %s"
+msgstr "E488: Caractères surnuméraires : %s"
+
 msgid "E78: Unknown mark"
 msgstr "E78: Marque inconnue"
 
@@ -7320,6 +7703,25 @@
 msgid "E107: Missing parentheses: %s"
 msgstr "E107: Parenthèses manquantes : %s"
 
+msgid "E110: Missing ')'"
+msgstr "E110: ')' manquant"
+
+#, c-format
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: Il manque ':' dans le Dictionnaire %s"
+
+#, c-format
+msgid "E721: Duplicate key in Dictionary: \"%s\""
+msgstr "E721: Clé dupliquée dans le Dictionnaire : %s"
+
+#, c-format
+msgid "E722: Missing comma in Dictionary: %s"
+msgstr "E722: Il manque une virgule dans le Dictionnaire : %s"
+
+#, c-format
+msgid "E723: Missing end of Dictionary '}': %s"
+msgstr "E723: Il manque '}' à la fin du Dictionnaire : %s"
+
 msgid "E449: Invalid expression received"
 msgstr "E449: Expression invalide reçue"
 
@@ -7353,6 +7755,9 @@
 msgid "E850: Invalid register name"
 msgstr "E850: Nom de registre invalide"
 
+msgid "E806: using Float as a String"
+msgstr "E806: Utilisation d'un Flottant comme une Chaîne"
+
 #, c-format
 msgid "E919: Directory not found in '%s': \"%s\""
 msgstr "E919: Répertoire introuvable dans '%s' : \"%s\""
@@ -7360,6 +7765,10 @@
 msgid "E952: Autocommand caused recursive behavior"
 msgstr "E952: Une autocommande a causé une récursivité"
 
+msgid "E813: Cannot close autocmd or popup window"
+msgstr ""
+"E813: Impossible de fermer la fenêtre des autocommandes ou contextuelle"
+
 # DB - todo : J'hésite avec
 #      msgstr "E328: Le menu n'existe pas dans ce mode"
 msgid "E328: Menu only exists in another mode"
@@ -7372,12 +7781,56 @@
 msgid "E686: Argument of %s must be a List"
 msgstr "E686: L'argument de %s doit être une Liste"
 
+# AB - Je suis partagé entre la concision d'une traduction assez littérale et
+#      la lourdeur d'une traduction plus correcte.
+msgid "E109: Missing ':' after '?'"
+msgstr "E109: Il manque ':' après '?'"
+
+msgid "E690: Missing \"in\" after :for"
+msgstr "E690: \"in\" manquant après :for"
+
+#, c-format
+msgid "E117: Unknown function: %s"
+msgstr "E117: Fonction inconnue : %s"
+
+msgid "E111: Missing ']'"
+msgstr "E111: ']' manquant"
+
+msgid "E581: :else without :if"
+msgstr "E581: :else sans :if"
+
+msgid "E582: :elseif without :if"
+msgstr "E582: :elseif sans :if"
+
+msgid "E580: :endif without :if"
+msgstr "E580: :endif sans :if"
+
+msgid "E586: :continue without :while or :for"
+msgstr "E586: :continue sans :while ou :for"
+
+msgid "E587: :break without :while or :for"
+msgstr "E587: :break sans :while ou :for"
+
+msgid "E274: No white space allowed before parenthesis"
+msgstr "E274: espace interdite avant une parenthèse"
+
+#, c-format
+msgid "E940: Cannot lock or unlock variable %s"
+msgstr "E940: Impossible de (dé)verrouiller la variable %s"
+
+#, c-format
+msgid "E254: Cannot allocate color %s"
+msgstr "E254: Impossible d'allouer la couleur %s"
+
 msgid "search hit TOP, continuing at BOTTOM"
 msgstr "La recherche a atteint le HAUT, et continue en BAS"
 
 msgid "search hit BOTTOM, continuing at TOP"
 msgstr "La recherche a atteint le BAS, et continue en HAUT"
 
+msgid " line "
+msgstr " ligne "
+
 #, c-format
 msgid "Need encryption key for \"%s\""
 msgstr "Besoin de la clé de chiffrement pour \"%s\""
@@ -7708,3 +8161,69 @@
 
 msgid "Vim"
 msgstr "Vim"
+
+msgid "(local to buffer)"
+msgstr "(local au tampon)"
+
+msgid "(global or local to buffer)"
+msgstr "(global ou local au tampon)"
+
+msgid "number of lines used for the command-line"
+msgstr "nombre de lignes utilisée pour la ligne de commande"
+
+msgid "don't redraw while executing macros"
+msgstr "ne pas rafraîchir l'écran lors de l'exécution des macros"
+
+msgid "show <Tab> as ^I and end-of-line as $"
+msgstr "montrer ^I pour <Tab> et $ pour la fin de ligne"
+
+msgid "show the line number for each line"
+msgstr "montrer le numéro de chaque ligne"
+
+msgid "terminal"
+msgstr "terminal"
+
+msgid "enable lisp mode"
+msgstr "activer le mode lisp"
+
+msgid "folding"
+msgstr "repli"
+
+msgid "list of directories to put backup files in"
+msgstr "liste des répertoires des copies de secours dans"
+
+msgid "the swap file"
+msgstr "le fichier d'échange"
+
+msgid "list of directories for the swap file"
+msgstr "liste des répertoires du fichier d'échange"
+
+msgid "command line editing"
+msgstr "édition de ligne de commande"
+
+msgid "multi-byte characters"
+msgstr "caractères multi-octets"
+
+msgid "various"
+msgstr "divers"
+
+msgid "name of the Lua dynamic library"
+msgstr "nom de la bibliothèque dynamique Lua"
+
+msgid "name of the Perl dynamic library"
+msgstr "nom de la bibliothèque dynamique Perl"
+
+msgid "whether to use Python 2 or 3"
+msgstr "utilisation de Python 2 ou 3"
+
+msgid "name of the Python 2 dynamic library"
+msgstr "nom de la bibliothèque dynamique Python 2"
+
+msgid "name of the Ruby dynamic library"
+msgstr "nom de la bibliothèque dynamique Ruby"
+
+msgid "name of the Tcl dynamic library"
+msgstr "nom de la bibliothèque dynamique Tcl"
+
+msgid "name of the MzScheme dynamic library"
+msgstr "nom de la bibliothèque dynamique MzScheme"
diff -Nru vim-8.2.1913/src/po/sr.po vim-8.2.2434/src/po/sr.po
--- vim-8.2.1913/src/po/sr.po	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/po/sr.po	2021-01-30 22:05:11.000000000 +0000
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: Vim(Serbian)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-18 10:14+0400\n"
-"PO-Revision-Date: 2018-05-15 10:50+0400\n"
+"POT-Creation-Date: 2020-11-23 22:13+0400\n"
+"PO-Revision-Date: 2020-11-27 00:43+0400\n"
 "Last-Translator: Ivan Pešić <ivan.pesic@gmail.com>\n"
 "Language-Team: Serbian\n"
 "Language: sr\n"
@@ -30,6 +30,9 @@
 msgid "E165: Cannot go beyond last file"
 msgstr "E165: �е може да �е иде иза по�ледњег фајла"
 
+msgid "E610: No argument to delete"
+msgstr "E610: �ема аргумента за бри�ање"
+
 msgid "E249: window layout changed unexpectedly"
 msgstr "E249: ра�поред прозора �е нечекивано променио"
 
@@ -179,8 +182,7 @@
 #, c-format
 msgid "E89: No write since last change for buffer %d (add ! to override)"
 msgstr ""
-"E89: Од по�ледње измене није било упи�а за бафер %d (додајте ! да "
-"премо�тите)"
+"E89: Од по�ледње измене није било упи�а за бафер %d (додајте ! да премо�тите)"
 
 msgid "E948: Job still running (add ! to end the job)"
 msgstr "E948: Задатак �е још извршава (додајте ! да зау�тавите задатак)"
@@ -222,9 +224,6 @@
 msgid "[Not edited]"
 msgstr "[�ије уређивано]"
 
-msgid "[New file]"
-msgstr "[�ов фајл]"
-
 msgid "[Read errors]"
 msgstr "[Грешке при читању]"
 
@@ -284,6 +283,12 @@
 msgid "Do you really want to write to it"
 msgstr "Да ли заи�та желите да пишете у њега"
 
+msgid "[New]"
+msgstr "[�ово]"
+
+msgid "[New File]"
+msgstr "[�ов фајл]"
+
 msgid "E676: No matching autocommands for acwrite buffer"
 msgstr "E676: �ема одговарајућих аутокоманди за acwrite бафер"
 
@@ -379,12 +384,6 @@
 msgid "[Device]"
 msgstr "[Уређај]"
 
-msgid "[New]"
-msgstr "[�ово]"
-
-msgid "[New File]"
-msgstr "[�ов фајл]"
-
 msgid " [a]"
 msgstr " [н]"
 
@@ -422,12 +421,16 @@
 msgid "E902: Cannot connect to port"
 msgstr "E902: Повезивање на порт није могуће"
 
+msgid "E898: socket() in channel_connect()"
+msgstr "E898: socket() у channel_connect()"
+
+#, c-format
+msgid "E901: getaddrinfo() in channel_open(): %s"
+msgstr "E901: getaddrinfo() у channel_open(): %s"
+
 msgid "E901: gethostbyname() in channel_open()"
 msgstr "E901: gethostbyname() у channel_open()"
 
-msgid "E898: socket() in channel_open()"
-msgstr "E898: socket() у channel_open()"
-
 msgid "E903: received command with non-string argument"
 msgstr "E903: примњена команда �а аргуменом који није �тринг"
 
@@ -460,18 +463,46 @@
 msgstr ""
 "E912: ch_evalexpr()/ch_sendexpr() не може да �е кори�ти �а raw или nl каналом"
 
-msgid "E920: _io file requires _name to be set"
-msgstr "E920: _io фајл захтева да _name буде по�тављено"
+msgid "No display"
+msgstr "�ема приказа"
 
-msgid "E915: in_io buffer requires in_buf or in_name to be set"
-msgstr "E915: in_io бафер захтева да in_buf или in_name буде по�тављено"
+msgid ": Send failed.\n"
+msgstr ": Слање није у�пело.\n"
+
+msgid ": Send failed. Trying to execute locally\n"
+msgstr ": Слање није у�пело. Покушава �е локално извршавање\n"
 
 #, c-format
-msgid "E918: buffer must be loaded: %s"
-msgstr "E918: бафер мора бити учитан: %s"
+msgid "%d of %d edited"
+msgstr "%d од %d уређено"
 
-msgid "E916: not a valid job"
-msgstr "E916: није валидан job"
+msgid "No display: Send expression failed.\n"
+msgstr "�ема приказа: Израз �лања није у�пео.\n"
+
+msgid ": Send expression failed.\n"
+msgstr ": Израз �лања није у�пео.\n"
+
+msgid "E240: No connection to the X server"
+msgstr "E240: �ема везе �а X �ервером"
+
+#, c-format
+msgid "E241: Unable to send to %s"
+msgstr "E241: Слање ка %s није могуће"
+
+msgid "E277: Unable to read a server reply"
+msgstr "E277: �е може да �е прочита одговор �ервера"
+
+msgid "E941: already started a server"
+msgstr "E941: �ервер је већ покренут"
+
+msgid "E942: +clientserver feature not available"
+msgstr "E942: Могућно�т +clientserver није до�тупна"
+
+msgid "E258: Unable to send to client"
+msgstr "E258: Слање ка клијенту није могуће"
+
+msgid "Used CUT_BUFFER0 instead of empty selection"
+msgstr "Уме�то празне �елекције корићен је CUT_BUFFER0"
 
 msgid "tagname"
 msgstr "ознака"
@@ -545,22 +576,6 @@
 msgid "%3d  expr %s"
 msgstr "%3d  израз %s"
 
-#, c-format
-msgid "E720: Missing colon in Dictionary: %s"
-msgstr "E720: �едо�таје тачка-зарез у Речнику: %s"
-
-#, c-format
-msgid "E721: Duplicate key in Dictionary: \"%s\""
-msgstr "E721: Дупликат кључа у Речнику: \"%s\""
-
-#, c-format
-msgid "E722: Missing comma in Dictionary: %s"
-msgstr "E722: �едо�таје зарез у Речнику: %s"
-
-#, c-format
-msgid "E723: Missing end of Dictionary '}': %s"
-msgstr "E723: �едо�таје крај Речника '}': %s"
-
 msgid "extend() argument"
 msgstr "extend() аргумент"
 
@@ -707,82 +722,30 @@
 msgid "E791: Empty keymap entry"
 msgstr "E791: Празна keymap �тавка"
 
-msgid "E111: Missing ']'"
-msgstr "E111: �едо�таје ']'"
-
-msgid "E719: Cannot use [:] with a Dictionary"
-msgstr "E719: �е може да �е кори�ти [:] �а Речником"
-
-msgid "E806: using Float as a String"
-msgstr "E806: коришћење Float као String"
-
-msgid "E274: No white space allowed before parenthesis"
-msgstr "E274: И�пред заграде није дозвољен празан карактер"
-
 msgid "E689: Can only index a List, Dictionary or Blob"
-msgstr "E689: Само Ли�та, Речник или Blob могу да �е индек�ирају"
+msgstr "E689: Само Ли�та, Речник или Блоб могу да �е индек�ирају"
 
 msgid "E708: [:] must come last"
 msgstr "E708: [:] мора да буде по�ледња"
 
 msgid "E709: [:] requires a List or Blob value"
-msgstr "E709: [:] захтева вредно�т типа List или Blob"
+msgstr "E709: [:] захтева вредно�т типа Ли�та или Блоб"
 
 msgid "E972: Blob value does not have the right number of bytes"
-msgstr "E972: Blob вредно�т нема одговарајући број бајтова"
+msgstr "E972: Блоб вредно�т нема одговарајући број бајтова"
 
 msgid "E996: Cannot lock a range"
 msgstr "E996: Оп�ег не може да �е закључа"
 
-msgid "E710: List value has more items than target"
-msgstr "E710: Вредно�т типа List има више �тавки него одредиште"
-
-msgid "E711: List value has not enough items"
-msgstr "E711: Вредно�т типа List нема довољно �тавки"
-
 msgid "E996: Cannot lock a list or dict"
 msgstr "E996: Ли�та или Речник не могу да �е закључају"
 
-msgid "E690: Missing \"in\" after :for"
-msgstr "E690: �едо�таје \"in\" након :for"
-
-msgid "E109: Missing ':' after '?'"
-msgstr "E109: �едо�таје ':' након '?'"
-
-msgid "E804: Cannot use '%' with Float"
-msgstr "E804: '%' не може да �е кори�ти �а Float"
-
-msgid "E973: Blob literal should have an even number of hex characters"
-msgstr "E973: Blob литерал би требало да има паран број хек� карактера"
-
-msgid "E110: Missing ')'"
-msgstr "E110: �едо�таје ')'"
-
 msgid "E260: Missing name after ->"
 msgstr "E260: �едо�таје име након ->"
 
 msgid "E695: Cannot index a Funcref"
 msgstr "E695: Funcref не може да �е индек�ира"
 
-msgid "E909: Cannot index a special variable"
-msgstr "E909: Специјална променљива не може да �е индек�ира"
-
-#, c-format
-msgid "E112: Option name missing: %s"
-msgstr "E112: �едо�таје име опције: %s"
-
-#, c-format
-msgid "E113: Unknown option: %s"
-msgstr "E113: �епозната опција: %s"
-
-#, c-format
-msgid "E114: Missing quote: %s"
-msgstr "E114: �едо�таје наводник: %s"
-
-#, c-format
-msgid "E115: Missing quote: %s"
-msgstr "E115: �едо�таје наводник: %s"
-
 msgid "Not enough memory to set references, garbage collection aborted!"
 msgstr ""
 "�ема довољно меморије за по�тављање референци, прекинуто је �купљање отпада"
@@ -790,66 +753,6 @@
 msgid "E724: variable nested too deep for displaying"
 msgstr "E724: променљива је угњеждена предубоко да би �е приказала"
 
-msgid "E805: Using a Float as a Number"
-msgstr "E805: Кори�ти �е Float као Number"
-
-msgid "E703: Using a Funcref as a Number"
-msgstr "E703: Кори�ти �е Funcref као Number"
-
-msgid "E745: Using a List as a Number"
-msgstr "E745: Кори�ти �е List као Number"
-
-msgid "E728: Using a Dictionary as a Number"
-msgstr "E728: Кори�ти �е Dictionary као Number"
-
-msgid "E910: Using a Job as a Number"
-msgstr "E910: Кори�ти �е Job као Number"
-
-msgid "E913: Using a Channel as a Number"
-msgstr "E913: Кори�ти �е Channel као Number"
-
-msgid "E974: Using a Blob as a Number"
-msgstr "E974: Кори�ти �е Blob као Number"
-
-msgid "E891: Using a Funcref as a Float"
-msgstr "E891: Кори�ти �е Funcref као Float"
-
-msgid "E892: Using a String as a Float"
-msgstr "E892: Кори�ти �е String као Float"
-
-msgid "E893: Using a List as a Float"
-msgstr "E893: Кори�ти �е List као Float"
-
-msgid "E894: Using a Dictionary as a Float"
-msgstr "E894: Кори�ти �е Dictionary као Float"
-
-msgid "E907: Using a special value as a Float"
-msgstr "E907: Кори�ти �е �пецијална вредно�т као Float"
-
-msgid "E911: Using a Job as a Float"
-msgstr "E911: Кори�ти �е Job као Float"
-
-msgid "E914: Using a Channel as a Float"
-msgstr "E914: Кори�ти �е Channel као Float"
-
-msgid "E975: Using a Blob as a Float"
-msgstr "E975: Кори�ти �е Blob као Float"
-
-msgid "E729: using Funcref as a String"
-msgstr "E729: кори�ти �е Funcref као String"
-
-msgid "E730: using List as a String"
-msgstr "E730: кори�ти �е List као String"
-
-msgid "E731: using Dictionary as a String"
-msgstr "E731: кори�ти �е Dictionary као String"
-
-msgid "E976: using Blob as a String"
-msgstr "E976: коришћење Blob као String"
-
-msgid "E908: using an invalid value as a String"
-msgstr "E908: кори�ти �е недозвољена вредно�т као String"
-
 msgid "E698: variable nested too deep for making a copy"
 msgstr "E698: променљива је предубоко угњеждена да би �е направила копија"
 
@@ -860,29 +763,8 @@
 "\n"
 "\tПо�ледње по�тављено из "
 
-msgid " line "
-msgstr " линија "
-
-msgid "E977: Can only compare Blob with Blob"
-msgstr "E977: Blob може да �е пореди �амо �а Blob"
-
-msgid "E691: Can only compare List with List"
-msgstr "E691: List може да �е пореди �амо �а List"
-
-msgid "E692: Invalid operation for List"
-msgstr "E692: �еи�правна операција за List"
-
-msgid "E735: Can only compare Dictionary with Dictionary"
-msgstr "E735: Dictionary може да �е пореди �амо �а Dictionary"
-
-msgid "E736: Invalid operation for Dictionary"
-msgstr "E736: �еи�правна операција за Dictionary"
-
-msgid "E694: Invalid operation for Funcrefs"
-msgstr "E694: �еи�правна операција за Funcrefs"
-
 msgid "E808: Number or Float required"
-msgstr "E808: Захтева �е Number или Float"
+msgstr "E808: Захтева �е Број или Покретни"
 
 #, c-format
 msgid "E158: Invalid buffer name: %s"
@@ -926,39 +808,14 @@
 msgid "E727: Start past end"
 msgstr "E727: Почетак иза краја"
 
-msgid "E240: No connection to the X server"
-msgstr "E240: �ема везе �а X �ервером"
-
-#, c-format
-msgid "E241: Unable to send to %s"
-msgstr "E241: Слање ка %s није могуће"
-
-msgid "E277: Unable to read a server reply"
-msgstr "E277: �е може да �е прочита одговор �ервера"
-
-msgid "E941: already started a server"
-msgstr "E941: �ервер је већ покренут"
-
-msgid "E942: +clientserver feature not available"
-msgstr "E942: Могућно�т +clientserver није до�тупна"
-
-msgid "E258: Unable to send to client"
-msgstr "E258: Слање ка клијенту није могуће"
-
 #, c-format
 msgid "E962: Invalid action: '%s'"
 msgstr "E962: �еи�правна акција: '%s'"
 
-msgid "(Invalid)"
-msgstr "(�еи�правно)"
-
 #, c-format
 msgid "E935: invalid submatch number: %d"
 msgstr "E935: неи�праван број подпоклапања: %d"
 
-msgid "E18: Unexpected characters in :let"
-msgstr "E18: �еочекивани карактери у :let"
-
 msgid "E991: cannot use =<< here"
 msgstr "E991: овде не може да �е кори�ти =<<"
 
@@ -972,8 +829,8 @@
 msgid "E990: Missing end marker '%s'"
 msgstr "E990: �едо�таје маркер краја '%s'"
 
-msgid "E985: .= is not supported with script version 2"
-msgstr "E985: .= није подржано �а �крипт верзијом 2"
+msgid "E985: .= is not supported with script version >= 2"
+msgstr "E985: .= није подржано �а �крипт верзијом >= 2"
 
 msgid "E687: Less targets than List items"
 msgstr "E687: Мање одредишта него �тавки Ли�те"
@@ -981,8 +838,8 @@
 msgid "E688: More targets than List items"
 msgstr "E688: Више одредишта него �тавки Ли�те"
 
-msgid "Double ; in list of variables"
-msgstr "Дупле ; у ли�ти променљивих"
+msgid "E452: Double ; in list of variables"
+msgstr "E452: Дво�труке ; у ли�ти променљивих"
 
 #, c-format
 msgid "E738: Can't list variables for %s"
@@ -991,9 +848,6 @@
 msgid "E996: Cannot lock an environment variable"
 msgstr "E996: Променљива окружења не може да �е закључа"
 
-msgid "E996: Cannot lock an option"
-msgstr "E996: Опција не може да �е закључа"
-
 msgid "E996: Cannot lock a register"
 msgstr "E996: Реги�тар не може да �е закључа"
 
@@ -1001,12 +855,8 @@
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: �е по�тоји таква променљива: \"%s\""
 
-#, c-format
-msgid "E940: Cannot lock or unlock variable %s"
-msgstr "E940: �е може да �е откључа или закључа променљива %s"
-
 msgid "E743: variable nested too deep for (un)lock"
-msgstr "E743: променљива је угњеждена �увише дубоко да би �е за(от)кључала"
+msgstr "E743: променљива је угњеждена �увише дубоко да би �е (за/от)кључала"
 
 #, c-format
 msgid "E963: setting %s to value with wrong type"
@@ -1097,11 +947,11 @@
 
 #, c-format
 msgid "Swap file \"%s\" exists, overwrite anyway?"
-msgstr "Swap фајл \"%s\" по�тоји, да га препишем у �ваком �лучају?"
+msgstr "Привремени фајл \"%s\" по�тоји, да га препишем у �ваком �лучају?"
 
 #, c-format
 msgid "E768: Swap file exists: %s (:silent! overrides)"
-msgstr "E768: Swap фајл по�тоји: %s (:silent! премошћава)"
+msgstr "E768: Привремени фајл по�тоји: %s (:silent! премошћава)"
 
 #, c-format
 msgid "E141: No file name for buffer %ld"
@@ -1197,45 +1047,6 @@
 msgid "Pattern not found: %s"
 msgstr "Шаблон није пронађен: %s"
 
-msgid "E478: Don't panic!"
-msgstr "E478: �е паничите!"
-
-#, c-format
-msgid "E661: Sorry, no '%s' help for %s"
-msgstr "E661: Жао нам је, нема '%s' помоћи за %s"
-
-#, c-format
-msgid "E149: Sorry, no help for %s"
-msgstr "E149: Жао нам је, нема помоћи за %s"
-
-#, c-format
-msgid "Sorry, help file \"%s\" not found"
-msgstr "Жао нам је, фајл помоћи \"%s\" није пронађен"
-
-#, c-format
-msgid "E151: No match: %s"
-msgstr "E151: �ема подударања: %s"
-
-#, c-format
-msgid "E152: Cannot open %s for writing"
-msgstr "E152: %s не може да �е отвори за упи�"
-
-#, c-format
-msgid "E153: Unable to open %s for reading"
-msgstr "E153: %s не може да �е отвори за читање"
-
-#, c-format
-msgid "E670: Mix of help file encodings within a language: %s"
-msgstr "E670: Помешано је више кодирања фајлова помоћи за језик: %s"
-
-#, c-format
-msgid "E154: Duplicate tag \"%s\" in file %s/%s"
-msgstr "E154: Дуплирана ознака \"%s\" у фајлу %s/%s"
-
-#, c-format
-msgid "E150: Not a directory: %s"
-msgstr "E150: �ије директоријум: %s"
-
 msgid "No old files"
 msgstr "�ема �тарих фајлова"
 
@@ -1266,17 +1077,9 @@
 msgid "W21: Required python version 3.x not supported, ignoring file: %s"
 msgstr "W21: Захтевани python верзије 3.x није подржан, фајл: %s �е игнорише"
 
-#, c-format
-msgid "Current %slanguage: \"%s\""
-msgstr "Текући %sјезик: \"%s\""
-
-#, c-format
-msgid "E197: Cannot set language to \"%s\""
-msgstr "E197: Језик не може да �е по�тави на \"%s\""
-
-msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
-msgstr ""
-"Улазак у Ex режим.  Откуцајте \"visual\" да би�те прешли у �ормални режим."
+msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
+msgstr ""
+"Улазак у Ex режим.  Откуцајте \"visual\" да би�те прешли у �ормални режим."
 
 msgid "E501: At end-of-file"
 msgstr "E501: �а крају-фајла"
@@ -1316,15 +1119,15 @@
 msgid "E494: Use w or w>>"
 msgstr "E494: Кори�тите w или w>>"
 
+msgid "E943: Command table needs to be updated, run 'make cmdidxs'"
+msgstr "E943: Табела команди мора да �е о�вежи, покрените 'make cmdidxs'"
+
 msgid ""
 "INTERNAL: Cannot use EX_DFLALL with ADDR_NONE, ADDR_UNSIGNED or ADDR_QUICKFIX"
 msgstr ""
 "И�ТЕР�О: EX_DFLALL не може да �е кори�ти �а ADDR_NONE, ADDR_UNSIGNED или "
 "ADDR_QUICKFIX"
 
-msgid "E943: Command table needs to be updated, run 'make cmdidxs'"
-msgstr "E943: Табела команди мора да �е о�вежи, покрените 'make cmdidxs'"
-
 msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: Жао нам је, та команда није до�тупна у овој верзији"
 
@@ -1369,7 +1172,7 @@
 msgstr "Картица %d"
 
 msgid "No swap file"
-msgstr "�ема swap фајла"
+msgstr "�ема привременог фајла"
 
 msgid "Append File"
 msgstr "Додавање на крај Фајла"
@@ -1440,6 +1243,9 @@
 msgid "E498: no :source file name to substitute for \"<sfile>\""
 msgstr "E498: нема имена :source фајла које би заменило \"<sfile>\""
 
+msgid "E489: no call stack to substitute for \"<stack>\""
+msgstr "E489: нема �тека позива који би заменио \"<stack>\""
+
 msgid "E842: no line number to use for \"<slnum>\""
 msgstr "E842: нема броја линије који би �е кори�тио за \"<slnum>\""
 
@@ -1509,15 +1315,6 @@
 msgid "E579: :if nesting too deep"
 msgstr "E579: :if угњеждавање је �увише дубоко"
 
-msgid "E580: :endif without :if"
-msgstr "E580: :endif без :if"
-
-msgid "E581: :else without :if"
-msgstr "E581: :else без :if"
-
-msgid "E582: :elseif without :if"
-msgstr "E582: :elseif без :if"
-
 msgid "E583: multiple :else"
 msgstr "E583: више�труко :else"
 
@@ -1527,35 +1324,23 @@
 msgid "E585: :while/:for nesting too deep"
 msgstr "E585: :while/:for угњеждавање је �увише дубоко"
 
-msgid "E586: :continue without :while or :for"
-msgstr "E586: :continue без :while или :for"
-
-msgid "E587: :break without :while or :for"
-msgstr "E587: :break без :while или :for"
-
 msgid "E732: Using :endfor with :while"
 msgstr "E732: Коришћење :endfor �а :while"
 
 msgid "E733: Using :endwhile with :for"
 msgstr "E733: Коришћење :endwhile �а :for"
 
+msgid "E579: block nesting too deep"
+msgstr "E579: угњеждавање блокова је �увише дубоко"
+
 msgid "E601: :try nesting too deep"
 msgstr "E601: :try угњеждавање је �увише дубоко"
 
-msgid "E603: :catch without :try"
-msgstr "E603: :catch без :try"
-
 msgid "E604: :catch after :finally"
 msgstr "E604: :catch након :finally"
 
-msgid "E606: :finally without :try"
-msgstr "E606: :finally без :try"
-
-msgid "E607: multiple :finally"
-msgstr "E607: више�труко :finally"
-
-msgid "E602: :endtry without :try"
-msgstr "E602: :endtry без :try"
+msgid "E193: :enddef not inside a function"
+msgstr "E193: :enddef није унутар функције"
 
 msgid "E193: :endfunction not inside a function"
 msgstr "E193: :endfunction није унутар функције"
@@ -1666,11 +1451,11 @@
 msgstr[2] "%ld линија, "
 
 #, c-format
-msgid "%lld character"
-msgid_plural "%lld characters"
-msgstr[0] "%lld карактера"
-msgstr[1] "%lld карактера"
-msgstr[2] "%lld карактера"
+msgid "%lld byte"
+msgid_plural "%lld bytes"
+msgstr[0] "%lld бајт"
+msgstr[1] "%lld бајта"
+msgstr[2] "%lld бајтова"
 
 msgid "[noeol]"
 msgstr "[noeol]"
@@ -1757,6 +1542,9 @@
 msgid "E655: Too many symbolic links (cycle?)"
 msgstr "E655: Превише �имболичких веза (циклу�?)"
 
+msgid "writefile() first argument must be a List or a Blob"
+msgstr "Први аргумент writefile() мора бити Ли�та или Блоб"
+
 msgid "Select Directory dialog"
 msgstr "Дијалог избора директоријума"
 
@@ -1769,6 +1557,9 @@
 msgid "E338: Sorry, no file browser in console mode"
 msgstr "E338: Жао нам је, нема претраживача фајлова у конзолном режиму"
 
+msgid "no matches"
+msgstr "нема подударања"
+
 msgid "E854: path too long for completion"
 msgstr "E854: путања је �увише дугачка да би �е довршила"
 
@@ -1854,10 +1645,6 @@
 msgid "E599: Value of 'imactivatekey' is invalid"
 msgstr "E599: Вредно�т 'imactivatekey' није и�правна"
 
-#, c-format
-msgid "E254: Cannot allocate color %s"
-msgstr "E254: Боја %s не може да �е алоцира"
-
 msgid "No match at cursor, finding next"
 msgstr "�ема подударања на ме�ту кур�ора, тражи �е даље"
 
@@ -1893,15 +1680,15 @@
 msgstr ""
 "E232: �е може да �е креира BalloonEval и �а поруком и �а повратним позивом"
 
-msgid "_Cancel"
-msgstr "_Откажи"
-
 msgid "_Save"
 msgstr "_Сачувај"
 
 msgid "_Open"
 msgstr "_Отвори"
 
+msgid "_Cancel"
+msgstr "_Откажи"
+
 msgid "_OK"
 msgstr "_OK"
 
@@ -2082,6 +1869,25 @@
 msgid "Font%d width: %d"
 msgstr "Фонт%d ширина: %d"
 
+msgid "E284: Cannot set IC values"
+msgstr "E284: IC вредно�ти не могу да �е по�таве"
+
+msgid "E285: Failed to create input context"
+msgstr "E285: Креирање контек�та уно�а није у�пело"
+
+msgid "E286: Failed to open input method"
+msgstr "E286: Отварање методе уно�а није у�пело"
+
+msgid "E287: Warning: Could not set destroy callback to IM"
+msgstr ""
+"E287: Упозорење: По�тављање повратне функције за уништење IM није у�пело"
+
+msgid "E288: input method doesn't support any style"
+msgstr "E288: метод уно�а не подржава ниједан �тил"
+
+msgid "E289: input method doesn't support my preedit type"
+msgstr "E289: метод уно�а не подржава мој preedit тип"
+
 msgid "Invalid font specification"
 msgstr "�еи�правна �пецификација фонта"
 
@@ -2112,9 +1918,6 @@
 msgid "Size:"
 msgstr "Величина:"
 
-msgid "E256: Hangul automata ERROR"
-msgstr "E256: ГРЕШК� Hangul аутомата"
-
 msgid "E550: Missing colon"
 msgstr "E550: �едо�таје двотачка"
 
@@ -2208,6 +2011,45 @@
 msgid "Print job sent."
 msgstr "Задатак штампе је по�лат"
 
+msgid "E478: Don't panic!"
+msgstr "E478: �е паничите!"
+
+#, c-format
+msgid "E661: Sorry, no '%s' help for %s"
+msgstr "E661: Жао нам је, нема '%s' помоћи за %s"
+
+#, c-format
+msgid "E149: Sorry, no help for %s"
+msgstr "E149: Жао нам је, нема помоћи за %s"
+
+#, c-format
+msgid "Sorry, help file \"%s\" not found"
+msgstr "Жао нам је, фајл помоћи \"%s\" није пронађен"
+
+#, c-format
+msgid "E151: No match: %s"
+msgstr "E151: �ема подударања: %s"
+
+#, c-format
+msgid "E152: Cannot open %s for writing"
+msgstr "E152: %s не може да �е отвори за упи�"
+
+#, c-format
+msgid "E153: Unable to open %s for reading"
+msgstr "E153: %s не може да �е отвори за читање"
+
+#, c-format
+msgid "E670: Mix of help file encodings within a language: %s"
+msgstr "E670: Помешано је више кодирања фајлова помоћи за језик: %s"
+
+#, c-format
+msgid "E154: Duplicate tag \"%s\" in file %s/%s"
+msgstr "E154: Дуплирана ознака \"%s\" у фајлу %s/%s"
+
+#, c-format
+msgid "E150: Not a directory: %s"
+msgstr "E150: �ије директоријум: %s"
+
 msgid "E679: recursive loop loading syncolor.vim"
 msgstr "E679: Рекурзивна петља код учитавања syncolor.vim"
 
@@ -2248,6 +2090,9 @@
 msgid "E420: BG color unknown"
 msgstr "E420: �епозната BG боја"
 
+msgid "E453: UL color unknown"
+msgstr "E453: �епозната UL боја"
+
 #, c-format
 msgid "E421: Color name or number not recognized: %s"
 msgstr "E421: Име боје или број ни�у препознати: %s"
@@ -2272,29 +2117,6 @@
 msgid "E849: Too many highlight and syntax groups"
 msgstr "E849: Превише �интак�них и група и�тицања"
 
-#, c-format
-msgid "E799: Invalid ID: %d (must be greater than or equal to 1)"
-msgstr "E799: �еважећи ИД: %d (мора бити веће или једнако од 1)"
-
-#, c-format
-msgid "E801: ID already taken: %d"
-msgstr "E801: ИД је већ заузет: %d"
-
-msgid "E290: List or number required"
-msgstr "E290: Захтева �е ли�та или број"
-
-#, c-format
-msgid "E802: Invalid ID: %d (must be greater than or equal to 1)"
-msgstr "E802: �еважећи ИД: %d (мора бити веће или једнако од 1)"
-
-#, c-format
-msgid "E803: ID not found: %d"
-msgstr "E803: ИД није пронађен: %d"
-
-#, c-format
-msgid "E798: ID is reserved for \":match\": %d"
-msgstr "E798: ИД је резерви�ан за \":match\": %d"
-
 msgid "Add a new database"
 msgstr "Додај нову базу"
 
@@ -2566,7 +2388,7 @@
 msgstr "E837: Овај Vim не може да изврши :py3 након коришћења :python"
 
 msgid "E265: $_ must be an instance of String"
-msgstr "E265: $_ мора да буде ин�танца String-а"
+msgstr "E265: $_ мора да буде ин�танца Стринга"
 
 msgid ""
 "E266: Sorry, this command is disabled, the Ruby library could not be loaded."
@@ -2791,22 +2613,41 @@
 msgid "match %d"
 msgstr "подударање %d"
 
+msgid "E920: _io file requires _name to be set"
+msgstr "E920: _io фајл захтева да _name буде по�тављено"
+
+msgid "E915: in_io buffer requires in_buf or in_name to be set"
+msgstr "E915: in_io бафер захтева да in_buf или in_name буде по�тављено"
+
+#, c-format
+msgid "E918: buffer must be loaded: %s"
+msgstr "E918: бафер мора бити учитан: %s"
+
+msgid "E916: not a valid job"
+msgstr "E916: није валидан job"
+
+#, c-format
+msgid "E491: json decode error at '%s'"
+msgstr "E491: грешка json декодирања на '%s'"
+
 #, c-format
 msgid "E938: Duplicate key in JSON: \"%s\""
 msgstr "E938: Дупли кључ у JSON: \"%s\""
 
 #, c-format
 msgid "E899: Argument of %s must be a List or Blob"
-msgstr "E899: �ргумент за %s мора бити Ли�та или Blob"
+msgstr "E899: �ргумент за %s мора бити Ли�та или Блоб"
+
+msgid "E900: maxdepth must be non-negative number"
+msgstr "E900: maxdepth не �ме да буде негативан број"
+
+msgid "flatten() argument"
+msgstr "flatten() аргумент"
 
 #, c-format
 msgid "E696: Missing comma in List: %s"
 msgstr "E696: У Ли�ти недо�таје зарез: %s"
 
-#, c-format
-msgid "E697: Missing end of List ']': %s"
-msgstr "E697: �едо�таје крај Ли�те ']': %s"
-
 msgid "sort() argument"
 msgstr "sort() аргумент"
 
@@ -2822,6 +2663,9 @@
 msgid "map() argument"
 msgstr "map() аргумент"
 
+msgid "mapnew() argument"
+msgstr "mapnew() аргумент"
+
 msgid "filter() argument"
 msgstr "filter() аргумент"
 
@@ -2837,6 +2681,14 @@
 msgid "reverse() argument"
 msgstr "reverse() аргумент"
 
+#, c-format
+msgid "Current %slanguage: \"%s\""
+msgstr "Текући %sјезик: \"%s\""
+
+#, c-format
+msgid "E197: Cannot set language to \"%s\""
+msgstr "E197: Језик не може да �е по�тави на \"%s\""
+
 msgid "Unknown option argument"
 msgstr "�епознат аргумент опције"
 
@@ -3019,10 +2871,10 @@
 msgstr "-D\t\t\tDebugging режим"
 
 msgid "-n\t\t\tNo swap file, use memory only"
-msgstr "-n\t\t\tБез swap фајла, кори�ти �амо меморију"
+msgstr "-n\t\t\tБез привременог фајла, кори�ти �амо меморију"
 
 msgid "-r\t\t\tList swap files and exit"
-msgstr "-r\t\t\tИзли�тај swap фајлове и изађи"
+msgstr "-r\t\t\tИзли�тај привремене фајлове и изађи"
 
 msgid "-r (with file name)\tRecover crashed session"
 msgstr "-r (�а именом фајла)\tОбнови �рушену �е�ију"
@@ -3247,25 +3099,6 @@
 msgid "--windowid <HWND>\tOpen Vim inside another win32 widget"
 msgstr "--windowid <HWND>\tОтвори Vim унутар другог win32 виџета"
 
-msgid "No display"
-msgstr "�ема приказа"
-
-msgid ": Send failed.\n"
-msgstr ": Слање није у�пело.\n"
-
-msgid ": Send failed. Trying to execute locally\n"
-msgstr ": Слање није у�пело. Покушава �е локално извршавање\n"
-
-#, c-format
-msgid "%d of %d edited"
-msgstr "%d од %d уређено"
-
-msgid "No display: Send expression failed.\n"
-msgstr "�ема приказа: Израз �лања није у�пео.\n"
-
-msgid ": Send expression failed.\n"
-msgstr ": Израз �лања није у�пео.\n"
-
 #, c-format
 msgid "E224: global abbreviation already exists for %s"
 msgstr "E224: глобална �краћеница за %s већ по�тоји"
@@ -3291,6 +3124,9 @@
 msgid "E228: makemap: Illegal mode"
 msgstr "E228: makemap: �едозвољен режим"
 
+msgid "E460: entries missing in mapset() dict argument"
+msgstr "E460: недо�тају �тавке у mapset() dict аргументу"
+
 #, c-format
 msgid "E357: 'langmap': Matching character missing for %s"
 msgstr "E357: 'langmap': �едо�таје одговарајући карактер за %s"
@@ -3327,45 +3163,49 @@
 "\n"
 "измена лин   кол тек�т"
 
-msgid "E543: Not a valid codepage"
-msgstr "E543: �еважећа кодна �трана"
+#, c-format
+msgid "E799: Invalid ID: %d (must be greater than or equal to 1)"
+msgstr "E799: �еважећи ИД: %d (мора бити веће или једнако од 1)"
 
-msgid "E284: Cannot set IC values"
-msgstr "E284: IC вредно�ти не могу да �е по�таве"
+#, c-format
+msgid "E801: ID already taken: %d"
+msgstr "E801: ИД је већ заузет: %d"
 
-msgid "E285: Failed to create input context"
-msgstr "E285: Креирање контек�та уно�а није у�пело"
+msgid "E290: List or number required"
+msgstr "E290: Захтева �е ли�та или број"
 
-msgid "E286: Failed to open input method"
-msgstr "E286: Отварање методе уно�а није у�пело"
+#, c-format
+msgid "E802: Invalid ID: %d (must be greater than or equal to 1)"
+msgstr "E802: �еважећи ИД: %d (мора бити веће или једнако од 1)"
 
-msgid "E287: Warning: Could not set destroy callback to IM"
-msgstr ""
-"E287: Упозорење: По�тављање повратне функције за уништење IM није у�пело"
+#, c-format
+msgid "E803: ID not found: %d"
+msgstr "E803: ИД није пронађен: %d"
 
-msgid "E288: input method doesn't support any style"
-msgstr "E288: метод уно�а не подржава ниједан �тил"
+#, c-format
+msgid "E798: ID is reserved for \":match\": %d"
+msgstr "E798: ИД је резерви�ан за \":match\": %d"
 
-msgid "E289: input method doesn't support my preedit type"
-msgstr "E289: метод уно�а не подржава мој preedit тип"
+msgid "E543: Not a valid codepage"
+msgstr "E543: �еважећа кодна �трана"
 
 msgid "E293: block was not locked"
 msgstr "E293: блок није закључан"
 
 msgid "E294: Seek error in swap file read"
-msgstr "E294: Грешка код по�тављања показивача за читање swap фајла"
+msgstr "E294: Грешка код по�тављања показивача за читање из привременог фајла"
 
 msgid "E295: Read error in swap file"
-msgstr "E295: Грешка при читању swap фајла"
+msgstr "E295: Грешка при читању привременог фајла"
 
 msgid "E296: Seek error in swap file write"
-msgstr "E296: Грешка код по�тављања показивача за упи� swap фајла"
+msgstr "E296: Грешка код по�тављања показивача за упи� у привремени фајл"
 
 msgid "E297: Write error in swap file"
-msgstr "E297: Грешка при упи�у swap фајла"
+msgstr "E297: Грешка при упи�у преивременог фајла"
 
 msgid "E300: Swap file already exists (symlink attack?)"
-msgstr "E300: Swap фајл већ по�тоји (symlink напад?)"
+msgstr "E300: Привремени фајл већ по�тоји (symlink напад?)"
 
 msgid "E298: Didn't get block nr 0?"
 msgstr "E298: Блок бр 0 није добављен?"
@@ -3377,27 +3217,29 @@
 msgstr "E298: Блок бр 2 није добављен?"
 
 msgid "E843: Error while updating swap file crypt"
-msgstr "E843: Грешка приликом о�вежавања криптовања swap фајла"
+msgstr "E843: Грешка приликом о�вежавања шифрирања привременог фајла"
 
 msgid "E301: Oops, lost the swap file!!!"
-msgstr "E301: Ууп�, swap фајл је изгубљен!!!"
+msgstr "E301: Ууп�, привремени фајл је изгубљен!!!"
 
 msgid "E302: Could not rename swap file"
-msgstr "E302: Промена имена swap фајла није у�пела"
+msgstr "E302: Промена имена привременог фајла није у�пела"
 
 #, c-format
 msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
-msgstr "E303: Отварање swap фајла за \"%s\" није у�пело, опоравак је немогућ"
+msgstr ""
+"E303: Отварање привременог фајла за \"%s\" није у�пело, опоравак је немогућ"
 
 msgid "E304: ml_upd_block0(): Didn't get block 0??"
 msgstr "E304: ml_upd_block0(): Блок бр 0 није добављен??"
 
 #, c-format
 msgid "E305: No swap file found for %s"
-msgstr "E305: За %s није пронађен swap фајл"
+msgstr "E305: За %s није пронађен привремени фајл"
 
 msgid "Enter number of swap file to use (0 to quit): "
-msgstr "Уне�ите број swap фајла који ће да �е кори�ти (0 за отказивање): "
+msgstr ""
+"Уне�ите број привременог фајла који ће да �е кори�ти (0 за отказивање): "
 
 #, c-format
 msgid "E306: Cannot open %s"
@@ -3411,17 +3253,17 @@
 "Maybe no changes were made or Vim did not update the swap file."
 msgstr ""
 "\n"
-"Можда ни�у направљене никакве измене или Vim није о�вежио swap фајл."
+"Можда ни�у направљене никакве измене или Vim није о�вежио привремени фајл."
 
 msgid " cannot be used with this version of Vim.\n"
 msgstr " не може да �е кори�ти �а овом верзијом Vim-а.\n"
 
 msgid "Use Vim version 3.0.\n"
-msgstr "Кори�тите Vim верзијe 3.0.\n"
+msgstr "Кори�ти �е Vim верзијe 3.0.\n"
 
 #, c-format
 msgid "E307: %s does not look like a Vim swap file"
-msgstr "E307: %s не изгледа као Vim swap фајл"
+msgstr "E307: %s не изгледа као Vim привремени фајл"
 
 msgid " cannot be used on this computer.\n"
 msgstr " не може да �е кори�ти на овом компјутеру.\n"
@@ -3446,7 +3288,7 @@
 
 #, c-format
 msgid "Using swap file \"%s\""
-msgstr "Кори�ти �е swap фајл \"%s\""
+msgstr "Кори�ти �е привремени фајл \"%s\""
 
 #, c-format
 msgid "Original file \"%s\""
@@ -3457,7 +3299,7 @@
 
 #, c-format
 msgid "Swap file is encrypted: \"%s\""
-msgstr "Swap фајл је шифрован: \"%s\""
+msgstr "Привремени фајл је шифрован: \"%s\""
 
 msgid ""
 "\n"
@@ -3486,7 +3328,7 @@
 "to use the same key for text file and swap file"
 msgstr ""
 "\n"
-"да би�те кори�тили и�ти кључ за тек�т фајл и swap фајл"
+"да би�те кори�тили и�ти кључ за тек�т фајл и привремени фајл"
 
 #, c-format
 msgid "E309: Unable to read block 1 from %s"
@@ -3550,18 +3392,23 @@
 
 msgid ""
 "\n"
-"You may want to delete the .swp file now.\n"
-"\n"
+"You may want to delete the .swp file now."
 msgstr ""
 "\n"
-"Сада можда желите да обришете .swp фајл.\n"
+"Сада би могли да обришете .swp фајл."
+
+msgid ""
+"\n"
+"Note: process STILL RUNNING: "
+msgstr ""
 "\n"
+"�апомена: проце� �е ЈОШ УВЕК ИЗВРШ�В�: "
 
 msgid "Using crypt key from swap file for the text file.\n"
-msgstr "За тек�т фајл �е кори�ти кључ за шифрирање из swap фајла.\n"
+msgstr "За тек�т фајл �е кори�ти кључ за шифрирање из привременог фајла.\n"
 
 msgid "Swap files found:"
-msgstr "Пронађени �у swap фајлови:"
+msgstr "Пронађени �у привремени фајлови:"
 
 msgid "   In current directory:\n"
 msgstr "   У текућем директоријуму:\n"
@@ -3575,9 +3422,6 @@
 msgid "      -- none --\n"
 msgstr "      -- ниједан --\n"
 
-msgid "%a %b %d %H:%M:%S %Y"
-msgstr "%a %b %d %H:%M:%S %Y"
-
 msgid "          owned by: "
 msgstr "          који по�едује: "
 
@@ -3591,7 +3435,7 @@
 msgstr "         [од Vim верзије 3.0]"
 
 msgid "         [does not look like a Vim swap file]"
-msgstr "         [не изгледа као Vim swap фајл]"
+msgstr "         [не изгледа као Vim привремени фајл]"
 
 msgid "         file name: "
 msgstr "         име фајла: "
@@ -3657,13 +3501,13 @@
 msgstr "         [не може да �е отвори]"
 
 msgid "E313: Cannot preserve, there is no swap file"
-msgstr "E313: �е може да �е презервира, нема swap фајла"
+msgstr "E313: �е може да �е очува, нема привременог фајла"
 
 msgid "File preserved"
-msgstr "Фајл је презервиран"
+msgstr "Фајл је очуван"
 
 msgid "E314: Preserve failed"
-msgstr "E314: Презервација није у�пела"
+msgstr "E314: Очување није у�пело"
 
 #, c-format
 msgid "E315: ml_get: invalid lnum: %ld"
@@ -3724,7 +3568,7 @@
 "Found a swap file by the name \""
 msgstr ""
 "\n"
-"Пронађен је swap фајл под именом \""
+"Пронађен је привремени фајл под именом \""
 
 msgid "While opening file \""
 msgstr "Док �е отварао фајл \""
@@ -3733,7 +3577,7 @@
 msgstr "      �ИЈЕ ПРО��ЂЕ�О"
 
 msgid "      NEWER than swap file!\n"
-msgstr "      �ОВИЈИ од swap фајла!\n"
+msgstr "      �ОВИЈИ од привременог фајла!\n"
 
 msgid ""
 "\n"
@@ -3760,7 +3604,7 @@
 "    да опоравите измене (погледајте \":help recovery\").\n"
 
 msgid "    If you did this already, delete the swap file \""
-msgstr "    �ко �те ово већ учинили, обришите swap фајл \""
+msgstr "    �ко �те ово већ учинили, обришите привремени фајл \""
 
 msgid ""
 "\"\n"
@@ -3770,10 +3614,10 @@
 "    како би избегли ову поруку.\n"
 
 msgid "Found a swap file that is not useful, deleting it"
-msgstr "Пронађен је бе�кори�тан swap фајл, брише �е"
+msgstr "Пронађен је бе�кори�тан привремени фајл, брише �е"
 
 msgid "Swap file \""
-msgstr "Swap фајл \""
+msgstr "Привремени фајл \""
 
 msgid "\" already exists!"
 msgstr "\" већ по�тоји!"
@@ -3782,7 +3626,7 @@
 msgstr "VIM - П�ЖЊ�"
 
 msgid "Swap file already exists!"
-msgstr "Swap фајл већ по�тоји!"
+msgstr "Привремени фајл већ по�тоји!"
 
 msgid ""
 "&Open Read-Only\n"
@@ -3813,7 +3657,7 @@
 "&Прекини"
 
 msgid "E326: Too many swap files found"
-msgstr "E326: Пронађено је превише swap фајлова"
+msgstr "E326: Пронађено је превише привремених фајлова"
 
 msgid "E327: Part of menu-item path is not sub-menu"
 msgstr "E327: Део путање �тавке менија није подмени"
@@ -3862,6 +3706,10 @@
 msgstr "E337: Мени није пронађен - проверите имена менија"
 
 #, c-format
+msgid "Error detected while compiling %s:"
+msgstr "Откривена је грешка током компајлирања %s:"
+
+#, c-format
 msgid "Error detected while processing %s:"
 msgstr "Откривена је грешка током обраде %s:"
 
@@ -3919,16 +3767,16 @@
 msgstr "E766: �едовољно аргумената за printf()"
 
 msgid "E807: Expected Float argument for printf()"
-msgstr "E807: Очекује �е Float аргумент за printf()"
+msgstr "E807: Очекује �е аргумент типа Покретни за printf()"
 
 msgid "E767: Too many arguments to printf()"
 msgstr "E767: Сувише аргумената за printf()"
 
-msgid "Type number and <Enter> or click with mouse (empty cancels): "
-msgstr "Уне�ите број и <Ентер> или кликните мишем (ништа за отказ): "
+msgid "Type number and <Enter> or click with the mouse (q or empty cancels): "
+msgstr "Уне�ите број и <Ентер> или кликните мишем (q или ништа за отказ): "
 
-msgid "Type number and <Enter> (empty cancels): "
-msgstr "Уне�ите број и <Ентер> (ништа за отказ): "
+msgid "Type number and <Enter> (q or empty cancels): "
+msgstr "Уне�ите број и <Ентер> (q или ништа за отказ): "
 
 #, c-format
 msgid "%ld more line"
@@ -3953,13 +3801,6 @@
 msgid "E677: Error writing temp file"
 msgstr "E677: Грешка при упи�у temp фајла"
 
-#, c-format
-msgid "%ld second ago"
-msgid_plural "%ld seconds ago"
-msgstr[0] "пре %ld �екунде"
-msgstr[1] "пре %ld �екунде"
-msgstr[2] "пре %ld �екунди"
-
 msgid "ERROR: "
 msgstr "ГРЕШК�: "
 
@@ -4076,6 +3917,13 @@
 msgstr[2] "%ld линија је промењено"
 
 #, c-format
+msgid "%d line changed"
+msgid_plural "%d lines changed"
+msgstr[0] "%d линија је промењена"
+msgstr[1] "%d линије је промењено"
+msgstr[2] "%d линија је промењено"
+
+#, c-format
 msgid "%ld Cols; "
 msgstr "%ld Кол; "
 
@@ -4123,7 +3971,8 @@
 msgstr "E520: �ије довољено у режим�кој линији"
 
 msgid "E992: Not allowed in a modeline when 'modelineexpr' is off"
-msgstr "E992: �ије дозвољено у режим�кој линији када је 'modelineexpr' и�кључена"
+msgstr ""
+"E992: �ије дозвољено у режим�кој линији када је 'modelineexpr' и�кључена"
 
 msgid "E846: Key code not set"
 msgstr "E846: �ије по�тављeн код та�тера"
@@ -4205,7 +4054,6 @@
 msgid "E540: Unclosed expression sequence"
 msgstr "E540: �из израза није затворен"
 
-
 msgid "E542: unbalanced groups"
 msgstr "E542: неуравнотежене групе"
 
@@ -4250,8 +4098,10 @@
 msgid "E528: Must specify a ' value"
 msgstr "E528: Мора да �е наведе ' вредно�т"
 
-msgid "E595: contains unprintable or wide character"
-msgstr "E595: �адржи карактер који не може да �е одштампа, или широки карактер"
+msgid "E595: 'showbreak' contains unprintable or wide character"
+msgstr ""
+"E595: 'showbreak' �адржи карактер који не може да �е одштампа, или широки "
+"карактер"
 
 msgid "E596: Invalid font(s)"
 msgstr "E596: �еи�правни фонт(ови)"
@@ -4503,8 +4353,11 @@
 msgid "shell returned %d"
 msgstr "командно окружење је вратило %d"
 
-msgid "E278: Cannot put a terminal buffer in a popup window"
-msgstr "E278: Терминал�ки бафер не може да �е �тави у и�качући прозор"
+msgid "E861: Cannot open a second popup with a terminal"
+msgstr "E861: Са терминалом није могуће да �е отвори други и�качући прозор"
+
+msgid "E450: buffer number, text or a list required"
+msgstr "E450: Захтева број бафера Број или Покретни"
 
 #, c-format
 msgid "E997: Tabpage not found: %d"
@@ -4517,22 +4370,28 @@
 msgid "E994: Not allowed in a popup window"
 msgstr "E994: �ије дозвољено у и�качућем прозору"
 
+msgid "E863: Not allowed for a terminal in a popup window"
+msgstr "E863: За терминал није дозвољено у и�качућем прозору"
+
 msgid "E750: First use \":profile start {fname}\""
-msgstr "E750: �ајпре кори�тите \":profile start {fname}\""
+msgstr "E750: �ајпре употребите „:profile start {имеф}�"
 
 msgid "E553: No more items"
 msgstr "E553: �ема више �тавки"
 
+msgid "E925: Current quickfix list was changed"
+msgstr "E925: Текућа quickfix ли�та је измењена"
+
 msgid "E926: Current location list was changed"
-msgstr "E926: Текућа ли�та локација је промењена"
+msgstr "E926: Текућа ли�та локација је измењена"
 
 #, c-format
 msgid "E372: Too many %%%c in format string"
-msgstr "E372: Превише %%%c �трингу формата"
+msgstr "E372: Превише %%%c у �трингу формата"
 
 #, c-format
 msgid "E373: Unexpected %%%c in format string"
-msgstr "E373: �еочекивано %%%c �трингу формата"
+msgstr "E373: �еочекивано %%%c у �трингу формата"
 
 msgid "E374: Missing ] in format string"
 msgstr "E374: �едо�таје ] у �трингу формата"
@@ -4558,9 +4417,6 @@
 msgid "E924: Current window was closed"
 msgstr "E924: Текући прозор је затворен"
 
-msgid "E925: Current quickfix was changed"
-msgstr "E925: Текући quickfix је промењен"
-
 #, c-format
 msgid "(%d of %d)%s%s: "
 msgstr "(%d од %d)%s%s: "
@@ -4591,11 +4447,14 @@
 msgid "Cannot open file \"%s\""
 msgstr "Фајл \"%s\" не може да �е отвори"
 
+msgid "cannot have both a list and a \"what\" argument"
+msgstr "не може да �е има и ли�та и \"what\" аргумент"
+
 msgid "E681: Buffer is not loaded"
 msgstr "E681: Бафер није учитан"
 
 msgid "E777: String or List expected"
-msgstr "E777: Очекује �е String или List"
+msgstr "E777: Очекује �е Стринг или Ли�та"
 
 #, c-format
 msgid "E927: Invalid action: '%s'"
@@ -4645,22 +4504,26 @@
 msgstr "E956: Шаблон не може да �е кори�ти рекурзивно"
 
 #, c-format
+msgid "E654: missing delimiter after search pattern: %s"
+msgstr "E654: недо�таје граничник иза шаблона претраге: %s"
+
+#, c-format
 msgid "E554: Syntax error in %s{...}"
 msgstr "E554: Синтак�на грешка у %s{...}"
 
 #, c-format
 msgid "E888: (NFA regexp) cannot repeat %s"
-msgstr "E888: (NFA regexp) не може да �е понови %s"
+msgstr "E888: (�К� регизраз) не може да �е понови %s"
 
 msgid ""
 "E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
 "used "
 msgstr ""
 "E864: Иза \\%#= може да �леди једино 0, 1, или 2. Кори�тиће �е аутомат�ки "
-"енџин "
+"механизам "
 
 msgid "Switching to backtracking RE engine for pattern: "
-msgstr "Пребацивање на backtracking RE енџин за шаблон: "
+msgstr "Пребацивање на РИ механизам �а погледом уназад за шаблон: "
 
 msgid "E65: Illegal back reference"
 msgstr "E65: �еважећа повратна референца"
@@ -4713,51 +4576,51 @@
 msgstr "E339: Шаблон је предугачак"
 
 msgid "External submatches:\n"
-msgstr "Спољна подпоклапања:\n"
+msgstr "Спољна под-подударања:\n"
 
 msgid "E865: (NFA) Regexp end encountered prematurely"
-msgstr "E865: Крај (NFA) Regexp израза је до�тигнут прерано"
+msgstr "E865: (�К�) прерано је до�тигнут крај регизраза"
 
 #, c-format
 msgid "E866: (NFA regexp) Misplaced %c"
-msgstr "E866: (NFA regexp) %c је на погрешном ме�ту"
+msgstr "E866: (�К� регизраз) %c је на погрешном ме�ту"
 
 #, c-format
 msgid "E877: (NFA regexp) Invalid character class: %d"
-msgstr "E877: (NFA regexp) �еважећа карактер кла�а: %d"
-
-#, c-format
-msgid "E867: (NFA) Unknown operator '\\z%c'"
-msgstr "E867: (NFA) �епознати оператор '\\z%c'"
+msgstr "E877: (�К� регизраз) �еважећа карактер кла�а: %d"
 
 msgid "E951: \\% value too large"
 msgstr "E951: Вредно�т \\% је предугачка"
 
 #, c-format
-msgid "E867: (NFA) Unknown operator '\\%%%c'"
-msgstr "E867: (NFA) �епознати оператор '\\%%%c'"
+msgid "E867: (NFA) Unknown operator '\\z%c'"
+msgstr "E867: (�К�) �епознати оператор '\\z%c'"
+
+#, c-format
+msgid "E867: (NFA) Unknown operator '\\%%%c'"
+msgstr "E867: (�К�) �епознати оператор '\\%%%c'"
 
 msgid "E868: Error building NFA with equivalence class!"
-msgstr "E868: Грешка при грађењу NFA �а кла�ом еквиваленције!"
+msgstr "E868: Грешка при грађењу �К� �а кла�ом еквиваленције!"
 
 #, c-format
 msgid "E869: (NFA) Unknown operator '\\@%c'"
-msgstr "E869: (NFA) �епознати оператор '\\@%c'"
+msgstr "E869: (�К�) �епознати оператор '\\@%c'"
 
 msgid "E870: (NFA regexp) Error reading repetition limits"
-msgstr "E870: (NFA regexp) Грешка при читању граница понављања"
+msgstr "E870: (�К� регизраз) Грешка при читању граница понављања"
 
 msgid "E871: (NFA regexp) Can't have a multi follow a multi"
-msgstr "E871: (NFA regexp) Мулти не може �леди иза мулти"
+msgstr "E871: (�К� регизраз) Мулти не може �леди иза мулти"
 
 msgid "E872: (NFA regexp) Too many '('"
-msgstr "E872: (NFA regexp) Превише '('"
+msgstr "E872: (�К� регизраз) Превише '('"
 
 msgid "E879: (NFA regexp) Too many \\z("
-msgstr "E879: (NFA regexp) Превише \\z("
+msgstr "E879: (�К� регизраз) Превише \\z("
 
 msgid "E873: (NFA regexp) proper termination error"
-msgstr "E873: (NFA regexp) грешка правилне терминације"
+msgstr "E873: (�К� регизраз) грешка правилне терминације"
 
 msgid "Could not open temporary log file for writing, displaying on stderr... "
 msgstr ""
@@ -4765,21 +4628,21 @@
 "stderr... "
 
 msgid "E874: (NFA) Could not pop the stack!"
-msgstr "E874: (NFA) Скидање �а �тека није у�пело!"
+msgstr "E874: (�К�) Скидање �а �тека није у�пело!"
 
 msgid ""
 "E875: (NFA regexp) (While converting from postfix to NFA), too many states "
 "left on stack"
 msgstr ""
-"E875: (NFA regexp) (Док је вршена конверзија из postfix у NFA), превише "
-"�тања је о�тало на �теку"
+"E875: (�К� регизраз) (Док је вршена конверзија из по�тфикног облика у �К�), "
+"превише �тања је о�тало на �теку"
 
 msgid "E876: (NFA regexp) Not enough space to store the whole NFA "
 msgstr ""
-"E876: (NFA regexp) �ема довољно про�тора да �е у�кладишти комплетан NFA "
+"E876: (�К� регизраз) �ема довољно про�тора да �е у�кладишти комплетан �К� "
 
 msgid "E878: (NFA) Could not allocate memory for branch traversal!"
-msgstr "E878: (NFA) �ије могла да �е алоцира меморија за обилазак грана!"
+msgstr "E878: (�К�) �ије могла да �е алоцира меморија за обилазак грана!"
 
 msgid "E748: No previously used register"
 msgstr "E748: �ема претходно коришћеног реги�тра"
@@ -5074,9 +4937,6 @@
 msgid " (not supported)"
 msgstr " (није подржано)"
 
-msgid "E756: Spell checking is not enabled"
-msgstr "E756: Провера правопи�а није омогућена"
-
 #, c-format
 msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
 msgstr ""
@@ -5326,43 +5186,47 @@
 msgstr "Читање фајла речи %s..."
 
 #, c-format
-msgid "Duplicate /encoding= line ignored in %s line %d: %s"
-msgstr "Дупликат /encoding= линија је игнори�ана у %s линија %d: %s"
+msgid "Conversion failure for word in %s line %ld: %s"
+msgstr "�еу�пешна конверзија за реч у %s линија %ld: %s"
+
+#, c-format
+msgid "Duplicate /encoding= line ignored in %s line %ld: %s"
+msgstr "Дупликат /encoding= линије sе игнорише у %s линија %ld: %s"
 
 #, c-format
-msgid "/encoding= line after word ignored in %s line %d: %s"
-msgstr "/encoding= линија након речи је игнори�ана у %s линија %d: %s"
+msgid "/encoding= line after word ignored in %s line %ld: %s"
+msgstr "/encoding= линија након речи �е игнорише у %s линија %ld: %s"
 
 #, c-format
-msgid "Duplicate /regions= line ignored in %s line %d: %s"
-msgstr "Дупликат /regions= линија је игнори�ана у %s линија %d: %s"
+msgid "Duplicate /regions= line ignored in %s line %ld: %s"
+msgstr "Дупликат /regions= линије �е игнорише у %s линија %ld: %s"
 
 #, c-format
-msgid "Too many regions in %s line %d: %s"
-msgstr "Превише региона у %s линија %d: %s"
+msgid "Too many regions in %s line %ld: %s"
+msgstr "Превише региона у %s линија %ld: %s"
 
 #, c-format
-msgid "/ line ignored in %s line %d: %s"
-msgstr "/ линија игнори�ана у %s линија %d: %s"
+msgid "/ line ignored in %s line %ld: %s"
+msgstr "/ линија �е игнорише у %s линија %ld: %s"
 
 #, c-format
-msgid "Invalid region nr in %s line %d: %s"
-msgstr "�еважећи број региона у %s линија %d: %s"
+msgid "Invalid region nr in %s line %ld: %s"
+msgstr "�еважећи број региона у %s линија %ld: %s"
 
 #, c-format
-msgid "Unrecognized flags in %s line %d: %s"
-msgstr "�епрепознати индикатори у %s линија %d: %s"
+msgid "Unrecognized flags in %s line %ld: %s"
+msgstr "�епрепознатe за�тавице у %s линија %ld: %s"
 
 #, c-format
 msgid "Ignored %d words with non-ASCII characters"
-msgstr "Игнори�ано је %d рћи �а не-ASCII карактерима"
+msgstr "Игнори�ано је %d речи �а не-ASCII карактерима"
 
 msgid "E845: Insufficient memory, word list will be incomplete"
 msgstr "E845: �едовољно меморије, ли�та речи неће бити комплетна"
 
 #, c-format
-msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
-msgstr "Компре�овано је %d од %d чворова; прео�тало је још %d (%d%%)"
+msgid "Compressed %s: %ld of %ld nodes; %ld (%ld%%) remaining"
+msgstr "Компре�овано је %s: %ld од %ld чворова; прео�тало је још %ld (%ld%%)"
 
 msgid "Reading back spell file..."
 msgstr "Читање правопи�ног фајла..."
@@ -5440,8 +5304,12 @@
 msgid " < \"%.*s\""
 msgstr " < \"%.*s\""
 
+#, c-format
+msgid "E390: Illegal argument: %s"
+msgstr "E390: �еважећи аргумент: %s"
+
 msgid "No Syntax items defined for this buffer"
-msgstr "Синтак�не �тавке ни�у дефини�ане за овај бафер"
+msgstr "�иједна �интак�на �тавка није дефини�ана за овај бафер"
 
 msgid "'redrawtime' exceeded, syntax highlighting disabled"
 msgstr "Прекорачено је 'redrawtime', и�тицање �интак�е је и�кључено"
@@ -5452,34 +5320,36 @@
 msgid "syntax conceal off"
 msgstr "�интак�но �кривање и�кључено"
 
-#, c-format
-msgid "E390: Illegal argument: %s"
-msgstr "E390: �еважећи аргумент: %s"
-
 msgid "syntax case ignore"
 msgstr "мала/велика �лова �е не разликују у �интак�и"
 
 msgid "syntax case match"
 msgstr "мала/велика �лова �е разликују у �интак�и"
 
+msgid "syntax foldlevel start"
+msgstr "�интак�ни foldlevel start"
+
+msgid "syntax foldlevel minimum"
+msgstr "�интак�ни foldlevel minimum"
+
 msgid "syntax spell toplevel"
-msgstr "�интак�а правопи�а toplevel"
+msgstr "�интак�ни правопи� toplevel"
 
 msgid "syntax spell notoplevel"
-msgstr "�интак�а правопи�а notoplevel"
+msgstr "�интак�ни правопи� notoplevel"
 
 msgid "syntax spell default"
-msgstr "�интак�а правопи�а подразумевано"
+msgstr "�интак�ни правопи� подразумевано"
 
 msgid "syntax iskeyword "
-msgstr "�интак�а iskeyword "
+msgstr "�интак�на iskeyword "
 
 msgid "syntax iskeyword not set"
-msgstr "�интак�а iskeyword није по�тављена"
+msgstr "�интак�на iskeyword није по�тављена"
 
 #, c-format
 msgid "E391: No such syntax cluster: %s"
-msgstr "E391: �е по�тоји такав �интак�ни кла�тер: %s"
+msgstr "E391: �е по�тоји таква �интак�на �купина: %s"
 
 msgid "syncing on C-style comments"
 msgstr "�инхронизација на коментарима C-�тила"
@@ -5487,6 +5357,9 @@
 msgid "no syncing"
 msgstr "без �инхронизације"
 
+msgid "syncing starts at the first line"
+msgstr "�инхронизација почиње од прве линије"
+
 msgid "syncing starts "
 msgstr "�инхронизација почиње "
 
@@ -5512,12 +5385,15 @@
 "--- Syntax items ---"
 msgstr ""
 "\n"
-"--- Ставке �интак�е ---"
+"--- Синтак�не �тавке ---"
 
 #, c-format
 msgid "E392: No such syntax cluster: %s"
 msgstr "E392: не по�тоји такав �интак�ни кла�тер: %s"
 
+msgid "from the first line"
+msgstr "од прве линије"
+
 msgid "minimal "
 msgstr "минимално "
 
@@ -5659,7 +5535,7 @@
 msgstr "E429: Фајл \"%s\" не по�тоји"
 
 msgid "  # pri kind tag"
-msgstr "  # pri ознака вр�та"
+msgstr "  # при вр�та ознака"
 
 msgid "file\n"
 msgstr "фајл\n"
@@ -5679,9 +5555,6 @@
 msgid "E430: Tag file path truncated for %s\n"
 msgstr "E430: Путања фајла ознака је прекинута за %s\n"
 
-msgid "Ignoring long line in tags file"
-msgstr "Дугачка линија у фајлу ознака �е игнорише"
-
 #, c-format
 msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Грешка формата у фајлу ознака \"%s\""
@@ -5697,6 +5570,9 @@
 msgid "E433: No tags file"
 msgstr "E433: �ема фајла ознака"
 
+msgid "Ignoring long line in tags file"
+msgstr "Дугачка линија у фајлу ознака �е игнорише"
+
 msgid "E434: Can't find tag pattern"
 msgstr "E434: �е може да �е пронађе шаблон ознаке"
 
@@ -5802,6 +5678,9 @@
 msgid "E968: Need at least one of 'id' or 'type'"
 msgstr "E968: �еопхпдан је бар један од 'id' или 'type'"
 
+msgid "E860: Need 'id' and 'type' with 'both'"
+msgstr "E860: 'id' и 'type' �у потребни уз 'both'"
+
 #, c-format
 msgid "E969: Property type %s already defined"
 msgstr "E969: Тип о�обине %s је већ дефини�ан"
@@ -5810,15 +5689,121 @@
 msgid "E970: Unknown highlight group name: '%s'"
 msgstr "E970: �епознато име групе и�тицања: '%s'"
 
+msgid "(Invalid)"
+msgstr "(�еи�правно)"
+
+msgid "%a %b %d %H:%M:%S %Y"
+msgstr "%a %b %d %H:%M:%S %Y"
+
+#, c-format
+msgid "%ld second ago"
+msgid_plural "%ld seconds ago"
+msgstr[0] "пре %ld �екунде"
+msgstr[1] "пре %ld �екунде"
+msgstr[2] "пре %ld �екунди"
+
+msgid "E805: Using a Float as a Number"
+msgstr "E805: Покретни �е кори�ти као Број"
+
+msgid "E703: Using a Funcref as a Number"
+msgstr "E703: Funcref �е кори�ти као Број"
+
+msgid "E745: Using a List as a Number"
+msgstr "E745: Ли�та �е кори�ти као Број"
+
+msgid "E728: Using a Dictionary as a Number"
+msgstr "E728: Речник �е кори�ти као Број"
+
+msgid "E611: Using a Special as a Number"
+msgstr "E611: Специјал �е кори�ти као Број"
+
+msgid "E910: Using a Job as a Number"
+msgstr "E910: По�ао �е кори�ти као Број"
+
+msgid "E913: Using a Channel as a Number"
+msgstr "E913: Канал �е кори�ти као Број"
+
+msgid "E974: Using a Blob as a Number"
+msgstr "E974: Блоб �е кори�ти као Број"
+
+msgid "E891: Using a Funcref as a Float"
+msgstr "E891: Funcref �е кори�ти као Покретни"
+
+msgid "E892: Using a String as a Float"
+msgstr "E892: Стринг �е кори�ти као Покретни"
+
+msgid "E893: Using a List as a Float"
+msgstr "E893: Ли�та �е кори�ти као Покретни"
+
+msgid "E894: Using a Dictionary as a Float"
+msgstr "E894: Речник �е кори�ти као Покретни"
+
+msgid "E362: Using a boolean value as a Float"
+msgstr "E362: Логичка вредно�т �е кори�ти као Покретни"
+
+msgid "E907: Using a special value as a Float"
+msgstr "E907: Специјална вредно�т �е кори�ти као Покретни"
+
+msgid "E911: Using a Job as a Float"
+msgstr "E911: По�ао �е кори�ти као Покретни"
+
+msgid "E914: Using a Channel as a Float"
+msgstr "E914: Канал �е кори�ти као Покретни"
+
+msgid "E975: Using a Blob as a Float"
+msgstr "E975: Блоб �е кори�ти као Покретни"
+
+msgid "E729: using Funcref as a String"
+msgstr "E729: Funcref �е кори�ти као Стринг"
+
+msgid "E730: using List as a String"
+msgstr "E730: Ли�та �е кори�ти као Стринг"
+
+msgid "E731: using Dictionary as a String"
+msgstr "E731: Речник �е кори�ти као Стринг"
+
+msgid "E976: using Blob as a String"
+msgstr "E976: Блоб �е кори�ти као Стринг"
+
+msgid "E977: Can only compare Blob with Blob"
+msgstr "E977: Блоб може да �е пореди �амо �а Блоб"
+
+msgid "E691: Can only compare List with List"
+msgstr "E691: Ли�та може да �е пореди �амо �а Ли�та"
+
+msgid "E692: Invalid operation for List"
+msgstr "E692: �еи�правна операција за Ли�ту"
+
+msgid "E735: Can only compare Dictionary with Dictionary"
+msgstr "E735: Речник може да �е пореди �амо �а Речником"
+
+msgid "E736: Invalid operation for Dictionary"
+msgstr "E736: �еи�правна операција за Речник"
+
+msgid "E694: Invalid operation for Funcrefs"
+msgstr "E694: �еи�правна операција за Funcrefs"
+
+#, c-format
+msgid "E112: Option name missing: %s"
+msgstr "E112: �едо�таје име опције: %s"
+
+msgid "E973: Blob literal should have an even number of hex characters"
+msgstr "E973: Блоб литерал би требало да има паран број хек� карактера"
+
+#, c-format
+msgid "E114: Missing quote: %s"
+msgstr "E114: �едо�таје наводник: %s"
+
+#, c-format
+msgid "E115: Missing quote: %s"
+msgstr "E115: �едо�таје наводник: %s"
+
 msgid "new shell started\n"
 msgstr "покренуто ново командно окружење\n"
 
 msgid "Vim: Error reading input, exiting...\n"
 msgstr "Vim: Грешка при читању улаза, излазак...\n"
 
-msgid "Used CUT_BUFFER0 instead of empty selection"
-msgstr "Уме�то празне �елекције корићен је CUT_BUFFER0"
-
 msgid "E881: Line count changed unexpectedly"
 msgstr "E881: Број линија �е неочекивано променио"
 
@@ -6037,6 +6022,10 @@
 msgstr "E989: �еподразумевани аргумент �леди иза подразумеваног аргумента"
 
 #, c-format
+msgid "E451: Expected }: %s"
+msgstr "E451: Очекује �е }: %s"
+
+#, c-format
 msgid "E740: Too many arguments for function %s"
 msgstr "E740: Превише аргумената за функцију %s"
 
@@ -6067,22 +6056,10 @@
 msgstr "E699: Сувише аргумената"
 
 #, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: �епозната функција: %s"
-
-#, c-format
 msgid "E276: Cannot use function as a method: %s"
 msgstr "E276: Функција не може да �е кори�ти као метода: %s"
 
 #, c-format
-msgid "E933: Function was deleted: %s"
-msgstr "E933: Функција је обри�ана: %s"
-
-#, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: �ема довољно аргумената за функцију: %s"
-
-#, c-format
 msgid "E120: Using <SID> not in a script context: %s"
 msgstr "E120: Коришћење <SID> ван �крипт контек�та: %s"
 
@@ -6101,6 +6078,9 @@
 msgid "E884: Function name cannot contain a colon: %s"
 msgstr "E884: Име функције не може да �адржи двотачку: %s"
 
+msgid "E454: function list was modified"
+msgstr "E454: ли�та функције је измењена"
+
 #, c-format
 msgid "E123: Undefined function: %s"
 msgstr "E123: �едефини�ана функција: %s"
@@ -6120,6 +6100,10 @@
 msgstr "E126: �едо�таје :endfunction"
 
 #, c-format
+msgid "W1001: Text found after :enddef: %s"
+msgstr "W1001: Пронађен је тек�т након :enddef: %s"
+
+#, c-format
 msgid "W22: Text found after :endfunction: %s"
 msgstr "W22: Пронађен тек�т након :endfunction: %s"
 
@@ -6295,18 +6279,15 @@
 msgid "with X11-Athena GUI."
 msgstr "�а X11-Athena ГКИ."
 
+msgid "with Haiku GUI."
+msgstr "�а Haiku ГКИ."
+
 msgid "with Photon GUI."
 msgstr "�а Photon ГКИ."
 
 msgid "with GUI."
 msgstr "�а ГКИ."
 
-msgid "with Carbon GUI."
-msgstr "�а Carbon ГКИ."
-
-msgid "with Cocoa GUI."
-msgstr "�а Cocoa ГКИ."
-
 msgid "  Features included (+) or not (-):\n"
 msgstr "  Могућно�ти укључене (+) или не (-):\n"
 
@@ -6433,6 +6414,21 @@
 msgid "menu  Help->Sponsor/Register  for information    "
 msgstr "мени  Помоћ->Спонзор/Реги�труј �е  за информације    "
 
+msgid "[end of lines]"
+msgstr "[крај линија]"
+
+msgid "global"
+msgstr "глобална"
+
+msgid "buffer"
+msgstr "бафер"
+
+msgid "window"
+msgstr "прозор"
+
+msgid "tab"
+msgstr "картица"
+
 msgid ""
 "\n"
 "# Buffer list:\n"
@@ -6562,8 +6558,8 @@
 msgstr "# Вредно�т опције 'encoding' када је овај фајл запи�ан\n"
 
 #, c-format
-msgid "Reading viminfo file \"%s\"%s%s%s"
-msgstr "Читање viminfo фајла \"%s\"%s%s%s"
+msgid "Reading viminfo file \"%s\"%s%s%s%s"
+msgstr "Читање viminfo фајла \"%s\"%s%s%s%s"
 
 msgid " info"
 msgstr " инфо"
@@ -6622,17 +6618,16 @@
 msgid "E444: Cannot close last window"
 msgstr "E444: По�ледњи прозор не може да �е затвори"
 
-msgid "E813: Cannot close autocmd or popup window"
-msgstr "E813: Прозор аутокоманде или и�качући прозор не може да �е затвори"
-
 msgid "E814: Cannot close window, only autocmd window would remain"
 msgstr ""
-"E814: Прозор не може да �е затвори, прео�тао би једино прозор "
-"аутокоманде"
+"E814: Прозор не може да �е затвори, прео�тао би једино прозор аутокоманде"
 
 msgid "E445: Other window contains changes"
 msgstr "E445: Други прозори �адрже измене"
 
+msgid "E366: Not allowed to enter a popup window"
+msgstr "E366: �ије дозвољено да �е уђе у и�качући прозор"
+
 msgid "Edit with &multiple Vims"
 msgstr "Уређуј �а &више Vim-ова"
 
@@ -6664,766 +6659,2820 @@
 msgid "Path length too long!"
 msgstr "Путања је предугачка!"
 
-msgid "--No lines in buffer--"
-msgstr "--У баферу нема линија--"
-
-msgid "E470: Command aborted"
-msgstr "E470: Команда прекинута"
+#, c-format
+msgid "E121: Undefined variable: %s"
+msgstr "E121: �едефини�ана променљива: %s"
 
-msgid "E471: Argument required"
-msgstr "E471: Потребан је аргумент"
+#, c-format
+msgid "E121: Undefined variable: %c:%s"
+msgstr "E121: �едефини�ана променљива: %c:%s"
 
-msgid "E10: \\ should be followed by /, ? or &"
-msgstr "E10: Иза \\ треба да је /, ? или &"
+msgid "E476: Invalid command"
+msgstr "E476: �еважећа команда"
 
-msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
-msgstr ""
-"E11: �еважеће у прозору командне линије; <CR> извршава, CTRL-C отказује"
+#, c-format
+msgid "E476: Invalid command: %s"
+msgstr "E476: �еважећа команда: %s"
 
-msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
-msgstr ""
-"E12: По�тоји забрана за команду у exrc/vimrc у текућој претрази "
-"директоријума или ознаке"
+msgid "E710: List value has more items than targets"
+msgstr "E710: Вредно�т типа Ли�та има више �тавки него одредишта"
 
-msgid "E171: Missing :endif"
-msgstr "E171: �едо�таје :endif"
+msgid "E711: List value does not have enough items"
+msgstr "E711: Вредно�т типа Ли�та нема довољно �тавки"
 
-msgid "E600: Missing :endtry"
-msgstr "E600: �едо�таје :endtry"
+msgid "E719: Cannot slice a Dictionary"
+msgstr "E719: Речник не може да �е �ече"
 
-msgid "E170: Missing :endwhile"
-msgstr "E170: �едо�таје :endwhile"
+msgid ""
+"E856: \"assert_fails()\" second argument must be a string or a list with one "
+"or two strings"
+msgstr ""
+"E856: \"assert_fails()\" други аргумент мора бити �тринг или ли�та �а једним "
+"или два �тринга"
 
-msgid "E170: Missing :endfor"
-msgstr "E170: �едо�таје :endfor"
+msgid "E909: Cannot index a special variable"
+msgstr "E909: Специјална променљива не може да �е индек�ира"
 
-msgid "E588: :endwhile without :while"
-msgstr "E588: :endwhile без :while"
+#, c-format
+msgid "E1100: Missing :var: %s"
+msgstr "E1100: �едо�таје :var: %s"
 
-msgid "E588: :endfor without :for"
-msgstr "E588: :endfor без :for"
+#, c-format
+msgid "E1001: Variable not found: %s"
+msgstr "E1001: Променљива није пронађена: %s"
 
-msgid "E13: File exists (add ! to override)"
-msgstr "E13: Фајл по�тоји (додајте ! за премошћавање)"
+#, c-format
+msgid "E1002: Syntax error at %s"
+msgstr "E1002: Синтак�на грешка код %s"
 
-msgid "E472: Command failed"
-msgstr "E472: Команда није у�пела"
+msgid "E1003: Missing return value"
+msgstr "E1003: �едо�таје повратна вредно�т"
 
 #, c-format
-msgid "E234: Unknown fontset: %s"
-msgstr "E234: �епознат fontset: %s"
+msgid "E1004: White space required before and after '%s'"
+msgstr "E1004: �еопходан је празан про�тор и�пред и иза '%s'"
 
-#, c-format
-msgid "E235: Unknown font: %s"
-msgstr "E235: �епознат фонт: %s"
+msgid "E1005: Too many argument types"
+msgstr "E1005: Сувише типова аргумената"
 
 #, c-format
-msgid "E236: Font \"%s\" is not fixed-width"
-msgstr "E236: Фонт \"%s\" није фик�не ширине"
+msgid "E1006: %s is used as an argument"
+msgstr "E1006: %s је употребљено као аргумент"
 
-msgid "E473: Internal error"
-msgstr "E473: Интерна грешка"
+msgid "E1007: Mandatory argument after optional argument"
+msgstr "E1007: Обавезни аргумент након необавезног аргумента"
 
-#, c-format
-msgid "E685: Internal error: %s"
-msgstr "E685: Интерна грешка: %s"
+msgid "E1008: Missing <type>"
+msgstr "E1008: �едо�таје <type>"
 
-msgid "Interrupted"
-msgstr "Прекинуто"
+msgid "E1009: Missing > after type"
+msgstr "E1009: �едо�таје > након type"
 
-msgid "E474: Invalid argument"
-msgstr "E474: �еважећи аргумент"
+#, c-format
+msgid "E1010: Type not recognized: %s"
+msgstr "E1010: Тип �е не препознаје: %s"
 
 #, c-format
-msgid "E475: Invalid argument: %s"
-msgstr "E475: �еважећи аргумент: %s"
+msgid "E1011: Name too long: %s"
+msgstr "E1011: Предугачко име: %s"
 
 #, c-format
-msgid "E983: Duplicate argument: %s"
-msgstr "E983: Дуплирани аргумент: %s"
+msgid "E1012: Type mismatch; expected %s but got %s"
+msgstr "E1012: �еодговарајући тип; очекује �е %s али је наведено %s"
 
 #, c-format
-msgid "E475: Invalid value for argument %s"
-msgstr "E475: �еважећa вредно�т за аргумент: %s"
+msgid "E1013: Argument %d: type mismatch, expected %s but got %s"
+msgstr ""
+"E1013: �ргумент %d: неодговарајући тип, очекује �е %s али је наведено %s"
 
 #, c-format
-msgid "E475: Invalid value for argument %s: %s"
-msgstr "E475: �еважећa вредно�т за аргумент %s: %s"
+msgid "E1014: Invalid key: %s"
+msgstr "E1014: �еважећи кључ: %s"
 
 #, c-format
-msgid "E15: Invalid expression: %s"
-msgstr "E15: �еважећи израз: %s"
+msgid "E1015: Name expected: %s"
+msgstr "E1015: Очекује �е име: %s"
 
-msgid "E16: Invalid range"
-msgstr "E16: �еважећи оп�ег"
+#, c-format
+msgid "E1016: Cannot declare a %s variable: %s"
+msgstr "E1016: �е може да �е декларише %s променљива: %s"
 
-msgid "E476: Invalid command"
-msgstr "E476: �еважећа команда"
+#, c-format
+msgid "E1016: Cannot declare an environment variable: %s"
+msgstr "E1016: �е може да �е декларише променљива окружења: %s"
 
 #, c-format
-msgid "E17: \"%s\" is a directory"
-msgstr "E17: \"%s\" је директоријум"
+msgid "E1017: Variable already declared: %s"
+msgstr "E1017: Променљива је већ деклари�ана: %s"
 
 #, c-format
-msgid "E364: Library call failed for \"%s()\""
-msgstr "E364: Позив библиотеке није у�пео за \"%s()\""
+msgid "E1018: Cannot assign to a constant: %s"
+msgstr "E1018: Кон�танти не �ме да �е додељује: %s"
 
-msgid "E667: Fsync failed"
-msgstr "E667: Fsync није у�пео"
+msgid "E1019: Can only concatenate to string"
+msgstr "E1019: Може да �е надовеже �амо у �тринг"
 
 #, c-format
-msgid "E448: Could not load library function %s"
-msgstr "E448: Библиотечка функција %s није могла да �е учита"
+msgid "E1020: Cannot use an operator on a new variable: %s"
+msgstr "E1020: Оператор не може да �е употреби над новом променљивом: %s"
 
-msgid "E19: Mark has invalid line number"
-msgstr "E19: Маркер �адржи неи�праван број линије"
+msgid "E1021: Const requires a value"
+msgstr "E1021: Const захтева вредно�т"
 
-msgid "E20: Mark not set"
-msgstr "E20: Маркер није по�тављен"
+msgid "E1022: Type or initialization required"
+msgstr "E1022: Потребан је тип или иницијализација"
 
-msgid "E21: Cannot make changes, 'modifiable' is off"
-msgstr "E21: Измене не могу да �е учине, опција 'modifiable' је и�кључена"
+#, c-format
+msgid "E1023: Using a Number as a Bool: %d"
+msgstr "E1023: Број �е кори�ти као Логичка: %d"
 
-msgid "E22: Scripts nested too deep"
-msgstr "E22: Скрипте �у предубоко угњеждене"
+msgid "E1024: Using a Number as a String"
+msgstr "E1024: Број �е кори�ти као Стринг"
 
-msgid "E23: No alternate file"
-msgstr "E23: �ема алтернативног фајла"
+msgid "E1025: Using } outside of a block scope"
+msgstr "E1025: } �е кори�ти ван оп�ега важења блока"
 
-msgid "E24: No such abbreviation"
-msgstr "E24: Таква �краћеница не по�тоји"
+msgid "E1026: Missing }"
+msgstr "E1026: �едо�таје }"
 
-msgid "E477: No ! allowed"
-msgstr "E477: ! није дозвољен"
+msgid "E1027: Missing return statement"
+msgstr "E1027: �едо�таје наредба повратка"
 
-msgid "E25: GUI cannot be used: Not enabled at compile time"
-msgstr "E25: ГКИ не може да �е кори�ти: �ије омогућен у време компилације"
+msgid "E1028: Compiling :def function failed"
+msgstr "E1028: Компајлирање :def функције није у�пело"
 
-msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
-msgstr ""
-"E26: хебреј�ки не може да �е кори�ти: �ије омогућен у време компилације\n"
+#, c-format
+msgid "E1029: Expected %s but got %s"
+msgstr "E1029: Очекује �е %s али је наведено %s"
 
-msgid "E27: Farsi support has been removed\n"
-msgstr "E27: Подршка за фар�и је уклоњена\n"
+#, c-format
+msgid "E1030: Using a String as a Number: \"%s\""
+msgstr "E1030: Стринг �е кори�ти као Број: \"%s\""
 
-msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
-msgstr ""
-"E800: арап�ки не може да �е кори�ти: �ије омогућен у време компилације\n"
+msgid "E1031: Cannot use void value"
+msgstr "E1031: �е може да �е употреби празна вредно�т"
 
-#, c-format
-msgid "E28: No such highlight group name: %s"
-msgstr "E28: �ема групе и�тицања �а таквим именом: %s"
+msgid "E1032: Missing :catch or :finally"
+msgstr "E1032: �едо�таје :catch или :finally"
 
-msgid "E29: No inserted text yet"
-msgstr "E29: Тек�т још није унет"
+msgid "E1033: Catch unreachable after catch-all"
+msgstr "E1033: Catch не може да �е до�егне након catch-all"
 
-msgid "E30: No previous command line"
-msgstr "E30: �ема претходне командне линије"
+#, c-format
+msgid "E1034: Cannot use reserved name %s"
+msgstr "E1034: �е може да �е употреби резерви�ано име %s"
 
-msgid "E31: No such mapping"
-msgstr "E31: Такво мапирање не по�тоји"
+msgid "E1035: % requires number arguments"
+msgstr "E1035: % захтева аргументе типа Број"
 
-msgid "E479: No match"
-msgstr "E479: �ема подударања"
+#, c-format
+msgid "E1036: %c requires number or float arguments"
+msgstr "E1036: %c захтева аргументе типа Број или Покретни"
 
 #, c-format
-msgid "E480: No match: %s"
-msgstr "E480: �ема подударања: %s"
+msgid "E1037: Cannot use \"%s\" with %s"
+msgstr "E1037: \"%s\" не може да �е кори�ти �а %s"
 
-msgid "E32: No file name"
-msgstr "E32: �ема имена фајла"
+msgid "E1038: \"vim9script\" can only be used in a script"
+msgstr "E1038: \"vim9script\" може да �е кори�ти �амо у �крипти"
 
-msgid "E33: No previous substitute regular expression"
-msgstr "E33: �ема претходног регуларног израза за замену"
+msgid "E1039: \"vim9script\" must be the first command in a script"
+msgstr "E1039: \"vim9script\" мора да буде прва команда у �крипти"
 
-msgid "E34: No previous command"
-msgstr "E34: �ема претходне команде"
+msgid "E1040: Cannot use :scriptversion after :vim9script"
+msgstr "E1040: :scriptversion не може да �е употреби након :vim9script"
 
-msgid "E35: No previous regular expression"
-msgstr "E35: �ема претходног регуларног израза"
+#, c-format
+msgid "E1041: Redefining script item %s"
+msgstr "E1041: Редефини�ање �крипт �тавке %s"
 
-msgid "E481: No range allowed"
-msgstr "E481: Оп�ег није дозвољен"
+msgid "E1042: Export can only be used in vim9script"
+msgstr "E1042: Export може да �е кори�ти �амо у vim9script"
 
-msgid "E36: Not enough room"
-msgstr "E36: �ема довољно про�тора"
+msgid "E1043: Invalid command after :export"
+msgstr "E1043: �еважећа команда након :export"
 
-#, c-format
-msgid "E247: no registered server named \"%s\""
-msgstr "E247: нема реги�тованог �ервера под именом \"%s\""
+msgid "E1044: Export with invalid argument"
+msgstr "E1044: Export �а неважећим аргументом"
 
-#, c-format
-msgid "E482: Can't create file %s"
-msgstr "E482: Фајл %s не може да �е креира"
+msgid "E1045: Missing \"as\" after *"
+msgstr "E1045: �едо�таје \"as\" након *"
 
-msgid "E483: Can't get temp file name"
-msgstr "E483: Име привременог фајла не може да �е добије"
+msgid "E1046: Missing comma in import"
+msgstr "E1046: �едо�таје зарез у import"
+
+msgid "E1047: Syntax error in import"
+msgstr "E1047: Синтак�на грешка у import"
 
 #, c-format
-msgid "E484: Can't open file %s"
-msgstr "E484: Фајл %s не може да �е отвори"
+msgid "E1048: Item not found in script: %s"
+msgstr "E1048: Ставка није пронађена у �крипти: %s"
 
 #, c-format
-msgid "E485: Can't read file %s"
-msgstr "E485: Фајл %s не може да �е прочита"
+msgid "E1049: Item not exported in script: %s"
+msgstr "E1049: Ставка није ек�портована у �крипт: %s"
 
-msgid "E38: Null argument"
-msgstr "E38: Празан аргумент"
+msgid "E1050: Colon required before a range"
+msgstr "E1050: И�пред оп�ега је неопходна двотачка"
 
-msgid "E39: Number expected"
-msgstr "E39: Очекује �е број"
+msgid "E1051: Wrong argument type for +"
+msgstr "E1051: Погрешан тип аргумента за +"
 
 #, c-format
-msgid "E40: Can't open errorfile %s"
-msgstr "E40: Фајл грешке %s не може да �е отвори"
+msgid "E1052: Cannot declare an option: %s"
+msgstr "E1052: Опција не може да �е декларише: %s"
 
-msgid "E233: cannot open display"
-msgstr "E233: приказ не може да �е отвори"
+#, c-format
+msgid "E1053: Could not import \"%s\""
+msgstr "E1053: \"%s\" није могло да �е увезе"
 
-msgid "E41: Out of memory!"
-msgstr "E41: �ема више меморије!"
+#, c-format
+msgid "E1054: Variable already declared in the script: %s"
+msgstr "E1054: Променљива је већ деклари�ана у �крипти: %s"
 
-msgid "Pattern not found"
-msgstr "Шаблон није пронађен"
+#
+msgid "E1055: Missing name after ..."
+msgstr "E1055: �едо�таје име након ..."
 
 #, c-format
-msgid "E486: Pattern not found: %s"
-msgstr "E486: Шаблон није пронађен: %s"
+msgid "E1056: Expected a type: %s"
+msgstr "E1056: Очекивао �е тип: %s"
 
-msgid "E487: Argument must be positive"
-msgstr "E487: �ргумент мора бити позитиван"
+msgid "E1057: Missing :enddef"
+msgstr "E1057: �едо�таје :enddef"
 
-msgid "E459: Cannot go back to previous directory"
-msgstr "E459: �е може да �е оде назад на претходни директоријум"
+msgid "E1058: Function nesting too deep"
+msgstr "E1058: Угњеждавање функције је �увише дубоко"
 
-msgid "E42: No Errors"
-msgstr "E42: �ема грешака"
+#, c-format
+msgid "E1059: No white space allowed before colon: %s"
+msgstr "E1059: И�пред двотачке није дозвољен празан про�тор: %s"
 
-msgid "E776: No location list"
-msgstr "E776: �ема ли�те локација"
+#, c-format
+msgid "E1060: Expected dot after name: %s"
+msgstr "E1060: Очекује �е тачка иза имена: %s"
 
-msgid "E43: Damaged match string"
-msgstr "E43: Оштећен �тринг за подударање"
+#, c-format
+msgid "E1061: Cannot find function %s"
+msgstr "E1061: �е може да �е пронађе функција %s"
 
-msgid "E44: Corrupted regexp program"
-msgstr "E44: regexp програм је покварен"
+msgid "E1062: Cannot index a Number"
+msgstr "E1062: Број не може да �е индек�ира"
 
-msgid "E45: 'readonly' option is set (add ! to override)"
-msgstr "E45: По�тављена је 'readonly' опција (додајте ! за премошћавање)"
+msgid "E1063: Type mismatch for v: variable"
+msgstr "E1063: �еодговарајући тип за v: променљиву"
 
 #, c-format
-msgid "E121: Undefined variable: %s"
-msgstr "E121: �едефини�ана променљива: %s"
+msgid "E1066: Cannot declare a register: %s"
+msgstr "E1066: Реги�тар не може да �е декларише: %s"
 
 #, c-format
-msgid "E734: Wrong variable type for %s="
-msgstr "E734: Погрешан тип променљиве за %s="
+msgid "E1067: Separator mismatch: %s"
+msgstr "E1067: Граничници �е не подударају: %s"
 
 #, c-format
-msgid "E461: Illegal variable name: %s"
-msgstr "E461: �едозвољено име променљиве: %s"
+msgid "E1068: No white space allowed before '%s'"
+msgstr "E1068: �ије дозвољен празан про�тор и�пред '%s'"
 
-msgid "E995: Cannot modify existing variable"
-msgstr "E995: По�тојећа променљива не може да �е измени"
+#, c-format
+msgid "E1069: White space required after '%s'"
+msgstr "E1069: Потребан је празан про�тор након '%s'"
+
+msgid "E1070: Missing \"from\""
+msgstr "E1070: �едо�таје \"from\""
+
+msgid "E1071: Invalid string after \"from\""
+msgstr "E1071: �еважећи �тринг након \"from\""
 
 #, c-format
-msgid "E46: Cannot change read-only variable \"%s\""
-msgstr "E46: Променљива �амо за читање \"%s\" не може да �е измени"
+msgid "E1072: Cannot compare %s with %s"
+msgstr "E1072: �е може да �е пореди %s �а %s"
 
 #, c-format
-msgid "E794: Cannot set variable in the sandbox: \"%s\""
-msgstr "E794: �е може да �е по�тави променљива у sandbox-у: \"%s\""
+msgid "E1073: Name already defined: %s"
+msgstr "E1073: Име је већ дефини�ано: %s"
 
-msgid "E928: String required"
-msgstr "E928: Захтева �е String"
+msgid "E1074: No white space allowed after dot"
+msgstr "E1074: И�пред тачке није дозвољен празан про�тор"
 
-msgid "E713: Cannot use empty key for Dictionary"
-msgstr "E713: �е може да �е кори�ти празан кључ за Речник"
+#, c-format
+msgid "E1075: Namespace not supported: %s"
+msgstr "E1075: �ије подржан про�тор имена: %s"
 
-msgid "E715: Dictionary required"
-msgstr "E715: Потребан Речник"
+msgid "E1076: This Vim is not compiled with float support"
+msgstr "E1076: Овај Vim није компајлиран �а подршком за Покретни"
 
 #, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: индек� ли�те је ван оп�ега: %ld"
+msgid "E1077: Missing argument type for %s"
+msgstr "E1077: �едо�таје тип аргумента за %s"
 
 #, c-format
-msgid "E979: Blob index out of range: %ld"
-msgstr "E979: Индек� Blob-а је ван оп�ега: %ld"
+msgid "E1081: Cannot unlet %s"
+msgstr "E1081: �е може да �е уради unlet %s"
 
-msgid "E978: Invalid operation for Blob"
-msgstr "E978: �еи�правна операција за Blob"
+#, c-format
+msgid "E1082: Cannot use a namespaced variable: %s"
+msgstr "E1082: �е може да �е кори�ти променљива �а про�тором имена: %s"
+
+msgid "E1083: Missing backtick"
+msgstr "E1083: �едо�таје краткоузлазни акценат"
 
 #, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: Превише аргумената за функцију: %s"
+msgid "E1084: Cannot delete Vim9 script function %s"
+msgstr "E1084: Vim9 �крипт функција не може да �е обрише %s"
 
 #, c-format
-msgid "E716: Key not present in Dictionary: %s"
-msgstr "E716: У Речнику нема кључа: %s"
+msgid "E1085: Not a callable type: %s"
+msgstr "E1085: Тип који не може да �е позива: %s"
 
-msgid "E714: List required"
-msgstr "E714: Потребна Ли�та"
+msgid "E1086: Cannot use :function inside :def"
+msgstr "E1086: :function не може да �е кори�ти унутар :def"
 
-msgid "E897: List or Blob required"
-msgstr "E897: Потребна је Ли�та или Blob"
+msgid "E1087: Cannot use an index when declaring a variable"
+msgstr "E1087: �ије дозвољена употреба индек�а када �е декларише променљива"
 
 #, c-format
-msgid "E712: Argument of %s must be a List or Dictionary"
-msgstr "E712: �ргумент за %s мора бити Ли�та или Речник"
+msgid "E1089: Unknown variable: %s"
+msgstr "E1089: �епозната променљива: %s"
 
 #, c-format
-msgid "E896: Argument of %s must be a List, Dictionary or Blob"
-msgstr "E896: �ргумент за %s мора бити Ли�та, Речник или Blob"
+msgid "E1090: Cannot assign to argument %s"
+msgstr "E1090: �е може да �е врши додела аргументу %s"
 
-msgid "E47: Error while reading errorfile"
-msgstr "E47: Грешка приликом читања фајла грешке"
+#, c-format
+msgid "E1091: Function is not compiled: %s"
+msgstr "E1091: Функција није компајлирана: %s"
 
-msgid "E48: Not allowed in sandbox"
-msgstr "E48: �ије дозвољено у sandbox-у"
+msgid "E1092: Cannot use a list for a declaration"
+msgstr "E1092: Ли�та не може да �е кори�ти за декларацију"
 
-msgid "E523: Not allowed here"
-msgstr "E523: �ије дозвољено овде"
+#, c-format
+msgid "E1093: Expected %d items but got %d"
+msgstr "E1093: Очекује �е %d �тавки али је наведено %d"
 
-msgid "E359: Screen mode setting not supported"
-msgstr "E359: Подешавање режима екрана није подржано"
+msgid "E1094: Import can only be used in a script"
+msgstr "E1094: Import може да �е употреби �амо у �крипти"
 
-msgid "E49: Invalid scroll size"
-msgstr "E49: �еважећа величина линије за �кроловање"
+msgid "E1095: Unreachable code after :return"
+msgstr "E1095: Код не може да �е до�егне након :return"
 
-msgid "E91: 'shell' option is empty"
-msgstr "E91: Опција 'shell' је празна"
+msgid "E1096: Returning a value in a function without a return type"
+msgstr "E1096: Враћа �е вредно�т из функције без наведеног повратног типа"
 
-msgid "E255: Couldn't read in sign data!"
-msgstr "E255: Подаци за знак ни�у могли да �е прочитају!"
+msgid "E1097: Line incomplete"
+msgstr "E1097: Линија није комплетна"
 
-msgid "E72: Close error on swap file"
-msgstr "E72: Грешка код затварања swap фајла"
+#, c-format
+msgid "E1099: Unknown error while executing %s"
+msgstr "E1099: �епозната грешка током извршавања %s"
 
-msgid "E73: tag stack empty"
-msgstr "E73: �тек ознака је празан"
+#, c-format
+msgid "E1101: Cannot declare a script variable in a function: %s"
+msgstr "E1101: У функцији не може да �е декларише �крипт променљива: %s"
 
-msgid "E74: Command too complex"
-msgstr "E74: Команда је �увише комплек�на"
+#, c-format
+msgid "E1102: Lambda function not found: %s"
+msgstr "E1102: �ије пронађена ламбда функција: %s"
 
-msgid "E75: Name too long"
-msgstr "E75: Име је предугачко"
+msgid "E1103: Dictionary not set"
+msgstr "E1103: Речник није по�тављен"
 
-msgid "E76: Too many ["
-msgstr "E76: Превише ["
+msgid "E1104: Missing >"
+msgstr "E1104: �едо�таје >"
 
-msgid "E77: Too many file names"
-msgstr "E77: Превише имена фајлова"
+#, c-format
+msgid "E1105: Cannot convert %s to string"
+msgstr "E1105: %s не може да �е ковертује у �тринг"
 
-msgid "E488: Trailing characters"
-msgstr "E488: Карактери вишка на крају"
+msgid "E1106: One argument too many"
+msgstr "E1106: Један аргумент вишка"
 
-msgid "E78: Unknown mark"
-msgstr "E78: �епознат маркер"
+#, c-format
+msgid "E1106: %d arguments too many"
+msgstr "E1106: %d аргумената вишка"
 
-msgid "E79: Cannot expand wildcards"
-msgstr "E79: �окери не могу да �е развију"
+msgid "E1107: String, List, Dict or Blob required"
+msgstr "E1107: Потребан је Стринг Ли�та, Речн или Блоб"
 
-msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
-msgstr "E591: 'winheight' не може да буде мање од 'winminheight'"
+#, c-format
+msgid "E1108: Item not found: %s"
+msgstr "E1108: Ставка није пронађена: %s"
 
-msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
-msgstr "E592: 'winwidth' не може да буде мање од 'winminwidth'"
+#, c-format
+msgid "E1109: List item %d is not a List"
+msgstr "E1109: Ставка ли�те %d није Ли�та"
 
-msgid "E80: Error while writing"
-msgstr "E80: Грешка приликом упи�а"
+#, c-format
+msgid "E1110: List item %d does not contain 3 numbers"
+msgstr "E1110: Ставка ли�те %d не �адржи 3 броја"
 
-msgid "E939: Positive count required"
-msgstr "E939: Потребан је позитиван број"
+#, c-format
+msgid "E1111: List item %d range invalid"
+msgstr "E1111: Оп�ег �тавке ли�те %d је неважћи"
 
-msgid "E81: Using <SID> not in a script context"
-msgstr "E81: <SID> �е кори�ти ван �крипт контек�та"
+#, c-format
+msgid "E1112: List item %d cell width invalid"
+msgstr "E1112: Ширина ћелије �тавке ли�те %d је неважећа"
 
 #, c-format
-msgid "E107: Missing parentheses: %s"
-msgstr "E107: �едо�тају заграде: %s"
+msgid "E1113: Overlapping ranges for 0x%lx"
+msgstr "E1113: Оп�ези за 0x%lx �е преклапају"
 
-msgid "E449: Invalid expression received"
-msgstr "E449: Примљен је неважећи израз"
+msgid "E1114: Only values of 0x100 and higher supported"
+msgstr "E1114: Подржавају �е �амо вредно�ти од 0x100 и веће"
 
-msgid "E463: Region is guarded, cannot modify"
-msgstr "E463: Регион је чуван, измена није могућа"
+msgid "E1115: \"assert_fails()\" fourth argument must be a number"
+msgstr "E1115: \"assert_fails()\" четврти аргумент мора бити број"
 
-msgid "E744: NetBeans does not allow changes in read-only files"
-msgstr ""
-"E744: NetBeans не дозвољава измене на фајловима који �меју �амо да �е читају"
+msgid "E1116: \"assert_fails()\" fifth argument must be a string"
+msgstr "E1116: \"assert_fails()\" пети аргумент мора бити �тринг"
 
-msgid "E363: pattern uses more memory than 'maxmempattern'"
-msgstr "E363: шаблон кори�ти више меморије од 'maxmempattern'"
+msgid "E1117: Cannot use ! with nested :def"
+msgstr "E1117: ! не може да �е кори�ти �а угњежденим :def"
 
-msgid "E749: empty buffer"
-msgstr "E749: празан бафер"
+msgid "E1118: Cannot change list"
+msgstr "E1118: Ли�та не може да �е измени"
 
-#, c-format
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: Бафер %ld не по�тоји"
+msgid "E1119: Cannot change list item"
+msgstr "E1119: Ставка ли�те не може да �е измени"
 
-msgid "E682: Invalid search pattern or delimiter"
-msgstr "E682: �еважећи шаблон претраге или раздвојни карактер"
+msgid "E1120: Cannot change dict"
+msgstr "E1120: Речн не може да �е измени"
 
-msgid "E139: File is loaded in another buffer"
-msgstr "E139: Фајл је учитан у други бафер"
+msgid "E1121: Cannot change dict item"
+msgstr "E1121: Ставка речн не може да �е измени"
 
 #, c-format
-msgid "E764: Option '%s' is not set"
-msgstr "E764: Опција '%s' није по�тављена"
-
-msgid "E850: Invalid register name"
-msgstr "E850: �еважеће име реги�тра"
+msgid "E1122: Variable is locked: %s"
+msgstr "E1122: Променљива је закључана: %s"
 
 #, c-format
-msgid "E919: Directory not found in '%s': \"%s\""
-msgstr "E919: �ије пронађен директоријум у '%s': \"%s\""
+msgid "E1123: Missing comma before argument: %s"
+msgstr "E1123: �едо�таје зарез и�пред аргумента: %s"
 
-msgid "E952: Autocommand caused recursive behavior"
-msgstr "E952: �утокомандa je изазвала рекурзивно понашање"
+#, c-format
+msgid "E1124: \"%s\" cannot be used in legacy Vim script"
+msgstr "E1124: \"%s\" не може да �е кори�ти у за�тарелом Vim �крипту"
 
-msgid "E328: Menu only exists in another mode"
-msgstr "E328: Мени по�тоји �амо у другом режиму"
+msgid "E1125: Final requires a value"
+msgstr "E1125: Final захтева вредно�т"
 
+msgid "E1126: Cannot use :let in Vim9 script"
+msgstr "E1126: :let не може да �е кори�ти у Vim9 �крипти"
 
-msgid "E957: Invalid window number"
-msgstr "E957: �еи�праван број прозора"
+msgid "E1127: Missing name after dot"
+msgstr "E1127: �едо�таје име иза тачке"
 
-#, c-format
-msgid "E686: Argument of %s must be a List"
-msgstr "E686: �ргумент за %s мора бити Ли�та"
+msgid "E1128: } without {"
+msgstr "E1128: } без {"
 
-msgid "search hit TOP, continuing at BOTTOM"
-msgstr "претрага је до�тигла ВРХ, на�тавља �е од Д��"
+msgid "E1129: Throw with empty string"
+msgstr "E1129: Throw �а празним �трингом"
 
-msgid "search hit BOTTOM, continuing at TOP"
-msgstr "претрага је до�тигла Д�О, на�тавља �е од ВРХ�"
+msgid "E1130: Cannot add to null list"
+msgstr "E1130: null не може да �е дода ли�ти"
 
-#, c-format
-msgid "Need encryption key for \"%s\""
-msgstr "Потребан је кључ за шифровање \"%s\""
+msgid "E1131: Cannot add to null blob"
+msgstr "E1131: �е може да �е дода на null блоб"
 
-msgid "empty keys are not allowed"
-msgstr "празни кључеви ни�у дозвољени"
+msgid "E1132: Missing function argument"
+msgstr "E1132: �едо�таје аргумент функције"
 
-msgid "dictionary is locked"
-msgstr "речник је закључан"
+msgid "E1133: Cannot extend a null dict"
+msgstr "E1133: �е може да �е прошири null речн"
 
-msgid "list is locked"
-msgstr "ли�та је закључана"
+msgid "E1134: Cannot extend a null list"
+msgstr "E1134: �е може да �е прошири null ли�та"
 
 #, c-format
-msgid "failed to add key '%s' to dictionary"
-msgstr "кључ '%s' није могао да �е дода у речник"
+msgid "E1135: Using a String as a Bool: \"%s\""
+msgstr "E1135: Стринг �е кори�ти као Логичка: \"%s\""
 
-#, c-format
-msgid "index must be int or slice, not %s"
-msgstr "index мора бити типа int или slice, не %s"
+msgid "E1135: <Cmd> mapping must end with <CR>"
+msgstr "E1135: <Cmd> мапирање мора да �е заврши �а <CR>"
 
-#, c-format
-msgid "expected str() or unicode() instance, but got %s"
-msgstr "очекивала �е ин�танца str() или unicode(), али је добијена %s"
+msgid "E1136: <Cmd> mapping must end with <CR> before second <Cmd>"
+msgstr "E1136: <Cmd> мапирање мора да �е заврђи �а <CR> пре другог <Cmd>"
 
 #, c-format
-msgid "expected bytes() or str() instance, but got %s"
-msgstr "очекивала �е ин�танца bytes() или str(), али је добијена %s"
+msgid "E1137: <Cmd> mapping must not include %s key"
+msgstr "E1137: <Cmd> мапирање не �ме да има та�тер %s"
 
-#, c-format
-msgid ""
-"expected int(), long() or something supporting coercing to long(), but got %s"
-msgstr ""
-"очекивало �е int(), long() или нешто што подржава �пајање �а long(), али је "
-"добијено %s"
+msgid "E1138: Using a Bool as a Number"
+msgstr "E1138: Логичка �е кори�ти као Број"
 
-#, c-format
-msgid "expected int() or something supporting coercing to int(), but got %s"
-msgstr ""
-"очекивало �е int() или нешто што подржава �пајање �а int(), али је добијено "
-"%s"
+msgid "E1139: Missing matching bracket after dict key"
+msgstr "E1139: �едо�таје одговарајућа заграда након кључа речн"
 
-msgid "value is too large to fit into C int type"
-msgstr "вредно�т је �увише велика да �е �ме�ти у C int тип"
+msgid "E1140: For argument must be a sequence of lists"
+msgstr "E1140: For аргумент мора бити низ ли�ти"
 
-msgid "value is too small to fit into C int type"
-msgstr "вредно�т је �увише мала да �е �ме�ти у C int тип"
+msgid "--No lines in buffer--"
+msgstr "--У баферу нема линија--"
 
-msgid "number must be greater than zero"
-msgstr "број мора бити већи од нуле"
+msgid "E470: Command aborted"
+msgstr "E470: Команда прекинута"
 
-msgid "number must be greater or equal to zero"
-msgstr "број мора бити већи од или једнак нули"
+msgid "E471: Argument required"
+msgstr "E471: Потребан је аргумент"
 
-msgid "can't delete OutputObject attributes"
-msgstr "атрибути OutputObject не могу да �е обришу"
+msgid "E10: \\ should be followed by /, ? or &"
+msgstr "E10: Иза \\ треба да је /, ? или &"
 
-#, c-format
-msgid "invalid attribute: %s"
-msgstr "неважећи атрибут: %s"
+msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
+msgstr ""
+"E11: �еважеће у прозору командне линије; <CR> извршава, CTRL-C отказује"
 
-msgid "E264: Python: Error initialising I/O objects"
-msgstr "E264: Python: Грешка код иницијализације У/И објеката"
+msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
+msgstr ""
+"E12: По�тоји забрана за команду у exrc/vimrc у текућој претрази "
+"директоријума или ознаке"
+
+msgid "E171: Missing :endif"
+msgstr "E171: �едо�таје :endif"
+
+msgid "E603: :catch without :try"
+msgstr "E603: :catch без :try"
+
+msgid "E606: :finally without :try"
+msgstr "E606: :finally без :try"
+
+msgid "E607: multiple :finally"
+msgstr "E607: више�труко :finally"
+
+msgid "E600: Missing :endtry"
+msgstr "E600: �едо�таје :endtry"
+
+msgid "E602: :endtry without :try"
+msgstr "E602: :endtry без :try"
+
+msgid "E170: Missing :endwhile"
+msgstr "E170: �едо�таје :endwhile"
+
+msgid "E170: Missing :endfor"
+msgstr "E170: �едо�таје :endfor"
+
+msgid "E588: :endwhile without :while"
+msgstr "E588: :endwhile без :while"
+
+msgid "E588: :endfor without :for"
+msgstr "E588: :endfor без :for"
+
+msgid "E13: File exists (add ! to override)"
+msgstr "E13: Фајл по�тоји (додајте ! за премошћавање)"
+
+msgid "E472: Command failed"
+msgstr "E472: Команда није у�пела"
+
+#, c-format
+msgid "E234: Unknown fontset: %s"
+msgstr "E234: �епознат fontset: %s"
+
+#, c-format
+msgid "E235: Unknown font: %s"
+msgstr "E235: �епознат фонт: %s"
+
+#, c-format
+msgid "E236: Font \"%s\" is not fixed-width"
+msgstr "E236: Фонт \"%s\" није фик�не ширине"
+
+msgid "E473: Internal error"
+msgstr "E473: Интерна грешка"
+
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: Интерна грешка: %s"
+
+msgid "Interrupted"
+msgstr "Прекинуто"
+
+msgid "E474: Invalid argument"
+msgstr "E474: �еважећи аргумент"
+
+#, c-format
+msgid "E475: Invalid argument: %s"
+msgstr "E475: �еважећи аргумент: %s"
+
+#, c-format
+msgid "E983: Duplicate argument: %s"
+msgstr "E983: Дуплирани аргумент: %s"
+
+#, c-format
+msgid "E475: Invalid value for argument %s"
+msgstr "E475: �еважећa вредно�т за аргумент: %s"
+
+#, c-format
+msgid "E475: Invalid value for argument %s: %s"
+msgstr "E475: �еважећa вредно�т за аргумент %s: %s"
+
+#, c-format
+msgid "E15: Invalid expression: %s"
+msgstr "E15: �еважећи израз: %s"
+
+msgid "E16: Invalid range"
+msgstr "E16: �еважећи оп�ег"
+
+#, c-format
+msgid "E17: \"%s\" is a directory"
+msgstr "E17: \"%s\" је директоријум"
+
+msgid "E756: Spell checking is not possible"
+msgstr "E756: Провера правопи�а није могућа"
+
+#, c-format
+msgid "E364: Library call failed for \"%s()\""
+msgstr "E364: Позив библиотеке није у�пео за \"%s()\""
+
+msgid "E667: Fsync failed"
+msgstr "E667: Fsync није у�пео"
+
+#, c-format
+msgid "E448: Could not load library function %s"
+msgstr "E448: Библиотечка функција %s није могла да �е учита"
+
+msgid "E19: Mark has invalid line number"
+msgstr "E19: Маркер �адржи неи�праван број линије"
+
+msgid "E20: Mark not set"
+msgstr "E20: Маркер није по�тављен"
+
+msgid "E21: Cannot make changes, 'modifiable' is off"
+msgstr "E21: Измене не могу да �е учине, опција 'modifiable' је и�кључена"
+
+msgid "E22: Scripts nested too deep"
+msgstr "E22: Скрипте �у предубоко угњеждене"
+
+msgid "E23: No alternate file"
+msgstr "E23: �ема алтернативног фајла"
+
+msgid "E24: No such abbreviation"
+msgstr "E24: Таква �краћеница не по�тоји"
+
+msgid "E477: No ! allowed"
+msgstr "E477: ! није дозвољен"
+
+msgid "E25: GUI cannot be used: Not enabled at compile time"
+msgstr "E25: ГКИ не може да �е кори�ти: �ије омогућен у време компилације"
+
+msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
+msgstr ""
+"E26: хебреј�ки не може да �е кори�ти: �ије омогућен у време компилације\n"
+
+msgid "E27: Farsi support has been removed\n"
+msgstr "E27: Подршка за фар�и је уклоњена\n"
+
+msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
+msgstr ""
+"E800: арап�ки не може да �е кори�ти: �ије омогућен у време компилације\n"
+
+#, c-format
+msgid "E28: No such highlight group name: %s"
+msgstr "E28: �ема групе и�тицања �а таквим именом: %s"
+
+msgid "E29: No inserted text yet"
+msgstr "E29: Тек�т још није унет"
+
+msgid "E30: No previous command line"
+msgstr "E30: �ема претходне командне линије"
+
+msgid "E31: No such mapping"
+msgstr "E31: Такво мапирање не по�тоји"
+
+msgid "E479: No match"
+msgstr "E479: �ема подударања"
+
+#, c-format
+msgid "E480: No match: %s"
+msgstr "E480: �ема подударања: %s"
+
+msgid "E32: No file name"
+msgstr "E32: �ема имена фајла"
+
+msgid "E33: No previous substitute regular expression"
+msgstr "E33: �ема претходног регуларног израза за замену"
+
+msgid "E34: No previous command"
+msgstr "E34: �ема претходне команде"
+
+msgid "E35: No previous regular expression"
+msgstr "E35: �ема претходног регуларног израза"
+
+msgid "E481: No range allowed"
+msgstr "E481: Оп�ег није дозвољен"
+
+msgid "E36: Not enough room"
+msgstr "E36: �ема довољно про�тора"
+
+#, c-format
+msgid "E247: no registered server named \"%s\""
+msgstr "E247: нема реги�тованог �ервера под именом \"%s\""
+
+#, c-format
+msgid "E482: Can't create file %s"
+msgstr "E482: Фајл %s не може да �е креира"
+
+msgid "E483: Can't get temp file name"
+msgstr "E483: Име привременог фајла не може да �е добије"
+
+#, c-format
+msgid "E484: Can't open file %s"
+msgstr "E484: Фајл %s не може да �е отвори"
+
+#, c-format
+msgid "E485: Can't read file %s"
+msgstr "E485: Фајл %s не може да �е прочита"
+
+msgid "E38: Null argument"
+msgstr "E38: Празан аргумент"
+
+msgid "E39: Number expected"
+msgstr "E39: Очекује �е број"
+
+#, c-format
+msgid "E40: Can't open errorfile %s"
+msgstr "E40: Фајл грешке %s не може да �е отвори"
+
+msgid "E233: cannot open display"
+msgstr "E233: приказ не може да �е отвори"
+
+msgid "E41: Out of memory!"
+msgstr "E41: �ема више меморије!"
+
+msgid "Pattern not found"
+msgstr "Шаблон није пронађен"
+
+#, c-format
+msgid "E486: Pattern not found: %s"
+msgstr "E486: Шаблон није пронађен: %s"
+
+msgid "E487: Argument must be positive"
+msgstr "E487: �ргумент мора бити позитиван"
+
+msgid "E459: Cannot go back to previous directory"
+msgstr "E459: �е може да �е оде назад на претходни директоријум"
+
+msgid "E42: No Errors"
+msgstr "E42: �ема грешака"
+
+msgid "E776: No location list"
+msgstr "E776: �ема ли�те локација"
+
+msgid "E43: Damaged match string"
+msgstr "E43: Оштећен �тринг за подударање"
+
+msgid "E44: Corrupted regexp program"
+msgstr "E44: regexp програм је покварен"
+
+msgid "E45: 'readonly' option is set (add ! to override)"
+msgstr "E45: По�тављена је 'readonly' опција (додајте ! за премошћавање)"
+
+#, c-format
+msgid "E734: Wrong variable type for %s="
+msgstr "E734: Погрешан тип променљиве за %s="
+
+#, c-format
+msgid "E461: Illegal variable name: %s"
+msgstr "E461: �едозвољено име променљиве: %s"
+
+msgid "E995: Cannot modify existing variable"
+msgstr "E995: По�тојећа променљива не може да �е измени"
+
+#, c-format
+msgid "E46: Cannot change read-only variable \"%s\""
+msgstr "E46: Променљива �амо за читање \"%s\" не може да �е измени"
+
+#, c-format
+msgid "E794: Cannot set variable in the sandbox: \"%s\""
+msgstr "E794: �е може да �е по�тави променљива у sandbox-у: \"%s\""
+
+msgid "E928: String required"
+msgstr "E928: Захтева �е Стринг"
+
+msgid "E713: Cannot use empty key for Dictionary"
+msgstr "E713: �е може да �е кори�ти празан кључ за Речник"
+
+msgid "E715: Dictionary required"
+msgstr "E715: Потребан Речник"
+
+#, c-format
+msgid "E684: list index out of range: %ld"
+msgstr "E684: индек� ли�те је ван оп�ега: %ld"
+
+#, c-format
+msgid "E979: Blob index out of range: %ld"
+msgstr "E979: Индек� Блоба је ван оп�ега: %ld"
+
+msgid "E978: Invalid operation for Blob"
+msgstr "E978: �еи�правна операција за Блоб"
+
+#, c-format
+msgid "E118: Too many arguments for function: %s"
+msgstr "E118: Превише аргумената за функцију: %s"
+
+#, c-format
+msgid "E119: Not enough arguments for function: %s"
+msgstr "E119: �ема довољно аргумената за функцију: %s"
+
+#, c-format
+msgid "E933: Function was deleted: %s"
+msgstr "E933: Функција је обри�ана: %s"
+
+#, c-format
+msgid "E716: Key not present in Dictionary: \"%s\""
+msgstr "E716: У Речнику нема кључа: \"%s\""
+
+msgid "E714: List required"
+msgstr "E714: Потребна Ли�та"
+
+msgid "E897: List or Blob required"
+msgstr "E897: Потребна је Ли�та или Блоб"
+
+#, c-format
+msgid "E697: Missing end of List ']': %s"
+msgstr "E697: �едо�таје крај Ли�те ']': %s"
+
+#, c-format
+msgid "E712: Argument of %s must be a List or Dictionary"
+msgstr "E712: �ргумент за %s мора бити Ли�та или Речник"
+
+#, c-format
+msgid "E896: Argument of %s must be a List, Dictionary or Blob"
+msgstr "E896: �ргумент за %s мора бити Ли�та, Речник или Блоб"
+
+msgid "E804: Cannot use '%' with Float"
+msgstr "E804: '%' не може да �е кори�ти �а Покретни"
+
+msgid "E908: using an invalid value as a String"
+msgstr "E908: Кори�ти �е недозвољена вредно�т као Стринг"
+
+msgid "E996: Cannot lock an option"
+msgstr "E996: Опција не може да �е закључа"
+
+#, c-format
+msgid "E113: Unknown option: %s"
+msgstr "E113: �епозната опција: %s"
+
+msgid "E18: Unexpected characters in :let"
+msgstr "E18: �еочекивани карактери у :let"
+
+#, c-format
+msgid "E998: Reduce of an empty %s with no initial value"
+msgstr "E998: Редукција празне %s без почетне вредно�ти"
+
+#, c-format
+msgid "E857: Dictionary key \"%s\" required"
+msgstr "E857: Потребан је кључ Речника \"%s\""
+
+msgid "E47: Error while reading errorfile"
+msgstr "E47: Грешка приликом читања фајла грешке"
+
+msgid "E48: Not allowed in sandbox"
+msgstr "E48: �ије дозвољено у sandbox-у"
+
+msgid "E523: Not allowed here"
+msgstr "E523: �ије дозвољено овде"
+
+msgid "E578: Not allowed to change text here"
+msgstr "E578: Овде није дозвољена измена тек�та"
+
+msgid "E565: Not allowed to change text or change window"
+msgstr "E565: �ије дозвољена измена тек�та или мењање прозора"
+
+msgid "E359: Screen mode setting not supported"
+msgstr "E359: Подешавање режима екрана није подржано"
+
+msgid "E49: Invalid scroll size"
+msgstr "E49: �еважећа величина линије за �кроловање"
+
+msgid "E91: 'shell' option is empty"
+msgstr "E91: Опција 'shell' је празна"
+
+msgid "E255: Couldn't read in sign data!"
+msgstr "E255: Подаци за знак ни�у могли да �е прочитају!"
+
+msgid "E72: Close error on swap file"
+msgstr "E72: Грешка код затварања привременог фајла"
+
+msgid "E73: tag stack empty"
+msgstr "E73: �тек ознака је празан"
+
+msgid "E74: Command too complex"
+msgstr "E74: Команда је �увише комплек�на"
+
+msgid "E75: Name too long"
+msgstr "E75: Име је предугачко"
+
+msgid "E76: Too many ["
+msgstr "E76: Превише ["
+
+msgid "E77: Too many file names"
+msgstr "E77: Превише имена фајлова"
+
+msgid "E488: Trailing characters"
+msgstr "E488: Карактери вишка на крају"
+
+#, c-format
+msgid "E488: Trailing characters: %s"
+msgstr "E488: Карактери вишка на крају: %s"
+
+msgid "E78: Unknown mark"
+msgstr "E78: �епознат маркер"
+
+msgid "E79: Cannot expand wildcards"
+msgstr "E79: �окери не могу да �е развију"
+
+msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
+msgstr "E591: 'winheight' не може да буде мање од 'winminheight'"
+
+msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
+msgstr "E592: 'winwidth' не може да буде мање од 'winminwidth'"
+
+msgid "E80: Error while writing"
+msgstr "E80: Грешка приликом упи�а"
+
+msgid "E939: Positive count required"
+msgstr "E939: Потребан је позитиван број"
+
+msgid "E81: Using <SID> not in a script context"
+msgstr "E81: <SID> �е кори�ти ван �крипт контек�та"
+
+#, c-format
+msgid "E107: Missing parentheses: %s"
+msgstr "E107: �едо�тају заграде: %s"
+
+msgid "E110: Missing ')'"
+msgstr "E110: �едо�таје ')'"
+
+#, c-format
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: �едо�таје тачка-зарез у Речнику: %s"
+
+#, c-format
+msgid "E721: Duplicate key in Dictionary: \"%s\""
+msgstr "E721: Дупликат кључа у Речнику: \"%s\""
+
+#, c-format
+msgid "E722: Missing comma in Dictionary: %s"
+msgstr "E722: �едо�таје зарез у Речнику: %s"
+
+#, c-format
+msgid "E723: Missing end of Dictionary '}': %s"
+msgstr "E723: �едо�таје крај Речника '}': %s"
+
+msgid "E449: Invalid expression received"
+msgstr "E449: Примљен је неважећи израз"
+
+msgid "E463: Region is guarded, cannot modify"
+msgstr "E463: Регион је чуван, измена није могућа"
+
+msgid "E744: NetBeans does not allow changes in read-only files"
+msgstr ""
+"E744: NetBeans не дозвољава измене на фајловима који �меју �амо да �е читају"
+
+msgid "E363: pattern uses more memory than 'maxmempattern'"
+msgstr "E363: шаблон кори�ти више меморије од 'maxmempattern'"
+
+msgid "E749: empty buffer"
+msgstr "E749: празан бафер"
+
+#, c-format
+msgid "E86: Buffer %ld does not exist"
+msgstr "E86: Бафер %ld не по�тоји"
+
+msgid "E682: Invalid search pattern or delimiter"
+msgstr "E682: �еважећи шаблон претраге или раздвојни карактер"
+
+msgid "E139: File is loaded in another buffer"
+msgstr "E139: Фајл је учитан у други бафер"
+
+#, c-format
+msgid "E764: Option '%s' is not set"
+msgstr "E764: Опција '%s' није по�тављена"
+
+msgid "E850: Invalid register name"
+msgstr "E850: �еважеће име реги�тра"
+
+msgid "E806: using Float as a String"
+msgstr "E806: Коришћење Покретни као Стринг"
+
+#, c-format
+msgid "E919: Directory not found in '%s': \"%s\""
+msgstr "E919: �ије пронађен директоријум у '%s': \"%s\""
+
+msgid "E952: Autocommand caused recursive behavior"
+msgstr "E952: �утокомандa je изазвала рекурзивно понашање"
+
+msgid "E813: Cannot close autocmd or popup window"
+msgstr "E813: Прозор аутокоманде или и�качући прозор не може да �е затвори"
+
+msgid "E328: Menu only exists in another mode"
+msgstr "E328: Мени по�тоји �амо у другом режиму"
+
+msgid "E957: Invalid window number"
+msgstr "E957: �еи�праван број прозора"
+
+#, c-format
+msgid "E686: Argument of %s must be a List"
+msgstr "E686: �ргумент за %s мора бити Ли�та"
+
+msgid "E109: Missing ':' after '?'"
+msgstr "E109: �едо�таје ':' након '?'"
+
+msgid "E690: Missing \"in\" after :for"
+msgstr "E690: �едо�таје \"in\" након :for"
+
+#, c-format
+msgid "E117: Unknown function: %s"
+msgstr "E117: �епозната функција: %s"
+
+msgid "E111: Missing ']'"
+msgstr "E111: �едо�таје ']'"
+
+msgid "E581: :else without :if"
+msgstr "E581: :else без :if"
+
+msgid "E582: :elseif without :if"
+msgstr "E582: :elseif без :if"
+
+msgid "E580: :endif without :if"
+msgstr "E580: :endif без :if"
+
+msgid "E586: :continue without :while or :for"
+msgstr "E586: :continue без :while или :for"
+
+msgid "E587: :break without :while or :for"
+msgstr "E587: :break без :while или :for"
+
+msgid "E274: No white space allowed before parenthesis"
+msgstr "E274: И�пред заграде није дозвољен празан карактер"
+
+#, c-format
+msgid "E940: Cannot lock or unlock variable %s"
+msgstr "E940: �е може да �е откључа или закључа променљива %s"
+
+#, c-format
+msgid "E254: Cannot allocate color %s"
+msgstr "E254: Боја %s не може да �е алоцира"
+
+msgid "search hit TOP, continuing at BOTTOM"
+msgstr "претрага је до�тигла ВРХ, на�тавља �е од Д��"
+
+msgid "search hit BOTTOM, continuing at TOP"
+msgstr "претрага је до�тигла Д�О, на�тавља �е од ВРХ�"
+
+msgid " line "
+msgstr " линија "
+
+#, c-format
+msgid "Need encryption key for \"%s\""
+msgstr "Потребан је кључ за шифровање \"%s\""
+
+msgid "empty keys are not allowed"
+msgstr "празни кључеви ни�у дозвољени"
+
+msgid "dictionary is locked"
+msgstr "речник је закључан"
+
+msgid "list is locked"
+msgstr "ли�та је закључана"
+
+#, c-format
+msgid "failed to add key '%s' to dictionary"
+msgstr "кључ '%s' није могао да �е дода у речник"
+
+#, c-format
+msgid "index must be int or slice, not %s"
+msgstr "index мора бити типа int или slice, не %s"
+
+#, c-format
+msgid "expected str() or unicode() instance, but got %s"
+msgstr "очекивала �е ин�танца str() или unicode(), али је добијена %s"
+
+#, c-format
+msgid "expected bytes() or str() instance, but got %s"
+msgstr "очекивала �е ин�танца bytes() или str(), али је добијена %s"
+
+#, c-format
+msgid ""
+"expected int(), long() or something supporting coercing to long(), but got %s"
+msgstr ""
+"очекивало �е int(), long() или нешто што подржава �пајање �а long(), али је "
+"добијено %s"
+
+#, c-format
+msgid "expected int() or something supporting coercing to int(), but got %s"
+msgstr ""
+"очекивало �е int() или нешто што подржава �пајање �а int(), али је добијено "
+"%s"
+
+msgid "value is too large to fit into C int type"
+msgstr "вредно�т је �увише велика да �е �ме�ти у C int тип"
+
+msgid "value is too small to fit into C int type"
+msgstr "вредно�т је �увише мала да �е �ме�ти у C int тип"
+
+msgid "number must be greater than zero"
+msgstr "број мора бити већи од нуле"
+
+msgid "number must be greater or equal to zero"
+msgstr "број мора бити већи од или једнак нули"
+
+msgid "can't delete OutputObject attributes"
+msgstr "атрибути OutputObject не могу да �е обришу"
+
+#, c-format
+msgid "invalid attribute: %s"
+msgstr "неважећи атрибут: %s"
+
+msgid "E264: Python: Error initialising I/O objects"
+msgstr "E264: Python: Грешка код иницијализације У/И објеката"
+
+msgid "failed to change directory"
+msgstr "не може да �е промени директоријум"
+
+#, c-format
+msgid "expected 3-tuple as imp.find_module() result, but got %s"
+msgstr "Као резултат imp.find_module() очекује �е триплет, али је добијено %s"
+
+#, c-format
+msgid "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
+msgstr ""
+"Као резултат imp.find_module() очекује �е триплет, али је добијена н-торка "
+"величине %d"
+
+msgid "internal error: imp.find_module returned tuple with NULL"
+msgstr "интерна грешка: imp.find_module је вратио н-торку �а NULL"
+
+msgid "cannot delete vim.Dictionary attributes"
+msgstr "vim.Dictionary атрибути не могу да �е обришу"
+
+msgid "cannot modify fixed dictionary"
+msgstr "фик�ни речник не може да �е измени"
+
+#, c-format
+msgid "cannot set attribute %s"
+msgstr "атрибут %s не може да �е по�тави"
+
+msgid "hashtab changed during iteration"
+msgstr "hashtab је промењен током итерације"
+
+#, c-format
+msgid "expected sequence element of size 2, but got sequence of size %d"
+msgstr ""
+"очекивао �е елемент �еквенце величине 2, али је добијена �еквенца величине %d"
+
+msgid "list constructor does not accept keyword arguments"
+msgstr "кон�труктор ли�те не прихвата кључне речи за аргументе"
+
+msgid "list index out of range"
+msgstr "индек� ли�те је ван оп�ега"
+
+#, c-format
+msgid "internal error: failed to get Vim list item %d"
+msgstr "интерна грешка: �тавка %d vim ли�те није могла да �е добије"
+
+msgid "slice step cannot be zero"
+msgstr "slice корак не може да буде нула"
+
+#, c-format
+msgid "attempt to assign sequence of size greater than %d to extended slice"
+msgstr "покушај доделе �еквенце величине веће од %d како би �е продужио slice"
+
+#, c-format
+msgid "internal error: no Vim list item %d"
+msgstr "интерна грешка: нема �тавке %d у vim ли�ти"
+
+msgid "internal error: not enough list items"
+msgstr "интерна грешка: нема довољно �тавки ли�те"
+
+msgid "internal error: failed to add item to list"
+msgstr "интерна грешка: �тавка није могла да �е дода ли�ти"
+
+#, c-format
+msgid "attempt to assign sequence of size %d to extended slice of size %d"
+msgstr ""
+"покушај доделе �еквенце величине %d како би �е продужио slice величине %d"
+
+msgid "failed to add item to list"
+msgstr "�тавка није могла да �е дода ли�ти"
+
+msgid "cannot delete vim.List attributes"
+msgstr "vim.List атрибути не могу да �е обришу"
+
+msgid "cannot modify fixed list"
+msgstr "фик�на ли�та не може да �е измени"
+
+#, c-format
+msgid "unnamed function %s does not exist"
+msgstr "неименована функција %s не по�тоји"
+
+#, c-format
+msgid "function %s does not exist"
+msgstr "функција %s не по�тоји"
+
+#, c-format
+msgid "failed to run function %s"
+msgstr "функција %s није могла да �е покрене"
+
+msgid "unable to get option value"
+msgstr "вредно�т опције није могла да �е добије"
+
+msgid "internal error: unknown option type"
+msgstr "интерна грешка: непознат тип опције"
+
+msgid "problem while switching windows"
+msgstr "проблем код пребацивања прозора"
+
+#, c-format
+msgid "unable to unset global option %s"
+msgstr "глобална опција %s није могла да �е и�кључи"
+
+#, c-format
+msgid "unable to unset option %s which does not have global value"
+msgstr "опција %s која нема глобалну вредно�т није могла да �е и�кључи"
+
+msgid "attempt to refer to deleted tab page"
+msgstr "покушај рефери�ања на обри�ану картицу"
+
+msgid "no such tab page"
+msgstr "не по�тоји таква картица"
+
+msgid "attempt to refer to deleted window"
+msgstr "покушај рефери�ања на обри�ан прозор"
+
+msgid "readonly attribute: buffer"
+msgstr "атрибут �амо за читање: бафер"
+
+msgid "cursor position outside buffer"
+msgstr "позиција кур�ора је ван бафера"
+
+msgid "no such window"
+msgstr "нема таквог прозора"
+
+msgid "attempt to refer to deleted buffer"
+msgstr "покушај рефери�ања на обри�ан бафер"
+
+msgid "failed to rename buffer"
+msgstr "име бафера није могло да �е промени"
+
+msgid "mark name must be a single character"
+msgstr "име маркера мора бити �амо један карактер"
+
+#, c-format
+msgid "expected vim.Buffer object, but got %s"
+msgstr "очекивао �е vim.Buffer објекат, али је добијен %s"
+
+#, c-format
+msgid "failed to switch to buffer %d"
+msgstr "прелазак на бафер %d није био могућ"
+
+#, c-format
+msgid "expected vim.Window object, but got %s"
+msgstr "очекивао �е vim.Window објекат, али је добијен %s"
+
+msgid "failed to find window in the current tab page"
+msgstr "прозор није пронађен у текућој картици"
+
+msgid "did not switch to the specified window"
+msgstr "није �е прешло у наведени прозор"
+
+#, c-format
+msgid "expected vim.TabPage object, but got %s"
+msgstr "очекивао �е vim.TabPage објекат, али је добијен %s"
+
+msgid "did not switch to the specified tab page"
+msgstr "није �е прешло у наведену картицу"
+
+msgid "failed to run the code"
+msgstr "кôд није могао да �е покрене"
+
+msgid "E858: Eval did not return a valid python object"
+msgstr "E858: Eval није вратио важећи python објекат"
+
+msgid "E859: Failed to convert returned python object to a Vim value"
+msgstr "E859: Конверзија враћеног python објекта у vim вредно�т није у�пела"
+
+#, c-format
+msgid "unable to convert %s to a Vim dictionary"
+msgstr "%s не може да �е конвертује у vim речник"
+
+#, c-format
+msgid "unable to convert %s to a Vim list"
+msgstr "%s не може да �е конвертује у vim ли�ту"
+
+#, c-format
+msgid "unable to convert %s to a Vim structure"
+msgstr "%s не може да �е конвертује у vim �труктуру"
+
+msgid "internal error: NULL reference passed"
+msgstr "интерна грешка: про�леђена је NULL референца"
+
+msgid "internal error: invalid value type"
+msgstr "интерна грешка: вредно�т неважећег типа"
+
+msgid ""
+"Failed to set path hook: sys.path_hooks is not a list\n"
+"You should now do the following:\n"
+"- append vim.path_hook to sys.path_hooks\n"
+"- append vim.VIM_SPECIAL_PATH to sys.path\n"
+msgstr ""
+"Кука за путању није могла да �е по�тави: sys.path_hooks није у ли�ти\n"
+"Сада би требало да урадите �ледеће:\n"
+"- додајте vim.path_hook на крај sys.path_hooks\n"
+"- додајте vim.VIM_SPECIAL_PATH на крај sys.path\n"
+
+msgid ""
+"Failed to set path: sys.path is not a list\n"
+"You should now append vim.VIM_SPECIAL_PATH to sys.path"
+msgstr ""
+"Путања није могла да �е по�тави: sys.path није у ли�ти\n"
+"Сада би требало да додате vim.VIM_SPECIAL_PATH на крај sys.path"
+
+msgid ""
+"Vim macro files (*.vim)\t*.vim\n"
+"All Files (*.*)\t*.*\n"
+msgstr ""
+"Vim макро фајлови (*.vim)\t*.vim\n"
+"Сви фајлови (*.*)\t*.*\n"
+
+msgid "All Files (*.*)\t*.*\n"
+msgstr "Сви фајлови (*.*)\t*.*\n"
+
+msgid ""
+"All Files (*.*)\t*.*\n"
+"C source (*.c, *.h)\t*.c;*.h\n"
+"C++ source (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"VB code (*.bas, *.frm)\t*.bas;*.frm\n"
+"Vim files (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+msgstr ""
+"Сви фајлови (*.*)\t*.*\n"
+"C изворни код (*.c, *.h)\t*.c;*.h\n"
+"C++ изворни код (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"VB код (*.bas, *.frm)\t*.bas;*.frm\n"
+"Vim фајлови (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+
+msgid ""
+"Vim macro files (*.vim)\t*.vim\n"
+"All Files (*)\t*\n"
+msgstr ""
+"Vim макро фајлови (*.vim)\t*.vim\n"
+"Сви фајлови (*)\t*\n"
+
+msgid "All Files (*)\t*\n"
+msgstr "Сви фајлови (*)\t*\n"
+
+msgid ""
+"All Files (*)\t*\n"
+"C source (*.c, *.h)\t*.c;*.h\n"
+"C++ source (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"Vim files (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+msgstr ""
+"Сви фајлови (*)\t*\n"
+"C изворни код (*.c, *.h)\t*.c;*.h\n"
+"C++ изворни код (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"Vim фајлови (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+
+msgid "GVim"
+msgstr "GVim"
+
+msgid "Text Editor"
+msgstr "Едитор тек�т"
+
+msgid "Edit text files"
+msgstr "Уређујте тек�т фајлове"
+
+msgid "Text;editor;"
+msgstr "Тек�т;едитор;"
+
+msgid "Vim"
+msgstr "Vim"
+
+msgid "(local to window)"
+msgstr "(локално за прозор)"
+
+msgid "(local to buffer)"
+msgstr "(локално за бафер)"
+
+msgid "(global or local to buffer)"
+msgstr "(глобално или локално за бафер)"
+
+msgid ""
+"\" Each \"set\" line shows the current value of an option (on the left)."
+msgstr "\" Свака „set� линија приказује текућу вредно�т опције (�а леве �тране)."
+
+msgid "\" Hit <Enter> on a \"set\" line to execute it."
+msgstr "\" Прити�ните <Ентер> на „set� линији да је извршите."
+
+msgid "\"            A boolean option will be toggled."
+msgstr "\"            Логичка опција ће променити �тање."
+
+msgid ""
+"\"            For other options you can edit the value before hitting "
+"<Enter>."
+msgstr ""
+"\"            О�талим опцијама можете променити вредно�т пре прити�ка "
+"на <Ентер>."
+
+msgid "\" Hit <Enter> on a help line to open a help window on this option."
+msgstr "\" Прити�ните <Ентер> на линији помоћи да �е отвори прозор помоћи за ову опцију."
+
+msgid "\" Hit <Enter> on an index line to jump there."
+msgstr "\" Прити�ните <Ентер> на линији индек�а да �кочите тамо."
+
+msgid "\" Hit <Space> on a \"set\" line to refresh it."
+msgstr "\" Прити�ните <Space> на „set� линији да је о�вежите."
+
+msgid "important"
+msgstr "важно"
+
+msgid "behave very Vi compatible (not advisable)"
+msgstr "понаша �е веома Vi компатибилно (не препоручује �е)"
+
+msgid "list of flags to specify Vi compatibility"
+msgstr "ли�та за�тавица за навођење Vi компатибилно�ти"
+
+msgid "use Insert mode as the default mode"
+msgstr "режим Уметање �е кори�ти као подразумевани режим"
+
+msgid "paste mode, insert typed text literally"
+msgstr "режим налепљивања, откуцани тек�т �е умеће до�ловно"
+
+msgid "key sequence to toggle paste mode"
+msgstr "низ та�тера којим �е преклапа режим налепљивања"
+
+msgid "list of directories used for runtime files and plugins"
+msgstr ""
+"ли�та директоријума који �е кори�те за фајлове за време\n"
+"извршавања и додатке"
+
+msgid "list of directories used for plugin packages"
+msgstr "ли�та директоријума који �е кори�те за пакете додатака"
+
+msgid "name of the main help file"
+msgstr "име главног фајла помоћи"
+
+msgid "moving around, searching and patterns"
+msgstr "кретање наоколо, претрага и шаблони"
+
+msgid "list of flags specifying which commands wrap to another line"
+msgstr ""
+"ли�та за�тавица која наводи које команде обавијају у наредну\n"
+"линију"
+
+msgid ""
+"many jump commands move the cursor to the first non-blank\n"
+"character of a line"
+msgstr ""
+"многе команде померају кур�ор на први непразни карактер у\n"
+"линији"
+
+msgid "nroff macro names that separate paragraphs"
+msgstr "имена nroff макроа који одвајају па�у�е"
+
+msgid "nroff macro names that separate sections"
+msgstr "имена nroff макроа који одвајају одељке"
+
+msgid "list of directory names used for file searching"
+msgstr "ли�та имена директоријума који �е кори�те за претрагу фајлова"
+
+msgid "list of directory names used for :cd"
+msgstr "ли�та имена директоријума који �е кори�те за :cd"
+
+msgid "change to directory of file in buffer"
+msgstr "мења на директоријум фајла у баферу"
+
+msgid "search commands wrap around the end of the buffer"
+msgstr "команде претраге �е обавијају око краја бафера"
+
+msgid "show match for partly typed search command"
+msgstr "приказује подударање за делимично откуцану команду претраге"
+
+msgid "change the way backslashes are used in search patterns"
+msgstr ""
+"мења начин на који �е кори�те обрнуте ко�е црте у шаблонима\n"
+"претраге"
+
+msgid "select the default regexp engine used"
+msgstr "бира подразумевани регизраз механизам"
+
+msgid "ignore case when using a search pattern"
+msgstr "не прави разлику у величини �лова када �е кори�ти шаблон претраге"
+
+msgid "override 'ignorecase' when pattern has upper case characters"
+msgstr "премошћава 'ignorecase' када шаблон �адржи велика �лова"
+
+msgid "what method to use for changing case of letters"
+msgstr "који метод �е кори�ти за промену величине �лова"
+
+msgid "maximum amount of memory in Kbyte used for pattern matching"
+msgstr ""
+"мак�имална количина меморије у Кбајтима која �е кори�ти за\n"
+"подударање шаблона"
+
+msgid "pattern for a macro definition line"
+msgstr "шаблона за линију која дефинише макро"
+
+msgid "pattern for an include-file line"
+msgstr "шаблон за линију која укључује фајл"
+
+msgid "expression used to transform an include line to a file name"
+msgstr ""
+"израз који �е кори�ти за тран�формацију линије укључивања фајла у\n"
+"име фајла"
+
+msgid "tags"
+msgstr "ознаке"
+
+msgid "use binary searching in tags files"
+msgstr "кори�ти бинарно претраживање у фајловима ознака"
+
+msgid "number of significant characters in a tag name or zero"
+msgstr "број значајних карактера у имену ознаке или нула"
+
+msgid "list of file names to search for tags"
+msgstr "ли�та имена фајлова који �е претражују на ознаке"
+
+msgid ""
+"how to handle case when searching in tags files:\n"
+"\"followic\" to follow 'ignorecase', \"ignore\" or \"match\""
+msgstr ""
+"како �е обрађује величина �лова када �е претражују фајлови\n"
+"ознака: „followic� да �е �леди 'ignorecase', „ignore� или „match�"
+
+msgid "file names in a tags file are relative to the tags file"
+msgstr "имена фајлова у фајлу ознака �у релативна у одно�у на фајл ознака"
+
+msgid "a :tag command will use the tagstack"
+msgstr "Команда :tag ће да кори�ти �тек ознака"
+
+msgid "when completing tags in Insert mode show more info"
+msgstr "када �е довршавају ознаке у режиму Уметање приказује �е још инфо"
+
+msgid "a function to be used to perform tag searches"
+msgstr "функција која �е кори�ти за обављање претраге ознака"
+
+msgid "command for executing cscope"
+msgstr "команда за извршавање cscope"
+
+msgid "use cscope for tag commands"
+msgstr "cscope �е кори�ти за команде ознака"
+
+msgid "0 or 1; the order in which \":cstag\" performs a search"
+msgstr "0 или 1; редо�лед по коме „:cstag� врши претрагу"
+
+msgid "give messages when adding a cscope database"
+msgstr "враћа поруке када �е додаје cscope база података"
+
+msgid "how many components of the path to show"
+msgstr "колико компоненти путање �е приказује"
+
+msgid "when to open a quickfix window for cscope"
+msgstr "када �е за cscope отвара quickfix прозор"
+
+msgid "file names in a cscope file are relative to that file"
+msgstr "имена фајлова у cscope фајлу �у релативна у одно�у на тај фајл"
+
+msgid "displaying text"
+msgstr "приказ тек�та"
+
+msgid "number of lines to scroll for CTRL-U and CTRL-D"
+msgstr "број линија које �кролују CTRL-U и CTRL-D"
+
+msgid "number of screen lines to show around the cursor"
+msgstr "број екран�ких линија које �е пеиказују око кур�ора"
+
+msgid "long lines wrap"
+msgstr "дуге линије �е обавијају"
+
+msgid "wrap long lines at a character in 'breakat'"
+msgstr "дугачке линије �е преламају на карактеру из 'breakat'"
+
+msgid "preserve indentation in wrapped text"
+msgstr "задржава �е увлачење у обавијеном тек�ту"
+
+msgid "adjust breakindent behaviour"
+msgstr "подешавање breakindent понашања"
+
+msgid "which characters might cause a line break"
+msgstr "који карактери би могли да преломе линију"
+
+msgid "string to put before wrapped screen lines"
+msgstr "�тринг који �е по�тавља и�пред обавијених екран�ких линија"
+
+msgid "minimal number of columns to scroll horizontally"
+msgstr "минимални број колона које �е �кролују хоризонтално"
+
+msgid "minimal number of columns to keep left and right of the cursor"
+msgstr "минимални број колона које �е задржавају лево и де�но од кур�ора"
+
+msgid ""
+"include \"lastline\" to show the last line even if it doesn't fit\n"
+"include \"uhex\" to show unprintable characters as a hex number"
+msgstr ""
+"укључује „lastline� за приказивање по�ледње линије, чак и ако не\n"
+"�таје\n"
+"укључује „uhex� за приказ карактера који �е не штампају као хек�\n"
+"броја"
+
+msgid "characters to use for the status line, folds and filler lines"
+msgstr ""
+"карактери који �е кори�те за �тату�ну линију, �вијутке и линије\n"
+"и�пуне"
+
+msgid "number of lines used for the command-line"
+msgstr "број линија резерви�аних за командну-линију"
+
+msgid "width of the display"
+msgstr "ширина приказа"
+
+msgid "number of lines in the display"
+msgstr "број линија у приказу"
+
+msgid "number of lines to scroll for CTRL-F and CTRL-B"
+msgstr "број линија који �кролују CTRL-F и CTRL-B"
+
+msgid "don't redraw while executing macros"
+msgstr "екран �е не и�цртава током извршавања макроа"
+
+msgid "timeout for 'hlsearch' and :match highlighting in msec"
+msgstr "тајмаут за 'hlsearch' и :match и�тицање у мили�екундама"
+
+msgid ""
+"delay in msec for each char written to the display\n"
+"(for debugging)"
+msgstr ""
+"кашњење у мили�екундама за �ваки карактер и�пи�ан на екран\n"
+"(за дибагинг)"
+
+msgid "show <Tab> as ^I and end-of-line as $"
+msgstr "приказује <Tab> као ^I и крај-линије као $"
+
+msgid "list of strings used for list mode"
+msgstr "ли�та �трингова који �е кори�те за режим ли�те"
+
+msgid "show the line number for each line"
+msgstr "приказује број линије за �ваку линију"
+
+msgid "show the relative line number for each line"
+msgstr "приказује релативни број линије за �ваку линију"
+
+msgid "number of columns to use for the line number"
+msgstr "број колона које �е кори�те за број линије"
+
+msgid "controls whether concealable text is hidden"
+msgstr "контролише да ли �е �крива тек�т који може да �е �акрије"
+
+msgid "modes in which text in the cursor line can be concealed"
+msgstr "режими у којима тек�т у кур�ор�кој линији може да �е �акрива"
+
+msgid "syntax, highlighting and spelling"
+msgstr "�интак�а, и�тицање и провера правопи�а"
+
+msgid "\"dark\" or \"light\"; the background color brightness"
+msgstr "„dark� или „light�; �ветлина боје позадине"
+
+msgid "type of file; triggers the FileType event when set"
+msgstr "тип фајла; када је по�тављена окида FileType догађај"
+
+msgid "name of syntax highlighting used"
+msgstr "име и�тицања �интак�е које �е кори�ти"
+
+msgid "maximum column to look for syntax items"
+msgstr "мак�ималан број колона које �е претражују на �интак�не �тавке"
+
+msgid "which highlighting to use for various occasions"
+msgstr "које и�тицање �е кори�ти у разним �итуацијама"
+
+msgid "highlight all matches for the last used search pattern"
+msgstr "и�тичу �е �ва подударања по�ледње коришћеног шаблона претраге"
+
+msgid "highlight group to use for the window"
+msgstr "група и�тицања која �е кори�ти за прозор"
+
+msgid "use GUI colors for the terminal"
+msgstr "за терминал �е кори�те ГКИ боје"
+
+msgid "highlight the screen column of the cursor"
+msgstr "и�тиче �е екран�ка колона у којој је кур�ор"
+
+msgid "highlight the screen line of the cursor"
+msgstr "и�тиче �е екран�ка линија у којој је кур�ор"
+
+msgid "specifies which area 'cursorline' highlights"
+msgstr "наводи површину коју и�тиче 'cursorline'"
+
+msgid "columns to highlight"
+msgstr "колоне које �е и�тичу"
+
+msgid "highlight spelling mistakes"
+msgstr "и�тицање правопи�них грешака"
+
+msgid "list of accepted languages"
+msgstr "ли�та језика који �е прихватају"
+
+msgid "file that \"zg\" adds good words to"
+msgstr "фајл у који „zg� додаје добро и�пи�ане речи"
+
+msgid "pattern to locate the end of a sentence"
+msgstr "шаблон којим �е лоцира крај реченице"
+
+msgid "flags to change how spell checking works"
+msgstr "за�тавице које мењају начин рада провере правопи�а"
+
+msgid "methods used to suggest corrections"
+msgstr "методе које �е кори�те за правопи�не предлоге"
+
+msgid "amount of memory used by :mkspell before compressing"
+msgstr "количина меморије коју кори�ти :mkspell пре компре�ије"
+
+msgid "multiple windows"
+msgstr "више�труки прозори"
+
+msgid "0, 1 or 2; when to use a status line for the last window"
+msgstr "0, 1 или 2; када �е кори�ти �тату�на линија за по�ледњи прозор"
+
+msgid "alternate format to be used for a status line"
+msgstr "алтернативни формат који ће �е кори�тити за �тату�ну линију"
+
+msgid "make all windows the same size when adding/removing windows"
+msgstr ""
+"по�тавља �ве прозоре на и�ту величину када �е прозори\n"
+"додају/уклањају"
+
+msgid "in which direction 'equalalways' works: \"ver\", \"hor\" or \"both\""
+msgstr "у ком �меру функционише 'equalalways': „ver�, „hor� или „both�"
+
+msgid "minimal number of lines used for the current window"
+msgstr "минимални број линија који �е кори�ти за текући прозор"
+
+msgid "minimal number of lines used for any window"
+msgstr "минимални број линија који �е кори�ти за било који прозор"
+
+msgid "keep the height of the window"
+msgstr "задржава �е ви�ина прозора"
+
+msgid "keep the width of the window"
+msgstr "задржава �е ширина прозора"
+
+msgid "minimal number of columns used for the current window"
+msgstr "минимални број колона које �е кори�те за текући прозор"
+
+msgid "minimal number of columns used for any window"
+msgstr "минимални број колона које �е кори�те за било који прозор"
+
+msgid "initial height of the help window"
+msgstr "иницијална ви�ина прозора помоћи"
+
+msgid "use a popup window for preview"
+msgstr "за преглед �е кори�ти и�качући прозор"
+
+msgid "default height for the preview window"
+msgstr "подразумевана ви�ина прозора за преглед"
+
+msgid "identifies the preview window"
+msgstr "идентификује прозора за преглед"
+
+msgid "don't unload a buffer when no longer shown in a window"
+msgstr ""
+"бафер �е не уклања из меморије када �е више не приказује у\n"
+"прозору"
+
+msgid ""
+"\"useopen\" and/or \"split\"; which window to use when jumping\n"
+"to a buffer"
+msgstr ""
+"„useopen� и/или „split�; који прозор �е кори�ти када �е �каче на\n"
+"бафер"
+
+msgid "a new window is put below the current one"
+msgstr "нови прозор �е по�тавља и�под текућег"
+
+msgid "a new window is put right of the current one"
+msgstr "нови прозор �е по�тавља де�но од текућег"
+
+msgid "this window scrolls together with other bound windows"
+msgstr "овај прозор �е �кролује заједно �а о�талим везаним прозорима"
+
+msgid "\"ver\", \"hor\" and/or \"jump\"; list of options for 'scrollbind'"
+msgstr "„ver�, „hor� и/или „jump�; ли�та опција за 'scrollbind'"
+
+msgid "this window's cursor moves together with other bound windows"
+msgstr ""
+"кур�ор овог прозора �е помера заједно �а о�талим везаним\n"
+"прозорима"
+
+msgid "size of a terminal window"
+msgstr "величина терминал�ког прозора"
+
+msgid "key that precedes Vim commands in a terminal window"
+msgstr "та�тер који иде и�пред Vim команди у терминал�ком прозору"
+
+msgid "max number of lines to keep for scrollback in a terminal window"
+msgstr ""
+"мак�ималан број линија које �е чувају за �кроловање уназад у\n"
+"терминал�ком прозору"
+
+msgid "type of pty to use for a terminal window"
+msgstr "тип pty који �е кори�ти за терминал�ки прозор"
+
+msgid "name of the winpty dynamic library"
+msgstr "име winpty динамичке библиотеке"
+
+msgid "multiple tab pages"
+msgstr "више�труке картице"
+
+msgid "0, 1 or 2; when to use a tab pages line"
+msgstr "0, 1 или 2; када �е кори�ти линија �а картицама"
+
+msgid "maximum number of tab pages to open for -p and \"tab all\""
+msgstr "мак�имални број картица које �е отварају за -p и „tab all�"
+
+msgid "custom tab pages line"
+msgstr "прилагођена линија �а картицама"
+
+msgid "custom tab page label for the GUI"
+msgstr "лабела прилагођене линије �а картицама у ГКИ"
+
+msgid "custom tab page tooltip for the GUI"
+msgstr "прилагођени �авет алата за картицу у ГКИ"
+
+msgid "terminal"
+msgstr "терминал"
+
+msgid "name of the used terminal"
+msgstr "име терминала који �е кори�ти"
+
+msgid "alias for 'term'"
+msgstr "алија� за 'term'"
+
+msgid "check built-in termcaps first"
+msgstr "најпре �е проверава уграђени termcaps"
+
+msgid "terminal connection is fast"
+msgstr "веза �а терминалом је брза"
+
+msgid "terminal that requires extra redrawing"
+msgstr "терминал који тражи додатно поновно и�цртавање"
+
+msgid "recognize keys that start with <Esc> in Insert mode"
+msgstr "препознају �е та�тери који у режиму Уметање почињу �а <Esc>"
+
+msgid "minimal number of lines to scroll at a time"
+msgstr "минимални број линија које �е одједном �кролују"
+
+msgid "maximum number of lines to use scrolling instead of redrawing"
+msgstr ""
+"мак�имални број линија за које �е уме�то поновног и�цртавања\n"
+"кори�ти �кроловање"
+
+msgid "specifies what the cursor looks like in different modes"
+msgstr "наводи како у различитим режимима изгледа кур�ор"
+
+msgid "show info in the window title"
+msgstr "у на�лову прозора �е приказују инфомрмације"
+
+msgid "percentage of 'columns' used for the window title"
+msgstr "проценат 'columns' који �е кори�ти за на�лов прозора"
+
+msgid "when not empty, string to be used for the window title"
+msgstr "када није празна, �тринг који �е кори�ти за на�лов прозора"
+
+msgid "string to restore the title to when exiting Vim"
+msgstr "�тринг који �е по�тавља као на�лов прозора када �е напушта Vim"
+
+msgid "set the text of the icon for this window"
+msgstr "по�тавља тек�т иконе за овај прозор"
+
+msgid "when not empty, text for the icon of this window"
+msgstr "када није празна, тек�т за икону овог прозора"
+
+msgid "restore the screen contents when exiting Vim"
+msgstr "враћа �адржај екрана када �е напушта Vim"
+
+msgid "using the mouse"
+msgstr "употреба миша"
+
+msgid "list of flags for using the mouse"
+msgstr "ли�та за�тавица за коришћење миша"
+
+msgid "the window with the mouse pointer becomes the current one"
+msgstr "прозор �а показивачем миша по�таје текући"
+
+msgid "the window with the mouse pointer scrolls with the mouse wheel"
+msgstr "прозор �а показивачем миша �е �кролује точкићем миша"
+
+msgid "hide the mouse pointer while typing"
+msgstr "показивач миша �е �акрива док �е куца"
+
+msgid ""
+"\"extend\", \"popup\" or \"popup_setpos\"; what the right\n"
+"mouse button is used for"
+msgstr ""
+"„extend�, „popup� или „popup_setpos�; за шта �е кори�ти де�ни\n"
+"та�тер миша"
+
+msgid "maximum time in msec to recognize a double-click"
+msgstr "мак�имално време у мили�екундама за препознавање дво�труког клика"
+
+msgid "\"xterm\", \"xterm2\", \"sgr\", etc.; type of mouse"
+msgstr "„xterm�, „xterm2�, „sgr�, итд.; тип миша"
+
+msgid "what the mouse pointer looks like in different modes"
+msgstr "како изгледа показивач миша у различитим режимима"
+
+msgid "GUI"
+msgstr "ГКИ"
+
+msgid "list of font names to be used in the GUI"
+msgstr "ли�та имена фонтова који ће да �е кори�те у ГКИ"
+
+msgid "pair of fonts to be used, for multibyte editing"
+msgstr "пар фонтова који ће да �е кори�те, за уређевање вишебајтног тек�та"
+
+msgid "list of font names to be used for double-wide characters"
+msgstr ""
+"ли�та имена фонтова који треба да �е кори�те за карактере\n"
+"дво�труке ширине"
+
+msgid "use smooth, antialiased fonts"
+msgstr "кори�те �е глатки, неназубљени фонтови"
+
+msgid "list of flags that specify how the GUI works"
+msgstr "ли�та за�тавица које наводе како ради ГКИ"
+
+msgid "\"icons\", \"text\" and/or \"tooltips\"; how to show the toolbar"
+msgstr "„icons�, „text� и/или „tooltips�; како �е приказује алатна линија"
+
+msgid "size of toolbar icons"
+msgstr "величина икона алатне линије"
+
+msgid "room (in pixels) left above/below the window"
+msgstr "ме�то (у пик�елима) лево изнад/и�под прозора"
+
+msgid "options for text rendering"
+msgstr "опције за и�цртавање тек�та"
+
+msgid "use a pseudo-tty for I/O to external commands"
+msgstr "кори�ти �е п�еудо-tty за У/И у �пољне команде"
+
+msgid ""
+"\"last\", \"buffer\" or \"current\": which directory used for the file "
+"browser"
+msgstr ""
+"„last�, „buffer� или „current�: који директоријум �е кори�ти за\n"
+"прегледач фајлова"
+
+msgid "language to be used for the menus"
+msgstr "језик који �е кори�ти за меније"
+
+msgid "maximum number of items in one menu"
+msgstr "мак�имални број �тавки у једном менију"
+
+msgid "\"no\", \"yes\" or \"menu\"; how to use the ALT key"
+msgstr "„no�, „yes� или „menu�; како �е кори�ти та�тер ALT"
+
+msgid "number of pixel lines to use between characters"
+msgstr "број пик�ел линија које �е кори�те између карактера"
+
+msgid "delay in milliseconds before a balloon may pop up"
+msgstr "кашњење у мили�екундама пре него што балон може да и�кочи"
+
+msgid "use balloon evaluation in the GUI"
+msgstr "у ГКИ �е кори�ти израчунавање балона"
+
+msgid "use balloon evaluation in the terminal"
+msgstr "у терминалу �е кори�ти израчунавање балона"
+
+msgid "expression to show in balloon eval"
+msgstr "израз који �е приказује у балону"
+
+msgid "printing"
+msgstr "штампање"
+
+msgid "list of items that control the format of :hardcopy output"
+msgstr "ли�та �тавки које контролишу формат излаза :hardcopy"
+
+msgid "name of the printer to be used for :hardcopy"
+msgstr "име штампача који �е кори�ти за :hardcopy"
+
+msgid "expression used to print the PostScript file for :hardcopy"
+msgstr "израз који �е кори�ти код штампања PostScript фајла за :hardcopy"
+
+msgid "name of the font to be used for :hardcopy"
+msgstr "име фонта који ће �е кори�тити за :hardcopy"
+
+msgid "format of the header used for :hardcopy"
+msgstr "формат заглавља које �е кори�ти за :hardcopy"
+
+msgid "encoding used to print the PostScript file for :hardcopy"
+msgstr ""
+"кодирање које �е кори�ти код штампања PostScript фајла за\n"
+":hardcopy"
+
+msgid "the CJK character set to be used for CJK output from :hardcopy"
+msgstr "CJK �куп карактера који ће �е кори�тити за CJK излаз из :hardcopy"
+
+msgid "list of font names to be used for CJK output from :hardcopy"
+msgstr ""
+"ли�та имена фонтова који ће �е кори�тити за CJK излаз из\n"
+":hardcopy"
+
+msgid "messages and info"
+msgstr "поруке и информације"
+
+msgid "add 's' flag in 'shortmess' (don't show search message)"
+msgstr ""
+"додаје �е за�тавица ’s’ у 'shortmess' (не приказује �е порука\n"
+"претраге)"
+
+msgid "list of flags to make messages shorter"
+msgstr "ли�та за�тавица за �краћивање порука"
+
+msgid "show (partial) command keys in the status line"
+msgstr "у �тату�ној линији �е приказују (делимични) та�тери команде"
+
+msgid "display the current mode in the status line"
+msgstr "у �тату�ној линији �е приказује текући режим"
+
+msgid "show cursor position below each window"
+msgstr "позиција кур�ора �е приказује и�под �ваког прозора"
+
+msgid "alternate format to be used for the ruler"
+msgstr "алтернативни формат који ће �е кори�тити за лењир"
+
+msgid "threshold for reporting number of changed lines"
+msgstr "граница за извештавање о броју измењених линија"
+
+msgid "the higher the more messages are given"
+msgstr "што је веће, издаје �е више порука"
+
+msgid "file to write messages in"
+msgstr "фајл у који ће да �е упи�ују поруке"
+
+msgid "pause listings when the screen is full"
+msgstr "и�пи�и �е паузирају када �е екран напуни"
+
+msgid "start a dialog when a command fails"
+msgstr "када команда не у�пе да �е изврши, покреће �е дијалог"
+
+msgid "ring the bell for error messages"
+msgstr "позвони приликом порука о грешки"
+
+msgid "use a visual bell instead of beeping"
+msgstr "употребљава �е визуелно звонце уме�то звучног"
+
+msgid "do not ring the bell for these reasons"
+msgstr "звонце �е неће оглашавати у �ледећим �лучајевима"
+
+msgid "list of preferred languages for finding help"
+msgstr "ли�та жељених језика за проналажење помоћи"
+
+msgid "selecting text"
+msgstr "избор тек�та"
+
+msgid "\"old\", \"inclusive\" or \"exclusive\"; how selecting text behaves"
+msgstr "„old�, „inclusive� или „exclusive�; како �е понаша избор тек�та"
+
+msgid ""
+"\"mouse\", \"key\" and/or \"cmd\"; when to start Select mode\n"
+"instead of Visual mode"
+msgstr ""
+"„mouse�, „key� и/или „cmd�; када �е уме�то Визуелног режима\n"
+"покреће режим Избор"
+
+msgid ""
+"\"unnamed\" to use the * register like unnamed register\n"
+"\"autoselect\" to always put selected text on the clipboard"
+msgstr ""
+"„unnamed� да �е кори�ти * реги�тар као неименовани реги�тар\n"
+"„autoselect� да �е изабрани тек�т увек �тавља у клипборд"
+
+msgid "\"startsel\" and/or \"stopsel\"; what special keys can do"
+msgstr "„startsel� и/или „stopsel�; шта могу да ураде �пецијални та�тери"
+
+msgid "editing text"
+msgstr "уређивање тек�та"
+
+msgid "maximum number of changes that can be undone"
+msgstr "мак�ималан број измена које могу да �е пониште"
+
+msgid "automatically save and restore undo history"
+msgstr "и�торија поништавања �е аутомат�ки чува и враћа"
+
+msgid "list of directories for undo files"
+msgstr "ли�та директоријума за фајлове поништавања"
+
+msgid "maximum number lines to save for undo on a buffer reload"
+msgstr ""
+"мак�имални број линија које �е чувају за поништавање приликом\n"
+"поновног учитавања бафера"
+
+msgid "changes have been made and not written to a file"
+msgstr "промене �у извршене, а ни�у упи�ане у фајл"
+
+msgid "buffer is not to be written"
+msgstr "бафер не може да �е упи�ује"
+
+msgid "changes to the text are possible"
+msgstr "могуће �у измене тек�та"
+
+msgid "line length above which to break a line"
+msgstr "дужина линије преко које �е линија прелама"
+
+msgid "margin from the right in which to break a line"
+msgstr "маргина �а де�не �тране у којој �е прелама линија"
+
+msgid "specifies what <BS>, CTRL-W, etc. can do in Insert mode"
+msgstr "наводи шта у режиму Уметање могу <BS>, CTRL-W, итд."
+
+msgid "definition of what comment lines look like"
+msgstr "дефиниција изгледа линије коментара"
+
+msgid "list of flags that tell how automatic formatting works"
+msgstr "ли�та за�тавица које говоре како ради аутомат�ко форматирање"
+
+msgid "pattern to recognize a numbered list"
+msgstr "шаблон који препознаје нумери�ану ли�ту"
+
+msgid "expression used for \"gq\" to format lines"
+msgstr "израз који „gq� кори�ти да форматира линије"
+
+msgid "specifies how Insert mode completion works for CTRL-N and CTRL-P"
+msgstr "наводи како ради довршавање у режиму Уметање за CTRL-N и CTRL-P"
+
+msgid "whether to use a popup menu for Insert mode completion"
+msgstr "да ли �е за довршавање у режиму Уметање кори�ти и�качући мени"
+
+msgid "options for the Insert mode completion info popup"
+msgstr "опције за и�качући мени за довршавање у режиму Уметање"
+
+msgid "maximum height of the popup menu"
+msgstr "мак�имална ви�ина и�качућег менија"
+
+msgid "minimum width of the popup menu"
+msgstr "минимална ширина и�качућег менија"
+
+msgid "user defined function for Insert mode completion"
+msgstr "кори�нички дефини�ана фунцкија за довршавање у режиму Уметање"
+
+msgid "function for filetype-specific Insert mode completion"
+msgstr "фунцкија за довршавање у режиму Уметање �пецифично за тип фајла"
+
+msgid "list of dictionary files for keyword completion"
+msgstr "ли�та фајлова речника за довршавање кључних речи"
+
+msgid "list of thesaurus files for keyword completion"
+msgstr "ли�та тезауру� фајлова за довршавање кључних речи"
+
+msgid "adjust case of a keyword completion match"
+msgstr ""
+"подешавање величине �лова за подударања код довршавања кључних\n"
+"речи"
+
+msgid "enable entering digraphs with c1 <BS> c2"
+msgstr "укључивање уно�а диграфа �а к1 <BS> к2"
+
+msgid "the \"~\" command behaves like an operator"
+msgstr "команда „~� �е понаша као оператор"
+
+msgid "function called for the \"g@\" operator"
+msgstr "функција која �е позива за оператор „g@�"
+
+msgid "when inserting a bracket, briefly jump to its match"
+msgstr "када �е умеће заграда, кратко �е �каче на њену одговарајућу"
+
+msgid "tenth of a second to show a match for 'showmatch'"
+msgstr "де�етинки �екунде �е приказује подударање за 'showmatch'"
+
+msgid "list of pairs that match for the \"%\" command"
+msgstr "ли�та парова који �е подударају командом „%�"
+
+msgid "use two spaces after '.' when joining a line"
+msgstr "кори�те �е �ва размака након ’.’ када �е �паја линија"
+
+msgid ""
+"\"alpha\", \"octal\", \"hex\", \"bin\" and/or \"unsigned\"; number formats\n"
+"recognized for CTRL-A and CTRL-X commands"
+msgstr ""
+"„alpha�, „octal�, „hex�, „bin� и/или „unsigned�; формати бројева\n"
+"које препознају команде CTRL-A и CTRL-X"
+
+msgid "tabs and indenting"
+msgstr "табулатори и увлачење"
+
+msgid "number of spaces a <Tab> in the text stands for"
+msgstr "број размака којим �е у тек�ту мења један <Tab>"
+
+msgid "number of spaces used for each step of (auto)indent"
+msgstr "број размака који �е кори�те за �ваки корак (ауто)увлачења"
+
+msgid "list of number of spaces a tab counts for"
+msgstr "ли�та броја размака које вреди таб"
+
+msgid "list of number of spaces a soft tabsstop counts for"
+msgstr "ли�та броја размака које вреди �офт таб�топ"
+
+msgid "a <Tab> in an indent inserts 'shiftwidth' spaces"
+msgstr "<Tab> у увлачењу умеће 'shiftwidth' размака"
+
+msgid "if non-zero, number of spaces to insert for a <Tab>"
+msgstr "ако је различито од нуле, број разнака који �е умеће за <Tab>"
+
+msgid "round to 'shiftwidth' for \"<<\" and \">>\""
+msgstr "заокружено на 'shiftwidth' за „<<� и „>>�"
+
+msgid "expand <Tab> to spaces in Insert mode"
+msgstr "у режиму Уметање �е <Tab> развија у размаке"
+
+msgid "automatically set the indent of a new line"
+msgstr "увлачење нове линије �е по�тавља аутомат�ки"
+
+msgid "do clever autoindenting"
+msgstr "врши �е паметно аутоувлачење"
+
+msgid "enable specific indenting for C code"
+msgstr "укључивање увлачења �пецифично за C кôд"
+
+msgid "options for C-indenting"
+msgstr "опције за C-увлачење"
+
+msgid "keys that trigger C-indenting in Insert mode"
+msgstr "та�тери који окидају C-увлачење у режиму Уметање"
+
+msgid "list of words that cause more C-indent"
+msgstr "ли�та речи које изазивају још C-увлачења"
+
+msgid "expression used to obtain the indent of a line"
+msgstr "израз који �е кори�ти за израчунавање увлачњеа линије"
+
+msgid "keys that trigger indenting with 'indentexpr' in Insert mode"
+msgstr "та�тери који окидају увлачење �а 'indentexpr' у режиму Уметање"
+
+msgid "copy whitespace for indenting from previous line"
+msgstr "копира �е празан про�тор за увлачење из претходне линије"
+
+msgid "preserve kind of whitespace when changing indent"
+msgstr "задржава �е вр�та празног про�тора када �е мења увлачење"
+
+msgid "enable lisp mode"
+msgstr "укључивање lisp режима"
+
+msgid "words that change how lisp indenting works"
+msgstr "речи које мењају начин рада lisp режима"
+
+msgid "folding"
+msgstr "подвијање"
+
+msgid "unset to display all folds open"
+msgstr "и�кључите да би �е �ви �вијуци приказали отворени"
+
+msgid "folds with a level higher than this number will be closed"
+msgstr "биће затворени �вијуци �а нивоом подвијања већим од овог броја"
+
+msgid "value for 'foldlevel' when starting to edit a file"
+msgstr "вредно�т за 'foldlevel' када �е започне уређивање фајла"
+
+msgid "width of the column used to indicate folds"
+msgstr "ширина колоне која �е кори�ти за означавање �вијутака"
+
+msgid "expression used to display the text of a closed fold"
+msgstr "израз који �е кори�ти за приказивање тек�та затвореног �вијутка"
+
+msgid "set to \"all\" to close a fold when the cursor leaves it"
+msgstr "по�тавите на „all� да �е �вијутак затвори када га кур�ор напу�ти"
+
+msgid "specifies for which commands a fold will be opened"
+msgstr "наводи команде за које ће �вијутак бити отворен"
+
+msgid "minimum number of screen lines for a fold to be closed"
+msgstr "минимални број екран�ких линија да би �вијутак био затворен"
+
+msgid "template for comments; used to put the marker in"
+msgstr "шаблон за коментаре; кори�ти �е да �е у њега по�тави маркер"
+
+msgid ""
+"folding type: \"manual\", \"indent\", \"expr\", \"marker\",\n"
+"\"syntax\" or \"diff\""
+msgstr ""
+"тип подвијања: „manual�, „indent�, „expr�, „marker�,\n"
+"„syntax� или „diff�"
+
+msgid "expression used when 'foldmethod' is \"expr\""
+msgstr "израз који �е кори�ти када је 'foldmethod' „expr�"
+
+msgid "used to ignore lines when 'foldmethod' is \"indent\""
+msgstr "кори�ти �е за игнори�ање линија када је 'foldmethod' „indent�"
+
+msgid "markers used when 'foldmethod' is \"marker\""
+msgstr "маркери који �е кори�те када је 'foldmethod' „marker�"
+
+msgid "maximum fold depth for when 'foldmethod' is \"indent\" or \"syntax\""
+msgstr ""
+"мак�имална дубина подвијања када је 'foldmethod' „indent� или\n"
+"„syntax�"
+
+msgid "diff mode"
+msgstr "diff режим"
+
+msgid "use diff mode for the current window"
+msgstr "кори�ти �е diff режим за текући прозор"
+
+msgid "options for using diff mode"
+msgstr "опције за коришћење diff режима"
+
+msgid "expression used to obtain a diff file"
+msgstr "израз који �е кори�ти за добијање diff фајла"
+
+msgid "expression used to patch a file"
+msgstr "израз који �е кори�ти за крпљење фајла"
+
+msgid "mapping"
+msgstr "мапирање"
+
+msgid "maximum depth of mapping"
+msgstr "мак�имална дубина мапирања"
+
+msgid "recognize mappings in mapped keys"
+msgstr "мапирања �е препознају у мапираним та�терима"
+
+msgid "allow timing out halfway into a mapping"
+msgstr "дозвољава �е и�тицање времена на пола мапирања"
+
+msgid "allow timing out halfway into a key code"
+msgstr "дозвољава �е и�тицање времена на пола кода та�тера"
+
+msgid "time in msec for 'timeout'"
+msgstr "време у мили�екундама за 'timeout'"
+
+msgid "time in msec for 'ttimeout'"
+msgstr "време у мили�екундама за 'ttimeout'"
+
+msgid "reading and writing files"
+msgstr "читање и упи�ивање фајлова"
+
+msgid "enable using settings from modelines when reading a file"
+msgstr ""
+"омогућавање употребе подешавања из режим�ке линије када �е чита\n"
+"фајл"
+
+msgid "allow setting expression options from a modeline"
+msgstr "омогућавање по�тављања опција израза из режим�ке линије"
+
+msgid "number of lines to check for modelines"
+msgstr "број линија које �е проверавају на по�тојање режим�ке линије"
+
+msgid "binary file editing"
+msgstr "уређивање бинарног фајла"
+
+msgid "last line in the file has an end-of-line"
+msgstr "по�ледња линија у фајлу има крај-линије"
+
+msgid "fixes missing end-of-line at end of text file"
+msgstr "поправља недо�тајуће крај-линије на крају тек�т фајла"
+
+msgid "prepend a Byte Order Mark to the file"
+msgstr "по�тавља Маркер редо�леда бајтова (BOM) на почетак фајла"
+
+msgid "end-of-line format: \"dos\", \"unix\" or \"mac\""
+msgstr "формат краја-линије: „dos�, „unix� или „mac�"
 
-msgid "failed to change directory"
-msgstr "не може да �е промени директоријум"
+msgid "list of file formats to look for when editing a file"
+msgstr "ли�та формата фајла који �е претражују када �е уређује фајл"
 
-#, c-format
-msgid "expected 3-tuple as imp.find_module() result, but got %s"
-msgstr "Као резултат imp.find_module() очекује �е триплет, али је добијено %s"
+msgid "obsolete, use 'fileformat'"
+msgstr "за�тарело, кори�тите 'fileformat'"
 
-#, c-format
-msgid "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
+msgid "obsolete, use 'fileformats'"
+msgstr "за�тарело, кори�тите 'fileformats'"
+
+msgid "writing files is allowed"
+msgstr "дозвољено је упи�ивање фајлова"
+
+msgid "write a backup file before overwriting a file"
+msgstr "резервни фајл �е упи�ује пре препи�ивања фајла"
+
+msgid "keep a backup after overwriting a file"
+msgstr "резервни фајл �е након препи�ивања фајла задржава"
+
+msgid "patterns that specify for which files a backup is not made"
+msgstr "шаблони који наводе за које фајлове �е не прави резервна копија"
+
+msgid "whether to make the backup as a copy or rename the existing file"
 msgstr ""
-"Као резултат imp.find_module() очекује �е триплет, али је добијена н-торка "
-"величине %d"
+"да ли �е резервни фајл прави као копија или �е преименује\n"
+"по�тојећи фајл"
 
-msgid "internal error: imp.find_module returned tuple with NULL"
-msgstr "интерна грешка: imp.find_module је вратио н-торку �а NULL"
+msgid "list of directories to put backup files in"
+msgstr "ли�та директоријума у које �е �тављају резервни фајлови"
 
-msgid "cannot delete vim.Dictionary attributes"
-msgstr "vim.Dictionary атрибути не могу да �е обришу"
+msgid "file name extension for the backup file"
+msgstr "ек�тензија фајла за резервни фајл"
 
-msgid "cannot modify fixed dictionary"
-msgstr "фик�ни речник не може да �е измени"
+msgid "automatically write a file when leaving a modified buffer"
+msgstr "фајл �е аутомат�ки упи�ује када �е напушта измењени бафер"
 
-#, c-format
-msgid "cannot set attribute %s"
-msgstr "атрибут %s не може да �е по�тави"
+msgid "as 'autowrite', but works with more commands"
+msgstr "као 'autowrite', али ради �а више команди"
 
-msgid "hashtab changed during iteration"
-msgstr "hashtab је промењен током итерације"
+msgid "always write without asking for confirmation"
+msgstr "увек �е упи�ује без тражења потврде"
 
-#, c-format
-msgid "expected sequence element of size 2, but got sequence of size %d"
+msgid "automatically read a file when it was modified outside of Vim"
+msgstr "аутомат�ки �е чита фајл када је измењен ван програма Vim"
+
+msgid "keep oldest version of a file; specifies file name extension"
 msgstr ""
-"очекивао �е елемент �еквенце величине 2, али је добијена �еквенца величине %d"
+"задржава �е нај�тарија верзија фајла; наводи ек�тензију имена\n"
+"фајла"
 
-msgid "list constructor does not accept keyword arguments"
-msgstr "кон�труктор ли�те не прихвата кључне речи за аргументе"
+msgid "forcibly sync the file to disk after writing it"
+msgstr "након упи�а, фајл �е фор�ирано �инхронизује на ди�к"
 
-msgid "list index out of range"
-msgstr "индек� ли�те је ван оп�ега"
+msgid "use 8.3 file names"
+msgstr "кори�те �е 8.3 имена фајлова"
 
-#, c-format
-msgid "internal error: failed to get Vim list item %d"
-msgstr "интерна грешка: �тавка %d vim ли�те није могла да �е добије"
+msgid "encryption method for file writing: zip, blowfish or blowfish2"
+msgstr "метода шифрирања код упи�а фајла: zip, blowfish или blowfish2"
 
-msgid "slice step cannot be zero"
-msgstr "slice корак не може да буде нула"
+msgid "the swap file"
+msgstr "swap фајл"
 
-#, c-format
-msgid "attempt to assign sequence of size greater than %d to extended slice"
-msgstr "покушај доделе �еквенце величине веће од %d како би �е продужио slice"
+msgid "list of directories for the swap file"
+msgstr "ли�та директоријума за swap фајл"
 
-#, c-format
-msgid "internal error: no Vim list item %d"
-msgstr "интерна грешка: нема �тавке %d у vim ли�ти"
+msgid "use a swap file for this buffer"
+msgstr "swap фајл �е кори�ти за овај бафер"
 
-msgid "internal error: not enough list items"
-msgstr "интерна грешка: нема довољно �тавки ли�те"
+msgid "\"sync\", \"fsync\" or empty; how to flush a swap file to disk"
+msgstr "„sync�, „fsync� или празно; како �е swap празни на ди�к"
 
-msgid "internal error: failed to add item to list"
-msgstr "интерна грешка: �тавка није могла да �е дода ли�ти"
+msgid "number of characters typed to cause a swap file update"
+msgstr "број откуцаних карактера који покреће ажурирање swap фајла"
 
-#, c-format
-msgid "attempt to assign sequence of size %d to extended slice of size %d"
+msgid "time in msec after which the swap file will be updated"
+msgstr "време у мили�екундама након кога �е ажурира swap фајл"
+
+msgid "maximum amount of memory in Kbyte used for one buffer"
 msgstr ""
-"покушај доделе �еквенце величине %d како би �е продужио slice величине %d"
+"мак�имална количина меморије у Кбајтима која �е кори�ти за један\n"
+"бафер"
 
-msgid "failed to add item to list"
-msgstr "�тавка није могла да �е дода ли�ти"
+msgid "maximum amount of memory in Kbyte used for all buffers"
+msgstr ""
+"мак�имална количина меморије у Кбајтима која �е кори�ти за �ве\n"
+"бафере"
 
-msgid "cannot delete vim.List attributes"
-msgstr "vim.List атрибути не могу да �е обришу"
+msgid "command line editing"
+msgstr "уређивање командне линије"
 
-msgid "cannot modify fixed list"
-msgstr "фик�на ли�та не може да �е измени"
+msgid "how many command lines are remembered"
+msgstr "колико командних линија �е памти"
 
-#, c-format
-msgid "unnamed function %s does not exist"
-msgstr "неименована функција %s не по�тоји"
+msgid "key that triggers command-line expansion"
+msgstr "та�тери који окидају развијање командне-линије"
 
-#, c-format
-msgid "function %s does not exist"
-msgstr "функција %s не по�тоји"
+msgid "like 'wildchar' but can also be used in a mapping"
+msgstr "као 'wildchar' али може такође да �е кори�ти у мапирању"
 
-#, c-format
-msgid "failed to run function %s"
-msgstr "функција %s није могла да �е покрене"
+msgid "specifies how command line completion works"
+msgstr "наводи како ради довршавање командне линије"
 
-msgid "unable to get option value"
-msgstr "вредно�т опције није могла да �е добије"
+msgid "empty or \"tagfile\" to list file name of matching tags"
+msgstr "празно или „tagfile� за и�пи� имена фајла ознака које �е подударају"
 
-msgid "internal error: unknown option type"
-msgstr "интерна грешка: непознат тип опције"
+msgid "list of file name extensions that have a lower priority"
+msgstr "ли�та ек�тензија имена фајла које имају нижи приоритет"
 
-msgid "problem while switching windows"
-msgstr "проблем код пребацивања прозора"
+msgid "list of file name extensions added when searching for a file"
+msgstr "ли�та ек�тензија имена фајла које �е додају када �е тражи фајл"
 
-#, c-format
-msgid "unable to unset global option %s"
-msgstr "глобална опција %s није могла да �е и�кључи"
+msgid "list of patterns to ignore files for file name completion"
+msgstr "ли�та шаблона за игнори�ање фајлова код довршавања имена фајла"
 
-#, c-format
-msgid "unable to unset option %s which does not have global value"
-msgstr "опција %s која нема глобалну вредно�т није могла да �е и�кључи"
+msgid "ignore case when using file names"
+msgstr "не разликује �е величина �лова када �е кори�те имена фајлова"
 
-msgid "attempt to refer to deleted tab page"
-msgstr "покушај рефери�ања на обри�ану картицу"
+msgid "ignore case when completing file names"
+msgstr "не разликује �е величина �лова када �е довршавају имена фајлова"
 
-msgid "no such tab page"
-msgstr "не по�тоји таква картица"
+msgid "command-line completion shows a list of matches"
+msgstr "довршавање командне-линије приказује ли�ту подударања"
 
-msgid "attempt to refer to deleted window"
-msgstr "покушај рефери�ања на обри�ан прозор"
+msgid "key used to open the command-line window"
+msgstr "та�тер који �е кори�ти за отварање прозора командне-линије"
 
-msgid "readonly attribute: buffer"
-msgstr "атрибут �амо за читање: бафер"
+msgid "height of the command-line window"
+msgstr "ви�ина командне-линије"
 
-msgid "cursor position outside buffer"
-msgstr "позиција кур�ора је ван бафера"
+msgid "executing external commands"
+msgstr "извршавање �пољних команди"
 
-msgid "no such window"
-msgstr "нема таквог прозора"
+msgid "name of the shell program used for external commands"
+msgstr "име програма командног окружења који �е кори�ти за �пољне команде"
 
-msgid "attempt to refer to deleted buffer"
-msgstr "покушај рефери�ања на обри�ан бафер"
+msgid "when to use the shell or directly execute a command"
+msgstr "када �е кори�ти командно окружење а када директно извршава команда"
 
-msgid "failed to rename buffer"
-msgstr "име бафера није могло да �е промени"
+msgid "character(s) to enclose a shell command in"
+msgstr "карактер(и) којима �е уоквирује команда командног окружења"
 
-msgid "mark name must be a single character"
-msgstr "име маркера мора бити �амо један карактер"
+msgid "like 'shellquote' but include the redirection"
+msgstr "као 'shellquote' али укључује редирекцију"
 
-#, c-format
-msgid "expected vim.Buffer object, but got %s"
-msgstr "очекивао �е vim.Buffer објекат, али је добијен %s"
+msgid "characters to escape when 'shellxquote' is ("
+msgstr "карактери који �е означавају када је 'shellxquote' ("
 
-#, c-format
-msgid "failed to switch to buffer %d"
-msgstr "прелазак на бафер %d није био могућ"
+msgid "argument for 'shell' to execute a command"
+msgstr "аргумент за 'shell' којим �е извршава команда"
 
-#, c-format
-msgid "expected vim.Window object, but got %s"
-msgstr "очекивао �е vim.Window објекат, али је добијен %s"
+msgid "used to redirect command output to a file"
+msgstr "кори�ти �е за редирекцију излаза команде у фајл"
 
-msgid "failed to find window in the current tab page"
-msgstr "прозор није пронађен у текућој картици"
+msgid "use a temp file for shell commands instead of using a pipe"
+msgstr ""
+"уме�то пајпа, за команде командног окружења �е кори�ти привремени\n"
+"фајл"
 
-msgid "did not switch to the specified window"
-msgstr "није �е прешло у наведени прозор"
+msgid "program used for \"=\" command"
+msgstr "програм који �е кори�ти за команду „=�"
 
-#, c-format
-msgid "expected vim.TabPage object, but got %s"
-msgstr "очекивао �е vim.TabPage објекат, али је добијен %s"
+msgid "program used to format lines with \"gq\" command"
+msgstr "програм који �е кори�ти за форматирање линија командом „gq�"
 
-msgid "did not switch to the specified tab page"
-msgstr "није �е прешло у наведену картицу"
+msgid "program used for the \"K\" command"
+msgstr "програм који �е кори�ти за команду „K�"
 
-msgid "failed to run the code"
-msgstr "кôд није могао да �е покрене"
+msgid "warn when using a shell command and a buffer has changes"
+msgstr ""
+"упозорава �е када �е кори�ти команда командног окружења, а бафер\n"
+"је претрпео измене"
 
-msgid "E858: Eval did not return a valid python object"
-msgstr "E858: Eval није вратио важећи python објекат"
+msgid "running make and jumping to errors (quickfix)"
+msgstr "покретање make и �какање на грешке (quickfix)"
 
-msgid "E859: Failed to convert returned python object to a Vim value"
-msgstr "E859: Конверзија враћеног python објекта у vim вредно�т није у�пела"
+msgid "name of the file that contains error messages"
+msgstr "име фајла који �адржи поруке о грешкама"
 
-#, c-format
-msgid "unable to convert %s to a Vim dictionary"
-msgstr "%s не може да �е конвертује у vim речник"
+msgid "list of formats for error messages"
+msgstr "ли�та формата порука о грешкама"
 
-#, c-format
-msgid "unable to convert %s to a Vim list"
-msgstr "%s не може да �е конвертује у vim ли�ту"
+msgid "program used for the \":make\" command"
+msgstr "програм који �е кори�ти за команду „:make� command"
 
-#, c-format
-msgid "unable to convert %s to a Vim structure"
-msgstr "%s не може да �е конвертује у vim �труктуру"
+msgid "string used to put the output of \":make\" in the error file"
+msgstr ""
+"�тринг који �е кори�ти за �тављање излаза команде „:make� у фајл\n"
+"грешака"
 
-msgid "internal error: NULL reference passed"
-msgstr "интерна грешка: про�леђена је NULL референца"
+msgid "name of the errorfile for the 'makeprg' command"
+msgstr "име фајла грешака за команду 'makeprg'"
 
-msgid "internal error: invalid value type"
-msgstr "интерна грешка: вредно�т неважећег типа"
+msgid "program used for the \":grep\" command"
+msgstr "програм који �е кори�ти за команду „:grep�"
 
-msgid ""
-"Failed to set path hook: sys.path_hooks is not a list\n"
-"You should now do the following:\n"
-"- append vim.path_hook to sys.path_hooks\n"
-"- append vim.VIM_SPECIAL_PATH to sys.path\n"
+msgid "list of formats for output of 'grepprg'"
+msgstr "ли�та формата за излаз команде 'grepprg'"
+
+msgid "encoding of the \":make\" and \":grep\" output"
+msgstr "кодирање излаза команди „:make� и „:grep�"
+
+msgid "function to display text in the quickfix window"
+msgstr "функција за приказивање тек�та у quickfix прозору"
+
+msgid "system specific"
+msgstr "опције �пецифичне за �и�тем"
+
+msgid "use forward slashes in file names; for Unix-like shells"
+msgstr "у именима фајлова �е кори�те ко�е црте; за окружења �лична Unix"
+
+msgid "specifies slash/backslash used for completion"
+msgstr "наводи ко�у/обрнуту ко�у црту која �е кори�ти за довршавање"
+
+msgid "language specific"
+msgstr "опције �пецифичне за језик"
+
+msgid "specifies the characters in a file name"
+msgstr "наводи карактере у имену фајла"
+
+msgid "specifies the characters in an identifier"
+msgstr "наводи карактере у идентификатору"
+
+msgid "specifies the characters in a keyword"
+msgstr "наводи карактере у кључној речи"
+
+msgid "specifies printable characters"
+msgstr "наводи карактере који могу да �е одштампају"
+
+msgid "specifies escape characters in a string"
+msgstr "наводи карактере за обележавање у �трингу"
+
+msgid "display the buffer right-to-left"
+msgstr "приказује бафер � де�на-у-лево"
+
+msgid "when to edit the command-line right-to-left"
+msgstr "када �е командна-линија уређује � де�на-у-лево"
+
+msgid "insert characters backwards"
+msgstr "умерање карактера уназад"
+
+msgid "allow CTRL-_ in Insert and Command-line mode to toggle 'revins'"
 msgstr ""
-"Кука за путању није могла да �е по�тави: sys.path_hooks није у ли�ти\n"
-"Сада би требало да урадите �ледеће:\n"
-"- додајте vim.path_hook на крај sys.path_hooks\n"
-"- додајте vim.VIM_SPECIAL_PATH на крај sys.path\n"
+"дозвољава да CTRL-_ у режиму Уметање и Командна линија мења �тање\n"
+"опције 'revins'"
 
-msgid ""
-"Failed to set path: sys.path is not a list\n"
-"You should now append vim.VIM_SPECIAL_PATH to sys.path"
+msgid "the ASCII code for the first letter of the Hebrew alphabet"
+msgstr "ASCII кôд за прво �лово хебреј�ког алфабета"
+
+msgid "use Hebrew keyboard mapping"
+msgstr "кори�ти �е хебреј�ко мапирање та�татуре"
+
+msgid "use phonetic Hebrew keyboard mapping"
+msgstr "кори�ти �е фонет�ко хебреј�ко мапирање та�татуре"
+
+msgid "prepare for editing Arabic text"
+msgstr "припрема за уређивање арап�ког тек�та"
+
+msgid "perform shaping of Arabic characters"
+msgstr "обављање уобличавања арап�ких карактера"
+
+msgid "terminal will perform bidi handling"
+msgstr "терминал врши биди обраду"
+
+msgid "name of a keyboard mapping"
+msgstr "име мапирања та�татуре"
+
+msgid "list of characters that are translated in Normal mode"
+msgstr "ли�та карактера који �у преведени у �ормалном режиму"
+
+msgid "apply 'langmap' to mapped characters"
+msgstr "'langmap' �е примењује на мапиране карактере"
+
+msgid "when set never use IM; overrules following IM options"
 msgstr ""
-"Путања није могла да �е по�тави: sys.path није у ли�ти\n"
-"Сада би требало да додате vim.VIM_SPECIAL_PATH на крај sys.path"
+"када је по�тављена, IM �е никада не кори�ти; преиначује\n"
+"наредне IM опције"
 
-msgid ""
-"Vim macro files (*.vim)\t*.vim\n"
-"All Files (*.*)\t*.*\n"
+msgid "in Insert mode: 1: use :lmap; 2: use IM; 0: neither"
 msgstr ""
-"Vim макро фајлови (*.vim)\t*.vim\n"
-"Сви фајлови (*.*)\t*.*\n"
+"у режиму Уметање: 1: кори�ти �е :lmap; 2: кори�ти �е IM;\n"
+"0: ниједно"
 
-msgid "All Files (*.*)\t*.*\n"
-msgstr "Сви фајлови (*.*)\t*.*\n"
+msgid "input method style, 0: on-the-spot, 1: over-the-spot"
+msgstr "�тил методе уно�а, 0: on-the-spot, 1: over-the-spot"
 
-msgid ""
-"All Files (*.*)\t*.*\n"
-"C source (*.c, *.h)\t*.c;*.h\n"
-"C++ source (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
-"VB code (*.bas, *.frm)\t*.bas;*.frm\n"
-"Vim files (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+msgid "entering a search pattern: 1: use :lmap; 2: use IM; 0: neither"
 msgstr ""
-"Сви фајлови (*.*)\t*.*\n"
-"C изворни код (*.c, *.h)\t*.c;*.h\n"
-"C++ изворни код (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
-"VB код (*.bas, *.frm)\t*.bas;*.frm\n"
-"Vim фајлови (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+"уно� шаблона претраге: 1: кори�ти �е :lmap; 2: кори�ти �е IM;\n"
+"0: ниједно"
+
+msgid "when set always use IM when starting to edit a command line"
+msgstr ""
+"када је по�тављена, IM �е увек кори�ти када �е започиње\n"
+"уређивање командне линије"
+
+msgid "function to obtain IME status"
+msgstr "функција за добијање �тату�а IME"
+
+msgid "function to enable/disable IME"
+msgstr "функција за укључивање/и�кључивање IME"
+
+msgid "multi-byte characters"
+msgstr "вишебајтни карактери"
 
 msgid ""
-"Vim macro files (*.vim)\t*.vim\n"
-"All Files (*)\t*\n"
+"character encoding used in Vim: \"latin1\", \"utf-8\",\n"
+"\"euc-jp\", \"big5\", etc."
 msgstr ""
-"Vim макро фајлови (*.vim)\t*.vim\n"
-"Сви фајлови (*)\t*\n"
+"кодирање карактера које �е кори�ти у програму Vim: „latin1�,\n"
+"„utf-8�, „euc-jp�, „big5�, итд."
 
-msgid "All Files (*)\t*\n"
-msgstr "Сви фајлови (*)\t*\n"
+msgid "character encoding for the current file"
+msgstr "кодирање карактера за текући фајл"
+
+msgid "automatically detected character encodings"
+msgstr "кодирања карактера која �е аутомат�ки детектују"
+
+msgid "character encoding used by the terminal"
+msgstr "кодирање карактера које кори�ти терминал"
+
+msgid "expression used for character encoding conversion"
+msgstr "израз који �е кор�ти за конверзију кодирања карактера"
+
+msgid "delete combining (composing) characters on their own"
+msgstr "бри�ање �амих комбинујућих (компонујућих) карактера"
+
+msgid "maximum number of combining (composing) characters displayed"
+msgstr ""
+"мак�имални број комбинујућих (компонујућих) карактера који �е\n"
+"приказују"
+
+msgid "key that activates the X input method"
+msgstr "та�тер који активира X метод уно�а"
+
+msgid "width of ambiguous width characters"
+msgstr "ширина карактера дво�ми�лене ширине"
+
+msgid "emoji characters are full width"
+msgstr "имоџи карактери �у пуне ширине"
+
+msgid "various"
+msgstr "разно"
 
 msgid ""
-"All Files (*)\t*\n"
-"C source (*.c, *.h)\t*.c;*.h\n"
-"C++ source (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
-"Vim files (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+"when to use virtual editing: \"block\", \"insert\", \"all\"\n"
+"and/or \"onemore\""
 msgstr ""
-"Сви фајлови (*)\t*\n"
-"C изворни код (*.c, *.h)\t*.c;*.h\n"
-"C++ изворни код (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
-"Vim фајлови (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+"када �е кори�ти виртуелно уређивање: „block�, „insert�, „all�\n"
+"и/или „onemore�"
 
-msgid "GVim"
-msgstr "GVim"
+msgid "list of autocommand events which are to be ignored"
+msgstr "ли�та догађаја аутокоманди који треба да �е игноришу"
 
-msgid "Text Editor"
-msgstr "Тек�т Едитор"
+msgid "load plugin scripts when starting up"
+msgstr "�крипте додатака �е учитавају током покретања"
 
-msgid "Edit text files"
-msgstr "Уређивање тек�т фајлова"
+msgid "enable reading .vimrc/.exrc/.gvimrc in the current directory"
+msgstr "омогућава �е читање .vimrc/.exrc/.gvimrc у текућем директоријуму"
 
-msgid "Text;editor;"
-msgstr "Тек�т;едитор;"
+msgid "safer working with script files in the current directory"
+msgstr "безбеднији рад �а �крипт фајловима у текућем директоријуму"
 
-msgid "gvim"
-msgstr "gvim"
+msgid "use the 'g' flag for \":substitute\""
+msgstr "кори�ти �е за�тавица ’g’ за „:substitute�"
+
+msgid "'g' and 'c' flags of \":substitute\" toggle"
+msgstr "’g’ и ’c’ за�тавице команде \":substitute\" мењају �тање"
+
+msgid "allow reading/writing devices"
+msgstr "дозвољава �е читање/упи� на уређаје"
+
+msgid "maximum depth of function calls"
+msgstr "мак�имална дубина позива функција"
+
+msgid "list of words that specifies what to put in a session file"
+msgstr "ли�та речи које наводе шта да �е �тави у фајл �е�ије"
+
+msgid "list of words that specifies what to save for :mkview"
+msgstr "ли�та речи које наводе шта чува команда :mkview"
+
+msgid "directory where to store files with :mkview"
+msgstr "директоријум у који :mkview чува фајлове"
+
+msgid "list that specifies what to write in the viminfo file"
+msgstr "ли�та која наводи шта �е упи�ује у viminfo фајл"
+
+msgid "file name used for the viminfo file"
+msgstr "име фајла које �е кори�ти за viminfo фајл"
+
+msgid "what happens with a buffer when it's no longer in a window"
+msgstr "шта �е дешава �а бафером када више није у прозору"
+
+msgid "empty, \"nofile\", \"nowrite\", \"quickfix\", etc.: type of buffer"
+msgstr "празно, „nofile�, „nowrite�, „quickfix�, итд.: тип бафера"
+
+msgid "whether the buffer shows up in the buffer list"
+msgstr "да ли �е бафер појављује у ли�ти бафера"
+
+msgid "set to \"msg\" to see all error messages"
+msgstr "по�тавите на „msg� да видите �ве поруке о грешкама"
+
+msgid "whether to show the signcolumn"
+msgstr "да ли �е приказује колона за знаке"
+
+msgid "interval in milliseconds between polls for MzScheme threads"
+msgstr "интервал у мили�екундама између прозивања за MzScheme нити"
+
+msgid "name of the Lua dynamic library"
+msgstr "име Lua динамичке библиотеке"
+
+msgid "name of the Perl dynamic library"
+msgstr "име Perl динамичке библиотеке"
+
+msgid "whether to use Python 2 or 3"
+msgstr "да ли �е кори�ти Python 2 или 3"
+
+msgid "name of the Python 2 dynamic library"
+msgstr "име Python 2 динамичке библиотеке"
+
+msgid "name of the Python 2 home directory"
+msgstr "име Python 2 почетног директоријума"
+
+msgid "name of the Python 3 dynamic library"
+msgstr "име Python 3 динамичке библиотеке"
+
+msgid "name of the Python 3 home directory"
+msgstr "име Python 3 почетног директоријума"
+
+msgid "name of the Ruby dynamic library"
+msgstr "име Ruby динамичке библиотеке"
+
+msgid "name of the Tcl dynamic library"
+msgstr "име Tcl динамичке библиотеке"
+
+msgid "name of the MzScheme dynamic library"
+msgstr "име MzScheme динамичке библиотеке"
+
+msgid "name of the MzScheme GC dynamic library"
+msgstr "име MzScheme GC динамичке библиотеке"
 
-msgid "Vim"
-msgstr "Vim"
 
diff -Nru vim-8.2.1913/src/po/tr.po vim-8.2.2434/src/po/tr.po
--- vim-8.2.1913/src/po/tr.po	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/po/tr.po	2021-01-30 22:05:11.000000000 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: Vim Turkish Localization Project\n"
 "Report-Msgid-Bugs-To: Emir SARI <bitigchi@me.com>\n"
-"POT-Creation-Date: 2020-09-04 18:43+0300\n"
-"PO-Revision-Date: 2020-09-04 21:30+0300\n"
+"POT-Creation-Date: 2020-11-29 00:20+0300\n"
+"PO-Revision-Date: 2020-11-29 20:00+0300\n"
 "Last-Translator: Emir SARI <bitigchi@me.com>\n"
 "Language-Team: Turkish <https://github.com/bitigchi/vim>\n"
 "Language: tr\n"
@@ -45,7 +45,7 @@
 msgstr "E367: Böyle bir grup yok: \"%s\""
 
 msgid "E936: Cannot delete the current group"
-msgstr "E936: Mevcut grup silinemiyor"
+msgstr "E936: Geçerli grup silinemiyor"
 
 msgid "W19: Deleting augroup that is still in use"
 msgstr "W19: Kullanımda olan otokomut grubu siliniyor"
@@ -132,7 +132,7 @@
 msgstr "E937: Kullanımda olan bir arabellek silinmeye çalışılıyor: %s"
 
 msgid "E515: No buffers were unloaded"
-msgstr "E515: Hiçbir arabellek kaldırılmadı"
+msgstr "E515: Hiçbir arabellek bellekten kaldırılmadı"
 
 msgid "E516: No buffers were deleted"
 msgstr "E516: Hiçbir arabellek silinmedi"
@@ -143,8 +143,8 @@
 #, c-format
 msgid "%d buffer unloaded"
 msgid_plural "%d buffers unloaded"
-msgstr[0] "%d arabellek kaldırıldı"
-msgstr[1] "%d arabellek kaldırıldı"
+msgstr[0] "%d arabellek bellekten kaldırıldı"
+msgstr[1] "%d arabellek bellekten kaldırıldı"
 
 #, c-format
 msgid "%d buffer deleted"
@@ -159,7 +159,7 @@
 msgstr[1] "%d arabellek yok edildi"
 
 msgid "E90: Cannot unload last buffer"
-msgstr "E90: Son arabellek kaldırılamıyor"
+msgstr "E90: Son arabellek bellekten kaldırılamıyor"
 
 msgid "E84: No modified buffer found"
 msgstr "E84: Değiştirilmiş bir arabellek bulunamadı"
@@ -454,19 +454,6 @@
 msgid "E912: cannot use ch_evalexpr()/ch_sendexpr() with a raw or nl channel"
 msgstr "E912: ch_evalexpr()/ch_sendexpr() raw/nl kanalları ile kullanılamaz"
 
-msgid "E920: _io file requires _name to be set"
-msgstr "E920: _io dosyası _name ayarlı olmasını gerektirir"
-
-msgid "E915: in_io buffer requires in_buf or in_name to be set"
-msgstr "E915: in_io arabelleği in_buf veya in_name ayarlı olmasını gerektirir"
-
-#, c-format
-msgid "E918: buffer must be loaded: %s"
-msgstr "E918: Arabellek yüklenmiş olmalıdır: %s"
-
-msgid "E916: not a valid job"
-msgstr "E916: Geçerli bir iş değil"
-
 msgid "No display"
 msgstr "Görüntü yok"
 
@@ -747,12 +734,6 @@
 msgid "E996: Cannot lock a range"
 msgstr "E996: Erim kilitlenemiyor"
 
-msgid "E710: List value has more items than target"
-msgstr "E710: Liste değeri hedeften daha fazla ögeye sahip"
-
-msgid "E711: List value has not enough items"
-msgstr "E711: Liste değeri yeterli ögeye sahip değil"
-
 msgid "E996: Cannot lock a list or dict"
 msgstr "E996: Bir liste veya sözlük kilitlenemiyor"
 
@@ -1177,7 +1158,7 @@
 
 #, c-format
 msgid "Tab page %d"
-msgstr "Sekme %d"
+msgstr "Sekme sayfası %d"
 
 msgid "No swap file"
 msgstr "Takas dosyası yok"
@@ -1338,6 +1319,9 @@
 msgid "E733: Using :endwhile with :for"
 msgstr "E733: :endwhile, :for ile kullanılıyor"
 
+msgid "E579: block nesting too deep"
+msgstr "E579: İç içe geçmeler çok derin"
+
 msgid "E601: :try nesting too deep"
 msgstr "E601: :try çok iç içe geçmiş"
 
@@ -1680,15 +1664,15 @@
 msgid "E232: Cannot create BalloonEval with both message and callback"
 msgstr "E232: Hem ileti hem de geri çağırma ile BallonEval oluşturulamıyor"
 
-msgid "_Cancel"
-msgstr "Ä°_ptal"
-
 msgid "_Save"
 msgstr "_Kaydet"
 
 msgid "_Open"
 msgstr "_Aç"
 
+msgid "_Cancel"
+msgstr "Ä°_ptal"
+
 msgid "_OK"
 msgstr "_Tamam"
 
@@ -2587,6 +2571,19 @@
 msgid "match %d"
 msgstr "eÅŸleÅŸme %d"
 
+msgid "E920: _io file requires _name to be set"
+msgstr "E920: _io dosyası _name ayarlı olmasını gerektirir"
+
+msgid "E915: in_io buffer requires in_buf or in_name to be set"
+msgstr "E915: in_io arabelleği in_buf veya in_name ayarlı olmasını gerektirir"
+
+#, c-format
+msgid "E918: buffer must be loaded: %s"
+msgstr "E918: Arabellek yüklenmiş olmalıdır: %s"
+
+msgid "E916: not a valid job"
+msgstr "E916: Geçerli bir iş değil"
+
 #, c-format
 msgid "E491: json decode error at '%s'"
 msgstr "E491: '%s' konumunda json çözümü hatası"
@@ -2624,6 +2621,9 @@
 msgid "map() argument"
 msgstr "map() deÄŸiÅŸkeni"
 
+msgid "mapnew() argument"
+msgstr "mapnew() deÄŸiÅŸkeni"
+
 msgid "filter() argument"
 msgstr "filter() deÄŸiÅŸkeni"
 
@@ -3326,7 +3326,7 @@
 msgstr "Ek bilgi için \":help E312\" yazın."
 
 msgid "Recovery completed. You should check if everything is OK."
-msgstr "Kurtarma tamamlandı. Her şey tamam mı diye bir bakın."
+msgstr "Kurtarma tamamlandı. Her şey yolunda mı diye lütfen bir bakın."
 
 msgid ""
 "\n"
@@ -3343,12 +3343,17 @@
 
 msgid ""
 "\n"
-"You may want to delete the .swp file now.\n"
-"\n"
+"You may want to delete the .swp file now."
 msgstr ""
 "\n"
-"Bu .swp dosyasını silmeniz iyi olur.\n"
+"Bu .swp dosyasını silmeniz iyi olur."
+
+msgid ""
+"\n"
+"Note: process STILL RUNNING: "
+msgstr ""
 "\n"
+"Not: İşlem HÂLÂ ÇALIŞIYOR: "
 
 msgid "Using crypt key from swap file for the text file.\n"
 msgstr ""
@@ -3653,6 +3658,10 @@
 msgstr "E337: Menü bulunamadı - menü adlarını denetle"
 
 #, c-format
+msgid "Error detected while compiling %s:"
+msgstr "%s derlenirken hata tespit edildi:"
+
+#, c-format
 msgid "Error detected while processing %s:"
 msgstr "%s iÅŸlenirken hata tespit edildi:"
 
@@ -3990,7 +3999,6 @@
 msgid "E540: Unclosed expression sequence"
 msgstr "E540: Kapatılmamış ifade sıralaması"
 
-
 msgid "E542: unbalanced groups"
 msgstr "E542: DengelenmemiÅŸ gruplar"
 
@@ -4315,8 +4323,11 @@
 msgid "E553: No more items"
 msgstr "E553: Öge yok"
 
+msgid "E925: Current quickfix list was changed"
+msgstr "E925: Geçerli hızlı düzelt listesi değiştirildi"
+
 msgid "E926: Current location list was changed"
-msgstr "E926: Mevcut konum listesi deÄŸiÅŸtirildi"
+msgstr "E926: Geçerli konum listesi değiştirildi"
 
 #, c-format
 msgid "E372: Too many %%%c in format string"
@@ -4348,10 +4359,7 @@
 msgstr "E379: Eksik veya boş dizin adı"
 
 msgid "E924: Current window was closed"
-msgstr "E924: Mevcut pencere kapatıldı"
-
-msgid "E925: Current quickfix was changed"
-msgstr "E925: Mevcut hızlı düzelt değiştirildi"
+msgstr "E924: Geçerli pencere kapatıldı"
 
 #, c-format
 msgid "(%d of %d)%s%s: "
@@ -5261,13 +5269,13 @@
 msgstr "sözdizim kıvırma düzeyi an az"
 
 msgid "syntax spell toplevel"
-msgstr "sözdizim yazım denetimi üst düzeyde"
+msgstr "bir sözdizim içinde olmayan metinde yazım denetimi yap"
 
 msgid "syntax spell notoplevel"
-msgstr "sözdizim yazım denetimi üst düzeyde değil"
+msgstr "bir sözdizim içinde olmayan metinde yazım denetimi yapma"
 
 msgid "syntax spell default"
-msgstr "sözdizim yazım denetimi varsayılan"
+msgstr "@Spell kümesi varsa yazım denetimi yapma (öntanımlı)"
 
 msgid "syntax iskeyword "
 msgstr "sözdizim anahtar sözcük"
@@ -5285,6 +5293,9 @@
 msgid "no syncing"
 msgstr "eÅŸitleme yok"
 
+msgid "syncing starts at the first line"
+msgstr "eşitleme ilk satırda başlar"
+
 msgid "syncing starts "
 msgstr "eşitleme başlangıcı "
 
@@ -5316,6 +5327,9 @@
 msgid "E392: No such syntax cluster: %s"
 msgstr "E392: Böyle bir sözdizim kümesi yok: %s"
 
+msgid "from the first line"
+msgstr "ilk satırdan"
+
 msgid "minimal "
 msgstr "en az biçimde "
 
@@ -5506,7 +5520,7 @@
 msgstr "Yinelenen alan adı: %s"
 
 msgid "' not known. Available builtin terminals are:"
-msgstr "' bilinmiyor. Mevcut uçbirimler şunlar:"
+msgstr "' bilinmiyor. Kullanılabilir uçbirimler şunlar:"
 
 msgid "defaulting to '"
 msgstr "öntanımlı olarak '"
@@ -5576,13 +5590,6 @@
 msgid "E982: ConPTY is not available"
 msgstr "E982: ConPTY mevcut deÄŸil"
 
-msgid ""
-"E856: assert_fails() second argument must be a string or a list with one or "
-"two strings"
-msgstr ""
-"E856: assert_fails() ikinci deÄŸiÅŸkeni bir dizi veya bir veya iki dizili bir "
-"liste olmalıdır"
-
 #, c-format
 msgid "E971: Property type %s does not exist"
 msgstr "E971: Özellik türü %s mevcut değil"
@@ -5599,7 +5606,7 @@
 msgstr "E965: Özellik tür adı eksik"
 
 msgid "E275: Cannot add text property to unloaded buffer"
-msgstr "E275: Yüklenmemiş arabelleğe metin özelliği eklenemiyor"
+msgstr "E275: Bellekten kaldırılmış arabelleğe metin özelliği eklenemiyor"
 
 msgid "E967: text property info corrupted"
 msgstr "E967: Metin özellik bilgisi hasarlı"
@@ -6613,18 +6620,31 @@
 msgid "E476: Invalid command: %s"
 msgstr "E476: Geçersiz komut: %s"
 
-msgid "E719: cannot slice a Dictionary"
+msgid "E710: List value has more items than targets"
+msgstr "E710: Liste değeri hedeften daha fazla ögeye sahip"
+
+msgid "E711: List value does not have enough items"
+msgstr "E711: Liste değeri yeterli ögeye sahip değil"
+
+msgid "E719: Cannot slice a Dictionary"
 msgstr "E719: Bir Sözlük dilimlenemiyor"
 
+msgid ""
+"E856: \"assert_fails()\" second argument must be a string or a list with one "
+"or two strings"
+msgstr ""
+"E856: \"assert_fails()\" ikinci deÄŸiÅŸkeni bir dizi veya bir veya iki dizili "
+"bir liste olmalıdır"
+
 msgid "E909: Cannot index a special variable"
 msgstr "E909: Özel bir değişken dizinlenemiyor"
 
 #, c-format
-msgid "E1100: Missing :let: %s"
-msgstr "E1100: :let eksik: %s"
+msgid "E1100: Missing :var: %s"
+msgstr "E1100: :var eksik: %s"
 
 #, c-format
-msgid "E1001: variable not found: %s"
+msgid "E1001: Variable not found: %s"
 msgstr "E1001: Değişken bulunamadı: %s"
 
 #, c-format
@@ -6635,7 +6655,7 @@
 msgstr "E1003: Dönüş değeri eksik"
 
 #, c-format
-msgid "E1004: white space required before and after '%s'"
+msgid "E1004: White space required before and after '%s'"
 msgstr "E1004: '%s' öncesinde ve sonrasında boşluk gerekiyor"
 
 msgid "E1005: Too many argument types"
@@ -6645,7 +6665,7 @@
 msgid "E1006: %s is used as an argument"
 msgstr "E1006: %s bir değişken olarak kullanılıyor"
 
-msgid "E1007: mandatory argument after optional argument"
+msgid "E1007: Mandatory argument after optional argument"
 msgstr "E1007: İsteğe bağlı değişken sonrasında zorunlu değişken"
 
 msgid "E1008: Missing <type>"
@@ -6659,15 +6679,15 @@
 msgstr "E1010: Tür tanımlanamadı: %s"
 
 #, c-format
-msgid "E1011: name too long: %s"
+msgid "E1011: Name too long: %s"
 msgstr "E1011: Ad çok uzun: %s"
 
 #, c-format
-msgid "E1012: type mismatch, expected %s but got %s"
+msgid "E1012: Type mismatch; expected %s but got %s"
 msgstr "E1012: Tür uyumsuzluğu, %s bekleniyordu, ancak %s alındı"
 
 #, c-format
-msgid "E1013: argument %d: type mismatch, expected %s but got %s"
+msgid "E1013: Argument %d: type mismatch, expected %s but got %s"
 msgstr "E1013: %d değişkeni: Tür uyumsuzluğu, %s bekleniyordu, ancak %s alındı"
 
 #, c-format
@@ -6698,13 +6718,13 @@
 msgstr "E1019: Yalnızca bir diziye birleştirilebilir"
 
 #, c-format
-msgid "E1020: cannot use an operator on a new variable: %s"
+msgid "E1020: Cannot use an operator on a new variable: %s"
 msgstr "E1020: Yeni bir değişken üzerinde bir işleç kullanılamaz: %s"
 
-msgid "E1021: const requires a value"
-msgstr "E1021: Sabit, bir deÄŸer gerektiriyor"
+msgid "E1021: Const requires a value"
+msgstr "E1021: Sabit, bir deÄŸer gerektirir"
 
-msgid "E1022: type or initialization required"
+msgid "E1022: Type or initialization required"
 msgstr "E1022: Tür veya ilklendirme gerekiyor"
 
 #, c-format
@@ -6714,7 +6734,7 @@
 msgid "E1024: Using a Number as a String"
 msgstr "E1024: Bir Sayı, bir Dizi yerine kullanılıyor"
 
-msgid "E1025: using } outside of a block scope"
+msgid "E1025: Using } outside of a block scope"
 msgstr "E1025: } bir blok kapsamı dışında kullanılıyor"
 
 msgid "E1026: Missing }"
@@ -6723,23 +6743,24 @@
 msgid "E1027: Missing return statement"
 msgstr "E1027: Dönüş ifadesi eksik"
 
-msgid "E1028: compile_def_function failed"
-msgstr "E1028: compile_def_function başarısız"
+msgid "E1028: Compiling :def function failed"
+msgstr "E1028: :def işlevi derleme başarısız"
 
 #, c-format
 msgid "E1029: Expected %s but got %s"
 msgstr "E1029: %s bekleniyordu ancak %s alındı"
 
-msgid "E1030: Using a String as a Number"
-msgstr "E1030: Bir Dizi, bir Sayı yerine kullanılıyor"
+#, c-format
+msgid "E1030: Using a String as a Number: \"%s\""
+msgstr "E1030: Bir Dizi, bir Sayı yerine kullanılıyor: \"%s\""
 
 msgid "E1031: Cannot use void value"
 msgstr "E1031: Boş değer kullanılamaz"
 
-msgid "E1032: missing :catch or :finally"
+msgid "E1032: Missing :catch or :finally"
 msgstr "E1032: :catch veya :finally eksik"
 
-msgid "E1033: catch unreachable after catch-all"
+msgid "E1033: Catch unreachable after catch-all"
 msgstr "E1033: catch-all sonrası catch ulaşılamıyor"
 
 #, c-format
@@ -6747,21 +6768,21 @@
 msgstr "E1034: Ayrılmış ad %s kullanılamaz"
 
 msgid "E1035: % requires number arguments"
-msgstr "E1035: %, sayı değişkenler gerektiriyor"
+msgstr "E1035: %, sayı değişkenler gerektirir"
 
 #, c-format
 msgid "E1036: %c requires number or float arguments"
-msgstr "E1036: %c, sayı veya kayan noktalı değer değişkenler gerektiriyor"
+msgstr "E1036: %c, sayı veya kayan noktalı değer değişkenler gerektirir"
 
 #, c-format
 msgid "E1037: Cannot use \"%s\" with %s"
 msgstr "E1037: \"%s\", %s ile birlikte kullanılamaz"
 
-msgid "E1038: vim9script can only be used in a script"
-msgstr "E1038: vim9script yalnızca bir betikte kullanılabilir"
+msgid "E1038: \"vim9script\" can only be used in a script"
+msgstr "E1038: \"vim9script\" yalnızca bir betikte kullanılabilir"
 
-msgid "E1039: vim9script must be the first command in a script"
-msgstr "E1039: vim9script bir betikteki ilk komut olmalıdır"
+msgid "E1039: \"vim9script\" must be the first command in a script"
+msgstr "E1039: \"vim9script\" bir betikteki ilk komut olmalıdır"
 
 msgid "E1040: Cannot use :scriptversion after :vim9script"
 msgstr "E1040: :vim9script sonrası :scriptversion kullanılamaz"
@@ -6770,13 +6791,13 @@
 msgid "E1041: Redefining script item %s"
 msgstr "E1041: Betik ögesi %s yeniden tanımlanıyor"
 
-msgid "E1042: export can only be used in vim9script"
-msgstr "E1042: Dışa aktarma yalnızca vim9script içinde kullanılabilir"
+msgid "E1042: Export can only be used in vim9script"
+msgstr "E1042: Dışa aktarım yalnızca vim9script içinde kullanılabilir"
 
 msgid "E1043: Invalid command after :export"
 msgstr "E1043: :export sonrası geçersiz komut"
 
-msgid "E1044: export with invalid argument"
+msgid "E1044: Export with invalid argument"
 msgstr "E1044: Geçersiz değişkenle dışa aktarım"
 
 msgid "E1045: Missing \"as\" after *"
@@ -6785,7 +6806,7 @@
 msgid "E1046: Missing comma in import"
 msgstr "E1046: İçe aktarımda virgül eksik"
 
-msgid "E1047: syntax error in import"
+msgid "E1047: Syntax error in import"
 msgstr "E1047: İçe aktarımda sözdizim hatası"
 
 #, c-format
@@ -6799,7 +6820,7 @@
 msgid "E1050: Colon required before a range"
 msgstr "E1050: Bir erim öncesi iki nokta gerekiyor"
 
-msgid "E1051: wrong argument type for +"
+msgid "E1051: Wrong argument type for +"
 msgstr "E1051: + için hatalı değişken türü"
 
 #, c-format
@@ -6818,13 +6839,13 @@
 msgstr "E1055: ... sonraki ad eksik"
 
 #, c-format
-msgid "E1056: expected a type: %s"
+msgid "E1056: Expected a type: %s"
 msgstr "E1056: Bir tür bekleniyordu: %s"
 
 msgid "E1057: Missing :enddef"
 msgstr "E1057: :enddef eksik"
 
-msgid "E1058: function nesting too deep"
+msgid "E1058: Function nesting too deep"
 msgstr "E1058: İşlev çok iç içe geçmiş"
 
 #, c-format
@@ -6832,7 +6853,7 @@
 msgstr "E1059: İki nokta öncesinde boşluğa izin verilmiyor: %s"
 
 #, c-format
-msgid "E1060: expected dot after name: %s"
+msgid "E1060: Expected dot after name: %s"
 msgstr "E1060: Ad sonrası nokta bekleniyordu: %s"
 
 #, c-format
@@ -6842,7 +6863,7 @@
 msgid "E1062: Cannot index a Number"
 msgstr "E1062: Bir Sayı dizinlenemiyor"
 
-msgid "E1063: type mismatch for v: variable"
+msgid "E1063: Type mismatch for v: variable"
 msgstr "E1063: v: değişkeni için tür uyumsuzluğu"
 
 #, c-format
@@ -6858,8 +6879,8 @@
 msgstr "E1068: '%s' önce boşluğa izin verilmiyor"
 
 #, c-format
-msgid "E1069: white space required after '%s'"
-msgstr "E1069: '%s' sonrası boşluğa izin verilmiyor"
+msgid "E1069: White space required after '%s'"
+msgstr "E1069: '%s' sonrası boşluk gerekiyor"
 
 msgid "E1070: Missing \"from\""
 msgstr "E1070: \"from\" eksik"
@@ -6872,10 +6893,10 @@
 msgstr "E1072: %s, %s ile karşılaştırılamıyor"
 
 #, c-format
-msgid "E1073: name already defined: %s"
+msgid "E1073: Name already defined: %s"
 msgstr "E1073: Ad halihazırda tanımlanmış: %s"
 
-msgid "E1074: no white space allowed after dot"
+msgid "E1074: No white space allowed after dot"
 msgstr "E1074: Nokta sonrası boşluğa izin verilmiyor"
 
 #, c-format
@@ -6897,7 +6918,7 @@
 msgid "E1082: Cannot use a namespaced variable: %s"
 msgstr "E1082: Ad alanına alınmış bir değişken kullanılamaz: %s"
 
-msgid "E1083: missing backtick"
+msgid "E1083: Missing backtick"
 msgstr "E1083: Ters eÄŸik kesme imi eksik"
 
 #, c-format
@@ -6911,11 +6932,11 @@
 msgid "E1086: Cannot use :function inside :def"
 msgstr "E1086: :def içinde :function kullanılamaz"
 
-msgid "E1087: cannot use an index when declaring a variable"
-msgstr "E1087: Bir değişken tanımlarken bir indeks kullanılamaz"
+msgid "E1087: Cannot use an index when declaring a variable"
+msgstr "E1087: Bir değişken tanımlarken indeks kullanılamaz"
 
 #, c-format
-msgid "E1089: unknown variable: %s"
+msgid "E1089: Unknown variable: %s"
 msgstr "E1089: Bilinmeyen deÄŸiÅŸken: %s"
 
 #, c-format
@@ -6933,7 +6954,7 @@
 msgid "E1093: Expected %d items but got %d"
 msgstr "E1093: %d öge bekleniyordu, ancak %d alındı"
 
-msgid "E1094: import can only be used in a script"
+msgid "E1094: Import can only be used in a script"
 msgstr "E1094: İçe aktarım yalnızca bir betikte kullanılabilir"
 
 msgid "E1095: Unreachable code after :return"
@@ -6942,7 +6963,7 @@
 msgid "E1096: Returning a value in a function without a return type"
 msgstr "E1096: Dönüş türü olmayan bir işlevde bir değer döndürülüyor"
 
-msgid "E1097: line incomplete"
+msgid "E1097: Line incomplete"
 msgstr "E1097: Satır tamamlanmamış"
 
 #, c-format
@@ -6954,7 +6975,7 @@
 msgstr "E1101: Bir işlevde bir betik değişkeni tanımlanamıyor: %s"
 
 #, c-format
-msgid "E1102: lambda function not found: %s"
+msgid "E1102: Lambda function not found: %s"
 msgstr "E1102: Lambda işlevi bulunamadı: %s"
 
 msgid "E1103: Dictionary not set"
@@ -6967,7 +6988,7 @@
 msgid "E1105: Cannot convert %s to string"
 msgstr "E1105: %s bir diziye dönüştürülemiyor"
 
-msgid "E1106: one argument too many"
+msgid "E1106: One argument too many"
 msgstr "E1106: Bir deÄŸiÅŸken fazladan"
 
 #, c-format
@@ -7004,6 +7025,95 @@
 msgid "E1114: Only values of 0x100 and higher supported"
 msgstr "E1114: Yalnızca 0x100 ve daha yüksek değerler destekleniyor"
 
+msgid "E1115: \"assert_fails()\" fourth argument must be a number"
+msgstr "E1115: \"assert_fails()\" dördüncü değişkeni bir sayı olmalıdır"
+
+msgid "E1116: \"assert_fails()\" fifth argument must be a string"
+msgstr "E1116: \"assert_fails()\" beşinci değişkeni bir dizi olmalıdır"
+
+msgid "E1117: Cannot use ! with nested :def"
+msgstr "E1117: !, iç içe geçmiş :def ile kullanılamaz"
+
+msgid "E1118: Cannot change list"
+msgstr "E1118: Liste deÄŸiÅŸtirilemez"
+
+msgid "E1119: Cannot change list item"
+msgstr "E1119: Liste ögesi değiştirilemez"
+
+msgid "E1120: Cannot change dict"
+msgstr "E1120: Sözlük değiştirilemez"
+
+msgid "E1121: Cannot change dict item"
+msgstr "E1121: Sözlük ögesi değiştirilemez"
+
+#, c-format
+msgid "E1122: Variable is locked: %s"
+msgstr "E1122: DeÄŸiÅŸken kilitli: %s"
+
+#, c-format
+msgid "E1123: Missing comma before argument: %s"
+msgstr "E1123: Değişken öncesi virgül eksik: %s"
+
+#, c-format
+msgid "E1124: \"%s\" cannot be used in legacy Vim script"
+msgstr "E1124: \"%s\" yalnızca eski Vim betiklerinde kullanılabilir"
+
+msgid "E1125: Final requires a value"
+msgstr "E1125: Final, bir deÄŸer gerektirir"
+
+msgid "E1126: Cannot use :let in Vim9 script"
+msgstr "E1126: :let, Vim9 betiğinde kullanılamaz"
+
+msgid "E1127: Missing name after dot"
+msgstr "E1127: Nokta sonrası ad eksik"
+
+msgid "E1128: } without {"
+msgstr "E1128: { olmadan }"
+
+msgid "E1129: Throw with empty string"
+msgstr "E1129: BoÅŸ dizi ile \"Throw\""
+
+msgid "E1130: Cannot add to null list"
+msgstr "E1130: Null listesine bir öge eklenemez"
+
+msgid "E1131: Cannot add to null blob"
+msgstr "E1131: Null ikili geniş nesnesine ekleme yapılamaz"
+
+msgid "E1132: Missing function argument"
+msgstr "E1132: Ä°ÅŸlev deÄŸiÅŸkeni eksik"
+
+msgid "E1133: Cannot extend a null dict"
+msgstr "E1133: Bir null sözlük genişletilemez"
+
+msgid "E1134: Cannot extend a null list"
+msgstr "E1134: Bir null listesi geniÅŸletilemez"
+
+#, c-format
+msgid "E1135: Using a String as a Bool: \"%s\""
+msgstr "E1135: Bir Dizi, bir Boole yerine kullanılıyor: \"%s\""
+
+msgid "E1135: <Cmd> mapping must end with <CR>"
+msgstr "E1135: <Cmd> eÅŸlemlemesi <CR> ile bitmelidir"
+
+msgid "E1136: <Cmd> mapping must end with <CR> before second <Cmd>"
+msgstr "E1136: <Cmd> eşlemlemesi ikinci <Cmd>'den önce <CR> ile bitmelidir"
+
+#, c-format
+msgid "E1137: <Cmd> mapping must not include %s key"
+msgstr "E1137: <Cmd> eşlemlemesi %s anahtarını içermemelidir"
+
+msgid "E1138: Using a Bool as a Number"
+msgstr "E1138: Bir Boole, Sayı yerine kullanılıyor"
+
+msgid "E1139: Missing matching bracket after dict key"
+msgstr "E1139: Sözlük anahtarı sonrası eşleşen ayraç eksik"
+
+msgid "E1140: For argument must be a sequence of lists"
+msgstr "E1140: For değişkeni listelerin bir sıralaması olmalıdır"
+
+msgid "E1141: Indexable type required"
+msgstr "E1141: İndekslenebilir tür gerekiyor"
+
 msgid "--No lines in buffer--"
 msgstr "--Arabellek içinde satır yok--"
 
@@ -7021,7 +7131,7 @@
 
 msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
 msgstr ""
-"E12: Mevcut dizin veya etiket aramasında exrc veya vimrc'den komutlara izin "
+"E12: Geçerli dizin veya etiket aramasında exrc veya vimrc'den komutlara izin "
 "verilmiyor"
 
 msgid "E171: Missing :endif"
@@ -7312,8 +7422,8 @@
 msgstr "E933: Ä°ÅŸlev silinmiÅŸ: %s"
 
 #, c-format
-msgid "E716: Key not present in Dictionary: %s"
-msgstr "E716: Anahtar sözlükte mevcut değil: %s"
+msgid "E716: Key not present in Dictionary: \"%s\""
+msgstr "E716: Anahtar sözlükte mevcut değil: \"%s\""
 
 msgid "E714: List required"
 msgstr "E714: Liste gerekiyor"
@@ -7876,10 +7986,18 @@
 msgid "Vim"
 msgstr "Vim"
 
+msgid "(local to window)"
+msgstr "(pencereye yerel)"
+
+msgid "(local to buffer)"
+msgstr "(arabelleÄŸe yerel)"
+
+msgid "(global or local to buffer)"
+msgstr "(arabelleÄŸe global veya yerel)"
+
 msgid ""
 "\" Each \"set\" line shows the current value of an option (on the left)."
-msgstr ""
-"\" Her \"set\" satırı bir seçeneğin geçerli değerini gösterir (solda)."
+msgstr "\" Her \"set\" satırı bir seçeneğin geçerli değerini gösterir (solda)."
 
 msgid "\" Hit <Enter> on a \"set\" line to execute it."
 msgstr "\" Değiştirmek için bir \"set\" satırında <Enter>'a basın."
@@ -7891,15 +8009,1362 @@
 "\"            For other options you can edit the value before hitting "
 "<Enter>."
 msgstr ""
-"\"   Diğer seçenekler için <Enter>'a basmadan önce değeri düzenleyebilirsiniz."
+"\"   Diğer seçenekler için <Enter>'a basmadan önce değeri "
+"düzenleyebilirsiniz."
 
 msgid "\" Hit <Enter> on a help line to open a help window on this option."
-msgstr "\" Bir seçeneğin yardım penceresini açmak için bir yardım satırının "
-"üzerinde <Enter>'a basın."
+msgstr ""
+"\" Yardım penceresini açmak için seçenek adı üzerinde <Enter>'a basın."
 
 msgid "\" Hit <Enter> on an index line to jump there."
-msgstr "\" Bir seçeneğe atlamak için indeks satırının üzerinde <Enter>'a basın."
+msgstr ""
+"\" Bir seçeneğe atlamak için indeks satırının üzerinde <Enter>'a basın."
 
 msgid "\" Hit <Space> on a \"set\" line to refresh it."
 msgstr ""
-"\" Bir seçeneği yenilemek için bir \"set\" satırının üzerinde <Boşluk>'a basın."
+"\" Bir seçeneği yenilemek için bir \"set\" satırının üzerinde <Boşluk>'a "
+"basın."
+
+msgid "important"
+msgstr "önemli"
+
+msgid "behave very Vi compatible (not advisable)"
+msgstr "olabildiğince Vi uyumlu biçimde davran (önerilmez)"
+
+msgid "list of flags to specify Vi compatibility"
+msgstr "Vi uyumluluğu bayrakları listesi"
+
+msgid "use Insert mode as the default mode"
+msgstr "Ekleme kipini öntanımlı kip olarak kullan"
+
+msgid "paste mode, insert typed text literally"
+msgstr "yapıştır kipi, girilen metni doğrudan ekle"
+
+msgid "key sequence to toggle paste mode"
+msgstr "yapıştır kipini açıp/kapatmak için düğme sıralaması"
+
+msgid "list of directories used for runtime files and plugins"
+msgstr "çalışma zamanı dosyaları ve eklentileri için kullanılan dizinler"
+
+msgid "list of directories used for plugin packages"
+msgstr "eklenti paketleri için kullanılan dizinlerin listesi"
+
+msgid "name of the main help file"
+msgstr "ana yardım dosyasının adı"
+
+msgid "moving around, searching and patterns"
+msgstr "dolaÅŸma, arama ve dizgeler"
+
+msgid "list of flags specifying which commands wrap to another line"
+msgstr "hangi komutların diğer satıra kaydırıldığını belirleyen bayraklar\n"
+"listesi"
+
+msgid ""
+"many jump commands move the cursor to the first non-blank\n"
+"character of a line"
+msgstr ""
+"çoğu atlama komutu, imleci satırın boş olmayan ilk\n"
+"karakterine taşır"
+
+msgid "nroff macro names that separate paragraphs"
+msgstr "paragrafları ayıran nroff makro adları"
+
+msgid "nroff macro names that separate sections"
+msgstr "bölümleri ayıran nroff makro adları"
+
+msgid "list of directory names used for file searching"
+msgstr "dosya arama için kullanılan dizin adları listesi"
+
+msgid "list of directory names used for :cd"
+msgstr ":cd için kullanılan dizin adları listesi"
+
+msgid "change to directory of file in buffer"
+msgstr "arabellekteki dosyanın olduğu dizine değiştir"
+
+msgid "search commands wrap around the end of the buffer"
+msgstr "arama komutları, arabelleğin sonunda kaydırılır"
+
+msgid "show match for partly typed search command"
+msgstr "bir kısmı yazılmış arama komutu ile eşleşeni göster"
+
+msgid "change the way backslashes are used in search patterns"
+msgstr "arama dizgilerinde ters eğik çizginin kullanımını değiştir"
+
+msgid "select the default regexp engine used"
+msgstr "öntanımlı kullanılan düzenli ifade motorunu seç"
+
+msgid "ignore case when using a search pattern"
+msgstr "bir arama dizgisinde BÜYÜK/küçük harf ayrımını yok say"
+
+msgid "override 'ignorecase' when pattern has upper case characters"
+msgstr "dizgide BÜYÜK harf varsa 'ignorecase'i geçersiz kıl"
+
+msgid "what method to use for changing case of letters"
+msgstr "BÜYÜK/küçük harf değiştirirken hangi yöntemin kullanılacağı"
+
+msgid "maximum amount of memory in Kbyte used for pattern matching"
+msgstr "dizgi eşleşme için kullanılabilecek en çok bellek miktarı (KiB)"
+
+msgid "pattern for a macro definition line"
+msgstr "bir makro tanım satırı için dizgi"
+
+msgid "pattern for an include-file line"
+msgstr "bir 'include-file' satırı için dizgi"
+
+msgid "expression used to transform an include line to a file name"
+msgstr "bir 'include' satırını dosya adına dönüştürmede kullanılan ifade"
+
+msgid "tags"
+msgstr "etiketler"
+
+msgid "use binary searching in tags files"
+msgstr "etiketler dosyasında ikili arama kullan"
+
+msgid "number of significant characters in a tag name or zero"
+msgstr "bir etiket adındaki belirgin karakterlerin sayısı veya sıfır"
+
+msgid "list of file names to search for tags"
+msgstr "etiketlerin aranacağı dosyaların listesi"
+
+msgid ""
+"how to handle case when searching in tags files:\n"
+"\"followic\" to follow 'ignorecase', \"ignore\" or \"match\""
+msgstr ""
+"etiket dosyalarında arama yaparken BÜYÜK/küçük harf kullanımı:\n"
+"'ignorecase', \"ignore\" veya \"match\"den sonra \"followic\" gelir"
+
+msgid "file names in a tags file are relative to the tags file"
+msgstr "bir etiket dosyasındaki dosya adları etiket dosyasına görelidir"
+
+msgid "a :tag command will use the tagstack"
+msgstr "bir :tag komutu etiket yığınını kullanır"
+
+msgid "when completing tags in Insert mode show more info"
+msgstr "Ekleme kipinde etiketleri tamamlarken daha çok bilgi göster"
+
+msgid "a function to be used to perform tag searches"
+msgstr "etiket aramaları gerçekleştirmek için bir işlev kullanılır"
+
+msgid "command for executing cscope"
+msgstr "cscope çalıştırmak için kullanılacak komut"
+
+msgid "use cscope for tag commands"
+msgstr "etiket komutları için cscope kullan"
+
+msgid "0 or 1; the order in which \":cstag\" performs a search"
+msgstr "0 veya 1; \":cstag\"in arama yaparken kullanacağı sıra"
+
+msgid "give messages when adding a cscope database"
+msgstr "bir cscope veritabanı eklerken iletiler göster"
+
+msgid "how many components of the path to show"
+msgstr "yolun kaç tane bileşeninin gösterileceği"
+
+msgid "when to open a quickfix window for cscope"
+msgstr "cscope için ne zaman bir hızlı düzelt penceresinin açılacağı"
+
+msgid "file names in a cscope file are relative to that file"
+msgstr "bir cscope dosyasındaki o dosyaya göreli olan dosya adları"
+
+msgid "displaying text"
+msgstr "metin görüntüleme"
+
+msgid "number of lines to scroll for CTRL-U and CTRL-D"
+msgstr "CTRL-U ve CTRL-D için kaydırılacak satır sayısı"
+
+msgid "number of screen lines to show around the cursor"
+msgstr "imleç etrafında gösterilecek ekran satırları sayısı"
+
+msgid "long lines wrap"
+msgstr "uzun satırları kaydır"
+
+msgid "wrap long lines at a character in 'breakat'"
+msgstr "'breakat' içindeki bir karakterde uzun satırları kaydır"
+
+msgid "preserve indentation in wrapped text"
+msgstr "kaydırılmış metindeki girintilemeyi koru"
+
+msgid "adjust breakindent behaviour"
+msgstr "'breakindent' davranışını ayarla"
+
+msgid "which characters might cause a line break"
+msgstr "hangi karakterler bir satır sonuna neden olabilir"
+
+msgid "string to put before wrapped screen lines"
+msgstr "kaydırılmış ekran satırlarından önce konumlanacak dizi"
+
+msgid "minimal number of columns to scroll horizontally"
+msgstr "en az yatay kaydırma sütunu sayısı"
+
+msgid "minimal number of columns to keep left and right of the cursor"
+msgstr "imlecin sağında ve solunda bırakılacak en az sütun sayısı"
+
+msgid ""
+"include \"lastline\" to show the last line even if it doesn't fit\n"
+"include \"uhex\" to show unprintable characters as a hex number"
+msgstr ""
+"eğer sığmasa bile son satırı göstermek için \"lastline\"ı içer\n"
+"yazdırılamayan karakterleri onaltılık olarak göstermek için\n"
+"\"uhex\" içer"
+
+msgid "characters to use for the status line, folds and filler lines"
+msgstr "durum satırı, kıvırma ve doldurucular için kullanılan karakterler"
+
+msgid "number of lines used for the command-line"
+msgstr "komut satırı için kullanılan satırların sayısı"
+
+msgid "width of the display"
+msgstr "ekranın genişliği"
+
+msgid "number of lines in the display"
+msgstr "ekrandaki satırların sayısı"
+
+msgid "number of lines to scroll for CTRL-F and CTRL-B"
+msgstr "CTRL-F ve CTRL-B için kaydırılacak satır sayısı"
+
+msgid "don't redraw while executing macros"
+msgstr "makroları çalıştırırken yenileme yapma"
+
+msgid "timeout for 'hlsearch' and :match highlighting in msec"
+msgstr "'hlsearch' ve : match vurgulaması için zaman aşımı (milisaniye)"
+
+msgid ""
+"delay in msec for each char written to the display\n"
+"(for debugging)"
+msgstr ""
+"ekrana yazılan her karakter için gecikme süresi (milisaniye)\n"
+"(hata ayıklama için)"
+
+msgid "show <Tab> as ^I and end-of-line as $"
+msgstr "<Tab>'ı ^I ve satır sonunu $ olarak göster"
+
+msgid "list of strings used for list mode"
+msgstr "liste kipi için kullanılan diziler listesi"
+
+msgid "show the line number for each line"
+msgstr "her satır için satır numarasını göster"
+
+msgid "show the relative line number for each line"
+msgstr "her satır için göreli satır numarasını göster"
+
+msgid "number of columns to use for the line number"
+msgstr "satır numarası için kullanılacak sütün sayısı"
+
+msgid "controls whether concealable text is hidden"
+msgstr "gizlenebilir metnin saklı olup olmadığını denetler"
+
+msgid "modes in which text in the cursor line can be concealed"
+msgstr "imleç satırındaki metnin gizlenebileceği kipler"
+
+msgid "syntax, highlighting and spelling"
+msgstr "sözdizim, vurgulama ve yazım denetimi"
+
+msgid "\"dark\" or \"light\"; the background color brightness"
+msgstr "\"dark\" veya \"light\"; arka plan renk parlaklığı"
+
+msgid "type of file; triggers the FileType event when set"
+msgstr "dosya türü; ayarlandığında FileType olayını tetikler"
+
+msgid "name of syntax highlighting used"
+msgstr "kullanılan sözdizim vurgulamanın adı"
+
+msgid "maximum column to look for syntax items"
+msgstr "sözdizim ögeleri için bakılacak en çok sütun sayısı"
+
+msgid "which highlighting to use for various occasions"
+msgstr "çeşitli durumlarda hangi vurgulamanın kullanılacağı"
+
+msgid "highlight all matches for the last used search pattern"
+msgstr "son kullanılan arama dizgisi için tüm eşleşmeleri vurgula"
+
+msgid "highlight group to use for the window"
+msgstr "pencere için kullanılacak vurgulama grubu"
+
+msgid "use GUI colors for the terminal"
+msgstr "uçbirim için grafik arabirim renklerini kullan"
+
+msgid "highlight the screen column of the cursor"
+msgstr "imlecin ekrandaki sütununu vurgula"
+
+msgid "highlight the screen line of the cursor"
+msgstr "imlecin ekrandaki satırını vurgula"
+
+msgid "specifies which area 'cursorline' highlights"
+msgstr "'cursorline'ın hangi alanı vurgulayacağı"
+
+msgid "columns to highlight"
+msgstr "vurgulanacak sütunlar"
+
+msgid "highlight spelling mistakes"
+msgstr "yazım yanlışlarını vurgula"
+
+msgid "list of accepted languages"
+msgstr "kabul edilen dillerin listesi"
+
+msgid "file that \"zg\" adds good words to"
+msgstr "\"zg\" komutunun düzgün sözcükleri ekleyeceği dosya"
+
+msgid "pattern to locate the end of a sentence"
+msgstr "bir tümcenin sonunu bulmak için kullanılan dizgi"
+
+msgid "flags to change how spell checking works"
+msgstr "yazım denetiminin nice çalıştığını değiştirmek için bayraklar"
+
+msgid "methods used to suggest corrections"
+msgstr "düzeltmeleri önermek için yöntemler"
+
+msgid "amount of memory used by :mkspell before compressing"
+msgstr "sıkıştırma öncesi :mkspell tarafından kullanılan bellek"
+
+msgid "multiple windows"
+msgstr "çoklu pencereler"
+
+msgid "0, 1 or 2; when to use a status line for the last window"
+msgstr "0, 1 veya 2; son pencere için ne zaman bir durum satırı\n"
+"kullanılacağı"
+
+msgid "alternate format to be used for a status line"
+msgstr "durum satırı için kullanılabilecek alternatif biçim"
+
+msgid "make all windows the same size when adding/removing windows"
+msgstr "pencere eklerken/kaldırırken tüm pencereleri aynı boyuta getir"
+
+msgid "in which direction 'equalalways' works: \"ver\", \"hor\" or \"both\""
+msgstr "'equalalways'in hangi yönde çalıştığı: \"ver\", \"hor\" veya \"both\""
+
+msgid "minimal number of lines used for the current window"
+msgstr "geçerli pencere için kullanılan en az satır sayısı"
+
+msgid "minimal number of lines used for any window"
+msgstr "herhangi bir pencere için kullanılan en az satır sayısı"
+
+msgid "keep the height of the window"
+msgstr "pencerenin yüksekliğini tut"
+
+msgid "keep the width of the window"
+msgstr "pencerenin geniÅŸliÄŸini tut"
+
+msgid "minimal number of columns used for the current window"
+msgstr "geçerli pencere için kullanılan en az sütun sayısı"
+
+msgid "minimal number of columns used for any window"
+msgstr "herhangi bir pencere için kullanılan en az sütun sayısı"
+
+msgid "initial height of the help window"
+msgstr "yardım penceresinin başlangıç yüksekliği"
+
+msgid "use a popup window for preview"
+msgstr "önizleme için bir açılır pencere kullan"
+
+msgid "default height for the preview window"
+msgstr "önizleme penceresi için öntanımlı yükseklik"
+
+msgid "identifies the preview window"
+msgstr "önizleme penceresini tanımlar"
+
+msgid "don't unload a buffer when no longer shown in a window"
+msgstr "arabellek artık pencerede görüntülenmiyorsa bellekten kaldırma"
+
+msgid ""
+"\"useopen\" and/or \"split\"; which window to use when jumping\n"
+"to a buffer"
+msgstr ""
+"\"useopen\" ve/veya \"split\"; bir belleÄŸe atlarken hangi\n"
+"pencerenin kullanılacağı"
+
+msgid "a new window is put below the current one"
+msgstr "geçerli pencerenin altına yeni bir pencere koyulur"
+
+msgid "a new window is put right of the current one"
+msgstr "yeni bir pencere geçerli pencerenin sağına koyulur"
+
+msgid "this window scrolls together with other bound windows"
+msgstr "bu pencere, bağlı diğer pencerelerle birlikte kayar"
+
+msgid "\"ver\", \"hor\" and/or \"jump\"; list of options for 'scrollbind'"
+msgstr "\"ver\", \"hor\" ve/veya \"jump\"; 'scrollbind' için seçenekler listesi"
+
+msgid "this window's cursor moves together with other bound windows"
+msgstr "bu pencerenin imleci bağlı diğer pencerelerle birlikte kayar"
+
+msgid "size of a terminal window"
+msgstr "bir uçbirim penceresinin boyutu"
+
+msgid "key that precedes Vim commands in a terminal window"
+msgstr "bir uçbirim penceresinde Vim komutlarından önce gelen düğme"
+
+msgid "max number of lines to keep for scrollback in a terminal window"
+msgstr "bir uçbirim penceresinde geri kaydırma için kullanılacak\n"
+"en çok satır sayısı"
+
+msgid "type of pty to use for a terminal window"
+msgstr "bir uçbirim penceresi için kullanılacak pty türü"
+
+msgid "name of the winpty dynamic library"
+msgstr "winpty devingen kitaplığının adı"
+
+msgid "multiple tab pages"
+msgstr "çoklu sekme sayfaları"
+
+msgid "0, 1 or 2; when to use a tab pages line"
+msgstr "0, 1 veya 2; ne zaman bir sekme sayfası satırının kullanılacağı"
+
+msgid "maximum number of tab pages to open for -p and \"tab all\""
+msgstr "-p ve \"tab all\"un açacağı en çok sekme sayfası sayısı"
+
+msgid "custom tab pages line"
+msgstr "özelleştirilmiş sekme sayfası satırı"
+
+msgid "custom tab page label for the GUI"
+msgstr "grafik arabirim için özelleştirilmiş sekme sayfası etiketi"
+
+msgid "custom tab page tooltip for the GUI"
+msgstr "grafik arabirim için özelleştirilmiş sekme sayfası bilgi kutusu"
+
+msgid "terminal"
+msgstr "uçbirim"
+
+msgid "name of the used terminal"
+msgstr "kullanılan uçbirimin adı"
+
+msgid "alias for 'term'"
+msgstr "'term' için arma"
+
+msgid "check built-in termcaps first"
+msgstr "önce iç termcaps'i denetle"
+
+msgid "terminal connection is fast"
+msgstr "uçbirim bağlantısı hızlı"
+
+msgid "terminal that requires extra redrawing"
+msgstr "ek yenileme gerektiren uçbirim"
+
+msgid "recognize keys that start with <Esc> in Insert mode"
+msgstr "Ekleme kipinde <Esc> ile başlayan düğmeleri tanı"
+
+msgid "minimal number of lines to scroll at a time"
+msgstr "herhangi bir zamanda kaydırılacak en az satır sayısı"
+
+msgid "maximum number of lines to use scrolling instead of redrawing"
+msgstr "yenileme yerine kaydırma kullanacak en çok satır sayısı"
+
+msgid "specifies what the cursor looks like in different modes"
+msgstr "imlecin farklı kiplerde nice göründüğünü belirler"
+
+msgid "show info in the window title"
+msgstr "pencere başlığında bilgi görüntüle"
+
+msgid "percentage of 'columns' used for the window title"
+msgstr "pencere başlığı için kullanılacak 'columns' yüzdesi"
+
+msgid "when not empty, string to be used for the window title"
+msgstr "boş değilken, pencere başlığı yerine kullanılacak dizi"
+
+msgid "string to restore the title to when exiting Vim"
+msgstr "Vim'den çıkarken başlığın döndürüleceği dizi"
+
+msgid "set the text of the icon for this window"
+msgstr "bu pencere için simgenin metnini ayarla"
+
+msgid "when not empty, text for the icon of this window"
+msgstr "boş değilken, bu pencerenin simgesi için metin"
+
+msgid "restore the screen contents when exiting Vim"
+msgstr "Vim'den çıkarken ekran içeriğini eski haline getir"
+
+msgid "using the mouse"
+msgstr "fare kullanımı"
+
+msgid "list of flags for using the mouse"
+msgstr "fare kullanımı için bayraklar listesi"
+
+msgid "the window with the mouse pointer becomes the current one"
+msgstr "fare imlecinin olduğu pencere geçerli pencere olur"
+
+msgid "the window with the mouse pointer scrolls with the mouse wheel"
+msgstr "fare imlecinin olduğu pencere fare tekerleği ile kaydırılabilir"
+
+msgid "hide the mouse pointer while typing"
+msgstr "yazı yazarken fare imlecini gizle"
+
+msgid ""
+"\"extend\", \"popup\" or \"popup_setpos\"; what the right\n"
+"mouse button is used for"
+msgstr ""
+"\"extend\", \"popup\" veya \"popup_setpos\"; sağ fare düğmesinin\"\n"
+"ne için kullanıldığı"
+
+msgid "maximum time in msec to recognize a double-click"
+msgstr "bir çif tıklamayı tanımak için en çok süre (milisaniye)"
+
+msgid "\"xterm\", \"xterm2\", \"sgr\", etc.; type of mouse"
+msgstr "\"xterm\", \"xterm2\", \"sgr\" vb.; fare türü"
+
+msgid "what the mouse pointer looks like in different modes"
+msgstr "farklı kiplerde fare imlecinin nice göründüğü"
+
+msgid "GUI"
+msgstr "grafik arabirim"
+
+msgid "list of font names to be used in the GUI"
+msgstr "grafik arabirimde kullanılacak yazıtiplerinin listesi"
+
+msgid "pair of fonts to be used, for multibyte editing"
+msgstr "çoklu bayt düzenlemede kullanılacak yazıtipi eşleşmeleri"
+
+msgid "list of font names to be used for double-wide characters"
+msgstr "çift genişlikli karakterler için kullanılacak yazıtiplerinin listesi"
+
+msgid "use smooth, antialiased fonts"
+msgstr "düzletilmiş yazıtipleri kullan"
+
+msgid "list of flags that specify how the GUI works"
+msgstr "grafik arabirimin nice çalıştığını belirleyen bayraklar listesi"
+
+msgid "\"icons\", \"text\" and/or \"tooltips\"; how to show the toolbar"
+msgstr ""
+"\"icons\", \"text\" ve/veya \"tooltips\"; araç çubuğu kipleri "
+
+msgid "size of toolbar icons"
+msgstr "araç çubuğu simgelerinin boyutu"
+
+msgid "room (in pixels) left above/below the window"
+msgstr "pencerenin altında/üstünde bırakılan alan (piksel)"
+
+msgid "options for text rendering"
+msgstr "metin dokuması için seçenekler"
+
+msgid "use a pseudo-tty for I/O to external commands"
+msgstr "dış komutlara, girdi çıktı için yalancı-tty kullan"
+
+msgid ""
+"\"last\", \"buffer\" or \"current\": which directory used for the file "
+"browser"
+msgstr ""
+"\"last\", \"buffer\" veya \"current\"; dosya tarayıcısı için hangi dizinin "
+"kullanıldığı"
+
+msgid "language to be used for the menus"
+msgstr "menüler için kullanılan dil"
+
+msgid "maximum number of items in one menu"
+msgstr "bir menüdeki en çok öge sayısı"
+
+msgid "\"no\", \"yes\" or \"menu\"; how to use the ALT key"
+msgstr "\"no\", \"yes\" veya \"menu\"; ALT düğmesinin nice kullanılacağı"
+
+msgid "number of pixel lines to use between characters"
+msgstr "karakterler arasında kullanılacak piksel satırları sayısı"
+
+msgid "delay in milliseconds before a balloon may pop up"
+msgstr "bir balonun patlamadan önceki gecikme (milisaniye)"
+
+msgid "use balloon evaluation in the GUI"
+msgstr "grafik arabirimde balon deÄŸerlendirme kullan"
+
+msgid "use balloon evaluation in the terminal"
+msgstr "uçbirimde balon değerlendirme kullan"
+
+msgid "expression to show in balloon eval"
+msgstr "balon değerlendirmesinde gösterilecek ifade"
+
+msgid "printing"
+msgstr "yazdırma"
+
+msgid "list of items that control the format of :hardcopy output"
+msgstr ":hardcopy çıktısının biçimini denetleyen ögelerin listesi"
+
+msgid "name of the printer to be used for :hardcopy"
+msgstr ":hardcopy için kullanılan yazıcının adı"
+
+msgid "expression used to print the PostScript file for :hardcopy"
+msgstr ":hardcopy için PostScript dosyasını yazdırmada kullanılan ifade"
+
+msgid "name of the font to be used for :hardcopy"
+msgstr ":hardcopy için kullanılan yazıtipinin adı"
+
+msgid "format of the header used for :hardcopy"
+msgstr ":hardcopy için kullanılan üstbilginin biçimi"
+
+msgid "encoding used to print the PostScript file for :hardcopy"
+msgstr ":hardcopy için Postscript dosyasını yazdırmada kullanılan kodlama"
+
+msgid "the CJK character set to be used for CJK output from :hardcopy"
+msgstr ":hardcopy'deki ÇJK çıktısında kullanılan ÇJK karakter seti"
+
+msgid "list of font names to be used for CJK output from :hardcopy"
+msgstr ":hardcopy'deki ÇJK çıktısında kullanılan ÇJK yazıtipi"
+
+msgid "messages and info"
+msgstr "iletiler ve bilgi"
+
+msgid "add 's' flag in 'shortmess' (don't show search message)"
+msgstr "'shortness'daki 's' bayrağını ekle (arama iletisini gösterme)"
+
+msgid "list of flags to make messages shorter"
+msgstr "iletileri kısalaştırmak için kullanılan bayraklar listesi"
+
+msgid "show (partial) command keys in the status line"
+msgstr "durum satırında (kısmi) komut düğmelerini göster"
+
+msgid "display the current mode in the status line"
+msgstr "durum satırında geçerli kipi görüntüle"
+
+msgid "show cursor position below each window"
+msgstr "her pencerenin altında imleç konumunu göster"
+
+msgid "alternate format to be used for the ruler"
+msgstr "cetvel için kullanılan alternatif biçim"
+
+msgid "threshold for reporting number of changed lines"
+msgstr "değiştirilmiş satırların sayısını raporlama eşiği"
+
+msgid "the higher the more messages are given"
+msgstr "ne kadar yüksek olursa o kadar çok ileti olur"
+
+msgid "file to write messages in"
+msgstr "iletilerin içine yazılacağı dosya"
+
+msgid "pause listings when the screen is full"
+msgstr "ekran doluyken listelemeleri duraklat"
+
+msgid "start a dialog when a command fails"
+msgstr "bir komut başarısız olursa iletişim kutusu göster"
+
+msgid "ring the bell for error messages"
+msgstr "hata iletilerinde zili çal"
+
+msgid "use a visual bell instead of beeping"
+msgstr "bipleme yerine görsel zil kullan"
+
+msgid "do not ring the bell for these reasons"
+msgstr "bu nedenlerle zili çalma"
+
+msgid "list of preferred languages for finding help"
+msgstr "yardım için yeğlenen diller listesi"
+
+msgid "selecting text"
+msgstr "metin seçme"
+
+msgid "\"old\", \"inclusive\" or \"exclusive\"; how selecting text behaves"
+msgstr "\"old\", \"inclusive\" veya \"exclusive\"; metin seçim davranışı"
+
+msgid ""
+"\"mouse\", \"key\" and/or \"cmd\"; when to start Select mode\n"
+"instead of Visual mode"
+msgstr ""
+"\"mouse\", \"key\", ve/veya \"cmd\"; Görsel kip yerine Seçim\n"
+"kipinin başlatılacağı zaman"
+
+msgid ""
+"\"unnamed\" to use the * register like unnamed register\n"
+"\"autoselect\" to always put selected text on the clipboard"
+msgstr ""
+"\"unnamed\": * yazmacını adsız yazmaç gibi kullan\n"
+"\"autoselect\": seçili metni her zaman panoya koy"
+
+msgid "\"startsel\" and/or \"stopsel\"; what special keys can do"
+msgstr "\"startsel\" ve/veya \"stopsel\"; özel düğmelerin işlevleri"
+
+msgid "editing text"
+msgstr "metin düzenleme"
+
+msgid "maximum number of changes that can be undone"
+msgstr "geri alınabilecek en çok değişiklik sayısı"
+
+msgid "automatically save and restore undo history"
+msgstr "geri al geçmişini kendiliğinden kaydet ve eski haline getir"
+
+msgid "list of directories for undo files"
+msgstr "geri al dosyaları için dizinler listesi"
+
+msgid "maximum number lines to save for undo on a buffer reload"
+msgstr "arabellek yeniden yüklemesinde geri al için kaydedilecek\n"
+"en çok satır sayısı"
+
+msgid "changes have been made and not written to a file"
+msgstr "yapılan; ancak bir dosyaya yazılmayan değişiklikler"
+
+msgid "buffer is not to be written"
+msgstr "arabellek, yazım için değil"
+
+msgid "changes to the text are possible"
+msgstr "metne değişiklik yapımı olanaklı"
+
+msgid "line length above which to break a line"
+msgstr "sonrasında yeni satır yapılacak satır uzunluğu"
+
+msgid "margin from the right in which to break a line"
+msgstr "sonrasında yeni satır yapılacak sağ kenar boşluğu"
+
+msgid "specifies what <BS>, CTRL-W, etc. can do in Insert mode"
+msgstr "<BS>, CTRL-W, vb. Ekleme kipinde ne yapabileceÄŸini belirtir"
+
+msgid "definition of what comment lines look like"
+msgstr "yorum satırlarının nice görüneceğinin tanımı"
+
+msgid "list of flags that tell how automatic formatting works"
+msgstr "kendiliğinden biçimlendirmenin nice çalıştığını anlatan\n"
+"bayraklar listesi"
+
+msgid "pattern to recognize a numbered list"
+msgstr "numaralandırılmış bir listeyi tanımak için dizgi"
+
+msgid "expression used for \"gq\" to format lines"
+msgstr "satırları biçimlendirmek için \"gq\" için kullanılan ifade"
+
+msgid "specifies how Insert mode completion works for CTRL-N and CTRL-P"
+msgstr "Ekleme kipi tamamlamasının CTRL-N ve CTRL-P için nice çalıştığını\n"
+"belirler"
+
+msgid "whether to use a popup menu for Insert mode completion"
+msgstr "Ekleme kipi tamamlaması için açılır menü kullanımı"
+
+msgid "options for the Insert mode completion info popup"
+msgstr "Ekleme kipi tamamlama açılır penceresi için seçenekler"
+
+msgid "maximum height of the popup menu"
+msgstr "açılır menünün en çok yüksekliği"
+
+msgid "minimum width of the popup menu"
+msgstr "açılır menünün en çok genişliği"
+
+msgid "user defined function for Insert mode completion"
+msgstr "Ekleme kipi tamamlaması için kullanıcı tanımlı işlev"
+
+msgid "function for filetype-specific Insert mode completion"
+msgstr "dosya türüne özel Ekleme kipi tamamlaması için işlev"
+
+msgid "list of dictionary files for keyword completion"
+msgstr "anahtar sözcük tamamlaması için sözlük dosyaları listesi"
+
+msgid "list of thesaurus files for keyword completion"
+msgstr "anahtar sözcük tamamlaması için eşanlamlılar sözlüğü dosyaları\n"
+"listesi"
+
+msgid "adjust case of a keyword completion match"
+msgstr "anahtar sözcük tamamlama eşleşmesinin BÜYÜK/küçük harfini ayarla"
+
+msgid "enable entering digraphs with c1 <BS> c2"
+msgstr "c1 <BS> c2 ile ikili harflerin girilmesini etkinleÅŸtir"
+
+msgid "the \"~\" command behaves like an operator"
+msgstr "\"~\" komutu bir işleç gibi davranır"
+
+msgid "function called for the \"g@\" operator"
+msgstr "\"g@\" işleci için çağrılan işlev"
+
+msgid "when inserting a bracket, briefly jump to its match"
+msgstr "bir ayraç eklendiğinde hemen eşine atla"
+
+msgid "tenth of a second to show a match for 'showmatch'"
+msgstr "bir 'showmatch' eşleşmesini göstermek için saniyenin onda biri"
+
+msgid "list of pairs that match for the \"%\" command"
+msgstr "\"%\" komutu için eşleşen eşleşmelerin listesi"
+
+msgid "use two spaces after '.' when joining a line"
+msgstr "bir satırı birleştirirken '.' sonrası iki boşluk kullan"
+
+msgid ""
+"\"alpha\", \"octal\", \"hex\", \"bin\" and/or \"unsigned\"; number formats\n"
+"recognized for CTRL-A and CTRL-X commands"
+msgstr ""
+"\"alpha\", \"octal\", \"hex\", \"bin\" ve/veya \"unsigned\"; CTRL-A ve\n"
+"CTRL-X komutları için tanınan sayı biçimleri"
+
+msgid "tabs and indenting"
+msgstr "sekmeler ve girintileme"
+
+msgid "number of spaces a <Tab> in the text stands for"
+msgstr "metinde bir <Tab>'ın denk olduğu boşluk sayısı"
+
+msgid "number of spaces used for each step of (auto)indent"
+msgstr "her bir kendiliğinden girintileme için kullanılan boşluk sayısı"
+
+msgid "list of number of spaces a tab counts for"
+msgstr "bir sekmenin denk olduğu boşlukların sayısının listesi"
+
+msgid "list of number of spaces a soft tabsstop counts for"
+msgstr "bir yumuşak sekmedurağının denk olduğu boşlukların sayısı listesi"
+
+msgid "a <Tab> in an indent inserts 'shiftwidth' spaces"
+msgstr "bir girintideki <Tab>, 'shiftwidth' kadar boÅŸluk ekler"
+
+msgid "if non-zero, number of spaces to insert for a <Tab>"
+msgstr "eğer sıfırdan farklıysa, bir <Tab> için eklenecek boşluk sayısı"
+
+msgid "round to 'shiftwidth' for \"<<\" and \">>\""
+msgstr "\"<<\" ve \">>\" için 'shiftwidth'e yuvarla"
+
+msgid "expand <Tab> to spaces in Insert mode"
+msgstr "Ekleme kipinde <Tab>'ı boşluklara genişlet"
+
+msgid "automatically set the indent of a new line"
+msgstr "yeni bir satırın girintisini kendiliğinden ayarla"
+
+msgid "do clever autoindenting"
+msgstr "akıllı kendiliğinden girintileme yap"
+
+msgid "enable specific indenting for C code"
+msgstr "C kodu için özel girintilemeyi etkinleştir"
+
+msgid "options for C-indenting"
+msgstr "C girintilemesi için seçenekler"
+
+msgid "keys that trigger C-indenting in Insert mode"
+msgstr "Ekleme kipinde C girintilemesini tetikleyen düğmeler"
+
+msgid "list of words that cause more C-indent"
+msgstr "daha çok C girintilemesine neden olan sözcüklerin listesi"
+
+msgid "expression used to obtain the indent of a line"
+msgstr "bir satırın girintisini elde etmek için kullanılan ifade"
+
+msgid "keys that trigger indenting with 'indentexpr' in Insert mode"
+msgstr "Ekleme kipinde 'indentexpr' ile girintilemeyi tetikleyen düğmeler"
+
+msgid "copy whitespace for indenting from previous line"
+msgstr "bir önceki satırdan girintileme için boşlukları kopyala"
+
+msgid "preserve kind of whitespace when changing indent"
+msgstr "girintilemeyi değiştirirken boşluk türünü koru"
+
+msgid "enable lisp mode"
+msgstr "lisp kipini etkinleÅŸtir"
+
+msgid "words that change how lisp indenting works"
+msgstr "lisp girintilemesinin nice çalıştığını değiştiren sözcükler"
+
+msgid "folding"
+msgstr "kıvırma"
+
+msgid "unset to display all folds open"
+msgstr "tüm kıvırmaları açık görüntülemek için ayarı kaldır"
+
+msgid "folds with a level higher than this number will be closed"
+msgstr "bu sayıdan daha yüksek düzeyli kıvırmalar kapatılacak"
+
+msgid "value for 'foldlevel' when starting to edit a file"
+msgstr "bir dosyayı düzenlemeye başlarkenki 'foldlevel' değeri"
+
+msgid "width of the column used to indicate folds"
+msgstr "kıvırmaları belirtmek için kullanılan sütunun genişliği"
+
+msgid "expression used to display the text of a closed fold"
+msgstr "kapalı bir kıvırmanın metnini görüntülemek için kullanılan ifade"
+
+msgid "set to \"all\" to close a fold when the cursor leaves it"
+msgstr "imleç ayrıldığında kıvırmayı kapatmak için \"all\" olarak ayarlayın"
+
+msgid "specifies for which commands a fold will be opened"
+msgstr "hangi komutlarda bir kıvırmanın açılacağını belirler"
+
+msgid "minimum number of screen lines for a fold to be closed"
+msgstr "bir kıvırmanın kapatılması için en az ekran satırı sayısı"
+
+msgid "template for comments; used to put the marker in"
+msgstr "yorumlar için şablon; imleyiciyi içine koymak için kullanılır"
+
+msgid ""
+"folding type: \"manual\", \"indent\", \"expr\", \"marker\",\n"
+"\"syntax\" or \"diff\""
+msgstr ""
+"kıvırma türü: \"manual\", \"indent\", \"expr\", \"marker\",\n"
+"\"syntax\" veya \"diff\""
+
+msgid "expression used when 'foldmethod' is \"expr\""
+msgstr "'foldmethod' \"expr\" olduğundan kullanılacak ifade"
+
+msgid "used to ignore lines when 'foldmethod' is \"indent\""
+msgstr "'foldmethod' \"indent\" olduğunda satırları yok saymada kullanılır"
+
+msgid "markers used when 'foldmethod' is \"marker\""
+msgstr "'foldmethod' \"marker\" olduğunda kullanılan imleyiciler"
+
+msgid "maximum fold depth for when 'foldmethod' is \"indent\" or \"syntax\""
+msgstr "'foldmethod' \"indent\" veya \"syntax\" olduğunda kullanılan en çok\n"
+"kıvırma derinliği"
+
+msgid "diff mode"
+msgstr "diff kipi"
+
+msgid "use diff mode for the current window"
+msgstr "geçerli pencere için diff kipi kullan"
+
+msgid "options for using diff mode"
+msgstr "diff kipi kullanımı için seçenekler"
+
+msgid "expression used to obtain a diff file"
+msgstr "bir diff dosyası elde etmek için kullanılan ifade"
+
+msgid "expression used to patch a file"
+msgstr "bir dosyayı yamalamak için kullanılan ifade"
+
+msgid "mapping"
+msgstr "eÅŸlemleme"
+
+msgid "maximum depth of mapping"
+msgstr "en çok eşlemleme derinliği"
+
+msgid "recognize mappings in mapped keys"
+msgstr "eşlemlenmiş düğmelerdeki eşlemlemeleri tanımla"
+
+msgid "allow timing out halfway into a mapping"
+msgstr "bir eşlemlemenin yarısında zaman aşımına izin ver"
+
+msgid "allow timing out halfway into a key code"
+msgstr "bir düğme kodunun yarısında zaman aşımına izin ver"
+
+msgid "time in msec for 'timeout'"
+msgstr "'timeout' için süre (milisaniye)"
+
+msgid "time in msec for 'ttimeout'"
+msgstr "'ttimeout' için süre (milisaniye)"
+
+msgid "reading and writing files"
+msgstr "dosyaları okuma ve yazma"
+
+msgid "enable using settings from modelines when reading a file"
+msgstr "dosya okurken ayarları kip satırından kullanımı etkinleştir"
+
+msgid "allow setting expression options from a modeline"
+msgstr "ifade seçeneklerini bir kip satırından ayarlamaya izin ver"
+
+msgid "number of lines to check for modelines"
+msgstr "kip satırlarını denetlemede kullanılacak satırların sayısı"
+
+msgid "binary file editing"
+msgstr "ikili dosya düzenleme"
+
+msgid "last line in the file has an end-of-line"
+msgstr "dosyanın son satırında bir satırsonu var"
+
+msgid "fixes missing end-of-line at end of text file"
+msgstr "bir metin dosyasının sonundaki eksik satırsonlarını onarır"
+
+msgid "prepend a Byte Order Mark to the file"
+msgstr "dosyanın önüne bir Bayt Sıralama İmi ekle"
+
+msgid "end-of-line format: \"dos\", \"unix\" or \"mac\""
+msgstr "satırsonu biçimi: \"dos\", \"unix\" veya \"mac\""
+
+msgid "list of file formats to look for when editing a file"
+msgstr "bir dosyayı düzenlerken bakılacak dosya biçimler listesi"
+
+msgid "obsolete, use 'fileformat'"
+msgstr "eskimiş, yerine 'fileformat' kullanın"
+
+msgid "obsolete, use 'fileformats'"
+msgstr "eskimiş, yerine 'fileformats' kullanın"
+
+msgid "writing files is allowed"
+msgstr "dosya yazımına izin verilir"
+
+msgid "write a backup file before overwriting a file"
+msgstr "bir dosyanın üzerine yazmadan önce bir yedek dosyası yaz"
+
+msgid "keep a backup after overwriting a file"
+msgstr "bir dosyanın üzerine yazdıktan sonra bir yedek tut"
+
+msgid "patterns that specify for which files a backup is not made"
+msgstr "bir yedeği yapılmayan dosyaları belirleyen dizgi"
+
+msgid "whether to make the backup as a copy or rename the existing file"
+msgstr "yedeğin kopya olarak mı yoksa ad değişikliği ile mi yapılacağı"
+
+msgid "list of directories to put backup files in"
+msgstr "yedek dosyalarının koyulacağı dizinlerin listesi"
+
+msgid "file name extension for the backup file"
+msgstr "yedek dosyası için dosya adı uzantısı"
+
+msgid "automatically write a file when leaving a modified buffer"
+msgstr "değiştirilmiş arabellekten çıkarken dosyayı kendiliğinden yaz"
+
+msgid "as 'autowrite', but works with more commands"
+msgstr "'autowrite' gibi, ancak daha çok komutla çalışır"
+
+msgid "always write without asking for confirmation"
+msgstr "onay beklemeden her zaman yaz"
+
+msgid "automatically read a file when it was modified outside of Vim"
+msgstr "Vim dışında değiştirildiğinde dosyayı kendiliğinden oku"
+
+msgid "keep oldest version of a file; specifies file name extension"
+msgstr "bir dosyanın en eski sürümünü tut; dosya adı uzantısı belirler"
+
+msgid "forcibly sync the file to disk after writing it"
+msgstr "yazımdan sonra dosyayı zorla diske eşitle"
+
+msgid "use 8.3 file names"
+msgstr "8.3 dosya adlarını kullan"
+
+msgid "encryption method for file writing: zip, blowfish or blowfish2"
+msgstr "dosya yazımı için şifreleme yöntemi: zip, blowfish veya blowfish2"
+
+msgid "the swap file"
+msgstr "takas dosyası"
+
+msgid "list of directories for the swap file"
+msgstr "takas dosyası için dizinler listesi"
+
+msgid "use a swap file for this buffer"
+msgstr "bu arabellek için bir takas dosyası kullan"
+
+msgid "\"sync\", \"fsync\" or empty; how to flush a swap file to disk"
+msgstr "\"sync\", \"fsync\", veya boş; bir takas dosyasının diske\n"
+"nice floşlanacağı"
+
+msgid "number of characters typed to cause a swap file update"
+msgstr "takas dosyası güncellemesi için yazılması gereken karakter sayısı"
+
+msgid "time in msec after which the swap file will be updated"
+msgstr "takas dosyasının güncelleneceği süre dilimi (milisaniye)"
+
+msgid "maximum amount of memory in Kbyte used for one buffer"
+msgstr "bir arabellek için kullanılacak en çok bellek miktarı (KiB)"
+
+msgid "maximum amount of memory in Kbyte used for all buffers"
+msgstr "tüm arabellekler için kullanılacak en çok bellek miktarı (KiB)"
+
+msgid "command line editing"
+msgstr "komut satırı düzenleme"
+
+msgid "how many command lines are remembered"
+msgstr "kaç tane komut satırının hatırlandığı"
+
+msgid "key that triggers command-line expansion"
+msgstr "komut satırı ifadesi tetikleyen düğme"
+
+msgid "like 'wildchar' but can also be used in a mapping"
+msgstr "'wildchar' gibi; ancak bir eşlemleme içinde kullanılabilir"
+
+msgid "specifies how command line completion works"
+msgstr "komut satırı tamamlamasının nasıl çalıştığını belirtir"
+
+msgid "empty or \"tagfile\" to list file name of matching tags"
+msgstr "eşleşen etiketlerin dosya adını listelemek için boş veya \"tagfile\""
+
+msgid "list of file name extensions that have a lower priority"
+msgstr "düşük öncelikli dosya adı uzantılarının listesi"
+
+msgid "list of file name extensions added when searching for a file"
+msgstr "bir dosya ararken eklenen dosya adı uzantılarının listesi"
+
+msgid "list of patterns to ignore files for file name completion"
+msgstr "dosya adı tamamlaması için yok sayılacak dizgelerin listesi"
+
+msgid "ignore case when using file names"
+msgstr "dosya adları kullanırken BÜYÜK/küçük harf yok say"
+
+msgid "ignore case when completing file names"
+msgstr "dosya adları tamamlarken BÜYÜK/küçük harf yok say"
+
+msgid "command-line completion shows a list of matches"
+msgstr "komut satırı tamamlaması, eşleşmelerin bir listesini gösterir"
+
+msgid "key used to open the command-line window"
+msgstr "komut satırı penceresini açmak için kullanılan düğme"
+
+msgid "height of the command-line window"
+msgstr "komut satırı penceresinin yüksekliği"
+
+msgid "executing external commands"
+msgstr "dış komutları çalıştırma"
+
+msgid "name of the shell program used for external commands"
+msgstr "dış komutlar için kullanılan kabuk programının adı"
+
+msgid "when to use the shell or directly execute a command"
+msgstr "ne zaman kabuğu kullanmalı veya doğrudan bir komut çalıştırmalı"
+
+msgid "character(s) to enclose a shell command in"
+msgstr "bir kabuk komutunu çevreleyen karakter(ler)"
+
+msgid "like 'shellquote' but include the redirection"
+msgstr "'shellquote' gibi; ancak yeniden yönlendirmeyi içer"
+
+msgid "characters to escape when 'shellxquote' is ("
+msgstr "'shellxquote' ( iken kaçırılacak karakterler"
+
+msgid "argument for 'shell' to execute a command"
+msgstr "bir komut çalıştırmak için 'shell' için değişken"
+
+msgid "used to redirect command output to a file"
+msgstr "komut çıktısını bir dosyaya yeniden yönlendirmek için kullanılır"
+
+msgid "use a temp file for shell commands instead of using a pipe"
+msgstr "bir veri yolu kullanımı yerine kabuk komutları için geçici\n"
+"bir dosya kullan"
+
+msgid "program used for \"=\" command"
+msgstr "\"=\" komutu için kullanılan program"
+
+msgid "program used to format lines with \"gq\" command"
+msgstr "\"gq\" komutu ile satır biçimlemek için kullanılan program"
+
+msgid "program used for the \"K\" command"
+msgstr "\"K\" komutu için kullanılan program"
+
+msgid "warn when using a shell command and a buffer has changes"
+msgstr "bir kabuk komutu kullanılıyorsa ve arabellekte değişiklikler\n"
+"varsa uyar"
+
+msgid "running make and jumping to errors (quickfix)"
+msgstr "make çalıştırma ve hatalara atlama (hızlı düzelt)"
+
+msgid "name of the file that contains error messages"
+msgstr "hata iletileri içeren dosyanın adı"
+
+msgid "list of formats for error messages"
+msgstr "hata iletileri için biçim listesi"
+
+msgid "program used for the \":make\" command"
+msgstr "\":make\" komutu için kullanılan program"
+
+msgid "string used to put the output of \":make\" in the error file"
+msgstr "\":make\" komutunun çıktısını hata dosyasına koymak için\n"
+"kullanılan dizi"
+
+msgid "name of the errorfile for the 'makeprg' command"
+msgstr "'makeprg' komutu için hata dosyası adı"
+
+msgid "program used for the \":grep\" command"
+msgstr "\":grep\" komutu için kullanılan program"
+
+msgid "list of formats for output of 'grepprg'"
+msgstr "'grepprg' çıktısı için kullanılan biçimlerin listesi"
+
+msgid "encoding of the \":make\" and \":grep\" output"
+msgstr "\":make\" ve \":grep\" çıktılarının kodlaması"
+
+msgid "function to display text in the quickfix window"
+msgstr "hızlı düzelt içinde metin düzenlemek için işlev"
+
+msgid "system specific"
+msgstr "sisteme özel"
+
+msgid "use forward slashes in file names; for Unix-like shells"
+msgstr "dosya adlarında eğik çizgi kullan; Unix tarzı kabuklar için"
+
+msgid "specifies slash/backslash used for completion"
+msgstr "tamamlama için kullanılan eğik/ters eğik çizgiyi belirler"
+
+msgid "language specific"
+msgstr "dile özel ayarlar"
+
+msgid "specifies the characters in a file name"
+msgstr "bir dosya adındaki karakterleri belirtir"
+
+msgid "specifies the characters in an identifier"
+msgstr "bir tanımlayıcıdaki karakterleri belirler"
+
+msgid "specifies the characters in a keyword"
+msgstr "bir anahtar sözcükteki karakterleri belirler"
+
+msgid "specifies printable characters"
+msgstr "yazdırılabilir karakterleri belirler"
+
+msgid "specifies escape characters in a string"
+msgstr "bir dizideki kaçış karakterlerini belirler"
+
+msgid "display the buffer right-to-left"
+msgstr "arabelleği sağdan sola görüntüle"
+
+msgid "when to edit the command-line right-to-left"
+msgstr "komut satırının ne zaman sağdan sola düzenleneceği"
+
+msgid "insert characters backwards"
+msgstr "karakterleri geriye doÄŸru ekle"
+
+msgid "allow CTRL-_ in Insert and Command-line mode to toggle 'revins'"
+msgstr "'revins' açıp kapatmak için Ekleme ve Komut Satırı kipinde\n"
+"CTRL-_ izin ver"
+
+msgid "the ASCII code for the first letter of the Hebrew alphabet"
+msgstr "Ä°bran abecesinin ilk harfinin ASCII kodu"
+
+msgid "use Hebrew keyboard mapping"
+msgstr "Ä°branca klavye eÅŸlemlemesini kullan"
+
+msgid "use phonetic Hebrew keyboard mapping"
+msgstr "fonetik Ä°branca klavye eÅŸlemlemesini kullan"
+
+msgid "prepare for editing Arabic text"
+msgstr "Arapça metni düzenleme için hazırlan"
+
+msgid "perform shaping of Arabic characters"
+msgstr "Arapça karakterlerin şekillendirmesini gerçekleştir"
+
+msgid "terminal will perform bidi handling"
+msgstr "sağdan sola yazımı uçbirim gerçekleştirecek"
+
+msgid "name of a keyboard mapping"
+msgstr "bir klavye eşlemlemesinin adı"
+
+msgid "list of characters that are translated in Normal mode"
+msgstr "Normal kipte çevrilen karakterlerin listesi"
+
+msgid "apply 'langmap' to mapped characters"
+msgstr "eÅŸlemlenen karakterlere 'langmap' uygula"
+
+msgid "when set never use IM; overrules following IM options"
+msgstr "ayarlandığında hiçbir zaman IM kullanma; aşağıdaki IM seçeneklerini "
+"geçersiz kılar"
+
+msgid "in Insert mode: 1: use :lmap; 2: use IM; 0: neither"
+msgstr "Ekleme kipinde: 1: :lmap kullan; 2; IM kullan; 0: hiçbiri"
+
+msgid "input method style, 0: on-the-spot, 1: over-the-spot"
+msgstr "girdi yöntemi stili, 0: on-the-spot, 1: over-the-spot"
+
+msgid "entering a search pattern: 1: use :lmap; 2: use IM; 0: neither"
+msgstr "bir arama dizgisi gir: 1: :lmap kullan; 2: IM kullan; 0: hiçbiri"
+
+msgid "when set always use IM when starting to edit a command line"
+msgstr ""
+"ayarlandığında, bir komut satırı düzenlemeye başlarken her zaman IM kullan"
+
+msgid "function to obtain IME status"
+msgstr "IME durumunu elde etmek için işlev"
+
+msgid "function to enable/disable IME"
+msgstr "IME'yi etkinleştirmek/devre dışı bırakmak için işlev"
+
+msgid "multi-byte characters"
+msgstr "çoklu bayt karakterler"
+
+msgid ""
+"character encoding used in Vim: \"latin1\", \"utf-8\",\n"
+"\"euc-jp\", \"big5\", etc."
+msgstr ""
+"Vim'de kullanılan karakter kodlamaları: \"latin1\", \"utf-8\",\n"
+"\"euc-jp\", \"big5\" gibi"
+
+msgid "character encoding for the current file"
+msgstr "geçerli dosya için karakter kodlaması"
+
+msgid "automatically detected character encodings"
+msgstr "karakter kodlamasını kendiliğinden algıla"
+
+msgid "character encoding used by the terminal"
+msgstr "uçbirim tarafından kullanılan karakter kodlaması"
+
+msgid "expression used for character encoding conversion"
+msgstr "karakter kodlaması dönüşümü için kullanılan ifade"
+
+msgid "delete combining (composing) characters on their own"
+msgstr "birleştiren (oluşturucu) karakterleri kendi başına kullan"
+
+msgid "maximum number of combining (composing) characters displayed"
+msgstr "en çok görüntülenen birleştiren (oluşturucu) karakterlerin sayısı"
+
+msgid "key that activates the X input method"
+msgstr "X girdi yöntemini etkinleştiren düğme"
+
+msgid "width of ambiguous width characters"
+msgstr "belirsiz geniÅŸlikli karakterlerin geniÅŸliÄŸi"
+
+msgid "emoji characters are full width"
+msgstr "emoji karakterleri tam geniÅŸliklidir"
+
+msgid "various"
+msgstr "çeşitli"
+
+msgid ""
+"when to use virtual editing: \"block\", \"insert\", \"all\"\n"
+"and/or \"onemore\""
+msgstr ""
+"ne zaman sanal düzenleme kullanmalı: \"block\", \"insert\",\n"
+"\"all\" ve/veya \"onemore\""
+
+msgid "list of autocommand events which are to be ignored"
+msgstr "yok sayılacak otokomut olayları"
+
+msgid "load plugin scripts when starting up"
+msgstr "başlarken eklenti betiklerini yükle"
+
+msgid "enable reading .vimrc/.exrc/.gvimrc in the current directory"
+msgstr "geçerli dizinde .vimrc/.exrc/.gvimrc okumayı etkinleştir"
+
+msgid "safer working with script files in the current directory"
+msgstr "geçerli dizinde betik dosyalarıyla daha güvenli çalışma"
+
+msgid "use the 'g' flag for \":substitute\""
+msgstr "\":substitute\" için 'g' bayrağını kullan"
+
+msgid "'g' and 'c' flags of \":substitute\" toggle"
+msgstr "\":substitute\" açma/kapama düğmesinin 'g' ve 'c' bayrakları"
+
+msgid "allow reading/writing devices"
+msgstr "aygıtları okumaya/yazmaya izin ver"
+
+msgid "maximum depth of function calls"
+msgstr "işlev çağrılarının en çok derinliği"
+
+msgid "list of words that specifies what to put in a session file"
+msgstr "bir oturum dosyasına ne koyulacağını belirleyen sözcükler listesi"
+
+msgid "list of words that specifies what to save for :mkview"
+msgstr ":mkview için neyin kaydedileceğini belirleyen sözcükler listesi"
+
+msgid "directory where to store files with :mkview"
+msgstr ":mkview ile dosyaların depolanacağı dizin"
+
+msgid "list that specifies what to write in the viminfo file"
+msgstr "viminfo dosyasına nelerin yazılacağını belirleyen liste"
+
+msgid "file name used for the viminfo file"
+msgstr "viminfo dosyası için kullanılan dosya adı"
+
+msgid "what happens with a buffer when it's no longer in a window"
+msgstr "bir arabellek artık bir pencerede değilken ne olacağı"
+
+msgid "empty, \"nofile\", \"nowrite\", \"quickfix\", etc.: type of buffer"
+msgstr "boş, \"nofile\", \"nowrite\", \"quickfix\" vb.: arabellek türü"
+
+msgid "whether the buffer shows up in the buffer list"
+msgstr "arabelleğin, arabellek listesinde görünüp görünmeyeceği"
+
+msgid "set to \"msg\" to see all error messages"
+msgstr "tüm hata iletilerini görmek için \"msg\" olarak ayarlayın"
+
+msgid "whether to show the signcolumn"
+msgstr "işaret sütununun görünüp görünmeyeceği"
+
+msgid "interval in milliseconds between polls for MzScheme threads"
+msgstr "MzScheme iş parçacıkları için anketler arasındaki süre (milisaniye)"
+
+msgid "name of the Lua dynamic library"
+msgstr "Lua devingen kitaplığının adı"
+
+msgid "name of the Perl dynamic library"
+msgstr "Perl devingen kitaplığının adı"
+
+msgid "whether to use Python 2 or 3"
+msgstr "Python 2 veya 3 mü kullanılacağı"
+
+msgid "name of the Python 2 dynamic library"
+msgstr "Python 2 devingen kitaplığının adı"
+
+msgid "name of the Python 2 home directory"
+msgstr "Python 2 ev dizininin adı"
+
+msgid "name of the Python 3 dynamic library"
+msgstr "Python 3 devingen kitaplığının adı"
+
+msgid "name of the Python 3 home directory"
+msgstr "Python 3 ev dizininin adı"
+
+msgid "name of the Ruby dynamic library"
+msgstr "Ruby devingen kitaplığının adı"
+
+msgid "name of the Tcl dynamic library"
+msgstr "Tcl devingen kitaplığının adı"
+
+msgid "name of the MzScheme dynamic library"
+msgstr "MzScheme devingen kitaplığının adı"
+
+msgid "name of the MzScheme GC dynamic library"
+msgstr "MzScheme GC devingen kitaplığının adı"
diff -Nru vim-8.2.1913/src/popupmenu.c vim-8.2.2434/src/popupmenu.c
--- vim-8.2.1913/src/popupmenu.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/popupmenu.c	2021-01-30 22:05:11.000000000 +0000
@@ -361,6 +361,8 @@
 	// redo the positioning.  Limit this to two times, when there is not
 	// much room the window size will keep changing.
     } while (pum_set_selected(selected, redo_count) && ++redo_count <= 2);
+
+    pum_redraw();
 }
 
 /*
@@ -541,8 +543,23 @@
 			{
 			    if (st != NULL)
 			    {
-				screen_puts_len(st, (int)STRLEN(st), row, col,
-									attr);
+				int size = (int)STRLEN(st);
+				int cells = (*mb_string2cells)(st, size);
+
+				// only draw the text that fits
+				while (size > 0
+					  && col + cells > pum_width + pum_col)
+				{
+				    --size;
+				    if (has_mbyte)
+				    {
+					size -= (*mb_head_off)(st, st + size);
+					cells -= (*mb_ptr2cells)(st + size);
+				    }
+				    else
+					--cells;
+				}
+				screen_puts_len(st, size, row, col, attr);
 				vim_free(st);
 			    }
 			    col += width;
@@ -795,6 +812,10 @@
 		use_popup = USEPOPUP_NORMAL;
 	    else
 		use_popup = USEPOPUP_NONE;
+	    if (use_popup != USEPOPUP_NONE)
+		// don't use WinEnter or WinLeave autocommands for the info
+		// popup
+		block_autocmds();
 # endif
 	    // Open a preview window and set "curwin" to it.
 	    // 3 lines by default, prefer 'previewheight' if set and smaller.
@@ -837,6 +858,7 @@
 			// Edit a new, empty buffer. Set options for a "wipeout"
 			// buffer.
 			set_option_value((char_u *)"swf", 0L, NULL, OPT_LOCAL);
+			set_option_value((char_u *)"bl", 0L, NULL, OPT_LOCAL);
 			set_option_value((char_u *)"bt", 0L,
 					       (char_u *)"nofile", OPT_LOCAL);
 			set_option_value((char_u *)"bh", 0L,
@@ -973,6 +995,10 @@
 		// can't keep focus in a popup window
 		win_enter(firstwin, TRUE);
 # endif
+# ifdef FEAT_PROP_POPUP
+	    if (use_popup != USEPOPUP_NONE)
+		unblock_autocmds();
+# endif
 	}
 #endif
     }
@@ -982,9 +1008,6 @@
 	popup_hide_info();
 #endif
 
-    if (!resized)
-	pum_redraw();
-
     return resized;
 }
 
@@ -1435,10 +1458,21 @@
 	return;
 
     FOR_ALL_CHILD_MENUS(menu, mp)
+    {
+	char_u *s = NULL;
+
+	// Make a copy of the text, the menu may be redefined in a callback.
 	if (menu_is_separator(mp->dname))
-	    array[idx++].pum_text = (char_u *)"";
+	    s = (char_u *)"";
 	else if (mp->modes & mp->enabled & mode)
-	    array[idx++].pum_text = mp->dname;
+	    s = mp->dname;
+	if (s != NULL)
+	{
+	    s = vim_strsave(s);
+	    if (s != NULL)
+		array[idx++].pum_text = s;
+	}
+    }
 
     pum_array = array;
     pum_compute_size();
@@ -1519,6 +1553,8 @@
 	}
     }
 
+    for (idx = 0; idx < pum_size; ++idx)
+	vim_free(array[idx].pum_text);
     vim_free(array);
     pum_undisplay();
 # ifdef FEAT_BEVAL_TERM
diff -Nru vim-8.2.1913/src/popupwin.c vim-8.2.2434/src/popupwin.c
--- vim-8.2.1913/src/popupwin.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/popupwin.c	2021-01-30 22:05:11.000000000 +0000
@@ -384,7 +384,7 @@
 
     vim_snprintf((char *)cbbuf, sizeof(cbbuf),
 				       "{_ -> popup_close(%d)}", wp->w_id);
-    if (get_lambda_tv(&ptr, &tv, &EVALARG_EVALUATE) == OK)
+    if (get_lambda_tv(&ptr, &tv, FALSE, &EVALARG_EVALUATE) == OK)
     {
 	wp->w_popup_timer = create_timer(time, 0);
 	wp->w_popup_timer->tr_callback = get_callback(&tv);
@@ -2380,9 +2380,10 @@
     res.v_type = VAR_NUMBER;
 
     old_lnum = wp->w_cursor.lnum;
-    if ((c == 'k' || c == 'K' || c == K_UP) && wp->w_cursor.lnum > 1)
+    if ((c == 'k' || c == 'K' || c == K_UP || c == Ctrl_P)
+						      && wp->w_cursor.lnum > 1)
 	--wp->w_cursor.lnum;
-    if ((c == 'j' || c == 'J' || c == K_DOWN)
+    if ((c == 'j' || c == 'J' || c == K_DOWN || c == Ctrl_N)
 		       && wp->w_cursor.lnum < wp->w_buffer->b_ml.ml_line_count)
 	++wp->w_cursor.lnum;
     if (old_lnum != wp->w_cursor.lnum)
@@ -3346,21 +3347,29 @@
 	cols = tv_get_number(&li->li_tv);
 	if (cols < 0)
 	    cols = width + cols + 1;
+	if (cols <= 0)
+	    cols = 1;
 	li = li->li_next;
 	cole = tv_get_number(&li->li_tv);
 	if (cole < 0)
 	    cole = width + cole + 1;
+	if (cole > width)
+	    cole = width;
 	li = li->li_next;
 	lines = tv_get_number(&li->li_tv);
 	if (lines < 0)
 	    lines = height + lines + 1;
+	if (lines <= 0)
+	    lines = 1;
 	li = li->li_next;
 	linee = tv_get_number(&li->li_tv);
 	if (linee < 0)
 	    linee = height + linee + 1;
+	if (linee > height)
+	    linee = height;
 
-	for (row = lines - 1; row < linee && row < height; ++row)
-	    for (col = cols - 1; col < cole && col < width; ++col)
+	for (row = lines - 1; row < linee; ++row)
+	    for (col = cols - 1; col < cole; ++col)
 		cells[row * width + col] = 1;
     }
 }
@@ -3692,19 +3701,25 @@
     int	    row;
     int	    wincol;
     int	    padcol = 0;
-    int	    padwidth = 0;
+    int	    padendcol = 0;
     int	    i;
     int	    sb_thumb_top = 0;
     int	    sb_thumb_height = 0;
     int	    attr_scroll = 0;
     int	    attr_thumb = 0;
 
+    // hide the cursor until redrawing is done.
+    cursor_off();
+
     // Find the window with the lowest zindex that hasn't been updated yet,
     // so that the window with a higher zindex is drawn later, thus goes on
     // top.
     popup_reset_handled(POPUP_HANDLED_5);
     while ((wp = find_next_popup(TRUE, POPUP_HANDLED_5)) != NULL)
     {
+	int	    title_len = 0;
+	int	    title_wincol;
+
 	// This drawing uses the zindex of the popup window, so that it's on
 	// top of the text but doesn't draw when another popup with higher
 	// zindex is on top of the character.
@@ -3743,13 +3758,17 @@
 
 	wp->w_winrow -= top_off;
 	wp->w_wincol -= left_extra;
-	// cursor position matters in terminal in job mode
-#ifdef FEAT_TERMINAL
-	if (wp != curwin || !term_in_normal_mode())
-#endif
+
+	// Add offset for border and padding if not done already.
+	if ((wp->w_flags & WFLAG_WCOL_OFF_ADDED) == 0)
 	{
-	    wp->w_wrow += top_off;
 	    wp->w_wcol += left_extra;
+	    wp->w_flags |= WFLAG_WCOL_OFF_ADDED;
+	}
+	if ((wp->w_flags & WFLAG_WROW_OFF_ADDED) == 0)
+	{
+	    wp->w_wrow += top_off;
+	    wp->w_flags |= WFLAG_WROW_OFF_ADDED;
 	}
 
 	total_width = popup_width(wp);
@@ -3794,16 +3813,47 @@
 		border_attr[i] = syn_name2attr(wp->w_border_highlight[i]);
 	}
 
+	// Title goes on top of border or padding.
+	title_wincol = wp->w_wincol + 1;
+	if (wp->w_popup_title != NULL)
+	{
+	    char_u  *title_text;
+
+	    title_len = (int)STRLEN(wp->w_popup_title);
+	    title_text = alloc(title_len + 1);
+	    trunc_string(wp->w_popup_title, title_text,
+					       total_width - 2, title_len + 1);
+	    screen_puts(title_text, wp->w_winrow, title_wincol,
+		      wp->w_popup_border[0] > 0 ? border_attr[0] : popup_attr);
+	    vim_free(title_text);
+	    if (title_len > total_width - 2)
+		title_len = total_width - 2;
+	}
+
 	wincol = wp->w_wincol - wp->w_popup_leftoff;
 	top_padding = wp->w_popup_padding[0];
 	if (wp->w_popup_border[0] > 0)
 	{
-	    // top border
-	    screen_fill(wp->w_winrow, wp->w_winrow + 1,
-		    wincol < 0 ? 0 : wincol, wincol + total_width,
-		    wp->w_popup_border[3] != 0 && wp->w_popup_leftoff == 0
+	    // top border; do not draw over the title
+	    if (title_len > 0)
+	    {
+		screen_fill(wp->w_winrow, wp->w_winrow + 1,
+			wincol < 0 ? 0 : wincol, title_wincol,
+			wp->w_popup_border[3] != 0 && wp->w_popup_leftoff == 0
+					     ? border_char[4] : border_char[0],
+			border_char[0], border_attr[0]);
+		screen_fill(wp->w_winrow, wp->w_winrow + 1,
+			title_wincol + title_len, wincol + total_width,
+			border_char[0], border_char[0], border_attr[0]);
+	    }
+	    else
+	    {
+		screen_fill(wp->w_winrow, wp->w_winrow + 1,
+			wincol < 0 ? 0 : wincol, wincol + total_width,
+			wp->w_popup_border[3] != 0 && wp->w_popup_leftoff == 0
 					     ? border_char[4] : border_char[0],
-		    border_char[0], border_attr[0]);
+			border_char[0], border_attr[0]);
+	    }
 	    if (wp->w_popup_border[1] > 0 && wp->w_popup_rightoff == 0)
 	    {
 		buf[mb_char2bytes(border_char[5], buf)] = NUL;
@@ -3817,32 +3867,29 @@
 	if (top_padding > 0 || wp->w_popup_padding[2] > 0)
 	{
 	    padcol = wincol + wp->w_popup_border[3];
-	    padwidth = wp->w_wincol + total_width - wp->w_popup_border[1]
+	    padendcol = wp->w_wincol + total_width - wp->w_popup_border[1]
 							 - wp->w_has_scrollbar;
 	    if (padcol < 0)
 	    {
-		padwidth += padcol;
+		padendcol += padcol;
 		padcol = 0;
 	    }
 	}
 	if (top_padding > 0)
 	{
-	    // top padding
 	    row = wp->w_winrow + wp->w_popup_border[0];
-	    screen_fill(row, row + top_padding, padcol, padwidth,
+	    if (title_len > 0 && row == wp->w_winrow)
+	    {
+		// top padding and no border; do not draw over the title
+		screen_fill(row, row + 1, padcol, title_wincol,
+							 ' ', ' ', popup_attr);
+		screen_fill(row, row + 1, title_wincol + title_len,
+					      padendcol, ' ', ' ', popup_attr);
+		row += 1;
+		top_padding -= 1;
+	    }
+	    screen_fill(row, row + top_padding, padcol, padendcol,
 							 ' ', ' ', popup_attr);
-	}
-
-	// Title goes on top of border or padding.
-	if (wp->w_popup_title != NULL)
-	{
-	    int	    len = (int)STRLEN(wp->w_popup_title) + 1;
-	    char_u  *title = alloc(len);
-
-	    trunc_string(wp->w_popup_title, title, total_width - 2, len);
-	    screen_puts(title, wp->w_winrow, wp->w_wincol + 1,
-		    wp->w_popup_border[0] > 0 ? border_attr[0] : popup_attr);
-	    vim_free(title);
 	}
 
 	// Compute scrollbar thumb position and size.
@@ -3944,7 +3991,7 @@
 	    row = wp->w_winrow + wp->w_popup_border[0]
 				       + wp->w_popup_padding[0] + wp->w_height;
 	    screen_fill(row, row + wp->w_popup_padding[2],
-				       padcol, padwidth, ' ', ' ', popup_attr);
+				       padcol, padendcol, ' ', ' ', popup_attr);
 	}
 
 	if (wp->w_popup_border[2] > 0)
diff -Nru vim-8.2.1913/src/profiler.c vim-8.2.2434/src/profiler.c
--- vim-8.2.1913/src/profiler.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/profiler.c	2021-01-30 22:05:11.000000000 +0000
@@ -555,6 +555,51 @@
 }
 
 /*
+ * When calling a function: may initialize for profiling.
+ */
+    void
+profile_may_start_func(profinfo_T *info, ufunc_T *fp, funccall_T *fc)
+{
+    if (do_profiling == PROF_YES)
+    {
+	if (!fp->uf_profiling && has_profiling(FALSE, fp->uf_name, NULL))
+	{
+	    info->pi_started_profiling = TRUE;
+	    func_do_profile(fp);
+	}
+	if (fp->uf_profiling
+		    || (fc->caller != NULL && fc->caller->func->uf_profiling))
+	{
+	    ++fp->uf_tm_count;
+	    profile_start(&info->pi_call_start);
+	    profile_zero(&fp->uf_tm_children);
+	}
+	script_prof_save(&info->pi_wait_start);
+    }
+}
+
+/*
+ * After calling a function: may handle profiling.  profile_may_start_func()
+ * must have been called previously.
+ */
+    void
+profile_may_end_func(profinfo_T *info, ufunc_T *fp, funccall_T *fc)
+{
+    profile_end(&info->pi_call_start);
+    profile_sub_wait(&info->pi_wait_start, &info->pi_call_start);
+    profile_add(&fp->uf_tm_total, &info->pi_call_start);
+    profile_self(&fp->uf_tm_self, &info->pi_call_start, &fp->uf_tm_children);
+    if (fc->caller != NULL && fc->caller->func->uf_profiling)
+    {
+	profile_add(&fc->caller->func->uf_tm_children, &info->pi_call_start);
+	profile_add(&fc->caller->func->uf_tml_children, &info->pi_call_start);
+    }
+    if (info->pi_started_profiling)
+	// make a ":profdel func" stop profiling the function
+	fp->uf_profiling = FALSE;
+}
+
+/*
  * Prepare profiling for entering a child or something else that is not
  * counted for the script/function itself.
  * Should always be called in pair with prof_child_exit().
@@ -597,15 +642,14 @@
  * until later and we need to store the time now.
  */
     void
-func_line_start(void *cookie)
+func_line_start(void *cookie, long lnum)
 {
     funccall_T	*fcp = (funccall_T *)cookie;
     ufunc_T	*fp = fcp->func;
 
-    if (fp->uf_profiling && SOURCING_LNUM >= 1
-				      && SOURCING_LNUM <= fp->uf_lines.ga_len)
+    if (fp->uf_profiling && lnum >= 1 && lnum <= fp->uf_lines.ga_len)
     {
-	fp->uf_tml_idx = SOURCING_LNUM - 1;
+	fp->uf_tml_idx = lnum - 1;
 	// Skip continuation lines.
 	while (fp->uf_tml_idx > 0 && FUNCLINE(fp, fp->uf_tml_idx) == NULL)
 	    --fp->uf_tml_idx;
diff -Nru vim-8.2.1913/src/proto/buffer.pro vim-8.2.2434/src/proto/buffer.pro
--- vim-8.2.1913/src/proto/buffer.pro	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/proto/buffer.pro	2021-01-30 22:05:11.000000000 +0000
@@ -5,7 +5,7 @@
 void set_bufref(bufref_T *bufref, buf_T *buf);
 int bufref_valid(bufref_T *bufref);
 int buf_valid(buf_T *buf);
-void close_buffer(win_T *win, buf_T *buf, int action, int abort_if_last, int ignore_abort);
+int close_buffer(win_T *win, buf_T *buf, int action, int abort_if_last, int ignore_abort);
 void buf_clear_file(buf_T *buf);
 void buf_freeall(buf_T *buf, int flags);
 void free_wininfo(wininfo_T *wip);
@@ -66,6 +66,7 @@
 int bt_dontwrite_msg(buf_T *buf);
 int buf_hide(buf_T *buf);
 char_u *buf_spname(buf_T *buf);
+char_u *buf_get_fname(buf_T *buf);
 void set_buflisted(int on);
 int buf_contents_changed(buf_T *buf);
 void wipe_buffer(buf_T *buf, int aucmd);
diff -Nru vim-8.2.1913/src/proto/dict.pro vim-8.2.2434/src/proto/dict.pro
--- vim-8.2.1913/src/proto/dict.pro	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/proto/dict.pro	2021-01-30 22:05:11.000000000 +0000
@@ -33,6 +33,8 @@
 varnumber_T dict_get_number_check(dict_T *d, char_u *key);
 varnumber_T dict_get_bool(dict_T *d, char_u *key, int def);
 char_u *dict2string(typval_T *tv, int copyID, int restore_copyID);
+char_u *skip_literal_key(char_u *key);
+char_u *get_literal_key(char_u **arg);
 int eval_dict(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int literal);
 void dict_extend(dict_T *d1, dict_T *d2, char_u *action);
 dictitem_T *dict_lookup(hashitem_T *hi);
diff -Nru vim-8.2.1913/src/proto/edit.pro vim-8.2.2434/src/proto/edit.pro
--- vim-8.2.1913/src/proto/edit.pro	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/proto/edit.pro	2021-01-30 22:05:11.000000000 +0000
@@ -10,7 +10,7 @@
 void undisplay_dollar(void);
 void truncate_spaces(char_u *line);
 void backspace_until_column(int col);
-int get_literal(void);
+int get_literal(int noReduceKeys);
 void insertchar(int c, int flags, int second_indent);
 void start_arrow(pos_T *end_insert_pos);
 int stop_arrow(void);
diff -Nru vim-8.2.1913/src/proto/evalfunc.pro vim-8.2.2434/src/proto/evalfunc.pro
--- vim-8.2.1913/src/proto/evalfunc.pro	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/proto/evalfunc.pro	2021-01-30 22:05:11.000000000 +0000
@@ -4,8 +4,9 @@
 int find_internal_func(char_u *name);
 int has_internal_func(char_u *name);
 char *internal_func_name(int idx);
-int internal_func_check_arg_types(type_T **types, int idx, int argcount);
+int internal_func_check_arg_types(type_T **types, int idx, int argcount, cctx_T *cctx);
 type_T *internal_func_ret_type(int idx, int argcount, type_T **argtypes);
+int internal_func_is_map(int idx);
 int check_internal_func(int idx, int argcount);
 int call_internal_func(char_u *name, int argcount, typval_T *argvars, typval_T *rettv);
 void call_internal_func_by_idx(int idx, typval_T *argvars, typval_T *rettv);
@@ -16,6 +17,7 @@
 void execute_redir_str(char_u *value, int value_len);
 void execute_common(typval_T *argvars, typval_T *rettv, int arg_off);
 void f_has(typval_T *argvars, typval_T *rettv);
+int dynamic_feature(char_u *feature);
 void mzscheme_call_vim(char_u *name, typval_T *args, typval_T *rettv);
 void range_list_materialize(list_T *list);
 float_T vim_round(float_T f);
diff -Nru vim-8.2.1913/src/proto/eval.pro vim-8.2.2434/src/proto/eval.pro
--- vim-8.2.1913/src/proto/eval.pro	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/proto/eval.pro	2021-01-30 22:05:11.000000000 +0000
@@ -1,6 +1,6 @@
 /* eval.c */
-varnumber_T num_divide(varnumber_T n1, varnumber_T n2);
-varnumber_T num_modulus(varnumber_T n1, varnumber_T n2);
+varnumber_T num_divide(varnumber_T n1, varnumber_T n2, int *failed);
+varnumber_T num_modulus(varnumber_T n1, varnumber_T n2, int *failed);
 void eval_init(void);
 void eval_clear(void);
 void fill_evalarg_from_eap(evalarg_T *evalarg, exarg_T *eap, int skip);
@@ -11,12 +11,15 @@
 char_u *eval_to_string_skip(char_u *arg, exarg_T *eap, int skip);
 int skip_expr(char_u **pp, evalarg_T *evalarg);
 int skip_expr_concatenate(char_u **arg, char_u **start, char_u **end, evalarg_T *evalarg);
+char_u *typval2string(typval_T *tv, int convert);
+char_u *eval_to_string_eap(char_u *arg, int convert, exarg_T *eap);
 char_u *eval_to_string(char_u *arg, int convert);
 char_u *eval_to_string_safe(char_u *arg, int use_sandbox);
 varnumber_T eval_to_number(char_u *expr);
 typval_T *eval_expr(char_u *arg, exarg_T *eap);
 int call_vim_function(char_u *func, int argc, typval_T *argv, typval_T *rettv);
 varnumber_T call_func_retnr(char_u *func, int argc, typval_T *argv);
+int call_func_noret(char_u *func, int argc, typval_T *argv);
 void *call_func_retstr(char_u *func, int argc, typval_T *argv);
 void *call_func_retlist(char_u *func, int argc, typval_T *argv);
 int eval_foldexpr(char_u *arg, int *cp);
@@ -37,8 +40,10 @@
 int eval1(char_u **arg, typval_T *rettv, evalarg_T *evalarg);
 void eval_addblob(typval_T *tv1, typval_T *tv2);
 int eval_addlist(typval_T *tv1, typval_T *tv2);
+int eval_leader(char_u **arg, int vim9);
 int check_can_index(typval_T *rettv, int evaluate, int verbose);
-int eval_index_inner(typval_T *rettv, int is_range, typval_T *var1, typval_T *var2, char_u *key, int keylen, int verbose);
+void f_slice(typval_T *argvars, typval_T *rettv);
+int eval_index_inner(typval_T *rettv, int is_range, typval_T *var1, typval_T *var2, int exclusive, char_u *key, int keylen, int verbose);
 char_u *partial_name(partial_T *pt);
 void partial_unref(partial_T *pt);
 int get_copyID(void);
@@ -52,8 +57,10 @@
 char_u *echo_string(typval_T *tv, char_u **tofree, char_u *numbuf, int copyID);
 char_u *string_quote(char_u *str, int function);
 int string2float(char_u *text, float_T *value);
-pos_T *var2fpos(typval_T *varp, int dollar_lnum, int *fnum);
-int list2fpos(typval_T *arg, pos_T *posp, int *fnump, colnr_T *curswantp);
+int buf_byteidx_to_charidx(buf_T *buf, int lnum, int byteidx);
+int buf_charidx_to_byteidx(buf_T *buf, int lnum, int charidx);
+pos_T *var2fpos(typval_T *varp, int dollar_lnum, int *fnum, int charcol);
+int list2fpos(typval_T *arg, pos_T *posp, int *fnump, colnr_T *curswantp, int charcol);
 int get_env_len(char_u **arg);
 int get_id_len(char_u **arg);
 int get_name_len(char_u **arg, char_u **alias, int evaluate, int verbose);
@@ -61,8 +68,6 @@
 int eval_isnamec(int c);
 int eval_isnamec1(int c);
 int eval_isdictc(int c);
-char_u *char_from_string(char_u *str, varnumber_T index);
-char_u *string_slice(char_u *str, varnumber_T first, varnumber_T last);
 int handle_subscript(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int verbose);
 int item_copy(typval_T *from, typval_T *to, int deep, int copyID);
 void echo_one(typval_T *rettv, int with_space, int *atstart, int *needclr);
diff -Nru vim-8.2.1913/src/proto/evalvars.pro vim-8.2.2434/src/proto/evalvars.pro
--- vim-8.2.1913/src/proto/evalvars.pro	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/proto/evalvars.pro	2021-01-30 22:05:11.000000000 +0000
@@ -26,6 +26,7 @@
 int do_unlet(char_u *name, int forceit);
 void item_lock(typval_T *tv, int deep, int lock, int check_refcount);
 void del_menutrans_vars(void);
+char_u *cat_prefix_varname(int prefix, char_u *name);
 char_u *get_user_var_name(expand_T *xp, int idx);
 char *get_var_special_name(int nr);
 dict_T *get_globvar_dict(void);
@@ -59,7 +60,7 @@
 dictitem_T *find_var(char_u *name, hashtab_T **htp, int no_autoload);
 dictitem_T *find_var_in_ht(hashtab_T *ht, int htname, char_u *varname, int no_autoload);
 hashtab_T *get_script_local_ht(void);
-void *lookup_scriptvar(char_u *name, size_t len, cctx_T *dummy);
+int lookup_scriptvar(char_u *name, size_t len, void *lvar, cctx_T *dummy);
 hashtab_T *find_var_ht(char_u *name, char_u **varname);
 char_u *get_var_value(char_u *name);
 void new_script_vars(scid_T id);
@@ -70,12 +71,13 @@
 void delete_var(hashtab_T *ht, hashitem_T *hi);
 void set_var(char_u *name, typval_T *tv, int copy);
 void set_var_const(char_u *name, type_T *type, typval_T *tv_arg, int copy, int flags);
+int var_check_permission(dictitem_T *di, char_u *name);
 int var_check_ro(int flags, char_u *name, int use_gettext);
 int var_check_lock(int flags, char_u *name, int use_gettext);
 int var_check_fixed(int flags, char_u *name, int use_gettext);
 int var_wrong_func_name(char_u *name, int new_var);
 int value_check_lock(int lock, char_u *name, int use_gettext);
-int valid_varname(char_u *varname);
+int valid_varname(char_u *varname, int autoload);
 void reset_v_option_vars(void);
 void assert_error(garray_T *gap);
 int var_exists(char_u *var);
diff -Nru vim-8.2.1913/src/proto/ex_docmd.pro vim-8.2.2434/src/proto/ex_docmd.pro
--- vim-8.2.1913/src/proto/ex_docmd.pro	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/proto/ex_docmd.pro	2021-01-30 22:05:11.000000000 +0000
@@ -1,6 +1,7 @@
 /* ex_docmd.c */
 void do_exmode(int improved);
 int do_cmdline_cmd(char_u *cmd);
+int do_cmd_argument(char_u *cmd);
 int do_cmdline(char_u *cmdline, char_u *(*fgetline)(int, void *, int, getline_opt_T), void *cookie, int flags);
 int getline_equal(char_u *(*fgetline)(int, void *, int, getline_opt_T), void *cookie, char_u *(*func)(int, void *, int, getline_opt_T));
 void *getline_cookie(char_u *(*fgetline)(int, void *, int, getline_opt_T), void *cookie);
@@ -12,7 +13,7 @@
 int parse_cmd_address(exarg_T *eap, char **errormsg, int silent);
 int checkforcmd(char_u **pp, char *cmd, int len);
 char_u *skip_option_env_lead(char_u *start);
-char_u *find_ex_command(exarg_T *eap, int *full, void *(*lookup)(char_u *, size_t, cctx_T *), cctx_T *cctx);
+char_u *find_ex_command(exarg_T *eap, int *full, int (*lookup)(char_u *, size_t, void *, cctx_T *), cctx_T *cctx);
 int modifier_len(char_u *cmd);
 int cmd_exists(char_u *name);
 cmdidx_T excmd_get_cmdidx(char_u *cmd, int len);
@@ -41,7 +42,7 @@
 void post_chdir(cdscope_T scope);
 int changedir_func(char_u *new_dir, int forceit, cdscope_T scope);
 void ex_cd(exarg_T *eap);
-void do_sleep(long msec);
+void do_sleep(long msec, int hide_cursor);
 void ex_may_print(exarg_T *eap);
 void ex_redraw(exarg_T *eap);
 int vim_mkdir_emsg(char_u *name, int prot);
diff -Nru vim-8.2.1913/src/proto/filepath.pro vim-8.2.2434/src/proto/filepath.pro
--- vim-8.2.1913/src/proto/filepath.pro	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/proto/filepath.pro	2021-01-30 22:05:11.000000000 +0000
@@ -1,5 +1,6 @@
 /* filepath.c */
 int modify_fname(char_u *src, int tilde_file, int *usedlen, char_u **fnamep, char_u **bufp, int *fnamelen);
+void shorten_dir(char_u *str);
 void f_chdir(typval_T *argvars, typval_T *rettv);
 void f_delete(typval_T *argvars, typval_T *rettv);
 void f_executable(typval_T *argvars, typval_T *rettv);
@@ -21,10 +22,10 @@
 void f_globpath(typval_T *argvars, typval_T *rettv);
 void f_isdirectory(typval_T *argvars, typval_T *rettv);
 void f_mkdir(typval_T *argvars, typval_T *rettv);
-void shorten_dir(char_u *str);
 void f_pathshorten(typval_T *argvars, typval_T *rettv);
 void f_readdir(typval_T *argvars, typval_T *rettv);
 void f_readdirex(typval_T *argvars, typval_T *rettv);
+void f_readblob(typval_T *argvars, typval_T *rettv);
 void f_readfile(typval_T *argvars, typval_T *rettv);
 void f_resolve(typval_T *argvars, typval_T *rettv);
 void f_tempname(typval_T *argvars, typval_T *rettv);
diff -Nru vim-8.2.1913/src/proto/getchar.pro vim-8.2.2434/src/proto/getchar.pro
--- vim-8.2.1913/src/proto/getchar.pro	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/proto/getchar.pro	2021-01-30 22:05:11.000000000 +0000
@@ -51,4 +51,5 @@
 void vungetc(int c);
 int fix_input_buffer(char_u *buf, int len);
 int input_available(void);
+char_u *getcmdkeycmd(int promptc, void *cookie, int indent, getline_opt_T do_concat);
 /* vim: set ft=c : */
diff -Nru vim-8.2.1913/src/proto/list.pro vim-8.2.2434/src/proto/list.pro
--- vim-8.2.1913/src/proto/list.pro	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/proto/list.pro	2021-01-30 22:05:11.000000000 +0000
@@ -34,7 +34,7 @@
 int list_extend(list_T *l1, list_T *l2, listitem_T *bef);
 int list_concat(list_T *l1, list_T *l2, typval_T *tv);
 list_T *list_slice(list_T *ol, long n1, long n2);
-int list_slice_or_index(list_T *list, int range, long n1_arg, long n2_arg, typval_T *rettv, int verbose);
+int list_slice_or_index(list_T *list, int range, varnumber_T n1_arg, varnumber_T n2_arg, int exclusive, typval_T *rettv, int verbose);
 list_T *list_copy(list_T *orig, int deep, int copyID);
 void vimlist_remove(list_T *l, listitem_T *item, listitem_T *item2);
 char_u *list2string(typval_T *tv, int copyID, int restore_copyID);
@@ -48,9 +48,11 @@
 void f_uniq(typval_T *argvars, typval_T *rettv);
 void f_filter(typval_T *argvars, typval_T *rettv);
 void f_map(typval_T *argvars, typval_T *rettv);
+void f_mapnew(typval_T *argvars, typval_T *rettv);
 void f_add(typval_T *argvars, typval_T *rettv);
 void f_count(typval_T *argvars, typval_T *rettv);
 void f_extend(typval_T *argvars, typval_T *rettv);
+void f_extendnew(typval_T *argvars, typval_T *rettv);
 void f_insert(typval_T *argvars, typval_T *rettv);
 void f_remove(typval_T *argvars, typval_T *rettv);
 void f_reverse(typval_T *argvars, typval_T *rettv);
diff -Nru vim-8.2.1913/src/proto/move.pro vim-8.2.2434/src/proto/move.pro
--- vim-8.2.1913/src/proto/move.pro	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/proto/move.pro	2021-01-30 22:05:11.000000000 +0000
@@ -13,6 +13,7 @@
 void changed_line_abv_curs(void);
 void changed_line_abv_curs_win(win_T *wp);
 void validate_botline(void);
+void validate_botline_win(win_T *wp);
 void invalidate_botline(void);
 void invalidate_botline_win(win_T *wp);
 void approximate_botline_win(win_T *wp);
diff -Nru vim-8.2.1913/src/proto/option.pro vim-8.2.2434/src/proto/option.pro
--- vim-8.2.1913/src/proto/option.pro	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/proto/option.pro	2021-01-30 22:05:11.000000000 +0000
@@ -24,7 +24,7 @@
 void set_term_option_sctx_idx(char *name, int opt_idx);
 void check_redraw(long_u flags);
 int findoption(char_u *arg);
-int get_option_value(char_u *name, long *numval, char_u **stringval, int opt_flags);
+getoption_T get_option_value(char_u *name, long *numval, char_u **stringval, int opt_flags);
 int get_option_value_strict(char_u *name, long *numval, char_u **stringval, int opt_type, void *from);
 char_u *option_iter_next(void **option, int opt_type);
 long_u get_option_flags(int opt_idx);
@@ -75,4 +75,5 @@
 char_u *get_showbreak_value(win_T *win);
 dict_T *get_winbuf_options(int bufopt);
 int fill_culopt_flags(char_u *val, win_T *wp);
+int magic_isset(void);
 /* vim: set ft=c : */
diff -Nru vim-8.2.1913/src/proto/profiler.pro vim-8.2.2434/src/proto/profiler.pro
--- vim-8.2.1913/src/proto/profiler.pro	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/proto/profiler.pro	2021-01-30 22:05:11.000000000 +0000
@@ -19,9 +19,11 @@
 void prof_inchar_exit(void);
 int prof_def_func(void);
 void func_do_profile(ufunc_T *fp);
+void profile_may_start_func(profinfo_T *info, ufunc_T *fp, funccall_T *fc);
+void profile_may_end_func(profinfo_T *info, ufunc_T *fp, funccall_T *fc);
 void prof_child_enter(proftime_T *tm);
 void prof_child_exit(proftime_T *tm);
-void func_line_start(void *cookie);
+void func_line_start(void *cookie, long lnum);
 void func_line_exec(void *cookie);
 void func_line_end(void *cookie);
 void script_do_profile(scriptitem_T *si);
diff -Nru vim-8.2.1913/src/proto/regexp.pro vim-8.2.2434/src/proto/regexp.pro
--- vim-8.2.1913/src/proto/regexp.pro	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/proto/regexp.pro	2021-01-30 22:05:11.000000000 +0000
@@ -2,7 +2,7 @@
 int re_multiline(regprog_T *prog);
 char_u *skip_regexp(char_u *startp, int delim, int magic);
 char_u *skip_regexp_err(char_u *startp, int delim, int magic);
-char_u *skip_regexp_ex(char_u *startp, int dirc, int magic, char_u **newp, int *dropped);
+char_u *skip_regexp_ex(char_u *startp, int dirc, int magic, char_u **newp, int *dropped, magic_T *magic_val);
 reg_extmatch_T *ref_extmatch(reg_extmatch_T *em);
 void unref_extmatch(reg_extmatch_T *em);
 char_u *regtilde(char_u *source, int magic);
diff -Nru vim-8.2.1913/src/proto/register.pro vim-8.2.2434/src/proto/register.pro
--- vim-8.2.1913/src/proto/register.pro	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/proto/register.pro	2021-01-30 22:05:11.000000000 +0000
@@ -6,7 +6,7 @@
 void set_y_current(yankreg_T *yreg);
 void set_y_previous(yankreg_T *yreg);
 int get_expr_register(void);
-void set_expr_line(char_u *new_line);
+void set_expr_line(char_u *new_line, exarg_T *eap);
 char_u *get_expr_line(void);
 int valid_yank_reg(int regname, int writing);
 int get_yank_register(int regname, int writing);
diff -Nru vim-8.2.1913/src/proto/typval.pro vim-8.2.2434/src/proto/typval.pro
--- vim-8.2.1913/src/proto/typval.pro	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/proto/typval.pro	2021-01-30 22:05:11.000000000 +0000
@@ -9,14 +9,18 @@
 varnumber_T tv_get_bool(typval_T *varp);
 varnumber_T tv_get_bool_chk(typval_T *varp, int *denote);
 float_T tv_get_float(typval_T *varp);
+int check_for_string(typval_T *tv);
+int check_for_nonempty_string(typval_T *tv);
 char_u *tv_get_string(typval_T *varp);
+char_u *tv_get_string_strict(typval_T *varp);
 char_u *tv_get_string_buf(typval_T *varp, char_u *buf);
 char_u *tv_get_string_chk(typval_T *varp);
 char_u *tv_get_string_buf_chk(typval_T *varp, char_u *buf);
+char_u *tv_get_string_buf_chk_strict(typval_T *varp, char_u *buf, int strict);
 char_u *tv_stringify(typval_T *varp, char_u *buf);
 int tv_check_lock(typval_T *tv, char_u *name, int use_gettext);
 void copy_tv(typval_T *from, typval_T *to);
-int typval_compare(typval_T *typ1, typval_T *typ2, exptype_T type, int ic);
+int typval_compare(typval_T *typ1, typval_T *typ2, exprtype_T type, int ic);
 char_u *typval_tostring(typval_T *arg);
 int tv_islocked(typval_T *tv);
 int tv_equal(typval_T *tv1, typval_T *tv2, int ic, int recursive);
diff -Nru vim-8.2.1913/src/proto/userfunc.pro vim-8.2.2434/src/proto/userfunc.pro
--- vim-8.2.1913/src/proto/userfunc.pro	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/proto/userfunc.pro	2021-01-30 22:05:11.000000000 +0000
@@ -1,11 +1,10 @@
 /* userfunc.c */
 void func_init(void);
 hashtab_T *func_tbl_get(void);
-int get_function_args(char_u **argp, char_u endchar, garray_T *newargs, garray_T *argtypes, int *varargs, garray_T *default_args, int skip, exarg_T *eap, char_u **line_to_free);
 char_u *get_lambda_name(void);
 char_u *register_cfunc(cfunc_T cb, cfunc_free_T cb_free, void *state);
-int get_lambda_tv(char_u **arg, typval_T *rettv, evalarg_T *evalarg);
-char_u *deref_func_name(char_u *name, int *lenp, partial_T **partialp, int no_autoload);
+int get_lambda_tv(char_u **arg, typval_T *rettv, int types_optional, evalarg_T *evalarg);
+char_u *deref_func_name(char_u *name, int *lenp, partial_T **partialp, type_T **type, int no_autoload);
 void emsg_funcname(char *ermsg, char_u *name);
 int get_func_tv(char_u *name, int len, typval_T *rettv, char_u **arg, evalarg_T *evalarg, funcexe_T *funcexe);
 char_u *fname_trans_sid(char_u *name, char_u *fname_buf, char_u **tofree, int *error);
@@ -13,7 +12,12 @@
 ufunc_T *find_func(char_u *name, int is_global, cctx_T *cctx);
 int func_is_global(ufunc_T *ufunc);
 int func_name_refcount(char_u *name);
-void copy_func(char_u *lambda, char_u *global);
+int copy_func(char_u *lambda, char_u *global, ectx_T *ectx);
+int funcdepth_increment(void);
+void funcdepth_decrement(void);
+int funcdepth_get(void);
+void funcdepth_restore(int depth);
+int check_user_func_argcount(ufunc_T *fp, int argcount);
 int call_user_func_check(ufunc_T *fp, int argcount, typval_T *argvars, typval_T *rettv, funcexe_T *funcexe, dict_T *selfdict);
 void save_funccal(funccal_entry_T *entry);
 void restore_funccal(void);
@@ -27,8 +31,9 @@
 void user_func_error(int error, char_u *name);
 int call_func(char_u *funcname, int len, typval_T *rettv, int argcount_in, typval_T *argvars_in, funcexe_T *funcexe);
 char_u *printable_func_name(ufunc_T *fp);
-char_u *trans_function_name(char_u **pp, int *is_global, int skip, int flags, funcdict_T *fdp, partial_T **partial);
+char_u *trans_function_name(char_u **pp, int *is_global, int skip, int flags, funcdict_T *fdp, partial_T **partial, type_T **type);
 char_u *untrans_function_name(char_u *name);
+void list_functions(regmatch_T *regmatch);
 ufunc_T *define_function(exarg_T *eap, char_u *name_arg);
 void ex_function(exarg_T *eap);
 void ex_defcompile(exarg_T *eap);
diff -Nru vim-8.2.1913/src/proto/vim9compile.pro vim-8.2.2434/src/proto/vim9compile.pro
--- vim-8.2.1913/src/proto/vim9compile.pro	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/proto/vim9compile.pro	2021-01-30 22:05:11.000000000 +0000
@@ -1,22 +1,25 @@
 /* vim9compile.c */
 int check_defined(char_u *p, size_t len, cctx_T *cctx);
-int check_compare_types(exptype_T type, typval_T *tv1, typval_T *tv2);
+int check_compare_types(exprtype_T type, typval_T *tv1, typval_T *tv2);
+int use_typecheck(type_T *actual, type_T *expected);
+int need_type(type_T *actual, type_T *expected, int offset, int arg_idx, cctx_T *cctx, int silent, int actual_is_const);
+int func_needs_compiling(ufunc_T *ufunc, int profile);
 int get_script_item_idx(int sid, char_u *name, int check_writable, cctx_T *cctx);
 imported_T *find_imported(char_u *name, size_t len, cctx_T *cctx);
 imported_T *find_imported_in_script(char_u *name, size_t len, int sid);
-int vim9_comment_start(char_u *p);
 char_u *peek_next_line_from_context(cctx_T *cctx);
 char_u *next_line_from_context(cctx_T *cctx, int skip_comment);
+char_u *to_name_end(char_u *arg, int use_namespace);
 char_u *to_name_const_end(char_u *arg);
-exptype_T get_compare_type(char_u *p, int *len, int *type_is);
+exprtype_T get_compare_type(char_u *p, int *len, int *type_is);
 void error_white_both(char_u *op, int len);
 int assignment_len(char_u *p, int *heredoc);
 void vim9_declare_error(char_u *name);
 int check_vim9_unlet(char_u *name);
-int compile_def_function(ufunc_T *ufunc, int set_return_type, cctx_T *outer_cctx);
+int compile_def_function(ufunc_T *ufunc, int check_return_type, int profiling, cctx_T *outer_cctx);
 void set_function_type(ufunc_T *ufunc);
 void delete_instr(isn_T *isn);
-void clear_def_function(ufunc_T *ufunc);
 void unlink_def_function(ufunc_T *ufunc);
+void link_def_function(ufunc_T *ufunc);
 void free_def_functions(void);
 /* vim: set ft=c : */
diff -Nru vim-8.2.1913/src/proto/vim9execute.pro vim-8.2.2434/src/proto/vim9execute.pro
--- vim-8.2.1913/src/proto/vim9execute.pro	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/proto/vim9execute.pro	2021-01-30 22:05:11.000000000 +0000
@@ -1,8 +1,12 @@
 /* vim9execute.c */
 void to_string_error(vartype_T vartype);
 void funcstack_check_refcount(funcstack_T *funcstack);
+char_u *char_from_string(char_u *str, varnumber_T index);
+char_u *string_slice(char_u *str, varnumber_T first, varnumber_T last, int exclusive);
+int fill_partial_and_closure(partial_T *pt, ufunc_T *ufunc, ectx_T *ectx);
 int call_def_function(ufunc_T *ufunc, int argc_arg, typval_T *argv, partial_T *partial, typval_T *rettv);
 void ex_disassemble(exarg_T *eap);
 int tv2bool(typval_T *tv);
+void emsg_using_string_as(typval_T *tv, int as_number);
 int check_not_string(typval_T *tv);
 /* vim: set ft=c : */
diff -Nru vim-8.2.1913/src/proto/vim9script.pro vim-8.2.2434/src/proto/vim9script.pro
--- vim-8.2.1913/src/proto/vim9script.pro	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/proto/vim9script.pro	2021-01-30 22:05:11.000000000 +0000
@@ -2,13 +2,15 @@
 int in_vim9script(void);
 void ex_vim9script(exarg_T *eap);
 int not_in_vim9(exarg_T *eap);
+int vim9_comment_start(char_u *p);
 void ex_export(exarg_T *eap);
 void free_imports_and_script_vars(int sid);
+void mark_imports_for_reload(int sid);
 void ex_import(exarg_T *eap);
 int find_exported(int sid, char_u *name, ufunc_T **ufunc, type_T **type, cctx_T *cctx);
 char_u *handle_import(char_u *arg_start, garray_T *gap, int import_sid, evalarg_T *evalarg, void *cctx);
 char_u *vim9_declare_scriptvar(exarg_T *eap, char_u *arg);
-void add_vim9_script_var(dictitem_T *di, typval_T *tv, type_T *type);
+void update_vim9_script_var(int create, dictitem_T *di, int flags, typval_T *tv, type_T **type);
 void hide_script_var(scriptitem_T *si, int idx, int func_defined);
 void free_all_script_vars(scriptitem_T *si);
 svar_T *find_typval_in_script(typval_T *dest);
diff -Nru vim-8.2.1913/src/proto/vim9type.pro vim-8.2.2434/src/proto/vim9type.pro
--- vim-8.2.1913/src/proto/vim9type.pro	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/proto/vim9type.pro	2021-01-30 22:05:11.000000000 +0000
@@ -15,10 +15,13 @@
 void type_mismatch(type_T *expected, type_T *actual);
 void arg_type_mismatch(type_T *expected, type_T *actual, int argidx);
 int check_type(type_T *expected, type_T *actual, int give_msg, int argidx);
+int check_argument_types(type_T *type, typval_T *argvars, int argcount, char_u *name);
 char_u *skip_type(char_u *start, int optional);
-type_T *parse_type(char_u **arg, garray_T *type_gap);
+type_T *parse_type(char_u **arg, garray_T *type_gap, int give_error);
+int equal_type(type_T *type1, type_T *type2);
 void common_type(type_T *type1, type_T *type2, type_T **dest, garray_T *type_gap);
 type_T *get_member_type_from_stack(type_T **stack_top, int count, int skip, garray_T *type_gap);
 char *vartype_name(vartype_T type);
 char *type_name(type_T *type, char **tofree);
+void f_typename(typval_T *argvars, typval_T *rettv);
 /* vim: set ft=c : */
diff -Nru vim-8.2.1913/src/proto/window.pro vim-8.2.2434/src/proto/window.pro
--- vim-8.2.1913/src/proto/window.pro	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/proto/window.pro	2021-01-30 22:05:11.000000000 +0000
@@ -5,6 +5,7 @@
 int win_split_ins(int size, int flags, win_T *new_wp, int dir);
 int win_valid_popup(win_T *win);
 int win_valid(win_T *win);
+win_T *win_find_by_id(int id);
 int win_valid_any_tab(win_T *win);
 int win_count(void);
 int make_windows(int count, int vertical);
diff -Nru vim-8.2.1913/src/proto.h vim-8.2.2434/src/proto.h
--- vim-8.2.1913/src/proto.h	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/proto.h	2021-01-30 22:05:11.000000000 +0000
@@ -233,10 +233,10 @@
 # include "usercmd.pro"
 # include "userfunc.pro"
 # include "version.pro"
+# include "vim9script.pro"
 # ifdef FEAT_EVAL
 #  include "vim9compile.pro"
 #  include "vim9execute.pro"
-#  include "vim9script.pro"
 #  include "vim9type.pro"
 # endif
 # include "window.pro"
diff -Nru vim-8.2.1913/src/quickfix.c vim-8.2.2434/src/quickfix.c
--- vim-8.2.1913/src/quickfix.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/quickfix.c	2021-01-30 22:05:11.000000000 +0000
@@ -4151,13 +4151,15 @@
     if (qf_buf != NULL)
     {
 	// Use the existing quickfix buffer
-	(void)do_ecmd(qf_buf->b_fnum, NULL, NULL, NULL, ECMD_ONE,
-		ECMD_HIDE + ECMD_OLDBUF, oldwin);
+	if (do_ecmd(qf_buf->b_fnum, NULL, NULL, NULL, ECMD_ONE,
+				      ECMD_HIDE + ECMD_OLDBUF, oldwin) == FAIL)
+	    return FAIL;
     }
     else
     {
 	// Create a new quickfix buffer
-	(void)do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, ECMD_HIDE, oldwin);
+	if (do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, ECMD_HIDE, oldwin) == FAIL)
+	    return FAIL;
 
 	// save the number of the new buffer
 	qi->qf_bufnr = curbuf->b_fnum;
@@ -4429,21 +4431,26 @@
 }
 
 /*
- * Update the w:quickfix_title variable in the quickfix/location list window
+ * Update the w:quickfix_title variable in the quickfix/location list window in
+ * all the tab pages.
  */
     static void
 qf_update_win_titlevar(qf_info_T *qi)
 {
+    qf_list_T	*qfl = qf_get_curlist(qi);
+    tabpage_T	*tp;
     win_T	*win;
-    win_T	*curwin_save;
+    win_T	*save_curwin = curwin;
 
-    if ((win = qf_find_win(qi)) != NULL)
+    FOR_ALL_TAB_WINDOWS(tp, win)
     {
-	curwin_save = curwin;
-	curwin = win;
-	qf_set_title_var(qf_get_curlist(qi));
-	curwin = curwin_save;
+	if (is_qf_win(win, qi))
+	{
+	    curwin = win;
+	    qf_set_title_var(qfl);
+	}
     }
+    curwin = save_curwin;
 }
 
 /*
@@ -4674,14 +4681,17 @@
 	*dirname = NUL;
 
 	// Add one line for each error
-	if (old_last == NULL || old_last->qf_next == NULL)
+	if (old_last == NULL)
 	{
 	    qfp = qfl->qf_start;
 	    lnum = 0;
 	}
 	else
 	{
-	    qfp = old_last->qf_next;
+	    if (old_last->qf_next != NULL)
+		qfp = old_last->qf_next;
+	    else
+		qfp = old_last;
 	    lnum = buf->b_ml.ml_line_count;
 	}
 
@@ -6043,7 +6053,7 @@
 	return FAIL;
     }
 
-    // parse the list of arguments
+    // Parse the list of arguments, wildcards have already been expanded.
     if (get_arglist_exp(p, &args->fcount, &args->fnames, TRUE) == FAIL)
 	return FAIL;
     if (args->fcount == 0)
@@ -6503,7 +6513,7 @@
 	enter_cleanup(&cs);
 #endif
 
-	wipe_buffer(buf, FALSE);
+	wipe_buffer(buf, TRUE);
 
 #if defined(FEAT_EVAL)
 	// Restore the error/interrupt/exception state if not discarded by a
@@ -7344,7 +7354,7 @@
     if (action == 'r')
 	qf_free_items(&qi->qf_lists[qf_idx]);
     if (qf_init_ext(qi, qf_idx, NULL, NULL, &di->di_tv, errorformat,
-		FALSE, (linenr_T)0, (linenr_T)0, NULL, NULL) > 0)
+		FALSE, (linenr_T)0, (linenr_T)0, NULL, NULL) >= 0)
 	retval = OK;
 
     return retval;
@@ -7469,8 +7479,10 @@
     if ((di = dict_find(what, (char_u *)"quickfixtextfunc", -1)) != NULL)
 	retval = qf_setprop_qftf(qi, qfl, di);
 
-    if (retval == OK)
+    if (newlist || retval == OK)
 	qf_list_changed(qfl);
+    if (newlist)
+	qf_update_buffer(qi, NULL);
 
     return retval;
 }
@@ -8087,6 +8099,7 @@
     int		new_qi = FALSE;
     char_u	*au_name =  NULL;
     char_u	*lang = NULL;
+    int		updated = FALSE;
 
     switch (eap->cmdidx)
     {
@@ -8138,14 +8151,24 @@
 	qfl->qf_ptr = qfl->qf_start;
 	qfl->qf_index = 1;
 	qf_list_changed(qfl);
-	qf_update_buffer(qi, NULL);
+	updated = TRUE;
     }
 
     if (p_cpo == empty_option)
 	p_cpo = save_cpo;
     else
-	// Darn, some plugin changed the value.
+    {
+	// Darn, some plugin changed the value.  If it's still empty it was
+	// changed and restored, need to restore in the complicated way.
+	if (*p_cpo == NUL)
+	    set_option_value((char_u *)"cpo", 0L, save_cpo, 0);
 	free_string_option(save_cpo);
+    }
+
+    if (updated)
+	// This may open a window and source scripts, do this after 'cpo' was
+	// restored.
+	qf_update_buffer(qi, NULL);
 
     if (au_name != NULL)
     {
diff -Nru vim-8.2.1913/src/regexp_bt.c vim-8.2.2434/src/regexp_bt.c
--- vim-8.2.1913/src/regexp_bt.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/regexp_bt.c	2021-01-30 22:05:11.000000000 +0000
@@ -4805,6 +4805,26 @@
     if (backpos.ga_maxlen > BACKPOS_INITIAL)
 	ga_clear(&backpos);
 
+    if (retval > 0)
+    {
+	// Make sure the end is never before the start.  Can happen when \zs
+	// and \ze are used.
+	if (REG_MULTI)
+	{
+	    lpos_T *start = &rex.reg_mmatch->startpos[0];
+	    lpos_T *end = &rex.reg_mmatch->endpos[0];
+
+	    if (end->lnum < start->lnum
+			|| (end->lnum == start->lnum && end->col < start->col))
+		rex.reg_mmatch->endpos[0] = rex.reg_mmatch->startpos[0];
+	}
+	else
+	{
+	    if (rex.reg_match->endp[0] < rex.reg_match->startp[0])
+		rex.reg_match->endp[0] = rex.reg_match->startp[0];
+	}
+    }
+
     return retval;
 }
 
diff -Nru vim-8.2.1913/src/regexp.c vim-8.2.2434/src/regexp.c
--- vim-8.2.1913/src/regexp.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/regexp.c	2021-01-30 22:05:11.000000000 +0000
@@ -294,6 +294,7 @@
 
 static char_u	*regparse;	// Input-scan pointer.
 static int	regnpar;	// () count.
+static int	wants_nfa;	// regex should use NFA engine
 #ifdef FEAT_SYN_HL
 static int	regnzpar;	// \z() count.
 static int	re_has_z;	// \z item detected
@@ -303,11 +304,7 @@
 static int	had_eol;	// TRUE when EOL found by vim_regcomp()
 #endif
 
-static int	reg_magic;	// magicness of the pattern:
-#define MAGIC_NONE	1	// "\V" very unmagic
-#define MAGIC_OFF	2	// "\M" or 'magic' off
-#define MAGIC_ON	3	// "\m" or 'magic'
-#define MAGIC_ALL	4	// "\v" very magic
+static magic_T	reg_magic;	// magicness of the pattern
 
 static int	reg_string;	// matching with a string instead of a buffer
 				// line
@@ -381,6 +378,9 @@
 static char_u	*cstrchr(char_u *, int);
 static int	re_mult_next(char *what);
 static int	reg_iswordc(int);
+#ifdef FEAT_EVAL
+static void report_re_switch(char_u *pat);
+#endif
 
 static regengine_T bt_regengine;
 static regengine_T nfa_regengine;
@@ -544,7 +544,7 @@
     int		delim,
     int		magic)
 {
-    return skip_regexp_ex(startp, delim, magic, NULL, NULL);
+    return skip_regexp_ex(startp, delim, magic, NULL, NULL, NULL);
 }
 
 /*
@@ -573,6 +573,7 @@
  * expression and change "\?" to "?".  If "*newp" is not NULL the expression
  * is changed in-place.
  * If a "\?" is changed to "?" then "dropped" is incremented, unless NULL.
+ * If "magic_val" is not NULL, returns the effective magicness of the pattern
  */
     char_u *
 skip_regexp_ex(
@@ -580,9 +581,10 @@
     int		dirc,
     int		magic,
     char_u	**newp,
-    int		*dropped)
+    int		*dropped,
+    magic_T	*magic_val)
 {
-    int		mymagic;
+    magic_T	mymagic;
     char_u	*p = startp;
 
     if (magic)
@@ -628,6 +630,8 @@
 		mymagic = MAGIC_NONE;
 	}
     }
+    if (magic_val != NULL)
+	*magic_val = mymagic;
     return p;
 }
 
@@ -2662,7 +2666,7 @@
     if (prog == NULL)
     {
 #ifdef BT_REGEXP_DEBUG_LOG
-	if (regexp_engine != BACKTRACKING_ENGINE)   // debugging log for NFA
+	if (regexp_engine == BACKTRACKING_ENGINE)   // debugging log for BT engine
 	{
 	    FILE *f;
 	    f = fopen(BT_REGEXP_DEBUG_LOG_NAME, "a");
@@ -2686,6 +2690,9 @@
 					  && called_emsg == called_emsg_before)
 	{
 	    regexp_engine = BACKTRACKING_ENGINE;
+#ifdef FEAT_EVAL
+	    report_re_switch(expr);
+#endif
 	    prog = bt_regengine.regcomp(expr, re_flags);
 	}
     }
diff -Nru vim-8.2.1913/src/regexp_nfa.c vim-8.2.2434/src/regexp_nfa.c
--- vim-8.2.1913/src/regexp_nfa.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/regexp_nfa.c	2021-01-30 22:05:11.000000000 +0000
@@ -253,6 +253,12 @@
 static int *post_start;  // holds the postfix form of r.e.
 static int *post_end;
 static int *post_ptr;
+
+// Set when the pattern should use the NFA engine.
+// E.g. [[:upper:]] only allows 8bit characters for BT engine,
+// while NFA engine handles multibyte characters correctly.
+static int wants_nfa;
+
 static int nstate;	// Number of states in the NFA.
 static int istate;	// Index in the state vector, used in alloc_state()
 
@@ -306,6 +312,7 @@
 	return FAIL;
     post_ptr = post_start;
     post_end = post_start + nstate_max;
+    wants_nfa = FALSE;
     rex.nfa_has_zend = FALSE;
     rex.nfa_has_backref = FALSE;
 
@@ -1707,6 +1714,7 @@
 				    EMIT(NFA_CLASS_GRAPH);
 				    break;
 				case CLASS_LOWER:
+				    wants_nfa = TRUE;
 				    EMIT(NFA_CLASS_LOWER);
 				    break;
 				case CLASS_PRINT:
@@ -1719,6 +1727,7 @@
 				    EMIT(NFA_CLASS_SPACE);
 				    break;
 				case CLASS_UPPER:
+				    wants_nfa = TRUE;
 				    EMIT(NFA_CLASS_UPPER);
 				    break;
 				case CLASS_XDIGIT:
@@ -2137,9 +2146,15 @@
 
 	    // The engine is very inefficient (uses too many states) when the
 	    // maximum is much larger than the minimum and when the maximum is
-	    // large.  Bail out if we can use the other engine.
+	    // large.  However, when maxval is MAX_LIMIT, it is okay, as this
+	    // will emit NFA_STAR.
+	    // Bail out if we can use the other engine, but only, when the
+	    // pattern does not need the NFA engine like (e.g. [[:upper:]]\{2,\}
+	    // does not work with with characters > 8 bit with the BT engine)
 	    if ((nfa_re_flags & RE_AUTO)
-				   && (maxval > 500 || maxval > minval + 200))
+				   && (maxval > 500 || maxval > minval + 200)
+				   && (maxval != MAX_LIMIT && minval < 200)
+				   && !wants_nfa)
 		return FAIL;
 
 	    // Ignore previous call to nfa_regatom()
@@ -5754,9 +5769,11 @@
 	    {
 	    case NFA_MATCH:
 	      {
-		// If the match ends before a composing characters and
-		// rex.reg_icombine is not set, that is not really a match.
-		if (enc_utf8 && !rex.reg_icombine && utf_iscomposing(curc))
+		// If the match is not at the start of the line, ends before a
+		// composing characters and rex.reg_icombine is not set, that
+		// is not really a match.
+		if (enc_utf8 && !rex.reg_icombine
+			     && rex.input != rex.line && utf_iscomposing(curc))
 		    break;
 
 		nfa_match = TRUE;
@@ -7225,6 +7242,26 @@
 #endif
 
 theend:
+    if (retval > 0)
+    {
+	// Make sure the end is never before the start.  Can happen when \zs and
+	// \ze are used.
+	if (REG_MULTI)
+	{
+	    lpos_T *start = &rex.reg_mmatch->startpos[0];
+	    lpos_T *end = &rex.reg_mmatch->endpos[0];
+
+	    if (end->lnum < start->lnum
+			|| (end->lnum == start->lnum && end->col < start->col))
+		rex.reg_mmatch->endpos[0] = rex.reg_mmatch->startpos[0];
+	}
+	else
+	{
+	    if (rex.reg_match->endp[0] < rex.reg_match->startp[0])
+		rex.reg_match->endp[0] = rex.reg_match->startp[0];
+	}
+    }
+
     return retval;
 }
 
diff -Nru vim-8.2.1913/src/register.c vim-8.2.2434/src/register.c
--- vim-8.2.1913/src/register.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/register.c	2021-01-30 22:05:11.000000000 +0000
@@ -79,6 +79,7 @@
  * Keep the last expression line here, for repeating.
  */
 static char_u	*expr_line = NULL;
+static exarg_T	*expr_eap = NULL;
 
 /*
  * Get an expression for the "\"=expr1" or "CTRL-R =expr1"
@@ -95,19 +96,22 @@
     if (*new_line == NUL)	// use previous line
 	vim_free(new_line);
     else
-	set_expr_line(new_line);
+	set_expr_line(new_line, NULL);
     return '=';
 }
 
 /*
  * Set the expression for the '=' register.
  * Argument must be an allocated string.
+ * "eap" may be used if the next line needs to be checked when evaluating the
+ * expression.
  */
     void
-set_expr_line(char_u *new_line)
+set_expr_line(char_u *new_line, exarg_T *eap)
 {
     vim_free(expr_line);
     expr_line = new_line;
+    expr_eap = eap;
 }
 
 /*
@@ -136,7 +140,7 @@
 	return expr_copy;
 
     ++nested;
-    rv = eval_to_string(expr_copy, TRUE);
+    rv = eval_to_string_eap(expr_copy, TRUE, expr_eap);
     --nested;
     vim_free(expr_copy);
     return rv;
@@ -318,8 +322,7 @@
 #endif
 }
 
-#if (defined(FEAT_CLIPBOARD) && defined(FEAT_X11) && defined(USE_SYSTEM)) \
-	|| defined(PROTO)
+#if defined(FEAT_CLIPBOARD) || defined(PROTO)
     void
 free_register(void *reg)
 {
@@ -806,7 +809,14 @@
 	{
 	    for (i = 0; i < y_current->y_size; ++i)
 	    {
-		stuffescaped(y_current->y_array[i], literally);
+		if (regname == '-')
+		{
+		    AppendCharToRedobuff(Ctrl_R);
+		    AppendCharToRedobuff(regname);
+		    do_put(regname, NULL, BACKWARD, 1L, PUT_CURSEND);
+		}
+		else
+		    stuffescaped(y_current->y_array[i], literally);
 		// Insert a newline between lines and after last line if
 		// y_type is MLINE.
 		if (y_current->y_type == MLINE || i < y_current->y_size - 1)
@@ -2774,7 +2784,7 @@
 	    vim_free(p);
 	    p = s;
 	}
-	set_expr_line(p);
+	set_expr_line(p, NULL);
 	return;
     }
 
diff -Nru vim-8.2.1913/src/screen.c vim-8.2.2434/src/screen.c
--- vim-8.2.1913/src/screen.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/screen.c	2021-01-30 22:05:11.000000000 +0000
@@ -464,7 +464,8 @@
     // First char of a popup window may go on top of the right half of a
     // double-wide character. Clear the left half to avoid it getting the popup
     // window background color.
-    if (coloff > 0 && ScreenLines[off_to] == 0
+    if (coloff > 0 && enc_utf8
+		   && ScreenLines[off_to] == 0
 		   && ScreenLinesUC[off_to - 1] != 0
 		   && (*mb_char2cells)(ScreenLinesUC[off_to - 1]) > 1)
     {
@@ -2490,7 +2491,8 @@
 {
     if ((emsg_on_display || (check_msg_scroll && msg_scroll))
 	    && !did_wait_return
-	    && emsg_silent == 0)
+	    && emsg_silent == 0
+	    && !in_assert_fails)
     {
 	out_flush();
 	ui_delay(1006L, TRUE);
@@ -3085,7 +3087,6 @@
     // Can't use ScreenLines unless initialized
     if (ScreenLines == NULL)
 	return;
-
     if (col != screen_cur_col || row != screen_cur_row)
     {
 	// Check for valid position.
@@ -4190,7 +4191,8 @@
 #endif
 		    msg_puts_attr(_(" INSERT"), attr);
 		}
-		else if (restart_edit == 'I' || restart_edit == 'A')
+		else if (restart_edit == 'I' || restart_edit == 'i' ||
+			restart_edit == 'a' || restart_edit == 'A')
 		    msg_puts_attr(_(" (insert)"), attr);
 		else if (restart_edit == 'R')
 		    msg_puts_attr(_(" (replace)"), attr);
diff -Nru vim-8.2.1913/src/scriptfile.c vim-8.2.2434/src/scriptfile.c
--- vim-8.2.1913/src/scriptfile.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/scriptfile.c	2021-01-30 22:05:11.000000000 +0000
@@ -1019,30 +1019,6 @@
 /*
  * ":source" and associated commands.
  */
-/*
- * Structure used to store info for each sourced file.
- * It is shared between do_source() and getsourceline().
- * This is required, because it needs to be handed to do_cmdline() and
- * sourcing can be done recursively.
- */
-struct source_cookie
-{
-    FILE	*fp;		// opened file for sourcing
-    char_u	*nextline;	// if not NULL: line that was read ahead
-    linenr_T	sourcing_lnum;	// line number of the source file
-    int		finished;	// ":finish" used
-#ifdef USE_CRNL
-    int		fileformat;	// EOL_UNKNOWN, EOL_UNIX or EOL_DOS
-    int		error;		// TRUE if LF found after CR-LF
-#endif
-#ifdef FEAT_EVAL
-    linenr_T	breakpoint;	// next line with breakpoint or zero
-    char_u	*fname;		// name of sourced file
-    int		dbg_tick;	// debug_tick when breakpoint was set
-    int		level;		// top nesting level of sourced file
-#endif
-    vimconv_T	conv;		// type of conversion
-};
 
 #ifdef FEAT_EVAL
 /*
@@ -1051,7 +1027,7 @@
     linenr_T *
 source_breakpoint(void *cookie)
 {
-    return &((struct source_cookie *)cookie)->breakpoint;
+    return &((source_cookie_T *)cookie)->breakpoint;
 }
 
 /*
@@ -1060,7 +1036,7 @@
     int *
 source_dbg_tick(void *cookie)
 {
-    return &((struct source_cookie *)cookie)->dbg_tick;
+    return &((source_cookie_T *)cookie)->dbg_tick;
 }
 
 /*
@@ -1069,7 +1045,7 @@
     int
 source_level(void *cookie)
 {
-    return ((struct source_cookie *)cookie)->level;
+    return ((source_cookie_T *)cookie)->level;
 }
 
 /*
@@ -1079,7 +1055,7 @@
     char_u *
 source_nextline(void *cookie)
 {
-    return ((struct source_cookie *)cookie)->nextline;
+    return ((source_cookie_T *)cookie)->nextline;
 }
 #endif
 
@@ -1130,13 +1106,13 @@
     int		is_vimrc,	    // DOSO_ value
     int		*ret_sid UNUSED)
 {
-    struct source_cookie    cookie;
+    source_cookie_T	    cookie;
     char_u		    *p;
     char_u		    *fname_exp;
     char_u		    *firstline = NULL;
     int			    retval = FAIL;
-#ifdef FEAT_EVAL
     sctx_T		    save_current_sctx;
+#ifdef FEAT_EVAL
     static scid_T	    last_current_SID = 0;
     static int		    last_current_SID_seq = 0;
     funccal_entry_T	    funccalp_entry;
@@ -1300,6 +1276,9 @@
 	time_push(&tv_rel, &tv_start);
 #endif
 
+    save_current_sctx = current_sctx;
+    current_sctx.sc_version = 1;  // default script version
+
 #ifdef FEAT_EVAL
 # ifdef FEAT_PROFILE
     if (do_profiling == PROF_YES)
@@ -1310,9 +1289,7 @@
     // Also starts profiling timer for nested script.
     save_funccal(&funccalp_entry);
 
-    save_current_sctx = current_sctx;
     current_sctx.sc_lnum = 0;
-    current_sctx.sc_version = 1;  // default script version
 
     // Check if this script was sourced before to finds its SID.
     // Always use a new sequence number.
@@ -1320,40 +1297,28 @@
     if (sid > 0)
     {
 	hashtab_T	*ht;
-	int		is_vim9 = si->sn_version == SCRIPT_VERSION_VIM9;
+	int		todo;
+	hashitem_T	*hi;
+	dictitem_T	*di;
 
 	// loading the same script again
-	si->sn_had_command = FALSE;
-	si->sn_version = 1;
+	si->sn_state = SN_STATE_RELOAD;
 	current_sctx.sc_sid = sid;
 
-	// In Vim9 script all script-local variables are removed when reloading
-	// the same script.  In legacy script they remain but "const" can be
-	// set again.
+	// Script-local variables remain but "const" can be set again.
+	// In Vim9 script variables will be cleared when "vim9script" is
+	// encountered without the "noclear" argument.
 	ht = &SCRIPT_VARS(sid);
-	if (is_vim9)
-	    hashtab_free_contents(ht);
-	else
-	{
-	    int		todo = (int)ht->ht_used;
-	    hashitem_T	*hi;
-	    dictitem_T	*di;
-
-	    for (hi = ht->ht_array; todo > 0; ++hi)
-		if (!HASHITEM_EMPTY(hi))
-		{
-		    --todo;
-		    di = HI2DI(hi);
-		    di->di_flags |= DI_FLAGS_RELOAD;
-		}
-	}
-
-	// old imports and script variables are no longer valid
-	free_imports_and_script_vars(sid);
-
-	// in Vim9 script functions are marked deleted
-	if (is_vim9)
-	    delete_script_functions(sid);
+	todo = (int)ht->ht_used;
+	for (hi = ht->ht_array; todo > 0; ++hi)
+	    if (!HASHITEM_EMPTY(hi))
+	    {
+		--todo;
+		di = HI2DI(hi);
+		di->di_flags |= DI_FLAGS_RELOAD;
+	    }
+	// imports can be redefined once
+	mark_imports_for_reload(sid);
     }
     else
     {
@@ -1387,6 +1352,9 @@
 	fname_exp = vim_strsave(si->sn_name);  // used for autocmd
 	if (ret_sid != NULL)
 	    *ret_sid = current_sctx.sc_sid;
+
+	// Used to check script variable index is still valid.
+	si->sn_script_seq = current_sctx.sc_seq;
     }
 
 # ifdef FEAT_PROFILE
@@ -1488,18 +1456,18 @@
     si = SCRIPT_ITEM(current_sctx.sc_sid);
     if (si->sn_save_cpo != NULL)
     {
-	free_string_option(p_cpo);
-	p_cpo = si->sn_save_cpo;
-	si->sn_save_cpo = NULL;
+	set_option_value((char_u *)"cpo", 0L, si->sn_save_cpo, 0);
+	CLEAR_POINTER(si->sn_save_cpo);
     }
 
-    current_sctx = save_current_sctx;
     restore_funccal();
 # ifdef FEAT_PROFILE
     if (do_profiling == PROF_YES)
 	prof_child_exit(&wait_start);		// leaving a child now
 # endif
 #endif
+    current_sctx = save_current_sctx;
+
     fclose(cookie.fp);
     vim_free(cookie.nextline);
     vim_free(firstline);
@@ -1562,6 +1530,7 @@
 
 /*
  * Get a pointer to a script name.  Used for ":verbose set".
+ * Message appended to "Last set from "
  */
     char_u *
 get_scriptname(scid_T id)
@@ -1576,6 +1545,8 @@
 	return (char_u *)_("environment variable");
     if (id == SID_ERROR)
 	return (char_u *)_("error handler");
+    if (id == SID_WINLAYOUT)
+	return (char_u *)_("changed window size");
     return SCRIPT_ITEM(id)->sn_name;
 }
 
@@ -1618,12 +1589,12 @@
 	void *cookie)
 {
     return fgetline == getsourceline
-			? ((struct source_cookie *)cookie)->sourcing_lnum
+			? ((source_cookie_T *)cookie)->sourcing_lnum
 			: SOURCING_LNUM;
 }
 
     static char_u *
-get_one_sourceline(struct source_cookie *sp)
+get_one_sourceline(source_cookie_T *sp)
 {
     garray_T		ga;
     int			len;
@@ -1741,9 +1712,13 @@
 	int indent UNUSED,
 	getline_opt_T options)
 {
-    struct source_cookie *sp = (struct source_cookie *)cookie;
+    source_cookie_T	*sp = (source_cookie_T *)cookie;
     char_u		*line;
     char_u		*p;
+    int			do_vim9_all = in_vim9script()
+					      && options == GETLINE_CONCAT_ALL;
+    int			do_bar_cont = do_vim9_all
+					 || options == GETLINE_CONCAT_CONTBAR;
 
 #ifdef FEAT_EVAL
     // If breakpoints have been added/deleted need to check for it.
@@ -1762,8 +1737,8 @@
     SOURCING_LNUM = sp->sourcing_lnum + 1;
 
     // Get current line.  If there is a read-ahead line, use it, otherwise get
-    // one now.
-    if (sp->finished)
+    // one now.  "fp" is NULL if actually using a string.
+    if (sp->finished || sp->fp == NULL)
 	line = NULL;
     else if (sp->nextline == NULL)
 	line = get_one_sourceline(sp);
@@ -1790,17 +1765,15 @@
 	// backslash. We always need to read the next line, keep it in
 	// sp->nextline.
 	/* Also check for a comment in between continuation lines: "\ */
-	// Also check for a Vim9 comment and empty line.
+	// Also check for a Vim9 comment, empty line, line starting with '|',
+	// but not "||".
 	sp->nextline = get_one_sourceline(sp);
 	if (sp->nextline != NULL
 		&& (*(p = skipwhite(sp->nextline)) == '\\'
 			      || (p[0] == '"' && p[1] == '\\' && p[2] == ' ')
-#ifdef FEAT_EVAL
-			      || (in_vim9script()
-				      && options == GETLINE_CONCAT_ALL
-				      && (*p == NUL || vim9_comment_start(p)))
-#endif
-			      ))
+			      || (do_vim9_all && (*p == NUL
+						     || vim9_comment_start(p)))
+			      || (do_bar_cont && p[0] == '|' && p[1] != '|')))
 	{
 	    garray_T    ga;
 
@@ -1808,6 +1781,11 @@
 	    ga_concat(&ga, line);
 	    if (*p == '\\')
 		ga_concat(&ga, p + 1);
+	    else if (*p == '|')
+	    {
+		ga_concat(&ga, (char_u *)" ");
+		ga_concat(&ga, p);
+	    }
 	    for (;;)
 	    {
 		vim_free(sp->nextline);
@@ -1815,7 +1793,7 @@
 		if (sp->nextline == NULL)
 		    break;
 		p = skipwhite(sp->nextline);
-		if (*p == '\\')
+		if (*p == '\\' || (do_bar_cont && p[0] == '|' && p[1] != '|'))
 		{
 		    // Adjust the growsize to the current length to speed up
 		    // concatenating many lines.
@@ -1826,15 +1804,16 @@
 			else
 			    ga.ga_growsize = ga.ga_len;
 		    }
-		    ga_concat(&ga, p + 1);
+		    if (*p == '\\')
+			ga_concat(&ga, p + 1);
+		    else
+		    {
+			ga_concat(&ga, (char_u *)" ");
+			ga_concat(&ga, p);
+		    }
 		}
 		else if (!(p[0] == '"' && p[1] == '\\' && p[2] == ' ')
-#ifdef FEAT_EVAL
-			&& !(in_vim9script()
-				&& options == GETLINE_CONCAT_ALL
-				&& (*p == NUL || vim9_comment_start(p)))
-#endif
-			)
+		     && !(do_vim9_all && (*p == NUL || vim9_comment_start(p))))
 		    break;
 		/* drop a # comment or "\ comment line */
 	    }
@@ -1877,8 +1856,8 @@
     void
 ex_scriptencoding(exarg_T *eap)
 {
-    struct source_cookie	*sp;
-    char_u			*name;
+    source_cookie_T	*sp;
+    char_u		*name;
 
     if (!getline_equal(eap->getline, eap->cookie, getsourceline))
     {
@@ -1896,7 +1875,7 @@
 	name = eap->arg;
 
     // Setup for conversion from the specified encoding to 'encoding'.
-    sp = (struct source_cookie *)getline_cookie(eap->getline, eap->cookie);
+    sp = (source_cookie_T *)getline_cookie(eap->getline, eap->cookie);
     convert_setup(&sp->conv, name, p_enc);
 
     if (name != eap->arg)
@@ -1909,7 +1888,6 @@
     void
 ex_scriptversion(exarg_T *eap UNUSED)
 {
-#ifdef FEAT_EVAL
     int		nr;
 
     if (!getline_equal(eap->getline, eap->cookie, getsourceline))
@@ -1931,9 +1909,10 @@
     else
     {
 	current_sctx.sc_version = nr;
+#ifdef FEAT_EVAL
 	SCRIPT_ITEM(current_sctx.sc_sid)->sn_version = nr;
-    }
 #endif
+    }
 }
 
 #if defined(FEAT_EVAL) || defined(PROTO)
@@ -1960,7 +1939,7 @@
     int		idx;
 
     if (reanimate)
-	((struct source_cookie *)getline_cookie(eap->getline,
+	((source_cookie_T *)getline_cookie(eap->getline,
 					      eap->cookie))->finished = FALSE;
 
     // Cleanup (and inactivate) conditionals, but stop when a try conditional
@@ -1974,7 +1953,7 @@
 	report_make_pending(CSTP_FINISH, NULL);
     }
     else
-	((struct source_cookie *)getline_cookie(eap->getline,
+	((source_cookie_T *)getline_cookie(eap->getline,
 					       eap->cookie))->finished = TRUE;
 }
 
@@ -1990,7 +1969,7 @@
     void	*cookie)
 {
     return (getline_equal(fgetline, cookie, getsourceline)
-	    && ((struct source_cookie *)getline_cookie(
+	    && ((source_cookie_T *)getline_cookie(
 						fgetline, cookie))->finished);
 }
 
diff -Nru vim-8.2.1913/src/search.c vim-8.2.2434/src/search.c
--- vim-8.2.1913/src/search.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/search.c	2021-01-30 22:05:11.000000000 +0000
@@ -134,7 +134,7 @@
     int		i;
 
     rc_did_emsg = FALSE;
-    magic = p_magic;
+    magic = magic_isset();
 
     /*
      * If no pattern given, use a previously defined pattern.
@@ -1341,7 +1341,8 @@
 	     * If there is a matching '/' or '?', toss it.
 	     */
 	    ps = strcopy;
-	    p = skip_regexp_ex(pat, search_delim, (int)p_magic, &strcopy, NULL);
+	    p = skip_regexp_ex(pat, search_delim, magic_isset(),
+							&strcopy, NULL, NULL);
 	    if (strcopy != ps)
 	    {
 		// made a copy of "pat" to change "\?" to "?"
@@ -3385,7 +3386,7 @@
 	sprintf((char *)pat, whole ? "\\<%.*s\\>" : "%.*s", len, ptr);
 	// ignore case according to p_ic, p_scs and pat
 	regmatch.rm_ic = ignorecase(pat);
-	regmatch.regprog = vim_regcomp(pat, p_magic ? RE_MAGIC : 0);
+	regmatch.regprog = vim_regcomp(pat, magic_isset() ? RE_MAGIC : 0);
 	vim_free(pat);
 	if (regmatch.regprog == NULL)
 	    goto fpip_end;
@@ -3393,7 +3394,8 @@
     inc_opt = (*curbuf->b_p_inc == NUL) ? p_inc : curbuf->b_p_inc;
     if (*inc_opt != NUL)
     {
-	incl_regmatch.regprog = vim_regcomp(inc_opt, p_magic ? RE_MAGIC : 0);
+	incl_regmatch.regprog = vim_regcomp(inc_opt,
+						 magic_isset() ? RE_MAGIC : 0);
 	if (incl_regmatch.regprog == NULL)
 	    goto fpip_end;
 	incl_regmatch.rm_ic = FALSE;	// don't ignore case in incl. pat.
@@ -3401,7 +3403,8 @@
     if (type == FIND_DEFINE && (*curbuf->b_p_def != NUL || *p_def != NUL))
     {
 	def_regmatch.regprog = vim_regcomp(*curbuf->b_p_def == NUL
-			   ? p_def : curbuf->b_p_def, p_magic ? RE_MAGIC : 0);
+			   ? p_def : curbuf->b_p_def,
+						 magic_isset() ? RE_MAGIC : 0);
 	if (def_regmatch.regprog == NULL)
 	    goto fpip_end;
 	def_regmatch.rm_ic = FALSE;	// don't ignore case in define pat.
@@ -3753,7 +3756,7 @@
 
 		    // we read a line, set "already" to check this "line" later
 		    // if depth >= 0 we'll increase files[depth].lnum far
-		    // bellow  -- Acevedo
+		    // below  -- Acevedo
 		    already = aux = p = skipwhite(line);
 		    p = find_word_start(p);
 		    p = find_word_end(p);
@@ -4258,8 +4261,10 @@
 // bonus for adjacent matches; this is higher than SEPARATOR_BONUS so that
 // matching a whole word is preferred.
 #define SEQUENTIAL_BONUS 40
-// bonus if match occurs after a separator
-#define SEPARATOR_BONUS 30
+// bonus if match occurs after a path separator
+#define PATH_SEPARATOR_BONUS 30
+// bonus if match occurs after a word separator
+#define WORD_SEPARATOR_BONUS 25
 // bonus if match is uppercase and prev is lower
 #define CAMEL_BONUS 30
 // bonus if the first letter is matched
@@ -4334,7 +4339,6 @@
 	    // Camel case
 	    int	neighbor = ' ';
 	    int	curr;
-	    int	neighborSeparator;
 
 	    if (has_mbyte)
 	    {
@@ -4355,10 +4359,11 @@
 	    if (vim_islower(neighbor) && vim_isupper(curr))
 		score += CAMEL_BONUS;
 
-	    // Separator
-	    neighborSeparator = neighbor == '_' || neighbor == ' ';
-	    if (neighborSeparator)
-		score += SEPARATOR_BONUS;
+	    // Bonus if the match follows a separator character
+	    if (neighbor == '/' || neighbor == '\\')
+		score += PATH_SEPARATOR_BONUS;
+	    else if (neighbor == ' ' || neighbor == '_')
+		score += WORD_SEPARATOR_BONUS;
 	}
 	else
 	{
@@ -4718,10 +4723,10 @@
 
 	// For matchfuzzy(), return a list of matched strings.
 	//	    ['str1', 'str2', 'str3']
-	// For matchfuzzypos(), return a list with two items.
+	// For matchfuzzypos(), return a list with three items.
 	// The first item is a list of matched strings. The second item
 	// is a list of lists where each list item is a list of matched
-	// character positions.
+	// character positions. The third item is a list of matching scores.
 	//	[['str1', 'str2', 'str3'], [[1, 3], [1, 3], [1, 3]]]
 	if (retmatchpos)
 	{
@@ -4744,7 +4749,7 @@
 	// next copy the list of matching positions
 	if (retmatchpos)
 	{
-	    li = list_find(fmatchlist, -1);
+	    li = list_find(fmatchlist, -2);
 	    if (li == NULL || li->li_tv.vval.v_list == NULL)
 		goto done;
 	    l = li->li_tv.vval.v_list;
@@ -4757,6 +4762,19 @@
 			list_append_list(l, ptrs[i].lmatchpos) == FAIL)
 		    goto done;
 	    }
+
+	    // copy the matching scores
+	    li = list_find(fmatchlist, -1);
+	    if (li == NULL || li->li_tv.vval.v_list == NULL)
+		goto done;
+	    l = li->li_tv.vval.v_list;
+	    for (i = 0; i < len; i++)
+	    {
+		if (ptrs[i].score == SCORE_NONE)
+		    break;
+		if (list_append_number(l, ptrs[i].score) == FAIL)
+		    goto done;
+	    }
 	}
     }
 
@@ -4837,9 +4855,15 @@
     {
 	list_T	*l;
 
-	// For matchfuzzypos(), a list with two items are returned. First item
-	// is a list of matching strings and the second item is a list of
-	// lists with matching positions within each string.
+	// For matchfuzzypos(), a list with three items are returned. First
+	// item is a list of matching strings, the second item is a list of
+	// lists with matching positions within each string and the third item
+	// is the list of scores of the matches.
+	l = list_alloc();
+	if (l == NULL)
+	    goto done;
+	if (list_append_list(rettv->vval.v_list, l) == FAIL)
+	    goto done;
 	l = list_alloc();
 	if (l == NULL)
 	    goto done;
diff -Nru vim-8.2.1913/src/session.c vim-8.2.2434/src/session.c
--- vim-8.2.1913/src/session.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/session.c	2021-01-30 22:05:11.000000000 +0000
@@ -397,6 +397,19 @@
 	}
     }
 
+    if (wp->w_alt_fnum)
+    {
+	buf_T *alt = buflist_findnr(wp->w_alt_fnum);
+
+	// Set the alternate file.
+	if (alt != NULL
+		&& alt->b_fname != NULL
+		&& *alt->b_fname != NUL
+		&& (fputs("balt ", fd) < 0
+		|| ses_fname(fd, alt, flagp, TRUE) == FAIL))
+	    return FAIL;
+    }
+
     // Local mappings and abbreviations.
     if ((*flagp & (SSOP_OPTIONS | SSOP_LOCALOPTIONS))
 					 && makemap(fd, wp->w_buffer) == FAIL)
@@ -447,9 +460,9 @@
 		    (long)wp->w_height / 2, (long)wp->w_height) < 0
 		|| put_eol(fd) == FAIL
 		|| put_line(fd, "if s:l < 1 | let s:l = 1 | endif") == FAIL
-		|| put_line(fd, "exe s:l") == FAIL
+		|| put_line(fd, "keepjumps exe s:l") == FAIL
 		|| put_line(fd, "normal! zt") == FAIL
-		|| fprintf(fd, "%ld", (long)wp->w_cursor.lnum) < 0
+		|| fprintf(fd, "keepjumps %ld", (long)wp->w_cursor.lnum) < 0
 		|| put_eol(fd) == FAIL)
 	    return FAIL;
 	// Restore the cursor column and left offset when not wrapping.
@@ -1216,7 +1229,7 @@
 #ifdef FEAT_SESSION
 	if (!failed && view_session)
 	{
-	    if (put_line(fd, "let s:so_save = &so | let s:siso_save = &siso | set so=0 siso=0") == FAIL)
+	    if (put_line(fd, "let s:so_save = &g:so | let s:siso_save = &g:siso | setg so=0 siso=0 | setl so=-1 siso=-1") == FAIL)
 		failed = TRUE;
 	    if (eap->cmdidx == CMD_mksession)
 	    {
@@ -1261,7 +1274,7 @@
 		failed |= (put_view(fd, curwin, !using_vdir, flagp, -1, NULL)
 								      == FAIL);
 	    }
-	    if (put_line(fd, "let &so = s:so_save | let &siso = s:siso_save")
+	    if (put_line(fd, "let &g:so = s:so_save | let &g:siso = s:siso_save")
 								      == FAIL)
 		failed = TRUE;
 #ifdef FEAT_SEARCH_EXTRA
diff -Nru vim-8.2.1913/src/spell.c vim-8.2.2434/src/spell.c
--- vim-8.2.1913/src/spell.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/spell.c	2021-01-30 22:05:11.000000000 +0000
@@ -3813,7 +3813,7 @@
 
     if (no_spell_checking(curwin))
 	return;
-    get_option_value((char_u*)"spl", &dummy, &spl, OPT_LOCAL);
+    (void)get_option_value((char_u*)"spl", &dummy, &spl, OPT_LOCAL);
 
     // Create a new empty buffer in a new window.
     do_cmdline_cmd((char_u *)"new");
@@ -4340,7 +4340,7 @@
     char_u *s;
 
     for (s = val; *s != NUL; ++s)
-	if (!vim_isfilec(*s) && *s != ',')
+	if (!vim_isfilec(*s) && *s != ',' && *s != ' ')
 	    return FALSE;
     return TRUE;
 }
diff -Nru vim-8.2.1913/src/spellsuggest.c vim-8.2.2434/src/spellsuggest.c
--- vim-8.2.1913/src/spellsuggest.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/spellsuggest.c	2021-01-30 22:05:11.000000000 +0000
@@ -770,6 +770,7 @@
     int		c;
     int		i;
     langp_T	*lp;
+    int		did_intern = FALSE;
 
     // Set the info in "*su".
     CLEAR_POINTER(su);
@@ -863,12 +864,13 @@
 	else if (STRNCMP(buf, "file:", 5) == 0)
 	    // Use list of suggestions in a file.
 	    spell_suggest_file(su, buf + 5);
-	else
+	else if (!did_intern)
 	{
-	    // Use internal method.
+	    // Use internal method once.
 	    spell_suggest_intern(su, interactive);
 	    if (sps_flags & SPS_DOUBLE)
 		do_combine = TRUE;
+	    did_intern = TRUE;
 	}
     }
 
diff -Nru vim-8.2.1913/src/structs.h vim-8.2.2434/src/structs.h
--- vim-8.2.1913/src/structs.h	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/structs.h	2021-01-30 22:05:11.000000000 +0000
@@ -83,9 +83,11 @@
  * sc_version is also here, for convenience.
  */
 typedef struct {
+#ifdef FEAT_EVAL
     scid_T	sc_sid;		// script ID
     int		sc_seq;		// sourcing sequence number
     linenr_T	sc_lnum;	// line number
+#endif
     int		sc_version;	// :scriptversion
 } sctx_T;
 
@@ -1224,8 +1226,8 @@
     char	m_silent;	// <silent> used, don't echo commands
     char	m_nowait;	// <nowait> used
 #ifdef FEAT_EVAL
-    char	m_expr;		// <expr> used, m_str is an expression
     sctx_T	m_script_ctx;	// SCTX where map was defined
+    char	m_expr;		// <expr> used, m_str is an expression
 #endif
 };
 
@@ -1363,6 +1365,7 @@
 typedef struct cbq_S cbq_T;
 typedef struct channel_S channel_T;
 typedef struct cctx_S cctx_T;
+typedef struct ectx_S ectx_T;
 
 typedef enum
 {
@@ -1478,6 +1481,7 @@
 	    int		lv_idx;		// cached index of an item
 	} mat;
     } lv_u;
+    type_T	*lv_type;	// allocated by alloc_type()
     list_T	*lv_copylist;	// copied list used by deepcopy()
     list_T	*lv_used_next;	// next list in used lists list
     list_T	*lv_used_prev;	// previous list in used lists list
@@ -1541,6 +1545,7 @@
     int		dv_refcount;	// reference count
     int		dv_copyID;	// ID used by deepcopy()
     hashtab_T	dv_hashtab;	// hashtab that refers to the items
+    type_T	*dv_type;	// allocated by alloc_type()
     dict_T	*dv_copydict;	// copied dict used by deepcopy()
     dict_T	*dv_used_next;	// next dict in used dicts list
     dict_T	*dv_used_prev;	// previous dict in used dicts list
@@ -1562,14 +1567,17 @@
 // type of getline() last argument
 typedef enum {
     GETLINE_NONE,	    // do not concatenate any lines
-    GETLINE_CONCAT_CONT,    // concatenate continuation lines
+    GETLINE_CONCAT_CONT,    // concatenate continuation lines with backslash
+    GETLINE_CONCAT_CONTBAR, // concatenate continuation lines with \ and |
     GETLINE_CONCAT_ALL	    // concatenate continuation and Vim9 # comment lines
 } getline_opt_T;
 
+typedef struct svar_S svar_T;
+
 #if defined(FEAT_EVAL) || defined(PROTO)
 typedef struct funccall_S funccall_T;
 
-// values used for "uf_dfunc_idx"
+// values used for "uf_def_status"
 typedef enum {
     UF_NOT_COMPILED,
     UF_TO_BE_COMPILED,
@@ -1598,6 +1606,9 @@
     garray_T	uf_type_list;	// types used in arg and return types
     int		*uf_def_arg_idx; // instruction indexes for evaluating
 				// uf_def_args; length: uf_def_args.ga_len + 1
+    partial_T	*uf_partial;	// for closure created inside :def function:
+				// information about the context
+
     char_u	*uf_va_name;	// name from "...name" or NULL
     type_T	*uf_va_type;	// type from "...name: type" or NULL
     type_T	*uf_func_type;	// type of the function, &t_func_any if unknown
@@ -1688,7 +1699,8 @@
 #ifdef FEAT_PROFILE
     proftime_T	prof_child;	// time spent in a child
 #endif
-    funccall_T	*caller;	// calling function or NULL
+    funccall_T	*caller;	// calling function or NULL; or next funccal in
+				// list pointed to by previous_funccal.
 
     // for closure
     int		fc_refcount;	// number of user functions that reference this
@@ -1761,37 +1773,38 @@
 /*
  * Entry for "sn_var_vals".  Used for script-local variables.
  */
-typedef struct {
+struct svar_S {
     char_u	*sv_name;	// points into "sn_all_vars" di_key
     typval_T	*sv_tv;		// points into "sn_vars" or "sn_all_vars" di_tv
     type_T	*sv_type;
-    int		sv_const;
+    int		sv_const;	// 0, ASSIGN_CONST or ASSIGN_FINAL
     int		sv_export;	// "export let var = val"
-} svar_T;
+};
 
 typedef struct {
     char_u	*imp_name;	    // name imported as (allocated)
     int		imp_sid;	    // script ID of "from"
 
-    // for "import * as Name", "imp_name" is "Name"
-    int		imp_all;
+    int		imp_flags;	    // IMP_FLAGS_ values
 
-    // for variable
+    // for a variable
     type_T	*imp_type;
     int		imp_var_vals_idx;   // index in sn_var_vals of "from"
 
-    // for function
+    // for a function
     char_u	*imp_funcname;	    // user func name (NOT allocated)
 } imported_T;
 
+#define IMP_FLAGS_STAR		1   // using "import * as Name"
+#define IMP_FLAGS_RELOAD	2   // script reloaded, OK to redefine
+
 /*
- * Growarray to store info about already sourced scripts.
- * For Unix also store the dev/ino, so that we don't have to stat() each
- * script when going through the list.
+ * Info about an already sourced scripts.
  */
 typedef struct
 {
     char_u	*sn_name;
+    int		sn_script_seq;	    // latest sctx_T sc_seq value
 
     // "sn_vars" stores the s: variables currently valid.  When leaving a block
     // variables local to that block are removed.
@@ -1817,7 +1830,7 @@
     int		sn_last_block_id;  // Unique ID for each script block
 
     int		sn_version;	// :scriptversion
-    int		sn_had_command;	// TRUE if any command was executed
+    int		sn_state;	// SN_STATE_ values
     char_u	*sn_save_cpo;	// 'cpo' value when :vim9script found
 
 # ifdef FEAT_PROFILE
@@ -1841,6 +1854,10 @@
 # endif
 } scriptitem_T;
 
+#define SN_STATE_NEW		0   // newly loaded script, nothing done
+#define SN_STATE_RELOAD		1   // script loaded before, nothing done
+#define SN_STATE_HAD_COMMAND	9   // a command was executed
+
 // Struct passed through eval() functions.
 // See EVALARG_EVALUATE for a fixed value with eval_flags set to EVAL_EVALUATE.
 typedef struct {
@@ -1882,6 +1899,18 @@
 } sn_prl_T;
 
 #  define PRL_ITEM(si, idx)	(((sn_prl_T *)(si)->sn_prl_ga.ga_data)[(idx)])
+
+typedef struct {
+    int		pi_started_profiling;
+    proftime_T	pi_wait_start;
+    proftime_T	pi_call_start;
+} profinfo_T;
+
+# else
+typedef struct
+{
+    int	    dummy;
+} profinfo_T;
 # endif
 #else
 // dummy typedefs for use in function prototypes
@@ -1927,6 +1956,7 @@
     partial_T	*partial;	// for extra arguments
     dict_T	*selfdict;	// Dictionary for "self"
     typval_T	*basetv;	// base for base->method()
+    type_T	*check_type;	// type from funcref or NULL
 } funcexe_T;
 
 /*
@@ -1947,6 +1977,14 @@
     int		fs_copyID;	// for garray_T collection
 } funcstack_T;
 
+typedef struct outer_S outer_T;
+struct outer_S {
+    garray_T	*out_stack;	    // stack from outer scope
+    int		out_frame_idx;	    // index of stack frame in out_stack
+    outer_T	*out_up;	    // outer scope of outer scope or NULL
+    int		out_up_is_copy;	    // don't free out_up
+};
+
 struct partial_S
 {
     int		pt_refcount;	// reference count
@@ -1957,11 +1995,11 @@
     int		pt_auto;	// when TRUE the partial was created for using
 				// dict.member in handle_subscript()
 
-    // For a compiled closure: the arguments and local variables.
-    garray_T	*pt_ectx_stack;	    // where to find local vars
-    int		pt_ectx_frame;	    // index of function frame in uf_ectx_stack
-    funcstack_T	*pt_funcstack;	    // copy of stack, used after context
-				    // function returns
+    // For a compiled closure: the arguments and local variables scope
+    outer_T	pt_outer;
+
+    funcstack_T	*pt_funcstack;	// copy of stack, used after context
+				// function returns
 
     int		pt_argc;	// number of arguments
     typval_T	*pt_argv;	// arguments in allocated array
@@ -3347,6 +3385,10 @@
 				    // top of the window
     char	w_topline_was_set;  // flag set to TRUE when topline is set,
 				    // e.g. by winrestview()
+
+    linenr_T	w_botline;	    // number of the line below the bottom of
+				    // the window
+
 #ifdef FEAT_DIFF
     int		w_topfill;	    // number of filler lines above w_topline
     int		w_old_topfill;	    // w_topfill at last redraw
@@ -3360,6 +3402,12 @@
     colnr_T	w_skipcol;	    // starting column when a single line
 				    // doesn't fit in the window
 
+    int		w_empty_rows;	    // number of ~ rows in window
+#ifdef FEAT_DIFF
+    int		w_filler_rows;	    // number of filler rows at the end of the
+				    // window
+#endif
+
     /*
      * Layout of the window in the screen.
      * May need to add "msg_scrolled" to "w_winrow" in rare situations.
@@ -3367,11 +3415,14 @@
     int		w_winrow;	    // first row of window in screen
     int		w_height;	    // number of rows in window, excluding
 				    // status/command/winbar line(s)
+
     int		w_status_height;    // number of status lines (0 or 1)
     int		w_wincol;	    // Leftmost column of window in screen.
     int		w_width;	    // Width of window, excluding separation.
     int		w_vsep_width;	    // Number of separator columns (0 or 1).
+
     pos_save_T	w_save_cursor;	    // backup of cursor pos and topline
+
 #ifdef FEAT_PROP_POPUP
     int		w_popup_flags;	    // POPF_ values
     int		w_popup_handled;    // POPUP_HANDLE[0-9] flags
@@ -3432,8 +3483,14 @@
 # if defined(FEAT_TIMERS)
     timer_T	*w_popup_timer;	    // timer for closing popup window
 # endif
-#endif
 
+    int		w_flags;	    // WFLAG_ flags
+
+# define WFLAG_WCOL_OFF_ADDED	1   // popup border and padding were added to
+				    // w_wcol
+# define WFLAG_WROW_OFF_ADDED	2   // popup border and padding were added to
+				    // w_wrow
+#endif
 
     /*
      * === start of cached values ====
@@ -3474,14 +3531,6 @@
      */
     int		w_wrow, w_wcol;	    // cursor position in window
 
-    linenr_T	w_botline;	    // number of the line below the bottom of
-				    // the window
-    int		w_empty_rows;	    // number of ~ rows in window
-#ifdef FEAT_DIFF
-    int		w_filler_rows;	    // number of filler rows at the end of the
-				    // window
-#endif
-
     /*
      * Info about the lines currently in the window is remembered to avoid
      * recomputing it every time.  The allocated size of w_lines[] is Rows.
@@ -3888,13 +3937,13 @@
  */
 typedef struct
 {
-    buf_T	*save_curbuf;	// saved curbuf
-    int		use_aucmd_win;	// using aucmd_win
-    win_T	*save_curwin;	// saved curwin
-    win_T	*new_curwin;	// new curwin
-    win_T	*save_prevwin;	// saved prevwin
-    bufref_T	new_curbuf;	// new curbuf
-    char_u	*globaldir;	// saved value of globaldir
+    buf_T	*save_curbuf;	    // saved curbuf
+    int		use_aucmd_win;	    // using aucmd_win
+    int		save_curwin_id;	    // ID of saved curwin
+    int		new_curwin_id;	    // ID of new curwin
+    int		save_prevwin_id;    // ID of saved prevwin
+    bufref_T	new_curbuf;	    // new curbuf
+    char_u	*globaldir;	    // saved value of globaldir
 } aco_save_T;
 
 /*
@@ -4000,7 +4049,7 @@
     EXPR_MULT,		// *
     EXPR_DIV,		// /
     EXPR_REM,		// %
-} exptype_T;
+} exprtype_T;
 
 /*
  * Structure used for reading in json_decode().
@@ -4143,6 +4192,7 @@
     int		save_finish_op;
     int		save_opcount;
     int		save_reg_executing;
+    int		save_script_version;
     tasave_T	tabuf;
 } save_state_T;
 
@@ -4262,6 +4312,32 @@
     int		sa_wrapped;	// search wrapped around
 } searchit_arg_T;
 
+/*
+ * Cookie used by getsourceline().
+ */
+/*
+ * Cookie used to store info for each sourced file.
+ * It is shared between do_source() and getsourceline().
+ * This is passed to do_cmdline().
+ */
+typedef struct {
+    FILE	*fp;		// opened file for sourcing
+    char_u	*nextline;	// if not NULL: line that was read ahead
+    linenr_T	sourcing_lnum;	// line number of the source file
+    int		finished;	// ":finish" used
+#ifdef USE_CRNL
+    int		fileformat;	// EOL_UNKNOWN, EOL_UNIX or EOL_DOS
+    int		error;		// TRUE if LF found after CR-LF
+#endif
+#ifdef FEAT_EVAL
+    linenr_T	breakpoint;	// next line with breakpoint or zero
+    char_u	*fname;		// name of sourced file
+    int		dbg_tick;	// debug_tick when breakpoint was set
+    int		level;		// top nesting level of sourced file
+#endif
+    vimconv_T	conv;		// type of conversion
+} source_cookie_T;
+
 
 #define WRITEBUFSIZE	8192	// size of normal write buffer
 
@@ -4291,3 +4367,21 @@
 // We have to guess how much a sequence of bytes may expand when converting
 // with iconv() to be able to allocate a buffer.
 #define ICONV_MULT 8
+
+// Used for "magic_overruled".
+typedef enum {
+    OPTION_MAGIC_NOT_SET,	// p_magic not overruled
+    OPTION_MAGIC_ON,		// magic on inside regexp
+    OPTION_MAGIC_OFF		// magic off inside regexp
+} optmagic_T;
+
+// Magicness of a pattern, used by regexp code.
+// The order and values matter:
+//  magic <= MAGIC_OFF includes MAGIC_NONE
+//  magic >= MAGIC_ON  includes MAGIC_ALL
+typedef enum {
+    MAGIC_NONE = 1,		// "\V" very unmagic
+    MAGIC_OFF = 2,		// "\M" or 'magic' off
+    MAGIC_ON = 3,		// "\m" or 'magic'
+    MAGIC_ALL = 4		// "\v" very magic
+} magic_T;
diff -Nru vim-8.2.1913/src/syntax.c vim-8.2.2434/src/syntax.c
--- vim-8.2.1913/src/syntax.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/syntax.c	2021-01-30 22:05:11.000000000 +0000
@@ -2606,8 +2606,6 @@
 	{
 	    sip->si_attr = CUR_STATE(idx - 1).si_attr;
 	    sip->si_trans_id = CUR_STATE(idx - 1).si_trans_id;
-	    sip->si_h_startpos = CUR_STATE(idx - 1).si_h_startpos;
-	    sip->si_h_endpos = CUR_STATE(idx - 1).si_h_endpos;
 	    if (sip->si_cont_list == NULL)
 	    {
 		sip->si_flags |= HL_TRANS_CONT;
@@ -3869,9 +3867,14 @@
 		msg_puts(_("no syncing"));
 	    else
 	    {
-		msg_puts(_("syncing starts "));
-		msg_outnum(curwin->w_s->b_syn_sync_minlines);
-		msg_puts(_(" lines before top line"));
+		if (curwin->w_s->b_syn_sync_minlines == MAXLNUM)
+		    msg_puts(_("syncing starts at the first line"));
+		else
+		{
+		    msg_puts(_("syncing starts "));
+		    msg_outnum(curwin->w_s->b_syn_sync_minlines);
+		    msg_puts(_(" lines before top line"));
+		}
 		syn_match_msg();
 	    }
 	    return;
@@ -3935,19 +3938,24 @@
 				      || curwin->w_s->b_syn_sync_minlines > 0)
     {
 	msg_puts("; ");
-	if (curwin->w_s->b_syn_sync_minlines > 0)
-	{
-	    msg_puts(_("minimal "));
-	    msg_outnum(curwin->w_s->b_syn_sync_minlines);
-	    if (curwin->w_s->b_syn_sync_maxlines)
-		msg_puts(", ");
-	}
-	if (curwin->w_s->b_syn_sync_maxlines > 0)
+	if (curwin->w_s->b_syn_sync_minlines == MAXLNUM)
+	    msg_puts(_("from the first line"));
+	else
 	{
-	    msg_puts(_("maximal "));
-	    msg_outnum(curwin->w_s->b_syn_sync_maxlines);
+	    if (curwin->w_s->b_syn_sync_minlines > 0)
+	    {
+		msg_puts(_("minimal "));
+		msg_outnum(curwin->w_s->b_syn_sync_minlines);
+		if (curwin->w_s->b_syn_sync_maxlines)
+		    msg_puts(", ");
+	    }
+	    if (curwin->w_s->b_syn_sync_maxlines > 0)
+	    {
+		msg_puts(_("maximal "));
+		msg_outnum(curwin->w_s->b_syn_sync_maxlines);
+	    }
+	    msg_puts(_(" lines before top line"));
 	}
-	msg_puts(_(" lines before top line"));
     }
 }
 
@@ -5662,7 +5670,7 @@
 
     // Make 'cpoptions' empty, to avoid the 'l' flag
     cpo_save = p_cpo;
-    p_cpo = (char_u *)"";
+    p_cpo = empty_option;
     ci->sp_prog = vim_regcomp(ci->sp_pattern, RE_MAGIC);
     p_cpo = cpo_save;
 
@@ -5850,7 +5858,7 @@
 
 		// Make 'cpoptions' empty, to avoid the 'l' flag
 		cpo_save = p_cpo;
-		p_cpo = (char_u *)"";
+		p_cpo = empty_option;
 		curwin->w_s->b_syn_linecont_prog =
 		       vim_regcomp(curwin->w_s->b_syn_linecont_pat, RE_MAGIC);
 		p_cpo = cpo_save;
@@ -6697,7 +6705,7 @@
 {
     int		idx;
     synpat_T	*spp;
-# ifdef FEAT_FLOAT
+# if defined(FEAT_RELTIME) && defined(FEAT_FLOAT)
     proftime_T	tm;
 # endif
     int		len;
@@ -6727,7 +6735,7 @@
 	    p->match = spp->sp_time.match;
 	    total_count += spp->sp_time.count;
 	    p->slowest = spp->sp_time.slowest;
-# ifdef FEAT_FLOAT
+# if defined(FEAT_RELTIME) && defined(FEAT_FLOAT)
 	    profile_divide(&spp->sp_time.total, spp->sp_time.count, &tm);
 	    p->average = tm;
 # endif
diff -Nru vim-8.2.1913/src/tag.c vim-8.2.2434/src/tag.c
--- vim-8.2.1913/src/tag.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/tag.c	2021-01-30 22:05:11.000000000 +0000
@@ -1271,7 +1271,7 @@
 	else
 	    for (pats->headlen = 0; pats->head[pats->headlen] != NUL;
 							      ++pats->headlen)
-		if (vim_strchr((char_u *)(p_magic ? ".[~*\\$" : "\\$"),
+		if (vim_strchr((char_u *)(magic_isset() ? ".[~*\\$" : "\\$"),
 					   pats->head[pats->headlen]) != NULL)
 		    break;
 	if (p_tl != 0 && pats->headlen > p_tl)	// adjust for 'taglength'
@@ -1279,7 +1279,8 @@
     }
 
     if (has_re)
-	pats->regmatch.regprog = vim_regcomp(pats->pat, p_magic ? RE_MAGIC : 0);
+	pats->regmatch.regprog = vim_regcomp(pats->pat,
+						 magic_isset() ? RE_MAGIC : 0);
     else
 	pats->regmatch.regprog = NULL;
 }
@@ -3311,7 +3312,7 @@
     int		keep_help)	// keep help flag (FALSE for cscope)
 {
     int		save_secure;
-    int		save_magic;
+    optmagic_T	save_magic_overruled;
     int		save_p_ws, save_p_scs, save_p_ic;
     linenr_T	save_lnum;
     char_u	*str;
@@ -3503,8 +3504,8 @@
 #ifdef HAVE_SANDBOX
 	++sandbox;
 #endif
-	save_magic = p_magic;
-	p_magic = FALSE;	// always execute with 'nomagic'
+	save_magic_overruled = magic_overruled;
+	magic_overruled = OPTION_MAGIC_OFF;	// always execute with 'nomagic'
 #ifdef FEAT_SEARCH_EXTRA
 	// Save value of no_hlsearch, jumping to a tag is not a real search
 	save_no_hlsearch = no_hlsearch;
@@ -3626,7 +3627,7 @@
 	if (secure == 2)
 	    wait_return(TRUE);
 	secure = save_secure;
-	p_magic = save_magic;
+	magic_overruled = save_magic_overruled;
 #ifdef HAVE_SANDBOX
 	--sandbox;
 #endif
@@ -4200,7 +4201,7 @@
 	// parse 'from' for the cursor position before the tag jump
 	if ((di = dict_find(itemdict, (char_u *)"from", -1)) == NULL)
 	    continue;
-	if (list2fpos(&di->di_tv, &mark, &fnum, NULL) != OK)
+	if (list2fpos(&di->di_tv, &mark, &fnum, NULL, FALSE) != OK)
 	    continue;
 	if ((tagname =
 		dict_get_string(itemdict, (char_u *)"tagname", TRUE)) == NULL)
diff -Nru vim-8.2.1913/src/term.c vim-8.2.2434/src/term.c
--- vim-8.2.1913/src/term.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/term.c	2021-01-30 22:05:11.000000000 +0000
@@ -38,7 +38,7 @@
  * argument for tputs().
  */
 # ifdef VMS
-#  define TPUTSFUNCAST
+#  define TPUTSFUNCAST (void (*)(unsigned int))
 # else
 #  ifdef HAVE_OUTFUNTYPE
 #   define TPUTSFUNCAST (outfuntype)
@@ -196,6 +196,11 @@
 
 static int  detected_8bit = FALSE;	// detected 8-bit terminal
 
+#if (defined(UNIX) || defined(VMS))
+static int focus_mode = FALSE; // xterm's "focus reporting" availability
+static int focus_state = FALSE; // TRUE if the terminal window gains focus
+#endif
+
 #ifdef FEAT_TERMRESPONSE
 // When the cursor shape was detected these values are used:
 // 1: block, 2: underline, 3: vertical bar
@@ -297,7 +302,7 @@
     {(int)KS_UE,	"\033[0m"},
     {(int)KS_CZH,	"\033[3m"},
     {(int)KS_CZR,	"\033[0m"},
-#if defined(__MORPHOS__) || defined(__AROS__)
+#if defined(__amigaos4__) || defined(__MORPHOS__) || defined(__AROS__)
     {(int)KS_CCO,	"8"},		// allow 8 colors
 #  ifdef TERMINFO
     {(int)KS_CAB,	"\033[4%p1%dm"},// set background color
@@ -908,16 +913,20 @@
     {(int)KS_CRT,	IF_EB("\033[23;2t", ESC_STR "[23;2t")},
     {(int)KS_SSI,	IF_EB("\033[22;1t", ESC_STR "[22;1t")},
     {(int)KS_SRI,	IF_EB("\033[23;1t", ESC_STR "[23;1t")},
+#  if (defined(UNIX) || defined(VMS))
+    {(int)KS_FD,	IF_EB("\033[?1004l", ESC_STR "[?1004l")},
+    {(int)KS_FE,	IF_EB("\033[?1004h", ESC_STR "[?1004h")},
+#  endif
 
     {K_UP,		IF_EB("\033O*A", ESC_STR "O*A")},
     {K_DOWN,		IF_EB("\033O*B", ESC_STR "O*B")},
     {K_RIGHT,		IF_EB("\033O*C", ESC_STR "O*C")},
     {K_LEFT,		IF_EB("\033O*D", ESC_STR "O*D")},
     // An extra set of cursor keys for vt100 mode
-    {K_XUP,		IF_EB("\033[1;*A", ESC_STR "[1;*A")},
-    {K_XDOWN,		IF_EB("\033[1;*B", ESC_STR "[1;*B")},
-    {K_XRIGHT,		IF_EB("\033[1;*C", ESC_STR "[1;*C")},
-    {K_XLEFT,		IF_EB("\033[1;*D", ESC_STR "[1;*D")},
+    {K_XUP,		IF_EB("\033[@;*A", ESC_STR "[@;*A")},
+    {K_XDOWN,		IF_EB("\033[@;*B", ESC_STR "[@;*B")},
+    {K_XRIGHT,		IF_EB("\033[@;*C", ESC_STR "[@;*C")},
+    {K_XLEFT,		IF_EB("\033[@;*D", ESC_STR "[@;*D")},
     // An extra set of function keys for vt100 mode
     {K_XF1,		IF_EB("\033O*P", ESC_STR "O*P")},
     {K_XF2,		IF_EB("\033O*Q", ESC_STR "O*Q")},
@@ -1800,7 +1809,7 @@
     mch_errmsg(_("defaulting to '"));
     mch_errmsg((char *)term);
     mch_errmsg("'\r\n");
-    if (emsg_silent == 0)
+    if (emsg_silent == 0 && !in_assert_fails)
     {
 	screen_start();	// don't know where cursor is now
 	out_flush();
@@ -2044,6 +2053,27 @@
     set_mouse_termcode(KS_MOUSE, (char_u *)"\233M");
 #endif
 
+#ifdef FEAT_MOUSE_XTERM
+    // focus reporting is supported by xterm compatible terminals and tmux.
+    if (use_xterm_like_mouse(term))
+    {
+	char_u name[3];
+
+	// handle focus in event
+	name[0] = KS_EXTRA;
+	name[1] = KE_FOCUSGAINED;
+	name[2] = NUL;
+	add_termcode(name, (char_u *)"\033[I", FALSE);
+
+	// handle focus out event
+	name[1] = KE_FOCUSLOST;
+	add_termcode(name, (char_u *)"\033[O", FALSE);
+
+	focus_mode = TRUE;
+	focus_state = TRUE;
+    }
+#endif
+
 #ifdef USE_TERM_CONSOLE
     // DEFAULT_TERM indicates that it is the machine console.
     if (STRCMP(term, DEFAULT_TERM) != 0)
@@ -2519,7 +2549,12 @@
 	if (ch_log_output)
 	{
 	    out_buf[len] = NUL;
-	    ch_log(NULL, "raw terminal output: \"%s\"", out_buf);
+	    ch_log(NULL, "raw %s output: \"%s\"",
+# ifdef FEAT_GUI
+			(gui.in_use && !gui.dying && !gui.starting) ? "GUI" :
+# endif
+			"terminal",
+			out_buf);
 	    ch_log_output = FALSE;
 	}
 #endif
@@ -2678,7 +2713,7 @@
 		else
 		{
 		    ++p;
-		    do_sleep(duration);
+		    do_sleep(duration, FALSE);
 		}
 # else
 		// Rely on the terminal library to sleep.
@@ -3411,9 +3446,10 @@
 	return;
 
     // curwin->w_buffer can be NULL when we are closing a window and the
-    // buffer has already been closed and removing a scrollbar causes a resize
-    // event. Don't resize then, it will happen after entering another buffer.
-    if (curwin->w_buffer == NULL)
+    // buffer (or window) has already been closed and removing a scrollbar
+    // causes a resize event. Don't resize then, it will happen after entering
+    // another buffer.
+    if (curwin->w_buffer == NULL || curwin->w_lines == NULL)
 	return;
 
     ++busy;
@@ -3581,6 +3617,13 @@
 	out_str(T_CTI);			// start "raw" mode
 	out_str(T_KS);			// start "keypad transmit" mode
 	out_str(T_BE);			// enable bracketed paste mode
+
+#if (defined(UNIX) || defined(VMS))
+	// enable xterm's focus reporting mode
+	if (focus_mode && *T_FE != NUL)
+	    out_str(T_FE);
+#endif
+
 	out_flush();
 	termcap_active = TRUE;
 	screen_start();			// don't know where cursor is now
@@ -3632,6 +3675,13 @@
 #ifdef FEAT_JOB_CHANNEL
 	ch_log_output = TRUE;
 #endif
+
+#if (defined(UNIX) || defined(VMS))
+	// disable xterm's focus reporting mode
+	if (focus_mode && *T_FD != NUL)
+	    out_str(T_FD);
+#endif
+
 	out_str(T_BD);			// disable bracketed paste mode
 	out_str(T_KE);			// stop "keypad transmit" mode
 	out_flush();
@@ -3744,7 +3794,7 @@
 #endif
 	LOG_TR(("Sending xterm compatibility test sequence."));
 	// Do this in the third row.  Second row is used by ambiguous
-	// chararacter width check.
+	// character width check.
 	term_windgoto(2, 0);
 	// send the test DCS string.
 	out_str((char_u *)"\033Pzz\033\\");
@@ -4230,7 +4280,12 @@
     termcodes[i].modlen = 0;
     j = termcode_star(s, len);
     if (j > 0)
+    {
 	termcodes[i].modlen = len - 1 - j;
+	// For "CSI[@;X" the "@" is not included in "modlen".
+	if (termcodes[i].code[termcodes[i].modlen - 1] == '@')
+	    --termcodes[i].modlen;
+    }
     ++tc_len;
 }
 
@@ -4242,7 +4297,7 @@
     static int
 termcode_star(char_u *code, int len)
 {
-    // Shortest is <M-O>*X.  With ; shortest is <CSI>1;*X
+    // Shortest is <M-O>*X.  With ; shortest is <CSI>@;*X
     if (len >= 3 && code[len - 2] == '*')
     {
 	if (len >= 5 && code[len - 3] == ';')
@@ -4462,7 +4517,8 @@
     if (modifiers != 0)
     {
 	// Some keys have the modifier included.  Need to handle that here to
-	// make mappings work.
+	// make mappings work.  This may result in a special key, such as
+	// K_S_TAB.
 	*key = simplify_key(*key, &modifiers);
 	if (modifiers != 0)
 	{
@@ -4530,7 +4586,7 @@
 
 /*
  * Handle a response to T_CRV: {lead}{first}{x};{vers};{y}c
- * Xterm and alikes use '>' for {first}.
+ * Xterm and alike use '>' for {first}.
  * Rxvt sends "{lead}?1;2c".
  */
     static void
@@ -4793,7 +4849,13 @@
     // insert modifiers with KS_MODIFIER
     new_slen = modifiers2keycode(modifiers, &key, string);
 
-    if (has_mbyte)
+    if (IS_SPECIAL(key))
+    {
+	string[new_slen++] = K_SPECIAL;
+	string[new_slen++] = KEY2TERMCAP0(key);
+	string[new_slen++] = KEY2TERMCAP1(key);
+    }
+    else if (has_mbyte)
 	new_slen += (*mb_char2bytes)(key, string + new_slen);
     else
 	string[new_slen++] = key;
@@ -5277,6 +5339,8 @@
 	else
 #endif // FEAT_GUI
 	{
+	    int  mouse_index_found = -1;
+
 	    for (idx = 0; idx < tc_len; ++idx)
 	    {
 		/*
@@ -5314,23 +5378,42 @@
 			    }
 		    }
 
-		    key_name[0] = termcodes[idx].name[0];
-		    key_name[1] = termcodes[idx].name[1];
-		    break;
+		    // The mouse termcode "ESC [" is also the prefix of
+		    // "ESC [ I" (focus gained).  Only use it when there is
+		    // no other match.  Do use it when a digit is following to
+		    // avoid waiting for more bytes.
+		    if (slen == 2 && len > 2
+			    && termcodes[idx].code[0] == ESC
+			    && termcodes[idx].code[1] == '['
+			    && !isdigit(tp[2]))
+		    {
+			if (mouse_index_found < 0)
+			    mouse_index_found = idx;
+		    }
+		    else
+		    {
+			key_name[0] = termcodes[idx].name[0];
+			key_name[1] = termcodes[idx].name[1];
+			break;
+		    }
 		}
 
 		/*
 		 * Check for code with modifier, like xterm uses:
 		 * <Esc>[123;*X  (modslen == slen - 3)
+		 * <Esc>[@;*X    (matches <Esc>[X and <Esc>[1;9X )
 		 * Also <Esc>O*X and <M-O>*X (modslen == slen - 2).
 		 * When there is a modifier the * matches a number.
 		 * When there is no modifier the ;* or * is omitted.
 		 */
-		if (termcodes[idx].modlen > 0)
+		if (termcodes[idx].modlen > 0 && mouse_index_found < 0)
 		{
+		    int at_code;
+
 		    modslen = termcodes[idx].modlen;
 		    if (cpo_koffset && offset && len < modslen)
 			continue;
+		    at_code = termcodes[idx].code[modslen] == '@';
 		    if (STRNCMP(termcodes[idx].code, tp,
 				(size_t)(modslen > len ? len : modslen)) == 0)
 		    {
@@ -5340,9 +5423,14 @@
 			    return -1;		// need to get more chars
 
 			if (tp[modslen] == termcodes[idx].code[slen - 1])
-			    slen = modslen + 1;	// no modifiers
+			    // no modifiers
+			    slen = modslen + 1;
 			else if (tp[modslen] != ';' && modslen == slen - 3)
-			    continue;	// no match
+			    // no match for "code;*X" with "code;"
+			    continue;
+			else if (at_code && tp[modslen] != '1')
+			    // no match for "<Esc>[@" with "<Esc>[1"
+			    continue;
 			else
 			{
 			    // Skip over the digits, the final char must
@@ -5371,6 +5459,11 @@
 		    }
 		}
 	    }
+	    if (idx == tc_len && mouse_index_found >= 0)
+	    {
+		key_name[0] = termcodes[mouse_index_found].name[0];
+		key_name[1] = termcodes[mouse_index_found].name[1];
+	    }
 	}
 
 #ifdef FEAT_TERMRESPONSE
@@ -5625,6 +5718,41 @@
 # endif // !USE_ON_FLY_SCROLL
 #endif // FEAT_GUI
 
+#if (defined(UNIX) || defined(VMS))
+	/*
+	 * Handle FocusIn/FocusOut event sequences reported by XTerm.
+	 * (CSI I/CSI O)
+	 */
+	if (focus_mode
+# ifdef FEAT_GUI
+		&& !gui.in_use
+# endif
+		&& key_name[0] == KS_EXTRA
+	    )
+	{
+	    if (key_name[1] == KE_FOCUSGAINED)
+	    {
+		if (!focus_state)
+		{
+		    ui_focus_change(TRUE);
+		    did_cursorhold = TRUE;
+		    focus_state = TRUE;
+		}
+		key_name[1] = (int)KE_IGNORE;
+	    }
+	    else if (key_name[1] == KE_FOCUSLOST)
+	    {
+		if (focus_state)
+		{
+		    ui_focus_change(FALSE);
+		    did_cursorhold = TRUE;
+		    focus_state = FALSE;
+		}
+		key_name[1] = (int)KE_IGNORE;
+	    }
+	}
+#endif
+
 	/*
 	 * Change <xHome> to <Home>, <xUp> to <Up>, etc.
 	 */
diff -Nru vim-8.2.1913/src/term.h vim-8.2.2434/src/term.h
--- vim-8.2.1913/src/term.h	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/term.h	2021-01-30 22:05:11.000000000 +0000
@@ -109,10 +109,12 @@
     KS_CST,	// save window title
     KS_CRT,	// restore window title
     KS_SSI,	// save icon text
-    KS_SRI	// restore icon text
+    KS_SRI,	// restore icon text
+    KS_FD,	// disable focus event tracking
+    KS_FE	// enable focus event tracking
 };
 
-#define KS_LAST	    KS_SRI
+#define KS_LAST	    KS_FE
 
 /*
  * the terminal capabilities are stored in this array
@@ -212,6 +214,8 @@
 #define T_CRT	(TERM_STR(KS_CRT))	// restore window title
 #define T_SSI	(TERM_STR(KS_SSI))	// save icon text
 #define T_SRI	(TERM_STR(KS_SRI))	// restore icon text
+#define T_FD	(TERM_STR(KS_FD))	// disable focus event tracking
+#define T_FE	(TERM_STR(KS_FE))	// enable focus event tracking
 
 typedef enum {
     TMODE_COOK,	    // terminal mode for external cmds and Ex mode
diff -Nru vim-8.2.1913/src/terminal.c vim-8.2.2434/src/terminal.c
--- vim-8.2.1913/src/terminal.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/terminal.c	2021-01-30 22:05:11.000000000 +0000
@@ -1202,6 +1202,7 @@
 	return;
     }
     ch_log(channel, "writing %d bytes to terminal", (int)len);
+    cursor_off();
     term_write_job_output(term, msg, len);
 
 #ifdef FEAT_GUI
@@ -1598,7 +1599,7 @@
 	char_u	buff[DIALOG_MSG_SIZE];
 	int	ret;
 
-	dialog_msg(buff, _("Kill job in \"%s\"?"), buf->b_fname);
+	dialog_msg(buff, _("Kill job in \"%s\"?"), buf_get_fname(buf));
 	ret = vim_dialog_yesnocancel(VIM_QUESTION, NULL, buff, 1);
 	if (ret == VIM_YES)
 	    how = "kill";
@@ -1830,6 +1831,10 @@
 			width = cell.width;
 
 			cell2cellattr(&cell, &p[pos.col]);
+			if (width == 2)
+			    // second cell of double-width character has the
+			    // same attributes.
+			    p[pos.col + 1] = p[pos.col];
 
 			// Each character can be up to 6 bytes.
 			if (ga_grow(&ga, VTERM_MAX_CHARS_PER_CELL * 6) == OK)
@@ -2176,6 +2181,10 @@
 		    return FAIL;
 		}
 	    }
+	    break;
+
+	case K_COMMAND:
+	    return do_cmdline(NULL, getcmdkeycmd, NULL, 0);
     }
     if (typed)
 	mouse_was_outside = FALSE;
@@ -2191,16 +2200,19 @@
 }
 
     static void
-position_cursor(win_T *wp, VTermPos *pos, int add_off UNUSED)
+position_cursor(win_T *wp, VTermPos *pos)
 {
     wp->w_wrow = MIN(pos->row, MAX(0, wp->w_height - 1));
     wp->w_wcol = MIN(pos->col, MAX(0, wp->w_width - 1));
 #ifdef FEAT_PROP_POPUP
-    if (add_off && popup_is_popup(curwin))
+    if (popup_is_popup(wp))
     {
-	wp->w_wrow += popup_top_extra(curwin);
-	wp->w_wcol += popup_left_extra(curwin);
+	wp->w_wrow += popup_top_extra(wp);
+	wp->w_wcol += popup_left_extra(wp);
+	wp->w_flags |= WFLAG_WCOL_OFF_ADDED | WFLAG_WROW_OFF_ADDED;
     }
+    else
+	wp->w_flags &= ~(WFLAG_WCOL_OFF_ADDED | WFLAG_WROW_OFF_ADDED);
 #endif
     wp->w_valid |= (VALID_WCOL|VALID_WROW);
 }
@@ -2513,13 +2525,13 @@
 	if (termwinkey == Ctrl_W)
 	    termwinkey = 0;
     }
-    position_cursor(curwin, &curbuf->b_term->tl_cursor_pos, TRUE);
+    position_cursor(curwin, &curbuf->b_term->tl_cursor_pos);
     may_set_cursor_props(curbuf->b_term);
 
     while (blocking || vpeekc_nomap() != NUL)
     {
 #ifdef FEAT_GUI
-	if (!curbuf->b_term->tl_system)
+	if (curbuf->b_term != NULL && !curbuf->b_term->tl_system)
 #endif
 	    // TODO: skip screen update when handling a sequence of keys.
 	    // Repeat redrawing in case a message is received while redrawing.
@@ -2534,8 +2546,6 @@
 	restore_cursor = TRUE;
 
 	raw_c = term_vgetc();
-if (raw_c > 0)
-    ch_log(NULL, "terminal_loop() got %d", raw_c);
 	if (!term_use_loop_check(TRUE) || in_terminal_loop != curbuf->b_term)
 	{
 	    // Job finished while waiting for a character.  Push back the
@@ -3050,13 +3060,10 @@
     while (for_all_windows_and_curwin(&wp, &did_curwin))
     {
 	if (wp->w_buffer == term->tl_buffer)
-	    position_cursor(wp, &pos, FALSE);
+	    position_cursor(wp, &pos);
     }
     if (term->tl_buffer == curbuf && !term->tl_normal_mode)
-    {
-	may_toggle_cursor(term);
 	update_cursor(term, term->tl_cursor_visible);
-    }
 
     return 1;
 }
@@ -3442,15 +3449,19 @@
 	if (term->tl_finish == TL_FINISH_OPEN
 				   && term->tl_buffer->b_nwindows == 0)
 	{
-	    char buf[50];
-
-	    // TODO: use term_opencmd
-	    ch_log(NULL, "terminal job finished, opening window");
-	    vim_snprintf(buf, sizeof(buf),
-		    term->tl_opencmd == NULL
-			    ? "botright sbuf %d"
-			    : (char *)term->tl_opencmd, fnum);
-	    do_cmdline_cmd((char_u *)buf);
+	    char    *cmd = term->tl_opencmd == NULL
+				? "botright sbuf %d"
+				: (char *)term->tl_opencmd;
+	    size_t  len = strlen(cmd) + 50;
+	    char    *buf = alloc(len);
+
+	    if (buf != NULL)
+	    {
+		ch_log(NULL, "terminal job finished, opening window");
+		vim_snprintf(buf, len, cmd, fnum);
+		do_cmdline_cmd((char_u *)buf);
+		vim_free(buf);
+	    }
 	}
 	else
 	    ch_log(NULL, "terminal job finished");
@@ -3639,6 +3650,7 @@
 	    }
 #endif
 	    else
+		// This will only store the lower byte of "c".
 		ScreenLines[off] = c;
 	}
 	ScreenAttrs[off] = cell2attr(term, wp, cell.attrs, cell.fg, cell.bg);
@@ -3647,13 +3659,20 @@
 	++off;
 	if (cell.width == 2)
 	{
-	    if (enc_utf8)
-		ScreenLinesUC[off] = NUL;
-
 	    // don't set the second byte to NUL for a DBCS encoding, it
 	    // has been set above
-	    if (enc_utf8 || !has_mbyte)
+	    if (enc_utf8)
+	    {
+		ScreenLinesUC[off] = NUL;
 		ScreenLines[off] = NUL;
+	    }
+	    else if (!has_mbyte)
+	    {
+		// Can't show a double-width character with a single-byte
+		// 'encoding', just use a space.
+		ScreenLines[off] = ' ';
+		ScreenAttrs[off] = ScreenAttrs[off - 1];
+	    }
 
 	    ++pos->col;
 	    ++off;
@@ -3797,7 +3816,7 @@
 
     // The cursor may have been moved when resizing.
     vterm_state_get_cursorpos(state, &pos);
-    position_cursor(wp, &pos, FALSE);
+    position_cursor(wp, &pos);
 
     for (pos.row = term->tl_dirty_row_start; pos.row < term->tl_dirty_row_end
 					  && pos.row < wp->w_height; ++pos.row)
@@ -4517,6 +4536,7 @@
     {
 	char_u *txt;
 	size_t len;
+	char_u *fname;
 
 	if (term->tl_normal_mode)
 	{
@@ -4533,11 +4553,12 @@
 	    txt = (char_u *)_("running");
 	else
 	    txt = (char_u *)_("finished");
-	len = 9 + STRLEN(term->tl_buffer->b_fname) + STRLEN(txt);
+	fname = buf_get_fname(term->tl_buffer);
+	len = 9 + STRLEN(fname) + STRLEN(txt);
 	term->tl_status_text = alloc(len);
 	if (term->tl_status_text != NULL)
 	    vim_snprintf((char *)term->tl_status_text, len, "%s [%s]",
-						term->tl_buffer->b_fname, txt);
+								   fname, txt);
     }
     return term->tl_status_text;
 }
@@ -4572,12 +4593,12 @@
 {
     buf_T *buf;
 
-    (void)tv_get_number(&argvars[0]);	    // issue errmsg if type error
     ++emsg_off;
     buf = tv_get_buf(&argvars[0], FALSE);
     --emsg_off;
     if (buf == NULL || buf->b_term == NULL)
     {
+	(void)tv_get_number(&argvars[0]);    // issue errmsg if type error
 	ch_log(NULL, "%s: invalid buffer argument", where);
 	return NULL;
     }
diff -Nru vim-8.2.1913/src/testdir/check.vim vim-8.2.2434/src/testdir/check.vim
--- vim-8.2.1913/src/testdir/check.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/check.vim	2021-01-30 22:05:11.000000000 +0000
@@ -183,4 +183,12 @@
   return v:false
 endfunc
 
+" Command to check for not running under ASAN
+command CheckNotAsan call CheckNotAsan()
+func CheckNotAsan()
+  if execute('version') =~# '-fsanitize=[a-z,]*\<address\>'
+    throw 'Skipped: does not work with ASAN'
+  endif
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff -Nru vim-8.2.1913/src/testdir/dumps/Test_diff_cuc_01.dump vim-8.2.2434/src/testdir/dumps/Test_diff_cuc_01.dump
--- vim-8.2.1913/src/testdir/dumps/Test_diff_cuc_01.dump	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/src/testdir/dumps/Test_diff_cuc_01.dump	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,20 @@
+>a+0&#ffffff0@1| @34||+1&&| +0#0000e05#a8a8a8255@1|a+0#0000000#ffffff0@1| @32
+|-+0#4040ff13#afffff255@36||+1#0000000#ffffff0| +0#0000e05#a8a8a8255@1|b+0#0000000#5fd7ff255@1| @32
+|c+0&#e0e0e08|c+0&#ffffff0| @34||+1&&| +0#0000e05#a8a8a8255@1|c+0#0000000#ffffff0@1| @32
+|~+0#4040ff13&| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @5|1|,|1| @11|A|l@1| |[+1&&|N|o| |N|a|m|e|]| |[|+|]| @5|1|,|1| @11|A|l@1
+| +0&&@74
diff -Nru vim-8.2.1913/src/testdir/dumps/Test_diff_cuc_02.dump vim-8.2.2434/src/testdir/dumps/Test_diff_cuc_02.dump
--- vim-8.2.1913/src/testdir/dumps/Test_diff_cuc_02.dump	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/src/testdir/dumps/Test_diff_cuc_02.dump	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,20 @@
+|a+0&#ffffff0>a| @34||+1&&| +0#0000e05#a8a8a8255@1|a+0#0000000#ffffff0@1| @32
+|-+0#4040ff13#afffff255@36||+1#0000000#ffffff0| +0#0000e05#a8a8a8255@1|b+0#0000000#5fd7ff255@1| @32
+|c+0&#ffffff0|c+0&#e0e0e08| +0&#ffffff0@34||+1&&| +0#0000e05#a8a8a8255@1|c+0#0000000#ffffff0@1| @32
+|~+0#4040ff13&| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @5|1|,|2| @11|A|l@1| |[+1&&|N|o| |N|a|m|e|]| |[|+|]| @5|1|,|2| @11|A|l@1
+| +0&&@74
diff -Nru vim-8.2.1913/src/testdir/dumps/Test_diff_cuc_03.dump vim-8.2.2434/src/testdir/dumps/Test_diff_cuc_03.dump
--- vim-8.2.1913/src/testdir/dumps/Test_diff_cuc_03.dump	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/src/testdir/dumps/Test_diff_cuc_03.dump	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,20 @@
+|a+0&#e0e0e08|a+0&#ffffff0| @34||+1&&| +0#0000e05#a8a8a8255@1|a+0#0000000#ffffff0@1| @32
+|-+0#4040ff13#afffff255@36||+1#0000000#ffffff0| +0#0000e05#a8a8a8255@1|b+0#0000000#5fd7ff255@1| @32
+>c+0&#ffffff0@1| @34||+1&&| +0#0000e05#a8a8a8255@1|c+0#0000000#ffffff0@1| @32
+|~+0#4040ff13&| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @5|2|,|1| @11|A|l@1| |[+1&&|N|o| |N|a|m|e|]| |[|+|]| @5|3|,|1| @11|A|l@1
+| +0&&@74
diff -Nru vim-8.2.1913/src/testdir/dumps/Test_diff_cuc_04.dump vim-8.2.2434/src/testdir/dumps/Test_diff_cuc_04.dump
--- vim-8.2.1913/src/testdir/dumps/Test_diff_cuc_04.dump	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/src/testdir/dumps/Test_diff_cuc_04.dump	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,20 @@
+|a+0&#ffffff0|a+0&#e0e0e08| +0&#ffffff0@34||+1&&| +0#0000e05#a8a8a8255@1|a+0#0000000#ffffff0@1| @32
+|-+0#4040ff13#afffff255@36||+1#0000000#ffffff0| +0#0000e05#a8a8a8255@1|b+0#0000000#5fd7ff255@1| @32
+|c+0&#ffffff0>c| @34||+1&&| +0#0000e05#a8a8a8255@1|c+0#0000000#ffffff0@1| @32
+|~+0#4040ff13&| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|~| @35||+1#0000000&|~+0#4040ff13&| @35
+|[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @5|2|,|2| @11|A|l@1| |[+1&&|N|o| |N|a|m|e|]| |[|+|]| @5|3|,|2| @11|A|l@1
+| +0&&@74
diff -Nru vim-8.2.1913/src/testdir/dumps/Test_incsearch_newline1.dump vim-8.2.2434/src/testdir/dumps/Test_incsearch_newline1.dump
--- vim-8.2.1913/src/testdir/dumps/Test_incsearch_newline1.dump	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/src/testdir/dumps/Test_incsearch_newline1.dump	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,5 @@
+|t+1&#ffffff0|e|s|t| +0&&@5
+|x@2| @6
+|~+0#4040ff13&| @8
+|~| @8
+|/+0#0000000&|t|e|s|t> @4
diff -Nru vim-8.2.1913/src/testdir/dumps/Test_incsearch_newline2.dump vim-8.2.2434/src/testdir/dumps/Test_incsearch_newline2.dump
--- vim-8.2.1913/src/testdir/dumps/Test_incsearch_newline2.dump	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/src/testdir/dumps/Test_incsearch_newline2.dump	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,5 @@
+|t+1&#ffffff0|e|s|t| | +0&&@4
+|x@2| @6
+|~+0#4040ff13&| @8
+|~| @8
+|/+0#0000000&|t|e|s|t|\|n> @2
diff -Nru vim-8.2.1913/src/testdir/dumps/Test_incsearch_newline3.dump vim-8.2.2434/src/testdir/dumps/Test_incsearch_newline3.dump
--- vim-8.2.1913/src/testdir/dumps/Test_incsearch_newline3.dump	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/src/testdir/dumps/Test_incsearch_newline3.dump	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,5 @@
+|t+1&#ffffff0|e|s|t| | +0&&@4
+|x+1&&|x+0&&@1| @6
+|~+0#4040ff13&| @8
+|~| @8
+|/+0#0000000&|t|e|s|t|\|n|x> @1
diff -Nru vim-8.2.1913/src/testdir/dumps/Test_incsearch_newline4.dump vim-8.2.2434/src/testdir/dumps/Test_incsearch_newline4.dump
--- vim-8.2.1913/src/testdir/dumps/Test_incsearch_newline4.dump	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/src/testdir/dumps/Test_incsearch_newline4.dump	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,5 @@
+|t+1&#ffffff0|e|s|t| | +0&&@4
+|x+1&&@1|x+0&&| @6
+|~+0#4040ff13&| @8
+|~| @8
+|/+0#0000000&|t|e|s|t|\|n|x@1> 
diff -Nru vim-8.2.1913/src/testdir/dumps/Test_incsearch_newline5.dump vim-8.2.2434/src/testdir/dumps/Test_incsearch_newline5.dump
--- vim-8.2.1913/src/testdir/dumps/Test_incsearch_newline5.dump	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/src/testdir/dumps/Test_incsearch_newline5.dump	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,5 @@
+|o+0#00e0003#ffffff0|r| |t|y|p|e| |c|o
+|m| @7|m
+|a|n|d| |t|o| |c|o|n
+|t| @7|i
+|n|u|e> +0#0000000&@6
diff -Nru vim-8.2.1913/src/testdir/dumps/Test_incsearch_sub_01.dump vim-8.2.2434/src/testdir/dumps/Test_incsearch_sub_01.dump
--- vim-8.2.1913/src/testdir/dumps/Test_incsearch_sub_01.dump	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/src/testdir/dumps/Test_incsearch_sub_01.dump	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,9 @@
+|f+0&#ffffff0|o@1| |1| @64
+|f|o@1| |2| @64
+|f|o@1| |3| @64
+|f|o@1| |4| @64
+|a|b|c|||d|e|f| @62
+|~+0#4040ff13&| @68
+|~| @68
+|~| @68
+|:+0#0000000&|%|s|/|\|v|a|b|c||> @59
diff -Nru vim-8.2.1913/src/testdir/dumps/Test_incsearch_sub_02.dump vim-8.2.2434/src/testdir/dumps/Test_incsearch_sub_02.dump
--- vim-8.2.1913/src/testdir/dumps/Test_incsearch_sub_02.dump	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/src/testdir/dumps/Test_incsearch_sub_02.dump	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,9 @@
+|f+0&#ffffff0|o@1| |1| @64
+|f|o@1| |2| @64
+|f|o@1| |3| @64
+|f|o@1| |4| @64
+|a|b|c|||d|e|f| @62
+|~+0#4040ff13&| @68
+|~| @68
+|~| @68
+|:+0#0000000&|1|,|5|s|/|\|v||> @60
diff -Nru vim-8.2.1913/src/testdir/dumps/Test_popup_command_04.dump vim-8.2.2434/src/testdir/dumps/Test_popup_command_04.dump
--- vim-8.2.1913/src/testdir/dumps/Test_popup_command_04.dump	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/src/testdir/dumps/Test_popup_command_04.dump	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,20 @@
+|o+0&#ffffff0|n|e| |t|w|o| |t|h|r|e@1| |f|o|u|r| |f|i|v|e| @51
+|a|n|d| |o|n|e| |t|w|o| |X|t|h|r|e@1| |f|o|u|r| |f|i|v|e| @46
+|o|n|e| |m|o|r|e| |t|w| +0#0000001#ffd7ff255|U|n|d|o| @12| +0#0000000#ffffff0@45
+|~+0#4040ff13&| @9| +0#0000001#ffd7ff255@17| +0#4040ff13#ffffff0@45
+|~| @9| +0#0000001#ffd7ff255|P|a|s|t|e| @11| +0#4040ff13#ffffff0@45
+|~| @9| +0#0000001#ffd7ff255@17| +0#4040ff13#ffffff0@45
+|~| @9| +0#0000001#ffd7ff255|S|e|l|e|c|t| |W|o|r|d| @5| +0#4040ff13#ffffff0@45
+|~| @9| +0#0000001#ffd7ff255|S|e|l|e|c|t| |S|e|n|t|e|n|c|e| @1| +0#4040ff13#ffffff0@45
+|~| @9| +0#0000001#ffd7ff255|S|e|l|e|c|t| |P|a|r|a|g|r|a|p|h| | +0#4040ff13#ffffff0@45
+|~| @9| +0#0000001#ffd7ff255|S|e|l|e|c|t| |L|i|n|e| @5| +0#4040ff13#ffffff0@45
+|~| @9| +0#0000001#ffd7ff255|S|e|l|e|c|t| |B|l|o|c|k| @4| +0#4040ff13#ffffff0@45
+|~| @9| +0#0000001#ffd7ff255|S|e|l|e|c|t| |A|l@1| @6| +0#4040ff13#ffffff0@45
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|c+0#0000000&|h|a|n|g|e|d> @67
diff -Nru vim-8.2.1913/src/testdir/dumps/Test_popup_command_05.dump vim-8.2.2434/src/testdir/dumps/Test_popup_command_05.dump
--- vim-8.2.1913/src/testdir/dumps/Test_popup_command_05.dump	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/src/testdir/dumps/Test_popup_command_05.dump	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,20 @@
+|o+0&#ffffff0|n|e| |t|w|o| |t|h|r|e@1| |f|o|u|r| |f|i|v|e| @51
+|a|n|d| |o|n|e| |t|w|o| >X|t|h|r|e@1| |f|o|u|r| |f|i|v|e| @46
+|o|n|e| |m|o|r|e| |t|w|o| |t|h|r|e@1| |f|o|u|r| |f|i|v|e| @46
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|p+0#0000000&|a|s|t|e|d| @50|2|,|1|3| @9|A|l@1| 
diff -Nru vim-8.2.1913/src/testdir/dumps/Test_popupwin_longtitle_3.dump vim-8.2.2434/src/testdir/dumps/Test_popupwin_longtitle_3.dump
--- vim-8.2.1913/src/testdir/dumps/Test_popupwin_longtitle_3.dump	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/src/testdir/dumps/Test_popupwin_longtitle_3.dump	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,10 @@
+>1+0&#ffffff0| @73
+|2| @73
+|3| @27| +0#0000001#ffd7ff255|T|i|t|l|e| @9| +0#0000000#ffffff0@29
+|4| @27| +0#0000001#ffd7ff255@15| +0#0000000#ffffff0@29
+|5| @27| +0#0000001#ffd7ff255@1|a@2| @10| +0#0000000#ffffff0@29
+|6| @27| +0#0000001#ffd7ff255@1|b@2| @10| +0#0000000#ffffff0@29
+|7| @27| +0#0000001#ffd7ff255@15| +0#0000000#ffffff0@29
+|8| @27| +0#0000001#ffd7ff255@15| +0#0000000#ffffff0@29
+|9| @73
+|:| @55|1|,|1| @10|T|o|p| 
diff -Nru vim-8.2.1913/src/testdir/dumps/Test_popupwin_longtitle_4.dump vim-8.2.2434/src/testdir/dumps/Test_popupwin_longtitle_4.dump
--- vim-8.2.1913/src/testdir/dumps/Test_popupwin_longtitle_4.dump	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/src/testdir/dumps/Test_popupwin_longtitle_4.dump	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,10 @@
+>1+0&#ffffff0| @73
+|2| @26|╔+0#0000001#ffd7ff255|T|i|t|l|e|�@10|╗| +0#0000000#ffffff0@28
+|3| @26|â•‘+0#0000001#ffd7ff255| @15|â•‘| +0#0000000#ffffff0@28
+|4| @26|â•‘+0#0000001#ffd7ff255| @15|â•‘| +0#0000000#ffffff0@28
+|5| @26|â•‘+0#0000001#ffd7ff255| @1|a@2| @10|â•‘| +0#0000000#ffffff0@28
+|6| @26|â•‘+0#0000001#ffd7ff255| @1|b@2| @10|â•‘| +0#0000000#ffffff0@28
+|7| @26|â•‘+0#0000001#ffd7ff255| @15|â•‘| +0#0000000#ffffff0@28
+|8| @26|â•‘+0#0000001#ffd7ff255| @15|â•‘| +0#0000000#ffffff0@28
+|9| @26|╚+0#0000001#ffd7ff255|�@15|�| +0#0000000#ffffff0@28
+|:| @55|1|,|1| @10|T|o|p| 
diff -Nru vim-8.2.1913/src/testdir/dumps/Test_quickfix_window_fails.dump vim-8.2.2434/src/testdir/dumps/Test_quickfix_window_fails.dump
--- vim-8.2.1913/src/testdir/dumps/Test_quickfix_window_fails.dump	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/src/testdir/dumps/Test_quickfix_window_fails.dump	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,13 @@
+|a+0&#ffffff0|n|y|t|h|i|n|g| @66
+> @74
+|t|r|y| @71
+|X+3&&|q|u|i|c|k|f|i|x|F|a|i|l|s| |[|+|]| @38|2|,|0|-|1| @9|T|o|p
+| +0&&@74
+|t|r|y| @71
+@2|a|n|y|t|h|i|n|g| @64
+|X+1&&|q|u|i|c|k|f|i|x|F|a|i|l|s| |[|+|]| @38|2|,|0|-|1| @9|5|0|%
+| +0&&@74
+|~+0#4040ff13&| @73
+|~| @73
+|[+1#0000000&|N|o| |N|a|m|e|]| @47|0|,|0|-|1| @9|A|l@1
+| +0&&@74
diff -Nru vim-8.2.1913/src/testdir/dumps/Test_terminal_from_cmd.dump vim-8.2.2434/src/testdir/dumps/Test_terminal_from_cmd.dump
--- vim-8.2.1913/src/testdir/dumps/Test_terminal_from_cmd.dump	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/src/testdir/dumps/Test_terminal_from_cmd.dump	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,20 @@
+| +0&#ffffff0@74
+@75
+@75
+@75
+@75
+@75
+@75
+@75
+@75
+|!+2#ffffff16#00e0003|/|b|i|n|/|s|h| |[|f|i|n|i|s|h|e|d|]| @37|0|,|0|-|1| @9|A|l@1
+|a+0#0000000#ffffff0| @73
+|b| @73
+|c| @73
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1| @11|A|l@1
+|/+0&&> @73
diff -Nru vim-8.2.1913/src/testdir/dumps/Test_terminal_popup_m1.dump vim-8.2.2434/src/testdir/dumps/Test_terminal_popup_m1.dump
--- vim-8.2.1913/src/testdir/dumps/Test_terminal_popup_m1.dump	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/dumps/Test_terminal_popup_m1.dump	2021-01-30 22:05:11.000000000 +0000
@@ -5,8 +5,8 @@
 |4| @24|╔+0#0000001#ffd7ff255|�@19|╗| +0#0000000#ffffff0@26
 |5| @24|â•‘+0#0000001#ffd7ff255|a|n|o|t|h|e|r| |t|e|x|t| @7|â•‘| +0#0000000#ffffff0@26
 |6| @24|â•‘+0#0000001#ffd7ff255|t|o| |s|h|o|w| @12|â•‘| +0#0000000#ffffff0@26
-|7| @24|â•‘+0#0000001#ffd7ff255|i|n| |a| |p|o|p|u|p| |w|i|n|d|o|w| @2|â•‘| +0#0000000#ffffff0@26
-|8| @24|â•‘+0#0000001#ffd7ff255| +0#4040ff13&> @18|â•‘+0#0000001&| +0#0000000#ffffff0@26
+|7| @24|â•‘+0#0000001#ffd7ff255>i|n| |a| |p|o|p|u|p| |w|i|n|d|o|w| @2|â•‘| +0#0000000#ffffff0@26
+|8| @24|â•‘+0#0000001#ffd7ff255| +0#4040ff13&@19|â•‘+0#0000001&| +0#0000000#ffffff0@26
 |9| @24|â•‘+0#0000001#ffd7ff255| +0#4040ff13&@19|â•‘+0#0000001&| +0#0000000#ffffff0@26
 |1|0| @23|╚+0#0000001#ffd7ff255|�@19|�| +0#0000000#ffffff0@26
 |1@1| @72
diff -Nru vim-8.2.1913/src/testdir/gen_opt_test.vim vim-8.2.2434/src/testdir/gen_opt_test.vim
--- vim-8.2.1913/src/testdir/gen_opt_test.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/gen_opt_test.vim	2021-01-30 22:05:11.000000000 +0000
@@ -130,7 +130,7 @@
       \ 'selectmode': [['', 'mouse', 'key,cmd'], ['xxx']],
       \ 'sessionoptions': [['', 'blank', 'help,options,slash'], ['xxx']],
       \ 'signcolumn': [['', 'auto', 'no'], ['xxx', 'no,yes']],
-      \ 'spellfile': [['', 'file.en.add'], ['xxx', '/tmp/file']],
+      \ 'spellfile': [['', 'file.en.add', '/tmp/dir\ with\ space/en.utf-8.add'], ['xxx', '/tmp/file']],
       \ 'spelllang': [['', 'xxx', 'sr@latin'], ['not&lang', "that\\\rthere"]],
       \ 'spelloptions': [['', 'camel'], ['xxx']],
       \ 'spellsuggest': [['', 'best', 'double,33'], ['xxx']],
@@ -200,8 +200,8 @@
       " setting an option can only fail when it's implemented.
       call add(script, "if exists('+" . name . "')")
       for val in a[1]
-	call add(script, "call assert_fails('set " . name . "=" . val . "')")
-	call add(script, "call assert_fails('set " . shortname . "=" . val . "')")
+	call add(script, "silent! call assert_fails('set " . name . "=" . val . "')")
+	call add(script, "silent! call assert_fails('set " . shortname . "=" . val . "')")
       endfor
       call add(script, "endif")
     endif
diff -Nru vim-8.2.1913/src/testdir/Make_all.mak vim-8.2.2434/src/testdir/Make_all.mak
--- vim-8.2.1913/src/testdir/Make_all.mak	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/Make_all.mak	2021-01-30 22:05:11.000000000 +0000
@@ -246,6 +246,7 @@
 	test_shortpathname \
 	test_signals \
 	test_signs \
+	test_sleep \
 	test_smartindent \
 	test_sort \
 	test_sound \
@@ -416,6 +417,7 @@
 	test_listdict.res \
 	test_listener.res \
 	test_listlbr.res \
+	test_listlbr_utf8.res \
 	test_lua.res \
 	test_makeencoding.res \
 	test_man.res \
@@ -471,6 +473,7 @@
 	test_shortpathname.res \
 	test_signals.res \
 	test_signs.res \
+	test_sleep.res \
 	test_smartindent.res \
 	test_sort.res \
 	test_sound.res \
diff -Nru vim-8.2.1913/src/testdir/Make_vms.mms vim-8.2.2434/src/testdir/Make_vms.mms
--- vim-8.2.1913/src/testdir/Make_vms.mms	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/Make_vms.mms	2021-01-30 22:05:11.000000000 +0000
@@ -4,7 +4,7 @@
 # Authors:	Zoltan Arpadffy, <arpadffy@polarhome.com>
 #		Sandor Kopanyi,  <sandor.kopanyi@mailbox.hu>
 #
-# Last change:  2020 Aug 13
+# Last change:  2020 Aug 14
 #
 # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
 # Edit the lines in the Configuration section below to select.
diff -Nru vim-8.2.1913/src/testdir/runtest.vim vim-8.2.2434/src/testdir/runtest.vim
--- vim-8.2.1913/src/testdir/runtest.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/runtest.vim	2021-01-30 22:05:11.000000000 +0000
@@ -136,6 +136,13 @@
   let s:t_normal = &t_me
 endif
 
+if has('mac')
+  " In MacOS, when starting a shell in a terminal, a bash deprecation warning
+  " message is displayed. This breaks the terminal test. Disable the warning
+  " message.
+  let $BASH_SILENCE_DEPRECATION_WARNING = 1
+endif
+
 " Prepare for calling test_garbagecollect_now().
 let v:testing = 1
 
diff -Nru vim-8.2.1913/src/testdir/shared.vim vim-8.2.2434/src/testdir/shared.vim
--- vim-8.2.1913/src/testdir/shared.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/shared.vim	2021-01-30 22:05:11.000000000 +0000
@@ -223,7 +223,7 @@
   call feedkeys('x', 'nt')
 endfunc
 
-" Get $VIMPROG to run Vim executable.
+" Get $VIMPROG to run the Vim executable.
 " The Makefile writes it as the first line in the "vimcmd" file.
 func GetVimProg()
   if !filereadable('vimcmd')
diff -Nru vim-8.2.1913/src/testdir/term_util.vim vim-8.2.2434/src/testdir/term_util.vim
--- vim-8.2.1913/src/testdir/term_util.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/term_util.vim	2021-01-30 22:05:11.000000000 +0000
@@ -134,7 +134,7 @@
 endfunc
 
 " Stop a Vim running in terminal buffer "buf".
-func StopVimInTerminal(buf)
+func StopVimInTerminal(buf, kill = 1)
   " Using a terminal to run Vim is always considered flaky.
   let g:test_is_flaky = 1
 
@@ -147,8 +147,13 @@
   " Wait for all the pending updates to terminal to complete
   call TermWait(a:buf)
 
+  " Wait for the terminal to end.
   call WaitForAssert({-> assert_equal("finished", term_getstatus(a:buf))})
-  only!
+
+  " If the buffer still exists forcefully wipe it.
+  if a:kill && bufexists(a:buf)
+    exe a:buf .. 'bwipe!'
+  endif
 endfunc
 
 " Open a terminal with a shell, assign the job to g:job and return the buffer
diff -Nru vim-8.2.1913/src/testdir/test_alot_utf8.vim vim-8.2.2434/src/testdir/test_alot_utf8.vim
--- vim-8.2.1913/src/testdir/test_alot_utf8.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_alot_utf8.vim	2021-01-30 22:05:11.000000000 +0000
@@ -6,7 +6,6 @@
 
 source test_charsearch_utf8.vim
 source test_expr_utf8.vim
-source test_listlbr_utf8.vim
 source test_mksession_utf8.vim
 source test_regexp_utf8.vim
 source test_source_utf8.vim
diff -Nru vim-8.2.1913/src/testdir/test_arglist.vim vim-8.2.2434/src/testdir/test_arglist.vim
--- vim-8.2.1913/src/testdir/test_arglist.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_arglist.vim	2021-01-30 22:05:11.000000000 +0000
@@ -524,9 +524,10 @@
   bwipe Xa.c Xb.c Xc.c
 endfunc
 
-" Test for quiting Vim with unedited files in the argument list
+" Test for quitting Vim with unedited files in the argument list
 func Test_quit_with_arglist()
   CheckRunVimInTerminal
+
   let buf = RunVimInTerminal('', {'rows': 6})
   call term_sendkeys(buf, ":set nomore\n")
   call term_sendkeys(buf, ":args a b c\n")
@@ -559,4 +560,22 @@
   call delete('.c.swp')
 endfunc
 
+" Test for ":all" not working when in the cmdline window
+func Test_all_not_allowed_from_cmdwin()
+  CheckFeature cmdwin
+
+  au BufEnter * all
+  next x
+  " Use try/catch here, somehow assert_fails() doesn't work on MS-Windows
+  " console.
+  let caught = 'no'
+  try
+    exe ":norm! 7q?apat\<CR>"
+  catch /E11:/
+    let caught = 'yes'
+  endtry
+  call assert_equal('yes', caught)
+  au! BufEnter
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff -Nru vim-8.2.1913/src/testdir/test_assert.vim vim-8.2.2434/src/testdir/test_assert.vim
--- vim-8.2.1913/src/testdir/test_assert.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_assert.vim	2021-01-30 22:05:11.000000000 +0000
@@ -6,11 +6,11 @@
   call assert_equal(0, v:false->assert_false())
 
   call assert_equal(1, assert_false(123))
-  call assert_match("Expected False but got 123", v:errors[0])
+  call assert_match("Expected 'False' but got 123", v:errors[0])
   call remove(v:errors, 0)
 
   call assert_equal(1, 123->assert_false())
-  call assert_match("Expected False but got 123", v:errors[0])
+  call assert_match("Expected 'False' but got 123", v:errors[0])
   call remove(v:errors, 0)
 endfunc
 
@@ -21,11 +21,11 @@
   call assert_equal(0, v:true->assert_true())
 
   call assert_equal(1, assert_true(0))
-  call assert_match("Expected True but got 0", v:errors[0])
+  call assert_match("Expected 'True' but got 0", v:errors[0])
   call remove(v:errors, 0)
 
   call assert_equal(1, 0->assert_true())
-  call assert_match("Expected True but got 0", v:errors[0])
+  call assert_match("Expected 'True' but got 0", v:errors[0])
   call remove(v:errors, 0)
 endfunc
 
@@ -234,11 +234,11 @@
   call remove(v:errors, 0)
 
   call assert_equal(1, assert_fails('xxx', ['E9876']))
-  call assert_match("Expected \\['E9876'\\] but got 'E492:", v:errors[0])
+  call assert_match("Expected 'E9876' but got 'E492:", v:errors[0])
   call remove(v:errors, 0)
 
   call assert_equal(1, assert_fails('xxx', ['E492:', 'E9876']))
-  call assert_match("Expected \\['E492:', 'E9876'\\] but got 'E492:", v:errors[0])
+  call assert_match("Expected 'E9876' but got 'E492:", v:errors[0])
   call remove(v:errors, 0)
 
   call assert_equal(1, assert_fails('echo', '', 'echo command'))
diff -Nru vim-8.2.1913/src/testdir/test_autocmd.vim vim-8.2.2434/src/testdir/test_autocmd.vim
--- vim-8.2.1913/src/testdir/test_autocmd.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_autocmd.vim	2021-01-30 22:05:11.000000000 +0000
@@ -132,19 +132,19 @@
     autocmd BufWipeout * call add(s:li, "bufwipeout")
   augroup END
 
-  let s:li=[]
+  let s:li = []
   new
   setlocal bufhidden=
   bunload
   call assert_equal(["bufunload", "bufdelete"], s:li)
 
-  let s:li=[]
+  let s:li = []
   new
   setlocal bufhidden=delete
   bunload
   call assert_equal(["bufunload", "bufdelete"], s:li)
 
-  let s:li=[]
+  let s:li = []
   new
   setlocal bufhidden=unload
   bwipeout
@@ -173,6 +173,12 @@
   quit
 endfunc
 
+func Test_argdelete_in_next()
+  au BufNew,BufEnter,BufLeave,BufWinEnter * argdel
+  call assert_fails('next a b', 'E1156:')
+  au! BufNew,BufEnter,BufLeave,BufWinEnter *
+endfunc
+
 func Test_autocmd_bufwinleave_with_tabfirst()
   tabedit
   augroup sample
@@ -194,7 +200,7 @@
     exe 'autocmd BufUnload <buffer> ' . (lastbuf + 1) . 'bwipeout!'
   augroup END
 
-  call assert_fails('edit bb.txt', ['E937:', 'E517:'])
+  call assert_fails('edit bb.txt', 'E937:')
 
   autocmd! test_autocmd_bufunload
   augroup! test_autocmd_bufunload
@@ -214,13 +220,35 @@
 
   normal! i1
   call assert_fails('edit a.txt', 'E517:')
-  call feedkeys("\<CR>")
 
   autocmd! test_autocmd_bufunload
   augroup! test_autocmd_bufunload
   bwipe! a.txt
 endfunc
 
+func Test_autocmd_dummy_wipeout()
+  " prepare files
+  call writefile([''], 'Xdummywipetest1.txt')
+  call writefile([''], 'Xdummywipetest2.txt')
+  augroup test_bufunload_group
+    autocmd!
+    autocmd BufUnload * call add(s:li, "bufunload")
+    autocmd BufDelete * call add(s:li, "bufdelete")
+    autocmd BufWipeout * call add(s:li, "bufwipeout")
+  augroup END
+
+  let s:li = []
+  split Xdummywipetest1.txt
+  silent! vimgrep /notmatched/ Xdummywipetest*
+  call assert_equal(["bufunload", "bufwipeout"], s:li)
+
+  bwipeout
+  call delete('Xdummywipetest1.txt')
+  call delete('Xdummywipetest2.txt')
+  au! test_bufunload_group
+  augroup! test_bufunload_group
+endfunc
+
 func Test_win_tab_autocmd()
   let g:record = []
 
@@ -300,28 +328,28 @@
   augroup TheWarning
     au VimEnter * echo 'entering'
   augroup END
-  call assert_true(match(execute('au VimEnter'), "TheWarning.*VimEnter") >= 0)
+  call assert_match("TheWarning.*VimEnter", execute('au VimEnter'))
   redir => res
   augroup! TheWarning
   redir END
-  call assert_true(match(res, "W19:") >= 0)
-  call assert_true(match(execute('au VimEnter'), "-Deleted-.*VimEnter") >= 0)
+  call assert_match("W19:", res)
+  call assert_match("-Deleted-.*VimEnter", execute('au VimEnter'))
 
   " check "Another" does not take the pace of the deleted entry
   augroup Another
   augroup END
-  call assert_true(match(execute('au VimEnter'), "-Deleted-.*VimEnter") >= 0)
+  call assert_match("-Deleted-.*VimEnter", execute('au VimEnter'))
   augroup! Another
 
   " no warning for postpone aucmd delete
   augroup StartOK
     au VimEnter * call RemoveGroup()
   augroup END
-  call assert_true(match(execute('au VimEnter'), "StartOK.*VimEnter") >= 0)
+  call assert_match("StartOK.*VimEnter", execute('au VimEnter'))
   redir => res
   doautocmd VimEnter
   redir END
-  call assert_true(match(res, "W19:") < 0)
+  call assert_notmatch("W19:", res)
   au! VimEnter
 
   call assert_fails('augroup!', 'E471:')
@@ -351,7 +379,7 @@
     au VimEnter * echo
   augroup end
   augroup! x
-  call assert_true(match(execute('au VimEnter'), "-Deleted-.*VimEnter") >= 0)
+  call assert_match("-Deleted-.*VimEnter", execute('au VimEnter'))
   au! VimEnter
 endfunc
 
@@ -454,7 +482,7 @@
   let content =<< trim [CODE]
     call test_override('ui_delay', 10)
     set nocp noswapfile
-    let v:swapchoice="e"
+    let v:swapchoice = "e"
     augroup test_autocmd_sessionload
     autocmd!
     autocmd SessionLoadPost * exe bufnr("Xsomething") . "bw!"
@@ -477,6 +505,26 @@
   endfor
 endfunc
 
+" Using :blast and :ball for many events caused a crash, because b_nwindows was
+" not incremented correctly.
+func Test_autocmd_blast_badd()
+  let content =<< trim [CODE]
+      au BufNew,BufAdd,BufWinEnter,BufEnter,BufLeave,BufWinLeave,BufUnload,VimEnter foo* blast
+      edit foo1
+      au BufNew,BufAdd,BufWinEnter,BufEnter,BufLeave,BufWinLeave,BufUnload,VimEnter foo* ball
+      edit foo2
+      call writefile(['OK'], 'Xerrors')
+      qall
+  [CODE]
+
+  call writefile(content, 'XblastBall')
+  call system(GetVimCommand() .. ' --clean -S XblastBall')
+  call assert_match('OK', readfile('Xerrors')->join())
+
+  call delete('XblastBall')
+  call delete('Xerrors')
+endfunc
+
 " SEGV occurs in older versions.
 func Test_autocmd_bufwipe_in_SessLoadPost2()
   tabnew
@@ -542,43 +590,43 @@
   au OptionSet * :call s:AutoCommandOptionSet(expand("<amatch>"))
 
   " 1: Setting number option"
-  let g:options=[['number', 0, 0, 0, 1, 'global', 'set']]
+  let g:options = [['number', 0, 0, 0, 1, 'global', 'set']]
   set nu
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
 
   " 2: Setting local number option"
-  let g:options=[['number', 1, 1, '', 0, 'local', 'setlocal']]
+  let g:options = [['number', 1, 1, '', 0, 'local', 'setlocal']]
   setlocal nonu
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
 
   " 3: Setting global number option"
-  let g:options=[['number', 1, '', 1, 0, 'global', 'setglobal']]
+  let g:options = [['number', 1, '', 1, 0, 'global', 'setglobal']]
   setglobal nonu
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
 
   " 4: Setting local autoindent option"
-  let g:options=[['autoindent', 0, 0, '', 1, 'local', 'setlocal']]
+  let g:options = [['autoindent', 0, 0, '', 1, 'local', 'setlocal']]
   setlocal ai
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
 
   " 5: Setting global autoindent option"
-  let g:options=[['autoindent', 0, '', 0, 1, 'global', 'setglobal']]
+  let g:options = [['autoindent', 0, '', 0, 1, 'global', 'setglobal']]
   setglobal ai
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
 
   " 6: Setting global autoindent option"
-  let g:options=[['autoindent', 1, 1, 1, 0, 'global', 'set']]
+  let g:options = [['autoindent', 1, 1, 1, 0, 'global', 'set']]
   set ai!
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
 
   " 6a: Setting global autoindent option"
-  let g:options=[['autoindent', 1, 1, 0, 0, 'global', 'set']]
+  let g:options = [['autoindent', 1, 1, 0, 0, 'global', 'set']]
   noa setlocal ai
   noa setglobal noai
   set ai!
@@ -587,55 +635,55 @@
 
   " Should not print anything, use :noa
   " 7: don't trigger OptionSet"
-  let g:options=[['invalid', 'invalid', 'invalid', 'invalid', 'invalid', 'invalid', 'invalid']]
+  let g:options = [['invalid', 'invalid', 'invalid', 'invalid', 'invalid', 'invalid', 'invalid']]
   noa set nonu
   call assert_equal([['invalid', 'invalid', 'invalid', 'invalid', 'invalid', 'invalid', 'invalid']], g:options)
   call assert_equal(g:opt[0], g:opt[1])
 
   " 8: Setting several global list and number option"
-  let g:options=[['list', 0, 0, 0, 1, 'global', 'set'], ['number', 0, 0, 0, 1, 'global', 'set']]
+  let g:options = [['list', 0, 0, 0, 1, 'global', 'set'], ['number', 0, 0, 0, 1, 'global', 'set']]
   set list nu
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
 
   " 9: don't trigger OptionSet"
-  let g:options=[['invalid', 'invalid', 'invalid', 'invalid', 'invalid', 'invalid', 'invalid'], ['invalid', 'invalid', 'invalid', 'invalid', 'invalid', 'invalid', 'invalid']]
+  let g:options = [['invalid', 'invalid', 'invalid', 'invalid', 'invalid', 'invalid', 'invalid'], ['invalid', 'invalid', 'invalid', 'invalid', 'invalid', 'invalid', 'invalid']]
   noa set nolist nonu
   call assert_equal([['invalid', 'invalid', 'invalid', 'invalid', 'invalid', 'invalid', 'invalid'], ['invalid', 'invalid', 'invalid', 'invalid', 'invalid', 'invalid', 'invalid']], g:options)
   call assert_equal(g:opt[0], g:opt[1])
 
   " 10: Setting global acd"
-  let g:options=[['autochdir', 0, 0, '', 1, 'local', 'setlocal']]
+  let g:options = [['autochdir', 0, 0, '', 1, 'local', 'setlocal']]
   setlocal acd
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
 
   " 11: Setting global autoread (also sets local value)"
-  let g:options=[['autoread', 0, 0, 0, 1, 'global', 'set']]
+  let g:options = [['autoread', 0, 0, 0, 1, 'global', 'set']]
   set ar
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
 
   " 12: Setting local autoread"
-  let g:options=[['autoread', 1, 1, '', 1, 'local', 'setlocal']]
+  let g:options = [['autoread', 1, 1, '', 1, 'local', 'setlocal']]
   setlocal ar
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
 
   " 13: Setting global autoread"
-  let g:options=[['autoread', 1, '', 1, 0, 'global', 'setglobal']]
+  let g:options = [['autoread', 1, '', 1, 0, 'global', 'setglobal']]
   setglobal invar
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
 
   " 14: Setting option backspace through :let"
-  let g:options=[['backspace', '', '', '', 'eol,indent,start', 'global', 'set']]
-  let &bs="eol,indent,start"
+  let g:options = [['backspace', '', '', '', 'eol,indent,start', 'global', 'set']]
+  let &bs = "eol,indent,start"
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
 
   " 15: Setting option backspace through setbufvar()"
-  let g:options=[['backup', 0, 0, '', 1, 'local', 'setlocal']]
+  let g:options = [['backup', 0, 0, '', 1, 'local', 'setlocal']]
   " try twice, first time, shouldn't trigger because option name is invalid,
   " second time, it should trigger
   let bnum = bufnr('%')
@@ -646,13 +694,13 @@
   call assert_equal(g:opt[0], g:opt[1])
 
   " 16: Setting number option using setwinvar"
-  let g:options=[['number', 0, 0, '', 1, 'local', 'setlocal']]
+  let g:options = [['number', 0, 0, '', 1, 'local', 'setlocal']]
   call setwinvar(0, '&number', 1)
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
 
   " 17: Setting key option, shouldn't trigger"
-  let g:options=[['key', 'invalid', 'invalid1', 'invalid2', 'invalid3', 'invalid4', 'invalid5']]
+  let g:options = [['key', 'invalid', 'invalid1', 'invalid2', 'invalid3', 'invalid4', 'invalid5']]
   setlocal key=blah
   setlocal key=
   call assert_equal([['key', 'invalid', 'invalid1', 'invalid2', 'invalid3', 'invalid4', 'invalid5']], g:options)
@@ -661,19 +709,19 @@
 
   " 18a: Setting string global option"
   let oldval = &backupext
-  let g:options=[['backupext', oldval, oldval, oldval, 'foo', 'global', 'set']]
+  let g:options = [['backupext', oldval, oldval, oldval, 'foo', 'global', 'set']]
   set backupext=foo
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
 
   " 18b: Resetting string global option"
-  let g:options=[['backupext', 'foo', 'foo', 'foo', oldval, 'global', 'set']]
+  let g:options = [['backupext', 'foo', 'foo', 'foo', oldval, 'global', 'set']]
   set backupext&
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
 
   " 18c: Setting global string global option"
-  let g:options=[['backupext', oldval, '', oldval, 'bar', 'global', 'setglobal']]
+  let g:options = [['backupext', oldval, '', oldval, 'bar', 'global', 'setglobal']]
   setglobal backupext=bar
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
@@ -682,7 +730,7 @@
   " As this is a global option this sets the global value even though
   " :setlocal is used!
   noa set backupext& " Reset global and local value (without triggering autocmd)
-  let g:options=[['backupext', oldval, oldval, '', 'baz', 'local', 'setlocal']]
+  let g:options = [['backupext', oldval, oldval, '', 'baz', 'local', 'setlocal']]
   setlocal backupext=baz
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
@@ -690,7 +738,7 @@
   " 18e: Setting again string global option"
   noa setglobal backupext=ext_global " Reset global and local value (without triggering autocmd)
   noa setlocal backupext=ext_local " Sets the global(!) value!
-  let g:options=[['backupext', 'ext_local', 'ext_local', 'ext_local', 'fuu', 'global', 'set']]
+  let g:options = [['backupext', 'ext_local', 'ext_local', 'ext_local', 'fuu', 'global', 'set']]
   set backupext=fuu
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
@@ -698,25 +746,25 @@
 
   " 19a: Setting string local-global (to buffer) option"
   let oldval = &tags
-  let g:options=[['tags', oldval, oldval, oldval, 'tagpath', 'global', 'set']]
+  let g:options = [['tags', oldval, oldval, oldval, 'tagpath', 'global', 'set']]
   set tags=tagpath
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
 
   " 19b: Resetting string local-global (to buffer) option"
-  let g:options=[['tags', 'tagpath', 'tagpath', 'tagpath', oldval, 'global', 'set']]
+  let g:options = [['tags', 'tagpath', 'tagpath', 'tagpath', oldval, 'global', 'set']]
   set tags&
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
 
   " 19c: Setting global string local-global (to buffer) option "
-  let g:options=[['tags', oldval, '', oldval, 'tagpath1', 'global', 'setglobal']]
+  let g:options = [['tags', oldval, '', oldval, 'tagpath1', 'global', 'setglobal']]
   setglobal tags=tagpath1
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
 
   " 19d: Setting local string local-global (to buffer) option"
-  let g:options=[['tags', 'tagpath1', 'tagpath1', '', 'tagpath2', 'local', 'setlocal']]
+  let g:options = [['tags', 'tagpath1', 'tagpath1', '', 'tagpath2', 'local', 'setlocal']]
   setlocal tags=tagpath2
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
@@ -726,7 +774,7 @@
   " but the old local value for all other kinds of options.
   noa setglobal tags=tag_global " Reset global and local value (without triggering autocmd)
   noa setlocal tags=tag_local
-  let g:options=[['tags', 'tag_global', 'tag_local', 'tag_global', 'tagpath', 'global', 'set']]
+  let g:options = [['tags', 'tag_global', 'tag_local', 'tag_global', 'tagpath', 'global', 'set']]
   set tags=tagpath
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
@@ -736,7 +784,7 @@
   " but the old local value for all other kinds of options.
   noa set tags=tag_global " Reset global and local value (without triggering autocmd)
   noa setlocal tags= " empty string
-  let g:options=[['tags', 'tag_global', '', 'tag_global', 'tagpath', 'global', 'set']]
+  let g:options = [['tags', 'tag_global', '', 'tag_global', 'tagpath', 'global', 'set']]
   set tags=tagpath
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
@@ -744,26 +792,26 @@
 
   " 20a: Setting string local (to buffer) option"
   let oldval = &spelllang
-  let g:options=[['spelllang', oldval, oldval, oldval, 'elvish,klingon', 'global', 'set']]
+  let g:options = [['spelllang', oldval, oldval, oldval, 'elvish,klingon', 'global', 'set']]
   set spelllang=elvish,klingon
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
 
   " 20b: Resetting string local (to buffer) option"
-  let g:options=[['spelllang', 'elvish,klingon', 'elvish,klingon', 'elvish,klingon', oldval, 'global', 'set']]
+  let g:options = [['spelllang', 'elvish,klingon', 'elvish,klingon', 'elvish,klingon', oldval, 'global', 'set']]
   set spelllang&
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
 
   " 20c: Setting global string local (to buffer) option"
-  let g:options=[['spelllang', oldval, '', oldval, 'elvish', 'global', 'setglobal']]
+  let g:options = [['spelllang', oldval, '', oldval, 'elvish', 'global', 'setglobal']]
   setglobal spelllang=elvish
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
 
   " 20d: Setting local string local (to buffer) option"
   noa set spelllang& " Reset global and local value (without triggering autocmd)
-  let g:options=[['spelllang', oldval, oldval, '', 'klingon', 'local', 'setlocal']]
+  let g:options = [['spelllang', oldval, oldval, '', 'klingon', 'local', 'setlocal']]
   setlocal spelllang=klingon
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
@@ -773,7 +821,7 @@
   " but the old local value for all other kinds of options.
   noa setglobal spelllang=spellglobal " Reset global and local value (without triggering autocmd)
   noa setlocal spelllang=spelllocal
-  let g:options=[['spelllang', 'spelllocal', 'spelllocal', 'spellglobal', 'foo', 'global', 'set']]
+  let g:options = [['spelllang', 'spelllocal', 'spelllocal', 'spellglobal', 'foo', 'global', 'set']]
   set spelllang=foo
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
@@ -781,7 +829,7 @@
 
   " 21a: Setting string local-global (to window) option"
   let oldval = &statusline
-  let g:options=[['statusline', oldval, oldval, oldval, 'foo', 'global', 'set']]
+  let g:options = [['statusline', oldval, oldval, oldval, 'foo', 'global', 'set']]
   set statusline=foo
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
@@ -789,20 +837,20 @@
   " 21b: Resetting string local-global (to window) option"
   " Note: v:option_old is the old global value for local-global string options
   " but the old local value for all other kinds of options.
-  let g:options=[['statusline', 'foo', 'foo', 'foo', oldval, 'global', 'set']]
+  let g:options = [['statusline', 'foo', 'foo', 'foo', oldval, 'global', 'set']]
   set statusline&
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
 
   " 21c: Setting global string local-global (to window) option"
-  let g:options=[['statusline', oldval, '', oldval, 'bar', 'global', 'setglobal']]
+  let g:options = [['statusline', oldval, '', oldval, 'bar', 'global', 'setglobal']]
   setglobal statusline=bar
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
 
   " 21d: Setting local string local-global (to window) option"
   noa set statusline& " Reset global and local value (without triggering autocmd)
-  let g:options=[['statusline', oldval, oldval, '', 'baz', 'local', 'setlocal']]
+  let g:options = [['statusline', oldval, oldval, '', 'baz', 'local', 'setlocal']]
   setlocal statusline=baz
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
@@ -812,7 +860,7 @@
   " but the old local value for all other kinds of options.
   noa setglobal statusline=bar " Reset global and local value (without triggering autocmd)
   noa setlocal statusline=baz
-  let g:options=[['statusline', 'bar', 'baz', 'bar', 'foo', 'global', 'set']]
+  let g:options = [['statusline', 'bar', 'baz', 'bar', 'foo', 'global', 'set']]
   set statusline=foo
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
@@ -820,26 +868,26 @@
 
   " 22a: Setting string local (to window) option"
   let oldval = &foldignore
-  let g:options=[['foldignore', oldval, oldval, oldval, 'fo', 'global', 'set']]
+  let g:options = [['foldignore', oldval, oldval, oldval, 'fo', 'global', 'set']]
   set foldignore=fo
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
 
   " 22b: Resetting string local (to window) option"
-  let g:options=[['foldignore', 'fo', 'fo', 'fo', oldval, 'global', 'set']]
+  let g:options = [['foldignore', 'fo', 'fo', 'fo', oldval, 'global', 'set']]
   set foldignore&
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
 
   " 22c: Setting global string local (to window) option"
-  let g:options=[['foldignore', oldval, '', oldval, 'bar', 'global', 'setglobal']]
+  let g:options = [['foldignore', oldval, '', oldval, 'bar', 'global', 'setglobal']]
   setglobal foldignore=bar
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
 
   " 22d: Setting local string local (to window) option"
   noa set foldignore& " Reset global and local value (without triggering autocmd)
-  let g:options=[['foldignore', oldval, oldval, '', 'baz', 'local', 'setlocal']]
+  let g:options = [['foldignore', oldval, oldval, '', 'baz', 'local', 'setlocal']]
   setlocal foldignore=baz
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
@@ -847,7 +895,7 @@
   " 22e: Setting again string local (to window) option"
   noa setglobal foldignore=glob " Reset global and local value (without triggering autocmd)
   noa setlocal foldignore=loc
-  let g:options=[['foldignore', 'loc', 'loc', 'glob', 'fo', 'global', 'set']]
+  let g:options = [['foldignore', 'loc', 'loc', 'glob', 'fo', 'global', 'set']]
   set foldignore=fo
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
@@ -856,7 +904,7 @@
   " 23a: Setting global number local option"
   noa setglobal cmdheight=8 " Reset global and local value (without triggering autocmd)
   noa setlocal cmdheight=1 " Sets the global(!) value!
-  let g:options=[['cmdheight', '1', '', '1', '2', 'global', 'setglobal']]
+  let g:options = [['cmdheight', '1', '', '1', '2', 'global', 'setglobal']]
   setglobal cmdheight=2
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
@@ -864,7 +912,7 @@
   " 23b: Setting local number global option"
   noa setglobal cmdheight=8 " Reset global and local value (without triggering autocmd)
   noa setlocal cmdheight=1 " Sets the global(!) value!
-  let g:options=[['cmdheight', '1', '1', '', '2', 'local', 'setlocal']]
+  let g:options = [['cmdheight', '1', '1', '', '2', 'local', 'setlocal']]
   setlocal cmdheight=2
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
@@ -872,14 +920,14 @@
   " 23c: Setting again number global option"
   noa setglobal cmdheight=8 " Reset global and local value (without triggering autocmd)
   noa setlocal cmdheight=1 " Sets the global(!) value!
-  let g:options=[['cmdheight', '1', '1', '1', '2', 'global', 'set']]
+  let g:options = [['cmdheight', '1', '1', '1', '2', 'global', 'set']]
   set cmdheight=2
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
 
   " 23d: Setting again number global option"
   noa set cmdheight=8 " Reset global and local value (without triggering autocmd)
-  let g:options=[['cmdheight', '8', '8', '8', '2', 'global', 'set']]
+  let g:options = [['cmdheight', '8', '8', '8', '2', 'global', 'set']]
   set cmdheight=2
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
@@ -888,7 +936,7 @@
   " 24a: Setting global number global-local (to buffer) option"
   noa setglobal undolevels=8 " Reset global and local value (without triggering autocmd)
   noa setlocal undolevels=1
-  let g:options=[['undolevels', '8', '', '8', '2', 'global', 'setglobal']]
+  let g:options = [['undolevels', '8', '', '8', '2', 'global', 'setglobal']]
   setglobal undolevels=2
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
@@ -896,7 +944,7 @@
   " 24b: Setting local number global-local (to buffer) option"
   noa setglobal undolevels=8 " Reset global and local value (without triggering autocmd)
   noa setlocal undolevels=1
-  let g:options=[['undolevels', '1', '1', '', '2', 'local', 'setlocal']]
+  let g:options = [['undolevels', '1', '1', '', '2', 'local', 'setlocal']]
   setlocal undolevels=2
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
@@ -904,14 +952,14 @@
   " 24c: Setting again number global-local (to buffer) option"
   noa setglobal undolevels=8 " Reset global and local value (without triggering autocmd)
   noa setlocal undolevels=1
-  let g:options=[['undolevels', '1', '1', '8', '2', 'global', 'set']]
+  let g:options = [['undolevels', '1', '1', '8', '2', 'global', 'set']]
   set undolevels=2
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
 
   " 24d: Setting again global number global-local (to buffer) option"
   noa set undolevels=8 " Reset global and local value (without triggering autocmd)
-  let g:options=[['undolevels', '8', '8', '8', '2', 'global', 'set']]
+  let g:options = [['undolevels', '8', '8', '8', '2', 'global', 'set']]
   set undolevels=2
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
@@ -920,7 +968,7 @@
   " 25a: Setting global number local (to buffer) option"
   noa setglobal wrapmargin=8 " Reset global and local value (without triggering autocmd)
   noa setlocal wrapmargin=1
-  let g:options=[['wrapmargin', '8', '', '8', '2', 'global', 'setglobal']]
+  let g:options = [['wrapmargin', '8', '', '8', '2', 'global', 'setglobal']]
   setglobal wrapmargin=2
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
@@ -928,7 +976,7 @@
   " 25b: Setting local number local (to buffer) option"
   noa setglobal wrapmargin=8 " Reset global and local value (without triggering autocmd)
   noa setlocal wrapmargin=1
-  let g:options=[['wrapmargin', '1', '1', '', '2', 'local', 'setlocal']]
+  let g:options = [['wrapmargin', '1', '1', '', '2', 'local', 'setlocal']]
   setlocal wrapmargin=2
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
@@ -936,14 +984,14 @@
   " 25c: Setting again number local (to buffer) option"
   noa setglobal wrapmargin=8 " Reset global and local value (without triggering autocmd)
   noa setlocal wrapmargin=1
-  let g:options=[['wrapmargin', '1', '1', '8', '2', 'global', 'set']]
+  let g:options = [['wrapmargin', '1', '1', '8', '2', 'global', 'set']]
   set wrapmargin=2
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
 
   " 25d: Setting again global number local (to buffer) option"
   noa set wrapmargin=8 " Reset global and local value (without triggering autocmd)
-  let g:options=[['wrapmargin', '8', '8', '8', '2', 'global', 'set']]
+  let g:options = [['wrapmargin', '8', '8', '8', '2', 'global', 'set']]
   set wrapmargin=2
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
@@ -956,7 +1004,7 @@
   " 27a: Setting global number local (to window) option"
   noa setglobal foldcolumn=8 " Reset global and local value (without triggering autocmd)
   noa setlocal foldcolumn=1
-  let g:options=[['foldcolumn', '8', '', '8', '2', 'global', 'setglobal']]
+  let g:options = [['foldcolumn', '8', '', '8', '2', 'global', 'setglobal']]
   setglobal foldcolumn=2
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
@@ -964,7 +1012,7 @@
   " 27b: Setting local number local (to window) option"
   noa setglobal foldcolumn=8 " Reset global and local value (without triggering autocmd)
   noa setlocal foldcolumn=1
-  let g:options=[['foldcolumn', '1', '1', '', '2', 'local', 'setlocal']]
+  let g:options = [['foldcolumn', '1', '1', '', '2', 'local', 'setlocal']]
   setlocal foldcolumn=2
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
@@ -972,14 +1020,14 @@
   " 27c: Setting again number local (to window) option"
   noa setglobal foldcolumn=8 " Reset global and local value (without triggering autocmd)
   noa setlocal foldcolumn=1
-  let g:options=[['foldcolumn', '1', '1', '8', '2', 'global', 'set']]
+  let g:options = [['foldcolumn', '1', '1', '8', '2', 'global', 'set']]
   set foldcolumn=2
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
 
   " 27d: Ssettin again global number local (to window) option"
   noa set foldcolumn=8 " Reset global and local value (without triggering autocmd)
-  let g:options=[['foldcolumn', '8', '8', '8', '2', 'global', 'set']]
+  let g:options = [['foldcolumn', '8', '8', '8', '2', 'global', 'set']]
   set foldcolumn=2
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
@@ -988,7 +1036,7 @@
   " 28a: Setting global boolean global option"
   noa setglobal nowrapscan " Reset global and local value (without triggering autocmd)
   noa setlocal wrapscan " Sets the global(!) value!
-  let g:options=[['wrapscan', '1', '', '1', '0', 'global', 'setglobal']]
+  let g:options = [['wrapscan', '1', '', '1', '0', 'global', 'setglobal']]
   setglobal nowrapscan
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
@@ -996,7 +1044,7 @@
   " 28b: Setting local boolean global option"
   noa setglobal nowrapscan " Reset global and local value (without triggering autocmd)
   noa setlocal wrapscan " Sets the global(!) value!
-  let g:options=[['wrapscan', '1', '1', '', '0', 'local', 'setlocal']]
+  let g:options = [['wrapscan', '1', '1', '', '0', 'local', 'setlocal']]
   setlocal nowrapscan
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
@@ -1004,14 +1052,14 @@
   " 28c: Setting again boolean global option"
   noa setglobal nowrapscan " Reset global and local value (without triggering autocmd)
   noa setlocal wrapscan " Sets the global(!) value!
-  let g:options=[['wrapscan', '1', '1', '1', '0', 'global', 'set']]
+  let g:options = [['wrapscan', '1', '1', '1', '0', 'global', 'set']]
   set nowrapscan
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
 
   " 28d: Setting again global boolean global option"
   noa set nowrapscan " Reset global and local value (without triggering autocmd)
-  let g:options=[['wrapscan', '0', '0', '0', '1', 'global', 'set']]
+  let g:options = [['wrapscan', '0', '0', '0', '1', 'global', 'set']]
   set wrapscan
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
@@ -1020,7 +1068,7 @@
   " 29a: Setting global boolean global-local (to buffer) option"
   noa setglobal noautoread " Reset global and local value (without triggering autocmd)
   noa setlocal autoread
-  let g:options=[['autoread', '0', '', '0', '1', 'global', 'setglobal']]
+  let g:options = [['autoread', '0', '', '0', '1', 'global', 'setglobal']]
   setglobal autoread
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
@@ -1028,7 +1076,7 @@
   " 29b: Setting local boolean global-local (to buffer) option"
   noa setglobal noautoread " Reset global and local value (without triggering autocmd)
   noa setlocal autoread
-  let g:options=[['autoread', '1', '1', '', '0', 'local', 'setlocal']]
+  let g:options = [['autoread', '1', '1', '', '0', 'local', 'setlocal']]
   setlocal noautoread
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
@@ -1036,14 +1084,14 @@
   " 29c: Setting again boolean global-local (to buffer) option"
   noa setglobal noautoread " Reset global and local value (without triggering autocmd)
   noa setlocal autoread
-  let g:options=[['autoread', '1', '1', '0', '1', 'global', 'set']]
+  let g:options = [['autoread', '1', '1', '0', '1', 'global', 'set']]
   set autoread
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
 
   " 29d: Setting again global boolean global-local (to buffer) option"
   noa set noautoread " Reset global and local value (without triggering autocmd)
-  let g:options=[['autoread', '0', '0', '0', '1', 'global', 'set']]
+  let g:options = [['autoread', '0', '0', '0', '1', 'global', 'set']]
   set autoread
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
@@ -1052,7 +1100,7 @@
   " 30a: Setting global boolean local (to buffer) option"
   noa setglobal nocindent " Reset global and local value (without triggering autocmd)
   noa setlocal cindent
-  let g:options=[['cindent', '0', '', '0', '1', 'global', 'setglobal']]
+  let g:options = [['cindent', '0', '', '0', '1', 'global', 'setglobal']]
   setglobal cindent
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
@@ -1060,7 +1108,7 @@
   " 30b: Setting local boolean local (to buffer) option"
   noa setglobal nocindent " Reset global and local value (without triggering autocmd)
   noa setlocal cindent
-  let g:options=[['cindent', '1', '1', '', '0', 'local', 'setlocal']]
+  let g:options = [['cindent', '1', '1', '', '0', 'local', 'setlocal']]
   setlocal nocindent
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
@@ -1068,14 +1116,14 @@
   " 30c: Setting again boolean local (to buffer) option"
   noa setglobal nocindent " Reset global and local value (without triggering autocmd)
   noa setlocal cindent
-  let g:options=[['cindent', '1', '1', '0', '1', 'global', 'set']]
+  let g:options = [['cindent', '1', '1', '0', '1', 'global', 'set']]
   set cindent
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
 
   " 30d: Setting again global boolean local (to buffer) option"
   noa set nocindent " Reset global and local value (without triggering autocmd)
-  let g:options=[['cindent', '0', '0', '0', '1', 'global', 'set']]
+  let g:options = [['cindent', '0', '0', '0', '1', 'global', 'set']]
   set cindent
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
@@ -1088,7 +1136,7 @@
   " 32a: Setting global boolean local (to window) option"
   noa setglobal nocursorcolumn " Reset global and local value (without triggering autocmd)
   noa setlocal cursorcolumn
-  let g:options=[['cursorcolumn', '0', '', '0', '1', 'global', 'setglobal']]
+  let g:options = [['cursorcolumn', '0', '', '0', '1', 'global', 'setglobal']]
   setglobal cursorcolumn
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
@@ -1096,7 +1144,7 @@
   " 32b: Setting local boolean local (to window) option"
   noa setglobal nocursorcolumn " Reset global and local value (without triggering autocmd)
   noa setlocal cursorcolumn
-  let g:options=[['cursorcolumn', '1', '1', '', '0', 'local', 'setlocal']]
+  let g:options = [['cursorcolumn', '1', '1', '', '0', 'local', 'setlocal']]
   setlocal nocursorcolumn
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
@@ -1104,14 +1152,14 @@
   " 32c: Setting again boolean local (to window) option"
   noa setglobal nocursorcolumn " Reset global and local value (without triggering autocmd)
   noa setlocal cursorcolumn
-  let g:options=[['cursorcolumn', '1', '1', '0', '1', 'global', 'set']]
+  let g:options = [['cursorcolumn', '1', '1', '0', '1', 'global', 'set']]
   set cursorcolumn
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
 
   " 32d: Setting again global boolean local (to window) option"
   noa set nocursorcolumn " Reset global and local value (without triggering autocmd)
-  let g:options=[['cursorcolumn', '0', '0', '0', '1', 'global', 'set']]
+  let g:options = [['cursorcolumn', '0', '0', '0', '1', 'global', 'set']]
   set cursorcolumn
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
@@ -1119,7 +1167,7 @@
 
   " 33: Test autocommands when an option value is converted internally.
   noa set backspace=1 " Reset global and local value (without triggering autocmd)
-  let g:options=[['backspace', 'indent,eol', 'indent,eol', 'indent,eol', '2', 'global', 'set']]
+  let g:options = [['backspace', 'indent,eol', 'indent,eol', 'indent,eol', '2', 'global', 'set']]
   set backspace=2
   call assert_equal([], g:options)
   call assert_equal(g:opt[0], g:opt[1])
@@ -1139,7 +1187,7 @@
   call test_override('starting', 1)
   " 18: Changing an option when entering diff mode
   new
-  au OptionSet diff :let &l:cul=v:option_new
+  au OptionSet diff :let &l:cul = v:option_new
 
   call setline(1, ['buffer 1', 'line2', 'line3', 'line4'])
   call assert_equal(0, &l:cul)
@@ -1596,14 +1644,14 @@
 endfunc
 
 func SetChangeMarks(start, end)
-  exe a:start. 'mark ['
-  exe a:end. 'mark ]'
+  exe a:start .. 'mark ['
+  exe a:end .. 'mark ]'
 endfunc
 
 " Verify the effects of autocmds on '[ and ']
 func Test_change_mark_in_autocmds()
   edit! Xtest
-  call feedkeys("ia\<CR>b\<CR>c\<CR>d\<C-g>u", 'xtn')
+  call feedkeys("ia\<CR>b\<CR>c\<CR>d\<C-g>u\<Esc>", 'xtn')
 
   call SetChangeMarks(2, 3)
   write
@@ -1689,9 +1737,7 @@
 endfunc
 
 func Test_Filter_noshelltemp()
-  if !executable('cat')
-    return
-  endif
+  CheckExecutable cat
 
   enew!
   call setline(1, ['a', 'b', 'c', 'd'])
@@ -1760,25 +1806,36 @@
 
   call assert_equal({}, v:event)
 
+  if has('clipboard_working') && !has('gui_running')
+    " Test that when the visual selection is automatically copied to clipboard
+    " register a TextYankPost is emitted
+    call setline(1, ['foobar'])
+
+    let @* = ''
+    set clipboard=autoselect
+    exe "norm! ggviw\<Esc>"
+    call assert_equal(
+        \{'regcontents': ['foobar'], 'regname': '*', 'operator': 'y', 'regtype': 'v', 'visual': v:true},
+        \g:event)
+
+    let @+ = ''
+    set clipboard=autoselectplus
+    exe "norm! ggviw\<Esc>"
+    call assert_equal(
+        \{'regcontents': ['foobar'], 'regname': '+', 'operator': 'y', 'regtype': 'v', 'visual': v:true},
+        \g:event)
+
+    set clipboard&vim
+  endif
+
   au! TextYankPost
   unlet g:event
   bwipe!
 endfunc
 
-func Test_nocatch_wipe_all_buffers()
-  " Real nasty autocommand: wipe all buffers on any event.
-  au * * bwipe *
-  call assert_fails('next x', ['E94:', 'E517:'])
-  bwipe
-  au!
-endfunc
-
-func Test_nocatch_wipe_dummy_buffer()
-  CheckFeature quickfix
-  " Nasty autocommand: wipe buffer on any event.
-  au * x bwipe
-  call assert_fails('lv½ /x', 'E937:')
-  au!
+func Test_autocommand_all_events()
+  call assert_fails('au * * bwipe', 'E1155:')
+  call assert_fails('au * x bwipe', 'E1155:')
 endfunc
 
 function s:Before_test_dirchanged()
@@ -2304,7 +2361,7 @@
   call writefile(lines, 'XSafeState')
   let buf = RunVimInTerminal('-S XSafeState', #{rows: 6})
 
-  " Sometimes we loop to handle a K_IGNORE, SafeState may be trigered once or
+  " Sometimes we loop to handle a K_IGNORE, SafeState may be triggered once or
   " more often.
   call term_sendkeys(buf, ":echo g:safe\<CR>")
   call WaitForAssert({-> assert_match('^\d ', term_getline(buf, 6))}, 1000)
@@ -2326,16 +2383,14 @@
 
 func Test_autocmd_CmdWinEnter()
   CheckRunVimInTerminal
-  " There is not cmdwin switch, so
-  " test for cmdline_hist
-  " (both are available with small builds)
-  CheckFeature cmdline_hist
+  CheckFeature cmdwin
+
   let lines =<< trim END
     let b:dummy_var = 'This is a dummy'
     autocmd CmdWinEnter * quit
     let winnr = winnr('$')
   END
-  let filename='XCmdWinEnter'
+  let filename = 'XCmdWinEnter'
   call writefile(lines, filename)
   let buf = RunVimInTerminal('-S '.filename, #{rows: 6})
 
diff -Nru vim-8.2.1913/src/testdir/test_backspace_opt.vim vim-8.2.2434/src/testdir/test_backspace_opt.vim
--- vim-8.2.1913/src/testdir/test_backspace_opt.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_backspace_opt.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1,15 +1,5 @@
 " Tests for 'backspace' settings
 
-func Exec(expr)
-  let str=''
-  try
-    exec a:expr
-  catch /.*/
-    let str=v:exception
-  endtry
-  return str
-endfunc
-
 func Test_backspace_option()
   set backspace=
   call assert_equal('', &backspace)
@@ -41,10 +31,10 @@
   set backspace-=eol
   call assert_equal('', &backspace)
   " Check the error
-  call assert_equal(0, match(Exec('set backspace=ABC'), '.*E474:'))
-  call assert_equal(0, match(Exec('set backspace+=def'), '.*E474:'))
+  call assert_fails('set backspace=ABC', 'E474:')
+  call assert_fails('set backspace+=def', 'E474:')
   " NOTE: Vim doesn't check following error...
-  "call assert_equal(0, match(Exec('set backspace-=ghi'), '.*E474:'))
+  "call assert_fails('set backspace-=ghi', 'E474:')
 
   " Check backwards compatibility with version 5.4 and earlier
   set backspace=0
@@ -55,8 +45,8 @@
   call assert_equal('2', &backspace)
   set backspace=3
   call assert_equal('3', &backspace)
-  call assert_false(match(Exec('set backspace=4'), '.*E474:'))
-  call assert_false(match(Exec('set backspace=10'), '.*E474:'))
+  call assert_fails('set backspace=4', 'E474:')
+  call assert_fails('set backspace=10', 'E474:')
 
   " Cleared when 'compatible' is set
   set compatible
diff -Nru vim-8.2.1913/src/testdir/test_buffer.vim vim-8.2.2434/src/testdir/test_buffer.vim
--- vim-8.2.1913/src/testdir/test_buffer.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_buffer.vim	2021-01-30 22:05:11.000000000 +0000
@@ -374,4 +374,11 @@
   bwipe! SomeNewBuffer
 endfunc
 
+func Test_balt()
+  new SomeNewBuffer
+  balt +3 OtherBuffer
+  e #
+  call assert_equal('OtherBuffer', bufname())
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff -Nru vim-8.2.1913/src/testdir/test_channel.vim vim-8.2.2434/src/testdir/test_channel.vim
--- vim-8.2.1913/src/testdir/test_channel.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_channel.vim	2021-01-30 22:05:11.000000000 +0000
@@ -2181,18 +2181,21 @@
   else
     let cmd = 'grep foo'
   endif
+
   let g:job = job_start(cmd, {})
+  sleep 50m  " give the job time to start
   call job_stop(g:job)
-  sleep 50m
-  call assert_equal(-1, job_info(g:job).exitval)
+  call WaitForAssert({-> assert_equal(-1, job_info(g:job).exitval)})
+
   let g:job = job_start(cmd, {})
-  call job_stop(g:job, 'term')
   sleep 50m
-  call assert_equal(-1, job_info(g:job).exitval)
+  call job_stop(g:job, 'term')
+  call WaitForAssert({-> assert_equal(-1, job_info(g:job).exitval)})
+
   let g:job = job_start(cmd, {})
-  call job_stop(g:job, 'kill')
   sleep 50m
-  call assert_equal(-1, job_info(g:job).exitval)
+  call job_stop(g:job, 'kill')
+  call WaitForAssert({-> assert_equal(-1, job_info(g:job).exitval)})
 endfunc
 
 func Test_issue_5485()
@@ -2301,8 +2304,14 @@
 func Test_cb_with_input()
   let g:wait_exit_cb = 1
 
-  call job_start('echo "Vim''s test"',
-        \ {'out_cb': 'ExitCb_cb_with_input'})
+  if has('win32')
+    let cmd = 'cmd /c echo "Vim''s test"'
+  else
+    let cmd = 'echo "Vim''s test"'
+  endif
+
+  let job = job_start(cmd, {'out_cb': 'ExitCb_cb_with_input'})
+  call WaitFor({-> job_status(job) == "dead"})
   call WaitForAssert({-> assert_equal(0, g:wait_exit_cb)})
 
   unlet g:wait_exit_cb
diff -Nru vim-8.2.1913/src/testdir/test_clientserver.vim vim-8.2.2434/src/testdir/test_clientserver.vim
--- vim-8.2.1913/src/testdir/test_clientserver.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_clientserver.vim	2021-01-30 22:05:11.000000000 +0000
@@ -63,8 +63,9 @@
       call remote_send(name, ":gui -f\<CR>")
     endif
     " Wait for the server to be up and answering requests.
-    sleep 100m
-    call WaitForAssert({-> assert_true(name->remote_expr("v:version", "", 1) != "")})
+    " When using valgrind this can be very, very slow.
+    sleep 1
+    call WaitForAssert({-> assert_match('\d', name->remote_expr("v:version", "", 1))}, 10000)
 
     call remote_send(name, ":let testvar = 'maybe'\<CR>")
     call WaitForAssert({-> assert_equal('maybe', remote_expr(name, "testvar", "", 2))})
@@ -72,6 +73,16 @@
 
   call assert_fails('call remote_send("XXX", ":let testvar = ''yes''\<CR>")', 'E241:')
 
+  call writefile(['one'], 'Xclientfile')
+  let cmd = GetVimProg() .. ' --servername ' .. name .. ' --remote Xclientfile'
+  call system(cmd)
+  call WaitForAssert({-> assert_equal('Xclientfile', remote_expr(name, "bufname()", "", 2))})
+  call WaitForAssert({-> assert_equal('one', remote_expr(name, "getline(1)", "", 2))})
+  call writefile(['one', 'two'], 'Xclientfile')
+  call system(cmd)
+  call WaitForAssert({-> assert_equal('two', remote_expr(name, "getline(2)", "", 2))})
+  call delete('Xclientfile')
+
   " Expression evaluated locally.
   if v:servername == ''
     eval 'MYSELF'->remote_startserver()
@@ -124,19 +135,19 @@
 
     " Edit multiple files using --remote
     call system(cmd .. ' --remote Xfile1 Xfile2 Xfile3')
-    call assert_equal("Xfile1\nXfile2\nXfile3\n", remote_expr(name, 'argv()'))
+    call assert_match(".*Xfile1\n.*Xfile2\n.*Xfile3\n", remote_expr(name, 'argv()'))
     eval name->remote_send(":%bw!\<CR>")
 
     " Edit files in separate tab pages
     call system(cmd .. ' --remote-tab Xfile1 Xfile2 Xfile3')
     call WaitForAssert({-> assert_equal('3', remote_expr(name, 'tabpagenr("$")'))})
-    call assert_equal('Xfile2', remote_expr(name, 'bufname(tabpagebuflist(2)[0])'))
+    call assert_match('.*\<Xfile2', remote_expr(name, 'bufname(tabpagebuflist(2)[0])'))
     eval name->remote_send(":%bw!\<CR>")
 
     " Edit a file using --remote-wait
     eval name->remote_send(":source $VIMRUNTIME/plugin/rrhelper.vim\<CR>")
     call system(cmd .. ' --remote-wait +enew Xfile1')
-    call assert_equal("Xfile1", remote_expr(name, 'bufname("#")'))
+    call assert_match('.*\<Xfile1', remote_expr(name, 'bufname("#")'))
     eval name->remote_send(":%bw!\<CR>")
 
     " Edit files using --remote-tab-wait
diff -Nru vim-8.2.1913/src/testdir/test_cmdline.vim vim-8.2.2434/src/testdir/test_cmdline.vim
--- vim-8.2.1913/src/testdir/test_cmdline.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_cmdline.vim	2021-01-30 22:05:11.000000000 +0000
@@ -58,6 +58,22 @@
   call feedkeys(":e Xdir1/\<Tab>\<Down>\<Up>\<Right>\<CR>", 'tx')
   call assert_equal('testfile1', getline(1))
 
+  " this fails in some Unix GUIs, not sure why
+  if !has('unix') || !has('gui_running')
+    " <C-J>/<C-K> mappings to go up/down directories when 'wildcharm' is
+    " different than 'wildchar'.
+    set wildcharm=<C-Z>
+    cnoremap <C-J> <Down><C-Z>
+    cnoremap <C-K> <Up><C-Z>
+    call feedkeys(":e Xdir1/\<Tab>\<C-J>\<CR>", 'tx')
+    call assert_equal('testfile3', getline(1))
+    call feedkeys(":e Xdir1/\<Tab>\<C-J>\<C-K>\<CR>", 'tx')
+    call assert_equal('testfile1', getline(1))
+    set wildcharm=0
+    cunmap <C-J>
+    cunmap <C-K>
+  endif
+
   " Test for canceling the wild menu by adding a character
   redrawstatus
   call feedkeys(":e Xdir1/\<Tab>x\<C-B>\"\<CR>", 'xt')
@@ -84,7 +100,7 @@
   call delete('Xdir1', 'd')
   set nowildmenu
 endfunc
-f
+
 func Test_wildmenu_screendump()
   CheckScreendump
 
@@ -112,9 +128,7 @@
   call delete('XTest_wildmenu')
 endfunc
 
-
 func Test_map_completion()
-  CheckFeature cmdline_compl
   call feedkeys(":map <unique> <si\<Tab>\<Home>\"\<CR>", 'xt')
   call assert_equal('"map <unique> <silent>', getreg(':'))
   call feedkeys(":map <script> <un\<Tab>\<Home>\"\<CR>", 'xt')
@@ -192,7 +206,6 @@
 endfunc
 
 func Test_match_completion()
-  CheckFeature cmdline_compl
   hi Aardig ctermfg=green
   call feedkeys(":match \<Tab>\<Home>\"\<CR>", 'xt')
   call assert_equal('"match Aardig', getreg(':'))
@@ -201,7 +214,6 @@
 endfunc
 
 func Test_highlight_completion()
-  CheckFeature cmdline_compl
   hi Aardig ctermfg=green
   call feedkeys(":hi \<Tab>\<Home>\"\<CR>", 'xt')
   call assert_equal('"hi Aardig', getreg(':'))
@@ -238,7 +250,6 @@
 endfunc
 
 func Test_getcompletion()
-  CheckFeature cmdline_compl
   let groupcount = len(getcompletion('', 'event'))
   call assert_true(groupcount > 0)
   let matchcount = len('File'->getcompletion('event'))
@@ -604,6 +615,10 @@
   call assert_match('"func Test_cmdline_complete_user', @:)
   call feedkeys(":func s:ScriptL\<Tab>\<Home>\"\<cr>", 'tx')
   call assert_match('"func <SNR>\d\+_ScriptLocalFunction', @:)
+
+  " g: prefix also works
+  call feedkeys(":echo g:Test_cmdline_complete_user_f\<Tab>\<Home>\"\<cr>", 'tx')
+  call assert_match('"echo g:Test_cmdline_complete_user_func', @:)
 endfunc
 
 func Test_cmdline_complete_user_names()
@@ -674,6 +689,17 @@
   unlet $X_VIM_TEST_COMPLETE_ENV
 endfunc
 
+func Test_cmdline_complete_expression()
+  let g:SomeVar = 'blah'
+  for cmd in ['exe', 'echo', 'echon', 'echomsg']
+    call feedkeys(":" .. cmd .. " SomeV\<Tab>\<C-B>\"\<CR>", 'tx')
+    call assert_match('"' .. cmd .. ' SomeVar', @:)
+    call feedkeys(":" .. cmd .. " foo SomeV\<Tab>\<C-B>\"\<CR>", 'tx')
+    call assert_match('"' .. cmd .. ' foo SomeVar', @:)
+  endfor
+  unlet g:SomeVar
+endfunc
+
 " Test for various command-line completion
 func Test_cmdline_complete_various()
   " completion for a command starting with a comment
@@ -950,6 +976,8 @@
 endfunc
 
 func Test_getcmdwintype()
+  CheckFeature cmdwin
+
   call feedkeys("q/:let a = getcmdwintype()\<CR>:q\<CR>", 'x!')
   call assert_equal('/', a)
 
@@ -966,6 +994,8 @@
 endfunc
 
 func Test_getcmdwin_autocmd()
+  CheckFeature cmdwin
+
   let s:seq = []
   augroup CmdWin
   au WinEnter * call add(s:seq, 'WinEnter ' .. win_getid())
@@ -1078,6 +1108,8 @@
 endfunc
 
 func Test_cmdwin_bug()
+  CheckFeature cmdwin
+
   let winid = win_getid()
   sp
   try
@@ -1088,6 +1120,7 @@
 endfunc
 
 func Test_cmdwin_restore()
+  CheckFeature cmdwin
   CheckScreendump
 
   let lines =<< trim [SCRIPT]
@@ -1163,6 +1196,8 @@
 endfunc
 
 func Test_cmdwin_feedkeys()
+  CheckFeature cmdwin
+
   " This should not generate E488
   call feedkeys("q:\<CR>", 'x')
   " Using feedkeys with q: only should automatically close the cmd window
@@ -1174,6 +1209,8 @@
 " Tests for the issues fixed in 7.4.441.
 " When 'cedit' is set to Ctrl-C, opening the command window hangs Vim
 func Test_cmdwin_cedit()
+  CheckFeature cmdwin
+
   exe "set cedit=\<C-c>"
   normal! :
   call assert_equal(1, winnr('$'))
@@ -1196,8 +1233,11 @@
 
 " Test for CmdwinEnter autocmd
 func Test_cmdwin_autocmd()
+  CheckFeature cmdwin
+
   augroup CmdWin
     au!
+    autocmd BufLeave * if &buftype == '' | update | endif
     autocmd CmdwinEnter * startinsert
   augroup END
 
@@ -1238,6 +1278,8 @@
 endfunc
 
 func Test_cmdwin_jump_to_win()
+  CheckFeature cmdwin
+
   call assert_fails('call feedkeys("q:\<C-W>\<C-W>\<CR>", "xt")', 'E11:')
   new
   set modified
@@ -1254,6 +1296,7 @@
 endfunc
 
 func Test_cmdwin_interrupted()
+  CheckFeature cmdwin
   CheckScreendump
 
   " aborting the :smile output caused the cmdline window to use the current
@@ -1540,6 +1583,8 @@
 
 " Test for recursively getting multiple command line inputs
 func Test_cmdwin_multi_input()
+  CheckFeature cmdwin
+
   call feedkeys(":\<C-R>=input('P: ')\<CR>\"cyan\<CR>\<CR>", 'xt')
   call assert_equal('"cyan', @:)
 endfunc
@@ -1564,6 +1609,8 @@
 
 " Test for normal mode commands not supported in the cmd window
 func Test_cmdwin_blocked_commands()
+  CheckFeature cmdwin
+
   call assert_fails('call feedkeys("q:\<C-T>\<CR>", "xt")', 'E11:')
   call assert_fails('call feedkeys("q:\<C-]>\<CR>", "xt")', 'E11:')
   call assert_fails('call feedkeys("q:\<C-^>\<CR>", "xt")', 'E11:')
@@ -1595,6 +1642,8 @@
 
 " Close the Cmd-line window in insert mode using CTRL-C
 func Test_cmdwin_insert_mode_close()
+  CheckFeature cmdwin
+
   %bw!
   let s = ''
   exe "normal q:a\<C-C>let s='Hello'\<CR>"
@@ -1631,4 +1680,34 @@
   endif
 endfunc
 
+" Test for going up and down the directory tree using 'wildmenu'
+func Test_wildmenu_dirstack()
+  CheckUnix
+  %bw!
+  call mkdir('Xdir1/dir2/dir3', 'p')
+  call writefile([], 'Xdir1/file1_1.txt')
+  call writefile([], 'Xdir1/file1_2.txt')
+  call writefile([], 'Xdir1/dir2/file2_1.txt')
+  call writefile([], 'Xdir1/dir2/file2_2.txt')
+  call writefile([], 'Xdir1/dir2/dir3/file3_1.txt')
+  call writefile([], 'Xdir1/dir2/dir3/file3_2.txt')
+  cd Xdir1/dir2/dir3
+  set wildmenu
+
+  call feedkeys(":e \<Tab>\<C-B>\"\<CR>", 'xt')
+  call assert_equal('"e file3_1.txt', @:)
+  call feedkeys(":e \<Tab>\<Up>\<C-B>\"\<CR>", 'xt')
+  call assert_equal('"e ../dir3/', @:)
+  call feedkeys(":e \<Tab>\<Up>\<Up>\<C-B>\"\<CR>", 'xt')
+  call assert_equal('"e ../../dir2/', @:)
+  call feedkeys(":e \<Tab>\<Up>\<Up>\<Down>\<C-B>\"\<CR>", 'xt')
+  call assert_equal('"e ../../dir2/dir3/', @:)
+  call feedkeys(":e \<Tab>\<Up>\<Up>\<Down>\<Down>\<C-B>\"\<CR>", 'xt')
+  call assert_equal('"e ../../dir2/dir3/file3_1.txt', @:)
+
+  cd -
+  call delete('Xdir1', 'rf')
+  set wildmenu&
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff -Nru vim-8.2.1913/src/testdir/test_compiler.vim vim-8.2.2434/src/testdir/test_compiler.vim
--- vim-8.2.1913/src/testdir/test_compiler.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_compiler.vim	2021-01-30 22:05:11.000000000 +0000
@@ -4,9 +4,7 @@
 source shared.vim
 
 func Test_compiler()
-  if !executable('perl')
-    return
-  endif
+  CheckExecutable perl
   CheckFeature quickfix
 
   " $LANG changes the output of Perl.
@@ -41,12 +39,19 @@
   bw!
 endfunc
 
+func GetCompilerNames()
+  return glob('$VIMRUNTIME/compiler/*.vim', 0, 1)
+        \ ->map({i, v -> substitute(v, '.*[\\/]\([a-zA-Z0-9_\-]*\).vim', '\1', '')})
+        \ ->sort()
+endfunc
+
 func Test_compiler_without_arg()
   let runtime = substitute($VIMRUNTIME, '\\', '/', 'g')
   let a = split(execute('compiler'))
-  call assert_match(runtime .. '/compiler/ant.vim$',   a[0])
-  call assert_match(runtime .. '/compiler/bcc.vim$',   a[1])
-  call assert_match(runtime .. '/compiler/xo.vim$', a[-1])
+  let exp = GetCompilerNames()
+  call assert_match(runtime .. '/compiler/' .. exp[0] .. '.vim$',  a[0])
+  call assert_match(runtime .. '/compiler/' .. exp[1] .. '.vim$',  a[1])
+  call assert_match(runtime .. '/compiler/' .. exp[-1] .. '.vim$', a[-1])
 endfunc
 
 " Test executing :compiler from the command line, not from a script
@@ -59,8 +64,9 @@
 endfunc
 
 func Test_compiler_completion()
+  let clist = GetCompilerNames()->join(' ')
   call feedkeys(":compiler \<C-A>\<C-B>\"\<CR>", 'tx')
-  call assert_match('^"compiler ant bcc .* xmlwf xo$', @:)
+  call assert_match('^"compiler ' .. clist .. '$', @:)
 
   call feedkeys(":compiler p\<C-A>\<C-B>\"\<CR>", 'tx')
   call assert_equal('"compiler pbx perl php pylint pyunit', @:)
diff -Nru vim-8.2.1913/src/testdir/test_cursor_func.vim vim-8.2.2434/src/testdir/test_cursor_func.vim
--- vim-8.2.1913/src/testdir/test_cursor_func.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_cursor_func.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1,4 +1,4 @@
-" Tests for cursor().
+" Tests for cursor() and other functions that get/set the cursor position
 
 func Test_wrong_arguments()
   call assert_fails('call cursor(1. 3)', 'E474:')
@@ -25,12 +25,15 @@
   " below last line goes to last line
   eval [9, 1]->cursor()
   call assert_equal([4, 1, 0, 1], getcurpos()[1:])
+  " pass string arguments
+  call cursor('3', '3')
+  call assert_equal([3, 3, 0, 3], getcurpos()[1:])
 
   call setline(1, ["\<TAB>"])
   call cursor(1, 1, 1)
   call assert_equal([1, 1, 1], getcurpos()[1:3])
 
-  call assert_equal(-1, cursor(-1, -1))
+  call assert_fails('call cursor(-1, -1)', 'E475:')
 
   quit!
 endfunc
@@ -101,6 +104,11 @@
   close
   call assert_equal({}, screenpos(999, 1, 1))
   bwipe!
+
+  call assert_equal({'col': 1, 'row': 1, 'endcol': 1, 'curscol': 1}, screenpos(win_getid(), 1, 1))
+  nmenu WinBar.TEST :
+  call assert_equal({'col': 1, 'row': 2, 'endcol': 1, 'curscol': 1}, screenpos(win_getid(), 1, 1))
+  nunmenu WinBar.TEST
 endfunc
 
 func Test_screenpos_number()
@@ -118,4 +126,246 @@
   bwipe!
 endfunc
 
+" Save the visual start character position
+func SaveVisualStartCharPos()
+  call add(g:VisualStartPos, getcharpos('v'))
+  return ''
+endfunc
+
+" Save the current cursor character position in insert mode
+func SaveInsertCurrentCharPos()
+  call add(g:InsertCurrentPos, getcharpos('.'))
+  return ''
+endfunc
+
+" Test for the getcharpos() function
+func Test_getcharpos()
+  call assert_fails('call getcharpos({})', 'E731:')
+  call assert_equal([0, 0, 0, 0], getcharpos(0))
+  new
+  call setline(1, ['', "01\tà4è678", 'Ⅵ', '012345678'])
+
+  " Test for '.' and '$'
+  normal 1G
+  call assert_equal([0, 1, 1, 0], getcharpos('.'))
+  call assert_equal([0, 4, 1, 0], getcharpos('$'))
+  normal 2G6l
+  call assert_equal([0, 2, 7, 0], getcharpos('.'))
+  normal 3G$
+  call assert_equal([0, 3, 1, 0], getcharpos('.'))
+  normal 4G$
+  call assert_equal([0, 4, 9, 0], getcharpos('.'))
+
+  " Test for a mark
+  normal 2G7lmmgg
+  call assert_equal([0, 2, 8, 0], getcharpos("'m"))
+  delmarks m
+  call assert_equal([0, 0, 0, 0], getcharpos("'m"))
+
+  " Test for the visual start column
+  vnoremap <expr> <F3> SaveVisualStartCharPos()
+  let g:VisualStartPos = []
+  exe "normal 2G6lv$\<F3>ohh\<F3>o\<F3>"
+  call assert_equal([[0, 2, 7, 0], [0, 2, 10, 0], [0, 2, 5, 0]], g:VisualStartPos)
+  call assert_equal([0, 2, 9, 0], getcharpos('v'))
+  let g:VisualStartPos = []
+  exe "normal 3Gv$\<F3>o\<F3>"
+  call assert_equal([[0, 3, 1, 0], [0, 3, 2, 0]], g:VisualStartPos)
+  let g:VisualStartPos = []
+  exe "normal 1Gv$\<F3>o\<F3>"
+  call assert_equal([[0, 1, 1, 0], [0, 1, 1, 0]], g:VisualStartPos)
+  vunmap <F3>
+
+  " Test for getting the position in insert mode with the cursor after the
+  " last character in a line
+  inoremap <expr> <F3> SaveInsertCurrentCharPos()
+  let g:InsertCurrentPos = []
+  exe "normal 1GA\<F3>"
+  exe "normal 2GA\<F3>"
+  exe "normal 3GA\<F3>"
+  exe "normal 4GA\<F3>"
+  exe "normal 2G6li\<F3>"
+  call assert_equal([[0, 1, 1, 0], [0, 2, 10, 0], [0, 3, 2, 0], [0, 4, 10, 0],
+                        \ [0, 2, 7, 0]], g:InsertCurrentPos)
+  iunmap <F3>
+
+  %bw!
+endfunc
+
+" Test for the setcharpos() function
+func Test_setcharpos()
+  call assert_equal(-1, setcharpos('.', test_null_list()))
+  new
+  call setline(1, ['', "01\tà4è678", 'Ⅵ', '012345678'])
+  call setcharpos('.', [0, 1, 1, 0])
+  call assert_equal([1, 1], [line('.'), col('.')])
+  call setcharpos('.', [0, 2, 7, 0])
+  call assert_equal([2, 9], [line('.'), col('.')])
+  call setcharpos('.', [0, 3, 4, 0])
+  call assert_equal([3, 1], [line('.'), col('.')])
+  call setcharpos('.', [0, 3, 1, 0])
+  call assert_equal([3, 1], [line('.'), col('.')])
+  call setcharpos('.', [0, 4, 0, 0])
+  call assert_equal([4, 1], [line('.'), col('.')])
+  call setcharpos('.', [0, 4, 20, 0])
+  call assert_equal([4, 9], [line('.'), col('.')])
+
+  " Test for mark
+  delmarks m
+  call setcharpos("'m", [0, 2, 9, 0])
+  normal `m
+  call assert_equal([2, 11], [line('.'), col('.')])
+  " unload the buffer and try to set the mark
+  let bnr = bufnr()
+  enew!
+  call assert_equal(-1, setcharpos("'m", [bnr, 2, 2, 0]))
+
+  %bw!
+  call assert_equal(-1, setcharpos('.', [10, 3, 1, 0]))
+endfunc
+
+func SaveVisualStartCharCol()
+  call add(g:VisualStartCol, charcol('v'))
+  return ''
+endfunc
+
+func SaveInsertCurrentCharCol()
+  call add(g:InsertCurrentCol, charcol('.'))
+  return ''
+endfunc
+
+" Test for the charcol() function
+func Test_charcol()
+  call assert_fails('call charcol({})', 'E731:')
+  call assert_equal(0, charcol(0))
+  new
+  call setline(1, ['', "01\tà4è678", 'Ⅵ', '012345678'])
+
+  " Test for '.' and '$'
+  normal 1G
+  call assert_equal(1, charcol('.'))
+  call assert_equal(1, charcol('$'))
+  normal 2G6l
+  call assert_equal(7, charcol('.'))
+  call assert_equal(10, charcol('$'))
+  normal 3G$
+  call assert_equal(1, charcol('.'))
+  call assert_equal(2, charcol('$'))
+  normal 4G$
+  call assert_equal(9, charcol('.'))
+  call assert_equal(10, charcol('$'))
+
+  " Test for [lnum, '$']
+  call assert_equal(1, charcol([1, '$']))
+  call assert_equal(10, charcol([2, '$']))
+  call assert_equal(2, charcol([3, '$']))
+  call assert_equal(0, charcol([5, '$']))
+
+  " Test for a mark
+  normal 2G7lmmgg
+  call assert_equal(8, charcol("'m"))
+  delmarks m
+  call assert_equal(0, charcol("'m"))
+
+  " Test for the visual start column
+  vnoremap <expr> <F3> SaveVisualStartCharCol()
+  let g:VisualStartCol = []
+  exe "normal 2G6lv$\<F3>ohh\<F3>o\<F3>"
+  call assert_equal([7, 10, 5], g:VisualStartCol)
+  call assert_equal(9, charcol('v'))
+  let g:VisualStartCol = []
+  exe "normal 3Gv$\<F3>o\<F3>"
+  call assert_equal([1, 2], g:VisualStartCol)
+  let g:VisualStartCol = []
+  exe "normal 1Gv$\<F3>o\<F3>"
+  call assert_equal([1, 1], g:VisualStartCol)
+  vunmap <F3>
+
+  " Test for getting the column number in insert mode with the cursor after
+  " the last character in a line
+  inoremap <expr> <F3> SaveInsertCurrentCharCol()
+  let g:InsertCurrentCol = []
+  exe "normal 1GA\<F3>"
+  exe "normal 2GA\<F3>"
+  exe "normal 3GA\<F3>"
+  exe "normal 4GA\<F3>"
+  exe "normal 2G6li\<F3>"
+  call assert_equal([1, 10, 2, 10, 7], g:InsertCurrentCol)
+  iunmap <F3>
+
+  %bw!
+endfunc
+
+func SaveInsertCursorCharPos()
+  call add(g:InsertCursorPos, getcursorcharpos('.'))
+  return ''
+endfunc
+
+" Test for getcursorcharpos()
+func Test_getcursorcharpos()
+  call assert_equal(getcursorcharpos(), getcursorcharpos(0))
+  call assert_equal([0, 0, 0, 0, 0], getcursorcharpos(-1))
+  call assert_equal([0, 0, 0, 0, 0], getcursorcharpos(1999))
+
+  new
+  call setline(1, ['', "01\tà4è678", 'Ⅵ', '012345678'])
+  normal 1G9l
+  call assert_equal([0, 1, 1, 0, 1], getcursorcharpos())
+  normal 2G9l
+  call assert_equal([0, 2, 9, 0, 14], getcursorcharpos())
+  normal 3G9l
+  call assert_equal([0, 3, 1, 0, 1], getcursorcharpos())
+  normal 4G9l
+  call assert_equal([0, 4, 9, 0, 9], getcursorcharpos())
+
+  " Test for getting the cursor position in insert mode with the cursor after
+  " the last character in a line
+  inoremap <expr> <F3> SaveInsertCursorCharPos()
+  let g:InsertCursorPos = []
+  exe "normal 1GA\<F3>"
+  exe "normal 2GA\<F3>"
+  exe "normal 3GA\<F3>"
+  exe "normal 4GA\<F3>"
+  exe "normal 2G6li\<F3>"
+  call assert_equal([[0, 1, 1, 0, 1], [0, 2, 10, 0, 15], [0, 3, 2, 0, 2],
+                    \ [0, 4, 10, 0, 10], [0, 2, 7, 0, 12]], g:InsertCursorPos)
+  iunmap <F3>
+
+  let winid = win_getid()
+  normal 2G5l
+  wincmd w
+  call assert_equal([0, 2, 6, 0, 11], getcursorcharpos(winid))
+  %bw!
+endfunc
+
+" Test for setcursorcharpos()
+func Test_setcursorcharpos()
+  call assert_fails('call setcursorcharpos(test_null_list())', 'E474:')
+  call assert_fails('call setcursorcharpos([1])', 'E474:')
+  call assert_fails('call setcursorcharpos([1, 1, 1, 1, 1])', 'E474:')
+  new
+  call setline(1, ['', "01\tà4è678", 'Ⅵ', '012345678'])
+  normal G
+  call setcursorcharpos([1, 1])
+  call assert_equal([1, 1], [line('.'), col('.')])
+  call setcursorcharpos([2, 7, 0])
+  call assert_equal([2, 9], [line('.'), col('.')])
+  call setcursorcharpos(3, 4)
+  call assert_equal([3, 1], [line('.'), col('.')])
+  call setcursorcharpos([3, 1])
+  call assert_equal([3, 1], [line('.'), col('.')])
+  call setcursorcharpos([4, 0, 0, 0])
+  call assert_equal([4, 1], [line('.'), col('.')])
+  call setcursorcharpos([4, 20])
+  call assert_equal([4, 9], [line('.'), col('.')])
+  normal 1G
+  call setcursorcharpos([100, 100, 100, 100])
+  call assert_equal([4, 9], [line('.'), col('.')])
+  normal 1G
+  call setcursorcharpos('$', 1)
+  call assert_equal([4, 1], [line('.'), col('.')])
+
+  %bw!
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff -Nru vim-8.2.1913/src/testdir/test_debugger.vim vim-8.2.2434/src/testdir/test_debugger.vim
--- vim-8.2.1913/src/testdir/test_debugger.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_debugger.vim	2021-01-30 22:05:11.000000000 +0000
@@ -17,14 +17,18 @@
 endfunc
 command! -nargs=0 -bar CheckCWD call CheckCWD()
 
+" "options" argument can contain:
+" 'msec' - time to wait for a match
+" 'match' - "pattern" to use "lines" as pattern instead of text
 func CheckDbgOutput(buf, lines, options = {})
   " Verify the expected output
   let lnum = 20 - len(a:lines)
+  let msec = get(a:options, 'msec', 1000)
   for l in a:lines
     if get(a:options, 'match', 'equal') ==# 'pattern'
-      call WaitForAssert({-> assert_match(l, term_getline(a:buf, lnum))}, 200)
+      call WaitForAssert({-> assert_match(l, term_getline(a:buf, lnum))}, msec)
     else
-      call WaitForAssert({-> assert_equal(l, term_getline(a:buf, lnum))}, 200)
+      call WaitForAssert({-> assert_equal(l, term_getline(a:buf, lnum))}, msec)
     endif
     let lnum += 1
   endfor
@@ -198,7 +202,7 @@
 
   " Start a debug session, so that reading the last line from the terminal
   " works properly.
-  call RunDbgCmd(buf, ':debug echo Foo()')
+  call RunDbgCmd(buf, ':debug echo Foo()', ['cmd: echo Foo()'])
 
   " No breakpoints
   call RunDbgCmd(buf, 'breakl', ['No breakpoints defined'])
@@ -809,9 +813,10 @@
         \ '-S Xtest1.vim -c "debug call GlobalFunction()"',
         \ {'wait_for_ruler': 0})
 
-  " Need to wait for the vim-in-terminal to be ready
+  " Need to wait for the vim-in-terminal to be ready.
+  " With valgrind this can take quite long.
   call CheckDbgOutput(buf, ['command line',
-                            \ 'cmd: call GlobalFunction()'])
+                            \ 'cmd: call GlobalFunction()'], #{msec: 5000})
 
   " At this point the ontly thing in the stack is the cmdline
   call RunDbgCmd(buf, 'backtrace', [
@@ -960,16 +965,16 @@
   " set a breakpoint and source file1.vim
   let buf = RunVimInTerminal(
         \ '-c "breakadd file 1 Xtest1.vim" -S Xtest1.vim',
-        \ #{ wait_for_ruler: 0 } )
+        \ #{wait_for_ruler: 0})
 
   call CheckDbgOutput(buf, [
         \ 'Breakpoint in "' .. file1 .. '" line 1',
         \ 'Entering Debug mode.  Type "cont" to continue.',
         \ 'command line..script ' .. file1,
         \ 'line 1: let s:file1_var = ''file1'''
-        \ ])
+        \ ], #{msec: 5000})
 
-  " step throught the initial declarations
+  " step through the initial declarations
   call RunDbgCmd(buf, 'step', [ 'line 2: let g:global_var = ''global''' ] )
   call RunDbgCmd(buf, 'step', [ 'line 4: func s:File1Func( arg )' ] )
   call RunDbgCmd(buf, 'echo s:file1_var', [ 'file1' ] )
diff -Nru vim-8.2.1913/src/testdir/test_delete.vim vim-8.2.2434/src/testdir/test_delete.vim
--- vim-8.2.1913/src/testdir/test_delete.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_delete.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1,5 +1,7 @@
 " Test for delete().
 
+source check.vim
+
 func Test_file_delete()
   split Xfile
   call setline(1, ['a', 'b'])
@@ -41,9 +43,7 @@
 endfunc
 
 func Test_symlink_delete()
-  if !has('unix')
-    return
-  endif
+  CheckUnix
   split Xfile
   call setline(1, ['a', 'b'])
   wq
@@ -56,9 +56,7 @@
 endfunc
 
 func Test_symlink_dir_delete()
-  if !has('unix')
-    return
-  endif
+  CheckUnix
   call mkdir('Xdir1')
   silent !ln -s Xdir1 Xlink
   call assert_true(isdirectory('Xdir1'))
@@ -70,9 +68,7 @@
 endfunc
 
 func Test_symlink_recursive_delete()
-  if !has('unix')
-    return
-  endif
+  CheckUnix
   call mkdir('Xdir3')
   call mkdir('Xdir3/subdir')
   call mkdir('Xdir4')
diff -Nru vim-8.2.1913/src/testdir/test_diffmode.vim vim-8.2.2434/src/testdir/test_diffmode.vim
--- vim-8.2.1913/src/testdir/test_diffmode.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_diffmode.vim	2021-01-30 22:05:11.000000000 +0000
@@ -621,9 +621,7 @@
 endfunc
 
 func Test_diffexpr()
-  if !executable('diff')
-    return
-  endif
+  CheckExecutable diff
 
   func DiffExpr()
     " Prepent some text to check diff type detection
@@ -1150,4 +1148,37 @@
   set ls&
 endfunc
 
+func Test_diff_filler_cursorcolumn()
+  CheckScreendump
+
+  let content =<< trim END
+    call setline(1, ['aa', 'bb', 'cc'])
+    vnew
+    call setline(1, ['aa', 'cc'])
+    windo diffthis
+    wincmd p
+    setlocal cursorcolumn foldcolumn=0
+    norm! gg0
+    redraw!
+  END
+  call writefile(content, 'Xtest_diff_cuc')
+  let buf = RunVimInTerminal('-S Xtest_diff_cuc', {})
+
+  call VerifyScreenDump(buf, 'Test_diff_cuc_01', {})
+
+  call term_sendkeys(buf, "l")
+  call term_sendkeys(buf, "\<C-l>")
+  call VerifyScreenDump(buf, 'Test_diff_cuc_02', {})
+  call term_sendkeys(buf, "0j")
+  call term_sendkeys(buf, "\<C-l>")
+  call VerifyScreenDump(buf, 'Test_diff_cuc_03', {})
+  call term_sendkeys(buf, "l")
+  call term_sendkeys(buf, "\<C-l>")
+  call VerifyScreenDump(buf, 'Test_diff_cuc_04', {})
+
+  " clean up
+  call StopVimInTerminal(buf)
+  call delete('Xtest_diff_cuc')
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff -Nru vim-8.2.1913/src/testdir/test_eval_stuff.vim vim-8.2.2434/src/testdir/test_eval_stuff.vim
--- vim-8.2.1913/src/testdir/test_eval_stuff.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_eval_stuff.vim	2021-01-30 22:05:11.000000000 +0000
@@ -68,6 +68,11 @@
   call assert_fails("for x in 99", 'E714:')
   call assert_fails("for x in 'asdf'", 'E714:')
   call assert_fails("for x in {'a': 9}", 'E714:')
+
+  if 0
+    /1/5/2/s/\n
+  endif
+  redraw
 endfunc
 
 func Test_readfile_binary()
@@ -218,6 +223,7 @@
   call assert_equal(15, 0o17)
   call assert_equal(15, 0O17)
   call assert_equal(18, 018)
+  call assert_equal(511, 0o777)
   call assert_equal(64, 0b1'00'00'00)
   call assert_equal(1048576, 0x10'00'00)
   call assert_equal(32768, 0o10'00'00)
@@ -233,6 +239,7 @@
   call assert_equal(15, 0o17)
   call assert_equal(15, 0O17)
   call assert_equal(18, 018)
+  call assert_equal(511, 0o777)
 endfunc
 
 func Test_scriptversion_fail()
@@ -254,10 +261,13 @@
   endif
 endfunc
 
-func Test_numbersize()
-  " This will fail on systems without 64 bit int support or when not configured
-  " correctly.
+func Test_number_max_min_size()
+  " This will fail on systems without 64 bit number support or when not
+  " configured correctly.
   call assert_equal(64, v:numbersize)
+
+  call assert_true(v:numbermin < -9999999)
+  call assert_true(v:numbermax > 9999999)
 endfunc
 
 func Assert_reg(name, type, value, valuestr, expr, exprstr)
diff -Nru vim-8.2.1913/src/testdir/test_execute_func.vim vim-8.2.2434/src/testdir/test_execute_func.vim
--- vim-8.2.1913/src/testdir/test_execute_func.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_execute_func.vim	2021-01-30 22:05:11.000000000 +0000
@@ -89,6 +89,8 @@
   call win_gotoid(thiswin)
   let line = win_execute(otherwin, 'echo getline(1)')
   call assert_match('the new window', line)
+  let line = win_execute(134343, 'echo getline(1)')
+  call assert_equal('', line)
 
   if has('popupwin')
     let popupwin = popup_create('the popup win', {'line': 2, 'col': 3})
diff -Nru vim-8.2.1913/src/testdir/test_exit.vim vim-8.2.2434/src/testdir/test_exit.vim
--- vim-8.2.1913/src/testdir/test_exit.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_exit.vim	2021-01-30 22:05:11.000000000 +0000
@@ -82,4 +82,31 @@
   call delete('Xtestout')
 endfunc
 
+" Test for getting the Vim exit code from v:exiting
+func Test_exit_code()
+  call assert_equal(v:null, v:exiting)
+
+  let before =<< trim [CODE]
+    au QuitPre * call writefile(['qp = ' .. v:exiting], 'Xtestout', 'a')
+    au ExitPre * call writefile(['ep = ' .. v:exiting], 'Xtestout', 'a')
+    au VimLeavePre * call writefile(['lp = ' .. v:exiting], 'Xtestout', 'a')
+    au VimLeave * call writefile(['l = ' .. v:exiting], 'Xtestout', 'a')
+  [CODE]
+
+  if RunVim(before, ['quit'], '')
+    call assert_equal(['qp = v:null', 'ep = v:null', 'lp = 0', 'l = 0'], readfile('Xtestout'))
+  endif
+  call delete('Xtestout')
+
+  if RunVim(before, ['cquit'], '')
+    call assert_equal(['lp = 1', 'l = 1'], readfile('Xtestout'))
+  endif
+  call delete('Xtestout')
+
+  if RunVim(before, ['cquit 4'], '')
+    call assert_equal(['lp = 4', 'l = 4'], readfile('Xtestout'))
+  endif
+  call delete('Xtestout')
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff -Nru vim-8.2.1913/src/testdir/test_ex_mode.vim vim-8.2.2434/src/testdir/test_ex_mode.vim
--- vim-8.2.1913/src/testdir/test_ex_mode.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_ex_mode.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1,6 +1,7 @@
 " Test editing line in Ex mode (see :help Q and :help gQ).
 
 source check.vim
+source shared.vim
 
 " Helper function to test editing line in Q Ex mode
 func Ex_Q(cmd)
@@ -179,4 +180,49 @@
   quit
 endfunc
 
+func Test_ex_mode_with_global()
+  CheckNotGui
+  CheckFeature timers
+
+  " This will get stuck in Normal mode after the failed "J", use a timer to
+  " get going again.
+  let lines =<< trim END
+    call ch_logfile('logfile', 'w')
+    pedit
+    func FeedQ(id)
+      call feedkeys('Q', 't')
+    endfunc
+    call timer_start(10, 'FeedQ')
+    g/^/vi|HJ
+    call writefile(['done'], 'Xdidexmode')
+    qall!
+  END
+  call writefile(lines, 'Xexmodescript')
+  call assert_equal(1, RunVim([], [], '-e -s -S Xexmodescript'))
+  call assert_equal(['done'], readfile('Xdidexmode'))
+
+  call delete('logfile')
+  call delete('Xdidexmode')
+  call delete('Xexmodescript')
+endfunc
+
+func Test_ex_mode_count_overflow()
+  " The multiplication causes an integer overflow
+  CheckNotAsan
+
+  " this used to cause a crash
+  let lines =<< trim END
+    call feedkeys("\<Esc>Q\<CR>")
+    v9|9silent! vi|333333233333y32333333%O
+    call writefile(['done'], 'Xdidexmode')
+    qall!
+  END
+  call writefile(lines, 'Xexmodescript')
+  call assert_equal(1, RunVim([], [], '-e -s -S Xexmodescript -c qa'))
+  call assert_equal(['done'], readfile('Xdidexmode'))
+
+  call delete('Xdidexmode')
+  call delete('Xexmodescript')
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff -Nru vim-8.2.1913/src/testdir/test_expr.vim vim-8.2.2434/src/testdir/test_expr.vim
--- vim-8.2.1913/src/testdir/test_expr.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_expr.vim	2021-01-30 22:05:11.000000000 +0000
@@ -543,9 +543,7 @@
 
 " Test for command-line completion of expressions
 func Test_expr_completion()
-  if !has('cmdline_compl')
-    return
-  endif
+  CheckFeature cmdline_compl
   for cmd in [
 	\ 'let a = ',
 	\ 'const a = ',
diff -Nru vim-8.2.1913/src/testdir/test_filetype.vim vim-8.2.2434/src/testdir/test_filetype.vim
--- vim-8.2.1913/src/testdir/test_filetype.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_filetype.vim	2021-01-30 22:05:11.000000000 +0000
@@ -87,6 +87,8 @@
     \ 'bzr': ['bzr_log.any', 'bzr_log.file'],
     \ 'c': ['enlightenment/file.cfg', 'file.qc', 'file.c', 'some-enlightenment/file.cfg'],
     \ 'cabal': ['file.cabal'],
+    \ 'cabalconfig': ['cabal.config'],
+    \ 'cabalproject': ['cabal.project', 'cabal.project.local'],
     \ 'calendar': ['calendar', '/.calendar/file', '/share/calendar/any/calendar.file', '/share/calendar/calendar.file', 'any/share/calendar/any/calendar.file', 'any/share/calendar/calendar.file'],
     \ 'catalog': ['catalog', 'sgml.catalogfile', 'sgml.catalog', 'sgml.catalog-file'],
     \ 'cdl': ['file.cdl'],
@@ -110,7 +112,7 @@
     \ 'conaryrecipe': ['file.recipe'],
     \ 'conf': ['auto.master'],
     \ 'config': ['configure.in', 'configure.ac', 'Pipfile', '/etc/hostname.file'],
-    \ 'context': ['tex/context/any/file.tex', 'file.mkii', 'file.mkiv', 'file.mkvi'],
+    \ 'context': ['tex/context/any/file.tex', 'file.mkii', 'file.mkiv', 'file.mkvi', 'file.mkxl', 'file.mklx'],
     \ 'cpp': ['file.cxx', 'file.c++', 'file.hh', 'file.hxx', 'file.hpp', 'file.ipp', 'file.moc', 'file.tcc', 'file.inl', 'file.tlh'],
     \ 'crm': ['file.crm'],
     \ 'crontab': ['crontab', 'crontab.file', '/etc/cron.d/file', 'any/etc/cron.d/file'],
@@ -151,6 +153,7 @@
     \ 'dsl': ['file.dsl'],
     \ 'dtd': ['file.dtd'],
     \ 'dts': ['file.dts', 'file.dtsi'],
+    \ 'dune': ['jbuild', 'dune', 'dune-project', 'dune-workspace'],
     \ 'dylan': ['file.dylan'],
     \ 'dylanintr': ['file.intr'],
     \ 'dylanlid': ['file.lid'],
@@ -159,6 +162,7 @@
     \ 'elinks': ['elinks.conf'],
     \ 'elm': ['file.elm'],
     \ 'elmfilt': ['filter-rules'],
+    \ 'epuppet': ['file.epp'],
     \ 'erlang': ['file.erl', 'file.hrl', 'file.yaws'],
     \ 'eruby': ['file.erb', 'file.rhtml'],
     \ 'esmtprc': ['anyesmtprc', 'esmtprc', 'some-esmtprc'],
@@ -171,6 +175,7 @@
     \ 'factor': ['file.factor'],
     \ 'falcon': ['file.fal'],
     \ 'fan': ['file.fan', 'file.fwt'],
+    \ 'fennel': ['file.fnl'],
     \ 'fetchmail': ['.fetchmailrc'],
     \ 'fgl': ['file.4gl', 'file.4gh', 'file.m4gl'],
     \ 'focexec': ['file.fex', 'file.focexec'],
@@ -183,6 +188,7 @@
     \ 'gdb': ['.gdbinit'],
     \ 'gdmo': ['file.mo', 'file.gdmo'],
     \ 'gedcom': ['file.ged', 'lltxxxxx.txt', '/tmp/lltmp', '/tmp/lltmp-file', 'any/tmp/lltmp', 'any/tmp/lltmp-file'],
+    \ 'gift': ['file.gift'],
     \ 'gitcommit': ['COMMIT_EDITMSG', 'MERGE_MSG', 'TAG_EDITMSG'],
     \ 'gitconfig': ['file.git/config', '.gitconfig', '.gitmodules', 'file.git/modules//config', '/.config/git/config', '/etc/gitconfig', '/etc/gitconfig.d/file', '/.gitconfig.d/file', 'any/.config/git/config', 'any/.gitconfig.d/file', 'some.git/config', 'some.git/modules/any/config'],
     \ 'gitolite': ['gitolite.conf', '/gitolite-admin/conf/file', 'any/gitolite-admin/conf/file'],
@@ -202,8 +208,8 @@
     \ 'gsp': ['file.gsp'],
     \ 'gtkrc': ['.gtkrc', 'gtkrc', '.gtkrc-file', 'gtkrc-file'],
     \ 'haml': ['file.haml'],
-    \ 'hamster': ['file.hsc', 'file.hsm'],
-    \ 'haskell': ['file.hs', 'file.hs-boot'],
+    \ 'hamster': ['file.hsm'],
+    \ 'haskell': ['file.hs', 'file.hsc', 'file.hs-boot'],
     \ 'haste': ['file.ht'],
     \ 'hastepreproc': ['file.htpp'],
     \ 'hb': ['file.hb'],
@@ -335,16 +341,18 @@
     \ 'nroff': ['file.tr', 'file.nr', 'file.roff', 'file.tmac', 'file.mom', 'tmac.file'],
     \ 'nsis': ['file.nsi', 'file.nsh'],
     \ 'obj': ['file.obj'],
-    \ 'ocaml': ['file.ml', 'file.mli', 'file.mll', 'file.mly', '.ocamlinit'],
+    \ 'ocaml': ['file.ml', 'file.mli', 'file.mll', 'file.mly', '.ocamlinit', 'file.mlt', 'file.mlp', 'file.mlip', 'file.mli.cppo', 'file.ml.cppo'],
     \ 'occam': ['file.occ'],
     \ 'omnimark': ['file.xom', 'file.xin'],
+    \ 'opam': ['opam', 'file.opam', 'file.opam.template'],
     \ 'openroad': ['file.or'],
     \ 'ora': ['file.ora'],
     \ 'pamconf': ['/etc/pam.conf', '/etc/pam.d/file', 'any/etc/pam.conf', 'any/etc/pam.d/file'],
     \ 'pamenv': ['/etc/security/pam_env.conf', '/home/user/.pam_environment', '.pam_environment', 'pam_env.conf'],
     \ 'papp': ['file.papp', 'file.pxml', 'file.pxsl'],
-    \ 'pascal': ['file.pas', 'file.pp', 'file.dpr', 'file.lpr'],
+    \ 'pascal': ['file.pas', 'file.dpr', 'file.lpr'],
     \ 'passwd': ['any/etc/passwd', 'any/etc/passwd-', 'any/etc/passwd.edit', 'any/etc/shadow', 'any/etc/shadow-', 'any/etc/shadow.edit', 'any/var/backups/passwd.bak', 'any/var/backups/shadow.bak', '/etc/passwd', '/etc/passwd-', '/etc/passwd.edit', '/etc/shadow', '/etc/shadow-', '/etc/shadow.edit', '/var/backups/passwd.bak', '/var/backups/shadow.bak'],
+    \ 'pbtxt': ['file.pbtxt'],
     \ 'pccts': ['file.g'],
     \ 'pdf': ['file.pdf'],
     \ 'perl': ['file.plx', 'file.al', 'file.psgi', 'gitolite.rc', '.gitolite.rc', 'example.gitolite.rc'],
@@ -378,11 +386,13 @@
     \ 'proto': ['file.proto'],
     \ 'protocols': ['/etc/protocols', 'any/etc/protocols'],
     \ 'psf': ['file.psf'],
+    \ 'puppet': ['file.pp'],
     \ 'pyrex': ['file.pyx', 'file.pxd'],
     \ 'python': ['file.py', 'file.pyw', '.pythonstartup', '.pythonrc', 'file.ptl', 'file.pyi', 'SConstruct'],
     \ 'quake': ['anybaseq2/file.cfg', 'anyid1/file.cfg', 'quake3/file.cfg', 'baseq2/file.cfg', 'id1/file.cfg', 'quake1/file.cfg', 'some-baseq2/file.cfg', 'some-id1/file.cfg', 'some-quake1/file.cfg'],
     \ 'radiance': ['file.rad', 'file.mat'],
     \ 'ratpoison': ['.ratpoisonrc', 'ratpoisonrc'],
+    \ 'rbs': ['file.rbs'],
     \ 'rc': ['file.rc', 'file.rch'],
     \ 'rcs': ['file,v'],
     \ 'readline': ['.inputrc', 'inputrc'],
@@ -399,7 +409,7 @@
     \ 'rpl': ['file.rpl'],
     \ 'rst': ['file.rst'],
     \ 'rtf': ['file.rtf'],
-    \ 'ruby': ['.irbrc', 'irbrc', 'file.rb', 'file.rbw', 'file.gemspec', 'file.ru', 'Gemfile', 'file.builder', 'file.rxml', 'file.rjs', 'file.rant', 'file.rake', 'rakefile', 'Rakefile', 'rantfile', 'Rantfile', 'rakefile-file', 'Rakefile-file'],
+    \ 'ruby': ['.irbrc', 'irbrc', 'file.rb', 'file.rbw', 'file.gemspec', 'file.ru', 'Gemfile', 'file.builder', 'file.rxml', 'file.rjs', 'file.rant', 'file.rake', 'rakefile', 'Rakefile', 'rantfile', 'Rantfile', 'rakefile-file', 'Rakefile-file', 'Puppetfile'],
     \ 'rust': ['file.rs'],
     \ 'samba': ['smb.conf'],
     \ 'sas': ['file.sas'],
@@ -410,6 +420,7 @@
     \ 'scheme': ['file.scm', 'file.ss', 'file.rkt'],
     \ 'scilab': ['file.sci', 'file.sce'],
     \ 'screen': ['.screenrc', 'screenrc'],
+    \ 'sexplib': ['file.sexp'],
     \ 'scss': ['file.scss'],
     \ 'sd': ['file.sd'],
     \ 'sdc': ['file.sdc'],
@@ -437,6 +448,7 @@
     \ 'smith': ['file.smt', 'file.smith'],
     \ 'sml': ['file.sml'],
     \ 'snobol4': ['file.sno', 'file.spt'],
+    \ 'sparql': ['file.rq', 'file.sparql'],
     \ 'spec': ['file.spec'],
     \ 'spice': ['file.sp', 'file.spice'],
     \ 'spup': ['file.speedup', 'file.spdata', 'file.spd'],
@@ -476,6 +488,7 @@
     \ 'tilde': ['file.t.html'],
     \ 'tli': ['file.tli'],
     \ 'tmux': ['tmuxfile.conf', '.tmuxfile.conf', '.tmux-file.conf', '.tmux.conf', 'tmux-file.conf', 'tmux.conf'],
+    \ 'toml': ['file.toml'],
     \ 'tpp': ['file.tpp'],
     \ 'treetop': ['file.treetop'],
     \ 'trustees': ['trustees.conf'],
@@ -484,7 +497,6 @@
     \ 'tssgm': ['file.tssgm'],
     \ 'tssop': ['file.tssop'],
     \ 'twig': ['file.twig'],
-    \ 'typescript': ['file.ts'],
     \ 'typescriptreact': ['file.tsx'],
     \ 'uc': ['file.uc'],
     \ 'udevconf': ['/etc/udev/udev.conf', 'any/etc/udev/udev.conf'],
@@ -629,6 +641,8 @@
       \ 'cpp': [['// Standard iostream objects -*- C++ -*-'],
       \         ['// -*- C++ -*-']],
       \ 'yaml': [['%YAML 1.2']],
+      \ 'pascal': [['#!/path/instantfpc']],
+      \ 'fennel': [['#!/path/fennel']],
       \ }
 
 " Various forms of "env" optional arguments.
@@ -706,5 +720,67 @@
   filetype off
 endfunc
 
+func Test_ts_file()
+  filetype on
+
+  call writefile(['<?xml version="1.0" encoding="utf-8"?>'], 'Xfile.ts')
+  split Xfile.ts
+  call assert_equal('xml', &filetype)
+  bwipe!
+
+  call writefile(['// looks like Typescript'], 'Xfile.ts')
+  split Xfile.ts
+  call assert_equal('typescript', &filetype)
+  bwipe!
+
+  call delete('Xfile.ts')
+  filetype off
+endfunc
+
+func Test_ttl_file()
+  filetype on
+
+  call writefile(['@base <http://example.org/> .'], 'Xfile.ttl')
+  split Xfile.ttl
+  call assert_equal('turtle', &filetype)
+  bwipe!
+
+  call writefile(['looks like Tera Term Language'], 'Xfile.ttl')
+  split Xfile.ttl
+  call assert_equal('teraterm', &filetype)
+  bwipe!
+
+  call delete('Xfile.ttl')
+  filetype off
+endfunc
+
+func Test_pp_file()
+  filetype on
+
+  call writefile(['looks like puppet'], 'Xfile.pp')
+  split Xfile.pp
+  call assert_equal('puppet', &filetype)
+  bwipe!
+
+  let g:filetype_pp = 'pascal'
+  split Xfile.pp
+  call assert_equal('pascal', &filetype)
+  bwipe!
+
+  " Test dist#ft#FTpp()
+  call writefile(['{ pascal comment'], 'Xfile.pp')
+  split Xfile.pp
+  call assert_equal('pascal', &filetype)
+  bwipe!
+
+  call writefile(['procedure pascal'], 'Xfile.pp')
+  split Xfile.pp
+  call assert_equal('pascal', &filetype)
+  bwipe!
+
+  call delete('Xfile.pp')
+  filetype off
+endfunc
+
 
 " vim: shiftwidth=2 sts=2 expandtab
diff -Nru vim-8.2.1913/src/testdir/test_filter_map.vim vim-8.2.2434/src/testdir/test_filter_map.vim
--- vim-8.2.1913/src/testdir/test_filter_map.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_filter_map.vim	2021-01-30 22:05:11.000000000 +0000
@@ -118,4 +118,31 @@
   call assert_fails('echo map(d, {k,v -> remove(d, k)})', 'E741:')
 endfunc
 
+func Test_mapnew_dict()
+  let din = #{one: 1, two: 2}
+  let dout = mapnew(din, {k, v -> string(v)})
+  call assert_equal(#{one: 1, two: 2}, din)
+  call assert_equal(#{one: '1', two: '2'}, dout)
+
+  const dconst = #{one: 1, two: 2, three: 3}
+  call assert_equal(#{one: 2, two: 3, three: 4}, mapnew(dconst, {_, v -> v + 1}))
+endfunc
+
+func Test_mapnew_list()
+  let lin = [1, 2, 3]
+  let lout = mapnew(lin, {k, v -> string(v)})
+  call assert_equal([1, 2, 3], lin)
+  call assert_equal(['1', '2', '3'], lout)
+
+  const lconst = [1, 2, 3]
+  call assert_equal([2, 3, 4], mapnew(lconst, {_, v -> v + 1}))
+endfunc
+
+func Test_mapnew_blob()
+  let bin = 0z123456
+  let bout = mapnew(bin, {k, v -> k == 1 ? 0x99 : v})
+  call assert_equal(0z123456, bin)
+  call assert_equal(0z129956, bout)
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff -Nru vim-8.2.1913/src/testdir/test_fold.vim vim-8.2.2434/src/testdir/test_fold.vim
--- vim-8.2.1913/src/testdir/test_fold.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_fold.vim	2021-01-30 22:05:11.000000000 +0000
@@ -95,9 +95,7 @@
 endfunc
 
 func Test_manual_fold_with_filter()
-  if !executable('cat')
-    return
-  endif
+  CheckExecutable cat
   for type in ['manual', 'marker']
     exe 'set foldmethod=' . type
     new
@@ -835,4 +833,65 @@
   bwipe!
 endfunc
 
+" this was crashing
+func Test_move_no_folds()
+  new
+  fold
+  setlocal fdm=expr
+  normal zj
+  bwipe!
+endfunc
+
+" this was crashing
+func Test_fold_create_delete_create()
+  new
+  fold
+  fold
+  normal zd
+  fold
+  bwipe!
+endfunc
+
+" this was crashing
+func Test_fold_create_delete()
+  new
+  norm zFzFzdzj
+  bwipe!
+endfunc
+
+func Test_fold_relative_move()
+  enew!
+  set fdm=indent sw=2 wrap tw=80
+
+  let content = [ '  foo', '  bar', '  baz',
+              \   repeat('x', &columns + 1),
+              \   '  foo', '  bar', '  baz'
+              \ ]
+  call append(0, content)
+
+  normal zM
+
+  call cursor(3, 1)
+  call assert_true(foldclosed(line('.')))
+  normal gj
+  call assert_equal(2, winline())
+
+  call cursor(2, 1)
+  call assert_true(foldclosed(line('.')))
+  normal 2gj
+  call assert_equal(3, winline())
+
+  call cursor(5, 1)
+  call assert_true(foldclosed(line('.')))
+  normal gk
+  call assert_equal(3, winline())
+
+  call cursor(6, 1)
+  call assert_true(foldclosed(line('.')))
+  normal 2gk
+  call assert_equal(2, winline())
+
+  set fdm& sw& wrap& tw&
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff -Nru vim-8.2.1913/src/testdir/test_functions.vim vim-8.2.2434/src/testdir/test_functions.vim
--- vim-8.2.1913/src/testdir/test_functions.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_functions.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1132,6 +1132,31 @@
   call assert_fails("call byteidxcomp([], 0)", 'E730:')
 endfunc
 
+" Test for charidx()
+func Test_charidx()
+  let a = 'xa�b�y'
+  call assert_equal(0, charidx(a, 0))
+  call assert_equal(1, charidx(a, 3))
+  call assert_equal(2, charidx(a, 4))
+  call assert_equal(3, charidx(a, 7))
+  call assert_equal(-1, charidx(a, 8))
+  call assert_equal(-1, charidx('', 0))
+
+  " count composing characters
+  call assert_equal(0, charidx(a, 0, 1))
+  call assert_equal(2, charidx(a, 2, 1))
+  call assert_equal(3, charidx(a, 4, 1))
+  call assert_equal(5, charidx(a, 7, 1))
+  call assert_equal(-1, charidx(a, 8, 1))
+  call assert_equal(-1, charidx('', 0, 1))
+
+  call assert_fails('let x = charidx([], 1)', 'E474:')
+  call assert_fails('let x = charidx("abc", [])', 'E474:')
+  call assert_fails('let x = charidx("abc", 1, [])', 'E474:')
+  call assert_fails('let x = charidx("abc", 1, -1)', 'E1023:')
+  call assert_fails('let x = charidx("abc", 1, 2)', 'E1023:')
+endfunc
+
 func Test_count()
   let l = ['a', 'a', 'A', 'b']
   call assert_equal(2, count(l, 'a'))
@@ -1263,7 +1288,13 @@
     " check that the relative path works in /
     lcd /
     call assert_equal(1, executable(catcmd))
-    call assert_equal('/' .. catcmd, catcmd->exepath())
+    let result = catcmd->exepath()
+    " when using chroot looking for sbin/cat can return bin/cat, that is OK
+    if catcmd =~ '\<sbin\>' && result =~ '\<bin\>'
+      call assert_equal('/' .. substitute(catcmd, '\<sbin\>', 'bin', ''), result)
+    else
+      call assert_equal('/' .. catcmd, result)
+    endif
     bwipe
   else
     throw 'Skipped: does not work on this platform'
@@ -1273,7 +1304,16 @@
 func Test_executable_longname()
   CheckMSWindows
 
-  let fname = 'X' . repeat('�', 200) . '.bat'
+  " Create a temporary .bat file with 205 characters in the name.
+  " Maximum length of a filename (including the path) on MS-Windows is 259
+  " characters.
+  " See https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation
+  let len = 259 - getcwd()->len() - 6
+  if len > 200
+    let len = 200
+  endif
+
+  let fname = 'X' . repeat('�', len) . '.bat'
   call writefile([], fname)
   call assert_equal(1, executable(fname))
   call delete(fname)
@@ -2090,6 +2130,7 @@
   let mydict = {'data': [0, 1, 2, 3], 'len': function("Mylen")}
   eval mydict.len->call([], mydict)->assert_equal(4)
   call assert_fails("call call('Mylen', [], 0)", 'E715:')
+  call assert_fails('call foo', 'E107:')
 endfunc
 
 func Test_char2nr()
@@ -2293,6 +2334,7 @@
 
   " filter()
   call assert_equal([1, 3], filter(range(5), 'v:val % 2'))
+  call assert_equal([1, 5, 7, 11, 13], filter(filter(range(15), 'v:val % 2'), 'v:val % 3'))
 
   " funcref()
   call assert_equal([0, 1], funcref('TwoArgs', range(2))())
@@ -2349,6 +2391,9 @@
 
   " map()
   call assert_equal([0, 2, 4, 6, 8], map(range(5), 'v:val * 2'))
+  call assert_equal([3, 5, 7, 9, 11], map(map(range(5), 'v:val * 2'), 'v:val + 3'))
+  call assert_equal([2, 6], map(filter(range(5), 'v:val % 2'), 'v:val * 2'))
+  call assert_equal([2, 4, 8], filter(map(range(5), 'v:val * 2'), 'v:val % 3'))
 
   " match()
   call assert_equal(3, match(range(5), 3))
diff -Nru vim-8.2.1913/src/testdir/test_gui.vim vim-8.2.2434/src/testdir/test_gui.vim
--- vim-8.2.1913/src/testdir/test_gui.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_gui.vim	2021-01-30 22:05:11.000000000 +0000
@@ -388,6 +388,18 @@
     call assert_fails('set guifont=xa1bc23d7f', 'E596:')
   endif
 
+  if exists('+renderoptions')
+    " doing this four times used to cause a crash
+    set renderoptions=type:directx
+    for i in range(5)
+      set guifont=
+    endfor
+    set renderoptions=
+    for i in range(5)
+      set guifont=
+    endfor
+  endif
+
   if has('xfontset')
     let &guifontset = guifontset_saved
   endif
diff -Nru vim-8.2.1913/src/testdir/test_hardcopy.vim vim-8.2.2434/src/testdir/test_hardcopy.vim
--- vim-8.2.1913/src/testdir/test_hardcopy.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_hardcopy.vim	2021-01-30 22:05:11.000000000 +0000
@@ -10,8 +10,10 @@
         \     'left:2in,top:30pt,right:16mm,bottom:3pc',
         \     'header:3,syntax:y,number:y,wrap:n',
         \     'header:3,syntax:n,number:y,wrap:y',
+        \     'header:0,syntax:a,number:y,wrap:y',
         \     'duplex:short,collate:n,jobsplit:y,portrait:n',
         \     'duplex:long,collate:y,jobsplit:n,portrait:y',
+        \     'duplex:off,collate:y,jobsplit:y,portrait:y',
         \     'paper:10x14',
         \     'paper:A3',
         \     'paper:A4',
@@ -46,8 +48,8 @@
 endfunc
 
 func Test_printmbfont()
-  " Print a small help page which contains tabs to cover code that expands tabs to spaces.
-  help help
+  " Print a help page which contains tabs, underlines (etc) to recover more code.
+  help syntax.txt
   syn on
 
   for opt in [':WadaMin-Regular,b:WadaMin-Bold,i:WadaMin-Italic,o:WadaMin-Bold-Italic,c:yes,a:no',
@@ -70,12 +72,17 @@
 
   " digraph.txt has plenty of non-latin1 characters.
   help digraph.txt
-  set printmbcharset=ISO10646 printencoding=utf-8 printmbfont=r:WadaMin-Regular
-
-  hardcopy > Xhardcopy_printmbcharset
-  let lines = readfile('Xhardcopy_printmbcharset')
-  call assert_true(len(lines) > 20)
-  call assert_true(lines[0] =~ 'PS-Adobe')
+  set printmbcharset=ISO10646 printencoding=utf-8
+  for courier in ['yes', 'no']
+    for ascii in ['yes', 'no']
+      exe 'set printmbfont=r:WadaMin-Regular,b:WadaMin-Bold,i:WadaMin-Italic,o:WadaMin-BoldItalic'
+      \   .. ',c:' .. courier .. ',a:' .. ascii
+      hardcopy > Xhardcopy_printmbcharset
+      let lines = readfile('Xhardcopy_printmbcharset')
+      call assert_true(len(lines) > 20)
+      call assert_true(lines[0] =~ 'PS-Adobe')
+    endfor
+  endfor
 
   set printmbcharset=does-not-exist printencoding=utf-8 printmbfont=r:WadaMin-Regular
   call assert_fails('hardcopy > Xhardcopy_printmbcharset', 'E456:')
diff -Nru vim-8.2.1913/src/testdir/test_highlight.vim vim-8.2.2434/src/testdir/test_highlight.vim
--- vim-8.2.1913/src/testdir/test_highlight.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_highlight.vim	2021-01-30 22:05:11.000000000 +0000
@@ -781,8 +781,9 @@
 endfunc
 
 " Test for using RGB color values in a highlight group
-func Test_highlight_RGB_color()
-  CheckGui
+func Test_xxlast_highlight_RGB_color()
+  CheckCanRunGui
+  gui -f
   hi MySearch guifg=#110000 guibg=#001100 guisp=#000011
   call assert_equal('#110000', synIDattr(synIDtrans(hlID('MySearch')), 'fg#'))
   call assert_equal('#001100', synIDattr(synIDtrans(hlID('MySearch')), 'bg#'))
diff -Nru vim-8.2.1913/src/testdir/test_increment.vim vim-8.2.2434/src/testdir/test_increment.vim
--- vim-8.2.1913/src/testdir/test_increment.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_increment.vim	2021-01-30 22:05:11.000000000 +0000
@@ -284,7 +284,7 @@
 " 1
 "     1
 "     1
-"     Expexted:
+"     Expected:
 "     1) g Ctrl-A on block selected indented lines
 "     2
 " 1
diff -Nru vim-8.2.1913/src/testdir/test_ins_complete.vim vim-8.2.2434/src/testdir/test_ins_complete.vim
--- vim-8.2.1913/src/testdir/test_ins_complete.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_ins_complete.vim	2021-01-30 22:05:11.000000000 +0000
@@ -114,7 +114,7 @@
   set omnifunc=Omni
   new
   exe "normal Gofind -\<C-x>\<C-o>"
-  call assert_equal("\n-\nmatch 1 of 2", execute(':2mess'))
+  call assert_equal("find -help", getline('$'))
 
   bwipe!
   delfunc Omni
@@ -343,6 +343,8 @@
 endfunc
 
 func Test_compl_in_cmdwin()
+  CheckFeature cmdwin
+
   set wildmenu wildchar=<Tab>
   com! -nargs=1 -complete=command GetInput let input = <q-args>
   com! -buffer TestCommand echo 'TestCommand'
@@ -546,7 +548,7 @@
   endfunc
   set completefunc=CompleteFunc
   call setline(1, ['', 'abcd', ''])
-  call assert_fails('exe "normal 2G$a\<C-X>\<C-U>"', 'E840:')
+  call assert_fails('exe "normal 2G$a\<C-X>\<C-U>"', 'E578:')
 
   " delete text when called for the second time
   func CompleteFunc2(findstart, base)
@@ -561,23 +563,22 @@
   call assert_fails('exe "normal 2G$a\<C-X>\<C-U>"', 'E578:')
 
   " Jump to a different window from the complete function
-  " TODO: The following test causes an ASAN failure. Once this issue is
-  " addressed, enable the following test.
-  "func! CompleteFunc(findstart, base)
-  "  if a:findstart == 1
-  "    return col('.') - 1
-  "  endif
-  "  wincmd p
-  "  return ['a', 'b']
-  "endfunc
-  "set completefunc=CompleteFunc
-  "new
-  "call assert_fails('exe "normal a\<C-X>\<C-U>"', 'E839:')
-  "close!
+  func CompleteFunc3(findstart, base)
+    if a:findstart == 1
+      return col('.') - 1
+    endif
+    wincmd p
+    return ['a', 'b']
+  endfunc
+  set completefunc=CompleteFunc3
+  new
+  call assert_fails('exe "normal a\<C-X>\<C-U>"', 'E565:')
+  close!
 
   set completefunc&
   delfunc CompleteFunc
   delfunc CompleteFunc2
+  delfunc CompleteFunc3
   close!
 endfunc
 
@@ -714,4 +715,16 @@
   set completeslash=
 endfunc
 
+" Test to ensure 'Scanning...' messages are not recorded in messages history
+func Test_z1_complete_no_history()
+  new
+  messages clear
+  let currmess = execute('messages')
+  setlocal dictionary=README.txt
+  exe "normal owh\<C-X>\<C-K>"
+  exe "normal owh\<C-N>"
+  call assert_equal(currmess, execute('messages'))
+  close!
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff -Nru vim-8.2.1913/src/testdir/test_lambda.vim vim-8.2.2434/src/testdir/test_lambda.vim
--- vim-8.2.1913/src/testdir/test_lambda.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_lambda.vim	2021-01-30 22:05:11.000000000 +0000
@@ -247,6 +247,11 @@
   call assert_equal(2, l:F())
   call assert_equal(3, l:F())
   call assert_equal(4, l:F())
+
+  call assert_match("^\n   function <SNR>\\d\\+_bar() closure"
+  \              .. "\n1        let x += 1"
+  \              .. "\n2        return x"
+  \              .. "\n   endfunction$", execute('func s:bar'))
 endfunc
 
 func Test_closure_unlet()
diff -Nru vim-8.2.1913/src/testdir/test_let.vim vim-8.2.2434/src/testdir/test_let.vim
--- vim-8.2.1913/src/testdir/test_let.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_let.vim	2021-01-30 22:05:11.000000000 +0000
@@ -338,7 +338,7 @@
   endfunc
   END
   call writefile(text, 'XheredocFail')
-  call assert_fails('source XheredocFail', 'E126:')
+  call assert_fails('source XheredocFail', 'E1145:')
   call delete('XheredocFail')
 
   let text =<< trim CodeEnd
@@ -347,7 +347,7 @@
   endfunc
   CodeEnd
   call writefile(text, 'XheredocWrong')
-  call assert_fails('source XheredocWrong', 'E126:')
+  call assert_fails('source XheredocWrong', 'E1145:')
   call delete('XheredocWrong')
 
   let text =<< trim TEXTend
diff -Nru vim-8.2.1913/src/testdir/test_listdict.vim vim-8.2.2434/src/testdir/test_listdict.vim
--- vim-8.2.1913/src/testdir/test_listdict.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_listdict.vim	2021-01-30 22:05:11.000000000 +0000
@@ -241,9 +241,9 @@
   try
     let n = d[1500]
   catch
-    let str=substitute(v:exception, '\v(.{14}).*( \d{4}).*', '\1\2', '')
+    let str = substitute(v:exception, '\v(.{14}).*( "\d{4}").*', '\1\2', '')
   endtry
-  call assert_equal('Vim(let):E716: 1500', str)
+  call assert_equal('Vim(let):E716: "1500"', str)
 
   " lookup each items
   for i in range(1500)
@@ -740,6 +740,9 @@
 
   call assert_equal(42, reduce(test_null_list(), function('add'), 42))
   call assert_equal(42, reduce(test_null_blob(), function('add'), 42))
+
+  " should not crash
+  call assert_fails('echo reduce([1], test_null_function())', 'E1132:')
 endfunc
 
 " splitting a string to a List using split()
@@ -861,6 +864,18 @@
   call assert_fails("call extend(g:, {'-!' : 10})", 'E461:')
 endfunc
 
+func Test_listdict_extendnew()
+  " Test extendnew() with lists
+  let l = [1, 2, 3]
+  call assert_equal([1, 2, 3, 4, 5], extendnew(l, [4, 5]))
+  call assert_equal([1, 2, 3], l)
+
+  " Test extend() with dictionaries.
+  let d = {'a': {'b': 'B'}}
+  call assert_equal({'a': {'b': 'B'}, 'c': 'cc'}, extendnew(d, {'c': 'cc'}))
+  call assert_equal({'a': {'b': 'B'}}, d)
+endfunc
+
 func s:check_scope_dict(x, fixed)
   func s:gen_cmd(cmd, x)
     return substitute(a:cmd, '\<x\ze:', a:x, 'g')
@@ -997,7 +1012,8 @@
 " Test for a null list
 func Test_null_list()
   let l = test_null_list()
-  call assert_equal(0, join(l))
+  call assert_equal(0, join(test_null_list()))
+  call assert_equal('', join(l))
   call assert_equal(0, len(l))
   call assert_equal(1, empty(l))
   call assert_fails('let s = join([1, 2], [])', 'E730:')
@@ -1005,8 +1021,10 @@
   call assert_equal([], l[:2])
   call assert_true([] == l)
   call assert_equal('[]', string(l))
-  call assert_equal(0, sort(l))
-  call assert_equal(0, uniq(l))
+  call assert_equal(0, sort(test_null_list()))
+  call assert_equal([], sort(l))
+  call assert_equal(0, uniq(test_null_list()))
+  call assert_equal([], uniq(l))
   let k = [] + l
   call assert_equal([], k)
   let k = l + []
@@ -1016,15 +1034,20 @@
   call assert_equal([], deepcopy(l))
   call assert_equal(5, get(l, 2, 5))
   call assert_equal(-1, index(l, 2, 5))
-  call assert_equal(0, insert(l, 2, -1))
+  call assert_equal(0, insert(test_null_list(), 2, -1))
+  call assert_fails('call insert(l, 2, -1)', 'E684:')
   call assert_equal(0, min(l))
   call assert_equal(0, max(l))
-  call assert_equal(0, remove(l, 0, 2))
+  call assert_equal(0, remove(test_null_list(), 0, 2))
+  call assert_fails('call remove(l, 0, 2)', 'E684:')
   call assert_equal([], repeat(l, 2))
-  call assert_equal(0, reverse(l))
-  call assert_equal(0, sort(l))
+  call assert_equal(0, reverse(test_null_list()))
+  call assert_equal([], reverse(l))
+  call assert_equal(0, sort(test_null_list()))
+  call assert_equal([], sort(l))
   call assert_equal('[]', string(l))
-  call assert_equal(0, extend(l, l, 0))
+  call assert_fails('call extend(test_null_list(), test_null_list())', 'E1134:')
+  call assert_equal([], extend(l, l, 0))
   lockvar l
   call assert_equal(1, islocked('l'))
   unlockvar l
@@ -1037,12 +1060,15 @@
   call assert_equal({}, d)
   call assert_equal(0, len(d))
   call assert_equal(1, empty(d))
-  call assert_equal(0, items(d))
-  call assert_equal(0, keys(d))
-  call assert_equal(0, values(d))
+  call assert_equal(0, items(test_null_dict()))
+  call assert_equal([], items(d))
+  call assert_equal(0, keys(test_null_dict()))
+  call assert_equal([], keys(d))
+  call assert_equal(0, values(test_null_dict()))
+  call assert_equal([], values(d))
   call assert_false(has_key(d, 'k'))
   call assert_equal('{}', string(d))
-  call assert_fails('let x = d[10]')
+  call assert_fails('let x = d[10]', 'E716:')
   call assert_equal({}, {})
   call assert_equal(0, len(copy(d)))
   call assert_equal(0, count(d, 'k'))
@@ -1050,9 +1076,11 @@
   call assert_equal(20, get(d, 'k', 20))
   call assert_equal(0, min(d))
   call assert_equal(0, max(d))
-  call assert_equal(0, remove(d, 'k'))
+  call assert_equal(0, remove(test_null_dict(), 'k'))
+  call assert_fails("call remove(d, 'k')", 'E716:')
   call assert_equal('{}', string(d))
-  call assert_equal(0, extend(d, d, 0))
+  call assert_fails('call extend(test_null_dict(), test_null_dict())', 'E1133:')
+  call assert_equal({}, extend(d, d, 'keep'))
   lockvar d
   call assert_equal(1, islocked('d'))
   unlockvar d
diff -Nru vim-8.2.1913/src/testdir/test_man.vim vim-8.2.2434/src/testdir/test_man.vim
--- vim-8.2.1913/src/testdir/test_man.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_man.vim	2021-01-30 22:05:11.000000000 +0000
@@ -132,4 +132,18 @@
   %bw!
 endfunc
 
+" Check that underlying shell command arguments are escaped.
+func Test_Man_uses_shellescape()
+  Man `touch\ Xbar` `touch\ Xfoo`
+
+  redir => msg
+  1messages
+  redir END
+  call assert_match('no manual entry for "`touch Xfoo`"', msg)
+
+  call assert_false(filereadable('Xbar'))
+  call assert_false(filereadable('Xfoo'))
+endfunc
+
+
 " vim: shiftwidth=2 sts=2 expandtab
diff -Nru vim-8.2.1913/src/testdir/test_mapping.vim vim-8.2.2434/src/testdir/test_mapping.vim
--- vim-8.2.1913/src/testdir/test_mapping.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_mapping.vim	2021-01-30 22:05:11.000000000 +0000
@@ -3,6 +3,7 @@
 source shared.vim
 source check.vim
 source screendump.vim
+source term_util.vim
 
 func Test_abbreviation()
   " abbreviation with 0x80 should work
@@ -681,7 +682,7 @@
   " invalid <expr> abbreviation
   abbr <expr> hte GetAbbr()
   call assert_fails('normal ihte ', 'E117:')
-  call assert_equal(' ', getline(1))
+  call assert_equal('', getline(1))
   unabbr <expr> hte
 
   close!
@@ -856,4 +857,512 @@
   mapclear!
 endfunc
 
+" Test for <Cmd> key in maps to execute commands
+func Test_map_cmdkey()
+  new
+
+  " Error cases
+  let x = 0
+  noremap <F3> <Cmd><Cmd>let x = 1<CR>
+  call assert_fails('call feedkeys("\<F3>", "xt")', 'E1136:')
+  call assert_equal(0, x)
+
+  noremap <F3> <Cmd><F3>let x = 2<CR>
+  call assert_fails('call feedkeys("\<F3>", "xt")', 'E1137:')
+  call assert_equal(0, x)
+
+  noremap <F3> <Cmd>let x = 3
+  call assert_fails('call feedkeys("\<F3>", "xt!")', 'E1135:')
+  call assert_equal(0, x)
+
+  " works in various modes and sees the correct mode()
+  noremap <F3> <Cmd>let m = mode(1)<CR>
+  noremap! <F3> <Cmd>let m = mode(1)<CR>
+
+  " normal mode
+  call feedkeys("\<F3>", 'xt')
+  call assert_equal('n', m)
+
+  " visual mode
+  call feedkeys("v\<F3>", 'xt!')
+  call assert_equal('v', m)
+  " shouldn't leave the visual mode
+  call assert_equal('v', mode(1))
+  call feedkeys("\<Esc>", 'xt')
+  call assert_equal('n', mode(1))
+
+  " visual mapping in select mode
+  call feedkeys("gh\<F3>", 'xt!')
+  call assert_equal('v', m)
+  " shouldn't leave select mode
+  call assert_equal('s', mode(1))
+  call feedkeys("\<Esc>", 'xt')
+  call assert_equal('n', mode(1))
+
+  " select mode mapping
+  snoremap <F3> <Cmd>let m = mode(1)<cr>
+  call feedkeys("gh\<F3>", 'xt!')
+  call assert_equal('s', m)
+  " shouldn't leave select mode
+  call assert_equal('s', mode(1))
+  call feedkeys("\<Esc>", 'xt')
+  call assert_equal('n', mode(1))
+
+  " operator-pending mode
+  call feedkeys("d\<F3>", 'xt!')
+  call assert_equal('no', m)
+  " leaves the operator-pending mode
+  call assert_equal('n', mode(1))
+
+  " insert mode
+  call feedkeys("i\<F3>abc", 'xt')
+  call assert_equal('i', m)
+  call assert_equal('abc', getline('.'))
+
+  " replace mode
+  call feedkeys("0R\<F3>two", 'xt')
+  call assert_equal('R', m)
+  call assert_equal('two', getline('.'))
+
+  " virtual replace mode
+  call setline('.', "one\ttwo")
+  call feedkeys("4|gR\<F3>xxx", 'xt')
+  call assert_equal('Rv', m)
+  call assert_equal("onexxx\ttwo", getline('.'))
+
+  " cmdline mode
+  call feedkeys(":\<F3>\"xxx\<CR>", 'xt!')
+  call assert_equal('c', m)
+  call assert_equal('"xxx', @:)
+
+  " terminal mode
+  if CanRunVimInTerminal()
+    tnoremap <F3> <Cmd>let m = mode(1)<CR>
+    let buf = Run_shell_in_terminal({})
+    call feedkeys("\<F3>", 'xt')
+    call assert_equal('t', m)
+    call assert_equal('t', mode(1))
+    call StopShellInTerminal(buf)
+    call TermWait(buf)
+    close!
+    tunmap <F3>
+  endif
+
+  " invoke cmdline mode recursively
+  noremap! <F2> <Cmd>norm! :foo<CR>
+  %d
+  call setline(1, ['some short lines', 'of test text'])
+  call feedkeys(":bar\<F2>x\<C-B>\"\r", 'xt')
+  call assert_equal('"barx', @:)
+  unmap! <F2>
+
+  " test for calling a <SID> function
+  let lines =<< trim END
+    map <F2> <Cmd>call <SID>do_it()<CR>
+    func s:do_it()
+      let g:x = 32
+    endfunc
+  END
+  call writefile(lines, 'Xscript')
+  source Xscript
+  call feedkeys("\<F2>", 'xt')
+  call assert_equal(32, g:x)
+  call delete('Xscript')
+
+  unmap <F3>
+  unmap! <F3>
+  %bw!
+
+  " command line ending in "0" is handled without errors
+  onoremap ix <cmd>eval 0<cr>
+  call feedkeys('dix.', 'xt')
+  ounmap ix
+endfunc
+
+" text object enters visual mode
+func TextObj()
+  if mode() !=# "v"
+    normal! v
+  end
+  call cursor(1, 3)
+  normal! o
+  call cursor(2, 4)
+endfunc
+
+func s:cmdmap(lhs, rhs)
+  exe 'noremap ' .. a:lhs .. ' <Cmd>' .. a:rhs .. '<CR>'
+  exe 'noremap! ' .. a:lhs .. ' <Cmd>' .. a:rhs .. '<CR>'
+endfunc
+
+func s:cmdunmap(lhs)
+  exe 'unmap ' .. a:lhs
+  exe 'unmap! ' .. a:lhs
+endfunc
+
+" Map various <Fx> keys used by the <Cmd> key tests
+func s:setupMaps()
+  call s:cmdmap('<F3>', 'let m = mode(1)')
+  call s:cmdmap('<F4>', 'normal! ww')
+  call s:cmdmap('<F5>', 'normal! "ay')
+  call s:cmdmap('<F6>', 'throw "very error"')
+  call s:cmdmap('<F7>', 'call TextObj()')
+  call s:cmdmap('<F8>', 'startinsert')
+  call s:cmdmap('<F9>', 'stopinsert')
+endfunc
+
+" Remove the mappings setup by setupMaps()
+func s:cleanupMaps()
+  call s:cmdunmap('<F3>')
+  call s:cmdunmap('<F4>')
+  call s:cmdunmap('<F5>')
+  call s:cmdunmap('<F6>')
+  call s:cmdunmap('<F7>')
+  call s:cmdunmap('<F8>')
+  call s:cmdunmap('<F9>')
+endfunc
+
+" Test for <Cmd> mapping in normal mode
+func Test_map_cmdkey_normal_mode()
+  new
+  call s:setupMaps()
+
+  " check v:count and v:register works
+  call s:cmdmap('<F2>', 'let s = [mode(1), v:count, v:register]')
+  call feedkeys("\<F2>", 'xt')
+  call assert_equal(['n', 0, '"'], s)
+  call feedkeys("7\<F2>", 'xt')
+  call assert_equal(['n', 7, '"'], s)
+  call feedkeys("\"e\<F2>", 'xt')
+  call assert_equal(['n', 0, 'e'], s)
+  call feedkeys("5\"k\<F2>", 'xt')
+  call assert_equal(['n', 5, 'k'], s)
+  call s:cmdunmap('<F2>')
+
+  call setline(1, ['some short lines', 'of test text'])
+  call feedkeys("\<F7>y", 'xt')
+  call assert_equal("me short lines\nof t", @")
+  call assert_equal('v', getregtype('"'))
+  call assert_equal([0, 1, 3, 0], getpos("'<"))
+  call assert_equal([0, 2, 4, 0], getpos("'>"))
+
+  " startinsert
+  %d
+  call feedkeys("\<F8>abc", 'xt')
+  call assert_equal('abc', getline(1))
+
+  " feedkeys are not executed immediately
+  noremap ,a <Cmd>call feedkeys("aalpha") \| let g:a = getline(2)<CR>
+  %d
+  call setline(1, ['some short lines', 'of test text'])
+  call cursor(2, 3)
+  call feedkeys(",a\<F3>", 'xt')
+  call assert_equal('of test text', g:a)
+  call assert_equal('n', m)
+  call assert_equal(['some short lines', 'of alphatest text'], getline(1, '$'))
+  nunmap ,a
+
+  " feedkeys(..., 'x') is executed immediately, but insert mode is aborted
+  noremap ,b <Cmd>call feedkeys("abeta", 'x') \| let g:b = getline(2)<CR>
+  call feedkeys(",b\<F3>", 'xt')
+  call assert_equal('n', m)
+  call assert_equal('of alphabetatest text', g:b)
+  nunmap ,b
+
+  call s:cleanupMaps()
+  %bw!
+endfunc
+
+" Test for <Cmd> mapping with the :normal command
+func Test_map_cmdkey_normal_cmd()
+  new
+  noremap ,x <Cmd>call append(1, "xx") \| call append(1, "aa")<CR>
+  noremap ,f <Cmd>nosuchcommand<CR>
+  noremap ,e <Cmd>throw "very error" \| call append(1, "yy")<CR>
+  noremap ,m <Cmd>echoerr "The message." \| call append(1, "zz")<CR>
+  noremap ,w <Cmd>for i in range(5) \| if i==1 \| echoerr "Err" \| endif \| call append(1, i) \| endfor<CR>
+
+  call setline(1, ['some short lines', 'of test text'])
+  exe "norm ,x\r"
+  call assert_equal(['some short lines', 'aa', 'xx', 'of test text'], getline(1, '$'))
+
+  call assert_fails('norm ,f', 'E492:')
+  call assert_fails('norm ,e', 'very error')
+  call assert_fails('norm ,m', 'The message.')
+  call assert_equal(['some short lines', 'aa', 'xx', 'of test text'], getline(1, '$'))
+
+  %d
+  let caught_err = 0
+  try
+    exe "normal ,w"
+  catch /Vim(echoerr):Err/
+    let caught_err = 1
+  endtry
+  call assert_equal(1, caught_err)
+  call assert_equal(['', '0'], getline(1, '$'))
+
+  %d
+  call assert_fails('normal ,w', 'Err')
+  call assert_equal(['', '4', '3', '2' ,'1', '0'], getline(1, '$'))
+  call assert_equal(1, line('.'))
+
+  nunmap ,x
+  nunmap ,f
+  nunmap ,e
+  nunmap ,m
+  nunmap ,w
+  %bw!
+endfunc
+
+" Test for <Cmd> mapping in visual mode
+func Test_map_cmdkey_visual_mode()
+  new
+  set showmode
+  call s:setupMaps()
+
+  call setline(1, ['some short lines', 'of test text'])
+  call feedkeys("v\<F4>", 'xt!')
+  call assert_equal(['v', 1, 12], [mode(1), col('v'), col('.')])
+
+  " can invoke an opeartor, ending the visual mode
+  let @a = ''
+  call feedkeys("\<F5>", 'xt!')
+  call assert_equal('n', mode(1))
+  call assert_equal('some short l', @a)
+
+  " error doesn't interrupt visual mode
+  call assert_fails('call feedkeys("ggvw\<F6>", "xt!")', 'E605:')
+  call assert_equal(['v', 1, 6], [mode(1), col('v'), col('.')])
+  call feedkeys("\<F7>", 'xt!')
+  call assert_equal(['v', 1, 3, 2, 4], [mode(1), line('v'), col('v'), line('.'), col('.')])
+
+  " startinsert gives "-- (insert) VISUAL --" mode
+  call feedkeys("\<F8>", 'xt!')
+  call assert_equal(['v', 1, 3, 2, 4], [mode(1), line('v'), col('v'), line('.'), col('.')])
+  redraw!
+  call assert_match('^-- (insert) VISUAL --', Screenline(&lines))
+  call feedkeys("\<Esc>new ", 'x')
+  call assert_equal(['some short lines', 'of new test text'], getline(1, '$'))
+
+  call s:cleanupMaps()
+  set showmode&
+  %bw!
+endfunc
+
+" Test for <Cmd> mapping in select mode
+func Test_map_cmdkey_select_mode()
+  new
+  set showmode
+  call s:setupMaps()
+
+  snoremap <F1> <cmd>throw "very error"<CR>
+  snoremap <F2> <cmd>normal! <c-g>"by<CR>
+  call setline(1, ['some short lines', 'of test text'])
+
+  call feedkeys("gh\<F4>", "xt!")
+  call assert_equal(['s', 1, 12], [mode(1), col('v'), col('.')])
+  redraw!
+  call assert_match('^-- SELECT --', Screenline(&lines))
+
+  " visual mapping in select mode restarts select mode after operator
+  let @a = ''
+  call feedkeys("\<F5>", 'xt!')
+  call assert_equal('s', mode(1))
+  call assert_equal('some short l', @a)
+
+  " select mode mapping works, and does not restart select mode
+  let @b = ''
+  call feedkeys("\<F2>", 'xt!')
+  call assert_equal('n', mode(1))
+  call assert_equal('some short l', @b)
+
+  " error doesn't interrupt temporary visual mode
+  call assert_fails('call feedkeys("\<Esc>ggvw\<C-G>\<F6>", "xt!")', 'E605:')
+  redraw!
+  call assert_match('^-- VISUAL --', Screenline(&lines))
+  " quirk: restoration of select mode is not performed
+  call assert_equal(['v', 1, 6], [mode(1), col('v'), col('.')])
+
+  " error doesn't interrupt select mode
+  call assert_fails('call feedkeys("\<Esc>ggvw\<C-G>\<F1>", "xt!")', 'E605:')
+  redraw!
+  call assert_match('^-- SELECT --', Screenline(&lines))
+  call assert_equal(['s', 1, 6], [mode(1), col('v'), col('.')])
+
+  call feedkeys("\<F7>", 'xt!')
+  redraw!
+  call assert_match('^-- SELECT --', Screenline(&lines))
+  call assert_equal(['s', 1, 3, 2, 4], [mode(1), line('v'), col('v'), line('.'), col('.')])
+
+  " startinsert gives "-- SELECT (insert) --" mode
+  call feedkeys("\<F8>", 'xt!')
+  redraw!
+  call assert_match('^-- (insert) SELECT --', Screenline(&lines))
+  call assert_equal(['s', 1, 3, 2, 4], [mode(1), line('v'), col('v'), line('.'), col('.')])
+  call feedkeys("\<Esc>new ", 'x')
+  call assert_equal(['some short lines', 'of new test text'], getline(1, '$'))
+
+  sunmap <F1>
+  sunmap <F2>
+  call s:cleanupMaps()
+  set showmode&
+  %bw!
+endfunc
+
+" Test for <Cmd> mapping in operator-pending mode
+func Test_map_cmdkey_op_pending_mode()
+  new
+  call s:setupMaps()
+
+  call setline(1, ['some short lines', 'of test text'])
+  call feedkeys("d\<F4>", 'xt')
+  call assert_equal(['lines', 'of test text'], getline(1, '$'))
+  call assert_equal(['some short '], getreg('"', 1, 1))
+  " create a new undo point
+  let &undolevels = &undolevels
+
+  call feedkeys(".", 'xt')
+  call assert_equal(['test text'], getline(1, '$'))
+  call assert_equal(['lines', 'of '], getreg('"', 1, 1))
+  " create a new undo point
+  let &undolevels = &undolevels
+
+  call feedkeys("uu", 'xt')
+  call assert_equal(['some short lines', 'of test text'], getline(1, '$'))
+
+  " error aborts operator-pending, operator not performed
+  call assert_fails('call feedkeys("d\<F6>", "xt")', 'E605:')
+  call assert_equal(['some short lines', 'of test text'], getline(1, '$'))
+
+  call feedkeys("\"bd\<F7>", 'xt')
+  call assert_equal(['soest text'], getline(1, '$'))
+  call assert_equal(['me short lines', 'of t'], getreg('b', 1, 1))
+
+  " startinsert aborts operator
+  call feedkeys("d\<F8>cc", 'xt')
+  call assert_equal(['soccest text'], getline(1, '$'))
+
+  call s:cleanupMaps()
+  %bw!
+endfunc
+
+" Test for <Cmd> mapping in insert mode
+func Test_map_cmdkey_insert_mode()
+  new
+  call s:setupMaps()
+
+  call setline(1, ['some short lines', 'of test text'])
+  " works the same as <C-O>w<C-O>w
+  call feedkeys("iindeed \<F4>little ", 'xt')
+  call assert_equal(['indeed some short little lines', 'of test text'], getline(1, '$'))
+  call assert_fails('call feedkeys("i\<F6> 2", "xt")', 'E605:')
+  call assert_equal(['indeed some short little 2 lines', 'of test text'], getline(1, '$'))
+
+  " Note when entering visual mode from InsertEnter autocmd, an async event,
+  " or a <Cmd> mapping, vim ends up in undocumented "INSERT VISUAL" mode.
+  call feedkeys("i\<F7>stuff ", 'xt')
+  call assert_equal(['indeed some short little 2 lines', 'of stuff test text'], getline(1, '$'))
+  call assert_equal(['v', 1, 3, 2, 9], [mode(1), line('v'), col('v'), line('.'), col('.')])
+
+  call feedkeys("\<F5>", 'xt')
+  call assert_equal(['deed some short little 2 lines', 'of stuff '], getreg('a', 1, 1))
+
+  " also works as part of abbreviation
+  abbr foo <Cmd>let g:y = 17<CR>bar
+  exe "normal i\<space>foo "
+  call assert_equal(17, g:y)
+  call assert_equal('in bar deed some short little 2 lines', getline(1))
+  unabbr foo
+
+  " :startinsert does nothing
+  call setline(1, 'foo bar')
+  call feedkeys("ggi\<F8>vim", 'xt')
+  call assert_equal('vimfoo bar', getline(1))
+
+  " :stopinsert works
+  call feedkeys("ggi\<F9>Abc", 'xt')
+  call assert_equal('vimfoo barbc', getline(1))
+
+  call s:cleanupMaps()
+  %bw!
+endfunc
+
+" Test for <Cmd> mapping in insert-completion mode
+func Test_map_cmdkey_insert_complete_mode()
+  new
+  call s:setupMaps()
+
+  call setline(1, 'some short lines')
+  call feedkeys("os\<C-X>\<C-N>\<F3>\<C-N> ", 'xt')
+  call assert_equal('ic', m)
+  call assert_equal(['some short lines', 'short '], getline(1, '$'))
+
+  call s:cleanupMaps()
+  %bw!
+endfunc
+
+" Test for <Cmd> mapping in cmdline mode
+func Test_map_cmdkey_cmdline_mode()
+  new
+  call s:setupMaps()
+
+  call setline(1, ['some short lines', 'of test text'])
+  let x = 0
+  call feedkeys(":let x\<F3>= 10\r", 'xt')
+  call assert_equal('c', m)
+  call assert_equal(10, x)
+
+  " exception doesn't leave cmdline mode
+  call assert_fails('call feedkeys(":let x\<F6>= 20\r", "xt")', 'E605:')
+  call assert_equal(20, x)
+
+  " move cursor in the buffer from cmdline mode
+  call feedkeys(":let x\<F4>= 30\r", 'xt')
+  call assert_equal(30, x)
+  call assert_equal(12, col('.'))
+
+  " :startinsert takes effect after leaving cmdline mode
+  call feedkeys(":let x\<F8>= 40\rnew ", 'xt')
+  call assert_equal(40, x)
+  call assert_equal('some short new lines', getline(1))
+
+  call s:cleanupMaps()
+  %bw!
+endfunc
+
+func Test_map_cmdkey_redo()
+  func SelectDash()
+    call search('^---\n\zs', 'bcW')
+    norm! V
+    call search('\n\ze---$', 'W')
+  endfunc
+
+  let text =<< trim END
+      ---
+      aaa
+      ---
+      bbb
+      bbb
+      ---
+      ccc
+      ccc
+      ccc
+      ---
+  END
+  new Xcmdtext
+  call setline(1, text)
+
+  onoremap <silent> i- <Cmd>call SelectDash()<CR>
+  call feedkeys('2Gdi-', 'xt')
+  call assert_equal(['---', '---'], getline(1, 2))
+  call feedkeys('j.', 'xt')
+  call assert_equal(['---', '---', '---'], getline(1, 3))
+  call feedkeys('j.', 'xt')
+  call assert_equal(['---', '---', '---', '---'], getline(1, 4))
+
+  bwipe!
+  call delete('Xcmdtext')
+  delfunc SelectDash
+  ounmap i-
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff -Nru vim-8.2.1913/src/testdir/test_matchfuzzy.vim vim-8.2.2434/src/testdir/test_matchfuzzy.vim
--- vim-8.2.1913/src/testdir/test_matchfuzzy.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_matchfuzzy.vim	2021-01-30 22:05:11.000000000 +0000
@@ -43,6 +43,8 @@
   call assert_equal(['.vim/vimrc', '.vim/vimrc_colors', '.vim/v_i_m_r_c'], ['.vim/vimrc', '.vim/vimrc_colors', '.vim/v_i_m_r_c']->matchfuzzy('vimrc'))
   " gap penalty
   call assert_equal(['xxayybxxxx', 'xxayyybxxx', 'xxayyyybxx'], ['xxayyyybxx', 'xxayyybxxx', 'xxayybxxxx']->matchfuzzy('ab'))
+  " path separator vs word separator
+  call assert_equal(['color/setup.vim', 'color\\setup.vim', 'color setup.vim', 'color_setup.vim', 'colorsetup.vim'], matchfuzzy(['colorsetup.vim', 'color setup.vim', 'color/setup.vim', 'color_setup.vim', 'color\\setup.vim'], 'setup.vim'))
 
   " match multiple words (separated by space)
   call assert_equal(['foo bar baz'], ['foo bar baz', 'foo', 'foo bar', 'baz bar']->matchfuzzy('baz foo'))
@@ -91,55 +93,55 @@
 
 " Test for the matchfuzzypos() function
 func Test_matchfuzzypos()
-  call assert_equal([['curl', 'world'], [[2,3], [2,3]]], matchfuzzypos(['world', 'curl'], 'rl'))
-  call assert_equal([['curl', 'world'], [[2,3], [2,3]]], matchfuzzypos(['world', 'one', 'curl'], 'rl'))
+  call assert_equal([['curl', 'world'], [[2,3], [2,3]], [128, 127]], matchfuzzypos(['world', 'curl'], 'rl'))
+  call assert_equal([['curl', 'world'], [[2,3], [2,3]], [128, 127]], matchfuzzypos(['world', 'one', 'curl'], 'rl'))
   call assert_equal([['hello', 'hello world hello world'],
-        \ [[0, 1, 2, 3, 4], [0, 1, 2, 3, 4]]],
+        \ [[0, 1, 2, 3, 4], [0, 1, 2, 3, 4]], [275, 257]],
         \ matchfuzzypos(['hello world hello world', 'hello', 'world'], 'hello'))
-  call assert_equal([['aaaaaaa'], [[0, 1, 2]]], matchfuzzypos(['aaaaaaa'], 'aaa'))
-  call assert_equal([['a  b'], [[0, 3]]], matchfuzzypos(['a  b'], 'a  b'))
-  call assert_equal([['a  b'], [[0, 3]]], matchfuzzypos(['a  b'], 'a    b'))
-  call assert_equal([['a  b'], [[0]]], matchfuzzypos(['a  b'], '  a  '))
-  call assert_equal([[], []], matchfuzzypos(['a  b'], '  '))
-  call assert_equal([[], []], matchfuzzypos(['world', 'curl'], 'ab'))
+  call assert_equal([['aaaaaaa'], [[0, 1, 2]], [191]], matchfuzzypos(['aaaaaaa'], 'aaa'))
+  call assert_equal([['a  b'], [[0, 3]], [219]], matchfuzzypos(['a  b'], 'a  b'))
+  call assert_equal([['a  b'], [[0, 3]], [219]], matchfuzzypos(['a  b'], 'a    b'))
+  call assert_equal([['a  b'], [[0]], [112]], matchfuzzypos(['a  b'], '  a  '))
+  call assert_equal([[], [], []], matchfuzzypos(['a  b'], '  '))
+  call assert_equal([[], [], []], matchfuzzypos(['world', 'curl'], 'ab'))
   let x = matchfuzzypos([repeat('a', 256)], repeat('a', 256))
   call assert_equal(range(256), x[1][0])
-  call assert_equal([[], []], matchfuzzypos([repeat('a', 300)], repeat('a', 257)))
-  call assert_equal([[], []], matchfuzzypos([], 'abc'))
+  call assert_equal([[], [], []], matchfuzzypos([repeat('a', 300)], repeat('a', 257)))
+  call assert_equal([[], [], []], matchfuzzypos([], 'abc'))
 
   " match in a long string
-  call assert_equal([[repeat('x', 300) .. 'abc'], [[300, 301, 302]]],
+  call assert_equal([[repeat('x', 300) .. 'abc'], [[300, 301, 302]], [-135]],
         \ matchfuzzypos([repeat('x', 300) .. 'abc'], 'abc'))
 
   " preference for camel case match
-  call assert_equal([['xabcxxaBc'], [[6, 7, 8]]], matchfuzzypos(['xabcxxaBc'], 'abc'))
+  call assert_equal([['xabcxxaBc'], [[6, 7, 8]], [189]], matchfuzzypos(['xabcxxaBc'], 'abc'))
   " preference for match after a separator (_ or space)
-  call assert_equal([['xabx_ab'], [[5, 6]]], matchfuzzypos(['xabx_ab'], 'ab'))
+  call assert_equal([['xabx_ab'], [[5, 6]], [145]], matchfuzzypos(['xabx_ab'], 'ab'))
   " preference for leading letter match
-  call assert_equal([['abcxabc'], [[0, 1]]], matchfuzzypos(['abcxabc'], 'ab'))
+  call assert_equal([['abcxabc'], [[0, 1]], [150]], matchfuzzypos(['abcxabc'], 'ab'))
   " preference for sequential match
-  call assert_equal([['aobncedone'], [[7, 8, 9]]], matchfuzzypos(['aobncedone'], 'one'))
+  call assert_equal([['aobncedone'], [[7, 8, 9]], [158]], matchfuzzypos(['aobncedone'], 'one'))
   " best recursive match
-  call assert_equal([['xoone'], [[2, 3, 4]]], matchfuzzypos(['xoone'], 'one'))
+  call assert_equal([['xoone'], [[2, 3, 4]], [168]], matchfuzzypos(['xoone'], 'one'))
 
   " match multiple words (separated by space)
-  call assert_equal([['foo bar baz'], [[8, 9, 10, 0, 1, 2]]], ['foo bar baz', 'foo', 'foo bar', 'baz bar']->matchfuzzypos('baz foo'))
-  call assert_equal([[], []], ['foo bar baz', 'foo', 'foo bar', 'baz bar']->matchfuzzypos('one two'))
-  call assert_equal([[], []], ['foo bar']->matchfuzzypos(" \t "))
-  call assert_equal([['grace'], [[1, 2, 3, 4, 2, 3, 4, 0, 1, 2, 3, 4]]], ['grace']->matchfuzzypos('race ace grace'))
+  call assert_equal([['foo bar baz'], [[8, 9, 10, 0, 1, 2]], [369]], ['foo bar baz', 'foo', 'foo bar', 'baz bar']->matchfuzzypos('baz foo'))
+  call assert_equal([[], [], []], ['foo bar baz', 'foo', 'foo bar', 'baz bar']->matchfuzzypos('one two'))
+  call assert_equal([[], [], []], ['foo bar']->matchfuzzypos(" \t "))
+  call assert_equal([['grace'], [[1, 2, 3, 4, 2, 3, 4, 0, 1, 2, 3, 4]], [657]], ['grace']->matchfuzzypos('race ace grace'))
 
   let l = [{'id' : 5, 'val' : 'crayon'}, {'id' : 6, 'val' : 'camera'}]
-  call assert_equal([[{'id' : 6, 'val' : 'camera'}], [[0, 1, 2]]],
+  call assert_equal([[{'id' : 6, 'val' : 'camera'}], [[0, 1, 2]], [192]],
         \ matchfuzzypos(l, 'cam', {'text_cb' : {v -> v.val}}))
-  call assert_equal([[{'id' : 6, 'val' : 'camera'}], [[0, 1, 2]]],
+  call assert_equal([[{'id' : 6, 'val' : 'camera'}], [[0, 1, 2]], [192]],
         \ matchfuzzypos(l, 'cam', {'key' : 'val'}))
-  call assert_equal([[], []], matchfuzzypos(l, 'day', {'text_cb' : {v -> v.val}}))
-  call assert_equal([[], []], matchfuzzypos(l, 'day', {'key' : 'val'}))
+  call assert_equal([[], [], []], matchfuzzypos(l, 'day', {'text_cb' : {v -> v.val}}))
+  call assert_equal([[], [], []], matchfuzzypos(l, 'day', {'key' : 'val'}))
   call assert_fails("let x = matchfuzzypos(l, 'cam', 'random')", 'E715:')
-  call assert_equal([[], []], matchfuzzypos(l, 'day', {'text_cb' : {v -> []}}))
-  call assert_equal([[], []], matchfuzzypos(l, 'day', {'text_cb' : {v -> 1}}))
+  call assert_equal([[], [], []], matchfuzzypos(l, 'day', {'text_cb' : {v -> []}}))
+  call assert_equal([[], [], []], matchfuzzypos(l, 'day', {'text_cb' : {v -> 1}}))
   call assert_fails("let x = matchfuzzypos(l, 'day', {'text_cb' : {a, b -> 1}})", 'E119:')
-  call assert_equal([[], []], matchfuzzypos(l, 'cam'))
+  call assert_equal([[], [], []], matchfuzzypos(l, 'cam'))
   call assert_fails("let x = matchfuzzypos(l, 'cam', {'text_cb' : []})", 'E921:')
   call assert_fails("let x = matchfuzzypos(l, 'foo', {'key' : []})", 'E730:')
   call assert_fails("let x = matchfuzzypos(l, 'cam', test_null_dict())", 'E715:')
@@ -191,41 +193,41 @@
 " Test for matchfuzzypos() with multibyte characters
 func Test_matchfuzzypos_mbyte()
   CheckFeature multi_lang
-  call assert_equal([['�ん���世界'], [[0, 1, 2, 3, 4]]],
+  call assert_equal([['�ん���世界'], [[0, 1, 2, 3, 4]], [273]],
         \ matchfuzzypos(['�ん���世界'], '�ん���'))
-  call assert_equal([['ンヹㄇヺヴ'], [[1, 3]]], matchfuzzypos(['ンヹㄇヺヴ'], 'ヹヺ'))
+  call assert_equal([['ンヹㄇヺヴ'], [[1, 3]], [88]], matchfuzzypos(['ンヹㄇヺヴ'], 'ヹヺ'))
   " reverse the order of characters
-  call assert_equal([[], []], matchfuzzypos(['ンヹㄇヺヴ'], 'ヺヹ'))
-  call assert_equal([['αβΩxxx', 'xαxβxΩx'], [[0, 1, 2], [1, 3, 5]]],
+  call assert_equal([[], [], []], matchfuzzypos(['ンヹㄇヺヴ'], 'ヺヹ'))
+  call assert_equal([['αβΩxxx', 'xαxβxΩx'], [[0, 1, 2], [1, 3, 5]], [222, 113]],
         \ matchfuzzypos(['αβΩxxx', 'xαxβxΩx'], 'αβΩ'))
   call assert_equal([['ππbbππ', 'πππbbbπππ', 'ππππbbbbππππ', 'πbπ'],
-        \ [[0, 1], [0, 1], [0, 1], [0, 2]]],
+        \ [[0, 1], [0, 1], [0, 1], [0, 2]], [151, 148, 145, 110]],
         \ matchfuzzypos(['πbπ', 'ππbbππ', 'πππbbbπππ', 'ππππbbbbππππ'], 'ππ'))
-  call assert_equal([['ααααααα'], [[0, 1, 2]]],
+  call assert_equal([['ααααααα'], [[0, 1, 2]], [191]],
         \ matchfuzzypos(['ααααααα'], 'ααα'))
 
-  call assert_equal([[], []], matchfuzzypos(['ンヹㄇ', 'ŗ�ţ'], 'ff�fl'))
+  call assert_equal([[], [], []], matchfuzzypos(['ンヹㄇ', 'ŗ�ţ'], 'ff�fl'))
   let x = matchfuzzypos([repeat('Ψ', 256)], repeat('Ψ', 256))
   call assert_equal(range(256), x[1][0])
-  call assert_equal([[], []], matchfuzzypos([repeat('✓', 300)], repeat('✓', 257)))
+  call assert_equal([[], [], []], matchfuzzypos([repeat('✓', 300)], repeat('✓', 257)))
 
   " match multiple words (separated by space)
-  call assert_equal([['세 마리� 작� �지'], [[9, 10, 2, 3, 4]]], ['세 마리� 작� �지', '마리�', '마리� 작�', '작� �지']->matchfuzzypos('�지 마리�'))
-  call assert_equal([[], []], ['세 마리� 작� �지', '마리�', '마리� 작�', '작� �지']->matchfuzzypos('파란 하늘'))
+  call assert_equal([['세 마리� 작� �지'], [[9, 10, 2, 3, 4]], [328]], ['세 마리� 작� �지', '마리�', '마리� 작�', '작� �지']->matchfuzzypos('�지 마리�'))
+  call assert_equal([[], [], []], ['세 마리� 작� �지', '마리�', '마리� 작�', '작� �지']->matchfuzzypos('파란 하늘'))
 
   " match in a long string
-  call assert_equal([[repeat('�', 300) .. 'ẼẼẼ'], [[300, 301, 302]]],
+  call assert_equal([[repeat('�', 300) .. 'ẼẼẼ'], [[300, 301, 302]], [-135]],
         \ matchfuzzypos([repeat('�', 300) .. 'ẼẼẼ'], 'ẼẼẼ'))
   " preference for camel case match
-  call assert_equal([['xѳѵ�xxѳѴ�'], [[6, 7, 8]]], matchfuzzypos(['xѳѵ�xxѳѴ�'], 'ѳѵ�'))
+  call assert_equal([['xѳѵ�xxѳѴ�'], [[6, 7, 8]], [189]], matchfuzzypos(['xѳѵ�xxѳѴ�'], 'ѳѵ�'))
   " preference for match after a separator (_ or space)
-  call assert_equal([['x��x_��'], [[5, 6]]], matchfuzzypos(['x��x_��'], '��'))
+  call assert_equal([['x��x_��'], [[5, 6]], [145]], matchfuzzypos(['x��x_��'], '��'))
   " preference for leading letter match
-  call assert_equal([['ѳѵ�xѳѵ�'], [[0, 1]]], matchfuzzypos(['ѳѵ�xѳѵ�'], 'ѳѵ'))
+  call assert_equal([['ѳѵ�xѳѵ�'], [[0, 1]], [150]], matchfuzzypos(['ѳѵ�xѳѵ�'], 'ѳѵ'))
   " preference for sequential match
-  call assert_equal([['aンbヹcㄇdンヹㄇ'], [[7, 8, 9]]], matchfuzzypos(['aンbヹcㄇdンヹㄇ'], 'ンヹㄇ'))
+  call assert_equal([['aンbヹcㄇdンヹㄇ'], [[7, 8, 9]], [158]], matchfuzzypos(['aンbヹcㄇdンヹㄇ'], 'ンヹㄇ'))
   " best recursive match
-  call assert_equal([['xффйд'], [[2, 3, 4]]], matchfuzzypos(['xффйд'], 'фйд'))
+  call assert_equal([['xффйд'], [[2, 3, 4]], [168]], matchfuzzypos(['xффйд'], 'фйд'))
 endfunc
 
 " vim: shiftwidth=2 sts=2 expandtab
diff -Nru vim-8.2.1913/src/testdir/test_memory_usage.vim vim-8.2.2434/src/testdir/test_memory_usage.vim
--- vim-8.2.1913/src/testdir/test_memory_usage.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_memory_usage.vim	2021-01-30 22:05:11.000000000 +0000
@@ -4,11 +4,9 @@
 CheckFeature terminal
 CheckNotGui
 
-if execute('version') =~# '-fsanitize=[a-z,]*\<address\>'
-  " Skip tests on Travis CI ASAN build because it's difficult to estimate
-  " memory usage.
-  throw 'Skipped: does not work with ASAN'
-endif
+" Skip tests on Travis CI ASAN build because it's difficult to estimate memory
+" usage.
+CheckNotAsan
 
 source shared.vim
 
diff -Nru vim-8.2.1913/src/testdir/test_menu.vim vim-8.2.2434/src/testdir/test_menu.vim
--- vim-8.2.1913/src/testdir/test_menu.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_menu.vim	2021-01-30 22:05:11.000000000 +0000
@@ -426,7 +426,7 @@
   nunmenu Test.Sign
 endfunc
 
-" Test for "icon=filname" in a toolbar
+" Test for "icon=filename" in a toolbar
 func Test_menu_icon()
   CheckFeature toolbar
   nmenu icon=myicon.xpm Toolbar.Foo  :echo "Foo"<CR>
diff -Nru vim-8.2.1913/src/testdir/test_messages.vim vim-8.2.2434/src/testdir/test_messages.vim
--- vim-8.2.1913/src/testdir/test_messages.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_messages.vim	2021-01-30 22:05:11.000000000 +0000
@@ -323,7 +323,7 @@
 
   " clean up
   call StopVimInTerminal(buf)
-  call delete('Xtest_diff_rnu')
+  call delete('Xtest_quit_message')
 endfunc
 
 " vim: shiftwidth=2 sts=2 expandtab
diff -Nru vim-8.2.1913/src/testdir/test_method.vim vim-8.2.2434/src/testdir/test_method.vim
--- vim-8.2.1913/src/testdir/test_method.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_method.vim	2021-01-30 22:05:11.000000000 +0000
@@ -131,9 +131,11 @@
   eval [1, 2, 3]  
 	\ ->sort(
 	\ )
-  call assert_fails('eval [1, 2, 3]-> sort()', 'E15:')
+  eval [1, 2, 3]-> sort()
+
   call assert_fails('eval [1, 2, 3]->sort ()', 'E274:')
-  call assert_fails('eval [1, 2, 3]-> sort ()', 'E15:')
+  call assert_fails('eval [1, 2, 3] ->sort ()', 'E274:')
+  call assert_fails('eval [1, 2, 3]-> sort ()', 'E274:')
 endfunc
 
 func Test_method_lambda()
diff -Nru vim-8.2.1913/src/testdir/test_mksession.vim vim-8.2.2434/src/testdir/test_mksession.vim
--- vim-8.2.1913/src/testdir/test_mksession.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_mksession.vim	2021-01-30 22:05:11.000000000 +0000
@@ -381,7 +381,7 @@
   let term_cmd = ''
   for line in lines
     if line =~ '^terminal'
-      call assert_report('session must not restore teminal')
+      call assert_report('session must not restore terminal')
     endif
   endfor
 
@@ -398,7 +398,7 @@
   let term_cmd = ''
   for line in lines
     if line =~ '^terminal'
-      call assert_report('session must not restore teminal')
+      call assert_report('session must not restore terminal')
     endif
   endfor
 
@@ -416,7 +416,7 @@
   let term_cmd = ''
   for line in lines
     if line =~ '^terminal'
-      call assert_report('session must not restore teminal')
+      call assert_report('session must not restore terminal')
     endif
   endfor
 
@@ -434,7 +434,7 @@
   let term_cmd = ''
   for line in lines
     if line =~ '^terminal'
-      call assert_report('session must not restore teminal')
+      call assert_report('session must not restore terminal')
     endif
   endfor
 
@@ -586,6 +586,53 @@
   %bwipe
 endfunc
 
+func Test_mkview_loadview_jumplist()
+  set viewdir=Xviewdir
+  au BufWinLeave * silent mkview
+  au BufWinEnter * silent loadview
+
+  edit Xfile1
+  call setline(1, ['a', 'bbbbbbb', 'c'])
+  normal j3l
+  call assert_equal([2, 4], getcurpos()[1:2])
+  write
+
+  edit Xfile2
+  call setline(1, ['d', 'eeeeeee', 'f'])
+  normal j5l
+  call assert_equal([2, 6], getcurpos()[1:2])
+  write
+
+  edit Xfile3
+  call setline(1, ['g', 'h', 'iiiii'])
+  normal jj3l
+  call assert_equal([3, 4], getcurpos()[1:2])
+  write
+
+  edit Xfile1
+  call assert_equal([2, 4], getcurpos()[1:2])
+  edit Xfile2
+  call assert_equal([2, 6], getcurpos()[1:2])
+  edit Xfile3
+  call assert_equal([3, 4], getcurpos()[1:2])
+
+  exe "normal \<C-O>"
+  call assert_equal('Xfile2', expand('%'))
+  call assert_equal([2, 6], getcurpos()[1:2])
+  exe "normal \<C-O>"
+  call assert_equal('Xfile1', expand('%'))
+  call assert_equal([2, 4], getcurpos()[1:2])
+
+  au! BufWinLeave
+  au! BufWinEnter
+  bwipe!
+  call delete('Xviewdir', 'rf')
+  call delete('Xfile1')
+  call delete('Xfile2')
+  call delete('Xfile3')
+  set viewdir&
+endfunc
+
 " A clean session (one empty buffer, one window, and one tab) should not
 " set any error messages when sourced because no commands should fail.
 func Test_mksession_no_errmsg()
@@ -859,4 +906,41 @@
   call delete('Xtestvimrc')
 endfunc
 
+func Test_scrolloff()
+  set sessionoptions+=localoptions
+  setlocal so=1 siso=1
+  mksession! Xtest_mks.out
+  setlocal so=-1 siso=-1
+  source Xtest_mks.out
+  call assert_equal(1, &l:so)
+  call assert_equal(1, &l:siso)
+  call delete('Xtest_mks.out')
+  setlocal so& siso&
+  set sessionoptions&
+endfunc
+
+func Test_altfile()
+  edit Xone
+  split Xtwo
+  edit Xtwoalt
+  edit #
+  wincmd w
+  edit Xonealt
+  edit #
+  mksession! Xtest_altfile
+  only
+  bwipe Xonealt
+  bwipe Xtwoalt
+  bwipe!
+  source Xtest_altfile
+  call assert_equal('Xone', bufname())
+  call assert_equal('Xonealt', bufname('#'))
+  wincmd w
+  call assert_equal('Xtwo', bufname())
+  call assert_equal('Xtwoalt', bufname('#'))
+  only
+  bwipe!
+  call delete('Xtest_altfile')
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff -Nru vim-8.2.1913/src/testdir/test_netbeans.py vim-8.2.2434/src/testdir/test_netbeans.py
--- vim-8.2.1913/src/testdir/test_netbeans.py	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_netbeans.py	2021-01-30 22:05:11.000000000 +0000
@@ -41,6 +41,8 @@
             elif re.match('1:insert=.* "\\\\n"', line):
                 # extract the command from the previous line
                 cmd = re.search('.*"(.*)"', self.prev_line).group(1)
+
+                # map of test names and the netbeans commands/functions
                 testmap = {
                   'getCursor_Test' : '0:getCursor/30\n',
                   'E627_Test' : '0 setReadOnly!31\n',
@@ -70,6 +72,7 @@
                   'getModified_Test' : '2:getModified/55\n',
                   'getText_Test' : '2:getText/56\n',
                   'setDot_Test' : '2:setDot!57 3/6\n',
+                  'setDot2_Test' : '2:setDot!57 9\n',
                   'startDocumentListen_Test' : '2:startDocumentListen!58\n',
                   'stopDocumentListen_Test' : '2:stopDocumentListen!59\n',
                   'define_anno_Test' : '2:defineAnnoType!60 1 "s1" "x" "=>" blue none\n',
@@ -90,6 +93,7 @@
                   'remove_invalid_count_Test' : '3:remove/75 1 800\n',
                   'guard_Test' : '3:guard!76 8 7\n',
                   'setModified_Test' : '3:setModified!77 T\n',
+                  'setModifiedClear_Test' : '3:setModified!77 F\n',
                   'insertDone_Test' : '3:insertDone!78 T F\n',
                   'saveDone_Test' : '3:saveDone!79\n',
                   'invalidcmd_Test' : '3:invalidcmd!80\n',
@@ -99,11 +103,16 @@
                   'save_fail_Test' : '0:save/84\n',
                   'netbeansBuffer_fail_Test' : '0:netbeansBuffer/85 T\n',
                   'setExitDelay_Test' : '0:setExitDelay!86 2\n',
-                  'setReadOnly_Test' : '3:setReadOnly!87\n',
-                  'close_Test' : '3:close!88\n',
-                  'specialKeys_Test' : '0:specialKeys!89 "F12 F13"\n',
-                  'nbbufwrite_Test' : '4:editFile!90 "XnbBuffer"\n4:netbeansBuffer!91 T\n',
-                  'detach_Test' : '2:close!92\n1:close!93\nDETACH\n'
+                  'setReadOnly_Test' : '3:setReadOnly!87 T\n',
+                  'setReadOnlyClear_Test' : '3:setReadOnly!88 F\n',
+                  'save_Test' : '3:save!89\n',
+                  'close_Test' : '3:close!90\n',
+                  'specialKeys_Test' : '0:specialKeys!91 "F12 F13 C-F13"\n',
+                  'nbbufwrite_Test' : '4:editFile!92 "XnbBuffer"\n4:netbeansBuffer!93 T\n',
+                  'startAtomic_Test' : '0:startAtomic!94\n',
+                  'endAtomic_Test' : '0:endAtomic!95\n',
+                  'AnnoScale_Test' : "".join(['2:defineAnnoType!60 ' + str(i) + ' "s' + str(i) + '" "x" "=>" blue none\n' for i in range(2, 26)]),
+                  'detach_Test' : '2:close!96\n1:close!97\nDETACH\n'
                 }
                 # execute the specified test
                 if cmd not in testmap:
diff -Nru vim-8.2.1913/src/testdir/test_netbeans.vim vim-8.2.2434/src/testdir/test_netbeans.vim
--- vim-8.2.1913/src/testdir/test_netbeans.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_netbeans.vim	2021-01-30 22:05:11.000000000 +0000
@@ -34,9 +34,9 @@
 " Read the "Xnetbeans" file and filter out geometry messages.
 func ReadXnetbeans()
   let l = readfile("Xnetbeans")
-  " Xnetbeans may include '0:geometry=' messages on GUI environment if window
+  " Xnetbeans may include '0:geometry=' messages in the GUI Vim if the window
   " position, size, or z order are changed.  Remove these messages because
-  " will causes troubles on check.
+  " these messages will break the assert for the output.
   return filter(l, 'v:val !~ "^0:geometry="')
 endfunc
 
@@ -303,11 +303,24 @@
         \ '56 "foo bar1\nfoo bar2\nfoo bar3\n"'], l[-2:])
   let g:last += 4
 
-  " setDot test
+  " setDot test with lnum/col
+  call cursor(1, 1)
   call appendbufline(cmdbufnr, '$', 'setDot_Test')
   call WaitFor('len(ReadXnetbeans()) >= (g:last + 3)')
   let l = ReadXnetbeans()
   call assert_equal('send: 2:setDot!57 3/6', l[-1])
+  sleep 10m
+  call assert_equal([0, 3, 7, 0], getpos('.'))
+  let g:last += 3
+
+  " setDot test with an offset
+  call cursor(1, 1)
+  call appendbufline(cmdbufnr, '$', 'setDot2_Test')
+  call WaitFor('len(ReadXnetbeans()) >= (g:last + 3)')
+  let l = ReadXnetbeans()
+  call assert_equal('send: 2:setDot!57 9', l[-1])
+  sleep 10m
+  call assert_equal([0, 2, 1, 0], getpos('.'))
   let g:last += 3
 
   " startDocumentListen test
@@ -328,6 +341,32 @@
   call assert_match('2:remove=\d\+ 0 9', l[-1])
   let g:last += 3
 
+  " Change case using the ~ command with 'whichwrap' containing '~'
+  set whichwrap+=~
+  normal 2G$~
+  set whichwrap&
+  call WaitFor('len(ReadXnetbeans()) >= (g:last + 2)')
+  let l = ReadXnetbeans()
+  call assert_match('2:remove=\d\+ 16 1', l[-4])
+  call assert_match('2:insert=\d\+ 16 "Y"', l[-3])
+  call assert_match('2:remove=\d\+ 18 0', l[-2])
+  call assert_match('2:insert=\d\+ 18 ""', l[-1])
+  let g:last += 4
+
+  " Test for replacing spaces with a tab character using 'softtabstop' and
+  " 'noexpandtab'
+  setlocal softtabstop=4
+  setlocal noexpandtab
+  exe "normal I\<Tab>\<Tab>"
+  setlocal expandtab&
+  setlocal softtabstop&
+  call WaitFor('len(ReadXnetbeans()) >= (g:last + 18)')
+  let l = ReadXnetbeans()
+  call assert_match('2:insert=\d\+ 18 "        foo bar3"', l[-3])
+  call assert_match('2:remove=\d\+ 26 8', l[-2])
+  call assert_match('2:insert=\d\+ 26 "\t"', l[-1])
+  let g:last += 18
+
   " stopDocumentListen test
   call appendbufline(cmdbufnr, '$', 'stopDocumentListen_Test')
   call WaitFor('len(ReadXnetbeans()) >= (g:last + 3)')
@@ -349,7 +388,7 @@
   call assert_equal('send: 2:defineAnnoType!60 1 "s1" "x" "=>" blue none', l[-1])
   sleep 1m
   call assert_equal({'name': '1', 'texthl': 'NB_s1', 'text': '=>'},
-        \ sign_getdefined()[0])
+        \ sign_getdefined()->get(0, {}))
   let g:last += 3
 
   " defineAnnoType with a long color name
@@ -491,8 +530,9 @@
   call assert_equal([{'name': '1', 'texthl': 'NB_s1', 'text': '=>'},
         \ {'name': '10000', 'linehl': 'NBGuarded'}],
         \ sign_getdefined())
-  call assert_equal([{'lnum': 2, 'id': 1000000, 'name': '10000',
-        \ 'priority': 10, 'group': ''}], sign_getplaced()[0].signs)
+  let s = sign_getplaced()[0].signs[0]
+  call assert_equal(2, s.lnum)
+  call assert_equal('10000', s.name)
   let g:last += 3
 
   " setModified test
@@ -500,9 +540,19 @@
   call WaitFor('len(ReadXnetbeans()) >= (g:last + 3)')
   let l = ReadXnetbeans()
   call assert_equal('send: 3:setModified!77 T', l[-1])
+  sleep 1m
   call assert_equal(1, &modified)
   let g:last += 3
 
+  " clear setModified test
+  call appendbufline(cmdbufnr, '$', 'setModifiedClear_Test')
+  call WaitFor('len(ReadXnetbeans()) >= (g:last + 3)')
+  let l = ReadXnetbeans()
+  call assert_equal('send: 3:setModified!77 F', l[-1])
+  sleep 1m
+  call assert_equal(0, &modified)
+  let g:last += 3
+
   " insertDone test
   let v:statusmsg = ''
   call appendbufline(cmdbufnr, '$', 'insertDone_Test')
@@ -586,15 +636,36 @@
   call appendbufline(cmdbufnr, '$', 'setReadOnly_Test')
   call WaitFor('len(ReadXnetbeans()) >= (g:last + 3)')
   let l = ReadXnetbeans()
-  call assert_equal('send: 3:setReadOnly!87', l[-1])
+  call assert_equal('send: 3:setReadOnly!87 T', l[-1])
+  sleep 1m
+  call assert_equal(1, &readonly)
+  let g:last += 3
+
+  " clear setReadonly test
+  call appendbufline(cmdbufnr, '$', 'setReadOnlyClear_Test')
+  call WaitFor('len(ReadXnetbeans()) >= (g:last + 3)')
+  let l = ReadXnetbeans()
+  call assert_equal('send: 3:setReadOnly!88 F', l[-1])
+  sleep 1m
+  call assert_equal(0, &readonly)
+  let g:last += 3
+
+  " save test
+  call setbufvar(bufnr('Xfile4'), '&modified', 1)
+  call appendbufline(cmdbufnr, '$', 'save_Test')
+  call WaitFor('len(ReadXnetbeans()) >= (g:last + 3)')
+  let l = ReadXnetbeans()
+  call assert_equal('send: 3:save!89', l[-1])
+  sleep 1m
+  call assert_true(filereadable('Xfile4'))
   let g:last += 3
 
   " close test. Don't use buffer 10 after this
   call appendbufline(cmdbufnr, '$', 'close_Test')
   call WaitFor('len(ReadXnetbeans()) >= (g:last + 4)')
   let l = ReadXnetbeans()
-  call assert_equal('send: 3:close!88', l[-2])
-  call assert_equal('3:killed=88', l[-1])
+  call assert_equal('send: 3:close!90', l[-2])
+  call assert_equal('3:killed=90', l[-1])
   call assert_equal(1, winnr('$'))
   let g:last += 4
 
@@ -602,10 +673,11 @@
   call appendbufline(cmdbufnr, '$', 'specialKeys_Test')
   call WaitFor('len(ReadXnetbeans()) >= (g:last + 3)')
   let l = ReadXnetbeans()
-  call assert_equal('send: 0:specialKeys!89 "F12 F13"', l[-1])
+  call assert_equal('send: 0:specialKeys!91 "F12 F13 C-F13"', l[-1])
   sleep 1m
   call assert_equal(':nbkey F12<CR>', maparg('<F12>', 'n'))
   call assert_equal(':nbkey F13<CR>', maparg('<F13>', 'n'))
+  call assert_equal(':nbkey C-F13<CR>', maparg('<C-F13>', 'n'))
   let g:last += 3
 
   " Open a buffer not monitored by netbeans
@@ -626,17 +698,110 @@
   call WaitFor('len(ReadXnetbeans()) >= (g:last + 10)')
   let g:last += 10
 
+  if has('mouse')
+    " Test for mouse button release
+    let save_mouse = &mouse
+    set mouse=a
+    call feedkeys("\<LeftMouse>\<LeftRelease>", 'xt')
+    let &mouse = save_mouse
+    call WaitFor('len(ReadXnetbeans()) >= (g:last + 2)')
+    let l = ReadXnetbeans()
+    call assert_equal('4:newDotAndMark=93 0 0', l[-2])
+    call assert_equal('4:buttonRelease=93 0 1 -1', l[-1])
+    let g:last += 2
+  endif
+
+  " Test for startAtomic
+  call appendbufline(cmdbufnr, '$', 'startAtomic_Test')
+  call WaitFor('len(ReadXnetbeans()) >= (g:last + 3)')
+  let l = ReadXnetbeans()
+  call assert_equal('send: 0:startAtomic!94', l[-1])
+  let g:last += 3
+
+  " Test for endAtomic
+  call appendbufline(cmdbufnr, '$', 'endAtomic_Test')
+  call WaitFor('len(ReadXnetbeans()) >= (g:last + 3)')
+  let l = ReadXnetbeans()
+  call assert_equal('send: 0:endAtomic!95', l[-1])
+  let g:last += 3
+
+  " Test for invoking a netbeans key binding
+  let special_keys = [
+        \ ["\<F1>", 'F1'], ["\<S-F1>", 'S-F1'],
+        \ ["\<F2>", 'F2'], ["\<S-F2>", 'S-F2'],
+        \ ["\<F3>", 'F3'], ["\<S-F3>", 'S-F3'],
+        \ ["\<F4>", 'F4'], ["\<S-F4>", 'S-F4'],
+        \ ["\<F5>", 'F5'], ["\<S-F5>", 'S-F5'],
+        \ ["\<F6>", 'F6'], ["\<S-F6>", 'S-F6'],
+        \ ["\<F7>", 'F7'], ["\<S-F7>", 'S-F7'],
+        \ ["\<F8>", 'F8'], ["\<S-F8>", 'S-F8'],
+        \ ["\<F9>", 'F9'], ["\<S-F9>", 'S-F9'],
+        \ ["\<F11>", 'F11'], ["\<S-F11>", 'S-F11'],
+        \ ["\<F12>", 'F12'], ["\<S-F12>", 'S-F12'], ['!', '!']
+        \ ]
+  for [key, name] in special_keys
+    call feedkeys("\<F21>" .. key, 'xt')
+    call WaitFor('len(ReadXnetbeans()) >= (g:last + 3)')
+    let l = ReadXnetbeans()
+    call assert_match('4:keyCommand=\d\+ "' .. name .. '"', l[-2])
+    call assert_match('4:keyAtPos=\d\+ "' .. name .. '" 0 1/0', l[-1])
+    let g:last += 3
+  endfor
+  call feedkeys("\<F21>\<C-S-M-F9>", 'xt')
+  call WaitFor('len(ReadXnetbeans()) >= (g:last + 3)')
+  let l = ReadXnetbeans()
+  call assert_match('4:keyCommand=\d\+ "CSM-F9"', l[-2])
+  call assert_match('4:keyAtPos=\d\+ "CSM-F9" 0 1/0', l[-1])
+  let g:last += 3
+
+  if has('signs') && has('mouse')
+    sign define S1 linehl=Search text==>
+    sign define S2 linehl=ErrorMsg text=!!
+    sign place 10 line=1 name=S1
+    sign place 20 line=1 name=S2
+
+    let save_mouse = &mouse
+    set mouse=a
+    call assert_equal('S2', sign_getplaced()[0].signs[0].name)
+    call test_setmouse(1, 1)
+    call feedkeys("\<LeftMouse>\<LeftRelease>", 'xt')
+    call assert_equal('S1', sign_getplaced()[0].signs[0].name)
+    call test_setmouse(1, 1)
+    call feedkeys("\<LeftMouse>\<LeftRelease>", 'xt')
+    call assert_equal('S2', sign_getplaced()[0].signs[0].name)
+    let &mouse = save_mouse
+
+    sign unplace 10
+    sign unplace 20
+    sign undefine S1
+    sign undefine S2
+  endif
+
+  " define a large number of annotations
+  call appendbufline(cmdbufnr, '$', 'AnnoScale_Test')
+  call WaitFor('len(ReadXnetbeans()) >= (g:last + 26)')
+  let l = ReadXnetbeans()
+  call assert_equal('2:defineAnnoType!60 25 "s25" "x" "=>" blue none', l[-1])
+  sleep 1m
+  call assert_true(len(sign_getdefined()) >= 25)
+  let g:last += 26
+
   " detach
   call appendbufline(cmdbufnr, '$', 'detach_Test')
   call WaitFor('len(ReadXnetbeans()) >= (g:last + 8)')
-  call WaitForAssert({-> assert_equal('0:disconnect=93', ReadXnetbeans()[-1])})
+  call WaitForAssert({-> assert_equal('0:disconnect=97', ReadXnetbeans()[-1])})
 
   " the connection was closed
   call assert_false(has("netbeans_enabled"))
 
+  " Remove all the signs
+  call sign_unplace('*')
+  call sign_undefine()
+
   call delete("Xnetbeans")
   call delete('Xfile1')
   call delete('Xfile3')
+  call delete('Xfile4')
 endfunc
 
 func Test_nb_basic()
@@ -674,12 +839,13 @@
   call s:run_server('Nb_file_auth')
 endfunc
 
-" Test for quiting Vim with an open netbeans connection
+" Test for quitting Vim with an open netbeans connection
 func Nb_quit_with_conn(port)
   call delete("Xnetbeans")
   call writefile([], "Xnetbeans")
   let after =<< trim END
     source shared.vim
+    set cpo&vim
 
     func ReadXnetbeans()
       let l = readfile("Xnetbeans")
@@ -726,4 +892,44 @@
   call s:run_server('Nb_quit_with_conn')
 endfunc
 
+func Nb_bwipe_buffer(port)
+  call delete("Xnetbeans")
+  call writefile([], "Xnetbeans")
+
+  " Last line number in the Xnetbeans file. Used to verify the result of the
+  " communication with the netbeans server
+  let g:last = 0
+
+  " Establish the connection with the netbeans server
+  exe 'nbstart :localhost:' .. a:port .. ':bunny'
+  call WaitFor('len(ReadXnetbeans()) > (g:last + 2)')
+  let l = ReadXnetbeans()
+  call assert_equal(['AUTH bunny',
+        \ '0:version=0 "2.5"',
+        \ '0:startupDone=0'], l[-3:])
+  let g:last += 3
+
+  " Open the command buffer to communicate with the server
+  split Xcmdbuf
+  call WaitFor('len(ReadXnetbeans()) > (g:last + 2)')
+  let l = ReadXnetbeans()
+  call assert_equal('0:fileOpened=0 "Xcmdbuf" T F',
+        \ substitute(l[-3], '".*/', '"', ''))
+  call assert_equal('send: 1:putBufferNumber!15 "Xcmdbuf"',
+        \ substitute(l[-2], '".*/', '"', ''))
+  call assert_equal('1:startDocumentListen!16', l[-1])
+  let g:last += 3
+
+  sleep 10m
+endfunc
+
+" This test used to reference a buffer after it was freed leading to an ASAN
+" error.
+func Test_nb_bwipe_buffer()
+  call s:run_server('Nb_bwipe_buffer')
+  silent! %bwipe!
+  sleep 100m
+  nbclose
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff -Nru vim-8.2.1913/src/testdir/test_normal.vim vim-8.2.2434/src/testdir/test_normal.vim
--- vim-8.2.1913/src/testdir/test_normal.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_normal.vim	2021-01-30 22:05:11.000000000 +0000
@@ -2584,9 +2584,11 @@
   call assert_false(&insertmode)
   call assert_beeps("normal! \<C-\>\<C-A>", 'xt')
 
-  " Using CTRL-\ CTRL-N in cmd window should close the window
-  call feedkeys("q:\<C-\>\<C-N>", 'xt')
-  call assert_equal('', getcmdwintype())
+  if has('cmdwin')
+    " Using CTRL-\ CTRL-N in cmd window should close the window
+    call feedkeys("q:\<C-\>\<C-N>", 'xt')
+    call assert_equal('', getcmdwintype())
+  endif
 
   " clean up
   bw!
diff -Nru vim-8.2.1913/src/testdir/test_options.vim vim-8.2.2434/src/testdir/test_options.vim
--- vim-8.2.1913/src/testdir/test_options.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_options.vim	2021-01-30 22:05:11.000000000 +0000
@@ -371,8 +371,14 @@
   call assert_fails('set foldmarker=x', 'E536:')
   call assert_fails('set commentstring=x', 'E537:')
   call assert_fails('set complete=x', 'E539:')
+  call assert_fails('set rulerformat=%-', 'E539:')
+  call assert_fails('set rulerformat=%(', 'E542:')
+  call assert_fails('set rulerformat=%15(%%', 'E542:')
+  call assert_fails('set statusline=%$', 'E539:')
   call assert_fails('set statusline=%{', 'E540:')
   call assert_fails('set statusline=%(', 'E542:')
+  call assert_fails('set statusline=%)', 'E542:')
+
   if has('cursorshape')
     " This invalid value for 'guicursor' used to cause Vim to crash.
     call assert_fails('set guicursor=i-ci,r-cr:h', 'E545:')
@@ -406,11 +412,22 @@
   call assert_fails('set wildchar=<abc>', 'E474:')
   call assert_fails('set cmdheight=1a', 'E521:')
   call assert_fails('set invcmdheight', 'E474:')
-  if has('python') && has('python3')
+  if has('python') || has('python3')
     call assert_fails('set pyxversion=6', 'E474:')
   endif
   call assert_fails("let &tabstop='ab'", 'E521:')
   call assert_fails('set spellcapcheck=%\\(', 'E54:')
+  call assert_fails('set sessionoptions=curdir,sesdir', 'E474:')
+  call assert_fails('set foldmarker={{{,', 'E474:')
+  call assert_fails('set sessionoptions=sesdir,curdir', 'E474:')
+  call assert_fails('set listchars=trail:· ambiwidth=double', 'E834:')
+  set listchars&
+  call assert_fails('set fillchars=stl:· ambiwidth=double', 'E835:')
+  set fillchars&
+  call assert_fails('set fileencoding=latin1,utf-8', 'E474:')
+  set nomodifiable
+  call assert_fails('set fileencoding=latin1', 'E21:')
+  set modifiable&
 endfunc
 
 func CheckWasSet(name)
@@ -815,7 +832,13 @@
   CheckUnix
   let save_shell = &shell
   set shell=
-  call assert_fails('shell', 'E91:')
+  let caught_e91 = 0
+  try
+    shell
+  catch /E91:/
+    let caught_e91 = 1
+  endtry
+  call assert_equal(1, caught_e91)
   let &shell = save_shell
 endfunc
 
@@ -1007,4 +1030,22 @@
   setlocal keywordprg&
 endfunc
 
+" Test that resetting laststatus does change scroll option
+func Test_opt_reset_scroll()
+  CheckRunVimInTerminal
+  let vimrc =<< trim [CODE]
+    set scroll=2
+    set laststatus=2
+  [CODE]
+  call writefile(vimrc, 'Xscroll')
+  let buf = RunVimInTerminal('-S Xscroll', {'rows': 16, 'cols': 45})
+  call term_sendkeys(buf, ":verbose set scroll?\n")
+  call WaitForAssert({-> assert_match('Last set.*window size', term_getline(buf, 15))})
+  call assert_match('^\s*scroll=7$', term_getline(buf, 14))
+  call StopVimInTerminal(buf)
+
+  " clean up
+  call delete('Xscroll')
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff -Nru vim-8.2.1913/src/testdir/test_perl.vim vim-8.2.2434/src/testdir/test_perl.vim
--- vim-8.2.1913/src/testdir/test_perl.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_perl.vim	2021-01-30 22:05:11.000000000 +0000
@@ -182,9 +182,21 @@
 
   call assert_equal('*VIM', perleval('"*VIM"'))
   call assert_true(perleval('\\0') =~ 'SCALAR(0x\x\+)')
+
+  " typeglob
+  call assert_equal('*main::STDOUT', perleval('*STDOUT'))
+'
+  call perleval("++-$foo")
+  let messages = split(execute('message'), "\n")
+  call assert_match("Can't modify negation", messages[-1])
 endfunc
 
 func Test_perldo()
+  new
+  " :perldo in empty buffer does nothing.
+  perldo ++$counter
+  call assert_equal(0, perleval("$counter"))
+
   sp __TEST__
   exe 'read ' g:testname
   perldo s/perl/vieux_chameau/g
@@ -204,8 +216,7 @@
   call setline(1, ['one', 'two', 'three'])
   perldo VIM::DoCommand("new")
   call assert_equal(wincount + 1, winnr('$'))
-  bwipe!
-  bwipe!
+  %bwipe!
 endfunc
 
 func Test_VIM_package()
@@ -311,4 +322,10 @@
   call assert_equal('ABCDE', s)
 endfunc
 
+func Test_perl_in_sandbox()
+  sandbox perl print 'test'
+  let messages = split(execute('message'), "\n")
+  call assert_match("'print' trapped by operation mask", messages[-1])
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff -Nru vim-8.2.1913/src/testdir/test_popup.vim vim-8.2.2434/src/testdir/test_popup.vim
--- vim-8.2.1913/src/testdir/test_popup.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_popup.vim	2021-01-30 22:05:11.000000000 +0000
@@ -342,9 +342,9 @@
   setlocal completefunc=DummyCompleteOne
   call setline(1, 'one')
   /^one
-  call assert_fails('call feedkeys("A\<C-X>\<C-U>\<C-N>\<Esc>", "x")', 'E578:')
+  call assert_fails('call feedkeys("A\<C-X>\<C-U>\<C-N>\<Esc>", "x")', 'E565:')
   call assert_equal(winid, win_getid())
-  call assert_equal('oneDEF', getline(1))
+  call assert_equal('onedef', getline(1))
   q!
 endfunc
 
@@ -367,11 +367,9 @@
   setlocal completefunc=DummyCompleteTwo
   call setline(1, 'two')
   /^two
-  call assert_fails('call feedkeys("A\<C-X>\<C-U>\<C-N>\<Esc>", "x")', 'E839:')
-  call assert_notequal(winid, win_getid())
-  q!
+  call assert_fails('call feedkeys("A\<C-X>\<C-U>\<C-N>\<Esc>", "x")', 'E565:')
   call assert_equal(winid, win_getid())
-  call assert_equal('two', getline(1))
+  call assert_equal('twodef', getline(1))
   q!
 endfunc
 
@@ -642,8 +640,8 @@
   set completefunc=MessComplete
   new
   call setline(1, 'Ju')
-  call feedkeys("A\<c-x>\<c-u>/\<esc>", 'tx')
-  call assert_equal('Oct/Oct', getline(1))
+  call assert_fails('call feedkeys("A\<c-x>\<c-u>/\<esc>", "tx")', 'E578:')
+  call assert_equal('Jan/', getline(1))
   bwipe!
   set completefunc=
 endfunc
@@ -859,18 +857,30 @@
   call assert_fails('popup Foo', 'E337:')
   unmenu Test.Foo
 
+  let script =<< trim END
+    func StartTimer()
+      call timer_start(100, {-> ChangeMenu()})
+    endfunc
+    func ChangeMenu()
+      nunmenu PopUp.&Paste
+      nnoremenu 1.40 PopUp.&Paste :echomsg "pasted"<CR>
+      echomsg 'changed'
+    endfunc
+  END
+  call writefile(script, 'XtimerScript')
+
   let lines =<< trim END
 	one two three four five
 	and one two Xthree four five
 	one more two three four five
   END
   call writefile(lines, 'Xtest')
-  let buf = RunVimInTerminal('Xtest', {})
+  let buf = RunVimInTerminal('-S XtimerScript Xtest', {})
   call term_sendkeys(buf, ":source $VIMRUNTIME/menu.vim\<CR>")
   call term_sendkeys(buf, "/X\<CR>:popup PopUp\<CR>")
   call VerifyScreenDump(buf, 'Test_popup_command_01', {})
 
-  " Select a word
+  " go to the Paste entry in the menu
   call term_sendkeys(buf, "jj")
   call VerifyScreenDump(buf, 'Test_popup_command_02', {})
 
@@ -879,8 +889,20 @@
   call VerifyScreenDump(buf, 'Test_popup_command_03', {})
 
   call term_sendkeys(buf, "\<Esc>")
+
+  " Set a timer to change a menu entry while it's displayed.  The text should
+  " not change but the command does.  Making the screendump also verifies that
+  " "changed" shows up, which means the timer triggered
+  call term_sendkeys(buf, "/X\<CR>:call StartTimer() | popup PopUp\<CR>")
+  call VerifyScreenDump(buf, 'Test_popup_command_04', {})
+
+  " Select the Paste entry, executes the changed menu item.
+  call term_sendkeys(buf, "jj\<CR>")
+  call VerifyScreenDump(buf, 'Test_popup_command_05', {})
+
   call StopVimInTerminal(buf)
   call delete('Xtest')
+  call delete('XtimerScript')
 endfunc
 
 func Test_popup_complete_backwards()
diff -Nru vim-8.2.1913/src/testdir/test_popupwin.vim vim-8.2.2434/src/testdir/test_popupwin.vim
--- vim-8.2.1913/src/testdir/test_popupwin.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_popupwin.vim	2021-01-30 22:05:11.000000000 +0000
@@ -605,6 +605,7 @@
 	endfor
 	%foldclose
 	set shell=/bin/sh noruler
+	unlet $PROMPT_COMMAND
 	let $PS1 = 'vim> '
         terminal ++rows=4
 	$wincmd w
@@ -820,6 +821,10 @@
   " clean up
   call StopVimInTerminal(buf)
   call delete('XtestPopupMask')
+
+  " this was causing a crash
+  call popup_create('test', #{mask: [[0, 0, 0, 0]]})
+  call popup_clear()
 endfunc
 
 func Test_popup_select()
@@ -1765,6 +1770,16 @@
   call term_sendkeys(buf, ":\<CR>")
   call VerifyScreenDump(buf, 'Test_popupwin_longtitle_2', {})
 
+  call term_sendkeys(buf, ":call popup_clear()\<CR>")
+  call term_sendkeys(buf, ":call popup_create(['aaa', 'bbb'], #{title: 'Title', minwidth: 12, padding: [2, 2, 2, 2]})\<CR>")
+  call term_sendkeys(buf, ":\<CR>")
+  call VerifyScreenDump(buf, 'Test_popupwin_longtitle_3', {})
+
+  call term_sendkeys(buf, ":call popup_clear()\<CR>")
+  call term_sendkeys(buf, ":call popup_create(['aaa', 'bbb'], #{title: 'Title', minwidth: 12, border: [], padding: [2, 2, 2, 2]})\<CR>")
+  call term_sendkeys(buf, ":\<CR>")
+  call VerifyScreenDump(buf, 'Test_popupwin_longtitle_4', {})
+
   " clean up
   call StopVimInTerminal(buf)
   call delete('XtestPopupTitle')
@@ -2171,7 +2186,7 @@
     endfunc
 
     def CreatePopup(text: list<string>)
-      popup_create(text, #{
+      popup_create(text, {
 	    \ minwidth: 30,
 	    \ maxwidth: 30,
 	    \ minheight: 4,
@@ -2661,10 +2676,19 @@
   help
 
   let termbuf = term_start(&shell, #{hidden: 1})
-  let winid = popup_create(termbuf, #{minwidth: 40, minheight: 10})
+  let winid = popup_create(termbuf, #{minwidth: 40, minheight: 10, border: []})
   " Wait for shell to start
   call WaitForAssert({-> assert_equal("run", job_status(term_getjob(termbuf)))})
-  sleep 100m
+  " Wait for a prompt (see border char first, then space after prompt)
+  call WaitForAssert({ -> assert_equal(' ', screenstring(screenrow(), screencol() - 1))})
+
+  " When typing a character, the cursor is after it.
+  call feedkeys("x", 'xt')
+  call term_wait(termbuf)
+  redraw
+  call WaitForAssert({ -> assert_equal('x', screenstring(screenrow(), screencol() - 1))})
+  call feedkeys("\<BS>", 'xt')
+
   " Check this doesn't crash
   call assert_equal(winnr(), winnr('j'))
   call assert_equal(winnr(), winnr('k'))
@@ -2708,7 +2732,7 @@
   split
   wincmd b
   assert_equal(2, winnr())
-  var buf = term_start(&shell, #{hidden: 1})
+  var buf = term_start(&shell, {hidden: 1})
   popup_create(buf, {})
   TermWait(buf, 100)
   popup_clear(true)
@@ -3206,6 +3230,9 @@
       call setline(1, 'text text text text text text text ')
       func ChangeColor()
 	let id = popup_findinfo()
+	if buflisted(winbufnr(id))
+	  call setline(1, 'buffer is listed')
+	endif
 	eval id->popup_setoptions(#{highlight: 'InfoPopup'})
       endfunc
 
@@ -3243,6 +3270,10 @@
 	  call popup_show(id)
 	endif
       endfunc
+
+      " Check that no autocommands are triggered for the info popup
+      au WinEnter * if win_gettype() == 'popup' | call setline(2, 'WinEnter') | endif
+      au WinLeave * if win_gettype() == 'popup' | call setline(2, 'WinLeave') | endif
   END
   return lines
 endfunc
@@ -3281,7 +3312,7 @@
   call term_sendkeys(buf, "cc\<C-X>\<C-U>")
   call VerifyScreenDump(buf, 'Test_popupwin_infopopup_6', {})
 
-  " Hide the info popup, cycle trough buffers, make sure it didn't get
+  " Hide the info popup, cycle through buffers, make sure it didn't get
   " deleted.
   call term_sendkeys(buf, "\<Esc>")
   call term_sendkeys(buf, ":set hidden\<CR>")
@@ -3685,6 +3716,35 @@
   call delete('XtestPopupThreeErrors')
 endfunc
 
+func Test_popupwin_latin1_encoding()
+  CheckScreendump
+  CheckUnix
+
+  " When 'encoding' is a single-byte encoding a terminal window will mess up
+  " the display.  Check that showing a popup on top of that doesn't crash.
+  let lines =<< trim END
+      set encoding=latin1
+      terminal cat Xmultibyte
+      call popup_create(['one', 'two', 'three', 'four'], #{line: 1, col: 10})
+      redraw
+      " wait for "cat" to finish
+      while execute('ls!') !~ 'finished'
+	sleep 10m
+      endwhile
+      echo "Done"
+  END
+  call writefile(lines, 'XtestPopupLatin')
+  call writefile([repeat("\u3042 ", 120)], 'Xmultibyte')
+
+  let buf = RunVimInTerminal('-S XtestPopupLatin', #{rows: 10})
+  call WaitForAssert({-> assert_match('Done', term_getline(buf, 10))})
+
+  call term_sendkeys(buf, ":q\<CR>")
+  call StopVimInTerminal(buf)
+  call delete('XtestPopupLatin')
+  call delete('Xmultibyte')
+endfunc
+
 func Test_popupwin_atcursor_far_right()
   new
 
@@ -3715,5 +3775,32 @@
   bwipe
 endfunc
 
+func Test_popupwin_exiting_terminal()
+  CheckFeature terminal
+
+  " Tests that when creating a popup right after closing a terminal window does
+  " not make the popup the current window.
+  let winid = win_getid()
+  try
+    augroup Test_popupwin_exiting_terminal
+      autocmd!
+      autocmd WinEnter * :call popup_create('test', {})
+    augroup END
+    let bnr = term_start(&shell, #{term_finish: 'close'})
+    call term_sendkeys(bnr, "exit\r\n")
+    call WaitForAssert({-> assert_equal(winid, win_getid())})
+  finally
+    call popup_clear(1)
+    augroup Test_popupwin_exiting_terminal
+      autocmd!
+    augroup END
+  endtry
+endfunc
+
+func Test_popup_filter_menu()
+  let colors = ['red', 'green', 'blue']
+  call popup_menu(colors, #{callback: {_, result -> assert_equal('green', colors[result - 1])}})
+  call feedkeys("\<c-n>\<c-n>\<c-p>\<cr>", 'xt')
+endfunc
 
 " vim: shiftwidth=2 sts=2
diff -Nru vim-8.2.1913/src/testdir/test_profile.vim vim-8.2.2434/src/testdir/test_profile.vim
--- vim-8.2.1913/src/testdir/test_profile.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_profile.vim	2021-01-30 22:05:11.000000000 +0000
@@ -5,24 +5,30 @@
 
 source shared.vim
 source screendump.vim
+source vim9.vim
 
 func Test_profile_func()
+  call RunProfileFunc('func', 'let', 'let')
+  call RunProfileFunc('def', 'var', '')
+endfunc
+
+func RunProfileFunc(command, declare, assign)
   let lines =<< trim [CODE]
     profile start Xprofile_func.log
     profile func Foo*
-    func! Foo1()
-    endfunc
-    func! Foo2()
-      let l:count = 100
-      while l:count > 0
-        let l:count = l:count - 1
+    XXX Foo1()
+    endXXX
+    XXX Foo2()
+      DDD counter = 100
+      while counter > 0
+        AAA counter = counter - 1
       endwhile
       sleep 1m
-    endfunc
-    func! Foo3()
-    endfunc
-    func! Bar()
-    endfunc
+    endXXX
+    XXX Foo3()
+    endXXX
+    XXX Bar()
+    endXXX
     call Foo1()
     call Foo1()
     profile pause
@@ -37,6 +43,10 @@
     delfunc Foo3
   [CODE]
 
+  call map(lines, {k, v -> substitute(v, 'XXX', a:command, '') })
+  call map(lines, {k, v -> substitute(v, 'DDD', a:declare, '') })
+  call map(lines, {k, v -> substitute(v, 'AAA', a:assign, '') })
+
   call writefile(lines, 'Xprofile_func.vim')
   call system(GetVimCommand()
     \ . ' -es --clean'
@@ -69,10 +79,10 @@
   call assert_match('^ Self time:\s\+\d\+\.\d\+$',                 lines[12])
   call assert_equal('',                                            lines[13])
   call assert_equal('count  total (s)   self (s)',                 lines[14])
-  call assert_match('^\s*1\s\+.*\slet l:count = 100$',             lines[15])
-  call assert_match('^\s*101\s\+.*\swhile l:count > 0$',           lines[16])
-  call assert_match('^\s*100\s\+.*\s  let l:count = l:count - 1$', lines[17])
-  call assert_match('^\s*101\s\+.*\sendwhile$',                    lines[18])
+  call assert_match('^\s*1\s\+.*\s\(let\|var\) counter = 100$',    lines[15])
+  call assert_match('^\s*101\s\+.*\swhile counter > 0$',           lines[16])
+  call assert_match('^\s*100\s\+.*\s  \(let\)\= counter = counter - 1$', lines[17])
+  call assert_match('^\s*10[01]\s\+.*\sendwhile$',                 lines[18])
   call assert_match('^\s*1\s\+.\+sleep 1m$',                       lines[19])
   call assert_equal('',                                            lines[20])
   call assert_equal('FUNCTIONS SORTED ON TOTAL TIME',              lines[21])
@@ -91,39 +101,47 @@
 endfunc
 
 func Test_profile_func_with_ifelse()
+  call Run_profile_func_with_ifelse('func', 'let')
+  call Run_profile_func_with_ifelse('def', 'var')
+endfunc
+
+func Run_profile_func_with_ifelse(command, declare)
   let lines =<< trim [CODE]
-    func! Foo1()
+    XXX Foo1()
       if 1
-        let x = 0
+        DDD x = 0
       elseif 1
-        let x = 1
+        DDD x = 1
       else
-        let x = 2
+        DDD x = 2
       endif
-    endfunc
-    func! Foo2()
+    endXXX
+    XXX Foo2()
       if 0
-        let x = 0
+        DDD x = 0
       elseif 1
-        let x = 1
+        DDD x = 1
       else
-        let x = 2
+        DDD x = 2
       endif
-    endfunc
-    func! Foo3()
+    endXXX
+    XXX Foo3()
       if 0
-        let x = 0
+        DDD x = 0
       elseif 0
-        let x = 1
+        DDD x = 1
       else
-        let x = 2
+        DDD x = 2
       endif
-    endfunc
+    endXXX
     call Foo1()
     call Foo2()
     call Foo3()
   [CODE]
 
+  call map(lines, {k, v -> substitute(v, 'XXX', a:command, '') })
+  call map(lines, {k, v -> substitute(v, 'DDD', a:declare, '') })
+
   call writefile(lines, 'Xprofile_func.vim')
   call system(GetVimCommand()
     \ . ' -es -i NONE --noplugin'
@@ -148,11 +166,11 @@
   call assert_equal('',                                            lines[5])
   call assert_equal('count  total (s)   self (s)',                 lines[6])
   call assert_match('^\s*1\s\+.*\sif 1$',                          lines[7])
-  call assert_match('^\s*1\s\+.*\s  let x = 0$',                   lines[8])
+  call assert_match('^\s*1\s\+.*\s  \(let\|var\) x = 0$',          lines[8])
   call assert_match(        '^\s\+elseif 1$',                      lines[9])
-  call assert_match(          '^\s\+let x = 1$',                   lines[10])
+  call assert_match(          '^\s\+\(let\|var\) x = 1$',          lines[10])
   call assert_match(        '^\s\+else$',                          lines[11])
-  call assert_match(          '^\s\+let x = 2$',                   lines[12])
+  call assert_match(          '^\s\+\(let\|var\) x = 2$',          lines[12])
   call assert_match('^\s*1\s\+.*\sendif$',                         lines[13])
   call assert_equal('',                                            lines[14])
   call assert_equal('FUNCTION  Foo2()',                            lines[15])
@@ -162,11 +180,11 @@
   call assert_equal('',                                            lines[20])
   call assert_equal('count  total (s)   self (s)',                 lines[21])
   call assert_match('^\s*1\s\+.*\sif 0$',                          lines[22])
-  call assert_match(          '^\s\+let x = 0$',                   lines[23])
+  call assert_match(          '^\s\+\(let\|var\) x = 0$',          lines[23])
   call assert_match('^\s*1\s\+.*\selseif 1$',                      lines[24])
-  call assert_match('^\s*1\s\+.*\s  let x = 1$',                   lines[25])
+  call assert_match('^\s*1\s\+.*\s  \(let\|var\) x = 1$',          lines[25])
   call assert_match(        '^\s\+else$',                          lines[26])
-  call assert_match(          '^\s\+let x = 2$',                   lines[27])
+  call assert_match(          '^\s\+\(let\|var\) x = 2$',          lines[27])
   call assert_match('^\s*1\s\+.*\sendif$',                         lines[28])
   call assert_equal('',                                            lines[29])
   call assert_equal('FUNCTION  Foo3()',                            lines[30])
@@ -176,11 +194,11 @@
   call assert_equal('',                                            lines[35])
   call assert_equal('count  total (s)   self (s)',                 lines[36])
   call assert_match('^\s*1\s\+.*\sif 0$',                          lines[37])
-  call assert_match(          '^\s\+let x = 0$',                   lines[38])
+  call assert_match(          '^\s\+\(let\|var\) x = 0$',          lines[38])
   call assert_match('^\s*1\s\+.*\selseif 0$',                      lines[39])
-  call assert_match(          '^\s\+let x = 1$',                   lines[40])
+  call assert_match(          '^\s\+\(let\|var\) x = 1$',          lines[40])
   call assert_match('^\s*1\s\+.*\selse$',                          lines[41])
-  call assert_match('^\s*1\s\+.*\s  let x = 2$',                   lines[42])
+  call assert_match('^\s*1\s\+.*\s  \(let\|var\) x = 2$',          lines[42])
   call assert_match('^\s*1\s\+.*\sendif$',                         lines[43])
   call assert_equal('',                                            lines[44])
   call assert_equal('FUNCTIONS SORTED ON TOTAL TIME',              lines[45])
@@ -201,42 +219,56 @@
 endfunc
 
 func Test_profile_func_with_trycatch()
+  call Run_profile_func_with_trycatch('func', 'let')
+  call Run_profile_func_with_trycatch('def', 'var')
+endfunc
+
+func Run_profile_func_with_trycatch(command, declare)
   let lines =<< trim [CODE]
-    func! Foo1()
+    XXX Foo1()
       try
-        let x = 0
+        DDD x = 0
       catch
-        let x = 1
+        DDD x = 1
       finally
-        let x = 2
+        DDD x = 2
       endtry
-    endfunc
-    func! Foo2()
+    endXXX
+    XXX Foo2()
       try
         throw 0
       catch
-        let x = 1
+        DDD x = 1
       finally
-        let x = 2
+        DDD x = 2
       endtry
-    endfunc
-    func! Foo3()
+    endXXX
+    XXX Foo3()
       try
         throw 0
       catch
         throw 1
       finally
-        let x = 2
+        DDD x = 2
       endtry
-    endfunc
+    endXXX
     call Foo1()
     call Foo2()
+    let rethrown = 0
     try
       call Foo3()
     catch
+      let rethrown = 1
     endtry
+    if rethrown != 1
+      " call Foo1 again so that the test fails
+      call Foo1()
+    endif
   [CODE]
 
+  call map(lines, {k, v -> substitute(v, 'XXX', a:command, '') })
+  call map(lines, {k, v -> substitute(v, 'DDD', a:declare, '') })
+
   call writefile(lines, 'Xprofile_func.vim')
   call system(GetVimCommand()
     \ . ' -es -i NONE --noplugin'
@@ -261,11 +293,11 @@
   call assert_equal('',                                            lines[5])
   call assert_equal('count  total (s)   self (s)',                 lines[6])
   call assert_match('^\s*1\s\+.*\stry$',                           lines[7])
-  call assert_match('^\s*1\s\+.*\s  let x = 0$',                   lines[8])
+  call assert_match('^\s*1\s\+.*\s  \(let\|var\) x = 0$',          lines[8])
   call assert_match(        '^\s\+catch$',                         lines[9])
-  call assert_match(          '^\s\+let x = 1$',                   lines[10])
+  call assert_match(          '^\s\+\(let\|var\) x = 1$',          lines[10])
   call assert_match('^\s*1\s\+.*\sfinally$',                       lines[11])
-  call assert_match('^\s*1\s\+.*\s  let x = 2$',                   lines[12])
+  call assert_match('^\s*1\s\+.*\s  \(let\|var\) x = 2$',          lines[12])
   call assert_match('^\s*1\s\+.*\sendtry$',                        lines[13])
   call assert_equal('',                                            lines[14])
   call assert_equal('FUNCTION  Foo2()',                            lines[15])
@@ -277,9 +309,9 @@
   call assert_match('^\s*1\s\+.*\stry$',                           lines[22])
   call assert_match('^\s*1\s\+.*\s  throw 0$',                     lines[23])
   call assert_match('^\s*1\s\+.*\scatch$',                         lines[24])
-  call assert_match('^\s*1\s\+.*\s  let x = 1$',                   lines[25])
+  call assert_match('^\s*1\s\+.*\s  \(let\|var\) x = 1$',          lines[25])
   call assert_match('^\s*1\s\+.*\sfinally$',                       lines[26])
-  call assert_match('^\s*1\s\+.*\s  let x = 2$',                   lines[27])
+  call assert_match('^\s*1\s\+.*\s  \(let\|var\) x = 2$',          lines[27])
   call assert_match('^\s*1\s\+.*\sendtry$',                        lines[28])
   call assert_equal('',                                            lines[29])
   call assert_equal('FUNCTION  Foo3()',                            lines[30])
@@ -293,7 +325,7 @@
   call assert_match('^\s*1\s\+.*\scatch$',                         lines[39])
   call assert_match('^\s*1\s\+.*\s  throw 1$',                     lines[40])
   call assert_match('^\s*1\s\+.*\sfinally$',                       lines[41])
-  call assert_match('^\s*1\s\+.*\s  let x = 2$',                   lines[42])
+  call assert_match('^\s*1\s\+.*\s  \(let\|var\) x = 2$',          lines[42])
   call assert_match(        '^\s\+endtry$',                        lines[43])
   call assert_equal('',                                            lines[44])
   call assert_equal('FUNCTIONS SORTED ON TOTAL TIME',              lines[45])
@@ -552,4 +584,26 @@
   call delete('XtestProfile')
 endfunc
 
+func Test_vim9_profiling()
+  " only tests that compiling and calling functions doesn't crash
+  let lines =<< trim END
+      vim9script
+      def Func()
+        Crash()
+      enddef
+      def Crash()
+      enddef
+      prof start Xprofile_crash.log
+      prof func Func
+      Func()
+  END
+  call writefile(lines, 'Xprofile_crash.vim')
+  call system(GetVimCommandClean() . ' -es -c "so Xprofile_crash.vim" -c q')
+  call assert_equal(0, v:shell_error)
+  call CheckScriptSuccess(lines)
+  call delete('Xprofile_crash.vim')
+  call delete('Xprofile_crash.log')
+endfunc
+
+
 " vim: shiftwidth=2 sts=2 expandtab
diff -Nru vim-8.2.1913/src/testdir/test_prompt_buffer.vim vim-8.2.2434/src/testdir/test_prompt_buffer.vim
--- vim-8.2.1913/src/testdir/test_prompt_buffer.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_prompt_buffer.vim	2021-01-30 22:05:11.000000000 +0000
@@ -85,9 +85,12 @@
   call term_sendkeys(buf, left . left . left . bs . '-')
   call WaitForAssert({-> assert_equal('cmd: -hel', term_getline(buf, 1))})
 
+  call term_sendkeys(buf, "\<C-O>lz")
+  call WaitForAssert({-> assert_equal('cmd: -hzel', term_getline(buf, 1))})
+
   let end = "\<End>"
   call term_sendkeys(buf, end . "x")
-  call WaitForAssert({-> assert_equal('cmd: -helx', term_getline(buf, 1))})
+  call WaitForAssert({-> assert_equal('cmd: -hzelx', term_getline(buf, 1))})
 
   call term_sendkeys(buf, "\<C-U>exit\<CR>")
   call WaitForAssert({-> assert_equal('other buffer', term_getline(buf, 1))})
@@ -122,6 +125,14 @@
   bwipe!
 endfunc
 
+func Test_prompt_backspace()
+  new
+  set buftype=prompt
+  call feedkeys("A123456\<Left>\<BS>\<Esc>", 'xt')
+  call assert_equal('% 12346', getline(1))
+  bwipe!
+endfunc
+
 " Test for editing the prompt buffer
 func Test_prompt_buffer_edit()
   new
diff -Nru vim-8.2.1913/src/testdir/test_python2.vim vim-8.2.2434/src/testdir/test_python2.vim
--- vim-8.2.1913/src/testdir/test_python2.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_python2.vim	2021-01-30 22:05:11.000000000 +0000
@@ -353,12 +353,12 @@
   call AssertException(["py t = vim.eval('[test_null_list()]')"],
         \ 'Vim(python):SystemError: error return without exception set')
 
-  " Try to bind a null List variable
+  " Try to bind a null List variable (works because an empty list is used)
   let cmds =<< trim END
     let l = test_null_list()
     py ll = vim.bindeval('l')
   END
-  call AssertException(cmds, 'Vim(python):SystemError: error return without exception set')
+  call AssertException(cmds, '')
 
   let l = []
   py l = vim.bindeval('l')
@@ -3692,7 +3692,7 @@
   call assert_equal(expected, getline(2, '$'))
   close!
 
-  " Try to import a non-existing moudle with a dot (.)
+  " Try to import a non-existing module with a dot (.)
   call AssertException(['py import a.b.c'], 'ImportError:')
 endfunc
 
@@ -3775,4 +3775,11 @@
   close!
 endfunc
 
+func Test_python_non_utf8_string()
+  smap <Esc>@ <A-@>
+  python vim.command('redir => _tmp_smaps | smap | redir END')
+  python vim.eval('_tmp_smaps').splitlines()
+  sunmap <Esc>@
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff -Nru vim-8.2.1913/src/testdir/test_python3.vim vim-8.2.2434/src/testdir/test_python3.vim
--- vim-8.2.1913/src/testdir/test_python3.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_python3.vim	2021-01-30 22:05:11.000000000 +0000
@@ -12,6 +12,7 @@
   return {'a': 1}
 endfunction
 
+let s:system_error_pat = 'Vim(py3):SystemError: \(<built-in function eval> returned NULL without setting an error\|error return without exception set\)'
 
 " This function should be called first. This sets up python functions used by
 " the other tests.
@@ -539,19 +540,18 @@
 func Test_python3_list()
   " Try to convert a null List
   call AssertException(["py3 t = vim.eval('test_null_list()')"],
-        \ 'Vim(py3):SystemError: <built-in function eval> returned NULL without setting an error')
+        \ s:system_error_pat)
 
   " Try to convert a List with a null List item
   call AssertException(["py3 t = vim.eval('[test_null_list()]')"],
-        \ 'Vim(py3):SystemError: <built-in function eval> returned NULL without setting an error')
+        \ s:system_error_pat)
 
-  " Try to bind a null List variable
+  " Try to bind a null List variable (works because an empty list is used)
   let cmds =<< trim END
     let l = test_null_list()
     py3 ll = vim.bindeval('l')
   END
-  call AssertException(cmds,
-        \ 'Vim(py3):SystemError: <built-in function bindeval> returned NULL without setting an error')
+  call AssertException(cmds, '')
 
   let l = []
   py3 l = vim.bindeval('l')
@@ -583,11 +583,11 @@
 func Test_python3_dict()
   " Try to convert a null Dict
   call AssertException(["py3 t = vim.eval('test_null_dict()')"],
-        \ 'Vim(py3):SystemError: <built-in function eval> returned NULL without setting an error')
+        \ s:system_error_pat)
 
   " Try to convert a Dict with a null List value
   call AssertException(["py3 t = vim.eval(\"{'a' : test_null_list()}\")"],
-        \ 'Vim(py3):SystemError: <built-in function eval> returned NULL without setting an error')
+        \ s:system_error_pat)
 
   " Try to convert a Dict with a null string key
   py3 t = vim.eval("{test_null_string() : 10}")
@@ -1120,7 +1120,7 @@
   let l = [test_null_list()]
   py3 ll = vim.bindeval('l')
   call AssertException(["py3 x = ll[:]"],
-        \ "Vim(py3):SystemError: error return without exception set")
+        \ s:system_error_pat)
 endfunc
 
 " Vars
@@ -3883,7 +3883,7 @@
   call assert_equal(expected, getline(2, '$'))
   close!
 
-  " Try to import a non-existing moudle with a dot (.)
+  " Try to import a non-existing module with a dot (.)
   call AssertException(['py3 import a.b.c'], "No module named 'a'")
 endfunc
 
@@ -4009,4 +4009,44 @@
   call assert_equal(1, g:options_iter_ref_count_increase)
 endfunc
 
+func Test_python3_non_utf8_string()
+  smap <Esc>@ <A-@>
+  py3 vim.command('redir => _tmp_smaps | smap | redir END')
+  py3 vim.eval('_tmp_smaps').splitlines()
+  sunmap <Esc>@
+endfunc
+
+func Test_python3_fold_hidden_buffer()
+  CheckFeature folding
+
+  set fdm=expr fde=Fde(v:lnum)
+  let b:regex = '^'
+  func Fde(lnum)
+    let ld = [{}]
+    let lines = bufnr('%')->getbufline(1, '$')
+    let was_import = 0
+    for lnum in range(1, len(lines))
+      let line = lines[lnum]
+      call add(ld, {'a': b:regex})
+      let ld[lnum].foldexpr = was_import ? 1 : '>1'
+      let was_import = 1
+    endfor
+    return ld[a:lnum].foldexpr
+  endfunc
+
+  call setline(1, repeat([''], 15) + repeat(['from'], 3))
+  eval repeat(['x'], 17)->writefile('Xa.txt')
+  split Xa.txt
+  py3 import vim
+  py3 b = vim.current.buffer
+  py3 aaa = b[:]
+  hide
+  py3 b[:] = aaa
+
+  call delete('Xa.txt')
+  set fdm& fde&
+  delfunc Fde
+  bwipe! Xa.txt
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff -Nru vim-8.2.1913/src/testdir/test_quickfix.vim vim-8.2.2434/src/testdir/test_quickfix.vim
--- vim-8.2.1913/src/testdir/test_quickfix.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_quickfix.vim	2021-01-30 22:05:11.000000000 +0000
@@ -702,6 +702,26 @@
   call s:test_xhelpgrep('l')
 endfunc
 
+def Test_helpgrep_vim9_restore_cpo()
+  assert_equal('aABceFs', &cpo)
+
+  var rtp_save = &rtp
+  var dir = 'Xruntime/after'
+  &rtp ..= ',' .. dir
+  mkdir(dir .. '/ftplugin', 'p')
+  writefile(['vim9'], dir .. '/ftplugin/qf.vim')
+  filetype plugin on
+  silent helpgrep grail
+  cwindow
+  silent helpgrep grail
+
+  assert_equal('aABceFs', &cpo)
+  delete(dir, 'rf')
+  &rtp = rtp_save
+  cclose
+  helpclose
+enddef
+
 func Test_errortitle()
   augroup QfBufWinEnter
     au!
@@ -2845,6 +2865,13 @@
   call XvimgrepTests('l')
 endfunc
 
+func Test_vimgrep_wildcards_expanded_once()
+  new X[id-01] file.txt
+  call setline(1, 'some text to search for')
+  vimgrep text %
+  bwipe!
+endfunc
+
 " Test for incsearch highlighting of the :vimgrep pattern
 " This test used to cause "E315: ml_get: invalid lnum" errors.
 func Test_vimgrep_incsearch()
@@ -3091,6 +3118,66 @@
   endtry
 endfunc
 
+func Test_vimgrep_with_textlock()
+  new
+
+  " Simple way to execute something with "textwinlock" set.
+  " Check that vimgrep without jumping can be executed.
+  au InsertCharPre * vimgrep /RunTheTest/j runtest.vim
+  normal ax
+  let qflist = getqflist()
+  call assert_true(len(qflist) > 0)
+  call assert_match('RunTheTest', qflist[0].text)
+  call setqflist([], 'r')
+  au! InsertCharPre
+
+  " Check that vimgrepadd without jumping can be executed.
+  au InsertCharPre * vimgrepadd /RunTheTest/j runtest.vim
+  normal ax
+  let qflist = getqflist()
+  call assert_true(len(qflist) > 0)
+  call assert_match('RunTheTest', qflist[0].text)
+  call setqflist([], 'r')
+  au! InsertCharPre
+
+  " Check that lvimgrep without jumping can be executed.
+  au InsertCharPre * lvimgrep /RunTheTest/j runtest.vim
+  normal ax
+  let qflist = getloclist(0)
+  call assert_true(len(qflist) > 0)
+  call assert_match('RunTheTest', qflist[0].text)
+  call setloclist(0, [], 'r')
+  au! InsertCharPre
+
+  " Check that lvimgrepadd without jumping can be executed.
+  au InsertCharPre * lvimgrepadd /RunTheTest/j runtest.vim
+  normal ax
+  let qflist = getloclist(0)
+  call assert_true(len(qflist) > 0)
+  call assert_match('RunTheTest', qflist[0].text)
+  call setloclist(0, [], 'r')
+  au! InsertCharPre
+
+  " trying to jump will give an error
+  au InsertCharPre * vimgrep /RunTheTest/ runtest.vim
+  call assert_fails('normal ax', 'E565:')
+  au! InsertCharPre
+
+  au InsertCharPre * vimgrepadd /RunTheTest/ runtest.vim
+  call assert_fails('normal ax', 'E565:')
+  au! InsertCharPre
+
+  au InsertCharPre * lvimgrep /RunTheTest/ runtest.vim
+  call assert_fails('normal ax', 'E565:')
+  au! InsertCharPre
+
+  au InsertCharPre * lvimgrepadd /RunTheTest/ runtest.vim
+  call assert_fails('normal ax', 'E565:')
+  au! InsertCharPre
+
+  bwipe!
+endfunc
+
 " Tests for the quickfix buffer b:changedtick variable
 func Xchangedtick_tests(cchar)
   call s:setup_commands(a:cchar)
@@ -3753,7 +3840,7 @@
   sv Xtest
   augroup QF_Test
     au!
-    au * * bw
+    au QuickFixCmdPre,QuickFixCmdPost,BufEnter,BufLeave * bw
   augroup END
   lbuffer
   augroup QF_Test
@@ -3765,7 +3852,7 @@
 func Test_lexpr_crash()
   augroup QF_Test
     au!
-    au * * call setloclist(0, [], 'f')
+    au QuickFixCmdPre,QuickFixCmdPost,BufEnter,BufLeave * call setloclist(0, [], 'f')
   augroup END
   lexpr ""
   augroup QF_Test
@@ -3800,7 +3887,7 @@
   sv Xtest
   augroup QF_Test
     au!
-    au * * call setloclist(0, [], 'f')
+    au QuickFixCmdPre,QuickFixCmdPost,BufEnter,BufLeave * call setloclist(0, [], 'f')
   augroup END
   lvimgrep quickfix test_quickfix.vim
   augroup QF_Test
@@ -3949,6 +4036,10 @@
     au BufEnter * call setqflist([], 'f')
   augroup END
   call assert_fails('helpgrep quickfix', 'E925:')
+  " run the test with a help window already open
+  help
+  wincmd w
+  call assert_fails('helpgrep quickfix', 'E925:')
   augroup QF_Test
     au! BufEnter
   augroup END
@@ -4101,13 +4192,37 @@
   call setqflist([], 'r', {'items' : [{'filename' : 'a.c', 'lnum' : 10}]})
   call assert_equal('Errors', w:quickfix_title)
   cclose
+
+  " Switching to another quickfix list in one tab page should update the
+  " quickfix window title and statusline in all the other tab pages also
+  call setqflist([], 'f')
+  %bw!
+  cgetexpr ['file_one:1:1: error in the first quickfix list']
+  call setqflist([], 'a', {'title': 'first quickfix list'})
+  cgetexpr ['file_two:2:1: error in the second quickfix list']
+  call setqflist([], 'a', {'title': 'second quickfix list'})
+  copen
+  wincmd t
+  tabnew two
+  copen
+  wincmd t
+  colder
+  call assert_equal('first quickfix list', gettabwinvar(1, 2, 'quickfix_title'))
+  call assert_equal('first quickfix list', gettabwinvar(2, 2, 'quickfix_title'))
+  call assert_equal(1, tabpagewinnr(1))
+  call assert_equal(1, tabpagewinnr(2))
+  tabnew
+  call setqflist([], 'a', {'title': 'new quickfix title'})
+  call assert_equal('new quickfix title', gettabwinvar(1, 2, 'quickfix_title'))
+  call assert_equal('new quickfix title', gettabwinvar(2, 2, 'quickfix_title'))
+  %bw!
 endfunc
 
 func Test_lbuffer_with_bwipe()
   new
   new
   augroup nasty
-    au * * bwipe
+    au QuickFixCmdPre,QuickFixCmdPost,BufEnter,BufLeave * bwipe
   augroup END
   lbuffer
   augroup nasty
@@ -4120,9 +4235,9 @@
 func Xexpr_acmd_freelist(cchar)
   call s:setup_commands(a:cchar)
 
-  " This was using freed memory.
+  " This was using freed memory (but with what events?)
   augroup nasty
-    au * * call g:Xsetlist([], 'f')
+    au QuickFixCmdPre,QuickFixCmdPost,BufEnter,BufLeave * call g:Xsetlist([], 'f')
   augroup END
   Xexpr "x"
   augroup nasty
@@ -5141,4 +5256,110 @@
   %bw!
 endfunc
 
+" Test for adding an invalid entry with the quickfix window open and making
+" sure that the window contents are not changed
+func Test_add_invalid_entry_with_qf_window()
+  call setqflist([], 'f')
+  cexpr "Xfile1:10:aa"
+  copen
+  call setqflist(['bb'], 'a')
+  call assert_equal(1, line('$'))
+  call assert_equal(['Xfile1|10| aa'], getline(1, '$'))
+  call assert_equal([{'lnum': 10, 'bufnr': bufnr('Xfile1'), 'col': 0, 'pattern': '', 'valid': 1, 'vcol': 0, 'nr': -1, 'type': '', 'module': '', 'text': 'aa'}], getqflist())
+  cclose
+endfunc
+
+" Test for very weird problem: autocommand causes a failure, resulting opening
+" the quickfix window to fail. This still splits the window, but otherwise
+" should not mess up buffers.
+func Test_quickfix_window_fails_to_open()
+  CheckScreendump
+
+  let lines =<< trim END
+      anything
+      try
+        anything
+      endtry
+  END
+  call writefile(lines, 'XquickfixFails')
+
+  let lines =<< trim END
+      split XquickfixFails
+      silent vimgrep anything %
+      normal o
+      au BufLeave * ++once source XquickfixFails
+      " This will trigger the autocommand, which causes an error, what follows
+      " is aborted but the window was already split.
+      silent! cwindow
+  END
+  call writefile(lines, 'XtestWinFails')
+  let buf = RunVimInTerminal('-S XtestWinFails', #{rows: 13})
+  call VerifyScreenDump(buf, 'Test_quickfix_window_fails', {})
+
+  " clean up
+  call term_sendkeys(buf, ":bwipe!\<CR>")
+  call term_wait(buf)
+  call StopVimInTerminal(buf)
+  call delete('XtestWinFails')
+  call delete('XquickfixFails')
+endfunc
+
+" Test for updating the quickfix buffer whenever the associated quickfix list
+" is changed.
+func Xqfbuf_update(cchar)
+  call s:setup_commands(a:cchar)
+
+  Xexpr "F1:1:line1"
+  Xopen
+  call assert_equal(['F1|1| line1'], getline(1, '$'))
+  call assert_equal(1, g:Xgetlist({'changedtick' : 0}).changedtick)
+
+  " Test setqflist() using the 'lines' key in 'what'
+  " add a new entry
+  call g:Xsetlist([], 'a', {'lines' : ['F2:2: line2']})
+  call assert_equal(['F1|1| line1', 'F2|2| line2'], getline(1, '$'))
+  call assert_equal(2, g:Xgetlist({'changedtick' : 0}).changedtick)
+  " replace all the entries with a single entry
+  call g:Xsetlist([], 'r', {'lines' : ['F3:3: line3']})
+  call assert_equal(['F3|3| line3'], getline(1, '$'))
+  call assert_equal(3, g:Xgetlist({'changedtick' : 0}).changedtick)
+  " remove all the entries
+  call g:Xsetlist([], 'r', {'lines' : []})
+  call assert_equal([''], getline(1, '$'))
+  call assert_equal(4, g:Xgetlist({'changedtick' : 0}).changedtick)
+  " add a new list
+  call g:Xsetlist([], ' ', {'lines' : ['F4:4: line4']})
+  call assert_equal(['F4|4| line4'], getline(1, '$'))
+  call assert_equal(1, g:Xgetlist({'changedtick' : 0}).changedtick)
+
+  " Test setqflist() using the 'items' key in 'what'
+  " add a new entry
+  call g:Xsetlist([], 'a', {'items' : [{'filename' : 'F5', 'lnum' : 5, 'text' : 'line5'}]})
+  call assert_equal(['F4|4| line4', 'F5|5| line5'], getline(1, '$'))
+  call assert_equal(2, g:Xgetlist({'changedtick' : 0}).changedtick)
+  " replace all the entries with a single entry
+  call g:Xsetlist([], 'r', {'items' : [{'filename' : 'F6', 'lnum' : 6, 'text' : 'line6'}]})
+  call assert_equal(['F6|6| line6'], getline(1, '$'))
+  call assert_equal(3, g:Xgetlist({'changedtick' : 0}).changedtick)
+  " remove all the entries
+  call g:Xsetlist([], 'r', {'items' : []})
+  call assert_equal([''], getline(1, '$'))
+  call assert_equal(4, g:Xgetlist({'changedtick' : 0}).changedtick)
+  " add a new list
+  call g:Xsetlist([], ' ', {'items' : [{'filename' : 'F7', 'lnum' : 7, 'text' : 'line7'}]})
+  call assert_equal(['F7|7| line7'], getline(1, '$'))
+  call assert_equal(1, g:Xgetlist({'changedtick' : 0}).changedtick)
+
+  call g:Xsetlist([], ' ', {})
+  call assert_equal([''], getline(1, '$'))
+  call assert_equal(1, g:Xgetlist({'changedtick' : 0}).changedtick)
+
+  Xclose
+endfunc
+
+func Test_qfbuf_update()
+  call Xqfbuf_update('c')
+  call Xqfbuf_update('l')
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff -Nru vim-8.2.1913/src/testdir/test_quotestar.vim vim-8.2.2434/src/testdir/test_quotestar.vim
--- vim-8.2.1913/src/testdir/test_quotestar.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_quotestar.vim	2021-01-30 22:05:11.000000000 +0000
@@ -98,8 +98,6 @@
 
     " Running in a terminal and the GUI is available: Tell the server to open
     " the GUI and check that the remote command still works.
-    " Need to wait for the GUI to start up, otherwise the send hangs in trying
-    " to send to the terminal window.
     if has('gui_athena') || has('gui_motif')
       " For those GUIs, ignore the 'failed to create input context' error.
       call remote_send(name, ":call test_ignore_error('E285') | gui -f\<CR>")
@@ -107,7 +105,10 @@
       call remote_send(name, ":gui -f\<CR>")
     endif
     " Wait for the server in the GUI to be up and answering requests.
+    " First need to wait for the GUI to start up, otherwise the send hangs in
+    " trying to send to the terminal window.
     " On some systems and with valgrind this can be very slow.
+    sleep 1
     call WaitForAssert({-> assert_match("1", remote_expr(name, "has('gui_running')", "", 1))}, 10000)
 
     call remote_send(name, ":let @* = 'maybe'\<CR>")
diff -Nru vim-8.2.1913/src/testdir/test_regexp_latin.vim vim-8.2.2434/src/testdir/test_regexp_latin.vim
--- vim-8.2.1913/src/testdir/test_regexp_latin.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_regexp_latin.vim	2021-01-30 22:05:11.000000000 +0000
@@ -911,6 +911,13 @@
   bwipe!
 endfunc
 
+func Test_ze_before_zs()
+  call assert_equal('', matchstr(' ', '\%#=1\ze \zs'))
+  call assert_equal('', matchstr(' ', '\%#=2\ze \zs'))
+  call assert_equal(repeat([''], 10), matchlist(' ', '\%#=1\ze \zs'))
+  call assert_equal(repeat([''], 10), matchlist(' ', '\%#=2\ze \zs'))
+endfunc
+
 " Check for detecting error
 func Test_regexp_error()
   call assert_fails("call matchlist('x x', '\\%#=1 \\zs*')", 'E888:')
diff -Nru vim-8.2.1913/src/testdir/test_regexp_utf8.vim vim-8.2.2434/src/testdir/test_regexp_utf8.vim
--- vim-8.2.1913/src/testdir/test_regexp_utf8.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_regexp_utf8.vim	2021-01-30 22:05:11.000000000 +0000
@@ -501,4 +501,61 @@
   close!
 endfunc
 
+" Check that "^" matches even when the line starts with a combining char
+func Test_match_start_of_line_combining()
+  new
+  call setline(1, ['', "\u05ae", ''])
+  exe "normal gg/^\<CR>"
+  call assert_equal(2, getcurpos()[1])
+  bwipe!
+endfunc
+
+" Check that [[:upper:]] matches for automatic engine
+func Test_match_char_class_upper()
+  new
+  let _engine=&regexpengine
+
+  " Test 1: [[:upper:]]\{2,\}
+  set regexpengine=0
+  call setline(1, ['05. ПЕС�Я О ГЕРОЯХ муз. �. Давиденко, М. Ковал� и Б. Шехтера ...', '05. PJESNJA O GJEROJAKH mus. A. Davidjenko, M. Kovalja i B. Shjekhtjera ...'])
+  call cursor(1,1)
+  let search_cmd='norm /\<[[:upper:]]\{2,\}\>' .. "\<CR>"
+  exe search_cmd
+  call assert_equal(4, searchcount().total, 'TEST 1')
+  set regexpengine=1
+  exe search_cmd
+  call assert_equal(2, searchcount().total, 'TEST 1')
+  set regexpengine=2
+  exe search_cmd
+  call assert_equal(4, searchcount().total, 'TEST 1')
+
+  " Test 2: [[:upper:]].\+
+  let search_cmd='norm /\<[[:upper:]].\+\>' .. "\<CR>"
+  set regexpengine=0
+  exe search_cmd
+  call assert_equal(2, searchcount().total, 'TEST 2')
+  set regexpengine=1
+  exe search_cmd
+  call assert_equal(1, searchcount().total, 'TEST 2')
+  set regexpengine=2
+  exe search_cmd
+  call assert_equal(2, searchcount().total, 'TEST 2')
+
+  " Test 3: [[:lower:]]\+
+  let search_cmd='norm /\<[[:lower:]]\+\>' .. "\<CR>"
+  set regexpengine=0
+  exe search_cmd
+  call assert_equal(4, searchcount().total, 'TEST 3 lower')
+  set regexpengine=1
+  exe search_cmd
+  call assert_equal(2, searchcount().total, 'TEST 3 lower')
+  set regexpengine=2
+  exe search_cmd
+  call assert_equal(4, searchcount().total, 'TEST 3 lower')
+
+  " clean up
+  let &regexpengine=_engine
+  bwipe!
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff -Nru vim-8.2.1913/src/testdir/test_registers.vim vim-8.2.2434/src/testdir/test_registers.vim
--- vim-8.2.1913/src/testdir/test_registers.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_registers.vim	2021-01-30 22:05:11.000000000 +0000
@@ -698,4 +698,15 @@
   bwipe!
 endfunc
 
+func Test_insert_small_delete()
+  new
+  call setline(1, ['foo foobar bar'])
+  call cursor(1,1)
+  exe ":norm! ciw'\<C-R>-'"
+  call assert_equal("'foo' foobar bar", getline(1))
+  exe ":norm! w.w."
+  call assert_equal("'foo' 'foobar' 'bar'", getline(1))
+  bwipe!
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff -Nru vim-8.2.1913/src/testdir/test_search.vim vim-8.2.2434/src/testdir/test_search.vim
--- vim-8.2.1913/src/testdir/test_search.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_search.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1776,4 +1776,65 @@
   close!
 endfunc
 
+func Test_incsearch_highlighting_newline()
+  CheckRunVimInTerminal
+  CheckOption incsearch
+  CheckScreendump
+  new
+  call test_override("char_avail", 1)
+
+  let commands =<< trim [CODE]
+    set incsearch nohls
+    call setline(1, ['test', 'xxx'])
+  [CODE]
+  call writefile(commands, 'Xincsearch_nl')
+  let buf = RunVimInTerminal('-S Xincsearch_nl', {'rows': 5, 'cols': 10})
+  call term_sendkeys(buf, '/test')
+  call VerifyScreenDump(buf, 'Test_incsearch_newline1', {})
+  " Need to send one key at a time to force a redraw
+  call term_sendkeys(buf, '\n')
+  call VerifyScreenDump(buf, 'Test_incsearch_newline2', {})
+  call term_sendkeys(buf, 'x')
+  call VerifyScreenDump(buf, 'Test_incsearch_newline3', {})
+  call term_sendkeys(buf, 'x')
+  call VerifyScreenDump(buf, 'Test_incsearch_newline4', {})
+  call term_sendkeys(buf, "\<CR>")
+  call VerifyScreenDump(buf, 'Test_incsearch_newline5', {})
+  call StopVimInTerminal(buf)
+
+  " clean up
+  call delete('Xincsearch_nl')
+  call test_override("char_avail", 0)
+  bw
+endfunc
+
+func Test_incsearch_substitute_dump2()
+  CheckOption incsearch
+  CheckScreendump
+
+  call writefile([
+	\ 'set incsearch hlsearch scrolloff=0',
+	\ 'for n in range(1, 4)',
+	\ '  call setline(n, "foo " . n)',
+	\ 'endfor',
+	\ 'call setline(5, "abc|def")',
+	\ '3',
+	\ ], 'Xis_subst_script2')
+  let buf = RunVimInTerminal('-S Xis_subst_script2', {'rows': 9, 'cols': 70})
+
+  call term_sendkeys(buf, ':%s/\vabc|')
+  sleep 100m
+  call VerifyScreenDump(buf, 'Test_incsearch_sub_01', {})
+  call term_sendkeys(buf, "\<Esc>")
+
+  " The following should not be highlighted
+  call term_sendkeys(buf, ':1,5s/\v|')
+  sleep 100m
+  call VerifyScreenDump(buf, 'Test_incsearch_sub_02', {})
+
+
+  call StopVimInTerminal(buf)
+  call delete('Xis_subst_script2')
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff -Nru vim-8.2.1913/src/testdir/test_signals.vim vim-8.2.2434/src/testdir/test_signals.vim
--- vim-8.2.1913/src/testdir/test_signals.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_signals.vim	2021-01-30 22:05:11.000000000 +0000
@@ -85,8 +85,8 @@
     throw 'Skipped: INT signal not supported'
   endif
 
-  " Skip the rest of the test when running with valgrind as signal INT is not
-  " received somehow by Vim when running with valgrind.
+  " Skip the test when running with valgrind as signal INT is not received
+  " somehow by Vim when running with valgrind.
   let cmd = GetVimCommand()
   if cmd =~ 'valgrind'
     throw 'Skipped: cannot test signal INT with valgrind'
@@ -119,10 +119,6 @@
     throw 'Skipped: TERM signal not supported'
   endif
   CheckRunVimInTerminal
-  let cmd = GetVimCommand()
-  if cmd =~ 'valgrind'
-    throw 'Skipped: cannot test signal TERM with valgrind'
-  endif
 
   " If test fails once, it can leave temporary files and trying to rerun
   " the test would then fail again if they are not deleted first.
@@ -153,8 +149,7 @@
   call assert_equal(['foo'], getline(1, '$'))
 
   let result = readfile('XautoOut')
-  call assert_match('VimLeavePre triggered', result[0])
-  call assert_match('VimLeave triggered', result[1])
+  call assert_equal(["VimLeavePre triggered", "VimLeave triggered"], result)
 
   %bwipe!
   call delete('.Xsig_TERM.swp')
diff -Nru vim-8.2.1913/src/testdir/test_sleep.vim vim-8.2.2434/src/testdir/test_sleep.vim
--- vim-8.2.1913/src/testdir/test_sleep.vim	1970-01-01 00:00:00.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_sleep.vim	2021-01-30 22:05:11.000000000 +0000
@@ -0,0 +1,26 @@
+" Test for sleep and sleep! commands
+
+func! s:get_time_ms()
+  let timestr = reltimestr(reltime())
+  let dotidx = stridx(timestr, '.')
+  let sec = str2nr(timestr[:dotidx])
+  let msec = str2nr(timestr[dotidx + 1:])
+  return (sec * 1000) + (msec / 1000)
+endfunc
+
+func! s:assert_takes_longer(cmd, time_ms)
+  let start = s:get_time_ms()
+  execute a:cmd
+  let end = s:get_time_ms()
+  call assert_true(end - start >=# a:time_ms)
+endfun
+
+func! Test_sleep_bang()
+  call s:assert_takes_longer('sleep 50m', 50)
+  call s:assert_takes_longer('sleep! 50m', 50)
+  call s:assert_takes_longer('sl 50m', 50)
+  call s:assert_takes_longer('sl! 50m', 50)
+  call s:assert_takes_longer('1sleep', 1000)
+endfunc
+
+" vim: shiftwidth=2 sts=2 expandtab
diff -Nru vim-8.2.1913/src/testdir/test_sort.vim vim-8.2.2434/src/testdir/test_sort.vim
--- vim-8.2.1913/src/testdir/test_sort.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_sort.vim	2021-01-30 22:05:11.000000000 +0000
@@ -15,6 +15,37 @@
   " numbers compared as strings
   call assert_equal([1, 2, 3], sort([3, 2, 1]))
   call assert_equal([13, 28, 3], sort([3, 28, 13]))
+
+  call assert_equal(['A', 'O', 'P', 'a', 'o', 'p', 'Ä', 'Ô', 'ä', 'ô', 'Œ', 'œ'],
+  \            sort(['A', 'O', 'P', 'a', 'o', 'p', 'Ä', 'Ô', 'ä', 'ô', 'œ', 'Œ']))
+
+  call assert_equal(['A', 'a', 'o', 'O', 'p', 'P', 'Ä', 'Ô', 'ä', 'ô', 'Œ', 'œ'],
+  \            sort(['A', 'a', 'o', 'O', 'œ', 'Œ', 'p', 'P', 'Ä', 'ä', 'ô', 'Ô'], 'i'))
+
+  " This does not appear to work correctly on Mac.
+  if !has('mac')
+    if v:collate =~? '^\(en\|fr\)_ca.utf-\?8$'
+      " with Canadian English capitals come before lower case.
+      " 'Å’' is omitted because it can sort before or after 'Å“'
+      call assert_equal(['A', 'a', 'Ä', 'ä', 'O', 'o', 'Ô', 'ô', 'œ', 'P', 'p'],
+      \            sort(['A', 'a', 'o', 'O', 'œ', 'p', 'P', 'Ä', 'ä', 'ô', 'Ô'], 'l'))
+    elseif v:collate =~? '^\(en\|es\|de\|fr\|it\|nl\).*\.utf-\?8$'
+      " With the following locales, the accentuated letters are ordered
+      " similarly to the non-accentuated letters...
+      call assert_equal(['a', 'A', 'ä', 'Ä', 'o', 'O', 'ô', 'Ô', 'œ', 'Œ', 'p', 'P'],
+      \            sort(['A', 'a', 'o', 'O', 'œ', 'Œ', 'p', 'P', 'Ä', 'ä', 'ô', 'Ô'], 'l'))
+    elseif v:collate =~? '^sv.*utf-\?8$'
+      " ... whereas with a Swedish locale, the accentuated letters are ordered
+      " after Z.
+      call assert_equal(['a', 'A', 'o', 'O', 'p', 'P', 'ä', 'Ä', 'œ', 'œ', 'ô', 'Ô'],
+      \            sort(['A', 'a', 'o', 'O', 'œ', 'œ', 'p', 'P', 'Ä', 'ä', 'ô', 'Ô'], 'l'))
+    endif
+  endif
+endfunc
+
+func Test_sort_null_string()
+  " null strings are sorted as empty strings.
+  call assert_equal(['', 'a', 'b'], sort(['b', test_null_string(), 'a']))
 endfunc
 
 func Test_sort_numeric()
@@ -1204,6 +1235,106 @@
 	\ },
 	\ ]
 
+    " This does not appear to work correctly on Mac.
+    if !has('mac')
+      if v:collate =~? '^\(en\|fr\)_ca.utf-\?8$'
+        " en_CA.utf-8 sorts capitals before lower case
+        " 'Å’' is omitted because it can sort before or after 'Å“'
+        let tests += [
+          \ {
+          \    'name' : 'sort with locale ' .. v:collate,
+          \    'cmd' : '%sort l',
+          \    'input' : [
+          \	'A',
+          \	'E',
+          \	'O',
+          \	'À',
+          \	'È',
+          \	'É',
+          \	'Ô',
+          \	'Z',
+          \	'a',
+          \	'e',
+          \	'o',
+          \	'à',
+          \	'è',
+          \	'é',
+          \	'ô',
+          \	'Å“',
+          \	'z'
+          \    ],
+          \    'expected' : [
+          \	'A',
+          \	'a',
+          \	'À',
+          \	'à',
+          \	'E',
+          \	'e',
+          \	'É',
+          \	'é',
+          \	'È',
+          \	'è',
+          \	'O',
+          \	'o',
+          \	'Ô',
+          \	'ô',
+          \	'Å“',
+          \	'Z',
+          \	'z'
+          \    ]
+          \ },
+          \ ]
+      elseif v:collate =~? '^\(en\|es\|de\|fr\|it\|nl\).*\.utf-\?8$'
+      " With these locales, the accentuated letters are ordered
+      " similarly to the non-accentuated letters.
+        let tests += [
+          \ {
+          \    'name' : 'sort with locale ' .. v:collate,
+          \    'cmd' : '%sort l',
+          \    'input' : [
+          \	'A',
+          \	'E',
+          \	'O',
+          \	'À',
+          \	'È',
+          \	'É',
+          \	'Ô',
+          \	'Å’',
+          \	'Z',
+          \	'a',
+          \	'e',
+          \	'o',
+          \	'à',
+          \	'è',
+          \	'é',
+          \	'ô',
+          \	'Å“',
+          \	'z'
+          \    ],
+          \    'expected' : [
+          \	'a',
+          \	'A',
+          \	'à',
+          \	'À',
+          \	'e',
+          \	'E',
+          \	'é',
+          \	'É',
+          \	'è',
+          \	'È',
+          \	'o',
+          \	'O',
+          \	'ô',
+          \	'Ô',
+          \	'Å“',
+          \	'Å’',
+          \	'z',
+          \	'Z'
+          \    ]
+          \ },
+          \ ]
+    endif
+  endif
   if has('float')
     let tests += [
           \ {
@@ -1251,7 +1382,7 @@
     endif
   endfor
 
-  " Needs atleast two lines for this test
+  " Needs at least two lines for this test
   call setline(1, ['line1', 'line2'])
   call assert_fails('sort no', 'E474:')
   call assert_fails('sort c', 'E475:')
diff -Nru vim-8.2.1913/src/testdir/test_sound.vim vim-8.2.2434/src/testdir/test_sound.vim
--- vim-8.2.1913/src/testdir/test_sound.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_sound.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1,5 +1,7 @@
 " Tests for the sound feature
 
+source shared.vim
+
 if !has('sound')
   throw 'Skipped: sound feature not available'
 endif
@@ -13,6 +15,7 @@
   if has('win32')
     throw 'Skipped: Playing event with callback is not supported on Windows'
   endif
+  let g:id = 0
   let id = 'bell'->sound_playevent('PlayCallback')
   if id == 0
     throw 'Skipped: bell event not available'
@@ -20,8 +23,7 @@
   " Stop it quickly, avoid annoying the user.
   sleep 20m
   eval id->sound_stop()
-  sleep 30m
-  call assert_equal(id, g:id)
+  call WaitForAssert({-> assert_equal(id, g:id)})
   call assert_equal(1, g:result)  " sound was aborted
 endfunc
 
@@ -37,17 +39,15 @@
   " play until the end
   let id2 = fname->sound_playfile('PlayCallback')
   call assert_true(id2 > 0)
-  sleep 500m
-  call assert_equal(id2, g:id)
+  call WaitForAssert({-> assert_equal(id2, g:id)})
   call assert_equal(0, g:result)
 
   let id2 = sound_playfile(fname, 'PlayCallback')
   call assert_true(id2 > 0)
   sleep 20m
   call sound_clear()
-  sleep 30m
-  call assert_equal(id2, g:id)
-  call assert_equal(1, g:result)
+  call WaitForAssert({-> assert_equal(id2, g:id)})
+  call assert_equal(1, g:result)  " sound was aborted
 
   " recursive use was causing a crash
   func PlayAgain(id, fname)
@@ -59,8 +59,7 @@
   call assert_true(id3 > 0)
   sleep 50m
   call sound_clear()
-  sleep 30m
-  call assert_true(g:id_again > 0)
+  call WaitForAssert({-> assert_true(g:id > 0)})
 endfunc
 
 " vim: shiftwidth=2 sts=2 expandtab
diff -Nru vim-8.2.1913/src/testdir/test_startup.vim vim-8.2.2434/src/testdir/test_startup.vim
--- vim-8.2.1913/src/testdir/test_startup.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_startup.vim	2021-01-30 22:05:11.000000000 +0000
@@ -741,6 +741,53 @@
   call delete('Xfile1')
 endfunc
 
+" Test the '-T' argument which sets the 'term' option.
+func Test_T_arg()
+  CheckNotGui
+  let after =<< trim [CODE]
+    call writefile([&term], "Xtest_T_arg")
+    qall
+  [CODE]
+
+  for t in ['builtin_dumb', 'builtin_ansi']
+    if RunVim([], after, '-T ' .. t)
+      let lines = readfile('Xtest_T_arg')
+      call assert_equal([t], lines)
+    endif
+  endfor
+
+  call delete('Xtest_T_arg')
+endfunc
+
+" Test the '-x' argument to read/write encrypted files.
+func Test_x_arg()
+  CheckRunVimInTerminal
+  CheckFeature cryptv
+
+  " Create an encrypted file Xtest_x_arg.
+  let buf = RunVimInTerminal('-n -x Xtest_x_arg', #{rows: 10, wait_for_ruler: 0})
+  call WaitForAssert({-> assert_match('^Enter encryption key: ', term_getline(buf, 10))})
+  call term_sendkeys(buf, "foo\n")
+  call WaitForAssert({-> assert_match('^Enter same key again: ', term_getline(buf, 10))})
+  call term_sendkeys(buf, "foo\n")
+  call WaitForAssert({-> assert_match(' All$', term_getline(buf, 10))})
+  call term_sendkeys(buf, "itest\<Esc>:w\<Enter>")
+  call WaitForAssert({-> assert_match('"Xtest_x_arg" \[New\]\[blowfish2\] 1L, 5B written',
+        \            term_getline(buf, 10))})
+  call StopVimInTerminal(buf)
+
+  " Read the encrypted file and check that it contains the expected content "test"
+  let buf = RunVimInTerminal('-n -x Xtest_x_arg', #{rows: 10, wait_for_ruler: 0})
+  call WaitForAssert({-> assert_match('^Enter encryption key: ', term_getline(buf, 10))})
+  call term_sendkeys(buf, "foo\n")
+  call WaitForAssert({-> assert_match('^Enter same key again: ', term_getline(buf, 10))})
+  call term_sendkeys(buf, "foo\n")
+  call WaitForAssert({-> assert_match('^test', term_getline(buf, 1))})
+  call StopVimInTerminal(buf)
+
+  call delete('Xtest_x_arg')
+endfunc
+
 " Test for entering the insert mode on startup
 func Test_start_insertmode()
   let before =<< trim [CODE]
@@ -955,4 +1002,80 @@
   call assert_match('^Too many edit arguments: "-"', l[1])
 endfunc
 
+" Test starting vim with various names: vim, ex, view, evim, etc.
+func Test_progname()
+  CheckUnix
+
+  call mkdir('Xprogname', 'p')
+  call writefile(['silent !date',
+  \               'call writefile([mode(1), '
+  \               .. '&insertmode, &diff, &readonly, &updatecount, '
+  \               .. 'join(split(execute("message"), "\n")[1:])], "Xprogname_out")',
+  \               'qall'], 'Xprogname_after')
+
+  "  +---------------------------------------------- progname
+  "  |            +--------------------------------- mode(1)
+  "  |            |     +--------------------------- &insertmode
+  "  |            |     |    +---------------------- &diff
+  "  |            |     |    |    +----------------- &readonly
+  "  |            |     |    |    |        +-------- &updatecount
+  "  |            |     |    |    |        |    +--- :messages
+  "  |            |     |    |    |        |    |
+  let expectations = {
+  \ 'vim':      ['n',  '0', '0', '0',   '200', ''],
+  \ 'gvim':     ['n',  '0', '0', '0',   '200', ''],
+  \ 'ex':       ['ce', '0', '0', '0',   '200', ''],
+  \ 'exim':     ['cv', '0', '0', '0',   '200', ''],
+  \ 'view':     ['n',  '0', '0', '1', '10000', ''],
+  \ 'gview':    ['n',  '0', '0', '1', '10000', ''],
+  \ 'evim':     ['n',  '1', '0', '0',   '200', ''],
+  \ 'eview':    ['n',  '1', '0', '1', '10000', ''],
+  \ 'rvim':     ['n',  '0', '0', '0',   '200', 'line    1: E145: Shell commands and some functionality not allowed in rvim'],
+  \ 'rgvim':    ['n',  '0', '0', '0',   '200', 'line    1: E145: Shell commands and some functionality not allowed in rvim'],
+  \ 'rview':    ['n',  '0', '0', '1', '10000', 'line    1: E145: Shell commands and some functionality not allowed in rvim'],
+  \ 'rgview':   ['n',  '0', '0', '1', '10000', 'line    1: E145: Shell commands and some functionality not allowed in rvim'],
+  \ 'vimdiff':  ['n',  '0', '1', '0',   '200', ''],
+  \ 'gvimdiff': ['n',  '0', '1', '0',   '200', '']}
+
+  let prognames = ['vim', 'gvim', 'ex', 'exim', 'view', 'gview',
+  \                'evim', 'eview', 'rvim', 'rgvim', 'rview', 'rgview',
+  \                'vimdiff', 'gvimdiff']
+
+  for progname in prognames
+    if empty($DISPLAY)
+      if progname =~# 'g'
+        " Can't run gvim, gview (etc.) if $DISPLAY is not setup.
+        continue
+      endif
+      if has('gui') && (progname ==# 'evim' || progname ==# 'eview')
+        " evim or eview will start the GUI if there is gui support.
+        " So don't try to start them either if $DISPLAY is not setup.
+        continue
+      endif
+    endif
+
+    exe 'silent !ln -s -f ' ..exepath(GetVimProg()) .. ' Xprogname/' .. progname
+
+    let stdout_stderr = ''
+    if progname =~# 'g'
+      let stdout_stderr = system('Xprogname/'..progname..' -f --clean --not-a-term -S Xprogname_after')
+    else
+      exe 'sil !Xprogname/'..progname..' -f --clean --not-a-term -S Xprogname_after'
+    endif
+
+    if progname =~# 'g' && !has('gui')
+      call assert_equal("E25: GUI cannot be used: Not enabled at compile time\n", stdout_stderr, progname)
+    else
+      call assert_equal('', stdout_stderr, progname)
+      call assert_equal(expectations[progname], readfile('Xprogname_out'), progname)
+    endif
+
+    call delete('Xprogname/' .. progname)
+    call delete('Xprogname_out')
+  endfor
+
+  call delete('Xprogname_after')
+  call delete('Xprogname', 'd')
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff -Nru vim-8.2.1913/src/testdir/test_suspend.vim vim-8.2.2434/src/testdir/test_suspend.vim
--- vim-8.2.1913/src/testdir/test_suspend.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_suspend.vim	2021-01-30 22:05:11.000000000 +0000
@@ -61,4 +61,48 @@
   call delete('Xfoo')
 endfunc
 
+func Test_suspend_autocmd()
+  CheckFeature terminal
+  CheckExecutable /bin/sh
+
+  let buf = term_start('/bin/sh', #{term_rows: 6})
+  " Wait for shell prompt.
+  call WaitForAssert({-> assert_match('[$#] $', term_getline(buf, '.'))})
+
+  call term_sendkeys(buf, v:progpath
+        \               . " --clean -X"
+        \               . " -c 'set nu'"
+        \               . " -c 'let g:count = 0'"
+        \               . " -c 'au VimSuspend * let g:count += 1'"
+        \               . " -c 'au VimResume * let g:count += 1'"
+        \               . " -c 'call setline(1, \"foo\")'"
+        \               . " Xfoo\<CR>")
+  " Cursor in terminal buffer should be on first line in spawned vim.
+  call WaitForAssert({-> assert_equal('  1 foo', term_getline(buf, '.'))})
+
+  for suspend_cmd in [":suspend\<CR>",
+        \             ":stop\<CR>",
+        \             ":suspend!\<CR>",
+        \             ":stop!\<CR>",
+        \             "\<C-Z>"]
+    " Suspend and wait for shell prompt.  Then "fg" will restore Vim.
+    call term_sendkeys(buf, suspend_cmd)
+    call CheckSuspended(buf, 0)
+  endfor
+
+  call term_sendkeys(buf, ":echo g:count\<CR>")
+  call TermWait(buf)
+  call WaitForAssert({-> assert_match('^10', term_getline(buf, 6))})
+
+  " Quit gracefully to dump coverage information.
+  call term_sendkeys(buf, ":qall!\<CR>")
+  call TermWait(buf)
+  " Wait until Vim actually exited and shell shows a prompt
+  call WaitForAssert({-> assert_match('[$#] $', term_getline(buf, '.'))})
+  call StopShellInTerminal(buf)
+
+  exe buf . 'bwipe!'
+  call delete('Xfoo')
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff -Nru vim-8.2.1913/src/testdir/test_swap.vim vim-8.2.2434/src/testdir/test_swap.vim
--- vim-8.2.1913/src/testdir/test_swap.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_swap.vim	2021-01-30 22:05:11.000000000 +0000
@@ -403,4 +403,84 @@
   call delete('Xswapdir', 'rf')
 endfunc
 
+func s:get_unused_pid(base)
+  if has('job')
+    " Execute 'echo' as a temporary job, and return its pid as an unused pid.
+    if has('win32')
+      let cmd = 'cmd /c echo'
+    else
+      let cmd = 'echo'
+    endif
+    let j = job_start(cmd)
+    while job_status(j) ==# 'run'
+      sleep 10m
+    endwhile
+    if job_status(j) ==# 'dead'
+      return job_info(j).process
+    endif
+  endif
+  " Must add four for MS-Windows to see it as a different one.
+  return a:base + 4
+endfunc
+
+func s:blob_to_pid(b)
+  return a:b[3] * 16777216 + a:b[2] * 65536 + a:b[1] * 256 + a:b[0]
+endfunc
+
+func s:pid_to_blob(i)
+  let b = 0z
+  let b[0] = and(a:i, 0xff)
+  let b[1] = and(a:i / 256, 0xff)
+  let b[2] = and(a:i / 65536, 0xff)
+  let b[3] = and(a:i / 16777216, 0xff)
+  return b
+endfunc
+
+func Test_swap_auto_delete()
+  " Create a valid swapfile by editing a file with a special extension.
+  split Xtest.scr
+  call setline(1, ['one', 'two', 'three'])
+  write  " file is written, not modified
+  write  " write again to make sure the swapfile is created
+  " read the swapfile as a Blob
+  let swapfile_name = swapname('%')
+  let swapfile_bytes = readfile(swapfile_name, 'B')
+
+  " Forget about the file, recreate the swap file, then edit it again.  The
+  " swap file should be automatically deleted.
+  bwipe!
+  " Change the process ID to avoid the "still running" warning.
+  let swapfile_bytes[24:27] = s:pid_to_blob(s:get_unused_pid(
+        \ s:blob_to_pid(swapfile_bytes[24:27])))
+  call writefile(swapfile_bytes, swapfile_name)
+  edit Xtest.scr
+  " will end up using the same swap file after deleting the existing one
+  call assert_equal(swapfile_name, swapname('%'))
+  bwipe!
+
+  " create the swap file again, but change the host name so that it won't be
+  " deleted
+  autocmd! SwapExists
+  augroup test_swap_recover_ext
+    autocmd!
+    autocmd SwapExists * let v:swapchoice = 'e'
+  augroup END
+
+  " change the host name
+  let swapfile_bytes[28 + 40] = swapfile_bytes[28 + 40] + 2
+  call writefile(swapfile_bytes, swapfile_name)
+  edit Xtest.scr
+  call assert_equal(1, filereadable(swapfile_name))
+  " will use another same swap file name
+  call assert_notequal(swapfile_name, swapname('%'))
+  bwipe!
+
+  call delete('Xtest.scr')
+  call delete(swapfile_name)
+  augroup test_swap_recover_ext
+    autocmd!
+  augroup END
+  augroup! test_swap_recover_ext
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff -Nru vim-8.2.1913/src/testdir/test_syntax.vim vim-8.2.2434/src/testdir/test_syntax.vim
--- vim-8.2.1913/src/testdir/test_syntax.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_syntax.vim	2021-01-30 22:05:11.000000000 +0000
@@ -27,6 +27,26 @@
   return c
 endfunc
 
+func AssertHighlightGroups(lnum, startcol, expected, trans = 1, msg = "")
+  " Assert that the characters starting at a given (line, col)
+  " sequentially match the expected highlight groups.
+  " If groups are provided as a string, each character is assumed to be a
+  " group and spaces represent no group, useful for visually describing tests.
+  let l:expectedGroups = type(a:expected) == v:t_string
+        \ ? a:expected->split('\zs')->map({_, v -> trim(v)})
+        \ : a:expected
+  let l:errors = 0
+  let l:msg = (a:msg->empty() ? "" : a:msg .. ": ")
+        \ .. "Wrong highlight group at " .. a:lnum .. ","
+
+  for l:i in range(a:startcol, a:startcol + l:expectedGroups->len() - 1)
+    let l:errors += synID(a:lnum, l:i, a:trans)
+          \ ->synIDattr("name")
+          \ ->assert_equal(l:expectedGroups[l:i - 1],
+          \    l:msg .. l:i)
+  endfor
+endfunc
+
 func Test_syn_iskeyword()
   new
   call setline(1, [
@@ -316,6 +336,8 @@
     syn sync ccomment
   endif
   call assert_notmatch('on C-style comments', execute('syntax sync'))
+  syn sync fromstart
+  call assert_match('syncing starts at the first line', execute('syntax sync'))
 
   syn clear
 endfunc
@@ -735,6 +757,7 @@
   redir END
   call assert_equal("\nsyntax foldlevel start", @c)
   syn sync fromstart
+  call assert_match('from the first line$', execute('syn sync'))
   let a = map(range(3,9), 'foldclosed(v:val)')
   call assert_equal([3,3,3,3,3,3,3], a) " attached cascade folds together
   let a = map(range(10,15), 'foldclosed(v:val)')
@@ -821,4 +844,80 @@
   bwipe!
 endfunc
 
+func Test_syn_contained_transparent()
+  " Comments starting with "Regression:" show the result when the highlighting
+  " span of the containing item is assigned to the contained region.
+  syntax on
+
+  let l:case = "Transparent region contained in region"
+  new
+  syntax region X start=/\[/ end=/\]/ contained transparent
+  syntax region Y start=/(/ end=/)/ contains=X
+
+  call setline(1,  "==(--[~~]--)==")
+  let l:expected = "  YYYYYYYYYY  "
+  eval AssertHighlightGroups(1, 1, l:expected, 1, l:case)
+  syntax clear Y X
+  bw!
+
+  let l:case = "Transparent region extends region"
+  new
+  syntax region X start=/\[/ end=/\]/ contained transparent
+  syntax region Y start=/(/ end=/)/ end=/e/ contains=X
+
+  call setline(1,  "==(--[~~e~~]--)==")
+  let l:expected = "  YYYYYYYYYYYYY  "
+  " Regression:    "  YYYYYYY   YYY  "
+  eval AssertHighlightGroups(1, 1, l:expected, 1, l:case)
+  syntax clear Y X
+  bw!
+
+  let l:case = "Nested transparent regions extend region"
+  new
+  syntax region X start=/\[/ end=/\]/ contained transparent
+  syntax region Y start=/(/ end=/)/ end=/e/ contains=X
+
+  call setline(1,  "==(--[~~e~~[~~e~~]~~e~~]--)==")
+  let l:expected = "  YYYYYYYYYYYYYYYYYYYYYYYYY  "
+  " Regression:    "  YYYYYYY         YYYYYYYYY  "
+  eval AssertHighlightGroups(1, 1, l:expected, 1, l:case)
+  syntax clear Y X
+  bw!
+
+  let l:case = "Transparent region contained in match"
+  new
+  syntax region X start=/\[/ end=/\]/ contained transparent
+  syntax match Y /(.\{-})/ contains=X
+
+  call setline(1,  "==(--[~~]--)==")
+  let l:expected = "  YYYYYYYYYY  "
+  eval AssertHighlightGroups(1, 1, l:expected, 1, l:case)
+  syntax clear Y X
+  bw!
+
+  let l:case = "Transparent region extends match"
+  new
+  syntax region X start=/\[/ end=/\]/ contained transparent
+  syntax match Y /(.\{-}[e)]/ contains=X
+
+  call setline(1,  "==(--[~~e~~]--)==")
+  let l:expected = "  YYYYYYYYYY     "
+  " Regression:    "  YYYYYYY        "
+  eval AssertHighlightGroups(1, 1, l:expected, 1, l:case)
+  syntax clear Y X
+  bw!
+
+  let l:case = "Nested transparent regions extend match"
+  new
+  syntax region X start=/\[/ end=/\]/ contained transparent
+  syntax match Y /(.\{-}[e)]/ contains=X
+
+  call setline(1,  "==(--[~~e~~[~~e~~]~~e~~]--)==")
+  let l:expected = "  YYYYYYYYYYYYYYYYYYYYYY     "
+  " Regression:    "  YYYYYYY         YYYYYY     "
+  eval AssertHighlightGroups(1, 1, l:expected, 1, l:case)
+  syntax clear Y X
+  bw!
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff -Nru vim-8.2.1913/src/testdir/test_tabpage.vim vim-8.2.2434/src/testdir/test_tabpage.vim
--- vim-8.2.1913/src/testdir/test_tabpage.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_tabpage.vim	2021-01-30 22:05:11.000000000 +0000
@@ -617,6 +617,8 @@
 
 " Test for closing the tab page from a command window
 func Test_tabpage_close_cmdwin()
+  CheckFeature cmdwin
+
   tabnew
   call feedkeys("q/:tabclose\<CR>\<Esc>", 'xt')
   call assert_equal(2, tabpagenr('$'))
diff -Nru vim-8.2.1913/src/testdir/test_termcodes.vim vim-8.2.2434/src/testdir/test_termcodes.vim
--- vim-8.2.1913/src/testdir/test_termcodes.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_termcodes.vim	2021-01-30 22:05:11.000000000 +0000
@@ -367,6 +367,8 @@
 
 " Test for using the mouse to increaes the height of the cmdline window
 func Test_mouse_cmdwin_resize()
+  CheckFeature cmdwin
+
   let save_mouse = &mouse
   let save_term = &term
   let save_ttymouse = &ttymouse
@@ -851,7 +853,10 @@
   let save_term = &term
   let save_ttymouse = &ttymouse
   call test_override('no_query_mouse', 1)
-  set mouse=a term=xterm mousetime=200
+  
+  " 'mousetime' must be sufficiently large, or else the test is flaky when
+  " using a ssh connection with X forwarding; i.e. ssh -X (issue #7563).
+  set mouse=a term=xterm mousetime=600
   new
 
   for ttymouse_val in g:Ttymouse_values + g:Ttymouse_dec
@@ -1863,6 +1868,34 @@
   call test_override('term_props', 0)
 endfunc
 
+func Test_focus_events()
+  let save_term = &term
+  let save_ttymouse = &ttymouse
+  set term=xterm ttymouse=xterm2
+
+  au FocusGained * let g:focus_gained += 1
+  au FocusLost * let g:focus_lost += 1
+  let g:focus_gained = 0
+  let g:focus_lost = 0
+
+  call feedkeys("\<Esc>[O", "Lx!")
+  call assert_equal(1, g:focus_lost)
+  call feedkeys("\<Esc>[I", "Lx!")
+  call assert_equal(1, g:focus_gained)
+
+  " still works when 'ttymouse' is empty
+  set ttymouse=
+  call feedkeys("\<Esc>[O", "Lx!")
+  call assert_equal(2, g:focus_lost)
+  call feedkeys("\<Esc>[I", "Lx!")
+  call assert_equal(2, g:focus_gained)
+
+  au! FocusGained
+  au! FocusLost
+  let &term = save_term
+  let &ttymouse = save_ttymouse
+endfunc
+
 func Test_get_termcode()
   try
     let k1 = &t_k1
@@ -1896,14 +1929,14 @@
 
 func Test_list_builtin_terminals()
   CheckRunVimInTerminal
-  let buf = RunVimInTerminal('', #{rows: 14})
-  call term_sendkeys(buf, ":set cmdheight=3\<CR>")
-  call TermWait(buf, 100)
-  call term_sendkeys(buf, ":set term=xxx\<CR>")
-  call TermWait(buf, 100)
-  call assert_match('builtin_dumb', term_getline(buf, 11))
-  call assert_match('Not found in termcap', term_getline(buf, 12))
-  call StopVimInTerminal(buf)
+  call RunVimInTerminal('', #{rows: 14})
+  call term_sendkeys('', ":set cmdheight=3\<CR>")
+  call TermWait('', 100)
+  call term_sendkeys('', ":set term=xxx\<CR>")
+  call TermWait('', 100)
+  call assert_match('builtin_dumb', term_getline('', 11))
+  call assert_match('Not found in termcap', term_getline('', 12))
+  call StopVimInTerminal('')
 endfunc
 
 func GetEscCodeCSI27(key, modifier)
@@ -1966,6 +1999,16 @@
   bwipe aaa
   bwipe bbb
 
+  " Ctrl-V X 33 is 3
+  call setline(1, '')
+  call feedkeys("a\<C-V>" .. a:func('X', 2) .. "33\<Esc>", 'Lx!')
+  call assert_equal("3", getline(1))
+
+  " Ctrl-V U 12345 is Unicode 12345
+  call setline(1, '')
+  call feedkeys("a\<C-V>" .. a:func('U', 2) .. "12345\<Esc>", 'Lx!')
+  call assert_equal("\U12345", getline(1))
+
   bwipe!
   set timeoutlen&
 endfunc
@@ -2029,6 +2072,23 @@
   set timeoutlen&
 endfunc
 
+" Whether Shift-Tab sends "ESC [ Z" or "ESC [ 27 ; 2 ; 9 ~" is unpredictable,
+" both should work.
+func Test_modifyOtherKeys_shift_tab()
+  set timeoutlen=10
+
+  call setline(1, '')
+  call feedkeys("a\<C-K>" .. GetEscCodeCSI27("\t", '2') .. "\<Esc>", 'Lx!')
+  eval getline(1)->assert_equal('<S-Tab>')
+
+  call setline(1, '')
+  call feedkeys("a\<C-K>\<Esc>[Z\<Esc>", 'Lx!')
+  eval getline(1)->assert_equal('<S-Tab>')
+
+  set timeoutlen&
+  bwipe!
+endfunc
+
 func RunTest_mapping_works_with_shift(func)
   new
   set timeoutlen=10
@@ -2229,7 +2289,7 @@
 endfunc
 
 " Test for translation of special key codes (<xF1>, <xF2>, etc.)
-func Test_Keycode_Tranlsation()
+func Test_Keycode_Translation()
   let keycodes = [
         \ ["<xUp>", "<Up>"],
         \ ["<xDown>", "<Down>"],
diff -Nru vim-8.2.1913/src/testdir/test_terminal2.vim vim-8.2.2434/src/testdir/test_terminal2.vim
--- vim-8.2.1913/src/testdir/test_terminal2.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_terminal2.vim	2021-01-30 22:05:11.000000000 +0000
@@ -287,7 +287,7 @@
   unlet g:job
 endfunc
 
-" TODO: reenable when this no longer hangs on Travis
+" TODO: re-enable when this no longer hangs on Travis
 "func Test_zz2_terminal_guioptions_bang()
 "  CheckGui
 "  set guioptions+=!
@@ -338,7 +338,7 @@
   let bnr = bufnr('$')
   call WaitForAssert({-> assert_equal('running', term_getstatus(bnr))})
   " In the GUI the first switch sometimes doesn't work.  Switch twice to avoid
-  " flakyness.
+  " flakiness.
   call feedkeys("\<C-W>N", 'xt')
   call feedkeys("A", 'xt')
   call WaitForAssert({-> assert_equal('running', term_getstatus(bnr))})
diff -Nru vim-8.2.1913/src/testdir/test_terminal3.vim vim-8.2.2434/src/testdir/test_terminal3.vim
--- vim-8.2.1913/src/testdir/test_terminal3.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_terminal3.vim	2021-01-30 22:05:11.000000000 +0000
@@ -101,7 +101,7 @@
   let buf = RunVimInTerminal('-S XtermPopup', #{rows: 15})
   call TermWait(buf, 100)
   call term_sendkeys(buf, ":call OpenTerm(0)\<CR>")
-  call TermWait(buf, 100)
+  call TermWait(buf, 500)
   call term_sendkeys(buf, ":\<CR>")
   call TermWait(buf, 100)
   call term_sendkeys(buf, "\<C-W>:echo getwinvar(g:winid, \"&buftype\") win_gettype(g:winid)\<CR>")
@@ -111,7 +111,7 @@
   call VerifyScreenDump(buf, 'Test_terminal_popup_2', {})
  
   call term_sendkeys(buf, ":call OpenTerm(1)\<CR>")
-  call TermWait(buf, 150)
+  call TermWait(buf, 500)
   call term_sendkeys(buf, ":set hlsearch\<CR>")
   call TermWait(buf, 100)
   call term_sendkeys(buf, "/edit\<CR>")
@@ -138,14 +138,14 @@
 
   call TermWait(buf, 50)
   call term_sendkeys(buf, ":q\<CR>")
-  call TermWait(buf, 150)  " wait for terminal to vanish
+  call TermWait(buf, 250)  " wait for terminal to vanish
 
   call StopVimInTerminal(buf)
   call delete('Xtext')
   call delete('XtermPopup')
 endfunc
 
-" Check a terminal in popup window uses the default mininum size.
+" Check a terminal in popup window uses the default minimum size.
 func Test_terminal_in_popup_min_size()
   CheckRunVimInTerminal
 
@@ -309,6 +309,7 @@
 
   let buf = RunVimInTerminal('', {})
   call term_sendkeys(buf, ":set nocompatible\<CR>")
+  call term_sendkeys(buf, ":set timeoutlen=20\<CR>")
 
   let keys = ["\<F1>", "\<F2>", "\<F3>", "\<F4>", "\<F5>", "\<F6>", "\<F7>",
         \ "\<F8>", "\<F9>", "\<F10>", "\<F11>", "\<F12>", "\<Home>",
@@ -325,7 +326,7 @@
   call term_sendkeys(buf, "i")
   for i in range(len(keys))
     call term_sendkeys(buf, "\<C-U>\<C-K>" .. keys[i])
-    call WaitForAssert({-> assert_equal(output[i], term_getline(buf, 1))})
+    call WaitForAssert({-> assert_equal(output[i], term_getline(buf, 1))}, 200)
   endfor
 
   let keypad_keys = ["\<k0>", "\<k1>", "\<k2>", "\<k3>", "\<k4>", "\<k5>",
@@ -340,7 +341,7 @@
       continue
     endif
     call term_sendkeys(buf, "\<C-U>" .. keypad_keys[i])
-    call WaitForAssert({-> assert_equal(keypad_output[i], term_getline(buf, 1))})
+    call WaitForAssert({-> assert_equal(keypad_output[i], term_getline(buf, 1))}, 100)
   endfor
 
   call feedkeys("\<C-U>\<kEnter>\<BS>one\<C-W>.two", 'xt')
@@ -560,7 +561,6 @@
   call TermWait(buf)
   call term_sendkeys(buf, ":q\<CR>")
   call StopVimInTerminal(buf)
-  exe buf . 'bwipe!'
   set splitright&
   only!
 endfunc
diff -Nru vim-8.2.1913/src/testdir/test_terminal.vim vim-8.2.2434/src/testdir/test_terminal.vim
--- vim-8.2.1913/src/testdir/test_terminal.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_terminal.vim	2021-01-30 22:05:11.000000000 +0000
@@ -41,6 +41,16 @@
   unlet g:job
 endfunc
 
+func Test_terminal_no_name()
+  let buf = Run_shell_in_terminal({})
+  call assert_match('^!', bufname(buf))
+  0file
+  call assert_equal("", bufname(buf))
+  call assert_match('\[No Name\]', execute('file'))
+  call StopShellInTerminal(buf)
+  call TermWait(buf)
+endfunc
+
 func Test_terminal_TerminalWinOpen()
   au TerminalWinOpen * let b:done = 'yes'
   let buf = Run_shell_in_terminal({})
@@ -65,7 +75,7 @@
 
   setlocal modifiable
   exe "normal Axxx\<Esc>"
-  call assert_fails(buf . 'bwipe', ['E89:', 'E517:'])
+  call assert_fails(buf . 'bwipe', 'E89:')
   undo
 
   exe buf . 'bwipe'
@@ -89,7 +99,7 @@
 
 func Test_terminal_wipe_buffer()
   let buf = Run_shell_in_terminal({})
-  call assert_fails(buf . 'bwipe', ['E89:', 'E517:'])
+  call assert_fails(buf . 'bwipe', 'E89:')
   exe buf . 'bwipe!'
   call WaitForAssert({-> assert_equal('dead', job_status(g:job))})
   call assert_equal("", bufname(buf))
@@ -113,7 +123,7 @@
   unlet g:job
 endfunc
 
-func Test_terminal_hide_buffer()
+func Test_terminal_hide_buffer_job_running()
   let buf = Run_shell_in_terminal({})
   setlocal bufhidden=hide
   quit
@@ -130,6 +140,25 @@
   unlet g:job
 endfunc
 
+func Test_terminal_hide_buffer_job_finished()
+  term echo hello
+  let buf = bufnr()
+  setlocal bufhidden=hide
+  call WaitForAssert({-> assert_equal('finished', term_getstatus(buf))})
+  call assert_true(bufloaded(buf))
+  call assert_true(buflisted(buf))
+  edit Xasdfasdf
+  call assert_true(bufloaded(buf))
+  call assert_true(buflisted(buf))
+  exe buf .. 'buf'
+  call assert_equal(buf, bufnr())
+  setlocal bufhidden=
+  edit Xasdfasdf
+  call assert_false(bufloaded(buf))
+  call assert_false(buflisted(buf))
+  bwipe Xasdfasdf
+endfunc
+
 func s:Nasty_exit_cb(job, st)
   exe g:buf . 'bwipe!'
   let g:buf = 0
@@ -557,10 +586,12 @@
   call assert_fails("call term_start(cmd, {'term_opencmd': 'split %d and %s'})", 'E475:')
   call assert_fails("call term_start(cmd, {'term_opencmd': 'split % and %d'})", 'E475:')
 
-  call term_start(cmd, {'term_finish': 'open', 'term_opencmd': '4split | buffer %d'})
+  call term_start(cmd, {'term_finish': 'open', 'term_opencmd': '4split | buffer %d | let g:result = "opened the buffer in a window"'})
   close!
   call WaitForAssert({-> assert_equal(2, winnr('$'))}, waittime)
   call assert_equal(4, winheight(0))
+  call assert_equal('opened the buffer in a window', g:result)
+  unlet g:result
   bwipe
 endfunc
 
@@ -648,7 +679,7 @@
 
 func Test_terminal_list_args()
   let buf = term_start([&shell, &shellcmdflag, 'echo "123"'])
-  call assert_fails(buf . 'bwipe', ['E89:', 'E517:'])
+  call assert_fails(buf . 'bwipe', 'E89:')
   exe buf . 'bwipe!'
   call assert_equal("", bufname(buf))
 endfunction
@@ -1188,7 +1219,76 @@
 
   unlet s:called
   au! repro
-endfunction
+endfunc
+
+func Test_open_term_from_cmd()
+  CheckUnix
+  CheckRunVimInTerminal
+
+  let lines =<< trim END
+      call setline(1, ['a', 'b', 'c'])
+      3
+      set incsearch
+      cnoremap <F3> <Cmd>call term_start(['/bin/sh', '-c', ':'])<CR>
+  END
+  call writefile(lines, 'Xopenterm')
+  let buf = RunVimInTerminal('-S Xopenterm', {})
+
+  " this opens a window, incsearch should not use the old cursor position
+  call term_sendkeys(buf, "/\<F3>")
+  call VerifyScreenDump(buf, 'Test_terminal_from_cmd', {})
+  call term_sendkeys(buf, "\<Esc>")
+  call term_sendkeys(buf, ":q\<CR>")
+
+  call StopVimInTerminal(buf)
+  call delete('Xopenterm')
+endfunc
+
+func Test_terminal_popup_with_cmd()
+  " this was crashing
+  let buf = term_start(&shell, #{hidden: v:true})
+  let s:winid = popup_create(buf, {})
+  tnoremap <F3> <Cmd>call popup_close(s:winid)<CR>
+  call feedkeys("\<F3>", 'xt')
+
+  tunmap  <F3>
+  exe 'bwipe! ' .. buf
+  unlet s:winid
+endfunc
+
+func Test_terminal_popup_bufload()
+  let termbuf = term_start(&shell, #{hidden: v:true, term_finish: 'close'})
+  let winid = popup_create(termbuf, {})
+  sleep 50m
+
+  let newbuf = bufadd('')
+  call bufload(newbuf)
+  call setbufline(newbuf, 1, 'foobar')
+
+  " must not have switched to another window
+  call assert_equal(winid, win_getid())
+
+  call StopShellInTerminal(termbuf)
+  call WaitFor({-> win_getid() != winid})
+  exe 'bwipe! ' .. newbuf
+endfunc
+
+func Test_terminal_popup_insert_cmd()
+  CheckUnix
+
+  inoremap <F3> <Cmd>call StartTermInPopup()<CR>
+  func StartTermInPopup()
+    call term_start(['/bin/sh', '-c', 'cat'], #{hidden: v:true, term_finish: 'close'})->popup_create(#{highlight: 'Pmenu'})
+  endfunc
+  call feedkeys("i\<F3>")
+  sleep 10m
+  call assert_equal('n', mode())
+
+  call feedkeys("\<C-D>", 'xt')
+  call WaitFor({-> popup_list() == []})
+  delfunc StartTermInPopup
+  iunmap <F3>
+endfunc
 
 func Check_dump01(off)
   call assert_equal('one two three four five', trim(getline(a:off + 1)))
@@ -1230,7 +1330,7 @@
   call assert_fails("call term_dumpwrite(buf, '')", 'E482:')
   call assert_fails("call term_dumpwrite(buf, test_null_string())", 'E482:')
   call test_garbagecollect_now()
-  call StopVimInTerminal(buf)
+  call StopVimInTerminal(buf, 0)
   call TermWait(buf)
   call assert_fails("call term_dumpwrite(buf, 'Xtest.dump')", 'E958:')
   call assert_fails('call term_sendkeys([], ":q\<CR>")', 'E745:')
diff -Nru vim-8.2.1913/src/testdir/test_textformat.vim vim-8.2.2434/src/testdir/test_textformat.vim
--- vim-8.2.1913/src/testdir/test_textformat.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_textformat.vim	2021-01-30 22:05:11.000000000 +0000
@@ -934,6 +934,18 @@
   call assert_equal('g uu uu ', getline(1)[-8:])
   call assert_equal(['uu. foo'], getline(2, '$'))
 
+  " using backspace or "x" triggers reformat
+  call setline(1, ['1 2 3 4 5 ', '6 7 8 9'])
+  set tw=10
+  set fo=taw
+  set bs=indent,eol,start
+  exe "normal 1G4la\<BS>\<BS>\<Esc>"
+  call assert_equal(['1 2 4 5 6 ', '7 8 9'], getline(1, 2))
+  exe "normal f4xx"
+  call assert_equal(['1 2 5 6 7 ', '8 9'], getline(1, 2))
+
+  set tw=0
+  set fo&
   %bw!
 endfunc
 
diff -Nru vim-8.2.1913/src/testdir/test_textprop.vim vim-8.2.2434/src/testdir/test_textprop.vim
--- vim-8.2.1913/src/testdir/test_textprop.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_textprop.vim	2021-01-30 22:05:11.000000000 +0000
@@ -219,15 +219,15 @@
   # Multiple props per line, start on the first, should find the second.
   new
   ['the quikc bronw fox jumsp over the layz dog']->repeat(2)->setline(1)
-  prop_type_add('misspell', #{highlight: 'ErrorMsg'})
+  prop_type_add('misspell', {highlight: 'ErrorMsg'})
   for lnum in [1, 2]
     for col in [8, 14, 24, 38]
-      prop_add(lnum, col, #{type: 'misspell', length: 2})
+      prop_add(lnum, col, {type: 'misspell', length: 2})
     endfor
   endfor
   cursor(1, 8)
-  var expected = {'lnum': 1, 'id': 0, 'col': 14, 'end': 1, 'type': 'misspell', 'length': 2, 'start': 1}
-  var result = prop_find(#{type: 'misspell', skipstart: true}, 'f')
+  var expected = {lnum: 1, id: 0, col: 14, end: 1, type: 'misspell', length: 2, start: 1}
+  var result = prop_find({type: 'misspell', skipstart: true}, 'f')
   assert_equal(expected, result)
 
   prop_type_delete('misspell')
@@ -322,7 +322,7 @@
 endfunc
 
 def Test_prop_add_vim9()
-  prop_type_add('comment', #{
+  prop_type_add('comment', {
       highlight: 'Directory',
       priority: 123,
       start_incl: true,
@@ -336,7 +336,7 @@
   new
   AddPropTypes()
   SetupPropsInFirstLine()
-  assert_equal(1, prop_remove({'type': 'three', 'id': 13, 'both': true, 'all': true}))
+  assert_equal(1, prop_remove({type: 'three', id: 13, both: true, all: true}))
   DeletePropTypes()
   bwipe!
 enddef
@@ -771,6 +771,36 @@
   call prop_type_delete('prop')
 endfunc
 
+func Test_prop_goto_byte()
+  new
+  call setline(1, '')
+  call setline(2, 'two three')
+  call setline(3, '')
+  call setline(4, 'four five')
+
+  call prop_type_add('testprop', {'highlight': 'Directory'})
+  call search('^two')
+  call prop_add(line('.'), col('.'), {
+        \ 'length': len('two'),
+        \ 'type':   'testprop'
+        \ })
+
+  call search('two \zsthree')
+  let expected_pos = line2byte(line('.')) + col('.') - 1
+  exe expected_pos .. 'goto'
+  let actual_pos = line2byte(line('.')) + col('.') - 1
+  eval actual_pos->assert_equal(expected_pos)
+
+  call search('four \zsfive')
+  let expected_pos = line2byte(line('.')) + col('.') - 1
+  exe expected_pos .. 'goto'
+  let actual_pos = line2byte(line('.')) + col('.') - 1
+  eval actual_pos->assert_equal(expected_pos)
+
+  call prop_type_delete('testprop')
+  bwipe!
+endfunc
+
 func Test_prop_undo()
   new
   call prop_type_add('comment', {'highlight': 'Directory'})
@@ -1358,4 +1388,24 @@
   call prop_type_delete('test')
 endfunc
 
+" this was causing an ml_get error because w_botline was wrong
+func Test_prop_one_line_window()
+  enew
+  call range(2)->setline(1)
+  call prop_type_add('testprop', {})
+  call prop_add(1, 1, {'type': 'testprop'})
+  call popup_create('popup', {'textprop': 'testprop'})
+  $
+  new
+  wincmd _
+  call feedkeys("\r", 'xt')
+  redraw
+
+  call popup_clear()
+  call prop_type_delete('testprop')
+  close
+  bwipe!
+endfunc
+
+
 " vim: shiftwidth=2 sts=2 expandtab
diff -Nru vim-8.2.1913/src/testdir/test_trycatch.vim vim-8.2.2434/src/testdir/test_trycatch.vim
--- vim-8.2.1913/src/testdir/test_trycatch.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_trycatch.vim	2021-01-30 22:05:11.000000000 +0000
@@ -2199,5 +2199,30 @@
   %bwipe!
 endfunc
 
+" Test for using try/catch in a user command with a failing expression    {{{1
+func Test_user_command_try_catch()
+  let lines =<< trim END
+      function s:throw() abort
+        throw 'error'
+      endfunction
+
+      command! Execute
+      \   try
+      \ |   let s:x = s:throw()
+      \ | catch
+      \ |   let g:caught = 'caught'
+      \ | endtry
+
+      let g:caught = 'no'
+      Execute
+      call assert_equal('caught', g:caught)
+  END
+  call writefile(lines, 'XtestTryCatch')
+  source XtestTryCatch
+
+  call delete('XtestTryCatch')
+  unlet g:caught
+endfunc
+
 " Modeline								    {{{1
 " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
diff -Nru vim-8.2.1913/src/testdir/test_user_func.vim vim-8.2.2434/src/testdir/test_user_func.vim
--- vim-8.2.1913/src/testdir/test_user_func.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_user_func.vim	2021-01-30 22:05:11.000000000 +0000
@@ -445,4 +445,36 @@
   delfunc Xfunc
 endfunc
 
+func Test_func_dict()
+  let mydict = {'a': 'b'}
+  function mydict.somefunc() dict
+    return len(self)
+  endfunc
+
+  call assert_equal("{'a': 'b', 'somefunc': function('2')}", string(mydict))
+  call assert_equal(2, mydict.somefunc())
+  call assert_match("^\n   function \\d\\\+() dict"
+  \              .. "\n1      return len(self)"
+  \              .. "\n   endfunction$", execute('func mydict.somefunc'))
+endfunc
+
+func Test_func_range()
+  new
+  call setline(1, range(1, 8))
+  func FuncRange() range
+    echo a:firstline
+    echo a:lastline
+  endfunc
+  3
+  call assert_equal("\n3\n3", execute('call FuncRange()'))
+  call assert_equal("\n4\n6", execute('4,6 call FuncRange()'))
+  call assert_equal("\n   function FuncRange() range"
+  \              .. "\n1      echo a:firstline"
+  \              .. "\n2      echo a:lastline"
+  \              .. "\n   endfunction",
+  \                 execute('function FuncRange'))
+
+  bwipe!
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff -Nru vim-8.2.1913/src/testdir/test_utf8.vim vim-8.2.2434/src/testdir/test_utf8.vim
--- vim-8.2.1913/src/testdir/test_utf8.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_utf8.vim	2021-01-30 22:05:11.000000000 +0000
@@ -180,4 +180,13 @@
   call assert_fails('call setcellwidths([[0x33, 0x44, 2]])', 'E1114:')
 endfunc
 
+func Test_print_overlong()
+  " Text with more composing characters than MB_MAXBYTES.
+  new
+  call setline(1, 'axxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')
+  s/x/\=nr2char(1629)/g
+  print
+  bwipe!
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff -Nru vim-8.2.1913/src/testdir/test_vartabs.vim vim-8.2.2434/src/testdir/test_vartabs.vim
--- vim-8.2.1913/src/testdir/test_vartabs.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_vartabs.vim	2021-01-30 22:05:11.000000000 +0000
@@ -97,7 +97,7 @@
   .retab!
   call assert_equal("\t\t\t\tl", getline(1))
 
-  " Test for 'retab' with same vlaues as vts
+  " Test for 'retab' with same values as vts
   set ts=8 sts=0 vts=5,3,6,2 vsts=
   exe "norm! S                l"
   .retab! 5,3,6,2
diff -Nru vim-8.2.1913/src/testdir/test_vim9_assign.vim vim-8.2.2434/src/testdir/test_vim9_assign.vim
--- vim-8.2.1913/src/testdir/test_vim9_assign.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_vim9_assign.vim	2021-01-30 22:05:11.000000000 +0000
@@ -45,6 +45,9 @@
     assert_equal(true, flag)
     flag = 1 && false
     assert_equal(false, flag)
+
+    var cp: bool = &cp
+    var fen: bool = &l:fen
   END
   CheckScriptSuccess(lines)
   CheckDefAndScriptFailure(['var x: bool = 2'], 'E1012:')
@@ -52,6 +55,8 @@
   CheckDefAndScriptFailure(['var x: bool = [1]'], 'E1012:')
   CheckDefAndScriptFailure(['var x: bool = {}'], 'E1012:')
   CheckDefAndScriptFailure(['var x: bool = "x"'], 'E1012:')
+
+  CheckDefAndScriptFailure(['var x: bool = "x"', '', 'eval 0'], 'E1012:', 1)
 enddef
 
 def Test_syntax()
@@ -63,7 +68,7 @@
   CheckDefFailure(['var x:string'], 'E1069:')
   CheckDefFailure(['var x:string = "x"'], 'E1069:')
   CheckDefFailure(['var a:string = "x"'], 'E1069:')
-  CheckDefFailure(['var lambda = {-> "lambda"}'], 'E704:')
+  CheckDefFailure(['var lambda = () => "lambda"'], 'E704:')
   CheckScriptFailure(['var x = "x"'], 'E1124:')
 
   var nr: number = 1234
@@ -118,6 +123,8 @@
   assert_equal('new', s:newVar)
 
   set ts=7
+  var ts: number = &ts
+  assert_equal(7, ts)
   &ts += 1
   assert_equal(8, &ts)
   &ts -= 3
@@ -156,6 +163,15 @@
     assert_equal(6, &g:ts)
     &g:ts += 2
     assert_equal(8, &g:ts)
+
+    &number = true
+    assert_equal(true, &number)
+    &number = 0
+    assert_equal(false, &number)
+    &number = 1
+    assert_equal(true, &number)
+    &number = false
+    assert_equal(false, &number)
   END
   CheckDefAndScriptSuccess(lines)
 
@@ -225,16 +241,164 @@
   END
 enddef
 
+def Test_assign_unpack()
+  var lines =<< trim END
+    var v1: number
+    var v2: number
+    [v1, v2] = [1, 2]
+    assert_equal(1, v1)
+    assert_equal(2, v2)
+  END
+  CheckDefAndScriptSuccess(lines)
+
+  lines =<< trim END
+      var v1: number
+      var v2: number
+      [v1, v2] = 
+  END
+  CheckDefFailure(lines, 'E1097:', 5)
+
+  lines =<< trim END
+      var v1: number
+      var v2: number
+      [v1, v2] = xxx
+  END
+  CheckDefFailure(lines, 'E1001:', 3)
+
+  lines =<< trim END
+      var v1: number
+      var v2: number
+      [v1, v2] = popup_clear()
+  END
+  CheckDefFailure(lines, 'E1031:', 3)
+
+  lines =<< trim END
+      [v1, v2] = [1, 2]
+  END
+  CheckDefFailure(lines, 'E1089', 1)
+  CheckScriptFailure(['vim9script'] + lines, 'E1089', 2)
+
+  lines =<< trim END
+      var v1: number
+      var v2: number
+      [v1, v2] = ''
+  END
+  CheckDefFailure(lines, 'E1012: Type mismatch; expected list<any> but got string', 3)
+enddef
+
+def Test_assign_linebreak()
+  var nr: number
+  nr =
+      123
+  assert_equal(123, nr)
+
+  var n2: number
+  [nr, n2] =
+     [12, 34]
+  assert_equal(12, nr)
+  assert_equal(34, n2)
+
+  CheckDefFailure(["var x = #"], 'E1097:', 3)
+enddef
+
+def Test_assign_index()
+  # list of list
+  var l1: list<number>
+  l1[0] = 123
+  assert_equal([123], l1)
+
+  var l2: list<list<number>>
+  l2[0] = []
+  l2[0][0] = 123
+  assert_equal([[123]], l2)
+
+  var l3: list<list<list<number>>>
+  l3[0] = []
+  l3[0][0] = []
+  l3[0][0][0] = 123
+  assert_equal([[[123]]], l3)
+
+  var lines =<< trim END
+      var l3: list<list<number>>
+      l3[0] = []
+      l3[0][0] = []
+  END
+  CheckDefFailure(lines, 'E1012: Type mismatch; expected number but got list<unknown>', 3)
+
+  # dict of dict
+  var d1: dict<number>
+  d1.one = 1
+  assert_equal({one: 1}, d1)
+
+  var d2: dict<dict<number>>
+  d2.one = {}
+  d2.one.two = 123
+  assert_equal({one: {two: 123}}, d2)
+
+  var d3: dict<dict<dict<number>>>
+  d3.one = {}
+  d3.one.two = {}
+  d3.one.two.three = 123
+  assert_equal({one: {two: {three: 123}}}, d3)
+
+  lines =<< trim END
+      var d3: dict<dict<number>>
+      d3.one = {}
+      d3.one.two = {}
+  END
+  CheckDefFailure(lines, 'E1012: Type mismatch; expected number but got dict<unknown>', 3)
+
+  lines =<< trim END
+    var lines: list<string>
+    lines['a'] = 'asdf'
+  END
+  CheckDefFailure(lines, 'E1012:', 2)
+
+  lines =<< trim END
+    var lines: string
+    lines[9] = 'asdf'
+  END
+  CheckDefFailure(lines, 'E1141:', 2)
+
+  # list of dict
+  var ld: list<dict<number>>
+  ld[0] = {}
+  ld[0].one = 123
+  assert_equal([{one: 123}], ld)
+
+  lines =<< trim END
+      var ld: list<dict<number>>
+      ld[0] = []
+  END
+  CheckDefFailure(lines, 'E1012: Type mismatch; expected dict<number> but got list<unknown>', 2)
+
+  # dict of list
+  var dl: dict<list<number>>
+  dl.one = []
+  dl.one[0] = 123
+  assert_equal({one: [123]}, dl)
+
+  lines =<< trim END
+      var dl: dict<list<number>>
+      dl.one = {}
+  END
+  CheckDefFailure(lines, 'E1012: Type mismatch; expected list<number> but got dict<unknown>', 2)
+enddef
+
 def Test_extend_list()
   var lines =<< trim END
       vim9script
       var l: list<number>
       l += [123]
       assert_equal([123], l)
+  END
+  CheckScriptSuccess(lines)
 
-      var d: dict<number>
-      d['one'] = 1
-      assert_equal(#{one: 1}, d)
+  lines =<< trim END
+      vim9script
+      var list: list<string>
+      extend(list, ['x'])
+      assert_equal(['x'], list)
   END
   CheckScriptSuccess(lines)
 
@@ -249,6 +413,58 @@
       assert_equal(['a', 'b'], list)
   END
   CheckScriptSuccess(lines)
+  lines =<< trim END
+      vim9script
+      var list: list<string>
+      def Func()
+        extend(list, ['x', 'b'])
+      enddef
+      Func()
+      assert_equal(['x', 'b'], list)
+  END
+  CheckScriptSuccess(lines)
+
+  lines =<< trim END
+      vim9script
+      var l: list<string> = test_null_list()
+      extend(l, ['x'])
+      assert_equal(['x'], l)
+  END
+  CheckScriptSuccess(lines)
+
+  lines =<< trim END
+      vim9script
+      extend(test_null_list(), ['x'])
+  END
+  CheckScriptFailure(lines, 'E1134:', 2)
+enddef
+
+def Test_extend_dict()
+  var lines =<< trim END
+      vim9script
+      var d: dict<number>
+      extend(d, {a: 1})
+      assert_equal({a: 1}, d)
+
+      var d2: dict<number>
+      d2['one'] = 1
+      assert_equal({one: 1}, d2)
+  END
+  CheckScriptSuccess(lines)
+
+  lines =<< trim END
+      vim9script
+      var d: dict<string> = test_null_dict()
+      extend(d, {a: 'x'})
+      assert_equal({a: 'x'}, d)
+  END
+  CheckScriptSuccess(lines)
+
+  lines =<< trim END
+      vim9script
+      extend(test_null_dict(), {a: 'x'})
+  END
+  CheckScriptFailure(lines, 'E1133:', 2)
 enddef
 
 def Test_single_letter_vars()
@@ -339,6 +555,21 @@
 
   # type becomes list<any>
   var somelist = rand() > 0 ? [1, 2, 3] : ['a', 'b', 'c']
+
+  var lines =<< trim END
+    var d = {dd: test_null_list()}
+    d.dd[0] = 0
+  END
+  CheckDefExecFailure(lines, 'E1147:', 2)
+enddef
+
+def Test_assignment_list_any_index()
+   var l: list<number> = [1, 2]
+  for  [x, y, _]
+  in  [[0, 1, ''], [1, 3, '']]
+      l[x] = l[x] + y
+  endfor
+  assert_equal([2, 5], l)
 enddef
 
 def Test_assignment_list_vim9script()
@@ -354,32 +585,69 @@
 enddef
 
 def Test_assignment_dict()
-  var dict1: dict<bool> = #{one: false, two: true}
-  var dict2: dict<number> = #{one: 1, two: 2}
-  var dict3: dict<string> = #{key: 'value'}
-  var dict4: dict<any> = #{one: 1, two: '2'}
-  var dict5: dict<blob> = #{one: 0z01, two: 0z02}
+  var dict1: dict<bool> = {one: false, two: true}
+  var dict2: dict<number> = {one: 1, two: 2}
+  var dict3: dict<string> = {key: 'value'}
+  var dict4: dict<any> = {one: 1, two: '2'}
+  var dict5: dict<blob> = {one: 0z01, two: 0z02}
 
   # overwrite
   dict3['key'] = 'another'
+  assert_equal(dict3, {key: 'another'})
+  dict3.key = 'yet another'
+  assert_equal(dict3, {key: 'yet another'})
+
+  # member "any" can also be a dict and assigned to
+  var anydict: dict<any> = {nest: {}, nr: 0}
+  anydict.nest['this'] = 123
+  anydict.nest.that = 456
+  assert_equal({nest: {this: 123, that: 456}, nr: 0}, anydict)
+
+  var lines =<< trim END
+    var dd = {}
+    dd.two = 2
+    assert_equal({two: 2}, dd)
+  END
+  CheckDefAndScriptSuccess(lines)
+
+  lines =<< trim END
+    var d = {dd: {}}
+    d.dd[0] = 2
+    d.dd['x'] = 3
+    d.dd.y = 4
+    assert_equal({dd: {0: 2, x: 3, y: 4}}, d)
+  END
+  CheckDefAndScriptSuccess(lines)
+
+  lines =<< trim END
+    var dd = {one: 1}
+    dd.one) = 2
+  END
+  CheckDefFailure(lines, 'E488:', 2)
+
+  lines =<< trim END
+    var dd = {one: 1}
+    var dd.one = 2
+  END
+  CheckDefAndScriptFailure(lines, 'E1017:', 2)
 
   # empty key can be used
   var dd = {}
   dd[""] = 6
-  assert_equal({'': 6}, dd)
+  assert_equal({['']: 6}, dd)
 
   # type becomes dict<any>
-  var somedict = rand() > 0 ? #{a: 1, b: 2} : #{a: 'a', b: 'b'}
+  var somedict = rand() > 0 ? {a: 1, b: 2} : {a: 'a', b: 'b'}
 
   # assignment to script-local dict
-  var lines =<< trim END
+  lines =<< trim END
     vim9script
     var test: dict<any> = {}
     def FillDict(): dict<any>
       test['a'] = 43
       return test
     enddef
-    assert_equal(#{a: 43}, FillDict())
+    assert_equal({a: 43}, FillDict())
   END
   CheckScriptSuccess(lines)
 
@@ -391,8 +659,9 @@
       return test
     enddef
     FillDict()
+    assert_equal({a: 43}, test)
   END
-  CheckScriptFailure(lines, 'E1103:')
+  CheckScriptSuccess(lines)
 
   # assignment to global dict
   lines =<< trim END
@@ -402,7 +671,7 @@
       g:test['a'] = 43
       return g:test
     enddef
-    assert_equal(#{a: 43}, FillDict())
+    assert_equal({a: 43}, FillDict())
   END
   CheckScriptSuccess(lines)
 
@@ -414,9 +683,21 @@
       b:test['a'] = 43
       return b:test
     enddef
-    assert_equal(#{a: 43}, FillDict())
+    assert_equal({a: 43}, FillDict())
   END
   CheckScriptSuccess(lines)
+
+  lines =<< trim END
+    var d = {dd: test_null_dict()}
+    d.dd[0] = 0
+  END
+  CheckDefExecFailure(lines, 'E1103:', 2)
+
+  lines =<< trim END
+    var d = {dd: 'string'}
+    d.dd[0] = 0
+  END
+  CheckDefExecFailure(lines, 'E1148:', 2)
 enddef
 
 def Test_assignment_local()
@@ -494,7 +775,7 @@
 
     if has('unix') && executable('cat')
       # check with non-null job and channel, types must match
-      thejob = job_start("cat ", #{})
+      thejob = job_start("cat ", {})
       thechannel = job_getchannel(thejob)
       job_stop(thejob, 'kill')
     endif
@@ -504,31 +785,68 @@
   assert_equal(5678, nr)
 enddef
 
+let scriptvar = 'init'
+
 def Test_assignment_var_list()
-  var v1: string
-  var v2: string
-  var vrem: list<string>
-  [v1] = ['aaa']
-  assert_equal('aaa', v1)
-
-  [v1, v2] = ['one', 'two']
-  assert_equal('one', v1)
-  assert_equal('two', v2)
-
-  [v1, v2; vrem] = ['one', 'two']
-  assert_equal('one', v1)
-  assert_equal('two', v2)
-  assert_equal([], vrem)
-
-  [v1, v2; vrem] = ['one', 'two', 'three']
-  assert_equal('one', v1)
-  assert_equal('two', v2)
-  assert_equal(['three'], vrem)
+  var lines =<< trim END
+      var v1: string
+      var v2: string
+      var vrem: list<string>
+      [v1] = ['aaa']
+      assert_equal('aaa', v1)
+
+      [v1, v2] = ['one', 'two']
+      assert_equal('one', v1)
+      assert_equal('two', v2)
+
+      [v1, v2; vrem] = ['one', 'two']
+      assert_equal('one', v1)
+      assert_equal('two', v2)
+      assert_equal([], vrem)
+
+      [v1, v2; vrem] = ['one', 'two', 'three']
+      assert_equal('one', v1)
+      assert_equal('two', v2)
+      assert_equal(['three'], vrem)
+
+      [&ts, &sw] = [3, 4]
+      assert_equal(3, &ts)
+      assert_equal(4, &sw)
+      set ts=8 sw=4
+
+      [@a, @z] = ['aa', 'zz']
+      assert_equal('aa', @a)
+      assert_equal('zz', @z)
+
+      [$SOME_VAR, $OTHER_VAR] = ['some', 'other']
+      assert_equal('some', $SOME_VAR)
+      assert_equal('other', $OTHER_VAR)
+
+      [g:globalvar, b:bufvar, w:winvar, t:tabvar, v:errmsg] =
+            ['global', 'buf', 'win', 'tab', 'error']
+      assert_equal('global', g:globalvar)
+      assert_equal('buf', b:bufvar)
+      assert_equal('win', w:winvar)
+      assert_equal('tab', t:tabvar)
+      assert_equal('error', v:errmsg)
+      unlet g:globalvar
+  END
+  CheckDefAndScriptSuccess(lines)
 
-  [&ts, &sw] = [3, 4]
-  assert_equal(3, &ts)
-  assert_equal(4, &sw)
-  set ts=8 sw=4
+  [g:globalvar, s:scriptvar, b:bufvar] = ['global', 'script', 'buf']
+  assert_equal('global', g:globalvar)
+  assert_equal('script', s:scriptvar)
+  assert_equal('buf', b:bufvar)
+
+  lines =<< trim END
+      vim9script
+      var s:scriptvar = 'init'
+      [g:globalvar, s:scriptvar, w:winvar] = ['global', 'script', 'win']
+      assert_equal('global', g:globalvar)
+      assert_equal('script', s:scriptvar)
+      assert_equal('win', w:winvar)
+  END
+  CheckScriptSuccess(lines)
 enddef
 
 def Test_assignment_vim9script()
@@ -664,8 +982,8 @@
   CheckDefFailure(['var name: list<string> = [123]'], 'expected list<string> but got list<number>')
   CheckDefFailure(['var name: list<number> = ["xx"]'], 'expected list<number> but got list<string>')
 
-  CheckDefFailure(['var name: dict<string> = #{key: 123}'], 'expected dict<string> but got dict<number>')
-  CheckDefFailure(['var name: dict<number> = #{key: "xx"}'], 'expected dict<number> but got dict<string>')
+  CheckDefFailure(['var name: dict<string> = {key: 123}'], 'expected dict<string> but got dict<number>')
+  CheckDefFailure(['var name: dict<number> = {key: "xx"}'], 'expected dict<number> but got dict<string>')
 
   CheckDefFailure(['var name = feedkeys("0")'], 'E1031:')
   CheckDefFailure(['var name: number = feedkeys("0")'], 'expected number but got void')
@@ -708,29 +1026,49 @@
 enddef
 
 def Test_assign_dict()
-  var d: dict<string> = {}
-  d['key'] = 'value'
-  assert_equal('value', d['key'])
-
-  d[123] = 'qwerty'
-  assert_equal('qwerty', d[123])
-  assert_equal('qwerty', d['123'])
-
-  var nrd: dict<number> = {}
-  for i in range(3)
-    nrd[i] = i
-  endfor
-  assert_equal({'0': 0, '1': 1, '2': 2}, nrd)
+  var lines =<< trim END
+      var d: dict<string> = {}
+      d['key'] = 'value'
+      assert_equal('value', d['key'])
+
+      d[123] = 'qwerty'
+      assert_equal('qwerty', d[123])
+      assert_equal('qwerty', d['123'])
+
+      var nrd: dict<number> = {}
+      for i in range(3)
+        nrd[i] = i
+      endfor
+      assert_equal({0: 0, 1: 1, 2: 2}, nrd)
+
+      d.somekey = 'someval'
+      assert_equal({key: 'value', '123': 'qwerty', somekey: 'someval'}, d)
+      # unlet d.somekey
+      # assert_equal({key: 'value', '123': 'qwerty'}, d)
+  END
+  CheckDefAndScriptSuccess(lines)
 
-  CheckDefFailure(["var d: dict<number> = #{a: '', b: true}"], 'E1012: Type mismatch; expected dict<number> but got dict<any>', 1)
-  CheckDefFailure(["var d: dict<dict<number>> = #{x: #{a: '', b: true}}"], 'E1012: Type mismatch; expected dict<dict<number>> but got dict<dict<any>>', 1)
+  # TODO: move to above once "unlet d.somekey" in :def is implemented
+  lines =<< trim END
+      vim9script
+      var d: dict<string> = {}
+      d['key'] = 'value'
+      d.somekey = 'someval'
+      assert_equal({key: 'value', somekey: 'someval'}, d)
+      unlet d.somekey
+      assert_equal({key: 'value'}, d)
+  END
+  CheckScriptSuccess(lines)
+
+  CheckDefFailure(["var d: dict<number> = {a: '', b: true}"], 'E1012: Type mismatch; expected dict<number> but got dict<any>', 1)
+  CheckDefFailure(["var d: dict<dict<number>> = {x: {a: '', b: true}}"], 'E1012: Type mismatch; expected dict<dict<number>> but got dict<dict<any>>', 1)
 enddef
 
 def Test_assign_dict_unknown_type()
   var lines =<< trim END
       vim9script
       var mylist = []
-      mylist += [#{one: 'one'}]
+      mylist += [{one: 'one'}]
       def Func()
         var dd = mylist[0]
         assert_equal('one', dd.one)
@@ -739,32 +1077,38 @@
   END
   CheckScriptSuccess(lines)
 
-  # doesn't work yet
-  #lines =<< trim END
-  #    vim9script
-  #    var mylist = [[]]
-  #    mylist[0] += [#{one: 'one'}]
-  #    def Func()
-  #      var dd = mylist[0][0]
-  #      assert_equal('one', dd.one)
-  #    enddef
-  #    Func()
-  #END
-  #CheckScriptSuccess(lines)
+  lines =<< trim END
+      vim9script
+      var mylist = [[]]
+      mylist[0] += [{one: 'one'}]
+      def Func()
+        var dd = mylist[0][0]
+        assert_equal('one', dd.one)
+      enddef
+      Func()
+  END
+  CheckScriptSuccess(lines)
 enddef
 
 def Test_assign_lambda()
   # check if assign a lambda to a variable which type is func or any.
   var lines =<< trim END
       vim9script
-      var FuncRef = {->123}
+      var FuncRef = () => 123
       assert_equal(123, FuncRef())
-      var FuncRef_Func: func = {->123}
+      var FuncRef_Func: func = () => 123
       assert_equal(123, FuncRef_Func())
-      var FuncRef_Any: any = {->123}
+      var FuncRef_Any: any = () => 123
       assert_equal(123, FuncRef_Any())
   END
   CheckScriptSuccess(lines)
+
+  lines =<< trim END
+      var Ref: func(number)
+      Ref = (j) => !j
+  END
+  CheckDefFailure(lines, 'E1012: Type mismatch; expected func(number) but got func(any): bool')
+  CheckScriptFailure(['vim9script'] + lines, 'E1012: Type mismatch; expected func(number) but got func(any): any')
 enddef
 
 def Test_heredoc()
@@ -781,6 +1125,17 @@
         var&lines =<< trim END
         x
         x
+      enddef
+      defcompile
+  [END]
+  CheckScriptFailure(lines, 'E1145: Missing heredoc end marker: END')
+  delfunc! g:Func
+
+  lines =<< trim [END]
+      def Func()
+        var lines =<< trim END
+        x
+        x
         x
         x
         x
@@ -790,10 +1145,11 @@
       enddef
       call Func()
   [END]
-  CheckScriptFailure(lines, 'E990:')
+  CheckScriptFailure(lines, 'E1145: Missing heredoc end marker: END')
+  delfunc! g:Func
 enddef
 
-def Test_let_func_call()
+def Test_var_func_call()
   var lines =<< trim END
     vim9script
     func GetValue()
@@ -817,7 +1173,7 @@
   delete('Xfinished')
 enddef
 
-def Test_let_missing_type()
+def Test_var_missing_type()
   var lines =<< trim END
     vim9script
     var name = g:unknown
@@ -832,7 +1188,7 @@
   CheckScriptSuccess(lines)
 enddef
 
-def Test_let_declaration()
+def Test_var_declaration()
   var lines =<< trim END
     vim9script
     var name: string
@@ -843,16 +1199,49 @@
     s:name = 'prefixed'
     g:var_prefixed = s:name
 
+    const FOO: number = 123
+    assert_equal(123, FOO)
+    const FOOS = 'foos'
+    assert_equal('foos', FOOS)
+    final FLIST = [1]
+    assert_equal([1], FLIST)
+    FLIST[0] = 11
+    assert_equal([11], FLIST)
+
+    const g:FOO: number = 321
+    assert_equal(321, g:FOO)
+    const g:FOOS = 'gfoos'
+    assert_equal('gfoos', g:FOOS)
+    final g:FLIST = [2]
+    assert_equal([2], g:FLIST)
+    g:FLIST[0] = 22
+    assert_equal([22], g:FLIST)
+
+    const w:FOO: number = 46
+    assert_equal(46, w:FOO)
+    const w:FOOS = 'wfoos'
+    assert_equal('wfoos', w:FOOS)
+    final w:FLIST = [3]
+    assert_equal([3], w:FLIST)
+    w:FLIST[0] = 33
+    assert_equal([33], w:FLIST)
+
     var s:other: number
     other = 1234
     g:other_var = other
 
     # type is inferred
-    s:dict = {'a': 222}
+    var s:dict = {['a']: 222}
     def GetDictVal(key: any)
       g:dict_val = s:dict[key]
     enddef
     GetDictVal('a')
+
+    final adict: dict<string> = {}
+    def ChangeAdict()
+      adict.foo = 'foo'
+    enddef
+    ChangeAdict()
   END
   CheckScriptSuccess(lines)
   assert_equal('', g:var_uninit)
@@ -865,9 +1254,15 @@
   unlet g:var_test
   unlet g:var_prefixed
   unlet g:other_var
+  unlet g:FOO
+  unlet g:FOOS
+  unlet g:FLIST
+  unlet w:FOO
+  unlet w:FOOS
+  unlet w:FLIST
 enddef
 
-def Test_let_declaration_fails()
+def Test_var_declaration_fails()
   var lines =<< trim END
     vim9script
     final var: string
@@ -876,6 +1271,32 @@
 
   lines =<< trim END
     vim9script
+    const g:constvar = 'string'
+    g:constvar = 'xx'
+  END
+  CheckScriptFailure(lines, 'E741:')
+  unlet g:constvar
+
+  lines =<< trim END
+    vim9script
+    const cdict: dict<string> = {}
+    def Change()
+      cdict.foo = 'foo'
+    enddef
+    defcompile
+  END
+  CheckScriptFailure(lines, 'E46:')
+
+  lines =<< trim END
+    vim9script
+    final w:finalvar = [9]
+    w:finalvar = [8]
+  END
+  CheckScriptFailure(lines, 'E1122:')
+  unlet w:finalvar
+
+  lines =<< trim END
+    vim9script
     const var: string
   END
   CheckScriptFailure(lines, 'E1021:')
@@ -885,9 +1306,13 @@
     var 9var: string
   END
   CheckScriptFailure(lines, 'E475:')
+
+  CheckDefFailure(['var foo.bar = 2'], 'E1087:')
+  CheckDefFailure(['var foo[3] = 2'], 'E1087:')
+  CheckDefFailure(['const foo: number'], 'E1021:')
 enddef
 
-def Test_let_type_check()
+def Test_var_type_check()
   var lines =<< trim END
     vim9script
     var name: string
@@ -924,7 +1349,7 @@
 
 let g:dict_number = #{one: 1, two: 2}
 
-def Test_let_list_dict_type()
+def Test_var_list_dict_type()
   var ll: list<number>
   ll = [1, 2, 2, 3, 3, 3]->uniq()
   ll->assert_equal([1, 2, 3])
@@ -937,7 +1362,11 @@
       var ll: list<number>
       ll = [1, 2, 3]->map('"one"')
   END
-  CheckDefExecFailure(lines, 'E1012: Type mismatch; expected list<number> but got list<string>')
+  CheckDefExecFailure(lines, 'E1012: Type mismatch; expected number but got string')
+enddef
+
+def Test_cannot_use_let()
+  CheckDefAndScriptFailure(['let a = 34'], 'E1126:', 1)
 enddef
 
 def Test_unlet()
@@ -954,6 +1383,61 @@
   assert_false(exists('s:somevar'))
   unlet! s:somevar
 
+  CheckDefExecFailure([
+    'var dd = 111',
+    'unlet dd',
+    ], 'E1081:', 2)
+
+  # dict unlet
+  var dd = {a: 1, b: 2, c: 3}
+  unlet dd['a']
+  unlet dd.c
+  assert_equal({b: 2}, dd)
+
+  # list unlet
+  var ll = [1, 2, 3, 4]
+  unlet ll[1]
+  unlet ll[-1]
+  assert_equal([1, 3], ll)
+
+  # list of dict unlet
+  var dl = [{a: 1, b: 2}, {c: 3}]
+  unlet dl[0]['b']
+  assert_equal([{a: 1}, {c: 3}], dl)
+
+  CheckDefExecFailure([
+    'var ll = test_null_list()',
+    'unlet ll[0]',
+    ], 'E684:', 2)
+  CheckDefExecFailure([
+    'var ll = [1]',
+    'unlet ll[2]',
+    ], 'E684:', 2)
+  CheckDefExecFailure([
+    'var ll = [1]',
+    'unlet ll[g:astring]',
+    ], 'E1012:', 2)
+  CheckDefExecFailure([
+    'var dd = test_null_dict()',
+    'unlet dd["a"]',
+    ], 'E716:', 2)
+  CheckDefExecFailure([
+    'var dd = {a: 1}',
+    'unlet dd["b"]',
+    ], 'E716:', 2)
+  CheckDefExecFailure([
+    'var dd = {a: 1}',
+    'unlet dd[g:alist]',
+    ], 'E1105:', 2)
+
+  # can compile unlet before variable exists
+  g:someDict = {key: 'val'}
+  var k = 'key'
+  unlet g:someDict[k]
+  assert_equal({}, g:someDict)
+  unlet g:someDict
+  assert_false(exists('g:someDict'))
+
   CheckScriptFailure([
    'vim9script',
    'var svar = 123',
@@ -975,17 +1459,88 @@
   CheckScriptFailure([
    'vim9script',
    'var svar = 123',
+   'func Func()',
+   '  unlet s:svar',
+   'endfunc',
+   'Func()',
+   ], 'E1081:')
+  CheckScriptFailure([
+   'vim9script',
+   'var svar = 123',
    'def Func()',
    '  unlet s:svar',
    'enddef',
    'defcompile',
    ], 'E1081:')
 
+  writefile(['vim9script', 'export var svar = 1234'], 'XunletExport.vim')
+  var lines =<< trim END
+    vim9script
+    import svar from './XunletExport.vim'
+    def UnletSvar()
+      unlet svar
+    enddef
+    defcompile
+  END
+  CheckScriptFailure(lines, 'E1081:', 1)
+  delete('XunletExport.vim')
+
   $ENVVAR = 'foobar'
   assert_equal('foobar', $ENVVAR)
   unlet $ENVVAR
   assert_equal('', $ENVVAR)
 enddef
 
+def Test_expr_error_no_assign()
+  var lines =<< trim END
+      vim9script
+      var x = invalid
+      echo x
+  END
+  CheckScriptFailureList(lines, ['E121:', 'E121:'])
+
+  lines =<< trim END
+      vim9script
+      var x = 1 / 0
+      echo x
+  END
+  CheckScriptFailureList(lines, ['E1154:', 'E121:'])
+
+  lines =<< trim END
+      vim9script
+      var x = 1 % 0
+      echo x
+  END
+  CheckScriptFailureList(lines, ['E1154:', 'E121:'])
+enddef
+
+
+def Test_assign_command_modifier()
+  var lines =<< trim END
+      var verbose = 0
+      verbose = 1
+      assert_equal(1, verbose)
+      silent verbose = 2
+      assert_equal(2, verbose)
+      silent verbose += 2
+      assert_equal(4, verbose)
+      silent verbose -= 1
+      assert_equal(3, verbose)
+
+      var topleft = {one: 1}
+      sandbox topleft.one = 3
+      assert_equal({one: 3}, topleft)
+      leftabove topleft[' '] = 4
+      assert_equal({one: 3, ' ': 4}, topleft)
+
+      var x: number
+      var y: number
+      silent [x, y] = [1, 2]
+      assert_equal(1, x)
+      assert_equal(2, y)
+  END
+  CheckDefAndScriptSuccess(lines)
+enddef
+
 
 " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
diff -Nru vim-8.2.1913/src/testdir/test_vim9_builtin.vim vim-8.2.2434/src/testdir/test_vim9_builtin.vim
--- vim-8.2.1913/src/testdir/test_vim9_builtin.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_vim9_builtin.vim	2021-01-30 22:05:11.000000000 +0000
@@ -32,7 +32,7 @@
     enddef
 
     def RetListAny(): list<any>
-      return items({'k': 'v'})
+      return items({k: 'v'})
     enddef
 
     def RetListString(): list<string>
@@ -115,6 +115,21 @@
   CheckDefExecFailure(lines, 'E1131:', 2)
 enddef
 
+def Test_append()
+  new
+  setline(1, range(3))
+  var res1: number = append(1, 'one')
+  assert_equal(0, res1)
+  var res2: bool = append(3, 'two')
+  assert_equal(false, res2)
+  assert_equal(['0', 'one', '1', 'two', '2'], getline(1, 6))
+enddef
+
+def Test_buflisted()
+  var res: bool = buflisted('asdf')
+  assert_equal(false, res)
+enddef
+
 def Test_bufname()
   split SomeFile
   bufname('%')->assert_equal('SomeFile')
@@ -185,12 +200,82 @@
   count('ABC ABC ABC', 'b', false)->assert_equal(0)
 enddef
 
+def Test_cursor()
+  new
+  setline(1, range(4))
+  cursor(2, 1)
+  assert_equal(2, getcurpos()[1])
+  cursor('$', 1)
+  assert_equal(4, getcurpos()[1])
+
+  var lines =<< trim END
+    cursor('2', 1)
+  END
+  CheckDefExecAndScriptFailure(lines, 'E475:')
+enddef
+
+def Test_delete()
+  var res: bool = delete('doesnotexist')
+  assert_equal(true, res)
+enddef
+
+def Test_executable()
+  assert_false(executable(""))
+  assert_false(executable(test_null_string()))
+
+  CheckDefExecFailure(['echo executable(123)'], 'E928:')
+  CheckDefExecFailure(['echo executable(true)'], 'E928:')
+enddef
+
+def Test_exepath()
+  CheckDefExecFailure(['echo exepath(true)'], 'E928:')
+  CheckDefExecFailure(['echo exepath(v:null)'], 'E928:')
+  CheckDefExecFailure(['echo exepath("")'], 'E1142:')
+enddef
+
 def Test_expand()
   split SomeFile
   expand('%', true, true)->assert_equal(['SomeFile'])
   close
 enddef
 
+def Test_extend_arg_types()
+  assert_equal([1, 2, 3], extend([1, 2], [3]))
+  assert_equal([3, 1, 2], extend([1, 2], [3], 0))
+  assert_equal([1, 3, 2], extend([1, 2], [3], 1))
+  assert_equal([1, 3, 2], extend([1, 2], [3], s:number_one))
+
+  assert_equal({a: 1, b: 2, c: 3}, extend({a: 1, b: 2}, {c: 3}))
+  assert_equal({a: 1, b: 4}, extend({a: 1, b: 2}, {b: 4}))
+  assert_equal({a: 1, b: 2}, extend({a: 1, b: 2}, {b: 4}, 'keep'))
+  assert_equal({a: 1, b: 2}, extend({a: 1, b: 2}, {b: 4}, s:string_keep))
+
+  var res: list<dict<any>>
+  extend(res, mapnew([1, 2], (_, v) => ({})))
+  assert_equal([{}, {}], res)
+
+  CheckDefFailure(['extend([1, 2], 3)'], 'E1013: Argument 2: type mismatch, expected list<number> but got number')
+  CheckDefFailure(['extend([1, 2], ["x"])'], 'E1013: Argument 2: type mismatch, expected list<number> but got list<string>')
+  CheckDefFailure(['extend([1, 2], [3], "x")'], 'E1013: Argument 3: type mismatch, expected number but got string')
+
+  CheckDefFailure(['extend({a: 1}, 42)'], 'E1013: Argument 2: type mismatch, expected dict<number> but got number')
+  CheckDefFailure(['extend({a: 1}, {b: "x"})'], 'E1013: Argument 2: type mismatch, expected dict<number> but got dict<string>')
+  CheckDefFailure(['extend({a: 1}, {b: 2}, 1)'], 'E1013: Argument 3: type mismatch, expected string but got number')
+
+  CheckDefFailure(['extend([1], ["b"])'], 'E1013: Argument 2: type mismatch, expected list<number> but got list<string>')
+  CheckDefExecFailure(['extend([1], ["b", 1])'], 'E1013: Argument 2: type mismatch, expected list<number> but got list<any>')
+enddef
+
+def Test_extendnew()
+  assert_equal([1, 2, 'a'], extendnew([1, 2], ['a']))
+  assert_equal({one: 1, two: 'a'}, extendnew({one: 1}, {two: 'a'}))
+
+  CheckDefFailure(['extendnew({a: 1}, 42)'], 'E1013: Argument 2: type mismatch, expected dict<number> but got number')
+  CheckDefFailure(['extendnew({a: 1}, [42])'], 'E1013: Argument 2: type mismatch, expected dict<number> but got list<number>')
+  CheckDefFailure(['extendnew([1, 2], "x")'], 'E1013: Argument 2: type mismatch, expected list<number> but got string')
+  CheckDefFailure(['extendnew([1, 2], {x: 1})'], 'E1013: Argument 2: type mismatch, expected list<number> but got dict<number>')
+enddef
+
 def Test_extend_return_type()
   var l = extend([1, 2], [3])
   var res = 0
@@ -200,9 +285,109 @@
   res->assert_equal(6)
 enddef
 
+func g:ExtendDict(d)
+  call extend(a:d, #{xx: 'x'})
+endfunc
+
+def Test_extend_dict_item_type()
+  var lines =<< trim END
+       var d: dict<number> = {a: 1}
+       extend(d, {b: 2})
+  END
+  CheckDefAndScriptSuccess(lines)
+
+  lines =<< trim END
+       var d: dict<number> = {a: 1}
+       extend(d, {b: 'x'})
+  END
+  CheckDefFailure(lines, 'E1013: Argument 2: type mismatch, expected dict<number> but got dict<string>', 2)
+  CheckScriptFailure(['vim9script'] + lines, 'E1012:', 3)
+
+  lines =<< trim END
+       var d: dict<number> = {a: 1}
+       g:ExtendDict(d)
+  END
+  CheckDefExecFailure(lines, 'E1012: Type mismatch; expected number but got string', 0)
+  CheckScriptFailure(['vim9script'] + lines, 'E1012:', 1)
+enddef
+
+func g:ExtendList(l)
+  call extend(a:l, ['x'])
+endfunc
+
+def Test_extend_list_item_type()
+  var lines =<< trim END
+       var l: list<number> = [1]
+       extend(l, [2])
+  END
+  CheckDefAndScriptSuccess(lines)
+
+  lines =<< trim END
+       var l: list<number> = [1]
+       extend(l, ['x'])
+  END
+  CheckDefFailure(lines, 'E1013: Argument 2: type mismatch, expected list<number> but got list<string>', 2)
+  CheckScriptFailure(['vim9script'] + lines, 'E1012:', 3)
+
+  lines =<< trim END
+       var l: list<number> = [1]
+       g:ExtendList(l)
+  END
+  CheckDefExecFailure(lines, 'E1012: Type mismatch; expected number but got string', 0)
+  CheckScriptFailure(['vim9script'] + lines, 'E1012:', 1)
+enddef
+
+def Test_job_info_return_type()
+  if has('job')
+    job_start(&shell)
+    var jobs = job_info()
+    assert_equal('list<job>', typename(jobs))
+    assert_equal('dict<any>', typename(job_info(jobs[0])))
+    job_stop(jobs[0])
+  endif
+enddef
 
 def Wrong_dict_key_type(items: list<number>): list<number>
-  return filter(items, {_, val -> get({val: 1}, 'x')})
+  return filter(items, (_, val) => get({[val]: 1}, 'x'))
+enddef
+
+def Test_filereadable()
+  assert_false(filereadable(""))
+  assert_false(filereadable(test_null_string()))
+
+  CheckDefExecFailure(['echo filereadable(123)'], 'E928:')
+  CheckDefExecFailure(['echo filereadable(true)'], 'E928:')
+enddef
+
+def Test_filewritable()
+  assert_false(filewritable(""))
+  assert_false(filewritable(test_null_string()))
+
+  CheckDefExecFailure(['echo filewritable(123)'], 'E928:')
+  CheckDefExecFailure(['echo filewritable(true)'], 'E928:')
+enddef
+
+def Test_finddir()
+  CheckDefExecFailure(['echo finddir(true)'], 'E928:')
+  CheckDefExecFailure(['echo finddir(v:null)'], 'E928:')
+  CheckDefExecFailure(['echo finddir("")'], 'E1142:')
+enddef
+
+def Test_findfile()
+  CheckDefExecFailure(['echo findfile(true)'], 'E928:')
+  CheckDefExecFailure(['echo findfile(v:null)'], 'E928:')
+  CheckDefExecFailure(['echo findfile("")'], 'E1142:')
+enddef
+
+def Test_fnamemodify()
+  CheckDefSuccess(['echo fnamemodify(test_null_string(), ":p")'])
+  CheckDefSuccess(['echo fnamemodify("", ":p")'])
+  CheckDefSuccess(['echo fnamemodify("file", test_null_string())'])
+  CheckDefSuccess(['echo fnamemodify("file", "")'])
+
+  CheckDefExecFailure(['echo fnamemodify(true, ":p")'], 'E928:')
+  CheckDefExecFailure(['echo fnamemodify(v:null, ":p")'], 'E928:')
+  CheckDefExecFailure(['echo fnamemodify("file", true)'], 'E928:')
 enddef
 
 def Test_filter_wrong_dict_key_type()
@@ -210,7 +395,7 @@
 enddef
 
 def Test_filter_return_type()
-  var l = filter([1, 2, 3], {-> 1})
+  var l = filter([1, 2, 3], () => 1)
   var res = 0
   for n in l
     res += n
@@ -218,6 +403,11 @@
   res->assert_equal(6)
 enddef
 
+def Test_filter_missing_argument()
+  var dict = {aa: [1], ab: [2], ac: [3], de: [4]}
+  var res = dict->filter((k) => k =~ 'a' && k !~ 'b')
+  res->assert_equal({aa: [1], ac: [3]})
+enddef
 
 def Test_garbagecollect()
   garbagecollect(true)
@@ -230,7 +420,7 @@
   edit Xtestfile1
   hide edit Xtestfile2
   hide enew
-  getbufinfo(#{bufloaded: true, buflisted: true, bufmodified: false})
+  getbufinfo({bufloaded: true, buflisted: true, bufmodified: false})
       ->len()->assert_equal(3)
   bwipe Xtestfile1 Xtestfile2
 enddef
@@ -273,16 +463,48 @@
   var l = getloclist(1)
   l->assert_equal([])
 
-  var d = getloclist(1, #{items: 0})
-  d->assert_equal(#{items: []})
+  var d = getloclist(1, {items: 0})
+  d->assert_equal({items: []})
+enddef
+
+def Test_getfperm()
+  assert_equal('', getfperm(""))
+  assert_equal('', getfperm(test_null_string()))
+
+  CheckDefExecFailure(['echo getfperm(true)'], 'E928:')
+  CheckDefExecFailure(['echo getfperm(v:null)'], 'E928:')
+enddef
+
+def Test_getfsize()
+  assert_equal(-1, getfsize(""))
+  assert_equal(-1, getfsize(test_null_string()))
+
+  CheckDefExecFailure(['echo getfsize(true)'], 'E928:')
+  CheckDefExecFailure(['echo getfsize(v:null)'], 'E928:')
+enddef
+
+def Test_getftime()
+  assert_equal(-1, getftime(""))
+  assert_equal(-1, getftime(test_null_string()))
+
+  CheckDefExecFailure(['echo getftime(true)'], 'E928:')
+  CheckDefExecFailure(['echo getftime(v:null)'], 'E928:')
+enddef
+
+def Test_getftype()
+  assert_equal('', getftype(""))
+  assert_equal('', getftype(test_null_string()))
+
+  CheckDefExecFailure(['echo getftype(true)'], 'E928:')
+  CheckDefExecFailure(['echo getftype(v:null)'], 'E928:')
 enddef
 
 def Test_getqflist_return_type()
   var l = getqflist()
   l->assert_equal([])
 
-  var d = getqflist(#{items: 0})
-  d->assert_equal(#{items: []})
+  var d = getqflist({items: 0})
+  d->assert_equal({items: []})
 enddef
 
 def Test_getreg()
@@ -320,6 +542,10 @@
   index(['a', 'b', 'a', 'B'], 'b', 2, true)->assert_equal(3)
 enddef
 
+let s:number_one = 1
+let s:number_two = 2
+let s:string_keep = 'keep'
+
 def Test_insert()
   var l = insert([2, 1], 3)
   var res = 0
@@ -329,15 +555,18 @@
   res->assert_equal(6)
 
   assert_equal([1, 2, 3], insert([2, 3], 1))
+  assert_equal([1, 2, 3], insert([2, 3], s:number_one))
   assert_equal([1, 2, 3], insert([1, 2], 3, 2))
+  assert_equal([1, 2, 3], insert([1, 2], 3, s:number_two))
   assert_equal(['a', 'b', 'c'], insert(['b', 'c'], 'a'))
   assert_equal(0z1234, insert(0z34, 0x12))
+
   CheckDefFailure(['insert([2, 3], "a")'], 'E1013: Argument 2: type mismatch, expected number but got string', 1)
   CheckDefFailure(['insert([2, 3], 1, "x")'], 'E1013: Argument 3: type mismatch, expected number but got string', 1)
 enddef
 
 def Test_keys_return_type()
-  const var: list<string> = #{a: 1, b: 2}->keys()
+  const var: list<string> = {a: 1, b: 2}->keys()
   var->assert_equal(['a', 'b'])
 enddef
 
@@ -354,10 +583,49 @@
           ->str2nr()
 enddef
 
+def Test_map_function_arg()
+  var lines =<< trim END
+      def MapOne(i: number, v: string): string
+        return i .. ':' .. v
+      enddef
+      var l = ['a', 'b', 'c']
+      map(l, MapOne)
+      assert_equal(['0:a', '1:b', '2:c'], l)
+  END
+  CheckDefAndScriptSuccess(lines)
+enddef
+
+def Test_map_item_type()
+  var lines =<< trim END
+      var l = ['a', 'b', 'c']
+      map(l, (k, v) => k .. '/' .. v )
+      assert_equal(['0/a', '1/b', '2/c'], l)
+  END
+  CheckDefAndScriptSuccess(lines)
+
+  lines =<< trim END
+    var l: list<number> = [0]
+    echo map(l, (_, v) => [])
+  END
+  CheckDefExecAndScriptFailure(lines, 'E1012: Type mismatch; expected number but got list<unknown>', 2)
+
+  lines =<< trim END
+    var l: list<number> = range(2)
+    echo map(l, (_, v) => [])
+  END
+  CheckDefExecAndScriptFailure(lines, 'E1012: Type mismatch; expected number but got list<unknown>', 2)
+
+  lines =<< trim END
+    var d: dict<number> = {key: 0}
+    echo map(d, (_, v) => [])
+  END
+  CheckDefExecAndScriptFailure(lines, 'E1012: Type mismatch; expected number but got list<unknown>', 2)
+enddef
+
 def Test_maparg()
   var lnum = str2nr(expand('<sflnum>'))
   map foo bar
-  maparg('foo', '', false, true)->assert_equal(#{
+  maparg('foo', '', false, true)->assert_equal({
         lnum: lnum + 1,
         script: 0,
         mode: ' ',
@@ -387,17 +655,71 @@
   nunmap <F3>
 enddef
 
+def Test_max()
+  g:flag = true
+  var l1: list<number> = g:flag
+          ? [1, max([2, 3])]
+          : [4, 5]
+  assert_equal([1, 3], l1)
+
+  g:flag = false
+  var l2: list<number> = g:flag
+          ? [1, max([2, 3])]
+          : [4, 5]
+  assert_equal([4, 5], l2)
+enddef
+
+def Test_min()
+  g:flag = true
+  var l1: list<number> = g:flag
+          ? [1, min([2, 3])]
+          : [4, 5]
+  assert_equal([1, 2], l1)
+
+  g:flag = false
+  var l2: list<number> = g:flag
+          ? [1, min([2, 3])]
+          : [4, 5]
+  assert_equal([4, 5], l2)
+enddef
+
 def Test_nr2char()
   nr2char(97, true)->assert_equal('a')
 enddef
 
 def Test_readdir()
-   eval expand('sautest')->readdir({e -> e[0] !=# '.'})
-   eval expand('sautest')->readdirex({e -> e.name[0] !=# '.'})
+   eval expand('sautest')->readdir((e) => e[0] !=# '.')
+   eval expand('sautest')->readdirex((e) => e.name[0] !=# '.')
+enddef
+
+def Test_readblob()
+  var blob = 0z12341234
+  writefile(blob, 'Xreadblob')
+  var read: blob = readblob('Xreadblob')
+  assert_equal(blob, read)
+
+  var lines =<< trim END
+      var read: list<string> = readblob('Xreadblob')
+  END
+  CheckDefAndScriptFailure(lines, 'E1012: Type mismatch; expected list<string> but got blob', 1)
+  delete('Xreadblob')
+enddef
+
+def Test_readfile()
+  var text = ['aaa', 'bbb', 'ccc']
+  writefile(text, 'Xreadfile')
+  var read: list<string> = readfile('Xreadfile')
+  assert_equal(text, read)
+
+  var lines =<< trim END
+      var read: dict<string> = readfile('Xreadfile')
+  END
+  CheckDefAndScriptFailure(lines, 'E1012: Type mismatch; expected dict<string> but got list<string>', 1)
+  delete('Xreadfile')
 enddef
 
 def Test_remove_return_type()
-  var l = remove(#{one: [1, 2], two: [3, 4]}, 'one')
+  var l = remove({one: [1, 2], two: [3, 4]}, 'one')
   var res = 0
   for n in l
     res += n
@@ -419,24 +741,24 @@
   setline(1, ['foo', 'bar'])
   var val = 0
   # skip expr returns boolean
-  search('bar', 'W', 0, 0, {-> val == 1})->assert_equal(2)
+  search('bar', 'W', 0, 0, () => val == 1)->assert_equal(2)
   :1
-  search('bar', 'W', 0, 0, {-> val == 0})->assert_equal(0)
+  search('bar', 'W', 0, 0, () => val == 0)->assert_equal(0)
   # skip expr returns number, only 0 and 1 are accepted
   :1
-  search('bar', 'W', 0, 0, {-> 0})->assert_equal(2)
+  search('bar', 'W', 0, 0, () => 0)->assert_equal(2)
   :1
-  search('bar', 'W', 0, 0, {-> 1})->assert_equal(0)
-  assert_fails("search('bar', '', 0, 0, {-> -1})", 'E1023:')
-  assert_fails("search('bar', '', 0, 0, {-> -1})", 'E1023:')
+  search('bar', 'W', 0, 0, () => 1)->assert_equal(0)
+  assert_fails("search('bar', '', 0, 0, () => -1)", 'E1023:')
+  assert_fails("search('bar', '', 0, 0, () => -1)", 'E1023:')
 enddef
 
 def Test_searchcount()
   new
   setline(1, "foo bar")
   :/foo
-  searchcount(#{recompute: true})
-      ->assert_equal(#{
+  searchcount({recompute: true})
+      ->assert_equal({
           exact_match: 1,
           current: 1,
           total: 1,
@@ -454,19 +776,29 @@
   &syntax->assert_equal('vim')
   setbufvar(bufnr('%'), '&ts', 16)
   &ts->assert_equal(16)
+  setbufvar(bufnr('%'), '&ai', true)
+  &ai->assert_equal(true)
+  setbufvar(bufnr('%'), '&ft', 'filetype')
+  &ft->assert_equal('filetype')
+
   settabwinvar(1, 1, '&syntax', 'vam')
   &syntax->assert_equal('vam')
   settabwinvar(1, 1, '&ts', 15)
   &ts->assert_equal(15)
   setlocal ts=8
+  settabwinvar(1, 1, '&list', false)
+  &list->assert_equal(false)
+  settabwinvar(1, 1, '&list', true)
+  &list->assert_equal(true)
+  setlocal list&
 
   setbufvar('%', 'myvar', 123)
   getbufvar('%', 'myvar')->assert_equal(123)
 enddef
 
 def Test_setloclist()
-  var items = [#{filename: '/tmp/file', lnum: 1, valid: true}]
-  var what = #{items: items}
+  var items = [{filename: '/tmp/file', lnum: 1, valid: true}]
+  var what = {items: items}
   setqflist([], ' ', what)
   setloclist(0, [], ' ', what)
 enddef
@@ -478,6 +810,29 @@
   getreginfo('a')->assert_equal(reginfo)
 enddef 
 
+def Test_slice()
+  assert_equal('12345', slice('012345', 1))
+  assert_equal('123', slice('012345', 1, 4))
+  assert_equal('1234', slice('012345', 1, -1))
+  assert_equal('1', slice('012345', 1, -4))
+  assert_equal('', slice('012345', 1, -5))
+  assert_equal('', slice('012345', 1, -6))
+
+  assert_equal([1, 2, 3, 4, 5], slice(range(6), 1))
+  assert_equal([1, 2, 3], slice(range(6), 1, 4))
+  assert_equal([1, 2, 3, 4], slice(range(6), 1, -1))
+  assert_equal([1], slice(range(6), 1, -4))
+  assert_equal([], slice(range(6), 1, -5))
+  assert_equal([], slice(range(6), 1, -6))
+
+  assert_equal(0z1122334455, slice(0z001122334455, 1))
+  assert_equal(0z112233, slice(0z001122334455, 1, 4))
+  assert_equal(0z11223344, slice(0z001122334455, 1, -1))
+  assert_equal(0z11, slice(0z001122334455, 1, -4))
+  assert_equal(0z, slice(0z001122334455, 1, -5))
+  assert_equal(0z, slice(0z001122334455, 1, -6))
+enddef
+
 def Test_spellsuggest()
   if !has('spell')
     MissingFeature 'spell'
@@ -492,8 +847,18 @@
 enddef
 
 def Test_sort_argument()
-  var res = ['b', 'a', 'c']->sort('i')
-  res->assert_equal(['a', 'b', 'c'])
+  var lines =<< trim END
+    var res = ['b', 'a', 'c']->sort('i')
+    res->assert_equal(['a', 'b', 'c'])
+
+    def Compare(a: number, b: number): number
+      return a - b
+    enddef
+    var l = [3, 6, 7, 1, 8, 2, 4, 5]
+    sort(l, Compare)
+    assert_equal([1, 2, 3, 4, 5, 6, 7, 8], l)
+  END
+  CheckDefAndScriptSuccess(lines)
 enddef
 
 def Test_split()
@@ -502,6 +867,13 @@
 
 def Test_str2nr()
   str2nr("1'000'000", 10, true)->assert_equal(1000000)
+
+  CheckDefFailure(['echo str2nr(123)'], 'E1013:')
+  CheckScriptFailure(['vim9script', 'echo str2nr(123)'], 'E1024:')
+  CheckDefFailure(['echo str2nr("123", "x")'], 'E1013:')
+  CheckScriptFailure(['vim9script', 'echo str2nr("123", "x")'], 'E1030:')
+  CheckDefFailure(['echo str2nr("123", 10, "x")'], 'E1013:')
+  CheckScriptFailure(['vim9script', 'echo str2nr("123", 10, "x")'], 'E1135:')
 enddef
 
 def Test_strchars()
@@ -510,7 +882,7 @@
 
 def Test_submatch()
   var pat = 'A\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)'
-  var Rep = {-> range(10)->map({_, v -> submatch(v, true)})->string()}
+  var Rep = () => range(10)->mapnew((_, v) => submatch(v, true))->string()
   var actual = substitute('A123456789', pat, Rep, '')
   var expected = "[['A123456789'], ['1'], ['2'], ['3'], ['4'], ['5'], ['6'], ['7'], ['8'], ['9']]"
   actual->assert_equal(expected)
@@ -539,25 +911,50 @@
   else
     botright new
     var winnr = winnr()
-    term_start(&shell, #{curwin: true})
+    term_start(&shell, {curwin: true})
     winnr()->assert_equal(winnr)
     bwipe!
   endif
 enddef
 
 def Test_timer_paused()
-  var id = timer_start(50, {-> 0})
+  var id = timer_start(50, () => 0)
   timer_pause(id, true)
   var info = timer_info(id)
   info[0]['paused']->assert_equal(1)
   timer_stop(id)
 enddef
 
+def Test_win_execute()
+  assert_equal("\n" .. winnr(), win_execute(win_getid(), 'echo winnr()'))
+  assert_equal('', win_execute(342343, 'echo winnr()'))
+enddef
+
 def Test_win_splitmove()
   split
-  win_splitmove(1, 2, #{vertical: true, rightbelow: true})
+  win_splitmove(1, 2, {vertical: true, rightbelow: true})
+  close
+enddef
+
+def Test_winrestcmd()
+  split
+  var cmd = winrestcmd()
+  wincmd _
+  exe cmd
+  assert_equal(cmd, winrestcmd())
   close
 enddef
 
+def Test_winsaveview()
+  var view: dict<number> = winsaveview()
+
+  var lines =<< trim END
+      var view: list<number> = winsaveview()
+  END
+  CheckDefAndScriptFailure(lines, 'E1012: Type mismatch; expected list<number> but got dict<number>', 1)
+enddef
+
+
+
 
 " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
diff -Nru vim-8.2.1913/src/testdir/test_vim9_cmd.vim vim-8.2.2434/src/testdir/test_vim9_cmd.vim
--- vim-8.2.1913/src/testdir/test_vim9_cmd.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_vim9_cmd.vim	2021-01-30 22:05:11.000000000 +0000
@@ -2,6 +2,7 @@
 
 source check.vim
 source vim9.vim
+source term_util.vim
 source view_util.vim
 
 def Test_edit_wildcards()
@@ -19,6 +20,93 @@
 
   edit X`=filename`xx`=filenr`yy
   assert_equal('XXtestxx77yy', bufname())
+
+  CheckDefFailure(['edit `=xxx`'], 'E1001:')
+  CheckDefFailure(['edit `="foo"'], 'E1083:')
+enddef
+
+def Test_expand_alternate_file()
+  var lines =<< trim END
+    edit Xfileone
+    var bone = bufnr()
+    edit Xfiletwo
+    var btwo = bufnr()
+    edit Xfilethree
+    var bthree = bufnr()
+
+    edit #
+    assert_equal(bthree, bufnr())
+    edit %%
+    assert_equal(btwo, bufnr())
+    edit %% # comment
+    assert_equal(bthree, bufnr())
+    edit %%yy
+    assert_equal('Xfiletwoyy', bufname())
+
+    exe "edit %%" .. bone
+    assert_equal(bone, bufnr())
+    exe "edit %%" .. btwo .. "xx"
+    assert_equal('Xfiletwoxx', bufname())
+
+    next Xfileone Xfiletwo Xfilethree
+    assert_equal('Xfileone', argv(0))
+    assert_equal('Xfiletwo', argv(1))
+    assert_equal('Xfilethree', argv(2))
+    next %%%zz
+    assert_equal('Xfileone', argv(0))
+    assert_equal('Xfiletwo', argv(1))
+    assert_equal('Xfilethreezz', argv(2))
+
+    v:oldfiles = ['Xonefile', 'Xtwofile']
+    edit %%<1
+    assert_equal('Xonefile', bufname())
+    edit %%<2
+    assert_equal('Xtwofile', bufname())
+    assert_fails('edit %%<3', 'E684:')
+
+    edit Xfileone.vim
+    edit Xfiletwo
+    edit %%:r
+    assert_equal('Xfileone', bufname())
+
+    assert_false(bufexists('altfoo'))
+    edit altfoo
+    edit bar
+    assert_true(bufexists('altfoo'))
+    assert_true(buflisted('altfoo'))
+    bdel %%
+    assert_true(bufexists('altfoo'))
+    assert_false(buflisted('altfoo'))
+    bwipe! altfoo
+    bwipe! bar
+  END
+  CheckDefAndScriptSuccess(lines)
+enddef
+
+def Test_global_backtick_expansion()
+  new
+  setline(1, 'xx')
+  var name = 'foobar'
+  g/^xx/s/.*/`=name`
+  assert_equal('foobar', getline(1))
+  bwipe!
+enddef
+
+def Test_folddo_backtick_expansion()
+  new
+  var name = 'xxx'
+  folddoopen edit `=name`
+  assert_equal('xxx', bufname())
+  bwipe!
+
+  new
+  setline(1, ['one', 'two'])
+  set nomodified
+  :1,2fold
+  foldclose
+  folddoclose edit `=name`
+  assert_equal('xxx', bufname())
+  bwipe!
 enddef
 
 def Test_hardcopy_wildcards()
@@ -73,7 +161,7 @@
       if 'text'
       endif
   END
-  CheckDefAndScriptFailure(lines, 'E1030:', 1)
+  CheckDefAndScriptFailure(lines, 'E1135:', 1)
 
   lines =<< trim END
       if [1]
@@ -87,7 +175,7 @@
       if g:cond
       endif
   END
-  CheckDefExecAndScriptFailure(lines, 'E1030:', 2)
+  CheckDefExecAndScriptFailure(lines, 'E1135:', 2)
 
   lines =<< trim END
       g:cond = 0
@@ -96,7 +184,7 @@
       endif
   END
   CheckDefFailure(lines, 'E1012:', 3)
-  CheckScriptFailure(['vim9script'] + lines, 'E1030:', 4)
+  CheckScriptFailure(['vim9script'] + lines, 'E1135:', 4)
 
   lines =<< trim END
       if g:cond
@@ -112,14 +200,14 @@
       elseif g:cond
       endif
   END
-  CheckDefExecAndScriptFailure(lines, 'E1030:', 3)
+  CheckDefExecAndScriptFailure(lines, 'E1135:', 3)
 
   lines =<< trim END
       while 'text'
       endwhile
   END
   CheckDefFailure(lines, 'E1012:', 1)
-  CheckScriptFailure(['vim9script'] + lines, 'E1030:', 2)
+  CheckScriptFailure(['vim9script'] + lines, 'E1135:', 2)
 
   lines =<< trim END
       while [1]
@@ -133,7 +221,7 @@
       while g:cond
       endwhile
   END
-  CheckDefExecAndScriptFailure(lines, 'E1030:', 2)
+  CheckDefExecAndScriptFailure(lines, 'E1135:', 2)
 enddef
 
 def Test_if_linebreak()
@@ -242,26 +330,40 @@
   CheckScriptSuccess(lines)
 enddef
 
+def Test_method_call_whitespace()
+  var lines =<< trim END
+    new
+    var yank = 'text'
+    yank->setline(1)
+    yank  ->setline(2)
+    yank->  setline(3)
+    yank  ->  setline(4)
+    assert_equal(['text', 'text', 'text', 'text'], getline(1, 4))
+    bwipe!
+  END
+  CheckDefAndScriptSuccess(lines)
+enddef
+
 def Test_skipped_expr_linebreak()
   if 0
     var x = []
-               ->map({ -> 0})
+               ->map(() => 0)
   endif
 enddef
 
 def Test_dict_member()
-   var test: dict<list<number>> = {'data': [3, 1, 2]}
+   var test: dict<list<number>> = {data: [3, 1, 2]}
    test.data->sort()
-   assert_equal(#{data: [1, 2, 3]}, test)
+   assert_equal({data: [1, 2, 3]}, test)
    test.data
       ->reverse()
-   assert_equal(#{data: [3, 2, 1]}, test)
+   assert_equal({data: [3, 2, 1]}, test)
 
   var lines =<< trim END
       vim9script
-      var test: dict<list<number>> = {'data': [3, 1, 2]}
+      var test: dict<list<number>> = {data: [3, 1, 2]}
       test.data->sort()
-      assert_equal(#{data: [1, 2, 3]}, test)
+      assert_equal({data: [1, 2, 3]}, test)
   END
   CheckScriptSuccess(lines)
 enddef
@@ -307,9 +409,287 @@
 enddef
 
 def Test_filter_is_not_modifier()
-  var tags = [{'a': 1, 'b': 2}, {'x': 3, 'y': 4}]
-  filter(tags, { _, v -> has_key(v, 'x') ? 1 : 0 })
-  assert_equal([#{x: 3, y: 4}], tags)
+  var tags = [{a: 1, b: 2}, {x: 3, y: 4}]
+  filter(tags, ( _, v) => has_key(v, 'x') ? 1 : 0 )
+  assert_equal([{x: 3, y: 4}], tags)
+enddef
+
+def Test_command_modifier_filter()
+  var lines =<< trim END
+    final expected = "\nType Name Content\n  c  \"c   piyo"
+    @a = 'hoge'
+    @b = 'fuga'
+    @c = 'piyo'
+
+    assert_equal(execute('filter /piyo/ registers abc'), expected)
+  END
+  CheckDefAndScriptSuccess(lines)
+enddef
+
+def Test_win_command_modifiers()
+  assert_equal(1, winnr('$'))
+
+  set splitright
+  vsplit
+  assert_equal(2, winnr())
+  close
+  aboveleft vsplit
+  assert_equal(1, winnr())
+  close
+  set splitright&
+
+  vsplit
+  assert_equal(1, winnr())
+  close
+  belowright vsplit
+  assert_equal(2, winnr())
+  close
+  rightbelow vsplit
+  assert_equal(2, winnr())
+  close
+
+  if has('browse')
+    browse set
+    assert_equal('option-window', expand('%'))
+    close
+  endif
+
+  vsplit
+  botright split
+  assert_equal(3, winnr())
+  assert_equal(&columns, winwidth(0))
+  close
+  close
+
+  vsplit
+  topleft split
+  assert_equal(1, winnr())
+  assert_equal(&columns, winwidth(0))
+  close
+  close
+
+  gettabinfo()->len()->assert_equal(1)
+  tab split
+  gettabinfo()->len()->assert_equal(2)
+  tabclose
+
+  vertical new
+  assert_inrange(&columns / 2 - 2, &columns / 2 + 1, winwidth(0))
+  close
+enddef
+
+func Test_command_modifier_confirm()
+  CheckNotGui
+  CheckRunVimInTerminal
+
+  " Test for saving all the modified buffers
+  let lines =<< trim END
+    call setline(1, 'changed')
+    def Getout()
+      confirm write Xfile
+    enddef
+  END
+  call writefile(lines, 'Xconfirmscript')
+  call writefile(['empty'], 'Xfile')
+  let buf = RunVimInTerminal('-S Xconfirmscript', {'rows': 8})
+  call term_sendkeys(buf, ":call Getout()\n")
+  call WaitForAssert({-> assert_match('(Y)es, \[N\]o: ', term_getline(buf, 8))}, 1000)
+  call term_sendkeys(buf, "y")
+  call WaitForAssert({-> assert_match('(Y)es, \[N\]o: ', term_getline(buf, 8))}, 1000)
+  call term_sendkeys(buf, "\<CR>")
+  call TermWait(buf)
+  call StopVimInTerminal(buf)
+
+  call assert_equal(['changed'], readfile('Xfile'))
+  call delete('Xfile')
+  call delete('.Xfile.swp')  " in case Vim was killed
+  call delete('Xconfirmscript')
+endfunc
+
+def Test_command_modifiers_keep()
+  if has('unix')
+    def DoTest(addRflag: bool, keepMarks: bool, hasMarks: bool)
+      new
+      setline(1, ['one', 'two', 'three'])
+      normal 1Gma
+      normal 2Gmb
+      normal 3Gmc
+      if addRflag
+        set cpo+=R
+      else
+        set cpo-=R
+      endif
+      if keepMarks
+        keepmarks :%!cat
+      else
+        :%!cat
+      endif
+      if hasMarks
+        assert_equal(1, line("'a"))
+        assert_equal(2, line("'b"))
+        assert_equal(3, line("'c"))
+      else
+        assert_equal(0, line("'a"))
+        assert_equal(0, line("'b"))
+        assert_equal(0, line("'c"))
+      endif
+      quit!
+    enddef
+    DoTest(false, false, true)
+    DoTest(true, false, false)
+    DoTest(false, true, true)
+    DoTest(true, true, true)
+    set cpo&vim
+
+    new
+    setline(1, ['one', 'two', 'three', 'four'])
+    assert_equal(4, line("$"))
+    normal 1Gma
+    normal 2Gmb
+    normal 3Gmc
+    lockmarks :1,2!wc
+    # line is deleted, marks don't move
+    assert_equal(3, line("$"))
+    assert_equal('four', getline(3))
+    assert_equal(1, line("'a"))
+    assert_equal(2, line("'b"))
+    assert_equal(3, line("'c"))
+    quit!
+  endif
+
+  edit Xone
+  edit Xtwo
+  assert_equal('Xone', expand('#'))
+  keepalt edit Xthree
+  assert_equal('Xone', expand('#'))
+
+  normal /a*b*
+  assert_equal('a*b*', histget("search"))
+  keeppatterns normal /c*d*
+  assert_equal('a*b*', histget("search"))
+
+  new
+  setline(1, range(10))
+  :10
+  normal gg
+  assert_equal(10, getpos("''")[1])
+  keepjumps normal 5G
+  assert_equal(10, getpos("''")[1])
+  quit!
+enddef
+
+def Test_bar_line_continuation()
+  var lines =<< trim END
+      au BufNewFile Xfile g:readFile = 1
+          | g:readExtra = 2
+      g:readFile = 0
+      g:readExtra = 0
+      edit Xfile
+      assert_equal(1, g:readFile)
+      assert_equal(2, g:readExtra)
+      bwipe!
+      au! BufNewFile
+
+      au BufNewFile Xfile g:readFile = 1
+          | g:readExtra = 2
+          | g:readMore = 3
+      g:readFile = 0
+      g:readExtra = 0
+      g:readMore = 0
+      edit Xfile
+      assert_equal(1, g:readFile)
+      assert_equal(2, g:readExtra)
+      assert_equal(3, g:readMore)
+      bwipe!
+      au! BufNewFile
+      unlet g:readFile
+      unlet g:readExtra
+      unlet g:readMore
+  END
+  CheckDefAndScriptSuccess(lines)
+enddef
+
+def Test_command_modifier_other()
+  new Xsomefile
+  setline(1, 'changed')
+  var buf = bufnr()
+  hide edit Xotherfile
+  var info = getbufinfo(buf)
+  assert_equal(1, info[0].hidden)
+  assert_equal(1, info[0].changed)
+  edit Xsomefile
+  bwipe!
+
+  au BufNewFile Xfile g:readFile = 1
+  g:readFile = 0
+  edit Xfile
+  assert_equal(1, g:readFile)
+  bwipe!
+  g:readFile = 0
+  noautocmd edit Xfile
+  assert_equal(0, g:readFile)
+  au! BufNewFile
+  unlet g:readFile
+
+  noswapfile edit XnoSwap
+  assert_equal(false, &l:swapfile)
+  bwipe!
+
+  var caught = false
+  try
+    sandbox !ls
+  catch /E48:/
+    caught = true
+  endtry
+  assert_true(caught)
+
+  :8verbose g:verbose_now = &verbose
+  assert_equal(8, g:verbose_now)
+  unlet g:verbose_now
+enddef
+
+def EchoHere()
+  echomsg 'here'
+enddef
+def EchoThere()
+  unsilent echomsg 'there'
+enddef
+
+def Test_modifier_silent_unsilent()
+  echomsg 'last one'
+  silent echomsg "text"
+  assert_equal("\nlast one", execute(':1messages'))
+
+  silent! echoerr "error"
+
+  echomsg 'last one'
+  silent EchoHere()
+  assert_equal("\nlast one", execute(':1messages'))
+
+  silent EchoThere()
+  assert_equal("\nthere", execute(':1messages'))
+
+  try
+    silent eval [][0]
+  catch
+    echomsg "caught"
+  endtry
+  assert_equal("\ncaught", execute(':1messages'))
+enddef
+
+def Test_range_after_command_modifier()
+  CheckScriptFailure(['vim9script', 'silent keepjump 1d _'], 'E1050: Colon required before a range: 1d _', 2)
+  new
+  setline(1, 'xxx')
+  CheckScriptSuccess(['vim9script', 'silent keepjump :1d _'])
+  assert_equal('', getline(1))
+  bwipe!
+enddef
+
+def Test_silent_pattern()
+  new
+  silent! :/pat/put _
+  bwipe!
 enddef
 
 def Test_eval_command()
@@ -325,6 +705,19 @@
         ->Increment()
   assert_equal(111 + 3 + 4 + 5, g:val)
   unlet g:val
+
+  var lines =<< trim END
+    vim9script
+    g:caught = 'no'
+    try
+      eval 123 || 0
+    catch
+      g:caught = 'yes'
+    endtry
+    assert_equal('yes', g:caught)
+    unlet g:caught
+  END
+  CheckScriptSuccess(lines)
 enddef
 
 def Test_map_command()
@@ -368,6 +761,38 @@
   assert_equal('above', getline(3))
   assert_equal('below', getline(4))
 
+  :2put =['a', 'b', 'c']
+  assert_equal(['ppp', 'a', 'b', 'c', 'above'], getline(2, 6))
+
+  # compute range at runtime
+  setline(1, range(1, 8))
+  @a = 'aaa'
+  :$-2put a
+  assert_equal('aaa', getline(7))
+
+  setline(1, range(1, 8))
+  :2
+  :+2put! a
+  assert_equal('aaa', getline(4))
+
+  []->mapnew(() => 0)
+  :$put ='end'
+  assert_equal('end', getline('$'))
+
+  bwipe!
+
+  CheckDefFailure(['put =xxx'], 'E1001:')
+enddef
+
+def Test_put_with_linebreak()
+  new
+  var lines =<< trim END
+    vim9script
+    pu =split('abc', '\zs')
+            ->join()
+  END
+  CheckScriptSuccess(lines)
+  getline(2)->assert_equal('a b c')
   bwipe!
 enddef
 
@@ -401,17 +826,138 @@
   CheckScriptSuccess(lines)
 enddef
 
-def Test_modifier_silent()
-  echomsg 'last one'
-  silent echomsg "text"
-  redir => g:testmsg
-    :1messages
-  redir END
-  assert_equal("\nlast one", g:testmsg)
-  unlet g:testmsg
+def Test_user_command_comment()
+  command -nargs=1 Comd echom <q-args>
 
-  silent! echoerr "error"
+  var lines =<< trim END
+    vim9script
+    Comd # comment
+  END
+  CheckScriptSuccess(lines)
+
+  lines =<< trim END
+    vim9script
+    Comd# comment
+  END
+  CheckScriptFailure(lines, 'E1144:')
+
+  delcommand Comd
+enddef
+
+def Test_star_command()
+  var lines =<< trim END
+    vim9script
+    @s = 'g:success = 8'
+    set cpo+=*
+    exe '*s'
+    assert_equal(8, g:success)
+    unlet g:success
+    set cpo-=*
+    assert_fails("exe '*s'", 'E1050:')
+  END
+  CheckScriptSuccess(lines)
+enddef
+
+def Test_cmd_argument_without_colon()
+  new Xfile
+  setline(1, ['a', 'b', 'c', 'd'])
+  write
+  edit +3 %
+  assert_equal(3, getcurpos()[1])
+  edit +/a %
+  assert_equal(1, getcurpos()[1])
+  bwipe
+  delete('Xfile')
+enddef
+
+def Test_ambiguous_user_cmd()
+  command Cmd1 eval 0
+  command Cmd2 eval 0
+  var lines =<< trim END
+      Cmd
+  END
+  CheckDefAndScriptFailure(lines, 'E464:', 1)
+  delcommand Cmd1
+  delcommand Cmd2
+enddef
+
+def Test_command_not_recognized()
+  var lines =<< trim END
+    d.key = 'asdf'
+  END
+  CheckDefFailure(lines, 'E1146:', 1)
+
+  lines =<< trim END
+    d['key'] = 'asdf'
+  END
+  CheckDefFailure(lines, 'E1146:', 1)
+enddef
+
+def Test_magic_not_used()
+  new
+  for cmd in ['set magic', 'set nomagic']
+    exe cmd
+    setline(1, 'aaa')
+    s/.../bbb/
+    assert_equal('bbb', getline(1))
+  endfor
+
+  set magic
+  setline(1, 'aaa')
+  assert_fails('s/.\M../bbb/', 'E486:')
+  assert_fails('snomagic/.../bbb/', 'E486:')
+  assert_equal('aaa', getline(1))
+
+  bwipe!
+enddef
+
+def Test_gdefault_not_used()
+  new
+  for cmd in ['set gdefault', 'set nogdefault']
+    exe cmd
+    setline(1, 'aaa')
+    s/./b/
+    assert_equal('baa', getline(1))
+  endfor
+
+  set nogdefault
+  bwipe!
+enddef
+
+def g:SomeComplFunc(findstart: number, base: string): any
+  if findstart
+    return 0
+  else
+    return ['aaa', 'bbb']
+  endif
+enddef
+
+def Test_insert_complete()
+  # this was running into an error with the matchparen hack
+  new
+  set completefunc=SomeComplFunc
+  feedkeys("i\<c-x>\<c-u>\<Esc>", 'ntx')
+  assert_equal('aaa', getline(1))
+
+  set completefunc=
+  bwipe!
 enddef
 
+def Test_wincmd()
+  split
+  var id1 = win_getid()
+  if true
+    try | wincmd w | catch | endtry
+  endif
+  assert_notequal(id1, win_getid())
+  close
+enddef
+
+def Test_windo_missing_endif()
+  var lines =<< trim END
+      windo if 1
+  END
+  CheckDefExecFailure(lines, 'E171:', 1)
+enddef
 
 " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
diff -Nru vim-8.2.1913/src/testdir/test_vim9_disassemble.vim vim-8.2.2434/src/testdir/test_vim9_disassemble.vim
--- vim-8.2.1913/src/testdir/test_vim9_disassemble.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_vim9_disassemble.vim	2021-01-30 22:05:11.000000000 +0000
@@ -15,6 +15,7 @@
 def s:ScriptFuncLoad(arg: string)
   var local = 1
   buffers
+  echo
   echo arg
   echo local
   echo &lines
@@ -22,6 +23,7 @@
   echo s:scriptvar
   echo g:globalvar
   echo get(g:, "global")
+  echo g:auto#var
   echo b:buffervar
   echo get(b:, "buffer")
   echo w:windowvar
@@ -43,19 +45,38 @@
 
   var res = execute('disass s:ScriptFuncLoad')
   assert_match('<SNR>\d*_ScriptFuncLoad.*' ..
-        'buffers.*' ..
-        ' EXEC \+buffers.*' ..
-        ' LOAD arg\[-1\].*' ..
-        ' LOAD $0.*' ..
-        ' LOADOPT &lines.*' ..
-        ' LOADV v:version.*' ..
-        ' LOADS s:scriptvar from .*test_vim9_disassemble.vim.*' ..
-        ' LOADG g:globalvar.*' ..
+        'buffers\_s*' ..
+        '\d\+ EXEC \+buffers\_s*' ..
+        'echo\_s*' ..
+        'echo arg\_s*' ..
+        '\d\+ LOAD arg\[-1\]\_s*' ..
+        '\d\+ ECHO 1\_s*' ..
+        'echo local\_s*' ..
+        '\d\+ LOAD $0\_s*' ..
+        '\d\+ ECHO 1\_s*' ..
+        'echo &lines\_s*' ..
+        '\d\+ LOADOPT &lines\_s*' ..
+        '\d\+ ECHO 1\_s*' ..
+        'echo v:version\_s*' ..
+        '\d\+ LOADV v:version\_s*' ..
+        '\d\+ ECHO 1\_s*' ..
+        'echo s:scriptvar\_s*' ..
+        '\d\+ LOADS s:scriptvar from .*test_vim9_disassemble.vim\_s*' ..
+        '\d\+ ECHO 1\_s*' ..
+        'echo g:globalvar\_s*' ..
+        '\d\+ LOADG g:globalvar\_s*' ..
+        '\d\+ ECHO 1\_s*' ..
         'echo get(g:, "global")\_s*' ..
         '\d\+ LOAD g:\_s*' ..
         '\d\+ PUSHS "global"\_s*' ..
-        '\d\+ BCALL get(argc 2).*' ..
-        ' LOADB b:buffervar.*' ..
+        '\d\+ BCALL get(argc 2)\_s*' ..
+        '\d\+ ECHO 1\_s*' ..
+        'echo g:auto#var\_s*' ..
+        '\d\+ LOADAUTO g:auto#var\_s*' ..
+        '\d\+ ECHO 1\_s*' ..
+        'echo b:buffervar\_s*' ..
+        '\d\+ LOADB b:buffervar\_s*' ..
+        '\d\+ ECHO 1\_s*' ..
         'echo get(b:, "buffer")\_s*' ..
         '\d\+ LOAD b:\_s*' ..
         '\d\+ PUSHS "buffer"\_s*' ..
@@ -96,8 +117,7 @@
         '\d 2STRING stack\[-1\]\_s*' ..
         '\d\+ PUSHS ".txt"\_s*' ..
         '\d\+ EXECCONCAT 4\_s*' ..
-        '\d\+ PUSHNR 0\_s*' ..
-        '\d\+ RETURN',
+        '\d\+ RETURN 0',
         res)
 enddef
 
@@ -113,8 +133,7 @@
         '\d EXEC   norm! m\[jjm\]\_s*' ..
         '  :''\[,''\]yank\_s*' ..
         '\d EXEC   :''\[,''\]yank\_s*' ..
-        '\d PUSHNR 0\_s*' ..
-        '\d RETURN',
+        '\d RETURN 0',
         res)
 enddef
 
@@ -128,8 +147,21 @@
         ' :3put ="text"\_s*' ..
         '\d PUSHS "text"\_s*' ..
         '\d PUT = 3\_s*' ..
-        '\d PUSHNR 0\_s*' ..
-        '\d RETURN',
+        '\d RETURN 0',
+        res)
+enddef
+
+def s:PutRange()
+  :$-2put a
+enddef
+
+def Test_disassemble_put_range()
+  var res = execute('disass s:PutRange')
+  assert_match('<SNR>\d*_PutRange.*' ..
+        ' :$-2put a\_s*' ..
+        '\d RANGE $-2\_s*' ..
+        '\d PUT a range\_s*' ..
+        '\d RETURN 0',
         res)
 enddef
 
@@ -146,7 +178,7 @@
   var res = execute('disass s:ScriptFuncPush')
   assert_match('<SNR>\d*_ScriptFuncPush.*' ..
         'localbool = true.*' ..
-        ' PUSH v:true.*' ..
+        ' PUSH true.*' ..
         'localspec = v:none.*' ..
         ' PUSH v:none.*' ..
         'localblob = 0z1234.*' ..
@@ -168,6 +200,7 @@
   v:char = 'abc'
   s:scriptvar = 'sv'
   g:globalvar = 'gv'
+  g:auto#var = 'av'
   b:buffervar = 'bv'
   w:windowvar = 'wv'
   t:tabpagevar = 'tv'
@@ -191,6 +224,8 @@
         ' STORES s:scriptvar in .*test_vim9_disassemble.vim.*' ..
         'g:globalvar = ''gv''.*' ..
         ' STOREG g:globalvar.*' ..
+        'g:auto#var = ''av''.*' ..
+        ' STOREAUTO g:auto#var.*' ..
         'b:buffervar = ''bv''.*' ..
         ' STOREB b:buffervar.*' ..
         'w:windowvar = ''wv''.*' ..
@@ -218,6 +253,7 @@
   assert_match('<SNR>\d*_ScriptFuncStoreMember\_s*' ..
         'var locallist: list<number> = []\_s*' ..
         '\d NEWLIST size 0\_s*' ..
+        '\d SETTYPE list<number>\_s*' ..
         '\d STORE $0\_s*' ..
         'locallist\[0\] = 123\_s*' ..
         '\d PUSHNR 123\_s*' ..
@@ -226,14 +262,37 @@
         '\d STORELIST\_s*' ..
         'var localdict: dict<number> = {}\_s*' ..
         '\d NEWDICT size 0\_s*' ..
+        '\d SETTYPE dict<number>\_s*' ..
         '\d STORE $1\_s*' ..
         'localdict\["a"\] = 456\_s*' ..
         '\d\+ PUSHNR 456\_s*' ..
         '\d\+ PUSHS "a"\_s*' ..
         '\d\+ LOAD $1\_s*' ..
         '\d\+ STOREDICT\_s*' ..
-        '\d\+ PUSHNR 0\_s*' ..
-        '\d\+ RETURN',
+        '\d\+ RETURN 0',
+        res)
+enddef
+
+def s:ScriptFuncStoreIndex()
+  var d = {dd: {}}
+  d.dd[0] = 0
+enddef
+
+def Test_disassemble_store_index()
+  var res = execute('disass s:ScriptFuncStoreIndex')
+  assert_match('<SNR>\d*_ScriptFuncStoreIndex\_s*' ..
+        'var d = {dd: {}}\_s*' ..
+        '\d PUSHS "dd"\_s*' ..
+        '\d NEWDICT size 0\_s*' ..
+        '\d NEWDICT size 1\_s*' ..
+        '\d STORE $0\_s*' ..
+        'd.dd\[0\] = 0\_s*' ..
+        '\d PUSHNR 0\_s*' ..
+        '\d PUSHNR 0\_s*' ..
+        '\d LOAD $0\_s*' ..
+        '\d MEMBER dd\_s*' ..
+        '\d STOREINDEX\_s*' ..
+        '\d\+ RETURN 0',
         res)
 enddef
 
@@ -268,8 +327,7 @@
         '\d\+ STORE $1\_s*' ..
         '\d\+ SLICE 2\_s*' ..
         '\d\+ STORE $2\_s*' ..
-        '\d\+ PUSHNR 0\_s*' ..
-        '\d\+ RETURN',
+        '\d\+ RETURN 0',
         res)
 enddef
 
@@ -284,6 +342,7 @@
   assert_match('<SNR>\d*_ListAdd\_s*' ..
         'var l: list<number> = []\_s*' ..
         '\d NEWLIST size 0\_s*' ..
+        '\d SETTYPE list<number>\_s*' ..
         '\d STORE $0\_s*' ..
         'add(l, 123)\_s*' ..
         '\d LOAD $0\_s*' ..
@@ -296,8 +355,7 @@
         '\d\+ CHECKTYPE number stack\[-1\]\_s*' ..
         '\d\+ LISTAPPEND\_s*' ..
         '\d\+ DROP\_s*' ..
-        '\d\+ PUSHNR 0\_s*' ..
-        '\d\+ RETURN',
+        '\d\+ RETURN 0',
         res)
 enddef
 
@@ -324,8 +382,7 @@
         '\d\+ CHECKTYPE number stack\[-1\]\_s*' ..
         '\d\+ BLOBAPPEND\_s*' ..
         '\d\+ DROP\_s*' ..
-        '\d\+ PUSHNR 0\_s*' ..
-        '\d\+ RETURN',
+        '\d\+ RETURN 0',
         res)
 enddef
 
@@ -390,7 +447,7 @@
 
 def s:ScriptFuncNew()
   var ll = [1, "two", 333]
-  var dd = #{one: 1, two: "val"}
+  var dd = {one: 1, two: "val"}
 enddef
 
 def Test_disassemble_new()
@@ -402,7 +459,7 @@
         '\d PUSHNR 333\_s*' ..
         '\d NEWLIST size 3\_s*' ..
         '\d STORE $0\_s*' ..
-        'var dd = #{one: 1, two: "val"}\_s*' ..
+        'var dd = {one: 1, two: "val"}\_s*' ..
         '\d PUSHS "one"\_s*' ..
         '\d PUSHNR 1\_s*' ..
         '\d PUSHS "two"\_s*' ..
@@ -510,18 +567,17 @@
   var res = execute('disass g:Append')
   assert_match('<lambda>\d\_s*' ..
         'local ..= arg\_s*' ..
-        '\d LOADOUTER $0\_s*' ..
+        '\d LOADOUTER level 1 $0\_s*' ..
         '\d LOAD arg\[-1\]\_s*' ..
         '\d CONCAT\_s*' ..
-        '\d STOREOUTER $0\_s*' ..
-        '\d PUSHNR 0\_s*' ..
-        '\d RETURN',
+        '\d STOREOUTER level 1 $0\_s*' ..
+        '\d RETURN 0',
         res)
 
   res = execute('disass g:Get')
   assert_match('<lambda>\d\_s*' ..
         'return local\_s*' ..
-        '\d LOADOUTER $0\_s*' ..
+        '\d LOADOUTER level 1 $0\_s*' ..
         '\d RETURN',
         res)
 
@@ -549,8 +605,7 @@
         '\d PCALL top (argc 1)\_s*' ..
         '\d PCALL end\_s*' ..
         '\d DROP\_s*' ..
-        '\d PUSHNR 0\_s*' ..
-        '\d RETURN',
+        '\d RETURN 0',
         res)
 enddef
 
@@ -629,6 +684,14 @@
   endif
 enddef
 
+def HasGuiRunning()
+  if has("gui_running")
+    echo "yes"
+  else
+    echo "no"
+  endif
+enddef
+
 def Test_disassemble_const_expr()
   assert_equal("\nyes", execute('HasEval()'))
   var instr = execute('disassemble HasEval')
@@ -676,9 +739,74 @@
   assert_notmatch('PUSHS "something"', instr)
   assert_notmatch('PUSHS "less"', instr)
   assert_notmatch('JUMP', instr)
+
+  var result: string
+  var instr_expected: string
+  if has('gui')
+    if has('gui_running')
+      # GUI already running, always returns "yes"
+      result = "\nyes"
+      instr_expected = 'HasGuiRunning.*' ..
+          'if has("gui_running")\_s*' ..
+          '  echo "yes"\_s*' ..
+          '\d PUSHS "yes"\_s*' ..
+          '\d ECHO 1\_s*' ..
+          'else\_s*' ..
+          '  echo "no"\_s*' ..
+          'endif'
+    else
+      result = "\nno"
+      if has('unix')
+        # GUI not running but can start later, call has()
+        instr_expected = 'HasGuiRunning.*' ..
+            'if has("gui_running")\_s*' ..
+            '\d PUSHS "gui_running"\_s*' ..
+            '\d BCALL has(argc 1)\_s*' ..
+            '\d 2BOOL (!!val)\_s*' ..
+            '\d JUMP_IF_FALSE -> \d\_s*' ..
+            '  echo "yes"\_s*' ..
+            '\d PUSHS "yes"\_s*' ..
+            '\d ECHO 1\_s*' ..
+            'else\_s*' ..
+            '\d JUMP -> \d\_s*' ..
+            '  echo "no"\_s*' ..
+            '\d PUSHS "no"\_s*' ..
+            '\d ECHO 1\_s*' ..
+            'endif'
+      else
+        # GUI not running, always return "no"
+        instr_expected = 'HasGuiRunning.*' ..
+            'if has("gui_running")\_s*' ..
+            '  echo "yes"\_s*' ..
+            'else\_s*' ..
+            '  echo "no"\_s*' ..
+            '\d PUSHS "no"\_s*' ..
+            '\d ECHO 1\_s*' ..
+            'endif'
+      endif
+    endif
+  else
+    # GUI not supported, always return "no"
+    result = "\nno"
+    instr_expected = 'HasGuiRunning.*' ..
+        'if has("gui_running")\_s*' ..
+        '  echo "yes"\_s*' ..
+        'else\_s*' ..
+        '  echo "no"\_s*' ..
+        '\d PUSHS "no"\_s*' ..
+        '\d ECHO 1\_s*' ..
+        'endif'
+  endif
+
+  assert_equal(result, execute('HasGuiRunning()'))
+  instr = execute('disassemble HasGuiRunning')
+  assert_match(instr_expected, instr)
 enddef
 
 def ReturnInIf(): string
+  if 1 < 0
+    return "maybe"
+  endif
   if g:cond
     return "yes"
   else
@@ -689,16 +817,20 @@
 def Test_disassemble_return_in_if()
   var instr = execute('disassemble ReturnInIf')
   assert_match('ReturnInIf\_s*' ..
+        'if 1 < 0\_s*' ..
+        '  return "maybe"\_s*' ..
+        'endif\_s*' ..
         'if g:cond\_s*' ..
         '0 LOADG g:cond\_s*' ..
-        '1 JUMP_IF_FALSE -> 4\_s*' ..
+        '1 COND2BOOL\_s*' ..
+        '2 JUMP_IF_FALSE -> 5\_s*' ..
         'return "yes"\_s*' ..
-        '2 PUSHS "yes"\_s*' ..
-        '3 RETURN\_s*' ..
+        '3 PUSHS "yes"\_s*' ..
+        '4 RETURN\_s*' ..
         'else\_s*' ..
         ' return "no"\_s*' ..
-        '4 PUSHS "no"\_s*' ..
-        '5 RETURN$',
+        '5 PUSHS "no"\_s*' ..
+        '6 RETURN$',
         instr)
 enddef
 
@@ -722,8 +854,7 @@
         '\d PUSHS "UserFunc"\_s*' ..
         '\d BCALL funcref(argc 1)\_s*' ..
         '\d STORE $2\_s*' ..
-        '\d PUSHNR 0\_s*' ..
-        '\d RETURN',
+        '\d RETURN 0',
         instr)
 enddef
 
@@ -750,13 +881,12 @@
         'var chan1: channel\_s*' ..
         '\d PUSHCHANNEL 0\_s*' ..
         '\d STORE $2\_s*' ..
-        '\d PUSHNR 0\_s*' ..
-        '\d RETURN',
+        '\d RETURN 0',
         instr)
 enddef
 
 def WithLambda(): string
-  var F = {a -> "X" .. a .. "X"}
+  var F = (a) => "X" .. a .. "X"
   return F("x")
 enddef
 
@@ -764,7 +894,7 @@
   assert_equal("XxX", WithLambda())
   var instr = execute('disassemble WithLambda')
   assert_match('WithLambda\_s*' ..
-        'var F = {a -> "X" .. a .. "X"}\_s*' ..
+        'var F = (a) => "X" .. a .. "X"\_s*' ..
         '\d FUNCREF <lambda>\d\+\_s*' ..
         '\d STORE $0\_s*' ..
         'return F("x")\_s*' ..
@@ -788,6 +918,28 @@
         instr)
 enddef
 
+def LambdaWithType(): number
+  var Ref = (a: number) => a + 10
+  return Ref(g:value)
+enddef
+
+def Test_disassemble_lambda_with_type()
+  g:value = 5
+  assert_equal(15, LambdaWithType())
+  var instr = execute('disassemble LambdaWithType')
+  assert_match('LambdaWithType\_s*' ..
+        'var Ref = (a: number) => a + 10\_s*' ..
+        '\d FUNCREF <lambda>\d\+\_s*' ..
+        '\d STORE $0\_s*' ..
+        'return Ref(g:value)\_s*' ..
+        '\d LOADG g:value\_s*' ..
+        '\d LOAD $0\_s*' ..
+        '\d CHECKTYPE number stack\[-2\] arg 1\_s*' ..
+        '\d PCALL (argc 1)\_s*' ..
+        '\d RETURN',
+        instr)
+enddef
+
 def NestedOuter()
   def g:Inner()
     echomsg "inner"
@@ -801,8 +953,29 @@
         'echomsg "inner"\_s*' ..
         'enddef\_s*' ..
         '\d NEWFUNC <lambda>\d\+ Inner\_s*' ..
-        '\d PUSHNR 0\_s*' ..
-        '\d RETURN',
+        '\d RETURN 0',
+        instr)
+enddef
+
+def NestedDefList()
+  def
+  def Info
+  def /Info
+  def /Info/
+enddef
+
+def Test_nested_def_list()
+   var instr = execute('disassemble NestedDefList')
+   assert_match('NestedDefList\_s*' ..
+        'def\_s*' ..
+        '\d DEF \_s*' ..
+        'def Info\_s*' ..
+        '\d DEF Info\_s*' ..
+        'def /Info\_s*' ..
+        '\d DEF /Info\_s*' ..
+        'def /Info/\_s*' ..
+        '\d DEF /Info/\_s*' ..
+        '\d RETURN 0',
         instr)
 enddef
 
@@ -849,6 +1022,7 @@
   assert_match('ForLoop\_s*' ..
         'var res: list<number>\_s*' ..
         '\d NEWLIST size 0\_s*' ..
+        '\d SETTYPE list<number>\_s*' ..
         '\d STORE $0\_s*' ..
         'for i in range(3)\_s*' ..
         '\d STORE -1 in $1\_s*' ..
@@ -904,6 +1078,39 @@
         instr)
 enddef
 
+def ForLoopUnpack()
+  for [x1, x2] in [[1, 2], [3, 4]]
+    echo x1 x2
+  endfor
+enddef
+
+def Test_disassemble_for_loop_unpack()
+  var instr = execute('disassemble ForLoopUnpack')
+  assert_match('ForLoopUnpack\_s*' ..
+        'for \[x1, x2\] in \[\[1, 2\], \[3, 4\]\]\_s*' ..
+        '\d\+ STORE -1 in $0\_s*' ..
+        '\d\+ PUSHNR 1\_s*' ..
+        '\d\+ PUSHNR 2\_s*' ..
+        '\d\+ NEWLIST size 2\_s*' ..
+        '\d\+ PUSHNR 3\_s*' ..
+        '\d\+ PUSHNR 4\_s*' ..
+        '\d\+ NEWLIST size 2\_s*' ..
+        '\d\+ NEWLIST size 2\_s*' ..
+        '\d\+ FOR $0 -> 16\_s*' ..
+        '\d\+ UNPACK 2\_s*' ..
+        '\d\+ STORE $1\_s*' ..
+        '\d\+ STORE $2\_s*' ..
+        'echo x1 x2\_s*' ..
+        '\d\+ LOAD $1\_s*' ..
+        '\d\+ LOAD $2\_s*' ..
+        '\d\+ ECHO 2\_s*' ..
+        'endfor\_s*' ..
+        '\d\+ JUMP -> 8\_s*' ..
+        '\d\+ DROP\_s*' ..
+        '\d\+ RETURN 0',
+        instr)
+enddef
+
 let g:number = 42
 
 def TypeCast()
@@ -918,9 +1125,9 @@
         '\d LOADG g:number\_s*' ..
         '\d CHECKTYPE number stack\[-1\]\_s*' ..
         '\d NEWLIST size 2\_s*' ..
+        '\d SETTYPE list<number>\_s*' ..
         '\d STORE $0\_s*' ..
-        '\d PUSHNR 0\_s*' ..
-        '\d RETURN\_s*',
+        '\d RETURN 0\_s*',
         instr)
 enddef
 
@@ -1066,7 +1273,7 @@
 
 def StringSlice(): string
   var s = "abcd"
-  var res = s[1:8]
+  var res = s[1 : 8]
   return res
 enddef
 
@@ -1076,7 +1283,7 @@
         'var s = "abcd"\_s*' ..
         '\d PUSHS "abcd"\_s*' ..
         '\d STORE $0\_s*' ..
-        'var res = s\[1:8]\_s*' ..
+        'var res = s\[1 : 8]\_s*' ..
         '\d LOAD $0\_s*' ..
         '\d PUSHNR 1\_s*' ..
         '\d PUSHNR 8\_s*' ..
@@ -1112,7 +1319,7 @@
 
 def ListSlice(): list<number>
   var l = [1, 2, 3]
-  var res = l[1:8]
+  var res = l[1 : 8]
   return res
 enddef
 
@@ -1125,7 +1332,7 @@
         '\d PUSHNR 3\_s*' ..
         '\d NEWLIST size 3\_s*' ..
         '\d STORE $0\_s*' ..
-        'var res = l\[1:8]\_s*' ..
+        'var res = l\[1 : 8]\_s*' ..
         '\d LOAD $0\_s*' ..
         '\d PUSHNR 1\_s*' ..
         '\d PUSHNR 8\_s*' ..
@@ -1136,7 +1343,7 @@
 enddef
 
 def DictMember(): number
-  var d = #{item: 1}
+  var d = {item: 1}
   var res = d.item
   res = d["item"]
   return res
@@ -1145,7 +1352,7 @@
 def Test_disassemble_dict_member()
   var instr = execute('disassemble DictMember')
   assert_match('DictMember\_s*' ..
-        'var d = #{item: 1}\_s*' ..
+        'var d = {item: 1}\_s*' ..
         '\d PUSHS "item"\_s*' ..
         '\d PUSHNR 1\_s*' ..
         '\d NEWDICT size 1\_s*' ..
@@ -1186,14 +1393,14 @@
 enddef
 
 def AnySlice(): list<number>
-  var res = g:somelist[1:3]
+  var res = g:somelist[1 : 3]
   return res
 enddef
 
 def Test_disassemble_any_slice()
   var instr = execute('disassemble AnySlice')
   assert_match('AnySlice\_s*' ..
-        'var res = g:somelist\[1:3\]\_s*' ..
+        'var res = g:somelist\[1 : 3\]\_s*' ..
         '\d LOADG g:somelist\_s*' ..
         '\d PUSHNR 1\_s*' ..
         '\d PUSHNR 3\_s*' ..
@@ -1242,7 +1449,7 @@
   var instr = execute('disassemble InvertBool')
   assert_match('InvertBool\_s*' ..
         'var flag = true\_s*' ..
-        '\d PUSH v:true\_s*' ..
+        '\d PUSH true\_s*' ..
         '\d STORE $0\_s*' ..
         'var invert = !flag\_s*' ..
         '\d LOAD $0\_s*' ..
@@ -1266,16 +1473,17 @@
   assert_match('ReturnBool\_s*' ..
         'var name: bool = 1 && 0 || 1\_s*' ..
         '0 PUSHNR 1\_s*' ..
-        '1 JUMP_IF_COND_FALSE -> 3\_s*' ..
-        '2 PUSHNR 0\_s*' ..
-        '3 COND2BOOL\_s*' ..
-        '4 JUMP_IF_COND_TRUE -> 6\_s*' ..
-        '5 PUSHNR 1\_s*' ..
-        '6 2BOOL (!!val)\_s*' ..
+        '1 2BOOL (!!val)\_s*' ..
+        '2 JUMP_IF_COND_FALSE -> 5\_s*' ..
+        '3 PUSHNR 0\_s*' ..
+        '4 2BOOL (!!val)\_s*' ..
+        '5 JUMP_IF_COND_TRUE -> 8\_s*' ..
+        '6 PUSHNR 1\_s*' ..
+        '7 2BOOL (!!val)\_s*' ..
         '\d STORE $0\_s*' ..
         'return name\_s*' ..
-        '\d LOAD $0\_s*' ..   
-        '\d RETURN',
+        '\d\+ LOAD $0\_s*' ..   
+        '\d\+ RETURN',
         instr)
   assert_equal(true, InvertBool())
 enddef
@@ -1316,15 +1524,15 @@
         ['[1, 2] is aList', 'COMPARELIST is'],
         ['[1, 2] isnot aList', 'COMPARELIST isnot'],
 
-        ['#{a: 1} == aDict', 'COMPAREDICT =='],
-        ['#{a: 1} != aDict', 'COMPAREDICT !='],
-        ['#{a: 1} is aDict', 'COMPAREDICT is'],
-        ['#{a: 1} isnot aDict', 'COMPAREDICT isnot'],
-
-        ['{->33} == {->44}', 'COMPAREFUNC =='],
-        ['{->33} != {->44}', 'COMPAREFUNC !='],
-        ['{->33} is {->44}', 'COMPAREFUNC is'],
-        ['{->33} isnot {->44}', 'COMPAREFUNC isnot'],
+        ['{a: 1} == aDict', 'COMPAREDICT =='],
+        ['{a: 1} != aDict', 'COMPAREDICT !='],
+        ['{a: 1} is aDict', 'COMPAREDICT is'],
+        ['{a: 1} isnot aDict', 'COMPAREDICT isnot'],
+
+        ['(() => 33) == (() => 44)', 'COMPAREFUNC =='],
+        ['(() => 33) != (() => 44)', 'COMPAREFUNC !='],
+        ['(() => 33) is (() => 44)', 'COMPAREFUNC is'],
+        ['(() => 33) isnot (() => 44)', 'COMPAREFUNC isnot'],
 
         ['77 == g:xx', 'COMPAREANY =='],
         ['77 != g:xx', 'COMPAREANY !='],
@@ -1362,7 +1570,7 @@
              '  var aString = "yy"',
              '  var aBlob = 0z22',
              '  var aList = [3, 4]',
-             '  var aDict = #{x: 2}',
+             '  var aDict = {x: 2}',
              floatDecl,
              '  if ' .. case[0],
              '    echo 42'
@@ -1406,8 +1614,7 @@
       'echo "" ?? "empty string"\_s*' ..
       '\d\+ PUSHS "empty string"\_s*' ..
       '\d\+ ECHO 1\_s*' ..
-      '\d\+ PUSHNR 0\_s*' ..
-      '\d\+ RETURN',
+      '\d\+ RETURN 0',
       res)
 enddef
 
@@ -1434,8 +1641,7 @@
           'if ' .. substitute(case[0], '[[~]', '\\\0', 'g') .. '.*' ..
           '\d PUSHNR 42.*' ..
           '\d ECHO 1.*' ..
-          '\d PUSHNR 0.*' ..
-          '\d RETURN.*',
+          '\d RETURN 0',
           instr)
     else
       # condition false, function just returns
@@ -1443,8 +1649,7 @@
           'if ' .. substitute(case[0], '[[~]', '\\\0', 'g') .. '[ \n]*' ..
           'echo 42[ \n]*' ..
           'endif[ \n]*' ..
-          '\s*\d PUSHNR 0.*' ..
-          '\d RETURN.*',
+          '\d RETURN 0',
           instr)
     endif
 
@@ -1482,8 +1687,7 @@
         '\d\+ LOAD $1\_s*' ..
         '\d\+ CONCAT\_s*' ..
         '\d\+ EXECUTE 1\_s*' ..
-        '\d\+ PUSHNR 0\_s*' ..
-        '\d\+ RETURN',
+        '\d\+ RETURN 0',
         res)
 enddef
 
@@ -1502,8 +1706,7 @@
         "echoerr 'went' .. 'wrong'\\_s*" ..
         '\d PUSHS "wentwrong"\_s*' ..
         '\d ECHOERR 1\_s*' ..
-        '\d PUSHNR 0\_s*' ..
-        '\d RETURN',
+        '\d RETURN 0',
         res)
 enddef
 
@@ -1612,8 +1815,7 @@
         '\d SHUFFLE 2 up 1\_s*' ..
         '\d BCALL append(argc 2)\_s*' ..
         '\d DROP\_s*' ..
-        '\d PUSHNR 0\_s*' ..
-        '\d RETURN',
+        '\d RETURN 0',
         res)
 enddef
 
@@ -1636,7 +1838,45 @@
         '\d PUSHS "error"\_s*' ..
         '\d ECHOERR 1\_s*' ..
         '\d CMDMOD_REV\_s*' ..
-        '\d PUSHNR 0\_s*' ..
+        '\d RETURN 0',
+        res)
+enddef
+
+def s:Profiled(): string
+  echo "profiled"
+  return "done"
+enddef
+
+def Test_profiled()
+  if !has('profile')
+    MissingFeature 'profile'
+  endif
+  var res = execute('disass! s:Profiled')
+  assert_match('<SNR>\d*_Profiled\_s*' ..
+        'echo "profiled"\_s*' ..
+        '\d PROFILE START line 1\_s*' ..
+        '\d PUSHS "profiled"\_s*' ..
+        '\d ECHO 1\_s*' ..
+        'return "done"\_s*' ..
+        '\d PROFILE END\_s*' ..
+        '\d PROFILE START line 2\_s*' ..
+        '\d PUSHS "done"\_s*' ..
+        '\d RETURN\_s*' ..
+        '\d PROFILE END',
+        res)
+enddef
+
+def s:SilentReturn(): string
+  silent return "done"
+enddef
+
+def Test_silent_return()
+  var res = execute('disass s:SilentReturn')
+  assert_match('<SNR>\d*_SilentReturn\_s*' ..
+        'silent return "done"\_s*' ..
+        '\d CMDMOD silent\_s*' ..
+        '\d PUSHS "done"\_s*' ..
+        '\d CMDMOD_REV\_s*' ..
         '\d RETURN',
         res)
 enddef
diff -Nru vim-8.2.1913/src/testdir/test_vim9_expr.vim vim-8.2.2434/src/testdir/test_vim9_expr.vim
--- vim-8.2.1913/src/testdir/test_vim9_expr.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_vim9_expr.vim	2021-01-30 22:05:11.000000000 +0000
@@ -13,52 +13,60 @@
 
 " test cond ? expr : expr
 def Test_expr1_trinary()
-  assert_equal('one', true ? 'one' : 'two')
-  assert_equal('one', 1 ?
-			'one' :
-			'two')
-  if has('float')
-    assert_equal('one', !!0.1 ? 'one' : 'two')
-  endif
-  assert_equal('one', !!'x' ? 'one' : 'two')
-  assert_equal('one', !!'x'
-  			? 'one'
-			: 'two')
-  assert_equal('one', !!0z1234 ? 'one' : 'two')
-  assert_equal('one', !![0] ? 'one' : 'two')
-  assert_equal('one', !!#{x: 0} ? 'one' : 'two')
-  var name = 1
-  assert_equal('one', name ? 'one' : 'two')
+  var lines =<< trim END
+      assert_equal('one', true ? 'one' : 'two')
+      assert_equal('one', 1 ?
+                            'one' :
+                            'two')
+      if has('float')
+        assert_equal('one', !!0.1 ? 'one' : 'two')
+      endif
+      assert_equal('one', !!'x' ? 'one' : 'two')
+      assert_equal('one', !!'x'
+                            ? 'one'
+                            : 'two')
+      assert_equal('one', !!0z1234 ? 'one' : 'two')
+      assert_equal('one', !![0] ? 'one' : 'two')
+      assert_equal('one', !!{x: 0} ? 'one' : 'two')
+      var name = 1
+      assert_equal('one', name ? 'one' : 'two')
 
-  assert_equal('two', false ? 'one' : 'two')
-  assert_equal('two', 0 ? 'one' : 'two')
-  if has('float')
-    assert_equal('two', !!0.0 ? 'one' : 'two')
-  endif
-  assert_equal('two', !!'' ? 'one' : 'two')
-  assert_equal('two', !!0z ? 'one' : 'two')
-  assert_equal('two', !![] ? 'one' : 'two')
-  assert_equal('two', !!{} ? 'one' : 'two')
-  name = 0
-  assert_equal('two', name ? 'one' : 'two')
-
-  # with constant condition expression is not evaluated 
-  assert_equal('one', 1 ? 'one' : xxx)
-
-  var Some: func = function('len')
-  var Other: func = function('winnr')
-  var Res: func = g:atrue ? Some : Other
-  assert_equal(function('len'), Res)
-
-  var RetOne: func(string): number = function('len')
-  var RetTwo: func(string): number = function('winnr')
-  var RetThat: func = g:atrue ? RetOne : RetTwo
-  assert_equal(function('len'), RetThat)
-
-  var X = FuncOne
-  var Y = FuncTwo
-  var Z = g:cond ? FuncOne : FuncTwo
-  assert_equal(123, Z(3))
+      assert_equal('two', false ? 'one' : 'two')
+      assert_equal('two', 0 ? 'one' : 'two')
+      if has('float')
+        assert_equal('two', !!0.0 ? 'one' : 'two')
+      endif
+      assert_equal('two', !!'' ? 'one' : 'two')
+      assert_equal('two', !!0z ? 'one' : 'two')
+      assert_equal('two', !![] ? 'one' : 'two')
+      assert_equal('two', !!{} ? 'one' : 'two')
+      name = 0
+      assert_equal('two', name ? 'one' : 'two')
+
+      echo ['a'] + (1 ? ['b'] : ['c']
+                )
+      echo ['a'] + (1 ? ['b'] : ['c'] # comment
+                )
+
+      # with constant condition expression is not evaluated 
+      assert_equal('one', 1 ? 'one' : xxx)
+
+      var Some: func = function('len')
+      var Other: func = function('winnr')
+      var Res: func = g:atrue ? Some : Other
+      assert_equal(function('len'), Res)
+
+      var RetOne: func(string): number = function('len')
+      var RetTwo: func(string): number = function('winnr')
+      var RetThat: func = g:atrue ? RetOne : RetTwo
+      assert_equal(function('len'), RetThat)
+
+      var X = FuncOne
+      var Y = FuncTwo
+      var Z = g:cond ? FuncOne : FuncTwo
+      assert_equal(123, Z(3))
+  END
+  CheckDefAndScriptSuccess(lines)
 enddef
 
 def Test_expr1_trinary_vimscript()
@@ -105,7 +113,7 @@
       vim9script
       var name = v:true?1:2
   END
-  CheckScriptFailure(lines, 'E1004:', 2)
+  CheckScriptFailure(lines, 'E1004: White space required before and after ''?'' at "?1:2"', 2)
   lines =<< trim END
       vim9script
       var name = v:true? 1 : 2
@@ -120,7 +128,7 @@
       vim9script
       var name = v:true ? 1: 2
   END
-  CheckScriptFailure(lines, 'E1004:', 2)
+  CheckScriptFailure(lines, 'E1004: White space required before and after '':'' at ": 2"', 2)
   lines =<< trim END
       vim9script
       var name = v:true ? 1 :2
@@ -131,7 +139,7 @@
       vim9script
       var name = 'x' ? 1 : 2
   END
-  CheckScriptFailure(lines, 'E1030:', 2)
+  CheckScriptFailure(lines, 'E1135:', 2)
 
   lines =<< trim END
       vim9script
@@ -180,11 +188,17 @@
   call CheckDefFailure(["var x = 1 ? 'one' :'two'"], msg, 1)
   call CheckDefFailure(["var x = 1 ? 'one':'two'"], msg, 1)
 
-  call CheckDefFailure(["var x = 'x' ? 'one' : 'two'"], 'E1030:', 1)
+  call CheckDefFailure(["var x = 'x' ? 'one' : 'two'"], 'E1135:', 1)
   call CheckDefFailure(["var x = 0z1234 ? 'one' : 'two'"], 'E974:', 1)
   call CheckDefExecFailure(["var x = [] ? 'one' : 'two'"], 'E745:', 1)
   call CheckDefExecFailure(["var x = {} ? 'one' : 'two'"], 'E728:', 1)
 
+  call CheckDefExecFailure(["var x = false ? "], 'E1097:', 3)
+  call CheckDefExecFailure(["var x = false ? 'one' : "], 'E1097:', 3)
+
+  call CheckDefExecFailure(["var x = true ? xxx : 'foo'"], 'E1001:', 1)
+  call CheckDefExecFailure(["var x = false ? 'foo' : xxx"], 'E1001:', 1)
+
   if has('float')
     call CheckDefFailure(["var x = 0.1 ? 'one' : 'two'"], 'E805:', 1)
   endif
@@ -203,7 +217,7 @@
       assert_equal(123, 123 ?? 456)
       assert_equal('yes', 'yes' ?? 456)
       assert_equal([1], [1] ?? 456)
-      assert_equal(#{one: 1}, #{one: 1} ?? 456)
+      assert_equal({one: 1}, {one: 1} ?? 456)
       if has('float')
         assert_equal(0.1, 0.1 ?? 456)
       endif
@@ -225,7 +239,6 @@
   call CheckDefFailure(["var x = 1??'one' : 'two'"], msg, 1)
 enddef
 
-" TODO: define inside test function
 def Record(val: any): any
   g:vals->add(val)
   return val
@@ -233,32 +246,52 @@
 
 " test ||
 def Test_expr2()
-  assert_equal(true, 1 || 0)
-  assert_equal(true, 0 ||
-		    0 ||
-		    1)
-  assert_equal(false, 0 || 0)
-  assert_equal(false, 0
-  		    || 0)
-  assert_equal(false, 0 || false)
-
-  g:vals = []
-  assert_equal(true, Record(1) || Record(3))
-  assert_equal([1], g:vals)
-
-  g:vals = []
-  assert_equal(true, Record(0) || Record(1))
-  assert_equal([0, 1], g:vals)
-
-  g:vals = []
-  assert_equal(true, Record(0)
-		      || Record(1)
-		      || Record(0))
-  assert_equal([0, 1], g:vals)
-
-  g:vals = []
-  assert_equal(false, Record(0) || Record(false) || Record(0))
-  assert_equal([0, false, 0], g:vals)
+  var lines =<< trim END
+      assert_equal(true, 1 || 0)
+      assert_equal(true, 0 ||
+                        0 ||
+                        1)
+      assert_equal(true, 0 ||
+			0 ||
+			!!7)
+      assert_equal(false, 0 || 0)
+      assert_equal(false, 0
+                        || 0)
+      assert_equal(false, 0 || false)
+
+      g:vals = []
+      assert_equal(true, Record(1) || Record(3))
+      assert_equal([1], g:vals)
+
+      g:vals = []
+      assert_equal(true, Record(0) || Record(1))
+      assert_equal([0, 1], g:vals)
+
+      g:vals = []
+      assert_equal(true, Record(0) || Record(true))
+      assert_equal([0, true], g:vals)
+
+      g:vals = []
+      assert_equal(true, Record(0)
+                          || Record(1)
+                          || Record(0))
+      assert_equal([0, 1], g:vals)
+
+      g:vals = []
+      assert_equal(true, Record(0)
+			  || Record(true)
+			  || Record(0))
+      assert_equal([0, true], g:vals)
+
+      g:vals = []
+      assert_equal(true, Record(true) || Record(false))
+      assert_equal([true], g:vals)
+
+      g:vals = []
+      assert_equal(false, Record(0) || Record(false) || Record(0))
+      assert_equal([0, false, 0], g:vals)
+  END
+  CheckDefAndScriptSuccess(lines)
 enddef
 
 def Test_expr2_vimscript()
@@ -305,7 +338,7 @@
       vim9script
       var name = v:true||v:true
   END
-  CheckScriptFailure(lines, 'E1004:', 2)
+  CheckScriptFailure(lines, 'E1004: White space required before and after ''||'' at "||v:true"', 2)
   lines =<< trim END
       vim9script
       var name = v:true ||v:true
@@ -316,37 +349,6 @@
       var name = v:true|| v:true
   END
   CheckScriptFailure(lines, 'E1004:', 2)
-
-  # check evaluating to bool
-  lines =<< trim END
-      assert_equal(true, 1 || 0)
-      assert_equal(true, 0 ||
-			0 ||
-			!!7)
-      assert_equal(false, 0 || 0)
-      assert_equal(false, 0
-			|| 0)
-      assert_equal(false, 0 || false)
-
-      g:vals = []
-      assert_equal(true, Record(true) || Record(false))
-      assert_equal([true], g:vals)
-
-      g:vals = []
-      assert_equal(true, Record(0) || Record(true))
-      assert_equal([0, true], g:vals)
-
-      g:vals = []
-      assert_equal(true, Record(0)
-			  || Record(true)
-			  || Record(0))
-      assert_equal([0, true], g:vals)
-
-      g:vals = []
-      assert_equal(false, Record(0) || Record(false) || Record(0))
-      assert_equal([0, false, 0], g:vals)
-  END
-  CheckDefAndScriptSuccess(lines)
 enddef
 
 def Test_expr2_fails()
@@ -355,47 +357,57 @@
   call CheckDefFailure(["var x = 1 ||2"], msg, 1)
   call CheckDefFailure(["var x = 1|| 2"], msg, 1)
 
+  call CheckDefFailure(["var x = false || "], 'E1097:', 3)
+
   call CheckDefFailure(["var x = 1 || xxx"], 'E1001:', 1)
+  call CheckDefFailure(["var x = [] || false"], 'E1012:', 1)
+  call CheckDefFailure(["if 'yes' || 0", 'echo 0', 'endif'], 'E1012: Type mismatch; expected bool but got string', 1)
 
   # TODO: should fail at compile time
   call CheckDefExecFailure(["var x = 3 || 7"], 'E1023:', 1)
   call CheckScriptFailure(["vim9script", "var x = 3 || 7"], 'E1023:', 2)
-  call CheckDefExecFailure(["var x = [] || false"], 'E745:', 1)
   call CheckScriptFailure(["vim9script", "var x = [] || false"], 'E745:', 2)
 enddef
 
 " test &&
 def Test_expr3()
-  assert_equal(false, 1 && 0)
-  assert_equal(false, 0 &&
-		0 &&
-		1)
-  assert_equal(true, 1
-  		    && true
-		    && 1)
-  assert_equal(false, 0 && 0)
-  assert_equal(false, 0 && false)
-  assert_equal(true, 1 && true)
-
-  g:vals = []
-  assert_equal(true, Record(true) && Record(1))
-  assert_equal([true, 1], g:vals)
-
-  g:vals = []
-  assert_equal(false, Record(0) && Record(1))
-  assert_equal([0], g:vals)
-
-  g:vals = []
-  assert_equal(false, Record(0) && Record(4) && Record(0))
-  assert_equal([0], g:vals)
-
-  g:vals = []
-  assert_equal(false, Record(1) && Record(true) && Record(0))
-  assert_equal([1, true, 0], g:vals)
-
-  g:vals = []
-  assert_equal(false, Record(1) && Record(true) && Record(0))
-  assert_equal([1, true, 0], g:vals)
+  var lines =<< trim END
+      assert_equal(false, 1 && 0)
+      assert_equal(false, 0 &&
+                    0 &&
+                    1)
+      assert_equal(true, 1
+                        && true
+                        && 1)
+      assert_equal(false, 0 && 0)
+      assert_equal(false, 0 && false)
+      assert_equal(true, 1 && true)
+
+      g:vals = []
+      assert_equal(true, Record(true) && Record(1))
+      assert_equal([true, 1], g:vals)
+
+      g:vals = []
+      assert_equal(true, Record(1) && Record(true))
+      assert_equal([1, true], g:vals)
+
+      g:vals = []
+      assert_equal(false, Record(0) && Record(1))
+      assert_equal([0], g:vals)
+
+      g:vals = []
+      assert_equal(false, Record(0) && Record(1) && Record(0))
+      assert_equal([0], g:vals)
+
+      g:vals = []
+      assert_equal(false, Record(0) && Record(4) && Record(0))
+      assert_equal([0], g:vals)
+
+      g:vals = []
+      assert_equal(false, Record(1) && Record(true) && Record(0))
+      assert_equal([1, true, 0], g:vals)
+  END
+  CheckDefAndScriptSuccess(lines)
 enddef
 
 def Test_expr3_vimscript()
@@ -447,44 +459,12 @@
       vim9script
       var name = v:true &&v:true
   END
-  CheckScriptFailure(lines, 'E1004:', 2)
+  CheckScriptFailure(lines, 'E1004: White space required before and after ''&&'' at "&&v:true"', 2)
   lines =<< trim END
       vim9script
       var name = v:true&& v:true
   END
   CheckScriptFailure(lines, 'E1004:', 2)
-
-  # check keeping the value
-  lines =<< trim END
-      vim9script
-      assert_equal(false, 1 && 0)
-      assert_equal(false, 0 &&
-		    0 &&
-		    1)
-      assert_equal(true, 1
-			&& true
-			&& 1)
-      assert_equal(false, 0 && 0)
-      assert_equal(false, 0 && false)
-      assert_equal(false, 1 && 0)
-
-      g:vals = []
-      assert_equal(true, Record(1) && Record(true))
-      assert_equal([1, true], g:vals)
-
-      g:vals = []
-      assert_equal(false, Record(0) && Record(1))
-      assert_equal([0], g:vals)
-
-      g:vals = []
-      assert_equal(false, Record(0) && Record(1) && Record(0))
-      assert_equal([0], g:vals)
-
-      g:vals = []
-      assert_equal(false, Record(1) && Record(true) && Record(0))
-      assert_equal([1, true, 0], g:vals)
-  END
-  CheckScriptSuccess(lines)
 enddef
 
 func Test_expr3_fails()
@@ -492,6 +472,10 @@
   call CheckDefFailure(["var x = 1&&2"], msg, 1)
   call CheckDefFailure(["var x = 1 &&2"], msg, 1)
   call CheckDefFailure(["var x = 1&& 2"], msg, 1)
+
+  call CheckDefFailure(["if 'yes' && 0", 'echo 0', 'endif'], 'E1012: Type mismatch; expected bool but got string', 1)
+
+  call CheckDefExecFailure(['assert_equal(false, Record(1) && Record(4) && Record(0))'], 'E1023: Using a Number as a Bool: 4', 1)
 endfunc
 
 " global variables to use for tests with the "any" type
@@ -512,307 +496,364 @@
 
 " test == comperator
 def Test_expr4_equal()
-  var trueVar = true
-  var falseVar = false
-  assert_equal(true, true == true)
-  assert_equal(false, true ==
-			false)
-  assert_equal(true, true
-			== trueVar)
-  assert_equal(false, true == falseVar)
-  assert_equal(true, true == g:atrue)
-  assert_equal(false, g:atrue == false)
-
-  assert_equal(true, v:none == v:none)
-  assert_equal(false, v:none == v:null)
-  assert_equal(true, g:anone == v:none)
-  assert_equal(false, v:none == g:anull)
-
-  var nr0 = 0
-  var nr61 = 61
-  assert_equal(false, 2 == 0)
-  assert_equal(false, 2 == nr0)
-  assert_equal(true, 61 == 61)
-  assert_equal(true, 61 == nr61)
-  assert_equal(true, g:anint == 10)
-  assert_equal(false, 61 == g:anint)
+  var lines =<< trim END
+      var trueVar = true
+      var falseVar = false
+      assert_equal(true, true == true)
+      assert_equal(false, true ==
+                            false)
+      assert_equal(true, true
+                            == trueVar)
+      assert_equal(false, true == falseVar)
+      assert_equal(true, true == g:atrue)
+      assert_equal(false, g:atrue == false)
+
+      assert_equal(true, v:none == v:none)
+      assert_equal(false, v:none == v:null)
+      assert_equal(true, g:anone == v:none)
+      assert_equal(true, null == v:null)
+      assert_equal(true, null == g:anull)
+      assert_equal(false, v:none == g:anull)
+
+      var nr0 = 0
+      var nr61 = 61
+      assert_equal(false, 2 == 0)
+      assert_equal(false, 2 == nr0)
+      assert_equal(true, 61 == 61)
+      assert_equal(true, 61 == nr61)
+      assert_equal(true, g:anint == 10)
+      assert_equal(false, 61 == g:anint)
 
-  if has('float')
-    var ff = 0.3
-    assert_equal(true, ff == 0.3)
-    assert_equal(false, 0.4 == ff)
-    assert_equal(true, 0.1 == g:afloat)
-    assert_equal(false, g:afloat == 0.3)
-
-    ff = 3.0
-    assert_equal(true, ff == 3)
-    assert_equal(true, 3 == ff)
-    ff = 3.1
-    assert_equal(false, ff == 3)
-    assert_equal(false, 3 == ff)
-  endif
+      if has('float')
+        var ff = 0.3
+        assert_equal(true, ff == 0.3)
+        assert_equal(false, 0.4 == ff)
+        assert_equal(true, 0.1 == g:afloat)
+        assert_equal(false, g:afloat == 0.3)
+
+        ff = 3.0
+        assert_equal(true, ff == 3)
+        assert_equal(true, 3 == ff)
+        ff = 3.1
+        assert_equal(false, ff == 3)
+        assert_equal(false, 3 == ff)
+      endif
 
-  assert_equal(true, 'abc' == 'abc')
-  assert_equal(false, 'xyz' == 'abc')
-  assert_equal(true, g:astring == 'asdf')
-  assert_equal(false, 'xyz' == g:astring)
-
-  assert_equal(false, 'abc' == 'aBc')
-  assert_equal(false, 'abc' ==# 'aBc')
-  assert_equal(true, 'abc' ==? 'aBc')
-
-  assert_equal(false, 'abc' == 'ABC')
-  set ignorecase
-  assert_equal(false, 'abc' == 'ABC')
-  assert_equal(false, 'abc' ==# 'ABC')
-  set noignorecase
+      assert_equal(true, 'abc' == 'abc')
+      assert_equal(false, 'xyz' == 'abc')
+      assert_equal(true, g:astring == 'asdf')
+      assert_equal(false, 'xyz' == g:astring)
+
+      assert_equal(false, 'abc' == 'aBc')
+      assert_equal(false, 'abc' ==# 'aBc')
+      assert_equal(true, 'abc' ==? 'aBc')
+
+      assert_equal(false, 'abc' == 'ABC')
+      set ignorecase
+      assert_equal(false, 'abc' == 'ABC')
+      assert_equal(false, 'abc' ==# 'ABC')
+      assert_equal(true, 'abc' ==? 'ABC')
+      set noignorecase
+
+      var bb = 0z3f
+      assert_equal(true, 0z3f == bb)
+      assert_equal(false, bb == 0z4f)
+      assert_equal(true, g:ablob == 0z01ab)
+      assert_equal(false, 0z3f == g:ablob)
+
+      assert_equal(true, [1, 2, 3] == [1, 2, 3])
+      assert_equal(false, [1, 2, 3] == [2, 3, 1])
+      assert_equal(true, [2, 3, 4] == g:alist)
+      assert_equal(false, g:alist == [2, 3, 1])
+      assert_equal(false, [1, 2, 3] == [])
+      assert_equal(false, [1, 2, 3] == ['1', '2', '3'])
+
+      assert_equal(true, {one: 1, two: 2} == {one: 1, two: 2})
+      assert_equal(false, {one: 1, two: 2} == {one: 2, two: 2})
+      assert_equal(false, {one: 1, two: 2} == {two: 2})
+      assert_equal(false, {one: 1, two: 2} == {})
+      assert_equal(true, g:adict == {bbb: 8, aaa: 2})
+      assert_equal(false, {ccc: 9, aaa: 2} == g:adict)
+
+      assert_equal(true, function('g:Test_expr4_equal') == function('g:Test_expr4_equal'))
+      assert_equal(false, function('g:Test_expr4_equal') == function('g:Test_expr4_is'))
+
+      assert_equal(true, function('g:Test_expr4_equal', [123]) == function('g:Test_expr4_equal', [123]))
+      assert_equal(false, function('g:Test_expr4_equal', [123]) == function('g:Test_expr4_is', [123]))
+      assert_equal(false, function('g:Test_expr4_equal', [123]) == function('g:Test_expr4_equal', [999]))
+
+      # TODO: this unexpectedly sometimes fails on Appveyor
+      if !has('win32')
+        var OneFunc: func
+        var TwoFunc: func
+        OneFunc = function('len')
+        TwoFunc = function('len')
+        assert_equal(true, OneFunc('abc') == TwoFunc('123'))
+      endif
+  END
+  CheckDefAndScriptSuccess(lines)
 
   CheckDefFailure(["var x = 'a' == xxx"], 'E1001:', 1)
+  CheckDefFailure(["var x = 'a' == "], 'E1097:', 3)
+
   CheckDefExecFailure(['var items: any', 'eval 1', 'eval 2', 'if items == []', 'endif'], 'E691:', 4)
 
-  var bb = 0z3f
-  assert_equal(true, 0z3f == bb)
-  assert_equal(false, bb == 0z4f)
-  assert_equal(true, g:ablob == 0z01ab)
-  assert_equal(false, 0z3f == g:ablob)
-
-  assert_equal(true, [1, 2, 3] == [1, 2, 3])
-  assert_equal(false, [1, 2, 3] == [2, 3, 1])
-  assert_equal(true, [2, 3, 4] == g:alist)
-  assert_equal(false, g:alist == [2, 3, 1])
-  assert_equal(false, [1, 2, 3] == [])
-  assert_equal(false, [1, 2, 3] == ['1', '2', '3'])
-
-  assert_equal(true, #{one: 1, two: 2} == #{one: 1, two: 2})
-  assert_equal(false, #{one: 1, two: 2} == #{one: 2, two: 2})
-  assert_equal(false, #{one: 1, two: 2} == #{two: 2})
-  assert_equal(false, #{one: 1, two: 2} == #{})
-  assert_equal(true, g:adict == #{bbb: 8, aaa: 2})
-  assert_equal(false, #{ccc: 9, aaa: 2} == g:adict)
-
-  assert_equal(true, function('g:Test_expr4_equal') == function('g:Test_expr4_equal'))
-  assert_equal(false, function('g:Test_expr4_equal') == function('g:Test_expr4_is'))
-
-  assert_equal(true, function('g:Test_expr4_equal', [123]) == function('g:Test_expr4_equal', [123]))
-  assert_equal(false, function('g:Test_expr4_equal', [123]) == function('g:Test_expr4_is', [123]))
-  assert_equal(false, function('g:Test_expr4_equal', [123]) == function('g:Test_expr4_equal', [999]))
-
-  var OneFunc: func
-  var TwoFunc: func
-  OneFunc = function('len')
-  TwoFunc = function('len')
-  assert_equal(true, OneFunc('abc') == TwoFunc('123'))
+  CheckDefExecFailure(['var x: any = "a"', 'echo x == true'], 'E1072: Cannot compare string with bool', 2)
+  CheckDefExecFailure(["var x: any = true", 'echo x == ""'], 'E1072: Cannot compare bool with string', 2)
+  CheckDefExecFailure(["var x: any = 99", 'echo x == true'], 'E1138', 2)
+  CheckDefExecFailure(["var x: any = 'a'", 'echo x == 99'], 'E1030:', 2)
+
+  for op in ['>', '>=', '<', '<=', '=~', '!~']
+    CheckDefExecFailure([
+        "var a: any = 'a'",
+        'var b: any = true',
+        'echo a ' .. op .. ' b'], 'E1072:', 3)
+  endfor
 enddef
 
 " test != comperator
 def Test_expr4_notequal()
-  var trueVar = true
-  var falseVar = false
-  assert_equal(false, true != true)
-  assert_equal(true, true !=
-			false)
-  assert_equal(false, true
-  			!= trueVar)
-  assert_equal(true, true != falseVar)
-  assert_equal(false, true != g:atrue)
-  assert_equal(true, g:atrue != false)
-
-  assert_equal(false, v:none != v:none)
-  assert_equal(true, v:none != v:null)
-  assert_equal(false, g:anone != v:none)
-  assert_equal(true, v:none != g:anull)
-
-  var nr55 = 55
-  var nr0 = 55
-  assert_equal(true, 2 != 0)
-  assert_equal(true, 2 != nr0)
-  assert_equal(false, 55 != 55)
-  assert_equal(false, 55 != nr55)
-  assert_equal(false, g:anint != 10)
-  assert_equal(true, 61 != g:anint)
+  var lines =<< trim END
+      var trueVar = true
+      var falseVar = false
+      assert_equal(false, true != true)
+      assert_equal(true, true !=
+                            false)
+      assert_equal(false, true
+                            != trueVar)
+      assert_equal(true, true != falseVar)
+      assert_equal(false, true != g:atrue)
+      assert_equal(true, g:atrue != false)
+
+      assert_equal(false, v:none != v:none)
+      assert_equal(true, v:none != v:null)
+      assert_equal(false, g:anone != v:none)
+      assert_equal(true, v:none != g:anull)
+
+      var nr55 = 55
+      var nr0 = 55
+      assert_equal(true, 2 != 0)
+      assert_equal(true, 2 != nr0)
+      assert_equal(false, 55 != 55)
+      assert_equal(false, 55 != nr55)
+      assert_equal(false, g:anint != 10)
+      assert_equal(true, 61 != g:anint)
 
-  if has('float')
-    var ff = 0.3
-    assert_equal(false, 0.3 != ff)
-    assert_equal(true, 0.4 != ff)
-    assert_equal(false, 0.1 != g:afloat)
-    assert_equal(true, g:afloat != 0.3)
-
-    ff = 3.0
-    assert_equal(false, ff != 3)
-    assert_equal(false, 3 != ff)
-    ff = 3.1
-    assert_equal(true, ff != 3)
-    assert_equal(true, 3 != ff)
-  endif
+      if has('float')
+        var ff = 0.3
+        assert_equal(false, 0.3 != ff)
+        assert_equal(true, 0.4 != ff)
+        assert_equal(false, 0.1 != g:afloat)
+        assert_equal(true, g:afloat != 0.3)
+
+        ff = 3.0
+        assert_equal(false, ff != 3)
+        assert_equal(false, 3 != ff)
+        ff = 3.1
+        assert_equal(true, ff != 3)
+        assert_equal(true, 3 != ff)
+      endif
 
-  assert_equal(false, 'abc' != 'abc')
-  assert_equal(true, 'xyz' != 'abc')
-  assert_equal(false, g:astring != 'asdf')
-  assert_equal(true, 'xyz' != g:astring)
-
-  assert_equal(true, 'abc' != 'ABC')
-  set ignorecase
-  assert_equal(true, 'abc' != 'ABC')
-  set noignorecase
-
-  var bb = 0z3f
-  assert_equal(false, 0z3f != bb)
-  assert_equal(true, bb != 0z4f)
-  assert_equal(false, g:ablob != 0z01ab)
-  assert_equal(true, 0z3f != g:ablob)
-
-  assert_equal(false, [1, 2, 3] != [1, 2, 3])
-  assert_equal(true, [1, 2, 3] != [2, 3, 1])
-  assert_equal(false, [2, 3, 4] != g:alist)
-  assert_equal(true, g:alist != [2, 3, 1])
-  assert_equal(true, [1, 2, 3] != [])
-  assert_equal(true, [1, 2, 3] != ['1', '2', '3'])
-
-  assert_equal(false, #{one: 1, two: 2} != #{one: 1, two: 2})
-  assert_equal(true, #{one: 1, two: 2} != #{one: 2, two: 2})
-  assert_equal(true, #{one: 1, two: 2} != #{two: 2})
-  assert_equal(true, #{one: 1, two: 2} != #{})
-  assert_equal(false, g:adict != #{bbb: 8, aaa: 2})
-  assert_equal(true, #{ccc: 9, aaa: 2} != g:adict)
-
-  assert_equal(false, function('g:Test_expr4_equal') != function('g:Test_expr4_equal'))
-  assert_equal(true, function('g:Test_expr4_equal') != function('g:Test_expr4_is'))
-
-  assert_equal(false, function('g:Test_expr4_equal', [123]) != function('g:Test_expr4_equal', [123]))
-  assert_equal(true, function('g:Test_expr4_equal', [123]) != function('g:Test_expr4_is', [123]))
-  assert_equal(true, function('g:Test_expr4_equal', [123]) != function('g:Test_expr4_equal', [999]))
+      assert_equal(false, 'abc' != 'abc')
+      assert_equal(true, 'xyz' != 'abc')
+      assert_equal(false, g:astring != 'asdf')
+      assert_equal(true, 'xyz' != g:astring)
+
+      assert_equal(true, 'abc' != 'ABC')
+      set ignorecase
+      assert_equal(true, 'abc' != 'ABC')
+      assert_equal(true, 'abc' !=# 'ABC')
+      assert_equal(false, 'abc' !=? 'ABC')
+      set noignorecase
+
+      var bb = 0z3f
+      assert_equal(false, 0z3f != bb)
+      assert_equal(true, bb != 0z4f)
+      assert_equal(false, g:ablob != 0z01ab)
+      assert_equal(true, 0z3f != g:ablob)
+
+      assert_equal(false, [1, 2, 3] != [1, 2, 3])
+      assert_equal(true, [1, 2, 3] != [2, 3, 1])
+      assert_equal(false, [2, 3, 4] != g:alist)
+      assert_equal(true, g:alist != [2, 3, 1])
+      assert_equal(true, [1, 2, 3] != [])
+      assert_equal(true, [1, 2, 3] != ['1', '2', '3'])
+
+      assert_equal(false, {one: 1, two: 2} != {one: 1, two: 2})
+      assert_equal(true, {one: 1, two: 2} != {one: 2, two: 2})
+      assert_equal(true, {one: 1, two: 2} != {two: 2})
+      assert_equal(true, {one: 1, two: 2} != {})
+      assert_equal(false, g:adict != {bbb: 8, aaa: 2})
+      assert_equal(true, {ccc: 9, aaa: 2} != g:adict)
+
+      assert_equal(false, function('g:Test_expr4_equal') != function('g:Test_expr4_equal'))
+      assert_equal(true, function('g:Test_expr4_equal') != function('g:Test_expr4_is'))
+
+      assert_equal(false, function('g:Test_expr4_equal', [123]) != function('g:Test_expr4_equal', [123]))
+      assert_equal(true, function('g:Test_expr4_equal', [123]) != function('g:Test_expr4_is', [123]))
+      assert_equal(true, function('g:Test_expr4_equal', [123]) != function('g:Test_expr4_equal', [999]))
+  END
+  CheckDefAndScriptSuccess(lines)
 enddef
 
 " test > comperator
 def Test_expr4_greater()
-  assert_true(2 > 0)
-  assert_true(2 >
-		1)
-  assert_false(2 > 2)
-  assert_false(2 > 3)
-  var nr2 = 2
-  assert_true(nr2 > 0)
-  assert_true(nr2 >
-		1)
-  assert_false(nr2 > 2)
-  assert_false(nr2
-  		    > 3)
-  if has('float')
-    var ff = 2.0
-    assert_true(ff > 0.0)
-    assert_true(ff > 1.0)
-    assert_false(ff > 2.0)
-    assert_false(ff > 3.0)
-  endif
+  var lines =<< trim END
+      assert_true(2 > 0)
+      assert_true(2 >
+                    1)
+      assert_false(2 > 2)
+      assert_false(2 > 3)
+      var nr2 = 2
+      assert_true(nr2 > 0)
+      assert_true(nr2 >
+                    1)
+      assert_false(nr2 > 2)
+      assert_false(nr2
+                        > 3)
+      if has('float')
+        var ff = 2.0
+        assert_true(ff > 0.0)
+        assert_true(ff > 1.0)
+        assert_false(ff > 2.0)
+        assert_false(ff > 3.0)
+      endif
+  END
+  CheckDefAndScriptSuccess(lines)
 enddef
 
 " test >= comperator
 def Test_expr4_greaterequal()
-  assert_true(2 >= 0)
-  assert_true(2 >=
-			2)
-  assert_false(2 >= 3)
-  var nr2 = 2
-  assert_true(nr2 >= 0)
-  assert_true(nr2 >= 2)
-  assert_false(nr2 >= 3)
-  if has('float')
-    var ff = 2.0
-    assert_true(ff >= 0.0)
-    assert_true(ff >= 2.0)
-    assert_false(ff >= 3.0)
-  endif
+  var lines =<< trim END
+      assert_true(2 >= 0)
+      assert_true(2 >=
+                            2)
+      assert_false(2 >= 3)
+      var nr2 = 2
+      assert_true(nr2 >= 0)
+      assert_true(nr2 >= 2)
+      assert_false(nr2 >= 3)
+      if has('float')
+        var ff = 2.0
+        assert_true(ff >= 0.0)
+        assert_true(ff >= 2.0)
+        assert_false(ff >= 3.0)
+      endif
+  END
+  CheckDefAndScriptSuccess(lines)
 enddef
 
 " test < comperator
 def Test_expr4_smaller()
-  assert_false(2 < 0)
-  assert_false(2 <
-			2)
-  assert_true(2
-  		< 3)
-  var nr2 = 2
-  assert_false(nr2 < 0)
-  assert_false(nr2 < 2)
-  assert_true(nr2 < 3)
-  if has('float')
-    var ff = 2.0
-    assert_false(ff < 0.0)
-    assert_false(ff < 2.0)
-    assert_true(ff < 3.0)
-  endif
+  var lines =<< trim END
+      assert_false(2 < 0)
+      assert_false(2 <
+                            2)
+      assert_true(2
+                    < 3)
+      var nr2 = 2
+      assert_false(nr2 < 0)
+      assert_false(nr2 < 2)
+      assert_true(nr2 < 3)
+      if has('float')
+        var ff = 2.0
+        assert_false(ff < 0.0)
+        assert_false(ff < 2.0)
+        assert_true(ff < 3.0)
+      endif
+  END
+  CheckDefAndScriptSuccess(lines)
 enddef
 
 " test <= comperator
 def Test_expr4_smallerequal()
-  assert_false(2 <= 0)
-  assert_false(2 <=
-			1)
-  assert_true(2
-  		<= 2)
-  assert_true(2 <= 3)
-  var nr2 = 2
-  assert_false(nr2 <= 0)
-  assert_false(nr2 <= 1)
-  assert_true(nr2 <= 2)
-  assert_true(nr2 <= 3)
-  if has('float')
-    var ff = 2.0
-    assert_false(ff <= 0.0)
-    assert_false(ff <= 1.0)
-    assert_true(ff <= 2.0)
-    assert_true(ff <= 3.0)
-  endif
+  var lines =<< trim END
+      assert_false(2 <= 0)
+      assert_false(2 <=
+                            1)
+      assert_true(2
+                    <= 2)
+      assert_true(2 <= 3)
+      var nr2 = 2
+      assert_false(nr2 <= 0)
+      assert_false(nr2 <= 1)
+      assert_true(nr2 <= 2)
+      assert_true(nr2 <= 3)
+      if has('float')
+        var ff = 2.0
+        assert_false(ff <= 0.0)
+        assert_false(ff <= 1.0)
+        assert_true(ff <= 2.0)
+        assert_true(ff <= 3.0)
+      endif
+  END
+  CheckDefAndScriptSuccess(lines)
 enddef
 
 " test =~ comperator
 def Test_expr4_match()
-  assert_equal(false, '2' =~ '0')
-  assert_equal(false, ''
-  			 =~ '0')
-  assert_equal(true, '2' =~
-			'[0-9]')
+  var lines =<< trim END
+      assert_equal(false, '2' =~ '0')
+      assert_equal(false, ''
+                             =~ '0')
+      assert_equal(true, '2' =~
+                            '[0-9]')
+      set ignorecase
+      assert_equal(false, 'abc' =~ 'ABC')
+      assert_equal(false, 'abc' =~# 'ABC')
+      assert_equal(true, 'abc' =~? 'ABC')
+      set noignorecase
+  END
+  CheckDefAndScriptSuccess(lines)
 enddef
 
 " test !~ comperator
 def Test_expr4_nomatch()
-  assert_equal(true, '2' !~ '0')
-  assert_equal(true, ''
-  			!~ '0')
-  assert_equal(false, '2' !~
-			'[0-9]')
+  var lines =<< trim END
+      assert_equal(true, '2' !~ '0')
+      assert_equal(true, ''
+                            !~ '0')
+      assert_equal(false, '2' !~
+                            '[0-9]')
+  END
+  CheckDefAndScriptSuccess(lines)
 enddef
 
 " test is comperator
 def Test_expr4_is()
-  var mylist = [2]
-  assert_false(mylist is [2])
-  var other = mylist
-  assert_true(mylist is
-		other)
-
-  var myblob = 0z1234
-  assert_false(myblob
-  			is 0z1234)
-  var otherblob = myblob
-  assert_true(myblob is otherblob)
+  var lines =<< trim END
+      var mylist = [2]
+      assert_false(mylist is [2])
+      var other = mylist
+      assert_true(mylist is
+                    other)
+
+      var myblob = 0z1234
+      assert_false(myblob
+                            is 0z1234)
+      var otherblob = myblob
+      assert_true(myblob is otherblob)
+  END
+  CheckDefAndScriptSuccess(lines)
 enddef
 
 " test isnot comperator
 def Test_expr4_isnot()
-  var mylist = [2]
-  assert_true('2' isnot '0')
-  assert_true(mylist isnot [2])
-  var other = mylist
-  assert_false(mylist isnot
-			other)
-
-  var myblob = 0z1234
-  assert_true(myblob
-  		isnot 0z1234)
-  var otherblob = myblob
-  assert_false(myblob isnot otherblob)
+  var lines =<< trim END
+      var mylist = [2]
+      assert_true('2' isnot '0')
+      assert_true(mylist isnot [2])
+      var other = mylist
+      assert_false(mylist isnot
+                            other)
+
+      var myblob = 0z1234
+      assert_true(myblob
+                    isnot 0z1234)
+      var otherblob = myblob
+      assert_false(myblob isnot otherblob)
+  END
+  CheckDefAndScriptSuccess(lines)
 enddef
 
 def RetVoid()
@@ -893,31 +934,12 @@
   END
   CheckScriptFailure(lines, 'Cannot use "is" with number', 2)
 
-  # check 'ignorecase' not being used
-  lines =<< trim END
-    vim9script
-    set ignorecase
-    assert_equal(false, 'abc' == 'ABC')
-    assert_equal(false, 'abc' ==# 'ABC')
-    assert_equal(true, 'abc' ==? 'ABC')
-
-    assert_equal(true, 'abc' != 'ABC')
-    assert_equal(true, 'abc' !=# 'ABC')
-    assert_equal(false, 'abc' !=? 'ABC')
-
-    assert_equal(false, 'abc' =~ 'ABC')
-    assert_equal(false, 'abc' =~# 'ABC')
-    assert_equal(true, 'abc' =~? 'ABC')
-    set noignorecase
-  END
-  CheckScriptSuccess(lines)
-
   # check missing white space
   lines =<< trim END
     vim9script
     echo 2>3
   END
-  CheckScriptFailure(lines, 'E1004:', 2)
+  CheckScriptFailure(lines, 'E1004: White space required before and after ''>'' at ">3"', 2)
   lines =<< trim END
     vim9script
     echo 2 >3
@@ -937,7 +959,7 @@
     vim9script
     echo 2 !=3
   END
-  CheckScriptFailure(lines, 'E1004:', 2)
+  CheckScriptFailure(lines, 'E1004: White space required before and after ''!'' at "!=3"', 2)
   lines =<< trim END
     vim9script
     echo 2!= 3
@@ -1029,55 +1051,65 @@
 
 " test addition, subtraction, concatenation
 def Test_expr5()
-  assert_equal(66, 60 + 6)
-  assert_equal(70, 60 +
-			g:anint)
-  assert_equal(9, g:thefour
-  			+ 5)
-  assert_equal(14, g:thefour + g:anint)
-  assert_equal([1, 2, 3, 4], [1] + g:alist)
-
-  assert_equal(54, 60 - 6)
-  assert_equal(50, 60 -
-		    g:anint)
-  assert_equal(-1, g:thefour
-  			- 5)
-  assert_equal(-6, g:thefour - g:anint)
-
-  assert_equal('hello', 'hel' .. 'lo')
-  assert_equal('hello 123', 'hello ' ..
-					123)
-  assert_equal('hello 123', 'hello '
-  				..  123)
-  assert_equal('123 hello', 123 .. ' hello')
-  assert_equal('123456', 123 .. 456)
-
-  assert_equal('av:true', 'a' .. true)
-  assert_equal('av:false', 'a' .. false)
-  assert_equal('av:null', 'a' .. v:null)
-  assert_equal('av:none', 'a' .. v:none)
-  if has('float')
-    assert_equal('a0.123', 'a' .. 0.123)
-  endif
+  var lines =<< trim END
+      assert_equal(66, 60 + 6)
+      assert_equal(70, 60 +
+                            g:anint)
+      assert_equal(9, g:thefour
+                            + 5)
+      assert_equal(14, g:thefour + g:anint)
+      assert_equal([1, 2, 3, 4], [1] + g:alist)
+
+      assert_equal(54, 60 - 6)
+      assert_equal(50, 60 -
+                        g:anint)
+      assert_equal(-1, g:thefour
+                            - 5)
+      assert_equal(-6, g:thefour - g:anint)
+
+      assert_equal('hello', 'hel' .. 'lo')
+      assert_equal('hello 123', 'hello ' ..
+                                            123)
+      assert_equal('hello 123', 'hello '
+                                    ..  123)
+      assert_equal('123 hello', 123 .. ' hello')
+      assert_equal('123456', 123 .. 456)
+
+      assert_equal('atrue', 'a' .. true)
+      assert_equal('afalse', 'a' .. false)
+      assert_equal('anull', 'a' .. v:null)
+      assert_equal('av:none', 'a' .. v:none)
+      if has('float')
+        assert_equal('a0.123', 'a' .. 0.123)
+      endif
 
-  assert_equal([1, 2, 3, 4], [1, 2] + [3, 4])
-  assert_equal(0z11223344, 0z1122 + 0z3344)
-  assert_equal(0z112201ab, 0z1122
-  				+ g:ablob)
-  assert_equal(0z01ab3344, g:ablob + 0z3344)
-  assert_equal(0z01ab01ab, g:ablob + g:ablob)
-
-  # concatenate non-constant to constant
-  var save_path = &path
-  &path = 'b'
-  assert_equal('ab', 'a' .. &path)
-  &path = save_path
+      set digraph
+      assert_equal('val: true', 'val: ' .. &digraph)
+      set nodigraph
+      assert_equal('val: false', 'val: ' .. &digraph)
+
+      assert_equal([1, 2, 3, 4], [1, 2] + [3, 4])
+      assert_equal(0z11223344, 0z1122 + 0z3344)
+      assert_equal(0z112201ab, 0z1122
+                                    + g:ablob)
+      assert_equal(0z01ab3344, g:ablob + 0z3344)
+      assert_equal(0z01ab01ab, g:ablob + g:ablob)
+
+      # concatenate non-constant to constant
+      var save_path = &path
+      &path = 'b'
+      assert_equal('ab', 'a' .. &path)
+      &path = save_path
 
-  @b = 'b'
-  assert_equal('ab', 'a' .. @b)
+      @b = 'b'
+      assert_equal('ab', 'a' .. @b)
 
-  $ENVVAR = 'env'
-  assert_equal('aenv', 'a' .. $ENVVAR)
+      $ENVVAR = 'env'
+      assert_equal('aenv', 'a' .. $ENVVAR)
+
+      assert_equal('val', '' .. {key: 'val'}['key'])
+  END
+  CheckDefAndScriptSuccess(lines)
 enddef
 
 def Test_expr5_vim9script()
@@ -1181,7 +1213,7 @@
       vim9script
       echo 'a'..'b'
   END
-  CheckScriptFailure(lines, 'E1004:', 2)
+  CheckScriptFailure(lines, 'E1004: White space required before and after ''..'' at "..''b''"', 2)
   lines =<< trim END
       vim9script
       echo 'a' ..'b'
@@ -1193,19 +1225,6 @@
   END
   CheckScriptFailure(lines, 'E1004:', 2)
 
-  # check valid string concatenation
-  lines =<< trim END
-      vim9script
-      assert_equal('one123', 'one' .. 123)
-      assert_equal('onev:true', 'one' .. true)
-      assert_equal('onev:null', 'one' .. v:null)
-      assert_equal('onev:none', 'one' .. v:none)
-      if has('float')
-        assert_equal('a0.123', 'a' .. 0.123)
-      endif
-  END
-  CheckScriptSuccess(lines)
-
   # check invalid string concatenation
   lines =<< trim END
       vim9script
@@ -1214,7 +1233,7 @@
   CheckScriptFailure(lines, 'E730:', 2)
   lines =<< trim END
       vim9script
-      echo 'a' .. #{a: 1}
+      echo 'a' .. {a: 1}
   END
   CheckScriptFailure(lines, 'E731:', 2)
   lines =<< trim END
@@ -1255,24 +1274,27 @@
   if !has('float')
     MissingFeature 'float'
   else
-    assert_equal(66.0, 60.0 + 6.0)
-    assert_equal(66.0, 60.0 + 6)
-    assert_equal(66.0, 60 +
-			 6.0)
-    assert_equal(5.1, g:afloat
-    			+ 5)
-    assert_equal(8.1, 8 + g:afloat)
-    assert_equal(10.1, g:anint + g:afloat)
-    assert_equal(10.1, g:afloat + g:anint)
-
-    assert_equal(54.0, 60.0 - 6.0)
-    assert_equal(54.0, 60.0
-    			    - 6)
-    assert_equal(54.0, 60 - 6.0)
-    assert_equal(-4.9, g:afloat - 5)
-    assert_equal(7.9, 8 - g:afloat)
-    assert_equal(9.9, g:anint - g:afloat)
-    assert_equal(-9.9, g:afloat - g:anint)
+    var lines =<< trim END
+        assert_equal(66.0, 60.0 + 6.0)
+        assert_equal(66.0, 60.0 + 6)
+        assert_equal(66.0, 60 +
+                             6.0)
+        assert_equal(5.1, g:afloat
+                            + 5)
+        assert_equal(8.1, 8 + g:afloat)
+        assert_equal(10.1, g:anint + g:afloat)
+        assert_equal(10.1, g:afloat + g:anint)
+
+        assert_equal(54.0, 60.0 - 6.0)
+        assert_equal(54.0, 60.0
+                                - 6)
+        assert_equal(54.0, 60 - 6.0)
+        assert_equal(-4.9, g:afloat - 5)
+        assert_equal(7.9, 8 - g:afloat)
+        assert_equal(9.9, g:anint - g:afloat)
+        assert_equal(-9.9, g:afloat - g:anint)
+    END
+    CheckDefAndScriptSuccess(lines)
   endif
 enddef
 
@@ -1292,67 +1314,98 @@
   call CheckDefFailure(["var x = '1' ..'2'"], msg, 1)
   call CheckDefFailure(["var x = '1'.. '2'"], msg, 1)
 
-  call CheckDefFailure(["var x = 0z1122 + 33"], 'E1051', 1)
-  call CheckDefFailure(["var x = 0z1122 + [3]"], 'E1051', 1)
-  call CheckDefFailure(["var x = 0z1122 + 'asd'"], 'E1051', 1)
-  call CheckDefFailure(["var x = 33 + 0z1122"], 'E1051', 1)
-  call CheckDefFailure(["var x = [3] + 0z1122"], 'E1051', 1)
-  call CheckDefFailure(["var x = 'asdf' + 0z1122"], 'E1051', 1)
-  call CheckDefFailure(["var x = 6 + xxx"], 'E1001', 1)
-
-  call CheckDefFailure(["var x = 'a' .. [1]"], 'E1105', 1)
-  call CheckDefFailure(["var x = 'a' .. #{a: 1}"], 'E1105', 1)
-  call CheckDefFailure(["var x = 'a' .. test_void()"], 'E1105', 1)
-  call CheckDefFailure(["var x = 'a' .. 0z32"], 'E1105', 1)
-  call CheckDefFailure(["var x = 'a' .. function('len')"], 'E1105', 1)
-  call CheckDefFailure(["var x = 'a' .. function('len', ['a'])"], 'E1105', 1)
+  call CheckDefFailure(["var x = 0z1122 + 33"], 'E1051:', 1)
+  call CheckDefFailure(["var x = 0z1122 + [3]"], 'E1051:', 1)
+  call CheckDefFailure(["var x = 0z1122 + 'asd'"], 'E1051:', 1)
+  call CheckDefFailure(["var x = 33 + 0z1122"], 'E1051:', 1)
+  call CheckDefFailure(["var x = [3] + 0z1122"], 'E1051:', 1)
+  call CheckDefFailure(["var x = 'asdf' + 0z1122"], 'E1051:', 1)
+  call CheckDefFailure(["var x = 6 + xxx"], 'E1001:', 1)
+
+  call CheckDefFailure(["var x = 'a' .. [1]"], 'E1105:', 1)
+  call CheckDefFailure(["var x = 'a' .. {a: 1}"], 'E1105:', 1)
+  call CheckDefFailure(["var x = 'a' .. test_void()"], 'E1105:', 1)
+  call CheckDefFailure(["var x = 'a' .. 0z32"], 'E1105:', 1)
+  call CheckDefFailure(["var x = 'a' .. function('len')"], 'E1105:', 1)
+  call CheckDefFailure(["var x = 'a' .. function('len', ['a'])"], 'E1105:', 1)
+
+  call CheckScriptFailure(['vim9script', 'var x = 1 + v:none'], 'E611:', 2)
+  call CheckScriptFailure(['vim9script', 'var x = 1 + v:null'], 'E611:', 2)
+  call CheckScriptFailure(['vim9script', 'var x = 1 + v:true'], 'E1138:', 2)
+  call CheckScriptFailure(['vim9script', 'var x = 1 + v:false'], 'E1138:', 2)
+  call CheckScriptFailure(['vim9script', 'var x = 1 + true'], 'E1138:', 2)
+  call CheckScriptFailure(['vim9script', 'var x = 1 + false'], 'E1138:', 2)
 endfunc
 
 func Test_expr5_fails_channel()
   CheckFeature channel
-  call CheckDefFailure(["var x = 'a' .. test_null_job()"], 'E1105', 1)
-  call CheckDefFailure(["var x = 'a' .. test_null_channel()"], 'E1105', 1)
+  call CheckDefFailure(["var x = 'a' .. test_null_job()"], 'E1105:', 1)
+  call CheckDefFailure(["var x = 'a' .. test_null_channel()"], 'E1105:', 1)
 endfunc
 
+def Test_expr5_list_add()
+  # concatenating two lists with same member types is OK
+  var d = {}
+  for i in ['a'] + ['b']
+    d = {[i]: 0}
+  endfor
+
+  # concatenating two lists with different member types results in "any"
+  var lines =<< trim END
+      var d = {}
+      for i in ['a'] + [0]
+        d = {[i]: 0}
+      endfor
+  END
+  CheckDefExecFailure(lines, 'E1012:')
+enddef
+
 " test multiply, divide, modulo
 def Test_expr6()
-  assert_equal(36, 6 * 6)
-  assert_equal(24, 6 *
-			g:thefour)
-  assert_equal(24, g:thefour
-  			* 6)
-  assert_equal(40, g:anint * g:thefour)
-
-  assert_equal(10, 60 / 6)
-  assert_equal(6, 60 /
-			g:anint)
-  assert_equal(1, g:anint / 6)
-  assert_equal(2, g:anint
-  			/ g:thefour)
-
-  assert_equal(5, 11 % 6)
-  assert_equal(4, g:anint % 6)
-  assert_equal(3, 13 %
-			g:anint)
-  assert_equal(2, g:anint
-  			% g:thefour)
-
-  assert_equal(4, 6 * 4 / 6)
-
-  var x = [2]
-  var y = [3]
-  assert_equal(5, x[0] + y[0])
-  assert_equal(6, x[0] * y[0])
-  if has('float')
-    var xf = [2.0]
-    var yf = [3.0]
-    assert_equal(5.0, xf[0]
-    			+ yf[0])
-    assert_equal(6.0, xf[0]
-    			* yf[0])
-  endif
+  var lines =<< trim END
+      assert_equal(36, 6 * 6)
+      assert_equal(24, 6 *
+                            g:thefour)
+      assert_equal(24, g:thefour
+                            * 6)
+      assert_equal(40, g:anint * g:thefour)
+
+      assert_equal(10, 60 / 6)
+      assert_equal(6, 60 /
+                            g:anint)
+      assert_equal(1, g:anint / 6)
+      assert_equal(2, g:anint
+                            / g:thefour)
+
+      assert_equal(5, 11 % 6)
+      assert_equal(4, g:anint % 6)
+      assert_equal(3, 13 %
+                            g:anint)
+      assert_equal(2, g:anint
+                            % g:thefour)
+
+      assert_equal(4, 6 * 4 / 6)
+
+      var x = [2]
+      var y = [3]
+      assert_equal(5, x[0] + y[0])
+      assert_equal(6, x[0] * y[0])
+      if has('float')
+        var xf = [2.0]
+        var yf = [3.0]
+        assert_equal(5.0, xf[0]
+                            + yf[0])
+        assert_equal(6.0, xf[0]
+                            * yf[0])
+      endif
+  END
+  CheckDefAndScriptSuccess(lines)
+
+  CheckDefFailure(["var x = 6 * xxx"], 'E1001:', 1)
+  CheckDefFailure(["var d = 6 * "], 'E1097:', 3)
 
-  CheckDefFailure(["var x = 6 * xxx"], 'E1001', 1)
+  CheckDefExecAndScriptFailure(['echo 1 / 0'], 'E1154', 1)
+  CheckDefExecAndScriptFailure(['echo 1 % 0'], 'E1154', 1)
 enddef
 
 def Test_expr6_vim9script()
@@ -1416,29 +1469,32 @@
   if !has('float')
     MissingFeature 'float'
   else
-    assert_equal(36.0, 6.0 * 6)
-    assert_equal(36.0, 6 *
-			   6.0)
-    assert_equal(36.0, 6.0 * 6.0)
-    assert_equal(1.0, g:afloat * g:anint)
-
-    assert_equal(10.0, 60 / 6.0)
-    assert_equal(10.0, 60.0 /
-			6)
-    assert_equal(10.0, 60.0 / 6.0)
-    assert_equal(0.01, g:afloat / g:anint)
-
-    assert_equal(4.0, 6.0 * 4 / 6)
-    assert_equal(4.0, 6 *
-			4.0 /
-			6)
-    assert_equal(4.0, 6 * 4 / 6.0)
-    assert_equal(4.0, 6.0 * 4.0 / 6)
-    assert_equal(4.0, 6 * 4.0 / 6.0)
-    assert_equal(4.0, 6.0 * 4 / 6.0)
-    assert_equal(4.0, 6.0 * 4.0 / 6.0)
+    var lines =<< trim END
+        assert_equal(36.0, 6.0 * 6)
+        assert_equal(36.0, 6 *
+                               6.0)
+        assert_equal(36.0, 6.0 * 6.0)
+        assert_equal(1.0, g:afloat * g:anint)
+
+        assert_equal(10.0, 60 / 6.0)
+        assert_equal(10.0, 60.0 /
+                            6)
+        assert_equal(10.0, 60.0 / 6.0)
+        assert_equal(0.01, g:afloat / g:anint)
+
+        assert_equal(4.0, 6.0 * 4 / 6)
+        assert_equal(4.0, 6 *
+                            4.0 /
+                            6)
+        assert_equal(4.0, 6 * 4 / 6.0)
+        assert_equal(4.0, 6.0 * 4.0 / 6)
+        assert_equal(4.0, 6 * 4.0 / 6.0)
+        assert_equal(4.0, 6.0 * 4 / 6.0)
+        assert_equal(4.0, 6.0 * 4.0 / 6.0)
 
-    assert_equal(4.0, 6.0 * 4.0 / 6.0)
+        assert_equal(4.0, 6.0 * 4.0 / 6.0)
+    END
+    CheckDefAndScriptSuccess(lines)
   endif
 enddef
 
@@ -1470,9 +1526,9 @@
   call CheckDefFailure(["var x = [1] / [2]"], 'E1036:', 1)
   call CheckDefFailure(["var x = [1] % [2]"], 'E1035:', 1)
 
-  call CheckDefFailure(["var x = #{one: 1} * #{two: 2}"], 'E1036:', 1)
-  call CheckDefFailure(["var x = #{one: 1} / #{two: 2}"], 'E1036:', 1)
-  call CheckDefFailure(["var x = #{one: 1} % #{two: 2}"], 'E1035:', 1)
+  call CheckDefFailure(["var x = {one: 1} * {two: 2}"], 'E1036:', 1)
+  call CheckDefFailure(["var x = {one: 1} / {two: 2}"], 'E1036:', 1)
+  call CheckDefFailure(["var x = {one: 1} % {two: 2}"], 'E1035:', 1)
 
   call CheckDefFailure(["var x = 0xff[1]"], 'E1107:', 1)
   if has('float')
@@ -1521,6 +1577,7 @@
   assert_equal(234, nr)
 
   CheckDefFailure(["var x = <nr>123"], 'E1010:', 1)
+  CheckDefFailure(["var x = <number>"], 'E1097:', 3)
   CheckDefFailure(["var x = <number >123"], 'E1068:', 1)
   CheckDefFailure(["var x = <number 123"], 'E1104:', 1)
 enddef
@@ -1528,12 +1585,15 @@
 " test low level expression
 def Test_expr7_number()
   # number constant
-  assert_equal(0, 0)
-  assert_equal(654, 0654)
+  var lines =<< trim END
+      assert_equal(0, 0)
+      assert_equal(654, 0654)
 
-  assert_equal(6, 0x6)
-  assert_equal(15, 0xf)
-  assert_equal(255, 0xff)
+      assert_equal(6, 0x6)
+      assert_equal(15, 0xf)
+      assert_equal(255, 0xff)
+  END
+  CheckDefAndScriptSuccess(lines)
 enddef
 
 def Test_expr7_float()
@@ -1541,31 +1601,40 @@
   if !has('float')
     MissingFeature 'float'
   else
-    assert_equal(g:float_zero, .0)
-    assert_equal(g:float_zero, 0.0)
-    assert_equal(g:float_neg, -9.8)
-    assert_equal(g:float_big, 9.9e99)
+    var lines =<< trim END
+        assert_equal(g:float_zero, .0)
+        assert_equal(g:float_zero, 0.0)
+        assert_equal(g:float_neg, -9.8)
+        assert_equal(g:float_big, 9.9e99)
+    END
+    CheckDefAndScriptSuccess(lines)
   endif
 enddef
 
 def Test_expr7_blob()
   # blob constant
-  assert_equal(g:blob_empty, 0z)
-  assert_equal(g:blob_one, 0z01)
-  assert_equal(g:blob_long, 0z0102.0304)
+  var lines =<< trim END
+      assert_equal(g:blob_empty, 0z)
+      assert_equal(g:blob_one, 0z01)
+      assert_equal(g:blob_long, 0z0102.0304)
+  END
+  CheckDefAndScriptSuccess(lines)
 
   CheckDefFailure(["var x = 0z123"], 'E973:', 1)
 enddef
 
 def Test_expr7_string()
   # string constant
-  assert_equal(g:string_empty, '')
-  assert_equal(g:string_empty, "")
-  assert_equal(g:string_short, 'x')
-  assert_equal(g:string_short, "x")
-  assert_equal(g:string_long, 'abcdefghijklm')
-  assert_equal(g:string_long, "abcdefghijklm")
-  assert_equal(g:string_special, "ab\ncd\ref\ekk")
+  var lines =<< trim END
+      assert_equal(g:string_empty, '')
+      assert_equal(g:string_empty, "")
+      assert_equal(g:string_short, 'x')
+      assert_equal(g:string_short, "x")
+      assert_equal(g:string_long, 'abcdefghijklm')
+      assert_equal(g:string_long, "abcdefghijklm")
+      assert_equal(g:string_special, "ab\ncd\ref\ekk")
+  END
+  CheckDefAndScriptSuccess(lines)
 
   CheckDefFailure(['var x = "abc'], 'E114:', 1)
   CheckDefFailure(["var x = 'abc"], 'E115:', 1)
@@ -1584,39 +1653,14 @@
 
 def Test_expr7_special()
   # special constant
-  assert_equal(g:special_true, true)
-  assert_equal(g:special_false, false)
-  assert_equal(g:special_true, v:true)
-  assert_equal(g:special_false, v:false)
-
-  assert_equal(true, !false)
-  assert_equal(false, !true)
-  assert_equal(true, !0)
-  assert_equal(false, !1)
-  assert_equal(false, !!false)
-  assert_equal(true, !!true)
-  assert_equal(false, !!0)
-  assert_equal(true, !!1)
-
-  assert_equal(g:special_null, v:null)
-  assert_equal(g:special_none, v:none)
-
-  CheckDefFailure(['v:true = true'], 'E46:', 1)
-  CheckDefFailure(['v:true = false'], 'E46:', 1)
-  CheckDefFailure(['v:false = true'], 'E46:', 1)
-  CheckDefFailure(['v:null = 11'], 'E46:', 1)
-  CheckDefFailure(['v:none = 22'], 'E46:', 1)
-enddef
-
-def Test_expr7_special_vim9script()
   var lines =<< trim END
-      vim9script
-      var t = true
-      var f = false
+      assert_equal(g:special_true, true)
+      assert_equal(g:special_false, false)
+      assert_equal(g:special_true, v:true)
+      assert_equal(g:special_false, v:false)
       assert_equal(v:true, true)
-      assert_equal(true, t)
       assert_equal(v:false, false)
-      assert_equal(false, f)
+
       assert_equal(true, !false)
       assert_equal(false, !true)
       assert_equal(true, !0)
@@ -1625,34 +1669,52 @@
       assert_equal(true, !!true)
       assert_equal(false, !!0)
       assert_equal(true, !!1)
+
+      var t = true
+      var f = false
+      assert_equal(true, t)
+      assert_equal(false, f)
+
+      assert_equal(g:special_null, v:null)
+      assert_equal(g:special_null, null)
+      assert_equal(g:special_none, v:none)
   END
-  CheckScriptSuccess(lines)
+  CheckDefAndScriptSuccess(lines)
+
+  CheckDefFailure(['v:true = true'], 'E46:', 1)
+  CheckDefFailure(['v:true = false'], 'E46:', 1)
+  CheckDefFailure(['v:false = true'], 'E46:', 1)
+  CheckDefFailure(['v:null = 11'], 'E46:', 1)
+  CheckDefFailure(['v:none = 22'], 'E46:', 1)
 enddef
 
 def Test_expr7_list()
   # list
-  assert_equal(g:list_empty, [])
-  assert_equal(g:list_empty, [  ])
+  var lines =<< trim END
+      assert_equal(g:list_empty, [])
+      assert_equal(g:list_empty, [  ])
 
-  var numbers: list<number> = [1, 2, 3]
-  numbers = [1]
-  numbers = []
-
-  var strings: list<string> = ['a', 'b', 'c']
-  strings = ['x']
-  strings = []
-
-  var mixed: list<any> = [1, 'b', false,]
-  assert_equal(g:list_mixed, mixed)
-  assert_equal('b', mixed[1])
-
-  echo [1,
-  	2] [3,
-		4]
-
-  var llstring: list<list<string>> = [['text'], []]
-  llstring = [[], ['text']]
-  llstring = [[], []]
+      var numbers: list<number> = [1, 2, 3]
+      numbers = [1]
+      numbers = []
+
+      var strings: list<string> = ['a', 'b', 'c']
+      strings = ['x']
+      strings = []
+
+      var mixed: list<any> = [1, 'b', false,]
+      assert_equal(g:list_mixed, mixed)
+      assert_equal('b', mixed[1])
+
+      echo [1,
+            2] [3,
+                    4]
+
+      var llstring: list<list<string>> = [['text'], []]
+      llstring = [[], ['text']]
+      llstring = [[], []]
+  END
+  CheckDefAndScriptSuccess(lines)
 
   var rangelist: list<number> = range(3)
   g:rangelist = range(3)
@@ -1669,15 +1731,15 @@
   CheckDefExecFailure(["echo 1", "var x = [][0]", "echo 3"], 'E684:', 2)
 
   CheckDefExecFailure(["var x = g:list_mixed['xx']"], 'E1012:', 1)
-  CheckDefFailure(["var x = g:list_mixed["], 'E1097:', 2)
-  CheckDefFailure(["var x = g:list_mixed[0"], 'E1097:', 2)
+  CheckDefFailure(["var x = g:list_mixed["], 'E1097:', 3)
+  CheckDefFailure(["var x = g:list_mixed[0"], 'E1097:', 3)
   CheckDefExecFailure(["var x = g:list_empty[3]"], 'E684:', 1)
   CheckDefExecFailure(["var l: list<number> = [234, 'x']"], 'E1012:', 1)
   CheckDefExecFailure(["var l: list<number> = ['x', 234]"], 'E1012:', 1)
   CheckDefExecFailure(["var l: list<string> = [234, 'x']"], 'E1012:', 1)
   CheckDefExecFailure(["var l: list<string> = ['x', 123]"], 'E1012:', 1)
 
-  var lines =<< trim END
+  lines =<< trim END
       vim9script
       var datalist: list<string>
       def Main()
@@ -1686,6 +1748,16 @@
       Main()
   END
   CheckScriptFailure(lines, 'E1127:')
+
+  lines =<< trim END
+      var numbers = [1, 2, 3, 4]
+      var a = 1
+      var b = 2
+  END
+  CheckDefAndScriptFailure(lines + ['echo numbers[1:b]'],
+      'E1004: White space required before and after '':'' at ":b]"', 4)
+  CheckDefAndScriptFailure(lines + ['echo numbers[1: b]'], 'E1004:', 4)
+  CheckDefAndScriptFailure(lines + ['echo numbers[a :b]'], 'E1004:', 4)
 enddef
 
 def Test_expr7_list_vim9script()
@@ -1749,96 +1821,219 @@
     var l: list<string> = [234, 'x']
   END
   CheckScriptFailure(lines, 'E1012:', 2)
+
+  lines =<< trim END
+      vim9script
+      def Failing()
+        job_stop()
+      enddef
+      var list = [Failing]
+  END
+  if has('channel')
+    CheckScriptFailure(lines, 'E119:', 1)
+  else
+    CheckScriptFailure(lines, 'E117:', 1)
+  endif
 enddef
 
 def LambdaWithComments(): func
-  return {x ->
+  return (x) =>
             # some comment
             x == 1
             # some comment
             ||
             x == 2
-        }
 enddef
 
 def LambdaUsingArg(x: number): func
-  return {->
+  return () =>
             # some comment
             x == 1
             # some comment
             ||
             x == 2
-        }
 enddef
 
 def Test_expr7_lambda()
-  var La = { -> 'result'}
-  assert_equal('result', La())
-  assert_equal([1, 3, 5], [1, 2, 3]->map({key, val -> key + val}))
-
-  # line continuation inside lambda with "cond ? expr : expr" works
-  var ll = range(3)
-  map(ll, {k, v -> v % 2 ? {
-	    '111': 111 } : {}
-	})
-  assert_equal([{}, {'111': 111}, {}], ll)
-
-  ll = range(3)
-  map(ll, {k, v -> v == 8 || v
-		== 9
-		|| v % 2 ? 111 : 222
-	})
-  assert_equal([222, 111, 222], ll)
-
-  ll = range(3)
-  map(ll, {k, v -> v != 8 && v
-		!= 9
-		&& v % 2 == 0 ? 111 : 222
-	})
-  assert_equal([111, 222, 111], ll)
-
-  var dl = [{'key': 0}, {'key': 22}]->filter({ _, v -> v['key'] })
-  assert_equal([{'key': 22}], dl)
-
-  dl = [{'key': 12}, {'foo': 34}]
-  assert_equal([{'key': 12}], filter(dl,
-	{_, v -> has_key(v, 'key') ? v['key'] == 12 : 0}))
-
-  assert_equal(false, LambdaWithComments()(0))
-  assert_equal(true, LambdaWithComments()(1))
-  assert_equal(true, LambdaWithComments()(2))
-  assert_equal(false, LambdaWithComments()(3))
+  var lines =<< trim END
+      var La = () => 'result'
+      assert_equal('result', La())
+      assert_equal([1, 3, 5], [1, 2, 3]->map((key, val) => key + val))
+
+      # line continuation inside lambda with "cond ? expr : expr" works
+      var ll = range(3)
+      var dll = mapnew(ll, (k, v) => v % 2 ? {
+                ['111']: 111 } : {}
+            )
+      assert_equal([{}, {111: 111}, {}], dll)
+
+      ll = range(3)
+      map(ll, (k, v) => v == 8 || v
+                    == 9
+                    || v % 2 ? 111 : 222
+            )
+      assert_equal([222, 111, 222], ll)
+
+      ll = range(3)
+      map(ll, (k, v) => v != 8 && v
+                    != 9
+                    && v % 2 == 0 ? 111 : 222
+            )
+      assert_equal([111, 222, 111], ll)
+
+      var dl = [{key: 0}, {key: 22}]->filter(( _, v) => v['key'] )
+      assert_equal([{key: 22}], dl)
+
+      dl = [{key: 12}, {['foo']: 34}]
+      assert_equal([{key: 12}], filter(dl,
+            (_, v) => has_key(v, 'key') ? v['key'] == 12 : 0))
+
+      assert_equal(false, LambdaWithComments()(0))
+      assert_equal(true, LambdaWithComments()(1))
+      assert_equal(true, LambdaWithComments()(2))
+      assert_equal(false, LambdaWithComments()(3))
+
+      assert_equal(false, LambdaUsingArg(0)())
+      assert_equal(true, LambdaUsingArg(1)())
+
+      var res = map([1, 2, 3], (i: number, v: number) => i + v)
+      assert_equal([1, 3, 5], res)
+  END
+  CheckDefAndScriptSuccess(lines)
+
+  CheckDefFailure(["var Ref = (a)=>a + 1"], 'E1004:')
+  CheckDefFailure(["var Ref = (a)=> a + 1"], 'E1004: White space required before and after ''=>'' at "=> a + 1"')
+  CheckDefFailure(["var Ref = (a) =>a + 1"], 'E1004:')
+
+  CheckDefFailure(["filter([1, 2], (k,v) => 1)"], 'E1069:', 1)
+  # error is in first line of the lambda
+  CheckDefFailure(["var L = (a) => a + b"], 'E1001:', 0)
+
+  assert_equal('xxxyyy', 'xxx'->((a, b) => a .. b)('yyy'))
+
+  CheckDefExecFailure(["var s = 'asdf'->((a) => a)('x')"], 'E118:')
+  CheckDefExecFailure(["var s = 'asdf'->((a) => a)('x', 'y')"], 'E118:')
+  CheckDefFailure(["echo 'asdf'->((a) => a)(x)"], 'E1001:', 1)
+
+  CheckDefSuccess(['var Fx = (a) => ({k1: 0,', ' k2: 1})'])
+  CheckDefFailure(['var Fx = (a) => ({k1: 0', ' k2: 1})'], 'E722:', 2)
+  CheckDefFailure(['var Fx = (a) => ({k1: 0,', ' k2 1})'], 'E720:', 2)
+
+  CheckDefSuccess(['var Fx = (a) => [0,', ' 1]'])
+  CheckDefFailure(['var Fx = (a) => [0', ' 1]'], 'E696:', 2)
+enddef
+
+def NewLambdaWithComments(): func
+  return (x) =>
+            # some comment
+            x == 1
+            # some comment
+            ||
+            x == 2
+enddef
+
+def NewLambdaUsingArg(x: number): func
+  return () =>
+            # some comment
+            x == 1
+            # some comment
+            ||
+            x == 2
+enddef
+
+def Test_expr7_new_lambda()
+  var lines =<< trim END
+      var La = () => 'result'
+      assert_equal('result', La())
+      assert_equal([1, 3, 5], [1, 2, 3]->map((key, val) => key + val))
+
+      # line continuation inside lambda with "cond ? expr : expr" works
+      var ll = range(3)
+      var dll = mapnew(ll, (k, v) => v % 2 ? {
+                ['111']: 111 } : {}
+            )
+      assert_equal([{}, {111: 111}, {}], dll)
+
+      ll = range(3)
+      map(ll, (k, v) => v == 8 || v
+                    == 9
+                    || v % 2 ? 111 : 222
+            )
+      assert_equal([222, 111, 222], ll)
+
+      ll = range(3)
+      map(ll, (k, v) => v != 8 && v
+                    != 9
+                    && v % 2 == 0 ? 111 : 222
+            )
+      assert_equal([111, 222, 111], ll)
+
+      var dl = [{key: 0}, {key: 22}]->filter(( _, v) => v['key'] )
+      assert_equal([{key: 22}], dl)
+
+      dl = [{key: 12}, {['foo']: 34}]
+      assert_equal([{key: 12}], filter(dl,
+            (_, v) => has_key(v, 'key') ? v['key'] == 12 : 0))
+
+      assert_equal(false, NewLambdaWithComments()(0))
+      assert_equal(true, NewLambdaWithComments()(1))
+      assert_equal(true, NewLambdaWithComments()(2))
+      assert_equal(false, NewLambdaWithComments()(3))
+
+      assert_equal(false, NewLambdaUsingArg(0)())
+      assert_equal(true, NewLambdaUsingArg(1)())
+
+      var res = map([1, 2, 3], (i: number, v: number) => i + v)
+      assert_equal([1, 3, 5], res)
+
+      # Lambda returning a dict
+      var Lmb = () => ({key: 42})
+      assert_equal({key: 42}, Lmb())
+
+      var RefOne: func(number): string = (a: number): string => 'x'
+      var RefTwo: func(number): any = (a: number): any => 'x'
+
+      var Fx = (a) => ({k1: 0,
+                         k2: 1})
+      var Fy = (a) => [0,
+                       1]
+  END
+  CheckDefAndScriptSuccess(lines)
 
-  assert_equal(false, LambdaUsingArg(0)())
-  assert_equal(true, LambdaUsingArg(1)())
+  CheckDefAndScriptFailure(["var Ref = (a)=>a + 1"], 'E1004:')
+  CheckDefAndScriptFailure(["var Ref = (a)=> a + 1"], 'E1004:')
+  CheckDefAndScriptFailure(["var Ref = (a) =>a + 1"],
+      'E1004: White space required before and after ''=>'' at " =>a + 1"')
 
-  CheckDefFailure(["filter([1, 2], {k,v -> 1})"], 'E1069:', 1)
+  CheckDefFailure(["var Ref: func(number): number = (a: number): string => 'x'"], 'E1012:')
+  CheckDefFailure(["var Ref: func(number): string = (a: number): string => 99"], 'E1012:')
+
+  CheckDefFailure(["filter([1, 2], (k,v) => 1)"], 'E1069:', 1)
   # error is in first line of the lambda
-  CheckDefFailure(["var L = {a -> a + b}"], 'E1001:', 0)
+  CheckDefFailure(["var L = (a) -> a + b"], 'E1001:', 1)
+
+# TODO: ->(lambda)() doesn't work yet
+#  assert_equal('xxxyyy', 'xxx'->((a, b) => a .. b)('yyy'))
 
-  assert_equal('xxxyyy', 'xxx'->{a, b -> a .. b}('yyy'))
+#  CheckDefExecFailure(["var s = 'asdf'->{a -> a}('x')"],
+#        'E1106: One argument too many')
+#  CheckDefExecFailure(["var s = 'asdf'->{a -> a}('x', 'y')"],
+#        'E1106: 2 arguments too many')
+#  CheckDefFailure(["echo 'asdf'->{a -> a}(x)"], 'E1001:', 1)
 
-  CheckDefExecFailure(["var s = 'asdf'->{a -> a}('x')"],
-        'E1106: One argument too many')
-  CheckDefExecFailure(["var s = 'asdf'->{a -> a}('x', 'y')"],
-        'E1106: 2 arguments too many')
-  CheckDefFailure(["echo 'asdf'->{a -> a}(x)"], 'E1001:', 1)
-
-  CheckDefSuccess(['var Fx = {a -> #{k1: 0,', ' k2: 1}}'])
-  CheckDefFailure(['var Fx = {a -> #{k1: 0', ' k2: 1}}'], 'E722:', 2)
-  CheckDefFailure(['var Fx = {a -> #{k1: 0,', ' k2 1}}'], 'E720:', 2)
+  CheckDefFailure(['var Fx = (a) => ({k1: 0', ' k2: 1})'], 'E722:', 2)
+  CheckDefFailure(['var Fx = (a) => ({k1: 0,', ' k2 1})'], 'E720:', 2)
 
-  CheckDefSuccess(['var Fx = {a -> [0,', ' 1]}'])
-  CheckDefFailure(['var Fx = {a -> [0', ' 1]}'], 'E696:', 2)
+  CheckDefFailure(['var Fx = (a) => [0', ' 1]'], 'E696:', 2)
 enddef
 
 def Test_expr7_lambda_vim9script()
   var lines =<< trim END
       vim9script
-      var v = 10->{a ->
+      var v = 10->((a) =>
 	    a
 	      + 2
-	  }()
+            )()
       assert_equal(12, v)
   END
   CheckScriptSuccess(lines)
@@ -1846,168 +2041,248 @@
   # nested lambda with line breaks
   lines =<< trim END
       vim9script
-      search('"', 'cW', 0, 0, {->
+      search('"', 'cW', 0, 0, () =>
 	synstack('.', col('.'))
-	->map({_, v -> synIDattr(v, 'name')})->len()})
+          ->map((_, v) => synIDattr(v, 'name'))->len())
   END
   CheckScriptSuccess(lines)
 enddef
 
 def Test_epxr7_funcref()
   var lines =<< trim END
-    def RetNumber(): number
-      return 123
-    enddef
-    var FuncRef = RetNumber
-    assert_equal(123, FuncRef())
+      def RetNumber(): number
+        return 123
+      enddef
+      var FuncRef = RetNumber
+      assert_equal(123, FuncRef())
   END
   CheckDefAndScriptSuccess(lines)
 enddef
 
+let g:test_space_dict = {'': 'empty', ' ': 'space'}
+let g:test_hash_dict = #{one: 1, two: 2}
+
 def Test_expr7_dict()
   # dictionary
-  assert_equal(g:dict_empty, {})
-  assert_equal(g:dict_empty, {  })
-  assert_equal(g:dict_one, {'one': 1})
-  var key = 'one'
-  var val = 1
-  assert_equal(g:dict_one, {key: val})
-
-  var numbers: dict<number> = #{a: 1, b: 2, c: 3}
-  numbers = #{a: 1}
-  numbers = #{}
-
-  var strings: dict<string> = #{a: 'a', b: 'b', c: 'c'}
-  strings = #{a: 'x'}
-  strings = #{}
-
-  var mixed: dict<any> = #{a: 'a', b: 42}
-  mixed = #{a: 'x'}
-  mixed = #{a: 234}
-  mixed = #{}
-
-  var dictlist: dict<list<string>> = #{absent: [], present: ['hi']}
-  dictlist = #{absent: ['hi'], present: []}
-  dictlist = #{absent: [], present: []}
-
-  var dictdict: dict<dict<string>> = #{one: #{a: 'text'}, two: #{}}
-  dictdict = #{one: #{}, two: #{a: 'text'}}
-  dictdict = #{one: #{}, two: #{}}
+  var lines =<< trim END
+      assert_equal(g:dict_empty, {})
+      assert_equal(g:dict_empty, {  })
+      assert_equal(g:dict_one, {['one']: 1})
+      var key = 'one'
+      var val = 1
+      assert_equal(g:dict_one, {[key]: val})
+
+      var numbers: dict<number> = {a: 1, b: 2, c: 3}
+      numbers = {a: 1}
+      numbers = {}
+
+      var strings: dict<string> = {a: 'a', b: 'b', c: 'c'}
+      strings = {a: 'x'}
+      strings = {}
+
+      var dash = {xx-x: 8}
+      assert_equal({['xx-x']: 8}, dash)
+
+      var dnr = {8: 8}
+      assert_equal({['8']: 8}, dnr)
+
+      var mixed: dict<any> = {a: 'a', b: 42}
+      mixed = {a: 'x'}
+      mixed = {a: 234}
+      mixed = {}
+
+      var dictlist: dict<list<string>> = {absent: [], present: ['hi']}
+      dictlist = {absent: ['hi'], present: []}
+      dictlist = {absent: [], present: []}
+
+      var dictdict: dict<dict<string>> = {one: {a: 'text'}, two: {}}
+      dictdict = {one: {}, two: {a: 'text'}}
+      dictdict = {one: {}, two: {}}
+
+      assert_equal({['']: 0}, {[matchstr('string', 'wont match')]: 0})
+
+      assert_equal(g:test_space_dict, {['']: 'empty', [' ']: 'space'})
+      assert_equal(g:test_hash_dict, {one: 1, two: 2})
+
+      assert_equal({['a a']: 1, ['b/c']: 2}, {'a a': 1, "b/c": 2})
+
+      var d = {a: () => 3, b: () => 7}
+      assert_equal(3, d.a())
+      assert_equal(7, d.b())
+
+      var cd = { # comment
+                key: 'val' # comment
+               }
+  END
+  CheckDefAndScriptSuccess(lines)
  
-  CheckDefFailure(["var x = #{a:8}"], 'E1069:', 1)
-  CheckDefFailure(["var x = #{a : 8}"], 'E1068:', 1)
-  CheckDefFailure(["var x = #{a :8}"], 'E1068:', 1)
-  CheckDefFailure(["var x = #{a: 8 , b: 9}"], 'E1068:', 1)
-  CheckDefFailure(["var x = #{a: 1,b: 2}"], 'E1069:', 1)
-
-  CheckDefFailure(["var x = #{8: 8}"], 'E1014:', 1)
-  CheckDefFailure(["var x = #{xxx}"], 'E720:', 1)
-  CheckDefFailure(["var x = #{xxx: 1", "var y = 2"], 'E722:', 2)
-  CheckDefFailure(["var x = #{xxx: 1,"], 'E723:', 2)
-  CheckDefFailure(["var x = {'a': xxx}"], 'E1001:', 1)
-  CheckDefFailure(["var x = {xxx: 8}"], 'E1001:', 1)
-  CheckDefFailure(["var x = #{a: 1, a: 2}"], 'E721:', 1)
-  CheckDefFailure(["var x = #"], 'E1015:', 1)
+  # legacy syntax doesn't work
+  CheckDefFailure(["var x = #{key: 8}"], 'E1097:', 3)
+  CheckDefFailure(["var x = 'a' .. #{a: 1}"], 'E1097:', 3)
+
+  CheckDefFailure(["var x = {a:8}"], 'E1069:', 1)
+  CheckDefFailure(["var x = {a : 8}"], 'E1068:', 1)
+  CheckDefFailure(["var x = {a :8}"], 'E1068:', 1)
+  CheckDefFailure(["var x = {a: 8 , b: 9}"], 'E1068:', 1)
+  CheckDefFailure(["var x = {a: 1,b: 2}"], 'E1069:', 1)
+
+  CheckDefFailure(["var x = {xxx}"], 'E720:', 1)
+  CheckDefFailure(["var x = {xxx: 1", "var y = 2"], 'E722:', 2)
+  CheckDefFailure(["var x = {xxx: 1,"], 'E723:', 2)
+  CheckDefFailure(["var x = {['a']: xxx}"], 'E1001:', 1)
+  CheckDefFailure(["var x = {a: 1, a: 2}"], 'E721:', 1)
   CheckDefExecFailure(["var x = g:anint.member"], 'E715:', 1)
   CheckDefExecFailure(["var x = g:dict_empty.member"], 'E716:', 1)
 
-  CheckDefExecFailure(['var x: dict<number> = #{a: 234, b: "1"}'], 'E1012:', 1)
-  CheckDefExecFailure(['var x: dict<number> = #{a: "x", b: 134}'], 'E1012:', 1)
-  CheckDefExecFailure(['var x: dict<string> = #{a: 234, b: "1"}'], 'E1012:', 1)
-  CheckDefExecFailure(['var x: dict<string> = #{a: "x", b: 134}'], 'E1012:', 1)
+  CheckDefExecFailure(['var x: dict<number> = {a: 234, b: "1"}'], 'E1012:', 1)
+  CheckDefExecFailure(['var x: dict<number> = {a: "x", b: 134}'], 'E1012:', 1)
+  CheckDefExecFailure(['var x: dict<string> = {a: 234, b: "1"}'], 'E1012:', 1)
+  CheckDefExecFailure(['var x: dict<string> = {a: "x", b: 134}'], 'E1012:', 1)
 
   CheckDefFailure(['var x = ({'], 'E723:', 2)
+  CheckDefExecFailure(['{}[getftype("file")]'], 'E716: Key not present in Dictionary: ""', 1)
+
+  # no automatic conversion from number to string
+  lines =<< trim END
+      var n = 123
+      var d = {[n]: 1}
+  END
+  CheckDefFailure(lines, 'E1012:', 2)
+  CheckScriptFailure(['vim9script'] + lines, 'E928:', 3)
 enddef
 
 def Test_expr7_dict_vim9script()
   var lines =<< trim END
       vim9script
       var d = {
-		'one':
+		['one']:
 		   1,
-		'two': 2,
+		['two']: 2,
 		   }
-      assert_equal({'one': 1, 'two': 2}, d)
+      assert_equal({one: 1, two: 2}, d)
 
       d = {  # comment
-		'one':
+		['one']:
                 # comment
 
 		   1,
                 # comment
                 # comment
-		'two': 2,
+		['two']: 2,
 		   }
-      assert_equal({'one': 1, 'two': 2}, d)
+      assert_equal({one: 1, two: 2}, d)
+
+      var dd = {k: 123->len()}
+      assert_equal(3, dd.k)
   END
   CheckScriptSuccess(lines)
 
   lines =<< trim END
       vim9script
-      var d = { "one": "one", "two": "two", }
-      assert_equal({'one': 'one', 'two': 'two'}, d)
+      var d = { ["one"]: "one", ["two"]: "two", }
+      assert_equal({one: 'one', two: 'two'}, d)
   END
   CheckScriptSuccess(lines)
 
   lines =<< trim END
       vim9script
-      var d = #{one: 1,
+      var d = {one: 1,
 		two: 2,
 	       }
-      assert_equal({'one': 1, 'two': 2}, d)
+      assert_equal({one: 1, two: 2}, d)
   END
   CheckScriptSuccess(lines)
 
   lines =<< trim END
       vim9script
-      var d = #{one:1, two: 2}
+      var d = {one:1, two: 2}
   END
   CheckScriptFailure(lines, 'E1069:', 2)
 
   lines =<< trim END
       vim9script
-      var d = #{one: 1,two: 2}
+      var d = {one: 1,two: 2}
   END
   CheckScriptFailure(lines, 'E1069:', 2)
 
   lines =<< trim END
       vim9script
-      var d = #{one : 1}
+      var d = {one : 1}
   END
   CheckScriptFailure(lines, 'E1068:', 2)
 
   lines =<< trim END
       vim9script
-      var d = #{one:1}
+      var d = {one:1}
   END
   CheckScriptFailure(lines, 'E1069:', 2)
 
   lines =<< trim END
       vim9script
-      var d = #{one: 1 , two: 2}
+      var d = {one: 1 , two: 2}
   END
   CheckScriptFailure(lines, 'E1068:', 2)
 
   lines =<< trim END
     vim9script
-    var l: dict<number> = #{a: 234, b: 'x'}
+    var l: dict<number> = {a: 234, b: 'x'}
   END
   CheckScriptFailure(lines, 'E1012:', 2)
   lines =<< trim END
     vim9script
-    var l: dict<number> = #{a: 'x', b: 234}
+    var l: dict<number> = {a: 'x', b: 234}
   END
   CheckScriptFailure(lines, 'E1012:', 2)
   lines =<< trim END
     vim9script
-    var l: dict<string> = #{a: 'x', b: 234}
+    var l: dict<string> = {a: 'x', b: 234}
   END
   CheckScriptFailure(lines, 'E1012:', 2)
   lines =<< trim END
     vim9script
-    var l: dict<string> = #{a: 234, b: 'x'}
+    var l: dict<string> = {a: 234, b: 'x'}
   END
   CheckScriptFailure(lines, 'E1012:', 2)
+
+  lines =<< trim END
+    vim9script
+    var d = {['a']: 234, ['b': 'x'}
+  END
+  CheckScriptFailure(lines, 'E1139:', 2)
+  lines =<< trim END
+    vim9script
+    def Func()
+      var d = {['a']: 234, ['b': 'x'}
+    enddef
+    defcompile
+  END
+  CheckScriptFailure(lines, 'E1139:', 1)
+  lines =<< trim END
+    vim9script
+    var d = {'a':
+  END
+  CheckScriptFailure(lines, 'E15:', 2)
+  lines =<< trim END
+    vim9script
+    def Func()
+      var d = {'a':
+    enddef
+    defcompile
+  END
+  CheckScriptFailure(lines, 'E723:', 1)
+
+  lines =<< trim END
+      vim9script
+      def Failing()
+        job_stop()
+      enddef
+      var dict = {name: Failing}
+  END
+  if has('channel')
+    CheckScriptFailure(lines, 'E119:', 1)
+  else
+    CheckScriptFailure(lines, 'E117:', 1)
+  endif
 enddef
 
 let g:oneString = 'one'
@@ -2021,15 +2296,15 @@
 		  ])
   assert_equal(1, d
   	.one)
-  d = {'1': 1, '_': 2}
+  d = {1: 1, _: 2}
   assert_equal(1, d
   	.1)
   assert_equal(2, d
   	._)
 
   # getting the one member should clear the dict after getting the item
-  assert_equal('one', #{one: 'one'}.one)
-  assert_equal('one', #{one: 'one'}[g:oneString])
+  assert_equal('one', {one: 'one'}.one)
+  assert_equal('one', {one: 'one'}[g:oneString])
 
   CheckDefFailure(["var x = g:dict_one.#$!"], 'E1002:', 1)
   CheckDefExecFailure(["var d: dict<any>", "echo d['a']"], 'E716:', 2)
@@ -2044,16 +2319,16 @@
     # string is permissive, index out of range accepted
     g:teststring = 'abcdef'
     assert_equal('b', g:teststring[1])
-    assert_equal('', g:teststring[-1])
+    assert_equal('f', g:teststring[-1])
     assert_equal('', g:teststring[99])
 
-    assert_equal('b', g:teststring[1:1])
-    assert_equal('bcdef', g:teststring[1:])
-    assert_equal('abcd', g:teststring[:3])
-    assert_equal('cdef', g:teststring[-4:])
-    assert_equal('abcdef', g:teststring[-9:])
-    assert_equal('abcd', g:teststring[:-3])
-    assert_equal('', g:teststring[:-9])
+    assert_equal('b', g:teststring[1 : 1])
+    assert_equal('bcdef', g:teststring[1 :])
+    assert_equal('abcd', g:teststring[: 3])
+    assert_equal('cdef', g:teststring[-4 :])
+    assert_equal('abcdef', g:teststring[-9 :])
+    assert_equal('abcd', g:teststring[: -3])
+    assert_equal('', g:teststring[: -9])
 
     # blob index cannot be out of range
     g:testblob = 0z01ab
@@ -2063,13 +2338,13 @@
     assert_equal(0x01, g:testblob[-2])
 
     # blob slice accepts out of range
-    assert_equal(0z01ab, g:testblob[0:1])
-    assert_equal(0z01, g:testblob[0:0])
-    assert_equal(0z01, g:testblob[-2:-2])
-    assert_equal(0zab, g:testblob[1:1])
-    assert_equal(0zab, g:testblob[-1:-1])
-    assert_equal(0z, g:testblob[2:2])
-    assert_equal(0z, g:testblob[0:-3])
+    assert_equal(0z01ab, g:testblob[0 : 1])
+    assert_equal(0z01, g:testblob[0 : 0])
+    assert_equal(0z01, g:testblob[-2 : -2])
+    assert_equal(0zab, g:testblob[1 : 1])
+    assert_equal(0zab, g:testblob[-1 : -1])
+    assert_equal(0z, g:testblob[2 : 2])
+    assert_equal(0z, g:testblob[0 : -3])
 
     # list index cannot be out of range
     g:testlist = [0, 1, 2, 3]
@@ -2081,21 +2356,21 @@
     assert_equal(1, g:testlist[g:theone])
 
     # list slice accepts out of range
-    assert_equal([0], g:testlist[0:0])
-    assert_equal([3], g:testlist[3:3])
-    assert_equal([0, 1], g:testlist[0:1])
-    assert_equal([0, 1, 2, 3], g:testlist[0:3])
-    assert_equal([0, 1, 2, 3], g:testlist[0:9])
-    assert_equal([], g:testlist[-1:1])
-    assert_equal([1], g:testlist[-3:1])
-    assert_equal([0, 1], g:testlist[-4:1])
-    assert_equal([0, 1], g:testlist[-9:1])
-    assert_equal([1, 2, 3], g:testlist[1:-1])
-    assert_equal([1], g:testlist[1:-3])
-    assert_equal([], g:testlist[1:-4])
-    assert_equal([], g:testlist[1:-9])
+    assert_equal([0], g:testlist[0 : 0])
+    assert_equal([3], g:testlist[3 : 3])
+    assert_equal([0, 1], g:testlist[0 : 1])
+    assert_equal([0, 1, 2, 3], g:testlist[0 : 3])
+    assert_equal([0, 1, 2, 3], g:testlist[0 : 9])
+    assert_equal([], g:testlist[-1 : 1])
+    assert_equal([1], g:testlist[-3 : 1])
+    assert_equal([0, 1], g:testlist[-4 : 1])
+    assert_equal([0, 1], g:testlist[-9 : 1])
+    assert_equal([1, 2, 3], g:testlist[1 : -1])
+    assert_equal([1], g:testlist[1 : -3])
+    assert_equal([], g:testlist[1 : -4])
+    assert_equal([], g:testlist[1 : -9])
 
-    g:testdict = #{a: 1, b: 2}
+    g:testdict = {a: 1, b: 2}
     assert_equal(1, g:testdict['a'])
     assert_equal(2, g:testdict['b'])
   END
@@ -2108,13 +2383,13 @@
   CheckDefExecFailure(['echo g:testblob[-3]'], 'E979:', 1)
   CheckScriptFailure(['vim9script', 'echo g:testblob[-3]'], 'E979:', 2)
 
-  CheckDefExecFailure(['echo g:testlist[4]'], 'E684:', 1)
+  CheckDefExecFailure(['echo g:testlist[4]'], 'E684: list index out of range: 4', 1)
   CheckScriptFailure(['vim9script', 'echo g:testlist[4]'], 'E684:', 2)
   CheckDefExecFailure(['echo g:testlist[-5]'], 'E684:', 1)
-  CheckScriptFailure(['vim9script', 'echo g:testlist[-5]'], 'E684:', 2)
+  CheckScriptFailure(['vim9script', 'echo g:testlist[-5]'], 'E684: list index out of range: -5', 2)
 
-  CheckDefExecFailure(['echo g:testdict["a":"b"]'], 'E719:', 1)
-  CheckScriptFailure(['vim9script', 'echo g:testdict["a":"b"]'], 'E719:', 2)
+  CheckDefExecFailure(['echo g:testdict["a" : "b"]'], 'E719:', 1)
+  CheckScriptFailure(['vim9script', 'echo g:testdict["a" : "b"]'], 'E719:', 2)
   CheckDefExecFailure(['echo g:testdict[1]'], 'E716:', 1)
   CheckScriptFailure(['vim9script', 'echo g:testdict[1]'], 'E716:', 2)
 
@@ -2126,7 +2401,7 @@
 def Test_expr_member_vim9script()
   var lines =<< trim END
       vim9script
-      var d = #{one:
+      var d = {one:
       		'one',
 		two: 'two',
 		1: 1,
@@ -2166,6 +2441,10 @@
   CheckScriptSuccess(lines)
 enddef
 
+def SetSomeVar()
+  b:someVar = &fdm
+enddef
+
 def Test_expr7_option()
   # option
   set ts=11
@@ -2178,6 +2457,16 @@
   &grepprg = test_null_string()
   assert_equal('', &grepprg)
   set grepprg&
+
+  # check matching type
+  var bval: bool = &tgc
+  var nval: number = &ts
+  var sval: string = &path
+
+  # check v_lock is cleared (requires using valgrind, doesn't always show)
+  SetSomeVar()
+  b:someVar = 0
+  unlet b:someVar
 enddef
 
 def Test_expr7_environment()
@@ -2237,21 +2526,26 @@
 
 def Test_expr7_parens()
   # (expr)
-  assert_equal(4, (6 * 4) / 6)
-  assert_equal(0, 6 * ( 4 / 6 ))
+  var lines =<< trim END
+      assert_equal(4, (6 * 4) / 6)
+      assert_equal(0, 6 * ( 4 / 6 ))
 
-  assert_equal(6, +6)
-  assert_equal(-6, -6)
-  assert_equal(6, --6)
-  assert_equal(6, -+-6)
-  assert_equal(-6, ---6)
-  assert_equal(false, !-3)
-  assert_equal(true, !+-+0)
-enddef
+      assert_equal(6, +6)
+      assert_equal(-6, -6)
+      assert_equal(false, !-3)
+      assert_equal(true, !+0)
+
+      assert_equal(7, 5 + (
+                    2))
+      assert_equal(7, 5 + (
+                    2
+                    ))
+      assert_equal(7, 5 + ( # comment
+                    2))
+      assert_equal(7, 5 + ( # comment
+                    # comment
+                    2))
 
-def Test_expr7_parens_vim9script()
-  var lines =<< trim END
-      vim9script
       var s = (
 		'one'
 		..
@@ -2259,15 +2553,62 @@
 		)
       assert_equal('onetwo', s)
   END
-  CheckScriptSuccess(lines)
+  CheckDefAndScriptSuccess(lines)
 enddef
 
-def Test_expr7_negate()
+def Test_expr7_negate_add()
   assert_equal(-99, -99)
-  assert_equal(99, --99)
+  assert_equal(-99, - 99)
+  assert_equal(99, +99)
+
   var nr = 88
   assert_equal(-88, -nr)
-  assert_equal(88, --nr)
+  assert_equal(-88, - nr)
+  assert_equal(88, + nr)
+
+  var lines =<< trim END
+    var n = 12
+    echo ++n
+  END
+  CheckDefAndScriptFailure(lines, 'E15:')
+  lines =<< trim END
+    var n = 12
+    echo --n
+  END
+  CheckDefAndScriptFailure(lines, 'E15:')
+  lines =<< trim END
+    var n = 12
+    echo +-n
+  END
+  CheckDefAndScriptFailure(lines, 'E15:')
+  lines =<< trim END
+    var n = 12
+    echo -+n
+  END
+  CheckDefAndScriptFailure(lines, 'E15:')
+  lines =<< trim END
+    var n = 12
+    echo - -n
+  END
+  CheckDefAndScriptFailure(lines, 'E15:')
+  lines =<< trim END
+    var n = 12
+    echo + +n
+  END
+  CheckDefAndScriptFailure(lines, 'E15:')
+
+  lines =<< trim END
+    var n = 12
+    :1
+    ++n
+  END
+  CheckDefAndScriptFailure(lines, 'E1050:')
+  lines =<< trim END
+    var n = 12
+    :1
+    --n
+  END
+  CheckDefAndScriptFailure(lines, 'E1050:')
 enddef
 
 def Echo(arg: any): string
@@ -2279,11 +2620,15 @@
 enddef
 
 def Test_expr7_call()
-  assert_equal('yes', 'yes'->Echo())
+  var lines =<< trim END
+      assert_equal('yes', 'yes'->Echo())
+      assert_equal(true, !range(5)->empty())
+      assert_equal([0, 1, 2], 3->range())
+  END
+  CheckDefAndScriptSuccess(lines)
+
   assert_equal('yes', 'yes'
-  			->s:Echo4Arg())
-  assert_equal(true, !range(5)->empty())
-  assert_equal([0, 1, 2], --3->range())
+                        ->s:Echo4Arg())
 
   CheckDefFailure(["var x = 'yes'->Echo"], 'E107:', 1)
   CheckScriptFailure([
@@ -2308,6 +2653,39 @@
   delete('Xruntime', 'rf')
 enddef
 
+def Test_expr7_method_call()
+  new
+  setline(1, ['first', 'last'])
+  'second'->append(1)
+  "third"->append(2)
+  assert_equal(['first', 'second', 'third', 'last'], getline(1, '$'))
+  bwipe!
+
+  var bufnr = bufnr()
+  var loclist = [{bufnr: bufnr, lnum: 42, col: 17, text: 'wrong'}]
+  loclist->setloclist(0)
+  assert_equal([{bufnr: bufnr,
+  		lnum: 42,
+		col: 17,
+		text: 'wrong',
+		pattern: '',
+		valid: 1,
+		vcol: 0,
+		nr: 0,
+		type: '',
+		module: ''}
+		], getloclist(0))
+
+  var result: bool = get({n: 0}, 'n', 0)
+  assert_equal(false, result)
+
+  assert_equal('+string+', 'string'->((s) => '+' .. s .. '+')())
+  assert_equal('-text-', 'text'->((s, c) => c .. s .. c)('-'))
+
+  var Join = (l) => join(l, 'x')
+  assert_equal('axb', ['a', 'b']->(Join)())
+enddef
+
 
 def Test_expr7_not()
   var lines =<< trim END
@@ -2335,11 +2713,11 @@
       unlet g:false
 
       assert_equal(true, !test_null_partial())
-      assert_equal(false, !{-> 'yes'})
+      assert_equal(false, !() => 'yes')
 
       assert_equal(true, !test_null_dict())
       assert_equal(true, !{})
-      assert_equal(false, !{'yes': 'no'})
+      assert_equal(false, !{yes: 'no'})
 
       if has('channel')
 	assert_equal(true, !test_null_job())
@@ -2360,13 +2738,13 @@
 enddef
 
 func Test_expr7_fails()
-  call CheckDefFailure(["var x = (12"], "E110:", 1)
+  call CheckDefFailure(["var x = (12"], "E1097:", 3)
 
   call CheckDefFailure(["var x = -'xx'"], "E1030:", 1)
   call CheckDefFailure(["var x = +'xx'"], "E1030:", 1)
   call CheckDefFailure(["var x = -0z12"], "E974:", 1)
   call CheckDefExecFailure(["var x = -[8]"], "E39:", 1)
-  call CheckDefExecFailure(["var x = -{'a': 1}"], "E39:", 1)
+  call CheckDefExecFailure(["var x = -{a: 1}"], "E39:", 1)
 
   call CheckDefFailure(["var x = @"], "E1002:", 1)
   call CheckDefFailure(["var x = @<"], "E354:", 1)
@@ -2374,8 +2752,8 @@
   call CheckDefFailure(["var x = [1, 2"], "E697:", 2)
   call CheckDefFailure(["var x = [notfound]"], "E1001:", 1)
 
-  call CheckDefFailure(["var x = { -> 123) }"], "E451:", 1)
-  call CheckDefFailure(["var x = 123->{x -> x + 5) }"], "E451:", 1)
+  call CheckDefFailure(["var X = () => 123)"], "E488:", 1)
+  call CheckDefFailure(["var x = 123->((x) => x + 5)"], "E107:", 1)
 
   call CheckDefFailure(["var x = &notexist"], 'E113:', 1)
   call CheckDefFailure(["&grepprg = [343]"], 'E1012:', 1)
@@ -2397,8 +2775,8 @@
   call CheckDefFailure(["'yes'->", "Echo()"], 'E488: Trailing characters: ->', 1)
 
   call CheckDefExecFailure(["[1, 2->len()"], 'E697:', 2)
-  call CheckDefExecFailure(["#{a: 1->len()"], 'E722:', 1)
-  call CheckDefExecFailure(["{'a': 1->len()"], 'E723:', 2)
+  call CheckDefExecFailure(["{a: 1->len()"], 'E723:', 2)
+  call CheckDefExecFailure(["{['a']: 1->len()"], 'E723:', 2)
 endfunc
 
 let g:Funcrefs = [function('add')]
@@ -2431,31 +2809,39 @@
 
   # method call
   l = [2, 5, 6]
-  l->map({k, v -> k + v})
+  l->map((k, v) => k + v)
   assert_equal([2, 6, 8], l)
 
   # lambda method call
   l = [2, 5]
-  l->{l -> add(l, 8)}()
+  l->((l) => add(l, 8))()
   assert_equal([2, 5, 8], l)
 
   # dict member
-  var d = #{key: 123}
+  var d = {key: 123}
   assert_equal(123, d.key)
 enddef
 
 def Test_expr7_string_subscript()
   var lines =<< trim END
     var text = 'abcdef'
-    assert_equal('', text[-1])
+    assert_equal('f', text[-1])
     assert_equal('a', text[0])
     assert_equal('e', text[4])
     assert_equal('f', text[5])
     assert_equal('', text[6])
 
+    text = 'ábçdë'
+    assert_equal('ë', text[-1])
+    assert_equal('d', text[-2])
+    assert_equal('ç', text[-3])
+    assert_equal('b', text[-4])
+    assert_equal('á', text[-5])
+    assert_equal('', text[-6])
+
     text = 'ábçdëf'
     assert_equal('', text[-999])
-    assert_equal('', text[-1])
+    assert_equal('f', text[-1])
     assert_equal('á', text[0])
     assert_equal('b', text[1])
     assert_equal('ç', text[2])
@@ -2465,30 +2851,63 @@
     assert_equal('', text[6])
     assert_equal('', text[999])
 
-    assert_equal('ábçdëf', text[0:-1])
-    assert_equal('ábçdëf', text[0 :-1])
-    assert_equal('ábçdëf', text[0: -1])
+    assert_equal('ábçdëf', text[0 : -1])
+    assert_equal('ábçdëf', text[0 : -1])
+    assert_equal('ábçdëf', text[0 : -1])
     assert_equal('ábçdëf', text[0 : -1])
     assert_equal('ábçdëf', text[0
-                  :-1])
-    assert_equal('ábçdëf', text[0:
+                  : -1])
+    assert_equal('ábçdëf', text[0 :
                   -1])
     assert_equal('ábçdëf', text[0 : -1
                   ])
-    assert_equal('bçdëf', text[1:-1])
-    assert_equal('çdëf', text[2:-1])
-    assert_equal('dëf', text[3:-1])
-    assert_equal('ëf', text[4:-1])
-    assert_equal('f', text[5:-1])
-    assert_equal('', text[6:-1])
-    assert_equal('', text[999:-1])
+    assert_equal('bçdëf', text[1 : -1])
+    assert_equal('çdëf', text[2 : -1])
+    assert_equal('dëf', text[3 : -1])
+    assert_equal('ëf', text[4 : -1])
+    assert_equal('f', text[5 : -1])
+    assert_equal('', text[6 : -1])
+    assert_equal('', text[999 : -1])
 
-    assert_equal('ábçd', text[:3])
-    assert_equal('bçdëf', text[1:])
+    assert_equal('ábçd', text[: 3])
+    assert_equal('bçdëf', text[1 :])
     assert_equal('ábçdëf', text[:])
   END
   CheckDefSuccess(lines)
   CheckScriptSuccess(['vim9script'] + lines)
+
+  lines =<< trim END
+      var d = 'asdf'[1 :
+  END
+  CheckDefFailure(lines, 'E1097:', 3)
+  lines =<< trim END
+      var d = 'asdf'[1 : xxx]
+  END
+  CheckDefFailure(lines, 'E1001:', 1)
+  lines =<< trim END
+      var d = 'asdf'[1 : 2
+  END
+  CheckDefFailure(lines, 'E1097:', 3)
+  lines =<< trim END
+      var d = 'asdf'[1 : 2
+      echo d
+  END
+  CheckDefFailure(lines, 'E111:', 2)
+  lines =<< trim END
+      var d = 'asdf'['1']
+      echo d
+  END
+  CheckDefFailure(lines, 'E1012: Type mismatch; expected number but got string', 1)
+  lines =<< trim END
+      var d = 'asdf'['1' : 2]
+      echo d
+  END
+  CheckDefFailure(lines, 'E1012: Type mismatch; expected number but got string', 1)
+  lines =<< trim END
+      var d = 'asdf'[1 : '2']
+      echo d
+  END
+  CheckDefFailure(lines, 'E1012: Type mismatch; expected number but got string', 1)
 enddef
 
 def Test_expr7_list_subscript()
@@ -2499,37 +2918,55 @@
     assert_equal(4, list[-1])
     assert_equal(0, list[-5])
 
-    assert_equal([0, 1, 2, 3, 4], list[0:4])
+    assert_equal([0, 1, 2, 3, 4], list[0 : 4])
     assert_equal([0, 1, 2, 3, 4], list[:])
-    assert_equal([1, 2, 3, 4], list[1:])
-    assert_equal([2, 3, 4], list[2:-1])
-    assert_equal([4], list[4:-1])
-    assert_equal([], list[5:-1])
-    assert_equal([], list[999:-1])
-    assert_equal([1, 2, 3, 4], list[g:theone:g:thefour])
-
-    assert_equal([0, 1, 2, 3], list[0:3])
-    assert_equal([0], list[0:0])
-    assert_equal([0, 1, 2, 3, 4], list[0:-1])
-    assert_equal([0, 1, 2], list[0:-3])
-    assert_equal([0], list[0:-5])
-    assert_equal([], list[0:-6])
-    assert_equal([], list[0:-99])
+    assert_equal([1, 2, 3, 4], list[1 :])
+    assert_equal([2, 3, 4], list[2 : -1])
+    assert_equal([4], list[4 : -1])
+    assert_equal([], list[5 : -1])
+    assert_equal([], list[999 : -1])
+    assert_equal([1, 2, 3, 4], list[g:theone : g:thefour])
+
+    assert_equal([0, 1, 2, 3], list[0 : 3])
+    assert_equal([0], list[0 : 0])
+    assert_equal([0, 1, 2, 3, 4], list[0 : -1])
+    assert_equal([0, 1, 2], list[0 : -3])
+    assert_equal([0], list[0 : -5])
+    assert_equal([], list[0 : -6])
+    assert_equal([], list[0 : -99])
   END
-  CheckDefSuccess(lines)
-  CheckScriptSuccess(['vim9script'] + lines)
+  CheckDefAndScriptSuccess(lines)
 
   lines = ['var l = [0, 1, 2]', 'echo l[g:astring : g:theone]']
   CheckDefExecFailure(lines, 'E1012:')
   CheckScriptFailure(['vim9script'] + lines, 'E1030:', 3)
+
+  lines =<< trim END
+      vim9script
+      var ld = []
+      def Func()
+        eval ld[0].key
+      enddef
+      defcompile
+  END
+  CheckScriptSuccess(lines)
 enddef
 
 def Test_expr7_dict_subscript()
   var lines =<< trim END
       vim9script
-      var l = [#{lnum: 2}, #{lnum: 1}]
+      var l = [{lnum: 2}, {lnum: 1}]
       var res = l[0].lnum > l[1].lnum
       assert_true(res)
+
+      var dd = {}
+      def Func1()
+        eval dd.key1.key2
+      enddef
+      def Func2()
+        eval dd['key1'].key2
+      enddef
+      defcompile
   END
   CheckScriptSuccess(lines)
 enddef
@@ -2538,65 +2975,38 @@
   var range = range(
   		3)
   var l = range
-	->map('string(v:key)')
+	->mapnew('string(v:key)')
   assert_equal(['0', '1', '2'], l)
 
   l = range
-  	->map('string(v:key)')
+  	->mapnew('string(v:key)')
   assert_equal(['0', '1', '2'], l)
 
   l = range # comment
-  	->map('string(v:key)')
+  	->mapnew('string(v:key)')
   assert_equal(['0', '1', '2'], l)
 
   l = range
 
-  	->map('string(v:key)')
+  	->mapnew('string(v:key)')
   assert_equal(['0', '1', '2'], l)
 
   l = range
 	# comment
-  	->map('string(v:key)')
+  	->mapnew('string(v:key)')
   assert_equal(['0', '1', '2'], l)
 
   assert_equal('1', l[
 	1])
 
-  var d = #{one: 33}
+  var d = {one: 33}
   assert_equal(33, d.
 	one)
 enddef
 
-def Test_expr7_method_call()
-  new
-  setline(1, ['first', 'last'])
-  'second'->append(1)
-  "third"->append(2)
-  assert_equal(['first', 'second', 'third', 'last'], getline(1, '$'))
-  bwipe!
-
-  var bufnr = bufnr()
-  var loclist = [#{bufnr: bufnr, lnum: 42, col: 17, text: 'wrong'}]
-  loclist->setloclist(0)
-  assert_equal([#{bufnr: bufnr,
-  		lnum: 42,
-		col: 17,
-		text: 'wrong',
-		pattern: '',
-		valid: 1,
-		vcol: 0,
-		nr: 0,
-		type: '',
-		module: ''}
-		], getloclist(0))
-
-  var result: bool = get(#{n: 0}, 'n', 0)
-  assert_equal(false, result)
-enddef
-
 func Test_expr7_trailing_fails()
-  call CheckDefFailure(['var l = [2]', 'l->{l -> add(l, 8)}'], 'E107:', 2)
-  call CheckDefFailure(['var l = [2]', 'l->{l -> add(l, 8)} ()'], 'E274:', 2)
+  call CheckDefFailure(['var l = [2]', 'l->((l) => add(l, 8))'], 'E107:', 2)
+  call CheckDefFailure(['var l = [2]', 'l->((l) => add(l, 8)) ()'], 'E274:', 2)
 endfunc
 
 func Test_expr_fails()
diff -Nru vim-8.2.1913/src/testdir/test_vim9_func.vim vim-8.2.2434/src/testdir/test_vim9_func.vim
--- vim-8.2.1913/src/testdir/test_vim9_func.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_vim9_func.vim	2021-01-30 22:05:11.000000000 +0000
@@ -30,14 +30,14 @@
   END
   call writefile(lines, 'XTest_compile_error')
   var buf = RunVimInTerminal('-S XTest_compile_error',
-              #{rows: 10, wait_for_ruler: 0})
+              {rows: 10, wait_for_ruler: 0})
   var text = ''
   for loop in range(100)
     text = ''
     for i in range(1, 9)
       text ..= term_getline(buf, i)
     endfor
-    if text =~ 'Error detected'
+    if text =~ 'Variable not found: nothing'
       break
     endif
     sleep 20m
@@ -49,6 +49,113 @@
   call delete('XTest_compile_error')
 enddef
 
+def CallRecursive(n: number): number
+  return CallRecursive(n + 1)
+enddef
+
+def CallMapRecursive(l: list<number>): number
+  return map(l, (_, v) => CallMapRecursive([v]))[0]
+enddef
+
+def Test_funcdepth_error()
+  set maxfuncdepth=10
+
+  var caught = false
+  try
+    CallRecursive(1)
+  catch /E132:/
+    caught = true
+  endtry
+  assert_true(caught)
+
+  caught = false
+  try
+    CallMapRecursive([1])
+  catch /E132:/
+    caught = true
+  endtry
+  assert_true(caught)
+
+  set maxfuncdepth&
+enddef
+
+def Test_endfunc_enddef()
+  var lines =<< trim END
+    def Test()
+      echo 'test'
+      endfunc
+    enddef
+  END
+  CheckScriptFailure(lines, 'E1151:', 3)
+
+  lines =<< trim END
+    def Test()
+      func Nested()
+        echo 'test'
+      enddef
+    enddef
+  END
+  CheckScriptFailure(lines, 'E1152:', 4)
+enddef
+
+def Test_missing_endfunc_enddef()
+  var lines =<< trim END
+    vim9script
+    def Test()
+      echo 'test'
+    endef
+  END
+  CheckScriptFailure(lines, 'E1057:', 2)
+
+  lines =<< trim END
+    vim9script
+    func Some()
+      echo 'test'
+    enfffunc
+  END
+  CheckScriptFailure(lines, 'E126:', 2)
+enddef
+
+def Test_white_space_before_paren()
+  var lines =<< trim END
+    vim9script
+    def Test ()
+      echo 'test'
+    enddef
+  END
+  CheckScriptFailure(lines, 'E1068:', 2)
+
+  lines =<< trim END
+    vim9script
+    func Test ()
+      echo 'test'
+    endfunc
+  END
+  CheckScriptFailure(lines, 'E1068:', 2)
+
+  lines =<< trim END
+    def Test ()
+      echo 'test'
+    enddef
+  END
+  CheckScriptFailure(lines, 'E1068:', 1)
+
+  lines =<< trim END
+    func Test ()
+      echo 'test'
+    endfunc
+  END
+  CheckScriptSuccess(lines)
+enddef
+
+def Test_enddef_dict_key()
+  var d = {
+    enddef: 'x',
+    endfunc: 'y',
+  }
+  assert_equal({enddef: 'x', endfunc: 'y'}, d)
+enddef
+
 def ReturnString(): string
   return 'string'
 enddef
@@ -69,6 +176,22 @@
   assert_fails('ReturnGlobal()', 'E1012: Type mismatch; expected number but got string', '', 1, 'ReturnGlobal')
 enddef
 
+def Test_check_argument_type()
+  var lines =<< trim END
+      vim9script
+      def Val(a: number, b: number): number
+        return 0
+      enddef
+      def Func()
+        var x: any = true
+        Val(0, x)
+      enddef
+      disass Func
+      Func()
+  END
+  CheckScriptFailure(lines, 'E1013: Argument 2: type mismatch, expected number but got bool', 2)
+enddef
+
 def Test_missing_return()
   CheckDefFailure(['def Missing(): number',
                    '  if g:cond',
@@ -122,6 +245,17 @@
   s:nothing->assert_equal(1)
 enddef
 
+def Test_return_invalid()
+  var lines =<< trim END
+    vim9script
+    def Func(): invalid
+      return xxx
+    enddef
+    defcompile
+  END
+  CheckScriptFailure(lines, 'E1010:', 2)
+enddef
+
 func Increment()
   let g:counter += 1
 endfunc
@@ -169,7 +303,45 @@
   MyDefaultSecond('test', false)->assert_equal('none')
 
   CheckScriptFailure(['def Func(arg: number = asdf)', 'enddef', 'defcompile'], 'E1001:')
+  delfunc g:Func
   CheckScriptFailure(['def Func(arg: number = "text")', 'enddef', 'defcompile'], 'E1013: Argument 1: type mismatch, expected number but got string')
+  delfunc g:Func
+enddef
+
+def FuncWithComment(  # comment
+  a: number, #comment
+  b: bool, # comment
+  c: string) #comment
+  assert_equal(4, a)
+  assert_equal(true, b)
+  assert_equal('yes', c)
+enddef
+
+def Test_func_with_comments()
+  FuncWithComment(4, true, 'yes')
+
+  var lines =<< trim END
+      def Func(# comment
+        arg: string)
+      enddef
+  END
+  CheckScriptFailure(lines, 'E125:', 1)
+
+  lines =<< trim END
+      def Func(
+        arg: string# comment
+        )
+      enddef
+  END
+  CheckScriptFailure(lines, 'E475:', 2)
+
+  lines =<< trim END
+      def Func(
+        arg: string
+        )# comment
+      enddef
+  END
+  CheckScriptFailure(lines, 'E488:', 3)
 enddef
 
 def Test_nested_function()
@@ -185,22 +357,52 @@
   CheckDefFailure(['def s:Nested()', 'enddef'], 'E1075:')
   CheckDefFailure(['def b:Nested()', 'enddef'], 'E1075:')
 
-  CheckDefFailure([
-        'def Outer()',
-        '  def Inner()',
-        '    # comment',
-        '  enddef',
-        '  def Inner()',
-        '  enddef',
-        'enddef'], 'E1073:')
-  CheckDefFailure([
-        'def Outer()',
-        '  def Inner()',
-        '    # comment',
-        '  enddef',
-        '  def! Inner()',
-        '  enddef',
-        'enddef'], 'E1117:')
+  var lines =<< trim END
+      def Outer()
+        def Inner()
+          # comment
+        enddef
+        def Inner()
+        enddef
+      enddef
+  END
+  CheckDefFailure(lines, 'E1073:')
+
+  lines =<< trim END
+      def Outer()
+        def Inner()
+          # comment
+        enddef
+        def! Inner()
+        enddef
+      enddef
+  END
+  CheckDefFailure(lines, 'E1117:')
+
+  # nested function inside conditional
+  # TODO: should it work when "thecount" is inside the "if"?
+  lines =<< trim END
+      vim9script
+      var thecount = 0
+      if true
+        def Test(): number
+          def TheFunc(): number
+            thecount += 1
+            return thecount
+          enddef
+          return TheFunc()
+        enddef
+      endif
+      defcompile
+      assert_equal(1, Test())
+      assert_equal(2, Test())
+  END
+  CheckScriptSuccess(lines)
+enddef
+
+def Test_not_nested_function()
+  echo printf('%d',
+      function('len')('xxx'))
 enddef
 
 func Test_call_default_args_from_func()
@@ -242,6 +444,20 @@
       Outer()
   END
   CheckScriptFailure(lines, "E122:")
+  delfunc g:Inner
+
+  lines =<< trim END
+      vim9script
+      def Outer()
+        def g:Inner()
+          echo map([1, 2, 3], (_, v) => v + 1)
+        enddef
+        g:Inner()
+      enddef
+      Outer()
+  END
+  CheckScriptSuccess(lines)
+  delfunc g:Inner
 
   lines =<< trim END
       vim9script
@@ -258,6 +474,42 @@
   CheckScriptFailure(lines, "E1073:")
 enddef
 
+def DefListAll()
+  def
+enddef
+
+def DefListOne()
+  def DefListOne
+enddef
+
+def DefListMatches()
+  def /DefList
+enddef
+
+def Test_nested_def_list()
+  var funcs = split(execute('call DefListAll()'), "\n")
+  assert_true(len(funcs) > 10)
+  assert_true(funcs->index('def DefListAll()') >= 0)
+
+  funcs = split(execute('call DefListOne()'), "\n")
+  assert_equal(['   def DefListOne()', '1    def DefListOne', '   enddef'], funcs)
+
+  funcs = split(execute('call DefListMatches()'), "\n")
+  assert_true(len(funcs) >= 3)
+  assert_true(funcs->index('def DefListAll()') >= 0)
+  assert_true(funcs->index('def DefListOne()') >= 0)
+  assert_true(funcs->index('def DefListMatches()') >= 0)
+
+  var lines =<< trim END
+    vim9script
+    def Func()
+      def +Func+
+    enddef
+    defcompile
+  END
+  CheckScriptFailure(lines, 'E476:', 1)
+enddef
+
 def Test_global_local_function()
   var lines =<< trim END
       vim9script
@@ -269,6 +521,7 @@
       enddef
       g:Func()->assert_equal('global')
       Func()->assert_equal('local')
+      delfunc g:Func
   END
   CheckScriptSuccess(lines)
 
@@ -376,6 +629,70 @@
   delete('Xscript')
 enddef
 
+def Test_call_funcref_wrong_args()
+  var head =<< trim END
+      vim9script
+      def Func3(a1: string, a2: number, a3: list<number>)
+        echo a1 .. a2 .. a3[0]
+      enddef
+      def Testme()
+        var funcMap: dict<func> = {func: Func3}
+  END
+  var tail =<< trim END
+      enddef
+      Testme()
+  END
+  CheckScriptSuccess(head + ["funcMap['func']('str', 123, [1, 2, 3])"] + tail)
+
+  CheckScriptFailure(head + ["funcMap['func']('str', 123)"] + tail, 'E119:')
+  CheckScriptFailure(head + ["funcMap['func']('str', 123, [1], 4)"] + tail, 'E118:')
+
+  var lines =<< trim END
+      vim9script
+      var Ref: func(number): any
+      Ref = (j) => !j
+      echo Ref(false)
+  END
+  CheckScriptFailure(lines, 'E1013: Argument 1: type mismatch, expected number but got bool', 4)
+
+  lines =<< trim END
+      vim9script
+      var Ref: func(number): any
+      Ref = (j) => !j
+      call Ref(false)
+  END
+  CheckScriptFailure(lines, 'E1013: Argument 1: type mismatch, expected number but got bool', 4)
+enddef
+
+def Test_call_lambda_args()
+  CheckDefFailure(['echo ((i) => 0)()'],
+                  'E119: Not enough arguments for function: ((i) => 0)()')
+
+  var lines =<< trim END
+      var Ref = (x: number, y: number) => x + y
+      echo Ref(1, 'x')
+  END
+  CheckDefFailure(lines, 'E1013: Argument 2: type mismatch, expected number but got string')
+
+  lines =<< trim END
+    var Ref: func(job, string, number)
+    Ref = (x, y) => 0
+  END
+  CheckDefAndScriptFailure(lines, 'E1012:')
+
+  lines =<< trim END
+    var Ref: func(job, string)
+    Ref = (x, y, z) => 0
+  END
+  CheckDefAndScriptFailure(lines, 'E1012:')
+enddef
+
+def Test_lambda_uses_assigned_var()
+  CheckDefSuccess([
+        'var x: any = "aaa"'
+        'x = filter(["bbb"], (_, v) => v =~ x)'])
+enddef
+
 " Default arg and varargs
 def MyDefVarargs(one: string, two = 'foo', ...rest: list<string>): string
   var res = one .. ',' .. two
@@ -537,6 +854,7 @@
   l[0]->assert_equal('value')
 
   CheckScriptFailure(['def Func(arg: number)', 'arg = 3', 'enddef', 'defcompile'], 'E1090:')
+  delfunc! g:Func
 enddef
 
 " These argument names are reserved in legacy functions.
@@ -695,33 +1013,41 @@
         'return "a"',
         'enddef',
         'defcompile'], 'expected number but got string')
+  delfunc! g:Func
   CheckScriptFailure([
         'def Func(): string',
         'return 1',
         'enddef',
         'defcompile'], 'expected string but got number')
+  delfunc! g:Func
   CheckScriptFailure([
         'def Func(): void',
         'return "a"',
         'enddef',
         'defcompile'],
         'E1096: Returning a value in a function without a return type')
+  delfunc! g:Func
   CheckScriptFailure([
         'def Func()',
         'return "a"',
         'enddef',
         'defcompile'],
         'E1096: Returning a value in a function without a return type')
+  delfunc! g:Func
 
   CheckScriptFailure([
         'def Func(): number',
         'return',
         'enddef',
         'defcompile'], 'E1003:')
+  delfunc! g:Func
 
   CheckScriptFailure(['def Func(): list', 'return []', 'enddef'], 'E1008:')
+  delfunc! g:Func
   CheckScriptFailure(['def Func(): dict', 'return {}', 'enddef'], 'E1008:')
+  delfunc! g:Func
   CheckScriptFailure(['def Func()', 'return 1'], 'E1057:')
+  delfunc! g:Func
 
   CheckScriptFailure([
         'vim9script',
@@ -770,16 +1096,16 @@
     def DictFunc(arg: dict<number>)
        dictvar = arg
     enddef
-    {'a': 1, 'b': 2}->DictFunc()
-    dictvar->assert_equal(#{a: 1, b: 2})
+    {a: 1, b: 2}->DictFunc()
+    dictvar->assert_equal({a: 1, b: 2})
     def CompiledDict()
-      {'a': 3, 'b': 4}->DictFunc()
+      {a: 3, b: 4}->DictFunc()
     enddef
     CompiledDict()
-    dictvar->assert_equal(#{a: 3, b: 4})
+    dictvar->assert_equal({a: 3, b: 4})
 
-    #{a: 3, b: 4}->DictFunc()
-    dictvar->assert_equal(#{a: 3, b: 4})
+    {a: 3, b: 4}->DictFunc()
+    dictvar->assert_equal({a: 3, b: 4})
 
     ('text')->MyFunc()
     name->assert_equal('text')
@@ -869,6 +1195,17 @@
   writefile(lines, 'Xcall_const.vim')
   assert_fails('source Xcall_const.vim', 'E46:', '', 1, 'MyFunc')
   delete('Xcall_const.vim')
+
+  lines =<< trim END
+      const g:Aconst = 77
+      def Change()
+        # comment
+        g:Aconst = 99
+      enddef
+      call Change()
+      unlet g:Aconst
+  END
+  CheckScriptFailure(lines, 'E741: Value is locked: Aconst', 2)
 enddef
 
 " Test that inside :function a Python function can be defined, :def is not
@@ -1180,6 +1517,7 @@
     v:exception->assert_match('Invalid command: invalid')
     v:throwpoint->assert_match(', line 3$')
   endtry
+  delfunc! g:Func
 
   # comment lines after the start of the function
   lines =<< trim END
@@ -1200,11 +1538,12 @@
     v:exception->assert_match('Invalid command: invalid')
     v:throwpoint->assert_match(', line 4$')
   endtry
+  delfunc! g:Func
 
   lines =<< trim END
     vim9script
     def Func()
-      var db = #{foo: 1, bar: 2}
+      var db = {foo: 1, bar: 2}
       # comment
       var x = db.asdf
     enddef
@@ -1218,6 +1557,7 @@
   catch /E716:/
     v:throwpoint->assert_match('_Func, line 3$')
   endtry
+  delfunc! g:Func
 
   delete('Xdef')
 enddef
@@ -1235,18 +1575,18 @@
       'delfunc g:NotExist'], 'E700:')
 enddef
 
-def RefFunc(Ref: func(string): string): string
+def RefFunc(Ref: func(any): any): string
   return Ref('more')
 enddef
 
 def Test_closure_simple()
   var local = 'some '
-  RefFunc({s -> local .. s})->assert_equal('some more')
+  RefFunc((s) => local .. s)->assert_equal('some more')
 enddef
 
 def MakeRef()
   var local = 'some '
-  g:Ref = {s -> local .. s}
+  g:Ref = (s) => local .. s
 enddef
 
 def Test_closure_ref_after_return()
@@ -1257,8 +1597,8 @@
 
 def MakeTwoRefs()
   var local = ['some']
-  g:Extend = {s -> local->add(s)}
-  g:Read = {-> local}
+  g:Extend = (s) => local->add(s)
+  g:Read = () => local
 enddef
 
 def Test_closure_two_refs()
@@ -1295,12 +1635,12 @@
 
 def MakeArgRefs(theArg: string)
   var local = 'loc_val'
-  g:UseArg = {s -> theArg .. '/' .. local .. '/' .. s}
+  g:UseArg = (s) => theArg .. '/' .. local .. '/' .. s
 enddef
 
 def MakeArgRefsVarargs(theArg: string, ...rest: list<string>)
   var local = 'the_loc'
-  g:UseVararg = {s -> theArg .. '/' .. local .. '/' .. s .. '/' .. join(rest)}
+  g:UseVararg = (s) => theArg .. '/' .. local .. '/' .. s .. '/' .. join(rest)
 enddef
 
 def Test_closure_using_argument()
@@ -1354,7 +1694,7 @@
 
 def Test_call_closure_not_compiled()
   var text = 'text'
-  g:Ref = {s ->  s .. text}
+  g:Ref = (s) =>  s .. text
   GetResult(g:Ref)->assert_equal('sometext')
 enddef
 
@@ -1364,7 +1704,7 @@
     def Func()
       var name = 0
       for i in range(2)
-          timer_start(0, {-> name})
+          timer_start(0, () => name)
       endfor
     enddef
     Func()
@@ -1377,8 +1717,8 @@
       vim9script
       def Func()
         var x = 'hello'
-        var Closure = {-> x}
-        g:Myclosure = {-> Closure()}
+        var Closure = () => x
+        g:Myclosure = () => Closure()
       enddef
       Func()
       assert_equal('hello', g:Myclosure())
@@ -1393,20 +1733,85 @@
       FuncB(0)
     enddef
     def FuncB(n: number): list<string>
-      return map([0], {_, v -> n})
+      return map([0], (_, v) => n)
     enddef
     FuncA()
   END
   CheckScriptFailure(lines, 'E1012:')
 enddef
 
+def Test_global_closure()
+  var lines =<< trim END
+      vim9script
+      def ReverseEveryNLines(n: number, line1: number, line2: number)
+        var mods = 'sil keepj keepp lockm '
+        var range = ':' .. line1 .. ',' .. line2
+        def g:Offset(): number
+            var offset = (line('.') - line1 + 1) % n
+            return offset != 0 ? offset : n
+        enddef
+        exe mods .. range .. 'g/^/exe "m .-" .. g:Offset()'
+      enddef
+
+      new
+      repeat(['aaa', 'bbb', 'ccc'], 3)->setline(1)
+      ReverseEveryNLines(3, 1, 9)
+  END
+  CheckScriptSuccess(lines)
+  var expected = repeat(['ccc', 'bbb', 'aaa'], 3)
+  assert_equal(expected, getline(1, 9))
+  bwipe!
+enddef
+
+def Test_global_closure_called_directly()
+  var lines =<< trim END
+      vim9script
+      def Outer()
+        var x = 1
+        def g:Inner()
+          var y = x
+          x += 1
+          assert_equal(1, y)
+        enddef
+        g:Inner()
+        assert_equal(2, x)
+      enddef
+      Outer()
+  END
+  CheckScriptSuccess(lines)
+  delfunc g:Inner
+enddef
+
+def Test_failure_in_called_function()
+  # this was using the frame index as the return value
+  var lines =<< trim END
+      vim9script
+      au TerminalWinOpen * eval [][0]
+      def PopupTerm(a: any)
+        # make sure typvals on stack are string
+        ['a', 'b', 'c', 'd', 'e', 'f', 'g']->join()
+        FireEvent()
+      enddef
+      def FireEvent()
+          do TerminalWinOpen
+      enddef
+      # use try/catch to make eval fail
+      try
+          call PopupTerm(0)
+      catch
+      endtry
+      au! TerminalWinOpen
+  END
+  CheckScriptSuccess(lines)
+enddef
+
 def Test_nested_lambda()
   var lines =<< trim END
     vim9script
     def Func()
       var x = 4
-      var Lambda1 = {-> 7}
-      var Lambda2 = {-> [Lambda1(), x]}
+      var Lambda1 = () => 7
+      var Lambda2 = () => [Lambda1(), x]
       var res = Lambda2()
       assert_equal([7, 4], res)
     enddef
@@ -1415,6 +1820,15 @@
   CheckScriptSuccess(lines)
 enddef
 
+def Shadowed(): list<number>
+  var FuncList: list<func: number> = [() => 42]
+  return FuncList->mapnew((_, Shadowed) => Shadowed())
+enddef
+
+def Test_lambda_arg_shadows_func()
+  assert_equal([42], Shadowed())
+enddef
+
 def Line_continuation_in_def(dir: string = ''): string
   var path: string = empty(dir)
           \ ? 'empty'
@@ -1426,16 +1840,64 @@
   Line_continuation_in_def('.')->assert_equal('full')
 enddef
 
+def Test_script_var_in_lambda()
+  var lines =<< trim END
+      vim9script
+      var script = 'test'
+      assert_equal(['test'], map(['one'], () => script))
+  END
+  CheckScriptSuccess(lines)
+enddef
+
 def Line_continuation_in_lambda(): list<string>
   var x = range(97, 100)
-      ->map({_, v -> nr2char(v)
-          ->toupper()})
+      ->mapnew((_, v) => nr2char(v)
+          ->toupper())
       ->reverse()
   return x
 enddef
 
 def Test_line_continuation_in_lambda()
   Line_continuation_in_lambda()->assert_equal(['D', 'C', 'B', 'A'])
+
+  var lines =<< trim END
+      vim9script
+      var res = [{n: 1, m: 2, s: 'xxx'}]
+                ->mapnew((_, v: dict<any>): string => printf('%d:%d:%s',
+                    v.n,
+                    v.m,
+                    substitute(v.s, '.*', 'yyy', '')
+                    ))
+      assert_equal(['1:2:yyy'], res)
+  END
+  CheckScriptSuccess(lines)
+enddef
+
+def Test_list_lambda()
+  timer_start(1000, (_) => 0)
+  var body = execute(timer_info()[0].callback
+         ->string()
+         ->substitute("('", ' ', '')
+         ->substitute("')", '', '')
+         ->substitute('function\zs', ' ', ''))
+  assert_match('def <lambda>\d\+(_: any, ...): number\n1  return 0\n   enddef', body)
+enddef
+
+def DoFilterThis(a: string): list<string>
+  # closure nested inside another closure using argument
+  var Filter = (l) => filter(l, (_, v) => stridx(v, a) == 0)
+  return ['x', 'y', 'a', 'x2', 'c']->Filter()
+enddef
+
+def Test_nested_closure_using_argument()
+  assert_equal(['x', 'x2'], DoFilterThis('x'))
+enddef
+
+def Test_triple_nested_closure()
+  var what = 'x'
+  var Match = (val: string, cmp: string): bool => stridx(val, cmp) == 0
+  var Filter = (l) => filter(l, (_, v) => Match(v, what))
+  assert_equal(['x', 'x2'], ['x', 'y', 'a', 'x2', 'c']->Filter())
 enddef
 
 func Test_silent_echo()
@@ -1460,6 +1922,50 @@
   call delete('XTest_silent_echo')
 endfunc
 
+def SilentlyError()
+  execute('silent! invalid')
+  g:did_it = 'yes'
+enddef
+
+func UserError()
+  silent! invalid
+endfunc
+
+def SilentlyUserError()
+  UserError()
+  g:did_it = 'yes'
+enddef
+
+" This can't be a :def function, because the assert would not be reached.
+func Test_ignore_silent_error()
+  let g:did_it = 'no'
+  call SilentlyError()
+  call assert_equal('yes', g:did_it)
+
+  let g:did_it = 'no'
+  call SilentlyUserError()
+  call assert_equal('yes', g:did_it)
+
+  unlet g:did_it
+endfunc
+
+def Test_ignore_silent_error_in_filter()
+  var lines =<< trim END
+      vim9script
+      def Filter(winid: number, key: string): bool
+          if key == 'o'
+              silent! eval [][0]
+              return true
+          endif
+          return popup_filter_menu(winid, key)
+      enddef
+
+      popup_create('popup', {filter: Filter})
+      feedkeys("o\r", 'xnt')
+  END
+  CheckScriptSuccess(lines)
+enddef
+
 def Fibonacci(n: number): number
   if n < 2
     return n
@@ -1473,11 +1979,11 @@
 enddef
 
 def TreeWalk(dir: string): list<any>
-  return readdir(dir)->map({_, val ->
+  return readdir(dir)->mapnew((_, val) =>
             fnamemodify(dir .. '/' .. val, ':p')->isdirectory()
-               ? {val: TreeWalk(dir .. '/' .. val)}
+               ? {[val]: TreeWalk(dir .. '/' .. val)}
                : val
-             })
+             )
 enddef
 
 def Test_closure_in_map()
@@ -1486,7 +1992,7 @@
   writefile(['222'], 'XclosureDir/file2')
   writefile(['333'], 'XclosureDir/tdir/file3')
 
-  TreeWalk('XclosureDir')->assert_equal(['file1', 'file2', {'tdir': ['file3']}])
+  TreeWalk('XclosureDir')->assert_equal(['file1', 'file2', {tdir: ['file3']}])
 
   delete('XclosureDir', 'rf')
 enddef
@@ -1519,20 +2025,20 @@
 
 def Test_partial_call()
   var Xsetlist = function('setloclist', [0])
-  Xsetlist([], ' ', {'title': 'test'})
-  getloclist(0, {'title': 1})->assert_equal({'title': 'test'})
+  Xsetlist([], ' ', {title: 'test'})
+  getloclist(0, {title: 1})->assert_equal({title: 'test'})
 
   Xsetlist = function('setloclist', [0, [], ' '])
-  Xsetlist({'title': 'test'})
-  getloclist(0, {'title': 1})->assert_equal({'title': 'test'})
+  Xsetlist({title: 'test'})
+  getloclist(0, {title: 1})->assert_equal({title: 'test'})
 
   Xsetlist = function('setqflist')
-  Xsetlist([], ' ', {'title': 'test'})
-  getqflist({'title': 1})->assert_equal({'title': 'test'})
+  Xsetlist([], ' ', {title: 'test'})
+  getqflist({title: 1})->assert_equal({title: 'test'})
 
   Xsetlist = function('setqflist', [[], ' '])
-  Xsetlist({'title': 'test'})
-  getqflist({'title': 1})->assert_equal({'title': 'test'})
+  Xsetlist({title: 'test'})
+  getqflist({title: 1})->assert_equal({title: 'test'})
 
   var Len: func: number = function('len', ['word'])
   assert_equal(4, Len())
@@ -1551,7 +2057,7 @@
       set eventignore=
       autocmd QuickFixCmdPost * copen
       def AutocmdsDisabled()
-          eval 0
+        eval 0
       enddef
       func Func()
         noautocmd call s:AutocmdsDisabled()
@@ -1591,7 +2097,7 @@
         var x = ['a', 'b', 'c']
         if 1
           var y = 'x'
-          map(x, {-> y})
+          map(x, () => y)
         endif
         var z = x
         assert_equal(['x', 'x', 'x'], z)
@@ -1601,5 +2107,185 @@
   CheckScriptSuccess(lines)
 enddef
 
+def Test_reset_did_emsg()
+  var lines =<< trim END
+      @s = 'blah'
+      au BufWinLeave * #
+      def Func()
+        var winid = popup_create('popup', {})
+        exe '*s'
+        popup_close(winid)
+      enddef
+      Func()
+  END
+  CheckScriptFailure(lines, 'E492:', 8)
+  delfunc! g:Func
+enddef
+
+def Test_did_emsg_reset()
+  # executing an autocommand resets did_emsg, this should not result in a
+  # builtin function considered failing
+  var lines =<< trim END
+      vim9script
+      au BufWinLeave * #
+      def Func()
+          popup_menu('', {callback: () => popup_create('', {})->popup_close()})
+          eval [][0]
+      enddef
+      nno <F3> <cmd>call <sid>Func()<cr>
+      feedkeys("\<F3>\e", 'xt')
+  END
+  writefile(lines, 'XemsgReset')
+  assert_fails('so XemsgReset', ['E684:', 'E684:'], lines, 2)
+  delete('XemsgReset')
+  nunmap <F3>
+  au! BufWinLeave
+enddef
+
+def Test_abort_with_silent_call()
+  var lines =<< trim END
+      vim9script
+      g:result = 'none'
+      def Func()
+        g:result += 3
+        g:result = 'yes'
+      enddef
+      # error is silenced, but function aborts on error
+      silent! Func()
+      assert_equal('none', g:result)
+      unlet g:result
+  END
+  CheckScriptSuccess(lines)
+enddef
+
+def Test_continues_with_silent_error()
+  var lines =<< trim END
+      vim9script
+      g:result = 'none'
+      def Func()
+        silent!  g:result += 3
+        g:result = 'yes'
+      enddef
+      # error is silenced, function does not abort
+      Func()
+      assert_equal('yes', g:result)
+      unlet g:result
+  END
+  CheckScriptSuccess(lines)
+enddef
+
+def Test_abort_even_with_silent()
+  var lines =<< trim END
+      vim9script
+      g:result = 'none'
+      def Func()
+        eval {-> ''}() .. '' .. {}['X']
+        g:result = 'yes'
+      enddef
+      silent! Func()
+      assert_equal('none', g:result)
+      unlet g:result
+  END
+  CheckScriptSuccess(lines)
+enddef
+
+def Test_cmdmod_silent_restored()
+  var lines =<< trim END
+      vim9script
+      def Func()
+        g:result = 'none'
+        silent! g:result += 3
+        g:result = 'none'
+        g:result += 3
+      enddef
+      Func()
+  END
+  # can't use CheckScriptFailure, it ignores the :silent!
+  var fname = 'Xdefsilent'
+  writefile(lines, fname)
+  var caught = 'no'
+  try
+    exe 'source ' .. fname
+  catch /E1030:/
+    caught = 'yes'
+    assert_match('Func, line 4', v:throwpoint)
+  endtry
+  assert_equal('yes', caught)
+  delete(fname)
+enddef
+
+def Test_dict_member_with_silent()
+  var lines =<< trim END
+      vim9script
+      g:result = 'none'
+      var d: dict<any>
+      def Func()
+        try
+          g:result = map([], (_, v) => ({}[v]))->join() .. d['']
+        catch
+        endtry
+      enddef
+      silent! Func()
+      assert_equal('0', g:result)
+      unlet g:result
+  END
+  CheckScriptSuccess(lines)
+enddef
+
+def Test_skip_cmds_with_silent()
+  var lines =<< trim END
+      vim9script
+
+      def Func(b: bool)
+        Crash()
+      enddef
+
+      def Crash()
+        sil! :/not found/d _
+        sil! :/not found/put _
+      enddef
+
+      Func(true)
+  END
+  CheckScriptSuccess(lines)
+enddef
+
+def Test_opfunc()
+  nnoremap <F3> <cmd>set opfunc=Opfunc<cr>g@
+  def g:Opfunc(_: any): string
+    setline(1, 'ASDF')
+    return ''
+  enddef
+  new
+  setline(1, 'asdf')
+  feedkeys("\<F3>$", 'x')
+  assert_equal('ASDF', getline(1))
+
+  bwipe!
+  nunmap <F3>
+enddef
+
+" this was crashing on exit
+def Test_nested_lambda_in_closure()
+  var lines =<< trim END
+      vim9script
+      def Outer()
+          def g:Inner()
+              echo map([1, 2, 3], {_, v -> v + 1})
+          enddef
+          g:Inner()
+      enddef
+      defcompile
+      writefile(['Done'], 'XnestedDone')
+      quit
+  END
+  if !RunVim([], lines, '--clean')
+    return
+  endif
+  assert_equal(['Done'], readfile('XnestedDone'))
+  delete('XnestedDone')
+enddef
+
+
 
 " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
diff -Nru vim-8.2.1913/src/testdir/test_vim9_script.vim vim-8.2.2434/src/testdir/test_vim9_script.vim
--- vim-8.2.1913/src/testdir/test_vim9_script.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_vim9_script.vim	2021-01-30 22:05:11.000000000 +0000
@@ -23,6 +23,11 @@
   list
   assert_equal('three$', Screenline(&lines))
   bwipe!
+
+  # won't generate anything
+  if false
+    :123
+  endif
 enddef
 
 let g:alist = [7]
@@ -177,14 +182,14 @@
     cl[1] = 88
     constlist->assert_equal([1, [77, 88], 3])
 
-    var vardict = #{five: 5, six: 6}
-    const constdict = #{one: 1, two: vardict, three: 3}
+    var vardict = {five: 5, six: 6}
+    const constdict = {one: 1, two: vardict, three: 3}
     vardict['five'] = 55
     # TODO: does not work yet
     # constdict['two']['six'] = 66
     var cd = constdict['two']
     cd['six'] = 66
-    constdict->assert_equal(#{one: 1, two: #{five: 55, six: 66}, three: 3})
+    constdict->assert_equal({one: 1, two: {five: 55, six: 66}, three: 3})
   END
   CheckDefAndScriptSuccess(lines)
 enddef
@@ -212,14 +217,14 @@
   CheckScriptFailure(['vim9script'] + lines, 'E684:', 3)
 
   lines =<< trim END
-      const dd = #{one: 1, two: 2}
+      const dd = {one: 1, two: 2}
       dd["one"] = 99
   END
   CheckDefExecFailure(lines, 'E1121:', 2)
   CheckScriptFailure(['vim9script'] + lines, 'E741:', 3)
 
   lines =<< trim END
-      const dd = #{one: 1, two: 2}
+      const dd = {one: 1, two: 2}
       dd["three"] = 99
   END
   CheckDefExecFailure(lines, 'E1120:')
@@ -319,7 +324,7 @@
   echo 'none'
 endfunc
 
-def Test_try_catch()
+def Test_try_catch_throw()
   var l = []
   try # comment
     add(l, '1')
@@ -356,6 +361,35 @@
   endtry
   assert_equal(99, n)
 
+  var done = 'no'
+  if 0
+    try | catch | endtry
+  else
+    done = 'yes'
+  endif
+  assert_equal('yes', done)
+
+  done = 'no'
+  if 1
+    done = 'yes'
+  else
+    try | catch | endtry
+    done = 'never'
+  endif
+  assert_equal('yes', done)
+
+  if 1
+  else
+    try | catch /pat/ | endtry
+    try | catch /pat/ 
+    endtry
+    try 
+    catch /pat/ | endtry
+    try 
+    catch /pat/ 
+    endtry
+  endif
+
   try
     # string slice returns a string, not a number
     n = g:astring[3]
@@ -385,7 +419,7 @@
   endtry
   assert_equal(121, n)
 
-  var d = #{one: 1}
+  var d = {one: 1}
   try
     n = d[g:astring]
   catch /E716:/
@@ -416,7 +450,7 @@
 
   var nd: dict<any>
   try
-    nd = {g:anumber: 1}
+    nd = {[g:anumber]: 1}
   catch /E1012:/
     n = 266
   endtry
@@ -459,7 +493,7 @@
   assert_equal(322, n)
 
   try
-    d = {'text': 1, g:astring: 2}
+    d = {text: 1, [g:astring]: 2}
   catch /E721:/
     n = 333
   endtry
@@ -524,6 +558,62 @@
   assert_equal(411, n)
 enddef
 
+def Test_cnext_works_in_catch()
+  var lines =<< trim END
+      vim9script
+      au BufEnter * eval 0
+      writefile(['text'], 'Xfile1')
+      writefile(['text'], 'Xfile2')
+      var items = [
+          {lnum: 1, filename: 'Xfile1', valid: true},
+          {lnum: 1, filename: 'Xfile2', valid: true}
+        ]
+      setqflist([], ' ', {items: items})
+      cwindow
+
+      def CnextOrCfirst()
+        # if cnext fails, cfirst is used
+        try
+          cnext
+        catch
+          cfirst
+        endtry
+      enddef
+
+      CnextOrCfirst()
+      CnextOrCfirst()
+      writefile([getqflist({idx: 0}).idx], 'Xresult')
+      qall
+  END
+  writefile(lines, 'XCatchCnext')
+  RunVim([], [], '--clean -S XCatchCnext')
+  assert_equal(['1'], readfile('Xresult'))
+
+  delete('Xfile1')
+  delete('Xfile2')
+  delete('XCatchCnext')
+  delete('Xresult')
+enddef
+
+def Test_throw_skipped()
+  if 0
+    throw dontgethere
+  endif
+enddef
+
+def Test_nocatch_throw_silenced()
+  var lines =<< trim END
+    vim9script
+    def Func()
+      throw 'error'
+    enddef
+    silent! Func()
+  END
+  writefile(lines, 'XthrowSilenced')
+  source XthrowSilenced
+  delete('XthrowSilenced')
+enddef
+
 def DeletedFunc(): list<any>
   return ['delete me']
 enddef
@@ -620,7 +710,7 @@
   CheckDefFailure(['if 1', 'endtry'], 'E171:')
   CheckDefFailure(['try', 'echo 1', 'endtry'], 'E1032:')
 
-  CheckDefFailure(['throw'], 'E1015:')
+  CheckDefFailure(['throw'], 'E1143:')
   CheckDefFailure(['throw xxx'], 'E1001:')
 enddef
 
@@ -725,6 +815,12 @@
       # comment 6
   END
   assert_equal(['# comment 1', 'two', '# comment 3', '', 'five', '# comment 6'], lines)
+
+  lines =<< trim END
+    [{
+      a: 0}]->string()->assert_equal("[{'a': 0}]")
+  END
+  CheckDefAndScriptSuccess(lines)
 enddef
 
 if has('channel')
@@ -775,7 +871,7 @@
     g:imported_func = Exported()
 
     def GetExported(): string
-      var local_dict = #{ref: Exported}
+      var local_dict = {ref: Exported}
       return local_dict.ref()
     enddef
     g:funcref_result = GetExported()
@@ -894,6 +990,16 @@
   writefile(import_star_as_lines_dot_space, 'Ximport.vim')
   assert_fails('source Ximport.vim', 'E1074:', '', 1, 'Func')
 
+  var import_star_as_duplicated =<< trim END
+    vim9script
+    import * as Export from './Xexport.vim'
+    var some = 'other'
+    import * as Export from './Xexport.vim'
+    defcompile
+  END
+  writefile(import_star_as_duplicated, 'Ximport.vim')
+  assert_fails('source Ximport.vim', 'E1073:', '', 4, 'Ximport.vim')
+
   var import_star_as_lines_missing_name =<< trim END
     vim9script
     import * as Export from './Xexport.vim'
@@ -962,6 +1068,18 @@
   writefile(import_already_defined, 'Ximport.vim')
   assert_fails('source Ximport.vim', 'E1073:', '', 3, 'Ximport.vim')
 
+  # try changing an imported const
+  var import_assign_to_const =<< trim END
+    vim9script
+    import CONST from './Xexport.vim'
+    def Assign()
+      CONST = 987
+    enddef
+    defcompile
+  END
+  writefile(import_assign_to_const, 'Ximport.vim')
+  assert_fails('source Ximport.vim', 'E46:', '', 1, '_Assign')
+
   # import a very long name, requires making a copy
   var import_long_name_lines =<< trim END
     vim9script
@@ -1133,14 +1251,61 @@
   END
   writefile(export, 'XexportCmd.vim')
 
-  var buf = RunVimInTerminal('-c "import Foo from ''./XexportCmd.vim''"', #{
+  var buf = RunVimInTerminal('-c "import Foo from ''./XexportCmd.vim''"', {
                 rows: 6, wait_for_ruler: 0})
-  WaitForAssert({-> assert_match('^E1094:', term_getline(buf, 5))})
+  WaitForAssert(() => assert_match('^E1094:', term_getline(buf, 5)))
 
   delete('XexportCmd.vim')
   StopVimInTerminal(buf)
 enddef
 
+def Test_vim9script_reload_noclear()
+  var lines =<< trim END
+    vim9script
+    export var exported = 'thexport'
+  END
+  writefile(lines, 'XExportReload')
+  lines =<< trim END
+    vim9script noclear
+    g:loadCount += 1
+    var s:reloaded = 'init'
+    import exported from './XExportReload'
+
+    def Again(): string
+      return 'again'
+    enddef
+
+    if exists('s:loaded') | finish | endif
+    var s:loaded = true
+
+    var s:notReloaded = 'yes'
+    s:reloaded = 'first'
+    def g:Values(): list<string>
+      return [s:reloaded, s:notReloaded, Again(), Once(), exported]
+    enddef
+
+    def Once(): string
+      return 'once'
+    enddef
+  END
+  writefile(lines, 'XReloaded')
+  g:loadCount = 0
+  source XReloaded
+  assert_equal(1, g:loadCount)
+  assert_equal(['first', 'yes', 'again', 'once', 'thexport'], g:Values())
+  source XReloaded
+  assert_equal(2, g:loadCount)
+  assert_equal(['init', 'yes', 'again', 'once', 'thexport'], g:Values())
+  source XReloaded
+  assert_equal(3, g:loadCount)
+  assert_equal(['init', 'yes', 'again', 'once', 'thexport'], g:Values())
+
+  delete('XReloaded')
+  delete('XExportReload')
+  delfunc g:Values
+  unlet g:loadCount
+enddef
+
 def Test_vim9script_reload_import()
   var lines =<< trim END
     vim9script
@@ -1190,6 +1355,32 @@
   delete('Ximport.vim')
 enddef
 
+" if a script is reloaded with a script-local variable that changed its type, a
+" compiled function using that variable must fail.
+def Test_script_reload_change_type()
+  var lines =<< trim END
+    vim9script noclear
+    var str = 'string'
+    def g:GetStr(): string
+      return str .. 'xxx'
+    enddef
+  END
+  writefile(lines, 'Xreload.vim')
+  source Xreload.vim
+  echo g:GetStr()
+
+  lines =<< trim END
+    vim9script noclear
+    var str = 1234
+  END
+  writefile(lines, 'Xreload.vim')
+  source Xreload.vim
+  assert_fails('echo g:GetStr()', 'E1150:')
+
+  delfunc g:GetStr
+  delete('Xreload.vim')
+enddef
+
 def s:RetSome(): string
   return 'some'
 enddef
@@ -1295,12 +1486,12 @@
   # FuncNo() is not redefined
   writefile(first_lines + nono_lines, 'Xreloaded.vim')
   source Xreloaded.vim
-  g:DoCheck()
+  g:DoCheck(false)
 
   # FuncNo() is back
   writefile(first_lines + withno_lines, 'Xreloaded.vim')
   source Xreloaded.vim
-  g:DoCheck()
+  g:DoCheck(false)
 
   delete('Xreloaded.vim')
 enddef
@@ -1550,7 +1741,7 @@
   CheckDefFailure(['elseif true'], 'E582:')
   CheckDefFailure(['else'], 'E581:')
   CheckDefFailure(['endif'], 'E580:')
-  CheckDefFailure(['if true', 'elseif xxx'], 'E1001:')
+  CheckDefFailure(['if g:abool', 'elseif xxx'], 'E1001:')
   CheckDefFailure(['if true', 'echo 1'], 'E171:')
 enddef
 
@@ -1707,6 +1898,10 @@
 enddef
 
 def Test_execute_cmd()
+  # missing argument is ignored
+  execute
+  execute # comment
+
   new
   setline(1, 'default')
   execute 'setline(1, "execute-string")'
@@ -1733,7 +1928,7 @@
   execute 'echomsg' (n ? '"true"' : '"no"')
   assert_match('^true$', Screenline(&lines))
 
-  echomsg [1, 2, 3] #{a: 1, b: 2}
+  echomsg [1, 2, 3] {a: 1, b: 2}
   assert_match('^\[1, 2, 3\] {''a'': 1, ''b'': 2}$', Screenline(&lines))
 
   CheckDefFailure(['execute xxx'], 'E1001:', 1)
@@ -1849,19 +2044,138 @@
     concat ..= str
   endfor
   assert_equal('onetwo', concat)
+
+  var total = 0
+  for nr in
+      [1, 2, 3]
+    total += nr
+  endfor
+  assert_equal(6, total)
+
+  total = 0
+  for nr
+    in [1, 2, 3]
+    total += nr
+  endfor
+  assert_equal(6, total)
+
+  total = 0
+  for nr
+    in
+    [1, 2, 3]
+    total += nr
+  endfor
+  assert_equal(6, total)
+
+  var res = ""
+  for [n: number, s: string] in [[1, 'a'], [2, 'b']]
+    res ..= n .. s
+  endfor
+  assert_equal('1a2b', res)
 enddef
 
 def Test_for_loop_fails()
+  CheckDefFailure(['for '], 'E1097:')
+  CheckDefFailure(['for x'], 'E1097:')
+  CheckDefFailure(['for x in'], 'E1097:')
   CheckDefFailure(['for # in range(5)'], 'E690:')
   CheckDefFailure(['for i In range(5)'], 'E690:')
   CheckDefFailure(['var x = 5', 'for x in range(5)'], 'E1017:')
   CheckScriptFailure(['def Func(arg: any)', 'for arg in range(5)', 'enddef', 'defcompile'], 'E1006:')
+  delfunc! g:Func
   CheckDefFailure(['for i in "text"'], 'E1012:')
   CheckDefFailure(['for i in xxx'], 'E1001:')
   CheckDefFailure(['endfor'], 'E588:')
   CheckDefFailure(['for i in range(3)', 'echo 3'], 'E170:')
 enddef
 
+def Test_for_loop_script_var()
+  # cannot use s:var in a :def function
+  CheckDefFailure(['for s:var in range(3)', 'echo 3'], 'E1101:')
+
+  # can use s:var in Vim9 script, with or without s:
+  var lines =<< trim END
+    vim9script
+    var total = 0
+    for s:var in [1, 2, 3]
+      total += s:var
+    endfor
+    assert_equal(6, total)
+
+    total = 0
+    for var in [1, 2, 3]
+      total += var
+    endfor
+    assert_equal(6, total)
+  END
+enddef
+
+def Test_for_loop_unpack()
+  var lines =<< trim END
+      var result = []
+      for [v1, v2] in [[1, 2], [3, 4]]
+        result->add(v1)
+        result->add(v2)
+      endfor
+      assert_equal([1, 2, 3, 4], result)
+
+      result = []
+      for [v1, v2; v3] in [[1, 2], [3, 4, 5, 6]]
+        result->add(v1)
+        result->add(v2)
+        result->add(v3)
+      endfor
+      assert_equal([1, 2, [], 3, 4, [5, 6]], result)
+
+      result = []
+      for [&ts, &sw] in [[1, 2], [3, 4]]
+        result->add(&ts)
+        result->add(&sw)
+      endfor
+      assert_equal([1, 2, 3, 4], result)
+
+      var slist: list<string>
+      for [$LOOPVAR, @r, v:errmsg] in [['a', 'b', 'c'], ['d', 'e', 'f']]
+        slist->add($LOOPVAR)
+        slist->add(@r)
+        slist->add(v:errmsg)
+      endfor
+      assert_equal(['a', 'b', 'c', 'd', 'e', 'f'], slist)
+
+      slist = []
+      for [g:globalvar, b:bufvar, w:winvar, t:tabvar] in [['global', 'buf', 'win', 'tab'], ['1', '2', '3', '4']]
+        slist->add(g:globalvar)
+        slist->add(b:bufvar)
+        slist->add(w:winvar)
+        slist->add(t:tabvar)
+      endfor
+      assert_equal(['global', 'buf', 'win', 'tab', '1', '2', '3', '4'], slist)
+      unlet! g:globalvar b:bufvar w:winvar t:tabvar
+  END
+  CheckDefAndScriptSuccess(lines)
+
+  lines =<< trim END
+      for [v1, v2] in [[1, 2, 3], [3, 4]]
+        echo v1 v2
+      endfor
+  END
+  CheckDefExecFailure(lines, 'E710:', 1)
+
+  lines =<< trim END
+      for [v1, v2] in [[1], [3, 4]]
+        echo v1 v2
+      endfor
+  END
+  CheckDefExecFailure(lines, 'E711:', 1)
+
+  lines =<< trim END
+      for [v1, v1] in [[1, 2], [3, 4]]
+        echo v1
+      endfor
+  END
+  CheckDefExecFailure(lines, 'E1017:', 1)
+enddef
+
 def Test_while_loop()
   var result = ''
   var cnt = 0
@@ -1916,26 +2230,26 @@
   assert_equal(['one', 'two', 'three'], mylist)
 
   var mydict = {
-      'one': 1,
-      'two': 2,
-      'three':
+      ['one']: 1,
+      ['two']: 2,
+      ['three']:
           3,
       } # comment
-  assert_equal({'one': 1, 'two': 2, 'three': 3}, mydict)
-  mydict = #{
+  assert_equal({one: 1, two: 2, three: 3}, mydict)
+  mydict = {
       one: 1,  # comment
       two:     # comment
            2,  # comment
       three: 3 # comment
       }
-  assert_equal(#{one: 1, two: 2, three: 3}, mydict)
-  mydict = #{
+  assert_equal({one: 1, two: 2, three: 3}, mydict)
+  mydict = {
       one: 1, 
       two: 
            2, 
       three: 3 
       }
-  assert_equal(#{one: 1, two: 2, three: 3}, mydict)
+  assert_equal({one: 1, two: 2, three: 3}, mydict)
 
   assert_equal(
         ['one', 'two', 'three'],
@@ -1947,7 +2261,21 @@
   CheckScriptSuccess([
       'vim9script',
       '# something',
+      '#something',
+      '#{something',
+      ])
+
+  split Xfile
+  CheckScriptSuccess([
+      'vim9script',
+      'edit #something',
+      ])
+  CheckScriptSuccess([
+      'vim9script',
+      'edit #{something',
       ])
+  close
+
   CheckScriptFailure([
       'vim9script',
       ':# something',
@@ -1984,7 +2312,7 @@
   CheckScriptFailure([
       'vim9script',
       'echo# something',
-      ], 'E121:')
+      ], 'E1144:')
   CheckScriptFailure([
       'echo "yes" # something',
       ], 'E121:')
@@ -2001,13 +2329,10 @@
       'vim9script',
       'exe "echo"# something',
       ], 'E121:')
-  CheckDefFailure([
-      'exe # comment',
-      ], 'E1015:')
   CheckScriptFailure([
       'vim9script',
       'exe# something',
-      ], 'E121:')
+      ], 'E1144:')
   CheckScriptFailure([
       'exe "echo" # something',
       ], 'E121:')
@@ -2017,18 +2342,18 @@
       '  echo "yes"',
       'catch',
       'endtry',
-      ], 'E488:')
+      ], 'E1144:')
   CheckScriptFailure([
       'vim9script',
       'try# comment',
       'echo "yes"',
-      ], 'E488:')
+      ], 'E1144:')
   CheckDefFailure([
       'try',
       '  throw#comment',
       'catch',
       'endtry',
-      ], 'E1015:')
+      ], 'E1144:')
   CheckDefFailure([
       'try',
       '  throw "yes"#comment',
@@ -2040,14 +2365,14 @@
       '  echo "yes"',
       'catch# comment',
       'endtry',
-      ], 'E488:')
+      ], 'E1144:')
   CheckScriptFailure([
       'vim9script',
       'try',
       '  echo "yes"',
       'catch# comment',
       'endtry',
-      ], 'E654:')
+      ], 'E1144:')
   CheckDefFailure([
       'try',
       '  echo "yes"',
@@ -2059,14 +2384,14 @@
       'echo "yes"',
       'catch',
       'endtry# comment',
-      ], 'E488:')
+      ], 'E1144:')
   CheckScriptFailure([
       'vim9script',
       'try',
       '  echo "yes"',
       'catch',
       'endtry# comment',
-      ], 'E488:')
+      ], 'E1144:')
 
   CheckScriptSuccess([
       'vim9script',
@@ -2075,7 +2400,7 @@
   CheckScriptFailure([
       'vim9script',
       'hi# comment',
-      ], 'E416:')
+      ], 'E1144:')
   CheckScriptSuccess([
       'vim9script',
       'hi Search # comment',
@@ -2121,7 +2446,7 @@
   CheckScriptFailure([
       'vim9script',
       'match# comment',
-      ], 'E475:')
+      ], 'E1144:')
   CheckScriptSuccess([
       'vim9script',
       'match none # comment',
@@ -2251,12 +2576,35 @@
       'vim9script',
       'command Echo echo # comment',
       'command Echo # comment',
+      'delcommand Echo',
       ])
   CheckScriptFailure([
       'vim9script',
       'command Echo echo# comment',
       'Echo',
-      ], 'E121:')
+      ], 'E1144:')
+  delcommand Echo
+
+  var curdir = getcwd()
+  CheckScriptSuccess([
+      'command Echo cd " comment',
+      'Echo',
+      'delcommand Echo',
+      ])
+  CheckScriptSuccess([
+      'vim9script',
+      'command Echo cd # comment',
+      'Echo',
+      'delcommand Echo',
+      ])
+  CheckScriptFailure([
+      'vim9script',
+      'command Echo cd " comment',
+      'Echo',
+      ], 'E344:')
+  delcommand Echo
+  chdir(curdir)
+
   CheckScriptFailure([
       'vim9script',
       'command Echo# comment',
@@ -2266,6 +2614,7 @@
       'command Echo echo',
       'command Echo# comment',
       ], 'E182:')
+  delcommand Echo
 
   CheckScriptSuccess([
       'vim9script',
@@ -2278,7 +2627,7 @@
   CheckScriptFailure([
       'vim9script',
       'function# comment',
-      ], 'E129:')
+      ], 'E1144:')
   CheckScriptSuccess([
       'vim9script',
       'function CheckScriptSuccess # comment',
@@ -2323,6 +2672,7 @@
   CheckScriptSuccess([
       'func Test() " comment',
       'endfunc',
+      'delfunc Test',
       ])
   CheckScriptSuccess([
       'vim9script',
@@ -2346,7 +2696,7 @@
   CheckScriptFailure([
       'vim9script',
       'gui#comment'
-      ], 'E499:')
+      ], 'E1144:')
   CheckScriptFailure([
       'vim9script',
       'gui -f#comment'
@@ -2526,6 +2876,17 @@
 enddef
 
 def Test_source_vim9_from_legacy()
+  var vim9_lines =<< trim END
+    vim9script
+    var local = 'local'
+    g:global = 'global'
+    export var exported = 'exported'
+    export def GetText(): string
+       return 'text'
+    enddef
+  END
+  writefile(vim9_lines, 'Xvim9_script.vim')
+
   var legacy_lines =<< trim END
     source Xvim9_script.vim
 
@@ -2547,19 +2908,7 @@
   END
   writefile(legacy_lines, 'Xlegacy_script.vim')
 
-  var vim9_lines =<< trim END
-    vim9script
-    var local = 'local'
-    g:global = 'global'
-    export var exported = 'exported'
-    export def GetText(): string
-       return 'text'
-    enddef
-  END
-  writefile(vim9_lines, 'Xvim9_script.vim')
-
   source Xlegacy_script.vim
-
   assert_equal('global', g:global)
   unlet g:global
 
@@ -2609,10 +2958,44 @@
   quit
 enddef
 
-" test using a vim9script that is auto-loaded from an autocmd
+" test using an auto-loaded function and variable
 def Test_vim9_autoload()
   var lines =<< trim END
      vim9script
+     def some#gettest(): string
+       return 'test'
+     enddef
+     g:some#name = 'name'
+  END
+
+  mkdir('Xdir/autoload', 'p')
+  writefile(lines, 'Xdir/autoload/some.vim')
+  var save_rtp = &rtp
+  exe 'set rtp^=' .. getcwd() .. '/Xdir'
+
+  assert_equal('test', g:some#gettest())
+  assert_equal('name', g:some#name)
+  g:some#other = 'other'
+  assert_equal('other', g:some#other)
+
+  # upper case script name works
+  lines =<< trim END
+     vim9script
+     def Other#getOther(): string
+       return 'other'
+     enddef
+  END
+  writefile(lines, 'Xdir/autoload/Other.vim')
+  assert_equal('other', g:Other#getOther())
+
+  delete('Xdir', 'rf')
+  &rtp = save_rtp
+enddef
+
+" test using a vim9script that is auto-loaded from an autocmd
+def Test_vim9_aucmd_autoload()
+  var lines =<< trim END
+     vim9script
      def foo#test()
          echomsg getreg('"')
      enddef
@@ -2651,7 +3034,7 @@
           invalid
       endfu
       try
-          invalid
+          alsoinvalid
       catch /wontmatch/
       endtry
   END
@@ -2672,6 +3055,12 @@
   delete('Xdidit')
   delete('Xscript')
   delete('Xruntime', 'rf')
+
+  lines =<< trim END
+    vim9script
+    var foo#bar = 'asdf'
+  END
+  CheckScriptFailure(lines, 'E461: Illegal variable name: foo#bar', 2)
 enddef
 
 def Test_script_var_in_autocmd()
@@ -2731,6 +3120,18 @@
   delete('Xdidit')
 enddef
 
+def Test_restoring_cpo()
+  writefile(['vim9script', 'set nocp'], 'Xsourced')
+  writefile(['call writefile(["done"], "Xdone")', 'quit!'], 'Xclose')
+  if RunVim([], [], '-u NONE +"set cpo+=a" -S Xsourced -S Xclose')
+    assert_equal(['done'], readfile('Xdone'))
+  endif
+  delete('Xsourced')
+  delete('Xclose')
+  delete('Xdone')
+enddef
+
+
 def Test_unset_any_variable()
   var lines =<< trim END
     var name: any
@@ -2756,11 +3157,11 @@
   END
   writefile([''], 'Xdidcmd')
   writefile(lines, 'XcallFunc')
-  var buf = RunVimInTerminal('-S XcallFunc', #{rows: 6})
+  var buf = RunVimInTerminal('-S XcallFunc', {rows: 6})
   # define Afunc() on the command line
   term_sendkeys(buf, ":def Afunc()\<CR>Bfunc()\<CR>enddef\<CR>")
   term_sendkeys(buf, ":call CheckAndQuit()\<CR>")
-  WaitForAssert({-> assert_equal(['errors: []'], readfile('Xdidcmd'))})
+  WaitForAssert(() => assert_equal(['errors: []'], readfile('Xdidcmd')))
 
   call StopVimInTerminal(buf)
   delete('XcallFunc')
@@ -2851,7 +3252,7 @@
         g:caught = 'yes'
       endtry
     enddef
-    popup_menu('popup', #{callback: Callback})
+    popup_menu('popup', {callback: Callback})
     feedkeys("\r", 'xt')
   END
   CheckScriptSuccess(lines)
@@ -2859,6 +3260,117 @@
   unlet g:caught
 enddef
 
+def Test_no_unknown_error_after_error()
+  if !has('unix') || !has('job')
+    throw 'Skipped: not unix of missing +job feature'
+  endif
+  var lines =<< trim END
+      vim9script
+      var source: list<number>
+      def Out_cb(...l: any)
+          eval [][0]
+      enddef
+      def Exit_cb(...l: any)
+          sleep 1m
+          source += l
+      enddef
+      var myjob = job_start('echo burp', {out_cb: Out_cb, exit_cb: Exit_cb, mode: 'raw'})
+      while job_status(myjob) == 'run'
+        sleep 10m
+      endwhile
+      sleep 10m
+  END
+  writefile(lines, 'Xdef')
+  assert_fails('so Xdef', ['E684:', 'E1012:'])
+  delete('Xdef')
+enddef
+
+def InvokeNormal()
+  exe "norm! :m+1\r"
+enddef
+
+def Test_invoke_normal_in_visual_mode()
+  xnoremap <F3> <Cmd>call <SID>InvokeNormal()<CR>
+  new
+  setline(1, ['aaa', 'bbb'])
+  feedkeys("V\<F3>", 'xt')
+  assert_equal(['bbb', 'aaa'], getline(1, 2))
+  xunmap <F3>
+enddef
+
+def Test_white_space_after_command()
+  var lines =<< trim END
+    exit_cb: Func})
+  END
+  CheckDefAndScriptFailure(lines, 'E1144:', 1)
+
+  lines =<< trim END
+    e#
+  END
+  CheckDefAndScriptFailure(lines, 'E1144:', 1)
+enddef
+
+def Test_script_var_gone_when_sourced_twice()
+  var lines =<< trim END
+      vim9script
+      if exists('g:guard')
+        finish
+      endif
+      g:guard = 1
+      var name = 'thename'
+      def g:GetName(): string
+        return name
+      enddef
+      def g:SetName(arg: string)
+        name = arg
+      enddef
+  END
+  writefile(lines, 'XscriptTwice.vim')
+  so XscriptTwice.vim
+  assert_equal('thename', g:GetName())
+  g:SetName('newname')
+  assert_equal('newname', g:GetName())
+  so XscriptTwice.vim
+  assert_fails('call g:GetName()', 'E1149:')
+  assert_fails('call g:SetName("x")', 'E1149:')
+
+  delfunc g:GetName
+  delfunc g:SetName
+  delete('XscriptTwice.vim')
+  unlet g:guard
+enddef
+
+def Test_import_gone_when_sourced_twice()
+  var exportlines =<< trim END
+      vim9script
+      if exists('g:guard')
+        finish
+      endif
+      g:guard = 1
+      export var name = 'someName'
+  END
+  writefile(exportlines, 'XexportScript.vim')
+
+  var lines =<< trim END
+      vim9script
+      import name from './XexportScript.vim'
+      def g:GetName(): string
+        return name
+      enddef
+  END
+  writefile(lines, 'XscriptImport.vim')
+  so XscriptImport.vim
+  assert_equal('someName', g:GetName())
+
+  so XexportScript.vim
+  assert_fails('call g:GetName()', 'E1149:')
+
+  delfunc g:GetName
+  delete('XexportScript.vim')
+  delete('XscriptImport.vim')
+  unlet g:guard
+enddef
+
 " Keep this last, it messes up highlighting.
 def Test_substitute_cmd()
   new
diff -Nru vim-8.2.1913/src/testdir/test_viminfo.vim vim-8.2.2434/src/testdir/test_viminfo.vim
--- vim-8.2.1913/src/testdir/test_viminfo.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_viminfo.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1,6 +1,8 @@
 " Test for reading and writing .viminfo
 
 source check.vim
+source term_util.vim
+source shared.vim
 
 function Test_viminfo_read_and_write()
   " First clear 'history', so that "hislen" is zero.  Then set it again,
@@ -879,4 +881,32 @@
   call assert_fails('set viminfo=%10', 'E528:')
 endfunc
 
+func Test_viminfo_oldfiles_newfile()
+  CheckRunVimInTerminal
+
+  let save_viminfo = &viminfo
+  let save_viminfofile = &viminfofile
+  set viminfo&vim
+  let v:oldfiles = []
+  let commands =<< trim [CODE]
+    set viminfofile=Xviminfofile
+    set viminfo&vim
+    w! Xnew-file.txt
+    qall
+  [CODE]
+  call writefile(commands, 'Xviminfotest')
+  let buf = RunVimInTerminal('-S Xviminfotest', #{wait_for_ruler: 0})
+  call WaitForAssert({-> assert_equal("finished", term_getstatus(buf))})
+
+  let &viminfofile = 'Xviminfofile'
+  rviminfo! Xviminfofile
+  call assert_match('Xnew-file.txt$', v:oldfiles[0])
+  call assert_equal(1, len(v:oldfiles))
+  call delete('Xviminfofile')
+  call delete('Xviminfotest')
+  call delete('Xnew-file.txt')
+  let &viminfo = save_viminfo
+  let &viminfofile = save_viminfofile
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff -Nru vim-8.2.1913/src/testdir/test_vimscript.vim vim-8.2.2434/src/testdir/test_vimscript.vim
--- vim-8.2.1913/src/testdir/test_vimscript.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_vimscript.vim	2021-01-30 22:05:11.000000000 +0000
@@ -6600,6 +6600,14 @@
     call ChangeYourMind()
 endfunc
 
+func Test_typename()
+  call assert_equal('number', typename(123))
+  call assert_equal('string', typename('x'))
+  call assert_equal('list<number>', typename([123]))
+  call assert_equal('dict<number>', typename(#{key: 123}))
+  call assert_equal('list<dict<number>>', typename([#{key: 123}]))
+endfunc
+
 "-------------------------------------------------------------------------------
 " Test 92:  skipping code					    {{{1
 "-------------------------------------------------------------------------------
@@ -6825,7 +6833,7 @@
 		    \ ])
 	call assert_report("Shouldn't be able to define function")
     catch
-	call assert_exception('Vim(function):E126: Missing :endfunction')
+	call assert_exception('Vim(function):E1145: Missing heredoc end marker: .')
     endtry
 
     " :change
@@ -6845,7 +6853,7 @@
 		    \ ])
 	call assert_report("Shouldn't be able to define function")
     catch
-	call assert_exception('Vim(function):E126: Missing :endfunction')
+	call assert_exception('Vim(function):E1145: Missing heredoc end marker: .')
     endtry
 
     " :insert
@@ -6865,7 +6873,7 @@
 		    \ ])
 	call assert_report("Shouldn't be able to define function")
     catch
-	call assert_exception('Vim(function):E126: Missing :endfunction')
+	call assert_exception('Vim(function):E1145: Missing heredoc end marker: .')
     endtry
 endfunc
 
@@ -7374,7 +7382,7 @@
   endtry
   call assert_equal(1, caught_e884)
 
-  " function name folowed by #
+  " function name followed by #
   let caught_e128 = 0
   try
     func! test2() "#
diff -Nru vim-8.2.1913/src/testdir/test_window_cmd.vim vim-8.2.2434/src/testdir/test_window_cmd.vim
--- vim-8.2.1913/src/testdir/test_window_cmd.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_window_cmd.vim	2021-01-30 22:05:11.000000000 +0000
@@ -19,6 +19,8 @@
 endfunc
 
 func Test_window_cmd_cmdwin_with_vsp()
+  CheckFeature cmdwin
+
   let efmt = 'Expected 0 but got %d (in ls=%d, %s window)'
   for v in range(0, 2)
     exec "set ls=" . v
@@ -565,8 +567,8 @@
 
 func Test_access_freed_mem()
   call assert_equal(&columns, winwidth(0))
-  " This was accessing freed memory
-  au * 0 vs xxx
+  " This was accessing freed memory (but with what events?)
+  au BufEnter,BufLeave,WinEnter,WinLeave 0 vs xxx
   arg 0
   argadd
   call assert_fails("all", "E242:")
@@ -1148,6 +1150,14 @@
   exe other_winnr .. 'resize +1'
   call assert_equal(12, winheight(other_winnr))
   call assert_equal(&lines - 10 - 3 -2, winheight(0))
+  close
+
+  vsplit
+  wincmd l
+  let other_winnr = winnr('h')
+  call assert_notequal(winnr(), other_winnr)
+  exe 'vert ' .. other_winnr .. 'resize -' .. &columns
+  call assert_equal(0, winwidth(other_winnr))
 
   %bwipe!
 endfunc
diff -Nru vim-8.2.1913/src/testdir/test_writefile.vim vim-8.2.2434/src/testdir/test_writefile.vim
--- vim-8.2.1913/src/testdir/test_writefile.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/test_writefile.vim	2021-01-30 22:05:11.000000000 +0000
@@ -676,4 +676,24 @@
   %bw!
 endfunc
 
+func Test_read_write_bin()
+  " write file missing EOL
+  call writefile(['noeol'], "XNoEolSetEol", 'bS')
+  call assert_equal(0z6E6F656F6C, readfile('XNoEolSetEol', 'B'))
+
+  " when file is read 'eol' is off
+  set nofixeol
+  e! ++ff=unix XNoEolSetEol
+  call assert_equal(0, &eol)
+
+  " writing with 'eol' set adds the newline
+  setlocal eol
+  w
+  call assert_equal(0z6E6F656F6C0A, readfile('XNoEolSetEol', 'B'))
+
+  call delete('XNoEolSetEol')
+  set ff&
+  bwipe! XNoEolSetEol
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff -Nru vim-8.2.1913/src/testdir/vim9.vim vim-8.2.2434/src/testdir/vim9.vim
--- vim-8.2.1913/src/testdir/vim9.vim	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testdir/vim9.vim	2021-01-30 22:05:11.000000000 +0000
@@ -1,11 +1,22 @@
 " Utility functions for testing vim9 script
 
-" Check that "lines" inside ":def" has no error.
+" Use a different file name for each run.
+let s:sequence = 1
+
+" Check that "lines" inside a ":def" function has no error.
 func CheckDefSuccess(lines)
-  call writefile(['def Func()'] + a:lines + ['enddef', 'defcompile'], 'Xdef')
-  so Xdef
-  call Func()
-  call delete('Xdef')
+  let cwd = getcwd()
+  let fname = 'XdefSuccess' .. s:sequence
+  let s:sequence += 1
+  call writefile(['def Func()'] + a:lines + ['enddef', 'defcompile'], fname)
+  try
+    exe 'so ' .. fname
+    call Func()
+    delfunc! Func
+  finally
+    call chdir(cwd)
+    call delete(fname)
+  endtry
 endfunc
 
 " Check that "lines" inside ":def" results in an "error" message.
@@ -13,9 +24,17 @@
 " Add a line before and after to make it less likely that the line number is
 " accidentally correct.
 func CheckDefFailure(lines, error, lnum = -3)
-  call writefile(['def Func()', '# comment'] + a:lines + ['#comment', 'enddef', 'defcompile'], 'Xdef')
-  call assert_fails('so Xdef', a:error, a:lines, a:lnum + 1)
-  call delete('Xdef')
+  let cwd = getcwd()
+  let fname = 'XdefFailure' .. s:sequence
+  let s:sequence += 1
+  call writefile(['def Func()', '# comment'] + a:lines + ['#comment', 'enddef', 'defcompile'], fname)
+  try
+    call assert_fails('so ' .. fname, a:error, a:lines, a:lnum + 1)
+  finally
+    call chdir(cwd)
+    call delete(fname)
+    delfunc! Func
+  endtry
 endfunc
 
 " Check that "lines" inside ":def" results in an "error" message when executed.
@@ -23,22 +42,57 @@
 " Add a line before and after to make it less likely that the line number is
 " accidentally correct.
 func CheckDefExecFailure(lines, error, lnum = -3)
-  call writefile(['def Func()', '# comment'] + a:lines + ['#comment', 'enddef'], 'Xdef')
-  so Xdef
-  call assert_fails('call Func()', a:error, a:lines, a:lnum + 1)
-  call delete('Xdef')
+  let cwd = getcwd()
+  let fname = 'XdefExecFailure' .. s:sequence
+  let s:sequence += 1
+  call writefile(['def Func()', '# comment'] + a:lines + ['#comment', 'enddef'], fname)
+  try
+    exe 'so ' .. fname
+    call assert_fails('call Func()', a:error, a:lines, a:lnum + 1)
+  finally
+    call chdir(cwd)
+    call delete(fname)
+    delfunc! Func
+  endtry
 endfunc
 
 def CheckScriptFailure(lines: list<string>, error: string, lnum = -3)
-  writefile(lines, 'Xdef')
-  assert_fails('so Xdef', error, lines, lnum)
-  delete('Xdef')
+  var cwd = getcwd()
+  var fname = 'XScriptFailure' .. s:sequence
+  s:sequence += 1
+  writefile(lines, fname)
+  try
+    assert_fails('so ' .. fname, error, lines, lnum)
+  finally
+    chdir(cwd)
+    delete(fname)
+  endtry
+enddef
+
+def CheckScriptFailureList(lines: list<string>, errors: list<string>, lnum = -3)
+  var cwd = getcwd()
+  var fname = 'XScriptFailure' .. s:sequence
+  s:sequence += 1
+  writefile(lines, fname)
+  try
+    assert_fails('so ' .. fname, errors, lines, lnum)
+  finally
+    chdir(cwd)
+    delete(fname)
+  endtry
 enddef
 
 def CheckScriptSuccess(lines: list<string>)
-  writefile(lines, 'Xdef')
-  so Xdef
-  delete('Xdef')
+  var cwd = getcwd()
+  var fname = 'XScriptSuccess' .. s:sequence
+  s:sequence += 1
+  writefile(lines, fname)
+  try
+    exe 'so ' .. fname
+  finally
+    chdir(cwd)
+    delete(fname)
+  endtry
 enddef
 
 def CheckDefAndScriptSuccess(lines: list<string>)
@@ -46,15 +100,15 @@
   CheckScriptSuccess(['vim9script'] + lines)
 enddef
 
-" Check that a command fails both when used in a :def function and when used
-" in Vim9 script.
+" Check that a command fails with the same error when used in a :def function
+" and when used in Vim9 script.
 def CheckDefAndScriptFailure(lines: list<string>, error: string, lnum = -3)
   CheckDefFailure(lines, error, lnum)
   CheckScriptFailure(['vim9script'] + lines, error, lnum + 1)
 enddef
 
-" Check that a command fails both when executed in a :def function and when
-" used in Vim9 script.
+" Check that a command fails with the same error  when executed in a :def
+" function and when used in Vim9 script.
 def CheckDefExecAndScriptFailure(lines: list<string>, error: string, lnum = -3)
   CheckDefExecFailure(lines, error, lnum)
   CheckScriptFailure(['vim9script'] + lines, error, lnum + 1)
diff -Nru vim-8.2.1913/src/testing.c vim-8.2.2434/src/testing.c
--- vim-8.2.1913/src/testing.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/testing.c	2021-01-30 22:05:11.000000000 +0000
@@ -220,7 +220,11 @@
 	vim_free(tofree);
     }
     else
+    {
+	ga_concat(gap, (char_u *)"'");
 	ga_concat_shorten_esc(gap, exp_str);
+	ga_concat(gap, (char_u *)"'");
+    }
     if (atype != ASSERT_NOTEQUAL)
     {
 	if (atype == ASSERT_MATCH)
@@ -555,8 +559,7 @@
     // trylevel must be zero for a ":throw" command to be considered failed
     trylevel = 0;
     suppress_errthrow = TRUE;
-    emsg_silent = TRUE;
-    emsg_assert_fails_used = TRUE;
+    in_assert_fails = TRUE;
 
     do_cmdline_cmd(cmd);
     if (called_emsg == called_emsg_before)
@@ -572,6 +575,7 @@
     {
 	char_u	buf[NUMBUFLEN];
 	char_u	*expected;
+	char_u	*expected_str = NULL;
 	int	error_found = FALSE;
 	int	error_found_index = 1;
 	char_u	*actual = emsg_assert_fails_msg == NULL ? (char_u *)"[unknown]"
@@ -599,6 +603,7 @@
 	    if (!pattern_match(expected, actual, FALSE))
 	    {
 		error_found = TRUE;
+		expected_str = expected;
 	    }
 	    else if (list->lv_len == 2)
 	    {
@@ -606,7 +611,10 @@
 		actual = get_vim_var_str(VV_ERRMSG);
 		expected = tv_get_string_buf_chk(tv, buf);
 		if (!pattern_match(expected, actual, FALSE))
+		{
 		    error_found = TRUE;
+		    expected_str = expected;
+		}
 	    }
 	}
 	else
@@ -666,7 +674,7 @@
 		actual_tv.v_type = VAR_STRING;
 		actual_tv.vval.v_string = actual;
 	    }
-	    fill_assert_error(&ga, &argvars[2], NULL,
+	    fill_assert_error(&ga, &argvars[2], expected_str,
 			&argvars[error_found_index], &actual_tv, ASSERT_OTHER);
 	    ga_concat(&ga, (char_u *)": ");
 	    assert_append_cmd_or_arg(&ga, argvars, cmd);
@@ -679,9 +687,13 @@
 theend:
     trylevel = save_trylevel;
     suppress_errthrow = FALSE;
-    emsg_silent = FALSE;
+    in_assert_fails = FALSE;
+    did_emsg = FALSE;
+    msg_col = 0;
+    need_wait_return = FALSE;
     emsg_on_display = FALSE;
-    emsg_assert_fails_used = FALSE;
+    msg_scrolled = 0;
+    lines_left = Rows;
     VIM_CLEAR(emsg_assert_fails_msg);
     set_vim_var_string(VV_ERRMSG, NULL, 0);
     if (wrong_arg_msg != NULL)
diff -Nru vim-8.2.1913/src/textprop.c vim-8.2.2434/src/textprop.c
--- vim-8.2.1913/src/textprop.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/textprop.c	2021-01-30 22:05:11.000000000 +0000
@@ -302,7 +302,7 @@
 	if (length < 0)
 	    length = 0;		// zero-width property
 
-	// Allocate the new line with space for the new proprety.
+	// Allocate the new line with space for the new property.
 	newtext = alloc(buf->b_ml.ml_line_len + sizeof(textprop_T));
 	if (newtext == NULL)
 	    return;
@@ -419,7 +419,7 @@
     int			i;
 
     // w_botline may not have been updated yet.
-    validate_botline();
+    validate_botline_win(wp);
     for (lnum = wp->w_topline; lnum < wp->w_botline; ++lnum)
     {
 	count = get_text_props(wp->w_buffer, lnum, &props, FALSE);
@@ -1485,7 +1485,7 @@
 	end = !(prop.tp_flags & TP_FLAG_CONT_NEXT);
 
 	adjust_prop(&prop, 0, -removed, 0); // Remove leading spaces
-	adjust_prop(&prop, -1, col, 0); // Make line start at its final colum
+	adjust_prop(&prop, -1, col, 0); // Make line start at its final column
 
 	if (add_all || end)
 	    mch_memmove(new_props + --(*props_remaining) * sizeof(prop),
diff -Nru vim-8.2.1913/src/time.c vim-8.2.2434/src/time.c
--- vim-8.2.1913/src/time.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/time.c	2021-01-30 22:05:11.000000000 +0000
@@ -478,6 +478,7 @@
 	    int save_must_redraw = must_redraw;
 	    int save_trylevel = trylevel;
 	    int save_did_throw = did_throw;
+	    int save_need_rethrow = need_rethrow;
 	    int save_ex_pressedreturn = get_pressedreturn();
 	    int save_may_garbage_collect = may_garbage_collect;
 	    except_T *save_current_exception = current_exception;
@@ -493,14 +494,17 @@
 	    must_redraw = 0;
 	    trylevel = 0;
 	    did_throw = FALSE;
+	    need_rethrow = FALSE;
 	    current_exception = NULL;
 	    may_garbage_collect = FALSE;
 	    save_vimvars(&vvsave);
 
+	    // Invoke the callback.
 	    timer->tr_firing = TRUE;
 	    timer_callback(timer);
 	    timer->tr_firing = FALSE;
 
+	    // Restore stuff.
 	    timer_next = timer->tr_next;
 	    did_one = TRUE;
 	    timer_busy = save_timer_busy;
@@ -511,6 +515,7 @@
 	    called_emsg = save_called_emsg;
 	    trylevel = save_trylevel;
 	    did_throw = save_did_throw;
+	    need_rethrow = save_need_rethrow;
 	    current_exception = save_current_exception;
 	    restore_vimvars(&vvsave);
 	    if (must_redraw != 0)
diff -Nru vim-8.2.1913/src/typval.c vim-8.2.2434/src/typval.c
--- vim-8.2.1913/src/typval.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/typval.c	2021-01-30 22:05:11.000000000 +0000
@@ -196,7 +196,7 @@
 	case VAR_STRING:
 	    if (in_vim9script())
 	    {
-		emsg(_(e_using_string_as_number));
+		emsg_using_string_as(varp, !want_bool);
 		break;
 	    }
 	    if (varp->vval.v_string != NULL)
@@ -213,7 +213,10 @@
 	case VAR_SPECIAL:
 	    if (!want_bool && in_vim9script())
 	    {
-		emsg(_("E611: Using a Special as a Number"));
+		if (varp->v_type == VAR_BOOL)
+		    emsg(_(e_using_bool_as_number));
+		else
+		    emsg(_("E611: Using a Special as a Number"));
 		break;
 	    }
 	    return varp->vval.v_number == VVAL_TRUE ? 1 : 0;
@@ -338,6 +341,36 @@
 #endif
 
 /*
+ * Give an error and return FAIL unless "tv" is a string.
+ */
+    int
+check_for_string(typval_T *tv)
+{
+    if (tv->v_type != VAR_STRING)
+    {
+	emsg(_(e_stringreq));
+	return FAIL;
+    }
+    return OK;
+}
+
+/*
+ * Give an error and return FAIL unless "tv" is a non-empty string.
+ */
+    int
+check_for_nonempty_string(typval_T *tv)
+{
+    if (check_for_string(tv) == FAIL)
+	return FAIL;
+    if (tv->vval.v_string == NULL || *tv->vval.v_string == NUL)
+    {
+	emsg(_(e_non_empty_string_required));
+	return FAIL;
+    }
+    return OK;
+}
+
+/*
  * Get the string value of a variable.
  * If it is a Number variable, the number is converted into a string.
  * tv_get_string() uses a single, static buffer.  YOU CAN ONLY USE IT ONCE!
@@ -355,6 +388,19 @@
     return tv_get_string_buf(varp, mybuf);
 }
 
+/*
+ * Like tv_get_string() but don't allow number to string conversion for Vim9.
+ */
+    char_u *
+tv_get_string_strict(typval_T *varp)
+{
+    static char_u   mybuf[NUMBUFLEN];
+    char_u	    *res =  tv_get_string_buf_chk_strict(
+						 varp, mybuf, in_vim9script());
+
+    return res != NULL ? res : (char_u *)"";
+}
+
     char_u *
 tv_get_string_buf(typval_T *varp, char_u *buf)
 {
@@ -377,9 +423,20 @@
     char_u *
 tv_get_string_buf_chk(typval_T *varp, char_u *buf)
 {
+    return tv_get_string_buf_chk_strict(varp, buf, FALSE);
+}
+
+    char_u *
+tv_get_string_buf_chk_strict(typval_T *varp, char_u *buf, int strict)
+{
     switch (varp->v_type)
     {
 	case VAR_NUMBER:
+	    if (strict)
+	    {
+		emsg(_(e_using_number_as_string));
+		break;
+	    }
 	    vim_snprintf((char *)buf, NUMBUFLEN, "%lld",
 					    (varnumber_T)varp->vval.v_number);
 	    return buf;
@@ -616,7 +673,7 @@
 typval_compare(
     typval_T	*typ1,   // first operand
     typval_T	*typ2,   // second operand
-    exptype_T	type,    // operator
+    exprtype_T	type,    // operator
     int		ic)      // ignore case
 {
     int		i;
@@ -801,6 +858,30 @@
 	    default:  break;  // avoid gcc warning
 	}
     }
+    else if (in_vim9script() && (typ1->v_type == VAR_BOOL
+						 || typ2->v_type == VAR_BOOL))
+    {
+	if (typ1->v_type != typ2->v_type)
+	{
+	    semsg(_(e_cannot_compare_str_with_str),
+		       vartype_name(typ1->v_type), vartype_name(typ2->v_type));
+	    clear_tv(typ1);
+	    return FAIL;
+	}
+	n1 = typ1->vval.v_number;
+	n2 = typ2->vval.v_number;
+	switch (type)
+	{
+	    case EXPR_IS:
+	    case EXPR_EQUAL:    n1 = (n1 == n2); break;
+	    case EXPR_ISNOT:
+	    case EXPR_NEQUAL:   n1 = (n1 != n2); break;
+	    default:
+		emsg(_(e_invalid_operation_for_bool));
+		clear_tv(typ1);
+		return FAIL;
+	}
+    }
     else
     {
 	s1 = tv_get_string_buf(typ1, buf1);
@@ -1050,7 +1131,7 @@
     char_u	*option_end;
     long	numval;
     char_u	*stringval;
-    int		opt_type;
+    getoption_T	opt_type;
     int		c;
     int		working = (**arg == '+');    // has("+option")
     int		ret = OK;
@@ -1076,7 +1157,7 @@
     opt_type = get_option_value(*arg, &numval,
 			       rettv == NULL ? NULL : &stringval, opt_flags);
 
-    if (opt_type == -3)			// invalid name
+    if (opt_type == gov_unknown)
     {
 	if (rettv != NULL)
 	    semsg(_(e_unknown_option), *arg);
@@ -1084,20 +1165,30 @@
     }
     else if (rettv != NULL)
     {
-	if (opt_type == -2)		// hidden string option
+	rettv->v_lock = 0;
+	if (opt_type == gov_hidden_string)
 	{
 	    rettv->v_type = VAR_STRING;
 	    rettv->vval.v_string = NULL;
 	}
-	else if (opt_type == -1)	// hidden number option
+	else if (opt_type == gov_hidden_bool || opt_type == gov_hidden_number)
 	{
-	    rettv->v_type = VAR_NUMBER;
+	    rettv->v_type = in_vim9script() && opt_type == gov_hidden_bool
+						       ? VAR_BOOL : VAR_NUMBER;
 	    rettv->vval.v_number = 0;
 	}
-	else if (opt_type == 1)		// number option
+	else if (opt_type == gov_bool || opt_type == gov_number)
 	{
-	    rettv->v_type = VAR_NUMBER;
-	    rettv->vval.v_number = numval;
+	    if (in_vim9script() && opt_type == gov_bool)
+	    {
+		rettv->v_type = VAR_BOOL;
+		rettv->vval.v_number = numval ? VVAL_TRUE : VVAL_FALSE;
+	    }
+	    else
+	    {
+		rettv->v_type = VAR_NUMBER;
+		rettv->vval.v_number = numval;
+	    }
 	}
 	else				// string option
 	{
@@ -1105,7 +1196,9 @@
 	    rettv->vval.v_string = stringval;
 	}
     }
-    else if (working && (opt_type == -2 || opt_type == -1))
+    else if (working && (opt_type == gov_hidden_bool
+			|| opt_type == gov_hidden_number
+			|| opt_type == gov_hidden_string))
 	ret = FAIL;
 
     *option_end = c;		    // put back for error messages
@@ -1503,14 +1596,14 @@
     linenr_T
 tv_get_lnum(typval_T *argvars)
 {
-    linenr_T	lnum = 0;
+    linenr_T	lnum = -1;
 
     if (argvars[0].v_type != VAR_STRING || !in_vim9script())
 	lnum = (linenr_T)tv_get_number_chk(&argvars[0], NULL);
-    if (lnum == 0)  // no valid number, try using arg like line()
+    if (lnum <= 0)  // no valid number, try using arg like line()
     {
 	int	fnum;
-	pos_T	*fp = var2fpos(&argvars[0], TRUE, &fnum);
+	pos_T	*fp = var2fpos(&argvars[0], TRUE, &fnum, FALSE);
 
 	if (fp != NULL)
 	    lnum = fp->lnum;
diff -Nru vim-8.2.1913/src/ui.c vim-8.2.2434/src/ui.c
--- vim-8.2.1913/src/ui.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/ui.c	2021-01-30 22:05:11.000000000 +0000
@@ -1012,13 +1012,14 @@
 	}
 	while (len-- > 0)
 	{
-	    /*
-	     * If a CTRL-C was typed, remove it from the buffer and set
-	     * got_int.  Also recognize CTRL-C with modifyOtherKeys set.
-	     */
+	    // If a CTRL-C was typed, remove it from the buffer and set
+	    // got_int.  Also recognize CTRL-C with modifyOtherKeys set, in two
+	    // forms.
 	    if (ctrl_c_interrupts && (inbuf[inbufcount] == 3
-			|| (len >= 9 && STRNCMP(inbuf + inbufcount,
-						   "\033[27;5;99~", 10) == 0)))
+			|| (len >= 10 && STRNCMP(inbuf + inbufcount,
+						   "\033[27;5;99~", 10) == 0)
+			|| (len >= 7 && STRNCMP(inbuf + inbufcount,
+						       "\033[99;5u", 7) == 0)))
 	    {
 		// remove everything typed before the CTRL-C
 		mch_memmove(inbuf, inbuf + inbufcount, (size_t)(len + 1));
@@ -1100,7 +1101,6 @@
     return row;
 }
 
-#if defined(FEAT_GUI) || defined(MSWIN) || defined(PROTO)
 /*
  * Called when focus changed.  Used for the GUI or for systems where this can
  * be done in the console (Win32).
@@ -1163,7 +1163,6 @@
 	maketitle();
 #endif
 }
-#endif
 
 #if defined(HAVE_INPUT_METHOD) || defined(PROTO)
 /*
diff -Nru vim-8.2.1913/src/usercmd.c vim-8.2.2434/src/usercmd.c
--- vim-8.2.1913/src/usercmd.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/usercmd.c	2021-01-30 22:05:11.000000000 +0000
@@ -21,8 +21,8 @@
     long	uc_def;		// The default value for a range/count
     int		uc_compl;	// completion type
     cmd_addr_T	uc_addr_type;	// The command's address type
-# ifdef FEAT_EVAL
     sctx_T	uc_script_ctx;	// SCTX where the command was defined
+# ifdef FEAT_EVAL
     char_u	*uc_compl_arg;	// completion argument if any
 # endif
 } ucmd_T;
@@ -954,8 +954,8 @@
     cmd->uc_argt = argt;
     cmd->uc_def = def;
     cmd->uc_compl = compl;
-#ifdef FEAT_EVAL
     cmd->uc_script_ctx = current_sctx;
+#ifdef FEAT_EVAL
     cmd->uc_script_ctx.sc_lnum += SOURCING_LNUM;
     cmd->uc_compl_arg = compl_arg;
 #endif
@@ -1573,9 +1573,7 @@
     size_t	split_len = 0;
     char_u	*split_buf = NULL;
     ucmd_T	*cmd;
-#ifdef FEAT_EVAL
     sctx_T	save_current_sctx = current_sctx;
-#endif
 
     if (eap->cmdidx == CMD_USER)
 	cmd = USER_CMD(eap->useridx);
@@ -1674,15 +1672,13 @@
 	}
     }
 
+    current_sctx.sc_version = cmd->uc_script_ctx.sc_version;
 #ifdef FEAT_EVAL
     current_sctx.sc_sid = cmd->uc_script_ctx.sc_sid;
-    current_sctx.sc_version = cmd->uc_script_ctx.sc_version;
 #endif
     (void)do_cmdline(buf, eap->getline, eap->cookie,
 				   DOCMD_VERBOSE|DOCMD_NOWAIT|DOCMD_KEYTYPED);
-#ifdef FEAT_EVAL
     current_sctx = save_current_sctx;
-#endif
     vim_free(buf);
     vim_free(split_buf);
 }
diff -Nru vim-8.2.1913/src/userfunc.c vim-8.2.2434/src/userfunc.c
--- vim-8.2.1913/src/userfunc.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/userfunc.c	2021-01-30 22:05:11.000000000 +0000
@@ -54,11 +54,17 @@
 /*
  * Get one function argument.
  * If "argtypes" is not NULL also get the type: "arg: type".
+ * If "types_optional" is TRUE a missing type is OK, use "any".
  * Return a pointer to after the type.
  * When something is wrong return "arg".
  */
     static char_u *
-one_function_arg(char_u *arg, garray_T *newargs, garray_T *argtypes, int skip)
+one_function_arg(
+	char_u	    *arg,
+	garray_T    *newargs,
+	garray_T    *argtypes,
+	int	    types_optional,
+	int	    skip)
 {
     char_u	*p = arg;
     char_u	*arg_copy = NULL;
@@ -105,7 +111,7 @@
     }
 
     // get any type from "arg: type"
-    if (argtypes != NULL && ga_grow(argtypes, 1) == OK)
+    if (argtypes != NULL && (skip || ga_grow(argtypes, 1) == OK))
     {
 	char_u *type = NULL;
 
@@ -118,22 +124,29 @@
 	if (*p == ':')
 	{
 	    ++p;
-	    if (!VIM_ISWHITE(*p))
+	    if (!skip && !VIM_ISWHITE(*p))
 	    {
 		semsg(_(e_white_space_required_after_str), ":");
 		return arg;
 	    }
 	    type = skipwhite(p);
 	    p = skip_type(type, TRUE);
-	    type = vim_strnsave(type, p - type);
+	    if (!skip)
+		type = vim_strnsave(type, p - type);
 	}
-	else if (*skipwhite(p) != '=')
+	else if (*skipwhite(p) != '=' && !types_optional)
 	{
 	    semsg(_(e_missing_argument_type_for_str),
 					    arg_copy == NULL ? arg : arg_copy);
 	    return arg;
 	}
-	((char_u **)argtypes->ga_data)[argtypes->ga_len++] = type;
+	if (!skip)
+	{
+	    if (type == NULL && types_optional)
+		// lambda arguments default to "any" type
+		type = vim_strsave((char_u *)"any");
+	    ((char_u **)argtypes->ga_data)[argtypes->ga_len++] = type;
+	}
     }
 
     return p;
@@ -141,13 +154,16 @@
 
 /*
  * Get function arguments.
+ * "argp" should point to just after the "(", possibly to white space.
+ * "argp" is advanced just after "endchar".
  */
-    int
+    static int
 get_function_args(
     char_u	**argp,
     char_u	endchar,
     garray_T	*newargs,
     garray_T	*argtypes,	// NULL unless using :def
+    int		types_optional,	// types optional if "argtypes" is not NULL
     int		*varargs,
     garray_T	*default_args,
     int		skip,
@@ -155,12 +171,12 @@
     char_u	**line_to_free)
 {
     int		mustend = FALSE;
-    char_u	*arg = *argp;
-    char_u	*p = arg;
+    char_u	*arg;
+    char_u	*p;
     int		c;
     int		any_default = FALSE;
     char_u	*expr;
-    char_u	*whitep = arg;
+    char_u	*whitep = *argp;
 
     if (newargs != NULL)
 	ga_init2(newargs, (int)sizeof(char_u *), 3);
@@ -175,6 +191,8 @@
     /*
      * Isolate the arguments: "arg1, arg2, ...)"
      */
+    arg = skipwhite(*argp);
+    p = arg;
     while (*p != endchar)
     {
 	while (eap != NULL && eap->getline != NULL
@@ -196,7 +214,7 @@
 	{
 	    if (!skip)
 		semsg(_(e_invarg2), *argp);
-	    break;
+	    goto err_ret;
 	}
 	if (*p == endchar)
 	    break;
@@ -213,12 +231,14 @@
 		// ...name: list<type>
 		if (!eval_isnamec1(*p))
 		{
-		    emsg(_(e_missing_name_after_dots));
-		    break;
+		    if (!skip)
+			emsg(_(e_missing_name_after_dots));
+		    goto err_ret;
 		}
 
 		arg = p;
-		p = one_function_arg(p, newargs, argtypes, skip);
+		p = one_function_arg(p, newargs, argtypes, types_optional,
+									 skip);
 		if (p == arg)
 		    break;
 	    }
@@ -226,7 +246,7 @@
 	else
 	{
 	    arg = p;
-	    p = one_function_arg(p, newargs, argtypes, skip);
+	    p = one_function_arg(p, newargs, argtypes, types_optional, skip);
 	    if (p == arg)
 		break;
 
@@ -304,6 +324,63 @@
 }
 
 /*
+ * Parse the argument types, filling "fp->uf_arg_types".
+ * Return OK or FAIL.
+ */
+    static int
+parse_argument_types(ufunc_T *fp, garray_T *argtypes, int varargs)
+{
+    ga_init2(&fp->uf_type_list, sizeof(type_T *), 10);
+    if (argtypes->ga_len > 0)
+    {
+	// When "varargs" is set the last name/type goes into uf_va_name
+	// and uf_va_type.
+	int len = argtypes->ga_len - (varargs ? 1 : 0);
+
+	if (len > 0)
+	    fp->uf_arg_types = ALLOC_CLEAR_MULT(type_T *, len);
+	if (fp->uf_arg_types != NULL)
+	{
+	    int	i;
+	    type_T	*type;
+
+	    for (i = 0; i < len; ++ i)
+	    {
+		char_u *p = ((char_u **)argtypes->ga_data)[i];
+
+		if (p == NULL)
+		    // will get the type from the default value
+		    type = &t_unknown;
+		else
+		    type = parse_type(&p, &fp->uf_type_list, TRUE);
+		if (type == NULL)
+		    return FAIL;
+		fp->uf_arg_types[i] = type;
+	    }
+	}
+	if (varargs)
+	{
+	    char_u *p;
+
+	    // Move the last argument "...name: type" to uf_va_name and
+	    // uf_va_type.
+	    fp->uf_va_name = ((char_u **)fp->uf_args.ga_data)
+						  [fp->uf_args.ga_len - 1];
+	    --fp->uf_args.ga_len;
+	    p = ((char_u **)argtypes->ga_data)[len];
+	    if (p == NULL)
+		// todo: get type from default value
+		fp->uf_va_type = &t_any;
+	    else
+		fp->uf_va_type = parse_type(&p, &fp->uf_type_list, TRUE);
+	    if (fp->uf_va_type == NULL)
+		return FAIL;
+	}
+    }
+    return OK;
+}
+
+/*
  * Register function "fp" as using "current_funccal" as its scope.
  */
     static int
@@ -385,55 +462,150 @@
 #endif
 
 /*
+ * Skip over "->" or "=>" after the arguments of a lambda.
+ * If ": type" is found make "ret_type" point to "type".
+ * If "white_error" is not NULL check for correct use of white space and set
+ * "white_error" to TRUE if there is an error.
+ * Return NULL if no valid arrow found.
+ */
+    static char_u *
+skip_arrow(
+	char_u	*start,
+	int	equal_arrow,
+	char_u	**ret_type,
+	int	*white_error)
+{
+    char_u  *s = start;
+    char_u  *bef = start - 2; // "start" points to > of ->
+
+    if (equal_arrow)
+    {
+	if (*s == ':')
+	{
+	    if (white_error != NULL && !VIM_ISWHITE(s[1]))
+	    {
+		*white_error = TRUE;
+		semsg(_(e_white_space_required_after_str), ":");
+		return NULL;
+	    }
+	    s = skipwhite(s + 1);
+	    *ret_type = s;
+	    s = skip_type(s, TRUE);
+	}
+	bef = s;
+	s = skipwhite(s);
+	if (*s != '=')
+	    return NULL;
+	++s;
+    }
+    if (*s != '>')
+	return NULL;
+    if (white_error != NULL && ((!VIM_ISWHITE(*bef) && *bef != '{')
+		|| !IS_WHITE_OR_NUL(s[1])))
+    {
+	*white_error = TRUE;
+	semsg(_(e_white_space_required_before_and_after_str_at_str),
+					       equal_arrow ? "=>" : "->", bef);
+	return NULL;
+    }
+    return skipwhite(s + 1);
+}
+
+/*
  * Parse a lambda expression and get a Funcref from "*arg".
+ * "arg" points to the { in "{arg -> expr}" or the ( in "(arg) => expr"
+ * When "types_optional" is TRUE optionally take argument types.
  * Return OK or FAIL.  Returns NOTDONE for dict or {expr}.
  */
     int
-get_lambda_tv(char_u **arg, typval_T *rettv, evalarg_T *evalarg)
+get_lambda_tv(
+	char_u	    **arg,
+	typval_T    *rettv,
+	int	    types_optional,
+	evalarg_T   *evalarg)
 {
     int		evaluate = evalarg != NULL
 				      && (evalarg->eval_flags & EVAL_EVALUATE);
     garray_T	newargs;
     garray_T	newlines;
     garray_T	*pnewargs;
+    garray_T	argtypes;
     ufunc_T	*fp = NULL;
     partial_T   *pt = NULL;
     int		varargs;
+    char_u	*ret_type = NULL;
     int		ret;
     char_u	*s;
     char_u	*start, *end;
     int		*old_eval_lavars = eval_lavars_used;
     int		eval_lavars = FALSE;
-    char_u	*tofree = NULL;
+    char_u	*tofree1 = NULL;
+    char_u	*tofree2 = NULL;
+    int		equal_arrow = **arg == '(';
+    int		white_error = FALSE;
+
+    if (equal_arrow && !in_vim9script())
+	return NOTDONE;
 
     ga_init(&newargs);
     ga_init(&newlines);
 
-    // First, check if this is a lambda expression. "->" must exist.
-    s = skipwhite(*arg + 1);
-    ret = get_function_args(&s, '-', NULL, NULL, NULL, NULL, TRUE,
-								   NULL, NULL);
-    if (ret == FAIL || *s != '>')
+    // First, check if this is really a lambda expression. "->" or "=>" must
+    // be found after the arguments.
+    s = *arg + 1;
+    ret = get_function_args(&s, equal_arrow ? ')' : '-', NULL,
+	    types_optional ? &argtypes : NULL, types_optional,
+						 NULL, NULL, TRUE, NULL, NULL);
+    if (ret == FAIL || skip_arrow(s, equal_arrow, &ret_type, NULL) == NULL)
+    {
+	if (types_optional)
+	    ga_clear_strings(&argtypes);
 	return NOTDONE;
+    }
 
-    // Parse the arguments again.
+    // Parse the arguments for real.
     if (evaluate)
 	pnewargs = &newargs;
     else
 	pnewargs = NULL;
-    *arg = skipwhite(*arg + 1);
-    // TODO: argument types
-    ret = get_function_args(arg, '-', pnewargs, NULL, &varargs, NULL, FALSE,
-								   NULL, NULL);
-    if (ret == FAIL || **arg != '>')
-	goto errret;
+    *arg += 1;
+    ret = get_function_args(arg, equal_arrow ? ')' : '-', pnewargs,
+	    types_optional ? &argtypes : NULL, types_optional,
+					    &varargs, NULL, FALSE, NULL, NULL);
+    if (ret == FAIL
+		  || (s = skip_arrow(*arg, equal_arrow, &ret_type,
+		equal_arrow || in_vim9script() ? &white_error : NULL)) == NULL)
+    {
+	if (types_optional)
+	    ga_clear_strings(&argtypes);
+	ga_clear_strings(&newargs);
+	return white_error ? FAIL : NOTDONE;
+    }
+    *arg = s;
+
+    // Skipping over linebreaks may make "ret_type" invalid, make a copy.
+    if (ret_type != NULL)
+    {
+	ret_type = vim_strsave(ret_type);
+	tofree2 = ret_type;
+    }
 
     // Set up a flag for checking local variables and arguments.
     if (evaluate)
 	eval_lavars_used = &eval_lavars;
 
+    *arg = skipwhite_and_linebreak(*arg, evalarg);
+
+    // Recognize "{" as the start of a function body.
+    if (equal_arrow && **arg == '{')
+    {
+	// TODO: process the function body upto the "}".
+	// Return type is required then.
+	emsg("Lambda function body not supported yet");
+	goto errret;
+    }
+
     // Get the start and the end of the expression.
-    *arg = skipwhite_and_linebreak(*arg + 1, evalarg);
     start = *arg;
     ret = skip_expr_concatenate(arg, &start, &end, evalarg);
     if (ret == FAIL)
@@ -441,17 +613,20 @@
     if (evalarg != NULL)
     {
 	// avoid that the expression gets freed when another line break follows
-	tofree = evalarg->eval_tofree;
+	tofree1 = evalarg->eval_tofree;
 	evalarg->eval_tofree = NULL;
     }
 
-    *arg = skipwhite_and_linebreak(*arg, evalarg);
-    if (**arg != '}')
+    if (!equal_arrow)
     {
-	semsg(_("E451: Expected }: %s"), *arg);
-	goto errret;
+	*arg = skipwhite_and_linebreak(*arg, evalarg);
+	if (**arg != '}')
+	{
+	    semsg(_("E451: Expected }: %s"), *arg);
+	    goto errret;
+	}
+	++*arg;
     }
-    ++*arg;
 
     if (evaluate)
     {
@@ -489,6 +664,21 @@
 	hash_add(&func_hashtab, UF2HIKEY(fp));
 	fp->uf_args = newargs;
 	ga_init(&fp->uf_def_args);
+	if (types_optional)
+	{
+	    if (parse_argument_types(fp, &argtypes, FALSE) == FAIL)
+		goto errret;
+	    if (ret_type != NULL)
+	    {
+		fp->uf_ret_type = parse_type(&ret_type,
+						      &fp->uf_type_list, TRUE);
+		if (fp->uf_ret_type == NULL)
+		    goto errret;
+	    }
+	    else
+		fp->uf_ret_type = &t_any;
+	}
+
 	fp->uf_lines = newlines;
 	if (current_funccal != NULL && eval_lavars)
 	{
@@ -496,8 +686,6 @@
 	    if (register_closure(fp) == FAIL)
 		goto errret;
 	}
-	else
-	    fp->uf_scoped = NULL;
 
 #ifdef FEAT_PROFILE
 	if (prof_def_func())
@@ -520,20 +708,26 @@
 
     eval_lavars_used = old_eval_lavars;
     if (evalarg != NULL && evalarg->eval_tofree == NULL)
-	evalarg->eval_tofree = tofree;
+	evalarg->eval_tofree = tofree1;
     else
-	vim_free(tofree);
+	vim_free(tofree1);
+    vim_free(tofree2);
+    if (types_optional)
+	ga_clear_strings(&argtypes);
     return OK;
 
 errret:
     ga_clear_strings(&newargs);
     ga_clear_strings(&newlines);
+    if (types_optional)
+	ga_clear_strings(&argtypes);
     vim_free(fp);
     vim_free(pt);
     if (evalarg != NULL && evalarg->eval_tofree == NULL)
-	evalarg->eval_tofree = tofree;
+	evalarg->eval_tofree = tofree1;
     else
-	vim_free(tofree);
+	vim_free(tofree1);
+    vim_free(tofree2);
     eval_lavars_used = old_eval_lavars;
     return FAIL;
 }
@@ -543,47 +737,68 @@
  * name it contains, otherwise return "name".
  * If "partialp" is not NULL, and "name" is of type VAR_PARTIAL also set
  * "partialp".
+ * If "type" is not NULL and a Vim9 script-local variable is found look up the
+ * type of the variable.
  */
     char_u *
-deref_func_name(char_u *name, int *lenp, partial_T **partialp, int no_autoload)
+deref_func_name(
+	char_u	    *name,
+	int	    *lenp,
+	partial_T   **partialp,
+	type_T	    **type,
+	int	    no_autoload)
 {
     dictitem_T	*v;
     int		cc;
-    char_u	*s;
+    char_u	*s = NULL;
+    hashtab_T	*ht;
 
     if (partialp != NULL)
 	*partialp = NULL;
 
     cc = name[*lenp];
     name[*lenp] = NUL;
-    v = find_var(name, NULL, no_autoload);
+    v = find_var(name, &ht, no_autoload);
     name[*lenp] = cc;
-    if (v != NULL && v->di_tv.v_type == VAR_FUNC)
+    if (v != NULL)
     {
-	if (v->di_tv.vval.v_string == NULL)
+	if (v->di_tv.v_type == VAR_FUNC)
 	{
-	    *lenp = 0;
-	    return (char_u *)"";	// just in case
+	    if (v->di_tv.vval.v_string == NULL)
+	    {
+		*lenp = 0;
+		return (char_u *)"";	// just in case
+	    }
+	    s = v->di_tv.vval.v_string;
+	    *lenp = (int)STRLEN(s);
 	}
-	s = v->di_tv.vval.v_string;
-	*lenp = (int)STRLEN(s);
-	return s;
-    }
 
-    if (v != NULL && v->di_tv.v_type == VAR_PARTIAL)
-    {
-	partial_T *pt = v->di_tv.vval.v_partial;
+	if (v->di_tv.v_type == VAR_PARTIAL)
+	{
+	    partial_T *pt = v->di_tv.vval.v_partial;
 
-	if (pt == NULL)
+	    if (pt == NULL)
+	    {
+		*lenp = 0;
+		return (char_u *)"";	// just in case
+	    }
+	    if (partialp != NULL)
+		*partialp = pt;
+	    s = partial_name(pt);
+	    *lenp = (int)STRLEN(s);
+	}
+
+	if (s != NULL)
 	{
-	    *lenp = 0;
-	    return (char_u *)"";	// just in case
+	    if (type != NULL && ht == get_script_local_ht())
+	    {
+		svar_T  *sv = find_typval_in_script(&v->di_tv);
+
+		if (sv != NULL)
+		    *type = sv->sv_type;
+	    }
+	    return s;
 	}
-	if (partialp != NULL)
-	    *partialp = pt;
-	s = partial_name(pt);
-	*lenp = (int)STRLEN(s);
-	return s;
     }
 
     return name;
@@ -1138,6 +1353,13 @@
     VIM_CLEAR(fp->uf_va_name);
     clear_type_list(&fp->uf_type_list);
 
+    // Increment the refcount of this function to avoid it being freed
+    // recursively when the partial is freed.
+    fp->uf_refcount += 3;
+    partial_unref(fp->uf_partial);
+    fp->uf_partial = NULL;
+    fp->uf_refcount -= 3;
+
 #ifdef FEAT_LUA
     if (fp->uf_cb_free != NULL)
     {
@@ -1170,8 +1392,7 @@
     // clear this function
     func_clear_items(fp);
     funccal_unref(fp->uf_scoped, fp, force);
-    if ((fp->uf_flags & FC_COPY) == 0)
-	clear_def_function(fp);
+    unlink_def_function(fp);
 }
 
 /*
@@ -1218,73 +1439,142 @@
  * Copy already defined function "lambda" to a new function with name "global".
  * This is for when a compiled function defines a global function.
  */
-    void
-copy_func(char_u *lambda, char_u *global)
+    int
+copy_func(char_u *lambda, char_u *global, ectx_T *ectx)
 {
     ufunc_T *ufunc = find_func_even_dead(lambda, TRUE, NULL);
-    ufunc_T *fp;
+    ufunc_T *fp = NULL;
 
     if (ufunc == NULL)
+    {
 	semsg(_(e_lambda_function_not_found_str), lambda);
-    else
+	return FAIL;
+    }
+
+    fp = find_func(global, TRUE, NULL);
+    if (fp != NULL)
     {
 	// TODO: handle ! to overwrite
-	fp = find_func(global, TRUE, NULL);
-	if (fp != NULL)
-	{
-	    semsg(_(e_funcexts), global);
-	    return;
-	}
+	semsg(_(e_funcexts), global);
+	return FAIL;
+    }
 
-	fp = alloc_clear(offsetof(ufunc_T, uf_name) + STRLEN(global) + 1);
-	if (fp == NULL)
-	    return;
+    fp = alloc_clear(offsetof(ufunc_T, uf_name) + STRLEN(global) + 1);
+    if (fp == NULL)
+	return FAIL;
 
-	fp->uf_varargs = ufunc->uf_varargs;
-	fp->uf_flags = (ufunc->uf_flags & ~FC_VIM9) | FC_COPY;
-	fp->uf_def_status = ufunc->uf_def_status;
-	fp->uf_dfunc_idx = ufunc->uf_dfunc_idx;
-	if (ga_copy_strings(&ufunc->uf_args, &fp->uf_args) == FAIL
-		|| ga_copy_strings(&ufunc->uf_def_args, &fp->uf_def_args)
-									== FAIL
-		|| ga_copy_strings(&ufunc->uf_lines, &fp->uf_lines) == FAIL)
+    fp->uf_varargs = ufunc->uf_varargs;
+    fp->uf_flags = (ufunc->uf_flags & ~FC_VIM9) | FC_COPY;
+    fp->uf_def_status = ufunc->uf_def_status;
+    fp->uf_dfunc_idx = ufunc->uf_dfunc_idx;
+    if (ga_copy_strings(&ufunc->uf_args, &fp->uf_args) == FAIL
+	    || ga_copy_strings(&ufunc->uf_def_args, &fp->uf_def_args)
+								    == FAIL
+	    || ga_copy_strings(&ufunc->uf_lines, &fp->uf_lines) == FAIL)
+	goto failed;
+
+    fp->uf_name_exp = ufunc->uf_name_exp == NULL ? NULL
+					 : vim_strsave(ufunc->uf_name_exp);
+    if (ufunc->uf_arg_types != NULL)
+    {
+	fp->uf_arg_types = ALLOC_MULT(type_T *, fp->uf_args.ga_len);
+	if (fp->uf_arg_types == NULL)
+	    goto failed;
+	mch_memmove(fp->uf_arg_types, ufunc->uf_arg_types,
+				    sizeof(type_T *) * fp->uf_args.ga_len);
+    }
+    if (ufunc->uf_def_arg_idx != NULL)
+    {
+	fp->uf_def_arg_idx = ALLOC_MULT(int, fp->uf_def_args.ga_len + 1);
+	if (fp->uf_def_arg_idx == NULL)
+	    goto failed;
+	mch_memmove(fp->uf_def_arg_idx, ufunc->uf_def_arg_idx,
+				 sizeof(int) * fp->uf_def_args.ga_len + 1);
+    }
+    if (ufunc->uf_va_name != NULL)
+    {
+	fp->uf_va_name = vim_strsave(ufunc->uf_va_name);
+	if (fp->uf_va_name == NULL)
 	    goto failed;
+    }
+    fp->uf_ret_type = ufunc->uf_ret_type;
 
-	fp->uf_name_exp = ufunc->uf_name_exp == NULL ? NULL
-					     : vim_strsave(ufunc->uf_name_exp);
-	if (ufunc->uf_arg_types != NULL)
-	{
-	    fp->uf_arg_types = ALLOC_MULT(type_T *, fp->uf_args.ga_len);
-	    if (fp->uf_arg_types == NULL)
-		goto failed;
-	    mch_memmove(fp->uf_arg_types, ufunc->uf_arg_types,
-					sizeof(type_T *) * fp->uf_args.ga_len);
-	}
-	if (ufunc->uf_def_arg_idx != NULL)
-	{
-	    fp->uf_def_arg_idx = ALLOC_MULT(int, fp->uf_def_args.ga_len + 1);
-	    if (fp->uf_def_arg_idx == NULL)
-		goto failed;
-	    mch_memmove(fp->uf_def_arg_idx, ufunc->uf_def_arg_idx,
-				     sizeof(int) * fp->uf_def_args.ga_len + 1);
-	}
-	if (ufunc->uf_va_name != NULL)
-	{
-	    fp->uf_va_name = vim_strsave(ufunc->uf_va_name);
-	    if (fp->uf_va_name == NULL)
-		goto failed;
-	}
+    fp->uf_refcount = 1;
+    STRCPY(fp->uf_name, global);
+    hash_add(&func_hashtab, UF2HIKEY(fp));
 
-	fp->uf_refcount = 1;
-	STRCPY(fp->uf_name, global);
-	hash_add(&func_hashtab, UF2HIKEY(fp));
+    // the referenced dfunc_T is now used one more time
+    link_def_function(fp);
+
+    // Create a partial to store the context of the function where it was
+    // instantiated.  Only needs to be done once.  Do this on the original
+    // function, "dfunc->df_ufunc" will point to it.
+    if ((ufunc->uf_flags & FC_CLOSURE) && ufunc->uf_partial == NULL)
+    {
+	partial_T   *pt = ALLOC_CLEAR_ONE(partial_T);
+
+	if (pt == NULL)
+	    goto failed;
+	if (fill_partial_and_closure(pt, ufunc, ectx) == FAIL)
+	{
+            vim_free(pt);
+	    goto failed;
+	}
+	ufunc->uf_partial = pt;
+	--pt->pt_refcount;  // not actually referenced here
     }
-    return;
+
+    return OK;
 
 failed:
     func_clear_free(fp, TRUE);
+    return FAIL;
+}
+
+static int	funcdepth = 0;
+
+/*
+ * Increment the function call depth count.
+ * Return FAIL when going over 'maxfuncdepth'.
+ * Otherwise return OK, must call funcdepth_decrement() later!
+ */
+    int
+funcdepth_increment(void)
+{
+    if (funcdepth >= p_mfd)
+    {
+	emsg(_("E132: Function call depth is higher than 'maxfuncdepth'"));
+	return FAIL;
+    }
+    ++funcdepth;
+    return OK;
 }
 
+    void
+funcdepth_decrement(void)
+{
+    --funcdepth;
+}
+
+/*
+ * Get the current function call depth.
+ */
+    int
+funcdepth_get(void)
+{
+    return funcdepth;
+}
+
+/*
+ * Restore the function call depth.  This is for cases where there is no
+ * guarantee funcdepth_decrement() can be called exactly the same number of
+ * times as funcdepth_increment().
+ */
+    void
+funcdepth_restore(int depth)
+{
+    funcdepth = depth;
+}
 
 /*
  * Call a user function.
@@ -1303,7 +1593,6 @@
     funccall_T	*fc;
     int		save_did_emsg;
     int		default_arg_err = FALSE;
-    static int	depth = 0;
     dictitem_T	*v;
     int		fixvar_idx = 0;	// index in fixvar[]
     int		i;
@@ -1312,21 +1601,21 @@
     char_u	numbuf[NUMBUFLEN];
     char_u	*name;
 #ifdef FEAT_PROFILE
-    proftime_T	wait_start;
-    proftime_T	call_start;
-    int		started_profiling = FALSE;
+    profinfo_T	profile_info;
 #endif
     ESTACK_CHECK_DECLARATION
 
-    // If depth of calling is getting too high, don't execute the function
-    if (depth >= p_mfd)
+#ifdef FEAT_PROFILE
+    CLEAR_FIELD(profile_info);
+#endif
+
+    // If depth of calling is getting too high, don't execute the function.
+    if (funcdepth_increment() == FAIL)
     {
-	emsg(_("E132: Function call depth is higher than 'maxfuncdepth'"));
 	rettv->v_type = VAR_NUMBER;
 	rettv->vval.v_number = -1;
 	return;
     }
-    ++depth;
 
     line_breakcheck();		// check for CTRL-C hit
 
@@ -1348,8 +1637,16 @@
     if (fp->uf_def_status != UF_NOT_COMPILED)
     {
 	// Execute the function, possibly compiling it first.
+#ifdef FEAT_PROFILE
+	profile_may_start_func(&profile_info, fp, fc);
+#endif
 	call_def_function(fp, argcount, argvars, funcexe->partial, rettv);
-	--depth;
+	funcdepth_decrement();
+#ifdef FEAT_PROFILE
+	if (do_profiling == PROF_YES && (fp->uf_profiling
+		    || (fc->caller != NULL && fc->caller->func->uf_profiling)))
+	    profile_may_end_func(&profile_info, fp, fc);
+#endif
 	current_funccal = fc->caller;
 	free_funccal(fc);
 	return;
@@ -1562,22 +1859,7 @@
 	--no_wait_return;
     }
 #ifdef FEAT_PROFILE
-    if (do_profiling == PROF_YES)
-    {
-	if (!fp->uf_profiling && has_profiling(FALSE, fp->uf_name, NULL))
-	{
-	    started_profiling = TRUE;
-	    func_do_profile(fp);
-	}
-	if (fp->uf_profiling
-		    || (fc->caller != NULL && fc->caller->func->uf_profiling))
-	{
-	    ++fp->uf_tm_count;
-	    profile_start(&call_start);
-	    profile_zero(&fp->uf_tm_children);
-	}
-	script_prof_save(&wait_start);
-    }
+    profile_may_start_func(&profile_info, fp, fc);
 #endif
 
     save_current_sctx = current_sctx;
@@ -1615,20 +1897,7 @@
 #ifdef FEAT_PROFILE
     if (do_profiling == PROF_YES && (fp->uf_profiling
 		    || (fc->caller != NULL && fc->caller->func->uf_profiling)))
-    {
-	profile_end(&call_start);
-	profile_sub_wait(&wait_start, &call_start);
-	profile_add(&fp->uf_tm_total, &call_start);
-	profile_self(&fp->uf_tm_self, &call_start, &fp->uf_tm_children);
-	if (fc->caller != NULL && fc->caller->func->uf_profiling)
-	{
-	    profile_add(&fc->caller->func->uf_tm_children, &call_start);
-	    profile_add(&fc->caller->func->uf_tml_children, &call_start);
-	}
-	if (started_profiling)
-	    // make a ":profdel func" stop profiling the function
-	    fp->uf_profiling = FALSE;
-    }
+	profile_may_end_func(&profile_info, fp, fc);
 #endif
 
     // when being verbose, mention the return value
@@ -1677,7 +1946,7 @@
     current_sctx = save_current_sctx;
 #ifdef FEAT_PROFILE
     if (do_profiling == PROF_YES)
-	script_prof_restore(&wait_start);
+	script_prof_restore(&profile_info.pi_wait_start);
 #endif
     if (using_sandbox)
 	--sandbox;
@@ -1695,12 +1964,27 @@
     }
 
     did_emsg |= save_did_emsg;
-    --depth;
-
+    funcdepth_decrement();
     cleanup_function_call(fc);
 }
 
 /*
+ * Check the argument count for user function "fp".
+ * Return FCERR_UNKNOWN if OK, FCERR_TOOFEW or FCERR_TOOMANY otherwise.
+ */
+    int
+check_user_func_argcount(ufunc_T *fp, int argcount)
+{
+    int regular_args = fp->uf_args.ga_len;
+
+    if (argcount < regular_args - fp->uf_def_args.ga_len)
+	return FCERR_TOOFEW;
+    else if (!has_varargs(fp) && argcount > regular_args)
+	return FCERR_TOOMANY;
+    return FCERR_UNKNOWN;
+}
+
+/*
  * Call a user function after checking the arguments.
  */
     int
@@ -1713,15 +1997,13 @@
 	dict_T	    *selfdict)
 {
     int error;
-    int regular_args = fp->uf_args.ga_len;
 
     if (fp->uf_flags & FC_RANGE && funcexe->doesrange != NULL)
 	*funcexe->doesrange = TRUE;
-    if (argcount < regular_args - fp->uf_def_args.ga_len)
-	error = FCERR_TOOFEW;
-    else if (!has_varargs(fp) && argcount > regular_args)
-	error = FCERR_TOOMANY;
-    else if ((fp->uf_flags & FC_DICT) && selfdict == NULL)
+    error = check_user_func_argcount(fp, argcount);
+    if (error != FCERR_UNKNOWN)
+	return error;
+    if ((fp->uf_flags & FC_DICT) && selfdict == NULL)
 	error = FCERR_DICT;
     else
     {
@@ -2122,6 +2404,14 @@
 	}
     }
 
+    if (error == FCERR_NONE && funcexe->check_type != NULL && funcexe->evaluate)
+    {
+	// Check that the argument types are OK for the types of the funcref.
+	if (check_argument_types(funcexe->check_type, argvars, argcount,
+								 name) == FAIL)
+	    error = FCERR_OTHER;
+    }
+
     if (error == FCERR_NONE && funcexe->evaluate)
     {
 	char_u *rfname = fname;
@@ -2364,7 +2654,8 @@
     int		skip,		// only find the end, don't evaluate
     int		flags,
     funcdict_T	*fdp,		// return: info about dictionary used
-    partial_T	**partial)	// return: partial of a FuncRef
+    partial_T	**partial,	// return: partial of a FuncRef
+    type_T	**type)		// return: type of funcref if not NULL
 {
     char_u	*name = NULL;
     char_u	*start;
@@ -2468,7 +2759,7 @@
     if (lv.ll_exp_name != NULL)
     {
 	len = (int)STRLEN(lv.ll_exp_name);
-	name = deref_func_name(lv.ll_exp_name, &len, partial,
+	name = deref_func_name(lv.ll_exp_name, &len, partial, type,
 						     flags & TFN_NO_AUTOLOAD);
 	if (name == lv.ll_exp_name)
 	    name = NULL;
@@ -2476,7 +2767,8 @@
     else if (!(flags & TFN_NO_DEREF))
     {
 	len = (int)(end - *pp);
-	name = deref_func_name(*pp, &len, partial, flags & TFN_NO_AUTOLOAD);
+	name = deref_func_name(*pp, &len, partial, type,
+						      flags & TFN_NO_AUTOLOAD);
 	if (name == *pp)
 	    name = NULL;
     }
@@ -2526,8 +2818,18 @@
 	goto theend;
     }
 
-    // In Vim9 script a user function is script-local by default.
+    // In Vim9 script a user function is script-local by default, unless it
+    // starts with a lower case character: dict.func().
     vim9script = ASCII_ISUPPER(*start) && in_vim9script();
+    if (vim9script)
+    {
+	char_u *p;
+
+	// SomeScript#func() is a global function.
+	for (p = start; *p != NUL && *p != '('; ++p)
+	    if (*p == AUTOLOAD_CHAR)
+		vim9script = FALSE;
+    }
 
     /*
      * Copy the function name to allocated memory.
@@ -2620,7 +2922,7 @@
  * List functions.  When "regmatch" is NULL all of then.
  * Otherwise functions matching "regmatch".
  */
-    static void
+    void
 list_functions(regmatch_T *regmatch)
 {
     int		changed = func_hashtab.ht_changed;
@@ -2653,6 +2955,27 @@
 }
 
 /*
+ * Check if "*cmd" points to a function command and if so advance "*cmd" and
+ * return TRUE.
+ * Otherwise return FALSE;
+ * Do not consider "function(" to be a command.
+ */
+    static int
+is_function_cmd(char_u **cmd)
+{
+    char_u *p = *cmd;
+
+    if (checkforcmd(&p, "function", 2))
+    {
+	if (*p == '(')
+	    return FALSE;
+	*cmd = p;
+	return TRUE;
+    }
+    return FALSE;
+}
+
+/*
  * ":function" also supporting nested ":def".
  * When "name_arg" is not NULL this is a nested function, using "name_arg" for
  * the function name.
@@ -2671,6 +2994,7 @@
     int		is_global = FALSE;
     char_u	*p;
     char_u	*arg;
+    char_u	*whitep;
     char_u	*line_arg = NULL;
     garray_T	newargs;
     garray_T	argtypes;
@@ -2690,7 +3014,7 @@
     static int	func_nr = 0;	    // number for nameless function
     int		paren;
     hashitem_T	*hi;
-    getline_opt_T getline_options = GETLINE_CONCAT_CONT;
+    getline_opt_T getline_options;
     linenr_T	sourcing_lnum_off;
     linenr_T	sourcing_lnum_top;
     int		is_heredoc = FALSE;
@@ -2766,8 +3090,16 @@
     }
     else
     {
-	name = trans_function_name(&p, &is_global, eap->skip,
-						 TFN_NO_AUTOLOAD, &fudi, NULL);
+	if (STRNCMP(p, "<lambda>", 8) == 0)
+	{
+	    p += 8;
+	    (void)getdigits(&p);
+	    name = vim_strnsave(eap->arg, p - eap->arg);
+	    CLEAR_FIELD(fudi);
+	}
+	else
+	    name = trans_function_name(&p, &is_global, eap->skip,
+					   TFN_NO_AUTOLOAD, &fudi, NULL, NULL);
 	paren = (vim_strchr(p, '(') != NULL);
 	if (name == NULL && (fudi.fd_dict == NULL || !paren) && !eap->skip)
 	{
@@ -2866,7 +3198,12 @@
 	if (vim_strchr(p, '(') != NULL)
 	    p = vim_strchr(p, '(');
     }
-    p = skipwhite(p + 1);
+
+    if ((vim9script || eap->cmdidx == CMD_def) && VIM_ISWHITE(p[-1]))
+    {
+	semsg(_(e_no_white_space_allowed_before_str), "(");
+	goto ret_free;
+    }
 
     // In Vim9 script only global functions can be redefined.
     if (vim9script && eap->forceit && !is_global)
@@ -2906,11 +3243,13 @@
 
     // This may get more lines and make the pointers into the first line
     // invalid.
+    ++p;
     if (get_function_args(&p, ')', &newargs,
-			eap->cmdidx == CMD_def ? &argtypes : NULL,
+			eap->cmdidx == CMD_def ? &argtypes : NULL, FALSE,
 			 &varargs, &default_args, eap->skip,
 			 eap, &line_to_free) == FAIL)
 	goto errret_2;
+    whitep = p;
 
     if (eap->cmdidx == CMD_def)
     {
@@ -2922,6 +3261,7 @@
 	    if (p > ret_type)
 	    {
 		ret_type = vim_strnsave(ret_type, p - ret_type);
+		whitep = p;
 		p = skipwhite(p);
 	    }
 	    else
@@ -2936,6 +3276,7 @@
 	// find extra arguments "range", "dict", "abort" and "closure"
 	for (;;)
 	{
+	    whitep = p;
 	    p = skipwhite(p);
 	    if (STRNCMP(p, "range", 5) == 0)
 	    {
@@ -2974,7 +3315,8 @@
     else if (*p != NUL
 	    && !(*p == '"' && (!vim9script || eap->cmdidx == CMD_function)
 						     && eap->cmdidx != CMD_def)
-	    && !(*p == '#' && (vim9script || eap->cmdidx == CMD_def))
+	    && !(VIM_ISWHITE(*whitep) && *p == '#'
+				     && (vim9script || eap->cmdidx == CMD_def))
 	    && !eap->skip
 	    && !did_emsg)
 	semsg(_(e_trailing_arg), p);
@@ -3021,6 +3363,8 @@
     indent = 2;
     nesting = 0;
     nesting_def[nesting] = (eap->cmdidx == CMD_def);
+    getline_options = eap->cmdidx == CMD_def
+				? GETLINE_CONCAT_CONTBAR : GETLINE_CONCAT_CONT;
     for (;;)
     {
 	if (KeyTyped)
@@ -3057,7 +3401,11 @@
 	    lines_left = Rows - 1;
 	if (theline == NULL)
 	{
-	    if (eap->cmdidx == CMD_def)
+	    // Use the start of the function for the line number.
+	    SOURCING_LNUM = sourcing_lnum_top;
+	    if (skip_until != NULL)
+		semsg(_(e_missing_heredoc_end_marker_str), skip_until);
+	    else if (eap->cmdidx == CMD_def)
 		emsg(_(e_missing_enddef));
 	    else
 		emsg(_("E126: Missing :endfunction"));
@@ -3093,7 +3441,8 @@
 		{
 		    VIM_CLEAR(skip_until);
 		    VIM_CLEAR(heredoc_trimmed);
-		    getline_options = GETLINE_CONCAT_CONT;
+		    getline_options = eap->cmdidx == CMD_def
+				? GETLINE_CONCAT_CONTBAR : GETLINE_CONCAT_CONT;
 		    is_heredoc = FALSE;
 		}
 	    }
@@ -3105,36 +3454,54 @@
 		;
 
 	    // Check for "endfunction" or "enddef".
+	    // When a ":" follows it must be a dict key; "enddef: value,"
 	    if (checkforcmd(&p, nesting_def[nesting]
-			     ? "enddef" : "endfunction", 4) && nesting-- == 0)
+						? "enddef" : "endfunction", 4)
+		    && *p != ':')
 	    {
-		char_u *nextcmd = NULL;
-
-		if (*p == '|')
-		    nextcmd = p + 1;
-		else if (line_arg != NULL && *skipwhite(line_arg) != NUL)
-		    nextcmd = line_arg;
-		else if (*p != NUL && *p != '"' && p_verbose > 0)
-		    give_warning2(eap->cmdidx == CMD_def
-			? (char_u *)_("W1001: Text found after :enddef: %s")
-			: (char_u *)_("W22: Text found after :endfunction: %s"),
-			 p, TRUE);
-		if (nextcmd != NULL)
+		if (nesting-- == 0)
 		{
-		    // Another command follows. If the line came from "eap" we
-		    // can simply point into it, otherwise we need to change
-		    // "eap->cmdlinep".
-		    eap->nextcmd = nextcmd;
-		    if (line_to_free != NULL)
+		    char_u *nextcmd = NULL;
+
+		    if (*p == '|')
+			nextcmd = p + 1;
+		    else if (line_arg != NULL && *skipwhite(line_arg) != NUL)
+			nextcmd = line_arg;
+		    else if (*p != NUL && *p != '"' && p_verbose > 0)
+			give_warning2(eap->cmdidx == CMD_def
+			    ? (char_u *)_("W1001: Text found after :enddef: %s")
+			    : (char_u *)_("W22: Text found after :endfunction: %s"),
+			     p, TRUE);
+		    if (nextcmd != NULL)
 		    {
-			vim_free(*eap->cmdlinep);
-			*eap->cmdlinep = line_to_free;
-			line_to_free = NULL;
+			// Another command follows. If the line came from "eap"
+			// we can simply point into it, otherwise we need to
+			// change "eap->cmdlinep".
+			eap->nextcmd = nextcmd;
+			if (line_to_free != NULL)
+			{
+			    vim_free(*eap->cmdlinep);
+			    *eap->cmdlinep = line_to_free;
+			    line_to_free = NULL;
+			}
 		    }
+		    break;
 		}
-		break;
 	    }
 
+	    // Check for mismatched "endfunc" or "enddef".
+	    // We don't check for "def" inside "func" thus we also can't check
+	    // for "enddef".
+	    // We continue to find the end of the function, although we might
+	    // not find it.
+	    else if (nesting_def[nesting])
+	    {
+		if (checkforcmd(&p, "endfunction", 4) && *p != ':')
+		    emsg(_(e_mismatched_endfunction));
+	    }
+	    else if (eap->cmdidx == CMD_def && checkforcmd(&p, "enddef", 4))
+		emsg(_(e_mismatched_enddef));
+
 	    // Increase indent inside "if", "while", "for" and "try", decrease
 	    // at "end".
 	    if (indent > 2 && (*p == '}' || STRNCMP(p, "end", 3) == 0))
@@ -3149,13 +3516,14 @@
 	    // Only recognize "def" inside "def", not inside "function",
 	    // For backwards compatibility, see Test_function_python().
 	    c = *p;
-	    if (checkforcmd(&p, "function", 2)
+	    if (is_function_cmd(&p)
 		    || (eap->cmdidx == CMD_def && checkforcmd(&p, "def", 3)))
 	    {
 		if (*p == '!')
 		    p = skipwhite(p + 1);
 		p += eval_fname_script(p);
-		vim_free(trans_function_name(&p, NULL, TRUE, 0, NULL, NULL));
+		vim_free(trans_function_name(&p, NULL, TRUE, 0, NULL,
+								  NULL, NULL));
 		if (*skipwhite(p) == '(')
 		{
 		    if (nesting == MAX_FUNC_NESTING - 1)
@@ -3224,18 +3592,24 @@
 
 	    // Check for ":cmd v =<< [trim] EOF"
 	    //       and ":cmd [a, b] =<< [trim] EOF"
+	    //       and "lines =<< [trim] EOF" for Vim9
 	    // Where "cmd" can be "let", "var", "final" or "const".
 	    arg = skipwhite(skiptowhite(p));
 	    if (*arg == '[')
 		arg = vim_strchr(arg, ']');
 	    if (arg != NULL)
 	    {
-		arg = skipwhite(skiptowhite(arg));
-		if (arg[0] == '=' && arg[1] == '<' && arg[2] =='<'
+		int found = (eap->cmdidx == CMD_def && arg[0] == '='
+					     && arg[1] == '<' && arg[2] =='<');
+
+		if (!found)
+		    // skip over the argument after "cmd"
+		    arg = skipwhite(skiptowhite(arg));
+		if (found || (arg[0] == '=' && arg[1] == '<' && arg[2] =='<'
 			&& (checkforcmd(&p, "let", 2)
 			    || checkforcmd(&p, "var", 3)
 			    || checkforcmd(&p, "final", 5)
-			    || checkforcmd(&p, "const", 5)))
+			    || checkforcmd(&p, "const", 5))))
 		{
 		    p = skipwhite(arg + 3);
 		    if (STRNCMP(p, "trim", 4) == 0)
@@ -3286,7 +3660,7 @@
     {
 	hashtab_T	*ht;
 
-	v = find_var(name, &ht, FALSE);
+	v = find_var(name, &ht, TRUE);
 	if (v != NULL && v->di_tv.v_type == VAR_FUNC)
 	{
 	    emsg_funcname(N_("E707: Function name conflicts with variable: %s"),
@@ -3350,7 +3724,7 @@
 		fp->uf_profiling = FALSE;
 		fp->uf_prof_initialized = FALSE;
 #endif
-		clear_def_function(fp);
+		fp->uf_def_status = UF_NOT_COMPILED;
 	    }
 	}
     }
@@ -3416,8 +3790,6 @@
 	fp = alloc_clear(offsetof(ufunc_T, uf_name) + STRLEN(name) + 1);
 	if (fp == NULL)
 	    goto erret;
-	fp->uf_def_status = eap->cmdidx == CMD_def ? UF_TO_BE_COMPILED
-							     : UF_NOT_COMPILED;
 
 	if (fudi.fd_dict != NULL)
 	{
@@ -3502,58 +3874,12 @@
 		cstack->cs_flags[i] |= CSF_FUNC_DEF;
 	}
 
-	// parse the argument types
-	ga_init2(&fp->uf_type_list, sizeof(type_T *), 10);
-	if (argtypes.ga_len > 0)
-	{
-	    // When "varargs" is set the last name/type goes into uf_va_name
-	    // and uf_va_type.
-	    int len = argtypes.ga_len - (varargs ? 1 : 0);
-
-	    if (len > 0)
-		fp->uf_arg_types = ALLOC_CLEAR_MULT(type_T *, len);
-	    if (fp->uf_arg_types != NULL)
-	    {
-		int	i;
-		type_T	*type;
-
-		for (i = 0; i < len; ++ i)
-		{
-		    p = ((char_u **)argtypes.ga_data)[i];
-		    if (p == NULL)
-			// will get the type from the default value
-			type = &t_unknown;
-		    else
-			type = parse_type(&p, &fp->uf_type_list);
-		    if (type == NULL)
-		    {
-			SOURCING_LNUM = lnum_save;
-			goto errret_2;
-		    }
-		    fp->uf_arg_types[i] = type;
-		}
-	    }
-	    if (varargs)
-	    {
-		// Move the last argument "...name: type" to uf_va_name and
-		// uf_va_type.
-		fp->uf_va_name = ((char_u **)fp->uf_args.ga_data)
-						      [fp->uf_args.ga_len - 1];
-		--fp->uf_args.ga_len;
-		p = ((char_u **)argtypes.ga_data)[len];
-		if (p == NULL)
-		    // todo: get type from default value
-		    fp->uf_va_type = &t_any;
-		else
-		    fp->uf_va_type = parse_type(&p, &fp->uf_type_list);
-		if (fp->uf_va_type == NULL)
-		{
-		    SOURCING_LNUM = lnum_save;
-		    goto errret_2;
-		}
-	    }
-	    varargs = FALSE;
+	if (parse_argument_types(fp, &argtypes, varargs) == FAIL)
+	{
+	    SOURCING_LNUM = lnum_save;
+	    goto errret_2;
 	}
+	varargs = FALSE;
 
 	// parse the return type, if any
 	if (ret_type == NULL)
@@ -3561,7 +3887,13 @@
 	else
 	{
 	    p = ret_type;
-	    fp->uf_ret_type = parse_type(&p, &fp->uf_type_list);
+	    fp->uf_ret_type = parse_type(&p, &fp->uf_type_list, TRUE);
+	    if (fp->uf_ret_type == NULL)
+	    {
+		fp->uf_ret_type = &t_void;
+		SOURCING_LNUM = lnum_save;
+		goto erret;
+	    }
 	}
 	SOURCING_LNUM = lnum_save;
     }
@@ -3615,6 +3947,7 @@
 ret_free:
     ga_clear_strings(&argtypes);
     vim_free(skip_until);
+    vim_free(heredoc_trimmed);
     vim_free(line_to_free);
     vim_free(fudi.fd_newkey);
     if (name != name_arg)
@@ -3637,7 +3970,7 @@
 
 /*
  * :defcompile - compile all :def functions in the current script that need to
- * be compiled.  Except dead functions.
+ * be compiled.  Except dead functions.  Doesn't do profiling.
  */
     void
 ex_defcompile(exarg_T *eap UNUSED)
@@ -3657,7 +3990,7 @@
 		    && ufunc->uf_def_status == UF_TO_BE_COMPILED
 		    && (ufunc->uf_flags & FC_DEAD) == 0)
 	    {
-		compile_def_function(ufunc, FALSE, NULL);
+		compile_def_function(ufunc, FALSE, FALSE, NULL);
 
 		if (func_hashtab.ht_changed != changed)
 		{
@@ -3724,7 +4057,7 @@
     flag = TFN_INT | TFN_QUIET | TFN_NO_AUTOLOAD;
     if (no_deref)
 	flag |= TFN_NO_DEREF;
-    p = trans_function_name(&nm, &is_global, FALSE, flag, NULL, NULL);
+    p = trans_function_name(&nm, &is_global, FALSE, flag, NULL, NULL, NULL);
     nm = skipwhite(nm);
 
     // Only accept "funcname", "funcname ", "funcname (..." and
@@ -3744,7 +4077,7 @@
     int		is_global = FALSE;
 
     p = trans_function_name(&nm, &is_global, FALSE,
-						TFN_INT|TFN_QUIET, NULL, NULL);
+					  TFN_INT|TFN_QUIET, NULL, NULL, NULL);
 
     if (p != NULL && *nm == NUL
 		       && (!check || translated_function_exists(p, is_global)))
@@ -3814,7 +4147,8 @@
     int		is_global = FALSE;
 
     p = eap->arg;
-    name = trans_function_name(&p, &is_global, eap->skip, 0, &fudi, NULL);
+    name = trans_function_name(&p, &is_global, eap->skip, 0, &fudi,
+								   NULL, NULL);
     vim_free(fudi.fd_newkey);
     if (name == NULL)
     {
@@ -3901,23 +4235,21 @@
 #endif
 	    internal_error("func_unref()");
     }
-    if (fp != NULL && --fp->uf_refcount <= 0)
-    {
-	// Only delete it when it's not being used.  Otherwise it's done
-	// when "uf_calls" becomes zero.
-	if (fp->uf_calls == 0)
-	    func_clear_free(fp, FALSE);
-    }
+    func_ptr_unref(fp);
 }
 
 /*
  * Unreference a Function: decrement the reference count and free it when it
  * becomes zero.
+ * Also when it becomes one and uf_partial points to the function.
  */
     void
 func_ptr_unref(ufunc_T *fp)
 {
-    if (fp != NULL && --fp->uf_refcount <= 0)
+    if (fp != NULL && (--fp->uf_refcount <= 0
+		|| (fp->uf_refcount == 1 && fp->uf_partial != NULL
+					 && fp->uf_partial->pt_refcount <= 1
+					 && fp->uf_partial->pt_func == fp)))
     {
 	// Only delete it when it's not being used.  Otherwise it's done
 	// when "uf_calls" becomes zero.
@@ -4045,6 +4377,7 @@
     funcdict_T	fudi;
     partial_T	*partial = NULL;
     evalarg_T	evalarg;
+    type_T	*type = NULL;
 
     fill_evalarg_from_eap(&evalarg, eap, eap->skip);
     if (eap->skip)
@@ -4060,8 +4393,8 @@
 	return;
     }
 
-    tofree = trans_function_name(&arg, NULL, eap->skip,
-						     TFN_INT, &fudi, &partial);
+    tofree = trans_function_name(&arg, NULL, eap->skip, TFN_INT,
+			      &fudi, &partial, in_vim9script() ? &type : NULL);
     if (fudi.fd_newkey != NULL)
     {
 	// Still need to give an error message for missing key.
@@ -4080,8 +4413,8 @@
     // contents.  For VAR_PARTIAL get its partial, unless we already have one
     // from trans_function_name().
     len = (int)STRLEN(tofree);
-    name = deref_func_name(tofree, &len,
-				    partial != NULL ? NULL : &partial, FALSE);
+    name = deref_func_name(tofree, &len, partial != NULL ? NULL : &partial,
+			in_vim9script() && type == NULL ? &type : NULL, FALSE);
 
     // Skip white space to allow ":call func ()".  Not good, but required for
     // backward compatibility.
@@ -4133,6 +4466,7 @@
 	funcexe.evaluate = !eap->skip;
 	funcexe.partial = partial;
 	funcexe.selfdict = fudi.fd_dict;
+	funcexe.check_type = type;
 	if (get_func_tv(name, -1, &rettv, &arg, &evalarg, &funcexe) == FAIL)
 	{
 	    failed = TRUE;
@@ -4352,7 +4686,7 @@
 	    SOURCING_LNUM = fcp->linenr;
 #ifdef FEAT_PROFILE
 	    if (do_profiling == PROF_YES)
-		func_line_start(cookie);
+		func_line_start(cookie, SOURCING_LNUM);
 #endif
 	}
     }
diff -Nru vim-8.2.1913/src/version.c vim-8.2.2434/src/version.c
--- vim-8.2.1913/src/version.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/version.c	2021-01-30 22:05:11.000000000 +0000
@@ -751,6 +751,1048 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2434,
+/**/
+    2433,
+/**/
+    2432,
+/**/
+    2431,
+/**/
+    2430,
+/**/
+    2429,
+/**/
+    2428,
+/**/
+    2427,
+/**/
+    2426,
+/**/
+    2425,
+/**/
+    2424,
+/**/
+    2423,
+/**/
+    2422,
+/**/
+    2421,
+/**/
+    2420,
+/**/
+    2419,
+/**/
+    2418,
+/**/
+    2417,
+/**/
+    2416,
+/**/
+    2415,
+/**/
+    2414,
+/**/
+    2413,
+/**/
+    2412,
+/**/
+    2411,
+/**/
+    2410,
+/**/
+    2409,
+/**/
+    2408,
+/**/
+    2407,
+/**/
+    2406,
+/**/
+    2405,
+/**/
+    2404,
+/**/
+    2403,
+/**/
+    2402,
+/**/
+    2401,
+/**/
+    2400,
+/**/
+    2399,
+/**/
+    2398,
+/**/
+    2397,
+/**/
+    2396,
+/**/
+    2395,
+/**/
+    2394,
+/**/
+    2393,
+/**/
+    2392,
+/**/
+    2391,
+/**/
+    2390,
+/**/
+    2389,
+/**/
+    2388,
+/**/
+    2387,
+/**/
+    2386,
+/**/
+    2385,
+/**/
+    2384,
+/**/
+    2383,
+/**/
+    2382,
+/**/
+    2381,
+/**/
+    2380,
+/**/
+    2379,
+/**/
+    2378,
+/**/
+    2377,
+/**/
+    2376,
+/**/
+    2375,
+/**/
+    2374,
+/**/
+    2373,
+/**/
+    2372,
+/**/
+    2371,
+/**/
+    2370,
+/**/
+    2369,
+/**/
+    2368,
+/**/
+    2367,
+/**/
+    2366,
+/**/
+    2365,
+/**/
+    2364,
+/**/
+    2363,
+/**/
+    2362,
+/**/
+    2361,
+/**/
+    2360,
+/**/
+    2359,
+/**/
+    2358,
+/**/
+    2357,
+/**/
+    2356,
+/**/
+    2355,
+/**/
+    2354,
+/**/
+    2353,
+/**/
+    2352,
+/**/
+    2351,
+/**/
+    2350,
+/**/
+    2349,
+/**/
+    2348,
+/**/
+    2347,
+/**/
+    2346,
+/**/
+    2345,
+/**/
+    2344,
+/**/
+    2343,
+/**/
+    2342,
+/**/
+    2341,
+/**/
+    2340,
+/**/
+    2339,
+/**/
+    2338,
+/**/
+    2337,
+/**/
+    2336,
+/**/
+    2335,
+/**/
+    2334,
+/**/
+    2333,
+/**/
+    2332,
+/**/
+    2331,
+/**/
+    2330,
+/**/
+    2329,
+/**/
+    2328,
+/**/
+    2327,
+/**/
+    2326,
+/**/
+    2325,
+/**/
+    2324,
+/**/
+    2323,
+/**/
+    2322,
+/**/
+    2321,
+/**/
+    2320,
+/**/
+    2319,
+/**/
+    2318,
+/**/
+    2317,
+/**/
+    2316,
+/**/
+    2315,
+/**/
+    2314,
+/**/
+    2313,
+/**/
+    2312,
+/**/
+    2311,
+/**/
+    2310,
+/**/
+    2309,
+/**/
+    2308,
+/**/
+    2307,
+/**/
+    2306,
+/**/
+    2305,
+/**/
+    2304,
+/**/
+    2303,
+/**/
+    2302,
+/**/
+    2301,
+/**/
+    2300,
+/**/
+    2299,
+/**/
+    2298,
+/**/
+    2297,
+/**/
+    2296,
+/**/
+    2295,
+/**/
+    2294,
+/**/
+    2293,
+/**/
+    2292,
+/**/
+    2291,
+/**/
+    2290,
+/**/
+    2289,
+/**/
+    2288,
+/**/
+    2287,
+/**/
+    2286,
+/**/
+    2285,
+/**/
+    2284,
+/**/
+    2283,
+/**/
+    2282,
+/**/
+    2281,
+/**/
+    2280,
+/**/
+    2279,
+/**/
+    2278,
+/**/
+    2277,
+/**/
+    2276,
+/**/
+    2275,
+/**/
+    2274,
+/**/
+    2273,
+/**/
+    2272,
+/**/
+    2271,
+/**/
+    2270,
+/**/
+    2269,
+/**/
+    2268,
+/**/
+    2267,
+/**/
+    2266,
+/**/
+    2265,
+/**/
+    2264,
+/**/
+    2263,
+/**/
+    2262,
+/**/
+    2261,
+/**/
+    2260,
+/**/
+    2259,
+/**/
+    2258,
+/**/
+    2257,
+/**/
+    2256,
+/**/
+    2255,
+/**/
+    2254,
+/**/
+    2253,
+/**/
+    2252,
+/**/
+    2251,
+/**/
+    2250,
+/**/
+    2249,
+/**/
+    2248,
+/**/
+    2247,
+/**/
+    2246,
+/**/
+    2245,
+/**/
+    2244,
+/**/
+    2243,
+/**/
+    2242,
+/**/
+    2241,
+/**/
+    2240,
+/**/
+    2239,
+/**/
+    2238,
+/**/
+    2237,
+/**/
+    2236,
+/**/
+    2235,
+/**/
+    2234,
+/**/
+    2233,
+/**/
+    2232,
+/**/
+    2231,
+/**/
+    2230,
+/**/
+    2229,
+/**/
+    2228,
+/**/
+    2227,
+/**/
+    2226,
+/**/
+    2225,
+/**/
+    2224,
+/**/
+    2223,
+/**/
+    2222,
+/**/
+    2221,
+/**/
+    2220,
+/**/
+    2219,
+/**/
+    2218,
+/**/
+    2217,
+/**/
+    2216,
+/**/
+    2215,
+/**/
+    2214,
+/**/
+    2213,
+/**/
+    2212,
+/**/
+    2211,
+/**/
+    2210,
+/**/
+    2209,
+/**/
+    2208,
+/**/
+    2207,
+/**/
+    2206,
+/**/
+    2205,
+/**/
+    2204,
+/**/
+    2203,
+/**/
+    2202,
+/**/
+    2201,
+/**/
+    2200,
+/**/
+    2199,
+/**/
+    2198,
+/**/
+    2197,
+/**/
+    2196,
+/**/
+    2195,
+/**/
+    2194,
+/**/
+    2193,
+/**/
+    2192,
+/**/
+    2191,
+/**/
+    2190,
+/**/
+    2189,
+/**/
+    2188,
+/**/
+    2187,
+/**/
+    2186,
+/**/
+    2185,
+/**/
+    2184,
+/**/
+    2183,
+/**/
+    2182,
+/**/
+    2181,
+/**/
+    2180,
+/**/
+    2179,
+/**/
+    2178,
+/**/
+    2177,
+/**/
+    2176,
+/**/
+    2175,
+/**/
+    2174,
+/**/
+    2173,
+/**/
+    2172,
+/**/
+    2171,
+/**/
+    2170,
+/**/
+    2169,
+/**/
+    2168,
+/**/
+    2167,
+/**/
+    2166,
+/**/
+    2165,
+/**/
+    2164,
+/**/
+    2163,
+/**/
+    2162,
+/**/
+    2161,
+/**/
+    2160,
+/**/
+    2159,
+/**/
+    2158,
+/**/
+    2157,
+/**/
+    2156,
+/**/
+    2155,
+/**/
+    2154,
+/**/
+    2153,
+/**/
+    2152,
+/**/
+    2151,
+/**/
+    2150,
+/**/
+    2149,
+/**/
+    2148,
+/**/
+    2147,
+/**/
+    2146,
+/**/
+    2145,
+/**/
+    2144,
+/**/
+    2143,
+/**/
+    2142,
+/**/
+    2141,
+/**/
+    2140,
+/**/
+    2139,
+/**/
+    2138,
+/**/
+    2137,
+/**/
+    2136,
+/**/
+    2135,
+/**/
+    2134,
+/**/
+    2133,
+/**/
+    2132,
+/**/
+    2131,
+/**/
+    2130,
+/**/
+    2129,
+/**/
+    2128,
+/**/
+    2127,
+/**/
+    2126,
+/**/
+    2125,
+/**/
+    2124,
+/**/
+    2123,
+/**/
+    2122,
+/**/
+    2121,
+/**/
+    2120,
+/**/
+    2119,
+/**/
+    2118,
+/**/
+    2117,
+/**/
+    2116,
+/**/
+    2115,
+/**/
+    2114,
+/**/
+    2113,
+/**/
+    2112,
+/**/
+    2111,
+/**/
+    2110,
+/**/
+    2109,
+/**/
+    2108,
+/**/
+    2107,
+/**/
+    2106,
+/**/
+    2105,
+/**/
+    2104,
+/**/
+    2103,
+/**/
+    2102,
+/**/
+    2101,
+/**/
+    2100,
+/**/
+    2099,
+/**/
+    2098,
+/**/
+    2097,
+/**/
+    2096,
+/**/
+    2095,
+/**/
+    2094,
+/**/
+    2093,
+/**/
+    2092,
+/**/
+    2091,
+/**/
+    2090,
+/**/
+    2089,
+/**/
+    2088,
+/**/
+    2087,
+/**/
+    2086,
+/**/
+    2085,
+/**/
+    2084,
+/**/
+    2083,
+/**/
+    2082,
+/**/
+    2081,
+/**/
+    2080,
+/**/
+    2079,
+/**/
+    2078,
+/**/
+    2077,
+/**/
+    2076,
+/**/
+    2075,
+/**/
+    2074,
+/**/
+    2073,
+/**/
+    2072,
+/**/
+    2071,
+/**/
+    2070,
+/**/
+    2069,
+/**/
+    2068,
+/**/
+    2067,
+/**/
+    2066,
+/**/
+    2065,
+/**/
+    2064,
+/**/
+    2063,
+/**/
+    2062,
+/**/
+    2061,
+/**/
+    2060,
+/**/
+    2059,
+/**/
+    2058,
+/**/
+    2057,
+/**/
+    2056,
+/**/
+    2055,
+/**/
+    2054,
+/**/
+    2053,
+/**/
+    2052,
+/**/
+    2051,
+/**/
+    2050,
+/**/
+    2049,
+/**/
+    2048,
+/**/
+    2047,
+/**/
+    2046,
+/**/
+    2045,
+/**/
+    2044,
+/**/
+    2043,
+/**/
+    2042,
+/**/
+    2041,
+/**/
+    2040,
+/**/
+    2039,
+/**/
+    2038,
+/**/
+    2037,
+/**/
+    2036,
+/**/
+    2035,
+/**/
+    2034,
+/**/
+    2033,
+/**/
+    2032,
+/**/
+    2031,
+/**/
+    2030,
+/**/
+    2029,
+/**/
+    2028,
+/**/
+    2027,
+/**/
+    2026,
+/**/
+    2025,
+/**/
+    2024,
+/**/
+    2023,
+/**/
+    2022,
+/**/
+    2021,
+/**/
+    2020,
+/**/
+    2019,
+/**/
+    2018,
+/**/
+    2017,
+/**/
+    2016,
+/**/
+    2015,
+/**/
+    2014,
+/**/
+    2013,
+/**/
+    2012,
+/**/
+    2011,
+/**/
+    2010,
+/**/
+    2009,
+/**/
+    2008,
+/**/
+    2007,
+/**/
+    2006,
+/**/
+    2005,
+/**/
+    2004,
+/**/
+    2003,
+/**/
+    2002,
+/**/
+    2001,
+/**/
+    2000,
+/**/
+    1999,
+/**/
+    1998,
+/**/
+    1997,
+/**/
+    1996,
+/**/
+    1995,
+/**/
+    1994,
+/**/
+    1993,
+/**/
+    1992,
+/**/
+    1991,
+/**/
+    1990,
+/**/
+    1989,
+/**/
+    1988,
+/**/
+    1987,
+/**/
+    1986,
+/**/
+    1985,
+/**/
+    1984,
+/**/
+    1983,
+/**/
+    1982,
+/**/
+    1981,
+/**/
+    1980,
+/**/
+    1979,
+/**/
+    1978,
+/**/
+    1977,
+/**/
+    1976,
+/**/
+    1975,
+/**/
+    1974,
+/**/
+    1973,
+/**/
+    1972,
+/**/
+    1971,
+/**/
+    1970,
+/**/
+    1969,
+/**/
+    1968,
+/**/
+    1967,
+/**/
+    1966,
+/**/
+    1965,
+/**/
+    1964,
+/**/
+    1963,
+/**/
+    1962,
+/**/
+    1961,
+/**/
+    1960,
+/**/
+    1959,
+/**/
+    1958,
+/**/
+    1957,
+/**/
+    1956,
+/**/
+    1955,
+/**/
+    1954,
+/**/
+    1953,
+/**/
+    1952,
+/**/
+    1951,
+/**/
+    1950,
+/**/
+    1949,
+/**/
+    1948,
+/**/
+    1947,
+/**/
+    1946,
+/**/
+    1945,
+/**/
+    1944,
+/**/
+    1943,
+/**/
+    1942,
+/**/
+    1941,
+/**/
+    1940,
+/**/
+    1939,
+/**/
+    1938,
+/**/
+    1937,
+/**/
+    1936,
+/**/
+    1935,
+/**/
+    1934,
+/**/
+    1933,
+/**/
+    1932,
+/**/
+    1931,
+/**/
+    1930,
+/**/
+    1929,
+/**/
+    1928,
+/**/
+    1927,
+/**/
+    1926,
+/**/
+    1925,
+/**/
+    1924,
+/**/
+    1923,
+/**/
+    1922,
+/**/
+    1921,
+/**/
+    1920,
+/**/
+    1919,
+/**/
+    1918,
+/**/
+    1917,
+/**/
+    1916,
+/**/
+    1915,
+/**/
+    1914,
+/**/
     1913,
 /**/
     1912,
@@ -4607,11 +5649,21 @@
     int
 has_patch(int n)
 {
-    int		i;
+    int		h, m, l;
 
-    for (i = 0; included_patches[i] != 0; ++i)
-	if (included_patches[i] == n)
+    // Perform a binary search.
+    l = 0;
+    h = (int)(sizeof(included_patches) / sizeof(included_patches[0])) - 1;
+    while (l < h)
+    {
+	m = (l + h) / 2;
+	if (included_patches[m] == n)
 	    return TRUE;
+	if (included_patches[m] < n)
+	    h = m;
+	else
+	    l = m + 1;
+    }
     return FALSE;
 }
 #endif
@@ -4803,6 +5855,11 @@
 # else
     msg_puts(_("\nmacOS version w/o darwin feat."));
 # endif
+# if defined(__arm64__)
+    msg_puts(" - arm64");
+# elif defined(__x86_64__)
+    msg_puts(" - x86_64");
+# endif
 #endif
 
 #ifdef VMS
@@ -4823,9 +5880,7 @@
     {
 	msg_puts(_("\nIncluded patches: "));
 	first = -1;
-	// find last one
-	for (i = 0; included_patches[i] != 0; ++i)
-	    ;
+	i = (int)(sizeof(included_patches) / sizeof(included_patches[0])) - 1;
 	while (--i >= 0)
 	{
 	    if (first < 0)
diff -Nru vim-8.2.1913/src/vim9compile.c vim-8.2.2434/src/vim9compile.c
--- vim-8.2.1913/src/vim9compile.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/vim9compile.c	2021-01-30 22:05:11.000000000 +0000
@@ -44,6 +44,7 @@
  */
 typedef struct {
     int		is_seen_else;
+    int		is_seen_skip_not;   // a block was unconditionally executed
     int		is_had_return;	    // every block ends in :return
     int		is_if_label;	    // instruction idx at IF or ELSEIF
     endlabel_T	*is_end_label;	    // instructions to set end label
@@ -108,7 +109,7 @@
     char_u	*lv_name;
     type_T	*lv_type;
     int		lv_idx;		// index of the variable on the stack
-    int		lv_from_outer;	// when TRUE using ctx_outer scope
+    int		lv_from_outer;	// nesting level, using ctx_outer scope
     int		lv_const;	// when TRUE cannot be assigned to
     int		lv_arg;		// when TRUE this is an argument
 } lvar_T;
@@ -123,6 +124,8 @@
     char_u	*ctx_line_start;    // start of current line or NULL
     garray_T	ctx_instr;	    // generated instructions
 
+    int		ctx_profiling;	    // when TRUE generate ISN_PROF_START
+
     garray_T	ctx_locals;	    // currently visible local variables
     int		ctx_locals_count;   // total number of local variables
 
@@ -145,48 +148,54 @@
     int		ctx_has_cmdmod;	    // ISN_CMDMOD was generated
 };
 
-static void delete_def_function_contents(dfunc_T *dfunc);
+static void delete_def_function_contents(dfunc_T *dfunc, int mark_deleted);
 
 /*
- * Lookup variable "name" in the local scope and return it.
- * Return NULL if not found.
+ * Lookup variable "name" in the local scope and return it in "lvar".
+ * "lvar->lv_from_outer" is incremented accordingly.
+ * If "lvar" is NULL only check if the variable can be found.
+ * Return FAIL if not found.
  */
-    static lvar_T *
-lookup_local(char_u *name, size_t len, cctx_T *cctx)
+    static int
+lookup_local(char_u *name, size_t len, lvar_T *lvar, cctx_T *cctx)
 {
     int	    idx;
-    lvar_T  *lvar;
+    lvar_T  *lvp;
 
     if (len == 0)
-	return NULL;
+	return FAIL;
 
     // Find local in current function scope.
     for (idx = 0; idx < cctx->ctx_locals.ga_len; ++idx)
     {
-	lvar = ((lvar_T *)cctx->ctx_locals.ga_data) + idx;
-	if (STRNCMP(name, lvar->lv_name, len) == 0
-					       && STRLEN(lvar->lv_name) == len)
+	lvp = ((lvar_T *)cctx->ctx_locals.ga_data) + idx;
+	if (STRNCMP(name, lvp->lv_name, len) == 0
+					       && STRLEN(lvp->lv_name) == len)
 	{
-	    lvar->lv_from_outer = FALSE;
-	    return lvar;
+	    if (lvar != NULL)
+	    {
+		*lvar = *lvp;
+		lvar->lv_from_outer = 0;
+	    }
+	    return OK;
 	}
     }
 
     // Find local in outer function scope.
     if (cctx->ctx_outer != NULL)
     {
-	lvar = lookup_local(name, len, cctx->ctx_outer);
-	if (lvar != NULL)
+	if (lookup_local(name, len, lvar, cctx->ctx_outer) == OK)
 	{
-	    // TODO: are there situations we should not mark the outer scope as
-	    // used?
-	    cctx->ctx_outer_used = TRUE;
-	    lvar->lv_from_outer = TRUE;
-	    return lvar;
+	    if (lvar != NULL)
+	    {
+		cctx->ctx_outer_used = TRUE;
+		++lvar->lv_from_outer;
+	    }
+	    return OK;
 	}
     }
 
-    return NULL;
+    return FAIL;
 }
 
 /*
@@ -252,7 +261,7 @@
 	if (arg_exists(name, len, idxp, type, gen_load_outer, cctx->ctx_outer)
 									 == OK)
 	{
-	    *gen_load_outer = TRUE;
+	    ++*gen_load_outer;
 	    return OK;
 	}
     }
@@ -312,7 +321,7 @@
 }
 
 /*
- * Returnd TRUE if the script context is Vim9 script.
+ * Return TRUE if the script context is Vim9 script.
  */
     static int
 script_is_vim9()
@@ -377,7 +386,7 @@
     p[len] = NUL;
     if (script_var_exists(p, len, FALSE, cctx) == OK
 	    || (cctx != NULL
-		&& (lookup_local(p, len, cctx) != NULL
+		&& (lookup_local(p, len, NULL, cctx) == OK
 		    || arg_exists(p, len, NULL, NULL, NULL, cctx) == OK))
 	    || find_imported(p, len, cctx) != NULL
 	    || (ufunc = find_func_even_dead(p, FALSE, cctx)) != NULL)
@@ -468,8 +477,10 @@
     isn_T	*isn;
     isntype_T	isntype = ISN_2STRING;
     garray_T	*stack = &cctx->ctx_type_stack;
-    type_T	**type = ((type_T **)stack->ga_data) + stack->ga_len + offset;
+    type_T	**type;
 
+    RETURN_OK_IF_SKIP(cctx);
+    type = ((type_T **)stack->ga_data) + stack->ga_len + offset;
     switch ((*type)->tt_type)
     {
 	// nothing to be done
@@ -532,14 +543,15 @@
 	type_T *type1,
 	type_T *type2)
 {
-    isn_T *isn = generate_instr_drop(cctx,
-	      vartype == VAR_NUMBER ? ISN_OPNR
-	    : vartype == VAR_LIST ? ISN_ADDLIST
-	    : vartype == VAR_BLOB ? ISN_ADDBLOB
+    garray_T	*stack = &cctx->ctx_type_stack;
+    isn_T	*isn = generate_instr_drop(cctx,
+		      vartype == VAR_NUMBER ? ISN_OPNR
+		    : vartype == VAR_LIST ? ISN_ADDLIST
+		    : vartype == VAR_BLOB ? ISN_ADDBLOB
 #ifdef FEAT_FLOAT
-	    : vartype == VAR_FLOAT ? ISN_OPFLOAT
+		    : vartype == VAR_FLOAT ? ISN_OPFLOAT
 #endif
-	    : ISN_OPANY, 1);
+		    : ISN_OPANY, 1);
 
     if (vartype != VAR_LIST && vartype != VAR_BLOB
 	    && type1->tt_type != VAR_ANY
@@ -550,6 +562,14 @@
 
     if (isn != NULL)
 	isn->isn_arg.op.op_type = EXPR_ADD;
+
+    // When concatenating two lists with different member types the member type
+    // becomes "any".
+    if (vartype == VAR_LIST
+	    && type1->tt_type == VAR_LIST && type2->tt_type == VAR_LIST
+	    && type1->tt_member != type2->tt_member)
+	(((type_T **)stack->ga_data)[stack->ga_len - 1]) = &t_list_any;
+
     return isn == NULL ? FAIL : OK;
 }
 
@@ -654,7 +674,7 @@
  * Return ISN_DROP when failed.
  */
     static isntype_T
-get_compare_isn(exptype_T exptype, vartype_T type1, vartype_T type2)
+get_compare_isn(exprtype_T exprtype, vartype_T type1, vartype_T type2)
 {
     isntype_T	isntype = ISN_DROP;
 
@@ -684,22 +704,22 @@
 	      && (type2 == VAR_NUMBER || type2 ==VAR_FLOAT)))
 	isntype = ISN_COMPAREANY;
 
-    if ((exptype == EXPR_IS || exptype == EXPR_ISNOT)
+    if ((exprtype == EXPR_IS || exprtype == EXPR_ISNOT)
 	    && (isntype == ISN_COMPAREBOOL
 	    || isntype == ISN_COMPARESPECIAL
 	    || isntype == ISN_COMPARENR
 	    || isntype == ISN_COMPAREFLOAT))
     {
 	semsg(_(e_cannot_use_str_with_str),
-		exptype == EXPR_IS ? "is" : "isnot" , vartype_name(type1));
+		exprtype == EXPR_IS ? "is" : "isnot" , vartype_name(type1));
 	return ISN_DROP;
     }
     if (isntype == ISN_DROP
-	    || ((exptype != EXPR_EQUAL && exptype != EXPR_NEQUAL
+	    || ((exprtype != EXPR_EQUAL && exprtype != EXPR_NEQUAL
 		    && (type1 == VAR_BOOL || type1 == VAR_SPECIAL
 		       || type2 == VAR_BOOL || type2 == VAR_SPECIAL)))
-	    || ((exptype != EXPR_EQUAL && exptype != EXPR_NEQUAL
-				 && exptype != EXPR_IS && exptype != EXPR_ISNOT
+	    || ((exprtype != EXPR_EQUAL && exprtype != EXPR_NEQUAL
+				 && exprtype != EXPR_IS && exprtype != EXPR_ISNOT
 		    && (type1 == VAR_BLOB || type2 == VAR_BLOB
 			|| type1 == VAR_LIST || type2 == VAR_LIST))))
     {
@@ -711,7 +731,7 @@
 }
 
     int
-check_compare_types(exptype_T type, typval_T *tv1, typval_T *tv2)
+check_compare_types(exprtype_T type, typval_T *tv1, typval_T *tv2)
 {
     if (get_compare_isn(type, tv1->v_type, tv2->v_type) == ISN_DROP)
 	return FAIL;
@@ -722,7 +742,7 @@
  * Generate an ISN_COMPARE* instruction with a boolean result.
  */
     static int
-generate_COMPARE(cctx_T *cctx, exptype_T exptype, int ic)
+generate_COMPARE(cctx_T *cctx, exprtype_T exprtype, int ic)
 {
     isntype_T	isntype;
     isn_T	*isn;
@@ -737,13 +757,13 @@
     // checking.
     type1 = ((type_T **)stack->ga_data)[stack->ga_len - 2]->tt_type;
     type2 = ((type_T **)stack->ga_data)[stack->ga_len - 1]->tt_type;
-    isntype = get_compare_isn(exptype, type1, type2);
+    isntype = get_compare_isn(exprtype, type1, type2);
     if (isntype == ISN_DROP)
 	return FAIL;
 
     if ((isn = generate_instr(cctx, isntype)) == NULL)
 	return FAIL;
-    isn->isn_arg.op.op_type = exptype;
+    isn->isn_arg.op.op_type = exprtype;
     isn->isn_arg.op.op_ic = ic;
 
     // takes two arguments, puts one bool back
@@ -799,7 +819,8 @@
 generate_TYPECHECK(
 	cctx_T	    *cctx,
 	type_T	    *expected,
-	int	    offset)
+	int	    offset,
+	int	    argidx)
 {
     isn_T	*isn;
     garray_T	*stack = &cctx->ctx_type_stack;
@@ -808,7 +829,8 @@
     if ((isn = generate_instr(cctx, ISN_CHECKTYPE)) == NULL)
 	return FAIL;
     isn->isn_arg.type.ct_type = alloc_type(expected);
-    isn->isn_arg.type.ct_off = offset;
+    isn->isn_arg.type.ct_off = (int8_T)offset;
+    isn->isn_arg.type.ct_arg_idx = (int8_T)argidx;
 
     // type becomes expected
     ((type_T **)stack->ga_data)[stack->ga_len + offset] = expected;
@@ -816,11 +838,25 @@
     return OK;
 }
 
+    static int
+generate_SETTYPE(
+	cctx_T	    *cctx,
+	type_T	    *expected)
+{
+    isn_T	*isn;
+
+    RETURN_OK_IF_SKIP(cctx);
+    if ((isn = generate_instr(cctx, ISN_SETTYPE)) == NULL)
+	return FAIL;
+    isn->isn_arg.type.ct_type = alloc_type(expected);
+    return OK;
+}
+
 /*
  * Return TRUE if "actual" could be "expected" and a runtime typecheck is to be
  * used.  Return FALSE if the types will never match.
  */
-    static int
+    int
 use_typecheck(type_T *actual, type_T *expected)
 {
     if (actual->tt_type == VAR_ANY
@@ -828,7 +864,9 @@
 	    || (actual->tt_type == VAR_FUNC
 		&& (expected->tt_type == VAR_FUNC
 					   || expected->tt_type == VAR_PARTIAL)
-		&& (actual->tt_member == &t_any || actual->tt_argcount < 0)))
+		&& (actual->tt_member == &t_any || actual->tt_argcount < 0)
+		&& ((actual->tt_member == &t_void)
+					 == (expected->tt_member == &t_void))))
 	return TRUE;
     if ((actual->tt_type == VAR_LIST || actual->tt_type == VAR_DICT)
 				       && actual->tt_type == expected->tt_type)
@@ -845,11 +883,12 @@
  * If "actual_is_const" is TRUE then the type won't change at runtime, do not
  * generate a TYPECHECK.
  */
-    static int
+    int
 need_type(
 	type_T	*actual,
 	type_T	*expected,
 	int	offset,
+	int	arg_idx,
 	cctx_T	*cctx,
 	int	silent,
 	int	actual_is_const)
@@ -863,23 +902,45 @@
 	return OK;
     }
 
-    if (check_type(expected, actual, FALSE, 0) == OK)
+    if (check_type(expected, actual, FALSE, arg_idx) == OK)
 	return OK;
 
     // If the actual type can be the expected type add a runtime check.
     // If it's a constant a runtime check makes no sense.
     if (!actual_is_const && use_typecheck(actual, expected))
     {
-	generate_TYPECHECK(cctx, expected, offset);
+	generate_TYPECHECK(cctx, expected, offset, arg_idx);
 	return OK;
     }
 
     if (!silent)
-	type_mismatch(expected, actual);
+	arg_type_mismatch(expected, actual, arg_idx);
     return FAIL;
 }
 
 /*
+ * Check that the top of the type stack has a type that can be used as a
+ * condition.  Give an error and return FAIL if not.
+ */
+    static int
+bool_on_stack(cctx_T *cctx)
+{
+    garray_T	*stack = &cctx->ctx_type_stack;
+    type_T	*type;
+
+    type = ((type_T **)stack->ga_data)[stack->ga_len - 1];
+    if (type == &t_bool)
+	return OK;
+
+    if (type == &t_any || type == &t_number)
+	// Number 0 and 1 are OK to use as a bool.  "any" could also be a bool.
+	// This requires a runtime type check.
+	return generate_COND2BOOL(cctx);
+
+    return need_type(type, &t_bool, -1, 0, cctx, FALSE, FALSE);
+}
+
+/*
  * Generate an ISN_PUSHNR instruction.
  */
     static int
@@ -894,17 +955,8 @@
     isn->isn_arg.number = number;
 
     if (number == 0 || number == 1)
-    {
-	type_T	*type = get_type_ptr(cctx->ctx_type_list);
-
 	// A 0 or 1 number can also be used as a bool.
-	if (type != NULL)
-	{
-	    type->tt_type = VAR_NUMBER;
-	    type->tt_flags = TTFLAG_BOOL_OK;
-	    ((type_T **)stack->ga_data)[stack->ga_len - 1] = type;
-	}
-    }
+	((type_T **)stack->ga_data)[stack->ga_len - 1] = &t_number_bool;
     return OK;
 }
 
@@ -967,7 +1019,11 @@
 {
     isn_T	*isn;
 
-    RETURN_OK_IF_SKIP(cctx);
+    if (cctx->ctx_skip == SKIP_YES)
+    {
+	vim_free(str);
+	return OK;
+    }
     if ((isn = generate_instr_type(cctx, ISN_PUSHS, &t_string)) == NULL)
 	return FAIL;
     isn->isn_arg.string = str;
@@ -1128,6 +1184,23 @@
 }
 
 /*
+ * Generate an ISN_STOREOUTER instruction.
+ */
+    static int
+generate_STOREOUTER(cctx_T *cctx, int idx, int level)
+{
+    isn_T	*isn;
+
+    RETURN_OK_IF_SKIP(cctx);
+    if ((isn = generate_instr_drop(cctx, ISN_STOREOUTER, 1)) == NULL)
+	return FAIL;
+    isn->isn_arg.outer.outer_idx = idx;
+    isn->isn_arg.outer.outer_depth = level;
+
+    return OK;
+}
+
+/*
  * Generate an ISN_STORENR instruction (short for ISN_PUSHNR + ISN_STORE)
  */
     static int
@@ -1186,6 +1259,27 @@
 }
 
 /*
+ * Generate an ISN_LOADOUTER instruction
+ */
+    static int
+generate_LOADOUTER(
+	cctx_T	    *cctx,
+	int	    idx,
+	int	    nesting,
+	type_T	    *type)
+{
+    isn_T	*isn;
+
+    RETURN_OK_IF_SKIP(cctx);
+    if ((isn = generate_instr_type(cctx, ISN_LOADOUTER, type)) == NULL)
+	return FAIL;
+    isn->isn_arg.outer.outer_idx = idx;
+    isn->isn_arg.outer.outer_depth = nesting;
+
+    return OK;
+}
+
+/*
  * Generate an ISN_LOADV instruction for v:var.
  */
     static int
@@ -1279,6 +1373,8 @@
 	type_T	    *type)
 {
     isn_T	*isn;
+    scriptref_T	*sref;
+    scriptitem_T *si = SCRIPT_ITEM(sid);
 
     RETURN_OK_IF_SKIP(cctx);
     if (isn_type == ISN_LOADSCRIPT)
@@ -1287,8 +1383,17 @@
 	isn = generate_instr_drop(cctx, isn_type, 1);
     if (isn == NULL)
 	return FAIL;
-    isn->isn_arg.script.script_sid = sid;
-    isn->isn_arg.script.script_idx = idx;
+
+    // This requires three arguments, which doesn't fit in an instruction, thus
+    // we need to allocate a struct for this.
+    sref = ALLOC_ONE(scriptref_T);
+    if (sref == NULL)
+	return FAIL;
+    isn->isn_arg.script.scriptref = sref;
+    sref->sref_sid = sid;
+    sref->sref_idx = idx;
+    sref->sref_seq = si->sn_script_seq;
+    sref->sref_type = type;
     return OK;
 }
 
@@ -1380,6 +1485,11 @@
     isn->isn_arg.funcref.fr_func = ufunc->uf_dfunc_idx;
     cctx->ctx_has_closure = 1;
 
+    // if the referenced function is a closure, it may use items further up in
+    // the nested context, including this one.
+    if (ufunc->uf_flags & FC_CLOSURE)
+	cctx->ctx_ufunc->uf_flags |= FC_CLOSURE;
+
     if (ga_grow(stack, 1) == FAIL)
 	return FAIL;
     ((type_T **)stack->ga_data)[stack->ga_len] =
@@ -1391,26 +1501,53 @@
 
 /*
  * Generate an ISN_NEWFUNC instruction.
+ * "lambda_name" and "func_name" must be in allocated memory and will be
+ * consumed.
  */
     static int
 generate_NEWFUNC(cctx_T *cctx, char_u *lambda_name, char_u *func_name)
 {
     isn_T	*isn;
-    char_u	*name;
 
-    RETURN_OK_IF_SKIP(cctx);
-    name = vim_strsave(lambda_name);
-    if (name == NULL)
-	return FAIL;
+    if (cctx->ctx_skip == SKIP_YES)
+    {
+	vim_free(lambda_name);
+	vim_free(func_name);
+	return OK;
+    }
     if ((isn = generate_instr(cctx, ISN_NEWFUNC)) == NULL)
+    {
+	vim_free(lambda_name);
+	vim_free(func_name);
 	return FAIL;
-    isn->isn_arg.newfunc.nf_lambda = name;
+    }
+    isn->isn_arg.newfunc.nf_lambda = lambda_name;
     isn->isn_arg.newfunc.nf_global = func_name;
 
     return OK;
 }
 
 /*
+ * Generate an ISN_DEF instruction: list functions
+ */
+    static int
+generate_DEF(cctx_T *cctx, char_u *name, size_t len)
+{
+    isn_T	*isn;
+
+    RETURN_OK_IF_SKIP(cctx);
+    if ((isn = generate_instr(cctx, ISN_DEF)) == NULL)
+	return FAIL;
+    if (len > 0)
+    {
+	isn->isn_arg.string = vim_strnsave(name, len);
+	if (isn->isn_arg.string == NULL)
+	    return FAIL;
+    }
+    return OK;
+}
+
+/*
  * Generate an ISN_JUMP instruction.
  */
     static int
@@ -1463,6 +1600,7 @@
     garray_T	*stack = &cctx->ctx_type_stack;
     int		argoff;
     type_T	**argtypes = NULL;
+    type_T	*maptype = NULL;
 
     RETURN_OK_IF_SKIP(cctx);
     argoff = check_internal_func(func_idx, argcount);
@@ -1481,8 +1619,11 @@
     {
 	// Check the types of the arguments.
 	argtypes = ((type_T **)stack->ga_data) + stack->ga_len - argcount;
-	if (internal_func_check_arg_types(argtypes, func_idx, argcount) == FAIL)
+	if (internal_func_check_arg_types(argtypes, func_idx, argcount,
+								 cctx) == FAIL)
 	    return FAIL;
+	if (internal_func_is_map(func_idx))
+	    maptype = *argtypes;
     }
 
     if ((isn = generate_instr(cctx, ISN_BCALL)) == NULL)
@@ -1498,6 +1639,11 @@
 			  internal_func_ret_type(func_idx, argcount, argtypes);
     ++stack->ga_len;
 
+    if (maptype != NULL && maptype->tt_member != NULL
+					       && maptype->tt_member != &t_any)
+	// Check that map() didn't change the item types.
+	generate_TYPECHECK(cctx, maptype, -1, 1);
+
     return OK;
 }
 
@@ -1517,7 +1663,7 @@
     list_type = ((type_T **)stack->ga_data)[stack->ga_len - 2];
     item_type = ((type_T **)stack->ga_data)[stack->ga_len - 1];
     expected = list_type->tt_member;
-    if (need_type(item_type, expected, -1, cctx, FALSE, FALSE) == FAIL)
+    if (need_type(item_type, expected, -1, 0, cctx, FALSE, FALSE) == FAIL)
 	return FAIL;
 
     if (generate_instr(cctx, ISN_LISTAPPEND) == NULL)
@@ -1539,7 +1685,7 @@
 
     // Caller already checked that blob_type is a blob.
     item_type = ((type_T **)stack->ga_data)[stack->ga_len - 1];
-    if (need_type(item_type, &t_number, -1, cctx, FALSE, FALSE) == FAIL)
+    if (need_type(item_type, &t_number, -1, 0, cctx, FALSE, FALSE) == FAIL)
 	return FAIL;
 
     if (generate_instr(cctx, ISN_BLOBAPPEND) == NULL)
@@ -1550,6 +1696,34 @@
 }
 
 /*
+ * Return TRUE if "ufunc" should be compiled, taking into account whether
+ * "profile" indicates profiling is to be done.
+ */
+    int
+func_needs_compiling(ufunc_T *ufunc, int profile UNUSED)
+{
+    switch (ufunc->uf_def_status)
+    {
+	case UF_NOT_COMPILED: break;
+	case UF_TO_BE_COMPILED: return TRUE;
+	case UF_COMPILED:
+	{
+#ifdef FEAT_PROFILE
+	    dfunc_T *dfunc = ((dfunc_T *)def_functions.ga_data)
+							 + ufunc->uf_dfunc_idx;
+
+	    return profile ? dfunc->df_instr_prof == NULL
+			   : dfunc->df_instr == NULL;
+#else
+	    break;
+#endif
+	}
+	case UF_COMPILING: break;
+    }
+    return FALSE;
+}
+
+/*
  * Generate an ISN_DCALL or ISN_UCALL instruction.
  * Return FAIL if the number of arguments is wrong.
  */
@@ -1594,17 +1768,17 @@
 	    else
 		expected = ufunc->uf_va_type->tt_member;
 	    actual = ((type_T **)stack->ga_data)[stack->ga_len - argcount + i];
-	    if (need_type(actual, expected, -argcount + i, cctx,
+	    if (need_type(actual, expected, -argcount + i, i + 1, cctx,
 							  TRUE, FALSE) == FAIL)
 	    {
 		arg_type_mismatch(expected, actual, i + 1);
 		return FAIL;
 	    }
 	}
-	if (ufunc->uf_def_status == UF_TO_BE_COMPILED)
-	    if (compile_def_function(ufunc, ufunc->uf_ret_type == NULL, NULL)
-								       == FAIL)
-		return FAIL;
+	if (func_needs_compiling(ufunc, PROFILING(ufunc))
+		&& compile_def_function(ufunc, ufunc->uf_ret_type == NULL,
+					       PROFILING(ufunc), NULL) == FAIL)
+	    return FAIL;
     }
 
     if ((isn = generate_instr(cctx,
@@ -1687,14 +1861,38 @@
 
 	    if (argcount < type->tt_min_argcount - varargs)
 	    {
-		semsg(_(e_toofewarg), "[reference]");
+		semsg(_(e_toofewarg), name);
 		return FAIL;
 	    }
 	    if (!varargs && argcount > type->tt_argcount)
 	    {
-		semsg(_(e_toomanyarg), "[reference]");
+		semsg(_(e_toomanyarg), name);
 		return FAIL;
 	    }
+	    if (type->tt_args != NULL)
+	    {
+		int i;
+
+		for (i = 0; i < argcount; ++i)
+		{
+		    int	    offset = -argcount + i - 1;
+		    type_T *actual = ((type_T **)stack->ga_data)[
+						       stack->ga_len + offset];
+		    type_T *expected;
+
+		    if (varargs && i >= type->tt_argcount - 1)
+			expected = type->tt_args[
+					     type->tt_argcount - 1]->tt_member;
+		    else
+			expected = type->tt_args[i];
+		    if (need_type(actual, expected, offset, i + 1,
+						    cctx, TRUE, FALSE) == FAIL)
+		    {
+			arg_type_mismatch(expected, actual, i + 1);
+			return FAIL;
+		    }
+		}
+	    }
 	}
 	ret_type = type->tt_member;
     }
@@ -1746,7 +1944,10 @@
     }
     // change dict type to dict member type
     if (type->tt_type == VAR_DICT)
-	((type_T **)stack->ga_data)[stack->ga_len - 1] = type->tt_member;
+    {
+	((type_T **)stack->ga_data)[stack->ga_len - 1] =
+		      type->tt_member == &t_unknown ? &t_any : type->tt_member;
+    }
 
     return OK;
 }
@@ -1823,6 +2024,39 @@
 }
 
 /*
+ * Generate ISN_RANGE.  Consumes "range".  Return OK/FAIL.
+ */
+    static int
+generate_RANGE(cctx_T *cctx, char_u *range)
+{
+    isn_T	*isn;
+    garray_T	*stack = &cctx->ctx_type_stack;
+
+    if ((isn = generate_instr(cctx, ISN_RANGE)) == NULL)
+	return FAIL;
+    isn->isn_arg.string = range;
+
+    if (ga_grow(stack, 1) == FAIL)
+	return FAIL;
+    ((type_T **)stack->ga_data)[stack->ga_len] = &t_number;
+    ++stack->ga_len;
+    return OK;
+}
+
+    static int
+generate_UNPACK(cctx_T *cctx, int var_count, int semicolon)
+{
+    isn_T	*isn;
+
+    RETURN_OK_IF_SKIP(cctx);
+    if ((isn = generate_instr(cctx, ISN_UNPACK)) == NULL)
+	return FAIL;
+    isn->isn_arg.unpack.unp_count = var_count;
+    isn->isn_arg.unpack.unp_semicolon = semicolon;
+    return OK;
+}
+
+/*
  * Generate an instruction for any command modifiers.
  */
     static int
@@ -1844,7 +2078,7 @@
 	if (isn->isn_arg.cmdmod.cf_cmdmod == NULL)
 	    return FAIL;
 	mch_memmove(isn->isn_arg.cmdmod.cf_cmdmod, cmod, sizeof(cmdmod_T));
-	// filter progam now belongs to the instruction
+	// filter program now belongs to the instruction
 	cmod->cmod_filter_regmatch.regprog = NULL;
     }
 
@@ -1854,17 +2088,21 @@
     static int
 generate_undo_cmdmods(cctx_T *cctx)
 {
-    isn_T	*isn;
-
-    if (cctx->ctx_has_cmdmod)
-    {
-	if ((isn = generate_instr(cctx, ISN_CMDMOD_REV)) == NULL)
-	    return FAIL;
-    }
-
+    if (cctx->ctx_has_cmdmod && generate_instr(cctx, ISN_CMDMOD_REV) == NULL)
+	return FAIL;
+    cctx->ctx_has_cmdmod = FALSE;
     return OK;
 }
 
+#ifdef FEAT_PROFILE
+    static void
+may_generate_prof_end(cctx_T *cctx, int prof_lnum)
+{
+    if (cctx->ctx_profiling && prof_lnum >= 0)
+	generate_instr(cctx, ISN_PROF_END);
+}
+#endif
+
 /*
  * Reserve space for a local variable.
  * Return the variable or NULL if it failed.
@@ -1934,10 +2172,29 @@
 }
 
 /*
+ * If "check_writable" is ASSIGN_CONST give an error if the variable was
+ * defined with :final or :const, if "check_writable" is ASSIGN_FINAL give an
+ * error if the variable was defined with :const.
+ */
+    static int
+check_item_writable(svar_T *sv, int check_writable, char_u *name)
+{
+    if ((check_writable == ASSIGN_CONST && sv->sv_const != 0)
+	    || (check_writable == ASSIGN_FINAL
+					      && sv->sv_const == ASSIGN_CONST))
+    {
+	semsg(_(e_readonlyvar), name);
+	return FAIL;
+    }
+    return OK;
+}
+
+/*
  * Find "name" in script-local items of script "sid".
+ * Pass "check_writable" to check_item_writable().
  * Returns the index in "sn_var_vals" if found.
  * If found but not in "sn_var_vals" returns -1.
- * If not found returns -2.
+ * If not found or the variable is not writable returns -2.
  */
     int
 get_script_item_idx(int sid, char_u *name, int check_writable, cctx_T *cctx)
@@ -1958,8 +2215,8 @@
 	    return -2;
 	idx = sav->sav_var_vals_idx;
 	sv = ((svar_T *)si->sn_var_vals.ga_data) + idx;
-	if (check_writable && sv->sv_const)
-	    semsg(_(e_readonlyvar), name);
+	if (check_item_writable(sv, check_writable, name) == FAIL)
+	    return -2;
 	return idx;
     }
 
@@ -1975,8 +2232,8 @@
 	sv = ((svar_T *)si->sn_var_vals.ga_data) + idx;
 	if (sv->sv_tv == &di->di_tv)
 	{
-	    if (check_writable && sv->sv_const)
-		semsg(_(e_readonlyvar), name);
+	    if (check_item_writable(sv, check_writable, name) == FAIL)
+		return -2;
 	    return idx;
 	}
     }
@@ -2048,15 +2305,6 @@
 }
 
 /*
- * Return TRUE if "p" points at a "#" but not at "#{".
- */
-    int
-vim9_comment_start(char_u *p)
-{
-    return p[0] == '#' && p[1] != '{';
-}
-
-/*
  * Return a pointer to the next line that isn't empty or only contains a
  * comment. Skips over white space.
  * Returns NULL if there is none.
@@ -2130,6 +2378,7 @@
 }
 
 /*
+ * Skip over white space at "whitep" and assign to "*arg".
  * If "*arg" is at the end of the line, advance to the next line.
  * Also when "whitep" points to white space and "*arg" is on a "#".
  * Return FAIL if beyond the last line, "*arg" is unmodified then.
@@ -2137,6 +2386,7 @@
     static int
 may_get_next_line(char_u *whitep, char_u **arg, cctx_T *cctx)
 {
+    *arg = skipwhite(whitep);
     if (**arg == NUL || (VIM_ISWHITE(*whitep) && vim9_comment_start(*arg)))
     {
 	char_u *next = next_line_from_context(cctx, TRUE);
@@ -2156,6 +2406,7 @@
 {
     if (may_get_next_line(whitep, arg, cctx) == FAIL)
     {
+	SOURCING_LNUM = cctx->ctx_lnum + 1;
 	emsg(_(e_line_incomplete));
 	return FAIL;
     }
@@ -2279,7 +2530,7 @@
     if (!SCRIPT_ID_VALID(current_sctx.sc_sid))
 	return FAIL;
     si = SCRIPT_ITEM(current_sctx.sc_sid);
-    idx = get_script_item_idx(current_sctx.sc_sid, name, FALSE, cctx);
+    idx = get_script_item_idx(current_sctx.sc_sid, name, 0, cctx);
     if (idx == -1 || si->sn_version != SCRIPT_VERSION_VIM9)
     {
 	// variable is not in sn_var_vals: old style script.
@@ -2298,7 +2549,7 @@
     import = find_imported(name, 0, cctx);
     if (import != NULL)
     {
-	if (import->imp_all)
+	if (import->imp_flags & IMP_FLAGS_STAR)
 	{
 	    char_u	*p = skipwhite(*end);
 	    char_u	*exp_name;
@@ -2364,9 +2615,10 @@
 	return FAIL;
 
     // Need to compile any default values to get the argument types.
-    if (ufunc->uf_def_status == UF_TO_BE_COMPILED)
-	if (compile_def_function(ufunc, TRUE, NULL) == FAIL)
-	    return FAIL;
+    if (func_needs_compiling(ufunc, PROFILING(ufunc))
+	    && compile_def_function(ufunc, TRUE, PROFILING(ufunc), NULL)
+								       == FAIL)
+	return FAIL;
     return generate_PUSHFUNC(cctx, ufunc->uf_name, ufunc->uf_func_type);
 }
 
@@ -2426,11 +2678,22 @@
 		case 's': res = compile_load_scriptvar(cctx, name,
 							    NULL, NULL, error);
 			  break;
-		case 'g': isn_type = ISN_LOADG; break;
+		case 'g': if (vim_strchr(name, AUTOLOAD_CHAR) == NULL)
+			      isn_type = ISN_LOADG;
+			  else
+			  {
+			      isn_type = ISN_LOADAUTO;
+			      vim_free(name);
+			      name = vim_strnsave(*arg, end - *arg);
+			      if (name == NULL)
+				  return FAIL;
+			  }
+			  break;
 		case 'w': isn_type = ISN_LOADW; break;
 		case 't': isn_type = ISN_LOADT; break;
 		case 'b': isn_type = ISN_LOADB; break;
-		default:  semsg(_(e_namespace_not_supported_str), *arg);
+		default:  // cannot happen, just in case
+			  semsg(_(e_namespace_not_supported_str), *arg);
 			  goto theend;
 	    }
 	    if (isn_type != ISN_DROP)
@@ -2447,7 +2710,7 @@
 	size_t	    len = end - *arg;
 	int	    idx;
 	int	    gen_load = FALSE;
-	int	    gen_load_outer = FALSE;
+	int	    gen_load_outer = 0;
 
 	name = vim_strnsave(*arg, end - *arg);
 	if (name == NULL)
@@ -2455,19 +2718,19 @@
 
 	if (arg_exists(*arg, len, &idx, &type, &gen_load_outer, cctx) == OK)
 	{
-	    if (!gen_load_outer)
+	    if (gen_load_outer == 0)
 		gen_load = TRUE;
 	}
 	else
 	{
-	    lvar_T *lvar = lookup_local(*arg, len, cctx);
+	    lvar_T lvar;
 
-	    if (lvar != NULL)
+	    if (lookup_local(*arg, len, &lvar, cctx) == OK)
 	    {
-		type = lvar->lv_type;
-		idx = lvar->lv_idx;
-		if (lvar->lv_from_outer)
-		    gen_load_outer = TRUE;
+		type = lvar.lv_type;
+		idx = lvar.lv_idx;
+		if (lvar.lv_from_outer != 0)
+		    gen_load_outer = lvar.lv_from_outer;
 		else
 		    gen_load = TRUE;
 	    }
@@ -2489,9 +2752,9 @@
 	}
 	if (gen_load)
 	    res = generate_LOAD(cctx, ISN_LOAD, idx, NULL, type);
-	if (gen_load_outer)
+	if (gen_load_outer > 0)
 	{
-	    res = generate_LOAD(cctx, ISN_LOADOUTER, idx, NULL, type);
+	    res = generate_LOADOUTER(cctx, idx, gen_load_outer, type);
 	    cctx->ctx_outer_used = TRUE;
 	}
     }
@@ -2580,7 +2843,7 @@
     char_u	fname_buf[FLEN_FIXED + 1];
     char_u	*tofree = NULL;
     int		error = FCERR_NONE;
-    ufunc_T	*ufunc;
+    ufunc_T	*ufunc = NULL;
     int		res = FAIL;
     int		is_autoload;
 
@@ -2596,7 +2859,8 @@
 	else if (*s == '\'')
 	    (void)eval_lit_string(&s, &argvars[0], TRUE);
 	s = skipwhite(s);
-	if (*s == ')' && argvars[0].v_type == VAR_STRING)
+	if (*s == ')' && argvars[0].v_type == VAR_STRING
+		&& !dynamic_feature(argvars[0].vval.v_string))
 	{
 	    typval_T	*tv = &ppconst->pp_tv[ppconst->pp_used];
 
@@ -2627,7 +2891,7 @@
     if (compile_arguments(arg, cctx, &argcount) == FAIL)
 	goto theend;
 
-    is_autoload = vim_strchr(name, '#') != NULL;
+    is_autoload = vim_strchr(name, AUTOLOAD_CHAR) != NULL;
     if (ASCII_ISLOWER(*name) && name[1] != ':' && !is_autoload)
     {
 	int	    idx;
@@ -2642,6 +2906,7 @@
 		type_T	    *type = ((type_T **)stack->ga_data)[
 							    stack->ga_len - 2];
 
+		// add() can be compiled to instructions if we know the type
 		if (type->tt_type == VAR_LIST)
 		{
 		    // inline "add(list, item)" so that the type can be checked
@@ -2664,13 +2929,19 @@
 	goto theend;
     }
 
-    // If we can find the function by name generate the right call.
-    // Skip global functions here, a local funcref takes precedence.
-    ufunc = find_func(name, FALSE, cctx);
-    if (ufunc != NULL && !func_is_global(ufunc))
-    {
-	res = generate_CALL(cctx, ufunc, argcount);
-	goto theend;
+    // An argument or local variable can be a function reference, this
+    // overrules a function name.
+    if (lookup_local(namebuf, varlen, NULL, cctx) == FAIL
+	    && arg_exists(namebuf, varlen, NULL, NULL, NULL, cctx) != OK)
+    {
+	// If we can find the function by name generate the right call.
+	// Skip global functions here, a local funcref takes precedence.
+	ufunc = find_func(name, FALSE, cctx);
+	if (ufunc != NULL && !func_is_global(ufunc))
+	{
+	    res = generate_CALL(cctx, ufunc, argcount);
+	    goto theend;
+	}
     }
 
     // If the name is a variable, load it and use PCALL.
@@ -2681,9 +2952,8 @@
 	    && compile_load(&p, namebuf + varlen, cctx, FALSE, FALSE) == OK)
     {
 	garray_T    *stack = &cctx->ctx_type_stack;
-	type_T	    *type;
+	type_T	    *type = ((type_T **)stack->ga_data)[stack->ga_len - 1];
 
-	type = ((type_T **)stack->ga_data)[stack->ga_len - 1];
 	res = generate_PCALL(cctx, argcount, namebuf, type, FALSE);
 	goto theend;
     }
@@ -2713,12 +2983,12 @@
 /*
  * Find the end of a variable or function name.  Unlike find_name_end() this
  * does not recognize magic braces.
- * When "namespace" is TRUE recognize "b:", "s:", etc.
+ * When "use_namespace" is TRUE recognize "b:", "s:", etc.
  * Return a pointer to just after the name.  Equal to "arg" if there is no
  * valid name.
  */
-    static char_u *
-to_name_end(char_u *arg, int namespace)
+    char_u *
+to_name_end(char_u *arg, int use_namespace)
 {
     char_u	*p;
 
@@ -2730,7 +3000,7 @@
 	// Include a namespace such as "s:var" and "v:var".  But "n:" is not
 	// and can be used in slice "[n:]".
 	if (*p == ':' && (p != arg + 1
-			     || !namespace
+			     || !use_namespace
 			     || vim_strchr(VIM9_NAMESPACE_CHAR, *arg) == NULL))
 	    break;
     return p;
@@ -2753,14 +3023,6 @@
 	if (eval_list(&p, &rettv, NULL, FALSE) == FAIL)
 	    p = arg;
     }
-    else if (p == arg && *arg == '#' && arg[1] == '{')
-    {
-	// Can be "#{a: 1}->Func()".
-	++p;
-	if (eval_dict(&p, &rettv, NULL, TRUE) == FAIL)
-	    p = arg;
-    }
-
     return p;
 }
 
@@ -2819,12 +3081,14 @@
 }
 
 /*
- * parse a lambda: {arg, arg -> expr}
+ * Parse a lambda: "(arg, arg) => expr"
  * "*arg" points to the '{'.
+ * Returns OK/FAIL when a lambda is recognized, NOTDONE if it's not a lambda.
  */
     static int
 compile_lambda(char_u **arg, cctx_T *cctx)
 {
+    int		r;
     typval_T	rettv;
     ufunc_T	*ufunc;
     evalarg_T	evalarg;
@@ -2834,20 +3098,20 @@
     evalarg.eval_cctx = cctx;
 
     // Get the funcref in "rettv".
-    if (get_lambda_tv(arg, &rettv, &evalarg) != OK)
+    r = get_lambda_tv(arg, &rettv, TRUE, &evalarg);
+    if (r != OK)
     {
 	clear_evalarg(&evalarg, NULL);
-	return FAIL;
+	return r;
     }
 
+    // "rettv" will now be a partial referencing the function.
     ufunc = rettv.vval.v_partial->pt_func;
     ++ufunc->uf_refcount;
     clear_tv(&rettv);
-    ga_init2(&ufunc->uf_type_list, sizeof(type_T *), 10);
 
-    // The function will have one line: "return {expr}".
-    // Compile it into instructions.
-    compile_def_function(ufunc, TRUE, cctx);
+    // Compile the function into instructions.
+    compile_def_function(ufunc, TRUE, PROFILING(ufunc), cctx);
 
     clear_evalarg(&evalarg, NULL);
 
@@ -2867,75 +3131,30 @@
 }
 
 /*
- * Compile a lamda call: expr->{lambda}(args)
- * "arg" points to the "{".
- */
-    static int
-compile_lambda_call(char_u **arg, cctx_T *cctx)
-{
-    ufunc_T	*ufunc;
-    typval_T	rettv;
-    int		argcount = 1;
-    int		ret = FAIL;
-
-    // Get the funcref in "rettv".
-    if (get_lambda_tv(arg, &rettv, &EVALARG_EVALUATE) == FAIL)
-	return FAIL;
-
-    if (**arg != '(')
-    {
-	if (*skipwhite(*arg) == '(')
-	    emsg(_(e_nowhitespace));
-	else
-	    semsg(_(e_missing_paren), "lambda");
-	clear_tv(&rettv);
-	return FAIL;
-    }
-
-    ufunc = rettv.vval.v_partial->pt_func;
-    ++ufunc->uf_refcount;
-    clear_tv(&rettv);
-    ga_init2(&ufunc->uf_type_list, sizeof(type_T *), 10);
-
-    // The function will have one line: "return {expr}".  Compile it into
-    // instructions so that we get any errors right now.
-    compile_def_function(ufunc, TRUE, cctx);
-
-    // compile the arguments
-    *arg = skipwhite(*arg + 1);
-    if (compile_arguments(arg, cctx, &argcount) == OK)
-	// call the compiled function
-	ret = generate_CALL(cctx, ufunc, argcount);
-
-    if (ret == FAIL)
-	func_ptr_unref(ufunc);
-    return ret;
-}
-
-/*
- * parse a dict: {'key': val} or #{key: val}
+ * parse a dict: {key: val, [key]: val}
  * "*arg" points to the '{'.
  * ppconst->pp_is_const is set if all item values are a constant.
  */
     static int
-compile_dict(char_u **arg, cctx_T *cctx, int literal, ppconst_T *ppconst)
+compile_dict(char_u **arg, cctx_T *cctx, ppconst_T *ppconst)
 {
     garray_T	*instr = &cctx->ctx_instr;
     garray_T	*stack = &cctx->ctx_type_stack;
     int		count = 0;
     dict_T	*d = dict_alloc();
     dictitem_T	*item;
-    char_u	*whitep = *arg;
+    char_u	*whitep = *arg + 1;
     char_u	*p;
     int		is_const;
     int		is_all_const = TRUE;	// reset when non-const encountered
 
     if (d == NULL)
 	return FAIL;
-    *arg = skipwhite(*arg + 1);
+    if (generate_ppconst(cctx, ppconst) == FAIL)
+	return FAIL;
     for (;;)
     {
-	char_u *key = NULL;
+	char_u	    *key = NULL;
 
 	if (may_get_next_line(whitep, arg, cctx) == FAIL)
 	{
@@ -2946,25 +3165,13 @@
 	if (**arg == '}')
 	    break;
 
-	if (literal)
+	if (**arg == '[')
 	{
-	    char_u *end = to_name_end(*arg, !literal);
+	    isn_T	*isn;
 
-	    if (end == *arg)
-	    {
-		semsg(_(e_invalid_key_str), *arg);
-		return FAIL;
-	    }
-	    key = vim_strnsave(*arg, end - *arg);
-	    if (generate_PUSHS(cctx, key) == FAIL)
-		return FAIL;
-	    *arg = end;
-	}
-	else
-	{
-	    isn_T		*isn;
-
-	    if (compile_expr0(arg, cctx) == FAIL)
+	    // {[expr]: value} uses an evaluated key.
+	    *arg = skipwhite(*arg + 1);
+	    if (compile_expr0(arg, cctx) == FAIL)
 		return FAIL;
 	    isn = ((isn_T *)instr->ga_data) + instr->ga_len - 1;
 	    if (isn->isn_type == ISN_PUSHS)
@@ -2972,11 +3179,29 @@
 	    else
 	    {
 		type_T *keytype = ((type_T **)stack->ga_data)
-							   [stack->ga_len - 1];
-		if (need_type(keytype, &t_string, -1, cctx,
-							 FALSE, FALSE) == FAIL)
+						       [stack->ga_len - 1];
+		if (need_type(keytype, &t_string, -1, 0, cctx,
+						     FALSE, FALSE) == FAIL)
 		    return FAIL;
 	    }
+	    *arg = skipwhite(*arg);
+	    if (**arg != ']')
+	    {
+		emsg(_(e_missing_matching_bracket_after_dict_key));
+		return FAIL;
+	    }
+	    ++*arg;
+	}
+	else
+	{
+	    // {"name": value},
+	    // {'name': value},
+	    // {name: value} use "name" as a literal key
+	    key = get_literal_key(arg);
+	    if (key == NULL)
+		return FAIL;
+	    if (generate_PUSHS(cctx, key) == FAIL)
+		return FAIL;
 	}
 
 	// Check for duplicate keys, if using string keys.
@@ -3013,7 +3238,6 @@
 	    return FAIL;
 	}
 
-	*arg = skipwhite(*arg + 1);
 	if (may_get_next_line(whitep, arg, cctx) == FAIL)
 	{
 	    *arg = NULL;
@@ -3027,7 +3251,6 @@
 	++count;
 
 	whitep = *arg;
-	*arg = skipwhite(*arg);
 	if (may_get_next_line(whitep, arg, cctx) == FAIL)
 	{
 	    *arg = NULL;
@@ -3091,8 +3314,9 @@
     if (ret == OK)
     {
 	// include the '&' in the name, eval_option() expects it.
-	char_u *name = vim_strnsave(start, *arg - start);
-	type_T	*type = rettv.v_type == VAR_NUMBER ? &t_number : &t_string;
+	char_u	*name = vim_strnsave(start, *arg - start);
+	type_T	*type = rettv.v_type == VAR_BOOL ? &t_bool
+			  : rettv.v_type == VAR_NUMBER ? &t_number : &t_string;
 
 	ret = generate_LOAD(cctx, ISN_LOADOPT, 0, name, type);
 	vim_free(name);
@@ -3245,10 +3469,10 @@
     }
 }
 
-    exptype_T
+    exprtype_T
 get_compare_type(char_u *p, int *len, int *type_is)
 {
-    exptype_T	type = EXPR_UNKNOWN;
+    exprtype_T	type = EXPR_UNKNOWN;
     int		i;
 
     switch (p[0])
@@ -3297,6 +3521,19 @@
 }
 
 /*
+ * Skip over an expression, ignoring most errors.
+ */
+    static void
+skip_expr_cctx(char_u **arg, cctx_T *cctx)
+{
+    evalarg_T	evalarg;
+
+    CLEAR_FIELD(evalarg);
+    evalarg.eval_cctx = cctx;
+    skip_expr(arg, &evalarg);
+}
+
+/*
  * Compile code to apply '-', '+' and '!'.
  * When "numeric_only" is TRUE do not apply '!'.
  */
@@ -3309,6 +3546,8 @@
     while (p > start)
     {
 	--p;
+	while (VIM_ISWHITE(*p))
+	    --p;
 	if (*p == '-' || *p == '+')
 	{
 	    int	    negate = *p == '-';
@@ -3353,6 +3592,41 @@
 }
 
 /*
+ * Compile "(expression)": recursive!
+ * Return FAIL/OK.
+ */
+    static int
+compile_parenthesis(char_u **arg, cctx_T *cctx, ppconst_T *ppconst)
+{
+    int	    ret;
+    char_u  *p = *arg + 1;
+
+    if (may_get_next_line_error(p, arg, cctx) == FAIL)
+	return FAIL;
+    if (ppconst->pp_used <= PPSIZE - 10)
+    {
+	ret = compile_expr1(arg, cctx, ppconst);
+    }
+    else
+    {
+	// Not enough space in ppconst, flush constants.
+	if (generate_ppconst(cctx, ppconst) == FAIL)
+	    return FAIL;
+	ret = compile_expr0(arg, cctx);
+    }
+    if (may_get_next_line_error(*arg, arg, cctx) == FAIL)
+	return FAIL;
+    if (**arg == ')')
+	++*arg;
+    else if (ret == OK)
+    {
+	emsg(_(e_missing_close));
+	ret = FAIL;
+    }
+    return ret;
+}
+
+/*
  * Compile whatever comes after "name" or "name()".
  * Advances "*arg" only when something was recognized.
  */
@@ -3390,7 +3664,7 @@
 	    }
 	}
 
-	// Do not skip over white space to find the "(", "exeucte 'x' ()" is
+	// Do not skip over white space to find the "(", "execute 'x' ()" is
 	// not a function call.
 	if (**arg == '(')
 	{
@@ -3428,10 +3702,47 @@
 	    p += 2;
 	    *arg = skipwhite(p);
 	    // No line break supported right after "->".
-	    if (**arg == '{')
+	    if (**arg == '(')
 	    {
-		// lambda call:  list->{lambda}
-		if (compile_lambda_call(arg, cctx) == FAIL)
+		int	    argcount = 1;
+		char_u	    *expr;
+		garray_T    *stack;
+		type_T	    *type;
+
+		// Funcref call:  list->(Refs[2])(arg)
+		// or lambda:	  list->((arg) => expr)(arg)
+		// Fist compile the arguments.
+		expr = *arg;
+		*arg = skipwhite(*arg + 1);
+		skip_expr_cctx(arg, cctx);
+		*arg = skipwhite(*arg);
+		if (**arg != ')')
+		{
+		    semsg(_(e_missing_paren), *arg);
+		    return FAIL;
+		}
+		++*arg;
+		if (**arg != '(')
+		{
+		    if (*skipwhite(*arg) == '(')
+			emsg(_(e_nowhitespace));
+		    else
+			semsg(_(e_missing_paren), *arg);
+		    return FAIL;
+		}
+
+		*arg = skipwhite(*arg + 1);
+		if (compile_arguments(arg, cctx, &argcount) == FAIL)
+		    return FAIL;
+
+		// Compile the function expression.
+		if (compile_parenthesis(&expr, cctx, ppconst) == FAIL)
+		    return FAIL;
+
+		stack = &cctx->ctx_type_stack;
+		type = ((type_T **)stack->ga_data)[stack->ga_len - 1];
+		if (generate_PCALL(cctx, argcount,
+				(char_u *)"[expression]", type, FALSE) == FAIL)
 		    return FAIL;
 	    }
 	    else
@@ -3476,24 +3787,38 @@
 	    ppconst->pp_is_const = FALSE;
 
 	    ++p;
-	    *arg = skipwhite(p);
 	    if (may_get_next_line_error(p, arg, cctx) == FAIL)
 		return FAIL;
 	    if (**arg == ':')
+	    {
 		// missing first index is equal to zero
 		generate_PUSHNR(cctx, 0);
+	    }
 	    else
 	    {
 		if (compile_expr0(arg, cctx) == FAIL)
 		    return FAIL;
-		if (may_get_next_line_error(p, arg, cctx) == FAIL)
+		if (**arg == ':')
+		{
+		    semsg(_(e_white_space_required_before_and_after_str_at_str),
+								    ":", *arg);
+		    return FAIL;
+		}
+		if (may_get_next_line_error(*arg, arg, cctx) == FAIL)
 		    return FAIL;
 		*arg = skipwhite(*arg);
 	    }
 	    if (**arg == ':')
 	    {
-		*arg = skipwhite(*arg + 1);
-		if (may_get_next_line_error(p, arg, cctx) == FAIL)
+		is_slice = TRUE;
+		++*arg;
+		if (!IS_WHITE_OR_NUL(**arg) && **arg != ']')
+		{
+		    semsg(_(e_white_space_required_before_and_after_str_at_str),
+								    ":", *arg);
+		    return FAIL;
+		}
+		if (may_get_next_line_error(*arg, arg, cctx) == FAIL)
 		    return FAIL;
 		if (**arg == ']')
 		    // missing second index is equal to end of string
@@ -3501,12 +3826,11 @@
 		else
 		{
 		    if (compile_expr0(arg, cctx) == FAIL)
-		    return FAIL;
-		    if (may_get_next_line_error(p, arg, cctx) == FAIL)
+			return FAIL;
+		    if (may_get_next_line_error(*arg, arg, cctx) == FAIL)
 			return FAIL;
 		    *arg = skipwhite(*arg);
 		}
-		is_slice = TRUE;
 	    }
 
 	    if (**arg != ']')
@@ -3529,13 +3853,13 @@
 		vtype = VAR_DICT;
 	    if (vtype == VAR_STRING || vtype == VAR_LIST || vtype == VAR_BLOB)
 	    {
-		if (need_type(valtype, &t_number, -1, cctx,
+		if (need_type(valtype, &t_number, -1, 0, cctx,
 							 FALSE, FALSE) == FAIL)
 		    return FAIL;
 		if (is_slice)
 		{
 		    valtype = ((type_T **)stack->ga_data)[stack->ga_len - 2];
-		    if (need_type(valtype, &t_number, -2, cctx,
+		    if (need_type(valtype, &t_number, -2, 0, cctx,
 							 FALSE, FALSE) == FAIL)
 			return FAIL;
 		}
@@ -3549,10 +3873,15 @@
 		    return FAIL;
 		}
 		if ((*typep)->tt_type == VAR_DICT)
+		{
 		    *typep = (*typep)->tt_member;
+		    if (*typep == &t_unknown)
+			// empty dict was used
+			*typep = &t_any;
+		}
 		else
 		{
-		    if (need_type(*typep, &t_dict_any, -2, cctx,
+		    if (need_type(*typep, &t_dict_any, -2, 0, cctx,
 							 FALSE, FALSE) == FAIL)
 			return FAIL;
 		    *typep = &t_any;
@@ -3587,7 +3916,12 @@
 		else
 		{
 		    if ((*typep)->tt_type == VAR_LIST)
+		    {
 			*typep = (*typep)->tt_member;
+			if (*typep == &t_unknown)
+			    // empty list was used
+			    *typep = &t_any;
+		    }
 		    if (generate_instr_drop(cctx,
 			     vtype == VAR_LIST ?  ISN_LISTINDEX : ISN_ANYINDEX,
 								    1) == FAIL)
@@ -3660,8 +3994,7 @@
  *  $VAR		environment variable
  *  (expression)	nested expression
  *  [expr, expr]	List
- *  {key: val, key: val}   Dictionary
- *  #{key: val, key: val}  Dictionary with literal keys
+ *  {key: val, [key]: val}   Dictionary
  *
  *  Also handle:
  *  ! in front		logical NOT
@@ -3689,8 +4022,8 @@
      * Skip '!', '-' and '+' characters.  They are handled later.
      */
     start_leader = *arg;
-    while (**arg == '!' || **arg == '-' || **arg == '+')
-	*arg = skipwhite(*arg + 1);
+    if (eval_leader(arg, TRUE) == FAIL)
+	return FAIL;
     end_leader = *arg;
 
     rettv->v_type = VAR_UNKNOWN;
@@ -3772,38 +4105,29 @@
 		    break;
 
 	/*
-	 * List: [expr, expr]
-	 */
-	case '[':   ret = compile_list(arg, cctx, ppconst);
-		    break;
-
-	/*
-	 * Dictionary: #{key: val, key: val}
+	 * "null" constant
 	 */
-	case '#':   if ((*arg)[1] == '{')
+	case 'n':   if (STRNCMP(*arg, "null", 4) == 0
+						   && !eval_isnamec((*arg)[5]))
 		    {
-			++*arg;
-			ret = compile_dict(arg, cctx, TRUE, ppconst);
+			*arg += 4;
+			rettv->v_type = VAR_SPECIAL;
+			rettv->vval.v_number = VVAL_NULL;
 		    }
 		    else
 			ret = NOTDONE;
 		    break;
 
 	/*
-	 * Lambda: {arg, arg -> expr}
-	 * Dictionary: {'key': val, 'key': val}
+	 * List: [expr, expr]
 	 */
-	case '{':   {
-			char_u *start = skipwhite(*arg + 1);
+	case '[':   ret = compile_list(arg, cctx, ppconst);
+		    break;
 
-			// Find out what comes after the arguments.
-			ret = get_function_args(&start, '-', NULL,
-					   NULL, NULL, NULL, TRUE, NULL, NULL);
-			if (ret != FAIL && *start == '>')
-			    ret = compile_lambda(arg, cctx);
-			else
-			    ret = compile_dict(arg, cctx, FALSE, ppconst);
-		    }
+	/*
+	 * Dictionary: {'key': val, 'key': val}
+	 */
+	case '{':   ret = compile_dict(arg, cctx, ppconst);
 		    break;
 
 	/*
@@ -3831,29 +4155,13 @@
 			break;
 	/*
 	 * nested expression: (expression).
+	 * lambda: (arg, arg) => expr
+	 * funcref: (arg, arg) => { statement }
 	 */
-	case '(':   *arg = skipwhite(*arg + 1);
-
-		    // recursive!
-		    if (ppconst->pp_used <= PPSIZE - 10)
-		    {
-			ret = compile_expr1(arg, cctx, ppconst);
-		    }
-		    else
-		    {
-			// Not enough space in ppconst, flush constants.
-			if (generate_ppconst(cctx, ppconst) == FAIL)
-			    return FAIL;
-			ret = compile_expr0(arg, cctx);
-		    }
-		    *arg = skipwhite(*arg);
-		    if (**arg == ')')
-			++*arg;
-		    else if (ret == OK)
-		    {
-			emsg(_(e_missing_close));
-			ret = FAIL;
-		    }
+	case '(':   // if compile_lambda returns NOTDONE then it must be (expr)
+		    ret = compile_lambda(arg, cctx);
+		    if (ret == NOTDONE)
+			ret = compile_parenthesis(arg, cctx, ppconst);
 		    break;
 
 	default:    ret = NOTDONE;
@@ -3878,7 +4186,10 @@
 
 	if (!eval_isnamec1(**arg))
 	{
-	    semsg(_(e_name_expected), *arg);
+	    if (ends_excmd(*skipwhite(*arg)))
+		semsg(_(e_empty_expression_str), *arg);
+	    else
+		semsg(_(e_name_expected_str), *arg);
 	    return FAIL;
 	}
 
@@ -3925,7 +4236,7 @@
     char_u	buf[10];
 
     vim_strncpy(buf, op, len);
-    semsg(_(e_white_space_required_before_and_after_str), buf);
+    semsg(_(e_white_space_required_before_and_after_str_at_str), buf, op);
 }
 
 /*
@@ -3939,11 +4250,9 @@
     // Recognize <type>
     if (**arg == '<' && eval_isnamec1((*arg)[1]))
     {
-	int		called_emsg_before = called_emsg;
-
 	++*arg;
-	want_type = parse_type(arg, cctx->ctx_type_list);
-	if (called_emsg != called_emsg_before)
+	want_type = parse_type(arg, cctx->ctx_type_list, TRUE);
+	if (want_type == NULL)
 	    return FAIL;
 
 	if (**arg != '>')
@@ -3955,7 +4264,7 @@
 	    return FAIL;
 	}
 	++*arg;
-	if (may_get_next_line_error(*arg - 1, arg, cctx) == FAIL)
+	if (may_get_next_line_error(*arg, arg, cctx) == FAIL)
 	    return FAIL;
     }
 
@@ -3971,7 +4280,7 @@
 	actual = ((type_T **)stack->ga_data)[stack->ga_len - 1];
 	if (check_type(want_type, actual, FALSE, 0) == FAIL)
 	{
-	    if (need_type(actual, want_type, -1, cctx, FALSE, FALSE) == FAIL)
+	    if (need_type(actual, want_type, -1, 0, cctx, FALSE, FALSE) == FAIL)
 		return FAIL;
 	}
     }
@@ -4014,8 +4323,7 @@
 	    error_white_both(op, 1);
 	    return FAIL;
 	}
-	*arg = skipwhite(op + 1);
-	if (may_get_next_line(op + 1, arg, cctx) == FAIL)
+	if (may_get_next_line_error(op + 1, arg, cctx) == FAIL)
 	    return FAIL;
 
 	// get the second expression
@@ -4026,20 +4334,25 @@
 		&& ppconst->pp_tv[ppconst_used].v_type == VAR_NUMBER
 		&& ppconst->pp_tv[ppconst_used + 1].v_type == VAR_NUMBER)
 	{
-	    typval_T *tv1 = &ppconst->pp_tv[ppconst_used];
-	    typval_T *tv2 = &ppconst->pp_tv[ppconst_used + 1];
-	    varnumber_T res = 0;
+	    typval_T	    *tv1 = &ppconst->pp_tv[ppconst_used];
+	    typval_T	    *tv2 = &ppconst->pp_tv[ppconst_used + 1];
+	    varnumber_T	    res = 0;
+	    int		    failed = FALSE;
 
 	    // both are numbers: compute the result
 	    switch (*op)
 	    {
 		case '*': res = tv1->vval.v_number * tv2->vval.v_number;
 			  break;
-		case '/': res = tv1->vval.v_number / tv2->vval.v_number;
+		case '/': res = num_divide(tv1->vval.v_number,
+						  tv2->vval.v_number, &failed);
 			  break;
-		case '%': res = tv1->vval.v_number % tv2->vval.v_number;
+		case '%': res = num_modulus(tv1->vval.v_number,
+						  tv2->vval.v_number, &failed);
 			  break;
 	    }
+	    if (failed)
+		return FAIL;
 	    tv1->vval.v_number = res;
 	    --ppconst->pp_used;
 	}
@@ -4091,8 +4404,7 @@
 	    return FAIL;
 	}
 
-	*arg = skipwhite(op + oplen);
-	if (may_get_next_line(op + oplen, arg, cctx) == FAIL)
+	if (may_get_next_line_error(op + oplen, arg, cctx) == FAIL)
 	    return FAIL;
 
 	// get the second expression
@@ -4172,7 +4484,7 @@
     static int
 compile_expr4(char_u **arg, cctx_T *cctx, ppconst_T *ppconst)
 {
-    exptype_T	type = EXPR_UNKNOWN;
+    exprtype_T	type = EXPR_UNKNOWN;
     char_u	*p;
     char_u	*next;
     int		len = 2;
@@ -4221,8 +4533,7 @@
 	}
 
 	// get the second variable
-	*arg = skipwhite(p + len);
-	if (may_get_next_line(p + len, arg, cctx) == FAIL)
+	if (may_get_next_line_error(p + len, arg, cctx) == FAIL)
 	    return FAIL;
 
 	if (compile_expr5(arg, cctx, ppconst) == FAIL)
@@ -4279,8 +4590,6 @@
     {
 	garray_T	*instr = &cctx->ctx_instr;
 	garray_T	end_ga;
-	garray_T	*stack = &cctx->ctx_type_stack;
-	int		all_bool_values = TRUE;
 
 	/*
 	 * Repeat until there is no following "||" or "&&"
@@ -4296,7 +4605,8 @@
 
 	    if (!IS_WHITE_OR_NUL(**arg) || !IS_WHITE_OR_NUL(p[2]))
 	    {
-		semsg(_(e_white_space_required_before_and_after_str), op);
+		semsg(_(e_white_space_required_before_and_after_str_at_str),
+								     op, *arg);
 		return FAIL;
 	    }
 
@@ -4304,8 +4614,12 @@
 	    // evaluating to bool
 	    generate_ppconst(cctx, ppconst);
 
-	    if (((type_T **)stack->ga_data)[stack->ga_len - 1] != &t_bool)
-		all_bool_values = FALSE;
+	    // Every part must evaluate to a bool.
+	    if (bool_on_stack(cctx) == FAIL)
+	    {
+		ga_clear(&end_ga);
+		return FAIL;
+	    }
 
 	    if (ga_grow(&end_ga, 1) == FAIL)
 	    {
@@ -4318,9 +4632,11 @@
 				 ?  JUMP_IF_COND_TRUE : JUMP_IF_COND_FALSE, 0);
 
 	    // eval the next expression
-	    *arg = skipwhite(p + 2);
-	    if (may_get_next_line(p + 2, arg, cctx) == FAIL)
+	    if (may_get_next_line_error(p + 2, arg, cctx) == FAIL)
+	    {
+		ga_clear(&end_ga);
 		return FAIL;
+	    }
 
 	    if ((opchar == '|' ? compile_expr3(arg, cctx, ppconst)
 				  : compile_expr4(arg, cctx, ppconst)) == FAIL)
@@ -4333,6 +4649,13 @@
 	}
 	generate_ppconst(cctx, ppconst);
 
+	// Every part must evaluate to a bool.
+	if (bool_on_stack(cctx) == FAIL)
+	{
+	    ga_clear(&end_ga);
+	    return FAIL;
+	}
+
 	// Fill in the end label in all jumps.
 	while (end_ga.ga_len > 0)
 	{
@@ -4344,10 +4667,6 @@
 	    isn->isn_arg.jump.jump_where = instr->ga_len;
 	}
 	ga_clear(&end_ga);
-
-	// The resulting type is converted to bool if needed.
-	if (!all_bool_values)
-	    generate_COND2BOOL(cctx);
     }
 
     return OK;
@@ -4358,11 +4677,11 @@
  *
  * Produces instructions:
  *	EVAL expr4a		Push result of "expr4a"
+ *	COND2BOOL		convert to bool if needed
  *	JUMP_IF_COND_FALSE end
  *	EVAL expr4b		Push result of "expr4b"
  *	JUMP_IF_COND_FALSE end
  *	EVAL expr4c		Push result of "expr4c"
- *	COND2BOOL
  * end:
  */
     static int
@@ -4383,11 +4702,11 @@
  *
  * Produces instructions:
  *	EVAL expr3a		Push result of "expr3a"
+ *	COND2BOOL		convert to bool if needed
  *	JUMP_IF_COND_TRUE end
  *	EVAL expr3b		Push result of "expr3b"
  *	JUMP_IF_COND_TRUE end
  *	EVAL expr3c		Push result of "expr3c"
- *	COND2BOOL
  * end:
  */
     static int
@@ -4421,7 +4740,7 @@
  * end:
  */
     static int
-compile_expr1(char_u **arg,  cctx_T *cctx, ppconst_T *ppconst)
+compile_expr1(char_u **arg, cctx_T *cctx, ppconst_T *ppconst)
 {
     char_u	*p;
     int		ppconst_used = ppconst->pp_used;
@@ -4430,11 +4749,7 @@
     // Ignore all kinds of errors when not producing code.
     if (cctx->ctx_skip == SKIP_YES)
     {
-	evalarg_T	evalarg;
-
-	CLEAR_FIELD(evalarg);
-	evalarg.eval_cctx = cctx;
-	skip_expr(arg, &evalarg);
+	skip_expr_cctx(arg, cctx);
 	return OK;
     }
 
@@ -4464,8 +4779,8 @@
 
 	if (!IS_WHITE_OR_NUL(**arg) || !IS_WHITE_OR_NUL(p[1 + op_falsy]))
 	{
-	    semsg(_(e_white_space_required_before_and_after_str),
-							op_falsy ? "??" : "?");
+	    semsg(_(e_white_space_required_before_and_after_str_at_str),
+						  op_falsy ? "??" : "?", *arg);
 	    return FAIL;
 	}
 
@@ -4509,8 +4824,7 @@
 	}
 
 	// evaluate the second expression; any type is accepted
-	*arg = skipwhite(p + 1 + op_falsy);
-	if (may_get_next_line(p + 1 + op_falsy, arg, cctx) == FAIL)
+	if (may_get_next_line_error(p + 1 + op_falsy, arg, cctx) == FAIL)
 	    return FAIL;
 	if (compile_expr1(arg, cctx, ppconst) == FAIL)
 	    return FAIL;
@@ -4551,7 +4865,8 @@
 
 	    if (!IS_WHITE_OR_NUL(**arg) || !IS_WHITE_OR_NUL(p[1]))
 	    {
-		semsg(_(e_white_space_required_before_and_after_str), ":");
+		semsg(_(e_white_space_required_before_and_after_str_at_str),
+								       ":", p);
 		return FAIL;
 	    }
 
@@ -4559,8 +4874,7 @@
 	    if (has_const_expr)
 		cctx->ctx_skip = save_skip == SKIP_YES || const_value
 							 ? SKIP_YES : SKIP_NOT;
-	    *arg = skipwhite(p + 1);
-	    if (may_get_next_line(p + 1, arg, cctx) == FAIL)
+	    if (may_get_next_line_error(p + 1, arg, cctx) == FAIL)
 		return FAIL;
 	    if (compile_expr1(arg, cctx, ppconst) == FAIL)
 		return FAIL;
@@ -4622,7 +4936,7 @@
  * compile "return [expr]"
  */
     static char_u *
-compile_return(char_u *arg, int set_return_type, cctx_T *cctx)
+compile_return(char_u *arg, int check_return_type, cctx_T *cctx)
 {
     char_u	*p = arg;
     garray_T	*stack = &cctx->ctx_type_stack;
@@ -4634,26 +4948,33 @@
 	if (compile_expr0(&p, cctx) == FAIL)
 	    return NULL;
 
-	stack_type = ((type_T **)stack->ga_data)[stack->ga_len - 1];
-	if (set_return_type)
-	    cctx->ctx_ufunc->uf_ret_type = stack_type;
-	else
+	if (cctx->ctx_skip != SKIP_YES)
 	{
-	    if (cctx->ctx_ufunc->uf_ret_type->tt_type == VAR_VOID
-		    && stack_type->tt_type != VAR_VOID
-		    && stack_type->tt_type != VAR_UNKNOWN)
+	    stack_type = ((type_T **)stack->ga_data)[stack->ga_len - 1];
+	    if (check_return_type && (cctx->ctx_ufunc->uf_ret_type == NULL
+				|| cctx->ctx_ufunc->uf_ret_type == &t_unknown
+				|| cctx->ctx_ufunc->uf_ret_type == &t_any))
 	    {
-		emsg(_(e_returning_value_in_function_without_return_type));
-		return NULL;
+		cctx->ctx_ufunc->uf_ret_type = stack_type;
+	    }
+	    else
+	    {
+		if (cctx->ctx_ufunc->uf_ret_type->tt_type == VAR_VOID
+			&& stack_type->tt_type != VAR_VOID
+			&& stack_type->tt_type != VAR_UNKNOWN)
+		{
+		    emsg(_(e_returning_value_in_function_without_return_type));
+		    return NULL;
+		}
+		if (need_type(stack_type, cctx->ctx_ufunc->uf_ret_type, -1,
+						0, cctx, FALSE, FALSE) == FAIL)
+		    return NULL;
 	    }
-	    if (need_type(stack_type, cctx->ctx_ufunc->uf_ret_type, -1,
-						   cctx, FALSE, FALSE) == FAIL)
-		return NULL;
 	}
     }
     else
     {
-	// "set_return_type" cannot be TRUE, only used for a lambda which
+	// "check_return_type" cannot be TRUE, only used for a lambda which
 	// always has an argument.
 	if (cctx->ctx_ufunc->uf_ret_type->tt_type != VAR_VOID
 		&& cctx->ctx_ufunc->uf_ret_type->tt_type != VAR_UNKNOWN)
@@ -4666,7 +4987,10 @@
 	generate_PUSHNR(cctx, 0);
     }
 
-    if (generate_instr(cctx, ISN_RETURN) == NULL)
+    // Undo any command modifiers.
+    generate_undo_cmdmods(cctx);
+
+    if (cctx->ctx_skip != SKIP_YES && generate_instr(cctx, ISN_RETURN) == NULL)
 	return NULL;
 
     // "return val | endif" is possible
@@ -4711,7 +5035,7 @@
     char_u	*name_end = to_name_end(eap->arg, TRUE);
     char_u	*lambda_name;
     ufunc_T	*ufunc;
-    int		r;
+    int		r = FAIL;
 
     if (eap->forceit)
     {
@@ -4719,6 +5043,27 @@
 	return NULL;
     }
 
+    if (*name_start == '/')
+    {
+	name_end = skip_regexp(name_start + 1, '/', TRUE);
+	if (*name_end == '/')
+	    ++name_end;
+	eap->nextcmd = check_nextcmd(name_end);
+    }
+    if (name_end == name_start || *skipwhite(name_end) != '(')
+    {
+	if (!ends_excmd2(name_start, name_end))
+	{
+	    semsg(_(e_invalid_command_str), eap->cmd);
+	    return NULL;
+	}
+
+	// "def" or "def Name": list functions
+	if (generate_DEF(cctx, name_start, name_end - name_start) == FAIL)
+	    return NULL;
+	return eap->nextcmd == NULL ? (char_u *)"" : eap->nextcmd;
+    }
+
     // Only g:Func() can use a namespace.
     if (name_start[1] == ':' && !is_global)
     {
@@ -4733,16 +5078,22 @@
     eap->cookie = cctx;
     eap->skip = cctx->ctx_skip == SKIP_YES;
     eap->forceit = FALSE;
-    lambda_name = get_lambda_name();
+    lambda_name = vim_strsave(get_lambda_name());
+    if (lambda_name == NULL)
+	return NULL;
     ufunc = define_function(eap, lambda_name);
 
     if (ufunc == NULL)
-	return eap->skip ? (char_u *)"" : NULL;
-    if (ufunc->uf_def_status == UF_TO_BE_COMPILED
-	    && compile_def_function(ufunc, TRUE, cctx) == FAIL)
+    {
+	r = eap->skip ? OK : FAIL;
+	goto theend;
+    }
+    if (func_needs_compiling(ufunc, PROFILING(ufunc))
+	    && compile_def_function(ufunc, TRUE, PROFILING(ufunc), cctx)
+								       == FAIL)
     {
 	func_ptr_unref(ufunc);
-	return NULL;
+	goto theend;
     }
 
     if (is_global)
@@ -4753,7 +5104,10 @@
 	if (func_name == NULL)
 	    r = FAIL;
 	else
+	{
 	    r = generate_NEWFUNC(cctx, lambda_name, func_name);
+	    lambda_name = NULL;
+	}
     }
     else
     {
@@ -4763,9 +5117,9 @@
 	int block_depth = cctx->ctx_ufunc->uf_block_depth;
 
 	if (lvar == NULL)
-	    return NULL;
+	    goto theend;
 	if (generate_FUNCREF(cctx, ufunc) == FAIL)
-	    return NULL;
+	    goto theend;
 	r = generate_STORE(cctx, ISN_STORE, lvar->lv_idx, NULL);
 
 	// copy over the block scope IDs
@@ -4780,8 +5134,11 @@
 	    }
 	}
     }
-
     // TODO: warning for trailing text?
+    r = OK;
+
+theend:
+    vim_free(lambda_name);
     return r == FAIL ? NULL : (char_u *)"";
 }
 
@@ -4811,9 +5168,11 @@
 static char *reserved[] = {
     "true",
     "false",
+    "null",
     NULL
 };
 
+// Destination for an assignment or ":unlet" with an index.
 typedef enum {
     dest_local,
     dest_option,
@@ -4825,8 +5184,38 @@
     dest_vimvar,
     dest_script,
     dest_reg,
+    dest_expr,
 } assign_dest_T;
 
+// Used by compile_lhs() to store information about the LHS of an assignment
+// and one argument of ":unlet" with an index.
+typedef struct {
+    assign_dest_T   lhs_dest;	    // type of destination
+
+    char_u	    *lhs_name;	    // allocated name including
+				    // "[expr]" or ".name".
+    size_t	    lhs_varlen;	    // length of the variable without
+				    // "[expr]" or ".name"
+    char_u	    *lhs_dest_end;  // end of the destination, including
+				    // "[expr]" or ".name".
+
+    int		    lhs_has_index;  // has "[expr]" or ".name"
+
+    int		    lhs_new_local;  // create new local variable
+    int		    lhs_opt_flags;  // for when destination is an option
+    int		    lhs_vimvaridx;  // for when destination is a v:var
+
+    lvar_T	    lhs_local_lvar; // used for existing local destination
+    lvar_T	    lhs_arg_lvar;   // used for argument destination
+    lvar_T	    *lhs_lvar;	    // points to destination lvar
+    int		    lhs_scriptvar_sid;
+    int		    lhs_scriptvar_idx;
+
+    int		    lhs_has_type;   // type was specified
+    type_T	    *lhs_type;
+    type_T	    *lhs_member_type;
+} lhs_T;
+
 /*
  * Generate the load instruction for "name".
  */
@@ -4845,7 +5234,10 @@
 	    generate_LOAD(cctx, ISN_LOADOPT, 0, name, type);
 	    break;
 	case dest_global:
-	    generate_LOAD(cctx, ISN_LOADG, 0, name + 2, type);
+	    if (vim_strchr(name, AUTOLOAD_CHAR) == NULL)
+		generate_LOAD(cctx, ISN_LOADG, 0, name + 2, type);
+	    else
+		generate_LOAD(cctx, ISN_LOADAUTO, 0, name, type);
 	    break;
 	case dest_buffer:
 	    generate_LOAD(cctx, ISN_LOADB, 0, name + 2, type);
@@ -4871,13 +5263,38 @@
 	    generate_LOADV(cctx, name + 2, TRUE);
 	    break;
 	case dest_local:
-	    if (lvar->lv_from_outer)
-		generate_LOAD(cctx, ISN_LOADOUTER, lvar->lv_idx,
-							   NULL, type);
+	    if (lvar->lv_from_outer > 0)
+		generate_LOADOUTER(cctx, lvar->lv_idx, lvar->lv_from_outer,
+									 type);
 	    else
 		generate_LOAD(cctx, ISN_LOAD, lvar->lv_idx, NULL, type);
 	    break;
+	case dest_expr:
+	    // list or dict value should already be on the stack.
+	    break;
+    }
+}
+
+/*
+ * Skip over "[expr]" or ".member".
+ * Does not check for any errors.
+ */
+    static char_u *
+skip_index(char_u *start)
+{
+    char_u *p = start;
+
+    if (*p == '[')
+    {
+	p = skipwhite(p + 1);
+	(void)skip_expr(&p, NULL);
+	p = skipwhite(p);
+	if (*p == ']')
+	    return p + 1;
+	return p;
     }
+    // if (*p == '.')
+    return to_name_end(p + 1, TRUE);
 }
 
     void
@@ -4904,461 +5321,749 @@
 }
 
 /*
- * Compile declaration and assignment:
- * "let name"
- * "var name = expr"
- * "final name = expr"
- * "const name = expr"
- * "name = expr"
- * "arg" points to "name".
- * Return NULL for an error.
- * Return "arg" if it does not look like a variable list.
+ * For one assignment figure out the type of destination.  Return it in "dest".
+ * When not recognized "dest" is not set.
+ * For an option "opt_flags" is set.
+ * For a v:var "vimvaridx" is set.
+ * "type" is set to the destination type if known, unchanted otherwise.
+ * Return FAIL if an error message was given.
  */
-    static char_u *
-compile_assignment(char_u *arg, exarg_T *eap, cmdidx_T cmdidx, cctx_T *cctx)
+    static int
+get_var_dest(
+	char_u		*name,
+	assign_dest_T	*dest,
+	int		cmdidx,
+	int		*opt_flags,
+	int		*vimvaridx,
+	type_T		**type,
+	cctx_T		*cctx)
 {
-    char_u	*var_start;
-    char_u	*p;
-    char_u	*end = arg;
-    char_u	*ret = NULL;
-    int		var_count = 0;
-    int		var_idx;
-    int		scriptvar_sid = 0;
-    int		scriptvar_idx = -1;
-    int		semicolon = 0;
-    garray_T	*instr = &cctx->ctx_instr;
-    garray_T    *stack = &cctx->ctx_type_stack;
-    char_u	*op;
-    int		oplen = 0;
-    int		heredoc = FALSE;
-    type_T	*type = &t_any;
-    type_T	*member_type = &t_any;
-    char_u	*name = NULL;
-    char_u	*sp;
-    int		is_decl = cmdidx == CMD_let || cmdidx == CMD_var
-				 || cmdidx == CMD_final || cmdidx == CMD_const;
+    char_u *p;
 
-    // Skip over the "var" or "[var, var]" to get to any "=".
-    p = skip_var_list(arg, TRUE, &var_count, &semicolon, TRUE);
-    if (p == NULL)
-	return *arg == '[' ? arg : NULL;
+    if (*name == '&')
+    {
+	int		cc;
+	long		numval;
+	getoption_T	opt_type;
 
-    if (var_count > 0 && is_decl)
+	*dest = dest_option;
+	if (cmdidx == CMD_final || cmdidx == CMD_const)
+	{
+	    emsg(_(e_const_option));
+	    return FAIL;
+	}
+	p = name;
+	p = find_option_end(&p, opt_flags);
+	if (p == NULL)
+	{
+	    // cannot happen?
+	    emsg(_(e_letunexp));
+	    return FAIL;
+	}
+	cc = *p;
+	*p = NUL;
+	opt_type = get_option_value(skip_option_env_lead(name),
+						    &numval, NULL, *opt_flags);
+	*p = cc;
+	switch (opt_type)
+	{
+	    case gov_unknown:
+		    semsg(_(e_unknown_option), name);
+		    return FAIL;
+	    case gov_string:
+	    case gov_hidden_string:
+		    *type = &t_string;
+		    break;
+	    case gov_bool:
+	    case gov_hidden_bool:
+		    *type = &t_bool;
+		    break;
+	    case gov_number:
+	    case gov_hidden_number:
+		    *type = &t_number;
+		    break;
+	}
+    }
+    else if (*name == '$')
     {
-	// TODO: should we allow this, and figure out type inference from list
-	// members?
-	emsg(_(e_cannot_use_list_for_declaration));
-	return NULL;
+	*dest = dest_env;
+	*type = &t_string;
     }
-
-    sp = p;
-    p = skipwhite(p);
-    op = p;
-    oplen = assignment_len(p, &heredoc);
-
-    if (var_count > 0 && oplen == 0)
-	// can be something like "[1, 2]->func()"
-	return arg;
-
-    if (oplen > 0 && (!VIM_ISWHITE(*sp) || !VIM_ISWHITE(op[oplen])))
+    else if (*name == '@')
     {
-	error_white_both(op, oplen);
-	return NULL;
+	if (!valid_yank_reg(name[1], FALSE) || name[1] == '.')
+	{
+	    emsg_invreg(name[1]);
+	    return FAIL;
+	}
+	*dest = dest_reg;
+	*type = &t_string;
     }
-
-    if (heredoc)
+    else if (STRNCMP(name, "g:", 2) == 0)
     {
-	list_T	   *l;
-	listitem_T *li;
-
-	// [let] varname =<< [trim] {end}
-	eap->getline = exarg_getline;
-	eap->cookie = cctx;
-	l = heredoc_get(eap, op + 3, FALSE);
-	if (l == NULL)
-	    return NULL;
-
-	if (cctx->ctx_skip != SKIP_YES)
-	{
-	    // Push each line and the create the list.
-	    FOR_ALL_LIST_ITEMS(l, li)
-	    {
-		generate_PUSHS(cctx, li->li_tv.vval.v_string);
-		li->li_tv.vval.v_string = NULL;
-	    }
-	    generate_NEWLIST(cctx, l->lv_len);
-	    type = &t_list_string;
-	    member_type = &t_list_string;
-	}
-	list_free(l);
-	p += STRLEN(p);
-	end = p;
+	*dest = dest_global;
     }
-    else if (var_count > 0)
+    else if (STRNCMP(name, "b:", 2) == 0)
     {
-	// for "[var, var] = expr" evaluate the expression here, loop over the
-	// list of variables below.
-
-	p = skipwhite(op + oplen);
-	if (compile_expr0(&p, cctx) == FAIL)
-	    return NULL;
-	end = p;
+	*dest = dest_buffer;
+    }
+    else if (STRNCMP(name, "w:", 2) == 0)
+    {
+	*dest = dest_window;
+    }
+    else if (STRNCMP(name, "t:", 2) == 0)
+    {
+	*dest = dest_tab;
+    }
+    else if (STRNCMP(name, "v:", 2) == 0)
+    {
+	typval_T	*vtv;
+	int		di_flags;
 
-	if (cctx->ctx_skip != SKIP_YES)
+	*vimvaridx = find_vim_var(name + 2, &di_flags);
+	if (*vimvaridx < 0)
 	{
-	    type_T	*stacktype;
+	    semsg(_(e_variable_not_found_str), name);
+	    return FAIL;
+	}
+	// We use the current value of "sandbox" here, is that OK?
+	if (var_check_ro(di_flags, name, FALSE))
+	    return FAIL;
+	*dest = dest_vimvar;
+	vtv = get_vim_var_tv(*vimvaridx);
+	*type = typval2type_vimvar(vtv, cctx->ctx_type_list);
+    }
+    return OK;
+}
 
-	    stacktype = stack->ga_len == 0 ? &t_void
-			      : ((type_T **)stack->ga_data)[stack->ga_len - 1];
-	    if (stacktype->tt_type == VAR_VOID)
+/*
+ * Generate a STORE instruction for "dest", not being "dest_local".
+ * Return FAIL when out of memory.
+ */
+    static int
+generate_store_var(
+	cctx_T		*cctx,
+	assign_dest_T	dest,
+	int		opt_flags,
+	int		vimvaridx,
+	int		scriptvar_idx,
+	int		scriptvar_sid,
+	type_T		*type,
+	char_u		*name)
+{
+    switch (dest)
+    {
+	case dest_option:
+	    return generate_STOREOPT(cctx, skip_option_env_lead(name),
+								    opt_flags);
+	case dest_global:
+	    // include g: with the name, easier to execute that way
+	    return generate_STORE(cctx, vim_strchr(name, AUTOLOAD_CHAR) == NULL
+					? ISN_STOREG : ISN_STOREAUTO, 0, name);
+	case dest_buffer:
+	    // include b: with the name, easier to execute that way
+	    return generate_STORE(cctx, ISN_STOREB, 0, name);
+	case dest_window:
+	    // include w: with the name, easier to execute that way
+	    return generate_STORE(cctx, ISN_STOREW, 0, name);
+	case dest_tab:
+	    // include t: with the name, easier to execute that way
+	    return generate_STORE(cctx, ISN_STORET, 0, name);
+	case dest_env:
+	    return generate_STORE(cctx, ISN_STOREENV, 0, name + 1);
+	case dest_reg:
+	    return generate_STORE(cctx, ISN_STOREREG, name[1], NULL);
+	case dest_vimvar:
+	    return generate_STORE(cctx, ISN_STOREV, vimvaridx, NULL);
+	case dest_script:
+	    if (scriptvar_idx < 0)
 	    {
-		emsg(_(e_cannot_use_void_value));
-		goto theend;
+		char_u  *name_s = name;
+		int	r;
+
+		// "s:" is included in the name.
+		r = generate_OLDSCRIPT(cctx, ISN_STORES, name_s,
+							  scriptvar_sid, type);
+		if (name_s != name)
+		    vim_free(name_s);
+		return r;
 	    }
-	    if (need_type(stacktype, &t_list_any, -1, cctx,
-							 FALSE, FALSE) == FAIL)
-		goto theend;
-	    // TODO: check the length of a constant list here
-	    generate_CHECKLEN(cctx, semicolon ? var_count - 1 : var_count,
-								    semicolon);
-	}
+	    return generate_VIM9SCRIPT(cctx, ISN_STORESCRIPT,
+					   scriptvar_sid, scriptvar_idx, type);
+	case dest_local:
+	case dest_expr:
+	    // cannot happen
+	    break;
     }
+    return FAIL;
+}
 
-    /*
-     * Loop over variables in "[var, var] = expr".
-     * For "var = expr" and "let var: type" this is done only once.
-     */
-    if (var_count > 0)
-	var_start = skipwhite(arg + 1);  // skip over the "["
+    static int
+is_decl_command(int cmdidx)
+{
+    return cmdidx == CMD_let || cmdidx == CMD_var
+				 || cmdidx == CMD_final || cmdidx == CMD_const;
+}
+
+/*
+ * Figure out the LHS type and other properties for an assignment or one item
+ * of ":unlet" with an index.
+ * Returns OK or FAIL.
+ */
+    static int
+compile_lhs(
+	char_u	*var_start,
+	lhs_T	*lhs,
+	int	cmdidx,
+	int	heredoc,
+	int	oplen,
+	cctx_T	*cctx)
+{
+    char_u	*var_end;
+    int		is_decl = is_decl_command(cmdidx);
+
+    CLEAR_POINTER(lhs);
+    lhs->lhs_dest = dest_local;
+    lhs->lhs_vimvaridx = -1;
+    lhs->lhs_scriptvar_idx = -1;
+
+    // "dest_end" is the end of the destination, including "[expr]" or
+    // ".name".
+    // "var_end" is the end of the variable/option/etc. name.
+    lhs->lhs_dest_end = skip_var_one(var_start, FALSE);
+    if (*var_start == '@')
+	var_end = var_start + 2;
     else
-	var_start = arg;
-    for (var_idx = 0; var_idx == 0 || var_idx < var_count; var_idx++)
     {
-	char_u		*var_end = skip_var_one(var_start, FALSE);
-	size_t		varlen;
-	int		new_local = FALSE;
-	int		opt_type;
-	int		opt_flags = 0;
-	assign_dest_T	dest = dest_local;
-	int		vimvaridx = -1;
-	lvar_T		*lvar = NULL;
-	lvar_T		arg_lvar;
-	int		has_type = FALSE;
-	int		has_index = FALSE;
-	int		instr_count = -1;
-
-	if (*var_start == '@')
-	    p = var_start + 2;
-	else
-	{
-	    // skip over the leading "&", "&l:", "&g:" and "$"
-	    p = skip_option_env_lead(var_start);
-	    p = to_name_end(p, TRUE);
-	}
+	// skip over the leading "&", "&l:", "&g:" and "$"
+	var_end = skip_option_env_lead(var_start);
+	var_end = to_name_end(var_end, TRUE);
+    }
+
+    // "a: type" is declaring variable "a" with a type, not dict "a:".
+    if (is_decl && lhs->lhs_dest_end == var_start + 2
+					       && lhs->lhs_dest_end[-1] == ':')
+	--lhs->lhs_dest_end;
+    if (is_decl && var_end == var_start + 2 && var_end[-1] == ':')
+	--var_end;
+
+    // compute the length of the destination without "[expr]" or ".name"
+    lhs->lhs_varlen = var_end - var_start;
+    lhs->lhs_name = vim_strnsave(var_start, lhs->lhs_varlen);
+    if (lhs->lhs_name == NULL)
+	return FAIL;
+
+    if (lhs->lhs_dest_end > var_start + lhs->lhs_varlen)
+	// Something follows after the variable: "var[idx]" or "var.key".
+	lhs->lhs_has_index = TRUE;
 
-	// "a: type" is declaring variable "a" with a type, not "a:".
-	if (is_decl && var_end == var_start + 2 && var_end[-1] == ':')
-	    --var_end;
-	if (is_decl && p == var_start + 2 && p[-1] == ':')
-	    --p;
+    if (heredoc)
+	lhs->lhs_type = &t_list_string;
+    else
+	lhs->lhs_type = &t_any;
 
-	varlen = p - var_start;
-	vim_free(name);
-	name = vim_strnsave(var_start, varlen);
-	if (name == NULL)
-	    return NULL;
-	if (!heredoc)
-	    type = &t_any;
+    if (cctx->ctx_skip != SKIP_YES)
+    {
+	int	    declare_error = FALSE;
 
-	if (cctx->ctx_skip != SKIP_YES)
+	if (get_var_dest(lhs->lhs_name, &lhs->lhs_dest, cmdidx,
+				      &lhs->lhs_opt_flags, &lhs->lhs_vimvaridx,
+						 &lhs->lhs_type, cctx) == FAIL)
+	    return FAIL;
+	if (lhs->lhs_dest != dest_local)
 	{
-	    int	    declare_error = FALSE;
-
-	    if (*var_start == '&')
-	    {
-		int	    cc;
-		long	    numval;
+	    // Specific kind of variable recognized.
+	    declare_error = is_decl;
+	}
+	else
+	{
+	    int	    idx;
 
-		dest = dest_option;
-		if (cmdidx == CMD_final || cmdidx == CMD_const)
-		{
-		    emsg(_(e_const_option));
-		    goto theend;
-		}
-		declare_error = is_decl;
-		p = var_start;
-		p = find_option_end(&p, &opt_flags);
-		if (p == NULL)
-		{
-		    // cannot happen?
-		    emsg(_(e_letunexp));
-		    goto theend;
-		}
-		cc = *p;
-		*p = NUL;
-		opt_type = get_option_value(skip_option_env_lead(var_start),
-						     &numval, NULL, opt_flags);
-		*p = cc;
-		if (opt_type == -3)
+	    // No specific kind of variable recognized, just a name.
+	    for (idx = 0; reserved[idx] != NULL; ++idx)
+		if (STRCMP(reserved[idx], lhs->lhs_name) == 0)
 		{
-		    semsg(_(e_unknown_option), var_start);
-		    goto theend;
+		    semsg(_(e_cannot_use_reserved_name), lhs->lhs_name);
+		    return FAIL;
 		}
-		if (opt_type == -2 || opt_type == 0)
-		    type = &t_string;
-		else
-		    type = &t_number;	// both number and boolean option
-	    }
-	    else if (*var_start == '$')
-	    {
-		dest = dest_env;
-		type = &t_string;
-		declare_error = is_decl;
-	    }
-	    else if (*var_start == '@')
+
+
+	    if (lookup_local(var_start, lhs->lhs_varlen,
+					     &lhs->lhs_local_lvar, cctx) == OK)
+		lhs->lhs_lvar = &lhs->lhs_local_lvar;
+	    else
 	    {
-		if (!valid_yank_reg(var_start[1], FALSE) || var_start[1] == '.')
+		CLEAR_FIELD(lhs->lhs_arg_lvar);
+		if (arg_exists(var_start, lhs->lhs_varlen,
+			 &lhs->lhs_arg_lvar.lv_idx, &lhs->lhs_arg_lvar.lv_type,
+			    &lhs->lhs_arg_lvar.lv_from_outer, cctx) == OK)
 		{
-		    emsg_invreg(var_start[1]);
-		    goto theend;
+		    if (is_decl)
+		    {
+			semsg(_(e_str_is_used_as_argument), lhs->lhs_name);
+			return FAIL;
+		    }
+		    lhs->lhs_lvar = &lhs->lhs_arg_lvar;
 		}
-		dest = dest_reg;
-		type = &t_string;
-		declare_error = is_decl;
-	    }
-	    else if (varlen > 1 && STRNCMP(var_start, "g:", 2) == 0)
-	    {
-		dest = dest_global;
-		declare_error = is_decl;
-	    }
-	    else if (varlen > 1 && STRNCMP(var_start, "b:", 2) == 0)
-	    {
-		dest = dest_buffer;
-		declare_error = is_decl;
-	    }
-	    else if (varlen > 1 && STRNCMP(var_start, "w:", 2) == 0)
-	    {
-		dest = dest_window;
-		declare_error = is_decl;
-	    }
-	    else if (varlen > 1 && STRNCMP(var_start, "t:", 2) == 0)
-	    {
-		dest = dest_tab;
-		declare_error = is_decl;
 	    }
-	    else if (varlen > 1 && STRNCMP(var_start, "v:", 2) == 0)
+	    if (lhs->lhs_lvar != NULL)
 	    {
-		typval_T	*vtv;
-		int		di_flags;
-
-		vimvaridx = find_vim_var(name + 2, &di_flags);
-		if (vimvaridx < 0)
+		if (is_decl)
 		{
-		    semsg(_(e_variable_not_found_str), var_start);
-		    goto theend;
+		    semsg(_(e_variable_already_declared), lhs->lhs_name);
+		    return FAIL;
 		}
-		// We use the current value of "sandbox" here, is that OK?
-		if (var_check_ro(di_flags, name, FALSE))
-		    goto theend;
-		dest = dest_vimvar;
-		vtv = get_vim_var_tv(vimvaridx);
-		type = typval2type_vimvar(vtv, cctx->ctx_type_list);
-		declare_error = is_decl;
 	    }
 	    else
 	    {
-		int	    idx;
+		int script_namespace = lhs->lhs_varlen > 1
+				       && STRNCMP(var_start, "s:", 2) == 0;
+		int script_var = (script_namespace
+			? script_var_exists(var_start + 2, lhs->lhs_varlen - 2,
+							       FALSE, cctx)
+			  : script_var_exists(var_start, lhs->lhs_varlen,
+							    TRUE, cctx)) == OK;
+		imported_T  *import =
+			       find_imported(var_start, lhs->lhs_varlen, cctx);
 
-		for (idx = 0; reserved[idx] != NULL; ++idx)
-		    if (STRCMP(reserved[idx], name) == 0)
+		if (script_namespace || script_var || import != NULL)
+		{
+		    char_u	*rawname = lhs->lhs_name
+					   + (lhs->lhs_name[1] == ':' ? 2 : 0);
+
+		    if (is_decl)
 		    {
-			semsg(_(e_cannot_use_reserved_name), name);
-			goto theend;
+			if (script_namespace)
+			    semsg(_(e_cannot_declare_script_variable_in_function),
+								lhs->lhs_name);
+			else
+			    semsg(_(e_variable_already_declared_in_script),
+								lhs->lhs_name);
+			return FAIL;
+		    }
+		    else if (cctx->ctx_ufunc->uf_script_ctx_version
+							 == SCRIPT_VERSION_VIM9
+				    && script_namespace
+				    && !script_var && import == NULL)
+		    {
+			semsg(_(e_unknown_variable_str), lhs->lhs_name);
+			return FAIL;
 		    }
 
-		lvar = lookup_local(var_start, varlen, cctx);
-		if (lvar == NULL)
-		{
-		    CLEAR_FIELD(arg_lvar);
-		    if (arg_exists(var_start, varlen,
-				&arg_lvar.lv_idx, &arg_lvar.lv_type,
-				&arg_lvar.lv_from_outer, cctx) == OK)
+		    lhs->lhs_dest = dest_script;
+
+		    // existing script-local variables should have a type
+		    lhs->lhs_scriptvar_sid = current_sctx.sc_sid;
+		    if (import != NULL)
+			lhs->lhs_scriptvar_sid = import->imp_sid;
+		    if (SCRIPT_ID_VALID(lhs->lhs_scriptvar_sid))
 		    {
-			if (is_decl)
+			// Check writable only when no index follows.
+			lhs->lhs_scriptvar_idx = get_script_item_idx(
+					       lhs->lhs_scriptvar_sid, rawname,
+			      lhs->lhs_has_index ? ASSIGN_FINAL : ASSIGN_CONST,
+									 cctx);
+			if (lhs->lhs_scriptvar_idx >= 0)
 			{
-			    semsg(_(e_str_is_used_as_argument), name);
-			    goto theend;
+			    scriptitem_T *si = SCRIPT_ITEM(
+						       lhs->lhs_scriptvar_sid);
+			    svar_T	 *sv =
+					    ((svar_T *)si->sn_var_vals.ga_data)
+						      + lhs->lhs_scriptvar_idx;
+			    lhs->lhs_type = sv->sv_type;
 			}
-			lvar = &arg_lvar;
 		    }
 		}
-		if (lvar != NULL)
-		{
-		    if (is_decl)
-		    {
-			semsg(_(e_variable_already_declared), name);
-			goto theend;
-		    }
-		}
-		else
-		{
-		    int script_namespace = varlen > 1
-					   && STRNCMP(var_start, "s:", 2) == 0;
-		    int script_var = (script_namespace
-			      ? script_var_exists(var_start + 2, varlen - 2,
-								   FALSE, cctx)
-			      : script_var_exists(var_start, varlen,
-							    TRUE, cctx)) == OK;
-		    imported_T  *import =
-					find_imported(var_start, varlen, cctx);
+		else if (check_defined(var_start, lhs->lhs_varlen, cctx)
+								       == FAIL)
+		    return FAIL;
+	    }
+	}
+
+	if (declare_error)
+	{
+	    vim9_declare_error(lhs->lhs_name);
+	    return FAIL;
+	}
+    }
+
+    // handle "a:name" as a name, not index "name" on "a"
+    if (lhs->lhs_varlen > 1 || var_start[lhs->lhs_varlen] != ':')
+	var_end = lhs->lhs_dest_end;
+
+    if (lhs->lhs_dest != dest_option)
+    {
+	if (is_decl && *var_end == ':')
+	{
+	    char_u *p;
+
+	    // parse optional type: "let var: type = expr"
+	    if (!VIM_ISWHITE(var_end[1]))
+	    {
+		semsg(_(e_white_space_required_after_str), ":");
+		return FAIL;
+	    }
+	    p = skipwhite(var_end + 1);
+	    lhs->lhs_type = parse_type(&p, cctx->ctx_type_list, TRUE);
+	    if (lhs->lhs_type == NULL)
+		return FAIL;
+	    lhs->lhs_has_type = TRUE;
+	}
+	else if (lhs->lhs_lvar != NULL)
+	    lhs->lhs_type = lhs->lhs_lvar->lv_type;
+    }
+
+    if (oplen == 3 && !heredoc && lhs->lhs_dest != dest_global
+		    && lhs->lhs_type->tt_type != VAR_STRING
+		    && lhs->lhs_type->tt_type != VAR_ANY)
+    {
+	emsg(_(e_can_only_concatenate_to_string));
+	return FAIL;
+    }
+
+    if (lhs->lhs_lvar == NULL && lhs->lhs_dest == dest_local
+						 && cctx->ctx_skip != SKIP_YES)
+    {
+	if (oplen > 1 && !heredoc)
+	{
+	    // +=, /=, etc. require an existing variable
+	    semsg(_(e_cannot_use_operator_on_new_variable), lhs->lhs_name);
+	    return FAIL;
+	}
+	if (!is_decl)
+	{
+	    semsg(_(e_unknown_variable_str), lhs->lhs_name);
+	    return FAIL;
+	}
+
+	// new local variable
+	if ((lhs->lhs_type->tt_type == VAR_FUNC
+				      || lhs->lhs_type->tt_type == VAR_PARTIAL)
+				   && var_wrong_func_name(lhs->lhs_name, TRUE))
+	    return FAIL;
+	lhs->lhs_lvar = reserve_local(cctx, var_start, lhs->lhs_varlen,
+		    cmdidx == CMD_final || cmdidx == CMD_const, lhs->lhs_type);
+	if (lhs->lhs_lvar == NULL)
+	    return FAIL;
+	lhs->lhs_new_local = TRUE;
+    }
+
+    lhs->lhs_member_type = lhs->lhs_type;
+    if (lhs->lhs_has_index)
+    {
+	// Something follows after the variable: "var[idx]" or "var.key".
+	// TODO: should we also handle "->func()" here?
+	if (is_decl)
+	{
+	    emsg(_(e_cannot_use_index_when_declaring_variable));
+	    return FAIL;
+	}
+
+	if (var_start[lhs->lhs_varlen] == '['
+					  || var_start[lhs->lhs_varlen] == '.')
+	{
+	    char_u	*after = var_start + lhs->lhs_varlen;
+	    char_u	*p;
+
+	    // Only the last index is used below, if there are others
+	    // before it generate code for the expression.  Thus for
+	    // "ll[1][2]" the expression is "ll[1]" and "[2]" is the index.
+	    for (;;)
+	    {
+		p = skip_index(after);
+		if (*p != '[' && *p != '.')
+		    break;
+		after = p;
+	    }
+	    if (after > var_start + lhs->lhs_varlen)
+	    {
+		lhs->lhs_varlen = after - var_start;
+		lhs->lhs_dest = dest_expr;
+		// We don't know the type before evaluating the expression,
+		// use "any" until then.
+		lhs->lhs_type = &t_any;
+	    }
+
+	    if (lhs->lhs_type->tt_member == NULL)
+		lhs->lhs_member_type = &t_any;
+	    else
+		lhs->lhs_member_type = lhs->lhs_type->tt_member;
+	}
+	else
+	{
+	    semsg("Not supported yet: %s", var_start);
+	    return FAIL;
+	}
+    }
+    return OK;
+}
+
+/*
+ * Assignment to a list or dict member, or ":unlet" for the item, using the
+ * information in "lhs".
+ * Returns OK or FAIL.
+ */
+    static int
+compile_assign_unlet(
+	char_u	*var_start,
+	lhs_T	*lhs,
+	int	is_assign,
+	type_T	*rhs_type,
+	cctx_T	*cctx)
+{
+    char_u	*p;
+    int		r;
+    vartype_T	dest_type;
+    size_t	varlen = lhs->lhs_varlen;
+    garray_T    *stack = &cctx->ctx_type_stack;
+
+    // Compile the "idx" in "var[idx]" or "key" in "var.key".
+    p = var_start + varlen;
+    if (*p == '[')
+    {
+	p = skipwhite(p + 1);
+	r = compile_expr0(&p, cctx);
+	if (r == OK && *skipwhite(p) != ']')
+	{
+	    // this should not happen
+	    emsg(_(e_missbrac));
+	    r = FAIL;
+	}
+    }
+    else // if (*p == '.')
+    {
+	char_u *key_end = to_name_end(p + 1, TRUE);
+	char_u *key = vim_strnsave(p + 1, key_end - p - 1);
+
+	r = generate_PUSHS(cctx, key);
+    }
+    if (r == FAIL)
+	return FAIL;
+
+    if (lhs->lhs_type == &t_any)
+    {
+	// Index on variable of unknown type: check at runtime.
+	dest_type = VAR_ANY;
+    }
+    else
+    {
+	dest_type = lhs->lhs_type->tt_type;
+	if (dest_type == VAR_DICT && may_generate_2STRING(-1, cctx) == FAIL)
+	    return FAIL;
+	if (dest_type == VAR_LIST
+		&& need_type(((type_T **)stack->ga_data)[stack->ga_len - 1],
+				 &t_number, -1, 0, cctx, FALSE, FALSE) == FAIL)
+	    return FAIL;
+    }
+
+    // Load the dict or list.  On the stack we then have:
+    // - value (for assignment, not for :unlet)
+    // - index
+    // - variable
+    if (lhs->lhs_dest == dest_expr)
+    {
+	int	    c = var_start[varlen];
+
+	// Evaluate "ll[expr]" of "ll[expr][idx]"
+	p = var_start;
+	var_start[varlen] = NUL;
+	if (compile_expr0(&p, cctx) == OK && p != var_start + varlen)
+	{
+	    // this should not happen
+	    emsg(_(e_missbrac));
+	    return FAIL;
+	}
+	var_start[varlen] = c;
+
+	lhs->lhs_type = stack->ga_len == 0 ? &t_void
+		  : ((type_T **)stack->ga_data)[stack->ga_len - 1];
+	// now we can properly check the type
+	if (lhs->lhs_type->tt_member != NULL && rhs_type != &t_void
+		&& need_type(rhs_type, lhs->lhs_type->tt_member, -2, 0, cctx,
+							 FALSE, FALSE) == FAIL)
+	    return FAIL;
+    }
+    else
+	generate_loadvar(cctx, lhs->lhs_dest, lhs->lhs_name,
+						 lhs->lhs_lvar, lhs->lhs_type);
+
+    if (dest_type == VAR_LIST || dest_type == VAR_DICT || dest_type == VAR_ANY)
+    {
+	if (is_assign)
+	{
+	    isn_T	*isn = generate_instr_drop(cctx, ISN_STOREINDEX, 3);
+
+	    if (isn == NULL)
+		return FAIL;
+	    isn->isn_arg.vartype = dest_type;
+	}
+	else
+	{
+	    if (generate_instr_drop(cctx, ISN_UNLETINDEX, 2) == NULL)
+		return FAIL;
+	}
+    }
+    else
+    {
+	emsg(_(e_indexable_type_required));
+	return FAIL;
+    }
+
+    return OK;
+}
+
+/*
+ * Compile declaration and assignment:
+ * "let name"
+ * "var name = expr"
+ * "final name = expr"
+ * "const name = expr"
+ * "name = expr"
+ * "arg" points to "name".
+ * Return NULL for an error.
+ * Return "arg" if it does not look like a variable list.
+ */
+    static char_u *
+compile_assignment(char_u *arg, exarg_T *eap, cmdidx_T cmdidx, cctx_T *cctx)
+{
+    char_u	*var_start;
+    char_u	*p;
+    char_u	*end = arg;
+    char_u	*ret = NULL;
+    int		var_count = 0;
+    int		var_idx;
+    int		semicolon = 0;
+    garray_T	*instr = &cctx->ctx_instr;
+    garray_T    *stack = &cctx->ctx_type_stack;
+    char_u	*op;
+    int		oplen = 0;
+    int		heredoc = FALSE;
+    type_T	*rhs_type = &t_any;
+    char_u	*sp;
+    int		is_decl = is_decl_command(cmdidx);
+    lhs_T	lhs;
 
-		    if (script_namespace || script_var || import != NULL)
-		    {
-			char_u	*rawname = name + (name[1] == ':' ? 2 : 0);
+    // Skip over the "var" or "[var, var]" to get to any "=".
+    p = skip_var_list(arg, TRUE, &var_count, &semicolon, TRUE);
+    if (p == NULL)
+	return *arg == '[' ? arg : NULL;
 
-			if (is_decl)
-			{
-			    if (script_namespace)
-				semsg(_(e_cannot_declare_script_variable_in_function),
-									 name);
-			    else
-				semsg(_(e_variable_already_declared_in_script),
-									 name);
-			    goto theend;
-			}
-			else if (cctx->ctx_ufunc->uf_script_ctx_version
-							== SCRIPT_VERSION_VIM9
-				&& script_namespace
-					      && !script_var && import == NULL)
-			{
-			    semsg(_(e_unknown_variable_str), name);
-			    goto theend;
-			}
+    if (var_count > 0 && is_decl)
+    {
+	// TODO: should we allow this, and figure out type inference from list
+	// members?
+	emsg(_(e_cannot_use_list_for_declaration));
+	return NULL;
+    }
+    lhs.lhs_name = NULL;
 
-			dest = dest_script;
+    sp = p;
+    p = skipwhite(p);
+    op = p;
+    oplen = assignment_len(p, &heredoc);
 
-			// existing script-local variables should have a type
-			scriptvar_sid = current_sctx.sc_sid;
-			if (import != NULL)
-			    scriptvar_sid = import->imp_sid;
-			if (SCRIPT_ID_VALID(scriptvar_sid))
-			{
-			    scriptvar_idx = get_script_item_idx(scriptvar_sid,
-							  rawname, TRUE, cctx);
-			    if (scriptvar_idx >= 0)
-			    {
-				scriptitem_T *si = SCRIPT_ITEM(scriptvar_sid);
-				svar_T	     *sv =
-					    ((svar_T *)si->sn_var_vals.ga_data)
-							       + scriptvar_idx;
-				type = sv->sv_type;
-			    }
-			}
-		    }
-		    else if (name[1] == ':' && name[2] != NUL)
-		    {
-			semsg(_(e_cannot_use_namespaced_variable), name);
-			goto theend;
-		    }
-		    else if (!is_decl)
-		    {
-			semsg(_(e_unknown_variable_str), name);
-			goto theend;
-		    }
-		    else if (check_defined(var_start, varlen, cctx) == FAIL)
-			goto theend;
-		}
-	    }
+    if (var_count > 0 && oplen == 0)
+	// can be something like "[1, 2]->func()"
+	return arg;
 
-	    if (declare_error)
-	    {
-		vim9_declare_error(name);
-		goto theend;
-	    }
-	}
+    if (oplen > 0 && (!VIM_ISWHITE(*sp) || !IS_WHITE_OR_NUL(op[oplen])))
+    {
+	error_white_both(op, oplen);
+	return NULL;
+    }
+
+    if (heredoc)
+    {
+	list_T	   *l;
+	listitem_T *li;
 
-	// handle "a:name" as a name, not index "name" on "a"
-	if (varlen > 1 || var_start[varlen] != ':')
-	    p = var_end;
+	// [let] varname =<< [trim] {end}
+	eap->getline = exarg_getline;
+	eap->cookie = cctx;
+	l = heredoc_get(eap, op + 3, FALSE);
+	if (l == NULL)
+	    return NULL;
 
-	if (dest != dest_option)
+	if (cctx->ctx_skip != SKIP_YES)
 	{
-	    if (is_decl && *p == ':')
+	    // Push each line and the create the list.
+	    FOR_ALL_LIST_ITEMS(l, li)
 	    {
-		// parse optional type: "let var: type = expr"
-		if (!VIM_ISWHITE(p[1]))
-		{
-		    semsg(_(e_white_space_required_after_str), ":");
-		    goto theend;
-		}
-		p = skipwhite(p + 1);
-		type = parse_type(&p, cctx->ctx_type_list);
-		has_type = TRUE;
+		generate_PUSHS(cctx, li->li_tv.vval.v_string);
+		li->li_tv.vval.v_string = NULL;
 	    }
-	    else if (lvar != NULL)
-		type = lvar->lv_type;
+	    generate_NEWLIST(cctx, l->lv_len);
 	}
+	list_free(l);
+	p += STRLEN(p);
+	end = p;
+    }
+    else if (var_count > 0)
+    {
+	char_u *wp;
 
-	if (oplen == 3 && !heredoc && dest != dest_global
-			&& type->tt_type != VAR_STRING
-			&& type->tt_type != VAR_ANY)
-	{
-	    emsg(_(e_can_only_concatenate_to_string));
-	    goto theend;
-	}
+	// for "[var, var] = expr" evaluate the expression here, loop over the
+	// list of variables below.
+	// A line break may follow the "=".
+
+	wp = op + oplen;
+	if (may_get_next_line_error(wp, &p, cctx) == FAIL)
+	    return FAIL;
+	if (compile_expr0(&p, cctx) == FAIL)
+	    return NULL;
+	end = p;
 
-	if (lvar == NULL && dest == dest_local && cctx->ctx_skip != SKIP_YES)
+	if (cctx->ctx_skip != SKIP_YES)
 	{
-	    if (oplen > 1 && !heredoc)
+	    type_T	*stacktype;
+
+	    stacktype = stack->ga_len == 0 ? &t_void
+			      : ((type_T **)stack->ga_data)[stack->ga_len - 1];
+	    if (stacktype->tt_type == VAR_VOID)
 	    {
-		// +=, /=, etc. require an existing variable
-		semsg(_(e_cannot_use_operator_on_new_variable), name);
+		emsg(_(e_cannot_use_void_value));
 		goto theend;
 	    }
-
-	    // new local variable
-	    if ((type->tt_type == VAR_FUNC || type->tt_type == VAR_PARTIAL)
-					    && var_wrong_func_name(name, TRUE))
-		goto theend;
-	    lvar = reserve_local(cctx, var_start, varlen,
-			     cmdidx == CMD_final || cmdidx == CMD_const, type);
-	    if (lvar == NULL)
+	    if (need_type(stacktype, &t_list_any, -1, 0, cctx,
+							 FALSE, FALSE) == FAIL)
 		goto theend;
-	    new_local = TRUE;
+	    // TODO: check the length of a constant list here
+	    generate_CHECKLEN(cctx, semicolon ? var_count - 1 : var_count,
+								    semicolon);
+	    if (stacktype->tt_member != NULL)
+		rhs_type = stacktype->tt_member;
 	}
+    }
 
-	member_type = type;
-	if (var_end > var_start + varlen)
-	{
-	    // Something follows after the variable: "var[idx]".
-	    if (is_decl)
-	    {
-		emsg(_(e_cannot_use_index_when_declaring_variable));
-		goto theend;
-	    }
+    /*
+     * Loop over variables in "[var, var] = expr".
+     * For "var = expr" and "let var: type" this is done only once.
+     */
+    if (var_count > 0)
+	var_start = skipwhite(arg + 1);  // skip over the "["
+    else
+	var_start = arg;
+    for (var_idx = 0; var_idx == 0 || var_idx < var_count; var_idx++)
+    {
+	int		instr_count = -1;
 
-	    if (var_start[varlen] == '[')
-	    {
-		has_index = TRUE;
-		if (type->tt_member == NULL)
-		    member_type = &t_any;
-		else
-		    member_type = type->tt_member;
-	    }
-	    else
-	    {
-		semsg("Not supported yet: %s", var_start);
-		goto theend;
-	    }
-	}
-	else if (lvar == &arg_lvar)
+	vim_free(lhs.lhs_name);
+
+	/*
+	 * Figure out the LHS type and other properties.
+	 */
+	if (compile_lhs(var_start, &lhs, cmdidx, heredoc, oplen, cctx) == FAIL)
+	    goto theend;
+
+	if (!lhs.lhs_has_index && lhs.lhs_lvar == &lhs.lhs_arg_lvar)
 	{
-	    semsg(_(e_cannot_assign_to_argument), name);
+	    semsg(_(e_cannot_assign_to_argument), lhs.lhs_name);
 	    goto theend;
 	}
-	if (!is_decl && lvar != NULL && lvar->lv_const && !has_index)
+	if (!is_decl && lhs.lhs_lvar != NULL
+			       && lhs.lhs_lvar->lv_const && !lhs.lhs_has_index)
 	{
-	    semsg(_(e_cannot_assign_to_constant), name);
+	    semsg(_(e_cannot_assign_to_constant), lhs.lhs_name);
 	    goto theend;
 	}
 
@@ -5375,8 +6080,8 @@
 	    }
 	    else if (oplen > 0)
 	    {
-		type_T	*stacktype;
 		int	is_const = FALSE;
+		char_u	*wp;
 
 		// For "var = expr" evaluate the expression.
 		if (var_count == 0)
@@ -5386,9 +6091,10 @@
 		    // for "+=", "*=", "..=" etc. first load the current value
 		    if (*op != '=')
 		    {
-			generate_loadvar(cctx, dest, name, lvar, type);
+			generate_loadvar(cctx, lhs.lhs_dest, lhs.lhs_name,
+						   lhs.lhs_lvar, lhs.lhs_type);
 
-			if (has_index)
+			if (lhs.lhs_has_index)
 			{
 			    // TODO: get member from list or dict
 			    emsg("Index with operation not supported yet");
@@ -5398,12 +6104,18 @@
 
 		    // Compile the expression.  Temporarily hide the new local
 		    // variable here, it is not available to this expression.
-		    if (new_local)
+		    if (lhs.lhs_new_local)
 			--cctx->ctx_locals.ga_len;
 		    instr_count = instr->ga_len;
-		    p = skipwhite(op + oplen);
+		    wp = op + oplen;
+		    if (may_get_next_line_error(wp, &p, cctx) == FAIL)
+		    {
+			if (lhs.lhs_new_local)
+			    ++cctx->ctx_locals.ga_len;
+			goto theend;
+		    }
 		    r = compile_expr0_ext(&p, cctx, &is_const);
-		    if (new_local)
+		    if (lhs.lhs_new_local)
 			++cctx->ctx_locals.ga_len;
 		    if (r == FAIL)
 			goto theend;
@@ -5419,21 +6131,21 @@
 		    // For "[var, var] = expr" get the "var_idx" item from the
 		    // list.
 		    if (generate_GETITEM(cctx, var_idx) == FAIL)
-			return FAIL;
+			goto theend;
 		}
 
-		stacktype = stack->ga_len == 0 ? &t_void
+		rhs_type = stack->ga_len == 0 ? &t_void
 			      : ((type_T **)stack->ga_data)[stack->ga_len - 1];
-		if (lvar != NULL && (is_decl || !has_type))
+		if (lhs.lhs_lvar != NULL && (is_decl || !lhs.lhs_has_type))
 		{
-		    if ((stacktype->tt_type == VAR_FUNC
-				|| stacktype->tt_type == VAR_PARTIAL)
-			    && var_wrong_func_name(name, TRUE))
+		    if ((rhs_type->tt_type == VAR_FUNC
+				|| rhs_type->tt_type == VAR_PARTIAL)
+			    && var_wrong_func_name(lhs.lhs_name, TRUE))
 			goto theend;
 
-		    if (new_local && !has_type)
+		    if (lhs.lhs_new_local && !lhs.lhs_has_type)
 		    {
-			if (stacktype->tt_type == VAR_VOID)
+			if (rhs_type->tt_type == VAR_VOID)
 			{
 			    emsg(_(e_cannot_use_void_value));
 			    goto theend;
@@ -5442,35 +6154,30 @@
 			{
 			    // An empty list or dict has a &t_unknown member,
 			    // for a variable that implies &t_any.
-			    if (stacktype == &t_list_empty)
-				lvar->lv_type = &t_list_any;
-			    else if (stacktype == &t_dict_empty)
-				lvar->lv_type = &t_dict_any;
-			    else if (stacktype == &t_unknown)
-				lvar->lv_type = &t_any;
+			    if (rhs_type == &t_list_empty)
+				lhs.lhs_lvar->lv_type = &t_list_any;
+			    else if (rhs_type == &t_dict_empty)
+				lhs.lhs_lvar->lv_type = &t_dict_any;
+			    else if (rhs_type == &t_unknown)
+				lhs.lhs_lvar->lv_type = &t_any;
 			    else
-				lvar->lv_type = stacktype;
+				lhs.lhs_lvar->lv_type = rhs_type;
 			}
 		    }
 		    else if (*op == '=')
 		    {
-			type_T *use_type = lvar->lv_type;
+			type_T *use_type = lhs.lhs_lvar->lv_type;
 
 			// without operator check type here, otherwise below
-			if (has_index)
-			{
-			    use_type = use_type->tt_member;
-			    if (use_type == NULL)
-				// could be indexing "any"
-				use_type = &t_any;
-			}
-			if (need_type(stacktype, use_type, -1, cctx,
+			if (lhs.lhs_has_index)
+			    use_type = lhs.lhs_member_type;
+			if (need_type(rhs_type, use_type, -1, 0, cctx,
 						      FALSE, is_const) == FAIL)
 			    goto theend;
 		    }
 		}
-		else if (*p != '=' && need_type(stacktype, member_type, -1,
-						   cctx, FALSE, FALSE) == FAIL)
+		else if (*p != '=' && need_type(rhs_type, lhs.lhs_member_type,
+					    -1, 0, cctx, FALSE, FALSE) == FAIL)
 		    goto theend;
 	    }
 	    else if (cmdidx == CMD_final)
@@ -5483,7 +6190,7 @@
 		emsg(_(e_const_requires_a_value));
 		goto theend;
 	    }
-	    else if (!has_type || dest == dest_option)
+	    else if (!lhs.lhs_has_type || lhs.lhs_dest == dest_option)
 	    {
 		emsg(_(e_type_or_initialization_required));
 		goto theend;
@@ -5493,7 +6200,7 @@
 		// variables are always initialized
 		if (ga_grow(instr, 1) == FAIL)
 		    goto theend;
-		switch (member_type->tt_type)
+		switch (lhs.lhs_member_type->tt_type)
 		{
 		    case VAR_BOOL:
 			generate_PUSHBOOL(cctx, VVAL_FALSE);
@@ -5550,14 +6257,14 @@
 	    if (*op == '.')
 		expected = &t_string;
 	    else
-		expected = member_type;
+		expected = lhs.lhs_member_type;
 	    stacktype = ((type_T **)stack->ga_data)[stack->ga_len - 1];
 	    if (
 #ifdef FEAT_FLOAT
 		// If variable is float operation with number is OK.
 		!(expected == &t_float && stacktype == &t_number) &&
 #endif
-		    need_type(stacktype, expected, -1, cctx,
+		    need_type(stacktype, expected, -1, 0, cctx,
 							 FALSE, FALSE) == FAIL)
 		goto theend;
 
@@ -5569,193 +6276,164 @@
 	    else if (*op == '+')
 	    {
 		if (generate_add_instr(cctx,
-			    operator_type(member_type, stacktype),
-					       member_type, stacktype) == FAIL)
+			    operator_type(lhs.lhs_member_type, stacktype),
+				       lhs.lhs_member_type, stacktype) == FAIL)
 		    goto theend;
 	    }
 	    else if (generate_two_op(cctx, op) == FAIL)
 		goto theend;
 	}
 
-	if (has_index)
+	if (lhs.lhs_has_index)
 	{
-	    int r;
-
-	    // Compile the "idx" in "var[idx]".
-	    if (new_local)
-		--cctx->ctx_locals.ga_len;
-	    p = skipwhite(var_start + varlen + 1);
-	    r = compile_expr0(&p, cctx);
-	    if (new_local)
-		++cctx->ctx_locals.ga_len;
-	    if (r == FAIL)
-		goto theend;
-	    if (*skipwhite(p) != ']')
-	    {
-		// this should not happen
-		emsg(_(e_missbrac));
-		goto theend;
-	    }
-	    if (type == &t_any)
-	    {
-		type_T	    *idx_type = ((type_T **)stack->ga_data)[
-							    stack->ga_len - 1];
-		// Index on variable of unknown type: guess the type from the
-		// index type: number is dict, otherwise dict.
-		// TODO: should do the assignment at runtime
-		if (idx_type->tt_type == VAR_NUMBER)
-		    type = &t_list_any;
-		else
-		    type = &t_dict_any;
-	    }
-	    if (type->tt_type == VAR_DICT
-		    && may_generate_2STRING(-1, cctx) == FAIL)
-		goto theend;
-	    if (type->tt_type == VAR_LIST
-		    && ((type_T **)stack->ga_data)[stack->ga_len - 1]->tt_type
-								 != VAR_NUMBER)
-	    {
-		emsg(_(e_number_exp));
-		goto theend;
-	    }
-
-	    // Load the dict or list.  On the stack we then have:
-	    // - value
-	    // - index
-	    // - variable
-	    generate_loadvar(cctx, dest, name, lvar, type);
-
-	    if (type->tt_type == VAR_LIST)
-	    {
-		if (generate_instr_drop(cctx, ISN_STORELIST, 3) == FAIL)
-		    return FAIL;
-	    }
-	    else if (type->tt_type == VAR_DICT)
-	    {
-		if (generate_instr_drop(cctx, ISN_STOREDICT, 3) == FAIL)
-		    return FAIL;
-	    }
-	    else
-	    {
-		emsg(_(e_listreq));
+	    // Use the info in "lhs" to store the value at the index in the
+	    // list or dict.
+	    if (compile_assign_unlet(var_start, &lhs, TRUE, rhs_type, cctx)
+								       == FAIL)
 		goto theend;
-	    }
 	}
 	else
 	{
-	    if (is_decl && cmdidx == CMD_const
-				&& (dest == dest_script || dest == dest_local))
+	    if (is_decl && cmdidx == CMD_const && (lhs.lhs_dest == dest_script
+						|| lhs.lhs_dest == dest_local))
 		// ":const var": lock the value, but not referenced variables
 		generate_LOCKCONST(cctx);
 
-	    switch (dest)
+	    if (is_decl
+		    && (lhs.lhs_type->tt_type == VAR_DICT
+					  || lhs.lhs_type->tt_type == VAR_LIST)
+		    && lhs.lhs_type->tt_member != NULL
+		    && lhs.lhs_type->tt_member != &t_any
+		    && lhs.lhs_type->tt_member != &t_unknown)
+		// Set the type in the list or dict, so that it can be checked,
+		// also in legacy script.
+		generate_SETTYPE(cctx, lhs.lhs_type);
+
+	    if (lhs.lhs_dest != dest_local)
+	    {
+		if (generate_store_var(cctx, lhs.lhs_dest,
+			    lhs.lhs_opt_flags, lhs.lhs_vimvaridx,
+			    lhs.lhs_scriptvar_idx, lhs.lhs_scriptvar_sid,
+					   lhs.lhs_type, lhs.lhs_name) == FAIL)
+		    goto theend;
+	    }
+	    else if (lhs.lhs_lvar != NULL)
 	    {
-		case dest_option:
-		    generate_STOREOPT(cctx, skip_option_env_lead(name),
-								    opt_flags);
-		    break;
-		case dest_global:
-		    // include g: with the name, easier to execute that way
-		    generate_STORE(cctx, ISN_STOREG, 0, name);
-		    break;
-		case dest_buffer:
-		    // include b: with the name, easier to execute that way
-		    generate_STORE(cctx, ISN_STOREB, 0, name);
-		    break;
-		case dest_window:
-		    // include w: with the name, easier to execute that way
-		    generate_STORE(cctx, ISN_STOREW, 0, name);
-		    break;
-		case dest_tab:
-		    // include t: with the name, easier to execute that way
-		    generate_STORE(cctx, ISN_STORET, 0, name);
-		    break;
-		case dest_env:
-		    generate_STORE(cctx, ISN_STOREENV, 0, name + 1);
-		    break;
-		case dest_reg:
-		    generate_STORE(cctx, ISN_STOREREG, name[1], NULL);
-		    break;
-		case dest_vimvar:
-		    generate_STORE(cctx, ISN_STOREV, vimvaridx, NULL);
-		    break;
-		case dest_script:
-		    {
-			if (scriptvar_idx < 0)
-			{
-			    char_u *name_s = name;
-
-			    // Include s: in the name for store_var()
-			    if (name[1] != ':')
-			    {
-				int len = (int)STRLEN(name) + 3;
-
-				name_s = alloc(len);
-				if (name_s == NULL)
-				    name_s = name;
-				else
-				    vim_snprintf((char *)name_s, len,
-								 "s:%s", name);
-			    }
-			    generate_OLDSCRIPT(cctx, ISN_STORES, name_s,
-							  scriptvar_sid, type);
-			    if (name_s != name)
-				vim_free(name_s);
-			}
-			else
-			    generate_VIM9SCRIPT(cctx, ISN_STORESCRIPT,
-					   scriptvar_sid, scriptvar_idx, type);
-		    }
-		    break;
-		case dest_local:
-		    if (lvar != NULL)
-		    {
-			isn_T *isn = ((isn_T *)instr->ga_data)
-							   + instr->ga_len - 1;
+		isn_T *isn = ((isn_T *)instr->ga_data)
+						   + instr->ga_len - 1;
 
-			// optimization: turn "var = 123" from ISN_PUSHNR +
-			// ISN_STORE into ISN_STORENR
-			if (!lvar->lv_from_outer
-					&& instr->ga_len == instr_count + 1
-					&& isn->isn_type == ISN_PUSHNR)
-			{
-			    varnumber_T val = isn->isn_arg.number;
+		// optimization: turn "var = 123" from ISN_PUSHNR +
+		// ISN_STORE into ISN_STORENR
+		if (lhs.lhs_lvar->lv_from_outer == 0
+				&& instr->ga_len == instr_count + 1
+				&& isn->isn_type == ISN_PUSHNR)
+		{
+		    varnumber_T val = isn->isn_arg.number;
 
-			    isn->isn_type = ISN_STORENR;
-			    isn->isn_arg.storenr.stnr_idx = lvar->lv_idx;
-			    isn->isn_arg.storenr.stnr_val = val;
-			    if (stack->ga_len > 0)
-				--stack->ga_len;
-			}
-			else if (lvar->lv_from_outer)
-			    generate_STORE(cctx, ISN_STOREOUTER, lvar->lv_idx,
-									 NULL);
-			else
-			    generate_STORE(cctx, ISN_STORE, lvar->lv_idx, NULL);
-		    }
-		    break;
+		    isn->isn_type = ISN_STORENR;
+		    isn->isn_arg.storenr.stnr_idx = lhs.lhs_lvar->lv_idx;
+		    isn->isn_arg.storenr.stnr_val = val;
+		    if (stack->ga_len > 0)
+			--stack->ga_len;
+		}
+		else if (lhs.lhs_lvar->lv_from_outer > 0)
+		    generate_STOREOUTER(cctx, lhs.lhs_lvar->lv_idx,
+						  lhs.lhs_lvar->lv_from_outer);
+		else
+		    generate_STORE(cctx, ISN_STORE, lhs.lhs_lvar->lv_idx, NULL);
 	    }
 	}
 
 	if (var_idx + 1 < var_count)
-	    var_start = skipwhite(var_end + 1);
+	    var_start = skipwhite(lhs.lhs_dest_end + 1);
     }
 
     // for "[var, var] = expr" drop the "expr" value
     if (var_count > 0 && !semicolon)
     {
-	    if (generate_instr_drop(cctx, ISN_DROP, 1) == NULL)
+	if (generate_instr_drop(cctx, ISN_DROP, 1) == NULL)
 	    goto theend;
     }
 
     ret = skipwhite(end);
 
 theend:
-    vim_free(name);
+    vim_free(lhs.lhs_name);
     return ret;
 }
 
 /*
+ * Check for an assignment at "eap->cmd", compile it if found.
+ * Return NOTDONE if there is none, FAIL for failure, OK if done.
+ */
+    static int
+may_compile_assignment(exarg_T *eap, char_u **line, cctx_T *cctx)
+{
+    char_u  *pskip;
+    char_u  *p;
+
+    // Assuming the command starts with a variable or function name,
+    // find what follows.
+    // Skip over "var.member", "var[idx]" and the like.
+    // Also "&opt = val", "$ENV = val" and "@r = val".
+    pskip = (*eap->cmd == '&' || *eap->cmd == '$' || *eap->cmd == '@')
+						 ? eap->cmd + 1 : eap->cmd;
+    p = to_name_end(pskip, TRUE);
+    if (p > eap->cmd && *p != NUL)
+    {
+	char_u *var_end;
+	int	oplen;
+	int	heredoc;
+
+	if (eap->cmd[0] == '@')
+	    var_end = eap->cmd + 2;
+	else
+	    var_end = find_name_end(pskip, NULL, NULL,
+					FNE_CHECK_START | FNE_INCL_BR);
+	oplen = assignment_len(skipwhite(var_end), &heredoc);
+	if (oplen > 0)
+	{
+	    size_t len = p - eap->cmd;
+
+	    // Recognize an assignment if we recognize the variable
+	    // name:
+	    // "g:var = expr"
+	    // "local = expr"  where "local" is a local var.
+	    // "script = expr"  where "script" is a script-local var.
+	    // "import = expr"  where "import" is an imported var
+	    // "&opt = expr"
+	    // "$ENV = expr"
+	    // "@r = expr"
+	    if (*eap->cmd == '&'
+		    || *eap->cmd == '$'
+		    || *eap->cmd == '@'
+		    || ((len) > 2 && eap->cmd[1] == ':')
+		    || lookup_local(eap->cmd, len, NULL, cctx) == OK
+		    || arg_exists(eap->cmd, len, NULL, NULL, NULL, cctx) == OK
+		    || script_var_exists(eap->cmd, len, FALSE, cctx) == OK
+		    || find_imported(eap->cmd, len, cctx) != NULL)
+	    {
+		*line = compile_assignment(eap->cmd, eap, CMD_SIZE, cctx);
+		if (*line == NULL || *line == eap->cmd)
+		    return FAIL;
+		return OK;
+	    }
+	}
+    }
+
+    if (*eap->cmd == '[')
+    {
+	// [var, var] = expr
+	*line = compile_assignment(eap->cmd, eap, CMD_SIZE, cctx);
+	if (*line == NULL)
+	    return FAIL;
+	if (*line != eap->cmd)
+	    return OK;
+    }
+    return NOTDONE;
+}
+
+/*
  * Check if "name" can be "unlet".
  */
     int
@@ -5783,31 +6461,60 @@
     int	    deep UNUSED,
     void    *coookie)
 {
-    cctx_T *cctx = coookie;
+    cctx_T	*cctx = coookie;
+    char_u	*p = lvp->ll_name;
+    int		cc = *name_end;
+    int		ret = OK;
 
-    if (lvp->ll_tv == NULL)
+    if (cctx->ctx_skip == SKIP_YES)
+	return OK;
+
+    *name_end = NUL;
+    if (*p == '$')
+    {
+	// :unlet $ENV_VAR
+	ret = generate_UNLET(cctx, ISN_UNLETENV, p + 1, eap->forceit);
+    }
+    else if (vim_strchr(p, '.') != NULL || vim_strchr(p, '[') != NULL)
     {
-	char_u	*p = lvp->ll_name;
-	int	cc = *name_end;
-	int	ret = OK;
+	lhs_T	    lhs;
 
-	// Normal name.  Only supports g:, w:, t: and b: namespaces.
-	*name_end = NUL;
-	if (*p == '$')
-	    ret = generate_UNLET(cctx, ISN_UNLETENV, p + 1, eap->forceit);
-	else if (check_vim9_unlet(p) == FAIL)
+	// This is similar to assigning: lookup the list/dict, compile the
+	// idx/key.  Then instead of storing the value unlet the item.
+	// unlet {list}[idx]
+	// unlet {dict}[key]  dict.key
+	//
+	// Figure out the LHS type and other properties.
+	//
+	ret = compile_lhs(p, &lhs, CMD_unlet, FALSE, 0, cctx);
+
+	// : unlet an indexed item
+	if (!lhs.lhs_has_index)
+	{
+	    iemsg("called compile_lhs() without an index");
 	    ret = FAIL;
+	}
 	else
-	    ret = generate_UNLET(cctx, ISN_UNLET, p, eap->forceit);
+	{
+	    // Use the info in "lhs" to unlet the item at the index in the
+	    // list or dict.
+	    ret = compile_assign_unlet(p, &lhs, FALSE, &t_void, cctx);
+	}
 
-	*name_end = cc;
-	return ret;
+	vim_free(lhs.lhs_name);
+    }
+    else if (check_vim9_unlet(p) == FAIL)
+    {
+	ret = FAIL;
+    }
+    else
+    {
+	// Normal name.  Only supports g:, w:, t: and b: namespaces.
+	ret = generate_UNLET(cctx, ISN_UNLET, p, eap->forceit);
     }
 
-    // TODO: unlet {list}[idx]
-    // TODO: unlet {dict}[key]
-    emsg("Sorry, :unlet not fully implemented yet");
-    return FAIL;
+    *name_end = cc;
+    return ret;
 }
 
 /*
@@ -5825,13 +6532,8 @@
 	return NULL;
     }
 
-    if (*p == '!')
-    {
-	p = skipwhite(p + 1);
-	eap->forceit = TRUE;
-    }
-
-    ex_unletlock(eap, p, 0, GLV_NO_AUTOLOAD, compile_unlet, cctx);
+    ex_unletlock(eap, p, 0, GLV_NO_AUTOLOAD | GLV_COMPILING,
+							  compile_unlet, cctx);
     return eap->nextcmd == NULL ? (char_u *)"" : eap->nextcmd;
 }
 
@@ -5864,7 +6566,7 @@
 }
 
     static void
-compile_fill_jump_to_end(endlabel_T **el, cctx_T *cctx)
+compile_fill_jump_to_end(endlabel_T **el, int jump_where, cctx_T *cctx)
 {
     garray_T	*instr = &cctx->ctx_instr;
 
@@ -5874,7 +6576,7 @@
 	isn_T	    *isn;
 
 	isn = ((isn_T *)instr->ga_data) + cur->el_end_label;
-	isn->isn_arg.jump.jump_where = instr->ga_len;
+	isn->isn_arg.jump.jump_where = jump_where;
 	*el = cur->el_next;
 	vim_free(cur);
     }
@@ -5933,28 +6635,11 @@
 	    compile_free_jump_to_end(&scope->se_u.se_while.ws_end_label); break;
 	case TRY_SCOPE:
 	    compile_free_jump_to_end(&scope->se_u.se_try.ts_end_label); break;
-	case NO_SCOPE:
-	case BLOCK_SCOPE:
-	    break;
-    }
-    vim_free(scope);
-}
-
-/*
- * Check that the top of the type stack has a type that can be used as a
- * condition.  Give an error and return FAIL if not.
- */
-    static int
-bool_on_stack(cctx_T *cctx)
-{
-    garray_T	*stack = &cctx->ctx_type_stack;
-    type_T	*type;
-
-    type = ((type_T **)stack->ga_data)[stack->ga_len - 1];
-    if (type != &t_bool && type != &t_number && type != &t_any
-	    && need_type(type, &t_bool, -1, cctx, FALSE, FALSE) == FAIL)
-	return FAIL;
-    return OK;
+	case NO_SCOPE:
+	case BLOCK_SCOPE:
+	    break;
+    }
+    vim_free(scope);
 }
 
 /*
@@ -6045,6 +6730,18 @@
     else
 	scope->se_u.se_if.is_if_label = -1;
 
+#ifdef FEAT_PROFILE
+    if (cctx->ctx_profiling && cctx->ctx_skip == SKIP_YES
+						      && skip_save != SKIP_YES)
+    {
+	// generated a profile start, need to generate a profile end, since it
+	// won't be done after returning
+	cctx->ctx_skip = SKIP_NOT;
+	generate_instr(cctx, ISN_PROF_END);
+	cctx->ctx_skip = SKIP_YES;
+    }
+#endif
+
     return p;
 }
 
@@ -6068,6 +6765,25 @@
     if (!cctx->ctx_had_return)
 	scope->se_u.se_if.is_had_return = FALSE;
 
+    if (cctx->ctx_skip == SKIP_NOT)
+    {
+	// previous block was executed, this one and following will not
+	cctx->ctx_skip = SKIP_YES;
+	scope->se_u.se_if.is_seen_skip_not = TRUE;
+    }
+    if (scope->se_u.se_if.is_seen_skip_not)
+    {
+	// A previous block was executed, skip over expression and bail out.
+	// Do not count the "elseif" for profiling.
+#ifdef FEAT_PROFILE
+	if (cctx->ctx_profiling && ((isn_T *)instr->ga_data)[instr->ga_len - 1]
+						   .isn_type == ISN_PROF_START)
+	    --instr->ga_len;
+#endif
+	skip_expr_cctx(&p, cctx);
+	return p;
+    }
+
     if (cctx->ctx_skip == SKIP_UNKNOWN)
     {
 	if (compile_jump_to_end(&scope->se_u.se_if.is_end_label,
@@ -6081,7 +6797,17 @@
     // compile "expr"; if we know it evaluates to FALSE skip the block
     CLEAR_FIELD(ppconst);
     if (cctx->ctx_skip == SKIP_YES)
+    {
 	cctx->ctx_skip = SKIP_UNKNOWN;
+#ifdef FEAT_PROFILE
+	if (cctx->ctx_profiling)
+	{
+	    // the previous block was skipped, need to profile this line
+	    generate_instr(cctx, ISN_PROF_START);
+	    instr_count = instr->ga_len;
+	}
+#endif
+    }
     if (compile_expr1(&p, cctx, &ppconst) == FAIL)
     {
 	clear_ppconst(&ppconst);
@@ -6139,7 +6865,27 @@
 	scope->se_u.se_if.is_had_return = FALSE;
     scope->se_u.se_if.is_seen_else = TRUE;
 
-    if (scope->se_skip_save != SKIP_YES)
+#ifdef FEAT_PROFILE
+    if (cctx->ctx_profiling)
+    {
+	if (cctx->ctx_skip == SKIP_NOT
+		&& ((isn_T *)instr->ga_data)[instr->ga_len - 1]
+						   .isn_type == ISN_PROF_START)
+	    // the previous block was executed, do not count "else" for profiling
+	    --instr->ga_len;
+	if (cctx->ctx_skip == SKIP_YES && !scope->se_u.se_if.is_seen_skip_not)
+	{
+	    // the previous block was not executed, this one will, do count the
+	    // "else" for profiling
+	    cctx->ctx_skip = SKIP_NOT;
+	    generate_instr(cctx, ISN_PROF_END);
+	    generate_instr(cctx, ISN_PROF_START);
+	    cctx->ctx_skip = SKIP_YES;
+	}
+    }
+#endif
+
+    if (!scope->se_u.se_if.is_seen_skip_not && scope->se_skip_save != SKIP_YES)
     {
 	// jump from previous block to the end, unless the else block is empty
 	if (cctx->ctx_skip == SKIP_UNKNOWN)
@@ -6193,7 +6939,18 @@
 	isn->isn_arg.jump.jump_where = instr->ga_len;
     }
     // Fill in the "end" label in jumps at the end of the blocks.
-    compile_fill_jump_to_end(&ifscope->is_end_label, cctx);
+    compile_fill_jump_to_end(&ifscope->is_end_label, instr->ga_len, cctx);
+
+#ifdef FEAT_PROFILE
+    // even when skipping we count the endif as executed, unless the block it's
+    // in is skipped
+    if (cctx->ctx_profiling && cctx->ctx_skip == SKIP_YES
+					    && scope->se_skip_save != SKIP_YES)
+    {
+	cctx->ctx_skip = SKIP_NOT;
+	generate_instr(cctx, ISN_PROF_START);
+    }
+#endif
     cctx->ctx_skip = scope->se_skip_save;
 
     // If all the blocks end in :return and there is an :else then the
@@ -6205,12 +6962,12 @@
 }
 
 /*
- * compile "for var in expr"
+ * Compile "for var in expr":
  *
  * Produces instructions:
  *       PUSHNR -1
  *       STORE loop-idx		Set index to -1
- *       EVAL expr		Push result of "expr"
+ *       EVAL expr		result of "expr" on top of stack
  * top:  FOR loop-idx, end	Increment index, use list on bottom of stack
  *				- if beyond end, jump to "end"
  *				- otherwise get item from list and push it
@@ -6219,11 +6976,21 @@
  *       JUMP top		Jump back to repeat
  * end:	 DROP			Drop the result of "expr"
  *
+ * Compile "for [var1, var2] in expr" - as above, but instead of "STORE var":
+ *	 UNPACK 2		Split item in 2
+ *       STORE var1		Store item in "var1"
+ *       STORE var2		Store item in "var2"
  */
     static char_u *
-compile_for(char_u *arg, cctx_T *cctx)
+compile_for(char_u *arg_start, cctx_T *cctx)
 {
+    char_u	*arg;
+    char_u	*arg_end;
+    char_u	*name = NULL;
     char_u	*p;
+    char_u	*wp;
+    int		var_count = 0;
+    int		semicolon = FALSE;
     size_t	varlen;
     garray_T	*instr = &cctx->ctx_instr;
     garray_T	*stack = &cctx->ctx_type_stack;
@@ -6231,34 +6998,34 @@
     lvar_T	*loop_lvar;	// loop iteration variable
     lvar_T	*var_lvar;	// variable for "var"
     type_T	*vartype;
+    type_T	*item_type = &t_any;
+    int		idx;
 
-    // TODO: list of variables: "for [key, value] in dict"
-    // parse "var"
-    for (p = arg; eval_isnamec1(*p); ++p)
-	;
-    varlen = p - arg;
-    var_lvar = lookup_local(arg, varlen, cctx);
-    if (var_lvar != NULL)
-    {
-	semsg(_(e_variable_already_declared), arg);
+    p = skip_var_list(arg_start, TRUE, &var_count, &semicolon, FALSE);
+    if (p == NULL)
 	return NULL;
-    }
+    if (var_count == 0)
+	var_count = 1;
 
     // consume "in"
-    p = skipwhite(p);
-    if (STRNCMP(p, "in", 2) != 0 || !VIM_ISWHITE(p[2]))
+    wp = p;
+    if (may_get_next_line_error(wp, &p, cctx) == FAIL)
+	return NULL;
+    if (STRNCMP(p, "in", 2) != 0 || !IS_WHITE_OR_NUL(p[2]))
     {
 	emsg(_(e_missing_in));
 	return NULL;
     }
-    p = skipwhite(p + 2);
-
+    wp = p + 2;
+    if (may_get_next_line_error(wp, &p, cctx) == FAIL)
+	return NULL;
 
     scope = new_scope(cctx, FOR_SCOPE);
     if (scope == NULL)
 	return NULL;
 
-    // Reserve a variable to store the loop iteration counter.
+    // Reserve a variable to store the loop iteration counter and initialize it
+    // to -1.
     loop_lvar = reserve_local(cctx, (char_u *)"", 0, FALSE, &t_number);
     if (loop_lvar == NULL)
     {
@@ -6266,16 +7033,6 @@
 	drop_scope(cctx);
 	return NULL;
     }
-
-    // Reserve a variable to store "var"
-    var_lvar = reserve_local(cctx, arg, varlen, FALSE, &t_any);
-    if (var_lvar == NULL)
-    {
-	// out of memory or used as an argument
-	drop_scope(cctx);
-	return NULL;
-    }
-
     generate_STORENR(cctx, loop_lvar->lv_idx, -1);
 
     // compile "expr", it remains on the stack until "endfor"
@@ -6285,25 +7042,116 @@
 	drop_scope(cctx);
 	return NULL;
     }
+    arg_end = arg;
 
     // Now that we know the type of "var", check that it is a list, now or at
     // runtime.
     vartype = ((type_T **)stack->ga_data)[stack->ga_len - 1];
-    if (need_type(vartype, &t_list_any, -1, cctx, FALSE, FALSE) == FAIL)
+    if (need_type(vartype, &t_list_any, -1, 0, cctx, FALSE, FALSE) == FAIL)
     {
 	drop_scope(cctx);
 	return NULL;
     }
+
     if (vartype->tt_type == VAR_LIST && vartype->tt_member->tt_type != VAR_ANY)
-	var_lvar->lv_type = vartype->tt_member;
+    {
+	if (var_count == 1)
+	    item_type = vartype->tt_member;
+	else if (vartype->tt_member->tt_type == VAR_LIST
+		      && vartype->tt_member->tt_member->tt_type != VAR_ANY)
+	    item_type = vartype->tt_member->tt_member;
+    }
 
     // "for_end" is set when ":endfor" is found
     scope->se_u.se_for.fs_top_label = instr->ga_len;
-
     generate_FOR(cctx, loop_lvar->lv_idx);
-    generate_STORE(cctx, ISN_STORE, var_lvar->lv_idx, NULL);
 
-    return arg;
+    arg = arg_start;
+    if (var_count > 1)
+    {
+	generate_UNPACK(cctx, var_count, semicolon);
+	arg = skipwhite(arg + 1);	// skip white after '['
+
+	// the list item is replaced by a number of items
+	if (ga_grow(stack, var_count - 1) == FAIL)
+	{
+	    drop_scope(cctx);
+	    return NULL;
+	}
+	--stack->ga_len;
+	for (idx = 0; idx < var_count; ++idx)
+	{
+	    ((type_T **)stack->ga_data)[stack->ga_len] =
+				(semicolon && idx == 0) ? vartype : item_type;
+	    ++stack->ga_len;
+	}
+    }
+
+    for (idx = 0; idx < var_count; ++idx)
+    {
+	assign_dest_T	dest = dest_local;
+	int		opt_flags = 0;
+	int		vimvaridx = -1;
+	type_T		*type = &t_any;
+
+	p = skip_var_one(arg, FALSE);
+	varlen = p - arg;
+	name = vim_strnsave(arg, varlen);
+	if (name == NULL)
+	    goto failed;
+
+	// TODO: script var not supported?
+	if (get_var_dest(name, &dest, CMD_for, &opt_flags,
+					      &vimvaridx, &type, cctx) == FAIL)
+	    goto failed;
+	if (dest != dest_local)
+	{
+	    if (generate_store_var(cctx, dest, opt_flags, vimvaridx,
+						     0, 0, type, name) == FAIL)
+		goto failed;
+	}
+	else
+	{
+	    if (lookup_local(arg, varlen, NULL, cctx) == OK)
+	    {
+		semsg(_(e_variable_already_declared), arg);
+		goto failed;
+	    }
+
+	    if (STRNCMP(name, "s:", 2) == 0)
+	    {
+		semsg(_(e_cannot_declare_script_variable_in_function), name);
+		goto failed;
+	    }
+
+	    // Reserve a variable to store "var".
+	    // TODO: check for type
+	    var_lvar = reserve_local(cctx, arg, varlen, FALSE, &t_any);
+	    if (var_lvar == NULL)
+		// out of memory or used as an argument
+		goto failed;
+
+	    if (semicolon && idx == var_count - 1)
+		var_lvar->lv_type = vartype;
+	    else
+		var_lvar->lv_type = item_type;
+	    generate_STORE(cctx, ISN_STORE, var_lvar->lv_idx, NULL);
+	}
+
+	if (*p == ':')
+	    p = skip_type(skipwhite(p + 1), FALSE);
+	if (*p == ',' || *p == ';')
+	    ++p;
+	arg = skipwhite(p);
+	vim_free(name);
+    }
+
+    return arg_end;
+
+failed:
+    vim_free(name);
+    drop_scope(cctx);
+    return NULL;
 }
 
 /*
@@ -6334,7 +7182,7 @@
     isn->isn_arg.forloop.for_end = instr->ga_len;
 
     // Fill in the "end" label any BREAK statements
-    compile_fill_jump_to_end(&forscope->fs_end_label, cctx);
+    compile_fill_jump_to_end(&forscope->fs_end_label, instr->ga_len, cctx);
 
     // Below the ":for" scope drop the "expr" list from the stack.
     if (generate_instr_drop(cctx, ISN_DROP, 1) == NULL)
@@ -6367,7 +7215,13 @@
     if (scope == NULL)
 	return NULL;
 
+    // "endwhile" jumps back here, one before when profiling
     scope->se_u.se_while.ws_top_label = instr->ga_len;
+#ifdef FEAT_PROFILE
+    if (cctx->ctx_profiling && ((isn_T *)instr->ga_data)[instr->ga_len - 1]
+						   .isn_type == ISN_PROF_START)
+	--scope->se_u.se_while.ws_top_label;
+#endif
 
     // compile "expr"
     if (compile_expr0(&p, cctx) == FAIL)
@@ -6391,6 +7245,7 @@
 compile_endwhile(char_u *arg, cctx_T *cctx)
 {
     scope_T	*scope = cctx->ctx_scope;
+    garray_T	*instr = &cctx->ctx_instr;
 
     if (scope == NULL || scope->se_type != WHILE_SCOPE)
     {
@@ -6400,12 +7255,18 @@
     cctx->ctx_scope = scope->se_outer;
     unwind_locals(cctx, scope->se_local_count);
 
+#ifdef FEAT_PROFILE
+    // count the endwhile before jumping
+    may_generate_prof_end(cctx, cctx->ctx_lnum);
+#endif
+
     // At end of ":for" scope jump back to the FOR instruction.
     generate_JUMP(cctx, JUMP_ALWAYS, scope->se_u.se_while.ws_top_label);
 
     // Fill in the "end" label in the WHILE statement so it can jump here.
     // And in any jumps for ":break"
-    compile_fill_jump_to_end(&scope->se_u.se_while.ws_end_label, cctx);
+    compile_fill_jump_to_end(&scope->se_u.se_while.ws_end_label,
+							  instr->ga_len, cctx);
 
     vim_free(scope);
 
@@ -6511,7 +7372,7 @@
  *	    ... try block
  *	" catch {expr}"
  *	    JUMP -> finally
- * catch1:  PUSH exeception
+ * catch1:  PUSH exception
  *	    EVAL {expr}
  *	    MATCH
  *	    JUMP nomatch -> catch2
@@ -6539,11 +7400,14 @@
     if (try_scope == NULL)
 	return NULL;
 
-    // "catch" is set when the first ":catch" is found.
-    // "finally" is set when ":finally" or ":endtry" is found
-    try_scope->se_u.se_try.ts_try_label = instr->ga_len;
-    if (generate_instr(cctx, ISN_TRY) == NULL)
-	return NULL;
+    if (cctx->ctx_skip != SKIP_YES)
+    {
+	// "catch" is set when the first ":catch" is found.
+	// "finally" is set when ":finally" or ":endtry" is found
+	try_scope->se_u.se_try.ts_try_label = instr->ga_len;
+	if (generate_instr(cctx, ISN_TRY) == NULL)
+	    return NULL;
+    }
 
     // scope for the try block itself
     scope = new_scope(cctx, BLOCK_SCOPE);
@@ -6582,20 +7446,38 @@
 	return NULL;
     }
 
-    // Jump from end of previous block to :finally or :endtry
-    if (compile_jump_to_end(&scope->se_u.se_try.ts_end_label,
+    if (cctx->ctx_skip != SKIP_YES)
+    {
+#ifdef FEAT_PROFILE
+	// the profile-start should be after the jump
+	if (cctx->ctx_profiling && ((isn_T *)instr->ga_data)[instr->ga_len - 1]
+						   .isn_type == ISN_PROF_START)
+	    --instr->ga_len;
+#endif
+	// Jump from end of previous block to :finally or :endtry
+	if (compile_jump_to_end(&scope->se_u.se_try.ts_end_label,
 						    JUMP_ALWAYS, cctx) == FAIL)
-	return NULL;
+	    return NULL;
 
-    // End :try or :catch scope: set value in ISN_TRY instruction
-    isn = ((isn_T *)instr->ga_data) + scope->se_u.se_try.ts_try_label;
-    if (isn->isn_arg.try.try_catch == 0)
-	isn->isn_arg.try.try_catch = instr->ga_len;
-    if (scope->se_u.se_try.ts_catch_label != 0)
-    {
-	// Previous catch without match jumps here
-	isn = ((isn_T *)instr->ga_data) + scope->se_u.se_try.ts_catch_label;
-	isn->isn_arg.jump.jump_where = instr->ga_len;
+	// End :try or :catch scope: set value in ISN_TRY instruction
+	isn = ((isn_T *)instr->ga_data) + scope->se_u.se_try.ts_try_label;
+	if (isn->isn_arg.try.try_catch == 0)
+	    isn->isn_arg.try.try_catch = instr->ga_len;
+	if (scope->se_u.se_try.ts_catch_label != 0)
+	{
+	    // Previous catch without match jumps here
+	    isn = ((isn_T *)instr->ga_data) + scope->se_u.se_try.ts_catch_label;
+	    isn->isn_arg.jump.jump_where = instr->ga_len;
+	}
+#ifdef FEAT_PROFILE
+	if (cctx->ctx_profiling)
+	{
+	    // a "throw" that jumps here needs to be counted
+	    generate_instr(cctx, ISN_PROF_END);
+	    // the "catch" is also counted
+	    generate_instr(cctx, ISN_PROF_START);
+	}
+#endif
     }
 
     p = skipwhite(arg);
@@ -6615,7 +7497,7 @@
 	// Push v:exception, push {expr} and MATCH
 	generate_instr_type(cctx, ISN_PUSHEXC, &t_string);
 
-	end = skip_regexp_ex(p + 1, *p, TRUE, &tofree, &dropped);
+	end = skip_regexp_ex(p + 1, *p, TRUE, &tofree, &dropped, NULL);
 	if (*end != *p)
 	{
 	    semsg(_(e_separator_mismatch_str), p);
@@ -6642,7 +7524,7 @@
 	    return NULL;
     }
 
-    if (generate_instr(cctx, ISN_CATCH) == NULL)
+    if (cctx->ctx_skip != SKIP_YES && generate_instr(cctx, ISN_CATCH) == NULL)
 	return NULL;
 
     if (new_scope(cctx, BLOCK_SCOPE) == NULL)
@@ -6656,6 +7538,7 @@
     scope_T	*scope = cctx->ctx_scope;
     garray_T	*instr = &cctx->ctx_instr;
     isn_T	*isn;
+    int		this_instr;
 
     // end block scope from :try or :catch
     if (scope != NULL && scope->se_type == BLOCK_SCOPE)
@@ -6677,15 +7560,24 @@
 	return NULL;
     }
 
+    this_instr = instr->ga_len;
+#ifdef FEAT_PROFILE
+    if (cctx->ctx_profiling && ((isn_T *)instr->ga_data)[instr->ga_len - 1]
+						   .isn_type == ISN_PROF_START)
+	// jump to the profile start of the "finally"
+	--this_instr;
+#endif
+
     // Fill in the "end" label in jumps at the end of the blocks.
-    compile_fill_jump_to_end(&scope->se_u.se_try.ts_end_label, cctx);
+    compile_fill_jump_to_end(&scope->se_u.se_try.ts_end_label,
+							     this_instr, cctx);
 
-    isn->isn_arg.try.try_finally = instr->ga_len;
+    isn->isn_arg.try.try_finally = this_instr;
     if (scope->se_u.se_try.ts_catch_label != 0)
     {
 	// Previous catch without match jumps here
 	isn = ((isn_T *)instr->ga_data) + scope->se_u.se_try.ts_catch_label;
-	isn->isn_arg.jump.jump_where = instr->ga_len;
+	isn->isn_arg.jump.jump_where = this_instr;
 	scope->se_u.se_try.ts_catch_label = 0;
     }
 
@@ -6720,34 +7612,51 @@
 	return NULL;
     }
 
-    isn = ((isn_T *)instr->ga_data) + scope->se_u.se_try.ts_try_label;
-    if (isn->isn_arg.try.try_catch == 0 && isn->isn_arg.try.try_finally == 0)
+    if (cctx->ctx_skip != SKIP_YES)
     {
-	emsg(_(e_missing_catch_or_finally));
-	return NULL;
-    }
+	isn = ((isn_T *)instr->ga_data) + scope->se_u.se_try.ts_try_label;
+	if (isn->isn_arg.try.try_catch == 0
+					  && isn->isn_arg.try.try_finally == 0)
+	{
+	    emsg(_(e_missing_catch_or_finally));
+	    return NULL;
+	}
 
-    // Fill in the "end" label in jumps at the end of the blocks, if not done
-    // by ":finally".
-    compile_fill_jump_to_end(&scope->se_u.se_try.ts_end_label, cctx);
+#ifdef FEAT_PROFILE
+    if (cctx->ctx_profiling && ((isn_T *)instr->ga_data)[instr->ga_len - 1]
+						   .isn_type == ISN_PROF_START)
+	// move the profile start after "endtry" so that it's not counted when
+	// the exception is rethrown.
+	--instr->ga_len;
+#endif
 
-    // End :catch or :finally scope: set value in ISN_TRY instruction
-    if (isn->isn_arg.try.try_catch == 0)
-	isn->isn_arg.try.try_catch = instr->ga_len;
-    if (isn->isn_arg.try.try_finally == 0)
-	isn->isn_arg.try.try_finally = instr->ga_len;
+	// Fill in the "end" label in jumps at the end of the blocks, if not
+	// done by ":finally".
+	compile_fill_jump_to_end(&scope->se_u.se_try.ts_end_label,
+							  instr->ga_len, cctx);
+
+	// End :catch or :finally scope: set value in ISN_TRY instruction
+	if (isn->isn_arg.try.try_catch == 0)
+	    isn->isn_arg.try.try_catch = instr->ga_len;
+	if (isn->isn_arg.try.try_finally == 0)
+	    isn->isn_arg.try.try_finally = instr->ga_len;
 
-    if (scope->se_u.se_try.ts_catch_label != 0)
-    {
-	// Last catch without match jumps here
-	isn = ((isn_T *)instr->ga_data) + scope->se_u.se_try.ts_catch_label;
-	isn->isn_arg.jump.jump_where = instr->ga_len;
+	if (scope->se_u.se_try.ts_catch_label != 0)
+	{
+	    // Last catch without match jumps here
+	    isn = ((isn_T *)instr->ga_data) + scope->se_u.se_try.ts_catch_label;
+	    isn->isn_arg.jump.jump_where = instr->ga_len;
+	}
     }
 
     compile_endblock(cctx);
 
-    if (generate_instr(cctx, ISN_ENDTRY) == NULL)
+    if (cctx->ctx_skip != SKIP_YES && generate_instr(cctx, ISN_ENDTRY) == NULL)
 	return NULL;
+#ifdef FEAT_PROFILE
+	if (cctx->ctx_profiling)
+	    generate_instr(cctx, ISN_PROF_START);
+#endif
     return arg;
 }
 
@@ -6761,6 +7670,8 @@
 
     if (compile_expr0(&p, cctx) == FAIL)
 	return NULL;
+    if (cctx->ctx_skip == SKIP_YES)
+	return p;
     if (may_generate_2STRING(-1, cctx) == FAIL)
 	return NULL;
     if (generate_instr_drop(cctx, ISN_THROW, 1) == NULL)
@@ -6779,32 +7690,51 @@
 compile_mult_expr(char_u *arg, int cmdidx, cctx_T *cctx)
 {
     char_u	*p = arg;
-    char_u	*prev;
+    char_u	*prev = arg;
     int		count = 0;
 
     for (;;)
     {
+	if (ends_excmd2(prev, p))
+	    break;
 	if (compile_expr0(&p, cctx) == FAIL)
 	    return NULL;
 	++count;
 	prev = p;
 	p = skipwhite(p);
-	if (ends_excmd2(prev, p))
-	    break;
     }
 
-    if (cmdidx == CMD_echo || cmdidx == CMD_echon)
-	generate_ECHO(cctx, cmdidx == CMD_echo, count);
-    else if (cmdidx == CMD_execute)
-	generate_MULT_EXPR(cctx, ISN_EXECUTE, count);
-    else if (cmdidx == CMD_echomsg)
-	generate_MULT_EXPR(cctx, ISN_ECHOMSG, count);
-    else
-	generate_MULT_EXPR(cctx, ISN_ECHOERR, count);
+    if (count > 0)
+    {
+	if (cmdidx == CMD_echo || cmdidx == CMD_echon)
+	    generate_ECHO(cctx, cmdidx == CMD_echo, count);
+	else if (cmdidx == CMD_execute)
+	    generate_MULT_EXPR(cctx, ISN_EXECUTE, count);
+	else if (cmdidx == CMD_echomsg)
+	    generate_MULT_EXPR(cctx, ISN_ECHOMSG, count);
+	else
+	    generate_MULT_EXPR(cctx, ISN_ECHOERR, count);
+    }
     return p;
 }
 
 /*
+ * If "eap" has a range that is not a constant generate an ISN_RANGE
+ * instruction to compute it and return OK.
+ * Otherwise return FAIL, the caller must deal with any range.
+ */
+    static int
+compile_variable_range(exarg_T *eap, cctx_T *cctx)
+{
+    char_u *range_end = skip_range(eap->cmd, TRUE, NULL);
+    char_u *p = skipdigits(eap->cmd);
+
+    if (p == range_end)
+	return FAIL;
+    return generate_RANGE(cctx, vim_strnsave(eap->cmd, range_end - eap->cmd));
+}
+
+/*
  * :put r
  * :put ={expr}
  */
@@ -6829,17 +7759,24 @@
     else if (eap->regname != NUL)
 	++line;
 
-    // "errormsg" will not be set because the range is ADDR_LINES.
-    // TODO: if the range contains something like "$" or "." need to evaluate
-    // at runtime
-    if (parse_cmd_address(eap, &errormsg, FALSE) == FAIL)
-	return NULL;
-    if (eap->addr_count == 0)
-	lnum = -1;
+    if (compile_variable_range(eap, cctx) == OK)
+    {
+	lnum = above ? LNUM_VARIABLE_RANGE_ABOVE : LNUM_VARIABLE_RANGE;
+    }
     else
-	lnum = eap->line2;
-    if (above)
-	--lnum;
+    {
+	// Either no range or a number.
+	// "errormsg" will not be set because the range is ADDR_LINES.
+	if (parse_cmd_address(eap, &errormsg, FALSE) == FAIL)
+	    // cannot happen
+	    return NULL;
+	if (eap->addr_count == 0)
+	    lnum = -1;
+	else
+	    lnum = eap->line2;
+	if (above)
+	    --lnum;
+    }
 
     generate_PUT(cctx, eap->regname, lnum);
     return line;
@@ -6879,6 +7816,20 @@
 	    if (eap->nextcmd != NULL)
 		nextcmd = eap->nextcmd;
 	}
+	else if (eap->cmdidx == CMD_wincmd)
+	{
+	    p = eap->arg;
+	    if (*p != NUL)
+		++p;
+	    if (*p == 'g' || *p == Ctrl_G)
+		++p;
+	    p = skipwhite(p);
+	    if (*p == '|')
+	    {
+		*p = NUL;
+		nextcmd = p + 1;
+	    }
+	}
     }
 
     if (eap->cmdidx == CMD_syntax && STRNCMP(eap->arg, "include ", 8) == 0)
@@ -6890,6 +7841,26 @@
 	    eap->arg = skiptowhite(eap->arg);
     }
 
+    if ((eap->cmdidx == CMD_global || eap->cmdidx == CMD_vglobal)
+						       && STRLEN(eap->arg) > 4)
+    {
+	int delim = *eap->arg;
+
+	p = skip_regexp_ex(eap->arg + 1, delim, TRUE, NULL, NULL, NULL);
+	if (*p == delim)
+	{
+	    eap->arg = p + 1;
+	    has_expr = TRUE;
+	}
+    }
+
+    if (eap->cmdidx == CMD_folddoopen || eap->cmdidx == CMD_folddoclosed)
+    {
+	// TODO: should only expand when appropriate for the command
+	eap->arg = skiptowhite(eap->arg);
+	has_expr = TRUE;
+    }
+
     if (has_expr && (p = (char_u *)strstr((char *)eap->arg, "`=")) != NULL)
     {
 	int	count = 0;
@@ -6975,6 +7946,8 @@
     dfunc->df_idx = def_functions.ga_len;
     ufunc->uf_dfunc_idx = dfunc->df_idx;
     dfunc->df_ufunc = ufunc;
+    dfunc->df_name = vim_strsave(ufunc->uf_name);
+    ++dfunc->df_refcount;
     ++def_functions.ga_len;
     return OK;
 }
@@ -6983,36 +7956,44 @@
  * After ex_function() has collected all the function lines: parse and compile
  * the lines into instructions.
  * Adds the function to "def_functions".
- * When "set_return_type" is set then set ufunc->uf_ret_type to the type of the
- * return statement (used for lambda).
+ * When "check_return_type" is set then set ufunc->uf_ret_type to the type of
+ * the return statement (used for lambda).  When uf_ret_type is already set
+ * then check that it matches.
+ * When "profiling" is true add ISN_PROF_START instructions.
  * "outer_cctx" is set for a nested function.
  * This can be used recursively through compile_lambda(), which may reallocate
  * "def_functions".
  * Returns OK or FAIL.
  */
     int
-compile_def_function(ufunc_T *ufunc, int set_return_type, cctx_T *outer_cctx)
+compile_def_function(
+	ufunc_T	    *ufunc,
+	int	    check_return_type,
+	int	    profiling UNUSED,
+	cctx_T	    *outer_cctx)
 {
     char_u	*line = NULL;
     char_u	*p;
     char	*errormsg = NULL;	// error message
     cctx_T	cctx;
     garray_T	*instr;
-    int		called_emsg_before = called_emsg;
+    int		did_emsg_before = did_emsg;
     int		ret = FAIL;
     sctx_T	save_current_sctx = current_sctx;
     int		save_estack_compiling = estack_compiling;
     int		do_estack_push;
-    int		emsg_before = called_emsg;
     int		new_def_function = FALSE;
+#ifdef FEAT_PROFILE
+    int		prof_lnum = -1;
+#endif
 
     // When using a function that was compiled before: Free old instructions.
-    // Otherwise add a new entry in "def_functions".
+    // The index is reused.  Otherwise add a new entry in "def_functions".
     if (ufunc->uf_dfunc_idx > 0)
     {
 	dfunc_T *dfunc = ((dfunc_T *)def_functions.ga_data)
 							 + ufunc->uf_dfunc_idx;
-	delete_def_function_contents(dfunc);
+	delete_def_function_contents(dfunc, FALSE);
     }
     else
     {
@@ -7024,6 +8005,10 @@
     ufunc->uf_def_status = UF_COMPILING;
 
     CLEAR_FIELD(cctx);
+
+#ifdef FEAT_PROFILE
+    cctx.ctx_profiling = profiling;
+#endif
     cctx.ctx_ufunc = ufunc;
     cctx.ctx_lnum = -1;
     cctx.ctx_outer = outer_cctx;
@@ -7107,7 +8092,7 @@
 
 	// Bail out on the first error to avoid a flood of errors and report
 	// the right line number when inside try/catch.
-	if (emsg_before != called_emsg)
+	if (did_emsg_before != did_emsg)
 	    goto erret;
 
 	if (line != NULL && *line == '|')
@@ -7124,27 +8109,41 @@
 	{
 	    line = next_line_from_context(&cctx, FALSE);
 	    if (cctx.ctx_lnum >= ufunc->uf_lines.ga_len)
+	    {
 		// beyond the last line
+#ifdef FEAT_PROFILE
+		if (cctx.ctx_skip != SKIP_YES)
+		    may_generate_prof_end(&cctx, prof_lnum);
+#endif
 		break;
+	    }
 	}
-	emsg_before = called_emsg;
 
 	CLEAR_FIELD(ea);
 	ea.cmdlinep = &line;
 	ea.cmd = skipwhite(line);
 
+	if (*ea.cmd == '#')
+	{
+	    // "#" starts a comment
+	    line = (char_u *)"";
+	    continue;
+	}
+
+#ifdef FEAT_PROFILE
+	if (cctx.ctx_profiling && cctx.ctx_lnum != prof_lnum &&
+						     cctx.ctx_skip != SKIP_YES)
+	{
+	    may_generate_prof_end(&cctx, prof_lnum);
+
+	    prof_lnum = cctx.ctx_lnum;
+	    generate_instr(&cctx, ISN_PROF_START);
+	}
+#endif
+
 	// Some things can be recognized by the first character.
 	switch (*ea.cmd)
 	{
-	    case '#':
-		// "#" starts a comment, but "#{" does not.
-		if (ea.cmd[1] != '{')
-		{
-		    line = (char_u *)"";
-		    continue;
-		}
-		break;
-
 	    case '}':
 		{
 		    // "}" ends a block scope
@@ -7175,10 +8174,6 @@
 		    continue;
 		}
 		break;
-
-	    case ':':
-		starts_with_colon = TRUE;
-		break;
 	}
 
 	/*
@@ -7197,6 +8192,16 @@
 	generate_cmdmods(&cctx, &local_cmdmod);
 	undo_cmdmod(&local_cmdmod);
 
+	// Check if there was a colon after the last command modifier or before
+	// the current position.
+	for (p = ea.cmd; p >= line; --p)
+	{
+	    if (*p == ':')
+		starts_with_colon = TRUE;
+	    if (p < ea.cmd && !VIM_ISWHITE(*p))
+		break;
+	}
+
 	// Skip ":call" to get to the function name.
 	p = ea.cmd;
 	if (checkforcmd(&ea.cmd, "call", 3))
@@ -7210,68 +8215,14 @@
 
 	if (!starts_with_colon)
 	{
-	    char_u *pskip;
-
-	    // Assuming the command starts with a variable or function name,
-	    // find what follows.
-	    // Skip over "var.member", "var[idx]" and the like.
-	    // Also "&opt = val", "$ENV = val" and "@r = val".
-	    pskip = (*ea.cmd == '&' || *ea.cmd == '$' || *ea.cmd == '@')
-							 ? ea.cmd + 1 : ea.cmd;
-	    p = to_name_end(pskip, TRUE);
-	    if (p > ea.cmd && *p != NUL)
-	    {
-		char_u *var_end;
-		int	oplen;
-		int	heredoc;
-
-		if (ea.cmd[0] == '@')
-		    var_end = ea.cmd + 2;
-		else
-		    var_end = find_name_end(pskip, NULL, NULL,
-						FNE_CHECK_START | FNE_INCL_BR);
-		oplen = assignment_len(skipwhite(var_end), &heredoc);
-		if (oplen > 0)
-		{
-		    size_t len = p - ea.cmd;
-
-		    // Recognize an assignment if we recognize the variable
-		    // name:
-		    // "g:var = expr"
-		    // "local = expr"  where "local" is a local var.
-		    // "script = expr"  where "script" is a script-local var.
-		    // "import = expr"  where "import" is an imported var
-		    // "&opt = expr"
-		    // "$ENV = expr"
-		    // "@r = expr"
-		    if (*ea.cmd == '&'
-			    || *ea.cmd == '$'
-			    || *ea.cmd == '@'
-			    || ((len) > 2 && ea.cmd[1] == ':')
-			    || lookup_local(ea.cmd, len, &cctx) != NULL
-			    || arg_exists(ea.cmd, len, NULL, NULL,
-							     NULL, &cctx) == OK
-			    || script_var_exists(ea.cmd, len,
-							    FALSE, &cctx) == OK
-			    || find_imported(ea.cmd, len, &cctx) != NULL)
-		    {
-			line = compile_assignment(ea.cmd, &ea, CMD_SIZE, &cctx);
-			if (line == NULL || line == ea.cmd)
-			    goto erret;
-			continue;
-		    }
-		}
-	    }
+	    int	    assign;
 
-	    if (*ea.cmd == '[')
-	    {
-		// [var, var] = expr
-		line = compile_assignment(ea.cmd, &ea, CMD_SIZE, &cctx);
-		if (line == NULL)
-		    goto erret;
-		if (line != ea.cmd)
-		    continue;
-	    }
+	    // Check for assignment after command modifiers.
+	    assign = may_compile_assignment(&ea, &line, &cctx);
+	    if (assign == OK)
+		goto nextline;
+	    if (assign == FAIL)
+		goto erret;
 	}
 
 	/*
@@ -7286,7 +8237,7 @@
 	    {
 		if (!starts_with_colon)
 		{
-		    emsg(_(e_colon_required_before_a_range));
+		    semsg(_(e_colon_required_before_range_str), cmd);
 		    goto erret;
 		}
 		if (ends_excmd2(line, ea.cmd))
@@ -7301,22 +8252,30 @@
 	    }
 	}
 	p = find_ex_command(&ea, NULL, starts_with_colon ? NULL
-		   : (void *(*)(char_u *, size_t, cctx_T *))lookup_local,
+		   : (int (*)(char_u *, size_t, void *, cctx_T *))lookup_local,
 									&cctx);
 
+	if (p == NULL)
+	{
+	    if (cctx.ctx_skip != SKIP_YES)
+		emsg(_(e_ambiguous_use_of_user_defined_command));
+	    goto erret;
+	}
+
 	if (p == ea.cmd && ea.cmdidx != CMD_SIZE)
 	{
 	    if (cctx.ctx_skip == SKIP_YES)
 	    {
 		line += STRLEN(line);
-		continue;
+		goto nextline;
 	    }
 
 	    // Expression or function call.
 	    if (ea.cmdidx != CMD_eval)
 	    {
-		// CMD_var cannot happen, compile_assignment() above is used
-		iemsg("Command from find_ex_command() not handled");
+		// CMD_var cannot happen, compile_assignment() above would be
+		// used.  Most likely an assignment to a non-existing variable.
+		semsg(_(e_command_not_recognized_str), ea.cmd);
 		goto erret;
 	    }
 	}
@@ -7362,7 +8321,7 @@
 		    goto erret;
 
 	    case CMD_return:
-		    line = compile_return(p, set_return_type, &cctx);
+		    line = compile_return(p, check_return_type, &cctx);
 		    cctx.ctx_had_return = TRUE;
 		    break;
 
@@ -7537,16 +8496,26 @@
 	}
 
 	// Return zero if there is no return at the end.
-	generate_PUSHNR(&cctx, 0);
-	generate_instr(&cctx, ISN_RETURN);
+	generate_instr(&cctx, ISN_RETURN_ZERO);
     }
 
     {
 	dfunc_T	*dfunc = ((dfunc_T *)def_functions.ga_data)
 							 + ufunc->uf_dfunc_idx;
 	dfunc->df_deleted = FALSE;
-	dfunc->df_instr = instr->ga_data;
-	dfunc->df_instr_count = instr->ga_len;
+	dfunc->df_script_seq = current_sctx.sc_seq;
+#ifdef FEAT_PROFILE
+	if (cctx.ctx_profiling)
+	{
+	    dfunc->df_instr_prof = instr->ga_data;
+	    dfunc->df_instr_prof_count = instr->ga_len;
+	}
+	else
+#endif
+	{
+	    dfunc->df_instr = instr->ga_data;
+	    dfunc->df_instr_count = instr->ga_len;
+	}
 	dfunc->df_varcount = cctx.ctx_locals_count;
 	dfunc->df_has_closure = cctx.ctx_has_closure;
 	if (cctx.ctx_outer_used)
@@ -7566,6 +8535,7 @@
 	for (idx = 0; idx < instr->ga_len; ++idx)
 	    delete_instr(((isn_T *)instr->ga_data) + idx);
 	ga_clear(instr);
+	VIM_CLEAR(dfunc->df_name);
 
 	// If using the last entry in the table and it was added above, we
 	// might as well remove it.
@@ -7585,7 +8555,7 @@
 
 	if (errormsg != NULL)
 	    emsg(errormsg);
-	else if (called_emsg == called_emsg_before)
+	else if (did_emsg == did_emsg_before)
 	    emsg(_(e_compiling_def_function_failed));
     }
 
@@ -7655,22 +8625,26 @@
 {
     switch (isn->isn_type)
     {
+	case ISN_DEF:
 	case ISN_EXEC:
+	case ISN_LOADAUTO:
+	case ISN_LOADB:
 	case ISN_LOADENV:
 	case ISN_LOADG:
-	case ISN_LOADB:
-	case ISN_LOADW:
-	case ISN_LOADT:
 	case ISN_LOADOPT:
-	case ISN_STRINGMEMBER:
+	case ISN_LOADT:
+	case ISN_LOADW:
 	case ISN_PUSHEXC:
+	case ISN_PUSHFUNC:
 	case ISN_PUSHS:
+	case ISN_RANGE:
+	case ISN_STOREAUTO:
+	case ISN_STOREB:
 	case ISN_STOREENV:
 	case ISN_STOREG:
-	case ISN_STOREB:
-	case ISN_STOREW:
 	case ISN_STORET:
-	case ISN_PUSHFUNC:
+	case ISN_STOREW:
+	case ISN_STRINGMEMBER:
 	    vim_free(isn->isn_arg.string);
 	    break;
 
@@ -7712,9 +8686,10 @@
 	    {
 		dfunc_T *dfunc = ((dfunc_T *)def_functions.ga_data)
 					       + isn->isn_arg.funcref.fr_func;
+		ufunc_T *ufunc = dfunc->df_ufunc;
 
-		if (func_name_refcount(dfunc->df_ufunc->uf_name))
-		    func_ptr_unref(dfunc->df_ufunc);
+		if (ufunc != NULL && func_name_refcount(ufunc->uf_name))
+		    func_ptr_unref(ufunc);
 	    }
 	    break;
 
@@ -7736,9 +8711,7 @@
 
 		if (ufunc != NULL)
 		{
-		    // Clear uf_dfunc_idx so that the function is deleted.
-		    clear_def_function(ufunc);
-		    ufunc->uf_dfunc_idx = 0;
+		    unlink_def_function(ufunc);
 		    func_ptr_unref(ufunc);
 		}
 
@@ -7748,6 +8721,7 @@
 	    break;
 
 	case ISN_CHECKTYPE:
+	case ISN_SETTYPE:
 	    free_type(isn->isn_arg.type.ct_type);
 	    break;
 
@@ -7757,6 +8731,11 @@
 	    vim_free(isn->isn_arg.cmdmod.cf_cmdmod);
 	    break;
 
+	case ISN_LOADSCRIPT:
+	case ISN_STORESCRIPT:
+	    vim_free(isn->isn_arg.script.scriptref);
+	    break;
+
 	case ISN_2BOOL:
 	case ISN_2STRING:
 	case ISN_2STRING_ANY:
@@ -7800,7 +8779,6 @@
 	case ISN_LOADGDICT:
 	case ISN_LOADOUTER:
 	case ISN_LOADREG:
-	case ISN_LOADSCRIPT:
 	case ISN_LOADTDICT:
 	case ISN_LOADV:
 	case ISN_LOADWDICT:
@@ -7814,36 +8792,39 @@
 	case ISN_OPNR:
 	case ISN_PCALL:
 	case ISN_PCALL_END:
+	case ISN_PROF_END:
+	case ISN_PROF_START:
 	case ISN_PUSHBOOL:
 	case ISN_PUSHF:
 	case ISN_PUSHNR:
 	case ISN_PUSHSPEC:
 	case ISN_PUT:
 	case ISN_RETURN:
+	case ISN_RETURN_ZERO:
 	case ISN_SHUFFLE:
 	case ISN_SLICE:
 	case ISN_STORE:
-	case ISN_STOREDICT:
-	case ISN_STORELIST:
+	case ISN_STOREINDEX:
 	case ISN_STORENR:
 	case ISN_STOREOUTER:
 	case ISN_STOREREG:
-	case ISN_STORESCRIPT:
 	case ISN_STOREV:
 	case ISN_STRINDEX:
 	case ISN_STRSLICE:
 	case ISN_THROW:
 	case ISN_TRY:
+	case ISN_UNLETINDEX:
+	case ISN_UNPACK:
 	    // nothing allocated
 	    break;
     }
 }
 
 /*
- * Free all instructions for "dfunc".
+ * Free all instructions for "dfunc" except df_name.
  */
     static void
-delete_def_function_contents(dfunc_T *dfunc)
+delete_def_function_contents(dfunc_T *dfunc, int mark_deleted)
 {
     int idx;
 
@@ -7854,38 +8835,59 @@
 	for (idx = 0; idx < dfunc->df_instr_count; ++idx)
 	    delete_instr(dfunc->df_instr + idx);
 	VIM_CLEAR(dfunc->df_instr);
+	dfunc->df_instr = NULL;
+    }
+#ifdef FEAT_PROFILE
+    if (dfunc->df_instr_prof != NULL)
+    {
+	for (idx = 0; idx < dfunc->df_instr_prof_count; ++idx)
+	    delete_instr(dfunc->df_instr_prof + idx);
+	VIM_CLEAR(dfunc->df_instr_prof);
+	dfunc->df_instr_prof = NULL;
     }
+#endif
 
-    dfunc->df_deleted = TRUE;
+    if (mark_deleted)
+	dfunc->df_deleted = TRUE;
+    if (dfunc->df_ufunc != NULL)
+	dfunc->df_ufunc->uf_def_status = UF_NOT_COMPILED;
 }
 
 /*
  * When a user function is deleted, clear the contents of any associated def
- * function.  The position in def_functions can be re-used.
+ * function, unless another user function still uses it.
+ * The position in def_functions can be re-used.
  */
     void
-clear_def_function(ufunc_T *ufunc)
+unlink_def_function(ufunc_T *ufunc)
 {
     if (ufunc->uf_dfunc_idx > 0)
     {
 	dfunc_T *dfunc = ((dfunc_T *)def_functions.ga_data)
 							 + ufunc->uf_dfunc_idx;
 
-	delete_def_function_contents(dfunc);
+	if (--dfunc->df_refcount <= 0)
+	    delete_def_function_contents(dfunc, TRUE);
 	ufunc->uf_def_status = UF_NOT_COMPILED;
+	ufunc->uf_dfunc_idx = 0;
+	if (dfunc->df_ufunc == ufunc)
+	    dfunc->df_ufunc = NULL;
     }
 }
 
 /*
- * Used when a user function is about to be deleted: remove the pointer to it.
- * The entry in def_functions is then unused.
+ * Used when a user function refers to an existing dfunc.
  */
     void
-unlink_def_function(ufunc_T *ufunc)
+link_def_function(ufunc_T *ufunc)
 {
-    dfunc_T *dfunc = ((dfunc_T *)def_functions.ga_data) + ufunc->uf_dfunc_idx;
+    if (ufunc->uf_dfunc_idx > 0)
+    {
+	dfunc_T *dfunc = ((dfunc_T *)def_functions.ga_data)
+							 + ufunc->uf_dfunc_idx;
 
-    dfunc->df_ufunc = NULL;
+	++dfunc->df_refcount;
+    }
 }
 
 #if defined(EXITFREE) || defined(PROTO)
@@ -7901,7 +8903,8 @@
     {
 	dfunc_T *dfunc = ((dfunc_T *)def_functions.ga_data) + idx;
 
-	delete_def_function_contents(dfunc);
+	delete_def_function_contents(dfunc, TRUE);
+	vim_free(dfunc->df_name);
     }
 
     ga_clear(&def_functions);
diff -Nru vim-8.2.1913/src/vim9execute.c vim-8.2.2434/src/vim9execute.c
--- vim-8.2.1913/src/vim9execute.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/vim9execute.c	2021-01-30 22:05:11.000000000 +0000
@@ -54,12 +54,11 @@
 /*
  * Execution context.
  */
-typedef struct {
+struct ectx_S {
     garray_T	ec_stack;	// stack of typval_T values
     int		ec_frame_idx;	// index in ec_stack: context of ec_dfunc_idx
 
-    garray_T	*ec_outer_stack;    // stack used for closures
-    int		ec_outer_frame;	    // stack frame in ec_outer_stack
+    outer_T	*ec_outer;	// outer scope used for closures, allocated
 
     garray_T	ec_trystack;	// stack of trycmd_T values
     int		ec_in_catch;	// when TRUE in catch or finally block
@@ -69,7 +68,7 @@
     int		ec_iidx;	// index in ec_instr: instruction to execute
 
     garray_T	ec_funcrefs;	// partials that might be a closure
-} ectx_T;
+};
 
 // Get pointer to item relative to the bottom of the stack, -1 is the last one.
 #define STACK_TV_BOT(idx) (((typval_T *)ectx->ec_stack.ga_data) + ectx->ec_stack.ga_len + (idx))
@@ -149,6 +148,9 @@
 
 /*
  * Call compiled function "cdf_idx" from compiled code.
+ * This adds a stack frame and sets the instruction pointer to the start of the
+ * called function.
+ * If "pt" is not null use "pt->pt_outer" for ec_outer.
  *
  * Stack has:
  * - current arguments (already there)
@@ -160,7 +162,7 @@
  * - reserved space for local variables
  */
     static int
-call_dfunc(int cdf_idx, int argcount_arg, ectx_T *ectx)
+call_dfunc(int cdf_idx, partial_T *pt, int argcount_arg, ectx_T *ectx)
 {
     int	    argcount = argcount_arg;
     dfunc_T *dfunc = ((dfunc_T *)def_functions.ga_data) + cdf_idx;
@@ -173,10 +175,22 @@
 
     if (dfunc->df_deleted)
     {
-	emsg_funcname(e_func_deleted, ufunc->uf_name);
+	// don't use ufunc->uf_name, it may have been freed
+	emsg_funcname(e_func_deleted,
+		dfunc->df_name == NULL ? (char_u *)"unknown" : dfunc->df_name);
 	return FAIL;
     }
 
+#ifdef FEAT_PROFILE
+    // Profiling might be enabled/disabled along the way.  This should not
+    // fail, since the function was compiled before and toggling profiling
+    // doesn't change any errors.
+    if (func_needs_compiling(ufunc, PROFILING(ufunc))
+	    && compile_def_function(ufunc, FALSE, PROFILING(ufunc), NULL)
+								       == FAIL)
+	return FAIL;
+#endif
+
     if (ufunc->uf_va_name != NULL)
     {
 	// Need to make a list out of the vararg arguments.
@@ -227,6 +241,10 @@
 								       == FAIL)
 	return FAIL;
 
+    // If depth of calling is getting too high, don't execute the function.
+    if (funcdepth_increment() == FAIL)
+	return FAIL;
+
     // Move the vararg-list to below the missing optional arguments.
     if (vararg_count > 0 && arg_to_add > 0)
 	*STACK_TV_BOT(arg_to_add - 1) = *STACK_TV_BOT(-1);
@@ -237,11 +255,10 @@
     ectx->ec_stack.ga_len += arg_to_add;
 
     // Store current execution state in stack frame for ISN_RETURN.
-    STACK_TV_BOT(0)->vval.v_number = ectx->ec_dfunc_idx;
-    STACK_TV_BOT(1)->vval.v_number = ectx->ec_iidx;
-    STACK_TV_BOT(2)->vval.v_string = (void *)ectx->ec_outer_stack;
-    STACK_TV_BOT(3)->vval.v_number = ectx->ec_outer_frame;
-    STACK_TV_BOT(4)->vval.v_number = ectx->ec_frame_idx;
+    STACK_TV_BOT(STACK_FRAME_FUNC_OFF)->vval.v_number = ectx->ec_dfunc_idx;
+    STACK_TV_BOT(STACK_FRAME_IIDX_OFF)->vval.v_number = ectx->ec_iidx;
+    STACK_TV_BOT(STACK_FRAME_OUTER_OFF)->vval.v_string = (void *)ectx->ec_outer;
+    STACK_TV_BOT(STACK_FRAME_IDX_OFF)->vval.v_number = ectx->ec_frame_idx;
     ectx->ec_frame_idx = ectx->ec_stack.ga_len;
 
     // Initialize local variables
@@ -256,10 +273,38 @@
     }
     ectx->ec_stack.ga_len += STACK_FRAME_SIZE + varcount;
 
+    if (pt != NULL || ufunc->uf_partial != NULL
+					     || (ufunc->uf_flags & FC_CLOSURE))
+    {
+	outer_T *outer = ALLOC_CLEAR_ONE(outer_T);
+
+	if (outer == NULL)
+	    return FAIL;
+	if (pt != NULL)
+	{
+	    *outer = pt->pt_outer;
+	    outer->out_up_is_copy = TRUE;
+	}
+	else if (ufunc->uf_partial != NULL)
+	{
+	    *outer = ufunc->uf_partial->pt_outer;
+	    outer->out_up_is_copy = TRUE;
+	}
+	else
+	{
+	    outer->out_stack = &ectx->ec_stack;
+	    outer->out_frame_idx = ectx->ec_frame_idx;
+	    outer->out_up = ectx->ec_outer;
+	}
+	ectx->ec_outer = outer;
+    }
+    else
+	ectx->ec_outer = NULL;
+
     // Set execution state to the start of the called function.
     ectx->ec_dfunc_idx = cdf_idx;
-    ectx->ec_instr = dfunc->df_instr;
-    entry = estack_push_ufunc(dfunc->df_ufunc, 1);
+    ectx->ec_instr = INSTRUCTIONS(dfunc);
+    entry = estack_push_ufunc(ufunc, 1);
     if (entry != NULL)
     {
 	// Set the script context to the script where the function was defined.
@@ -403,8 +448,9 @@
 	    {
 		++funcstack->fs_refcount;
 		pt->pt_funcstack = funcstack;
-		pt->pt_ectx_stack = &funcstack->fs_ga;
-		pt->pt_ectx_frame = ectx->ec_frame_idx - top;
+		pt->pt_outer.out_stack = &funcstack->fs_ga;
+		pt->pt_outer.out_frame_idx = ectx->ec_frame_idx - top;
+		pt->pt_outer.out_up = ectx->ec_outer;
 	    }
 	}
     }
@@ -463,6 +509,7 @@
 func_return(ectx_T *ectx)
 {
     int		idx;
+    int		ret_idx;
     dfunc_T	*dfunc = ((dfunc_T *)def_functions.ga_data)
 							  + ectx->ec_dfunc_idx;
     int		argcount = ufunc_argcount(dfunc->df_ufunc);
@@ -486,23 +533,39 @@
 					idx < ectx->ec_stack.ga_len - 1; ++idx)
 	clear_tv(STACK_TV(idx));
 
+    // The return value should be on top of the stack.  However, when aborting
+    // it may not be there and ec_frame_idx is the top of the stack.
+    ret_idx = ectx->ec_stack.ga_len - 1;
+    if (ret_idx == ectx->ec_frame_idx + STACK_FRAME_IDX_OFF)
+	ret_idx = 0;
+
+    vim_free(ectx->ec_outer);
+
     // Restore the previous frame.
-    ectx->ec_dfunc_idx = STACK_TV(ectx->ec_frame_idx)->vval.v_number;
-    ectx->ec_iidx = STACK_TV(ectx->ec_frame_idx + 1)->vval.v_number;
-    ectx->ec_outer_stack =
-		       (void *)STACK_TV(ectx->ec_frame_idx + 2)->vval.v_string;
-    ectx->ec_outer_frame = STACK_TV(ectx->ec_frame_idx + 3)->vval.v_number;
+    ectx->ec_dfunc_idx = STACK_TV(ectx->ec_frame_idx
+					+ STACK_FRAME_FUNC_OFF)->vval.v_number;
+    ectx->ec_iidx = STACK_TV(ectx->ec_frame_idx
+					+ STACK_FRAME_IIDX_OFF)->vval.v_number;
+    ectx->ec_outer = (void *)STACK_TV(ectx->ec_frame_idx
+				       + STACK_FRAME_OUTER_OFF)->vval.v_string;
     // restoring ec_frame_idx must be last
-    ectx->ec_frame_idx = STACK_TV(ectx->ec_frame_idx + 4)->vval.v_number;
+    ectx->ec_frame_idx = STACK_TV(ectx->ec_frame_idx
+				       + STACK_FRAME_IDX_OFF)->vval.v_number;
     dfunc = ((dfunc_T *)def_functions.ga_data) + ectx->ec_dfunc_idx;
-    ectx->ec_instr = dfunc->df_instr;
+    ectx->ec_instr = INSTRUCTIONS(dfunc);
 
-    // Reset the stack to the position before the call, move the return value
-    // to the top of the stack.
-    idx = ectx->ec_stack.ga_len - 1;
-    ectx->ec_stack.ga_len = top + 1;
-    *STACK_TV_BOT(-1) = *STACK_TV(idx);
+    if (ret_idx > 0)
+    {
+	// Reset the stack to the position before the call, with a spot for the
+	// return value, moved there from above the frame.
+	ectx->ec_stack.ga_len = top + 1;
+	*STACK_TV_BOT(-1) = *STACK_TV(ret_idx);
+    }
+    else
+	// Reset the stack to the position before the call.
+	ectx->ec_stack.ga_len = top;
 
+    funcdepth_decrement();
     return OK;
 }
 
@@ -550,7 +613,7 @@
 {
     typval_T	argvars[MAX_FUNC_ARGS];
     int		idx;
-    int		called_emsg_before = called_emsg;
+    int		did_emsg_before = did_emsg;
     ectx_T	*prev_ectx = current_ectx;
 
     if (call_prepare(argcount, argvars, ectx) == FAIL)
@@ -566,31 +629,56 @@
     for (idx = 0; idx < argcount; ++idx)
 	clear_tv(&argvars[idx]);
 
-    if (called_emsg != called_emsg_before)
+    if (did_emsg > did_emsg_before)
 	return FAIL;
     return OK;
 }
 
 /*
  * Execute a user defined function.
+ * If the function is compiled this will add a stack frame and set the
+ * instruction pointer at the start of the function.
+ * Otherwise the function is called here.
+ * If "pt" is not null use "pt->pt_outer" for ec_outer.
  * "iptr" can be used to replace the instruction with a more efficient one.
  */
     static int
-call_ufunc(ufunc_T *ufunc, int argcount, ectx_T *ectx, isn_T *iptr)
+call_ufunc(
+	ufunc_T	    *ufunc,
+	partial_T   *pt,
+	int	    argcount,
+	ectx_T	    *ectx,
+	isn_T	    *iptr)
 {
     typval_T	argvars[MAX_FUNC_ARGS];
     funcexe_T   funcexe;
     int		error;
     int		idx;
-    int		called_emsg_before = called_emsg;
+    int		did_emsg_before = did_emsg;
+#ifdef FEAT_PROFILE
+    int		profiling = do_profiling == PROF_YES && ufunc->uf_profiling;
+#else
+# define profiling FALSE
+#endif
 
-    if (ufunc->uf_def_status == UF_TO_BE_COMPILED
-	    && compile_def_function(ufunc, FALSE, NULL) == FAIL)
+    if (func_needs_compiling(ufunc, profiling)
+		&& compile_def_function(ufunc, FALSE, profiling, NULL) == FAIL)
 	return FAIL;
     if (ufunc->uf_def_status == UF_COMPILED)
     {
+	error = check_user_func_argcount(ufunc, argcount);
+	if (error != FCERR_UNKNOWN)
+	{
+	    if (error == FCERR_TOOMANY)
+		semsg(_(e_toomanyarg), ufunc->uf_name);
+	    else
+		semsg(_(e_toofewarg), ufunc->uf_name);
+	    return FAIL;
+	}
+
 	// The function has been compiled, can call it quickly.  For a function
 	// that was defined later: we can call it directly next time.
+	// TODO: what if the function was deleted and then defined again?
 	if (iptr != NULL)
 	{
 	    delete_instr(iptr);
@@ -598,7 +686,7 @@
 	    iptr->isn_arg.dfunc.cdf_idx = ufunc->uf_dfunc_idx;
 	    iptr->isn_arg.dfunc.cdf_argcount = argcount;
 	}
-	return call_dfunc(ufunc->uf_dfunc_idx, argcount, ectx);
+	return call_dfunc(ufunc->uf_dfunc_idx, pt, argcount, ectx);
     }
 
     if (call_prepare(argcount, argvars, ectx) == FAIL)
@@ -620,7 +708,7 @@
 	user_func_error(error, ufunc->uf_name);
 	return FAIL;
     }
-    if (called_emsg > called_emsg_before)
+    if (did_emsg > did_emsg_before)
 	// Error other than from calling the function itself.
 	return FAIL;
     return OK;
@@ -671,7 +759,7 @@
     }
 
     if (ufunc != NULL)
-	return call_ufunc(ufunc, argcount, ectx, iptr);
+	return call_ufunc(ufunc, NULL, argcount, ectx, iptr);
 
     return FAIL;
 }
@@ -682,7 +770,7 @@
     int		argcount = argcount_arg;
     char_u	*name = NULL;
     int		called_emsg_before = called_emsg;
-    int		res;
+    int		res = FAIL;
 
     if (tv->v_type == VAR_PARTIAL)
     {
@@ -706,15 +794,8 @@
 	}
 
 	if (pt->pt_func != NULL)
-	{
-	    int ret = call_ufunc(pt->pt_func, argcount, ectx, NULL);
+	    return call_ufunc(pt->pt_func, pt, argcount, ectx, NULL);
 
-	    // closure may need the function context where it was defined
-	    ectx->ec_outer_stack = pt->pt_ectx_stack;
-	    ectx->ec_outer_frame = pt->pt_ectx_frame;
-
-	    return ret;
-	}
 	name = pt->pt_name;
     }
     else if (tv->v_type == VAR_FUNC)
@@ -735,7 +816,7 @@
 	vim_free(tofree);
     }
 
-    if (name == NULL || res == FAIL)
+    if (res == FAIL)
     {
 	if (called_emsg == called_emsg_before)
 	    semsg(_(e_unknownfunc),
@@ -770,10 +851,190 @@
     funccal_entry_T entry;
 
     save_funccal(&entry);
-    set_var_const(name, NULL, tv, FALSE, ASSIGN_NO_DECL);
+    set_var_const(name, NULL, tv, FALSE, ASSIGN_DECL);
     restore_funccal();
 }
 
+/*
+ * Convert "tv" to a string.
+ * Return FAIL if not allowed.
+ */
+    static int
+do_2string(typval_T *tv, int is_2string_any)
+{
+    if (tv->v_type != VAR_STRING)
+    {
+	char_u *str;
+
+	if (is_2string_any)
+	{
+	    switch (tv->v_type)
+	    {
+		case VAR_SPECIAL:
+		case VAR_BOOL:
+		case VAR_NUMBER:
+		case VAR_FLOAT:
+		case VAR_BLOB:	break;
+		default:	to_string_error(tv->v_type);
+				return FAIL;
+	    }
+	}
+	str = typval_tostring(tv);
+	clear_tv(tv);
+	tv->v_type = VAR_STRING;
+	tv->vval.v_string = str;
+    }
+    return OK;
+}
+
+/*
+ * When the value of "sv" is a null list of dict, allocate it.
+ */
+    static void
+allocate_if_null(typval_T *tv)
+{
+    switch (tv->v_type)
+    {
+	case VAR_LIST:
+	    if (tv->vval.v_list == NULL)
+		rettv_list_alloc(tv);
+	    break;
+	case VAR_DICT:
+	    if (tv->vval.v_dict == NULL)
+		rettv_dict_alloc(tv);
+	    break;
+	default:
+	    break;
+    }
+}
+
+/*
+ * Return the character "str[index]" where "index" is the character index.  If
+ * "index" is out of range NULL is returned.
+ */
+    char_u *
+char_from_string(char_u *str, varnumber_T index)
+{
+    size_t	    nbyte = 0;
+    varnumber_T	    nchar = index;
+    size_t	    slen;
+
+    if (str == NULL)
+	return NULL;
+    slen = STRLEN(str);
+
+    // do the same as for a list: a negative index counts from the end
+    if (index < 0)
+    {
+	int	clen = 0;
+
+	for (nbyte = 0; nbyte < slen; ++clen)
+	    nbyte += MB_CPTR2LEN(str + nbyte);
+	nchar = clen + index;
+	if (nchar < 0)
+	    // unlike list: index out of range results in empty string
+	    return NULL;
+    }
+
+    for (nbyte = 0; nchar > 0 && nbyte < slen; --nchar)
+	nbyte += MB_CPTR2LEN(str + nbyte);
+    if (nbyte >= slen)
+	return NULL;
+    return vim_strnsave(str + nbyte, MB_CPTR2LEN(str + nbyte));
+}
+
+/*
+ * Get the byte index for character index "idx" in string "str" with length
+ * "str_len".
+ * If going over the end return "str_len".
+ * If "idx" is negative count from the end, -1 is the last character.
+ * When going over the start return -1.
+ */
+    static long
+char_idx2byte(char_u *str, size_t str_len, varnumber_T idx)
+{
+    varnumber_T nchar = idx;
+    size_t	nbyte = 0;
+
+    if (nchar >= 0)
+    {
+	while (nchar > 0 && nbyte < str_len)
+	{
+	    nbyte += MB_CPTR2LEN(str + nbyte);
+	    --nchar;
+	}
+    }
+    else
+    {
+	nbyte = str_len;
+	while (nchar < 0 && nbyte > 0)
+	{
+	    --nbyte;
+	    nbyte -= mb_head_off(str, str + nbyte);
+	    ++nchar;
+	}
+	if (nchar < 0)
+	    return -1;
+    }
+    return (long)nbyte;
+}
+
+/*
+ * Return the slice "str[first:last]" using character indexes.
+ * "exclusive" is TRUE for slice().
+ * Return NULL when the result is empty.
+ */
+    char_u *
+string_slice(char_u *str, varnumber_T first, varnumber_T last, int exclusive)
+{
+    long	start_byte, end_byte;
+    size_t	slen;
+
+    if (str == NULL)
+	return NULL;
+    slen = STRLEN(str);
+    start_byte = char_idx2byte(str, slen, first);
+    if (start_byte < 0)
+	start_byte = 0; // first index very negative: use zero
+    if ((last == -1 && !exclusive) || last == VARNUM_MAX)
+	end_byte = (long)slen;
+    else
+    {
+	end_byte = char_idx2byte(str, slen, last);
+	if (!exclusive && end_byte >= 0 && end_byte < (long)slen)
+	    // end index is inclusive
+	    end_byte += MB_CPTR2LEN(str + end_byte);
+    }
+
+    if (start_byte >= (long)slen || end_byte <= start_byte)
+	return NULL;
+    return vim_strnsave(str + start_byte, end_byte - start_byte);
+}
+
+    static svar_T *
+get_script_svar(scriptref_T *sref, ectx_T *ectx)
+{
+    scriptitem_T    *si = SCRIPT_ITEM(sref->sref_sid);
+    dfunc_T	    *dfunc = ((dfunc_T *)def_functions.ga_data)
+							  + ectx->ec_dfunc_idx;
+    svar_T	    *sv;
+
+    if (sref->sref_seq != si->sn_script_seq)
+    {
+	// The script was reloaded after the function was
+	// compiled, the script_idx may not be valid.
+	semsg(_(e_script_variable_invalid_after_reload_in_function_str),
+						 dfunc->df_ufunc->uf_name_exp);
+	return NULL;
+    }
+    sv = ((svar_T *)si->sn_var_vals.ga_data) + sref->sref_idx;
+    if (!equal_type(sv->sv_type, sref->sref_type))
+    {
+	emsg(_(e_script_variable_type_changed));
+	return NULL;
+    }
+    return sv;
+}
 
 /*
  * Execute a function by "name".
@@ -808,6 +1069,52 @@
 }
 
 /*
+ * When a function reference is used, fill a partial with the information
+ * needed, especially when it is used as a closure.
+ */
+    int
+fill_partial_and_closure(partial_T *pt, ufunc_T *ufunc, ectx_T *ectx)
+{
+    pt->pt_func = ufunc;
+    pt->pt_refcount = 1;
+
+    if (ufunc->uf_flags & FC_CLOSURE)
+    {
+	dfunc_T	*dfunc = ((dfunc_T *)def_functions.ga_data)
+							  + ectx->ec_dfunc_idx;
+
+	// The closure needs to find arguments and local
+	// variables in the current stack.
+	pt->pt_outer.out_stack = &ectx->ec_stack;
+	pt->pt_outer.out_frame_idx = ectx->ec_frame_idx;
+	pt->pt_outer.out_up = ectx->ec_outer;
+	pt->pt_outer.out_up_is_copy = TRUE;
+
+	// If this function returns and the closure is still
+	// being used, we need to make a copy of the context
+	// (arguments and local variables). Store a reference
+	// to the partial so we can handle that.
+	if (ga_grow(&ectx->ec_funcrefs, 1) == FAIL)
+	{
+	    vim_free(pt);
+	    return FAIL;
+	}
+	// Extra variable keeps the count of closures created
+	// in the current function call.
+	++(((typval_T *)ectx->ec_stack.ga_data) + ectx->ec_frame_idx
+		       + STACK_FRAME_SIZE + dfunc->df_varcount)->vval.v_number;
+
+	((partial_T **)ectx->ec_funcrefs.ga_data)
+			       [ectx->ec_funcrefs.ga_len] = pt;
+	++pt->pt_refcount;
+	++ectx->ec_funcrefs.ga_len;
+    }
+    ++ufunc->uf_refcount;
+    return OK;
+}
+
+
+/*
  * Call a "def" function from old Vim script.
  * Return OK or FAIL.
  */
@@ -828,12 +1135,17 @@
     int		defcount = ufunc->uf_args.ga_len - argc;
     sctx_T	save_current_sctx = current_sctx;
     int		breakcheck_count = 0;
-    int		called_emsg_before = called_emsg;
+    int		did_emsg_before = did_emsg_cumul + did_emsg;
     int		save_suppress_errthrow = suppress_errthrow;
     msglist_T	**saved_msg_list = NULL;
     msglist_T	*private_msg_list = NULL;
     cmdmod_T	save_cmdmod;
     int		restore_cmdmod = FALSE;
+    int		restore_cmdmod_stacklen = 0;
+    int		save_emsg_silent_def = emsg_silent_def;
+    int		save_did_emsg_def = did_emsg_def;
+    int		trylevel_at_start = trylevel;
+    int		orig_funcdepth;
 
 // Get pointer to item in the stack.
 #define STACK_TV(idx) (((typval_T *)ectx.ec_stack.ga_data) + idx)
@@ -845,14 +1157,12 @@
 // Get pointer to a local variable on the stack.  Negative for arguments.
 #define STACK_TV_VAR(idx) (((typval_T *)ectx.ec_stack.ga_data) + ectx.ec_frame_idx + STACK_FRAME_SIZE + idx)
 
-// Like STACK_TV_VAR but use the outer scope
-#define STACK_OUT_TV_VAR(idx) (((typval_T *)ectx.ec_outer_stack->ga_data) + ectx.ec_outer_frame + STACK_FRAME_SIZE + idx)
-
     if (ufunc->uf_def_status == UF_NOT_COMPILED
-	    || (ufunc->uf_def_status == UF_TO_BE_COMPILED
-			  && compile_def_function(ufunc, FALSE, NULL) == FAIL))
+	    || (func_needs_compiling(ufunc, PROFILING(ufunc))
+		&& compile_def_function(ufunc, FALSE, PROFILING(ufunc), NULL)
+								      == FAIL))
     {
-	if (called_emsg == called_emsg_before)
+	if (did_emsg_cumul + did_emsg == did_emsg_before)
 	    semsg(_(e_function_is_not_compiled_str),
 						   printable_func_name(ufunc));
 	return FAIL;
@@ -862,23 +1172,34 @@
 	// Check the function was really compiled.
 	dfunc_T	*dfunc = ((dfunc_T *)def_functions.ga_data)
 							 + ufunc->uf_dfunc_idx;
-	if (dfunc->df_instr == NULL)
+	if (INSTRUCTIONS(dfunc) == NULL)
 	{
 	    iemsg("using call_def_function() on not compiled function");
 	    return FAIL;
 	}
     }
 
+    // If depth of calling is getting too high, don't execute the function.
+    orig_funcdepth = funcdepth_get();
+    if (funcdepth_increment() == FAIL)
+	return FAIL;
+
     CLEAR_FIELD(ectx);
     ectx.ec_dfunc_idx = ufunc->uf_dfunc_idx;
     ga_init2(&ectx.ec_stack, sizeof(typval_T), 500);
     if (ga_grow(&ectx.ec_stack, 20) == FAIL)
+    {
+	funcdepth_decrement();
 	return FAIL;
+    }
     ga_init2(&ectx.ec_trystack, sizeof(trycmd_T), 10);
     ga_init2(&ectx.ec_funcrefs, sizeof(partial_T *), 10);
 
-    // Put arguments on the stack.
-    for (idx = 0; idx < argc; ++idx)
+    // Put arguments on the stack, but no more than what the function expects.
+    // A lambda can be called with more arguments than it uses.
+    for (idx = 0; idx < argc
+	    && (ufunc->uf_va_name != NULL || idx < ufunc->uf_args.ga_len);
+									 ++idx)
     {
 	if (ufunc->uf_arg_types != NULL && idx < ufunc->uf_args.ga_len
 		&& check_typval_type(ufunc->uf_arg_types[idx], &argv[idx],
@@ -940,18 +1261,31 @@
     ectx.ec_frame_idx = ectx.ec_stack.ga_len;
     initial_frame_idx = ectx.ec_frame_idx;
 
-    if (partial != NULL)
     {
-	if (partial->pt_ectx_stack == NULL && current_ectx != NULL)
-	{
-	    // TODO: is this always the right way?
-	    ectx.ec_outer_stack = &current_ectx->ec_stack;
-	    ectx.ec_outer_frame = current_ectx->ec_frame_idx;
-	}
-	else
+	dfunc_T	*dfunc = ((dfunc_T *)def_functions.ga_data)
+							 + ufunc->uf_dfunc_idx;
+	ufunc_T *base_ufunc = dfunc->df_ufunc;
+
+	// "uf_partial" is on the ufunc that "df_ufunc" points to, as is done
+	// by copy_func().
+	if (partial != NULL || base_ufunc->uf_partial != NULL)
 	{
-	    ectx.ec_outer_stack = partial->pt_ectx_stack;
-	    ectx.ec_outer_frame = partial->pt_ectx_frame;
+	    ectx.ec_outer = ALLOC_CLEAR_ONE(outer_T);
+	    if (ectx.ec_outer == NULL)
+		goto failed_early;
+	    if (partial != NULL)
+	    {
+		if (partial->pt_outer.out_stack == NULL && current_ectx != NULL)
+		{
+		    if (current_ectx->ec_outer != NULL)
+			*ectx.ec_outer = *current_ectx->ec_outer;
+		}
+		else
+		    *ectx.ec_outer = partial->pt_outer;
+	    }
+	    else
+		*ectx.ec_outer = base_ufunc->uf_partial->pt_outer;
+	    ectx.ec_outer->out_up_is_copy = TRUE;
 	}
     }
 
@@ -977,7 +1311,7 @@
 	    ++ectx.ec_stack.ga_len;
 	}
 
-	ectx.ec_instr = dfunc->df_instr;
+	ectx.ec_instr = INSTRUCTIONS(dfunc);
     }
 
     // Following errors are in the function, not the caller.
@@ -994,6 +1328,11 @@
     // Do turn errors into exceptions.
     suppress_errthrow = FALSE;
 
+    // When ":silent!" was used before calling then we still abort the
+    // function.  If ":silent!" is used in the function then we don't.
+    emsg_silent_def = emsg_silent;
+    did_emsg_def = 0;
+
     // Decide where to start execution, handles optional arguments.
     init_instr_idx(ufunc, argc, &ectx);
 
@@ -1070,8 +1409,21 @@
 	{
 	    // execute Ex command line
 	    case ISN_EXEC:
-		SOURCING_LNUM = iptr->isn_lnum;
-		do_cmdline_cmd(iptr->isn_arg.string);
+		{
+		    source_cookie_T cookie;
+
+		    SOURCING_LNUM = iptr->isn_lnum;
+		    // Pass getsourceline to get an error for a missing ":end"
+		    // command.
+		    CLEAR_FIELD(cookie);
+		    cookie.sourcing_lnum = iptr->isn_lnum - 1;
+		    if (do_cmdline(iptr->isn_arg.string,
+				getsourceline, &cookie,
+				   DOCMD_VERBOSE|DOCMD_NOWAIT|DOCMD_KEYTYPED)
+									== FAIL
+				|| did_emsg)
+			goto on_error;
+		}
 		break;
 
 	    // execute Ex command from pieces on the stack
@@ -1181,7 +1533,10 @@
 		    }
 		    ectx.ec_stack.ga_len -= count;
 		    if (failed)
+		    {
+			ga_clear(&ga);
 			goto on_error;
+		    }
 
 		    if (ga.ga_data != NULL)
 		    {
@@ -1189,6 +1544,11 @@
 			{
 			    SOURCING_LNUM = iptr->isn_lnum;
 			    do_cmdline_cmd((char_u *)ga.ga_data);
+			    if (did_emsg)
+			    {
+				ga_clear(&ga);
+				goto on_error;
+			    }
 			}
 			else
 			{
@@ -1217,15 +1577,6 @@
 		++ectx.ec_stack.ga_len;
 		break;
 
-	    // load variable or argument from outer scope
-	    case ISN_LOADOUTER:
-		if (GA_GROW(&ectx.ec_stack, 1) == FAIL)
-		    goto failed;
-		copy_tv(STACK_OUT_TV_VAR(iptr->isn_arg.number),
-							      STACK_TV_BOT(0));
-		++ectx.ec_stack.ga_len;
-		break;
-
 	    // load v: variable
 	    case ISN_LOADV:
 		if (GA_GROW(&ectx.ec_stack, 1) == FAIL)
@@ -1237,12 +1588,13 @@
 	    // load s: variable in Vim9 script
 	    case ISN_LOADSCRIPT:
 		{
-		    scriptitem_T *si =
-				  SCRIPT_ITEM(iptr->isn_arg.script.script_sid);
+		    scriptref_T	*sref = iptr->isn_arg.script.scriptref;
 		    svar_T	 *sv;
 
-		    sv = ((svar_T *)si->sn_var_vals.ga_data)
-					     + iptr->isn_arg.script.script_idx;
+		    sv = get_script_svar(sref, &ectx);
+		    if (sv == NULL)
+			goto failed;
+		    allocate_if_null(sv->sv_tv);
 		    if (GA_GROW(&ectx.ec_stack, 1) == FAIL)
 			goto failed;
 		    copy_tv(sv->sv_tv, STACK_TV_BOT(0));
@@ -1324,6 +1676,21 @@
 		}
 		break;
 
+	    // load autoload variable
+	    case ISN_LOADAUTO:
+		{
+		    char_u *name = iptr->isn_arg.string;
+
+		    if (GA_GROW(&ectx.ec_stack, 1) == FAIL)
+			goto failed;
+		    SOURCING_LNUM = iptr->isn_lnum;
+		    if (eval_variable(name, (int)STRLEN(name),
+				  STACK_TV_BOT(0), NULL, TRUE, FALSE) == FAIL)
+			goto on_error;
+		    ++ectx.ec_stack.ga_len;
+		}
+		break;
+
 	    // load g:/b:/w:/t: namespace
 	    case ISN_LOADGDICT:
 	    case ISN_LOADBDICT:
@@ -1405,14 +1772,6 @@
 		*tv = *STACK_TV_BOT(0);
 		break;
 
-	    // store variable or argument in outer scope
-	    case ISN_STOREOUTER:
-		--ectx.ec_stack.ga_len;
-		tv = STACK_OUT_TV_VAR(iptr->isn_arg.number);
-		clear_tv(tv);
-		*tv = *STACK_TV_BOT(0);
-		break;
-
 	    // store s: variable in old script
 	    case ISN_STORES:
 		{
@@ -1435,11 +1794,12 @@
 	    // store script-local variable in Vim9 script
 	    case ISN_STORESCRIPT:
 		{
-		    scriptitem_T *si = SCRIPT_ITEM(
-					      iptr->isn_arg.script.script_sid);
-		    svar_T	 *sv = ((svar_T *)si->sn_var_vals.ga_data)
-					     + iptr->isn_arg.script.script_idx;
+		    scriptref_T	    *sref = iptr->isn_arg.script.scriptref;
+		    svar_T	    *sv;
 
+		    sv = get_script_svar(sref, &ectx);
+		    if (sv == NULL)
+			goto failed;
 		    --ectx.ec_stack.ga_len;
 		    clear_tv(sv->sv_tv);
 		    *sv->sv_tv = *STACK_TV_BOT(0);
@@ -1512,8 +1872,10 @@
 	    case ISN_STOREW:
 	    case ISN_STORET:
 		{
-		    dictitem_T *di;
-		    hashtab_T *ht;
+		    dictitem_T	*di;
+		    hashtab_T	*ht;
+		    char_u	*name = iptr->isn_arg.string + 2;
+
 		    switch (iptr->isn_type)
 		    {
 			case ISN_STOREG:
@@ -1533,17 +1895,28 @@
 		    }
 
 		    --ectx.ec_stack.ga_len;
-		    di = find_var_in_ht(ht, 0, iptr->isn_arg.string + 2, TRUE);
+		    di = find_var_in_ht(ht, 0, name, TRUE);
 		    if (di == NULL)
 			store_var(iptr->isn_arg.string, STACK_TV_BOT(0));
 		    else
 		    {
+			SOURCING_LNUM = iptr->isn_lnum;
+			if (var_check_permission(di, name) == FAIL)
+			    goto on_error;
 			clear_tv(&di->di_tv);
 			di->di_tv = *STACK_TV_BOT(0);
 		    }
 		}
 		break;
 
+	    // store an autoload variable
+	    case ISN_STOREAUTO:
+		SOURCING_LNUM = iptr->isn_lnum;
+		set_var(iptr->isn_arg.string, STACK_TV_BOT(-1), TRUE);
+		clear_tv(STACK_TV_BOT(-1));
+		--ectx.ec_stack.ga_len;
+		break;
+
 	    // store number in local variable
 	    case ISN_STORENR:
 		tv = STACK_TV_VAR(iptr->isn_arg.storenr.stnr_idx);
@@ -1552,92 +1925,256 @@
 		tv->vval.v_number = iptr->isn_arg.storenr.stnr_val;
 		break;
 
-	    // store value in list variable
-	    case ISN_STORELIST:
+	    // store value in list or dict variable
+	    case ISN_STOREINDEX:
 		{
+		    vartype_T	dest_type = iptr->isn_arg.vartype;
 		    typval_T	*tv_idx = STACK_TV_BOT(-2);
-		    varnumber_T	lidx = tv_idx->vval.v_number;
-		    typval_T	*tv_list = STACK_TV_BOT(-1);
-		    list_T	*list = tv_list->vval.v_list;
+		    typval_T	*tv_dest = STACK_TV_BOT(-1);
+		    int		status = OK;
 
+		    // Stack contains:
+		    // -3 value to be stored
+		    // -2 index
+		    // -1 dict or list
+		    tv = STACK_TV_BOT(-3);
 		    SOURCING_LNUM = iptr->isn_lnum;
-		    if (lidx < 0 && list->lv_len + lidx >= 0)
-			// negative index is relative to the end
-			lidx = list->lv_len + lidx;
-		    if (lidx < 0 || lidx > list->lv_len)
+		    if (dest_type == VAR_ANY)
 		    {
-			semsg(_(e_listidx), lidx);
-			goto on_error;
+			dest_type = tv_dest->v_type;
+			if (dest_type == VAR_DICT)
+			    status = do_2string(tv_idx, TRUE);
+			else if (dest_type == VAR_LIST
+					       && tv_idx->v_type != VAR_NUMBER)
+			{
+			    emsg(_(e_number_exp));
+			    status = FAIL;
+			}
 		    }
-		    tv = STACK_TV_BOT(-3);
-		    if (lidx < list->lv_len)
+		    else if (dest_type != tv_dest->v_type)
 		    {
-			listitem_T *li = list_find(list, lidx);
+			// just in case, should be OK
+			semsg(_(e_expected_str_but_got_str),
+				    vartype_name(dest_type),
+				    vartype_name(tv_dest->v_type));
+			status = FAIL;
+		    }
 
-			if (error_if_locked(li->li_tv.v_lock,
+		    if (status == OK && dest_type == VAR_LIST)
+		    {
+			long	    lidx = (long)tv_idx->vval.v_number;
+			list_T	    *list = tv_dest->vval.v_list;
+
+			if (list == NULL)
+			{
+			    emsg(_(e_list_not_set));
+			    goto on_error;
+			}
+			if (lidx < 0 && list->lv_len + lidx >= 0)
+			    // negative index is relative to the end
+			    lidx = list->lv_len + lidx;
+			if (lidx < 0 || lidx > list->lv_len)
+			{
+			    semsg(_(e_listidx), lidx);
+			    goto on_error;
+			}
+			if (lidx < list->lv_len)
+			{
+			    listitem_T *li = list_find(list, lidx);
+
+			    if (error_if_locked(li->li_tv.v_lock,
 						    e_cannot_change_list_item))
-			    goto failed;
-			// overwrite existing list item
-			clear_tv(&li->li_tv);
-			li->li_tv = *tv;
+				goto on_error;
+			    // overwrite existing list item
+			    clear_tv(&li->li_tv);
+			    li->li_tv = *tv;
+			}
+			else
+			{
+			    if (error_if_locked(list->lv_lock,
+							 e_cannot_change_list))
+				goto on_error;
+			    // append to list, only fails when out of memory
+			    if (list_append_tv(list, tv) == FAIL)
+				goto failed;
+			    clear_tv(tv);
+			}
+		    }
+		    else if (status == OK && dest_type == VAR_DICT)
+		    {
+			char_u		*key = tv_idx->vval.v_string;
+			dict_T		*dict = tv_dest->vval.v_dict;
+			dictitem_T	*di;
+
+			SOURCING_LNUM = iptr->isn_lnum;
+			if (dict == NULL)
+			{
+			    emsg(_(e_dictionary_not_set));
+			    goto on_error;
+			}
+			if (key == NULL)
+			    key = (char_u *)"";
+			di = dict_find(dict, key, -1);
+			if (di != NULL)
+			{
+			    if (error_if_locked(di->di_tv.v_lock,
+						    e_cannot_change_dict_item))
+				goto on_error;
+			    // overwrite existing value
+			    clear_tv(&di->di_tv);
+			    di->di_tv = *tv;
+			}
+			else
+			{
+			    if (error_if_locked(dict->dv_lock,
+							 e_cannot_change_dict))
+				goto on_error;
+			    // add to dict, only fails when out of memory
+			    if (dict_add_tv(dict, (char *)key, tv) == FAIL)
+				goto failed;
+			    clear_tv(tv);
+			}
 		    }
 		    else
 		    {
-			if (error_if_locked(list->lv_lock,
-							 e_cannot_change_list))
-			    goto failed;
-			// append to list, only fails when out of memory
-			if (list_append_tv(list, tv) == FAIL)
-			    goto failed;
-			clear_tv(tv);
+			status = FAIL;
+			semsg(_(e_cannot_index_str), vartype_name(dest_type));
 		    }
+
 		    clear_tv(tv_idx);
-		    clear_tv(tv_list);
+		    clear_tv(tv_dest);
 		    ectx.ec_stack.ga_len -= 3;
+		    if (status == FAIL)
+		    {
+			clear_tv(tv);
+			goto on_error;
+		    }
 		}
 		break;
 
-	    // store value in dict variable
-	    case ISN_STOREDICT:
+	    // load or store variable or argument from outer scope
+	    case ISN_LOADOUTER:
+	    case ISN_STOREOUTER:
 		{
-		    typval_T	*tv_key = STACK_TV_BOT(-2);
-		    char_u	*key = tv_key->vval.v_string;
-		    typval_T	*tv_dict = STACK_TV_BOT(-1);
-		    dict_T	*dict = tv_dict->vval.v_dict;
-		    dictitem_T	*di;
+		    int		depth = iptr->isn_arg.outer.outer_depth;
+		    outer_T	*outer = ectx.ec_outer;
 
-		    SOURCING_LNUM = iptr->isn_lnum;
-		    if (dict == NULL)
+		    while (depth > 1 && outer != NULL)
 		    {
-			emsg(_(e_dictionary_not_set));
-			goto on_error;
+			outer = outer->out_up;
+			--depth;
 		    }
-		    if (key == NULL)
-			key = (char_u *)"";
-		    tv = STACK_TV_BOT(-3);
-		    di = dict_find(dict, key, -1);
-		    if (di != NULL)
+		    if (outer == NULL)
+		    {
+			SOURCING_LNUM = iptr->isn_lnum;
+			iemsg("LOADOUTER depth more than scope levels");
+			goto failed;
+		    }
+		    tv = ((typval_T *)outer->out_stack->ga_data)
+				    + outer->out_frame_idx + STACK_FRAME_SIZE
+				    + iptr->isn_arg.outer.outer_idx;
+		    if (iptr->isn_type == ISN_LOADOUTER)
+		    {
+			if (GA_GROW(&ectx.ec_stack, 1) == FAIL)
+			    goto failed;
+			copy_tv(tv, STACK_TV_BOT(0));
+			++ectx.ec_stack.ga_len;
+		    }
+		    else
+		    {
+			--ectx.ec_stack.ga_len;
+			clear_tv(tv);
+			*tv = *STACK_TV_BOT(0);
+		    }
+		}
+		break;
+
+	    // unlet item in list or dict variable
+	    case ISN_UNLETINDEX:
+		{
+		    typval_T	*tv_idx = STACK_TV_BOT(-2);
+		    typval_T	*tv_dest = STACK_TV_BOT(-1);
+		    int		status = OK;
+
+		    // Stack contains:
+		    // -2 index
+		    // -1 dict or list
+		    if (tv_dest->v_type == VAR_DICT)
+		    {
+			// unlet a dict item, index must be a string
+			if (tv_idx->v_type != VAR_STRING)
+			{
+			    SOURCING_LNUM = iptr->isn_lnum;
+			    semsg(_(e_expected_str_but_got_str),
+					vartype_name(VAR_STRING),
+					vartype_name(tv_idx->v_type));
+			    status = FAIL;
+			}
+			else
+			{
+			    dict_T	*d = tv_dest->vval.v_dict;
+			    char_u	*key = tv_idx->vval.v_string;
+			    dictitem_T  *di = NULL;
+
+			    if (key == NULL)
+				key = (char_u *)"";
+			    if (d != NULL)
+				di = dict_find(d, key, (int)STRLEN(key));
+			    if (di == NULL)
+			    {
+				// NULL dict is equivalent to empty dict
+				SOURCING_LNUM = iptr->isn_lnum;
+				semsg(_(e_dictkey), key);
+				status = FAIL;
+			    }
+			    else
+			    {
+				// TODO: check for dict or item locked
+				dictitem_remove(d, di);
+			    }
+			}
+		    }
+		    else if (tv_dest->v_type == VAR_LIST)
 		    {
-			if (error_if_locked(di->di_tv.v_lock,
-						    e_cannot_change_dict_item))
-			    goto failed;
-			// overwrite existing value
-			clear_tv(&di->di_tv);
-			di->di_tv = *tv;
+			// unlet a List item, index must be a number
+			if (tv_idx->v_type != VAR_NUMBER)
+			{
+			    SOURCING_LNUM = iptr->isn_lnum;
+			    semsg(_(e_expected_str_but_got_str),
+					vartype_name(VAR_NUMBER),
+					vartype_name(tv_idx->v_type));
+			    status = FAIL;
+			}
+			else
+			{
+			    list_T	*l = tv_dest->vval.v_list;
+			    long	n = (long)tv_idx->vval.v_number;
+			    listitem_T	*li = NULL;
+
+			    li = list_find(l, n);
+			    if (li == NULL)
+			    {
+				SOURCING_LNUM = iptr->isn_lnum;
+				semsg(_(e_listidx), n);
+				status = FAIL;
+			    }
+			    else
+				// TODO: check for list or item locked
+				listitem_remove(l, li);
+			}
 		    }
 		    else
 		    {
-			if (error_if_locked(dict->dv_lock,
-							 e_cannot_change_dict))
-			    goto failed;
-			// add to dict, only fails when out of memory
-			if (dict_add_tv(dict, (char *)key, tv) == FAIL)
-			    goto failed;
-			clear_tv(tv);
+			status = FAIL;
+			semsg(_(e_cannot_index_str),
+						vartype_name(tv_dest->v_type));
 		    }
-		    clear_tv(tv_key);
-		    clear_tv(tv_dict);
-		    ectx.ec_stack.ga_len -= 3;
+
+		    clear_tv(tv_idx);
+		    clear_tv(tv_dest);
+		    ectx.ec_stack.ga_len -= 2;
+		    if (status == FAIL)
+			goto on_error;
 		}
 		break;
 
@@ -1737,6 +2274,7 @@
 		    int		count = iptr->isn_arg.number;
 		    dict_T	*dict = dict_alloc();
 		    dictitem_T	*item;
+		    char_u	*key;
 
 		    if (dict == NULL)
 			goto failed;
@@ -1745,15 +2283,17 @@
 			// have already checked key type is VAR_STRING
 			tv = STACK_TV_BOT(2 * (idx - count));
 			// check key is unique
-			item = dict_find(dict, tv->vval.v_string, -1);
+			key = tv->vval.v_string == NULL
+					    ? (char_u *)"" : tv->vval.v_string;
+			item = dict_find(dict, key, -1);
 			if (item != NULL)
 			{
 			    SOURCING_LNUM = iptr->isn_lnum;
-			    semsg(_(e_duplicate_key), tv->vval.v_string);
+			    semsg(_(e_duplicate_key), key);
 			    dict_unref(dict);
 			    goto on_error;
 			}
-			item = dictitem_alloc(tv->vval.v_string);
+			item = dictitem_alloc(key);
 			clear_tv(tv);
 			if (item == NULL)
 			{
@@ -1787,7 +2327,7 @@
 	    // call a :def function
 	    case ISN_DCALL:
 		SOURCING_LNUM = iptr->isn_lnum;
-		if (call_dfunc(iptr->isn_arg.dfunc.cdf_idx,
+		if (call_dfunc(iptr->isn_arg.dfunc.cdf_idx, NULL,
 			      iptr->isn_arg.dfunc.cdf_argcount,
 			      &ectx) == FAIL)
 		    goto on_error;
@@ -1852,6 +2392,16 @@
 		break;
 
 	    // return from a :def function call
+	    case ISN_RETURN_ZERO:
+		if (GA_GROW(&ectx.ec_stack, 1) == FAIL)
+		    goto failed;
+		tv = STACK_TV_BOT(0);
+		++ectx.ec_stack.ga_len;
+		tv->v_type = VAR_NUMBER;
+		tv->vval.v_number = 0;
+		tv->v_lock = 0;
+		// FALLTHROUGH
+
 	    case ISN_RETURN:
 		{
 		    garray_T	*trystack = &ectx.ec_trystack;
@@ -1876,10 +2426,10 @@
 	    // push a function reference to a compiled function
 	    case ISN_FUNCREF:
 		{
-		    partial_T   *pt = NULL;
-		    dfunc_T	*pt_dfunc;
+		    partial_T   *pt = ALLOC_CLEAR_ONE(partial_T);
+		    dfunc_T	*pt_dfunc = ((dfunc_T *)def_functions.ga_data)
+					       + iptr->isn_arg.funcref.fr_func;
 
-		    pt = ALLOC_CLEAR_ONE(partial_T);
 		    if (pt == NULL)
 			goto failed;
 		    if (GA_GROW(&ectx.ec_stack, 1) == FAIL)
@@ -1887,41 +2437,9 @@
 			vim_free(pt);
 			goto failed;
 		    }
-		    pt_dfunc = ((dfunc_T *)def_functions.ga_data)
-					       + iptr->isn_arg.funcref.fr_func;
-		    pt->pt_func = pt_dfunc->df_ufunc;
-		    pt->pt_refcount = 1;
-
-		    if (pt_dfunc->df_ufunc->uf_flags & FC_CLOSURE)
-		    {
-			dfunc_T	*dfunc = ((dfunc_T *)def_functions.ga_data)
-							   + ectx.ec_dfunc_idx;
-
-			// The closure needs to find arguments and local
-			// variables in the current stack.
-			pt->pt_ectx_stack = &ectx.ec_stack;
-			pt->pt_ectx_frame = ectx.ec_frame_idx;
-
-			// If this function returns and the closure is still
-			// being used, we need to make a copy of the context
-			// (arguments and local variables). Store a reference
-			// to the partial so we can handle that.
-			if (ga_grow(&ectx.ec_funcrefs, 1) == FAIL)
-			{
-			    vim_free(pt);
-			    goto failed;
-			}
-			// Extra variable keeps the count of closures created
-			// in the current function call.
-			tv = STACK_TV_VAR(dfunc->df_varcount);
-			++tv->vval.v_number;
-
-			((partial_T **)ectx.ec_funcrefs.ga_data)
-					       [ectx.ec_funcrefs.ga_len] = pt;
-			++pt->pt_refcount;
-			++ectx.ec_funcrefs.ga_len;
-		    }
-		    ++pt_dfunc->df_ufunc->uf_refcount;
+		    if (fill_partial_and_closure(pt, pt_dfunc->df_ufunc,
+								&ectx) == FAIL)
+			goto failed;
 
 		    tv = STACK_TV_BOT(0);
 		    ++ectx.ec_stack.ga_len;
@@ -1936,7 +2454,23 @@
 		{
 		    newfunc_T	*newfunc = &iptr->isn_arg.newfunc;
 
-		    copy_func(newfunc->nf_lambda, newfunc->nf_global);
+		    if (copy_func(newfunc->nf_lambda, newfunc->nf_global,
+								&ectx) == FAIL)
+			goto failed;
+		}
+		break;
+
+	    // List functions
+	    case ISN_DEF:
+		if (iptr->isn_arg.string == NULL)
+		    list_functions(NULL);
+		else
+		{
+		    exarg_T ea;
+
+		    CLEAR_FIELD(ea);
+		    ea.cmd = ea.arg = iptr->isn_arg.string;
+		    define_function(&ea, NULL);
 		}
 		break;
 
@@ -2051,6 +2585,13 @@
 		{
 		    garray_T	*trystack = &ectx.ec_trystack;
 
+		    if (restore_cmdmod)
+		    {
+			cmdmod.cmod_filter_regmatch.regprog = NULL;
+			undo_cmdmod(&cmdmod);
+			cmdmod = save_cmdmod;
+			restore_cmdmod = FALSE;
+		    }
 		    if (trystack->ga_len > 0)
 		    {
 			trycmd_T    *trycmd = ((trycmd_T *)trystack->ga_data)
@@ -2058,6 +2599,7 @@
 			trycmd->tcd_caught = TRUE;
 		    }
 		    did_emsg = got_int = did_throw = FALSE;
+		    force_abort = need_rethrow = FALSE;
 		    catch_exception(current_exception);
 		}
 		break;
@@ -2069,7 +2611,7 @@
 
 		    if (trystack->ga_len > 0)
 		    {
-			trycmd_T    *trycmd = NULL;
+			trycmd_T    *trycmd;
 
 			--trystack->ga_len;
 			--trylevel;
@@ -2091,23 +2633,54 @@
 		break;
 
 	    case ISN_THROW:
-		--ectx.ec_stack.ga_len;
-		tv = STACK_TV_BOT(0);
-		if (tv->vval.v_string == NULL
-				       || *skipwhite(tv->vval.v_string) == NUL)
 		{
-		    vim_free(tv->vval.v_string);
-		    SOURCING_LNUM = iptr->isn_lnum;
-		    emsg(_(e_throw_with_empty_string));
-		    goto failed;
-		}
+		    garray_T	*trystack = &ectx.ec_trystack;
 
-		if (throw_exception(tv->vval.v_string, ET_USER, NULL) == FAIL)
-		{
-		    vim_free(tv->vval.v_string);
-		    goto failed;
+		    if (trystack->ga_len == 0 && trylevel == 0 && emsg_silent)
+		    {
+			// throwing an exception while using "silent!" causes
+			// the function to abort but not display an error.
+			tv = STACK_TV_BOT(-1);
+			clear_tv(tv);
+			tv->v_type = VAR_NUMBER;
+			tv->vval.v_number = 0;
+			goto done;
+		    }
+		    --ectx.ec_stack.ga_len;
+		    tv = STACK_TV_BOT(0);
+		    if (tv->vval.v_string == NULL
+				       || *skipwhite(tv->vval.v_string) == NUL)
+		    {
+			vim_free(tv->vval.v_string);
+			SOURCING_LNUM = iptr->isn_lnum;
+			emsg(_(e_throw_with_empty_string));
+			goto failed;
+		    }
+
+		    // Inside a "catch" we need to first discard the caught
+		    // exception.
+		    if (trystack->ga_len > 0)
+		    {
+			trycmd_T    *trycmd = ((trycmd_T *)trystack->ga_data)
+							+ trystack->ga_len - 1;
+			if (trycmd->tcd_caught && current_exception != NULL)
+			{
+			    // discard the exception
+			    if (caught_stack == current_exception)
+				caught_stack = caught_stack->caught;
+			    discard_current_exception();
+			    trycmd->tcd_caught = FALSE;
+			}
+		    }
+
+		    if (throw_exception(tv->vval.v_string, ET_USER, NULL)
+								       == FAIL)
+		    {
+			vim_free(tv->vval.v_string);
+			goto failed;
+		    }
+		    did_throw = TRUE;
 		}
-		did_throw = TRUE;
 		break;
 
 	    // compare with special values
@@ -2269,11 +2842,11 @@
 		{
 		    typval_T	*tv1 = STACK_TV_BOT(-2);
 		    typval_T	*tv2 = STACK_TV_BOT(-1);
-		    exptype_T	exptype = iptr->isn_arg.op.op_type;
+		    exprtype_T	exprtype = iptr->isn_arg.op.op_type;
 		    int		ic = iptr->isn_arg.op.op_ic;
 
 		    SOURCING_LNUM = iptr->isn_lnum;
-		    typval_compare(tv1, tv2, exptype, ic);
+		    typval_compare(tv1, tv2, exprtype, ic);
 		    clear_tv(tv2);
 		    --ectx.ec_stack.ga_len;
 		}
@@ -2376,6 +2949,7 @@
 		    else
 #endif
 		    {
+			SOURCING_LNUM = iptr->isn_lnum;
 			n1 = tv_get_number_chk(tv1, &error);
 			if (error)
 			    goto on_error;
@@ -2424,13 +2998,21 @@
 		    else
 #endif
 		    {
+			int failed = FALSE;
+
 			switch (iptr->isn_arg.op.op_type)
 			{
 			    case EXPR_MULT: n1 = n1 * n2; break;
-			    case EXPR_DIV:  n1 = num_divide(n1, n2); break;
+			    case EXPR_DIV:  n1 = num_divide(n1, n2, &failed);
+					    if (failed)
+						goto on_error;
+					    break;
 			    case EXPR_SUB:  n1 = n1 - n2; break;
 			    case EXPR_ADD:  n1 = n1 + n2; break;
-			    default:	    n1 = num_modulus(n1, n2); break;
+			    default:	    n1 = num_modulus(n1, n2, &failed);
+					    if (failed)
+						goto on_error;
+					    break;
 			}
 			clear_tv(tv1);
 			clear_tv(tv2);
@@ -2478,7 +3060,7 @@
 		    tv = STACK_TV_BOT(-1);
 		    if (is_slice)
 			// Slice: Select the characters from the string
-			res = string_slice(tv->vval.v_string, n1, n2);
+			res = string_slice(tv->vval.v_string, n1, n2, FALSE);
 		    else
 			// Index: The resulting variable is a string of a
 			// single character.  If the index is too big or
@@ -2516,8 +3098,8 @@
 		    ectx.ec_stack.ga_len -= is_slice ? 2 : 1;
 		    tv = STACK_TV_BOT(-1);
 		    SOURCING_LNUM = iptr->isn_lnum;
-		    if (list_slice_or_index(list, is_slice, n1, n2, tv, TRUE)
-								       == FAIL)
+		    if (list_slice_or_index(list, is_slice, n1, n2, FALSE,
+							     tv, TRUE) == FAIL)
 			goto on_error;
 		}
 		break;
@@ -2538,8 +3120,8 @@
 			goto on_error;
 		    var1 = is_slice ? STACK_TV_BOT(-2) : STACK_TV_BOT(-1);
 		    var2 = is_slice ? STACK_TV_BOT(-1) : NULL;
-		    res = eval_index_inner(tv, is_slice,
-						   var1, var2, NULL, -1, TRUE);
+		    res = eval_index_inner(tv, is_slice, var1, var2,
+							FALSE, NULL, -1, TRUE);
 		    clear_tv(var1);
 		    if (is_slice)
 			clear_tv(var2);
@@ -2606,17 +3188,28 @@
 		    tv = STACK_TV_BOT(-1);
 		    // no need to check for VAR_STRING, 2STRING will check.
 		    key = tv->vval.v_string;
+		    if (key == NULL)
+			key = (char_u *)"";
 
 		    if ((di = dict_find(dict, key, -1)) == NULL)
 		    {
 			SOURCING_LNUM = iptr->isn_lnum;
 			semsg(_(e_dictkey), key);
-			goto on_error;
+
+			// If :silent! is used we will continue, make sure the
+			// stack contents makes sense.
+			clear_tv(tv);
+			--ectx.ec_stack.ga_len;
+			tv = STACK_TV_BOT(-1);
+			clear_tv(tv);
+			tv->v_type = VAR_NUMBER;
+			tv->vval.v_number = 0;
+			goto on_fatal_error;
 		    }
 		    clear_tv(tv);
 		    --ectx.ec_stack.ga_len;
-		    // Clear the dict after getting the item, to avoid that it
-		    // make the item invalid.
+		    // Clear the dict only after getting the item, to avoid
+		    // that it makes the item invalid.
 		    tv = STACK_TV_BOT(-1);
 		    temp_tv = *tv;
 		    copy_tv(&di->di_tv, tv);
@@ -2693,9 +3286,10 @@
 		{
 		    checktype_T *ct = &iptr->isn_arg.type;
 
-		    tv = STACK_TV_BOT(ct->ct_off);
+		    tv = STACK_TV_BOT((int)ct->ct_off);
 		    SOURCING_LNUM = iptr->isn_lnum;
-		    if (check_typval_type(ct->ct_type, tv, 0) == FAIL)
+		    if (check_typval_type(ct->ct_type, tv, ct->ct_arg_idx)
+								       == FAIL)
 			goto on_error;
 
 		    // number 0 is FALSE, number 1 is TRUE
@@ -2731,6 +3325,24 @@
 		}
 		break;
 
+	    case ISN_SETTYPE:
+		{
+		    checktype_T *ct = &iptr->isn_arg.type;
+
+		    tv = STACK_TV_BOT(-1);
+		    if (tv->v_type == VAR_DICT && tv->vval.v_dict != NULL)
+		    {
+			free_type(tv->vval.v_dict->dv_type);
+			tv->vval.v_dict->dv_type = alloc_type(ct->ct_type);
+		    }
+		    else if (tv->v_type == VAR_LIST && tv->vval.v_list != NULL)
+		    {
+			free_type(tv->vval.v_list->lv_type);
+			tv->vval.v_list->lv_type = alloc_type(ct->ct_type);
+		    }
+		}
+		break;
+
 	    case ISN_2BOOL:
 	    case ISN_COND2BOOL:
 		{
@@ -2759,30 +3371,35 @@
 
 	    case ISN_2STRING:
 	    case ISN_2STRING_ANY:
+		SOURCING_LNUM = iptr->isn_lnum;
+		if (do_2string(STACK_TV_BOT(iptr->isn_arg.number),
+			iptr->isn_type == ISN_2STRING_ANY) == FAIL)
+			    goto on_error;
+		break;
+
+	    case ISN_RANGE:
 		{
-		    char_u *str;
+		    exarg_T	ea;
+		    char	*errormsg;
 
-		    tv = STACK_TV_BOT(iptr->isn_arg.number);
-		    if (tv->v_type != VAR_STRING)
-		    {
-			if (iptr->isn_type == ISN_2STRING_ANY)
-			{
-			    switch (tv->v_type)
-			    {
-				case VAR_SPECIAL:
-				case VAR_BOOL:
-				case VAR_NUMBER:
-				case VAR_FLOAT:
-				case VAR_BLOB:	break;
-				default:	to_string_error(tv->v_type);
-						goto on_error;
-			    }
-			}
-			str = typval_tostring(tv);
-			clear_tv(tv);
-			tv->v_type = VAR_STRING;
-			tv->vval.v_string = str;
-		    }
+		    ea.line2 = 0;
+		    ea.addr_count = 0;
+		    ea.addr_type = ADDR_LINES;
+		    ea.cmd = iptr->isn_arg.string;
+		    ea.skip = FALSE;
+		    if (parse_cmd_address(&ea, &errormsg, FALSE) == FAIL)
+			goto on_error;
+
+		    if (GA_GROW(&ectx.ec_stack, 1) == FAIL)
+			goto failed;
+		    ++ectx.ec_stack.ga_len;
+		    tv = STACK_TV_BOT(-1);
+		    tv->v_type = VAR_NUMBER;
+		    tv->v_lock = 0;
+		    if (ea.addr_count == 0)
+			tv->vval.v_number = curwin->w_cursor.lnum;
+		    else
+			tv->vval.v_number = ea.line2;
 		}
 		break;
 
@@ -2793,6 +3410,21 @@
 		    char_u	*expr = NULL;
 		    int		dir = FORWARD;
 
+		    if (lnum < -2)
+		    {
+			// line number was put on the stack by ISN_RANGE
+			tv = STACK_TV_BOT(-1);
+			curwin->w_cursor.lnum = tv->vval.v_number;
+			if (lnum == LNUM_VARIABLE_RANGE_ABOVE)
+			    dir = BACKWARD;
+			--ectx.ec_stack.ga_len;
+		    }
+		    else if (lnum == -2)
+			// :put! above cursor
+			dir = BACKWARD;
+		    else if (lnum >= 0)
+			curwin->w_cursor.lnum = iptr->isn_arg.put.put_lnum;
+
 		    if (regname == '=')
 		    {
 			tv = STACK_TV_BOT(-1);
@@ -2800,16 +3432,11 @@
 			    expr = tv->vval.v_string;
 			else
 			{
-			    expr = typval_tostring(tv);  // allocates value
+			    expr = typval2string(tv, TRUE); // allocates value
 			    clear_tv(tv);
 			}
 			--ectx.ec_stack.ga_len;
 		    }
-		    if (lnum == -2)
-			// :put! above cursor
-			dir = BACKWARD;
-		    else if (lnum >= 0)
-			curwin->w_cursor.lnum = iptr->isn_arg.put.put_lnum;
 		    check_cursor();
 		    do_put(regname, expr, dir, 1L, PUT_LINE|PUT_CURSLINE);
 		    vim_free(expr);
@@ -2819,6 +3446,7 @@
 	    case ISN_CMDMOD:
 		save_cmdmod = cmdmod;
 		restore_cmdmod = TRUE;
+		restore_cmdmod_stacklen = ectx.ec_stack.ga_len;
 		cmdmod = *iptr->isn_arg.cmdmod.cf_cmdmod;
 		apply_cmdmod(&cmdmod);
 		break;
@@ -2831,11 +3459,106 @@
 		restore_cmdmod = FALSE;
 		break;
 
+	    case ISN_UNPACK:
+		{
+		    int		count = iptr->isn_arg.unpack.unp_count;
+		    int		semicolon = iptr->isn_arg.unpack.unp_semicolon;
+		    list_T	*l;
+		    listitem_T	*li;
+		    int		i;
+
+		    // Check there is a valid list to unpack.
+		    tv = STACK_TV_BOT(-1);
+		    if (tv->v_type != VAR_LIST)
+		    {
+			SOURCING_LNUM = iptr->isn_lnum;
+			emsg(_(e_for_argument_must_be_sequence_of_lists));
+			goto on_error;
+		    }
+		    l = tv->vval.v_list;
+		    if (l == NULL
+				|| l->lv_len < (semicolon ? count - 1 : count))
+		    {
+			SOURCING_LNUM = iptr->isn_lnum;
+			emsg(_(e_list_value_does_not_have_enough_items));
+			goto on_error;
+		    }
+		    else if (!semicolon && l->lv_len > count)
+		    {
+			SOURCING_LNUM = iptr->isn_lnum;
+			emsg(_(e_list_value_has_more_items_than_targets));
+			goto on_error;
+		    }
+
+		    CHECK_LIST_MATERIALIZE(l);
+		    if (GA_GROW(&ectx.ec_stack, count - 1) == FAIL)
+			goto failed;
+		    ectx.ec_stack.ga_len += count - 1;
+
+		    // Variable after semicolon gets a list with the remaining
+		    // items.
+		    if (semicolon)
+		    {
+			list_T	*rem_list =
+				  list_alloc_with_items(l->lv_len - count + 1);
+
+			if (rem_list == NULL)
+			    goto failed;
+			tv = STACK_TV_BOT(-count);
+			tv->vval.v_list = rem_list;
+			++rem_list->lv_refcount;
+			tv->v_lock = 0;
+			li = l->lv_first;
+			for (i = 0; i < count - 1; ++i)
+			    li = li->li_next;
+			for (i = 0; li != NULL; ++i)
+			{
+			    list_set_item(rem_list, i, &li->li_tv);
+			    li = li->li_next;
+			}
+			--count;
+		    }
+
+		    // Produce the values in reverse order, first item last.
+		    li = l->lv_first;
+		    for (i = 0; i < count; ++i)
+		    {
+			tv = STACK_TV_BOT(-i - 1);
+			copy_tv(&li->li_tv, tv);
+			li = li->li_next;
+		    }
+
+		    list_unref(l);
+		}
+		break;
+
+	    case ISN_PROF_START:
+	    case ISN_PROF_END:
+		{
+#ifdef FEAT_PROFILE
+		    funccall_T cookie;
+		    ufunc_T	    *cur_ufunc =
+				    (((dfunc_T *)def_functions.ga_data)
+						 + ectx.ec_dfunc_idx)->df_ufunc;
+
+		    cookie.func = cur_ufunc;
+		    if (iptr->isn_type == ISN_PROF_START)
+		    {
+			func_line_start(&cookie, iptr->isn_lnum);
+			// if we get here the instruction is executed
+			func_line_exec(&cookie);
+		    }
+		    else
+			func_line_end(&cookie);
+#endif
+		}
+		break;
+
 	    case ISN_SHUFFLE:
 		{
-		    typval_T	    tmp_tv;
-		    int		    item = iptr->isn_arg.shuffle.shfl_item;
-		    int		    up = iptr->isn_arg.shuffle.shfl_up;
+		    typval_T	tmp_tv;
+		    int		item = iptr->isn_arg.shuffle.shfl_item;
+		    int		up = iptr->isn_arg.shuffle.shfl_up;
 
 		    tmp_tv = *STACK_TV_BOT(-item);
 		    for ( ; up > 0 && item > 1; --up)
@@ -2866,7 +3589,31 @@
 	continue;
 
 on_error:
-	if (trylevel == 0)
+	// Jump here for an error that does not require aborting execution.
+	// If "emsg_silent" is set then ignore the error, unless it was set
+	// when calling the function.
+	if (did_emsg_cumul + did_emsg == did_emsg_before
+					   && emsg_silent && did_emsg_def == 0)
+	{
+	    // If a sequence of instructions causes an error while ":silent!"
+	    // was used, restore the stack length and jump ahead to restoring
+	    // the cmdmod.
+	    if (restore_cmdmod)
+	    {
+		while (ectx.ec_stack.ga_len > restore_cmdmod_stacklen)
+		{
+		    --ectx.ec_stack.ga_len;
+		    clear_tv(STACK_TV_BOT(0));
+		}
+		while (ectx.ec_instr[ectx.ec_iidx].isn_type != ISN_CMDMOD_REV)
+		    ++ectx.ec_iidx;
+	    }
+	    continue;
+	}
+on_fatal_error:
+	// Jump here for an error that messes up the stack.
+	// If we are not inside a try-catch started here, abort execution.
+	if (trylevel <= trylevel_at_start)
 	    goto failed;
     }
 
@@ -2884,7 +3631,10 @@
 
     // Deal with any remaining closures, they may be in use somewhere.
     if (ectx.ec_funcrefs.ga_len > 0)
+    {
 	handle_closure_in_use(&ectx, FALSE);
+	ga_clear(&ectx.ec_funcrefs);  // TODO: should not be needed?
+    }
 
     estack_pop();
     current_sctx = save_current_sctx;
@@ -2908,6 +3658,8 @@
 	undo_cmdmod(&cmdmod);
 	cmdmod = save_cmdmod;
     }
+    emsg_silent_def = save_emsg_silent_def;
+    did_emsg_def += save_did_emsg_def;
 
 failed_early:
     // Free all local variables, but not arguments.
@@ -2917,17 +3669,27 @@
     vim_free(ectx.ec_stack.ga_data);
     vim_free(ectx.ec_trystack.ga_data);
 
+    while (ectx.ec_outer != NULL)
+    {
+	outer_T	    *up = ectx.ec_outer->out_up_is_copy
+						? NULL : ectx.ec_outer->out_up;
+
+	vim_free(ectx.ec_outer);
+	ectx.ec_outer = up;
+    }
+
     // Not sure if this is necessary.
     suppress_errthrow = save_suppress_errthrow;
 
-    if (ret != OK && called_emsg == called_emsg_before)
+    if (ret != OK && did_emsg_cumul + did_emsg == did_emsg_before)
 	semsg(_(e_unknown_error_while_executing_str),
 						   printable_func_name(ufunc));
+    funcdepth_restore(orig_funcdepth);
     return ret;
 }
 
 /*
- * ":dissassemble".
+ * ":disassemble".
  * We don't really need this at runtime, but we do have tests that require it,
  * so always include this.
  */
@@ -2939,6 +3701,7 @@
     ufunc_T	*ufunc;
     dfunc_T	*dfunc;
     isn_T	*instr;
+    int		instr_count;
     int		current;
     int		line_idx = 0;
     int		prev_current = 0;
@@ -2952,7 +3715,7 @@
     }
     else
 	fname = trans_function_name(&arg, &is_global, FALSE,
-			    TFN_INT | TFN_QUIET | TFN_NO_AUTOLOAD, NULL, NULL);
+		      TFN_INT | TFN_QUIET | TFN_NO_AUTOLOAD, NULL, NULL, NULL);
     if (fname == NULL)
     {
 	semsg(_(e_invarg2), eap->arg);
@@ -2974,8 +3737,8 @@
 	semsg(_(e_cannot_find_function_str), eap->arg);
 	return;
     }
-    if (ufunc->uf_def_status == UF_TO_BE_COMPILED
-	    && compile_def_function(ufunc, FALSE, NULL) == FAIL)
+    if (func_needs_compiling(ufunc, eap->forceit)
+	    && compile_def_function(ufunc, FALSE, eap->forceit, NULL) == FAIL)
 	return;
     if (ufunc->uf_def_status != UF_COMPILED)
     {
@@ -2988,8 +3751,15 @@
 	msg((char *)ufunc->uf_name);
 
     dfunc = ((dfunc_T *)def_functions.ga_data) + ufunc->uf_dfunc_idx;
+#ifdef FEAT_PROFILE
+    instr = eap->forceit ? dfunc->df_instr_prof : dfunc->df_instr;
+    instr_count = eap->forceit ? dfunc->df_instr_prof_count
+						       : dfunc->df_instr_count;
+#else
     instr = dfunc->df_instr;
-    for (current = 0; current < dfunc->df_instr_count; ++current)
+    instr_count = dfunc->df_instr_count;
+#endif
+    for (current = 0; current < instr_count; ++current)
     {
 	isn_T	    *iptr = &instr[current];
 	char	    *line;
@@ -3013,7 +3783,7 @@
 		break;
 	    case ISN_EXECCONCAT:
 		smsg("%4d EXECCONCAT %lld", current,
-					      (long long)iptr->isn_arg.number);
+					      (varnumber_T)iptr->isn_arg.number);
 		break;
 	    case ISN_ECHO:
 		{
@@ -3026,28 +3796,38 @@
 		break;
 	    case ISN_EXECUTE:
 		smsg("%4d EXECUTE %lld", current,
-					    (long long)(iptr->isn_arg.number));
+					    (varnumber_T)(iptr->isn_arg.number));
 		break;
 	    case ISN_ECHOMSG:
 		smsg("%4d ECHOMSG %lld", current,
-					    (long long)(iptr->isn_arg.number));
+					    (varnumber_T)(iptr->isn_arg.number));
 		break;
 	    case ISN_ECHOERR:
 		smsg("%4d ECHOERR %lld", current,
-					    (long long)(iptr->isn_arg.number));
+					    (varnumber_T)(iptr->isn_arg.number));
 		break;
 	    case ISN_LOAD:
-	    case ISN_LOADOUTER:
 		{
-		    char *add = iptr->isn_type == ISN_LOAD ? "" : "OUTER";
-
 		    if (iptr->isn_arg.number < 0)
-			smsg("%4d LOAD%s arg[%lld]", current, add,
-				(long long)(iptr->isn_arg.number
+			smsg("%4d LOAD arg[%lld]", current,
+				(varnumber_T)(iptr->isn_arg.number
 							  + STACK_FRAME_SIZE));
 		    else
-			smsg("%4d LOAD%s $%lld", current, add,
-					    (long long)(iptr->isn_arg.number));
+			smsg("%4d LOAD $%lld", current,
+					  (varnumber_T)(iptr->isn_arg.number));
+		}
+		break;
+	    case ISN_LOADOUTER:
+		{
+		    if (iptr->isn_arg.number < 0)
+			smsg("%4d LOADOUTER level %d arg[%d]", current,
+				iptr->isn_arg.outer.outer_depth,
+				iptr->isn_arg.outer.outer_idx
+							  + STACK_FRAME_SIZE);
+		    else
+			smsg("%4d LOADOUTER level %d $%d", current,
+					      iptr->isn_arg.outer.outer_depth,
+					      iptr->isn_arg.outer.outer_idx);
 		}
 		break;
 	    case ISN_LOADV:
@@ -3056,14 +3836,14 @@
 		break;
 	    case ISN_LOADSCRIPT:
 		{
-		    scriptitem_T *si =
-				  SCRIPT_ITEM(iptr->isn_arg.script.script_sid);
+		    scriptref_T	*sref = iptr->isn_arg.script.scriptref;
+		    scriptitem_T *si = SCRIPT_ITEM(sref->sref_sid);
 		    svar_T *sv = ((svar_T *)si->sn_var_vals.ga_data)
-					     + iptr->isn_arg.script.script_idx;
+							      + sref->sref_idx;
 
 		    smsg("%4d LOADSCRIPT %s-%d from %s", current,
 					    sv->sv_name,
-					    iptr->isn_arg.script.script_idx,
+					    sref->sref_idx,
 					    si->sn_name);
 		}
 		break;
@@ -3076,6 +3856,9 @@
 				 iptr->isn_arg.loadstore.ls_name, si->sn_name);
 		}
 		break;
+	    case ISN_LOADAUTO:
+		smsg("%4d LOADAUTO %s", current, iptr->isn_arg.string);
+		break;
 	    case ISN_LOADG:
 		smsg("%4d LOADG g:%s", current, iptr->isn_arg.string);
 		break;
@@ -3111,22 +3894,31 @@
 		break;
 
 	    case ISN_STORE:
+		if (iptr->isn_arg.number < 0)
+		    smsg("%4d STORE arg[%lld]", current,
+				      iptr->isn_arg.number + STACK_FRAME_SIZE);
+		else
+		    smsg("%4d STORE $%lld", current, iptr->isn_arg.number);
+		break;
 	    case ISN_STOREOUTER:
 		{
-		    char *add = iptr->isn_type == ISN_STORE ? "" : "OUTER";
-
 		if (iptr->isn_arg.number < 0)
-		    smsg("%4d STORE%s arg[%lld]", current, add,
-			 (long long)(iptr->isn_arg.number + STACK_FRAME_SIZE));
+		    smsg("%4d STOREOUTEr level %d arg[%d]", current,
+			    iptr->isn_arg.outer.outer_depth,
+			    iptr->isn_arg.outer.outer_idx + STACK_FRAME_SIZE);
 		else
-		    smsg("%4d STORE%s $%lld", current, add,
-					    (long long)(iptr->isn_arg.number));
+		    smsg("%4d STOREOUTER level %d $%d", current,
+			    iptr->isn_arg.outer.outer_depth,
+			    iptr->isn_arg.outer.outer_idx);
 		}
 		break;
 	    case ISN_STOREV:
 		smsg("%4d STOREV v:%s", current,
 				       get_vim_var_name(iptr->isn_arg.number));
 		break;
+	    case ISN_STOREAUTO:
+		smsg("%4d STOREAUTO %s", current, iptr->isn_arg.string);
+		break;
 	    case ISN_STOREG:
 		smsg("%4d STOREG %s", current, iptr->isn_arg.string);
 		break;
@@ -3150,14 +3942,14 @@
 		break;
 	    case ISN_STORESCRIPT:
 		{
-		    scriptitem_T *si =
-				  SCRIPT_ITEM(iptr->isn_arg.script.script_sid);
+		    scriptref_T	*sref = iptr->isn_arg.script.scriptref;
+		    scriptitem_T *si = SCRIPT_ITEM(sref->sref_sid);
 		    svar_T *sv = ((svar_T *)si->sn_var_vals.ga_data)
-					     + iptr->isn_arg.script.script_idx;
+							      + sref->sref_idx;
 
 		    smsg("%4d STORESCRIPT %s-%d in %s", current,
 					     sv->sv_name,
-					     iptr->isn_arg.script.script_idx,
+					     sref->sref_idx,
 					     si->sn_name);
 		}
 		break;
@@ -3177,18 +3969,26 @@
 				iptr->isn_arg.storenr.stnr_idx);
 		break;
 
-	    case ISN_STORELIST:
-		smsg("%4d STORELIST", current);
-		break;
-
-	    case ISN_STOREDICT:
-		smsg("%4d STOREDICT", current);
+	    case ISN_STOREINDEX:
+		switch (iptr->isn_arg.vartype)
+		{
+		    case VAR_LIST:
+			    smsg("%4d STORELIST", current);
+			    break;
+		    case VAR_DICT:
+			    smsg("%4d STOREDICT", current);
+			    break;
+		    case VAR_ANY:
+			    smsg("%4d STOREINDEX", current);
+			    break;
+		    default: break;
+		}
 		break;
 
 	    // constants
 	    case ISN_PUSHNR:
 		smsg("%4d PUSHNR %lld", current,
-					    (long long)(iptr->isn_arg.number));
+					    (varnumber_T)(iptr->isn_arg.number));
 		break;
 	    case ISN_PUSHBOOL:
 	    case ISN_PUSHSPEC:
@@ -3258,16 +4058,19 @@
 			iptr->isn_arg.unlet.ul_forceit ? "!" : "",
 			iptr->isn_arg.unlet.ul_name);
 		break;
+	    case ISN_UNLETINDEX:
+		smsg("%4d UNLETINDEX", current);
+		break;
 	    case ISN_LOCKCONST:
 		smsg("%4d LOCKCONST", current);
 		break;
 	    case ISN_NEWLIST:
 		smsg("%4d NEWLIST size %lld", current,
-					    (long long)(iptr->isn_arg.number));
+					    (varnumber_T)(iptr->isn_arg.number));
 		break;
 	    case ISN_NEWDICT:
 		smsg("%4d NEWDICT size %lld", current,
-					    (long long)(iptr->isn_arg.number));
+					    (varnumber_T)(iptr->isn_arg.number));
 		break;
 
 	    // function call
@@ -3314,6 +4117,9 @@
 	    case ISN_RETURN:
 		smsg("%4d RETURN", current);
 		break;
+	    case ISN_RETURN_ZERO:
+		smsg("%4d RETURN 0", current);
+		break;
 	    case ISN_FUNCREF:
 		{
 		    funcref_T	*funcref = &iptr->isn_arg.funcref;
@@ -3333,6 +4139,15 @@
 		}
 		break;
 
+	    case ISN_DEF:
+		{
+		    char_u *name = iptr->isn_arg.string;
+
+		    smsg("%4d DEF %s", current,
+					   name == NULL ? (char_u *)"" : name);
+		}
+		break;
+
 	    case ISN_JUMP:
 		{
 		    char *when = "?";
@@ -3497,11 +4312,18 @@
 	    case ISN_CHECKNR: smsg("%4d CHECKNR", current); break;
 	    case ISN_CHECKTYPE:
 		  {
+		      checktype_T *ct = &iptr->isn_arg.type;
 		      char *tofree;
 
-		      smsg("%4d CHECKTYPE %s stack[%d]", current,
-			      type_name(iptr->isn_arg.type.ct_type, &tofree),
-			      iptr->isn_arg.type.ct_off);
+		      if (ct->ct_arg_idx == 0)
+			  smsg("%4d CHECKTYPE %s stack[%d]", current,
+					  type_name(ct->ct_type, &tofree),
+					  (int)ct->ct_off);
+		      else
+			  smsg("%4d CHECKTYPE %s stack[%d] arg %d", current,
+					  type_name(ct->ct_type, &tofree),
+					  (int)ct->ct_off,
+					  (int)ct->ct_arg_idx);
 		      vim_free(tofree);
 		      break;
 		  }
@@ -3509,6 +4331,15 @@
 				iptr->isn_arg.checklen.cl_more_OK ? ">= " : "",
 				iptr->isn_arg.checklen.cl_min_len);
 			       break;
+	    case ISN_SETTYPE:
+		  {
+		      char *tofree;
+
+		      smsg("%4d SETTYPE %s", current,
+			      type_name(iptr->isn_arg.type.ct_type, &tofree));
+		      vim_free(tofree);
+		      break;
+		  }
 	    case ISN_COND2BOOL: smsg("%4d COND2BOOL", current); break;
 	    case ISN_2BOOL: if (iptr->isn_arg.number)
 				smsg("%4d INVERT (!val)", current);
@@ -3516,13 +4347,23 @@
 				smsg("%4d 2BOOL (!!val)", current);
 			    break;
 	    case ISN_2STRING: smsg("%4d 2STRING stack[%lld]", current,
-					 (long long)(iptr->isn_arg.number));
+					 (varnumber_T)(iptr->isn_arg.number));
 			      break;
 	    case ISN_2STRING_ANY: smsg("%4d 2STRING_ANY stack[%lld]", current,
-					 (long long)(iptr->isn_arg.number));
+					 (varnumber_T)(iptr->isn_arg.number));
 			      break;
+	    case ISN_RANGE: smsg("%4d RANGE %s", current, iptr->isn_arg.string);
+			    break;
 	    case ISN_PUT:
-		smsg("%4d PUT %c %ld", current, iptr->isn_arg.put.put_regname,
+	        if (iptr->isn_arg.put.put_lnum == LNUM_VARIABLE_RANGE_ABOVE)
+		    smsg("%4d PUT %c above range",
+				       current, iptr->isn_arg.put.put_regname);
+		else if (iptr->isn_arg.put.put_lnum == LNUM_VARIABLE_RANGE)
+		    smsg("%4d PUT %c range",
+				       current, iptr->isn_arg.put.put_regname);
+		else
+		    smsg("%4d PUT %c %ld", current,
+						 iptr->isn_arg.put.put_regname,
 					     (long)iptr->isn_arg.put.put_lnum);
 		break;
 
@@ -3545,6 +4386,18 @@
 		}
 	    case ISN_CMDMOD_REV: smsg("%4d CMDMOD_REV", current); break;
 
+	    case ISN_PROF_START:
+		 smsg("%4d PROFILE START line %d", current, iptr->isn_lnum);
+		 break;
+
+	    case ISN_PROF_END:
+		smsg("%4d PROFILE END", current);
+		break;
+
+	    case ISN_UNPACK: smsg("%4d UNPACK %d%s", current,
+			iptr->isn_arg.unpack.unp_count,
+			iptr->isn_arg.unpack.unp_semicolon ? " semicolon" : "");
+			      break;
 	    case ISN_SHUFFLE: smsg("%4d SHUFFLE %d up %d", current,
 					 iptr->isn_arg.shuffle.shfl_item,
 					 iptr->isn_arg.shuffle.shfl_up);
@@ -3612,6 +4465,15 @@
     return FALSE;
 }
 
+    void
+emsg_using_string_as(typval_T *tv, int as_number)
+{
+    semsg(_(as_number ? e_using_string_as_number_str
+						 : e_using_string_as_bool_str),
+		       tv->vval.v_string == NULL
+					   ? (char_u *)"" : tv->vval.v_string);
+}
+
 /*
  * If "tv" is a string give an error and return FAIL.
  */
@@ -3620,7 +4482,7 @@
 {
     if (tv->v_type == VAR_STRING)
     {
-	emsg(_(e_using_string_as_number));
+	emsg_using_string_as(tv, TRUE);
 	clear_tv(tv);
 	return FAIL;
     }
diff -Nru vim-8.2.1913/src/vim9.h vim-8.2.2434/src/vim9.h
--- vim-8.2.1913/src/vim9.h	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/vim9.h	2021-01-30 22:05:11.000000000 +0000
@@ -18,11 +18,13 @@
     ISN_EXECUTE,    // execute Ex commands isn_arg.number items on top of stack
     ISN_ECHOMSG,    // echo Ex commands isn_arg.number items on top of stack
     ISN_ECHOERR,    // echo Ex commands isn_arg.number items on top of stack
+    ISN_RANGE,	    // compute range from isn_arg.string, push to stack
 
     // get and set variables
     ISN_LOAD,	    // push local variable isn_arg.number
     ISN_LOADV,	    // push v: variable isn_arg.number
     ISN_LOADG,	    // push g: variable isn_arg.string
+    ISN_LOADAUTO,   // push g: autoload variable isn_arg.string
     ISN_LOADB,	    // push b: variable isn_arg.string
     ISN_LOADW,	    // push w: variable isn_arg.string
     ISN_LOADT,	    // push t: variable isn_arg.string
@@ -31,7 +33,7 @@
     ISN_LOADWDICT,  // push w: dict
     ISN_LOADTDICT,  // push t: dict
     ISN_LOADS,	    // push s: variable isn_arg.loadstore
-    ISN_LOADOUTER,  // push variable from outer scope isn_arg.number
+    ISN_LOADOUTER,  // push variable from outer scope isn_arg.outer
     ISN_LOADSCRIPT, // push script-local variable isn_arg.script.
     ISN_LOADOPT,    // push option isn_arg.string
     ISN_LOADENV,    // push environment variable isn_arg.string
@@ -40,11 +42,12 @@
     ISN_STORE,	    // pop into local variable isn_arg.number
     ISN_STOREV,	    // pop into v: variable isn_arg.number
     ISN_STOREG,	    // pop into global variable isn_arg.string
+    ISN_STOREAUTO,  // pop into global autoload variable isn_arg.string
     ISN_STOREB,	    // pop into buffer-local variable isn_arg.string
     ISN_STOREW,	    // pop into window-local variable isn_arg.string
     ISN_STORET,	    // pop into tab-local variable isn_arg.string
     ISN_STORES,	    // pop into script variable isn_arg.loadstore
-    ISN_STOREOUTER,  // pop variable into outer scope isn_arg.number
+    ISN_STOREOUTER,  // pop variable into outer scope isn_arg.outer
     ISN_STORESCRIPT, // pop into script variable isn_arg.script
     ISN_STOREOPT,    // pop into option isn_arg.string
     ISN_STOREENV,    // pop into environment variable isn_arg.string
@@ -52,11 +55,12 @@
     // ISN_STOREOTHER, // pop into other script variable isn_arg.other.
 
     ISN_STORENR,    // store number into local variable isn_arg.storenr.stnr_idx
-    ISN_STORELIST,	// store into list, value/index/varable on stack
-    ISN_STOREDICT,	// store into dictionary, value/index/variable on stack
+    ISN_STOREINDEX,	// store into list or dictionary, type isn_arg.vartype,
+			// value/index/variable on stack
 
     ISN_UNLET,		// unlet variable isn_arg.unlet.ul_name
     ISN_UNLETENV,	// unlet environment variable isn_arg.unlet.ul_name
+    ISN_UNLETINDEX,	// unlet item of list or dict
 
     ISN_LOCKCONST,	// lock constant value
 
@@ -80,8 +84,10 @@
     ISN_PCALL,	    // call partial, use isn_arg.pfunc
     ISN_PCALL_END,  // cleanup after ISN_PCALL with cpf_top set
     ISN_RETURN,	    // return, result is on top of stack
+    ISN_RETURN_ZERO, // Push zero, then return
     ISN_FUNCREF,    // push a function ref to dfunc isn_arg.funcref
     ISN_NEWFUNC,    // create a global function from a lambda function
+    ISN_DEF,	    // list functions
 
     // expression operations
     ISN_JUMP,	    // jump if condition is matched isn_arg.jump
@@ -99,12 +105,12 @@
     ISN_ADDLIST,    // add two lists
     ISN_ADDBLOB,    // add two blobs
 
-    // operation with two arguments; isn_arg.op.op_type is exptype_T
+    // operation with two arguments; isn_arg.op.op_type is exprtype_T
     ISN_OPNR,
     ISN_OPFLOAT,
     ISN_OPANY,
 
-    // comparative operations; isn_arg.op.op_type is exptype_T, op_ic used
+    // comparative operations; isn_arg.op.op_type is exprtype_T, op_ic used
     ISN_COMPAREBOOL,
     ISN_COMPARESPECIAL,
     ISN_COMPARENR,
@@ -137,14 +143,19 @@
     ISN_NEGATENR,   // apply "-" to number
 
     ISN_CHECKNR,    // check value can be used as a number
-    ISN_CHECKTYPE,  // check value type is isn_arg.type.tc_type
+    ISN_CHECKTYPE,  // check value type is isn_arg.type.ct_type
     ISN_CHECKLEN,   // check list length is isn_arg.checklen.cl_min_len
+    ISN_SETTYPE,    // set dict type to isn_arg.type.ct_type
 
     ISN_PUT,	    // ":put", uses isn_arg.put
 
     ISN_CMDMOD,	    // set cmdmod
     ISN_CMDMOD_REV, // undo ISN_CMDMOD
 
+    ISN_PROF_START, // start a line for profiling
+    ISN_PROF_END,   // end a line for profiling
+
+    ISN_UNPACK,	    // unpack list into items, uses isn_arg.unpack
     ISN_SHUFFLE,    // move item on stack up or down
     ISN_DROP	    // pop stack and discard value
 } isntype_T;
@@ -209,14 +220,15 @@
 
 // arguments to ISN_OPNR, ISN_OPFLOAT, etc.
 typedef struct {
-    exptype_T	op_type;
+    exprtype_T	op_type;
     int		op_ic;	    // TRUE with '#', FALSE with '?', else MAYBE
 } opexpr_T;
 
 // arguments to ISN_CHECKTYPE
 typedef struct {
     type_T	*ct_type;
-    int		ct_off;	    // offset in stack, -1 is bottom
+    int8_T	ct_off;		// offset in stack, -1 is bottom
+    int8_T	ct_arg_idx;	// argument index or zero
 } checktype_T;
 
 // arguments to ISN_STORENR
@@ -239,8 +251,14 @@
 
 // arguments to ISN_LOADSCRIPT and ISN_STORESCRIPT
 typedef struct {
-    int		script_sid;	// script ID
-    int		script_idx;	// index in sn_var_vals
+    int		sref_sid;	// script ID
+    int		sref_idx;	// index in sn_var_vals
+    int		sref_seq;	// sn_script_seq when compiled
+    type_T	*sref_type;	// type of the variable when compiled
+} scriptref_T;
+
+typedef struct {
+    scriptref_T	*scriptref;
 } script_T;
 
 // arguments to ISN_UNLET
@@ -283,6 +301,18 @@
     cmdmod_T	*cf_cmdmod;	// allocated
 } cmod_T;
 
+// arguments to ISN_UNPACK
+typedef struct {
+    int		unp_count;	// number of items to produce
+    int		unp_semicolon;	// last item gets list of remainder
+} unpack_T;
+
+// arguments to ISN_LOADOUTER and ISN_STOREOUTER
+typedef struct {
+    int		outer_idx;	// index
+    int		outer_depth;	// nesting level, stack frames to go up
+} isn_outer_T;
+
 /*
  * Instruction
  */
@@ -293,6 +323,7 @@
 	char_u		    *string;
 	varnumber_T	    number;
 	blob_T		    *blob;
+	vartype_T	    vartype;
 #ifdef FEAT_FLOAT
 	float_T		    fnumber;
 #endif
@@ -320,6 +351,8 @@
 	shuffle_T	    shuffle;
 	put_T		    put;
 	cmod_T		    cmdmod;
+	unpack_T	    unpack;
+	isn_outer_T	    outer;
     } isn_arg;
 };
 
@@ -328,12 +361,22 @@
  */
 struct dfunc_S {
     ufunc_T	*df_ufunc;	    // struct containing most stuff
+    int		df_refcount;	    // how many ufunc_T point to this dfunc_T
     int		df_idx;		    // index in def_functions
     int		df_deleted;	    // if TRUE function was deleted
+    char_u	*df_name;	    // name used for error messages
+    int		df_script_seq;	    // Value of sctx_T sc_seq when the function
+				    // was compiled.
 
     garray_T	df_def_args_isn;    // default argument instructions
+
+    // After compiling "df_instr" and/or "df_instr_prof" is not NULL.
     isn_T	*df_instr;	    // function body to be executed
-    int		df_instr_count;
+    int		df_instr_count;	    // size of "df_instr"
+#ifdef FEAT_PROFILE
+    isn_T	*df_instr_prof;	     // like "df_instr" with profiling
+    int		df_instr_prof_count; // size of "df_instr_prof"
+#endif
 
     int		df_varcount;	    // number of local variables
     int		df_has_closure;	    // one if a closure was created
@@ -342,10 +385,13 @@
 // Number of entries used by stack frame for a function call.
 // - ec_dfunc_idx:   function index
 // - ec_iidx:        instruction index
-// - ec_outer_stack: stack used for closures  TODO: can we avoid this?
-// - ec_outer_frame: stack frame for closures
+// - ec_outer:	     stack used for closures
 // - ec_frame_idx:   previous frame index
-#define STACK_FRAME_SIZE 5
+#define STACK_FRAME_FUNC_OFF 0
+#define STACK_FRAME_IIDX_OFF 1
+#define STACK_FRAME_OUTER_OFF 2
+#define STACK_FRAME_IDX_OFF 3
+#define STACK_FRAME_SIZE 4
 
 
 #ifdef DEFINE_VIM9_GLOBALS
@@ -357,3 +403,18 @@
 extern garray_T def_functions;
 #endif
 
+// Used for "lnum" when a range is to be taken from the stack.
+#define LNUM_VARIABLE_RANGE -999
+
+// Used for "lnum" when a range is to be taken from the stack and "!" is used.
+#define LNUM_VARIABLE_RANGE_ABOVE -888
+
+#ifdef FEAT_PROFILE
+# define PROFILING(ufunc) (do_profiling == PROF_YES && (ufunc)->uf_profiling)
+# define INSTRUCTIONS(dfunc) \
+	((do_profiling == PROF_YES && (dfunc->df_ufunc)->uf_profiling) \
+	? (dfunc)->df_instr_prof : (dfunc)->df_instr)
+#else
+# define PROFILING(ufunc) FALSE
+# define INSTRUCTIONS(dfunc) ((dfunc)->df_instr)
+#endif
diff -Nru vim-8.2.1913/src/vim9script.c vim-8.2.2434/src/vim9script.c
--- vim-8.2.1913/src/vim9script.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/vim9script.c	2021-01-30 22:05:11.000000000 +0000
@@ -13,9 +13,9 @@
 
 #include "vim.h"
 
-#if defined(FEAT_EVAL) || defined(PROTO)
-
-#include "vim9.h"
+#if defined(FEAT_EVAL)
+# include "vim9.h"
+#endif
 
     int
 in_vim9script(void)
@@ -30,8 +30,10 @@
  * ":vim9script".
  */
     void
-ex_vim9script(exarg_T *eap)
+ex_vim9script(exarg_T *eap UNUSED)
 {
+#ifdef FEAT_EVAL
+    int		    sid = current_sctx.sc_sid;
     scriptitem_T    *si;
 
     if (!getline_equal(eap->getline, eap->cookie, getsourceline))
@@ -39,21 +41,45 @@
 	emsg(_(e_vim9script_can_only_be_used_in_script));
 	return;
     }
-    si = SCRIPT_ITEM(current_sctx.sc_sid);
-    if (si->sn_had_command)
+
+    si = SCRIPT_ITEM(sid);
+    if (si->sn_state == SN_STATE_HAD_COMMAND)
     {
 	emsg(_(e_vim9script_must_be_first_command_in_script));
 	return;
     }
+    if (!IS_WHITE_OR_NUL(*eap->arg) && STRCMP(eap->arg, "noclear") != 0)
+    {
+	semsg(_(e_invarg2), eap->arg);
+	return;
+    }
+    if (si->sn_state == SN_STATE_RELOAD && IS_WHITE_OR_NUL(*eap->arg))
+    {
+	hashtab_T	*ht = &SCRIPT_VARS(sid);
+
+	// Reloading a script without the "noclear" argument: clear
+	// script-local variables and functions.
+	hashtab_free_contents(ht);
+	hash_init(ht);
+	delete_script_functions(sid);
+
+	// old imports and script variables are no longer valid
+	free_imports_and_script_vars(sid);
+    }
+    si->sn_state = SN_STATE_HAD_COMMAND;
+
     current_sctx.sc_version = SCRIPT_VERSION_VIM9;
     si->sn_version = SCRIPT_VERSION_VIM9;
-    si->sn_had_command = TRUE;
 
     if (STRCMP(p_cpo, CPO_VIM) != 0)
     {
 	si->sn_save_cpo = vim_strsave(p_cpo);
 	set_option_value((char_u *)"cpo", 0L, (char_u *)CPO_VIM, 0);
     }
+#else
+    // No check for this being the first command, it doesn't matter.
+    current_sctx.sc_version = SCRIPT_VERSION_VIM9;
+#endif
 }
 
 /*
@@ -70,7 +96,7 @@
 	    case CMD_insert:
 	    case CMD_t:
 	    case CMD_xit:
-		semsg(_(e_missing_let_str), eap->cmd);
+		semsg(_(e_command_not_supported_in_vim9_script_missing_var_str), eap->cmd);
 		return FAIL;
 	    default: break;
 	}
@@ -78,6 +104,17 @@
 }
 
 /*
+ * Return TRUE if "p" points at a "#".  Does not check for white space.
+ */
+    int
+vim9_comment_start(char_u *p)
+{
+    return p[0] == '#';
+}
+
+#if defined(FEAT_EVAL) || defined(PROTO)
+
+/*
  * ":export let Name: type"
  * ":export const Name: type"
  * ":export def Name(..."
@@ -153,6 +190,24 @@
 }
 
 /*
+ * Mark all imports as possible to redefine.  Used when a script is loaded
+ * again but not cleared.
+ */
+    void
+mark_imports_for_reload(int sid)
+{
+    scriptitem_T    *si = SCRIPT_ITEM(sid);
+    int		    idx;
+
+    for (idx = 0; idx < si->sn_imports.ga_len; ++idx)
+    {
+	imported_T *imp = ((imported_T *)si->sn_imports.ga_data) + idx;
+
+	imp->imp_flags |= IMP_FLAGS_RELOAD;
+    }
+}
+
+/*
  * ":import Item from 'filename'"
  * ":import Item as Alias from 'filename'"
  * ":import {Item} from 'filename'".
@@ -202,7 +257,7 @@
 
     // find name in "script"
     // TODO: also find script-local user function
-    idx = get_script_item_idx(sid, name, FALSE, cctx);
+    idx = get_script_item_idx(sid, name, 0, cctx);
     if (idx >= 0)
     {
 	sv = ((svar_T *)script->sn_var_vals.ga_data) + idx;
@@ -438,15 +493,29 @@
 
     if (*arg_start == '*')
     {
-	imported_T *imported = new_imported(gap != NULL ? gap
-					: &SCRIPT_ITEM(import_sid)->sn_imports);
+	imported_T *imported;
 
+	imported = find_imported(as_name, STRLEN(as_name), cctx);
+	if (imported != NULL && imported->imp_sid == sid)
+	{
+	    if (imported->imp_flags & IMP_FLAGS_RELOAD)
+		// import already defined on a previous script load
+		imported->imp_flags &= ~IMP_FLAGS_RELOAD;
+	    else
+	    {
+		semsg(_(e_name_already_defined_str), as_name);
+		goto erret;
+	    }
+	}
+
+	imported = new_imported(gap != NULL ? gap
+					: &SCRIPT_ITEM(import_sid)->sn_imports);
 	if (imported == NULL)
 	    goto erret;
 	imported->imp_name = as_name;
 	as_name = NULL;
 	imported->imp_sid = sid;
-	imported->imp_all = TRUE;
+	imported->imp_flags = IMP_FLAGS_STAR;
     }
     else
     {
@@ -458,6 +527,7 @@
 	for (i = 0; i < names.ga_len; ++i)
 	{
 	    char_u	*name = ((char_u **)names.ga_data)[i];
+	    size_t	len = STRLEN(name);
 	    int		idx;
 	    imported_T	*imported;
 	    ufunc_T	*ufunc = NULL;
@@ -468,28 +538,47 @@
 	    if (idx < 0 && ufunc == NULL)
 		goto erret;
 
-	    if (check_defined(name, STRLEN(name), cctx) == FAIL)
-		goto erret;
-
-	    imported = new_imported(gap != NULL ? gap
-				       : &SCRIPT_ITEM(import_sid)->sn_imports);
-	    if (imported == NULL)
-		goto erret;
-
-	    // TODO: check for "as" following
-	    // imported->imp_name = vim_strsave(as_name);
-	    imported->imp_name = name;
-	    ((char_u **)names.ga_data)[i] = NULL;
-	    imported->imp_sid = sid;
-	    if (idx >= 0)
+	    // If already imported with the same propertis and the
+	    // IMP_FLAGS_RELOAD set then we keep that entry.  Otherwise create
+	    // a new one (and give an error for an existing import).
+	    imported = find_imported(name, len, cctx);
+	    if (imported != NULL
+		    && (imported->imp_flags & IMP_FLAGS_RELOAD)
+		    && imported->imp_sid == sid
+		    && (idx >= 0
+			? (equal_type(imported->imp_type, type)
+			    && imported->imp_var_vals_idx == idx)
+			: (equal_type(imported->imp_type, ufunc->uf_func_type)
+			    && STRCMP(imported->imp_funcname,
+							ufunc->uf_name) == 0)))
 	    {
-		imported->imp_type = type;
-		imported->imp_var_vals_idx = idx;
+		imported->imp_flags &= ~IMP_FLAGS_RELOAD;
 	    }
 	    else
 	    {
-		imported->imp_type = ufunc->uf_func_type;
-		imported->imp_funcname = ufunc->uf_name;
+		if (check_defined(name, len, cctx) == FAIL)
+		    goto erret;
+
+		imported = new_imported(gap != NULL ? gap
+				       : &SCRIPT_ITEM(import_sid)->sn_imports);
+		if (imported == NULL)
+		    goto erret;
+
+		// TODO: check for "as" following
+		// imported->imp_name = vim_strsave(as_name);
+		imported->imp_name = name;
+		((char_u **)names.ga_data)[i] = NULL;
+		imported->imp_sid = sid;
+		if (idx >= 0)
+		{
+		    imported->imp_type = type;
+		    imported->imp_var_vals_idx = idx;
+		}
+		else
+		{
+		    imported->imp_type = ufunc->uf_func_type;
+		    imported->imp_funcname = ufunc->uf_name;
+		}
 	    }
 	}
     }
@@ -511,7 +600,6 @@
     char_u	    *name;
     scriptitem_T    *si = SCRIPT_ITEM(current_sctx.sc_sid);
     type_T	    *type;
-    int		    called_emsg_before = called_emsg;
     typval_T	    init_tv;
 
     if (eap->cmdidx == CMD_final || eap->cmdidx == CMD_const)
@@ -548,8 +636,8 @@
 
     // parse type
     p = skipwhite(p + 1);
-    type = parse_type(&p, &si->sn_type_list);
-    if (called_emsg != called_emsg_before)
+    type = parse_type(&p, &si->sn_type_list, TRUE);
+    if (type == NULL)
     {
 	vim_free(name);
 	return p;
@@ -571,36 +659,44 @@
 /*
  * Vim9 part of adding a script variable: add it to sn_all_vars (lookup by name
  * with a hashtable) and sn_var_vals (lookup by index).
- * When "type" is NULL use "tv" for the type.
+ * When "create" is TRUE this is a new variable, otherwise find and update an
+ * existing variable.
+ * "flags" can have ASSIGN_FINAL or ASSIGN_CONST.
+ * When "*type" is NULL use "tv" for the type and update "*type".
  */
     void
-add_vim9_script_var(dictitem_T *di, typval_T *tv, type_T *type)
+update_vim9_script_var(
+	int	    create,
+	dictitem_T  *di,
+	int	    flags,
+	typval_T    *tv,
+	type_T	    **type)
 {
-    scriptitem_T *si = SCRIPT_ITEM(current_sctx.sc_sid);
+    scriptitem_T    *si = SCRIPT_ITEM(current_sctx.sc_sid);
+    hashitem_T	    *hi;
+    svar_T	    *sv;
 
-    // Store a pointer to the typval_T, so that it can be found by
-    // index instead of using a hastab lookup.
-    if (ga_grow(&si->sn_var_vals, 1) == OK)
-    {
-	svar_T *sv = ((svar_T *)si->sn_var_vals.ga_data)
-						      + si->sn_var_vals.ga_len;
-	hashitem_T *hi;
-	sallvar_T *newsav = (sallvar_T *)alloc_clear(
-				       sizeof(sallvar_T) + STRLEN(di->di_key));
+    if (create)
+    {
+	sallvar_T	    *newsav;
+
+	// Store a pointer to the typval_T, so that it can be found by index
+	// instead of using a hastab lookup.
+	if (ga_grow(&si->sn_var_vals, 1) == FAIL)
+	    return;
 
+	sv = ((svar_T *)si->sn_var_vals.ga_data) + si->sn_var_vals.ga_len;
+	newsav = (sallvar_T *)alloc_clear(
+				       sizeof(sallvar_T) + STRLEN(di->di_key));
 	if (newsav == NULL)
 	    return;
 
 	sv->sv_tv = &di->di_tv;
-	if (type == NULL)
-	    sv->sv_type = typval2type(tv, &si->sn_type_list);
-	else
-	    sv->sv_type = type;
-	sv->sv_const = (di->di_flags & DI_FLAGS_LOCK) ? ASSIGN_CONST : 0;
+	sv->sv_const = (flags & ASSIGN_FINAL) ? ASSIGN_FINAL
+				   : (flags & ASSIGN_CONST) ? ASSIGN_CONST : 0;
 	sv->sv_export = is_export;
 	newsav->sav_var_vals_idx = si->sn_var_vals.ga_len;
 	++si->sn_var_vals.ga_len;
-
 	STRCPY(&newsav->sav_key, di->di_key);
 	sv->sv_name = newsav->sav_key;
 	newsav->sav_di = di;
@@ -619,10 +715,20 @@
 	else
 	    // new variable name
 	    hash_add(&si->sn_all_vars.dv_hashtab, newsav->sav_key);
-
-	// let ex_export() know the export worked.
-	is_export = FALSE;
     }
+    else
+    {
+	sv = find_typval_in_script(&di->di_tv);
+    }
+    if (sv != NULL)
+    {
+	if (*type == NULL)
+	    *type = typval2type(tv, &si->sn_type_list);
+	sv->sv_type = *type;
+    }
+
+    // let ex_export() know the export worked.
+    is_export = FALSE;
 }
 
 /*
@@ -720,6 +826,9 @@
     hash_init(ht);
 
     ga_clear(&si->sn_var_vals);
+
+    // existing commands using script variable indexes are no longer valid
+    si->sn_script_seq = current_sctx.sc_seq;
 }
 
 /*
@@ -741,7 +850,9 @@
     {
 	svar_T    *sv = ((svar_T *)si->sn_var_vals.ga_data) + idx;
 
-	if (sv->sv_tv == dest)
+	// If "sv_name" is NULL the variable was hidden when leaving a block,
+	// don't check "sv_tv" then, it might be used for another variable now.
+	if (sv->sv_name != NULL && sv->sv_tv == dest)
 	    return sv;
     }
     iemsg("check_script_var_type(): not found");
@@ -760,7 +871,7 @@
 
     if (sv != NULL)
     {
-	if (sv->sv_const)
+	if (sv->sv_const != 0)
 	{
 	    semsg(_(e_readonlyvar), name);
 	    return FAIL;
diff -Nru vim-8.2.1913/src/vim9type.c vim-8.2.2434/src/vim9type.c
--- vim-8.2.1913/src/vim9type.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/vim9type.c	2021-01-30 22:05:11.000000000 +0000
@@ -108,7 +108,7 @@
     type_T *type;
 
     // recognize commonly used types
-    if (member_type->tt_type == VAR_ANY)
+    if (member_type == NULL || member_type->tt_type == VAR_ANY)
 	return &t_list_any;
     if (member_type->tt_type == VAR_VOID
 	    || member_type->tt_type == VAR_UNKNOWN)
@@ -137,7 +137,7 @@
     type_T *type;
 
     // recognize commonly used types
-    if (member_type->tt_type == VAR_ANY)
+    if (member_type == NULL || member_type->tt_type == VAR_ANY)
 	return &t_dict_any;
     if (member_type->tt_type == VAR_VOID
 	    || member_type->tt_type == VAR_UNKNOWN)
@@ -336,8 +336,11 @@
 	    // May need to get the argument types from default values by
 	    // compiling the function.
 	    if (ufunc->uf_def_status == UF_TO_BE_COMPILED
-			    && compile_def_function(ufunc, TRUE, NULL) == FAIL)
+			    && compile_def_function(ufunc, TRUE, FALSE, NULL)
+								       == FAIL)
 		return NULL;
+	    if (ufunc->uf_func_type == NULL)
+		set_function_type(ufunc);
 	    if (ufunc->uf_func_type != NULL)
 		return ufunc->uf_func_type;
 	}
@@ -376,18 +379,9 @@
     if (type != NULL && type != &t_bool
 	    && (tv->v_type == VAR_NUMBER
 		    && (tv->vval.v_number == 0 || tv->vval.v_number == 1)))
-    {
-	type_T *newtype = get_type_ptr(type_gap);
-
-	// Number 0 and 1 and expression with "&&" or "||" can also be used
-	// for bool.
-	if (newtype != NULL)
-	{
-	    *newtype = *type;
-	    newtype->tt_flags = TTFLAG_BOOL_OK;
-	    type = newtype;
-	}
-    }
+	// Number 0 and 1 and expression with "&&" or "||" can also be used for
+	// bool.
+	type = &t_number_bool;
     return type;
 }
 
@@ -408,6 +402,7 @@
 
 /*
  * Return FAIL if "expected" and "actual" don't match.
+ * When "argidx" > 0 it is included in the error message.
  */
     int
 check_typval_type(type_T *expected, typval_T *actual_tv, int argidx)
@@ -486,15 +481,19 @@
 	}
 	else if (expected->tt_type == VAR_FUNC)
 	{
-	    if (expected->tt_member != &t_unknown)
+	    // If the return type is unknown it can be anything, including
+	    // nothing, thus there is no point in checking.
+	    if (expected->tt_member != &t_unknown
+					    && actual->tt_member != &t_unknown)
 		ret = check_type(expected->tt_member, actual->tt_member,
 								     FALSE, 0);
 	    if (ret == OK && expected->tt_argcount != -1
 		    && actual->tt_argcount != -1
 		    && (actual->tt_argcount < expected->tt_min_argcount
 			|| actual->tt_argcount > expected->tt_argcount))
-		    ret = FAIL;
-	    if (expected->tt_args != NULL && actual->tt_args != NULL)
+		ret = FAIL;
+	    if (ret == OK && expected->tt_args != NULL
+						    && actual->tt_args != NULL)
 	    {
 		int i;
 
@@ -516,6 +515,50 @@
 }
 
 /*
+ * Check that the arguments of "type" match "argvars[argcount]".
+ * Return OK/FAIL.
+ */
+    int
+check_argument_types(
+	type_T	    *type,
+	typval_T    *argvars,
+	int	    argcount,
+	char_u	    *name)
+{
+    int	    varargs = (type->tt_flags & TTFLAG_VARARGS) ? 1 : 0;
+    int	    i;
+
+    if (type->tt_type != VAR_FUNC && type->tt_type != VAR_PARTIAL)
+	return OK;  // just in case
+    if (argcount < type->tt_min_argcount - varargs)
+    {
+	semsg(_(e_toofewarg), name);
+	return FAIL;
+    }
+    if (!varargs && type->tt_argcount >= 0 && argcount > type->tt_argcount)
+    {
+	semsg(_(e_toomanyarg), name);
+	return FAIL;
+    }
+    if (type->tt_args == NULL)
+	return OK;  // cannot check
+
+
+    for (i = 0; i < argcount; ++i)
+    {
+	type_T	*expected;
+
+	if (varargs && i >= type->tt_argcount - 1)
+	    expected = type->tt_args[type->tt_argcount - 1]->tt_member;
+	else
+	    expected = type->tt_args[i];
+	if (check_typval_type(expected, &argvars[i], i + 1) == FAIL)
+	    return FAIL;
+    }
+    return OK;
+}
+
+/*
  * Skip over a type definition and return a pointer to just after it.
  * When "optional" is TRUE then a leading "?" is accepted.
  */
@@ -581,28 +624,38 @@
  * Returns NULL in case of failure.
  */
     static type_T *
-parse_type_member(char_u **arg, type_T *type, garray_T *type_gap)
+parse_type_member(
+	char_u	    **arg,
+	type_T	    *type,
+	garray_T    *type_gap,
+	int	    give_error)
 {
     type_T  *member_type;
     int	    prev_called_emsg = called_emsg;
 
     if (**arg != '<')
     {
-	if (*skipwhite(*arg) == '<')
-	    semsg(_(e_no_white_space_allowed_before_str), "<");
-	else
-	    emsg(_(e_missing_type));
-	return type;
+	if (give_error)
+	{
+	    if (*skipwhite(*arg) == '<')
+		semsg(_(e_no_white_space_allowed_before_str), "<");
+	    else
+		emsg(_(e_missing_type));
+	}
+	return NULL;
     }
     *arg = skipwhite(*arg + 1);
 
-    member_type = parse_type(arg, type_gap);
+    member_type = parse_type(arg, type_gap, give_error);
+    if (member_type == NULL)
+	return NULL;
 
     *arg = skipwhite(*arg);
     if (**arg != '>' && called_emsg == prev_called_emsg)
     {
-	emsg(_(e_missing_gt_after_type));
-	return type;
+	if (give_error)
+	    emsg(_(e_missing_gt_after_type));
+	return NULL;
     }
     ++*arg;
 
@@ -613,10 +666,11 @@
 
 /*
  * Parse a type at "arg" and advance over it.
- * Return &t_any for failure.
+ * When "give_error" is TRUE give error messages, otherwise be quiet.
+ * Return NULL for failure.
  */
     type_T *
-parse_type(char_u **arg, garray_T *type_gap)
+parse_type(char_u **arg, garray_T *type_gap, int give_error)
 {
     char_u  *p = *arg;
     size_t  len;
@@ -658,7 +712,8 @@
 	    if (len == 4 && STRNCMP(*arg, "dict", len) == 0)
 	    {
 		*arg += len;
-		return parse_type_member(arg, &t_dict_any, type_gap);
+		return parse_type_member(arg, &t_dict_any,
+							 type_gap, give_error);
 	    }
 	    break;
 	case 'f':
@@ -668,8 +723,9 @@
 		*arg += len;
 		return &t_float;
 #else
-		emsg(_(e_this_vim_is_not_compiled_with_float_support));
-		return &t_any;
+		if (give_error)
+		    emsg(_(e_this_vim_is_not_compiled_with_float_support));
+		return NULL;
 #endif
 	    }
 	    if (len == 4 && STRNCMP(*arg, "func", len) == 0)
@@ -706,11 +762,15 @@
 			}
 			else if (first_optional != -1)
 			{
-			    emsg(_(e_mandatory_argument_after_optional_argument));
-			    return &t_any;
+			    if (give_error)
+				emsg(_(e_mandatory_argument_after_optional_argument));
+			    return NULL;
 			}
 
-			arg_type[argcount++] = parse_type(&p, type_gap);
+			type = parse_type(&p, type_gap, give_error);
+			if (type == NULL)
+			    return NULL;
+			arg_type[argcount++] = type;
 
 			// Nothing comes after "...{type}".
 			if (flags & TTFLAG_VARARGS)
@@ -718,31 +778,35 @@
 
 			if (*p != ',' && *skipwhite(p) == ',')
 			{
-			    semsg(_(e_no_white_space_allowed_before_str), ",");
-			    return &t_any;
+			    if (give_error)
+				semsg(_(e_no_white_space_allowed_before_str), ",");
+			    return NULL;
 			}
 			if (*p == ',')
 			{
 			    ++p;
 			    if (!VIM_ISWHITE(*p))
 			    {
-				semsg(_(e_white_space_required_after_str), ",");
-				return &t_any;
+				if (give_error)
+				    semsg(_(e_white_space_required_after_str), ",");
+				return NULL;
 			    }
 			}
 			p = skipwhite(p);
 			if (argcount == MAX_FUNC_ARGS)
 			{
-			    emsg(_(e_too_many_argument_types));
-			    return &t_any;
+			    if (give_error)
+				emsg(_(e_too_many_argument_types));
+			    return NULL;
 			}
 		    }
 
 		    p = skipwhite(p);
 		    if (*p != ')')
 		    {
-			emsg(_(e_missing_close));
-			return &t_any;
+			if (give_error)
+			    emsg(_(e_missing_close));
+			return NULL;
 		    }
 		    *arg = p + 1;
 		}
@@ -750,10 +814,12 @@
 		{
 		    // parse return type
 		    ++*arg;
-		    if (!VIM_ISWHITE(**arg))
+		    if (!VIM_ISWHITE(**arg) && give_error)
 			semsg(_(e_white_space_required_after_str), ":");
 		    *arg = skipwhite(*arg);
-		    ret_type = parse_type(arg, type_gap);
+		    ret_type = parse_type(arg, type_gap, give_error);
+		    if (ret_type == NULL)
+			return NULL;
 		}
 		if (flags == 0 && first_optional == -1 && argcount <= 0)
 		    type = get_func_type(ret_type, argcount, type_gap);
@@ -768,7 +834,7 @@
 						   ? argcount : first_optional;
 			if (func_type_add_arg_types(type, argcount,
 							     type_gap) == FAIL)
-			    return &t_any;
+			    return NULL;
 			mch_memmove(type->tt_args, arg_type,
 						  sizeof(type_T *) * argcount);
 		    }
@@ -787,7 +853,8 @@
 	    if (len == 4 && STRNCMP(*arg, "list", len) == 0)
 	    {
 		*arg += len;
-		return parse_type_member(arg, &t_list_any, type_gap);
+		return parse_type_member(arg, &t_list_any,
+							 type_gap, give_error);
 	    }
 	    break;
 	case 'n':
@@ -813,14 +880,15 @@
 	    break;
     }
 
-    semsg(_(e_type_not_recognized_str), *arg);
-    return &t_any;
+    if (give_error)
+	semsg(_(e_type_not_recognized_str), *arg);
+    return NULL;
 }
 
 /*
  * Check if "type1" and "type2" are exactly the same.
  */
-    static int
+    int
 equal_type(type_T *type1, type_T *type2)
 {
     int i;
@@ -1001,9 +1069,12 @@
     char *
 type_name(type_T *type, char **tofree)
 {
-    char *name = vartype_name(type->tt_type);
+    char *name;
 
     *tofree = NULL;
+    if (type == NULL)
+	return "[unknown]";
+    name = vartype_name(type->tt_type);
     if (type->tt_type == VAR_LIST || type->tt_type == VAR_DICT)
     {
 	char *member_free;
@@ -1090,4 +1161,29 @@
     return name;
 }
 
+/*
+ * "typename(expr)" function
+ */
+    void
+f_typename(typval_T *argvars, typval_T *rettv)
+{
+    garray_T	type_list;
+    type_T	*type;
+    char	*tofree;
+    char	*name;
+
+    rettv->v_type = VAR_STRING;
+    ga_init2(&type_list, sizeof(type_T *), 10);
+    type = typval2type(argvars, &type_list);
+    name = type_name(type, &tofree);
+    if (tofree != NULL)
+	rettv->vval.v_string = (char_u *)tofree;
+    else
+    {
+	rettv->vval.v_string = vim_strsave((char_u *)name);
+	vim_free(tofree);
+    }
+    clear_type_list(&type_list);
+}
+
 #endif // FEAT_EVAL
diff -Nru vim-8.2.1913/src/vim.h vim-8.2.2434/src/vim.h
--- vim-8.2.1913/src/vim.h	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/vim.h	2021-01-30 22:05:11.000000000 +0000
@@ -1029,6 +1029,7 @@
 #define ECMD_OLDBUF	0x04	// use existing buffer if it exists
 #define ECMD_FORCEIT	0x08	// ! used in Ex command
 #define ECMD_ADDBUF	0x10	// don't edit, just add to buffer list
+#define ECMD_ALTBUF	0x20	// like ECMD_ADDBUF and set the alternate file
 
 // for lnum argument in do_ecmd()
 #define ECMD_LASTL	(linenr_T)0	// use last position in loaded file
@@ -1042,6 +1043,7 @@
 #define DOCMD_KEYTYPED	0x08	// don't reset KeyTyped
 #define DOCMD_EXCRESET	0x10	// reset exception environment (for debugging)
 #define DOCMD_KEEPLINE  0x20	// keep typed line for repeating with "."
+#define DOCMD_RANGEOK	0240	// can use a range without ":" in Vim9 script
 
 // flags for beginline()
 #define BL_WHITE	1	// cursor on first non-white in the line
@@ -1230,6 +1232,7 @@
 #define SID_ENV		-4	// for sourcing environment variable
 #define SID_ERROR	-5	// option was reset because of an error
 #define SID_NONE	-6	// don't set scriptID
+#define SID_WINLAYOUT	-7	// changing window size
 
 /*
  * Events for autocommands.
@@ -1342,6 +1345,8 @@
     EVENT_WINENTER,		// after entering a window
     EVENT_WINLEAVE,		// before leaving a window
     EVENT_WINNEW,		// when entering a new window
+    EVENT_VIMSUSPEND,		// before Vim is suspended
+    EVENT_VIMRESUME,		// after Vim is resumed
 
     NUM_EVENTS			// MUST be the last one
 };
@@ -1970,31 +1975,34 @@
 #define VV_TRUE		69
 #define VV_NONE		70
 #define VV_NULL		71
-#define VV_NUMBERSIZE	72
-#define VV_VIM_DID_ENTER 73
-#define VV_TESTING	74
-#define VV_TYPE_NUMBER	75
-#define VV_TYPE_STRING	76
-#define VV_TYPE_FUNC	77
-#define VV_TYPE_LIST	78
-#define VV_TYPE_DICT	79
-#define VV_TYPE_FLOAT	80
-#define VV_TYPE_BOOL	81
-#define VV_TYPE_NONE	82
-#define VV_TYPE_JOB	83
-#define VV_TYPE_CHANNEL	84
-#define VV_TYPE_BLOB	85
-#define VV_TERMRFGRESP	86
-#define VV_TERMRBGRESP	87
-#define VV_TERMU7RESP	88
-#define VV_TERMSTYLERESP 89
-#define VV_TERMBLINKRESP 90
-#define VV_EVENT	91
-#define VV_VERSIONLONG	92
-#define VV_ECHOSPACE	93
-#define VV_ARGV		94
-#define VV_COLLATE      95
-#define VV_LEN		96	// number of v: vars
+#define VV_NUMBERMAX	72
+#define VV_NUMBERMIN	73
+#define VV_NUMBERSIZE	74
+#define VV_VIM_DID_ENTER 75
+#define VV_TESTING	76
+#define VV_TYPE_NUMBER	77
+#define VV_TYPE_STRING	78
+#define VV_TYPE_FUNC	79
+#define VV_TYPE_LIST	80
+#define VV_TYPE_DICT	81
+#define VV_TYPE_FLOAT	82
+#define VV_TYPE_BOOL	83
+#define VV_TYPE_NONE	84
+#define VV_TYPE_JOB	85
+#define VV_TYPE_CHANNEL	86
+#define VV_TYPE_BLOB	87
+#define VV_TERMRFGRESP	88
+#define VV_TERMRBGRESP	89
+#define VV_TERMU7RESP	90
+#define VV_TERMSTYLERESP 91
+#define VV_TERMBLINKRESP 92
+#define VV_EVENT	93
+#define VV_VERSIONLONG	94
+#define VV_ECHOSPACE	95
+#define VV_ARGV		96
+#define VV_COLLATE      97
+#define VV_EXITING	98
+#define VV_LEN		99	// number of v: vars
 
 // used for v_number in VAR_BOOL and VAR_SPECIAL
 #define VVAL_FALSE	0L	// VAR_BOOL
@@ -2139,7 +2147,8 @@
 // Flags for assignment functions.
 #define ASSIGN_FINAL	1   // ":final"
 #define ASSIGN_CONST	2   // ":const"
-#define ASSIGN_NO_DECL	4   // "name = expr" without ":let" or ":const"
+#define ASSIGN_NO_DECL	4   // "name = expr" without ":let"/":const"/":final"
+#define ASSIGN_DECL	8   // may declare variable if it does not exist
 
 #include "ex_cmds.h"	    // Ex command defines
 #include "spell.h"	    // spell checking stuff
@@ -2531,16 +2540,20 @@
 #define COPYID_MASK (~0x1)
 
 // Values for trans_function_name() argument:
-#define TFN_INT		1	// internal function name OK
-#define TFN_QUIET	2	// no error messages
-#define TFN_NO_AUTOLOAD	4	// do not use script autoloading
-#define TFN_NO_DEREF	8	// do not dereference a Funcref
-#define TFN_READ_ONLY	16	// will not change the var
+#define TFN_INT		0x01	// internal function name OK
+#define TFN_QUIET	0x02	// no error messages
+#define TFN_NO_AUTOLOAD	0x04	// do not use script autoloading
+#define TFN_NO_DEREF	0x08	// do not dereference a Funcref
+#define TFN_READ_ONLY	0x10	// will not change the var
+#define TFN_NO_DECL	0x20	// only used for GLV_NO_DECL
+#define TFN_COMPILING	0x40	// only used for GLV_COMPILING
 
 // Values for get_lval() flags argument:
 #define GLV_QUIET	TFN_QUIET	// no error messages
 #define GLV_NO_AUTOLOAD	TFN_NO_AUTOLOAD	// do not use script autoloading
 #define GLV_READ_ONLY	TFN_READ_ONLY	// will not change the var
+#define GLV_NO_DECL	TFN_NO_DECL	// assignment without :var or :let
+#define GLV_COMPILING	TFN_COMPILING	// variable may be defined later
 
 #define DO_NOT_FREE_CNT 99999	// refcount for dict or list that should not
 				// be freed.
diff -Nru vim-8.2.1913/src/window.c vim-8.2.2434/src/window.c
--- vim-8.2.1913/src/window.c	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/src/window.c	2021-01-30 22:05:11.000000000 +0000
@@ -1461,6 +1461,30 @@
 }
 
 /*
+ * Find window "id" in the current tab page.
+ * Also find popup windows.
+ * Return NULL if not found.
+ */
+    win_T *
+win_find_by_id(int id)
+{
+    win_T   *wp;
+
+    FOR_ALL_WINDOWS(wp)
+	if (wp->w_id == id)
+	    return wp;
+#ifdef FEAT_PROP_POPUP
+    FOR_ALL_POPUPWINS(wp)
+	if (wp->w_id == id)
+	    return wp;
+    FOR_ALL_POPUPWINS_IN_TAB(curtab, wp)
+	if (wp->w_id == id)
+	    return wp;
+#endif
+    return NULL;
+}
+
+/*
  * Check if "win" is a pointer to an existing window in any tab page.
  */
     int
@@ -2569,7 +2593,12 @@
 
     // Now we are really going to close the window.  Disallow any autocommand
     // to split a window to avoid trouble.
+    // Also bail out of parse_queued_messages() to avoid it tries to update the
+    // screen.
     ++split_disallowed;
+#ifdef MESSAGE_QUEUE
+    ++dont_parse_messages;
+#endif
 
     // Free the memory used for the window and get the window that received
     // the screen space.
@@ -2626,6 +2655,9 @@
     }
 
     --split_disallowed;
+#ifdef MESSAGE_QUEUE
+    --dont_parse_messages;
+#endif
 
     /*
      * If last window has a status line now and we don't want one,
@@ -5655,6 +5687,8 @@
 	if (width == 0)
 	    width = 1;
     }
+    else if (width < 0)
+	width = 0;
 
     frame_setwidth(wp->w_frame, width + wp->w_vsep_width);
 
@@ -6293,9 +6327,21 @@
     void
 win_comp_scroll(win_T *wp)
 {
+#if defined(FEAT_EVAL)
+    int old_w_p_scr = wp->w_p_scr;
+#endif
+
     wp->w_p_scr = ((unsigned)wp->w_height >> 1);
     if (wp->w_p_scr == 0)
 	wp->w_p_scr = 1;
+#if defined(FEAT_EVAL)
+    if (wp->w_p_scr != old_w_p_scr)
+    {
+	// Used by "verbose set scroll".
+	wp->w_p_script_ctx[WV_SCROLL].sc_sid = SID_WINLAYOUT;
+	wp->w_p_script_ctx[WV_SCROLL].sc_lnum = 0;
+    }
+#endif
 }
 
 /*
diff -Nru vim-8.2.1913/.travis.yml vim-8.2.2434/.travis.yml
--- vim-8.2.1913/.travis.yml	2020-10-27 19:43:26.000000000 +0000
+++ vim-8.2.2434/.travis.yml	2021-01-30 22:05:11.000000000 +0000
@@ -172,56 +172,56 @@
 # Linux: 2 compilers on some of the environments + gcc on os390
 jobs:
   include:
-    - <<: *osx
-      name: tiny-nogui/clang
-      compiler: clang
-      env: *tiny-nogui
-    - <<: *osx
-      name: tiny-nogui/gcc
-      compiler: gcc
-      env: *tiny-nogui
-    - <<: *osx
-      <<: *osx-homebrew
-      name: huge/clang
-      compiler: clang
-      env: *osx-huge
-    - <<: *osx
-      <<: *osx-homebrew
-      name: huge/gcc
-      compiler: gcc
-      env: *osx-huge
-    - <<: *linux
-      name: tiny-nogui/clang
-      compiler: clang
-      env: *tiny-nogui
-    - <<: *linux
-      name: tiny-nogui/gcc
-      compiler: gcc
-      env: *tiny-nogui
-    - <<: *linux
-      name: tiny/clang
-      compiler: clang
-      env: *tiny
-    - <<: *linux
-      name: tiny/gcc
-      compiler: gcc
-      env: *tiny
-    - <<: *linux
-      name: small/gcc
-      compiler: gcc
-      env: *small
-    - <<: *linux
-      name: normal+shadow/clang
-      compiler: clang
-      env:
-        - *normal
-        - *shadowopt
-    - <<: *linux
-      name: normal+shadow/gcc
-      compiler: gcc
-      env:
-        - *normal
-        - *shadowopt
+    #- <<: *osx
+    #  name: tiny-nogui/clang
+    #  compiler: clang
+    #  env: *tiny-nogui
+    #- <<: *osx
+    #  name: tiny-nogui/gcc
+    #  compiler: gcc
+    #  env: *tiny-nogui
+    #- <<: *osx
+    #  <<: *osx-homebrew
+    #  name: huge/clang
+    #  compiler: clang
+    #  env: *osx-huge
+    #- <<: *osx
+    #  <<: *osx-homebrew
+    #  name: huge/gcc
+    #  compiler: gcc
+    #  env: *osx-huge
+    #- <<: *linux
+    #  name: tiny-nogui/clang
+    #  compiler: clang
+    #  env: *tiny-nogui
+    #- <<: *linux
+    #  name: tiny-nogui/gcc
+    #  compiler: gcc
+    #  env: *tiny-nogui
+    #- <<: *linux
+    #  name: tiny/clang
+    #  compiler: clang
+    #  env: *tiny
+    #- <<: *linux
+    #  name: tiny/gcc
+    #  compiler: gcc
+    #  env: *tiny
+    #- <<: *linux
+    #  name: small/gcc
+    #  compiler: gcc
+    #  env: *small
+    #- <<: *linux
+    #  name: normal+shadow/clang
+    #  compiler: clang
+    #  env:
+    #    - *normal
+    #    - *shadowopt
+    #- <<: *linux
+    #  name: normal+shadow/gcc
+    #  compiler: gcc
+    #  env:
+    #    - *normal
+    #    - *shadowopt
     - <<: *linux
       arch: s390x
       name: huge/gcc-s390x
@@ -234,57 +234,55 @@
       compiler: gcc
       env: *linux-huge
       services: []
-    - <<: *linux
-      name: huge+coverage/clang
-      compiler: clang
-      env:
-        - *linux-huge
-        - *coverage
-        # Clang cannot compile test_libvterm with "--coverage" flag.
-        - TEST=scripttests
-      after_success: *eval-coverage
-    - <<: *linux
-      name: huge+coverage/gcc
-      compiler: gcc
-      env:
-        - *linux-huge
-        - *coverage
-      after_success: *eval-coverage
-    - <<: *linux # ASAN
-      name: huge+asan/clang
-      compiler: clang-11
-      addons:
-        apt:
-          sources:
-            - sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-11 main'
-              key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
-          packages:
-            - *apt-packages
-            - clang-11
-      env:
-        - *linux-huge
-        - *asan
-      after_failure: *asan_symbolize
-    - <<: *linux
-      name: huge-testgui+coverage/gcc
-      compiler: gcc
-      env:
-        - *linux-huge
-        - *coverage
-        - TEST="-C src testgui"
-      after_success: *eval-coverage
-    - <<: *linux
-      name: unittests+coverage/gcc
-      compiler: gcc
-      env:
-        - *unittests
-        - *coverage
-      after_success: *eval-coverage
-    - <<: *linux
-      name: vimtags/gcc
-      compiler: gcc
-      env:
-        - *normal
-        - TEST="-C runtime/doc vimtags VIMEXE=../../${SRCDIR}/vim"
+    #- <<: *linux
+    #  name: huge+coverage/clang
+    #  compiler: clang
+    #  env:
+    #    - *linux-huge
+    #    - *coverage
+    #  after_success: *eval-coverage
+    #- <<: *linux
+    #  name: huge+coverage/gcc
+    #  compiler: gcc
+    #  env:
+    #    - *linux-huge
+    #    - *coverage
+    #  after_success: *eval-coverage
+    #- <<: *linux # ASAN
+    #  name: huge+asan/clang
+    #  compiler: clang-11
+    #  addons:
+    #    apt:
+    #      sources:
+    #        - sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-11 main'
+    #          key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
+    #      packages:
+    #        - *apt-packages
+    #        - clang-11
+    #  env:
+    #    - *linux-huge
+    #    - *asan
+    #  after_failure: *asan_symbolize
+    #- <<: *linux
+    #  name: huge-testgui+coverage/gcc
+    #  compiler: gcc
+    #  env:
+    #    - *linux-huge
+    #    - *coverage
+    #    - TEST="-C src testgui"
+    #  after_success: *eval-coverage
+    #- <<: *linux
+    #  name: unittests+coverage/gcc
+    #  compiler: gcc
+    #  env:
+    #    - *unittests
+    #    - *coverage
+    #  after_success: *eval-coverage
+    #- <<: *linux
+    #  name: vimtags/gcc
+    #  compiler: gcc
+    #  env:
+    #    - *normal
+    #    - TEST="-C runtime/doc vimtags VIMEXE=../../${SRCDIR}/vim"
 
 # vim:set sts=2 sw=2 tw=0 et: