patch 8.2.1861: Vim9: no specific error when parsing lambda fails

Problem:    Vim9: no specific error when parsing lambda fails.
Solution:   Also give syntax errors when not evaluating. (closes #7154)

.cirrus.yml

@@ -11,6 +11,9 @@ freebsd_12_task:
     - NPROC=$(getconf _NPROCESSORS_ONLN)
     - ./configure --with-features=${FEATURES}
     - make -j${NPROC}
-    - src/vim --version
   test_script:
-    - make test
+    - src/vim --version
+      # run tests as user "cirrus" instead of root
+    - pw useradd cirrus -m
+    - chown -R cirrus:cirrus .
+    - sudo -u cirrus make test

.github/CODEOWNERS

@@ -0,0 +1,154 @@
+# Lines starting with '#' are comments.
+# Each line is a file pattern followed by one or more owners.
+# You can use github users with @user or email addresses
+
+# These owners will be the default owners for everything in the repo.
+#*       @brammool
+
+# Order is important. The last matching pattern has the most precedence.
+# So if a pull request only touches javascript files, only these owners
+# will be requested to review.
+
+src/iscygpty.*				@k-takata
+src/libvterm/				@leonerd
+
+runtime/autoload/getscript.vim		@cecamp
+runtime/autoload/netrw.vim		@cecamp
+runtime/autoload/netrwFileHandlers.vim	@cecamp
+runtime/autoload/netrwSettings.vim	@cecamp
+runtime/autoload/rubycomplete.vim	@segfault @dkearns
+runtime/autoload/tar.vim		@cecamp
+runtime/autoload/vimball.vim		@cecamp
+runtime/autoload/zip.vim		@cecamp
+runtime/compiler/checkstyle.vim		@dkearns
+runtime/compiler/cucumber.vim		@tpope
+runtime/compiler/dart.vim		@dkearns
+runtime/compiler/dart2js.vim		@dkearns
+runtime/compiler/dart2native.vim	@dkearns
+runtime/compiler/dartanalyser.vim	@dkearns
+runtime/compiler/dartdevc.vim		@dkearns
+runtime/compiler/dartdoc.vim		@dkearns
+runtime/compiler/dartfmt.vim		@dkearns
+runtime/compiler/eruby.vim		@dkearns
+runtime/compiler/gawk.vim		@dkearns
+runtime/compiler/gjs.vim		@dkearns
+runtime/compiler/haml.vim		@tpope
+runtime/compiler/javac.vim		@dkearns
+runtime/compiler/jest.vim		@dkearns
+runtime/compiler/jjs.vim		@dkearns
+runtime/compiler/jshint.vim		@dkearns
+runtime/compiler/jsonlint.vim		@dkearns
+runtime/compiler/lazbuild.vim		@dkearns
+runtime/compiler/php.vim		@dkearns
+runtime/compiler/rake.vim		@tpope @dkearns
+runtime/compiler/rhino.vim		@dkearns
+runtime/compiler/rspec.vim		@tpope @dkearns
+runtime/compiler/rubocop.vim		@dkearns
+runtime/compiler/ruby.vim		@tpope @dkearns
+runtime/compiler/rubyunit.vim		@dkearns
+runtime/compiler/sass.vim		@tpope
+runtime/compiler/se.vim			@dkearns
+runtime/compiler/shellcheck.vim		@dkearns
+runtime/compiler/stylelint.vim		@dkearns
+runtime/compiler/tcl.vim		@dkearns
+runtime/compiler/tidy.vim		@dkearns
+runtime/compiler/ts-node.vim		@dkearns
+runtime/compiler/tsc.vim		@dkearns
+runtime/compiler/typedoc.vim		@dkearns
+runtime/compiler/xmllint.vim		@dkearns
+runtime/compiler/xo.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/bst.vim		@tpope
+runtime/ftplugin/css.vim		@dkearns
+runtime/ftplugin/cucumber.vim		@tpope
+runtime/ftplugin/eiffel.vim		@dkearns
+runtime/ftplugin/eruby.vim		@tpope @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/haml.vim		@tpope
+runtime/ftplugin/hgcommit.vim		@k-takata
+runtime/ftplugin/javascript.vim		@dkearns
+runtime/ftplugin/javascriptreact.vim	@dkearns
+runtime/ftplugin/liquid.vim		@tpope
+runtime/ftplugin/markdown.vim		@tpope
+runtime/ftplugin/matlab.vim		@cecamp
+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/tmux.vim		@ericpruitt
+runtime/ftplugin/typescript.vim		@dkearns
+runtime/ftplugin/typescriptreact.vim	@dkearns
+runtime/indent/bst.vim			@tpope
+runtime/indent/cucumber.vim		@tpope
+runtime/indent/dosbatch.vim		@k-takata
+runtime/indent/eruby.vim		@tpope @dkearns
+runtime/indent/gitconfig.vim		@tpope
+runtime/indent/haml.vim			@tpope
+runtime/indent/liquid.vim		@tpope
+runtime/indent/nsis.vim			@k-takata
+runtime/indent/ruby.vim			@AndrewRadev @dkearns
+runtime/indent/sass.vim			@tpope
+runtime/indent/scss.vim			@tpope
+runtime/indent/teraterm.vim		@k-takata
+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/amiga.vim		@cecamp
+runtime/syntax/bst.vim			@tpope
+runtime/syntax/csh.vim			@cecamp
+runtime/syntax/cucumber.vim		@tpope
+runtime/syntax/dcl.vim			@cecamp
+runtime/syntax/elmfilt.vim		@cecamp
+runtime/syntax/eruby.vim		@tpope @dkearns
+runtime/syntax/exports.vim		@cecamp
+runtime/syntax/git.vim			@tpope
+runtime/syntax/gitcommit.vim		@tpope
+runtime/syntax/gitconfig.vim		@tpope
+runtime/syntax/gitrebase.vim		@tpope
+runtime/syntax/haml.vim			@tpope
+runtime/syntax/hgcommit.vim		@k-takata
+runtime/syntax/lex.vim			@cecamp
+runtime/syntax/liquid.vim		@tpope
+runtime/syntax/lisp.vim			@cecamp
+runtime/syntax/lynx.vim			@dkearns
+runtime/syntax/mailcap.vim		@dkearns
+runtime/syntax/make.vim			@rohieb
+runtime/syntax/make.vim			@rohieb
+runtime/syntax/maple.vim		@cecamp
+runtime/syntax/markdown.vim		@tpope
+runtime/syntax/netrw.vim		@cecamp
+runtime/syntax/nsis.vim			@k-takata
+runtime/syntax/pdf.vim			@tpope
+runtime/syntax/php.vim			@TysonAndre
+runtime/syntax/privoxy.vim		@dkearns
+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/tags.vim			@cecamp
+runtime/syntax/teraterm.vim		@k-takata
+runtime/syntax/tex.vim			@cecamp
+runtime/syntax/tidy.vim			@dkearns
+runtime/syntax/tmux.vim			@ericpruitt
+runtime/syntax/vim.vim			@cecamp
+runtime/syntax/wget.vim			@dkearns
+runtime/syntax/xbl.vim			@dkearns
+runtime/syntax/xmath.vim		@cecamp
+runtime/syntax/xslt.vim			@Boobies
+runtime/syntax/xxd.vim			@cecamp
+runtime/syntax/yacc.vim			@cecamp

.github/workflows/ci-windows.yaml

@@ -0,0 +1,228 @@
+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:
+      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
+        )

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,71 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+name: "CodeQL"
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [master]
+  schedule:
+    - cron: '0 18 * * 1'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        # Override automatic language detection by changing the below list
+        # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
+        language: ['cpp', 'python']
+        # Learn more...
+        # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
+
+    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
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file. 
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.travis.yml

@@ -1,26 +1,32 @@
 language: c
 
+env:
+  global:
+    - BUILD=yes TEST=test CONFOPT= LEAK_CFLAGS="-DEXITFREE" SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no LOG_DIR="$TRAVIS_BUILD_DIR/logs"
+
 _anchors:
   envs:
     - &tiny-nogui
-      BUILD=yes TEST=test FEATURES=tiny CONFOPT="--disable-gui" SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no
+      FEATURES=tiny TEST=testtiny CONFOPT="--disable-gui"
     - &tiny
-      BUILD=yes TEST=test FEATURES=tiny CONFOPT= SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no
+      FEATURES=tiny TEST=testtiny
     - &small
-      BUILD=yes TEST=test FEATURES=small CONFOPT= SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no
+      FEATURES=small TEST=testtiny
     - &normal
-      BUILD=yes TEST=test FEATURES=normal CONFOPT= SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no
+      FEATURES=normal
     - &linux-huge
-      BUILD=yes TEST="scripttests test_libvterm" CFLAGS="--coverage -DUSE_GCOV_FLUSH" LDFLAGS=--coverage FEATURES=huge SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no
+      FEATURES=huge TEST="scripttests test_libvterm"
       CONFOPT="--enable-perlinterp --enable-pythoninterp --enable-python3interp --enable-rubyinterp --enable-luainterp --enable-tclinterp"
     - &osx-huge # macOS build
-      BUILD=yes TEST=test FEATURES=huge SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no
+      FEATURES=huge
-      CONFOPT="--enable-perlinterp --enable-pythoninterp --enable-rubyinterp --enable-luainterp --enable-tclinterp"
+      CONFOPT="--enable-perlinterp --enable-python3interp --enable-rubyinterp --enable-luainterp --enable-tclinterp"
     - &unittests
-      BUILD=no TEST=unittests CFLAGS="--coverage -DUSE_GCOV_FLUSH" LDFLAGS=--coverage FEATURES=huge SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=yes
+      BUILD=no TEST=unittests FEATURES=huge CHECK_AUTOCONF=yes
+    - &coverage
+      CFLAGS="--coverage -DUSE_GCOV_FLUSH" LDFLAGS=--coverage
     - &asan # ASAN build
-      SANITIZER_CFLAGS="-g -O1 -DABORT_ON_INTERNAL_ERROR -DEXITFREE -fsanitize=address -fno-omit-frame-pointer"
+      SANITIZER_CFLAGS="-g -O1 -DABORT_ON_INTERNAL_ERROR -DEXITFREE -fsanitize-recover=all -fsanitize=address -fsanitize=undefined -fno-omit-frame-pointer"
-      ASAN_OPTIONS="print_stacktrace=1 log_path=asan" LSAN_OPTIONS="suppressions=$TRAVIS_BUILD_DIR/src/testdir/lsan-suppress.txt"
+      ASAN_OPTIONS="print_stacktrace=1 log_path=$LOG_DIR/asan" UBSAN_OPTIONS="print_stacktrace=1 log_path=$LOG_DIR/ubsan" LSAN_OPTIONS="suppressions=$TRAVIS_BUILD_DIR/src/testdir/lsan-suppress.txt"
     - &shadowopt
       SHADOWOPT="-C src/shadow" SRCDIR=./src/shadow
 
@@ -29,7 +35,7 @@ _anchors:
     dist: bionic
     addons:
       apt:
-        packages:
+        packages: &apt-packages
           - autoconf
           - clang
           - lcov
@@ -63,7 +69,11 @@ _anchors:
         fi
     before_script:
       - sudo sysctl -w net.ipv6.conf.lo.disable_ipv6=0
-      - sudo bash ci/load-snd-dummy.sh || true
+      # It appears we can load "snd-dummy" on only amd64.
+      - |
+        if [[ "${TRAVIS_CPU_ARCH}" = amd64 ]]; then
+          sudo bash ci/load-snd-dummy.sh || true
+        fi
       - sudo usermod -a -G audio $USER
       - do_test() { sg audio "sg $(id -gn) '$*'"; }
 
@@ -87,7 +97,7 @@ _anchors:
       # Lua is not installed on macOS
       - export LUA_PREFIX=/usr/local
 
-  coverage: &coverage
+  coverage: &eval-coverage
     # needed for https support for coveralls building cffi only works with gcc,
     # not with clang
     - CC=gcc pip install --user cpp-coveralls pyopenssl ndg-httpsclient pyasn1
@@ -98,13 +108,14 @@ _anchors:
     # Update pyenv to fix the error "/opt/pyenv/libexec/pyenv: line 43: cd: asan_symbolize-6.0: Not a directory".
     # https://github.com/pyenv/pyenv/issues/580
     - (cd "${PYENV_ROOT}" && git fetch -p origin && git checkout "$(git rev-list --tags -n1)") &>/dev/null || true
