MacVim Snapshot 170

Updated to Vim 8.2.2576. Features ==================== Apple Silicon Support -------------------- MacVim's binary release now fully supports Apple Silicon! If you have an M1 Mac you should notice MacVim being more snappy and smoother. #1150 If you would like to (e.g. if you only installed Python 3 in Rosetta and use plugins that use Python), you could run MacVim under Rosetta. You could use `:version` while in MacVim to tell whether you are running in Rosetta / Intel or Apple Silicon by seeing whether it says x86_64 or arm64. (Vim 8.2.2174) If you rely on Python/Ruby/Lua integration, note that previously MacVim by default searches the `/usr/local/` path for installed language runtimes. With this release, MacVim will still search those folders under Intel / x86-64 builds, but under Apple Silicon / M1, MacVim will search under `/opt/homebrew/` instead, which is the default folder for Homebrew under Apple Silicon. If you don't use Homebrew, or installed language runtimes under other folders, you would need to set `python3dll`/`luadll`/`rubydll` in your vimrc. Full Screen Fixes and Improvements -------------------- Removed the fade-to-black animation when transition to full screen, as they were distracting and looked jarring. For non-native full screen, you could set `MMFullScreenFadeTime` to a non-zero value to still get the animation back. #1171 Non-native full screen - Non-native full screen now has an option to show menu bar when it's active (under Appearance preference pane). #1170 - Fixed non-native full screen to properly hide the menu / dock when used on a secondary screen. Also, fixed misc issues with non-native full screen not drawing at the right offset. #7 #1155 #1170 - Fixed non-native full screen's `fuopt` setting. It now works again. This feature allows you to limit only expand horizontally or vertically when using non-native full screen to help focus on the content, see `:help fuopt`. #509 Fixed small bug in Touch Bar's full screen button sometimes not being updated correctly. #1171 Known Issues ==================== Text invisible after plugging in monitor or waking from sleep -------------------- There is currently a known issue in rendering where after plugging/unplugging an external monitor, or waking from sleep when connected to a monitor, there is a small change MacVim will stop drawing text. If you see that, please report that to #1164. This release contains some additional logging to help dignose the issue and we are still looking to root cause it. General ==================== - Added an option to ignore font's line height. r168 introduced a new renderer which changed the behavior for how font's line height works -- instead of ignoring it, the new renderer respects the line height of the font. This new setting allows MacVim to behave in the old way, since some fonts have large line height that the user may not want to use. #1152 Fixes ==================== - Fixed balloon APIs (`balloon_show()` / `balloon_gettext()`) so plugins relying on them should now work. #902 #1064 Misc ==================== - Scripting languages versions: - Ruby is now built against 3.0, up from 2.7. Compatibility ==================== Requires macOS 10.9 or above. Script interfaces have compatibility with these versions: - Lua 5.4 - Perl 5.18 - Python2 2.7 - Python3 3.9 - Ruby 3.0
Merge remote-tracking branch 'vim/master'
2026-06-02 11:19:22 +02:00 · 2021-03-07 22:46:18 -08:00 · 2021-03-07 22:08:05 -08:00 · 2021-03-07 22:02:03 -08:00 · 2021-03-06 22:33:12 +01:00 · 2021-03-06 21:01:09 +01:00
1152 changed files with 88636 additions and 24899 deletions
@@ -3,6 +3,8 @@ env:
  FEATURES: huge

 freebsd_12_task:
+  only_if: $CIRRUS_TAG == ''
+  timeout_in: 20m
  freebsd_instance:
    image: freebsd-12-1-release-amd64
  install_script:
@@ -0,0 +1,6 @@
+coverage:
+  range: "80...100"
+  status:
+    project:
+      default:
+        threshold: 0.05%
@@ -0,0 +1 @@
+service_name: github-actions
@@ -0,0 +1,204 @@
+# 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/xmlformat.vim		@chrisbra
+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/fbc.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/sml.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/compiler/zsh.vim		@dkearns
+runtime/doc/pi_getscript.txt		@cecamp
+runtime/doc/pi_logipat.txt		@cecamp
+runtime/doc/pi_netrw.txt		@cecamp
+runtime/doc/pi_tar.txt			@cecamp
+runtime/doc/pi_vimball.txt		@cecamp
+runtime/doc/pi_zip.txt			@cecamp
+runtime/ftplugin/awk.vim		@dkearns
+runtime/ftplugin/basic.vim		@dkearns
+runtime/ftplugin/bst.vim		@tpope
+runtime/ftplugin/cfg.vim		@chrisbra
+runtime/ftplugin/css.vim		@dkearns
+runtime/ftplugin/cucumber.vim		@tpope
+runtime/ftplugin/eiffel.vim		@dkearns
+runtime/ftplugin/eruby.vim		@tpope @dkearns
+runtime/ftplugin/freebasic.vim		@dkearns
+runtime/ftplugin/git.vim		@tpope
+runtime/ftplugin/gitcommit.vim		@tpope
+runtime/ftplugin/gitconfig.vim		@tpope
+runtime/ftplugin/gitrebase.vim		@tpope
+runtime/ftplugin/gitsendemail.vim	@tpope
+runtime/ftplugin/gprof.vim		@dpelle
+runtime/ftplugin/haml.vim		@tpope
+runtime/ftplugin/hgcommit.vim		@k-takata
+runtime/ftplugin/javascript.vim		@dkearns
+runtime/ftplugin/javascriptreact.vim	@dkearns
+runtime/ftplugin/kconfig.vim		@chrisbra
+runtime/ftplugin/liquid.vim		@tpope
+runtime/ftplugin/markdown.vim		@tpope
+runtime/ftplugin/matlab.vim		@cecamp
+runtime/ftplugin/nroff.vim		@a-vrma
+runtime/ftplugin/nsis.vim		@k-takata
+runtime/ftplugin/pdf.vim		@tpope
+runtime/ftplugin/ruby.vim		@tpope @dkearns
+runtime/ftplugin/sass.vim		@tpope
+runtime/ftplugin/scss.vim		@tpope
+runtime/ftplugin/spec.vim		@ignatenkobrain
+runtime/ftplugin/tidy.vim		@dkearns
+runtime/ftplugin/tmux.vim		@ericpruitt
+runtime/ftplugin/typescript.vim		@dkearns
+runtime/ftplugin/typescriptreact.vim	@dkearns
+runtime/ftplugin/xml.vim		@chrisbra
+runtime/ftplugin/zsh.vim		@chrisbra
+runtime/indent/bst.vim			@tpope
+runtime/indent/cucumber.vim		@tpope
+runtime/indent/dosbatch.vim		@k-takata
+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/sh.vim			@chrisbra
+runtime/indent/teraterm.vim		@k-takata
+runtime/indent/xml.vim			@chrisbra
+runtime/indent/zsh.vim			@chrisbra
+runtime/keymap/tamil_tscii.vim		@yegappan
+runtime/pack/dist/opt/cfilter/plugin/cfilter.vim	@yegappan
+runtime/pack/dist/opt/matchit/		@chrisbra
+runtime/plugin/getscriptPlugin.vim	@cecamp
+runtime/plugin/logiPat.vim		@cecamp
+runtime/plugin/netrwPlugin.vim		@cecamp
+runtime/plugin/tarPlugin.vim		@cecamp
+runtime/plugin/vimballPlugin.vim	@cecamp
+runtime/plugin/zipPlugin.vim		@cecamp
+runtime/syntax/aidl.vim			@dpelle
+runtime/syntax/amiga.vim		@cecamp
+runtime/syntax/asm.vim			@dkearns
+runtime/syntax/asmh8300.vim		@dkearns
+runtime/syntax/awk.vim			@dkearns
+runtime/syntax/basic.vim		@dkearns
+runtime/syntax/bst.vim			@tpope
+runtime/syntax/cabal.vim		@coot
+runtime/syntax/cabalconfig.vim		@coot
+runtime/syntax/cabalproject.vim		@coot
+runtime/syntax/cs.vim			@nickspoons
+runtime/syntax/csh.vim			@cecamp
+runtime/syntax/cucumber.vim		@tpope
+runtime/syntax/datascript.vim		@dpelle
+runtime/syntax/dcl.vim			@cecamp
+runtime/syntax/doxygen.vim		@frogonwheels
+runtime/syntax/dtd.vim			@chrisbra
+runtime/syntax/elmfilt.vim		@cecamp
+runtime/syntax/eruby.vim		@tpope @dkearns
+runtime/syntax/exports.vim		@cecamp
+runtime/syntax/git.vim			@tpope
+runtime/syntax/gitcommit.vim		@tpope
+runtime/syntax/gitconfig.vim		@tpope
+runtime/syntax/gitrebase.vim		@tpope
+runtime/syntax/gprof.vim		@dpelle
+runtime/syntax/haml.vim			@tpope
+runtime/syntax/haskell.vim		@coot
+runtime/syntax/hgcommit.vim		@k-takata
+runtime/syntax/kconfig.vim		@chrisbra
+runtime/syntax/lex.vim			@cecamp
+runtime/syntax/liquid.vim		@tpope
+runtime/syntax/lisp.vim			@cecamp
+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/prolog.vim		@XVilka
+runtime/syntax/rc.vim			@chrisbra
+runtime/syntax/rpcgen.vim		@cecamp
+runtime/syntax/ruby.vim			@dkearns
+runtime/syntax/sass.vim			@tpope
+runtime/syntax/scss.vim			@tpope
+runtime/syntax/sh.vim			@cecamp
+runtime/syntax/sm.vim			@cecamp
+runtime/syntax/spec.vim			@ignatenkobrain
+runtime/syntax/sqloracle.vim		@chrisbra
+runtime/syntax/sshdconfig.vim		@Jakuje
+runtime/syntax/tags.vim			@cecamp
+runtime/syntax/teraterm.vim		@k-takata
+runtime/syntax/tex.vim			@cecamp
+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/xml.vim			@chrisbra
+runtime/syntax/xslt.vim			@Boobies
+runtime/syntax/xxd.vim			@cecamp
+runtime/syntax/yacc.vim			@cecamp
+runtime/syntax/zsh.vim			@chrisbra
+runtime/tutor/tutor.eo			@dpelle
+runtime/tutor/tutor.eo.utf-8		@dpelle
+runtime/tutor/tutor.fr			@dpelle
+runtime/tutor/tutor.fr.utf-8		@dpelle
+src/po/de.po				@chrisbra
+src/po/eo.po				@dpelle
+src/po/fr.po				@dpelle
@@ -0,0 +1,288 @@
+name: MacVim GitHub CI
+
+on:
+  push:
+  pull_request:
+
+env:
+  MACOSX_DEPLOYMENT_TARGET: 10.9
+
+  CC: clang
+
+  VERSIONER_PERL_VERSION: 5.18
+  VERSIONER_PYTHON_VERSION: 2.7
+  vi_cv_path_python: /usr/bin/python
+  vi_cv_path_python3: /usr/local/bin/python3
+  vi_cv_path_plain_lua: /usr/local/bin/lua
+  vi_cv_path_ruby: /usr/local/opt/ruby/bin/ruby
+  vi_cv_dll_name_perl: /System/Library/Perl/5.18/darwin-thread-multi-2level/CORE/libperl.dylib
+  vi_cv_dll_name_python: /System/Library/Frameworks/Python.framework/Versions/2.7/Python
+  vi_cv_dll_name_python3: /usr/local/Frameworks/Python.framework/Versions/3.9/Python
+  vi_cv_dll_name_python3_arm64: /opt/homebrew/Frameworks/Python.framework/Versions/3.9/Python
+  vi_cv_dll_name_ruby: /usr/local/opt/ruby/lib/libruby.dylib
+  vi_cv_dll_name_ruby_arm64: /opt/homebrew/opt/ruby/lib/libruby.dylib
+  vi_cv_dll_name_lua_arm64: /opt/homebrew/lib/liblua.dylib
+
+  VIM_BIN: src/MacVim/build/Release/MacVim.app/Contents/MacOS/Vim
+  MACVIM_BIN: src/MacVim/build/Release/MacVim.app/Contents/MacOS/MacVim
+
+  TERM: xterm
+  BASH_SILENCE_DEPRECATION_WARNING: 1
+
+jobs:
+  # Builds and test MacVim
+  build-and-test:
+
+    # Test on macOS 10.15 / 11.0, and also older version of Xcode for compatibility testing.
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: macos-10.15
+            xcode: 11.7
+          - os: macos-10.15
+          - os: macos-11.0
+            publish: true
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v2
+
+      # Set up, install, and cache gettext library for localization.
+      #
+      # Instead of using the default binary installed by Homebrew, need to build our own because gettext is statically
+      # linked in MacVim, and need to be built against MACOSX_DEPLOYMENT_TARGET to ensure the built binary will work on
+      # supported macOS versions.
+      #
+      # In addition, to support building a universal MacVim, we need an arm64 version of gettext as well in order to
+      # create a universal gettext binary to link against (Homebrew only distributes thin binaries and therefore this
+      # has to be done manually). To do that, we will just pull the bottle directly from Homebrew and patch it in using
+      # lipo. We can't use normal brew commands to get the bottle because brew doesn't natively support cross-compiling
+      # and we are running CI on x86_64 Macs. We also don't need to worry about the min deployment target fix on arm64
+      # because all Apple Silicon Macs have to run on macOS 11+.
+
+      - name: Set up gettext
+        if: matrix.publish
+        run: |
+          # Patch the official Homebrew gettext formula to explicitly build for min deployment target
+          cp /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/Formula/gettext.rb gettext.rb
+
+          cat << EOF > gettext_diff.patch
+          --- gettext_orig.rb
+          +++ gettext.rb
+          @@ -24,2 +24,3 @@
+             def install
+          +    ENV["MACOSX_DEPLOYMENT_TARGET"] = "${MACOSX_DEPLOYMENT_TARGET}"
+               args = [
+          EOF
+
+          patch gettext.rb gettext_diff.patch
+
+          # Uninstall the already installed gettext because we want to build our own
+          brew uninstall --ignore-dependencies gettext
+
+      - name: Cache gettext
+        id: cache-gettext
+        if: matrix.publish
+        uses: actions/cache@v2
+        with:
+          path: /usr/local/Cellar/gettext
+          key: gettext-homebrew-cache-patched-unified-${{ hashFiles('gettext.rb') }}
+
+      - name: Install gettext
+        if: matrix.publish
+        env:
+          HOMEBREW_NO_AUTO_UPDATE: 1
+        run: |
+          brew install -s gettext.rb  # This will be a no-op if gettext was cached
+          brew link gettext           # If gettext was cached, this step is necessary to relink it to /usr/local/
+
+      - name: Create universal gettext with arm64 bottle
+        if: matrix.publish && steps.cache-gettext.outputs.cache-hit != 'true'
+        env:
+          HOMEBREW_NO_AUTO_UPDATE: 1
+        run: |
+          set -o verbose
+
+          # Manually download and extract gettext bottle for arm64
+          gettext_url=$(brew info --json gettext | ruby -rjson -e 'j = JSON.parse(STDIN.read); puts j[0]["bottle"]["stable"]["files"]["arm64_big_sur"]["url"]')
+          gettext_ver=$(brew info --json gettext | ruby -rjson -e 'j = JSON.parse(STDIN.read); puts j[0]["versions"]["stable"]')
+
+          mkdir gettext_download
+          cd gettext_download
+          wget --no-verbose ${gettext_url}
+          tar xf gettext*.tar.gz
+
+          # Just for diagnostics, print out the old archs. This should be a thin binary (x86_64)
+          lipo -info /usr/local/lib/libintl.a
+          lipo -info /usr/local/lib/libintl.dylib
+
+          # Create a universal binary by patching the custom built x86_64 one with the downloaded arm64 one.
+          # Modify the actual binaries in /usr/local/Cellar instead of the symlinks to allow caching to work.
+          lipo -create -output /usr/local/Cellar/gettext/${gettext_ver}/lib/libintl.a /usr/local/Cellar/gettext/${gettext_ver}/lib/libintl.a ./gettext/${gettext_ver}/lib/libintl.a
+          lipo -create -output /usr/local/Cellar/gettext/${gettext_ver}/lib/libintl.dylib /usr/local/Cellar/gettext/${gettext_ver}/lib/libintl.dylib ./gettext/${gettext_ver}/lib/libintl.dylib
+
+          # Print out the new archs and verify they are universal with 2 archs.
+          lipo -info /usr/local/lib/libintl.a | grep 'x86_64 arm64'
+          lipo -info /usr/local/lib/libintl.dylib | grep 'x86_64 arm64'
+
+      # Set up remaining packages and tools
+
+      - name: Install packages
+        if: matrix.publish
+        env:
+          HOMEBREW_NO_AUTO_UPDATE: 1
+        run: |
+          brew install python
+          brew install ruby
+          brew install lua
+          if [[ -d /usr/local/Cellar/perl ]]; then
+            # We just use system perl to reduce dependencies
+            brew unlink perl
+          fi
+
+      - name: Set up Xcode
+        if: matrix.xcode != ''
+        run: |
+          sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
+          xcode-select -p
+
+      # All set up steps are done. Build and test MacVim below.
+
+      - name: Configure
+        run: |
+          set -o verbose
+
+          CONFOPT=(
+            --with-features=huge
+            --enable-netbeans
+            --with-tlib=ncurses
+            --enable-cscope
+            --enable-gui=macvim
+            --with-compiledby="GitHub Actions"
+          )
+          if ${{ matrix.publish == true }}; then
+            CONFOPT+=(
+              --enable-perlinterp=dynamic
+              --enable-pythoninterp=dynamic
+              --enable-python3interp=dynamic
+              --enable-rubyinterp=dynamic
+              --enable-luainterp=dynamic
+              --with-lua-prefix=/usr/local
+              --with-macarchs="x86_64 arm64"
+            )
+          else
+            CONFOPT+=(
+              --with-macarchs=x86_64
+            )
+          fi
+          echo "CONFOPT: ${CONFOPT[@]}"
+
+          ./configure "${CONFOPT[@]}" --enable-fail-if-missing
+
+          sed -i.bak -f ci/config.mk.sed -f ci/config.mk.clang.sed src/auto/config.mk
+
+      - name: Modify configure result
+        if: matrix.publish
+        run: |
+          # Ruby is keg-only in Homebrew, so need to manually link in the path so Vim will know where to look for the binaries.
+          perl -p -i -e "s#(?<=-DDYNAMIC_RUBY_DLL=\\\\\").*?(?=\\\\\")#${vi_cv_dll_name_ruby}#" src/auto/config.mk
+          grep -q -- "-DDYNAMIC_PERL_DLL=\\\\\"${vi_cv_dll_name_perl}\\\\\"" src/auto/config.mk
+          grep -q -- "-DDYNAMIC_PYTHON_DLL=\\\\\"${vi_cv_dll_name_python}\\\\\"" src/auto/config.mk
+          grep -q -- "-DDYNAMIC_PYTHON3_DLL=\\\\\"${vi_cv_dll_name_python3}\\\\\"" src/auto/config.mk
+          grep -q -- "-DDYNAMIC_RUBY_DLL=\\\\\"${vi_cv_dll_name_ruby}\\\\\"" src/auto/config.mk
+
+          # Also search for the arm64 overrides for the default library locations, which are different from x86_64
+          # because Homebrew puts them at a different place.
+          grep -q -- "-DDYNAMIC_PYTHON3_DLL_ARM64=\\\\\"${vi_cv_dll_name_python3_arm64}\\\\\"" src/auto/config.mk
+          grep -q -- "-DDYNAMIC_RUBY_DLL_ARM64=\\\\\"${vi_cv_dll_name_ruby_arm64}\\\\\"" src/auto/config.mk
+          grep -q -- "-DDYNAMIC_LUA_DLL_ARM64=\\\\\"${vi_cv_dll_name_lua_arm64}\\\\\"" src/auto/config.mk
+
+      - name: Show configure output
+        run: |
+          cat src/auto/config.mk
+          cat src/auto/config.h
+
+      - name: Build
+        env:
+          LC_ALL: C
+        run: |
+          set -o verbose
+
+          NPROC=$(getconf _NPROCESSORS_ONLN)
+          echo "Building MacVim with ${NPROC} cores"
+
+          make -j${NPROC}
+
+      - name: Check version
+        run: |
+          ${VIM_BIN} --version
+          ${VIM_BIN} -u NONE -i NONE --not-a-term -esNX -V1 -S ci/if_ver-1.vim -c quit
+          ${VIM_BIN} -u NONE -i NONE --not-a-term -esNX -V1 -S ci/if_ver-2.vim -c quit
+
+      - name: Smoketest
+        if: matrix.publish
+        run: |
+          set -o verbose
+
+          macvim_excmd() {
+            ${VIM_BIN} -u NONE -i NONE -g -f -X -V1 -es "$@" -c 'echo ""' -c 'qall!' 2>&1
+          }
+
+          # Smoketest scripting languages
+          macvim_excmd -c 'lua print("Test")'
+          macvim_excmd -c 'perl VIM::Msg("Test")'
+          macvim_excmd -c 'py import sys; print("Test")'
+          macvim_excmd -c 'py3 import sys; print("Test")'
+          macvim_excmd -c 'ruby puts("Test")'
+
+          # Check that localized messages work by printing ':version' and checking against localized word
+          macvim_excmd -c 'lang es_ES' -c 'version' | grep Enlazado
+
+          # Make sure there isn't any dynamic linkage to third-party dependencies in the built binary, as we should only use
+          # static linkage to avoid dependency hell. Test that all those dylib's are in /usr/lib which is bundled with macOS and not third-party.
+          if otool -L ${VIM_BIN} | grep '\.dylib\s' | grep -v '^\s*/usr/lib/'; then
+            echo 'Found external dynamic linkage!'; false
+          fi
+
+          # Make sure we are building universal x86_64 / arm64 builds and didn't accidentally create a thin app.
+          check_arch() {
+            local archs=($(lipo -archs "$1"))
+            if [[ ${archs[@]} != "x86_64 arm64" ]]; then
+              echo "Wrong arch(s) in $1: ${archs[@]}"; false
+            fi
+          }
+          check_arch "${VIM_BIN}"
+          check_arch "${MACVIM_BIN}"
+
+      - name: Update Vim help tags
+        if: matrix.publish
+        run: make -C runtime/doc vimtags VIMEXE=../../${VIM_BIN}
+
+      - name: Test
+        timeout-minutes: 20
+        run: make test
+
+      - name: Test GUI
+        timeout-minutes: 20
+        run: |
+          make -C src/testdir clean
+          make -C src testgui
+
+      # Creates a DMG package of MacVim. Note that this doesn't create a GitHub release for us, because we would prefer to
+      # do it manually, for two reasons: 1) signing / notarization are currently done out of CI, 2) we want to manually
+      # format our release notes and add pictures to make them look nice.
+      - name: Build MacVim dmg image
+        if: startsWith(github.ref, 'refs/tags/') && matrix.publish
+        run: |
+          # Use the --skip-jenkins flag to skip the prettify osascript calls which could fail due to permission issues in
+          # CI environment.
+          make -C src macvim-dmg CREATEDMG_FLAGS=--skip-jenkins
+
+      - name: Upload MacVim image
+        if: startsWith(github.ref, 'refs/tags/') && matrix.publish
+        uses: actions/upload-artifact@v2
+        with:
+          name: MacVim.dmg
+          path: src/MacVim/build/Release/MacVim.dmg
@@ -1,227 +0,0 @@
-name: GitHub CI
-
-on:
-  push:
-    branches:
-      - '*'
-  pull_request:
-
-env:
-  VCVARSALL: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat
-
-  # Interfaces
-  # Lua
-  LUA_VER: 54
-  LUA_VER_DOT: '5.4'
-  LUA_RELEASE: 5.4.0
-  LUA32_URL: https://downloads.sourceforge.net/luabinaries/lua-%LUA_RELEASE%_Win32_dllw6_lib.zip
-  LUA64_URL: https://downloads.sourceforge.net/luabinaries/lua-%LUA_RELEASE%_Win64_dllw6_lib.zip
-  LUA_DIR: D:\Lua
-  # Python 2
-  PYTHON_VER: 27
-  PYTHON_VER_DOT: '2.7'
-  # Python 3
-  PYTHON3_VER: 38
-  PYTHON3_VER_DOT: '3.8'
-
-  # Other dependencies
-  # winpty
-  WINPTY_URL: https://github.com/rprichard/winpty/releases/download/0.4.3/winpty-0.4.3-msvc2015.zip
-
-  # Escape sequences
-  COL_RED: "\x1b[31m"
-  COL_GREEN: "\x1b[32m"
-  COL_YELLOW: "\x1b[33m"
-  COL_RESET: "\x1b[m"
-
-jobs:
-  build:
-    runs-on: windows-latest
-
-    strategy:
-      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 "::set-env name=PYTHON_DIR::$python_dir"
-        echo "::set-env name=PYTHON3_DIR::$python3_dir"
-
-    - 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: 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
-
-        mkdir ..\src2
-        xcopy testdir ..\src2\testdir\ /E > nul || exit 1
-        copy evalfunc.c ..\src2 > nul
-
-        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,600) do (
-          if exist done.txt goto exitloop
-          ping -n 2 localhost > nul
-        )
-        set timeout=1
-        :exitloop
-
-        echo %COL_GREEN%Test results of vim:%COL_RESET%
-        if exist messages type messages
-        nmake -nologo -f Make_dos.mak report VIMPROG=..\..\src\vim || exit 1
-        if "%timeout%"=="1" (
-          echo %COL_RED%Timed out.%COL_RESET%
-          exit 1
-        )
@@ -0,0 +1,62 @@
+# 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
+
+    # 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
@@ -15,10 +15,11 @@ env:
      vi_cv_path_ruby=/usr/local/opt/ruby/bin/ruby
      vi_cv_dll_name_perl=/System/Library/Perl/5.18/darwin-thread-multi-2level/CORE/libperl.dylib
      vi_cv_dll_name_python=/System/Library/Frameworks/Python.framework/Versions/2.7/Python