-    - find . -type f -name 'asan.*' -size +0 2>/dev/null | xargs grep -l '^==[[:digit:]]*==ERROR:' | xargs -I{} -n1 -t asan_symbolize -l{}
+    - for f in $(grep -l '#[[:digit:]]* *0x[[:digit:]a-fA-F]*' "$LOG_DIR"/*); do asan_symbolize-11 -l "$f"; done
 
 branches:
   except:
     - /^v[0-9]/
 
 script:
+  - mkdir -p "$LOG_DIR"
   - NPROC=$(getconf _NPROCESSORS_ONLN)
   - set -o errexit
   - echo -e "\\033[33;1mConfiguring Vim\\033[0m" && echo -en "travis_fold:start:configure\\r\\033[0K"
@@ -125,7 +136,7 @@ script:
       # Append various warning flags to CFLAGS.
       # BSD sed needs backup extension specified.
       sed -i.bak -f ci/config.mk.sed ${SRCDIR}/auto/config.mk
-      if [[ "${TRAVIS_OS_NAME}" = "osx" ]]; then
+      if [[ "${TRAVIS_OS_NAME}" = "osx" ]] || [[ "${CC}" = "clang-11" ]]; then
         # On macOS, the entity of gcc is clang.
         sed -i.bak -f ci/config.mk.clang.sed ${SRCDIR}/auto/config.mk
       else
@@ -145,6 +156,15 @@ script:
   - echo -e "\\033[33;1mTesting Vim\\033[0m" && echo -en "travis_fold:start:test\\r\\033[0K"
   - do_test make ${SHADOWOPT} ${TEST} && FOLD_MARKER=travis_fold
   - echo -en "${FOLD_MARKER}:end:test\\r\\033[0K"
+  - |
+    # Not all sanitizers will cause the tests to fail.  This helps since we can
+    # see all the failures instead of just the first one, but we still want the
+    # test phase to fail if any sanitizer issues are detected.
+    if [[ -n "${ASAN_OPTIONS}" ]]; then
+      if grep -q '#[[:digit:]]* *0x[[:digit:]a-fA-F]*' "$LOG_DIR"/*; then
+        false
+      fi
+    fi
 
 # Instead of using all environments with both compilers on both systems,
 # exclude some builds on mac os x and linux.
@@ -191,13 +211,13 @@ jobs:
       compiler: gcc
       env: *small
     - <<: *linux
-      name: normal/clang
+      name: normal+shadow/clang
       compiler: clang
       env:
         - *normal
         - *shadowopt
     - <<: *linux
-      name: normal/gcc
+      name: normal+shadow/gcc
       compiler: gcc
       env:
         - *normal
@@ -208,22 +228,39 @@ jobs:
       compiler: gcc
       env: *linux-huge
       services: []
+    - <<: *linux
+      arch: arm64
+      name: huge/gcc-arm64
+      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: *coverage
+      after_success: *eval-coverage
     - <<: *linux
       name: huge+coverage/gcc
       compiler: gcc
-      env: *linux-huge
+      env:
-      after_success: *coverage
+        - *linux-huge
+        - *coverage
+      after_success: *eval-coverage
     - <<: *linux # ASAN
-      name: huge+asan/gcc
+      name: huge+asan/clang
-      compiler: gcc
+      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
@@ -233,13 +270,16 @@ jobs:
       compiler: gcc
       env:
         - *linux-huge
+        - *coverage
         - TEST="-C src testgui"
-      after_success: *coverage
+      after_success: *eval-coverage
     - <<: *linux
       name: unittests+coverage/gcc
       compiler: gcc
-      env: *unittests
+      env:
-      after_success: *coverage
+        - *unittests
+        - *coverage
+      after_success: *eval-coverage
     - <<: *linux
       name: vimtags/gcc
       compiler: gcc

Filelist

@@ -9,6 +9,9 @@ SRC_ALL =	\
 		.lgtm.yml \
 		.travis.yml \
 		.cirrus.yml \
+		.github/workflows/ci-windows.yaml \
+		.github/workflows/codeql-analysis.yml \
+		.github/CODEOWNERS \
 		appveyor.yml \
 		ci/appveyor.bat \
 		ci/if_ver*.vim \
@@ -44,6 +47,7 @@ SRC_ALL =	\
 		src/drawline.c \
 		src/drawscreen.c \
 		src/edit.c \
+		src/errors.h \
 		src/eval.c \
 		src/evalbuffer.c \
 		src/evalfunc.c \
@@ -68,18 +72,22 @@ SRC_ALL =	\
 		src/gui_beval.c \
 		src/hardcopy.c \
 		src/hashtab.c \
+		src/help.c \
 		src/highlight.c \
 		src/indent.c \
 		src/insexpand.c \
+		src/job.c \
 		src/json.c \
 		src/json_test.c \
 		src/kword_test.c \
 		src/list.c \
+		src/locale.c \
 		src/keymap.h \
 		src/macros.h \
 		src/main.c \
 		src/map.c \
 		src/mark.c \
+		src/match.c \
 		src/mbyte.c \
 		src/memfile.c \
 		src/memfile_test.c \
@@ -145,6 +153,7 @@ SRC_ALL =	\
 		src/vim9compile.c \
 		src/vim9execute.c \
 		src/vim9script.c \
+		src/vim9type.c \
 		src/viminfo.c \
 		src/winclip.c \
 		src/window.c \
@@ -168,12 +177,12 @@ SRC_ALL =	\
 		src/testdir/setup_gui.vim \
 		src/testdir/shared.vim \
 		src/testdir/vim9.vim \
+		src/testdir/script_util.vim \
 		src/testdir/summarize.vim \
 		src/testdir/term_util.vim \
 		src/testdir/view_util.vim \
 		src/testdir/test[0-9]*.ok \
-		src/testdir/test[0-9]*a.ok \
+		src/testdir/test77a.ok \
-		src/testdir/test49.vim \
 		src/testdir/test83-tags? \
 		src/testdir/test77a.com \
 		src/testdir/test_*.vim \
@@ -239,14 +248,18 @@ SRC_ALL =	\
 		src/proto/gui_beval.pro \
 		src/proto/hardcopy.pro \
 		src/proto/hashtab.pro \
+		src/proto/help.pro \
 		src/proto/highlight.pro \
 		src/proto/indent.pro \
 		src/proto/insexpand.pro \
+		src/proto/job.pro \
 		src/proto/json.pro \
 		src/proto/list.pro \
+		src/proto/locale.pro \
 		src/proto/main.pro \
 		src/proto/map.pro \
 		src/proto/mark.pro \
+		src/proto/match.pro \
 		src/proto/mbyte.pro \
 		src/proto/memfile.pro \
 		src/proto/memline.pro \
@@ -296,6 +309,7 @@ SRC_ALL =	\
 		src/proto/vim9compile.pro \
 		src/proto/vim9execute.pro \
 		src/proto/vim9script.pro \
+		src/proto/vim9type.pro \
 		src/proto/viminfo.pro \
 		src/proto/winclip.pro \
 		src/proto/window.pro \
@@ -610,7 +624,7 @@ SRC_AMI =	\
 		README_amisrc.txt.info \
 		src.info \
 		src/INSTALLami.txt \
-		src/Make_morph.mak \
+		src/Make_ami.mak \
 		src/os_amiga.c \
 		src/os_amiga.h \
 		src/proto/os_amiga.pro \
@@ -631,13 +645,11 @@ SRC_HAIKU =	\
 SRC_MAC =	\
 		src/INSTALLmac.txt \
 		src/dehqx.py \
-		src/gui_mac.c \
 		src/os_mac_rsrc/*.icns \
 		src/os_mac.h \
 		src/os_mac.rsr.hqx \
 		src/os_mac_conv.c \
 		src/os_macosx.m \
-		src/proto/gui_mac.pro \
 		src/proto/os_mac_conv.pro \
 
 # source files for VMS (in the extra archive)
@@ -673,10 +685,8 @@ SRC_EXTRA =	\
 		$(SRC_QNX) \
 		$(SRC_VMS) \
 		README_os390.txt \
-		src/Make_mint.mak \
 		src/infplist.xml \
 		src/link.390 \
-		src/os_mint.h \
 		src/os_vms_fix.com \
 		src/toolbar.phi \
 
@@ -1022,6 +1032,8 @@ LANG_SRC = \
 		src/po/README_mvc.txt \
 		src/po/check.vim \
 		src/po/cleanup.vim \
+		src/po/tojavascript.vim \
+		src/po/fixfilenames.vim \
 		src/po/Makefile \
 		src/po/Make_all.mak \
 		src/po/Make_cyg.mak \

Makefile

@@ -32,7 +32,7 @@ first:
 
 # Some make programs use the last target for the $@ default; put the other
 # targets separately to always let $@ expand to "first" by default.
-all install uninstall tools config configure reconfig proto depend lint tags types test scripttests test_libvterm unittests testclean clean distclean:
+all install uninstall tools config configure reconfig proto depend lint tags types test scripttests testtiny test_libvterm unittests testclean clean distclean:
 	@if test ! -f src/auto/config.mk; then \
 		cp src/config.mk.dist src/auto/config.mk; \
 	fi

README.md

@@ -2,6 +2,7 @@
 
 [![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)

README_VIM9.md

@@ -5,8 +5,8 @@
 This is an experimental side of [Vim](https://github.com/vim/vim).
 It explores ways of making Vim script faster and better.
 
-WARNING: The Vim9 script features are in the early stages of development,
+WARNING: The Vim9 script features are still under development, anything can
-anything can break!
+break!
 
 # Why Vim9?
 
@@ -52,7 +52,7 @@ we can gain, and also that Vim script can be faster than builtin
 interfaces.
 
 In practice the script would not do something useless as counting but change
-the text.  For example, re-indent all the lines:
+the text.  For example, reindent all the lines:
 
 ``` vim
   let totallen = 0
@@ -80,7 +80,7 @@ e.g. each stack item is a typeval_T.  And one of the instructions is
 "execute Ex command", for commands that are not compiled.
 
 
-## 2. PHASING OUT INTERFACES
+## 2. DEPRIORITIZE INTERFACES
 
 Attempts have been made to implement functionality with built-in script
 languages such as Python, Perl, Lua, Tcl and Ruby.  This never gained much
@@ -91,14 +91,14 @@ Instead of using script language support in Vim:
   with them.  The job and channel support already makes this possible.
   Really any language can be used, also Java and Go, which are not
   available built-in.
-* Phase out the built-in language interfaces, make maintenance a bit easier
+* No priority for the built-in language interfaces.  They will have to be kept
-  and executables easier to build.  They will be kept for backwards
+  for backwards compatibility, but many users won't need a Vim build with these
-  compatibility, no new features.
+  interfaces.
 * Improve the Vim script language, it is used to communicate with the external
   tool and implements the Vim side of the interface.  Also, it can be used when
   an external tool is undesired.
 
-All together this creates a clear situation: Vim with the +eval feature
+Altogether this creates a clear situation: Vim with the +eval feature
 will be sufficient for most plugins, while some plugins require
 installing a tool that can be written in any language.  No confusion
 about having Vim but the plugin not working because some specific
@@ -140,6 +140,9 @@ Taking this one step further is also dropping "s:" for script-local variables;
 everything at the script level is script-local by default.  Since this is not
 backwards compatible it requires a new script style: Vim9 script!
 
+To avoid having more variations, the syntax inside a compiled function is the
+same as in Vim9 script.  Thus you have legacy syntax and Vim9 syntax.
+
 It should be possible to convert code from other languages to Vim
 script.  We can add functionality to make this easier.  This still needs
 to be discussed, but we can consider adding type checking and a simple

READMEdir/README_extra.txt

@@ -16,11 +16,8 @@ src/os_amiga.*		Files for the Amiga port.
 src/os_msdos.*
 src/os_dos.*		Files for the MS-DOS port.
 
-src/gui_mac.*
 src/os_mac.*		Files for the Mac port.
 
-src/os_mint.8		Files for the Atari Mint port.
-
 src/os_vms*		Files for the VMS port.
 
 src/os_w32*

appveyor.yml

@@ -5,16 +5,17 @@ skip_tags: true
 environment:
   matrix:
     - FEATURE: HUGE
-    - FEATURE: NORMAL
 # 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'
 
@@ -25,9 +26,9 @@ test_script:
   - cd src/testdir
     # Testing with MSVC gvim
   - path C:\Python35-x64;%PATH%
-  - nmake -f Make_dos.mak POSTSCRIPT=yes VIMPROG=..\gvim
+  - nmake -f Make_dos.mak VIMPROG=..\gvim
   - nmake -f Make_dos.mak clean
-    # Testing with MingW console version
+    # Testing with MSVC console version
-  - nmake -f Make_dos.mak POSTSCRIPT=yes VIMPROG=..\vim
+  - nmake -f Make_dos.mak VIMPROG=..\vim
 
 # vim: sw=2 sts=2 et ts=8 sr

ci/appveyor.bat

@@ -5,48 +5,32 @@ setlocal ENABLEDELAYEDEXPANSION
 cd %APPVEYOR_BUILD_FOLDER%
 
 cd src
-echo "Building MinGW 32bit console version"
-set PATH=c:\msys64\mingw32\bin;%PATH%
-mingw32-make.exe -f Make_ming.mak GUI=no OPTIMIZE=speed IME=yes ICONV=yes DEBUG=no FEATURES=%FEATURE% || exit 1
-.\vim -u NONE -c "redir @a | ver |0put a | wq" ver_ming.txt
-:: Save vim.exe before Make clean, moved back below.
-copy vim.exe testdir
-mingw32-make.exe -f Make_ming.mak clean
-
-:: Build Mingw huge version with python and channel support, or
-:: with specified features without python.
-echo "Building MinGW 32bit GUI version"
-if "%FEATURE%" == "HUGE" (
-    mingw32-make.exe -f Make_ming.mak OPTIMIZE=speed CHANNEL=yes GUI=yes IME=yes ICONV=yes DEBUG=no PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27 PYTHON3_VER=35 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python35 FEATURES=%FEATURE% || exit 1
-) ELSE (
-    mingw32-make.exe -f Make_ming.mak OPTIMIZE=speed GUI=yes IME=yes ICONV=yes DEBUG=no FEATURES=%FEATURE% || exit 1
-)
-.\gvim -u NONE -c "redir @a | ver |0put a | wq" ver_ming_gui.txt
-
 :: Filter out the progress bar from the build log
 sed -e "s/@<<$/@<< | sed -e 's#.*\\\\r.*##'/" Make_mvc.mak > Make_mvc2.mak
 
 echo "Building MSVC 64bit console Version"
-nmake -f Make_mvc2.mak CPU=AMD64 OLE=no GUI=no IME=yes ICONV=yes DEBUG=no FEATURES=%FEATURE% || exit 1
+nmake -f Make_mvc2.mak CPU=AMD64 ^
-:: The executable is not used
+    OLE=no GUI=no IME=yes ICONV=yes DEBUG=no ^
-nmake -f Make_mvc2.mak clean
+    FEATURES=%FEATURE% || exit 1
 
 :: build MSVC huge version with python and channel support
 :: GUI needs to be last, so that testing works
 echo "Building MSVC 64bit GUI Version"
 if "%FEATURE%" == "HUGE" (
-    nmake -f Make_mvc2.mak DIRECTX=yes CPU=AMD64 CHANNEL=yes OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27-x64 PYTHON3_VER=35 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python35-x64 FEATURES=%FEATURE% || exit 1
+    nmake -f Make_mvc2.mak CPU=AMD64 ^
+        OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no POSTSCRIPT=yes ^
+        PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27-x64 ^
+        PYTHON3_VER=35 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python35-x64 ^
+        FEATURES=%FEATURE% || exit 1
 ) ELSE (
-    nmake -f Make_mvc2.mak CPU=AMD64 OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no FEATURES=%FEATURE% || exit 1
+    nmake -f Make_mvc2.mak CPU=AMD64 ^
+        OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no ^
+        FEATURES=%FEATURE% || exit 1
 )
 .\gvim -u NONE -c "redir @a | ver |0put a | wq" ver_msvc.txt
 
-:: Restore vim.exe, tests will run with this.
+echo "version output MSVC console"
-move /Y testdir\vim.exe .
+.\vim --version
-echo "version output MinGW"
+echo "version output MSVC GUI"
-type ver_ming.txt
-echo "version output MinGW GUI"
-type ver_ming_gui.txt
-echo "version output MVC"
 type ver_msvc.txt
 cd ..

ci/load-snd-dummy.sh

@@ -3,6 +3,6 @@ set -e
 
 if ! modprobe snd-dummy; then
     # snd-dummy is contained in linux-modules-extra (if exists)
-    apt install -y "linux-modules-extra-$(uname -r)"
+    apt-get install -yq --no-install-suggests --no-install-recommends "linux-modules-extra-$(uname -r)"
     modprobe snd-dummy
 fi

nsis/gvim.nsi

@@ -174,6 +174,7 @@ Page custom SetCustom ValidateCustom
     !include "lang\german.nsi"
     !include "lang\italian.nsi"
     !include "lang\japanese.nsi"
+    !include "lang\russian.nsi"
     !include "lang\simpchinese.nsi"
     !include "lang\tradchinese.nsi"
     !include "lang\turkish.nsi"
@@ -687,6 +688,15 @@ SectionEnd
 	${EndIf}
 !macroend
 
+!macro LoadDefaultVimrc out_var reg_value default_value
+	ClearErrors
+	ReadRegStr ${out_var} HKLM "${UNINST_REG_KEY_VIM}" ${reg_value}
+	${If} ${Errors}
+	${OrIf} ${out_var} == ""
+	  StrCpy ${out_var} ${default_value}
+	${EndIf}
+!macroend
+
 Function .onInit
 !ifdef HAVE_MULTI_LANG
   # Select a language (or read from the registry).
@@ -718,10 +728,10 @@ Function .onInit
 !endif
   ${EndIf}
 
-# Load the selections from the registry (if any).
   ${If} ${RunningX64}
     SetRegView 64
   ${EndIf}
+  # Load the selections from the registry (if any).
   !insertmacro LoadSectionSelection ${id_section_console}    "select_console"
   !insertmacro LoadSectionSelection ${id_section_batch}      "select_batch"
   !insertmacro LoadSectionSelection ${id_section_desktop}    "select_desktop"
@@ -736,6 +746,10 @@ Function .onInit
 !ifdef HAVE_NLS
   !insertmacro LoadSectionSelection ${id_section_nls}        "select_nls"
 !endif
+  # Load the default _vimrc settings from the registry (if any).
+  !insertmacro LoadDefaultVimrc $vim_compat_stat "vim_compat" "all"
+  !insertmacro LoadDefaultVimrc $vim_keymap_stat "vim_keyremap" "default"
+  !insertmacro LoadDefaultVimrc $vim_mouse_stat "vim_mouse" "default"
   ${If} ${RunningX64}
     SetRegView lastused
   ${EndIf}
@@ -799,17 +813,11 @@ Function SetCustom
 	${NSD_CB_AddString} $vim_nsd_compat $(str_msg_compat_defaults)
 	${NSD_CB_AddString} $vim_nsd_compat $(str_msg_compat_all)
 
-	# Default selection
+	${If} $vim_compat_stat == "defaults"
-	${If} $vim_compat_stat == ""
-	  ReadRegStr $3 HKLM "${UNINST_REG_KEY_VIM}" "vim_compat"
-	${Else}
-	  StrCpy $3 $vim_compat_stat
-	${EndIf}
-	${If} $3 == "defaults"
 	  StrCpy $4 2
-	${ElseIf} $3 == "vim"
+	${ElseIf} $vim_compat_stat == "vim"
 	  StrCpy $4 1
-	${ElseIf} $3 == "vi"
+	${ElseIf} $vim_compat_stat == "vi"
 	  StrCpy $4 0
 	${Else} # default
 	  StrCpy $4 3
@@ -828,13 +836,7 @@ Function SetCustom
 	${NSD_CB_AddString} $vim_nsd_keymap $(str_msg_keymap_default)
 	${NSD_CB_AddString} $vim_nsd_keymap $(str_msg_keymap_windows)
 
-	# Default selection
+	${If} $vim_keymap_stat == "windows"
-	${If} $vim_keymap_stat == ""
-	  ReadRegStr $3 HKLM "${UNINST_REG_KEY_VIM}" "vim_keyremap"
-	${Else}
-	  StrCpy $3 $vim_keymap_stat
-	${EndIf}
-	${If} $3 == "windows"
 	  StrCpy $4 1
 	${Else} # default
 	  StrCpy $4 0
@@ -854,15 +856,9 @@ Function SetCustom
 	${NSD_CB_AddString} $vim_nsd_mouse $(str_msg_mouse_windows)
 	${NSD_CB_AddString} $vim_nsd_mouse $(str_msg_mouse_unix)
 
-	# Default selection
+	${If} $vim_mouse_stat == "xterm"
-	${If} $vim_mouse_stat == ""
-	  ReadRegStr $3 HKLM "${UNINST_REG_KEY_VIM}" "vim_mouse"
-	${Else}
-	  StrCpy $3 $vim_mouse_stat
-	${EndIf}
-	${If} $3 == "xterm"
 	  StrCpy $4 2
-	${ElseIf} $3 == "windows"
+	${ElseIf} $vim_mouse_stat == "windows"
 	  StrCpy $4 1
 	${Else} # default
 	  StrCpy $4 0

nsis/lang/italian.nsi

@@ -58,10 +58,10 @@ LangString str_desc_console         ${LANG_ITALIAN} \
     "Versione console di Vim (vim.exe)."
 
 LangString str_section_batch        ${LANG_ITALIAN} \
-    "Crea file di invocazione (MS-DOS) .bat"
+    "Crea file .bat"
 LangString str_desc_batch           ${LANG_ITALIAN} \
-    "Crea file di invocazione .bat per varianti di Vim nella directory \
+    "Crea file .bat per varianti di Vim nella directory \
-     di Windows, per utilizzo da linea di comando (MS-DOS)."
+     di Windows, per utilizzo da riga di comando."
 
 LangString str_group_icons          ${LANG_ITALIAN} \
     "Crea icone per Vim"

nsis/lang/russian.nsi

@@ -0,0 +1,287 @@
+# vi:set ts=8 sts=4 sw=4 et fdm=marker:
+#
+# russian.nsi: Russian language strings for gvim NSIS installer.
+#
+# Locale ID    : 1049
+# Locale name  : ru-RU
+# fileencoding : UTF-8
+# Author       : Restorer
+
+!insertmacro MUI_LANGUAGE "Russian"
+
+
+# Overwrite the default translation.
+# These strings should be always English.  Otherwise dosinst.c fails.
+LangString ^SetupCaption     ${LANG_RUSSIAN} \
+        "$(^Name) Setup"
+LangString ^UninstallCaption ${LANG_RUSSIAN} \
+        "$(^Name) Uninstall"
+
+##############################################################################
+# MUI Configuration Strings                                               {{{1
+##############################################################################
+
+#LangString str_dest_folder          ${LANG_RUSSIAN} \
+#    "Маршрут к каталогу установки (должен оканчиваться каталогом $\"vim$\")"
+
+LangString str_show_readme          ${LANG_RUSSIAN} \
+    "После окончания установки ознакомиться с кратким описанием"
+
+# Install types:
+LangString str_type_typical         ${LANG_RUSSIAN} \
+    "Стандартная"
+
+LangString str_type_minimal         ${LANG_RUSSIAN} \
+    "Минимальная"
+
+LangString str_type_full            ${LANG_RUSSIAN} \
+    "Полная"
+
+
+##############################################################################
+# Section Titles & Description                                            {{{1
+##############################################################################
+
+LangString str_section_old_ver      ${LANG_RUSSIAN} \
+    "Удаление предыдущих версий"
+LangString str_desc_old_ver         ${LANG_RUSSIAN} \
+    "Будут удалены предыдущие установленные версии программы"
+
+LangString str_section_exe          ${LANG_RUSSIAN} \
+    "Графический интерфейс и вспомогательные файлы"
+LangString str_desc_exe             ${LANG_RUSSIAN} \
+    "Графический интерфейс программы Vim и все необходимые для этого файлы. \
+    Это обязательный компонент"
+
+LangString str_section_console      ${LANG_RUSSIAN} \
+    "Консольная программа Vim"
+LangString str_desc_console         ${LANG_RUSSIAN} \
+    "Вариант редактора Vim (vim.exe), используемый в командной оболочке"
+
+LangString str_section_batch        ${LANG_RUSSIAN} \
+    "Создать командные файлы"
+LangString str_desc_batch           ${LANG_RUSSIAN} \
+    "Создание командных bat-файлов позволяющих работать с редактором \
+     Vim из командной строки Windows"
+
+LangString str_group_icons          ${LANG_RUSSIAN} \
+    "Создать ярлыки для редактора Vim"
+LangString str_desc_icons           ${LANG_RUSSIAN} \
+    "Создание ярлыков редактора Vim для облегчения запуска программы"
+
+LangString str_section_desktop      ${LANG_RUSSIAN} \
+    "На Рабочем столе"
+LangString str_desc_desktop         ${LANG_RUSSIAN} \
+    "Создание ярлыков программы Gvim на Рабочем столе"
+
+LangString str_section_start_menu   ${LANG_RUSSIAN} \
+    "В меню кнопки Пуск"
+LangString str_desc_start_menu      ${LANG_RUSSIAN} \
+    "Создание ярлыков программы Gvim в меню кнопки Пуск"
+
+#LangString str_section_quick_launch ${LANG_RUSSIAN} \
+#    "На панели быстрого запуска"
+#LangString str_desc_quick_launch    ${LANG_RUSSIAN} \
+#    "Создание ярлыков программы GVim на панели быстрого запуска"
+
+LangString str_section_edit_with    ${LANG_RUSSIAN} \
+    "В контекстном меню"
+LangString str_desc_edit_with       ${LANG_RUSSIAN} \
+    "Добавление вызова программы Gvim в пункт $\"Открыть с помощью...$\" контекстного меню"
+
+#LangString str_section_edit_with32  ${LANG_RUSSIAN} \
+#    "32-разрядная версия программы"
+#LangString str_desc_edit_with32     ${LANG_RUSSIAN} \
+#    "Добавление вызова программы Gvim в пункт $\"Открыть с помощью...$\" контекстного меню \
+#     для 32-разрядных приложений"
+
+#LangString str_section_edit_with64  ${LANG_RUSSIAN} \
+#    "64-разрядная версия программы"
+#LangString str_desc_edit_with64     ${LANG_RUSSIAN} \
+#    "Добавление вызова программы Gvim в пункт $\"Открыть с помощью...$\" контекстного меню \
+#     для 64-разрядных приложений"
+
+LangString str_section_vim_rc       ${LANG_RUSSIAN} \
+    "Настройки программы по умолчанию"
+LangString str_desc_vim_rc          ${LANG_RUSSIAN} \
+    "Создание файла _vimrc с предустановленными настройками, если нет других \
+    файлов настроек"
+
+LangString str_group_plugin         ${LANG_RUSSIAN} \
+    "Создать каталог для подключаемых модулей"
+LangString str_desc_plugin          ${LANG_RUSSIAN} \
+    "Создание каталога для размещения подключаемых модулей, которые расширяют \
+     возможности редактора Vim"
+
+LangString str_section_plugin_home  ${LANG_RUSSIAN} \
+    "Личный каталог"
+LangString str_desc_plugin_home     ${LANG_RUSSIAN} \
+    "Создание каталога для подключаемых модулей в домашнем каталоге пользователя"
+
+LangString str_section_plugin_vim   ${LANG_RUSSIAN} \
+    "Общий каталог"
+LangString str_desc_plugin_vim      ${LANG_RUSSIAN} \
+    "Создание каталога для подключаемых модулей в каталоге установки редактора Vim. \
+     Модули в этом каталоге будут доступны для любого пользователя \
+     зарегистрировавшегося в системе"
+
+LangString str_section_vis_vim      ${LANG_RUSSIAN} \
+    "Подключаемый модуль VisVim"
+LangString str_desc_vis_vim         ${LANG_RUSSIAN} \
+    "Подключаемый модуль VisVim используется для интеграции с Microsoft Visual Studio"
+
+LangString str_section_nls          ${LANG_RUSSIAN} \
+    "Поддержка региональных языков"
+LangString str_desc_nls             ${LANG_RUSSIAN} \
+    "Установка файлов для поддержки региональных языков операционной системы"
+
+LangString str_unsection_register   ${LANG_RUSSIAN} \
+    "Отменить регистрацию компонентов программы Vim"
+LangString str_desc_unregister      ${LANG_RUSSIAN} \
+    "Отмена регистрации компонентов программы Vim в операционной системе"
+
+LangString str_unsection_exe        ${LANG_RUSSIAN} \
+    "Удалить файлы редактора Vim"
+LangString str_desc_rm_exe          ${LANG_RUSSIAN} \
+    "Удаление всех исполняемых и вспомогательных файлов редактора Vim"
+
+LangString str_ungroup_plugin       ${LANG_RUSSIAN} \
+    "Удалить каталог подключаемых модулей"
+LangString str_desc_rm_plugin       ${LANG_RUSSIAN} \
+    "Удаление каталога подключаемых модулей, если в нём нет файлов"
+
+LangString str_unsection_plugin_home ${LANG_RUSSIAN} \
+    "Личный каталог"
+LangString str_desc_rm_plugin_home  ${LANG_RUSSIAN} \
+    "Удаление каталога подключаемых модулей из домашнего каталога пользователя"
+
+LangString str_unsection_plugin_vim ${LANG_RUSSIAN} \
+    "Общий каталог"
+LangString str_desc_rm_plugin_vim   ${LANG_RUSSIAN} \
+    "Удаление каталога подключаемых модулей из каталога установки редактора Vim"
+
+LangString str_unsection_rootdir    ${LANG_RUSSIAN} \
+    "Удалить основной каталог программы Vim"
+LangString str_desc_rm_rootdir      ${LANG_RUSSIAN} \
+    "Удаление основного каталога программы Vim. В этом каталоге находятся файлы \
+    настроек!"
+
+
+##############################################################################
+# Messages                                                                {{{1
+##############################################################################
+
+#LangString str_msg_too_many_ver  ${LANG_RUSSIAN} \
+#    "Обнаружено предыдущих версий программы Vim: $vim_old_ver_count.$\r$\n\
+#     Данная программа установки может удалить не более ${VIM_MAX_OLD_VER}.$\r$\n\
+#     Удалить лишние версии программы Vim и повторите установку"
+
+#LangString str_msg_invalid_root  ${LANG_RUSSIAN} \
+#    "Недопустимый каталог установки программы Vim $vim_install_root!$\r$\n\
+#     Маршрут установки должен оканчиваться каталогом $\"vim$\""
+
+#LangString str_msg_bin_mismatch  ${LANG_RUSSIAN} \
+#    "Недопустимый маршрут к каталогу с исполняемыми файлами!$\r$\n$\r$\n\
+#     Маршрут к каталогу с исполняемыми файлами должен быть $\"$vim_bin_path$\",$\r$\n\
+#     но от операционной системы получен как $\"$INSTDIR$\"."
+
+#LangString str_msg_vim_running   ${LANG_RUSSIAN} \
+#    "Программа Vim сейчас работает.$\r$\n\
+#     Прежде чем продолжить, закройте все работающие редакторы Vim"
+
+#LangString str_msg_register_ole  ${LANG_RUSSIAN} \
+#    "Попытка зарегистрировать компоненты программы Vim в пространстве OLE. \
+#     Но не получено уведомление об успешности данной операции"
+
+#LangString str_msg_unreg_ole     ${LANG_RUSSIAN} \
+#    "Попытка отменить регистрацию компонентов программы Vim в пространстве OLE. \
+#     Но не получено уведомление об успешности данной операции"
+
+#LangString str_msg_rm_start      ${LANG_RUSSIAN} \
+#    "Выполняется удаление следующих версий программы:"
+
+#LangString str_msg_rm_fail       ${LANG_RUSSIAN} \
+#    "Произошёл сбой при выполнении удаления следующих версий программы:"
+
+#LangString str_msg_no_rm_key     ${LANG_RUSSIAN} \
+#    "Не удалось найти раздел реестра, содержащий информацию об удалении программы"
+
+#LangString str_msg_no_rm_reg     ${LANG_RUSSIAN} \
+#    "Не удалось найти программу выполняющую удаление, указанную в разделе реестра"
+
+#LangString str_msg_no_rm_exe     ${LANG_RUSSIAN} \
+#    "Отсутствуют права на доступ к программе, выполняющей удаление"
+
+#LangString str_msg_rm_copy_fail  ${LANG_RUSSIAN} \
+#    "Произошла ошибка при копировании программы удаления во временный каталог"
+
+#LangString str_msg_rm_run_fail   ${LANG_RUSSIAN} \
+#    "Произошёл сбой при запуске программы, выполняющей удаление"
+
+#LangString str_msg_abort_install ${LANG_RUSSIAN} \
+#    "Установка программы была отменена"
+
+LangString str_msg_install_fail  ${LANG_RUSSIAN} \
+    "Произошла ошибка при установке программы. Попробуйте повторить установку \
+    немного попозже"
+# когда луна будет в другой фазе и ветер должен дуть с юго‐запада
+
+LangString str_msg_rm_exe_fail   ${LANG_RUSSIAN} \
+    "Некоторые файлы не были удалены из каталога $0 $\r$\n\
+     Необходимо выполнить их удаление самостоятельно"
+
+#LangString str_msg_rm_root_fail  ${LANG_RUSSIAN} \
+#    "Внимание! В каталоге $\"$vim_install_root$\" содержатся файлы. Удаление каталога не выполнено"
+
+LangString str_msg_uninstalling  ${LANG_RUSSIAN} \
+    "Удаление предыдущих версий программ..."
+
+LangString str_msg_registering   ${LANG_RUSSIAN} \
+    "Регистрация компонентов программы в системе..."
+
+LangString str_msg_unregistering ${LANG_RUSSIAN} \
+    "Отмена регистрации компонентов программы в системе..."
+
+
+##############################################################################
+# Dialog Box                                                              {{{1
+##############################################################################
+
+LangString str_vimrc_page_title    ${LANG_RUSSIAN} \
+    "Установка параметров программы"
+LangString str_vimrc_page_subtitle ${LANG_RUSSIAN} \
+    "Параметры, используемые для клавиатуры, «мыши» и функциональности программы"
+
+LangString str_msg_compat_title    ${LANG_RUSSIAN} \
+    " Варианты использования программы "
+LangString str_msg_compat_desc     ${LANG_RUSSIAN} \
+    "Совместимость и функциональность программы"
+LangString str_msg_compat_vi       ${LANG_RUSSIAN} \
+    "Работа в варианте совместимости с редактором Vi"
+LangString str_msg_compat_vim      ${LANG_RUSSIAN} \
+    "Работа в варианте функциональности редактора Vim"
+LangString str_msg_compat_defaults ${LANG_RUSSIAN} \
+    "Работа редактора Vim с некоторыми улучшениями (файл defaults.vim)"
+LangString str_msg_compat_all      ${LANG_RUSSIAN} \
+    "Работа редактора Vim со всеми улучшениями (файл vimrc_example.vim). \
+    Используется по умолчанию"
+
+LangString str_msg_keymap_title   ${LANG_RUSSIAN} \
+    " Клавиатурные команды "
+LangString str_msg_keymap_desc    ${LANG_RUSSIAN} \
+    "Клавиатурные команды используемые в ОС Windows (CTRL+V, CTRL+C, CTRL+S, CTRL+F и т. п.)"
+LangString str_msg_keymap_default ${LANG_RUSSIAN} \
+    "Не изменять клавиатурные команды. Использовать принятые в редакторе Vim"
+LangString str_msg_keymap_windows ${LANG_RUSSIAN} \
+    "Изменить указанные клавиатурные команды"
+
+LangString str_msg_mouse_title   ${LANG_RUSSIAN} \
+    " Манипулятор «мышь» "
+LangString str_msg_mouse_desc    ${LANG_RUSSIAN} \
+    "Действий правой и левой кнопки манипулятора «мышь»"
+LangString str_msg_mouse_default ${LANG_RUSSIAN} \
+    "Правая кнопка — всплывающее меню, левая кнопка — режим визуальный"
+LangString str_msg_mouse_windows ${LANG_RUSSIAN} \
+    "Правая кнопка — всплывающее меню, левая кнопка — режим выборки (как в ОС Windows)"
+LangString str_msg_mouse_unix    ${LANG_RUSSIAN} \
+    "Правая кнопка — расширяемый режим выбора, левая кнопка — режим визуальный (как в UNIX‐подобных ОС)"

runtime/autoload/decada.vim

@@ -25,7 +25,7 @@ function decada#Unit_Name () dict				     " {{{1
     "	Convert filename into acs unit:
     "	    1:  remove the file extenstion.
     "	    2:  replace all double '_' or '-' with an dot (which denotes a separate)
-    "	    3:  remove a trailing '_' (wich denotes a specification)
+    "	    3:  remove a trailing '_' (which denotes a specification)
     return substitute (substitute (expand ("%:t:r"), '__\|-', ".", "g"), '_$', "", '')
 endfunction decada#Unit_Name					     " }}}1
 

runtime/autoload/dist/ft.vim

@@ -1,7 +1,7 @@
 " Vim functions for file type detection
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2020 Mar 30
+" Last Change:	2020 Aug 17
 
 " These functions are moved here from runtime/filetype.vim to make startup
 " faster.
@@ -575,7 +575,7 @@ endfunc
 let s:ft_rules_udev_rules_pattern = '^\s*\cudev_rules\s*=\s*"\([^"]\{-1,}\)/*".*'
 func dist#ft#FTRules()
   let path = expand('<amatch>:p')
-  if path =~ '^/\(etc/udev/\%(rules\.d/\)\=.*\.rules\|lib/udev/\%(rules\.d/\)\=.*\.rules\)$'
+  if path =~ '/\(etc/udev/\%(rules\.d/\)\=.*\.rules\|\%(usr/\)\=lib/udev/\%(rules\.d/\)\=.*\.rules\)$'
     setf udevrules
     return
   endif

runtime/autoload/javascriptcomplete.vim

@@ -1,7 +1,9 @@
 " Vim completion script
 " Language:	Java Script
-" Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
+" Maintainer:	Jay Sitter (jay@jaysitter.com)
-" Last Change:	2017 Mar 04
+" URL: https://github.com/jsit/javascriptcomplete.vim/
+" Previous Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
+" Last Change:	2020 Jul 30
 
 function! javascriptcomplete#CompleteJS(findstart, base)
   if a:findstart
@@ -154,12 +156,30 @@ function! javascriptcomplete#CompleteJS(findstart, base)
 					\ 'text', 'vLink']
 		let bodys = bodyprop
 		" Document - document.
-		let docuprop = ['anchors', 'applets', 'childNodes', 'embeds', 'forms', 'images', 'links', 'stylesheets',
+		let docuprop = ['anchors', 'body', 'characterSet', 'doctype',
-					\ 'body', 'cookie', 'documentElement', 'domain', 'lastModified', 'referrer', 'title', 'URL']
+					\ 'documentElement', 'documentURI', 'embeds', 'fonts', 'forms',
-		let documeth = ['close', 'createAttribute', 'createElement', 'createTextNode', 'focus', 'getElementById',
+					\ 'head', 'hidden', 'images', 'implementation', 'lastStyleSheetSet',
-					\ 'getElementsByName', 'getElementsByTagName', 'open', 'write', 'writeln',
+					\ 'links', 'plugins', 'preferredStyleSheetSet', 'scripts',
-					\ 'onClick', 'onDblClick', 'onFocus', 'onKeyDown', 'onKeyPress', 'onKeyUp',
+					\ 'scrollingElement', 'selectedStyleSheetSet', 'styleSheetSets',
-					\ 'onMouseDown', 'onMouseMove', 'onMouseOut', 'onMouseOver', 'onMouseUp', 'onResize']
+					\ 'timeline', 'visibilityState', 'cookie', 'defaultView',
+					\ 'designMode', 'dir', 'domain', 'lastModified', 'location',
+					\ 'readyState', 'referrer', 'title', 'URL', 'activeElement',
+					\ 'fullscreenElement', 'styleSheets']
+		let documeth = ['adoptNode', 'close', 'createAttribute',
+					\ 'createAttributeNS', 'createCDATASection', 'createComment',
+					\ 'createDocumentFragment', 'createElement', 'createElementNS',
+					\ 'createEvent', 'createExpression', 'createNSResolver',
+					\ 'createNodeIterator', 'createProcessingInstruction', 'createRange',
+					\ 'createTextNode', 'createTouchList', 'createTreeWalker',
+					\ 'enableStyleSheetsForSet', 'evaluate', 'focus', 'getElementById',
+					\ 'getElementById', 'getElementsByClassName', 'getElementsByName',
+					\ 'getElementsByTagName', 'getElementsByTagNameNS',
+					\ 'hasStorageAccess', 'importNode', 'onClick', 'onDblClick',
+					\ 'onFocus', 'onKeyDown', 'onKeyPress', 'onKeyUp', 'onMouseDown',
+					\ 'onMouseMove', 'onMouseOut', 'onMouseOver', 'onMouseUp',
+					\ 'onResize', 'open', 'querySelector', 'querySelectorAll',
+					\ 'requestStorageAccess', 'write', 'writeln']
+
 		call map(documeth, 'v:val."("')
 		let docuxprop = ['attributes', 'childNodes', 'doctype', 'documentElement', 'firstChild',
 					\ 'implementation', 'namespaceURI', 'nextSibling', 'nodeName', 'nodeType',
@@ -368,9 +388,11 @@ function! javascriptcomplete#CompleteJS(findstart, base)
 		let xdomelemprop = ['attributes', 'childNodes', 'firstChild', 'lastChild', 
 					\ 'namespaceURI', 'nextSibling', 'nodeName', 'nodeType', 'nodeValue',
 					\ 'ownerDocument', 'parentNode', 'prefix', 'previousSibling', 'tagName']
-		let xdomelemmeth = ['appendChild', 'cloneNode', 'getAttribute', 'getAttributeNode',
+		let xdomelemmeth = ['appendChild', 'addEventListener', 'cloneNode',
-					\ 'getElementsByTagName', 'hasChildNodes', 'insertBefore', 'normalize',
+					\ 'dispatchEvent', 'getAttribute', 'getAttributeNode',
-					\ 'removeAttribute', 'removeAttributeNode', 'removeChild', 'replaceChild',
+					\ 'getElementsByTagName', 'hasChildNodes', 'insertBefore',
+					\ 'normalize', 'removeAttribute', 'removeAttributeNode',
+					\ 'removeChild', 'removeEventListener', 'replaceChild',
 					\ 'setAttribute', 'setAttributeNode']
 		call map(xdomelemmeth, 'v:val."("')
 		let xdomelems = xdomelemprop + xdomelemmeth

runtime/autoload/netrw.vim

@@ -1,7 +1,7 @@
 " netrw.vim: Handles file transfer and remote directory listing across
 "            AUTOLOAD SECTION
-" Date:		Jan 07, 2020
+" Date:		Sep 18, 2020
-" Version:	168
+" Version:	170
 " Maintainer:	Charles E Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
 " GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim
 " Copyright:    Copyright (C) 2016 Charles E. Campbell {{{1
@@ -43,7 +43,7 @@ if exists("s:needspatches")
  endfor
 endif
 
-let g:loaded_netrw = "v168"
+let g:loaded_netrw = "v170"
 if !exists("s:NOTE")
  let s:NOTE    = 0
  let s:WARNING = 1
@@ -86,7 +86,16 @@ fun! netrw#ErrorMsg(level,msg,errnum)
   endif
 "  call Decho("level=".level,'~'.expand("<slnum>"))
 
-  if g:netrw_use_errorwindow
+  if g:netrw_use_errorwindow == 2 && (v:version > 802 || (v:version == 802 && has("patch486")))
+   " use popup window
+   if type(a:msg) == 3
+    let msg = [level]+a:msg
+   else
+    let msg= level.a:msg
+   endif
+   let s:popuperr_id  = popup_beval(msg,{})
+   let s:popuperr_text= ""
+ elseif g:netrw_use_errorwindow
    " (default) netrw creates a one-line window to show error/warning
    " messages (reliably displayed)
 
@@ -203,7 +212,11 @@ let g:netrw_localrmdiropt      = ""
 
 " ---------------------------------------------------------------------
 " Default values for netrw's global protocol variables {{{2
-call s:NetrwInit("g:netrw_use_errorwindow",1)
+if (v:version > 802 || (v:version == 802 && has("patch486"))) && has("balloon_eval") && !exists("s:initbeval") && !exists("g:netrw_nobeval") && has("syntax") && exists("g:syntax_on") && has("mouse")
+  call s:NetrwInit("g:netrw_use_errorwindow",2)
+else
+  call s:NetrwInit("g:netrw_use_errorwindow",1)
+endif
 
 if !exists("g:netrw_dav_cmd")
  if executable("cadaver")
@@ -559,6 +572,7 @@ call s:NetrwInit("s:netrw_posn",'{}')
 if v:version >= 700 && has("balloon_eval") && !exists("s:initbeval") && !exists("g:netrw_nobeval") && has("syntax") && exists("g:syntax_on")
 " call Decho("installed beval events",'~'.expand("<slnum>"))
  let &l:bexpr = "netrw#BalloonHelp()"
+" call Decho("&l:bexpr<".&l:bexpr."> buf#".bufnr())
  au FileType netrw	setl beval
  au WinLeave *		if &ft == "netrw" && exists("s:initbeval")|let &beval= s:initbeval|endif
  au VimEnter * 		let s:initbeval= &beval
@@ -591,7 +605,18 @@ if v:version >= 700 && has("balloon_eval") && has("syntax") && exists("g:syntax_
    if &ft != "netrw"
     return ""
    endif
-   if !exists("w:netrw_bannercnt") || v:beval_lnum >= w:netrw_bannercnt || (exists("g:netrw_nobeval") && g:netrw_nobeval)
+   if exists("s:popuperr_id") && popup_getpos(s:popuperr_id) != {}
+    " popup error window is still showing
+    " s:pouperr_id and s:popuperr_text are set up in netrw#ErrorMsg()
+    if exists("s:popuperr_text") && s:popuperr_text != "" && v:beval_text != s:popuperr_text
+     " text under mouse hasn't changed; only close window when it changes
+     call popup_close(s:popuperr_id)
+     unlet s:popuperr_text
+    else
+     let s:popuperr_text= v:beval_text
+    endif
+    let mesg= ""
+   elseif !exists("w:netrw_bannercnt") || v:beval_lnum >= w:netrw_bannercnt || (exists("g:netrw_nobeval") && g:netrw_nobeval)
     let mesg= ""
    elseif     v:beval_text == "Netrw" || v:beval_text == "Directory" || v:beval_text == "Listing"
     let mesg = "i: thin-long-wide-tree  gh: quick hide/unhide of dot-files   qf: quick file info  %:open new file"
@@ -1247,6 +1272,10 @@ fun! netrw#Lexplore(count,rightside,...)
    setlocal winfixwidth
    let g:netrw_altv     = keep_altv
    let t:netrw_lexbufnr = bufnr("%")
+   " done to prevent build-up of hidden buffers due to quitting and re-invocation of :Lexplore.
+   " Since the intended use of :Lexplore is to have an always-present explorer window, the extra
+   " effort to mis-use :Lex is warranted.
+   set bh=wipe
 "   call Decho("let t:netrw_lexbufnr=".t:netrw_lexbufnr) 
 "   call Decho("t:netrw_lexposn".(exists("t:netrw_lexposn")? string(t:netrw_lexposn) : " n/a"))
    if exists("t:netrw_lexposn")
@@ -1908,7 +1937,7 @@ fun! s:NetrwRestoreSetting(keepvar,setting)
     if type(a:setting) == 0
      exe "let ".a:setting."= ".keepvarval
     elseif type(a:setting) == 1
-     exe "let ".a:setting."= '".keepvarval."'"
+     exe "let ".a:setting."= '".substitute(keepvarval,"'","''","g")."'"
     else
      call netrw#ErrorMsg(s:ERROR,"(s:NetrwRestoreSetting) doesn't know how to restore ".a:keepvar." with a setting of type#".type(a:setting),105)
     endif
@@ -3640,6 +3669,8 @@ fun! s:NetrwBookHistSave()
   let savefile= s:NetrwHome()."/.netrwhist"
 "  call Decho("savefile<".savefile.">",'~'.expand("<slnum>"))
   1split
+
+  " setting up a new buffer which will become .netrwhist
   call s:NetrwEnew()
 "  call Decho("case g:netrw_use_noswf=".g:netrw_use_noswf.(exists("+acd")? " +acd" : " -acd"),'~'.expand("<slnum>"))
   if g:netrw_use_noswf
@@ -4722,7 +4753,7 @@ endfun
 "                       "new directory name" is actually a file,
 "                       NetrwBrowseChgDir() edits the file.
 fun! s:NetrwBrowseChgDir(islocal,newdir,...)
-"  call Dfunc("s:NetrwBrowseChgDir(islocal=".a:islocal."> newdir<".a:newdir.">) a:0=".a:0." curpos<".string(getpos("."))."> b:netrw_curdir<".(exists("b:netrw_curdir")? b:netrw_curdir : "").">")
+"  call Dfunc("s:NetrwBrowseChgDir(islocal=".a:islocal."> newdir<".a:newdir.">) a:0=".a:0." win#".winnr()." curpos<".string(getpos("."))."> b:netrw_curdir<".(exists("b:netrw_curdir")? b:netrw_curdir : "").">")
 "  call Decho("tab#".tabpagenr()." win#".winnr()." buf#".bufnr("%")."<".bufname("%")."> line#".line(".")." col#".col(".")." winline#".winline()." wincol#".wincol(),'~'.expand("<slnum>"))
 
   let ykeep= @@
@@ -4751,13 +4782,14 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...)
   let newdir    = a:newdir
   let dolockout = 0
   let dorestore = 1
+"  call Decho("win#".winnr(),'~'.expand("<slnum>"))
 "  call Decho("dirname<".dirname.">",'~'.expand("<slnum>"))
 "  call Decho("newdir<".newdir.">",'~'.expand("<slnum>"))
 
   " ignore <cr>s when done in the banner
 "  call Decho('(s:NetrwBrowseChgDir) ignore [return]s when done in banner (g:netrw_banner='.g:netrw_banner.")",'~'.expand("<slnum>"))
   if g:netrw_banner
-"   call Decho("w:netrw_bannercnt=".(exists("w:netrw_bannercnt")? w:netrw_bannercnt : 'n/a')." line(.)#".line('.')." line($)#".line("#"),'~'.expand("<slnum>"))
+"   call Decho("win#".winnr()." w:netrw_bannercnt=".(exists("w:netrw_bannercnt")? w:netrw_bannercnt : 'n/a')." line(.)#".line('.')." line($)#".line("#"),'~'.expand("<slnum>"))
    if exists("w:netrw_bannercnt") && line(".") < w:netrw_bannercnt && line("$") >= w:netrw_bannercnt
     if getline(".") =~# 'Quick Help'
 "     call Decho("#1: quickhelp=".g:netrw_quickhelp." ro=".&l:ro." ma=".&l:ma." mod=".&l:mod." wrap=".&l:wrap." (filename<".expand("%")."> win#".winnr()." ft<".&ft.">)",'~'.expand("<slnum>"))
@@ -4794,7 +4826,7 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...)
    " ------------------------------
    " NetrwBrowseChgDir: edit a file {{{3
    " ------------------------------
-"   call Decho('(s:NetrwBrowseChgDir) edit-a-file: case "handling a file": newdir<'.newdir.'> !~ dirpat<'.dirpat.">",'~'.expand("<slnum>"))
+"   call Decho('edit-a-file: case "handling a file": win#'.winnr().' newdir<'.newdir.'> !~ dirpat<'.dirpat.">",'~'.expand("<slnum>"))
 
    " save position for benefit of Rexplore
    let s:rexposn_{bufnr("%")}= winsaveview()
@@ -4829,7 +4861,7 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...)
     NetrwKeepj call s:NetrwOptionsRestore("s:")
     let curdir= b:netrw_curdir
     if !exists("s:didsplit")
-"     call Decho("edit-a-file: s:didsplit does not exist; g:netrw_browse_split=".string(g:netrw_browse_split)." win#".winnr(),'~'.expand("<slnum>"))
+"     "     call Decho("edit-a-file: s:didsplit does not exist; g:netrw_browse_split=".string(g:netrw_browse_split)." win#".winnr()." g:netrw_chgwin=".g:netrw_chgwin",'~'.expand("<slnum>"))
      if type(g:netrw_browse_split) == 3
       " open file in server
       " Note that g:netrw_browse_split is a List: [servername,tabnr,winnr]
@@ -4837,22 +4869,27 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...)
       call s:NetrwServerEdit(a:islocal,dirname)
 "      call Dret("s:NetrwBrowseChgDir")
       return
+
      elseif g:netrw_browse_split == 1
       " horizontally splitting the window first
 "      call Decho("edit-a-file: horizontally splitting window prior to edit",'~'.expand("<slnum>"))
-      keepalt new
+      let winsz= (g:netrw_winsize > 0)? (g:netrw_winsize*winheight(0))/100 : -g:netrw_winsize
+      exe "keepalt ".(g:netrw_alto? "bel " : "abo ").winsz."wincmd s"
       if !&ea
        keepalt wincmd _
       endif
       call s:SetRexDir(a:islocal,curdir)
+
      elseif g:netrw_browse_split == 2
       " vertically splitting the window first
 "      call Decho("edit-a-file: vertically splitting window prior to edit",'~'.expand("<slnum>"))
-      keepalt rightb vert new
+      let winsz= (g:netrw_winsize > 0)? (g:netrw_winsize*winwidth(0))/100 : -g:netrw_winsize
+      exe "keepalt ".(g:netrw_alto? "top " : "bot ")."vert ".winsz."wincmd s"
       if !&ea
        keepalt wincmd |
       endif
       call s:SetRexDir(a:islocal,curdir)
+
      elseif g:netrw_browse_split == 3
       " open file in new tab
 "      call Decho("edit-a-file: opening new tab prior to edit",'~'.expand("<slnum>"))
@@ -4861,6 +4898,7 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...)
        let b:netrw_curdir= getcwd()
       endif
       call s:SetRexDir(a:islocal,curdir)
+
      elseif g:netrw_browse_split == 4
       " act like "P" (ie. open previous window)
 "      call Decho("edit-a-file: use previous window for edit",'~'.expand("<slnum>"))
@@ -4870,13 +4908,14 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...)
        return
       endif
       call s:SetRexDir(a:islocal,curdir)
+
      else
       " handling a file, didn't split, so remove menu
 "      call Decho("edit-a-file: handling a file+didn't split, so remove menu",'~'.expand("<slnum>"))
       call s:NetrwMenu(0)
       " optional change to window
       if g:netrw_chgwin >= 1
-"       call Decho("edit-a-file: changing window to #".g:netrw_chgwin,'~'.expand("<slnum>"))
+"       call Decho("edit-a-file: changing window to #".g:netrw_chgwin.": (due to g:netrw_chgwin)",'~'.expand("<slnum>"))
        if winnr("$")+1 == g:netrw_chgwin
 	" if g:netrw_chgwin is set to one more than the last window, then
 	" vertically split the last window to make that window available.
@@ -4889,19 +4928,26 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...)
       endif
       call s:SetRexDir(a:islocal,curdir)
      endif
+
     endif
 
     " the point where netrw actually edits the (local) file
     " if its local only: LocalBrowseCheck() doesn't edit a file, but NetrwBrowse() will
     " no keepalt to support  :e #  to return to a directory listing
+    if !&mod
+     " if e the new file would fail due to &mod, then don't change any of the flags
+     let dolockout= 1
+    endif
     if a:islocal
 "     call Decho("edit-a-file: edit local file: exe e! ".fnameescape(dirname),'~'.expand("<slnum>"))
      " some like c-^ to return to the last edited file
      " others like c-^ to return to the netrw buffer
+     " Apr 30, 2020: used to have e! here.  That can cause loss of a modified file,
+     " so emit error E37 instead.
      if exists("g:netrw_altfile") && g:netrw_altfile
-      exe "NetrwKeepj keepalt e! ".fnameescape(dirname)
+      exe "NetrwKeepj keepalt e ".fnameescape(dirname)
      else
-      exe "NetrwKeepj e! ".fnameescape(dirname)
+      exe "NetrwKeepj e ".fnameescape(dirname)
      endif
 "     call Decho("edit-a-file: after e! ".dirname.": hidden=".&hidden." bufhidden<".&bufhidden."> mod=".&mod,'~'.expand("<slnum>"))
      call s:NetrwCursor()
@@ -4912,7 +4958,6 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...)
     else
 "     call Decho("edit-a-file: remote file: NetrwBrowse will edit it",'~'.expand("<slnum>"))
     endif
-    let dolockout= 1
 
     " handle g:Netrw_funcref -- call external-to-netrw functions
     "   This code will handle g:Netrw_funcref as an individual function reference
@@ -5376,16 +5421,6 @@ fun! netrw#BrowseX(fname,remote)
    endif
    let ret= v:shell_error
 
-  elseif has("unix") && executable("kfmclient") && s:CheckIfKde()
-"   call Decho("(netrw#BrowseX) unix and kfmclient",'~'.expand("<slnum>"))
-   call s:NetrwExe("sil !kfmclient exec ".s:ShellEscape(fname,1)." ".redir)
-   let ret= v:shell_error
-
-  elseif has("unix") && executable("exo-open") && executable("xdg-open") && executable("setsid")
-"   call Decho("(netrw#BrowseX) unix, exo-open, xdg-open",'~'.expand("<slnum>"))
-   call s:NetrwExe("sil !setsid xdg-open ".s:ShellEscape(fname,1).redir)
-   let ret= v:shell_error
-
   elseif has("unix") && $DESKTOP_SESSION == "mate" && executable("atril")
 "   call Decho("(netrw#BrowseX) unix and atril",'~'.expand("<slnum>"))
    if a:fname =~ '^https\=://'
@@ -5400,9 +5435,19 @@ fun! netrw#BrowseX(fname,remote)
    endif
    let ret= v:shell_error
 
+  elseif has("unix") && executable("kfmclient") && s:CheckIfKde()
+"   call Decho("(netrw#BrowseX) unix and kfmclient",'~'.expand("<slnum>"))
+   call s:NetrwExe("sil !kfmclient exec ".s:ShellEscape(fname,1)." ".redir)
+   let ret= v:shell_error
+
+  elseif has("unix") && executable("exo-open") && executable("xdg-open") && executable("setsid")
+"   call Decho("(netrw#BrowseX) unix, exo-open, xdg-open",'~'.expand("<slnum>"))
+   call s:NetrwExe("sil !setsid xdg-open ".s:ShellEscape(fname,1).redir.'&')
+   let ret= v:shell_error
+
   elseif has("unix") && executable("xdg-open")
 "   call Decho("(netrw#BrowseX) unix and xdg-open",'~'.expand("<slnum>"))
-   call s:NetrwExe("sil !xdg-open ".s:ShellEscape(fname,1).redir)
+   call s:NetrwExe("sil !xdg-open ".s:ShellEscape(fname,1).redir.'&')
    let ret= v:shell_error
 
   elseif has("macunix") && executable("open")
@@ -6107,10 +6152,10 @@ fun! s:NetrwListHide()
   " Duplicate characters don't matter.
   " Remove all such characters from the '/~@#...890' string.
   " Use the first character left as a separator character.
-"  call Decho("find a character not in the hide string to use as a separator")
+"  call Decho("find a character not in the hide string to use as a separator",'~'.expand("<slnum>"))
   let listhide= g:netrw_list_hide
   let sep     = strpart(substitute('~@#$%^&*{};:,<.>?|1234567890','['.escape(listhide,'-]^\').']','','ge'),1,1)
-"  call Decho("sep=".sep,"  (sep not in hide string)'~'.expand("<slnum>"))
+"  call Decho("sep<".sep.">  (sep not in hide string)",'~'.expand("<slnum>"))
 
   while listhide != ""
    if listhide =~ ','
@@ -6120,7 +6165,7 @@ fun! s:NetrwListHide()
     let hide     = listhide
     let listhide = ""
    endif
-"   call Decho("..extracted from listhide: hide<".hide."> g:netrw_sort_by<".g:netrw_sort_by.'>','~'.expand("<slnum>"))
+"   call Decho("..extracted pattern from listhide: hide<".hide."> g:netrw_sort_by<".g:netrw_sort_by.'>','~'.expand("<slnum>"))
    if g:netrw_sort_by =~ '^[ts]'
     if hide =~ '^\^'
 "     call Decho("..modify hide to handle a \"^...\" pattern",'~'.expand("<slnum>"))
@@ -6132,7 +6177,7 @@ fun! s:NetrwListHide()
    endif
 
    " Prune the list by hiding any files which match
-"   call Decho("..prune the list by hiding any files which ",((g:netrw_hide == 1)? "" : "don't")." match hide<".hide.">")
+"   call Decho("..prune the list by hiding any files which ".((g:netrw_hide == 1)? "" : "don't")."match hide<".hide.">")
    if g:netrw_hide == 1
 "    call Decho("..hiding<".hide.">",'~'.expand("<slnum>"))
     exe 'sil! NetrwKeepj '.w:netrw_bannercnt.',$g'.sep.hide.sep.'d'
@@ -9215,6 +9260,7 @@ endfun
 " (full path directory with trailing slash returned)
 fun! s:NetrwTreeDir(islocal)
 "  call Dfunc("s:NetrwTreeDir(islocal=".a:islocal.") getline(".line(".").")"."<".getline('.')."> b:netrw_curdir<".b:netrw_curdir."> tab#".tabpagenr()." win#".winnr()." buf#".bufnr("%")."<".bufname("%")."> ft=".&ft)
+"  call Decho("Determine tree directory given current cursor position")
 "  call Decho("g:netrw_keepdir  =".(exists("g:netrw_keepdir")?   g:netrw_keepdir   : 'n/a'),'~'.expand("<slnum>"))
 "  call Decho("w:netrw_liststyle=".(exists("w:netrw_liststyle")? w:netrw_liststyle : 'n/a'),'~'.expand("<slnum>"))
 "  call Decho("w:netrw_treetop  =".(exists("w:netrw_treetop")?   w:netrw_treetop   : 'n/a'),'~'.expand("<slnum>"))
@@ -9320,7 +9366,6 @@ fun! s:NetrwTreeDisplay(dir,depth)
    call setline(line("$")+1,a:depth.shortdir.'/')
   endif
 "  call Decho("setline#".line("$")." shortdir<".a:depth.shortdir.">",'~'.expand("<slnum>"))
-
   " append a / to dir if its missing one
   let dir= a:dir
 
@@ -9334,7 +9379,7 @@ fun! s:NetrwTreeDisplay(dir,depth)
    let listhide= split(g:netrw_list_hide,',')
 "   call Decho("listhide=".string(listhide))
    for pat in listhide
-    call filter(w:netrw_treedict[dir],'v:val !~ "'.pat.'"')
+    call filter(w:netrw_treedict[dir],'v:val !~ "'.escape(pat,'\\').'"')
    endfor
 
   elseif g:netrw_hide == 2
@@ -9472,6 +9517,7 @@ fun! s:NetrwTreeListing(dirname)
 "   call Decho("g:netrw_banner=".g:netrw_banner.": banner ".(g:netrw_banner? "enabled" : "suppressed").": (line($)=".line("$")." byte2line(1)=".byte2line(1)." bannercnt=".w:netrw_bannercnt.")",'~'.expand("<slnum>"))
 
    " display from treetop on down
+"   call Decho("(s:NetrwTreeListing) w:netrw_treetop<".w:netrw_treetop.">")
    NetrwKeepj call s:NetrwTreeDisplay(w:netrw_treetop,"")
 "   call Decho("s:NetrwTreeDisplay) setl noma nomod ro",'~'.expand("<slnum>"))
 
@@ -9742,7 +9788,7 @@ fun! s:PerformListing(islocal)
 
   " Hiding...  -or-  Showing... {{{3
   if g:netrw_banner
-"   call Decho("--handle hiding/showing (g:netrw_hide=".g:netrw_hide." g:netrw_list_hide<".g:netrw_list_hide.">)",'~'.expand("<slnum>"))
+"   call Decho("--handle hiding/showing in banner (g:netrw_hide=".g:netrw_hide." g:netrw_list_hide<".g:netrw_list_hide.">)",'~'.expand("<slnum>"))
    if g:netrw_list_hide != "" && g:netrw_hide
     if g:netrw_hide == 1
      NetrwKeepj put ='\"   Hiding:        '.g:netrw_list_hide
@@ -9795,7 +9841,7 @@ fun! s:PerformListing(islocal)
 "  call Decho("g:netrw_banner=".g:netrw_banner.": banner ".(g:netrw_banner? "enabled" : "suppressed").": (line($)=".line("$")." byte2line(1)=".byte2line(1)." bannercnt=".w:netrw_bannercnt.")",'~'.expand("<slnum>"))
 
   if !g:netrw_banner || line("$") >= w:netrw_bannercnt
-"   call Decho("manipulate directory listing (hide)",'~'.expand("<slnum>"))
+"   call Decho("manipulate directory listing (support hide)",'~'.expand("<slnum>"))
 "   call Decho("g:netrw_hide=".g:netrw_hide." g:netrw_list_hide<".g:netrw_list_hide.">",'~'.expand("<slnum>"))
    if g:netrw_hide && g:netrw_list_hide != ""
     NetrwKeepj call s:NetrwListHide()
@@ -11808,7 +11854,7 @@ endfun
 " ---------------------------------------------------------------------
 " s:NetrwEnew: opens a new buffer, passes netrw buffer variables through {{{2
 fun! s:NetrwEnew(...)
-"  call Dfunc("s:NetrwEnew() a:0=".a:0." bufnr($)=".bufnr("$")." expand(%)<".expand("%").">")
+"  call Dfunc("s:NetrwEnew() a:0=".a:0." win#".winnr()." winnr($)=".winnr("$")." bufnr($)=".bufnr("$")." expand(%)<".expand("%").">")
 "  call Decho("curdir<".((a:0>0)? a:1 : "")."> buf#".bufnr("%")."<".bufname("%").">",'~'.expand("<slnum>"))
 
   " grab a function-local-variable copy of buffer variables
@@ -11875,6 +11921,9 @@ fun! s:NetrwEnew(...)
     endif
    endif
   endif
+  if v:version >= 700 && has("balloon_eval") && !exists("s:initbeval") && !exists("g:netrw_nobeval") && has("syntax") && exists("g:syntax_on")
+   let &l:bexpr = "netrw#BalloonHelp()"
+  endif
 
 "  call Dret("s:NetrwEnew : buf#".bufnr("%")."<".bufname("%")."> expand(%)<".expand("%")."> expand(#)<".expand("#")."> bh=".&bh." win#".winnr()." winnr($)#".winnr("$"))
 endfun
@@ -11934,6 +11983,7 @@ endfun
 "           -1=failed
 fun! s:NetrwLcd(newdir)
 "  call Dfunc("s:NetrwLcd(newdir<".a:newdir.">)")
+"  call Decho("changing local directory",'~'.expand("<slnum>"))
 
   let err472= 0
   try
@@ -11969,6 +12019,8 @@ fun! s:NetrwLcd(newdir)
    return -1
   endif
 
+"  call Decho("getcwd        <".getcwd().">")
+"  call Decho("b:netrw_curdir<".b:netrw_curdir.">")
 "  call Dret("s:NetrwLcd 0")
   return 0
 endfun

runtime/autoload/netrwFileHandlers.vim

@@ -1,8 +1,8 @@
 " netrwFileHandlers: contains various extension-based file handlers for
 "                    netrw's browsers' x command ("eXecute launcher")
 " Author:	Charles E. Campbell
-" Date:		May 03, 2013
+" Date:		Sep 18, 2020
-" Version:	11b	ASTRO-ONLY
+" Version:	11
 " Copyright:    Copyright (C) 1999-2012 Charles E. Campbell {{{1
 "               Permission is hereby granted to use and distribute this code,
 "               with or without modifications, provided that this copyright
@@ -20,7 +20,7 @@
 if exists("g:loaded_netrwFileHandlers") || &cp
  finish
 endif
-let g:loaded_netrwFileHandlers= "v11b"
+let g:loaded_netrwFileHandlers= "v11"
 if v:version < 702
  echohl WarningMsg
  echo "***warning*** this version of netrwFileHandlers needs vim 7.2"

runtime/autoload/python3complete.vim

@@ -1,7 +1,8 @@
 "python3complete.vim - Omni Completion for python
-" Maintainer: Aaron Griffin <aaronmgriffin@gmail.com>
+" Maintainer: <vacancy>
+" Previous Maintainer: Aaron Griffin <aaronmgriffin@gmail.com>
 " Version: 0.9
-" Last Updated: 18 Jun 2009 (small fix 2015 Sep 14 from Debian)
+" Last Updated: 2020 Oct 9
 "
 " Roland Puntaier: this file contains adaptations for python3 and is parallel to pythoncomplete.vim
 "
@@ -83,7 +84,7 @@ function! python3complete#Complete(findstart, base)
                 break
             endif
         endwhile
-        execute "py3 vimpy3complete('" . cword . "', '" . a:base . "')"
+	execute "py3 vimpy3complete('" . escape(cword, "'") . "', '" . escape(a:base, "'") . "')"
         return g:python3complete_completions
     endif
 endfunction

runtime/autoload/pythoncomplete.vim

@@ -1,7 +1,8 @@
 "pythoncomplete.vim - Omni Completion for python
-" Maintainer: Aaron Griffin <aaronmgriffin@gmail.com>
+" Maintainer: <vacancy>
+" Previous Maintainer: Aaron Griffin <aaronmgriffin@gmail.com>
 " Version: 0.9
-" Last Updated: 18 Jun 2009
+" Last Updated: 2020 Oct 9
 "
 " Changes
 " TODO:
@@ -81,7 +82,7 @@ function! pythoncomplete#Complete(findstart, base)
                 break
             endif
         endwhile
-        execute "python vimcomplete('" . cword . "', '" . a:base . "')"
+        execute "python vimcomplete('" . escape(cword, "'") . "', '" . escape(a:base, "'") . "')"
         return g:pythoncomplete_completions
     endif
 endfunction

runtime/autoload/spellfile.vim

@@ -1,15 +1,11 @@
 " Vim script to download a missing spell file
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2012 Jan 08
+" Last Change:	2020 Jul 10
 
 if !exists('g:spellfile_URL')
-  " Prefer using http:// when netrw should be able to use it, since
+  " Always use https:// because it's secure.  The certificate is for nluug.nl,
-  " more firewalls let this through.
+  " thus we can't use the alias ftp.vim.org here.
-  if executable("curl") || executable("wget") || executable("fetch")
+  let g:spellfile_URL = 'https://ftp.nluug.nl/pub/vim/runtime/spell'
-    let g:spellfile_URL = 'http://ftp.vim.org/pub/vim/runtime/spell'
-  else
-    let g:spellfile_URL = 'ftp://ftp.vim.org/pub/vim/runtime/spell'
-  endif
 endif
 let s:spellfile_URL = ''    " Start with nothing so that s:donedict is reset.
 

runtime/colors/README.txt

@@ -67,7 +67,7 @@ You can use ":highlight" to find out the current colors.  Exception: the
 ctermfg and ctermbg values are numbers, which are only valid for the current
 terminal.  Use the color names instead.  See ":help cterm-colors".
 
-The default color settings can be found in the source file src/syntax.c.
+The default color settings can be found in the source file src/highlight.c.
 Search for "highlight_init".
 
 If you think you have a color scheme that is good enough to be used by others,

runtime/colors/tools/check_colors.vim

@@ -185,7 +185,7 @@ func! Test_check_colors()
 
   " 9) Normal should be defined first, not use reverse, fg or bg
   call cursor(1,1)
-  let pat = 'hi\%[light] \+\%(link\|clear\)\@!\w\+\>'
+  let pat = 'hi\%[ghlight] \+\%(link\|clear\)\@!\w\+\>'
   call search(pat, 'cW') " Look for the first hi def, skipping `hi link` and `hi clear`
   if getline('.') !~# '\m\<Normal\>'
     let err['highlight']['Normal'] = 'Should be defined first'

runtime/compiler/checkstyle.vim

@@ -1,7 +1,7 @@
 " Vim compiler file
 " Compiler:	Checkstyle
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:	2013 Jun 26
+" Last Change:	2020 Aug 2
 
 if exists("current_compiler")
   finish
@@ -12,8 +12,18 @@ if exists(":CompilerSet") != 2		" older Vim always used :setlocal
   command -nargs=* CompilerSet setlocal <args>
 endif
 
-CompilerSet makeprg=java\ com.puppycrawl.tools.checkstyle.Main\ -f\ plain
+let s:cpo_save = &cpo
+set cpo&vim
 
-" sample error: WebTable.java:282: '+=' is not preceeded with whitespace.
+" CompilerSet makeprg=java\ com.puppycrawl.tools.checkstyle.Main\ -f\ plain\ -c\ /sun_checks.xml
-"		WebTable.java:201:1: '{' should be on the previous line.
+" CompilerSet makeprg=java\ -jar\ checkstyle-X.XX-all.jar\ -f\ plain\ -c\ /sun_checks.xml
-CompilerSet errorformat=%f:%l:%v:\ %m,%f:%l:\ %m,%-G%.%#
+
+CompilerSet makeprg=checkstyle\ -f\ plain
+CompilerSet errorformat=[%tRROR]\ %f:%l:%v:\ %m,
+		       \[%tARN]\ %f:%l:%v:\ %m,
+		       \[%tRROR]\ %f:%l:\ %m,
+		       \[%tARN]\ %f:%l:\ %m,
+		       \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/compiler/dart.vim

@@ -0,0 +1,26 @@
+" Vim compiler file
+" Compiler:	Dart VM
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2019 May 08
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "dart"
+
+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=dart
+CompilerSet errorformat=%E%f:%l:%c:\ Error:\ %m,
+		       \%CTry\ %.%#,
+		       \%Z\ %#^%\\+,
+		       \%C%.%#,
+		       \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/compiler/dart2js.vim

@@ -0,0 +1,28 @@
+" Vim compiler file
+" Compiler:	Dart to JavaScript Compiler
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2019 May 08
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "dart2js"
+
+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=dart2js
+CompilerSet errorformat=%E%f:%l:%c:,
+		       \%-GError:\ Compilation\ failed.,
+		       \%CError:\ %m,
+		       \%Z\ %#^%\\+,
+		       \%C%.%#,
+		       \%trror:\ %m,
+		       \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/compiler/dart2native.vim

@@ -0,0 +1,28 @@
+" Vim compiler file
+" Compiler:	Dart to Native Compiler
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2019 May 08
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "dart2native"
+
+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=dart2native
+CompilerSet errorformat=%E%f:%l:%c:\ Error:\ %m,
+		       \%CTry\ %.%#,
+		       \%Z\ %#^%\\+,
+		       \%Z%$,
+		       \%C%.%#,
+		       \%E%f:\ %trror:\ %m,
+		       \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/compiler/dartanalyser.vim

@@ -0,0 +1,23 @@
+" Vim compiler file
+" Compiler:	Dart Analyzer
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2019 May 08
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "dartanalyzer"
+
+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=dartanalyzer\ --format\ machine
+CompilerSet errorformat=%t%\\w%\\+\|%\\w%\\+\|%\\w%\\+\|%f\|%l\|%c\|%\\d%\\+\|%m,
+		       \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/compiler/dartdevc.vim

@@ -0,0 +1,28 @@
+" Vim compiler file
+" Compiler:	Dart Development Compiler
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2019 May 08
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "dartdevc"
+
+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=dartdevc
+CompilerSet errorformat=%E%f:%l:%c:\ Error:\ %m,
+		       \%CTry\ %.%#,
+		       \%Z\ %#^%\\+,
+		       \%Z%$,
+		       \%C%.%#,
+		       \%E%f:\ %trror:\ %m,
+		       \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/compiler/dartdoc.vim

@@ -0,0 +1,26 @@
+" Vim compiler file
+" Compiler:	Dart Documentation Generator
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2019 May 08
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "dartdoc"
+
+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=dartdoc
+CompilerSet errorformat=\ \ %tarning:\ %m,
+		       \\ \ %trror:\ %m,
+		       \%+EGeneration\ failed:\ %m,
+		       \%+ISuccess!\ Docs\ generated\ into\ %f,
+		       \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/compiler/dartfmt.vim

@@ -0,0 +1,25 @@
+" Vim compiler file
+" Compiler:	Dart Formatter
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2019 May 08
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "dartfmt"
+
+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=dartfmt
+CompilerSet errorformat=%Eline\ %l\\,\ column\ %c\ of\ %f:\ %m,
+		       \%Z\ %\\{3}│\ %\\+^%\\+,
+		       \%C%.%#,
+		       \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/compiler/eslint.vim

@@ -1,7 +1,7 @@
 " Vim compiler file
 " Compiler:    ESLint for JavaScript
 " Maintainer:  Romain Lafourcade <romainlafourcade@gmail.com>
-" Last Change: 2020 May 17
+" Last Change: 2020 August 20
 
 if exists("current_compiler")
   finish
@@ -12,5 +12,5 @@ if exists(":CompilerSet") != 2
   command -nargs=* CompilerSet setlocal <args>
 endif
 
-CompilerSet makeprg=eslint\ --format\ compact
+CompilerSet makeprg=npx\ eslint\ --format\ compact
 CompilerSet errorformat=%f:\ line\ %l\\,\ col\ %c\\,\ %m,%-G%.%#

runtime/compiler/gawk.vim

@@ -0,0 +1,34 @@
+" Vim compiler file
+" Compiler:	GNU Awk
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2020 Feb 10
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "gawk"
+
+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=gawk
+CompilerSet errorformat=%Z%.awk:\ %f:%l:\ %p^\ %m,
+		       \%Eg%\\=awk:\ %f:%l:\ fatal:\ %m,
+		       \%Egawk:\ %f:%l:\ error:\ %m,
+		       \%Wgawk:\ %f:%l:\ warning:\ %m,
+		       \%Egawk:\ %f:%l:\ %.%#,
+		       \gawk:\ %f:%l:\ %tatal:\ %m,
+		       \gawk:\ %f:%l:\ %trror:\ %m,
+		       \gawk:\ %f:%l:\ %tarning:\ %m,
+		       \gawk:\ %tatal:\ %m,
+		       \gawk:\ %trror:\ %m,
+		       \gawk:\ %tarning:\ %m,
+		       \%+C%.%#,
+		       \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/compiler/gjs.vim

@@ -0,0 +1,25 @@
+" Vim compiler file
+" Compiler:	GJS (Gnome JavaScript Bindings)
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2019 Jul 10
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "gjs"
+
+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=gjs
+CompilerSet errorformat=%.%#JS\ %tRROR:\ %m\ @\ %f:%c,
+		       \%E%.%#JS\ ERROR:\ %m,
+		       \%Z@%f:%l:%c,
+		       \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/compiler/javac.vim

@@ -1,7 +1,7 @@
 " Vim compiler file
-" Compiler:	javac
+" Compiler:	Java Development Kit Compiler
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:	2004 Nov 27
+" Last Change:	2019 Oct 21
 
 if exists("current_compiler")
   finish
@@ -12,6 +12,15 @@ if exists(":CompilerSet") != 2		" older Vim always used :setlocal
   command -nargs=* CompilerSet setlocal <args>
 endif
 
-CompilerSet makeprg=javac
+let s:cpo_save = &cpo
+set cpo&vim
 
-CompilerSet errorformat=%E%f:%l:\ %m,%-Z%p^,%-C%.%#,%-G%.%#
+CompilerSet makeprg=javac
+CompilerSet errorformat=%E%f:%l:\ error:\ %m,
+		       \%W%f:%l:\ warning:\ %m,
+		       \%-Z%p^,
+		       \%-C%.%#,
+		       \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/compiler/jest.vim

@@ -0,0 +1,30 @@
+" Vim compiler file
+" Compiler:	Jest
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2018 May 15
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "jest"
+
+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=npx\ jest\ --no-colors
+
+CompilerSet makeprg=jest\ --no-colors
+CompilerSet errorformat=%E\ \ ●\ %m,
+		       \%Z\ %\\{4}%.%#Error:\ %f:\ %m\ (%l:%c):%\\=,
+		       \%Z\ %\\{6}at\ %\\S%#\ (%f:%l:%c),
+		       \%+C\ %\\{4}%\\w%.%#,
+		       \%+C\ %\\{4}%[-+]%.%#,
+		       \%-C%.%#,
+		       \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/compiler/jjs.vim

@@ -0,0 +1,24 @@
+" Vim compiler file
+" Compiler:	Nashorn Shell
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2018 Jan 9
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "jjs"
+
+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=jjs
+CompilerSet errorformat=%f:%l:%c\ %m,
+		       \%f:%l\ %m,
+		       \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/compiler/jshint.vim

@@ -0,0 +1,25 @@
+" Vim compiler file
+" Compiler:	JSHint
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2019 Jul 10
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "jshint"
+
+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=npx\ jshint\ --verbose
+
+CompilerSet makeprg=jshint\ --verbose
+CompilerSet errorformat=%f:\ line\ %l\\,\ col\ %c\\,\ %m\ (%t%n),
+		       \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/compiler/jsonlint.vim

@@ -0,0 +1,25 @@
+" Vim compiler file
+" Compiler:	JSON Lint
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2019 Jul 10
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "jsonlint"
+
+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=npx\ jsonlint\ --compact\ --quiet
+
+CompilerSet makeprg=jsonlint\ --compact\ --quiet
+CompilerSet errorformat=%f:\ line\ %l\\,\ col\ %c\\,\ found:\ %m,
+		       \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/compiler/rhino.vim

@@ -0,0 +1,30 @@
+" Vim compiler file
+" Compiler:	Rhino Shell (JavaScript in Java)
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2019 Jul 10
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "rhino"
+
+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=java\ -jar\ lib/rhino-X.X.XX.jar\ -w\ -strict
+
+CompilerSet makeprg=rhino
+CompilerSet errorformat=%-Gjs:\ %.%#Compilation\ produced%.%#,
+		       \%Ejs:\ \"%f\"\\,\ line\ %l:\ %m,
+		       \%Ejs:\ uncaught\ JavaScript\ runtime\ exception:\ %m,
+		       \%Wjs:\ warning:\ \"%f\"\\,\ line\ %l:\ %m,
+		       \%Zjs:\ %p^,
+		       \%Cjs:\ %.%#,
+		       \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/compiler/rubocop.vim

@@ -0,0 +1,23 @@
+" Vim compiler file
+" Compiler:	RuboCop
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2019 Jul 10
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "rubocop"
+
+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=rubocop\ --format\ emacs
+CompilerSet errorformat=%f:%l:%c:\ %t:\ %m,
+		       \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/compiler/shellcheck.vim

@@ -0,0 +1,25 @@
+" Vim compiler file
+" Compiler:	ShellCheck
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2020 Sep 4
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "shellcheck"
+
+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=shellcheck\ -f\ gcc
+CompilerSet errorformat=%f:%l:%c:\ %trror:\ %m\ [SC%n],
+		       \%f:%l:%c:\ %tarning:\ %m\ [SC%n],
+		       \%f:%l:%c:\ %tote:\ %m\ [SC%n],
+		       \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/compiler/standard.vim

@@ -1,7 +1,7 @@
 " Vim compiler file
 " Compiler:    Standard for JavaScript
 " Maintainer:  Romain Lafourcade <romainlafourcade@gmail.com>
-" Last Change: 2020 May 17
+" Last Change: 2020 August 20
 
 if exists("current_compiler")
   finish
@@ -12,5 +12,5 @@ if exists(":CompilerSet") != 2
   command -nargs=* CompilerSet setlocal <args>
 endif
 
-CompilerSet makeprg=standard
+CompilerSet makeprg=npx\ standard
-CompilerSet errorformat=%f:\ line\ %l\\,\ col\ %c\\,\ %m,%-G%.%#
+CompilerSet errorformat=%f:%l:%c:\ %m,%-G%.%#

runtime/compiler/stylelint.vim

@@ -0,0 +1,26 @@
+" Vim compiler file
+" Compiler:	Stylelint
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2020 Jun 10
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "stylelint"
+
+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=npx\ stylelint\ --formatter\ compact
+
+CompilerSet makeprg=stylelint\ --formatter\ compact
+CompilerSet errorformat=%f:\ line\ %l\\,\ col\ %c\\,\ %trror\ -\ %m,
+		       \%f:\ line\ %l\\,\ col\ %c\\,\ %tarning\ -\ %m,
+		       \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/compiler/ts-node.vim

@@ -0,0 +1,29 @@
+" Vim compiler file
+" Compiler:	TypeScript Runner
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2020 Feb 10
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "node"
+
+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=npx\ ts-node
+
+CompilerSet makeprg=ts-node
+CompilerSet errorformat=%f\ %#(%l\\,%c):\ %trror\ TS%n:\ %m,
+		       \%E%f:%l,
+		       \%+Z%\\w%\\+Error:\ %.%#,
+		       \%C%p^%\\+,
+		       \%C%.%#,
+		       \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/compiler/tsc.vim

@@ -0,0 +1,26 @@
+" Vim compiler file
+" Compiler:	TypeScript Compiler
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2020 Feb 10
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "tsc"
+
+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=npx\ tsc
+
+CompilerSet makeprg=tsc
+CompilerSet errorformat=%f\ %#(%l\\,%c):\ %trror\ TS%n:\ %m,
+		       \%trror\ TS%n:\ %m,
+		       \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/compiler/typedoc.vim

@@ -0,0 +1,28 @@
+" Vim compiler file
+" Compiler:	TypeDoc
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2020 Feb 10
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "typedoc"
+
+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=npx\ typedoc
+
+CompilerSet makeprg=typedoc
+CompilerSet errorformat=%EError:\ %f(%l),
+		       \%WWarning:\ %f(%l),
+		       \%+IDocumentation\ generated\ at\ %f,
+		       \%Z\ %m,
+		       \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/compiler/xmllint.vim

@@ -1,7 +1,7 @@
 " Vim compiler file
-" Compiler:	xmllint
+" Compiler:	Libxml2 Command-Line Tool
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:	2013 Jul 8
+" Last Change:	2020 Jul 30
 
 if exists("current_compiler")
   finish
@@ -13,14 +13,16 @@ if exists(":CompilerSet") != 2		" older Vim always used :setlocal
 endif
 
 let s:cpo_save = &cpo
-set cpo-=C
+set cpo&vim
 
 CompilerSet makeprg=xmllint\ --valid\ --noout
-
+CompilerSet errorformat=%E%f:%l:\ %.%#\ error\ :\ %m,
-CompilerSet errorformat=%+E%f:%l:\ %.%#\ error\ :\ %m,
+		       \%W%f:%l:\ %.%#\ warning\ :\ %m,
-		    \%+W%f:%l:\ %.%#\ warning\ :\ %m,
+		       \%-Z%p^,
-		    \%-Z%p^,
+		       \%C%.%#,
-		    \%-G%.%#
+		       \%terror:\ %m,
+		       \%tarning:\ %m,
+		       \%-G%.%#
 
 let &cpo = s:cpo_save
 unlet s:cpo_save

runtime/compiler/xo.vim

@@ -0,0 +1,26 @@
+" Vim compiler file
+" Compiler:	XO
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2019 Jul 10
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "xo"
+
+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=npx\ xo\ --reporter\ compact
+
+CompilerSet makeprg=xo\ --reporter\ compact
+CompilerSet errorformat=%f:\ line\ %l\\,\ col\ %c\\,\ %trror\ %m,
+		       \%f:\ line\ %l\\,\ col\ %c\\,\ %tarning\ %m,
+		       \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/defaults.vim

@@ -1,7 +1,7 @@
 " The default vimrc file.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last change:	2019 Oct 27
+" Last change:	2020 Sep 30
 "
 " This is loaded if no vimrc file was found.
 " Except when Vim is run with "-u NONE" or "-C".
@@ -85,17 +85,6 @@ if has('mouse')
   endif
 endif
 
-" Switch syntax highlighting on when the terminal has colors or when using the
-" GUI (which always has colors).
-if &t_Co > 2 || has("gui_running")
-  " Revert with ":syntax off".
-  syntax on
-
-  " I like highlighting strings inside C comments.
-  " Revert with ":unlet c_comment_strings".
-  let c_comment_strings=1
-endif
-
 " Only do this part when Vim was compiled with the +eval feature.
 if 1
 
@@ -124,6 +113,17 @@ if 1
 
 endif
 
+" Switch syntax highlighting on when the terminal has colors or when using the
+" GUI (which always has colors).
+if &t_Co > 2 || has("gui_running")
+  " Revert with ":syntax off".
+  syntax on
+
+  " I like highlighting strings inside C comments.
+  " Revert with ":unlet c_comment_strings".
+  let c_comment_strings=1
+endif
+
 " Convenient command to see the difference between the current buffer and the
 " file it was loaded from, thus the changes you made.
 " Only define it when not defined already.

runtime/doc/Makefile

@@ -396,7 +396,7 @@ test_urls:
 	vim -S test_urls.vim
 
 clean:
-	-rm doctags *.html tags.ref
+	-rm -f doctags *.html tags.ref
 
 # These files are in the extra archive, skip if not present
 

runtime/doc/arabic.txt

@@ -77,7 +77,7 @@ Arabic requires ISO-8859-6 as well as Presentation Form-B fonts
 (without Form-B, Arabic will _NOT_ be usable).	It is highly
 recommended that users search for so-called 'ISO-10646-1' fonts.
 Do an Internet search or check www.arabeyes.org for further
-info on where to attain the necessary Arabic fonts.
+info on where to obtain the necessary Arabic fonts.
 
 
 Font Installation
@@ -123,7 +123,7 @@ o  Setting the appropriate character Encoding
 >
 		:set encoding=utf-8
 <
-   to your .vimrc file (entering the command manually into you Vim
+   to your .vimrc file (entering the command manually into your Vim
    window is highly discouraged).  In short, include ':set
    encoding=utf-8' to your .vimrc file.
 

runtime/doc/autocmd.txt

@@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 8.2.  Last change: 2020 Jun 10
+*autocmd.txt*   For Vim version 8.2.  Last change: 2020 Sep 25
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -631,7 +631,7 @@ CompleteDone			After Insert mode completion is done.  Either
 
 							*CursorHold*
 CursorHold			When the user doesn't press a key for the time
-				specified with 'updatetime'.  Not re-triggered
+				specified with 'updatetime'.  Not triggered
 				until the user has pressed a key (i.e. doesn't
 				fire every 'updatetime' ms if you leave Vim to
 				make some coffee. :)  See |CursorHold-example|
@@ -1425,8 +1425,8 @@ name!
 :aug[roup]! {name}		Delete the autocmd group {name}.  Don't use
 				this if there is still an autocommand using
 				this group!  You will get a warning if doing
-				it anyway. when the group is the current group
+				it anyway.  When the group is the current
-				you will get error E936.
+				group you will get error E936.
 
 To enter autocommands for a specific group, use this method:
 1. Select the group with ":augroup {name}".

runtime/doc/change.txt

@@ -1,4 +1,4 @@
-*change.txt*    For Vim version 8.2.  Last change: 2020 Jun 04
+*change.txt*    For Vim version 8.2.  Last change: 2020 Aug 15
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -153,7 +153,7 @@ the 'joinspaces' option is on, these commands insert two spaces after a '.',
 '!' or '?' (but if 'cpoptions' includes the 'j' flag, they insert two spaces
 only after a '.').
 The 'B' and 'M' flags in 'formatoptions' change the behavior for inserting
-spaces before and after a multi-byte character |fo-table|.
+spaces before and after a multibyte character |fo-table|.
 
 The '[ mark is set at the end of the first line that was joined, '] at the end
 of the resulting line.
@@ -1680,11 +1680,11 @@ b	Like 'v', but only auto-wrap if you enter a blank at or before
 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.
-m	Also break at a multi-byte character above 255.  This is useful for
+m	Also break at a multibyte character above 255.  This is useful for
 	Asian text where every character is a word on its own.
-M	When joining lines, don't insert a space before or after a multi-byte
+M	When joining lines, don't insert a space before or after a multibyte
 	character.  Overrules the 'B' flag.
-B	When joining lines, don't insert a space between two multi-byte
+B	When joining lines, don't insert a space between two multibyte
 	characters.  Overruled by the 'M' flag.
 1	Don't break a line after a one-letter word.  It's broken before it
 	instead (if possible).
@@ -1755,7 +1755,7 @@ Some examples:
 Automatic formatting				*auto-format* *autoformat*
 
 When the 'a' flag is present in 'formatoptions' text is formatted
-automatically when inserting text or deleting text.  This works nice for
+automatically when inserting text or deleting text.  This works nicely for
 editing text paragraphs.  A few hints on how to use this:
 
 - You need to properly define paragraphs.  The simplest is paragraphs that are

runtime/doc/channel.txt

@@ -1,4 +1,4 @@
-*channel.txt*      For Vim version 8.2.  Last change: 2020 Jun 01
+*channel.txt*      For Vim version 8.2.  Last change: 2020 Sep 03
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -608,6 +608,10 @@ ch_logfile({fname} [, {mode}])					*ch_logfile()*
 		after every message, on Unix you can use "tail -f" to see what
 		is going on in real time.
 
+		To enable the log very early, to see what is received from a
+		terminal during startup, use |--cmd|: >
+			vim --cmd "call ch_logfile('logfile', 'w')"
+<
 		This function is not available in the |sandbox|.
 		NOTE: the channel communication is stored in the file, be
 		aware that this may contain confidential and privacy sensitive
@@ -1256,10 +1260,12 @@ After setting 'buftype' to "prompt" Vim does not automatically start Insert
 mode, use `:startinsert` if you want to enter Insert mode, so that the user
 can start typing a line.
 
-The text of the prompt can be set with the |prompt_setprompt()| function.
+The text of the prompt can be set with the |prompt_setprompt()| function. If
+no prompt is set with |prompt_setprompt()|, "% " is used. You can get the
+effective prompt text for a buffer, with |prompt_getprompt()|.
 
 The user can go to Normal mode and navigate through the buffer.  This can be
-useful see older output or copy text.
+useful to see older output or copy text.
 
 The CTRL-W key can be used to start a window command, such as CTRL-W w to
 switch to the next window.  This also works in Insert mode (use Shift-CTRL-W

runtime/doc/cmdline.txt

@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 8.2.  Last change: 2020 Apr 23
+*cmdline.txt*   For Vim version 8.2.  Last change: 2020 Sep 14
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -797,7 +797,7 @@ three lines: >
 <
 
 Visual Mode and Range					*v_:*
-
+							*:star-visual-range*
 {Visual}:	Starts a command-line with the Visual selected lines as a
 		range.  The code `:'<,'>` is used for this range, which makes
 		it possible to select a similar line from the command-line
@@ -873,49 +873,62 @@ it, no matter how many backslashes.
 	   \\#			\#
 Also see |`=|.
 
-			       *:<cword>* *<cword>* *:<cWORD>* *<cWORD>*
+							*E499* *E500*
-			       *:<cexpr>* *<cexpr>* *:<cfile>* *<cfile>*
-			       *:<afile>* *<afile>* *:<abuf>* *<abuf>*
-			       *:<amatch>* *<amatch>*
-			       *:<sfile>* *<sfile>* *:<slnum>* *<slnum>*
-			       *:<sflnum>* *<sflnum>* *E499* *E500*
 Note: these are typed literally, they are not special keys!
+							*:<cword>* *<cword>*
 	<cword>    is replaced with the word under the cursor (like |star|)
+							*:<cWORD>* *<cWORD>*
 	<cWORD>    is replaced with the WORD under the cursor (see |WORD|)
+							*:<cexpr>* *<cexpr>*
 	<cexpr>    is replaced with the word under the cursor, including more
 		   to form a C expression.  E.g., when the cursor is on "arg"
 		   of "ptr->arg" then the result is "ptr->arg"; when the
 		   cursor is on "]" of "list[idx]" then the result is
 		   "list[idx]".  This is used for |v:beval_text|.
+							*:<cfile>* *<cfile>*
 	<cfile>    is replaced with the path name under the cursor (like what
 		   |gf| uses)
+							*:<afile>* *<afile>*
 	<afile>    When executing autocommands, is replaced with the file name
 		   of the buffer being manipulated, or the file for a read or
 		   write.  *E495*
+							*:<abuf>* *<abuf>*
 	<abuf>     When executing autocommands, is replaced with the currently
 		   effective buffer number (for ":r file" and ":so file" it is
 		   the current buffer, the file being read/sourced is not in a
 		   buffer).  *E496*
+							*:<amatch>* *<amatch>*
 	<amatch>   When executing autocommands, is replaced with the match for
 		   which this autocommand was executed.  *E497*
 		   It differs from <afile> only when the file name isn't used
 		   to match with (for FileType, Syntax and SpellFileMissing
 		   events).
+							*:<sfile>* *<sfile>*
 	<sfile>    When executing a ":source" command, is replaced with the
 		   file name of the sourced file.  *E498*
-		   When executing a function, is replaced with:
+		   When executing a function, is replaced with the call stack,
-		   "function {function-name}[{lnum}]"
+		   as with <stack> (this is for backwards compatibility, using
-		   function call nesting is indicated like this:
+		   <stack> is preferred).
-		   "function {function-name1}[{lnum}]..{function-name2}[{lnum}]"
 		   Note that filename-modifiers are useless when <sfile> is
-		   used inside a function.
+		   not used inside a script.
+							*:<stack>* *<stack>*
+	<stack>	   is replaced with the call stack, using
+		   "function {function-name}[{lnum}]" for a function line
+		   and "script {file-name}[{lnum}]" for a script line, and
+		   ".." in between items.  E.g.:
+		   "function {function-name1}[{lnum}]..{function-name2}[{lnum}]"
+							*:<slnum>* *<slnum>*
 	<slnum>	   When executing a ":source" command, is replaced with the
 		   line number.  *E842*
 		   When executing a function it's the line number relative to
 		   the start of the function.
+							*:<sflnum>* *<sflnum>*
 	<sflnum>   When executing a script, is replaced with the line number.
 		   It differs from <slnum> in that <sflnum> is replaced with
 		   the script line number in any situation.  *E961*
+							*:<client>* *<client>*
+	<client>   is replaced with the {clinetid} of the last received
+		   message in |server2client()|
 
 							 *filename-modifiers*
 *:_%:* *::8* *::p* *::.* *::~* *::h* *::t* *::r* *::e* *::s* *::gs* *::S*
@@ -1126,7 +1139,8 @@ CTRL-C		Continue in Command-line mode.  The command-line under the
 		in Normal mode.  There is no redraw, thus the window will
 		remain visible.
 :quit		Discard the command line and go back to Normal mode.
-		":close", ":exit", ":xit" and CTRL-\ CTRL-N also work.
+		":close", CTRL-W c, ":exit", ":xit" and CTRL-\ CTRL-N also
+		work.
 :qall		Quit Vim, unless there are changes in some buffer.
 :qall!		Quit Vim, discarding changes to any buffer.
 

runtime/doc/develop.txt

@@ -1,4 +1,4 @@
-*develop.txt*   For Vim version 8.2.  Last change: 2020 Apr 13
+*develop.txt*   For Vim version 8.2.  Last change: 2020 Aug 15
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -34,8 +34,8 @@ balance must be found between them.
 VIM IS... VI COMPATIBLE					*design-compatible*
 
 First of all, it should be possible to use Vim as a drop-in replacement for
-Vi.  When the user wants to, he can use Vim in compatible mode and hardly
+Vi.  When the user wants to, Vim can be used in compatible mode and hardly
-notice any difference with the original Vi.
+any differences with the original Vi will be noticed.
 
 Exceptions:
 - We don't reproduce obvious Vi bugs in Vim.
@@ -473,7 +473,7 @@ available spell checking libraries and programs.  Unfortunately, the result
 was that none of them provided sufficient capabilities to be used as the spell
 checking engine in Vim, for various reasons:
 
-- Missing support for multi-byte encodings.  At least UTF-8 must be supported,
+- Missing support for multibyte encodings.  At least UTF-8 must be supported,
   so that more than one language can be used in the same file.
   Doing on-the-fly conversion is not always possible (would require iconv
   support).

runtime/doc/digraph.txt

@@ -1,4 +1,4 @@
-*digraph.txt*   For Vim version 8.2.  Last change: 2019 May 05
+*digraph.txt*   For Vim version 8.2.  Last change: 2020 Jul 16
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -33,6 +33,8 @@ An alternative is using the 'keymap' option.
 			it is the Unicode character, see |digraph-encoding|.
 			Example: >
 	:digr e: 235 a: 228
+<			You can use `:exe` to enter a hex number: >
+	:exe 'digr += ' .. 0x2A72
 <			Avoid defining a digraph with '_' (underscore) as the
 			first character, it has a special meaning in the
 			future.
@@ -919,6 +921,7 @@ char  digraph	hex	dec	official name ~
 ‟	9"	201F	8223	DOUBLE HIGH-REVERSED-9 QUOTATION MARK
 †	/-	2020	8224	DAGGER
 ‡	/=	2021	8225	DOUBLE DAGGER
+•	oo	2022	8226	BULLET
 ‥	..	2025	8229	TWO DOT LEADER
 …	,.	2026	8230	HORIZONTAL ELLIPSIS
 ‰	%0	2030	8240	PER MILLE SIGN

runtime/doc/editing.txt

@@ -1,4 +1,4 @@
-*editing.txt*   For Vim version 8.2.  Last change: 2020 Jun 05
+*editing.txt*   For Vim version 8.2.  Last change: 2020 Aug 17
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -652,7 +652,7 @@ list of the current window.
 				:args ## x
 <			This will add the "x" item and sort the new list.
 
-:argd[elete] {pattern} ..			*:argd* *:argdelete* *E480*
+:argd[elete] {pattern} ..		*:argd* *:argdelete* *E480* *E610*
 			Delete files from the argument list that match the
 			{pattern}s.  {pattern} is used like a file pattern,
 			see |file-pattern|.  "%" can be used to delete the
@@ -662,7 +662,7 @@ list of the current window.
 			Example: >
 				:argdel *.obj
 
-:[range]argd[elete]	Delete the {range} files from the argument list.
+:[range]argd[elete]	Delete the [range] files from the argument list.
 			Example: >
 				:10,$argdel
 <			Deletes arguments 10 and further, keeping 1-9. >
@@ -1402,7 +1402,7 @@ to 0, 'modeline' off, 'expandtab' off).  Setting the 'binary' option has the
 same effect.  Don't forget to do this before reading the file.
 
 There are a few things to remember when editing binary files:
-- When editing executable files the number of characters must not change.
+- When editing executable files the number of bytes must not change.
   Use only the "R" or "r" command to change text.  Do not delete characters
   with "x" or by backspacing.
 - Set the 'textwidth' option to 0.  Otherwise lines will unexpectedly be
@@ -1410,7 +1410,7 @@ There are a few things to remember when editing binary files:
 - When there are not many <EOL>s, the lines will become very long.  If you
   want to edit a line that does not fit on the screen reset the 'wrap' option.
   Horizontal scrolling is used then.  If a line becomes too long (more than
-  about 32767 characters on the Amiga, much more on 32-bit systems, see
+  about 32767 bytes on the Amiga, much more on 32-bit and 64-bit systems, see
   |limits|) you cannot edit that line.  The line will be split when reading
   the file.  It is also possible that you get an "out of memory" error when
   reading the file.

runtime/doc/filetype.txt

@@ -1,4 +1,4 @@
-*filetype.txt*  For Vim version 8.2.  Last change: 2019 Jul 16
+*filetype.txt*  For Vim version 8.2.  Last change: 2020 Sep 28
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -163,8 +163,8 @@ file.  It will be overwritten when installing a new version of Vim.
 
 A. If you want to overrule all default file type checks.
    This works by writing one file for each filetype.  The disadvantage is that
-   means there can be many files.  The advantage is that you can simply drop
+   there can be many files.  The advantage is that you can simply drop this
-   this file in the right directory to make it work.
+   file in the right directory to make it work.
 							*ftdetect*
    1. Create your user runtime directory.  You would normally use the first
       item of the 'runtimepath' option.  Then create the directory "ftdetect"
@@ -397,6 +397,13 @@ ways to change this:
 3.  Docs for the default filetype plugins.		*ftplugin-docs*
 
 
+AWK							*ft-awk-plugin*
+
+Support for features specific to GNU Awk, like @include, can be enabled by
+setting: >
+	let g:awk_is_gawk = 1
+
+
 CHANGELOG						*ft-changelog-plugin*
 
 Allows for easy entrance of Changelog entries in Changelog files.  There are

runtime/doc/ft_sql.txt

@@ -312,7 +312,7 @@ can create any of the following: >
 	$VIM/vimfiles/indent/sqlite.vim
 
 No changes are necessary to the SQLSetType function.  It will automatically
-pickup the new SQL files and load them when you issue the SQLSetType command.
+pick up the new SQL files and load them when you issue the SQLSetType command.
 
 
 ==============================================================================
@@ -519,7 +519,7 @@ beginning with those characters.  >
  4.3.2 Column Completion:			*sql-completion-columns*
 
 The SQL completion plugin can also display a list of columns for particular
-tables.  The column completion is trigger via <C-C>c.
+tables.  The column completion is triggered via <C-C>c.
 
 NOTE: The following example uses <Right> to trigger a column list while
       the popup window is active.
@@ -727,7 +727,7 @@ your platform (often a case on *nix) you define the following variable in
 your |vimrc|: >
     let g:omni_sql_no_default_maps = 1
 
-Do no edit ftplugin/sql.vim directly!  If you change this file your changes
+Do not edit ftplugin/sql.vim directly!  If you change this file your changes
 will be over written on future updates.  Vim has a special directory structure
 which allows you to make customizations without changing the files that are
 included with the Vim distribution.  If you wish to customize the maps

runtime/doc/gui.txt

@@ -1,4 +1,4 @@
-*gui.txt*       For Vim version 8.2.  Last change: 2020 Mar 16
+*gui.txt*       For Vim version 8.2.  Last change: 2020 Sep 28
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -547,15 +547,6 @@ floating menus that do not appear on the main menu bar.
 5.2 Creating New Menus					*creating-menus*
 
 				*:me*  *:menu*   *:noreme*  *:noremenu*
-				*:am*  *:amenu*  *:an*      *:anoremenu*
-				*:nme* *:nmenu*  *:nnoreme* *:nnoremenu*
-				*:ome* *:omenu*  *:onoreme* *:onoremenu*
-				*:vme* *:vmenu*  *:vnoreme* *:vnoremenu*
-				*:xme* *:xmenu*  *:xnoreme* *:xnoremenu*
-				*:sme* *:smenu*  *:snoreme* *:snoremenu*
-				*:ime* *:imenu*  *:inoreme* *:inoremenu*
-				*:cme* *:cmenu*  *:cnoreme* *:cnoremenu*
-				*:tlm* *:tlmenu* *:tln*     *:tlnoremenu*
 				*E330* *E327* *E331* *E336* *E333*
 				*E328* *E329* *E337* *E792*
 To create a new menu item, use the ":menu" commands.  They are mostly like
@@ -596,6 +587,7 @@ With the shortcut "F" (while keeping the <Alt> key pressed), and then "O",
 this menu can be used.  The second part is shown as "Open     :e".  The ":e"
 is right aligned, and the "O" is underlined, to indicate it is the shortcut.
 
+					*:am*  *:amenu*  *:an*      *:anoremenu*
 The ":amenu" command can be used to define menu entries for all modes at once,
 except for Terminal mode.  To make the command work correctly, a character is
 automatically inserted for some modes:
@@ -634,6 +626,30 @@ included they make the <> form and raw key codes not being recognized).
 Note that <Esc> in Cmdline mode executes the command, like in a mapping.  This
 is Vi compatible.  Use CTRL-C to quit Cmdline mode.
 
+		*:nme* *:nmenu*  *:nnoreme* *:nnoremenu* *:nunme* *:nunmenu*
+Menu commands starting with "n" work in Normal mode. |mapmode-n|
+
+		*:ome* *:omenu*  *:onoreme* *:onoremenu* *:ounme* *:ounmenu*
+Menu commands starting with "o" work in Operator-pending mode. |mapmode-o|
+
+		*:vme* *:vmenu*  *:vnoreme* *:vnoremenu* *:vunme* *:vunmenu*
+Menu commands starting with "v" work in Visual mode. |mapmode-v|
+
+		*:xme* *:xmenu*  *:xnoreme* *:xnoremenu* *:xunme* *:xunmenu*
+Menu commands starting with "x" work in Visual and Select mode. |mapmode-x|
+
+		*:sme* *:smenu*  *:snoreme* *:snoremenu* *:sunme* *:sunmenu*
+Menu commands starting with "s" work in Select mode. |mapmode-s|
+
+		*:ime* *:imenu*  *:inoreme* *:inoremenu* *:iunme* *:iunmenu*
+Menu commands starting with "i" work in Insert mode. |mapmode-i|
+
+		*:cme* *:cmenu*  *:cnoreme* *:cnoremenu* *:cunme* *:cunmenu*
+Menu commands starting with "c" work in Cmdline mode. |mapmode-c|
+
+		*:tlm* *:tlmenu* *:tln*     *:tlnoremenu* *:tlu*   *:tlunmenu*
+Menu commands starting with "tl" work in Terminal mode. |mapmode-t|
+
 						*:menu-<silent>* *:menu-silent*
 To define a menu which will not be echoed on the command line, add
 "<silent>" as the first argument.  Example: >
@@ -897,14 +913,6 @@ using the last visual selection.
 
 						*:unme*  *:unmenu*
 						*:aun*   *:aunmenu*
-						*:nunme* *:nunmenu*
-						*:ounme* *:ounmenu*
-						*:vunme* *:vunmenu*
-						*:xunme* *:xunmenu*
-						*:sunme* *:sunmenu*
-						*:iunme* *:iunmenu*
-						*:cunme* *:cunmenu*
-						*:tlu*   *:tlunmenu*
 To delete a menu item or a whole submenu, use the unmenu commands, which are
 analogous to the unmap commands.  Eg: >
     :unmenu! Edit.Paste
@@ -1096,8 +1104,9 @@ That's all.  XLFDs are not used.  For Chinese this is reported to work well: >
 
 For Mac OSX you can use something like this: >
     :set guifont=Monaco:h10
-Also see 'macatsui', it can help fix display problems.
+
-							*E236*
+Mono-spaced fonts					*E236*
+
 Note that the fonts must be mono-spaced (all characters have the same width).
 An exception is GTK: all fonts are accepted, but mono-spaced fonts look best.
 

runtime/doc/gui_w32.txt

@@ -451,7 +451,7 @@ with the Intellimouse driver 2.2 and when "Universal Scrolling" is turned on.
 
 XPM support						*w32-xpm-support*
 
-GVim can be build on MS-Windows with support for XPM files.  |+xpm_w32|
+GVim can be built on MS-Windows with support for XPM files.  |+xpm_w32|
 See the Make_mvc.mak file for instructions, search for XPM.
 
 To try out if XPM support works do this: >

runtime/doc/help.txt

@@ -1,4 +1,4 @@
-*help.txt*	For Vim version 8.2.  Last change: 2020 Apr 05
+*help.txt*	For Vim version 8.2.  Last change: 2020 Aug 15
 
 			VIM - main help file
 									 k
@@ -158,7 +158,7 @@ Programming language support ~
 
 Language support ~
 |digraph.txt|	list of available digraphs
-|mbyte.txt|	multi-byte text support
+|mbyte.txt|	multibyte text support
 |mlang.txt|	non-English language support
 |rileft.txt|	right-to-left editing mode
 |arabic.txt|	Arabic language support and editing

runtime/doc/helphelp.txt

@@ -1,4 +1,4 @@
-*helphelp.txt*	For Vim version 8.2.  Last change: 2020 Mar 01
+*helphelp.txt*	For Vim version 8.2.  Last change: 2020 Jul 27
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -369,14 +369,16 @@ highlighting.  So do these:
 You can find the details in $VIMRUNTIME/syntax/help.vim
 
 							*inclusion*
-Some people make a big deal about using "his" when referring to the user,
+Vim is for everybody, no matter race, gender or anything.  Some people make a
-thinking it means we assume the user is male.  That is of course not the case,
+big deal about using "he" or "his" when referring to the user, thinking it
-it's just a habit of writing help text, which quite often is many years old.
+means we assume the user is male.  That is not the case, it's just a habit of
-Also, a lot of the text is written by contributors for who English is not
+writing help text, which quite often is many years old.  Also, a lot of the
-their first language.  We do not make any assumptions about the gender of the
+text is written by contributors for whom English is not their first language.
-user, no matter how the text is phrased.  And we do not want to waste time on
+We do not make any assumptions about the gender of the user, no matter how the
-this discussion.  The goal is that the reader understands how Vim works, the
+text is phrased.  Some people have suggested using "they", but that is not
-exact wording is secondary.
+regular English. We do not want to spend much time on this discussion.  The
+goal is that the reader understands how Vim works, the exact wording is
+secondary.
 
 
  vim:tw=78:ts=8:noet:ft=help:norl:

runtime/doc/if_lua.txt

@@ -1,4 +1,4 @@
-*if_lua.txt*    For Vim version 8.2.  Last change: 2020 May 17
+*if_lua.txt*    For Vim version 8.2.  Last change: 2020 Jun 28
 
 
 		  VIM REFERENCE MANUAL    by Luis Carvalho
@@ -199,8 +199,8 @@ Vim evaluation and command execution, and others.
 				returns it. Note that the buffer is not set as
 				current.
 
-	vim.call({name} [,{args}])
+	vim.call({name} [, {args}])
-				Proxy to call Vim function named {name} with 
+				Proxy to call Vim function named {name} with
 				arguments {args}.  Example: >
 					:lua print(vim.call('has', 'timers'))
 <
@@ -217,14 +217,27 @@ Vim's syntax for lists. Since lists are objects, changes in list references in
 Lua are reflected in Vim and vice-versa. A list "l" has the following
 properties and methods:
 
+NOTE: In patch 8.2.1066 array indexes were changed from zero-based to
+one-based.  You can check with: >
+	    if has("patch-8.2.1066")
+
 Properties
 ----------
 	o "#l" is the number of items in list "l", equivalent to "len(l)"
 	    in Vim.
-	o "l[k]" returns the k-th item in "l"; "l" is zero-indexed, as in Vim.
+	o "l[k]" returns the k-th item in "l"; "l" is one-indexed, as in Lua.
 	    To modify the k-th item, simply do "l[k] = newitem"; in
-	    particular, "l[k] = nil" removes the k-th item from "l".
+	    particular, "l[k] = nil" removes the k-th item from "l". Item can
+	    be added to the end of the list by "l[#l + 1] = newitem"
 	o "l()" returns an iterator for "l".
+	o "table.insert(l, newitem)" inserts an item at the end of the list.
+	    (only Lua 5.3 and later)
+	o "table.insert(l, position, newitem)" inserts an item at the
+	    specified position. "position" is one-indexed.  (only Lua 5.3 and
+	    later)
+	o "table.remove(l, position)" removes an item at the specified
+	    position. "position" is one-indexed.
+
 
 Methods
 -------
@@ -237,13 +250,16 @@ Examples:
 	:let l = [1, 'item']
 	:lua l = vim.eval('l') -- same 'l'
 	:lua l:add(vim.list())
-	:lua l[0] = math.pi
+	:lua l[1] = math.pi
 	:echo l[0] " 3.141593
-	:lua l[0] = nil -- remove first item
+	:lua l[1] = nil -- remove first item
 	:lua l:insert(true, 1)
-	:lua print(l, #l, l[0], l[1], l[-1])
+	:lua print(l, #l, l[1], l[2])
+	:lua l[#l + 1] = 'value'
+	:lua table.insert(l, 100)
+	:lua table.insert(l, 2, 200)
+	:lua table.remove(l, 1)
 	:lua for item in l() do print(item) end
-<
 
 ==============================================================================
 4. Dict userdata					*lua-dict*
@@ -333,6 +349,14 @@ Examples:
 	:lua l = d.len -- assign d as 'self'
 	:lua print(l())
 <
+Lua functions and closures are automatically converted to a Vim |Funcref| and
+can be accessed in Vim scripts.  Example:
+>
+	lua <<EOF
+	vim.fn.timer_start(1000, function(timer)
+	    print('timer callback')
+	end)
+	EOF
 
 ==============================================================================
 7. Buffer userdata					*lua-buffer*

runtime/doc/if_tcl.txt

@@ -275,7 +275,7 @@ Options:
 	$win delcmd {cmd}				*tcl-window-delcmd*
 	Registers the Tcl command {cmd} as a deletion callback for the window.
 	This command is executed (in the global scope) just before the window
-	is closed.  Complex commands should be build with "list": >
+	is closed.  Complex commands should be built with "list": >
 		$win delcmd [list puts vimerr "window deleted"]
 <	See also |tcl-buffer-delcmd|.
 
@@ -357,7 +357,7 @@ Options:
 	$buf delcmd {cmd}				*tcl-buffer-delcmd*
 	Registers the Tcl command {cmd} as a deletion callback for the buffer.
 	This command is executed (in the global scope) just before the buffer
-	is deleted.  Complex commands should be build with "list": >
+	is deleted.  Complex commands should be built with "list": >
 		$buf delcmd [list puts vimerr "buffer [$buf number] gone"]
 <	See also |tcl-window-delcmd|.
 

runtime/doc/indent.txt

@@ -414,11 +414,11 @@ The examples below assume a 'shiftwidth' of 4.
 <
 							*cino-(*
 	(N    When in unclosed parentheses, indent N characters from the line
-	      with the unclosed parentheses.  Add a 'shiftwidth' for every
+	      with the unclosed parenthesis.  Add a 'shiftwidth' for every
 	      extra unclosed parentheses.  When N is 0 or the unclosed
-	      parentheses is the first non-white character in its line, line
+	      parenthesis is the first non-white character in its line, line
 	      up with the next non-white character after the unclosed
-	      parentheses.  (default 'shiftwidth' * 2).
+	      parenthesis.  (default 'shiftwidth' * 2).
 
 		cino=			  cino=(0 >
 		  if (c1 && (c2 ||	    if (c1 && (c2 ||
@@ -439,7 +439,7 @@ The examples below assume a 'shiftwidth' of 4.
 <
 							*cino-U*
 	UN    When N is non-zero, do not ignore the indenting specified by
-	      ( or u in case that the unclosed parentheses is the first
+	      ( or u in case that the unclosed parenthesis is the first
 	      non-white character in its line.  (default 0).
 
 		cino= or cino=(s	  cino=(s,U1 >
@@ -452,8 +452,8 @@ The examples below assume a 'shiftwidth' of 4.
 							*cino-w*
 	wN    When in unclosed parentheses and N is non-zero and either
 	      using "(0" or "u0", respectively, or using "U0" and the unclosed
-	      parentheses is the first non-white character in its line, line
+	      parenthesis is the first non-white character in its line, line
-	      up with the character immediately after the unclosed parentheses
+	      up with the character immediately after the unclosed parenthesis
 	      rather than the first non-white character.  (default 0).
 
 		cino=(0			  cino=(0,w1 >
@@ -464,11 +464,11 @@ The examples below assume a 'shiftwidth' of 4.
 <
 							*cino-W*
 	WN    When in unclosed parentheses and N is non-zero and either
-	      using "(0" or "u0", respectively and the unclosed parentheses is
+	      using "(0" or "u0", respectively and the unclosed parenthesis is
 	      the last non-white character in its line and it is not the
-	      closing parentheses, indent the following line N characters
+	      closing parenthesis, indent the following line N characters
 	      relative to the outer context (i.e. start of the line or the
-	      next unclosed parentheses).  (default: 0).
+	      next unclosed parenthesis).  (default: 0).
 
 		cino=(0			   cino=(0,W4 >
 		  a_long_line(		    a_long_line(
@@ -495,8 +495,8 @@ The examples below assume a 'shiftwidth' of 4.
 <
 							*cino-m*
 	mN    When N is non-zero, line up a line starting with a closing
-	      parentheses with the first character of the line with the
+	      parenthesis with the first character of the line with the
-	      matching opening parentheses.  (default 0).
+	      matching opening parenthesis.  (default 0).
 
 		cino=(s			  cino=(s,m1 >
 		  c = c1 && (		    c = c1 && (
@@ -510,7 +510,7 @@ The examples below assume a 'shiftwidth' of 4.
 <
 							*cino-M*
 	MN    When N is non-zero, line up a line starting with a closing
-	      parentheses with the first character of the previous line.
+	      parenthesis with the first character of the previous line.
 	      (default 0).
 
 		cino=			  cino=M1 >
@@ -569,7 +569,7 @@ The examples below assume a 'shiftwidth' of 4.
 	      recognize preprocessor lines; right-shifting lines that start
 	      with "#" does not work.
 
-
+								*cino-P*
 	PN    When N is non-zero recognize C pragmas, and indent them like any
 	      other code; does not concern other preprocessor directives.
 	      When N is zero (default): don't recognize C pragmas, treating
@@ -996,7 +996,7 @@ Indent after a nested paren: >
 Indent for a continuation line: >
 	let g:pyindent_continue = 'shiftwidth() * 2'
 
-The method uses |searchpair()| to look back for unclosed parenthesis.  This
+The method uses |searchpair()| to look back for unclosed parentheses.  This
 can sometimes be slow, thus it timeouts after 150 msec.  If you notice the
 indenting isn't correct, you can set a larger timeout in msec: >
 	let g:pyindent_searchpair_timeout = 500

runtime/doc/index.txt

@@ -1,4 +1,4 @@
-*index.txt*     For Vim version 8.2.  Last change: 2020 May 31
+*index.txt*     For Vim version 8.2.  Last change: 2020 Oct 05
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -440,6 +440,7 @@ tag		char	      note action in Normal mode	~
 |<C-LeftMouse>|	<C-LeftMouse>	   ":ta" to the keyword at the mouse click
 |<C-Right>|	<C-Right>	1  same as "w"
 |<C-RightMouse>| <C-RightMouse>	   same as "CTRL-T"
+|<C-Tab>|	<C-Tab>		   same as "g<Tab>"
 |<Del>|		["x]<Del>	2  same as "x"
 |N<Del>|	{count}<Del>	   remove the last digit from {count}
 |<Down>|	<Down>		1  same as "j"
@@ -587,6 +588,8 @@ tag		command		   action in Normal mode	~
 				   following the file name.
 |CTRL-W_gt|	CTRL-W g t	   same as `gt`: go to next tab page
 |CTRL-W_gT|	CTRL-W g T	   same as `gT`: go to previous tab page
+|CTRL-W_g<Tab>|	CTRL-W g <Tab>	   same as |g<Tab>|: go to last accessed tab
+				   page.
 |CTRL-W_h|	CTRL-W h	   go to Nth left window (stop at first window)
 |CTRL-W_i|	CTRL-W i	   split window and jump to declaration of
 				   identifier under the cursor
@@ -781,10 +784,10 @@ tag		char	      note action in Normal mode	~
 				   lines down
 |gk|		gk		1  like "k", but when 'wrap' on go N screen
 				   lines up
-|gn|		gn	      1,2  find the next match with the last used
-				   search pattern and Visually select it
 |gm|		gm		1  go to character at middle of the screenline
 |gM|		gM		1  go to character at middle of the text line
+|gn|		gn	      1,2  find the next match with the last used
+				   search pattern and Visually select it
 |go|		go		1  cursor to byte N in the buffer
 |gp|		["x]gp		2  put the text [from register x] after the
 				   cursor N times, leave the cursor after it
@@ -805,6 +808,7 @@ tag		char	      note action in Normal mode	~
 |g<LeftMouse>|	g<LeftMouse>	   same as <C-LeftMouse>
 		g<MiddleMouse>	   same as <C-MiddleMouse>
 |g<RightMouse>|	g<RightMouse>	   same as <C-RightMouse>
+|g<Tab>|	g<Tab>		   go to the last accessed tab page.
 |g<Up>|		g<Up>		1  same as "gk"
 
 ==============================================================================
@@ -1313,6 +1317,7 @@ tag		command		action ~
 |:filetype|	:filet[ype]	switch file type detection on/off
 |:filter|	:filt[er]	filter output of following command
 |:find|		:fin[d]		find file in 'path' and edit it
+|:final|	:final		declare an immutable variable in Vim9
 |:finally|	:fina[lly]	part of a :try command
 |:finish|	:fini[sh]	quit sourcing a Vim script
 |:first|	:fir[st]	go to the first file in the argument list
@@ -1687,6 +1692,7 @@ tag		command		action ~
 |:unsilent|	:uns[ilent]	run a command not silently
 |:update|	:up[date]	write buffer if modified
 |:vglobal|	:v[global]	execute commands for not matching lines
+|:var|		:var		variable declaration in Vim9
 |:version|	:ve[rsion]	print version number and other info
 |:verbose|	:verb[ose]	execute command with 'verbose' set
 |:vertical|	:vert[ical]	make following command split vertically

runtime/doc/insert.txt

@@ -1,4 +1,4 @@
-*insert.txt*    For Vim version 8.2.  Last change: 2020 Apr 30
+*insert.txt*    For Vim version 8.2.  Last change: 2020 Sep 19
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1843,6 +1843,7 @@ a			Append text after the cursor [count] times.  If the
 
 							*A*
 A			Append text at the end of the line [count] times.
+			For using "A" in Visual block mode see |v_b_A|.
 
 <insert>	or				*i* *insert* *<Insert>*
 i			Insert text before the cursor [count] times.
@@ -1855,6 +1856,7 @@ I			Insert text before the first non-blank in the line
 			When the 'H' flag is present in 'cpoptions' and the
 			line only contains blanks, insert start just before
 			the last blank.
+			For using "I" in Visual block mode see |v_b_I|.
 
 							*gI*
 gI			Insert text in column 1 [count] times.

runtime/doc/intro.txt

@@ -1,4 +1,4 @@
-*intro.txt*     For Vim version 8.2.  Last change: 2020 May 30
+*intro.txt*     For Vim version 8.2.  Last change: 2020 Aug 15
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -232,8 +232,8 @@ Vim would never have become what it is now, without the help of these people!
 	Flemming Madsen		X11 client-server, various features and patches
 	Tony Mechelynck		answers many user questions
 	Paul Moore		Python interface extensions, many patches
-	Katsuhito Nagano	Work on multi-byte versions
+	Katsuhito Nagano	Work on multibyte versions
-	Sung-Hyun Nam		Work on multi-byte versions
+	Sung-Hyun Nam		Work on multibyte versions
 	Vince Negri		Win32 GUI and generic console enhancements
 	Steve Oualline		Author of the first Vim book |frombook|
 	Dominique Pelle		Valgrind reports and many fixes
@@ -510,7 +510,7 @@ the ":map" command.  The rules are:
 	   <M-a>		Meta- a  ('a' with bit 8 set)
 	   <M-A>		Meta- A  ('A' with bit 8 set)
 	   <t_kd>		"kd" termcap entry (cursor down key)
-    Although you can specify <M-{char}> with {char} being a multi-byte
+    Although you can specify <M-{char}> with {char} being a multibyte
     character, Vim may not be able to know what byte sequence that is and then
     it won't work.
 

runtime/doc/map.txt

@@ -1,4 +1,4 @@
-*map.txt*       For Vim version 8.2.  Last change: 2020 Apr 23
+*map.txt*       For Vim version 8.2.  Last change: 2020 Oct 07
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -191,6 +191,12 @@ whether to use the "," mapping or the longer one.  To avoid this add the
 <nowait> argument.  Then the mapping will be used when it matches, Vim does
 not wait for more characters to be typed.  However, if the characters were
 already typed they are used.
+Note that this works when the <nowait> mapping fully matches and is found
+before any partial matches.  This works when:
+- There is only one matching buffer-local mapping, since these are always
+  found before global mappings.
+- There is another buffer-local mapping that partly matches, but it is
+  defined earlier (last defined mapping is found first).
 
 						*:map-<silent>* *:map-silent*
 To define a mapping which will not be echoed on the command line, add
@@ -246,6 +252,17 @@ For abbreviations |v:char| is set to the character that was typed to trigger
 the abbreviation.  You can use this to decide how to expand the {lhs}.  You
 should not either insert or change the v:char.
 
+In case you want the mapping to not do anything, you can have the expression
+evaluate to an empty string.  If something changed that requires Vim to
+go through the main loop (e.g. to update the display), return "\<Ignore>".
+This is similar to "nothing" but makes Vim return from the loop that waits for
+input. Example: >
+	func s:OpenPopup()
+	  call popup_create(... arguments ...)
+	  return "\<Ignore>"
+	endfunc
+	nnoremap <expr> <F3> <Sid>OpenPopup()
+
 Be very careful about side effects!  The expression is evaluated while
 obtaining characters, you may very well make the command dysfunctional.
 For this reason the following is blocked:
@@ -283,15 +300,8 @@ Here is an example that inserts a list number that increases: >
 CTRL-L inserts the next number, CTRL-R resets the count.  CTRL-R returns an
 empty string, so that nothing is inserted.
 
-Note that there are some tricks to make special keys work and escape CSI bytes
+Note that using 0x80 as a single byte before other text does not work, it will
-in the text.  The |:map| command also does this, thus you must avoid that it
+be seen as a special key.
-is done twice.  This does not work: >
-	:imap <expr> <F3> "<Char-0x611B>"
-Because the <Char- sequence is escaped for being a |:imap| argument and then
-again for using <expr>.  This does work: >
-	:imap <expr> <F3> "\u611B"
-Using 0x80 as a single byte before other text does not work, it will be seen
-as a special key.
 
 
 1.3 MAPPING AND MODES					*:map-modes*
@@ -595,7 +605,7 @@ construct can be used:
 	<Char-033>	character 27
 	<Char-0x7f>	character 127
 	<S-Char-114>    character 114 ('r') shifted ('R')
-This is useful to specify a (multi-byte) character in a 'keymap' file.
+This is useful to specify a (multibyte) character in a 'keymap' file.
 Upper and lowercase differences are ignored.
 
 							*map-comments*
@@ -840,14 +850,20 @@ execute a shell command, e.g.: `!ls`  Or put the lines in your |vimrc|.
 
 When modifyOtherKeys is enabled you can map <C-[> and <C-S-{>: >
 	imap <C-[> [[[
-	imap <C-S-{> {{{
+	imap <C-{> {{{
-Without modifyOtherKeys <C-[> and <C-S-{> are indistinguishable from Esc.
+Without modifyOtherKeys <C-[> and <C-{> are indistinguishable from Esc.
+Note that <C-{> is used and not <C-S-[> or <C-S-{>.  This works on most
+keyboards.  Similarly, <C-}> is used instead of <C-S-]> or <C-S-}> and
+<C-|> instead of <C-S-\> or <C-S-|>.  Note that '|' has a special meaning in a
+mapping, see |map-bar|.
 
-A known side effect effect is that in Insert mode the raw escape sequence is
+WARNING: if you map <C-[> you may very well break any key codes that start
-inserted after the CTRL-V key.  This can be used to check whether
+with Esc.  Make sure it comes AFTER other mappings.
-modifyOtherKeys is enabled: In Insert mode type CTRL-SHIFT-V CTRL-V, if you
+
-get one byte then modifyOtherKeys is off, if you get <1b>27;5;118~ then it is
+A known side effect is that in Insert mode the raw escape sequence is inserted
-on.
+after the CTRL-V key.  This can be used to check whether modifyOtherKeys is
+enabled: In Insert mode type CTRL-SHIFT-V CTRL-V, if you get one byte then
+modifyOtherKeys is off, if you get <1b>27;5;118~ then it is on.
 
 When the 'esckeys' option is off, then modifyOtherKeys will be disabled in
 Insert mode to avoid every key with a modifier causing Insert mode to end.
@@ -876,35 +892,47 @@ g@{motion}		Call the function set by the 'operatorfunc' option.
 
 Here is an example that counts the number of spaces with <F4>: >
 
-	nmap <silent> <F4> :set opfunc=CountSpaces<CR>g@
+	nnoremap <expr> <F4> CountSpaces()
-	vmap <silent> <F4> :<C-U>call CountSpaces(visualmode(), 1)<CR>
+	xnoremap <expr> <F4> CountSpaces()
+	" doubling <F4> works on a line
+	nnoremap <expr> <F4><F4> CountSpaces() .. '_'
+
+	function CountSpaces(type = '') abort
+	  if a:type == ''
+	    set opfunc=CountSpaces
+	    return 'g@'
+ 	  endif
 
-	function! CountSpaces(type, ...)
 	  let sel_save = &selection
-	  let &selection = "inclusive"
+	  let reg_save = getreginfo('"')
-	  let reg_save = @@
+	  let cb_save = &clipboard
+	  let visual_marks_save = [getpos("'<"), getpos("'>")]
 
-	  if a:0  " Invoked from Visual mode, use gv command.
+	  try
-	    silent exe "normal! gvy"
+	    set clipboard= selection=inclusive
-	  elseif a:type == 'line'
+	    let commands = #{line: "'[V']y", char: "`[v`]y", block: "`[\<c-v>`]y"}
-	    silent exe "normal! '[V']y"
+	    silent exe 'noautocmd keepjumps normal! ' .. get(commands, a:type, '')
-	  else
+	    echom getreg('"')->count(' ')
-	    silent exe "normal! `[v`]y"
+	  finally
-	  endif
+	    call setreg('"', reg_save)
-
+	    call setpos("'<", visual_marks_save[0])
-	  echomsg strlen(substitute(@@, '[^ ]', '', 'g'))
+	    call setpos("'>", visual_marks_save[1])
-
+	    let &clipboard = cb_save
-	  let &selection = sel_save
+	    let &selection = sel_save
-	  let @@ = reg_save
+	  endtry
 	endfunction
 
+An <expr> mapping is used to be able to fetch any prefixed count and register.
+This also avoids using a command line, which would trigger CmdlineEnter and
+CmdlineLeave autocommands.
+
 Note that the 'selection' option is temporarily set to "inclusive" to be able
 to yank exactly the right text by using Visual mode from the '[ to the ']
 mark.
 
-Also note that there is a separate mapping for Visual mode.  It removes the
+Also note that the 'clipboard' option is temporarily emptied to avoid
-"'<,'>" range that ":" inserts in Visual mode and invokes the function with
+clobbering the `"*` or `"+` registers, if its value contains the item `unnamed`
-visualmode() and an extra argument.
+or `unnamedplus`.
 
 ==============================================================================
 2. Abbreviations			*abbreviations* *Abbreviations*
@@ -1168,6 +1196,10 @@ When executing an autocommand or a user command, it will run in the context of
 the script it was defined in.  This makes it possible that the command calls a
 local function or uses a local mapping.
 
+In case the value is used in a context where <SID> cannot be correctly
+expanded, use the expand() function: >
+	let &includexpr = expand('<SID>') .. 'My_includeexpr()'
+
 Otherwise, using "<SID>" outside of a script context is an error.
 
 If you need to get the script number to use in a complicated script, you can
@@ -1492,7 +1524,7 @@ The valid escape sequences are
 	<bang>	(See the '-bang' attribute) Expands to a ! if the
 		command was executed with a ! modifier, otherwise
 		expands to nothing.
-						*<mods>* *:command-modifiers*
+					*<mods>* *<q-mods>* *:command-modifiers*
 	<mods>  The command modifiers, if specified. Otherwise, expands to
 		nothing. Supported modifiers are |:aboveleft|, |:belowright|,
 		|:botright|, |:browse|, |:confirm|, |:hide|, |:keepalt|,

runtime/doc/mbyte.txt

@@ -1,4 +1,4 @@
-*mbyte.txt*     For Vim version 8.2.  Last change: 2019 Jul 04
+*mbyte.txt*     For Vim version 8.2.  Last change: 2020 Aug 15
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar et al.
@@ -36,7 +36,7 @@ characters or boxes when using another encoding.
 This is a summary of the multibyte features in Vim.  If you are lucky it works
 as described and you can start using Vim without much trouble.  If something
 doesn't work you will have to read the rest.  Don't be surprised if it takes
-quite a bit of work and experimenting to make Vim use all the multi-byte
+quite a bit of work and experimenting to make Vim use all the multibyte
 features.  Unfortunately, every system has its own way to deal with multibyte
 languages and it is quite complicated.
 
@@ -123,12 +123,12 @@ You can also set 'guifont' alone, Vim will try to find a matching
 
 INPUT
 
-There are several ways to enter multi-byte characters:
+There are several ways to enter multibyte characters:
 - For X11 XIM can be used.  See |XIM|.
 - For MS-Windows IME can be used.  See |IME|.
 - For all systems keymaps can be used.  See |mbyte-keymap|.
 
-The options 'iminsert', 'imsearch' and 'imcmdline' can be used to chose
+The options 'iminsert', 'imsearch' and 'imcmdline' can be used to choose
 the different input methods or disable them temporarily.
 
 ==============================================================================
@@ -141,8 +141,8 @@ in, or just use a certain locale inside Vim.
 
 WHAT IS A LOCALE?					*locale*
 
-There are many of languages in the world.  And there are different cultures
+There are many languages in the world.  And there are different cultures and
-and environments at least as much as the number of languages.	A linguistic
+environments at least as many as the number of languages.  A linguistic
 environment corresponding to an area is called "locale".  This includes
 information about the used language, the charset, collating order for sorting,
 date format, currency format and so on.  For Vim only the language and charset
@@ -237,11 +237,11 @@ encoded with one byte, we call this a single-byte encoding.  The most often
 used one is called "latin1".  This limits the number of characters to 256.
 Some of these are control characters, thus even fewer can be used for text.
 
-When some characters use two or more bytes, we call this a multi-byte
+When some characters use two or more bytes, we call this a multibyte
 encoding.  This allows using much more than 256 characters, which is required
 for most East Asian languages.
 
-Most multi-byte encodings use one byte for the first 127 characters.  These
+Most multibyte encodings use one byte for the first 127 characters.  These
 are equal to ASCII, which makes it easy to exchange plain-ASCII text, no
 matter what language is used.  Thus you might see the right text even when the
 encoding was set wrong.
@@ -488,11 +488,11 @@ possible.
 ==============================================================================
 4. Using a terminal					*mbyte-terminal*
 
-The GUI fully supports multi-byte characters.  It is also possible in a
+The GUI fully supports multibyte characters.  It is also possible in a
 terminal, if the terminal supports the same encoding that Vim uses.  Thus this
 is less flexible.
 
-For example, you can run Vim in a xterm with added multi-byte support and/or
+For example, you can run Vim in a xterm with added multibyte support and/or
 |XIM|.  Examples are kterm (Kanji term) and hanterm (for Korean), Eterm
 (Enlightened terminal) and rxvt.
 
@@ -544,7 +544,7 @@ For Vim you may need to set 'encoding' to "utf-8".
 5.  Fonts on X11					*mbyte-fonts-X11*
 
 Unfortunately, using fonts in X11 is complicated.  The name of a single-byte
-font is a long string.  For multi-byte fonts we need several of these...
+font is a long string.  For multibyte fonts we need several of these...
 
 Note: Most of this is no longer relevant for GTK+ 2.  Selecting a font via
 its XLFD is not supported; see 'guifont' for an example of how to
@@ -610,7 +610,7 @@ written like:
 
 X FONTSET
 						*fontset* *xfontset*
-A single-byte charset is typically associated with one font.  For multi-byte
+A single-byte charset is typically associated with one font.  For multibyte
 charsets a combination of fonts is often used.  This means that one group of
 characters are used from one font and another group from another font (which
 might be double wide).  This collection of fonts is called a fontset.
@@ -889,7 +889,7 @@ input_server_name	is your |IM-server| name (check your |IM-server|
 your_input_style	is one of |OverTheSpot|, |OffTheSpot|, |Root|.  See
 			also |xim-input-style|.
 
-*international may not necessary if you use X11R6.
+*international may not be necessary if you use X11R6.
 *.inputMethod and *.preeditType are optional if you use X11R6.
 
 For example, when you are using kinput2 as |IM-server|, >
@@ -952,7 +952,7 @@ automatically.
 
 This works on not only insert-normal mode, but also search-command input and
 replace mode.
-The options 'iminsert', 'imsearch' and 'imcmdline' can be used to chose
+The options 'iminsert', 'imsearch' and 'imcmdline' can be used to choose
 the different input methods or disable them temporarily.
 
 WHAT IS IME
@@ -1436,7 +1436,7 @@ not everybody is able to type a composing character.
 ==============================================================================
 12. Overview of options					*mbyte-options*
 
-These options are relevant for editing multi-byte files.  Check the help in
+These options are relevant for editing multibyte files.  Check the help in
 options.txt for detailed information.
 
 'encoding'	Encoding used for the keyboard and display.  It is also the
@@ -1456,14 +1456,14 @@ options.txt for detailed information.
 		languages where a sequence of characters can be broken
 		anywhere.
 
-'guifontset'	The list of font names used for a multi-byte encoding.  When
+'guifontset'	The list of font names used for a multibyte encoding.  When
 		this option is not empty, it replaces 'guifont'.
 
 'keymap'	Specify the name of a keyboard mapping.
 
 ==============================================================================
 
-Contributions specifically for the multi-byte features by:
+Contributions specifically for the multibyte features by:
 	Chi-Deok Hwang <hwang@mizi.co.kr>
 	SungHyun Nam <goweol@gmail.com>
 	K.Nagano <nagano@atese.advantest.co.jp>

runtime/doc/message.txt

@@ -1,4 +1,4 @@
-*message.txt*   For Vim version 8.2.  Last change: 2020 Jan 01
+*message.txt*   For Vim version 8.2.  Last change: 2020 Sep 07
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -19,13 +19,14 @@ The ":messages" command can be used to view previously given messages.  This
 is especially useful when messages have been overwritten or truncated.  This
 depends on the 'shortmess' option.
 
-	:messages		Show all messages.
+	:mes[sages]		Show all messages.
 
-	:{count}messages	Show the {count} most recent messages.
+	:{count}mes[sages]	Show the {count} most recent messages.
 
-	:messages clear		Clear all messages.
+	:mes[sages] clear	Clear all messages.
 
-	:{count}messages clear	Clear messages, keeping only the {count} most
+	:{count}mes[sages] clear
+				Clear messages, keeping only the {count} most
 				recent ones.
 
 The number of remembered messages is fixed at 20 for the tiny version and 200
@@ -74,7 +75,7 @@ See `:messages` above.
 
 
 LIST OF MESSAGES
-			*E222* *E228* *E232* *E256* *E293* *E298* *E304* *E317*
+			*E222* *E228* *E232* *E293* *E298* *E304* *E317*
 			*E318* *E356* *E438* *E439* *E440* *E316* *E320* *E322*
 			*E323* *E341* *E473* *E570* *E685* *E292*  >
   Add to read buffer

runtime/doc/mlang.txt

@@ -1,4 +1,4 @@
-*mlang.txt*     For Vim version 8.2.  Last change: 2020 Jun 16
+*mlang.txt*     For Vim version 8.2.  Last change: 2020 Aug 15
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -7,7 +7,7 @@
 Multi-language features				*multilang* *multi-lang*
 
 This is about using messages and menus in various languages.  For editing
-multi-byte text see |multibyte|.
+multibyte text see |multibyte|.
 
 The basics are explained in the user manual: |usr_45.txt|.
 

runtime/doc/motion.txt

@@ -1,4 +1,4 @@
-*motion.txt*    For Vim version 8.2.  Last change: 2019 Nov 16
+*motion.txt*    For Vim version 8.2.  Last change: 2020 Aug 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -495,10 +495,11 @@ a set of section macros, specified by the pairs of characters in the
 'sections' option.  The default is "SHNHH HUnhsh", which defines a section to
 start at the nroff macros ".SH", ".NH", ".H", ".HU", ".nh" and ".sh".
 
-The "]" and "[" commands stop at the '{' or '}' in the first column.  This is
+The "]]" and "[[" commands stop at the '{' in the first column.  This is
-useful to find the start or end of a function in a C program.  Note that the
+useful to find the start of a function in a C program.  To search for a '}' in
-first character of the command determines the search direction and the
+the first column, the end of a C function, use "][" (forward) or "[]"
-second character the type of brace found.
+(backward).  Note that the first character of the command determines the
+search direction.
 
 If your '{' or '}' are not in the first column, and you would like to use "[["
 and "]]" anyway, try these mappings: >
@@ -1142,7 +1143,7 @@ sequence of small changes in a line, for example "xxxxx", adds many positions
 to the change list.  When 'textwidth' is zero 'wrapmargin' is used.  When that
 also isn't set a fixed number of 79 is used.  Detail: For the computations
 bytes are used, not characters, to avoid a speed penalty (this only matters
-for multi-byte encodings).
+for multibyte encodings).
 
 Note that when text has been inserted or deleted the cursor position might be
 a bit different from the position of the change.  Especially when lines have

runtime/doc/netbeans.txt

@@ -1,4 +1,4 @@
-*netbeans.txt*  For Vim version 8.2.  Last change: 2020 Apr 19
+*netbeans.txt*  For Vim version 8.2.  Last change: 2020 Aug 15
 
 
 		  VIM REFERENCE MANUAL    by Gordon Prieur et al.
@@ -362,12 +362,12 @@ color		Argument with either a decimal number, "none" (without the
 offset		A number argument that indicates a byte position in a buffer.
 		The first byte has offset zero.  Line breaks are counted for
 		how they appear in the file (CR/LF counts for two bytes).
-		Note that a multi-byte character is counted for the number of
+		Note that a multibyte character is counted for the number of
 		bytes it takes.
 
 lnum/col	Argument with a line number and column number position.  The
 		line number starts with one, the column is the byte position,
-		starting with zero.  Note that a multi-byte character counts
+		starting with zero.  Note that a multibyte character counts
 		for several columns.
 
 pathname	String argument: file name with full path.

runtime/doc/options.txt

@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 8.2.  Last change: 2020 Jun 10
+*options.txt*	For Vim version 8.2.  Last change: 2020 Oct 10
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -703,6 +703,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	The value "double" cannot be used if 'listchars' or 'fillchars'
 	contains a character that would be double width.
 
+	The values are overruled for characters specified with
+	|setcellwidths()|.
+
 	There are a number of CJK fonts for which the width of glyphs for
 	those characters are solely based on how many octets they take in
 	legacy/traditional CJK encodings.  In those encodings, Euro,
@@ -727,8 +730,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 'antialias' 'anti'	boolean (default: off)
 			global
 			{only available when compiled with GUI enabled
-			on Mac OS X}
+			on macOS}
-	This option only has an effect in the GUI version of Vim on Mac OS X
+	This option only has an effect in the GUI version of Vim on macOS
 	v10.2 or later.  When on, Vim will use smooth ("antialiased") fonts,
 	which can be easier to read at certain sizes on certain displays.
 	Setting this option can sometimes cause problems if 'guifont' is set
@@ -1951,9 +1954,11 @@ A jump table for the options with a short description can be found at |Q_op|.
 			{not available when compiled without the |+textprop|
 			or |+quickfix| feature}
 	When 'completeopt' contains "popup" then this option is used for the
-	properties of the info popup when it is created.  You can also use
+	properties of the info popup when it is created.  If an info popup
-	|popup_findinfo()| and then set properties for an existing info popup
+	window already exists it is closed, so that the option value is
-	with |popup_setoptions()|.  See |complete-popup|.
+	applied when it is created again.
+	You can also use |popup_findinfo()| and then set properties for an
+	existing info popup with |popup_setoptions()|.  See |complete-popup|.
 
 
 						*'concealcursor'* *'cocu'*
@@ -2549,7 +2554,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	"x" delete each combining character on its own.  When it is off (the
 	default) the character along with its combining characters are
 	deleted.
-	Note: When 'delcombine' is set "xx" may work different from "2x"!
+	Note: When 'delcombine' is set "xx" may work differently from "2x"!
 
 	This is useful for Arabic, Hebrew and many other languages where one
 	may have combining characters overtop of base characters, and want
@@ -2713,6 +2718,11 @@ A jump table for the options with a short description can be found at |Q_op|.
 				 for Unix: ".,~/tmp,/var/tmp,/tmp")
 			global
 	List of directory names for the swap file, separated with commas.
+	Recommended value:  ".,~/vimswap//" - this will put the swap file next
+	to the edited file if possible, and in your personal swap directory
+	otherwise.  Make sure "~/vimswap//" is only readable for you.
+
+	Possible items:
 	- The swap file will be created in the first directory where this is
 	  possible.
 	- Empty means that no swap file will be used (recovery is
@@ -2726,8 +2736,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	  is replaced with the path name of the edited file.
 	- For Unix and Win32, if a directory ends in two path separators "//",
 	  the swap file name will be built from the complete path to the file
-	  with all path separators substituted to percent '%' signs. This will
+	  with all path separators replaced by percent '%' signs (including
-	  ensure file name uniqueness in the preserve directory.
+	  the colon following the drive letter on Win32). This will ensure
+	  file name uniqueness in the preserve directory.
 	  On Win32, it is also possible to end with "\\".  However, When a
 	  separating comma is following, you must use "//", since "\\" will
 	  include the comma in the file name. Therefore it is recommended to
@@ -2747,9 +2758,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 	the same file twice will result in a warning.  Using "/tmp" on Unix is
 	discouraged: When the system crashes you lose the swap file.
 	"/var/tmp" is often not cleared when rebooting, thus is a better
-	choice than "/tmp".  But it can contain a lot of files, your swap
+	choice than "/tmp".  But others on the computer may be able to see the
-	files get lost in the crowd.  That is why a "tmp" directory in your
+	files, and it can contain a lot of files, your swap files get lost in
-	home directory is tried first.
+	the crowd.  That is why a "tmp" directory in your home directory is
+	tried first.
 	The use of |:set+=| and |:set-=| is preferred when adding or removing
 	directories from the list.  This avoids problems when a future version
 	uses another default.
@@ -2794,7 +2806,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 'emoji' 'emo'	boolean (default: on)
 			global
 	When on all Unicode emoji characters are considered to be full width.
-
+	This excludes "text emoji" characters, which are normally displayed as
+	single width.  Unfortunately there is no good specification for this
+	and it has been determined on trial-and-error basis.  Use the
+	|setcellwidths()| function to change the behavior.
 
 					*'encoding'* *'enc'* *E543*
 'encoding' 'enc'	string (default: "latin1" or value from $LANG)
@@ -2824,7 +2839,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	This is specified with 'fileencoding'.  The conversion is done with
 	iconv() or as specified with 'charconvert'.
 
-	If you need to know whether 'encoding' is a multi-byte encoding, you
+	If you need to know whether 'encoding' is a multibyte encoding, you
 	can use: >
 		if has("multi_byte_encoding")
 <
@@ -4133,7 +4148,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			global
 	This option specifies a function that will be called to
 	activate or deactivate the Input Method.
-	It is not used in the GUI.
+	It is not used in the MS-Windows GUI version.
 	The expression will be evaluated in the |sandbox| when set from a
 	modeline, see |sandbox-option|.
 
@@ -4242,7 +4257,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			global
 	This option specifies a function that is called to obtain the status
 	of Input Method.  It must return a positive number when IME is active.
-	It is not used in the GUI.
+	It is not used in the MS-Windows GUI version.
 
 	Example: >
 		function ImStatusFunc()
@@ -4538,7 +4553,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	set and to the Vim default value when 'compatible' is reset.
 
 						*'isprint'* *'isp'*
-'isprint' 'isp'	string	(default for Win32 and Macintosh:
+'isprint' 'isp'	string	(default for Win32 and macOS:
 				"@,~-255"; otherwise: "@,161-255")
 			global
 	The characters given by this option are displayed directly on the
@@ -4667,7 +4682,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	    characters.  Example: "abc;ABC"
 	Example: "aA,fgh;FGH,cCdDeE"
 	Special characters need to be preceded with a backslash.  These are
-	";", ',' and backslash itself.
+	";", ',', '"', '|' and backslash itself.
 
 	This will allow you to activate vim actions without having to switch
 	back and forth between the languages.  Your language characters will
@@ -4915,18 +4930,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 						*'macatsui'* *'nomacatsui'*
 'macatsui'		boolean	(default on)
 			global
-			{only available in Mac GUI version}
+			{not supported}
-	This is a workaround for when drawing doesn't work properly.  When set
+	No longer supported, as the Mac OS X GUI code was removed.
-	and compiled with multi-byte support ATSUI text drawing is used.  When
-	not set ATSUI text drawing is not used.  Switch this option off when
-	you experience drawing problems.  In a future version the problems may
-	be solved and this option becomes obsolete.  Therefore use this method
-	to unset it: >
-		if exists('&macatsui')
-		   set nomacatsui
-		endif
-<	Another option to check if you have drawing problems is
-	'termencoding'.
 
 						*'magic'* *'nomagic'*
 'magic'			boolean	(default on)
@@ -5911,7 +5916,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	customize the information displayed in the quickfix or location window
 	for each entry in the corresponding quickfix or location list.  See
 	|quickfix-window-function| for an explanation of how to write the
-	function and an example.
+	function and an example. The value can be the name of a function or a
+	lambda.
 
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
@@ -6188,7 +6194,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	screen.  If the statusline is given by 'statusline' (i.e. not empty),
 	this option takes precedence over 'ruler' and 'rulerformat'
 	If the number of characters displayed is different from the number of
-	bytes in the text (e.g., for a TAB or a multi-byte character), both
+	bytes in the text (e.g., for a TAB or a multibyte character), both
 	the text column (byte number) and the screen column are shown,
 	separated with a dash.
 	For an empty line "0-1" is shown.
@@ -6231,7 +6237,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 						$VIMRUNTIME,
 						$VIM/vimfiles/after,
 						$HOME/vimfiles/after"
-					Macintosh: "$VIM:vimfiles,
+					macOS: "$VIM:vimfiles,
 						$VIMRUNTIME,
 						$VIM:vimfiles:after"
 					Haiku: "$BE_USER_SETTINGS/vim,
@@ -6561,7 +6567,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	For the Amiga the default is ">".  For MS-Windows the default is
 	">%s 2>&1".  The output is directly saved in a file and not echoed to
 	the screen.
-	For Unix the default it "| tee".  The stdout of the compiler is saved
+	For Unix the default is "| tee".  The stdout of the compiler is saved
 	in a file and echoed to the screen.  If the 'shell' option is "csh" or
 	"tcsh" after initializations, the default becomes "|& tee".  If the
 	'shell' option is "sh", "ksh", "mksh", "pdksh", "zsh", "zsh-beta",
@@ -6730,7 +6736,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	 flag	meaning when present	~
 	  f	use "(3 of 5)" instead of "(file 3 of 5)"
 	  i	use "[noeol]" instead of "[Incomplete last line]"
-	  l	use "999L, 888C" instead of "999 lines, 888 characters"
+	  l	use "999L, 888B" instead of "999 lines, 888 bytes"
 	  m	use "[+]" instead of "[Modified]"
 	  n	use "[New]" instead of "[New File]"
 	  r	use "[RO]" instead of "[readonly]"
@@ -7285,8 +7291,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	N N   Printer page number.  (Only works in the 'printheader' option.)
 	l N   Line number.
 	L N   Number of lines in buffer.
-	c N   Column number.
+	c N   Column number (byte index).
-	v N   Virtual column number.
+	v N   Virtual column number (screen column).
 	V N   Virtual column number as -{num}.  Not displayed if equal to 'c'.
 	p N   Percentage through file in lines as in |CTRL-G|.
 	P S   Percentage through file of displayed window.  This is like the
@@ -7708,7 +7714,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 					on Amiga: "amiga"
 					on Haiku: "xterm"
 					  on Mac: "mac-ansi"
-					 on MiNT: "vt52"
 					 on Unix: "ansi"
 					  on VMS: "ansi"
 				       on Win 32: "win32")
@@ -7736,14 +7741,12 @@ A jump table for the options with a short description can be found at |Q_op|.
 	For further details see |arabic.txt|.
 
 					*'termencoding'* *'tenc'*
-'termencoding' 'tenc'	string	(default ""; with GTK+ GUI: "utf-8"; with
+'termencoding' 'tenc'	string	(default ""; with GTK+ GUI: "utf-8")
-						    Macintosh GUI: "macroman")
 			global
 	Encoding used for the terminal.  This specifies what character
 	encoding the keyboard produces and the display will understand.  For
 	the GUI it only applies to the keyboard ('encoding' is used for the
-	display).  Except for the Mac when 'macatsui' is off, then
+	display).
-	'termencoding' should be "macroman".
 								*E617* *E950*
 	Note: This does not apply to the GTK+ GUI.  After the GUI has been
 	successfully initialized, 'termencoding' is forcibly set to "utf-8".
@@ -7808,8 +7811,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 						*'termwinsize'* *'tws'*
 'termwinsize' 'tws'	string	(default "")
 			local to window
-	Size of the |terminal| window.  Format: {rows}x{columns} or
+	Size used when opening the |terminal| window.  Format:
-	{rows}*{columns}.
+		{rows}x{columns} or {rows}*{columns}.
 	- When empty the terminal gets the size from the window.
 	- When set with a "x" (e.g., "24x80") the terminal size is not
 	  adjusted to the window size.  If the window is smaller only the
@@ -7820,6 +7823,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	- When rows is zero then use the height of the window.
 	- When columns is zero then use the width of the window.
 	- Using "0x0" or "0*0" is the same as empty.
+	- Can be overruled in the |term_start()| options with "term_rows" and
+	  "term_cols".
 
 	Examples:
 	  "30x0" uses 30 rows and the current window width.
@@ -8366,7 +8371,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	>= 14	Anything pending in a ":finally" clause.
 	>= 15	Every executed Ex command from a script (truncated at 200
 		characters).
-	>= 16	Every executed Ex command
+	>= 16	Every executed Ex command.
 
 	This option can also be set with the "-V" argument.  See |-V|.
 	This option is also set by the |:verbose| command.
@@ -8389,7 +8394,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 'viewdir' 'vdir'	string	(default for Amiga and Win32:
 							 "$VIM/vimfiles/view",
 				 for Unix: "~/.vim/view",
-				 for Macintosh: "$VIM:vimfiles:view"
+				 for macOS: "$VIM:vimfiles:view"
 				 for VMS: "sys$login:vimfiles/view")
 			global
 			{not available when compiled without the |+mksession|
@@ -8905,7 +8910,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			{only available when compiled with the |terminal|
 			feature on MS-Windows}
 	Specifies the name of the winpty shared library, used for the
-	|:terminal| command. The default depends on whether was build as a
+	|:terminal| command. The default depends on whether Vim was built as a
 	32-bit or 64-bit executable.  If not found, "winpty.dll" is tried as
 	a fallback.
 	Environment variables are expanded |:set_env|.

runtime/doc/os_mint.txt

@@ -1,39 +1,15 @@
-*os_mint.txt*   For Vim version 8.2.  Last change: 2005 Mar 29
+*os_mint.txt*   For Vim version 8.2.  Last change: 2020 Jul 14
 
 
 		  VIM REFERENCE MANUAL    by Jens M. Felderhoff
 
 
 							*MiNT* *Atari*
-This file contains the particularities for the Atari MiNT version of Vim.
+The Atari MiNT support was removed with patch 8.2.1215. It probably didn't
+work at that time, since the code was old and not maintained.
 
-For compiling Vim on the Atari running MiNT see "INSTALL" and "Makefile"
-in the src directory.
 
-Vim for MiNT behaves almost exactly like the Unix version.
+Originally added by: Jens M. Felderhoff, e-mail: <jmf@infko.uni-koblenz.de>
-The Unix behavior described in the documentation also refers to the
-MiNT version of Vim unless explicitly stated otherwise.
 
-For wildcard expansion of <~> (home directory) you need a shell that
-expands the tilde.  The vanilla Bourne shell doesn't recognize it.
-With csh and ksh it should work OK.
-
-The MiNT version of vim needs the termcap file /etc/termcap with the
-terminal capabilities of your terminal.  Builtin termcaps are
-supported for the vt52 terminal.  Termcap entries for the TOSWIN window
-manager and the virtual console terminals have been appended to the
-termcap file that comes with the Vim distribution.
-
-If you should encounter problems with swapped <BS> and <Del> keys, see
-|:fixdel|.
-
-Because terminal updating under MiNT is often slow (e.g. serial line
-terminal), the 'showcmd' and 'ruler' options are default off.
-If you have a fast terminal, try setting them on.  You might
-also want to set 'ttyfast'.
-
-Send bug reports to
-
-	Jens M. Felderhoff, e-mail: <jmf@infko.uni-koblenz.de>
 
  vim:tw=78:ts=8:noet:ft=help:norl:

runtime/doc/os_unix.txt

@@ -30,8 +30,8 @@ can be changed at compile time.
 
 Because terminal updating under Unix is often slow (e.g. serial line
 terminal, shell window in suntools), the 'showcmd' and 'ruler' options
-are default off.  If you have a fast terminal, try setting them on.  You might
+are off by default.  If you have a fast terminal, try setting them on.  You
-also want to set 'ttyfast'.
+might also want to set 'ttyfast'.
 
 When using Vim in an xterm the mouse clicks can be used by Vim by setting
 'mouse' to "a".  If there is access to an X-server gui style copy/paste will

runtime/doc/os_vms.txt

@@ -88,7 +88,7 @@ VAX C compiler is not fully ANSI C compatible in pre-processor directives
 semantics, therefore you have to use a converter program that will do the lion
 part of the job.  For detailed instructions read file INSTALLvms.txt
 
-MMS_VIM.EXE is build together with VIM.EXE, but for XXD.EXE you should
+MMS_VIM.EXE is built together with VIM.EXE, but for XXD.EXE you should
 change to a subdirectory and build it separately.
 
 CTAGS is not part of the Vim source distribution anymore, however the OpenVMS

runtime/doc/pattern.txt

@@ -1,4 +1,4 @@
-*pattern.txt*   For Vim version 8.2.  Last change: 2019 Dec 07
+*pattern.txt*   For Vim version 8.2.  Last change: 2020 Sep 01
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -797,11 +797,12 @@ An ordinary atom can be:
 	^beep(		the start of the C function "beep" (probably).
 
 							*/\^*
-\^	Matches literal '^'.  Can be used at any position in the pattern.
+\^	Matches literal '^'.  Can be used at any position in the pattern, but
+	not inside [].
 
 							*/\_^*
 \_^	Matches start-of-line. |/zero-width|  Can be used at any position in
-	the pattern.
+	the pattern, but not inside [].
 	Example		matches ~
 	\_s*\_^foo	white space and blank lines and then "foo" at
 			start-of-line
@@ -812,12 +813,13 @@ $	At end of pattern or in front of "\|", "\)" or "\n" ('magic' on):
 	|/zero-width|
 
 							*/\$*
-\$	Matches literal '$'.  Can be used at any position in the pattern.
+\$	Matches literal '$'.  Can be used at any position in the pattern, but
+	not inside [].
 
 							*/\_$*
 \_$	Matches end-of-line. |/zero-width|  Can be used at any position in the
-	pattern.  Note that "a\_$b" never matches, since "b" cannot match an
+	pattern, but not inside [].  Note that "a\_$b" never matches, since
-	end-of-line.  Use "a\nb" instead |/\n|.
+	"b" cannot match an end-of-line.  Use "a\nb" instead |/\n|.
 	Example		matches ~
 	foo\_$\_s*	"foo" at end-of-line and following white space and
 			blank lines
@@ -840,8 +842,9 @@ $	At end of pattern or in front of "\|", "\)" or "\n" ('magic' on):
 	|/zero-width|
 
 							*/\zs*
-\zs	Matches at any position, and sets the start of the match there: The
+\zs	Matches at any position, but not inside [], and sets the start of the
-	next char is the first char of the whole match. |/zero-width|
+	match there: The next char is the first char of the whole match.
+	|/zero-width|
 	Example: >
 		/^\s*\zsif
 <	matches an "if" at the start of a line, ignoring white space.
@@ -852,8 +855,9 @@ $	At end of pattern or in front of "\|", "\)" or "\n" ('magic' on):
 	This cannot be followed by a multi. *E888*
 	{not available when compiled without the |+syntax| feature}
 							*/\ze*
-\ze	Matches at any position, and sets the end of the match there: The
+\ze	Matches at any position, but not inside [], and sets the end of the
-	previous char is the last char of the whole match. |/zero-width|
+	match there: The previous char is the last char of the whole match.
+	|/zero-width|
 	Can be used multiple times, the last one encountered in a matching
 	branch is used.
 	Example: "end\ze\(if\|for\)" matches the "end" in "endif" and
@@ -939,7 +943,7 @@ $	At end of pattern or in front of "\|", "\)" or "\n" ('magic' on):
 	These three can be used to match specific columns in a buffer or
 	string.  The "23" can be any column number.  The first column is 1.
 	Actually, the column is the byte number (thus it's not exactly right
-	for multi-byte characters).
+	for multibyte characters).
 	WARNING: When inserting or deleting text Vim does not automatically
 	update the matches.  This means Syntax highlighting quickly becomes
 	wrong.
@@ -994,7 +998,7 @@ Character classes:
 \p	printable character (see 'isprint' option)	*/\p*
 \P	like "\p", but excluding digits			*/\P*
 
-NOTE: the above also work for multi-byte characters.  The ones below only
+NOTE: the above also work for multibyte characters.  The ones below only
 match ASCII characters, as indicated by the range.
 
 						*whitespace* *white-space*
@@ -1131,9 +1135,9 @@ x	A single character, with no special meaning, matches itself
 	  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 multi-byte characters when using the new
+	  [:upper:] also work for multibyte characters when using the new
 	  regexp engine.  See |two-engines|.  In the future these items may
-	  work for multi-byte characters.  For now, to get all "alpha"
+	  work for multibyte characters.  For now, to get all "alpha"
 	  characters you can use: [[:lower:][:upper:]].
 
 	  The "Func" column shows what library function is used.  The
@@ -1257,8 +1261,8 @@ When working with expression evaluation, a <NL> character in the pattern
 matches a <NL> in the string.  The use of "\n" (backslash n) to match a <NL>
 doesn't work there, it only works to match text in the buffer.
 
-						*pattern-multi-byte*
+				*pattern-multi-byte* *pattern-multibyte*
-Patterns will also work with multi-byte characters, mostly as you would
+Patterns will also work with multibyte characters, mostly as you would
 expect.  But invalid bytes may cause trouble, a pattern with an invalid byte
 will probably never match.
 