-      vi_cv_dll_name_python3=/usr/local/Frameworks/Python.framework/Versions/3.8/Python
+      vi_cv_dll_name_python3=/usr/local/Frameworks/Python.framework/Versions/3.9/Python
      vi_cv_dll_name_ruby=/usr/local/opt/ruby/lib/libruby.dylib
      VIMCMD=src/MacVim/build/Release/MacVim.app/Contents/MacOS/Vim
-      CONFOPT="--with-features=huge --enable-netbeans --with-tlib=ncurses --enable-cscope --enable-gui=macvim"
+      MACVIM_BIN=src/MacVim/build/Release/MacVim.app/Contents/MacOS/MacVim
+      CONFOPT="--with-features=huge --enable-netbeans --with-tlib=ncurses --enable-cscope --enable-gui=macvim --with-macarchs=x86_64"
      BASH_SILENCE_DEPRECATION_WARNING=1

 _anchors:
@@ -61,30 +62,38 @@ script:
      grep -q -- "-DDYNAMIC_RUBY_DLL=\\\\\"${vi_cv_dll_name_ruby}\\\\\"" src/auto/config.mk
    fi
  - echo -en "travis_fold:end:configure\\r\\033[0K"
+
  - echo -e "\\033[33;1mBuilding MacVim\\033[0m" && echo -en "travis_fold:start:build\\r\\033[0K"
  - make -j${NPROC}
  - echo -en "travis_fold:end:build\\r\\033[0K"
-  - set +o errexit
  - ${VIMCMD} --version
-  - echo -e "\\033[33;1mTesting MacVim\\033[0m" && echo -en "travis_fold:start:test\\r\\033[0K"
+  # Disable errexit so flaky tests won't immediately exit to allow us to see all the errors.
+  - set +o errexit
+
  # Smoketest scripting languages
+  - echo -e "\\033[33;1mSmoketest\\033[0m" && echo -en "travis_fold:start:smoketest\\r\\033[0K"
  - |
    macvim_excmd() {
-      if [[ -n "${LANGOPT}" ]]; then
-        ${VIMCMD} -u NONE -i NONE -g -f -X -V1 -es "$@" -c 'echo ""' -c quit 2>&1
-      fi
+      ${VIMCMD} -u NONE -i NONE -g -f -X -V1 -es "$@" -c 'echo ""' -c 'qall!' 2>&1
    }
-  - macvim_excmd -c 'lua print("Test")'
-  - macvim_excmd -c 'perl VIM::Msg("Test")'
-  - macvim_excmd -c 'py import sys; print("Test")'
-  - macvim_excmd -c 'py3 import sys; print("Test")'
-  - macvim_excmd -c 'ruby puts("Test")'
+  - if [[ -n "${LANGOPT}" ]]; then macvim_excmd -c 'lua print("Test")'; fi
+  - if [[ -n "${LANGOPT}" ]]; then macvim_excmd -c 'perl VIM::Msg("Test")'; fi
+  - if [[ -n "${LANGOPT}" ]]; then macvim_excmd -c 'py import sys; print("Test")'; fi
+  - if [[ -n "${LANGOPT}" ]]; then macvim_excmd -c 'py3 import sys; print("Test")'; fi
+  - if [[ -n "${LANGOPT}" ]]; then macvim_excmd -c 'ruby puts("Test")'; fi
  # Check that localized messages work by printing ':version' and checking against localized word
-  - |
-    if [[ -n "${HAS_GETTEXT}" ]]; then
-      ${VIMCMD} -es -c 'lang es_ES' -c 'redir @a' -c 'version' -c 'put a' -c 'print' -c 'qa!' | grep Enlazado
-    fi
-  # Run standard test suites
+  - if [[ -n "${HAS_GETTEXT}" ]]; then macvim_excmd -c 'lang es_ES' -c 'version' | grep Enlazado; fi
+  # Make sure there isn't any dynamic linkage to third-party dependencies in the built binary, as we should only use
+  # static linkage to avoid dependency hell. Test that all those dylib's are in /usr/lib which is bundled with macOS and not third-party.
+  - (! otool -L ${VIMCMD} | grep '\.dylib\s' | grep -v '^\s*/usr/lib/')
+  # Make sure we are building x86_64 only. arm64 builds don't work properly now, so we don't want to accidentally build
+  # it as it will get prioritized by Apple Silicon Macs.
+  - (lipo -archs ${VIMCMD} | grep '^x86_64$')
+  - (lipo -archs ${MACVIM_BIN} | grep '^x86_64$')
+  - echo -en "travis_fold:end:smoketest\\r\\033[0K"
+
+  # Run standard test suites.
+  - echo -e "\\033[33;1mTesting MacVim\\033[0m" && echo -en "travis_fold:start:test\\r\\033[0K"
  - make test
  - make -C runtime/doc vimtags VIMEXE=../../src/MacVim/build/Release/MacVim.app/Contents/bin/vim
  - echo -en "travis_fold:end:test\\r\\033[0K"
@@ -95,20 +104,22 @@ script:

 jobs:
  include:
-    - osx_image: xcode12
-    - osx_image: xcode11.3
+    - osx_image: xcode12.2
      <<: *lang_env
      <<: *homebrew
      <<: *caches
-    - osx_image: xcode9.4
-    - osx_image: xcode7.3
+    # Disable unnecessary builds to cut down on Travis usage due to billing changes for open-source projects.
+    #- osx_image: xcode11.6
+    #- osx_image: xcode9.4
+    #- osx_image: xcode7.3
    - stage: deploy
-      osx_image: xcode11.3
+      osx_image: xcode12.2
      <<: *lang_env
      <<: *caches
      script: skip
      before_deploy:
-        - make -C src macvim-dmg
+        # Use the --skip-jenkins flag to skip the prettify osascript calls which will fail due to permission issues in Travis CI's Mac environment.
+        - make -C src macvim-dmg CREATEDMG_FLAGS=--skip-jenkins
      deploy:
        provider: releases
        token:
@@ -3,18 +3,23 @@

 # source files for all source archives
 SRC_ALL =	\
-		.gitignore \
+		.cirrus.yml \
+		.coveralls.yml \
 		.gitattributes \
+		.github/CODEOWNERS \
+		.github/workflows/ci.yml \
+		.github/workflows/codeql-analysis.yml \
+		.gitignore \
 		.hgignore \
 		.lgtm.yml \
 		.travis.yml \
-		.cirrus.yml \
-		.github/workflows/ci-windows.yaml \
 		appveyor.yml \
 		ci/appveyor.bat \
+		ci/build-snd-dummy.sh \
+		ci/config.mk*.sed \
 		ci/if_ver*.vim \
 		ci/load-snd-dummy.sh \
-		ci/config.mk*.sed \
+		ci/setup-xvfb.sh \
 		src/Make_all.mak \
 		src/README.md \
 		src/alloc.h \
@@ -45,6 +50,7 @@ SRC_ALL =	\
 		src/drawline.c \
 		src/drawscreen.c \
 		src/edit.c \
+		src/errors.h \
 		src/eval.c \
 		src/evalbuffer.c \
 		src/evalfunc.c \
@@ -73,6 +79,7 @@ SRC_ALL =	\
 		src/highlight.c \
 		src/indent.c \
 		src/insexpand.c \
+		src/job.c \
 		src/json.c \
 		src/json_test.c \
 		src/kword_test.c \
@@ -158,9 +165,7 @@ SRC_ALL =	\
 		src/testdir/gen_opt_test.vim \
 		src/testdir/README.txt \
 		src/testdir/Make_all.mak \