@@ -1279,7 +1283,7 @@ not match in "càt" (where the a has the composing character 0x0300), but
 0xe1, it does not have a compositing character).  It does match "cat" (where
 the a is just an a).
 
-When a composing character appears at the start of the pattern of after an
+When a composing character appears at the start of the pattern or after an
 item that doesn't include the composing character, a match is found at any
 character that includes this composing character.
 

runtime/doc/pi_netrw.txt

@@ -1,4 +1,4 @@
-*pi_netrw.txt*  For Vim version 8.2.  Last change: 2020 Jan 14
+*pi_netrw.txt*  For Vim version 8.2.  Last change: 2020 Sep 19
 
 	    ------------------------------------------------
 	    NETRW REFERENCE MANUAL    by Charles E. Campbell
@@ -437,9 +437,13 @@ settings are described below, in |netrw-browser-options|, and in
   *g:netrw_silent*	=0 : transfers done normally
 			=1 : transfers done silently
 
- *g:netrw_use_errorwindow* =1 : messages from netrw will use a separate one
+ *g:netrw_use_errorwindow* =2: messages from netrw will use a popup window
+			     Move the mouse and pause to remove the popup window.
+			     (default value if popup windows are availble)
+			 =1 : messages from netrw will use a separate one
 			      line window.  This window provides reliable