-		src/testdir/dotest.in \
-		src/testdir/test1.in \
-		src/testdir/test77a.in \
+		src/testdir/*.in \
 		src/testdir/*.py \
 		src/testdir/lsan-suppress.txt \
 		src/testdir/sautest/autoload/*.vim \
@@ -179,7 +184,7 @@ SRC_ALL =	\
 		src/testdir/summarize.vim \
 		src/testdir/term_util.vim \
 		src/testdir/view_util.vim \
-		src/testdir/test1.ok \
+		src/testdir/test[0-9]*.ok \
 		src/testdir/test77a.ok \
 		src/testdir/test83-tags? \
 		src/testdir/test77a.com \
@@ -250,6 +255,7 @@ SRC_ALL =	\
 		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 \
@@ -621,7 +627,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 \
@@ -1029,6 +1035,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 \
@@ -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
@@ -7,7 +7,7 @@ Vim - the text editor - for macOS

 - Vim README: [README_vim.md](README_vim.md)

- Travis CI <a href="https://travis-ci.com/macvim-dev/macvim"><img src="https://travis-ci.com/macvim-dev/macvim.svg?branch=master" alt="Build Status"></a>
+- [![MacVim GitHub CI](https://github.com/macvim-dev/macvim/workflows/MacVim%20GitHub%20CI/badge.svg)](https://github.com/macvim-dev/macvim/actions?query=workflow%3A%22MacVim+GitHub+CI%22)

 - Packaged in [![Homebrew package](https://repology.org/badge/version-for-repo/homebrew/macvim.svg)](https://repology.org/metapackage/macvim/versions) [![MacPorts package](https://repology.org/badge/version-for-repo/macports/macvim.svg)](https://repology.org/metapackage/macvim/versions)

@@ -70,6 +70,7 @@ the text.  For example, reindent all the lines:
 | Vim new | 0.190276 |

 The differences are smaller, but Vim 9 script is clearly the fastest.
+Using LuaJIT gives 0.25, only a little bit faster than plain Lua.

 How does Vim9 script work?  The function is first compiled into a sequence of
 instructions.  Each instruction has one or two parameters and a stack is
@@ -80,7 +81,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
@@ -98,7 +99,7 @@ Instead of using script language support in Vim:
  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
@@ -159,18 +160,18 @@ thing I have been thinking of is assignments without ":let".  I often
 make that mistake (after writing JavaScript especially).  I think it is
 possible, if we make local variables shadow commands.  That should be OK,
 if you shadow a command you want to use, just rename the variable.
-Using "let" and "const" to declare a variable, like in JavaScript and
+Using "var" and "const" to declare a variable, like in JavaScript and
 TypeScript, can work:


 ``` vim
 def MyFunction(arg: number): number
-   let local = 1
-   let todo = arg
+   var local = 1
+   var todo = arg
   const ADD = 88
   while todo > 0
      local += ADD
-      --todo
+      todo -= 1
   endwhile
   return local
 enddef
@@ -192,7 +193,7 @@ function and export it:
 ``` vim
 vim9script  " Vim9 script syntax used here

-let local = 'local variable is not exported, script-local'
+var local = 'local variable is not exported, script-local'

 export def MyFunction()  " exported function
 ...
@@ -248,10 +249,10 @@ END
  return luaeval('sum')
 endfunc

-def VimNew()
-  let sum = 0
+def VimNew(): number
+  var sum = 0
  for i in range(1, 2999999)
-    let sum += i
+    sum += i
  endfor
  return sum
 enddef
@@ -277,7 +278,7 @@ echo 'Vim new: ' .. reltimestr(reltime(start))

 ``` vim
 def VimNew(): number
-  let totallen = 0
+  var totallen = 0
  for i in range(1, 100000)
    setline(i, '    ' .. getline(i))
    totallen += len(getline(i))
@@ -1,14 +1,8 @@
-![Vim Logo](https://github.com/vim/vim/blob/master/runtime/vimlogo.gif)
+[![Vim Logo](https://github.com/vim/vim/raw/master/runtime/vimlogo.gif)](https://www.vim.org)

-[![Travis Build Status](https://travis-ci.org/vim/vim.svg?branch=master)](https://travis-ci.org/vim/vim)
-[![Appveyor Build status](https://ci.appveyor.com/api/projects/status/o2qht2kjm02sgghk?svg=true)](https://ci.appveyor.com/project/chrisbra/vim)
-[![Cirrus Build Status](https://api.cirrus-ci.com/github/vim/vim.svg)](https://cirrus-ci.com/github/vim/vim)
-[![Coverage Status](https://codecov.io/gh/vim/vim/coverage.svg?branch=master)](https://codecov.io/gh/vim/vim?branch=master)
-[![Coverity Scan](https://scan.coverity.com/projects/241/badge.svg)](https://scan.coverity.com/projects/vim)
-[![Language Grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/vim/vim.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/vim/vim/context:cpp)
-[![Debian CI](https://badges.debian.net/badges/debian/testing/vim/version.svg)](https://buildd.debian.org/vim)
-[![Packages](https://repology.org/badge/tiny-repos/vim.svg)](https://repology.org/metapackage/vim)
-For translations of this README see the end.
+[![Github Build status](https://github.com/vim/vim/workflows/GitHub%20CI/badge.svg)](https://github.com/vim/vim/actions?query=workflow%3A%22GitHub+CI%22) [![Travis Build Status](https://travis-ci.com/vim/vim.svg?branch=master)](https://travis-ci.com/github/vim/vim) [![Appveyor Build status](https://ci.appveyor.com/api/projects/status/o2qht2kjm02sgghk?svg=true)](https://ci.appveyor.com/project/chrisbra/vim) [![Cirrus Build Status](https://api.cirrus-ci.com/github/vim/vim.svg)](https://cirrus-ci.com/github/vim/vim) [![Coverage Status](https://codecov.io/gh/vim/vim/coverage.svg?branch=master)](https://codecov.io/gh/vim/vim?branch=master) [![Coverity Scan](https://scan.coverity.com/projects/241/badge.svg)](https://scan.coverity.com/projects/vim) [![Language Grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/vim/vim.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/vim/vim/context:cpp) [![Debian CI](https://badges.debian.net/badges/debian/testing/vim/version.svg)](https://buildd.debian.org/vim) [![Packages](https://repology.org/badge/tiny-repos/vim.svg)](https://repology.org/metapackage/vim) [![Fossies codespell report](https://fossies.org/linux/test/vim-master.tar.gz/codespell.svg)](https://fossies.org/linux/test/vim-master.tar.gz/codespell.html)
+
+<sub>For translations of this README see the end.</sub>


 ## What is Vim? ##
@@ -26,8 +20,8 @@ All commands are given with normal keyboard characters, so those who can type
 with ten fingers can work very fast.  Additionally, function keys can be
 mapped to commands by the user, and the mouse can be used.

-Vim runs under MS-Windows (XP, Vista, 7, 8, 10), macOS, VMS and almost all
-flavours of UNIX.  Porting to other systems should not be very difficult.
+Vim runs under MS-Windows (XP, Vista, 7, 8, 10), macOS, Haiku, VMS and almost
+all flavours of UNIX.  Porting to other systems should not be very difficult.
 Older versions of Vim run on MS-DOS, MS-Windows 95/98/Me/NT/2000, Amiga DOS,
 Atari MiNT, BeOS, RISC OS and OS/2.  These are no longer maintained.

@@ -72,6 +66,7 @@ archive):
 	README_unix.txt		Unix
 	README_dos.txt		MS-DOS and MS-Windows
 	README_mac.txt		Macintosh
+	README_haiku.txt	Haiku
 	README_vms.txt		VMS

 There are other `README_*.txt` files, depending on the distribution you used.
@@ -16,8 +16,7 @@ src/os_amiga.*		Files for the Amiga port.
 src/os_msdos.*
 src/os_dos.*		Files for the MS-DOS port.

-src/gui_mac.*           Carbon GUI (not used)
-src/os_mac*		Shared files for the different Mac ports.
+src/os_mac.*		Files for the Mac port.

 src/MacVim/*		Files for the MacVim port.

@@ -0,0 +1,19 @@
+#!/bin/bash
+set -eu
+
+LINUX_VERSION=$(uname -r | cut -d. -f1-2)
+LINUX_ARCHIVE_FILE=v${LINUX_VERSION}.tar.gz
+LINUX_SOURCE_DIR=linux-${LINUX_VERSION}
+
+mkdir -p "${TMPDIR}"
+cd "${TMPDIR}"
+
+wget -q "https://github.com/torvalds/linux/archive/${LINUX_ARCHIVE_FILE}"
+
+tar -xf "${LINUX_ARCHIVE_FILE}" "${LINUX_SOURCE_DIR}/sound"
+cd "${LINUX_SOURCE_DIR}/sound"
+
+CC=gcc make -C "/lib/modules/$(uname -r)/build" M="${PWD}" CONFIG_SOUND=m CONFIG_SND=m CONFIG_SND_PCM=m CONFIG_SND_DUMMY=m modules
+
+mkdir -p "${SND_DUMMY_DIR}"
+cp soundcore.ko core/snd.ko core/snd-pcm.ko drivers/snd-dummy.ko "${SND_DUMMY_DIR}"
@@ -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
@@ -0,0 +1,17 @@
+#!/bin/bash
+set -e
+
+apt-get install -y xvfb
+
+cat <<EOT >/etc/systemd/system/xvfb.service
+[Unit]
+Description=X Virtual Frame Buffer Service
+After=network.target
+[Service]
+ExecStart=/usr/bin/Xvfb :99 -screen 0 1024x768x24
+[Install]
+WantedBy=multi-user.target
+EOT
+
+systemctl enable xvfb.service
+systemctl start xvfb.service
@@ -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"
@@ -358,6 +359,8 @@ Section "$(str_section_exe)" id_section_exe

 	SetOutPath $0\colors
 	File ${VIMRT}\colors\*.*
+	SetOutPath $0\colors\tools
+	File ${VIMRT}\colors\tools\*.*

 	SetOutPath $0\compiler
 	File ${VIMRT}\compiler\*.*
@@ -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 \
-     di Windows, per utilizzo da linea di comando (MS-DOS)."
+    "Crea file .bat per varianti di Vim nella directory \
+     di Windows, per utilizzo da riga di comando."

 LangString str_group_icons          ${LANG_ITALIAN} \
    "Crea icone per Vim"
@@ -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‐подобных ОС)"
@@ -1,13 +1,13 @@
 " Vim completion script
 " Language:	C
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2020 Apr 08
+" Last Change:	2020 Nov 14

 let s:cpo_save = &cpo
 set cpo&vim

 " This function is used for the 'omnifunc' option.
-function! ccomplete#Complete(findstart, base)
+func ccomplete#Complete(findstart, base)
  if a:findstart
    " Locate the start of the item, including ".", "->" and "[...]".
    let line = getline('.')
@@ -244,7 +244,7 @@ function! ccomplete#Complete(findstart, base)
  return map(res, 's:Tagline2item(v:val, brackets)')
 endfunc

-function! s:GetAddition(line, match, memarg, bracket)
+func s:GetAddition(line, match, memarg, bracket)
  " Guess if the item is an array.
  if a:bracket && match(a:line, a:match . '\s*\[') > 0
    return '['
@@ -260,13 +260,13 @@ function! s:GetAddition(line, match, memarg, bracket)
    endif
  endif
  return ''
-endfunction
+endfunc

 " Turn the tag info "val" into an item for completion.
 " "val" is is an item in the list returned by taglist().
 " If it is a variable we may add "." or "->".  Don't do it for other types,
 " such as a typedef, by not including the info that s:GetAddition() uses.
-function! s:Tag2item(val)
+func s:Tag2item(val)
  let res = {'match': a:val['name']}

  let res['extra'] = s:Tagcmd2extra(a:val['cmd'], a:val['name'], a:val['filename'])
@@ -289,10 +289,10 @@ function! s:Tag2item(val)
  endif

  return res
-endfunction
+endfunc

 " Use all the items in dictionary for the "info" entry.
-function! s:Dict2info(dict)
+func s:Dict2info(dict)
  let info = ''
  for k in sort(keys(a:dict))
    let info  .= k . repeat(' ', 10 - len(k))
@@ -307,7 +307,7 @@ function! s:Dict2info(dict)
 endfunc

 " Parse a tag line and return a dictionary with items like taglist()
-function! s:ParseTagline(line)
+func s:ParseTagline(line)
  let l = split(a:line, "\t")
  let d = {}
  if len(l) >= 3
@@ -334,12 +334,12 @@ function! s:ParseTagline(line)
  endif

  return d
-endfunction
+endfunc

 " Turn a match item "val" into an item for completion.
 " "val['match']" is the matching item.
 " "val['tagline']" is the tagline in which the last part was found.
-function! s:Tagline2item(val, brackets)
+func s:Tagline2item(val, brackets)
  let line = a:val['tagline']
  let add = s:GetAddition(line, a:val['match'], [a:val], a:brackets == '')
  let res = {'word': a:val['match'] . a:brackets . add }
@@ -377,10 +377,10 @@ function! s:Tagline2item(val, brackets)
    let res['menu'] = s:Tagcmd2extra(s, a:val['match'], matchstr(line, '[^\t]*\t\zs[^\t]*\ze\t'))
  endif
  return res
-endfunction
+endfunc

 " Turn a command from a tag line to something that is useful in the menu
-function! s:Tagcmd2extra(cmd, name, fname)
+func s:Tagcmd2extra(cmd, name, fname)
  if a:cmd =~ '^/^'
    " The command is a search command, useful to see what it is.
    let x = matchstr(a:cmd, '^/^\s*\zs.*\ze$/')
@@ -395,13 +395,13 @@ function! s:Tagcmd2extra(cmd, name, fname)
    let x = a:cmd . ' - ' . a:fname
  endif
  return x
-endfunction
+endfunc

 " Find composing type in "lead" and match items[0] with it.
 " Repeat this recursively for items[1], if it's there.
 " When resolving typedefs "depth" is used to avoid infinite recursion.
 " Return the list of matches.
-function! s:Nextitem(lead, items, depth, all)
+func s:Nextitem(lead, items, depth, all)

  " Use the text up to the variable name and split it in tokens.
  let tokens = split(a:lead, '\s\+\|\<')
@@ -485,7 +485,7 @@ function! s:Nextitem(lead, items, depth, all)
  endfor

  return res
-endfunction
+endfunc


 " Search for members of structure "typename" in tags files.
@@ -493,7 +493,7 @@ endfunction
 " Each match is a dictionary with "match" and "tagline" entries.
 " When "all" is non-zero find all, otherwise just return 1 if there is any
 " member.
-function! s:StructMembers(typename, items, all)
+func s:StructMembers(typename, items, all)
  " Todo: What about local structures?
  let fnames = join(map(tagfiles(), 'escape(v:val, " \\#%")'))
  if fnames == ''
@@ -586,12 +586,12 @@ function! s:StructMembers(typename, items, all)

  " Failed to find anything.
  return []
-endfunction
+endfunc

 " For matching members, find matches for following items.
 " When "all" is non-zero find all, otherwise just return 1 if there is any
 " member.
-function! s:SearchMembers(matches, items, all)
+func s:SearchMembers(matches, items, all)
  let res = []
  for i in range(len(a:matches))
    let typename = ''
@@ -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.
@@ -362,6 +362,10 @@ func dist#ft#FTinc()
      setf aspvbs
    elseif lines =~ "<?"
      setf php
+    " Pascal supports // comments but they're vary rarely used for file
+    " headers so assume POV-Ray
+    elseif lines =~ '^\s*\%({\|(\*\)' || lines =~? s:ft_pascal_keywords
+      setf pascal
    else
      call dist#ft#FTasmsyntax()
      if exists("b:asmsyntax")
@@ -408,6 +412,9 @@ func dist#ft#FTprogress_asm()
  setf progress
 endfunc

+let s:ft_pascal_comments = '^\s*\%({\|(\*\|//\)'
+let s:ft_pascal_keywords = '^\s*\%(program\|unit\|library\|uses\|begin\|procedure\|function\|const\|type\|var\)\>'
+
 func dist#ft#FTprogress_pascal()
  if exists("g:filetype_p")
    exe "setf " . g:filetype_p
@@ -419,8 +426,7 @@ func dist#ft#FTprogress_pascal()
  let lnum = 1
  while lnum <= 10 && lnum < line('$')
    let line = getline(lnum)
-    if line =~ '^\s*\(program\|unit\|procedure\|function\|const\|type\|var\)\>'
-	\ || line =~ '^\s*{' || line =~ '^\s*(\*'
+    if line =~ s:ft_pascal_comments || line =~? s:ft_pascal_keywords
      setf pascal
      return
    elseif line !~ '^\s*$' || line =~ '^/\*'
@@ -433,6 +439,19 @@ func dist#ft#FTprogress_pascal()
  setf progress
 endfunc

+func dist#ft#FTpp()
+  if exists("g:filetype_pp")
+    exe "setf " . g:filetype_pp
+  else
+    let line = getline(nextnonblank(1))
+    if line =~ s:ft_pascal_comments || line =~? s:ft_pascal_keywords
+      setf pascal
+    else
+      setf puppet
+    endif
+  endif
+endfunc
+
 func dist#ft#FTr()
  let max = line("$") > 50 ? 50 : line("$")

@@ -575,7 +594,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
@@ -1,7 +1,7 @@
 " netrw.vim: Handles file transfer and remote directory listing across
 "            AUTOLOAD SECTION
-" Date:		Jan 07, 2020
-" Version:	168
+" Date:		Sep 18, 2020
+" 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
@@ -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
-" Version:	11b	ASTRO-ONLY
+" Date:		Sep 18, 2020
+" 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"
@@ -3,7 +3,7 @@
 " Maintainer:	Dávid Szabó ( complex857 AT gmail DOT com )
 " Previous Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
 " URL: https://github.com/shawncplus/phpcomplete.vim
-" Last Change:  2018 Oct 10
+" Last Change:  2021 Feb 08
 "
 "	OPTIONS:
 "
@@ -122,7 +122,6 @@ function! phpcomplete#CompletePHP(findstart, base) " {{{
 		endif
 	endif

-
 	" If exists b:php_menu it means completion was already constructed we
 	" don't need to do anything more
 	if exists("b:php_menu")
@@ -148,8 +147,6 @@ function! phpcomplete#CompletePHP(findstart, base) " {{{
 	try
 		let eventignore = &eventignore
 		let &eventignore = 'all'
-		let winheight = winheight(0)
-		let winnr = winnr()

 		let [current_namespace, imports] = phpcomplete#GetCurrentNameSpace(getline(0, line('.')))

@@ -183,7 +180,6 @@ function! phpcomplete#CompletePHP(findstart, base) " {{{
 				endif

 				if filereadable(classlocation)
-					let classfile = readfile(classlocation)
 					let classcontent = ''
 					let classcontent .= "\n".phpcomplete#GetClassContents(classlocation, classname)
 					let sccontent = split(classcontent, "\n")
@@ -217,7 +213,6 @@ function! phpcomplete#CompletePHP(findstart, base) " {{{
 			return phpcomplete#CompleteGeneral(a:base, current_namespace, imports)
 		endif
 	finally
-		silent! exec winnr.'resize '.winheight
 		let &eventignore = eventignore
 	endtry
 endfunction
@@ -1025,7 +1020,7 @@ function! phpcomplete#CompleteUserClass(context, base, sccontent, visibility) "
 				let c_var = '$'.c_var
 			endif
 			let c_variables[c_var] = ''
-			if g:phpcomplete_parse_docblock_comments && len(get(variables, var_index)) > 0
+			if g:phpcomplete_parse_docblock_comments && len(get(variables, var_index, '')) > 0
 				let c_doc[c_var] = phpcomplete#GetDocBlock(a:sccontent, variables[var_index])
 			endif
 			let var_index += 1
@@ -2082,26 +2077,17 @@ function! phpcomplete#GetClassContentsStructure(file_path, file_lines, class_nam
 	"	...
 	" ]
 	"
-	let full_file_path = fnamemodify(a:file_path, ':p')
 	let class_name_pattern = '[a-zA-Z_\x7f-\xff\\][a-zA-Z_0-9\x7f-\xff\\]*'
-	let cfile = join(a:file_lines, "\n")
+	let full_file_path = fnamemodify(a:file_path, ':p')
 	let result = []
-	" We use new buffer and (later) normal! because
-	" this is the most efficient way. The other way
-	" is to go through the looong string looking for
-	" matching {}
+	let popup_id = popup_create(a:file_lines, {'hidden': v:true})

-	" remember the window we started at
-	let phpcomplete_original_window = winnr()
+	call win_execute(popup_id, 'call search(''\c\(class\|interface\|trait\)\_s\+'.a:class_name.'\(\>\|$\)'')')
+	call win_execute(popup_id, "let cfline = line('.')")
+	call win_execute(popup_id, "call search('{')")
+	call win_execute(popup_id, "let endline = line('.')")

-	silent! below 1new
-	silent! 0put =cfile
-	call search('\c\(class\|interface\|trait\)\_s\+'.a:class_name.'\(\>\|$\)')
-	let cfline = line('.')
-	call search('{')
-	let endline = line('.')
-
-	let content = join(getline(cfline, endline), "\n")
+	call win_execute(popup_id, 'let content = join(getline('.cfline.', '.endline.'), "\n")')
 	" Catch extends
 	if content =~? 'extends'
 		let extends_string = matchstr(content, '\(class\|interface\)\_s\+'.a:class_name.'\_.\+extends\_s\+\zs\('.class_name_pattern.'\(,\|\_s\)*\)\+\ze\(extends\|{\)')
@@ -2117,14 +2103,16 @@ function! phpcomplete#GetClassContentsStructure(file_path, file_lines, class_nam
 	else
 		let implemented_interfaces = []
 	endif
-	call searchpair('{', '', '}', 'W')
-	let class_closing_bracket_line = line('.')
+
+	call win_execute(popup_id, 'let [class_closing_bracket_line, class_closing_bracket_col] = searchpairpos("{", "", "}", "W")')

 	" Include class docblock
 	let doc_line = cfline - 1
-	if getline(doc_line) =~? '^\s*\*/'
+	call win_execute(popup_id, 'let l = getline('.doc_line.')')
+	if l =~? '^\s*\*/'
 		while doc_line != 0
-			if getline(doc_line) =~? '^\s*/\*\*'
+			call win_execute(popup_id, 'let l = getline('.doc_line.')')
+			if l =~? '^\s*/\*\*'
 				let cfline = doc_line
 				break
 			endif
@@ -2132,22 +2120,22 @@ function! phpcomplete#GetClassContentsStructure(file_path, file_lines, class_nam
 		endwhile
 	endif

-	let classcontent = join(getline(cfline, class_closing_bracket_line), "\n")
+	call win_execute(popup_id, 'let classcontent = join(getline('.cfline.', '.class_closing_bracket_line.'), "\n")')

 	let used_traits = []
 	" move back to the line next to the class's definition
-	call cursor(endline + 1, 1)
+	call win_execute(popup_id, 'call cursor('.(endline + 1).', 1)')
 	let keep_searching = 1
 	while keep_searching != 0
 		" try to grab "use..." keywords