-			      delivery of messages. (default)
+			      delivery of messages.
+			     (default value if popup windows are not availble)
 			 =0 : messages from netrw will use echoerr ;
 			      messages don't always seem to show up this
 			      way, but one doesn't have to quit the window.
@@ -725,6 +729,8 @@ just as easily as if they were local files! >
 See |netrw-activate| for more on how to encourage your vim to use plugins
 such as netrw.
 
+For password-free use of scp:, see |netrw-ssh-hack|.
+
 
 ==============================================================================
 7. Ex Commands						*netrw-ex* {{{1
@@ -1063,7 +1069,7 @@ QUICK HELP						*netrw-quickhelp* {{{2
 	  Reverse sorting order.........................|netrw-r|
 
 
-				*netrw-quickmap* *netrw-quickmaps*
+				*netrw-quickmap*  *netrw-quickmaps*
 QUICK REFERENCE: MAPS				*netrw-browse-maps* {{{2
 >
 	  ---			-----------------			----
@@ -1080,7 +1086,7 @@ QUICK REFERENCE: MAPS				*netrw-browse-maps* {{{2
 	   a	Cycles between normal display,                       |netrw-a|
 	    	hiding (suppress display of files matching g:netrw_list_hide)
 	    	and showing (display only files which match g:netrw_list_hide)
-	   c	Make browsing directory the current directory        |netrw-c|
+	   cd	Make browsing directory the current directory        |netrw-cd|
 	   C	Setting the editing window                           |netrw-C|
 	   d	Make a directory                                     |netrw-d|
 	   D	Attempt to remove the file(s)/directory(ies)         |netrw-D|
@@ -2098,7 +2104,7 @@ the two directories the same, use the "cd" map (type cd).  That map will
 set Vim's notion of the current directory to netrw's current browsing
 directory.
 
-*netrw-c* : This map's name has been changed from "c" to cd (see |netrw-cd|).
+|netrw-cd|: This map's name was changed from "c" to cd (see |netrw-cd|).
           This change was done to allow for |netrw-cb| and |netrw-cB| maps.
 
 Associated setting variable: |g:netrw_keepdir|
@@ -2753,7 +2759,7 @@ your browsing preferences.  (see also: |netrw-settings|)
 				=0 keep the current directory the same as the
 				   browsing directory.
 				The current browsing directory is contained in
-				b:netrw_curdir (also see |netrw-c|)
+				b:netrw_curdir (also see |netrw-cd|)
 
   *g:netrw_keepj*		="keepj" (default) netrw attempts to keep the
 				         |:jumps| table unaffected.
@@ -3124,7 +3130,8 @@ a file using the local browser (by putting the cursor on it) and pressing
 
 Related topics:
  * To see what the current directory is, use |:pwd|
- * To make the currently browsed directory the current directory, see |netrw-c|
+ * To make the currently browsed directory the current directory, see
+   |netrw-cd|
  * To automatically make the currently browsed directory the current
    directory, see |g:netrw_keepdir|.
 
@@ -3799,9 +3806,15 @@ netrw:
 	   or
 	     http://vim.sourceforge.net/scripts/script.php?script_id=120
 
-	  Decho.vim is provided as a "vimball"; see |vimball-intro|.
+	  Decho.vim is provided as a "vimball"; see |vimball-intro|.  You
+	  should edit the Decho.vba.gz file and source it in: >
 
-	2. Edit the <netrw.vim> file by typing: >
+	  	vim Decho.vba.gz
+		:so %
+		:q
+<
+	2. To turn on debug tracing in netrw, then edit the <netrw.vim>
+	   file by typing: >
 
 		vim netrw.vim
 		:DechoOn
@@ -3823,14 +3836,34 @@ netrw:
 	   read/write your file over the network in a separate tab or
 	   server vim window.
 
-	   To save the file, use >
+	   Change the netrw.vimrc file to include the Decho plugin: >
+
+		set nocp
+		so $HOME/.vim/plugin/Decho.vim
+		so $HOME/.vim/plugin/netrwPlugin.vim
+<
+	   You should continue to run vim with >
+
+		vim -u netrw.vimrc --noplugins -i NONE [some path here]
+<
+	   to avoid entanglements with options and other plugins.
+
+	   To save the file: under linux, the output will be in a separate
+	   remote server window; in it, just save the file with >
+
+	   	:w! DBG
+
+<	   Under a vim that doesn't support clientserver, your debugging
+	   output will appear in another tab: >
 
 		:tabnext
 		:set bt=
 		:w! DBG
+<
+	   Furthermore, it'd be helpful if you would type >
 
-<	   Furthermore, it'd be helpful if you would type >
 		:Dsep <command>
+
 <	   where <command> is the command you're about to type next,
 	   thereby making it easier to associate which part of the
 	   debugging trace is due to which command.
@@ -3838,17 +3871,34 @@ netrw:
 	   Please send that information to <netrw.vim>'s maintainer along
 	   with the o/s you're using and the vim version that you're using
 	   (see |:version|)  (remove the embedded NOSPAM first) >
+
 		NcampObell@SdrPchip.AorgM-NOSPAM
 <
 ==============================================================================
 12. History						*netrw-history* {{{1
 
+	v170:	Mar 11, 2020	* (reported by Reiner Herrmann) netrw+tree
+				  would not hide with the ^\..* pattern
+				  correctly.
+				* (Marcin Szamotulski) NetrwOptionRestore
+				  did not restore options correctly that
+				  had a single quote in the option string.
+		Apr 13, 2020	* implemented error handling via popup
+				  windows (see |popup_beval()|)
+		Apr 30, 2020	* (reported by Manatsu Takahashi) while
+				  using Lexplore, a modified file could
+				  be overwritten.  Sol'n: will not overwrite,
+				  but will emit an |E37| (although one cannot
+				  add an ! to override)
+		Jun 07, 2020	* (reported by Jo Totland) repeatedly invoking
+				  :Lexplore and quitting it left unused
+				  hidden buffers.  Netrw will now set netrw
+				  buffers created by :Lexplore to |bh|=wipe.
 	v169:	Dec 20, 2019	* (reported by amkarthik) that netrw's x
 				  (|netrw-x|) would throw an error when
 				  attempting to open a local directory.
 	v168:	Dec 12, 2019	* scp timeout error message not reported,
 				  hopefully now fixed (Shane Xb Qian)
-
 	v167:	Nov 29, 2019	* netrw does a save&restore on @* and @+.
 				  That causes problems with the clipboard.
 				  Now restores occurs only if @* or @+ have
@@ -4306,4 +4356,4 @@ netrw:
 
 ==============================================================================
 Modelines: {{{1
- vim:tw=78:ts=8:noet:ft=help:norl:fdm=marker
+vim:tw=78:ts=8:ft=help:noet:norl:fdm=marker

runtime/doc/popup.txt

@@ -1,4 +1,4 @@
-*popup.txt*  For Vim version 8.2.  Last change: 2020 May 18
+*popup.txt*  For Vim version 8.2.  Last change: 2020 Sep 28
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -74,9 +74,9 @@ wrapping, lines in the buffer.  It can be limited with the "maxheight"
 property.  You can use empty lines to increase the height or the "minheight"
 property.
 
-The width of the window is normally equal to the longest line in the buffer.
+The width of the window is normally equal to the longest visible line in the
-It can be limited with the "maxwidth" property.  You can use spaces to
+buffer.  It can be limited with the "maxwidth" property.  You can use spaces
-increase the width or use the "minwidth" property.
+to increase the width or use the "minwidth" property.
 
 By default the 'wrap' option is set, so that no text disappears.  Otherwise,
 if there is not enough space then the window is shifted left in order to
@@ -711,7 +711,7 @@ The second argument of |popup_create()| is a dictionary with options:
 			By default a double line is used all around when
 			'encoding' is "utf-8" and 'ambiwidth' is "single",
 			otherwise ASCII characters are used.
-	scrollbar	non-zero: show a scrollbar when the text doesn't fit.
+	scrollbar	1 or true: show a scrollbar when the text doesn't fit.
 			zero: do not show a scrollbar.  Default is non-zero.
 			Also see |popup-scrollbar|.
 	scrollbarhighlight  Highlight group name for the scrollbar. The
@@ -910,11 +910,22 @@ A mouse click arrives as <LeftMouse>.  The coordinates can be obtained with
 Vim provides standard filters |popup_filter_menu()| and
 |popup_filter_yesno()|.
 
+Keys coming from a `:normal` command do not pass through the filter.  This can
+be used to move the cursor in a popup where the "cursorline" option is set: >
+	call win_execute(winid, 'normal! 10Gzz')
+Keys coming from `feedkeys()` are passed through the filter.
+
 Note that "x" is the normal way to close a popup.  You may want to use Esc,
 but since many keys start with an Esc character, there may be a delay before
 Vim recognizes the Esc key.  If you do use Esc, it is recommended to set the
 'ttimeoutlen' option to 100 and set 'timeout' and/or 'ttimeout'.
 
+							*popup-filter-errors*
+If the filter function can't be called, e.g. because the name is wrong, then
+the popup is closed.  If the filter causes an error then it is assumed to
+return zero.  If this happens three times in a row the popup is closed.  If
+the popup gives errors fewer than 10% of the calls then it won't be closed.
+
 
 POPUP CALLBACK						*popup-callback*
 

runtime/doc/print.txt

@@ -1,4 +1,4 @@
-*print.txt*     For Vim version 8.2.  Last change: 2019 Dec 17
+*print.txt*     For Vim version 8.2.  Last change: 2020 Aug 15
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -114,7 +114,7 @@ If 'printencoding' is empty or Vim cannot find the file then it will use
 encoding file.  If Vim is unable to find a character encoding file then it
 will use the "latin1" print character encoding file.
 
-When 'encoding' is set to a multi-byte encoding, Vim will try to convert
+When 'encoding' is set to a multibyte encoding, Vim will try to convert
 characters to the printing encoding for printing (if 'printencoding' is empty
 then the conversion will be to latin1).  Conversion to a printing encoding
 other than latin1 will require Vim to be compiled with the |+iconv| feature.
@@ -269,7 +269,7 @@ Japanese text you would do the following; >
 	:set printmbcharset=JIS_X_1983
 
 If 'printmbcharset' is not one of the above values then it is assumed to
-specify a custom multi-byte character set and no check will be made that it is
+specify a custom multibyte character set and no check will be made that it is
 compatible with the value for 'printencoding'.  Vim will look for a file
 defining the character set in the "print" directory in 'runtimepath'.
 
@@ -304,7 +304,7 @@ printing of characters in the ASCII code range.
   a:yes			Use ASCII character set for codes in the ASCII
   a:no (default)	code range.
 
-The following is an example of specifying two multi-byte fonts, one for normal
+The following is an example of specifying two multibyte fonts, one for normal
 and italic printing and one for bold and bold-italic printing, and using
 Courier to print codes in the ASCII code range but using the national
 character set: >
@@ -420,10 +420,10 @@ There are currently a number of limitations with PostScript printing:
   possible to get all the characters in an encoding to print by installing a
   new version of the Courier font family.
 
-- Multi-byte support - Currently Vim will try to convert multi-byte characters
+- Multi-byte support - Currently Vim will try to convert multibyte characters
   to the 8-bit encoding specified by 'printencoding' (or latin1 if it is
   empty).  Any characters that are not successfully converted are shown as
-  unknown characters.  Printing will fail if Vim cannot convert the multi-byte
+  unknown characters.  Printing will fail if Vim cannot convert the multibyte
   to the 8-bit encoding.
 
 ==============================================================================
@@ -508,7 +508,7 @@ print ASCII text using the national character set you may see some unexpected
 characters.  If you want true ASCII code printing then you need to configure
 Vim to output ASCII characters for the ASCII code range with 'printmbfont'.
 
-It is possible to define your own multi-byte character set although this
+It is possible to define your own multibyte character set although this
 should not be attempted lightly.  A discussion on the process if beyond the
 scope of these help files.  You can find details on CMap (character map) files
 in the document 'Adobe CMap and CIDFont Files Specification, Version 1.0',

runtime/doc/quickfix.txt

@@ -1705,7 +1705,7 @@ special problem here is that it doesn't print information on leaving the
 directory and that it doesn't print the absolute path.
 
 To solve the problem with relative paths and missing "leave directory"
-messages Vim uses following algorithm:
+messages Vim uses the following algorithm:
 
 1) Check if the given directory is a subdirectory of the current directory.
    If this is true, store it as the current directory.
@@ -1938,7 +1938,7 @@ list window is:
 The values displayed in each line correspond to the "bufnr", "lnum", "col" and
 "text" fields returned by the |getqflist()| function.
 
-For some quickfix/location lists, the displayed text need to be customized.
+For some quickfix/location lists, the displayed text needs to be customized.
 For example, if only the filename is present for a quickfix entry, then the
 two "|" field separator characters after the filename are not needed.  Another
 use case is to customize the path displayed for a filename. By default, the
@@ -1964,7 +1964,10 @@ The function should return a single line of text to display in the quickfix
 window for each entry from start_idx to end_idx. The function can obtain
 information about the entries using the |getqflist()| function and specifying
 the quickfix list identifier "id". For a location list, getloclist() function
-can be used with the 'winid' argument.
+can be used with the 'winid' argument. If an empty list is returned, then the
+default format is used to display all the entries. If an item in the returned
+list is an empty string, then the default format is used to display the
+corresponding entry.
 
 If a quickfix or location list specific customization is needed, then the
 'quickfixtextfunc' attribute of the list can be set using the |setqflist()| or

runtime/doc/quickref.txt

@@ -1,4 +1,4 @@
-*quickref.txt*  For Vim version 8.2.  Last change: 2020 Jun 10
+*quickref.txt*  For Vim version 8.2.  Last change: 2020 Aug 15
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -696,7 +696,7 @@ Short explanation of each option:		*option-list*
 'eventignore'	  'ei'	    autocommand events that are ignored
 'expandtab'	  'et'	    use spaces when <Tab> is inserted
 'exrc'		  'ex'	    read .vimrc and .exrc in the current directory
-'fileencoding'	  'fenc'    file encoding for multi-byte text
+'fileencoding'	  'fenc'    file encoding for multibyte text
 'fileencodings'   'fencs'   automatically detected character encodings
 'fileformat'	  'ff'	    file format used for file I/O
 'fileformats'	  'ffs'     automatically detected values for 'fileformat'
@@ -728,7 +728,7 @@ Short explanation of each option:		*option-list*
 'grepprg'	  'gp'	    program to use for ":grep"
 'guicursor'	  'gcr'     GUI: settings for cursor shape and blinking
 'guifont'	  'gfn'     GUI: Name(s) of font(s) to be used
-'guifontset'	  'gfs'     GUI: Names of multi-byte fonts to be used
+'guifontset'	  'gfs'     GUI: Names of multibyte fonts to be used
 'guifontwide'	  'gfw'     list of font names for double-wide characters
 'guiheadroom'	  'ghr'     GUI: pixels room for window decorations
 'guioptions'	  'go'	    GUI: Which components and options are used

runtime/doc/recover.txt

@@ -1,4 +1,4 @@
-*recover.txt*   For Vim version 8.2.  Last change: 2020 May 09
+*recover.txt*   For Vim version 8.2.  Last change: 2020 Aug 15
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -64,8 +64,8 @@ Disadvantages:
   directories (although Vim tries to avoid that by comparing the path name).
   This will result in bogus ATTENTION warning messages.
 - When you use your home directory, and somebody else tries to edit the same
-  file, he will not see your swap file and will not get the ATTENTION warning
+  file, that user will not see your swap file and will not get the ATTENTION
-  message.
+  warning message.
 On the Amiga you can also use a recoverable ram disk, but there is no 100%
 guarantee that this works.  Putting swap files in a normal ram disk (like RAM:
 on the Amiga) or in a place that is cleared when rebooting (like /tmp on Unix)

runtime/doc/remote.txt

@@ -179,7 +179,7 @@ name on the 'VimRegistry' property on the root window.
 
 A non GUI Vim with access to the X11 display (|xterm-clipboard| enabled), can
 also act as a command server if a server name is explicitly given with the
---servername argument, or when Vim was build with the |+autoservername|
+--servername argument, or when Vim was built with the |+autoservername|
 feature.
 
 An empty --servername argument will cause the command server to be disabled.

runtime/doc/repeat.txt

@@ -1,4 +1,4 @@
-*repeat.txt*    For Vim version 8.2.  Last change: 2020 May 14
+*repeat.txt*    For Vim version 8.2.  Last change: 2020 Oct 09
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -271,6 +271,9 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|.
 			directories are added to 'runtimepath'.  This is
 			useful in your .vimrc.  The plugins will then be
 			loaded during initialization, see |load-plugins|.
+			Note that for ftdetect scripts to be loaded
+			you will need to write `filetype plugin indent on`
+			AFTER all `packadd!` commands.
 
 			Also see |pack-add|.
 			{only available when compiled with |+eval|}
@@ -642,8 +645,8 @@ disallowed though.
 This assumes you write one or more plugins that you distribute as a package.
 
 If you have two unrelated plugins you would use two packages, so that Vim
-users can chose what they include or not.  Or you can decide to use one
+users can choose what they include or not.  Or you can decide to use one
-package with optional plugins, and tell the user to add the ones he wants with
+package with optional plugins, and tell the user to add the preferred ones with
 `:packadd`.
 
 Decide how you want to distribute the package.  You can create an archive or
@@ -679,7 +682,7 @@ You could add this packadd command in one of your plugins, to be executed when
 the optional plugin is needed.
 
 Run the `:helptags` command to generate the doc/tags file.  Including this
-generated file in the package means that the user can drop the package in his
+generated file in the package means that the user can drop the package in the
 pack directory and the help command works right away.  Don't forget to re-run
 the command after changing the plugin help: >
 	:helptags path/start/foobar/doc

runtime/doc/rileft.txt

@@ -69,7 +69,7 @@ o  Invocations
    + 'rightleft' ('rl') sets window orientation to right-to-left.
    + 'delcombine' ('deco'), boolean, if editing UTF-8 encoded languages,
      allows one to remove a composing character which gets superimposed
-     on those that proceeded them (some languages require this).
+     on those that preceded them (some languages require this).
    + 'rightleftcmd' ('rlc') sets the command-line within certain modes
      (such as search) to be utilized in right-to-left orientation as well.
 

runtime/doc/sign.txt

@@ -1,4 +1,4 @@
-*sign.txt*      For Vim version 8.2.  Last change: 2019 Nov 30
+*sign.txt*      For Vim version 8.2.  Last change: 2020 Aug 31
 
 
 		  VIM REFERENCE MANUAL    by Gordon Prieur
@@ -78,13 +78,17 @@ used by popup windows where 'cursorline' is set.
 							*sign-priority*
 Each placed sign is assigned a priority value. When multiple signs are placed
 on the same line, the attributes of the sign with the highest priority is used
-independent of the sign group. The default priority for a sign is 10. The
+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 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.
 
+When a sign with line highlighting and 'cursorline' highlighting are both
+present, if the priority is 100 or more then the sign highlighting takes
+precedence, otherwise the 'cursorline' highlighting.
+
 ==============================================================================
 2. Commands					*sign-commands* *:sig* *:sign*
 

runtime/doc/spell.txt

@@ -1,4 +1,4 @@
-*spell.txt*	For Vim version 8.2.  Last change: 2020 Jun 10
+*spell.txt*	For Vim version 8.2.  Last change: 2020 Aug 15
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -653,11 +653,12 @@ ask you where to write the file (there must be a writable directory in
 'runtimepath' for this).
 
 The plugin has a default place where to look for spell files, on the Vim ftp
-server.  If you want to use another location or another protocol, set the
+server.  The protocol used is SSL (https://) for security.  If you want to use
-g:spellfile_URL variable to the directory that holds the spell files.  The
+another location or another protocol, set the g:spellfile_URL variable to the
-|netrw| plugin is used for getting the file, look there for the specific
+directory that holds the spell files.  You can use http:// or ftp://, but you
-syntax of the URL.  Example: >
+are taking a security risk then.  The |netrw| plugin is used for getting the
-	let g:spellfile_URL = 'http://ftp.vim.org/vim/runtime/spell'
+file, look there for the specific syntax of the URL.  Example: >
+	let g:spellfile_URL = 'https://ftp.nluug.nl/vim/runtime/spell'
 You may need to escape special characters.
 
 The plugin will only ask about downloading a language once.  If you want to
@@ -886,7 +887,7 @@ time ":mkspell" is used.  Vim will then convert everything to 'encoding' and
 generate a spell file for 'encoding'.  If some of the used characters to not
 fit in 'encoding' you will get an error message.
 							*spell-affix-mbyte*
-When using a multi-byte encoding it's possible to use more different affix
+When using a multibyte encoding it's possible to use more different affix
 flags.  But Myspell doesn't support that, thus you may not want to use it
 anyway.  For compatibility use an 8-bit encoding.
 
@@ -1444,7 +1445,7 @@ are spelling mistakes this may not be quite right.
 Common words can be specified with the COMMON item.  This will give better
 suggestions when editing a short file.  Example:
 
-	COMMON  the of to and a in is it you that he was for on are ~
+	COMMON  the of to and a in is it you that he she was for on are ~
 
 The words must be separated by white space, up to 25 per line.
 When multiple regions are specified in a ":mkspell" command the common words

runtime/doc/starting.txt

@@ -1,4 +1,4 @@
-*starting.txt*  For Vim version 8.2.  Last change: 2020 Feb 04
+*starting.txt*  For Vim version 8.2.  Last change: 2020 Sep 23
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -513,6 +513,8 @@ a slash.  Thus "-R" means recovery and "-/R" readonly.
 		  'nocompatible': use Vim defaults
 		- no |gvimrc| script is loaded
 		- no viminfo file is read or written
+		Note that a following "-u" argument overrules the effect of
+		"-u DEFAULTS".
 
 							*-x*
 -x		Use encryption to read/write files.  Will prompt for a key,

runtime/doc/syntax.txt

@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 8.2.  Last change: 2020 Jun 01
+*syntax.txt*	For Vim version 8.2.  Last change: 2020 Aug 15
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1403,7 +1403,7 @@ to your startup file.
 
 EUPHORIA	    *euphoria3.vim* *euphoria4.vim* *ft-euphoria-syntax*
 
-Two syntax highlighting files exists for Euphoria. One for Euphoria
+Two syntax highlighting files exist for Euphoria. One for Euphoria
 version 3.1.1, which is the default syntax highlighting file, and one for
 Euphoria version 4.0.5 or later.
 
@@ -1937,7 +1937,7 @@ new highlightings for the following groups.:
     Debug, DebugSpecial, DebugString, DebugBoolean, DebugType
 which are used for the statement itself, special characters used in debug
 strings, strings, boolean constants and types (this, super) respectively.  I
-have opted to chose another background for those statements.
+have opted to choose another background for those statements.
 
 Javadoc is a program that takes special comments out of Java program files and
 creates HTML pages.  The standard configuration will highlight this HTML code
@@ -3648,7 +3648,7 @@ DEFINING FOLDLEVEL					*:syn-foldlevel*
 	start:		Use level of item containing start of line.
 	minimum:	Use lowest local-minimum level of items on line.
 
-	The default is 'start'.  Use 'minimum' to search a line horizontally
+	The default is "start".  Use "minimum" to search a line horizontally
 	for the lowest level contained on the line that is followed by a
 	higher level.  This produces more natural folds when syntax items
 	may close and open horizontally within a line.
@@ -3795,9 +3795,9 @@ DEFINING REGIONS	*:syn-region* *:syn-start* *:syn-skip* *:syn-end*
 		[keepend]
 		[extend]
 		[excludenl]
-		start={start_pattern} ..
+		start={start-pattern} ..
-		[skip={skip_pattern}]
+		[skip={skip-pattern}]
-		end={end_pattern} ..
+		end={end-pattern} ..
 		[{options}]
 
 	This defines one region.  It may span several lines.
@@ -3819,12 +3819,12 @@ DEFINING REGIONS	*:syn-region* *:syn-start* *:syn-skip* *:syn-end*
 				extend a containing match or item.  Only
 				useful for end patterns.  Must be given before
 				the patterns it applies to. |:syn-excludenl|
-	start={start_pattern}	The search pattern that defines the start of
+	start={start-pattern}	The search pattern that defines the start of
 				the region.  See |:syn-pattern| below.
-	skip={skip_pattern}	The search pattern that defines text inside
+	skip={skip-pattern}	The search pattern that defines text inside
 				the region where not to look for the end
 				pattern.  See |:syn-pattern| below.
-	end={end_pattern}	The search pattern that defines the end of
+	end={end-pattern}	The search pattern that defines the end of
 				the region.  See |:syn-pattern| below.
 
 	Example: >
@@ -4348,7 +4348,7 @@ Notes:
 - A negative offset for an end pattern may not always work, because the end
   pattern may be detected when the highlighting should already have stopped.
 - Before Vim 7.2 the offsets were counted in bytes instead of characters.
-  This didn't work well for multi-byte characters, so it was changed with the
+  This didn't work well for multibyte characters, so it was changed with the
   Vim 7.2 release.
 - The start of a match cannot be in a line other than where the pattern
   matched.  This doesn't work: "a\nb"ms=e.  You can make the highlighting
@@ -4809,6 +4809,7 @@ in their own color.
 			highlighting for groups added by the user!
 			Uses the current value of 'background' to decide which
 			default colors to use.
+			If there was a default link, restore it. |:hi-link|
 
 :hi[ghlight] clear {group-name}
 :hi[ghlight] {group-name} NONE
@@ -5018,7 +5019,7 @@ ctermul={color-nr}				*highlight-ctermul*
 	console.  Example, for reverse video: >
 	    :highlight Visual ctermfg=bg ctermbg=fg
 <	Note that the colors are used that are valid at the moment this
-	command are given.  If the Normal group colors are changed later, the
+	command is given.  If the Normal group colors are changed later, the
 	"fg" and "bg" colors will not be adjusted.
 
 

runtime/doc/tabpage.txt

@@ -1,4 +1,4 @@
-*tabpage.txt*   For Vim version 8.2.  Last change: 2020 Feb 06
+*tabpage.txt*   For Vim version 8.2.  Last change: 2020 Aug 10
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -142,6 +142,7 @@ something else.
 		    :tabclose +	    " close the next tab page
 		    :tabclose 3	    " close the third tab page
 		    :tabclose $	    " close the last tab page
+		    :tabclose #     " close the last accessed tab page
 <
 							*:tabo* *:tabonly*
 :tabo[nly][!]	Close all other tab pages.
@@ -170,6 +171,8 @@ something else.
 				    " one
 		    :tabonly 1	    " close all tab pages except the first one
 		    :tabonly $	    " close all tab pages except the last one
+		    :tabonly #	    " close all tab pages except the last
+				    " accessed one
 
 
 SWITCHING TO ANOTHER TAB PAGE:
@@ -192,6 +195,7 @@ gt					*i_CTRL-<PageDown>* *i_<C-PageDown>*
 		    :+2tabnext	" go to the two next tab page
 		    :1tabnext	" go to the first tab page
 		    :$tabnext	" go to the last tab page
+		    :tabnext #  " go to the last accessed tab page
 		    :tabnext $	" as above
 		    :tabnext -	" go to the previous tab page
 		    :tabnext -1	" as above
@@ -221,6 +225,8 @@ gT		Go to the previous tab page.  Wraps around from the first one
 							*:tabl* *:tablast*
 :tabl[ast]	Go to the last tab page.
 
+					    *g<Tab>* *CTRL-W_g<Tab>* *<C-Tab>*
+g<Tab>		Go to the last accessed tab page.
 
 Other commands:
 							*:tabs*
@@ -253,6 +259,8 @@ REORDERING TAB PAGES:
 		    :tabmove	" move the tab page to the last
 		    :$tabmove	" as above
 		    :tabmove $	" as above
+		    :tabmove #  " move the tab page after the last accessed
+				" tab page
 
 :tabm[ove] +[N]
 :tabm[ove] -[N]