-		let [lnum, col] = searchpos('\c^\s\+use\s\+'.class_name_pattern, 'cW', class_closing_bracket_line)
-		let syn_name = synIDattr(synID(lnum, col, 0), "name")
+		call win_execute(popup_id, 'let [lnum, col] = searchpos(''\c^\s\+use\s\+'.class_name_pattern.''', "cW", '.class_closing_bracket_line.')')
+		call win_execute(popup_id, 'let syn_name = synIDattr(synID('.lnum.', '.col.', 0), "name")')
 		if syn_name =~? 'string\|comment'
-			call cursor(lnum + 1, 1)
+			call win_execute(popup_id, 'call cursor('.(lnum + 1).', 1)')
 			continue
 		endif

-		let trait_line = getline(lnum)
+		call win_execute(popup_id, 'let trait_line = getline('.lnum.')')
 		if trait_line !~? ';'
 			" try to find the next line containing ';'
 			let l = lnum
@@ -2157,25 +2145,23 @@ function! phpcomplete#GetClassContentsStructure(file_path, file_lines, class_nam
 			while search_line !~? ';' && l > 0
 				" file lines are reversed so we need to go backwards
 				let l += 1
-				let search_line = getline(l)
+				call win_execute(popup_id, 'let search_line = getline('.l.')')
 				let trait_line .= ' '.substitute(search_line, '\(^\s\+\|\s\+$\)', '', 'g')
 			endwhile
 		endif
 		let use_expression = matchstr(trait_line, '^\s*use\s\+\zs.\{-}\ze;')
 		let use_parts = map(split(use_expression, '\s*,\s*'), 'substitute(v:val, "\\s+", " ", "g")')
 		let used_traits += map(use_parts, 'substitute(v:val, "\\s", "", "g")')
-		call cursor(lnum + 1, 1)
+		call win_execute(popup_id, 'call cursor('.(lnum + 1).', 1)')

 		if [lnum, col] == [0, 0]
 			let keep_searching = 0
 		endif
 	endwhile

-	silent! bw! %
+	call popup_close(popup_id)

 	let [current_namespace, imports] = phpcomplete#GetCurrentNameSpace(a:file_lines[0:cfline])
-	" go back to original window
-	exe phpcomplete_original_window.'wincmd w'
 	call add(result, {
 				\ 'class': a:class_name,
 				\ 'content': classcontent,
@@ -2532,40 +2518,37 @@ function! phpcomplete#FormatDocBlock(info) " {{{
 	endif

 	return res
-endfunction!
+endfunction
 " }}}

 function! phpcomplete#GetCurrentNameSpace(file_lines) " {{{
-	let original_window = winnr()
-
-	silent! below 1new
-	silent! 0put =a:file_lines
-	normal! G
+	let popup_id = popup_create(a:file_lines, {'hidden': v:true})
+	call win_execute(popup_id, 'normal! G')

 	" clear out classes, functions and other blocks
 	while 1
-		let block_start_pos = searchpos('\c\(class\|trait\|function\|interface\)\s\+\_.\{-}\zs{', 'Web')
+		call win_execute(popup_id, 'let block_start_pos = searchpos(''\c\(class\|trait\|function\|interface\)\s\+\_.\{-}\zs{'', "Web")')
 		if block_start_pos == [0, 0]
 			break
 		endif
-		let block_end_pos = searchpairpos('{', '', '}\|\%$', 'W', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment"')
+		call win_execute(popup_id, 'let block_end_pos = searchpairpos("{", "", ''}\|\%$'', "W", ''synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment"'')')

+		let popup_lines = winbufnr(popup_id)->getbufline(1, '$')
 		if block_end_pos != [0, 0]
 			" end of the block found, just delete it
-			silent! exec block_start_pos[0].','.block_end_pos[0].'d _'
+			call remove(popup_lines, block_start_pos[0] - 1, block_end_pos[0] - 1)
 		else
 			" block pair not found, use block start as beginning and the end
 			" of the buffer instead
-			silent! exec block_start_pos[0].',$d _'
+			call remove(popup_lines, block_start_pos[0] - 1, -1)
 		endif
+		call popup_settext(popup_id, popup_lines)
 	endwhile
-	normal! G
+	call win_execute(popup_id, 'normal! G', 'silent!')

 	" grab the remains
-	let file_lines = reverse(getline(1, line('.') - 1))
-
-	silent! bw! %
-	exe original_window.'wincmd w'
+	call win_execute(popup_id, "let file_lines = reverse(getline(1, line('.')-1))")
+	call popup_close(popup_id)

 	let namespace_name_pattern = '[a-zA-Z_\x7f-\xff\\][a-zA-Z_0-9\x7f-\xff\\]*'
 	let i = 0
@@ -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
@@ -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
@@ -1,12 +1,16 @@
 " Vim completion script
 " Language:    All languages, uses existing syntax highlighting rules
 " Maintainer:  David Fishburn <dfishburn dot vim at gmail dot com>
-" Version:     13.0
-" Last Change: 2019 Aug 08
+" Version:     14.0
+" Last Change: 2020 Dec 30
 " Usage:       For detailed help, ":help ft-syntax-omni"

 " History
 "
+" Version 14.0
+"   - Fixed issue with single quotes and is_keyword
+"     https://github.com/vim/vim/issues/7463
+"
 " Version 13.0
 "   - Extended the option omni_syntax_group_include_{filetype}
 "     to accept a comma separated list of regex's rather than
@@ -179,7 +183,8 @@ function! syntaxcomplete#Complete(findstart, base)
    endif

    " let base = s:prepended . a:base
-    let base = s:prepended
+    " let base = s:prepended
+    let base = substitute(s:prepended, "'", "''", 'g')

    let filetype = substitute(&filetype, '\.', '_', 'g')
    let list_idx = index(s:cache_name, filetype, 0, &ignorecase)
@@ -548,7 +553,7 @@ function! s:SyntaxCSyntaxGroupItems( group_name, syntax_full )
        " let syn_list = substitute( @l, '^.*xxx\s*\%(contained\s*\)\?', "", '' )
        " let syn_list = substitute( @l, '^.*xxx\s*', "", '' )

-        " We only want the words for the lines begining with
+        " We only want the words for the lines beginning with
        " containedin, but there could be other items.

        " Tried to remove all lines that do not begin with contained
@@ -163,7 +163,7 @@ fun! tar#Browse(tarfile)
 "   call Decho("1: exe silent r! gzip -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - ")
   exe "sil! r! gzip -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "

-  elseif tarfile =~# '\.\(tgz\)$' || tarfile =~# '\.\(tbz\)$' || tarfile =~# '\.\(txz\)$'
+  elseif tarfile =~# '\.\(tgz\)$' || tarfile =~# '\.\(tbz\)$' || tarfile =~# '\.\(txz\)$' || tarfile =~# '\.\(tzs\)$'
   if has("unix") && executable("file")
    let filekind= system("file ".shellescape(tarfile,1)) =~ "bzip2"
   else
@@ -174,6 +174,8 @@ fun! tar#Browse(tarfile)
    exe "sil! r! bzip2 -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
   elseif filekind =~ "XZ"
    exe "sil! r! xz -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
+   elseif filekind =~ "Zstandard"
+    exe "sil! r! zstd --decompress --stdout -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
   else
    exe "sil! r! gzip -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
   endif
@@ -190,6 +192,8 @@ fun! tar#Browse(tarfile)
  elseif tarfile =~# '\.\(xz\|txz\)$'
 "   call Decho("3: exe silent r! xz --decompress --stdout -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - ")
   exe "sil! r! xz --decompress --stdout -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
+  elseif tarfile =~# '\.\(zst\|tzs\)$'
+   exe "sil! r! zstd --decompress --stdout -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
  else
   if tarfile =~ '^\s*-'
    " A file name starting with a dash is taken as an option.  Prepend ./ to avoid that.
@@ -302,6 +306,9 @@ fun! tar#Read(fname,mode)
  elseif  fname =~ '\.xz$' && executable("xzcat")
   let decmp= "|xzcat"
   let doro = 1
+  elseif  fname =~ '\.zst$' && executable("zstdcat")
+   let decmp= "|zstdcat"
+   let doro = 1
  else
   let decmp=""
   let doro = 0
@@ -331,6 +338,8 @@ fun! tar#Read(fname,mode)
    exe "sil! r! bzip2 -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
   elseif filekind =~ "XZ"
    exe "sil! r! xz -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
+   elseif filekind =~ "Zstandard"
+    exe "sil! r! zstd --decompress --stdout -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
   else
    exe "sil! r! gzip -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
   endif
@@ -452,6 +461,10 @@ fun! tar#Write(fname)
   let tarfile = substitute(tarfile,'\.xz','','e')
   let compress= "xz -- ".shellescape(tarfile,0)
 "   call Decho("compress<".compress.">")
+  elseif tarfile =~# '\.zst'
+   call system("zstd --decompress -- ".shellescape(tarfile,0))
+   let tarfile = substitute(tarfile,'\.zst','','e')
+   let compress= "zstd -- ".shellescape(tarfile,0)
  elseif tarfile =~# '\.lzma'
   call system("lzma -d -- ".shellescape(tarfile,0))
   let tarfile = substitute(tarfile,'\.lzma','','e')
@@ -676,6 +689,28 @@ fun! tar#Extract()
   else
    echo "***note*** successfully extracted ".fname
   endif
+
+  elseif filereadable(tarbase.".tzs")
+   let extractcmd= substitute(extractcmd,"-","--zstd","")
+"   call Decho("system(".extractcmd." ".shellescape(tarbase).".tzs ".shellescape(fname).")")
+   call system(extractcmd." ".shellescape(tarbase).".txz ".shellescape(fname))
+   if v:shell_error != 0
+    echohl Error | echo "***error*** ".extractcmd." ".tarbase.".tzs ".fname.": failed!" | echohl NONE
+"    call Decho("***error*** ".extractcmd." ".tarbase.".tzs ".fname.": failed!")
+   else
+    echo "***note*** successfully extracted ".fname
+   endif
+
+  elseif filereadable(tarbase.".tar.zst")
+   let extractcmd= substitute(extractcmd,"-","--zstd","")
+"   call Decho("system(".extractcmd." ".shellescape(tarbase).".tar.zst ".shellescape(fname).")")
+   call system(extractcmd." ".shellescape(tarbase).".tar.xz ".shellescape(fname))
+   if v:shell_error != 0
+    echohl Error | echo "***error*** ".extractcmd." ".tarbase.".tar.zst ".fname.": failed!" | echohl NONE
+"    call Decho("***error*** ".extractcmd." ".tarbase.".tar.zst ".fname.": failed!")
+   else
+    echo "***note*** successfully extracted ".fname
+   endif
  endif

  " restore option
@@ -1,7 +1,7 @@
 " zip.vim: Handles browsing zipfiles
 "            AUTOLOAD PORTION
 " Date:		Jan 07, 2020
-" Version:	30
+" Version:	31
 " Maintainer:	Charles E Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
 " License:	Vim License  (see vim's :help license)
 " Copyright:    Copyright (C) 2005-2019 Charles E. Campbell {{{1
@@ -20,7 +20,7 @@
 if &cp || exists("g:loaded_zip")
 finish
 endif
-let g:loaded_zip= "v30"
+let g:loaded_zip= "v31"
 if v:version < 702
 echohl WarningMsg
 echo "***warning*** this version of zip needs vim 7.2 or later"
@@ -65,7 +65,7 @@ endif
 " zip#Browse: {{{2
 fun! zip#Browse(zipfile)
 "  call Dfunc("zip#Browse(zipfile<".a:zipfile.">)")
-  " sanity check: ensure that the zipfile has "PK" as its first two letters
+  " sanity check: insure that the zipfile has "PK" as its first two letters
  "               (zipped files have a leading PK as a "magic cookie")
  if !filereadable(a:zipfile) || readfile(a:zipfile, "", 1)[0] !~ '^PK'
   exe "noswapfile noautocmd noswapfile e ".fnameescape(a:zipfile)
@@ -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,
@@ -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'
@@ -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.
-"		WebTable.java:201:1: '{' should be on the previous line.
-CompilerSet errorformat=%f:%l:%v:\ %m,%f:%l:\ %m,%-G%.%#
+" CompilerSet makeprg=java\ com.puppycrawl.tools.checkstyle.Main\ -f\ plain\ -c\ /sun_checks.xml
+" CompilerSet makeprg=java\ -jar\ checkstyle-X.XX-all.jar\ -f\ plain\ -c\ /sun_checks.xml
+
+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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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%.%#
@@ -0,0 +1,27 @@
+" Vim compiler file
+" Compiler:	FreeBASIC Compiler
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2015 Jan 10
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "fbc"
+
+if exists(":CompilerSet") != 2		" older Vim always used :setlocal
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+CompilerSet makeprg=fbc
+CompilerSet errorformat=%-G%.%#Too\ many\ errors\\,\ exiting,
+		       \%f(%l)\ %tarning\ %n(%\\d%\\+):\ %m,
+                       \%E%f(%l)\ error\ %n:\ %m,
+		       \%-Z%p^,
+		       \%-C%.%#,
+		       \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,11 +1,11 @@
 " Vim Compiler File
 " Compiler:    ocaml
 " Maintainer:  Markus Mottl <markus.mottl@gmail.com>
-" URL:         https://github.com/rgrinberg/vim-ocaml
+" URL:         https://github.com/ocaml/vim-ocaml
 " Last Change:
+"              2020 Mar 28 - Improved error format (Thomas Leonard)
 "              2017 Nov 26 - Improved error format (Markus Mottl)
 "              2013 Aug 27 - Added a new OCaml error format (Markus Mottl)
-"              2013 Jun 30 - Initial version (Marc Weber)
 "
 " Marc Weber's comments:
 " Setting makeprg doesn't make sense, because there is ocamlc, ocamlopt,
@@ -21,6 +21,7 @@
 "
 " So having it here makes people opt-in

+
 if exists("current_compiler")
    finish
 endif
@@ -30,6 +31,7 @@ let s:cpo_save = &cpo
 set cpo&vim

 CompilerSet errorformat =
+      \%EFile\ \"%f\"\\,\ lines\ %*\\d-%l\\,\ characters\ %c-%*\\d:,
      \%EFile\ \"%f\"\\,\ line\ %l\\,\ characters\ %c-%*\\d:,
      \%EFile\ \"%f\"\\,\ line\ %l\\,\ characters\ %c-%*\\d\ %.%#,
      \%EFile\ \"%f\"\\,\ line\ %l\\,\ character\ %c:%m,
@@ -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
@@ -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
@@ -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
@@ -0,0 +1,28 @@
+" Vim compiler file
+" Compiler:	SML/NJ Compiler
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2020 Feb 10
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "sml"
+
+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=sml
+CompilerSet errorformat=%f:%l.%c-%\\d%\\+.%\\d%\\+\ %trror:\ %m,
+		       \%f:%l.%c\ %trror:\ %m,
+		       \%trror:\ %m
+		       \%f:%l.%c-%\\d%\\+.%\\d%\\+\ %tarning:\ %m,
+		       \%f:%l.%c\ %tarning:\ %m,
+		       \%tarning:\ %m,
+		       \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
@@ -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 errorformat=%f:\ line\ %l\\,\ col\ %c\\,\ %m,%-G%.%#
+CompilerSet makeprg=npx\ standard
+CompilerSet errorformat=%f:%l:%c:\ %m,%-G%.%#
@@ -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
@@ -1,7 +1,7 @@
 " Vim compiler file
 " Compiler:	HTML Tidy
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:	2016 Apr 21
+" Last Change:	2020 Sep 4

 if exists("current_compiler")
  finish
@@ -12,8 +12,15 @@ if exists(":CompilerSet") != 2		" older Vim always used :setlocal
  command -nargs=* CompilerSet setlocal <args>
 endif

-CompilerSet makeprg=tidy\ -quiet\ -errors\ --gnu-emacs\ yes\ %:S
+let s:cpo_save = &cpo
+set cpo&vim

-" foo.html:8:1: Warning: inserting missing 'foobar' element
-" foo.html:9:2: Error: <foobar> is not recognized!
-CompilerSet errorformat=%f:%l:%c:\ %trror:%m,%f:%l:%c:\ %tarning:%m,%-G%.%#
+CompilerSet makeprg=tidy\ -quiet\ -errors\ --gnu-emacs\ yes
+CompilerSet errorformat=%f:%l:%c:\ %trror:\ %m,
+		       \%f:%l:%c:\ %tarning:\ %m,
+		       \%f:%l:%c:\ %tnfo:\ %m,
+		       \%f:%l:%c:\ %m,
+		       \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
@@ -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
@@ -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
@@ -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
@@ -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,
-		    \%+W%f:%l:\ %.%#\ warning\ :\ %m,
-		    \%-Z%p^,
-		    \%-G%.%#
+CompilerSet errorformat=%E%f:%l:\ %.%#\ error\ :\ %m,
+		       \%W%f:%l:\ %.%#\ warning\ :\ %m,
+		       \%-Z%p^,
+		       \%C%.%#,
+		       \%terror:\ %m,
+		       \%tarning:\ %m,
+		       \%-G%.%#

 let &cpo = s:cpo_save
 unlet s:cpo_save
@@ -0,0 +1,23 @@
+" Vim compiler file
+" Compiler:	Zsh
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2020 Sep 6
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "zsh"
+
+if exists(":CompilerSet") != 2		" older Vim always used :setlocal
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+CompilerSet makeprg=zsh\ -n\ --\ %:S
+CompilerSet errorformat=%f:\ line\ %l:\ %m,
+		       \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
@@ -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.
@@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 8.2.  Last change: 2020 Aug 02
+*autocmd.txt*   For Vim version 8.2.  Last change: 2021 Jan 28


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -54,7 +54,8 @@ effects.  Be careful not to destroy your text.
 :au[tocmd] [group] {event} {pat} [++once] [++nested] {cmd}
 			Add {cmd} to the list of commands that Vim will
 			execute automatically on {event} for a file matching
-			{pat} |autocmd-patterns|.
+			{pat} |autocmd-patterns|. 
+			Here {event} cannot be "*".  *E1155*
 			Note: A quote character is seen as argument to the
 			:autocmd and won't start a comment.
 			Vim always adds the {cmd} after existing autocommands,
@@ -70,6 +71,11 @@ effects.  Be careful not to destroy your text.
 The special pattern <buffer> or <buffer=N> defines a buffer-local autocommand.
 See |autocmd-buflocal|.

+If the `:autocmd` is in Vim9 script (a script that starts with `:vim9script`
+and in a `:def` function) then {cmd} will be executed as in Vim9
+script.  Thus this depends on where the autocmd is defined, not where it is
+triggered.
+
 Note: The ":autocmd" command can only be followed by another command when the
 '|' appears before {cmd}.  This works: >
 	:augroup mine | au! BufRead | augroup END
@@ -278,7 +284,7 @@ Name			triggered by ~
 |BufWinLeave|		before a buffer is removed from a window

 |BufUnload|		before unloading a buffer
-|BufHidden|		just after a buffer has become hidden
+|BufHidden|		just before a buffer becomes hidden
 |BufNew|		just after creating a new buffer

 |SwapExists|		detected an existing swap file
@@ -303,6 +309,9 @@ Name			triggered by ~
 |VimLeavePre|		before exiting Vim, before writing the viminfo file
 |VimLeave|		before exiting Vim, after writing the viminfo file

+|VimSuspend|		when suspending Vim
+|VimResume|		when Vim is resumed after being suspended
+
 	Terminal
 |TerminalOpen|		after a terminal buffer was created
 |TerminalWinOpen|	after a terminal buffer was created in a new window
@@ -553,12 +562,15 @@ CmdlineChanged			After a change was made to the text in the
 							*CmdlineEnter*
 CmdlineEnter			After moving the cursor to the command line,
 				where the user can type a command or search
-				string.
+				string; including non-interactive use of ":"
+				in a mapping, but not when using |<Cmd>|.
 				<afile> is set to a single character,
 				indicating the type of command-line.
 				|cmdwin-char|
 							*CmdlineLeave*
-CmdlineLeave			Before leaving the command line.
+CmdlineLeave			Before leaving the command line; including
+				non-interactive use of ":" in a mapping, but
+				not when using |<Cmd>|.
 				Also when abandoning the command line, after
 				typing CTRL-C or <Esc>.
 				When the commands result in an error the
@@ -633,7 +645,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|
@@ -842,6 +854,8 @@ FuncUndefined			When a user function is used but it isn't
 				when it's used.  The pattern is matched
 				against the function name.  Both <amatch> and
 				<afile> are set to the name of the function.
+				Not triggered when compiling a |Vim9|
+				function.
 				NOTE: When writing Vim scripts a better
 				alternative is to use an autoloaded function.
 				See |autoload-functions|.
@@ -883,9 +897,14 @@ InsertEnter			Just before starting Insert mode.  Also for
 				The cursor is restored afterwards.  If you do
 				not want that set |v:char| to a non-empty
 				string.
+							*InsertLeavePre*
+InsertLeavePre			Just before leaving Insert mode.  Also when
+				using CTRL-O |i_CTRL-O|.  Be careful not to
+				change mode or use `:normal`, it will likely
+				cause trouble.
 							*InsertLeave*
-InsertLeave			When leaving Insert mode.  Also when using
-				CTRL-O |i_CTRL-O|.  But not for |i_CTRL-C|.
+InsertLeave			Just after leaving Insert mode.  Also when
+				using CTRL-O |i_CTRL-O|.  But not for |i_CTRL-C|.
 							*MenuPopup*
 MenuPopup			Just before showing the popup menu (under the
 				right mouse button).  Useful for adjusting the
@@ -1209,6 +1228,7 @@ VimLeave			Before exiting Vim, just after writing the
 				To detect an abnormal exit use |v:dying|.
 				When v:dying is 2 or more this event is not
 				triggered.
+				To get the exit code use |v:exiting|.
 							*VimLeavePre*
 VimLeavePre			Before exiting Vim, just before writing the
 				.viminfo file.  This is executed only once,
@@ -1219,10 +1239,22 @@ VimLeavePre			Before exiting Vim, just before writing the
 <				To detect an abnormal exit use |v:dying|.
 				When v:dying is 2 or more this event is not
 				triggered.
+				To get the exit code use |v:exiting|.
 							*VimResized*
 VimResized			After the Vim window was resized, thus 'lines'
 				and/or 'columns' changed.  Not when starting
 				up though.
+							*VimResume*
+VimResume			When the Vim instance is resumed after being
+				suspended and |VimSuspend| was triggered.
+				Useful for triggering |:checktime| and ensure
+				the buffers content did not change while Vim
+				was suspended: >
+	:autocmd VimResume * checktime
+<							*VimSuspend*
+VimSuspend			When the Vim instance is suspended.  Only when
+				CTRL-Z was typed inside Vim, not when the
+				SIGSTOP or SIGTSTP signal was sent to Vim.
 							*WinEnter*
 WinEnter			After entering another window.  Not done for
 				the first window, when Vim has just started.
@@ -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: 2021 Jan 21


 		  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.
@@ -1631,24 +1631,31 @@ default setting is "tcq".  You can separate the option letters with commas for
 readability.

 letter	 meaning when present in 'formatoptions'    ~
-
+							*fo-t*
 t	Auto-wrap text using textwidth
+							*fo-c*
 c	Auto-wrap comments using textwidth, inserting the current comment
 	leader automatically.
+							*fo-r*
 r	Automatically insert the current comment leader after hitting
 	<Enter> in Insert mode.
+							*fo-o*
 o	Automatically insert the current comment leader after hitting 'o' or
 	'O' in Normal mode.
+							*fo-q*
 q	Allow formatting of comments with "gq".
 	Note that formatting will not change blank lines or lines containing
 	only the comment leader.  A new paragraph starts after such a line,
 	or when the comment leader changes.
+							*fo-w*
 w	Trailing white space indicates a paragraph continues in the next line.
 	A line that ends in a non-white character ends a paragraph.
+							*fo-a*
 a	Automatic formatting of paragraphs.  Every time text is inserted or
 	deleted the paragraph will be reformatted.  See |auto-format|.
 	When the 'c' flag is present this only happens for recognized
 	comments.
+							*fo-n*
 n	When formatting text, recognize numbered lists.  This actually uses
 	the 'formatlistpat' option, thus any kind of list can be used.  The
 	indent of the text after the number is used for the next line.  The
@@ -1659,6 +1666,7 @@ n	When formatting text, recognize numbered lists.  This actually uses
 		1. the first item
 		   wraps
 		2. the second item
+<							*fo-2*
 2	When formatting text, use the indent of the second line of a paragraph
 	for the rest of the paragraph, instead of the indent of the first
 	line.  This supports paragraphs in which the first line has a
@@ -1668,36 +1676,46 @@ n	When formatting text, recognize numbered lists.  This actually uses
 		second line of the same paragraph
 		third line.
 <	This also works inside comments, ignoring the comment leader.
+							*fo-v*
 v	Vi-compatible auto-wrapping in insert mode: Only break a line at a
 	blank that you have entered during the current insert command.  (Note:
 	this is not 100% Vi compatible.  Vi has some "unexpected features" or
 	bugs in this area.  It uses the screen column instead of the line
 	column.)
+							*fo-b*
 b	Like 'v', but only auto-wrap if you enter a blank at or before
 	the wrap margin.  If the line was longer than 'textwidth' when you
 	started the insert, or you do not enter a blank in the insert before
 	reaching 'textwidth', Vim does not perform auto-wrapping.
+							*fo-l*
 l	Long lines are not broken in insert mode: When a line was longer than
 	'textwidth' when the insert command started, Vim does not
 	automatically format it.
-m	Also break at a multi-byte character above 255.  This is useful for
+							*fo-m*
+m	Also break at a multibyte character above 255.  This is useful for
 	Asian text where every character is a word on its own.
-M	When joining lines, don't insert a space before or after a multi-byte
+							*fo-M*
+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
+							*fo-B*
+B	When joining lines, don't insert a space between two multibyte
 	characters.  Overruled by the 'M' flag.
+							*fo-1*
 1	Don't break a line after a one-letter word.  It's broken before it
 	instead (if possible).
+							*fo-]*
 ]	Respect textwidth rigorously. With this flag set, no line can be
 	longer than textwidth, unless line-break-prohibition rules make this
 	impossible.  Mainly for CJK scripts and works only if 'encoding' is
 	"utf-8".
+							*fo-j*
 j	Where it makes sense, remove a comment leader when joining lines.  For
 	example, joining:
 		int i;   // the index ~
 		         // in the list ~
 	Becomes:
 		int i;   // the index in the list ~
+							*fo-p*
 p	Don't break lines at single spaces that follow periods.  This is
 	intended to complement 'joinspaces' and |cpo-J|, for prose with
 	sentences separated by two spaces.  For example, with 'textwidth' set
@@ -1801,7 +1819,7 @@ Vim has a sorting function and a sorting command.  The sorting function can be
 found here: |sort()|, |uniq()|.

 							*:sor* *:sort*
-:[range]sor[t][!] [b][f][i][n][o][r][u][x] [/{pattern}/]
+:[range]sor[t][!] [b][f][i][l][n][o][r][u][x] [/{pattern}/]
 			Sort lines in [range].  When no range is given all
 			lines are sorted.

@@ -1809,6 +1827,16 @@ found here: |sort()|, |uniq()|.

 			With [i] case is ignored.

+			With [l] sort uses the current collation locale.
+			Implementation details: strcoll() is used to compare
+			strings. See |:language| to check or set the collation
+			locale. Example: >
+				:language collate en_US.UTF-8
+				:%sort l
+<			|v:collate| can also used to check the current locale.
+			Sorting using the locale typically ignores case.
+			This does not work properly on Mac.
+
 			Options [n][f][x][o][b] are mutually exclusive.

 			With [n] sorting is done on the first decimal number
@@ -1842,6 +1870,8 @@ found here: |sort()|, |uniq()|.
 			When /{pattern}/ is specified and there is no [r] flag
 			the text matched with {pattern} is skipped, so that
 			you sort on what comes after the match.
+			'ignorecase' applies to the pattern, but 'smartcase'
+			is not used.
 			Instead of the slash any non-letter can be used.
 			For example, to sort on the second comma-separated
 			field: >
@@ -1875,8 +1905,7 @@ found here: |sort()|, |uniq()|.
 Note that using `:sort` with `:global` doesn't sort the matching lines, it's
 quite useless.

-The details about sorting depend on the library function used.  There is no
-guarantee that sorting obeys the current locale.  You will have to try it out.
+`:sort` does not use the current locale unless the l flag is used.
 Vim does do a "stable" sort.

 The sorting can be interrupted, but if you interrupt it too late in the
@@ -1,4 +1,4 @@
-*channel.txt*      For Vim version 8.2.  Last change: 2020 Jul 10
+*channel.txt*      For Vim version 8.2.  Last change: 2020 Oct 17


 		  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
@@ -961,6 +965,10 @@ job_status({job})					*job_status()* *E916*
 		"fail", because a fork happens before the failure can be
 		detected.

+		If in Vim9 script a variable is declared with type "job" but
+		never assigned to, passing that variable to job_status()
+		returns "fail".
+
 		If an exit callback was set with the "exit_cb" option and the
 		job is now detected to be "dead" the callback will be invoked.

@@ -1256,7 +1264,9 @@ 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 to see older output or copy text.
@@ -1282,7 +1292,7 @@ prompt. >
 	  " Send the text to a shell with Enter appended.
 	  call ch_sendraw(g:shell_job, a:text .. "\n")
 	endfunc
-		
+
 	" Function handling output from the shell: Added above the prompt.
 	func GotOutput(channel, msg)
 	  call append(line("$") - 1, "- " . a:msg)
@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 8.2.  Last change: 2020 Jul 26
+*cmdline.txt*   For Vim version 8.2.  Last change: 2021 Jan 26


 		  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
@@ -849,6 +849,16 @@ function |expand()|.
 		file name n.  See |:oldfiles| or |v:oldfiles| to get the
 		number.							*E809*
 		{only when compiled with the |+eval| and |+viminfo| features}
+In |Vim9-script| # is used to start a comment, use %% for the alternate file
+name:
+	%	Is replaced with the current file name.
+	%%	Is replaced with the alternate file name.	*:_%%* *c_%%*
+	%%n	(where n is a number) is replaced with		*:_%%0* *:_%%n*
+		the file name of buffer n.  "%%0" is the same as "%%".   *c_%%n*
+	%%%	Is replaced with all names in the argument	*:_%%%* *c_%%%#*
+		list concatenated, separated by spaces.
+	%%<n	(where n is a number > 0) is replaced with old  *:_%%<* *c_%%<*
+		file name n.

 Note that these, except "#<n", give the file name as it was typed.  If an
 absolute path is needed (when using the file name from a different directory),
@@ -873,34 +883,37 @@ it, no matter how many backslashes.
 	   \\#			\#
 Also see |`=|.

-			       *:<cword>* *<cword>* *:<cWORD>* *<cWORD>*
-			       *:<cexpr>* *<cexpr>* *:<cfile>* *<cfile>*
-			       *:<afile>* *<afile>* *:<abuf>* *<abuf>*
-			       *:<amatch>* *<amatch>* *:<stack>* *<stack>*
-			       *:<sfile>* *<sfile>* *:<slnum>* *<slnum>*
-			       *:<sflnum>* *<sflnum>* *E499* *E500*
+							*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 the call stack,
@@ -908,18 +921,24 @@ Note: these are typed literally, they are not special keys!
 		   <stack> is preferred).
 		   Note that filename-modifiers are useless when <sfile> is
 		   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*
@@ -1077,7 +1096,7 @@ Also see |`=|.
 In the command-line window the command line can be edited just like editing
 text in any window.  It is a special kind of window, because you cannot leave
 it in a normal way.
-{not available when compiled without the |+cmdline_hist| feature}
+{not available when compiled without the |+cmdwin| feature}


 OPEN						*c_CTRL-F* *q:* *q/* *q?*
@@ -1130,7 +1149,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.

@@ -1,4 +1,4 @@
-*develop.txt*   For Vim version 8.2.  Last change: 2020 Jul 27
+*develop.txt*   For Vim version 8.2.  Last change: 2020 Aug 15


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -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).
@@ -1,4 +1,4 @@
-*diff.txt*      For Vim version 8.2.  Last change: 2019 Nov 10
+*diff.txt*      For Vim version 8.2.  Last change: 2021 Feb 10


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -59,7 +59,7 @@ In each of the edited files these options are set:
 	'scrollbind'	on
 	'cursorbind'	on
 	'scrollopt'	includes "hor"
-	'wrap'		off
+	'wrap'		off, or leave as-is if 'diffopt' includes "followwrap"
 	'foldmethod'	"diff"
 	'foldcolumn'	value from 'diffopt', default is 2

@@ -144,7 +144,7 @@ Otherwise they are set to their default value:
 	'scrollbind'	off
 	'cursorbind'	off
 	'scrollopt'	without "hor"
-	'wrap'		on
+	'wrap'		on, or leave as-is if 'diffopt' includes "followwrap"
 	'foldmethod'	"manual"
 	'foldcolumn'	0

@@ -921,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
@@ -1,4 +1,4 @@
-*editing.txt*   For Vim version 8.2.  Last change: 2020 Jul 05
+*editing.txt*   For Vim version 8.2.  Last change: 2021 Jan 08


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -73,10 +73,14 @@ g CTRL-G		Prints the current position of the cursor in five
 			ways: Column, Line, Word, Character and Byte.  If the
 			number of Characters and Bytes is the same then the
 			Character position is omitted.
+
 			If there are characters in the line that take more
 			than one position on the screen (<Tab> or special
-			character), both the "real" column and the screen
-			column are shown, separated with a dash.
+			character), or characters using more than one byte per
+			column (characters above 0x7F when 'encoding' is
+			utf-8), both the byte column and the screen column are
+			shown, separated by a dash.
+
 			Also see the 'ruler' option and the |wordcount()|
 			function.

@@ -652,7 +656,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 +666,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. >
@@ -1010,7 +1014,7 @@ to write anyway add a '!' to the command.

 							*write-permissions*
 When writing a new file the permissions are read-write.  For unix the mask is
-0666 with additionally umask applied.  When writing a file that was read Vim
+0o666 with additionally umask applied.  When writing a file that was read Vim
 will preserve the permissions, but clear the s-bit.

 							*write-readonly*
@@ -1029,7 +1033,7 @@ original file fails, there will be an error message telling you that you
 lost the original file.

 						*DOS-format-write*
-If the 'fileformat' is "dos", <CR> <NL> is used for <EOL>.  This is default
+If the 'fileformat' is "dos", <CR><NL> is used for <EOL>.  This is default
 for Win32.  On other systems the message "[dos format]" is shown to remind you
 that an unusual <EOL> was used.
 						*Unix-format-write*
@@ -1415,8 +1419,8 @@ There are a few things to remember when editing binary files:
  the file.  It is also possible that you get an "out of memory" error when
  reading the file.
 - Make sure the 'binary' option is set BEFORE loading the
-  file.  Otherwise both <CR> <NL> and <NL> are considered to end a line
-  and when the file is written the <NL> will be replaced with <CR> <NL>.
+  file.  Otherwise both <CR><NL> and <NL> are considered to end a line
+  and when the file is written the <NL> will be replaced with <CR><NL>.
 - <Nul> characters are shown on the screen as ^@.  You can enter them with
  "CTRL-V CTRL-@" or "CTRL-V 000"
 - To insert a <NL> character in the file split a line.  When writing the
@@ -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: 2021 Jan 21


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -147,6 +147,7 @@ can be used to overrule the filetype used for certain extensions:
 	*.w		g:filetype_w	|ft-cweb-syntax|
 	*.i		g:filetype_i	|ft-progress-syntax|
 	*.p		g:filetype_p	|ft-pascal-syntax|
+	*.pp		g:filetype_pp	|ft-pascal-syntax|
 	*.sh		g:bash_is_sh	|ft-sh-syntax|
 	*.tex		g:tex_flavor	|ft-tex-plugin|

@@ -163,8 +164,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
-   this file in the right directory to make it work.
+   there can be many files.  The advantage is that you can simply drop this
+   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 +398,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
@@ -556,16 +564,15 @@ Local mappings:

 MAN					*ft-man-plugin* *:Man* *man.vim*

-Displays a manual page in a nice way.  Also see the user manual
-|find-manpage|.
-
-To start using the ":Man" command before any manual page was loaded, source
-this script from your startup vimrc file: >
+This plugin displays a manual page in a nice way.  See |find-manpage| in the
+user manual for more information.

+To start using the |:Man| command before any manual page has been loaded,
+source this script from your startup |vimrc| file: >
 	runtime ftplugin/man.vim

 Options:
-'iskeyword'	the '.' character is added to be able to use CTRL-] on the
+'iskeyword'	The '.' character is added to support the use of CTRL-] on the
 		manual page name.

 Commands:
@@ -575,24 +582,25 @@ Man {number} {name}

 Global mapping:
 <Leader>K	Displays the manual page for the word under the cursor.
-<Plug>ManPreGetPage  idem, allows for using a mapping: >
-			nmap <F1> <Plug>ManPreGetPage<CR>
+<Plug>ManPreGetPage
+		idem, allows for using a mapping: >
+			nmap <F1> <Plug>ManPreGetPage

 Local mappings:
 CTRL-]		Jump to the manual page for the word under the cursor.
 CTRL-T		Jump back to the previous manual page.
-q		Same as ":quit"
+q		Same as the |:quit| command.

 To use a vertical split instead of horizontal: >
 	let g:ft_man_open_mode = 'vert'
 To use a new tab: >
 	let g:ft_man_open_mode = 'tab'

-To enable folding use this: >
-  	let g:ft_man_folding_enable = 1
-If you do not like the default folding, use an autocommand to add your desired
+To enable |folding|, use this: >
+	let g:ft_man_folding_enable = 1
+If you do not like the default folding, use an |autocommand| to add your desired
 folding style instead.  For example: >
-        autocmd FileType man setlocal foldmethod=indent foldenable
+	autocmd FileType man setlocal foldmethod=indent foldenable

 If you would like :Man {number} {name} to behave like man {number} {name} by
 not running man {name} if no page is found, then use this: >
@@ -605,7 +613,7 @@ page in a Vim window: >

 MANPAGER				      *manpager.vim*

-The :Man command allows you to turn Vim into a manpager (that syntax highlights
+The |:Man| command allows you to turn Vim into a manpager (that syntax highlights
 manpages and follows linked manpages on hitting CTRL-]).

 For bash,zsh,ksh or dash, add to the config file (.bashrc,.zshrc, ...)
@@ -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
@@ -16,6 +16,7 @@ Vim's Graphical User Interface				*gui* *GUI*
 8. Shell Commands		|gui-shell|

 Other GUI documentation:
+|gui_mac.txt|	For specific items of the MacVim GUI.
 |gui_x11.txt|	For specific items of the X11 GUI.
 |gui_w32.txt|	For specific items of the Win32 GUI.

@@ -547,15 +548,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 +588,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 +627,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: >
@@ -836,7 +853,7 @@ The window toolbar uses the ToolbarLine and ToolbarButton highlight groups.
 When splitting the window the window toolbar is not copied to the new window.

 							*popup-menu*
-In the Win32, GTK+, Motif, Athena and Photon GUI, you can define the
+In the Win32, MacVim, GTK+, Motif, Athena and Photon GUI, you can define the
 special menu "PopUp".  This is the menu that is displayed when the right mouse
 button is pressed, if 'mousemodel' is set to popup or popup_setpos.
 Example: >
@@ -898,14 +915,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
@@ -966,13 +975,14 @@ See section |42.4| in the user manual.

 							*:tmenu* *:tm*
 :tm[enu] {menupath} {rhs}	Define a tip for a menu or tool.  {only in
-				X11 and Win32 GUI}
+				X11, MacVim, and Win32 GUI}

-:tm[enu] [menupath]		List menu tips. {only in X11 and Win32 GUI}
+:tm[enu] [menupath]		List menu tips. {only in X11, MacVim, and
+				Win32 GUI}

 							*:tunmenu* *:tu*
 :tu[nmenu] {menupath}		Remove a tip for a menu or tool.
-				{only in X11 and Win32 GUI}
+				{only in X11, MacVim, and Win32 GUI}

 Note: To create menus for terminal mode, use |:tlmenu| instead.

@@ -992,8 +1002,9 @@ The tip is defined like this: >
 And delete it with: >
 	:tunmenu MyMenu.Hello

-Tooltips are currently only supported for the X11 and Win32 GUI.  However, they
-should appear for the other gui platforms in the not too distant future.
+Tooltips are currently only supported for the X11, MacVim, and Win32 GUI.
+However, they should appear for the other gui platforms in the not too distant
+future.

 The ":tmenu" command works just like other menu commands, it uses the same
 arguments.  ":tunmenu" deletes an existing menu tip, in the same way as the
@@ -1105,7 +1116,8 @@ Also see 'macatsui', it can help fix display problems {not in MacVim}.
 In MacVim, fonts with spaces are set like this: >
    :set guifont=DejaVu\ Sans\ Mono:h13
 <
-							*E236*
+Mono-spaced fonts					*E236*
+
 Note that the fonts must be mono-spaced (all characters have the same width).
 An exception is MacVim and GTK: all fonts are accepted, but mono-spaced fonts
 look best.
@@ -1,4 +1,4 @@
-*gui_mac.txt*	For Vim version 8.1.  Last change: 2018 Dec 17
+*gui_mac.txt*	For Vim version 8.2.  Last change: 2020 Aug 13


 		  VIM REFERENCE MANUAL    by Bjorn Winckler
@@ -52,18 +52,14 @@ It is not possible to modify 'termencoding' in MacVim; this option is forcibly
 set to "utf-8".  The option 'encoding' also defaults to "utf-8" (as opposed to
 "latin1" in the other GUI ports).

-Note: UTF-8 can represent all characters defined in Unicode, which includes
-all characters in all other standard encodings, so it should be perfectly safe
-to edit files in any encoding while 'encoding' is set to "utf-8".  Of course,
-you may need to set 'fileencodings' to auto-detect the encoding of the files
-you edit, or force the detection with |++enc| on the command line.
+In generally you should keep 'encoding' set to the default ("utf-8") as that's
+what macOS uses.  It also works on any character.  Sometimes you may need to
+set 'fileencodings' to auto-detect encoding of files you edit, or force the
+detection with |++enc| on the command line.

 However, if you are editing files that use multiple encodings (container
-formats like MIME or Unix mbox files) or no standard encoding (binary data,
-see also |edit-binary|), you may want to prevent MacVim from re-encoding the
-file at all. In this situation, you will need to set both 'encoding' and
-'fileencodings' to a simple single-byte encoding such as Latin1 so that when
-the file is read into memory, the original bytes are left untouched.
+formats like MIME or Unix mbox files) or a binary file, you want to make sure
+'binary' is set (see |edit-binary|).

 							*macvim-shift-movement*
 Text editors on macOS lets the user hold down shift+movement key to extend the
@@ -91,13 +87,12 @@ The "Open files from applications" preference in the General preference pane
 gives more options on how dropped files should open, in case tabs are not
 desired.

-							*macvim-default-menu*
-The default menu in MacVim has been changed to conform better with the Apple
-Human Interface Guidelines (HIG).  At the moment this breaks the localized
-menus, so only English menus are supported.
+				    *macvim-default-menus* *macvim-help-menu*
+The default menus (|menu.vim|) in MacVim have been changed to conform better
+with the Apple Human Interface Guidelines (HIG).

-Note: The menus are a work in progress.  If you know something about the HIG
-and want to contribute to MacVim you could do so by making the menus better.
+The Help menu's search can be used to search Vim's documentation.  You can use
+it to quickly find the documentation you want in addition to using |:help|.

 							*macvim-window-title*
 The default window title does not include the argument list because it looks
@@ -124,7 +119,7 @@ These are the non-standard commands that MacVim supports:

                                                       *macvim-autocommands*
 These are the non-standard events that MacVim supports:
-       |OSAppearanceChanged|
+	|OSAppearanceChanged|

 							*macvim-find*
 Whenever you search for something in Vim (e.g. using "/"), or hit <D-e> when
@@ -157,11 +152,11 @@ behaviour, then add the line "set backspace&" to your "~/.vimrc" file.
 ==============================================================================
 2. Starting MacVim					*macvim-start*

-The easiest way to start MacVim is by double-clicking its icon in the Finder,
-but most users will probably prefer to use the Terminal.  First some Finder
-related ways of starting MacVim are described, then Terminal is discussed.
-Note that you can put MacVim anywhere on your hard drive, but in this help
-file it is assumed that you have put it inside your /Applications folder.
+Starting MacVim from the UI ~
+
+To start MacVim in macOS, simply double-click its icon in the Finder or click
+on the Dock icon. Usually it should be installed as
+`/Applications/MacVim.app`.

 MacVim automatically registers itself as an editor of several standard file
 formats.  This enables you to double-click a file to open it with MacVim (if
@@ -173,27 +168,26 @@ have files open in e.g. splits by changing the "Open files from applications"
 option in the General preference pane).  Finally, you can use macOS System
 Services to open files in MacVim, see |macvim-services|.

-Use |mvim| script to start MacVim from Terminal.
-
-Or use the "open" command (this method can not be used to pass parameters to
-Vim) >
+Alternatively, use the "open" command (this method can not be used to pass
+parameters to Vim) >
 	open -a MacVim file ...
 The advantage of using the latter method is that the settings relating to file
 opening in the preferences panel are respected, and files open instantly if
 |Quickstart| is enabled.

-Once in terminal Vim it is possible to start MacVim by using the following
-command:
-	:gui [++opt] [+cmd] [-f|-b] [files...]
-Note: Forking ("-b") currently does not work.
+Starting MacVim from a terminal~

-							*mvim*
-The "mvim" shell script bundled with MacVim. >
+					    *mvim* *macvim-PATH* *macvim-cmdline*
+MacVim comes bundled with a shell script called "mvim" that can be used to
+launch MacVim from the terminal. It's located at: >
 	/Applications/MacVim.app/Contents/bin/mvim
-This is a wrapper script to launch Vim executable in the bundle.  Put this
-folder >
+
+To be able to easily use it, put this folder in your path: >
 	/Applications/MacVim.app/Contents/bin
-in your path and then simply type "mvim" to start MacVim from Terminal. >
+For example, if you use zsh, you can put the following in `~/.zprofile`: >
+	export PATH="/Applications/MacVim.app/Contents/bin:$PATH"
+
+After that, type "mvim" to start MacVim from Terminal. >
 	$ mvim
 You can also specify files to open with. >
 	$ mvim file ...
@@ -201,13 +195,24 @@ Also the bin folder has convenient scripts for diffing and opening file as the f
 	* Diff:		mvimdiff
 	* Read-only:	mview

-You can use "vim", "vimdiff", and "view" if you want to use non-GUI Vim.
+You can still use the normal "vim", "vimdiff", and "view" commands if you want
+to use non-GUI Vim, and "gvim" to launch MacVim ("gvim" works the same way as
+"mvim").
+
+Going from terminal to GUI mode~
+
+Once in terminal Vim it is possible to start the MacVim GUI by using the
+following command (see |:gui|):
+	:gui [++opt] [+cmd] [-f|-b] [files...]
+Note: Forking ("-b") currently does not work.

 							*Quickstart*
-Quickstart ensures that new windows open instantaneously e.g. when <D-n> is
-pressed.  This feature can be enabled from the Advanced preferences pane (it
-is disabled by default).  Note that this setting does not affect the speed
-with which windows open when using the |mvim| command.
+Quickstart ensures that new windows open quickly e.g. when <D-n> is
+pressed.  It works by keeping a Vim process in the background that will
+immediately become active when you open a window.  This feature can be enabled
+from the Advanced preferences pane (it is disabled by default).  Note that
+this setting does not affect the speed with which windows open when using the
+|mvim| command.

 Note that any changes to runtime files that are kept in a non-standard
 location (i.e. not in ~/.vim) will not be picked up for the first window that
@@ -236,7 +241,7 @@ is sent back to the server application.

 Some settings are global to the MacVim application and would not make sense as
 Vim options.  These settings are stored in the user defaults database and can
-be accessed via the "MacVim.Preferences..." menu item.
+be accessed via the "MacVim.Preferences…" menu item.

 							*macvim-user-defaults*
 Not all entries in the user defaults database are exposed via the preference
@@ -257,7 +262,11 @@ KEY				VALUE ~
 *MMFullScreenFadeTime*		fade delay for non-native fullscreen [float]
 *MMLoginShellArgument*		login shell parameter [string]
 *MMLoginShellCommand*		which shell to use to launch Vim [string]
+*MMNativeFullScreen*		use native full screen mode [bool]
+*MMNonNativeFullScreenShowMenu*	show menus when in non-native full screen [bool]
 *MMNoFontSubstitution*		disable automatic font substitution [bool]
+				(Deprecated: Non-CoreText renderer only)
+*MMFontPreserveLineSpacing*	use the line-spacing as specified by font [bool]
 *MMNoTitleBarWindow*		hide title bar [bool]
 *MMTitlebarAppearsTransparent*	enable a transparent titlebar [bool]
 *MMAppearanceModeSelection*	dark mode selection (|macvim-dark-mode|)[bool]
@@ -305,6 +314,8 @@ this behaviour set MMLoginShellArgument to "--".
 ==============================================================================
 4. MacVim appearance					*macvim-appearance*

+MacVim can be used in full screen mode, see 'fullscreen'.
+
 				*macvim-appearance-mode* *macvim-dark-mode*
 MacVim will by default use the system apperance mode (light or dark). However,
 you can manually force MacVim to use either light or dark mode in the
@@ -314,6 +325,13 @@ color scheme while system preferences are configured to use light mode. It's
 also the recommended setting when title bar is configured to be "Transparent"
 (see |MMTitlebarAppearsTransparent|).

+							*macvim-full-screen*
+There are two types of full screen modes.  By default, MacVim uses macOS'
+native full screen functionality, which creates a separate space in Mission
+Control.  MacVim also provides a non-native full screen mode, which can be set
+by disabling native full screen in the preference panel, or by setting
+|MMNativeFullScreen| to `NO` manually.
+
 ==============================================================================
 5. Special colors					*macvim-colors*

@@ -367,6 +385,12 @@ highlight color when a window becomes inactive.
 ==============================================================================
 6. Menus						*macvim-menus*

+Default Menus~
+
+See |macvim-default-menus|.
+
+Customization~
+
 Menus in macOS behave slightly different from other platforms.  For that
 reason two new commands have been added to Vim.  To understand what these
 commands do you must first understand how menus work on macOS.
@@ -463,8 +487,7 @@ is not used.
 Hint: The |:macaction| command supports command-line completion so you can
 enter ":maca<Space><C-d>" to see a list of all available actions.

-Here is a random assortment of actions from Actions.plist which might be
-useful.  
+Here are some of the actions from Actions.plist which might be useful.  

 Action				Description ~
 fileOpen:			Show "File Open" dialog
@@ -514,10 +537,17 @@ icon can be found a warning triangle is displayed instead.
 ==============================================================================
 8. Touch Bar						*macvim-touchbar*

-Touch Bar in MacVim works similar to the toolbar (see |macvim-toolbar|).  The
-difference is that you use the special menu "TouchBar" instead of "ToolBar": >
+Touch Bar in MacVim is configurable, and works similar to the toolbar (see
+|macvim-toolbar|).  The difference is that you use the special menu "TouchBar"
+instead of "ToolBar": >
 	:an TouchBar.Hello          :echo "Hello"<CR>
-
+<
+You can also create submenus. Due to macOS restrictions, submenus can only be
+one level deep: >
+	:an TouchBar.Navigate.Next  :next<CR>
+	:an TouchBar.Navigate.Prev  :prev<CR>
+<
+						*macvim-touchbar-separator*
 The separators work similar to how toolbars work: >
 	:an TouchBar.-Sep-          <Nop>
 	:an TouchBar.-space1-       <Nop>
@@ -530,24 +560,48 @@ separator and are specified by names that begin with "-space" and ends with
 that items after it will be right-aligned, and is specified by names that
 begin with "-flexspace" and ends with "-".

-You can specify icons for Touch Bar buttons the same way for toolbar icons.
-Touch Bar icons should ideally be 36x36 pixels, and no larger than 44x44
-pixels. You can also use default template icons provided by Apple by using
-their template names. An example: >
-	:an icon=NSTouchBarListViewTemplate TouchBar.ShowList <Nop>
+						*macvim-touchbar-icon*
+You can specify icons for Touch Bar buttons the same way for toolbar icons
+(see |macvim-toolbar|).  When a button has an icon, it won't show the menu
+name.  Touch Bar icons should ideally be 36x36 pixels, and no larger than
+44x44 pixels. >
+	:an icon=/home/foo/bar.png TouchBar.DoSomething :echo 'Do'<CR>
+You can also use default template icons provided by Apple by using their
+template names. An example: >
+	:an icon=NSTouchBarListViewTemplate TouchBar.ShowList :ls<CR>
+<
+						*macvim-touchbar-title*
+By default, the Touch Bar buttons will use the menu names as the title. If an
+icon is specified, the title will not be shown. You can override this by using
+|tmenu| to set a tooltip. The tooltip will be displayed as the title of the
+button. If an icon is specified, the tooltip override will be shown alongside
+the icon. Example: >
+	:an icon=NSTouchBarAddTemplate TouchBar.AddItem <Nop>
+	:tmenu TouchBar.AddItem Add an Item
+<
+			*macvim-touchbar-characterpicker* *macvim-touchbar-emoji*
+You can also insert emojis by adding a character picker button (specified by
+using a name that begin wtih "-characterpicker" and ends with "-"): >
+	:inoremenu TouchBar.-characterpicker-	<Nop>

 This feature only works on Mac devices that come with Touch Bars. On the ones
 that don't, nothing will show up.

-						    *macvim-touchbar-defaults*
+						*macvim-touchbar-defaults*
 Here is a list of default Touch Bar buttons that MacVim sets up:

-					*macvim-touchbar-fullscreen*
+						*macvim-touchbar-fullscreen*
 					*g:macvim_default_touchbar_fullscreen*
 EnterFullScreen		Touch Bar buttons that allow you to toggle
-ExitFullScreen		|'fullscreen'| mode. To disable the button, add the
-			following to your vimrc file: >
+ExitFullScreen		|'fullscreen'| mode. To disable, add the following to
+			your vimrc file: >
 			  let g:macvim_default_touchbar_fullscreen=0
+<
+				*g:macvim_default_touchbar_characterpicker*
+-characterpicker-	Character picker that lets you add special characters
+			and emojis in insert and terminal modes. To disable,
+			add the following to your vimrc file: >
+			  let g:macvim_default_touchbar_characterpicker=0

 ==============================================================================
 9. Dialogs						*macvim-dialogs*
@@ -731,7 +785,9 @@ As another example, here is how to switch buffers by swiping left/right: >
 See the section on |key-mapping| for more help on how to map keys.

 ==============================================================================
-14. International					*macvim-international*
+14. International			*macvim-international* *macvim-multilang*
+
+Typing text ~

 When editing non-English text it may be convenient to keep separate keyboard
 layouts for normal and insert mode.  This is supported via the 'imd' option on
@@ -751,43 +807,56 @@ set (i.e when IM is enabled).  If you find that MacVim switches to the
 wrong layout when going back to normal mode, then select the layout you want
 to use in normal mode and type ":set imd" followed by ":set noimd".

+Translations ~
+
+MacVim uses localized Vim messages (see |multilang-messages|) and menus (see
+|multilang-menus|).  However, some of the user interface in MacVim (e.g.
+Preference pane) are not yet localized.  There are also some MacVim-specific
+messages/menus in Vim that are not currently localized.  Please file an issue
+if you would like to see certain messages localized.
+
 ==============================================================================
 15. Known bugs/missing features				*macvim-todo*

 This list is by no means exhaustive, it only enumerates some of the more
 prominent bugs/missing features.

- Under macOS Mojave (10.14), the default renderer (Core Text renderer) has
-  some performance issues and scrolling is not as smooth as previous macOS
-  versions (10.13 or below).
- Localized menus are not supported.  Choosing anything but "English" in the
-  "International" pane of "System Prefences" may break the menus (and
-  toolbar).
- Some Unicode characters are not handled well (e.g. nonspacing marks)
+- Sound.  MacVim does not currently support |+sound| yet.
+- |modifyOtherKeys| support.  This feature allows for more granular key
+  mapping (e.g. differentiating <C-I> and <Tab>) and isn't supported by the
+  MacVim GUI yet.
+- Some parts of MacVim GUI and MacVim-specific messages in Vim are not
+  localized yet.
 - Sometimes multibyte characters look "too wide", i.e. they overlap the
  following character.  It might help to change 'ambiwidth', or override the
  automatic font substitution by setting 'guifontwide' manually.
 - Printing.  As a temporary solution <D-p> creates a PostScript file which is
-  then opened in Preview where it may be printed.
- The toolbar looks ugly and is not very useful.
+  then opened in Preview where it may be printed. See |hardcopy|.

-Other bugs and issues are tracked on Github. If you find new bugs then please
-file an issue there: >
+General bugs and issues are tracked on Github.  If you find new bugs or have
+feature requests then please file an issue there: >
 	https://github.com/macvim-dev/macvim/issues

-There is also a vim_mac mailing list. You can also post your findings of bugs
+For general discussions, asking questions, you could use the Github
+discussions page: >
+	https://github.com/macvim-dev/macvim/discussions
+
+There is also a vim_mac mailing list.  You can also post your findings of bugs
 and issues there as well:				*vim_mac_group*   >
 	http://groups.google.com/group/vim_mac

-This is also the best place for making feature requests as well as for asking
-general questions about MacVim.
-
 ==============================================================================
 16. Hints						*macvim-hints*

 In this section some general (not necessarily MacVim specific) hints are
 given.

+Scenario: ~
+You would like to remap Caps Lock to Esc.
+Solution: ~
+Go to System Preferences → Keyboard → Modifier Keys…, and map Caps Lock Key to
+Escape.
+
 Scenario: ~
 You try opening a bunch of files in tabs but not all files get opened in their
 own tab.
@@ -820,16 +889,15 @@ Solution: ~
 See |cmd-movement|.

 Scenario: ~
-Enabling localized menus breaks the toolbar and the menus as well.
+When you click the (green) full screen button you want the window to maximize
+instead of going full screen. You would also like it to maximize both
+horizontally and vertically.
 Solution: ~
-This is a known problem, see |macvim-todo|.
-
-Scenario: ~
-When you click the (green) zoom button you want the window to maximize
-horizontally as well as vertically.
-Solution: ~
-Hold down Cmd and click the zoom button.  If you prefer this to be the default
-action, then set the user default MMZoomBoth (see |macvim-prefs|).
+Hole down Option, and the full screen button will become the zoom button,
+which will by default only maximize vertically.
+To maximize in both directions, hold down Cmd and click the zoom button.  If
+you prefer this to be the default action, then set the user default MMZoomBoth
+(see |macvim-prefs|).

 Scenario: ~
 Typing feels sluggish when the cursor is just before a right bracket (i.e.
@@ -867,18 +935,6 @@ bring up an editor, you would set that option to something like: >
 	mvim -f -c "au VimLeave * maca hide:"
 (See the above Scenario for an explanation of the "-f" switch.)

-Scenario: ~
-You would like to remap Caps Lock to Esc.
-Solution: ~
-The app "PCKeyboardHack" can be used to remap Caps Lock.  It is available as a
-free download from: >
-	http://pqrs.org/macosx/keyremap4macbook/extra.html
-On some Apple keyboards the Caps Lock key doesn't immediately register and
-this makes Caps Lock "drop" key presses.  To work around this problem go into
-the "Keyboard" System Preference and remap Caps Lock to Ctrl first (click the
-"Modifier Keys..." button).  This trick may also be necessary if the Caps Lock
-light turns on/off despite having remapped to Esc.
-
 Scenario: ~
 You have problems creating custom mappings involving the Cmd key.
 Solution: ~
@@ -893,6 +949,7 @@ Scenario: ~
 You can't find the information on MacVim you thought should be in this manual
 page.
 Solution: ~
-Post your question on the |vim_mac| mailing list and wait for an answer.
+Post your question on the |vim_mac| mailing list or file an issue at
+https://github.com/macvim-dev/macvim/issues.

 vim:tw=78:sw=4:ts=8:noet:ft=help:norl:
@@ -8,7 +8,7 @@ Vim had built-in support for hangul, the Korean language, for users without
 XIM (X Input Method).  Since it didn't work well and was not maintained it was
 removed in Vim 8.1.2327.

-If you want this hangul input mehod you can go back to Vim 8.1.2326 or
+If you want this hangul input method you can go back to Vim 8.1.2326 or
 earlier.  If you think this code is still useful and want to maintain it, make
 a patch to add it back.  However, making it work with UTF-8 encoding would be
 best.
@@ -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
@@ -1,4 +1,4 @@
-*helphelp.txt*	For Vim version 8.2.  Last change: 2020 Jul 27
+*helphelp.txt*	For Vim version 8.2.  Last change: 2020 Dec 29


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -92,9 +92,9 @@ Help on help files					*helphelp*
 				:help k| only
 <			Note that a space before the '|' is seen as part of
 			the ":help" argument.
-			You can also use <LF> or <CR> to separate the help
+			You can also use <NL> or <CR> to separate the help
 			command from a following command.  You need to type
-			CTRL-V first to insert the <LF> or <CR>.  Example: >
+			CTRL-V first to insert the <NL> or <CR>.  Example: >
 				:help so<C-V><CR>only

 :h[elp]! [subject]	Like ":help", but in non-English help files prefer to
@@ -158,9 +158,31 @@ When no argument is given to |:help| the file given with the 'helpfile' option
 will be opened.  Otherwise the specified tag is searched for in all "doc/tags"
 files in the directories specified in the 'runtimepath' option.

+If you would like to open the help in the current window, see this tip:
+|help-curwin|.
+
 The initial height of the help window can be set with the 'helpheight' option
 (default 20).

+When the help buffer is created, several local options are set to make sure
+the help text is displayed as it was intended:
+    'iskeyword'		nearly all ASCII chars except ' ', '*', '"' and '|'
+    'foldmethod'	"manual"
+    'tabstop'		8
+    'arabic'		off
+    'binary'		off
+    'buflisted'		off
+    'cursorbind'	off
+    'diff'		off
+    'foldenable'	off
+    'list'		off
+    'modifiable'	off
+    'number'		off
+    'relativenumber'	off
+    'rightleft'		off
+    'scrollbind'	off
+    'spell'		off
+
 Jump to specific subjects by using tags.  This can be done in two ways:
 - Use the "CTRL-]" command while standing on the name of a command or option.
  This only works when the tag is a keyword.  "<C-Leftmouse>" and
@@ -1,4 +1,4 @@
-*if_mzsch.txt*  For Vim version 8.2.  Last change: 2019 Dec 07
+*if_mzsch.txt*  For Vim version 8.2.  Last change: 2020 Oct 14


 		  VIM REFERENCE MANUAL    by Sergey Khorev
@@ -43,7 +43,7 @@ To speed up the process, you might also want to use --disable-gracket and
 {script}
 {endmarker}
 			Execute inlined MzScheme script {script}.
-			Note: This command doesn't work if the MzScheme
+			Note: This command doesn't work when the MzScheme
 			feature wasn't compiled in.  To avoid errors, see
 			|script-here|.

@@ -610,14 +610,14 @@ the use of square and curly brackets, and otherwise by community convention.
 These conventions are not universally followed, so the Clojure indent script
 offers a few configurable options, listed below.

-If the current vim does not include |searchpairpos()|, the indent script falls
+If the current vim does not include searchpairpos(), the indent script falls
 back to normal 'lisp' indenting, and the following options are ignored.

 							*g:clojure_maxlines*

-Set maximum scan distance of |searchpairpos()|. Larger values trade
-performance for correctness when dealing with very long forms. A value of 0
-will scan without limits.
+Set maximum scan distance of searchpairpos(). Larger values trade performance
+for correctness when dealing with very long forms. A value of 0 will scan
+without limits.
 >
 	" Default
 	let g:clojure_maxlines = 100
@@ -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: 2021 Feb 14


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -784,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
@@ -1176,6 +1176,7 @@ tag		command		action ~
 |:bNext|	:bN[ext]	go to previous buffer in the buffer list
 |:ball|		:ba[ll]		open a window for each buffer in the buffer list
 |:badd|		:bad[d]		add buffer to the buffer list
+|:balt|		:balt		like ":badd" but also set the alternate file
 |:bdelete|	:bd[elete]	remove a buffer from the buffer list
 |:behave|	:be[have]	set mouse and selection behavior
 |:belowright|	:bel[owright]	make split window appear right or below
@@ -1317,6 +1318,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
@@ -1591,6 +1593,8 @@ tag		command		action ~
 |:sign|		:sig[n]		manipulate signs
 |:silent|	:sil[ent]	run a command silently
 |:sleep|	:sl[eep]	do nothing for a few seconds
+|:sleep!|	:sl[eep]!	do nothing for a few seconds, without the
+				cursor visible
 |:slast|	:sla[st]	split window and go to last file in the
 				argument list
 |:smagic|	:sm[agic]	:substitute with 'magic'
@@ -1693,10 +1697,12 @@ 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
-|:vim9script|	:vim9[script]	indicates Vim9 script file
+|:vim9cmd|	:vim9[cmd]	make following command use Vim9 script syntax
+|:vim9script|	:vim9s[cript]	indicates Vim9 script file
 |:vimgrep|	:vim[grep]	search for pattern in files
 |:vimgrepadd|	:vimgrepa[dd]	like :vimgrep, but append to current list
 |:visual|	:vi[sual]	same as ":edit", but turns off "Ex" mode
@@ -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 Oct 16


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -312,6 +312,7 @@ If you enter a value of 10, it will end up in the file as a 0.  The 10 is a
 the buffer to a file, the <NL> character is translated into <Nul>.  The <NL>
 character is written at the end of each line.  Thus if you want to insert a
 <NL> character in a file you will have to make a line break.
+Also see 'fileformat'.

 						*i_CTRL-X* *insert_expand*
 CTRL-X enters a sub-mode where several commands can be used.  Most of these
@@ -1843,6 +1844,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 +1857,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.
@@ -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 Dec 29


 		  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
-	Sung-Hyun Nam		Work on multi-byte versions
+	Katsuhito Nagano	Work on multibyte 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
@@ -434,7 +434,7 @@ notation	meaning		    equivalent	decimal value(s)	~
 <CSI>		command sequence intro  ALT-Esc 155	*<CSI>*
 <xCSI>		CSI when typed in the GUI		*<xCSI>*

-<EOL>		end-of-line (can be <CR>, <LF> or <CR><LF>,
+<EOL>		end-of-line (can be <CR>, <NL> or <CR><NL>,
 		depends on system and 'fileformat')	*<EOL>*

 <Up>		cursor-up			*cursor-up* *cursor_up*
@@ -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.

@@ -678,8 +678,8 @@ Normal mode from any other mode.  This can be used to make sure Vim is in
 Normal mode, without causing a beep like <Esc> would.  However, this does not
 work in Ex mode.  When used after a command that takes an argument, such as
 |f| or |m|, the timeout set with 'ttimeoutlen' applies.
-When focus is in a terminal window, CTRL-\ CTRL-N goes to Normal mode for only
-one command, see |t_CTRL-\_CTRL-N|.
+When focus is in a terminal window, CTRL-\ CTRL-N goes to Normal mode until an
+edit command is entered, see |t_CTRL-\_CTRL-N|.

 	*CTRL-\_CTRL-G* *i_CTRL-\_CTRL-G* *c_CTRL-\_CTRL-G* *v_CTRL-\_CTRL-G*
 The command CTRL-\ CTRL-G or <C-\><C-G> can be used to go to Insert mode when
@@ -1,4 +1,4 @@
-*map.txt*       For Vim version 8.2.  Last change: 2020 Aug 01
+*map.txt*       For Vim version 8.2.  Last change: 2020 Dec 10


 		  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:
@@ -254,7 +271,7 @@ For this reason the following is blocked:
 - The |:normal| command.
 - Moving the cursor is allowed, but it is restored afterwards.
 If you want the mapping to do any of these let the returned characters do
-that.
+that, or use a |<Cmd>| mapping instead.

 You can use getchar(), it consumes typeahead if there is any. E.g., if you
 have these mappings: >
@@ -283,15 +300,45 @@ 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
-in the text.  The |:map| command also does this, thus you must avoid that it
-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.
+Note that using 0x80 as a single byte before other text does not work, it will
+be seen as a special key.
+
+						*<Cmd>* *:map-cmd*
+The special text <Cmd> begins a "command mapping", it executes the command
+directly without changing modes.  Where you might use ":...<CR>" in the
+{rhs} of a mapping, you can instead use "<Cmd>...<CR>".
+Example: >
+	noremap x <Cmd>echo mode(1)<CR>
+<
+This is more flexible than `:<C-U>` in Visual and Operator-pending mode, or
+`<C-O>:` in Insert mode, because the commands are executed directly in the
+current mode, instead of always going to Normal mode.  Visual mode is
+preserved, so tricks with |gv| are not needed.  Commands can be invoked
+directly in Command-line mode (which would otherwise require timer hacks).
+Example of using <Cmd> halfway Insert mode: >
+	nnoremap <F3> aText <Cmd>echo mode(1)<CR> Added<Esc>
+
+Unlike <expr> mappings, there are no special restrictions on the <Cmd>
+command: it is executed as if an (unrestricted) |autocommand| was invoked.
+
+Note:
+- Because <Cmd> avoids mode-changes it does not trigger |CmdlineEnter| and
+  |CmdlineLeave| events, because no user interaction is expected.
+- For the same reason, |keycodes| like <C-R><C-W> are interpreted as plain,
+  unmapped keys.
+- The command is not echo'ed, no need for <silent>.
+- In Visual mode  you can use `line('v')` and `col('v')` to get one end of the
+  Visual area, the cursor is at the other end.
+- In Select mode, |:map| and |:vmap| command mappings are executed in
+  Visual mode.  Use |:smap| to handle Select mode differently.
+
+							*E1135* *E1136*
+<Cmd> commands must terminate, that is, they must be followed by <CR> in the
+{rhs} of the mapping definition.  |Command-line| mode is never entered.
+
+							*E1137*
+<Cmd> commands can have only normal characters and cannot contain special
+characters like function keys.


 1.3 MAPPING AND MODES					*:map-modes*
@@ -595,7 +642,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,8 +887,15 @@ 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-{> {{{
-Without modifyOtherKeys <C-[> and <C-S-{> are indistinguishable from Esc.
+	imap <C-{> {{{
+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|.
+
+WARNING: if you map <C-[> you may very well break any key codes that start
+with Esc.  Make sure it comes AFTER other mappings.

 A known side effect is that in Insert mode the raw escape sequence is inserted
 after the CTRL-V key.  This can be used to check whether modifyOtherKeys is
@@ -855,7 +909,7 @@ Insert mode to avoid every key with a modifier causing Insert mode to end.
 1.12 MAPPING AN OPERATOR				*:map-operator*

 An operator is used before a {motion} command.  To define your own operator
-you must create mapping that first sets the 'operatorfunc' option and then
+you must create a mapping that first sets the 'operatorfunc' option and then
 invoke the |g@| operator.  After the user types the {motion} command the
 specified function will be called.

@@ -875,35 +929,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@
-	vmap <silent> <F4> :<C-U>call CountSpaces(visualmode(), 1)<CR>
+	nnoremap <expr> <F4> CountSpaces()
+	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 = @@
+	  let reg_save = getreginfo('"')
+	  let cb_save = &clipboard
+	  let visual_marks_save = [getpos("'<"), getpos("'>")]

-	  if a:0  " Invoked from Visual mode, use gv command.
-	    silent exe "normal! gvy"
-	  elseif a:type == 'line'
-	    silent exe "normal! '[V']y"
-	  else
-	    silent exe "normal! `[v`]y"
-	  endif
-
-	  echomsg strlen(substitute(@@, '[^ ]', '', 'g'))
-
-	  let &selection = sel_save
-	  let @@ = reg_save
+	  try
+	    set clipboard= selection=inclusive
+	    let commands = #{line: "'[V']y", char: "`[v`]y", block: "`[\<c-v>`]y"}
+	    silent exe 'noautocmd keepjumps normal! ' .. get(commands, a:type, '')
+	    echom getreg('"')->count(' ')
+	  finally
+	    call setreg('"', reg_save)
+	    call setpos("'<", visual_marks_save[0])
+	    call setpos("'>", visual_marks_save[1])
+	    let &clipboard = cb_save
+	    let &selection = sel_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
-"'<,'>" range that ":" inserts in Visual mode and invokes the function with
-visualmode() and an extra argument.
+Also note that the 'clipboard' option is temporarily emptied to avoid
+clobbering the `"*` or `"+` registers, if its value contains the item `unnamed`
+or `unnamedplus`.

 ==============================================================================
 2. Abbreviations			*abbreviations* *Abbreviations*
@@ -1175,9 +1241,9 @@ 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
 use this function: >
-	function s:SID()
-	  return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze_SID$')
-	endfun
+	func s:ScriptNumber()
+	  return matchstr(expand('<SID>'), '<SNR>\zs\d\+\ze_')
+	endfunc

 The "<SNR>" will be shown when listing functions and mappings.  This is useful
 to find out what they are defined to.
@@ -1255,15 +1321,15 @@ last defined. Example: >
 See |:verbose-cmd| for more information.

 							*E174* *E182*
-:com[mand][!] [{attr}...] {cmd} {rep}
+:com[mand][!] [{attr}...] {cmd} {repl}
 			Define a user command.  The name of the command is
-			{cmd} and its replacement text is {rep}.  The command's
-			attributes (see below) are {attr}.  If the command
-			already exists, an error is reported, unless a ! is
-			specified, in which case the command is redefined.
-			There is one exception: When sourcing a script again,
-			a command that was previously defined in that script
-			will be silently replaced.
+			{cmd} and its replacement text is {repl}.  The
+			command's attributes (see below) are {attr}.  If the
+			command already exists, an error is reported, unless a
+			! is specified, in which case the command is
+			redefined.  There is one exception: When sourcing a
+			script again, a command that was previously defined in
+			that script will be silently replaced.


 :delc[ommand] {cmd}				*:delc* *:delcommand* *E184*
@@ -1473,11 +1539,11 @@ feature.  Use the full name for new scripts.

 Replacement text ~

-The replacement text for a user defined command is scanned for special escape
-sequences, using <...> notation.  Escape sequences are replaced with values
-from the entered command line, and all other text is copied unchanged.  The
-resulting string is executed as an Ex command.  To avoid the replacement use
-<lt> in place of the initial <.  Thus to include "<bang>" literally use
+The replacement text {repl} for a user defined command is scanned for special
+escape sequences, using <...> notation.  Escape sequences are replaced with
+values from the entered command line, and all other text is copied unchanged.
+The resulting string is executed as an Ex command.  To avoid the replacement
+use <lt> in place of the initial <.  Thus to include "<bang>" literally use
 "<lt>bang>".

 The valid escape sequences are
@@ -1495,7 +1561,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|,
@@ -1603,6 +1669,11 @@ errors and the "update" command to write modified buffers): >
 This will invoke: >
 	:call Allargs("%s/foo/bar/ge|update")
 <
+If the command is defined in Vim9 script (a script that starts with
+`:vim9script` and in a `:def` function) then {repl} will be executed as in Vim9
+script.  Thus this depends on where the command is defined, not where it is
+used.
+
 When defining a user command in a script, it will be able to call functions
 local to the script and use mappings local to the script.  When the user
 invokes the user command, it will run in the context of the script it was
@@ -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,7 +123,7 @@ 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|.
@@ -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.
@@ -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>
@@ -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 Dec 29


 		  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
@@ -793,6 +794,9 @@ and the screen is about to be redrawn:
 -> Press <Enter> or <Space> to redraw the screen and continue, without that
   key being used otherwise.
 -> Press ':' or any other Normal mode command character to start that command.
+   Note that after an external command some special keys, such as the cursor
+   keys, may not work normally, because the terminal is still set to a state
+   for executing the external command.
 -> Press 'k', <Up>, 'u', 'b' or 'g' to scroll back in the messages.  This
   works the same way as at the |more-prompt|.  Only works when 'compatible'
   is off and 'more' is on.
@@ -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|.

@@ -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 Oct 18


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -190,11 +190,14 @@ l		or					*l*

 							*^*
 ^			To the first non-blank character of the line.
-			|exclusive| motion.
+			|exclusive| motion.  Any count is ignored.

 							*$* *<End>* *<kEnd>*
 $  or <End>		To the end of the line.  When a count is given also go
-			[count - 1] lines downward. |inclusive| motion.
+			[count - 1] lines downward, or as far is possible.
+			|inclusive| motion.  If a count of 2 of larger is
+			given and the cursor is on the last line, that is an
+			error an the cursor doesn't move.
 			In Visual mode the cursor goes to just after the last
 			character in the line.
 			When 'virtualedit' is active, "$" may move the cursor
@@ -495,10 +498,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
-useful to find the start or end of a function in a C program.  Note that the
-first character of the command determines the search direction and the
-second character the type of brace found.
+The "]]" and "[[" commands stop at the '{' in the first column.  This is
+useful to find the start of a function in a C program.  To search for a '}' in
+the first column, the end of a C function, use "][" (forward) or "[]"
+(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 +1146,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
@@ -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 Nov 02


 		  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.
@@ -562,9 +562,10 @@ setModtime time
 		saved directly by the Vim Controller.
 		New in version 2.3.

-setReadOnly
-		Set a file as readonly
-		Implemented in version 2.3.
+setReadOnly readonly
+		When the boolean argument "readonly" is "T" for True, mark the
+		buffer as readonly, when it is "F" for False, mark it as not
+		readonly.  Implemented in version 2.3.

 setStyle	Not implemented.

@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 8.2.  Last change: 2020 Aug 07
+*options.txt*	For Vim version 8.2.  Last change: 2021 Feb 13


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -438,7 +438,7 @@ the system, mostly it is something like 256 or 1024 characters.
 				  CTRL-?	CTRL-H
 				not CTRL-?	CTRL-?

-			(CTRL-? is 0177 octal, 0x7f hex)
+			(CTRL-? is 0o177 octal, 0x7f hex)

 			If your delete key terminal code is wrong, but the
 			code for backspace is alright, you can put this in
@@ -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, on for MacVim)
 			global
 			{only available when compiled with GUI enabled
-			on Mac OS X}
-	This option only has an effect in the GUI version of Vim on Mac OS X
+			on macOS}
+	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.

@@ -1570,7 +1573,11 @@ A jump table for the options with a short description can be found at |Q_op|.
 			{only in GUI versions or when the |+xterm_clipboard|
 			feature is included}
 	This option is a list of comma separated names.
-	These names are recognized:
+	Note: if one of the items is "exclude:", then you can't add an item
+	after that.  Therefore do append an item with += but use ^= to
+	prepend, e.g.: >
+		set clipboard^=unnamed
+<	These names are recognized:

 						*clipboard-unnamed*
 	unnamed		When included, Vim will use the clipboard register '*'
@@ -2566,7 +2573,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
@@ -2689,6 +2696,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 		foldcolumn:{n}	Set the 'foldcolumn' option to {n} when
 				starting diff mode.  Without this 2 is used.

+		followwrap	Follow the 'wrap' option and leave as it is.
+
 		internal	Use the internal diff library.  This is
 				ignored when 'diffexpr' is set.  *E960*
 				When running out of memory when writing a
@@ -2748,8 +2757,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
-	  ensure file name uniqueness in the preserve directory.
+	  with all path separators replaced by percent '%' signs (including
+	  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
@@ -2812,12 +2822,16 @@ A jump table for the options with a short description can be found at |Q_op|.
 	toggled each time the flag is given.  See |complex-change|.  See
 	also 'gdefault' option.
 	Switching this option on may break plugins!
+	This option is not used in |Vim9| script.

 					*'emoji'* *'emo'* *'noemoji'* *'noemo'*
 'emoji' 'emo'	boolean (default: on)
 			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)
@@ -2847,7 +2861,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")
 <
@@ -3129,7 +3143,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			local to buffer
 	This gives the <EOL> of the current buffer, which is used for
 	reading/writing the buffer from/to a file:
-	    dos	    <CR> <NL>
+	    dos	    <CR><NL>
 	    unix    <NL>
 	    mac	    <CR>
 	When "dos" is used, CTRL-Z at the end of a file is ignored.
@@ -3236,7 +3250,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Only normal file name characters can be used, "/\*?[|<>" are illegal.

 						*'fillchars'* *'fcs'*
-'fillchars' 'fcs'	string	(default "vert:|,fold:-")
+'fillchars' 'fcs'	string	(default "vert:|,fold:-,eob:~")
 			global
 			{not available when compiled without the |+folding|
 			feature}
@@ -3248,7 +3262,11 @@ A jump table for the options with a short description can be found at |Q_op|.
 	  stlnc:c	' ' or '='	statusline of the non-current windows
 	  vert:c	'|'		vertical separators |:vsplit|
 	  fold:c	'-'		filling 'foldtext'
+	  foldopen:c	'-'		mark the beginning of a fold
+	  foldclose:c	'+'		show a closed fold
+	  foldsep:c	'|'		open fold middle character
 	  diff:c	'-'		deleted lines of the 'diff' option
+	  eob:c		'~'		empty lines below the end of a buffer

 	Any one that is omitted will fall back to the default.  For "stl" and
 	"stlnc" the space will be used when there is highlighting, '^' or '='
@@ -3259,7 +3277,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 <	This is similar to the default, except that these characters will also
 	be used when there is highlighting.

-	for "stl" and "stlnc" only single-byte values are supported.
+	For "stl" and "stlnc" single-byte and multibyte characters are
+	supported.  But double-width characters are not supported.

 	The highlighting used for these items:
 	  item		highlight group ~
@@ -3268,6 +3287,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	  vert:c	VertSplit		|hl-VertSplit|
 	  fold:c	Folded			|hl-Folded|
 	  diff:c	DiffDelete		|hl-DiffDelete|
+	  eob:c		EndOfBuffer		|hl-EndOfBuffer|

 		*'fixendofline'* *'fixeol'* *'nofixendofline'* *'nofixeol'*
 'fixendofline' 'fixeol'	boolean	(default on)
@@ -3280,7 +3300,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	See the 'endofline' option.

 					*'fkmap'* *'fk'* *'nofkmap'* *'nofk'*
-'fkmap' 'fk'		boolean (default off)			*E198*
+'fkmap' 'fk'		boolean (default off)
 			global
 			{only available when compiled with the |+rightleft|
 			feature}
@@ -3572,50 +3592,49 @@ A jump table for the options with a short description can be found at |Q_op|.
 	(e.g. toolbar, title bar).  The tab bar and scroll bars remain visible.
 	Updates to the window position are ignored in fullscreen mode.

+	By default, this will use macOS's native full screen feature, which
+	will put the MacVim window into another Space under Mission Control.
+	MacVim also provides a custom full screen solution which you can
+	select by setting |MMNativeFullScreen| to NO, or toggle it under
+	Preferences → Appearance. Under custom full-screen, the window will
+	not be put in another space, which makes it easier to Cmd-Tab to other
+	windows.
+
+	Custom / non-native full screen configuration:~
+
 	See 'fuoptions' for how Vim resizes and colors the background when 
 	entering and leaving fullscreen mode.

-	You can use the hidden preference MMFullScreenFadeTime to adjust how
-	long the animation takes to fade in and out.  The default is 0.25
-	seconds.  See |macvim-preferences|for how to set hidden preferences.
+	There is an optional fade-to-black effect while transitioning that
+	could be turned on by using the hidden preference
+	|MMFullScreenFadeTime| (specified in seconds). It defaults to 0,
+	meaning this effect is turned off.  Setting it to a positive value
+	(e.g. 0.25) will create an effect that fades to black during the full
+	screen transition to make it less jarring.

-	Note: Setting 'fullscreen' usually changes the size of the Vim
-	control. However, for technical reasons, 'lines' and 'columns' will
-	currently only be updated when Vim runs its event loop. As a
-	consequence, if you set 'fullscreen' and 'lines' or 'columns' in a
-	Vim script file, you should always set 'fullscreen' after setting
-	'lines' and 'columns', else 'lines' and 'columns' will be overwritten
-	with the values 'fullscreen' sets after the script has been executed
-	and the event loop is ran again.
+	Note: While in 'fullscreen', you cannot set 'lines' or 'columns', as
+	they are determined by the size of the window.  'fuoptions' allows you
+	to override part of that behavior if using custom full screen.

-	XXX: Add fuenter/fuleave autocommands? You might want to display
-	a NERDTree or a Tlist only in fullscreen for example. Then again, this
-	could probably be in a sizechanged autocommand that triggers if the
-	size is above a certain threshold.
-	XXX: Think about how 'fullscreen' and 'transparency' should interact. 

 						*'fuoptions'* *'fuopt'*
 'fuoptions' 'fuopt'	string (default "maxvert,maxhorz")
 			global
 			{not in Vi}
 			{only in MacVim GUI}
-	In fullscreen mode, most of the screen is black, only a part of the
-	screen is covered by the actual Vim control.  The control is centered.
-	This option controls the size of the Vim control as well as the color
-	of the unused screen area. 
+			{not supported in native full screen mode}
+	In non-native fullscreen mode, MacVim can be configured to either show
+	all the content filling up the whole screen, or only use part of the
+	screen to show the content, centered.  This option controls the size
+	of the Vim control as well as the color of the unused screen area. 
 	value	effect	~
        maxvert	When entering fullscreen, 'lines' is set to the maximum number
-		of lines fitting on the screen in fullscreen mode. When
-		leaving fullscreen, if 'lines' is still equal to the maximized
-		number of lines, it is restored to the value it had before
-		entering fullscreen.
+		of lines fitting on the screen in fullscreen mode. If unset, 
+		'lines' will be unchanged when entering fullscreen mode.
        maxhorz	When entering fullscreen, 'columns' is set to the maximum number
-		of columns fitting on the screen in fullscreen mode. When
-		leaving fullscreen, if 'columns' is still equal to the maximized
-		number of columns, it is restored to the value it had before
-		entering fullscreen.
+		of columns fitting on the screen in fullscreen mode. If unset,
+		'columns' will be unchanged when entering fullscreen mode.
 	background:color
-		{not supported in Mac OS X native full screen}
 		When entering fullscreen, 'color' defines the color of the part
 		of the screen that is not occupied by the Vim control. If
 		'color' is an 8-digit hexadecimal number preceded by '#',
@@ -3637,13 +3656,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 <	Don't change size when entering fullscreen, and color the background
 	like the current text background: >
 	  :set fuoptions=background:Normal
-<
-	XXX: what if the font size is changed? you probably never want to
-	restore the old 'lines' or 'columns' in that case.
-	XXX: Each time the Vim window resizes (for example due to font size
-	changes, re-maximize Vim to fullscreen?)
-	XXX: The approach doesn't restore vertical Vim size if fu is entered
-	without tabs and leaves with tabs (or the other way round).



@@ -3664,6 +3676,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	DEPRECATED: Setting this option may break plugins that are not aware
 	of this option.  Also, many users get confused that adding the /g flag
 	has the opposite effect of that it normally does.
+	This option is not used in |Vim9| script.

 						*'grepformat'* *'gfm'*
 'grepformat' 'gfm'	string	(default "%f:%l:%m,%f:%l%m,%f  %l%m")
@@ -4649,7 +4662,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
@@ -4778,7 +4791,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
@@ -4940,7 +4953,7 @@ A jump table for the options with a short description can be found at |Q_op|.

 						*'listchars'* *'lcs'*
 'listchars' 'lcs'	string	(default "eol:$")
-			global
+			global or local to window |global-local|
 	Strings to use in 'list' mode and for the |:list| command.  It is a
 	comma separated list of string settings.
 							*lcs-eol*
@@ -4971,7 +4984,13 @@ A jump table for the options with a short description can be found at |Q_op|.
 							*lcs-space*
 	  space:c	Character to show for a space.  When omitted, spaces
 			are left blank.
-							*lcs-trail*
+							*lcs-lead*
+	  lead:c	Character to show for leading spaces.  When omitted,
+			leading spaces are blank.  Overrides the "space"
+			setting for leading spaces.  You can combine it with
+			"tab:", for example: >
+				:set listchars+=tab:>-,lead:.
+<							*lcs-trail*
 	  trail:c	Character to show for trailing spaces.  When omitted,
 			trailing spaces are blank.  Overrides the "space"
 			setting for trailing spaces.
@@ -5026,19 +5045,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 Carbon GUI version}
-	This is a workaround for when drawing doesn't work properly.  When set
-	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'.
-	Note: MacVim does not use this option.
+			{not supported}
+	No longer supported, as the Mac OS X GUI code was removed.

 				*'macligatures'* *'nomacligatures'*
 'macligatures' 		boolean (default off)
@@ -5087,6 +5095,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Only switch it off when working with old Vi scripts.  In any other
 	situation write patterns that work when 'magic' is on.  Include "\M"
 	when you want to |/\M|.
+	In |Vim9| script the value of 'magic' is ignored, patterns behave like
+	it is always set.

 						*'makeef'* *'mef'*
 'makeef' 'mef'		string	(default: "")
@@ -5361,7 +5371,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	NOTE: This option is set to the Vi default value when 'compatible' is
 	set and to the Vim default value when 'compatible' is reset.

-						*'mouse'* *E538*
+						*'mouse'*
 'mouse'			string	(default "", "a" for GUI and Win32,
 					set to "a" or "nvi" in |defaults.vim|)
 			global
@@ -6338,7 +6348,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.
@@ -6366,7 +6376,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 <
 				*'runtimepath'* *'rtp'* *vimfiles*
 'runtimepath' 'rtp'	string	(default:
-					Unix, Mac OS X: "$HOME/.vim,
+					Unix, macOS: "$HOME/.vim,
 						$VIM/vimfiles,
 						$VIMRUNTIME,
 						$VIM/vimfiles/after,
@@ -6376,20 +6386,20 @@ A jump table for the options with a short description can be found at |Q_op|.
 						$VIMRUNTIME,
 						$VIM/vimfiles/after,
 						home:vimfiles/after"
-					PC:    "$HOME/vimfiles,
+					MS-Windows: "$HOME/vimfiles,
 						$VIM/vimfiles,
 						$VIMRUNTIME,
 						$VIM/vimfiles/after,
 						$HOME/vimfiles/after"
-					Macintosh (pre-OS X): "$VIM:vimfiles,
+					Classic Mac OS: "$VIM:vimfiles,
 						$VIMRUNTIME,
 						$VIM:vimfiles:after"
 					Haiku: "$BE_USER_SETTINGS/vim,
 						$VIM/vimfiles,
 						$VIMRUNTIME,
 						$VIM/vimfiles/after,
-						$BE_USER_SETTINGS/vim/after")
-					VMS: "sys$login:vimfiles,
+						$BE_USER_SETTINGS/vim/after"
+					VMS:   "sys$login:vimfiles,
 						$VIM/vimfiles,
 						$VIMRUNTIME,
 						$VIM/vimfiles/after,
@@ -6461,7 +6471,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 			local to window
 	Number of lines to scroll with CTRL-U and CTRL-D commands.  Will be
 	set to half the number of lines in the window when the window size
-	changes.  If you give a count to the CTRL-U or CTRL-D command it will
+	changes.  This may happen when enabling the |status-line| or
+	'tabline' option after setting the 'scroll' option.
+	If you give a count to the CTRL-U or CTRL-D command it will
 	be used as the new value for 'scroll'.  Reset to half the window
 	height with ":set scroll=0".

@@ -6711,7 +6723,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",
@@ -7369,7 +7381,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	normal text.  Each status line item is of the form:
 	  %-0{minwid}.{maxwid}{item}
 	All fields except the {item} are optional.  A single percent sign can
-	be given as "%%".  Up to 80 items can be specified.  *E541*
+	be given as "%%".

 	When the option starts with "%!" then it is used as an expression,
 	evaluated and the result is used as the option value.  Example: >
@@ -7435,8 +7447,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.
-	v N   Virtual column number.
+	c N   Column number (byte index).
+	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
@@ -7891,8 +7903,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	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
-	'termencoding' should be "macroman".
+	display).
 								*E617* *E950*
 	Note: This does not apply to the GTK+ and MacVim GUIs.  After the GUI
 	has been successfully initialized, 'termencoding' is forcibly set to
@@ -7957,8 +7968,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
-	{rows}*{columns}.
+	Size used when opening the |terminal| window.  Format:
+		{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
@@ -7969,6 +7980,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.
@@ -8549,7 +8562,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|
@@ -1,4 +1,4 @@
-*os_vms.txt*    For Vim version 8.2.  Last change: 2020 Jun 07
+*os_vms.txt*    For Vim version 8.2.  Last change: 2021 Jan 04


 		  VIM REFERENCE MANUAL
@@ -72,7 +72,7 @@ See the file [.SRC]INSTALLVMS.TXT.
 4. Problems						*vms-problems*

 The code has been tested under Open VMS 6.2 - 8.2 on Alpha, VAX and IA64
-platforms with the DEC C compiler.  It should work without big problems.
+platforms with the DEC C compiler. It should work without major problems.
 If your system does not have some include libraries you can tune up in
 OS_VMS_CONF.H file.

@@ -765,6 +765,15 @@ GNU_TOOLS.ZIP package downloadable from http://www.polarhome.com/vim/

 9. VMS related changes					*vms-changes*

+Version 8.2
+- make all changes needed for clean compile build of v8.2 on VMS on all platforms
+- fix the call mkdir bug (vicente_polo@yahoo.es) 
+- test on VSI OpenVMS Alpha and Itanium platforms
+- added LUA support
+- added XPM support - Motif GUI with toolbar on all platforms
+- XPM v3.4.11 libraries for IA64, AXP and VAX are added 
+- start integrating the new test scripts 
+
 Version 8.1
 - make necessary changes to build v8.1 on VMS

@@ -1,4 +1,4 @@
-*pattern.txt*   For Vim version 8.2.  Last change: 2020 Jul 10
+*pattern.txt*   For Vim version 8.2.  Last change: 2021 Feb 16


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -229,7 +229,7 @@ This is like executing two search commands after each other, except that:
 							*last-pattern*
 The last used pattern and offset are remembered.  They can be used to repeat
 the search, possibly in another direction or with another count.  Note that
-two patterns are remembered: One for 'normal' search commands and one for the
+two patterns are remembered: One for "normal" search commands and one for the
 substitute command ":s".  Each time an empty pattern is given, the previously
 used pattern is used.  However, if there is no previous search command, a
 previous substitute pattern is used, if possible.
@@ -361,8 +361,8 @@ For starters, read chapter 27 of the user manual |usr_27.txt|.
 						*/atom*
 5. An atom can be one of a long list of items.  Many atoms match one character
   in the text.  It is often an ordinary character or a character class.
-   Braces can be used to make a pattern into an atom.  The "\z(\)" construct
-   is only for syntax highlighting.
+   Parentheses can be used to make a pattern into an atom.  The "\z(\)"
+   construct is only for syntax highlighting.

   atom    ::=	    ordinary-atom		|/ordinary-atom|
 		or  \( pattern \)		|/\(|
@@ -394,15 +394,19 @@ the pattern will not match.  This is only useful when debugging Vim.
 ==============================================================================
 3. Magic							*/magic*

-Some characters in the pattern are taken literally.  They match with the same
-character in the text.  When preceded with a backslash however, these
-characters get a special meaning.
+Some characters in the pattern, such as letters, are taken literally.  They
+match exactly the same character in the text.  When preceded with a backslash
+however, these characters may get a special meaning.  For example, "a" matches
+the letter "a", while "\a" matches any alphabetic character.

 Other characters have a special meaning without a backslash.  They need to be
-preceded with a backslash to match literally.
+preceded with a backslash to match literally.  For example "." matches any
+character while "\." matches a dot.

 If a character is taken literally or not depends on the 'magic' option and the
-items mentioned next.
+items in the pattern mentioned next.  The 'magic' option should always be set,
+but it can be switched off for Vi compatibility.  We mention the effect of
+'nomagic' here for completeness, but we recommend against using that.
 							*/\m* */\M*
 Use of "\m" makes the pattern after it be interpreted as if 'magic' is set,
 ignoring the actual value of the 'magic' option.
@@ -411,30 +415,28 @@ Use of "\M" makes the pattern after it be interpreted as if 'nomagic' is used.
 Use of "\v" means that after it, all ASCII characters except '0'-'9', 'a'-'z',
 'A'-'Z' and '_' have special meaning: "very magic"

-Use of "\V" means that after it, only a backslash and terminating character
-(usually / or ?) have special meaning: "very nomagic"
+Use of "\V" means that after it, only a backslash and the terminating
+character (usually / or ?) have special meaning: "very nomagic"

 Examples:
 after:	  \v	   \m	    \M	     \V		matches ~
 		'magic' 'nomagic'
-	  $	   $	    $	     \$		matches end-of-line
-	  .	   .	    \.	     \.		matches any character
+	  a	   a	    a	     a		literal 'a'
+	  \a	   \a	    \a	     \a		any alphabetic character
+	  .	   .	    \.	     \.		any character
+	  \.	   \.	    .	     .		literal dot
+	  $	   $	    $	     \$		end-of-line
 	  *	   *	    \*	     \*		any number of the previous atom
 	  ~	   ~	    \~	     \~		latest substitute string
-	  ()	   \(\)     \(\)     \(\)	grouping into an atom
-	  |	   \|	    \|	     \|		separating alternatives
-	  \a	   \a	    \a	     \a		alphabetic character
+	  ()	   \(\)     \(\)     \(\)	group as an atom
+	  |	   \|	    \|	     \|		nothing: separates alternatives
 	  \\	   \\	    \\	     \\		literal backslash
-	  \.	   \.	    .	     .		literal dot
-	  \{	   {	    {	     {		literal '{'
-	  a	   a	    a	     a		literal 'a'
+	  \{	   {	    {	     {		literal curly brace

 {only Vim supports \m, \M, \v and \V}

-It is recommended to always keep the 'magic' option at the default setting,
-which is 'magic'.  This avoids portability problems.  To make a pattern immune
-to the 'magic' option being set or not, put "\m" or "\M" at the start of the
-pattern.
+If you want to you can make a pattern immune to the 'magic' option being set
+or not by putting "\m" or "\M" at the start of the pattern.

 ==============================================================================
 4. Overview of pattern items				*pattern-overview*
@@ -676,7 +678,7 @@ overview.

 	Note that using "\&" works the same as using "\@=": "foo\&.." is the
 	same as "\(foo\)\@=..".  But using "\&" is easier, you don't need the
-	braces.
+	parentheses.


 							*/\@!*
@@ -797,11 +799,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 +815,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
-	end-of-line.  Use "a\nb" instead |/\n|.
+	pattern, but not inside [].  Note that "a\_$b" never matches, since
+	"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 +844,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
-	next char is the first char of the whole match. |/zero-width|
+\zs	Matches at any position, but not inside [], and sets the start of the
+	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 +857,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
-	previous char is the last char of the whole match. |/zero-width|
+\ze	Matches at any position, but not inside [], and sets the end of the
+	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 +945,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 +1000,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*
@@ -1065,8 +1071,8 @@ x	A single character, with no special meaning, matches itself

 []	(with 'nomagic': \[])		*/[]* */\[]* */\_[]* */collection*
 \_[]
-	A collection.  This is a sequence of characters enclosed in brackets.
-	It matches any single character in the collection.
+	A collection.  This is a sequence of characters enclosed in square
+	brackets.  It matches any single character in the collection.
 	Example		matches ~
 	[xyz]		any 'x', 'y' or 'z'
 	[a-zA-Z]$	any alphabetic character at the end of a line
@@ -1125,15 +1131,16 @@ x	A single character, with no special meaning, matches itself
 *[:ident:]*	  [:ident:]		identifier character (same as "\i")
 *[:keyword:]*	  [:keyword:]		keyword character (same as "\k")
 *[:fname:]*	  [:fname:]		file name character (same as "\f")
-	  The brackets in character class expressions are additional to the
-	  brackets delimiting a collection.  For example, the following is a
-	  plausible pattern for a UNIX filename: "[-./[:alnum:]_~]\+" That is,
-	  a list of at least one character, each of which is either '-', '.',
-	  '/', alphabetic, numeric, '_' or '~'.
+	  The square brackets in character class expressions are additional to
+	  the square brackets delimiting a collection.  For example, the
+	  following is a plausible pattern for a UNIX filename:
+	  "[-./[:alnum:]_~]\+".  That is, a list of at least one character,
+	  each of which is either '-', '.', '/', alphabetic, numeric, '_' or
+	  '~'.
 	  These items only work for 8-bit characters, except [:lower:] and
-	  [:upper:] also work for 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
@@ -1172,7 +1179,7 @@ x	A single character, with no special meaning, matches itself
 		\b	<BS>
 		\n	line break, see above |/[\n]|
 		\d123	decimal number of character
-		\o40	octal number of character up to 0377
+		\o40	octal number of character up to 0o377
 		\x20	hexadecimal number of character up to 0xff
 		\u20AC	hex. number of multibyte character up to 0xffff
 		\U1234	hex. number of multibyte character up to 0xffffffff
@@ -1210,7 +1217,8 @@ x	A single character, with no special meaning, matches itself
 \%d123	Matches the character specified with a decimal number.  Must be
 	followed by a non-digit.
 \%o40	Matches the character specified with an octal number up to 0377.
-	Numbers below 040 must be followed by a non-octal digit or a non-digit.
+	Numbers below 0o40 must be followed by a non-octal digit or a
+	non-digit.
 \%x2a	Matches the character specified with up to two hexadecimal characters.
 \%u20AC	Matches the character specified with up to four hexadecimal
 	characters.
@@ -1257,8 +1265,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*
-Patterns will also work with multi-byte characters, mostly as you would
+				*pattern-multi-byte* *pattern-multibyte*
+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.

@@ -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
@@ -154,4 +154,4 @@ Copyright: Copyright (C) 2005-2015 Charles E Campbell	 *zip-copyright*
   v1 Sep 15, 2005 * Initial release, had browsing, reading, and writing

 ==============================================================================
-vim:tw=78:ts=8:noet:ft=help:fdm=marker
+vim:tw=78:ts=8:ft=help:noet:norl:fdm=marker
@@ -1,4 +1,4 @@
-*popup.txt*  For Vim version 8.2.  Last change: 2020 Jul 27
+*popup.txt*  For Vim version 8.2.  Last change: 2021 Feb 21


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -101,7 +101,7 @@ CLOSING THE POPUP WINDOW				*popup-close*

 Normally the plugin that created the popup window is also in charge of closing
 it.  If somehow a popup hangs around, you can close all of them with: >
-	call popup_clear()
+	call popup_clear(1)
 Some popups, such as notifications, close after a specified time.  This can be
 set with the "time" property on `popup_create()`.
 Otherwise, a popup can be closed by clicking on the X in the top-right corner
@@ -309,11 +309,12 @@ popup_dialog({what}, {options})				*popup_dialog()*

 popup_filter_menu({id}, {key})				*popup_filter_menu()*
 		Filter that can be used for a popup. These keys can be used:
-		    j <Down>		select item below
-		    k <Up>		select item above
+		    j <Down> <C-N>	select item below
+		    k <Up> <C-P>	select item above
 		    <Space> <Enter>	accept current selection
 		    x Esc CTRL-C	cancel the menu
 		Other keys are ignored.
+		Always returns |v:true|.

 		A match is set on that line to highlight it, see
 		|popup_menu()|.
@@ -587,8 +588,6 @@ properties.  It is in one of four forms:

 If you want to create a new buffer yourself use |bufadd()| and pass the buffer
 number to popup_create().
-It is not possible to use the buffer of a terminal window. *E278*  You CAN
-create a hidden terminal buffer and use that one in a popup window.

 The second argument of |popup_create()| is a dictionary with options:
 	line		Screen line where to position the popup.  Can use a
@@ -621,7 +620,8 @@ The second argument of |popup_create()| is a dictionary with options:
 			property moves.  Use an empty string to remove.  See
 			|popup-textprop-pos|.
 	textpropwin	What window to search for the text property.  When
-			omitted or invalid the current window is used.
+			omitted or invalid the current window is used.  Used
+			when "textprop" is present.
 	textpropid	Used to identify the text property when "textprop" is
 			present. Use zero to reset.
 	fixed		When FALSE (the default), and:
@@ -693,8 +693,8 @@ The second argument of |popup_create()| is a dictionary with options:
 			the left.
 	border		List with numbers, defining the border thickness
 			above/right/below/left of the popup (similar to CSS).
-			Only values of zero and non-zero are recognized.
-			An empty list uses a border all around.
+			Only values of zero and non-zero are currently
+			recognized.  An empty list uses a border all around.
 	borderhighlight	List of highlight group names to use for the border.
 			When one entry it is used for all borders, otherwise
 			the highlight for the top/right/bottom/left border.
@@ -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
@@ -742,10 +742,10 @@ The second argument of |popup_create()| is a dictionary with options:
 			line or to another window.
 	mousemoved	Like "moved" but referring to the mouse pointer
 			position
-	cursorline	non-zero: Highlight the cursor line. Also scrolls the
-				  text to show this line (only works properly
-				  when 'wrap' is off).
-			zero: 	  Do not highlight the cursor line.
+	cursorline	TRUE:	 Highlight the cursor line. Also scrolls the
+				 text to show this line (only works properly
+				 when 'wrap' is off).
+			zero: 	 Do not highlight the cursor line.
 			Default is zero, except for |popup_menu()|.
 	filter		A callback that can filter typed characters, see
 			|popup-filter|.
@@ -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*

@@ -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',
@@ -1,4 +1,4 @@
-*quickfix.txt*  For Vim version 8.2.  Last change: 2020 May 31
+*quickfix.txt*  For Vim version 8.2.  Last change: 2021 Feb 05


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1025,6 +1025,12 @@ commands can be combined to create a NewGrep command: >
 			'smartcase' is not used.
 			If {pattern} is empty (e.g. // is specified), the last
 			used search pattern is used. |last-pattern|
+
+			|QuickFixCmdPre| and |QuickFixCmdPost| are triggered.
+			A file that is opened for matching may use a buffer
+			number, but it is reused if possible to avoid
+			consuming buffer numbers.
+
 :{count}vim[grep] ...
 			When a number is put before the command this is used
 			as the maximum number of matches to find.  Use
@@ -1705,7 +1711,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 +1944,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
@@ -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
@@ -698,7 +698,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'
@@ -732,7 +732,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
--- a/Show More
+++ b/Show More