iTerm2 PSMTabBarControl

https://github.com/gnachman/iTerm2/tree/master/ThirdParty/PSMTabBarControl
2026-06-02 11:19:22 +02:00 · 2016-10-01 23:48:20 -07:00
3012 changed files with 298529 additions and 632514 deletions
@@ -1,21 +0,0 @@
-env:
-  CIRRUS_CLONE_DEPTH: 3
-  FEATURES: huge
-
-freebsd_12_task:
-  only_if: $CIRRUS_TAG == ''
-  timeout_in: 20m
-  freebsd_instance:
-    image: freebsd-12-1-release-amd64
-  install_script:
-    pkg install -y gettext
-  build_script:
-    - NPROC=$(getconf _NPROCESSORS_ONLN)
-    - ./configure --with-features=${FEATURES}
-    - make -j${NPROC}
-  test_script:
-    - src/vim --version
-      # run tests as user "cirrus" instead of root
-    - pw useradd cirrus -m
-    - chown -R cirrus:cirrus .
-    - sudo -u cirrus make test
@@ -1,6 +0,0 @@
-coverage:
-  range: "80...100"
-  status:
-    project:
-      default:
-        threshold: 0.05%
@@ -1 +0,0 @@
-service_name: github-actions
@@ -1 +0,0 @@
-src/testdir/test42.in diff
@@ -1,208 +0,0 @@
-# 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/desktop.vim		@e-kwsm
-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/groff.vim		@jmarshall
-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/maple.vim		@cecamp
-runtime/syntax/markdown.vim		@tpope
-runtime/syntax/netrw.vim		@cecamp
-runtime/syntax/nroff.vim		@jmarshall
-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/sshconfig.vim		@Jakuje
-runtime/syntax/sshdconfig.vim		@Jakuje
-runtime/syntax/sudoers.vim		@e-kwsm
-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
@@ -1 +0,0 @@
-custom: https://www.vim.org/sponsor/index.php
@@ -1,34 +0,0 @@
---
-name: Bug report
-about: Create a report to help us improve Vim
-title: ''
-labels: ''
-
---
-
-_Instructions: Replace the template text and remove irrelevant text (including this line)_
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-(Issues related to the runtime files should be reported to their maintainer, check the file header.)
-
-**To Reproduce**
-Detailed steps to reproduce the behavior:
-1. Run `vim --clean` (or `gvim --clean`, etc.)
-2. Edit `filename`
-3. Type '....'
-4. Describe the error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, copy/paste the text or add screenshots to help explain your problem.
-
-**Environment (please complete the following information):**
- - Vim version [e.g. 8.1.1234] (Or paste the result of `vim --version`.)
- - OS: [e.g. Ubuntu 18.04, Windows 10 1809, macOS 10.14]
- - Terminal: [e.g. GNOME Terminal, mintty, iTerm2, tmux, GNU screen] (Use GUI if you use the GUI.)
-
-**Additional context**
-Add any other context about the problem here.
@@ -1,22 +0,0 @@
---
-name: Feature request
-about: Suggest an enhancement for Vim
-title: ''
-labels: enhancement
-
---
-
-_Instructions: Replace the template text and remove irrelevant text (including this line)_
-
-**Is your feature request about something that is currently impossible or hard to do? Please describe the problem.**
-A clear and concise description of what is hard to do. Ex. It is difficult to [...] when [...]
-(If it is related to runtime files, please check their header for where to discuss enhancements.)
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
@@ -1,288 +0,0 @@
-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,62 +0,0 @@
-# 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
@@ -5,18 +5,16 @@ src/xxd/xxd
 src/auto/if_perl.c
 src/auto/gui_gtk_gresources.c
 src/auto/gui_gtk_gresources.h
-src/auto/os_haiku.rdef
-src/objects/.dirstamp
-src/objects
 src/tags
-src/types.vim

 # We do need src/auto/configure.
+src/auto/config.aap
 src/auto/config.cache
 src/auto/config.h
 src/auto/config.log
 src/auto/config.mk
 src/auto/config.status
+src/auto/configure.aap
 src/auto/osdef.h
 src/auto/link.log
 src/auto/link.sed
@@ -27,7 +25,6 @@ src/auto/pathdef.c
 *.idb
 *.manifest
 *.exp
-*.map
 *.obj
 *.pdb
 *.ilk
@@ -35,24 +32,27 @@ src/auto/pathdef.c
 *.suo
 *.res
 *.RES
-vim*.dll
-vim*.lib
-src/dobj*/pathdef.c
-src/gobj*/pathdef.c
-src/obj*/pathdef.c
+src/if_perl.c
+src/pathdef.c
 src/Obj*/pathdef.c
 gvimext.dll
 gvimext.lib
-gvim.lib
 runtime/doc/uganda.nsis.txt
-nsis/icons/*
+
+# Borland C++
+bcc.cfg
+*.ilc
+*.ild
+*.ilf
+*.ils
+*.map
+*.tds

 # NetBeans
 nbproject/*

 # Mac OSX
 src/xxd/xxd.dSYM
-.DS_Store

 # All platforms
 *.rej
@@ -66,7 +66,6 @@ src/po/vim.pot

 # Generated by "make test"
 src/po/*.ck
-src/po/*.desktop
 src/testdir/mbyte.vim
 src/testdir/mzscheme.vim
 src/testdir/lua.vim
@@ -78,13 +77,9 @@ src/testdir/test.log
 src/testdir/dostmp/*
 src/testdir/messages
 src/testdir/viminfo
-src/testdir/opt_test.vim
-runtime/indent/testdir/*.out
-runtime/indent/testdir/*.fail
 src/memfile_test
 src/json_test
 src/message_test
-src/kword_test

 # From MacVim
 .*.swp
@@ -136,17 +131,3 @@ src/tags
 src/xxd/xxd
 src/xxd/xxd.dSYM
 src/a.out.dSYM
-
-# Generated by "make install"
-runtime/doc/tags
-runtime/doc/doctags
-
-# Generated by "make shadow".  The directory names could be anything but we
-# restrict them to shadow (the default) or shadow-*
-src/shadow
-src/shadow-*
-src/runtime
-src/pixmaps
-
-# other possible files build by tools
-src/cscope.out
@@ -1,100 +0,0 @@
-syntax: glob
-
-# Unixen: object and executable files.
-*.o
-src/vim
-src/xxd/xxd
-src/auto/if_perl.c
-src/auto/gui_gtk_gresources.c
-src/auto/gui_gtk_gresources.h
-src/objects/.dirstamp
-src/objects
-src/tags
-src/types.vim
-
-# We do need src/auto/configure.
-src/auto/config.cache
-src/auto/config.h
-src/auto/config.log
-src/auto/config.mk
-src/auto/config.status
-src/auto/osdef.h
-src/auto/link.log
-src/auto/link.sed
-src/auto/pathdef.c
-
-# Windows
-*.exe
-*.idb
-*.manifest
-*.exp
-*.map
-*.obj
-*.pdb
-*.ilk
-*.sln
-*.suo
-*.res
-*.RES
-vim*.dll
-vim*.lib
-src/dobj*/pathdef.c
-src/gobj*/pathdef.c
-src/obj*/pathdef.c
-src/Obj*/pathdef.c
-gvimext.dll
-gvimext.lib
-gvim.lib
-runtime/doc/uganda.nsis.txt
-nsis/icons/*
-
-# NetBeans
-nbproject/*
-
-# Mac OSX
-src/xxd/xxd.dSYM
-
-# All platforms
-*.rej
-*.orig
-*.mo
-*.swp
-*~
-*.pyc
-*.log
-src/po/vim.pot
-
-# Generated by "make test"
-src/po/*.ck
-src/po/*.desktop
-src/testdir/mbyte.vim
-src/testdir/mzscheme.vim
-src/testdir/lua.vim
-src/testdir/small.vim
-src/testdir/tiny.vim
-src/testdir/test*.out
-src/testdir/test*.failed
-src/testdir/test.log
-src/testdir/dostmp/*
-src/testdir/messages
-src/testdir/viminfo
-src/testdir/opt_test.vim
-runtime/indent/testdir/*.out
-src/memfile_test
-src/json_test
-src/message_test
-src/kword_test
-
-# Generated by "make install"
-runtime/doc/tags
-runtime/doc/doctags
-
-# Generated by "make shadow".  The directory names could be anything but we
-# restrict them to shadow (the default) or shadow-*
-src/shadow
-src/shadow-*
-src/runtime
-src/pixmaps
-
-# other possible files build by tools
-src/cscope.out
@@ -1,4 +0,0 @@
-# Format of this file: https://lgtm.com/help/lgtm/lgtm.yml-configuration-file
-path_classifiers:
-  documentation:
-    - runtime/tutor/tutor*
@@ -1,135 +1,61 @@
 language: c

-os: osx
+os:
+  - osx

-compiler: clang
+osx_image: xcode8
+
+compiler:
+  - clang

 env:
-  global:
-    - MACOSX_DEPLOYMENT_TARGET=10.9
-      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_ruby=/usr/local/opt/ruby/lib/libruby.dylib
-      VIMCMD=src/MacVim/build/Release/MacVim.app/Contents/MacOS/Vim
-      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
+  - MACOSX_DEPLOYMENT_TARGET=10.8
+    VERSIONER_PERL_VERSION=5.16
+    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_dll_name_perl=/System/Library/Perl/5.16/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.5/Python
+    VIMCMD=src/MacVim/build/Release/MacVim.app/Contents/MacOS/Vim
+    "CONFOPT='--with-features=huge --enable-multibyte --enable-netbeans --with-tlib=ncurses --enable-cscope --enable-perlinterp=dynamic --enable-pythoninterp=dynamic --enable-python3interp=dynamic --enable-rubyinterp=dynamic --enable-luainterp=dynamic --with-lua-prefix=/usr/local --enable-gui=macvim'"

-_anchors:
-  - &lang_env
-    env:
-      - LANGOPT="--enable-perlinterp=dynamic --enable-pythoninterp=dynamic --enable-python3interp=dynamic --enable-rubyinterp=dynamic --enable-luainterp=dynamic --with-lua-prefix=/usr/local"
-        HAS_GETTEXT=1
-  - &homebrew
-    addons:
-      homebrew:
-        packages:
-          - gettext
-          - lua
-          - python
-          - ruby
-        update: true
-  - &caches
-    cache:
-      directories:
-        - /usr/local/Homebrew/Library/Homebrew/vendor/
-        - /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/
-        - ${TRAVIS_BUILD_DIR}/src/MacVim/build/Release/MacVim.app/
+sudo: false
+
+before_install:
+  - brew update || brew update
+  - brew install python3
+  - brew install lua

 script:
-  - set -o errexit
-  - echo -e "\\033[33;1mConfiguring MacVim\\033[0m" && echo -en "travis_fold:start:configure\\r\\033[0K"
  - NPROC=$(getconf _NPROCESSORS_ONLN)
-  - make distclean
-  - ./configure ${CONFOPT} ${LANGOPT} --enable-fail-if-missing
-  - sed -i.bak -f ci/config.mk.sed -f ci/config.mk.clang.sed src/auto/config.mk
-  # 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
+  - ./configure $CONFOPT --enable-fail-if-missing
  - cat src/auto/config.mk
-  - cat src/auto/config.h
-  - |
-    if [[ -n "${LANGOPT}" ]]; then
-      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
-    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"
-  - ${VIMCMD} --version
-  # 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() {
-      ${VIMCMD} -u NONE -i NONE -g -f -X -V1 -es "$@" -c 'echo ""' -c 'qall!' 2>&1
-    }
-  - 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 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"
+  - 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
+  - make -j$NPROC
+  - rm -f result; $VIMCMD -g -f -c "redir>result" -c "lua print(\"Test\")" -c "redir END" -c q; cat result; echo; grep -q -w Test result
+  - rm -f result; $VIMCMD -g -f -c "redir>result" -c "perl VIM::Msg(\"Test\")" -c "redir END" -c q; cat result; echo; grep -q -w Test result
+  - rm -f result; $VIMCMD -g -f -c "redir>result" -c "py import sys; print(\"Test\")" -c "redir END" -c q; cat result; echo; grep -q -w Test result
+  - rm -f result; $VIMCMD -g -f -c "redir>result" -c "py3 import sys; print(\"Test\")" -c "redir END" -c q; cat result; echo; grep -q -w Test result
+  - rm -f result; $VIMCMD -g -f -c "redir>result" -c "ruby puts(\"Test\")" -c "redir END" -c q; cat result; echo; grep -q -w Test result
  - 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"
-  - echo -e "\\033[33;1mTesting MacVim (GUI)\\033[0m" && echo -en "travis_fold:start:test_gui\\r\\033[0K"
  - make -C src/testdir clean
  - make -C src testgui
-  - echo -en "travis_fold:end:test_gui\\r\\033[0K"

-jobs:
-  include:
-    - osx_image: xcode12.2
-      <<: *lang_env
-      <<: *homebrew
-      <<: *caches
-    # 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: xcode12.2
-      <<: *lang_env
-      <<: *caches
-      script: skip
-      before_deploy:
-        # 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:
-          secure: ukjm+qbuNiTli25Ut2BoVpeBCV+JyVbRUwPqjTKrJxfHz34bpr38eSbryIB8BgKBItgzE876Yoqa3CD0k8mqGClis1+98MtrYFpAkO97juJmHpcZZZB7ausbHGf7Z7VdMT4jBjjVGcBeaNj0mio0hwem0/S4WyJK3M/3Fym995CltCUtJKRfMvRiGkWZqUs8K7EZf53DFR6CXUn38rq/3B88SeK51OZuCkMsiDWLGYCdayH19vJfFrTF8MYMQYDYxz16Q/Kf21PVhwia7HEhOzqnXS8RXS+vLkZw8mzIxowX+w6NT90q7Sj0ENdR7YaS27QPfDdhZEnOgpgqj+za63lpiyIdRcgSBkGxNYrM6B5KhiwC1VocBxCBdCxT5WXlx9rA9+k4CASdsxAW/MtQOK6PRMfZEnAB+ShFvshM2H/iE5Jch+o/SIjCXhdkeASD5qov2x6eXcsEVu8PIxvEUptCpHeqJTN5/26nfKsvOdrsqbwJbDluwISOKfEPhohb8Hn7JqOJNTS2aJr3jfvU+egE1NS0eLqKPXecu7MOOsOq1CQL6WxblphG2JCCmAOuNMYrJx9+w28ekMDRDAbI9r5nWcPLZtBqjFUyuBXXM7UknMar0FZ2fd7YTi/Gki3n56UN0lKaSAKaJB9EXlneDSKp/1ogsETr9/b7jz0s6lI=
-        file: src/MacVim/build/Release/MacVim.dmg
-        skip_cleanup: true
-        draft: true
-        on:
-          all_branches: true
-          tags: true
-          repo: macvim-dev/macvim
+before_deploy:
+  - make -C src macvim-dmg
+deploy:
+  provider: releases
+  api_key:
+    secure: HYHKVbuSG2Trc5zEN+aQO0TO/020qtTokoaaatd9GhQ/ImOI2uhOuVsk47mcViCINyE9+wwVEr23Tk7GqzsJBS66FoZJeOsgYoO/LFlQjCYyya+48Ajez6I2VAIGKn0JD6jpW+ZYIX7MAWLCQKv/vW03MrBMDLZvjB89pHe72MLQFlVcEzxsWnr7smTzLcuKShkV+AVZopE/HRdY1k/zjWf/TzcJgqXwThuJOPYY+CcGUv1CMJjWB8pBuH31pbQ2AVOXV7VG5oxy2HSbCeDRShKT3GooecWj7xjh9SApNqEIzC44RlufgyC73M0DeILUasmbF0g2Q+AsDaj3+9w3LbLbmfpV5kEM9E/PbzWEn+0EgRKV+HCscZnPMlzkiVWKnjzfwKGMOmTwD0aN4Bt6Y9z+UvQKfsQN+6wHmh7xcSpaeR1J6PBeaCd+QyhD7t9ZxP2qmZWCBMFpnkqO4+LoclJNV+IxYstNFjaKIvxEe/S9GM2w+i2cSDDrxSNz+kUGWzshyu6HXxRtrNo+qM6sCO8TiOMMALPAkLCJT2P/TPMRkdy2wjCDwprc1ePDqikIHIGGwQ8Csd5IqFUcJs405xw4HfVkOuhWL/SpLuI6OHOVQqAkqMEMaEhlfh1swFNkT4ffDJGzvklB8v2980B003eWbcHr6lMGtpqQecqgS9A=
+  file: src/MacVim/build/Release/MacVim.dmg
+  skip_cleanup: true
+  on:
+    all_branches: true
+    tags: true
+    repo: macvim-dev/macvim

 # vim:set sts=2 sw=2 tw=0 et:
@@ -4,23 +4,14 @@ Patches are welcome in whatever form.
 Discussions about patches happen on the vim-dev maillist.
 If you create a pull request on GitHub it will be
 forwarded to the vim-dev maillist.  You can also send your patch there
-directly.  In that case an attachment with a unified diff format is preferred.
+directly.  An attachment with a unified diff format is preferred.
 Information about the maillist can be found [on the Vim website].

 [on the Vim website]: http://www.vim.org/maillist.php#vim-dev

-A pull request has the advantage that it will trigger the Continuous
-Integration tests, you will be warned of problems (you can ignore the coverage
-warning, it's noisy).
-
-Please consider adding a test.  All new functionality should be tested and bug
-fixes should be tested for regressions: the test should fail before the fix and
-pass after the fix.  Look through recent patches for examples and find help
-with ":help testing".  The tests are located under "src/testdir".
-
-Contributions will be distributed with Vim under the Vim license.  Providing a
-change to be included implies that you agree with this and your contribution
-does not cause us trouble with trademarks or patents.  There is no CLA to sign.
+Please consider adding a test.  Test coverage isn't very good yet, this needs
+to improve.  Look through recent patches for examples.  The tests are located
+under "src/testdir".


 # Reporting issues
@@ -30,9 +21,9 @@ maillist is also fine.

 Please use the GitHub issues only for actual issues. If you are not 100% sure
 that your problem is a Vim issue, please first discuss this on the Vim user
-maillist.  Try reproducing the problem without any of your plugins or settings:
+maillist.  Try reproducing the problem without any plugins or settings:

-    vim --clean
+    vim -N -u NONE

 If you report an issue, please describe exactly how to reproduce it.
 For example, don't say "insert some text" but say what you did exactly:
@@ -60,28 +51,4 @@ Look in the header of the file for the name and email address.
 The maintainer will take care of issues and send updates to Bram for 
 distribution with Vim.

-If the maintainer does not respond, contact the vim-dev maillist.
-
-
-# Translations
-
-Translations of this CONTRIBUTING file:
-[Korean](https://github.com/cjw1359/opensource/blob/master/Vim/CONTRIBUTING_ko.md)
-
-Translating messages and runtime files is very much appreciated!  These things
-can be translated:
-*   Messages in Vim, see [src/po/README.txt][1]
-    Also used for the desktop icons.
-*   Menus, see [runtime/lang/README.txt][2]
-*   Vim tutor, see [runtime/tutor/README.txt][3]
-*   Manual pages, see [runtime/doc/\*.1][4] for examples
-*   Installer, see [nsis/lang/\*.nsi][5] for examples
-
-The help files can be translated and made available separately.
-See https://www.vim.org/translations.php for examples.
-
-[1]: https://github.com/vim/vim/blob/master/src/po/README.txt
-[2]: https://github.com/vim/vim/blob/master/runtime/lang/README.txt
-[3]: https://github.com/vim/vim/blob/master/runtime/tutor/README.txt
-[4]: https://github.com/vim/vim/blob/master/runtime/doc/vim.1
-[5]: https://github.com/vim/vim/blob/master/nsis/lang/english.nsi
+If the maintainer does not react, contact the vim-dev maillist.
@@ -1,97 +1,55 @@
 # List of distributed Vim files.
-# Used by Makefile.
+# Used by Makefile and upload.aap.

 # source files for all source archives
 SRC_ALL =	\
-		.cirrus.yml \
-		.coveralls.yml \
-		.gitattributes \
-		.github/CODEOWNERS \
-		.github/workflows/ci.yml \
-		.github/workflows/codeql-analysis.yml \
-		.gitignore \
 		.hgignore \
-		.lgtm.yml \
 		.travis.yml \
-		.appveyor.yml \
-		.codecov.yml \
-		ci/appveyor.bat \
-		ci/build-snd-dummy.sh \
-		ci/config.mk*.sed \
-		ci/if_ver*.vim \
-		ci/load-snd-dummy.sh \
-		ci/setup-xvfb.sh \
-		src/Make_all.mak \
-		src/README.md \
+		appveyor.yml \
+		src/appveyor.bat \
+		src/README.txt \
 		src/alloc.h \
 		src/arabic.c \
-		src/arglist.c \
+		src/arabic.h \
 		src/ascii.h \
-		src/autocmd.c \
-		src/beval.c \
-		src/beval.h \
-		src/blob.c \
 		src/blowfish.c \
 		src/buffer.c \
-		src/bufwrite.c \
-		src/change.c \
 		src/channel.c \
 		src/charset.c \
-		src/cindent.c \
-		src/clientserver.c \
-		src/clipboard.c \
-		src/cmdexpand.c \
-		src/cmdhist.c \
 		src/crypt.c \
 		src/crypt_zip.c \
-		src/debugger.c \
 		src/dict.c \
 		src/diff.c \
 		src/digraph.c \
-		src/drawline.c \
-		src/drawscreen.c \
 		src/edit.c \
-		src/errors.h \
 		src/eval.c \
-		src/evalbuffer.c \
 		src/evalfunc.c \
-		src/evalvars.c \
-		src/evalwindow.c \
-		src/ex_cmdidxs.h \
 		src/ex_cmds.c \
 		src/ex_cmds.h \
 		src/ex_cmds2.c \
 		src/ex_docmd.c \
 		src/ex_eval.c \
 		src/ex_getln.c \
+		src/farsi.c \
+		src/farsi.h \
 		src/feature.h \
 		src/fileio.c \
-		src/filepath.c \
-		src/findfile.c \
 		src/fold.c \
 		src/getchar.c \
 		src/globals.h \
 		src/gui.c \
 		src/gui.h \
 		src/gui_beval.c \
+		src/gui_beval.h \
 		src/hardcopy.c \
 		src/hashtab.c \
-		src/help.c \
-		src/highlight.c \
-		src/indent.c \
-		src/insexpand.c \
-		src/job.c \
 		src/json.c \
 		src/json_test.c \
-		src/kword_test.c \
 		src/list.c \
-		src/locale.c \
 		src/keymap.h \
 		src/macros.h \
 		src/main.c \
-		src/map.c \
 		src/mark.c \
-		src/match.c \
 		src/mbyte.c \
 		src/memfile.c \
 		src/memfile_test.c \
@@ -101,7 +59,6 @@ SRC_ALL =	\
 		src/message_test.c \
 		src/misc1.c \
 		src/misc2.c \
-		src/mouse.c \
 		src/move.c \
 		src/mysign \
 		src/nbdebug.c \
@@ -111,82 +68,48 @@ SRC_ALL =	\
 		src/ops.c \
 		src/option.c \
 		src/option.h \
-		src/optiondefs.h \
-		src/optionstr.c \
-		src/popupmenu.c \
-		src/popupwin.c \
-		src/profiler.c \
+		src/popupmnu.c \
 		src/quickfix.c \
 		src/regexp.c \
-		src/regexp_bt.c \
 		src/regexp_nfa.c \
 		src/regexp.h \
-		src/register.c \
-		src/scriptfile.c \
 		src/screen.c \
 		src/search.c \
-		src/session.c \
 		src/sha256.c \
-		src/sign.c \
-		src/sound.c \
+		src/structs.h \
 		src/spell.c \
 		src/spell.h \
 		src/spellfile.c \
-		src/spellsuggest.c \
-		src/structs.h \
 		src/syntax.c \
 		src/tag.c \
 		src/term.c \
-		src/terminal.c \
 		src/term.h \
 		src/termlib.c \
-		src/testing.c \
-		src/textformat.c \
-		src/textobject.c \
-		src/textprop.c \
-		src/time.c \
-		src/typval.c \
 		src/ui.c \
 		src/undo.c \
-		src/usercmd.c \
 		src/userfunc.c \
 		src/version.c \
 		src/version.h \
 		src/vim.h \
-		src/vim9.h \
-		src/vim9compile.c \
-		src/vim9execute.c \
-		src/vim9script.c \
-		src/vim9type.c \
-		src/viminfo.c \
 		src/winclip.c \
 		src/window.c \
 		src/tee/tee.c \
 		src/xxd/xxd.c \
-		src/testdir/gen_opt_test.vim \
+		src/main.aap \
+		src/testdir/main.aap \
 		src/testdir/README.txt \
 		src/testdir/Make_all.mak \
 		src/testdir/*.in \
 		src/testdir/*.py \
-		src/testdir/lsan-suppress.txt \
 		src/testdir/sautest/autoload/*.vim \
-		src/testdir/testluaplugin/lua/testluaplugin/*.lua \
-		src/testdir/check.vim \
-		src/testdir/gui_init.vim \
-		src/testdir/gui_preinit.vim \
-		src/testdir/mouse.vim \
 		src/testdir/runtest.vim \
-		src/testdir/screendump.vim \
-		src/testdir/setup.vim \
-		src/testdir/setup_gui.vim \
 		src/testdir/shared.vim \
-		src/testdir/vim9.vim \
-		src/testdir/script_util.vim \
-		src/testdir/summarize.vim \
-		src/testdir/term_util.vim \
-		src/testdir/view_util.vim \
+		src/testdir/setup.vim \
 		src/testdir/test[0-9]*.ok \
-		src/testdir/test77a.ok \
+		src/testdir/test[0-9]*a.ok \
+		src/testdir/test_[a-z]*.ok \
+		src/testdir/test49.vim \
+		src/testdir/test60.vim \
 		src/testdir/test83-tags? \
 		src/testdir/test77a.com \
 		src/testdir/test_*.vim \
@@ -199,71 +122,40 @@ SRC_ALL =	\
 		src/testdir/pythonx/topmodule/submodule/subsubmodule/subsubsubmodule.py \
 		src/testdir/python_after/*.py \
 		src/testdir/python_before/*.py \
-		src/testdir/pyxfile/*.py \
-		src/testdir/dumps/*.dump \
+		src/testdir/bench*.in \
+		src/testdir/bench*.vim \
 		src/testdir/samples/*.txt \
-		src/testdir/samples/test000 \
-		src/testdir/color_ramp.vim \
-		src/testdir/silent.wav \
-		src/testdir/popupbounce.vim \
 		src/proto.h \
-		src/protodef.h \
 		src/proto/arabic.pro \
-		src/proto/arglist.pro \
-		src/proto/autocmd.pro \
-		src/proto/beval.pro \
-		src/proto/blob.pro \
 		src/proto/blowfish.pro \
 		src/proto/buffer.pro \
-		src/proto/bufwrite.pro \
-		src/proto/change.pro \
 		src/proto/channel.pro \
 		src/proto/charset.pro \
-		src/proto/cindent.pro \
-		src/proto/clientserver.pro \
-		src/proto/clipboard.pro \
-		src/proto/cmdexpand.pro \
-		src/proto/cmdhist.pro \
 		src/proto/crypt.pro \
 		src/proto/crypt_zip.pro \
-		src/proto/debugger.pro \
 		src/proto/dict.pro \
 		src/proto/diff.pro \
 		src/proto/digraph.pro \
-		src/proto/drawline.pro \
-		src/proto/drawscreen.pro \
 		src/proto/edit.pro \
 		src/proto/eval.pro \
-		src/proto/evalbuffer.pro \
 		src/proto/evalfunc.pro \
-		src/proto/evalvars.pro \
-		src/proto/evalwindow.pro \
 		src/proto/ex_cmds.pro \
 		src/proto/ex_cmds2.pro \
 		src/proto/ex_docmd.pro \
 		src/proto/ex_eval.pro \
 		src/proto/ex_getln.pro \
+		src/proto/farsi.pro \
 		src/proto/fileio.pro \
-		src/proto/filepath.pro \
-		src/proto/findfile.pro \
 		src/proto/fold.pro \
 		src/proto/getchar.pro \
 		src/proto/gui.pro \
 		src/proto/gui_beval.pro \
 		src/proto/hardcopy.pro \
 		src/proto/hashtab.pro \
-		src/proto/help.pro \
-		src/proto/highlight.pro \
-		src/proto/indent.pro \
-		src/proto/insexpand.pro \
-		src/proto/job.pro \
 		src/proto/json.pro \
 		src/proto/list.pro \
-		src/proto/locale.pro \
 		src/proto/main.pro \
-		src/proto/map.pro \
 		src/proto/mark.pro \
-		src/proto/match.pro \
 		src/proto/mbyte.pro \
 		src/proto/memfile.pro \
 		src/proto/memline.pro \
@@ -271,140 +163,29 @@ SRC_ALL =	\
 		src/proto/message.pro \
 		src/proto/misc1.pro \
 		src/proto/misc2.pro \
-		src/proto/mouse.pro \
 		src/proto/move.pro \
 		src/proto/netbeans.pro \
 		src/proto/normal.pro \
 		src/proto/ops.pro \
 		src/proto/option.pro \
-		src/proto/optionstr.pro \
-		src/proto/popupmenu.pro \
-		src/proto/popupwin.pro \
-		src/proto/profiler.pro \
+		src/proto/popupmnu.pro \
 		src/proto/quickfix.pro \
 		src/proto/regexp.pro \
-		src/proto/register.pro \
-		src/proto/scriptfile.pro \
 		src/proto/screen.pro \
 		src/proto/search.pro \
-		src/proto/session.pro \
 		src/proto/sha256.pro \
-		src/proto/sign.pro \
-		src/proto/sound.pro \
 		src/proto/spell.pro \
 		src/proto/spellfile.pro \
-		src/proto/spellsuggest.pro \
 		src/proto/syntax.pro \
 		src/proto/tag.pro \
 		src/proto/term.pro \
-		src/proto/terminal.pro \
 		src/proto/termlib.pro \
-		src/proto/testing.pro \
-		src/proto/textformat.pro \
-		src/proto/textobject.pro \
-		src/proto/textprop.pro \
-		src/proto/time.pro \
-		src/proto/typval.pro \
 		src/proto/ui.pro \
 		src/proto/undo.pro \
-		src/proto/usercmd.pro \
 		src/proto/userfunc.pro \
 		src/proto/version.pro \
-		src/proto/vim9compile.pro \
-		src/proto/vim9execute.pro \
-		src/proto/vim9script.pro \
-		src/proto/vim9type.pro \
-		src/proto/viminfo.pro \
 		src/proto/winclip.pro \
 		src/proto/window.pro \
-		src/libvterm/.bzrignore \
-		src/libvterm/.gitignore \
-		src/libvterm/LICENSE \
-		src/libvterm/Makefile \
-		src/libvterm/README \
-		src/libvterm/CONTRIBUTING \
-		src/libvterm/tbl2inc_c.pl \
-		src/libvterm/vterm.pc.in \
-		src/libvterm/doc/URLs \
-		src/libvterm/doc/seqs.txt \
-		src/libvterm/find-wide-chars.pl \
-		src/libvterm/include/vterm.h \
-		src/libvterm/include/vterm_keycodes.h \
-		src/libvterm/src/encoding.c \
-		src/libvterm/src/encoding/DECdrawing.inc \
-		src/libvterm/src/encoding/DECdrawing.tbl \
-		src/libvterm/src/encoding/uk.inc \
-		src/libvterm/src/encoding/uk.tbl \
-		src/libvterm/src/fullwidth.inc \
-		src/libvterm/src/keyboard.c \
-		src/libvterm/src/mouse.c \
-		src/libvterm/src/parser.c \
-		src/libvterm/src/pen.c \
-		src/libvterm/src/rect.h \
-		src/libvterm/src/screen.c \
-		src/libvterm/src/state.c \
-		src/libvterm/src/unicode.c \
-		src/libvterm/src/utf8.h \
-		src/libvterm/src/vterm.c \
-		src/libvterm/src/vterm_internal.h \
-		src/libvterm/t/02parser.test \
-		src/libvterm/t/03encoding_utf8.test \
-		src/libvterm/t/10state_putglyph.test \
-		src/libvterm/t/11state_movecursor.test \
-		src/libvterm/t/12state_scroll.test \
-		src/libvterm/t/13state_edit.test \
-		src/libvterm/t/14state_encoding.test \
-		src/libvterm/t/15state_mode.test \
-		src/libvterm/t/16state_resize.test \
-		src/libvterm/t/17state_mouse.test \
-		src/libvterm/t/18state_termprops.test \
-		src/libvterm/t/20state_wrapping.test \
-		src/libvterm/t/21state_tabstops.test \
-		src/libvterm/t/22state_save.test \
-		src/libvterm/t/25state_input.test \
-		src/libvterm/t/26state_query.test \
-		src/libvterm/t/27state_reset.test \
-		src/libvterm/t/28state_dbl_wh.test \
-		src/libvterm/t/29state_fallback.test \
-		src/libvterm/t/30state_pen.test \
-		src/libvterm/t/31state_rep.test \
-		src/libvterm/t/32state_flow.test \
-		src/libvterm/t/60screen_ascii.test \
-		src/libvterm/t/61screen_unicode.test \
-		src/libvterm/t/62screen_damage.test \
-		src/libvterm/t/63screen_resize.test \
-		src/libvterm/t/64screen_pen.test \
-		src/libvterm/t/65screen_protect.test \
-		src/libvterm/t/66screen_extent.test \
-		src/libvterm/t/67screen_dbl_wh.test \
-		src/libvterm/t/68screen_termprops.test \
-		src/libvterm/t/90vttest_01-movement-1.test \
-		src/libvterm/t/90vttest_01-movement-2.test \
-		src/libvterm/t/90vttest_01-movement-3.test \
-		src/libvterm/t/90vttest_01-movement-4.test \
-		src/libvterm/t/90vttest_02-screen-1.test \
-		src/libvterm/t/90vttest_02-screen-2.test \
-		src/libvterm/t/90vttest_02-screen-3.test \
-		src/libvterm/t/90vttest_02-screen-4.test \
-		src/libvterm/t/92lp1640917.test \
-		src/libvterm/t/harness.c \
-		src/libvterm/t/run-test.pl \
-		src/xdiff/COPYING \
-		src/xdiff/README.txt \
-		src/xdiff/xdiff.h \
-		src/xdiff/xdiffi.c \
-		src/xdiff/xdiffi.h \
-		src/xdiff/xemit.c \
-		src/xdiff/xemit.h \
-		src/xdiff/xhistogram.c \
-		src/xdiff/xinclude.h \
-		src/xdiff/xmacros.h \
-		src/xdiff/xpatience.c \
-		src/xdiff/xprepare.c \
-		src/xdiff/xprepare.h \
-		src/xdiff/xtypes.h \
-		src/xdiff/xutils.c \
-		src/xdiff/xutils.h \


 # source files for Unix only
@@ -421,12 +202,12 @@ SRC_UNIX =	\
 		src/INSTALLx.txt \
 		src/Makefile \
 		src/auto/configure \
+		src/config.aap.in \
 		src/config.h.in \
 		src/config.mk.dist \
 		src/config.mk.in \
 		src/configure \
-		src/configure.ac \
-		src/create_cmdidxs.vim \
+		src/configure.in \
 		src/gui_at_fs.c \
 		src/gui_at_sb.c \
 		src/gui_at_sb.h \
@@ -437,18 +218,20 @@ SRC_UNIX =	\
 		src/gui_gtk_x11.c \
 		src/gui_gtk_res.xml \
 		src/gui_motif.c \
-		src/gui_xim.c \
 		src/gui_xmdlg.c \
 		src/gui_xmebw.c \
 		src/gui_xmebw.h \
 		src/gui_xmebwp.h \
 		src/gui_x11.c \
 		src/gui_x11_pm.h \
+		src/hangulin.c \
 		src/if_xcmdsrv.c \
+		src/integration.c \
+		src/integration.h \
 		src/link.sh \
 		src/installman.sh \
 		src/installml.sh \
-		src/install-sh \
+		src/mkinstalldirs \
 		src/os_unix.c \
 		src/os_unix.h \
 		src/os_unixx.h \
@@ -461,12 +244,13 @@ SRC_UNIX =	\
 		src/proto/gui_gtk_x11.pro \
 		src/proto/gui_gtk_gresources.pro \
 		src/proto/gui_motif.pro \
-		src/proto/gui_xim.pro \
 		src/proto/gui_xmdlg.pro \
 		src/proto/gui_x11.pro \
+		src/proto/hangulin.pro \
 		src/proto/if_xcmdsrv.pro \
 		src/proto/os_unix.pro \
 		src/proto/pty.pro \
+		src/proto/workshop.pro \
 		src/pty.c \
 		src/testdir/Makefile \
 		src/testdir/unix.vim \
@@ -476,6 +260,10 @@ SRC_UNIX =	\
 		src/vimtutor \
 		src/gvimtutor \
 		src/which.sh \
+		src/workshop.c \
+		src/workshop.h \
+		src/wsdebug.c \
+		src/wsdebug.h \
 		src/tee/Makefile \
 		src/xxd/Makefile \

@@ -521,8 +309,11 @@ SRC_DOS =	\
 		src/GvimExt/uninst.bat \
 		README_srcdos.txt \
 		src/INSTALLpc.txt \
+		src/Make_bc5.mak \
 		src/Make_cyg.mak \
 		src/Make_cyg_ming.mak \
+		src/Make_ivc.mak \
+		src/Make_dvc.mak \
 		src/Make_ming.mak \
 		src/Make_mvc.mak \
 		tools/rename.bat \
@@ -531,9 +322,6 @@ SRC_DOS =	\
 		src/msvcsetup.bat \
 		src/msvc2008.bat \
 		src/msvc2010.bat \
-		src/msvc2015.bat \
-		src/msys32.bat \
-		src/msys64.bat \
 		src/dimm.idl \
 		src/dlldata.c \
 		src/dosinst.c \
@@ -564,21 +352,22 @@ SRC_DOS =	\
 		src/testdir/Make_dos.mak \
 		src/testdir/Make_ming.mak \
 		src/testdir/dos.vim \
-		src/uninstall.c \
+		src/uninstal.c \
 		src/vim.def \
 		src/vim.rc \
+		src/vimio.h \
 		src/gvim.exe.mnf \
 		src/vimrun.c \
 		src/xpm_w32.c \
 		src/xpm_w32.h \
 		src/tee/Make_mvc.mak \
+		src/xxd/Make_bc5.mak \
 		src/xxd/Make_ming.mak \
 		src/xxd/Make_mvc.mak \
 		nsis/gvim.nsi \
 		nsis/gvim_version.nsh \
 		nsis/README.txt \
-		nsis/lang/*.nsi \
-		uninstall.txt \
+		uninstal.txt \
 		src/VisVim/Commands.cpp \
 		src/VisVim/Commands.h \
 		src/VisVim/DSAddIn.cpp \
@@ -609,15 +398,15 @@ SRC_DOS_BIN =	\
 		src/vim.tlb \
 		src/xpm/COPYRIGHT \
 		src/xpm/README.txt \
-		src/xpm/arm64/lib-vc14/libXpm.lib \
 		src/xpm/include/*.h \
-		src/xpm/x64/lib-vc14/libXpm.lib \
 		src/xpm/x64/lib/libXpm.a \
 		src/xpm/x64/lib/libXpm.lib \
-		src/xpm/x86/lib-vc14/libXpm.lib \
+		src/xpm/x64/lib-vc14/libXpm.lib \
 		src/xpm/x86/lib/libXpm.a \
 		src/xpm/x86/lib/libXpm.lib \
-		nsis/icons.zip \
+		src/xpm/x86/lib-vc14/libXpm.lib \
+		nsis/icons/*.bmp \
+		nsis/icons/*.ico \

 # source files for Amiga, DOS, etc. (also in the extra archive)
 SRC_AMI_DOS =	\
@@ -628,7 +417,10 @@ SRC_AMI =	\
 		README_amisrc.txt.info \
 		src.info \
 		src/INSTALLami.txt \
-		src/Make_ami.mak \
+		src/Make_dice.mak \
+		src/Make_manx.mak \
+		src/Make_morph.mak \
+		src/Make_sas.mak \
 		src/os_amiga.c \
 		src/os_amiga.h \
 		src/proto/os_amiga.pro \
@@ -636,24 +428,17 @@ SRC_AMI =	\
 		src/testdir/amiga.vim \
 		src/xxd/Make_amiga.mak \

-# source files for Haiku (also in the extra archive)
-SRC_HAIKU =	\
-		README_haiku.txt \
-		src/os_haiku.h \
-		src/os_haiku.rdef.in \
-		src/gui_haiku.cc \
-		src/gui_haiku.h \
-		src/proto/gui_haiku.pro \
-
 # source files for the Mac (also in the extra archive)
 SRC_MAC =	\
 		src/INSTALLmac.txt \
 		src/dehqx.py \
+		src/gui_mac.c \
 		src/os_mac_rsrc/*.icns \
 		src/os_mac.h \
 		src/os_mac.rsr.hqx \
 		src/os_mac_conv.c \
 		src/os_macosx.m \
+		src/proto/gui_mac.pro \
 		src/proto/os_mac_conv.pro \

 # source files for VMS (in the extra archive)
@@ -678,19 +463,25 @@ SRC_QNX =	\
 		src/proto/gui_photon.pro \
 		src/proto/os_qnx.pro \

+
 # source files for the extra archive (all sources that are not for Unix)
 SRC_EXTRA =	\
 		$(SRC_AMI) \
 		$(SRC_AMI_DOS) \
 		$(SRC_DOS) \
 		$(SRC_DOS_BIN) \
-		$(SRC_HAIKU) \
 		$(SRC_MAC) \
 		$(SRC_QNX) \
 		$(SRC_VMS) \
 		README_os390.txt \
+		src/Make_mint.mak \
 		src/infplist.xml \
 		src/link.390 \
+		src/os_beos.c \
+		src/os_beos.h \
+		src/os_beos.rsrc \
+		src/proto/os_beos.pro \
+		src/os_mint.h \
 		src/os_vms_fix.com \
 		src/toolbar.phi \

@@ -698,8 +489,6 @@ SRC_EXTRA =	\
 RT_ALL =	\
 		README.txt \
 		README.md \
-		README_VIM9.md \
-		LICENSE \
 		CONTRIBUTING.md \
 		runtime/bugreport.vim \
 		runtime/doc/*.awk \
@@ -707,8 +496,6 @@ RT_ALL =	\
 		runtime/doc/*.txt \
 		runtime/doc/Makefile \
 		runtime/doc/doctags.c \
-		runtime/doc/doctags.vim \
-		runtime/doc/test_urls.vim \
 		runtime/doc/vim.1 \
 		runtime/doc/evim.1 \
 		runtime/doc/vimdiff.1 \
@@ -730,6 +517,7 @@ RT_ALL =	\
 		runtime/macros/matchit.vim \
 		runtime/macros/maze/README.txt \
 		runtime/macros/maze/[mM]akefile \
+		runtime/macros/maze/main.aap \
 		runtime/macros/maze/maze.c \
 		runtime/macros/maze/maze_5.78 \
 		runtime/macros/maze/maze_mac \
@@ -757,7 +545,6 @@ RT_ALL =	\
 		runtime/tutor/tutor \
 		runtime/tutor/tutor.vim \
 		runtime/vimrc_example.vim \
-		runtime/pack/dist/opt/cfilter/plugin/cfilter.vim \
 		runtime/pack/dist/opt/dvorak/plugin/dvorak.vim \
 		runtime/pack/dist/opt/dvorak/dvorak/enable.vim \
 		runtime/pack/dist/opt/dvorak/dvorak/disable.vim \
@@ -766,10 +553,8 @@ RT_ALL =	\
 		runtime/pack/dist/opt/matchit/plugin/matchit.vim \
 		runtime/pack/dist/opt/matchit/doc/matchit.txt \
 		runtime/pack/dist/opt/matchit/doc/tags \
-		runtime/pack/dist/opt/matchit/autoload/*.vim \
 		runtime/pack/dist/opt/shellmenu/plugin/shellmenu.vim \
 		runtime/pack/dist/opt/swapmouse/plugin/swapmouse.vim \
-		runtime/pack/dist/opt/termdebug/plugin/termdebug.vim \

 # runtime files for all distributions without CR-NL translation
 RT_ALL_BIN =	\
@@ -787,20 +572,13 @@ RT_SCRIPTS =	\
 		runtime/makemenu.vim \
 		runtime/autoload/*.vim \
 		runtime/autoload/README.txt \
-		runtime/autoload/dist/*.vim \
 		runtime/autoload/xml/*.vim \
 		runtime/colors/*.vim \
 		runtime/colors/README.txt \
-		runtime/colors/tools/*.vim \
 		runtime/compiler/*.vim \
 		runtime/compiler/README.txt \
 		runtime/indent/*.vim \
 		runtime/indent/README.txt \
-		runtime/indent/Makefile \
-		runtime/indent/testdir/README.txt \
-		runtime/indent/testdir/*.vim \
-		runtime/indent/testdir/*.in \
-		runtime/indent/testdir/*.ok \
 		runtime/ftplugin/*.vim \
 		runtime/ftplugin/logtalk.dict \
 		runtime/ftplugin/README.txt \
@@ -814,27 +592,26 @@ RT_UNIX =	\
 		README_unix.txt \
 		runtime/hi16-action-make.png \
 		runtime/hi22-action-make.png \
+		runtime/vim16x16.png \
+		runtime/vim16x16.xpm \
+		runtime/vim32x32.png \
+		runtime/vim32x32.xpm \
+		runtime/vim48x48.png \
+		runtime/vim48x48.xpm \
 		runtime/gvim.desktop \
 		runtime/vim.desktop \

 # Unix and DOS runtime without CR-LF translation
 RT_UNIX_DOS_BIN =	\
 		runtime/vim16x16.gif \
-		runtime/vim16x16.png \
-		runtime/vim16x16.xpm \
 		runtime/vim32x32.gif \
-		runtime/vim32x32.png \
-		runtime/vim32x32.xpm \
 		runtime/vim48x48.gif \
-		runtime/vim48x48.png \
-		runtime/vim48x48.xpm \

 # runtime not for unix or extra
 RT_NO_UNIX =	\

 # runtime for Amiga (also in the extra archive)
 RT_AMI_DOS =	\
-		runtime/doc/evim.man \
 		runtime/doc/vim.man \
 		runtime/doc/vimdiff.man \
 		runtime/doc/vimtutor.man \
@@ -902,7 +679,7 @@ BIN_AMI =	\
 # files for DOS binary (also in extra archive)
 BIN_DOS =	\
 		README_bindos.txt \
-		uninstall.txt \
+		uninstal.txt \

 # files for Win32 OLE binary (also in extra archive)
 BIN_OLE =	\
@@ -937,7 +714,10 @@ EXTRA =		\
 		$(SRC_EXTRA) \
 		README_extra.txt \
 		src/VisVim/VisVim.dll \
+		farsi/README.txt \
+		farsi/fonts/*/far-* \
 		runtime/vimlogo.xpm \
+		src/swis.s \
 		src/tee/Makefile \
 		src/tee/Make_mvc.mak \
 		src/tee/tee.c \
@@ -973,8 +753,6 @@ IN_README_DIR = \

 # generic language files
 LANG_GEN = \
-		runtime/doc/*-da.1 \
-		runtime/doc/*-da.UTF-8.1 \
 		runtime/doc/*-de.1 \
 		runtime/doc/*-de.UTF-8.1 \
 		runtime/doc/*-fr.1 \
@@ -986,8 +764,6 @@ LANG_GEN = \
 		runtime/doc/*-pl.UTF-8.1 \
 		runtime/doc/*-ru.1 \
 		runtime/doc/*-ru.UTF-8.1 \
-		runtime/doc/*-tr.1 \
-		runtime/doc/*-tr.UTF-8.1 \
 		runtime/lang/README.txt \
 		runtime/lang/menu_*.vim \
 		runtime/keymap/README.txt \
@@ -1036,15 +812,10 @@ 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 \
 		src/po/Make_ming.mak \
 		src/po/Make_mvc.mak \
-		src/po/vim.desktop.in \
-		src/po/gvim.desktop.in \
 		src/po/sjiscorr.c \
 		src/po/*.po \

@@ -1,78 +0,0 @@
-VIM LICENSE
-
-I)  There are no restrictions on distributing unmodified copies of Vim except
-    that they must include this license text.  You can also distribute
-    unmodified parts of Vim, likewise unrestricted except that they must
-    include this license text.  You are also allowed to include executables
-    that you made from the unmodified Vim sources, plus your own usage
-    examples and Vim scripts.
-
-II) It is allowed to distribute a modified (or extended) version of Vim,
-    including executables and/or source code, when the following four
-    conditions are met:
-    1) This license text must be included unmodified.
-    2) The modified Vim must be distributed in one of the following five ways:
-       a) If you make changes to Vim yourself, you must clearly describe in
-          the distribution how to contact you.  When the maintainer asks you
-          (in any way) for a copy of the modified Vim you distributed, you
-          must make your changes, including source code, available to the
-          maintainer without fee.  The maintainer reserves the right to
-          include your changes in the official version of Vim.  What the
-          maintainer will do with your changes and under what license they
-          will be distributed is negotiable.  If there has been no negotiation
-          then this license, or a later version, also applies to your changes.
-          The current maintainer is Bram Moolenaar <Bram@vim.org>.  If this
-          changes it will be announced in appropriate places (most likely
-          vim.sf.net, www.vim.org and/or comp.editors). When it is completely
-          impossible to contact the maintainer, the obligation to send him
-          your changes ceases.  Once the maintainer has confirmed that he has
-          received your changes they will not have to be sent again.
-       b) If you have received a modified Vim that was distributed as
-          mentioned under a) you are allowed to further distribute it
-          unmodified, as mentioned at I).  If you make additional changes the
-          text under a) applies to those changes.
-       c) Provide all the changes, including source code, with every copy of
-          the modified Vim you distribute.  This may be done in the form of a
-          context diff.  You can choose what license to use for new code you
-          add.  The changes and their license must not restrict others from
-          making their own changes to the official version of Vim.
-       d) When you have a modified Vim which includes changes as mentioned
-          under c), you can distribute it without the source code for the
-          changes if the following three conditions are met:
-          - The license that applies to the changes permits you to distribute
-            the changes to the Vim maintainer without fee or restriction, and
-            permits the Vim maintainer to include the changes in the official
-            version of Vim without fee or restriction.
-          - You keep the changes for at least three years after last
-            distributing the corresponding modified Vim.  When the maintainer
-            or someone who you distributed the modified Vim to asks you (in
-            any way) for the changes within this period, you must make them
-            available to him.
-          - You clearly describe in the distribution how to contact you.  This
-            contact information must remain valid for at least three years
-            after last distributing the corresponding modified Vim, or as long
-            as possible.
-       e) When the GNU General Public License (GPL) applies to the changes,
-          you can distribute the modified Vim under the GNU GPL version 2 or
-          any later version.
-    3) A message must be added, at least in the output of the ":version"
-       command and in the intro screen, such that the user of the modified Vim
-       is able to see that it was modified.  When distributing as mentioned
-       under 2)e) adding the message is only required for as far as this does
-       not conflict with the license used for the changes.
-    4) The contact information as required under 2)a) and 2)d) must not be
-       removed or changed, except that the person himself can make
-       corrections.
-
-III) If you distribute a modified version of Vim, you are encouraged to use
-     the Vim license for your changes and make them available to the
-     maintainer, including the source code.  The preferred way to do this is
-     by e-mail or by uploading the files to a server and e-mailing the URL.
-     If the number of changes is small (e.g., a modified Makefile) e-mailing a
-     context diff will do.  The e-mail address to be used is
-     <maintainer@vim.org>
-
-IV)  It is not allowed to remove this license from the distribution of the Vim
-     sources, parts of it or from a modified version.  You may use this
-     license for previous Vim releases instead of the license that they came
-     with, at your option.
@@ -32,31 +32,14 @@ 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 testtiny test_libvterm unittests testclean clean distclean:
+all install uninstall tools config configure reconfig proto depend lint tags types test scripttests unittests testclean clean distclean:
 	@if test ! -f src/auto/config.mk; then \
 		cp src/config.mk.dist src/auto/config.mk; \
 	fi
 	@echo "Starting make in the src directory."
 	@echo "If there are problems, cd to the src directory and run make there"
 	cd src && $(MAKE) $@
-	@# When the target is "test" also run the indent tests.
-	@if test "$@" = "test"; then \
-		$(MAKE) indenttest; \
-	fi
-	@# When the target is "clean" also clean for the indent tests.
-	@if test "$@" = "clean" -o "$@" = "distclean" -o "$@" = "testclean"; then \
-		cd runtime/indent && \
-			$(MAKE) clean; \
-	fi

-# Executable used for running the indent tests.
-VIM_FOR_INDENTTEST = ../../src/vim
-
-indenttest:
-	cd runtime/indent && \
-		$(MAKE) clean && \
-		$(MAKE) test VIM="$(VIM_FOR_INDENTTEST)"
-		

 #########################################################################
 # 2. Creating the various distribution files.
@@ -85,19 +68,19 @@ indenttest:
 #    Before creating an archive first delete all backup files, *.orig, etc.

 MAJOR = 8
-MINOR = 2
+MINOR = 0

 # CHECKLIST for creating a new version:
 #
 # - Update Vim version number.  For a test version in: src/version.h,
 #   READMEdir/Contents, MAJOR/MINOR above, VIMMAJOR and VIMMINOR in
-#   src/Makefile, README.txt, README.md, src/README.md, READMEdir/README*.txt,
+#   src/Makefile, README.txt, README.md, READMEdir/README*.txt,
 #   runtime/doc/*.txt and make nsis/gvim_version.nsh.
 #   For a minor/major version: src/GvimExt/GvimExt.reg, src/vim.def,
 #   src/gvim.exe.mnf.
-# - Compile Vim with GTK, Perl, Python, Python3, TCL, Ruby, Lua, Cscope and
-#   "huge" features.  Add MZscheme if you can make it work.
-#   Use "make reconfig" after selecting the configure arguments.
+# - Compile Vim with GTK, Perl, Python, Python3, TCL, Ruby, MZscheme, Lua (if
+#   you can make it all work), Cscope and "huge" features.  Exclude workshop
+#   and SNiFF.
 # - With these features: "make proto" (requires cproto and Motif installed;
 #   ignore warnings for missing include files, fix problems for syntax errors).
 # - With these features: "make depend" (works best with gcc).
@@ -106,6 +89,9 @@ MINOR = 2
 # - If you have valgrind, enable it in src/testdir/Makefile and run "make
 #   test".  Enable EXITFREE, disable GUI, scheme and tcl to avoid false alarms.
 #   Check the valgrind output.
+# - If you have the efence library, enable it in "src/Makefile" and run "make
+#   test".  Disable Python and Ruby to avoid trouble with threads (efence is
+#   not threadsafe).
 # - Adjust the date and other info in src/version.h.
 # - Correct included_patches[] in src/version.c.
 # - Check for missing entries in runtime/makemenu.vim (with checkmenu script).
@@ -134,50 +120,50 @@ MINOR = 2
 #
 # MS-Windows:
 # - Run make on Unix to update the ".mo" files.
-# - Get 32 bit libintl-8.dll, libiconv-2.dll and libgcc_s_sjlj-1.dll. E.g. from
+# - Get libintl-8.dll and libiconv-2.dll. E.g. from
 #   https://mlocati.github.io/gettext-iconv-windows/ .
-#   Use the "shared-32.zip file and extract the archive to get the files.
-#   Put them in the gettext32 directory, "make dosrt" uses them.
-# - Get 64 bit libintl-8.dll and libiconv-2.dll. E.g. from
-#   https://mlocati.github.io/gettext-iconv-windows/ .
-#   Use the "shared-64.zip file and extract the archive to get the files.
-#   Put them in the gettext64 directory, "make dosrt" uses them.
+#   Put them in the top directory, "make dosrt" uses them.
 # - > make dossrc
 #   > make dosrt
 #   Unpack dist/vim##rt.zip and dist/vim##src.zip on an MS-Windows PC.
-#   This creates the directory vim/vim82 and puts all files in there.
 # Win32 console version build:
-# - See src/INSTALLpc.txt for installing the compiler and SDK.
-# - Set environment for Visual C++ 2015:
-#   > cd src
-#   > msvc2015.bat
-# - Build the console binary:
+# - Set environment for Visual C++ 2008, e.g.:
+#   > src/msvc2008.bat
+#   Or: 
+#   > C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\vcvars32.bat
+#   Or, when using the Visual C++ Toolkit 2003: "msvcsetup.bat" (adjust the
+#   paths when necessary).
+#   For Windows 98/ME the 2003 version is required, but then the executable
+#   won't work on Windows 7 and 64 bit systems.
+# - > cd src
 #   > nmake -f Make_mvc.mak
-# - Run the tests and check the output:
+# - Run the tests:
 #   > nmake -f Make_mvc.mak testclean
 #   > nmake -f Make_mvc.mak test
+#   - check the output.
 # - Rename (using ../tools/rename.bat):
 #           vim.exe to vimw32.exe
 #           tee/tee.exe to teew32.exe
 #           xxd/xxd.exe to xxdw32.exe
 #           vim.pdb to vimw32.pdb
 #           install.exe to installw32.exe
-#           uninstall.exe to uninstallw32.exe
+#           uninstal.exe to uninstalw32.exe
 # Win32 GUI version build:
 # - > cd src
 #   > nmake -f Make_mvc.mak GUI=yes
-# - Run the tests and check the output:
+# - Run the tests:
 #   > nmake -f Make_mvc.mak testclean
 #   > nmake -f Make_mvc.mak testgvim
+#   - check the output.
 # - move "gvim.exe" to here (otherwise the OLE version will overwrite it).
 # - Move gvim.pdb to here.
 # - Copy "GvimExt/gvimext.dll" to here.
-# - Delete vimrun.exe, install.exe and uninstall.exe.
+# - Delete vimrun.exe, install.exe and uninstal.exe.
 # Win32 GUI version with OLE, PERL, Ruby, TCL, PYTHON and dynamic IME:
 # - Install the interfaces you want, see src/INSTALLpc.txt
-#   Adjust bigvim.bat to match the version of each interface you want.
 # - Build:
 #   > cd src
+#   Adjust bigvim.bat to match the version of each interface you want.
 #   > bigvim.bat
 # - Run the tests:
 #   > nmake -f Make_mvc.mak testclean
@@ -185,7 +171,7 @@ MINOR = 2
 #   - check the output.
 # - Rename "gvim.exe" to "gvim_ole.exe".
 # - Rename gvim.pdb to "gvim_ole.pdb".
-# - Delete install.exe and uninstall.exe.
+# - Delete install.exe and uninstal.exe.
 # Create the archives:
 # - Copy all the "*.exe" files to where this Makefile is.
 # - Copy all the "*.pdb" files to where this Makefile is.
@@ -194,20 +180,18 @@ MINOR = 2
 # NSIS self installing exe:
 # - To get NSIS see http://nsis.sourceforge.net
 # - Make sure gvim_ole.exe, vimw32.exe, installw32.exe,
-#   uninstallw32.exe, teew32.exe and xxdw32.exe have been build as mentioned
+#   uninstalw32.exe, teew32.exe and xxdw32.exe have been build as mentioned
 #   above.
 # - copy these files (get them from a binary archive or build them):
 #	gvimext.dll in src/GvimExt
 #	gvimext64.dll in src/GvimExt
 #	VisVim.dll in src/VisVim
 #   Note: VisVim needs to be build with MSVC 5, newer versions don't work.
-#   gvimext64.dll can be obtained from:
-#   https://github.com/vim/vim-win32-installer/releases
-#	It is part of gvim_8.2.*_x64.zip as vim/vim82/GvimExt/gvimext64.dll.
+#   gvimext64.dll can be obtained from http://code.google.com/p/vim-win3264/
+#	It is part of vim72.zip as vim72/gvimext.dll.
 # - Make sure there is a diff.exe two levels up (get it from a previous Vim
-#   version).  Also put winpty32.dll and winpty-agent.exe there.
+#   version).
 # - go to ../nsis and do:
-#   > unzip icons.zip
 #   > makensis gvim.nsi  (takes a few minutes).
 #      ignore warning for libwinpthread-1.dll
 # - Copy gvim##.exe to the dist directory.
@@ -471,25 +455,19 @@ dosrt_files: dist prepare no_title.vim
 	-rm $(IN_README_DIR)
 	mv dist/vim/$(VIMRTDIR)/runtime/* dist/vim/$(VIMRTDIR)
 	rmdir dist/vim/$(VIMRTDIR)/runtime
-# Add the message translations.  Trick: skip ja.mo/ja.euc-jp.mo and use
-# ja.sjis.mo instead.  Same for cs.mo / cs.cp1250.mo, pl.mo / pl.cp1250.mo,
-# sk.mo / sk.cp1250.mo, zh_CN.mo / zh_CN.cp936.mo, uk.mo / uk.cp1251.mo and
-# ru.mo / ru.cp1251.mo.
+# Add the message translations.  Trick: skip ja.mo and use ja.sjis.mo instead.
+# Same for cs.mo / cs.cp1250.mo, pl.mo / pl.cp1250.mo, sk.mo / sk.cp1250.mo,
+# zh_CN.mo / zh_CN.cp936.mo, uk.mo / uk.cp1251.mo and ru.mo / ru.cp1251.mo.
 	for i in $(LANG_DOS); do \
-	      if test "$$i" != "src/po/ja.mo" -a "$$i" != "src/po/ja.euc-jp.mo" -a "$$i" != "src/po/pl.mo" -a "$$i" != "src/po/cs.mo" -a "$$i" != "src/po/sk.mo" -a "$$i" != "src/po/zh_CN.mo" -a "$$i" != "src/po/ru.mo" -a "$$i" != "src/po/uk.mo"; then \
+	      if test "$$i" != "src/po/ja.mo" -a "$$i" != "src/po/pl.mo" -a "$$i" != "src/po/cs.mo" -a "$$i" != "src/po/sk.mo" -a "$$i" != "src/po/zh_CN.mo" -a "$$i" != "src/po/ru.mo" -a "$$i" != "src/po/uk.mo"; then \
 		n=`echo $$i | sed -e "s+src/po/\([-a-zA-Z0-9_]*\(.UTF-8\)*\)\(.sjis\)*\(.cp1250\)*\(.cp1251\)*\(.cp936\)*.mo+\1+"`; \
 		mkdir dist/vim/$(VIMRTDIR)/lang/$$n; \
 		mkdir dist/vim/$(VIMRTDIR)/lang/$$n/LC_MESSAGES; \
 		cp $$i dist/vim/$(VIMRTDIR)/lang/$$n/LC_MESSAGES/vim.mo; \
 	      fi \
 	    done
-	mkdir dist/vim/$(VIMRTDIR)/gettext32
-	cp gettext32/libintl-8.dll dist/vim/$(VIMRTDIR)/gettext32/
-	cp gettext32/libiconv-2.dll dist/vim/$(VIMRTDIR)/gettext32/
-	cp gettext32/libgcc_s_sjlj-1.dll dist/vim/$(VIMRTDIR)/gettext32/
-	mkdir dist/vim/$(VIMRTDIR)/gettext64
-	cp gettext64/libintl-8.dll dist/vim/$(VIMRTDIR)/gettext64/
-	cp gettext64/libiconv-2.dll dist/vim/$(VIMRTDIR)/gettext64/
+	cp libintl-8.dll dist/vim/$(VIMRTDIR)/
+	cp libiconv-2.dll dist/vim/$(VIMRTDIR)/


 # Used before uploading.  Don't delete the AAPDIR/sign files!
@@ -515,11 +493,8 @@ dosbin_gvim: dist no_title.vim dist/$(COMMENT_GVIM)
 	cp xxdw32.exe dist/vim/$(VIMRTDIR)/xxd.exe
 	cp vimrun.exe dist/vim/$(VIMRTDIR)/vimrun.exe
 	cp installw32.exe dist/vim/$(VIMRTDIR)/install.exe
-	cp uninstallw32.exe dist/vim/$(VIMRTDIR)/uninstall.exe
-	mkdir dist/vim/$(VIMRTDIR)/GvimExt32
-	cp gvimext.dll dist/vim/$(VIMRTDIR)/GvimExt32/gvimext.dll
-	mkdir dist/vim/$(VIMRTDIR)/GvimExt64
-	cp gvimext64.dll dist/vim/$(VIMRTDIR)/GvimExt64/gvimext.dll
+	cp uninstalw32.exe dist/vim/$(VIMRTDIR)/uninstal.exe
+	cp gvimext.dll dist/vim/$(VIMRTDIR)/gvimext.dll
 	cd dist && zip -9 -rD -z gvim$(VERSION).zip vim <$(COMMENT_GVIM)
 	cp gvim.pdb dist/gvim$(VERSION).pdb

@@ -536,7 +511,7 @@ dosbin_w32: dist no_title.vim dist/$(COMMENT_W32)
 	cp teew32.exe dist/vim/$(VIMRTDIR)/tee.exe
 	cp xxdw32.exe dist/vim/$(VIMRTDIR)/xxd.exe
 	cp installw32.exe dist/vim/$(VIMRTDIR)/install.exe
-	cp uninstallw32.exe dist/vim/$(VIMRTDIR)/uninstall.exe
+	cp uninstalw32.exe dist/vim/$(VIMRTDIR)/uninstal.exe
 	cd dist && zip -9 -rD -z vim$(VERSION)w32.zip vim <$(COMMENT_W32)
 	cp vimw32.pdb dist/vim$(VERSION)w32.pdb

@@ -554,7 +529,7 @@ dosbin_ole: dist no_title.vim dist/$(COMMENT_OLE)
 	cp xxdw32.exe dist/vim/$(VIMRTDIR)/xxd.exe
 	cp vimrun.exe dist/vim/$(VIMRTDIR)/vimrun.exe
 	cp installw32.exe dist/vim/$(VIMRTDIR)/install.exe
-	cp uninstallw32.exe dist/vim/$(VIMRTDIR)/uninstall.exe
+	cp uninstalw32.exe dist/vim/$(VIMRTDIR)/uninstal.exe
 	cp gvimext.dll dist/vim/$(VIMRTDIR)/gvimext.dll
 	cp README_ole.txt dist/vim/$(VIMRTDIR)
 	cp src/VisVim/VisVim.dll dist/vim/$(VIMRTDIR)/VisVim.dll
@@ -1,13 +1,12 @@
-Vim - the text editor - for macOS
+Vim - the text editor - for Mac OS X

+This is the official GitHub repository for MacVim, the macOS port of [vim](https://github.com/vim/vim). It is based on
+[Björn Winckler's repository](https://github.com/b4winckler/macvim), which was official until he stepped down as the
+maintainer of the port.

- MacVim homepage https://macvim-dev.github.io/macvim
+- MacVim homepage http://macvim-dev.github.io/macvim

- Download the latest version from [Releases](https://github.com/macvim-dev/macvim/releases/latest).
+- Vim README https://github.com/macvim-dev/macvim/blob/master/README_vim.md

- Vim README: [README_vim.md](README_vim.md)
-
- [![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)
+- Travis CI <a href="https://travis-ci.org/macvim-dev/macvim"><img src="https://travis-ci.org/macvim-dev/macvim.svg?branch=master" alt="Build Status"></a><a href="https://travis-ci.org/macvim-dev/homebrew-macvim"><img src="https://travis-ci.org/macvim-dev/homebrew-macvim.svg?branch=master" alt="Build Status"></a>

@@ -1,4 +1,4 @@
-README.txt for version 8.2 of Vim: Vi IMproved.
+README.txt for version 8.0 of Vim: Vi IMproved.


 WHAT IS VIM?
@@ -16,10 +16,10 @@ 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.
-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.
+Vim runs under MS-Windows (NT, 2000, XP, Vista, 7, 8, 10), Macintosh, 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, Amiga
+DOS, Atari MiNT, BeOS, RISC OS and OS/2.  These are no longer maintained.


 DISTRIBUTION
@@ -1,348 +0,0 @@
-![Vim Logo](https://github.com/vim/vim/blob/master/runtime/vimlogo.gif)
-
-# What is Vim9?
-
-This is an experimental side of [Vim](https://github.com/vim/vim).
-It explores ways of making Vim script faster and better.
-
-WARNING: The Vim9 script features are still under development, anything can
-break!
-
-# Why Vim9?
-
-## 1. FASTER VIM SCRIPT
-
-The third item on the poll results of 2018, after popup windows and text
-properties, is faster Vim script.  So how do we do that?
-
-I have been throwing some ideas around, and soon came to the conclusion
-that the current way functions are called and executed, with
-dictionaries for the arguments and local variables, is never going to be
-very fast.  We're lucky if we can make it twice as fast.  The overhead
-of a function call and executing every line is just too high.
-
-So what then?  We can only make something fast by having a new way of
-defining a function, with similar but different properties of the old
-way:
-* Arguments are only available by name, not through the a: dictionary or
-  the a:000 list.
-* Local variables are not available in an l: dictionary.
-* A few more things that slow us down, such as exception handling details.
-
-I Implemented a "proof of concept" and measured the time to run a simple
-for loop with an addition (Justin used this example in his presentation,
-full code is below):
-
-``` vim
-  let sum = 0
-  for i in range(1, 2999999)
-    let sum += i
-  endfor
-```
-
-| how     | time in sec |
-| --------| -------- |
-| Vim old | 5.018541 |
-| Python  | 0.369598 |
-| Lua     | 0.078817 |
-| Vim new | 0.073595 |
-
-That looks very promising!  It's just one example, but it shows how much
-we can gain, and also that Vim script can be faster than builtin
-interfaces.
-
-In practice the script would not do something useless as counting but change
-the text.  For example, reindent all the lines:
-
-``` vim
-  let totallen = 0
-  for i in range(1, 100000)
-    call setline(i, '    ' .. getline(i))
-    let totallen += len(getline(i))
-  endfor
-```
-
-| how     | time in sec |
-| --------| -------- |
-| Vim old | 0.853752 |
-| Python  | 0.304584 |
-| Lua     | 0.286573 |
-| 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
-used to store intermediate results.  Local variables are also on the
-stack, space is reserved during compilation.  This is a fairly normal
-way of compilation into an intermediate format, specialized for Vim,
-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. 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
-foothold, for various reasons.
-
-Instead of using script language support in Vim:
-* Encourage implementing external tools in any language and communicate
-  with them.  The job and channel support already makes this possible.
-  Really any language can be used, also Java and Go, which are not
-  available built-in.
-* No priority for the built-in language interfaces.  They will have to be kept
-  for backwards compatibility, but many users won't need a Vim build with these
-  interfaces.
-* Improve the Vim script language, it is used to communicate with the external
-  tool and implements the Vim side of the interface.  Also, it can be used when
-  an external tool is undesired.
-
-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
-language is missing.  This is a good long term goal.
-
-Rationale: Why is it better to run a tool separately from Vim than using a
-built-in interface and interpreter?  Take for example something that is
-written in Python:
-* The built-in interface uses the embedded python interpreter.  This is less
-  well maintained than the python command.  Building Vim with it requires
-  installing developer packages.  If loaded dynamically there can be a version
-  mismatch.
-* When running the tool externally the standard python command can be used,
-  which is quite often available by default or can be easily installed.
-* The built-in interface has an API that is unique for Vim with Python. This is
-  an extra API to learn.
-* A .py file can be compiled into a .pyc file and execute much faster.
-* Inside Vim multi-threading can cause problems, since the Vim core is single
-  threaded.  In an external tool there are no such problems.
-* The Vim part is written in .vim files, the Python part is in .py files, this
-  is nicely separated.
-* Disadvantage: An interface needs to be made between Vim and Python.
-  JSON is available for this, and it's fairly easy to use.  But it still
-  requires implementing asynchronous communication.
-
-
-## 3. BETTER VIM SCRIPT
-
-To make Vim faster a new way of defining a function needs to be added.
-While we are doing that, since the lines in this function won't be fully
-backwards compatible anyway, we can also make Vim script easier to use.
-In other words: "less weird".  Making it work more like modern
-programming languages will help.  No surprises.
-
-A good example is how in a function the arguments are prefixed with
-"a:". No other language I know does that, so let's drop it.
-
-Taking this one step further is also dropping "s:" for script-local variables;
-everything at the script level is script-local by default.  Since this is not
-backwards compatible it requires a new script style: Vim9 script!
-
-To avoid having more variations, the syntax inside a compiled function is the
-same as in Vim9 script.  Thus you have legacy syntax and Vim9 syntax.
-
-It should be possible to convert code from other languages to Vim
-script.  We can add functionality to make this easier.  This still needs
-to be discussed, but we can consider adding type checking and a simple
-form of classes.  If you look at JavaScript for example, it has gone
-through these stages over time, adding real class support and now
-TypeScript adds type checking.  But we'll have to see how much of that
-we actually want to include in Vim script.  Ideally a conversion tool
-can take Python, JavaScript or TypeScript code and convert it to Vim
-script, with only some things that cannot be converted.
-
-Vim script won't work the same as any specific language, but we can use
-mechanisms that are commonly known, ideally with the same syntax.  One
-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 "var" and "const" to declare a variable, like in JavaScript and
-TypeScript, can work:
-
-
-``` vim
-def MyFunction(arg: number): number
-   var local = 1
-   var todo = arg
-   const ADD = 88
-   while todo > 0
-      local += ADD
-      todo -= 1
-   endwhile
-   return local
-enddef
-```
-
-The similarity with JavaScript/TypeScript can also be used for dependencies
-between files.  Vim currently uses the `:source` command, which has several
-disadvantages:
-*   In the sourced script, is not clear what it provides.  By default all
-    functions are global and can be used elsewhere.
-*   In a script that sources other scripts, it is not clear what function comes
-    from what sourced script.  Finding the implementation is a hassle.
-*   Prevention of loading the whole script twice must be manually implemented.
-
-We can use the `:import` and `:export` commands from the JavaScript standard to
-make this much better.  For example, in script "myfunction.vim" define a
-function and export it:
-
-``` vim
-vim9script  " Vim9 script syntax used here
-
-var local = 'local variable is not exported, script-local'
-
-export def MyFunction()  " exported function
-...
-
-def LocalFunction() " not exported, script-local
-...
-```
-
-And in another script import the function:
-
-``` vim
-vim9script  " Vim9 script syntax used here
-
-import MyFunction from 'myfunction.vim'
-```
-
-This looks like JavaScript/TypeScript, thus many users will understand the
-syntax.
-
-These are ideas, this will take time to design, discuss and implement.
-Eventually this will lead to Vim 9!
-
-
-## Code for sum time measurements
-
-Vim was build with -O2.
-
-``` vim
-func VimOld()
-  let sum = 0
-  for i in range(1, 2999999)
-    let sum += i
-  endfor
-  return sum
-endfunc
-
-func Python()
-  py3 << END
-sum = 0
-for i in range(1, 3000000):
-  sum += i
-END
-  return py3eval('sum')
-endfunc
-
-func Lua()
-  lua << END
-    sum = 0
-    for i = 1, 2999999 do
-      sum = sum + i
-    end
-END
-  return luaeval('sum')
-endfunc
-
-def VimNew(): number
-  var sum = 0
-  for i in range(1, 2999999)
-    sum += i
-  endfor
-  return sum
-enddef
-
-let start = reltime()
-echo VimOld()
-echo 'Vim old: ' .. reltimestr(reltime(start))
-
-let start = reltime()
-echo Python()
-echo 'Python: ' .. reltimestr(reltime(start))
-
-let start = reltime()
-echo Lua()
-echo 'Lua: ' .. reltimestr(reltime(start))
-
-let start = reltime()
-echo VimNew()
-echo 'Vim new: ' .. reltimestr(reltime(start))
-```
-
-## Code for indent time measurements
-
-``` vim
-def VimNew(): number
-  var totallen = 0
-  for i in range(1, 100000)
-    setline(i, '    ' .. getline(i))
-    totallen += len(getline(i))
-  endfor
-  return totallen
-enddef
-
-func VimOld()
-  let totallen = 0
-  for i in range(1, 100000)
-    call setline(i, '    ' .. getline(i))
-    let totallen += len(getline(i))
-  endfor
-  return totallen
-endfunc
-
-func Lua()
-  lua << END
-    b = vim.buffer()
-    totallen = 0
-    for i = 1, 100000 do
-      b[i] = "    " .. b[i]
-      totallen = totallen + string.len(b[i])
-    end
-END
-  return luaeval('totallen')
-endfunc
-
-func Python()
-  py3 << END
-cb = vim.current.buffer
-totallen = 0
-for i in range(0, 100000):
-  cb[i] = '    ' + cb[i]
-  totallen += len(cb[i])
-END
-  return py3eval('totallen')
-endfunc
-
-new
-call setline(1, range(100000))
-let start = reltime()
-echo VimOld()
-echo 'Vim old: ' .. reltimestr(reltime(start))
-bwipe!
-
-new
-call setline(1, range(100000))
-let start = reltime()
-echo Python()
-echo 'Python: ' .. reltimestr(reltime(start))
-bwipe!
- 
-new
-call setline(1, range(100000))
-let start = reltime()
-echo Lua()
-echo 'Lua: ' .. reltimestr(reltime(start))
-bwipe!
-
-new
-call setline(1, range(100000))
-let start = reltime()
-echo VimNew()
-echo 'Vim new: ' .. reltimestr(reltime(start))
-bwipe!
-```
@@ -1,8 +1,8 @@
-[![Vim Logo](https://github.com/vim/vim/raw/master/runtime/vimlogo.gif)](https://www.vim.org)
-
-[![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>
+`README.md` for version 8.0 of Vim: Vi IMproved.
+[![Build Status](https://travis-ci.org/vim/vim.svg?branch=master)](https://travis-ci.org/vim/vim)
+[![Coverage Status](https://coveralls.io/repos/vim/vim/badge.svg?branch=master&service=github)](https://coveralls.io/github/vim/vim?branch=master)
+[![Appveyor Build status](https://ci.appveyor.com/api/projects/status/o2qht2kjm02sgghk?svg=true)](https://ci.appveyor.com/project/chrisbra/vim)
+[![Coverity Scan](https://scan.coverity.com/projects/241/badge.svg)](https://scan.coverity.com/projects/vim)


 ## What is Vim? ##
@@ -20,12 +20,11 @@ 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, 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.
+Vim runs under MS-Windows (NT, 2000, XP, Vista, 7, 8, 10), Macintosh, 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, Amiga
+DOS, Atari MiNT, BeOS, RISC OS and OS/2.  These are no longer maintained.

-For Vim9 script see [README_VIM9](README_VIM9.md).

 ## Distribution ##

@@ -66,7 +65,6 @@ 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.
@@ -136,11 +134,3 @@ If nothing else works, report bugs directly:

 Send any other comments, patches, flowers and suggestions to:
 	Bram Moolenaar <Bram@vim.org>
-
-
-This is `README.md` for version 8.2 of Vim: Vi IMproved.
-
-
-## Translations of this README ##
-
-[Korean](https://github.com/cjw1359/opensource/blob/master/Vim/README_ko.md)
@@ -9,10 +9,10 @@ Vim		Vi IMproved.  A clone of the UNIX text editor Vi.  Very useful
 		messages, shows current file name in window title, on-line
 		help, rectangular cut/paste, etc., etc., etc...

-		Version 8.2.  Also runs under UNIX, MS-Windows, Mac, etc.
-		vim82rt.tgz  contains the documentation and syntax files.
-		vim82bin.tgz contains the binaries.
-		vim82src.tgz contains the sources.
+		Version 8.0.  Also runs under UNIX, MS-Windows, Mac, etc.
+		vim80rt.tgz  contains the documentation and syntax files.
+		vim80bin.tgz contains the binaries.
+		vim80src.tgz contains the sources.
 		Author: Bram Moolenaar et al.


@@ -1,4 +1,4 @@
-README_ami.txt for version 8.2 of Vim: Vi IMproved.
+README_ami.txt for version 8.0 of Vim: Vi IMproved.

 This file explains the installation of Vim on Amiga systems.
 See README.txt for general information about Vim.
@@ -16,8 +16,8 @@ easily upgrade to a new version.  For example:
 You would then unpack the archives like this:

  cd dh0:editors
-  tar xf t:vim82bin.tar
-  tar xf t:vim82rt.tar
+  tar xf t:vim80bin.tar
+  tar xf t:vim80rt.tar

 Set the $VIM environment variable to point to the top directory of your Vim
 files.  For the above example:
@@ -1,8 +1,8 @@
-README_amibin.txt for version 8.2 of Vim: Vi IMproved.
+README_amibin.txt for version 8.0 of Vim: Vi IMproved.

 See "README.txt" for general information about Vim.
 See "README_ami.txt" for installation instructions for the Amiga.
-These files are in the runtime archive (vim82rt.tgz).
+These files are in the runtime archive (vim80rt.tgz).


 The Amiga "bin" archive contains the Vim executable for the Amiga.  It was
@@ -1,8 +1,8 @@
-README_amisrc.txt for version 8.2 of Vim: Vi IMproved.
+README_amisrc.txt for version 8.0 of Vim: Vi IMproved.

 See "README.txt" for general information about Vim.
 See "README_ami.txt" for installation instructions for the Amiga.
-These files are in the runtime archive (vim82rt.tgz).
+These files are in the runtime archive (vim80rt.tgz).


 The Amiga source archive contains the files needed to compile Vim on the
@@ -1,16 +1,16 @@
-README_bindos.txt for version 8.2 of Vim: Vi IMproved.
+README_bindos.txt for version 8.0 of Vim: Vi IMproved.

 See "README.txt" for general information about Vim.
 See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows.
-These files are in the runtime archive (vim82rt.zip).
+These files are in the runtime archive (vim80rt.zip).


 There are several binary distributions of Vim for the PC.  You would normally
 pick only one of them, but it's also possible to install several.
 These ones are available (the version number may differ):
-	vim82w32.zip	Windows 95/98/NT/etc. console version
-	gvim82.zip	Windows 95/98/NT/etc. GUI version
-	gvim82ole.zip	Windows 95/98/NT/etc. GUI version with OLE
+	vim80w32.zip	Windows 95/98/NT/etc. console version
+	gvim80.zip	Windows 95/98/NT/etc. GUI version
+	gvim80ole.zip	Windows 95/98/NT/etc. GUI version with OLE

-You MUST also get the runtime archive (vim82rt.zip).
-The sources are also available (vim82src.zip).
+You MUST also get the runtime archive (vim80rt.zip).
+The sources are also available (vim80src.zip).
@@ -1,6 +1,6 @@
-README_dos.txt for version 8.2 of Vim: Vi IMproved.
+README_dos.txt for version 8.0 of Vim: Vi IMproved.

-This file explains the installation of Vim on MS-Windows systems.
+This file explains the installation of Vim on MS-DOS and MS-Windows systems.
 See "README.txt" for general information about Vim.

 There are two ways to install Vim:
@@ -41,19 +41,19 @@ These are the normal steps to install Vim from the .zip archives:
   located.  Check the $VIM setting to see where it points to:
 	set VIM
   For example, if you have
-	C:\vim\vim82
+	C:\vim\vim80
   do
 	cd C:\
   Binary and runtime Vim archives are normally unpacked in the same location,
   on top of each other.

-2. Unpack the zip archives.  This will create a new directory "vim\vim82",
+2. Unpack the zip archives.  This will create a new directory "vim\vim80",
   in which all the distributed Vim files are placed.  Since the directory
   name includes the version number, it is unlikely that you overwrite
   existing files.
   Examples:
-	pkunzip -d gvim82.zip
-	unzip vim82w32.zip
+	pkunzip -d gvim80.zip
+	unzip vim80w32.zip

   You need to unpack the runtime archive and at least one of the binary
   archives.  When using more than one binary version, be careful not to
@@ -64,8 +64,12 @@ These are the normal steps to install Vim from the .zip archives:
   to another location.  That is where they will stay, the install program
   won't move or copy the runtime files.

+   Only for the 32 bit DOS version on MS-DOS without DPMI support (trying to
+   run install.exe will produce an error message): Unpack the CSDPMI4B.ZIP
+   archive and follow the instructions in the documentation.
+
 3. Change to the new directory:
-	cd vim\vim82
+	cd vim\vim80
   Run the "install.exe" program.  It will ask you a number of questions about
   how you would like to have your Vim setup.  Among these are:
   - You can tell it to write a "_vimrc" file with your preferences in the
@@ -76,8 +80,8 @@ These are the normal steps to install Vim from the .zip archives:
     console or in a shell.  You can select one of the directories in your
     $PATH.  If you skip this, you can add Vim to the search path manually:
     The simplest is to add a line to your autoexec.bat.  Examples:
-	set path=%path%;C:\vim\vim82
-	set path=%path%;D:\editors\vim\vim82
+	set path=%path%;C:\vim\vim80
+	set path=%path%;D:\editors\vim\vim80
   - Create entries for Vim on the desktop and in the Start menu.

 That's it!
@@ -89,8 +93,8 @@ Remarks:
  won't show a menubar.  Then you need to set the $VIM environment variable to
  point to the top directory of your Vim files.  Example:
    set VIM=C:\editors\vim
-  Vim version 8.2 will look for your vimrc file in $VIM, and for the runtime
-  files in $VIM/vim82.  See ":help $VIM" for more information.
+  Vim version 8.0 will look for your vimrc file in $VIM, and for the runtime
+  files in $VIM/vim80.  See ":help $VIM" for more information.

 - To avoid confusion between distributed files of different versions and your
  own modified vim scripts, it is recommended to use this directory layout:
@@ -101,14 +105,14 @@ Remarks:
 	C:\vim\vimfiles\ftplugin\*.vim	Filetype plugins
 	C:\vim\...			Other files you made.
  Distributed files:
-	C:\vim\vim82\vim.exe		The Vim version 8.2 executable.
-	C:\vim\vim82\doc\*.txt		The version 8.2 documentation files.
-	C:\vim\vim82\bugreport.vim	A Vim version 8.2 script.
-	C:\vim\vim82\...		Other version 8.2 distributed files.
+	C:\vim\vim80\vim.exe		The Vim version 8.0 executable.
+	C:\vim\vim80\doc\*.txt		The version 8.0 documentation files.
+	C:\vim\vim80\bugreport.vim	A Vim version 8.0 script.
+	C:\vim\vim80\...		Other version 8.0 distributed files.
  In this case the $VIM environment variable would be set like this:
 	set VIM=C:\vim
-  Then $VIMRUNTIME will automatically be set to "$VIM\vim82".  Don't add
-  "vim82" to $VIM, that won't work.
+  Then $VIMRUNTIME will automatically be set to "$VIM\vim80".  Don't add
+  "vim80" to $VIM, that won't work.

 - You can put your Vim executable anywhere else.  If the executable is not
  with the other Vim files, you should set $VIM. The simplest is to add a line
@@ -117,7 +121,7 @@ Remarks:
 	set VIM=d:\editors\vim

 - If you have told the "install.exe" program to add the "Edit with Vim" menu
-  entry, you can remove it by running the "uninstall.exe".  See
+  entry, you can remove it by running the "uninstal.exe".  See
  ":help win32-popup-menu".

 - In Windows 95/98/NT you can create a shortcut to Vim.  This works for all
@@ -132,8 +136,8 @@ Remarks:
     Select Properties.
  5. In the Program tab, change the "Cmdline" to add "/c" and the name of the
     Vim executable.  Examples:
-	C:\command.com /c C:\vim\vim82\vim.exe
-	C:\command.com /c D:\editors\vim\vim82\vim.exe
+	C:\command.com /c C:\vim\vim80\vim.exe
+	C:\command.com /c D:\editors\vim\vim80\vim.exe
  6. Select the font, window size, etc. that you like.  If this isn't
     possible, select "Advanced" in the Program tab, and deselect "MS-DOS
     mode".
@@ -146,4 +150,5 @@ Remarks:

 For further information, type one of these inside Vim:
 	:help dos
+	:help msdos
 	:help win32
@@ -1,4 +1,4 @@
-README_extra.txt for version 8.2 of Vim: Vi IMproved.
+README_extra.txt for version 8.0 of Vim: Vi IMproved.

 These extra files of Vim are for special purposes.  This README explains what
 the files are for.  For general information about Vim, see the "README.txt"
@@ -13,13 +13,22 @@ src/if_sniff.*		Interface to SNiFF.  If you don't know what SNiFF is,

 src/os_amiga.*		Files for the Amiga port.

+src/gui_beos.*
+src/os_beos.*		Files for the BeOS port.
+
 src/os_msdos.*
 src/os_dos.*		Files for the MS-DOS port.

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

 src/MacVim/*		Files for the MacVim port.

+src/os_mint.8		Files for the Atari Mint port.
+
+src/os_os2*		Files for the OS/2 port.
+src/tee/*		Extra program for OS/2.
+
 src/os_vms*		Files for the VMS port.

 src/os_w32*
@@ -1,13 +0,0 @@
-README_haiku.txt for version 8.2 of Vim: Vi IMproved.
-
-This file explains the installation of Vim on Haiku operating system.
-See "README.txt" for general information about Vim.
-
-Preferred (and easy) way to get Vim on Haiku is to use default Haiku
-software repository HaikuPorts. To get Vim:
-
- Open HaikuDepot application and search for "vim" package, then install,
- Open a Terminal and type "pkgman install vim", then follow instructions.
-
-If you prefer to install Vim from source, follow the instructions on
-"runtime/doc/os_haiku.txt", "Compiling Vim" section.
@@ -1,13 +1,38 @@
-README_mac.txt for version 8.2 of Vim: Vi IMproved.
+README_mac.txt for version 8.0 of Vim: Vi IMproved.

-How to install MacVim?
+This file explains the installation of MacVim.
+See "README.txt" for general information about Vim.
+See "src/MacVim/README" for an overview of the MacVim specific source code.
+
+MacVim uses the usual configure/make steps to build the binary but instead of
+"make install" you just drag the app bundle into the directory you wish to
+install in (usually `/Applications').
+
+
+How to build and install
 ========================

-Download MacVim.dmg from latest binary release page https://github.com/macvim-dev/macvim/releases/latest , open the dmg file, and copy MacVim.app to /Applications.
+Run `./configure` in the `src/` directory with the flags you want (call
+`./configure --help` to see a list of flags) e.g.:

+    $ cd src
+    $ ./configure --with-features=huge \
+                  --enable-rubyinterp \
+                  --enable-pythoninterp \
+                  --enable-perlinterp \
+                  --enable-cscope

-Questions?
-========================
+Now build the project using `make`:

-Please take a look at the home page http://macvim-dev.github.io/macvim/
+    $ make

+The resulting app bundle will reside under `MacVim/build/Release`.  To try it
+out quickly, type:
+
+    $ open MacVim/build/Release/MacVim.app
+
+To install MacVim, type
+
+    $ open MacVim/build/Release
+
+and drag the MacVim icon into your `Applications` folder.
@@ -1,4 +1,4 @@
-README_ole.txt for version 8.2 of Vim: Vi IMproved.
+README_ole.txt for version 8.0 of Vim: Vi IMproved.

 This archive contains gvim.exe with OLE interface and VisVim.
 This version of gvim.exe can also load a number of interface dynamically (you
@@ -1,4 +1,4 @@
-README_os2.txt for version 8.2 of Vim: Vi IMproved.
+README_os2.txt for version 8.0 of Vim: Vi IMproved.

 This file used to explain the installation of Vim on OS/2 systems.
 However, support for OS/2 has been removed in patch 7.4.1008.
@@ -1,4 +1,4 @@
-README_os390.txt for version 8.2 of Vim: Vi IMproved.
+README_zOS.txt for version 8.0 of Vim: Vi IMproved.

 This readme explains how to build Vim on z/OS.  Formerly called OS/390.
 See "README.txt" for general information about Vim.
@@ -11,8 +11,8 @@ Getting the source to z/OS:

 First get the source code in one big tar file and ftp it a binary to z/OS. If
 the tar file is initially compressed with gzip (tar.gz) or bzip2 (tar.bz2)
-uncompress it on your PC, as these tools are (most likely) not available on
-the mainframe.
+uncompress it on your PC, as this tools are (most likely) not available on the
+mainframe.

 To reduce the size of the tar file you might compress it into a zip file. On
 z/OS Unix you might have the command "jar" from java to uncompress a zip. Use:
@@ -82,8 +82,8 @@ WARNING: This instruction was not tested with Vim 7.4 or later.

 There are two ways for building VIM with X11 support. The first way is simple
 and results in a big executable (~13 Mb), the second needs a few additional
-steps and results in a much smaller executable (~4.5 Mb). These examples
-assume you want Motif.
+steps and results in a much smaller executable (~4.5 Mb). This examples assume
+you want Motif.

  The easy way:
    $ export CC=cc
@@ -1,8 +1,8 @@
-README_src.txt for version 8.2 of Vim: Vi IMproved.
+README_src.txt for version 8.0 of Vim: Vi IMproved.

 The source archive contains the files needed to compile Vim on Unix systems.
 It is packed for Unix systems (NL line separator).

 For more information, see the README.txt file that comes with the runtime
-archive (vim-8.2-rt.tar.gz).  To be able to run Vim you MUST get the runtime
+archive (vim-8.0-rt.tar.gz).  To be able to run Vim you MUST get the runtime
 archive too!
@@ -1,12 +1,12 @@
-README_srcdos.txt for version 8.2 of Vim: Vi IMproved.
+README_srcdos.txt for version 8.0 of Vim: Vi IMproved.

 See "README.txt" for general information about Vim.
-See "README_dos.txt" for installation instructions for MS-Windows.
-These files are in the runtime archive (vim82rt.zip).
+See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows.
+These files are in the runtime archive (vim80rt.zip).


-The DOS source archive contains the files needed to compile Vim on MS-Windows.
-It is packed for MS-Windows systems, with CR-LF.  It also includes the VisVim
-sources.
+The DOS source archive contains the files needed to compile Vim on MS-DOS or
+MS-Windows.  It is packed for DOS systems, with CR-LF.  It also includes the
+VisVim sources.

 See "src/INSTALLpc.txt" for instructions on how to compile Vim on the PC.
@@ -1,4 +1,4 @@
-README_unix.txt for version 8.2 of Vim: Vi IMproved.
+README_unix.txt for version 8.0 of Vim: Vi IMproved.

 This file explains the installation of Vim on Unix systems.
 See "README.txt" for general information about Vim.
@@ -1,4 +1,4 @@
-README_vms.txt for version 8.2 of Vim: Vi IMproved.
+README_vms.txt for version 8.0 of Vim: Vi IMproved.

 This file explains the installation of Vim on VMS systems.
 See "README.txt" in the runtime archive for information about Vim.
@@ -1,6 +1,15 @@
-README_w32s.txt for version 8.2 of Vim: Vi IMproved.
+README_w32s.txt for version 8.0 of Vim: Vi IMproved.

-This file used to explain the installation of Vim on MS-Windows 3.1 and 3.11
-systems.  However, support for MS-Windows 3.1 and 3.11 has been removed in
-patch 7.4.1364.
-See "README.txt" for general information about Vim.
+This archive contains the gvim.exe that was specifically compiled for use in
+the Win32s subsystem in MS-Windows 3.1 and 3.11.
+
+Also see the README_bindos.txt, README_dos.txt and README.txt files.
+
+Be careful not to overwrite the Win32s gvim.exe with the another gvim.exe when
+unpacking another binary archive!  Check the output of ":version":
+	Win32s - "MS-Windows 16/32 bit GUI version"
+	 Win32 - "MS-Windows 32 bit GUI version"
+Win32 with OLE - "MS-Windows 32 bit GUI version with OLE support"
+
+For further information, type this inside Vim:
+	:help win32s
@@ -5,22 +5,20 @@ skip_tags: true
 environment:
  matrix:
    - FEATURE: HUGE
+    - FEATURE: NORMAL
 # disabled
 #    - FEATURE: TINY
 #    - FEATURE: SMALL
-#    - FEATURE: NORMAL
 #    - FEATURE: BIG

 matrix:
  fast_finish: true

 before_build:
-  # Use Windows SDK 7.1 (= MSVC 2010)
  - '"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 /release'
-  - 'set INCLUDE=%INCLUDE%C:\Program Files (x86)\Windows Kits\8.1\Include\um'

 build_script:
-  - ci/appveyor.bat
+  - src/appveyor.bat

 test_script:
  - cd src/testdir
@@ -28,7 +26,7 @@ test_script:
  - path C:\Python35-x64;%PATH%
  - nmake -f Make_dos.mak VIMPROG=..\gvim
  - nmake -f Make_dos.mak clean
-    # Testing with MSVC console version
+    # Testing with MingW console version
  - nmake -f Make_dos.mak VIMPROG=..\vim

 # vim: sw=2 sts=2 et ts=8 sr
@@ -1,36 +0,0 @@
-@echo off
-:: Batch file for building/testing Vim on AppVeyor
-
-setlocal ENABLEDELAYEDEXPANSION
-cd %APPVEYOR_BUILD_FOLDER%
-
-cd src
-:: Filter out the progress bar from the build log
-sed -e "s/@<<$/@<< | sed -e 's#.*\\\\r.*##'/" Make_mvc.mak > Make_mvc2.mak
-
-echo "Building MSVC 64bit console Version"
-nmake -f Make_mvc2.mak CPU=AMD64 ^
-    OLE=no GUI=no IME=yes ICONV=yes DEBUG=no ^
-    FEATURES=%FEATURE% || exit 1
-
-:: build MSVC huge version with python and channel support
-:: GUI needs to be last, so that testing works
-echo "Building MSVC 64bit GUI Version"
-if "%FEATURE%" == "HUGE" (
-    nmake -f Make_mvc2.mak CPU=AMD64 ^
-        OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no POSTSCRIPT=yes ^
-        PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27-x64 ^
-        PYTHON3_VER=35 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python35-x64 ^
-        FEATURES=%FEATURE% || exit 1
-) ELSE (
-    nmake -f Make_mvc2.mak CPU=AMD64 ^
-        OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no ^
-        FEATURES=%FEATURE% || exit 1
-)
-.\gvim -u NONE -c "redir @a | ver |0put a | wq" ver_msvc.txt
-
-echo "version output MSVC console"
-.\vim --version
-echo "version output MSVC GUI"
-type ver_msvc.txt
-cd ..
@@ -1,19 +0,0 @@
-#!/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}"
@@ -1,2 +0,0 @@
-/^CFLAGS[[:blank:]]*=/s/$/ -Wno-error=missing-field-initializers -Wno-error=deprecated-declarations -Wno-error=unused-function/
-/^RUBY_CFLAGS[[:blank:]]*=/s/$/ -Wno-error=unknown-attributes -Wno-error=ignored-attributes/
@@ -1 +0,0 @@
-/^CFLAGS[[:blank:]]*=/s/$/ -Wno-error=maybe-uninitialized/
@@ -1,2 +0,0 @@
-/^CFLAGS[[:blank:]]*=/s/$/ -Wall -Wextra -Wshadow -Werror/
-/^PERL_CFLAGS[[:blank:]]*=/s/$/ -Wno-error=unused-function/
@@ -1,25 +0,0 @@
-" Print all interface versions for Ubuntu. Part 1.
-
-if 1
-  execute 'source' expand('<sfile>:h') .. '/if_ver-cmd.vim'
-
-  echo "*** Interface versions ***\n"
-
-  echo 'Lua:'
-  PrintVer lua print(_VERSION)
-
-  echo 'MzScheme:'
-  PrintVer mzscheme (display (version))
-
-  echo 'Perl:'
-  PrintVer perl print $^V
-
-  echo 'Ruby:'
-  PrintVer ruby print RUBY_VERSION
-
-  echo 'Tcl:'
-  PrintVer tcl puts [info patchlevel]
-
-  echo 'Python 2:'
-  PrintVer python print sys.version
-endif
@@ -1,8 +0,0 @@
-" Print py3 interface versions for Ubuntu. Part 2.
-
-if 1
-  execute 'source' expand('<sfile>:h') .. '/if_ver-cmd.vim'
-
-  echo 'Python 3:'
-  PrintVer python3 print(sys.version)
-endif
@@ -1,12 +0,0 @@
-" Provide 'PrintVer' command to print the interface versions.
-
-func s:print_ver(lang, ...)
-  if has(a:lang)
-    exec a:lang join(a:000)
-  else
-    echo 'N/A'
-  endif
-  echo ''
-endfunc
-
-command -nargs=+ PrintVer call <SID>print_ver(<f-args>)
@@ -1,8 +0,0 @@
-#!/bin/bash
-set -e
-
-if ! modprobe snd-dummy; then
-    # snd-dummy is contained in linux-modules-extra (if exists)
-    apt-get install -yq --no-install-suggests --no-install-recommends "linux-modules-extra-$(uname -r)"
-    modprobe snd-dummy
-fi
@@ -1,17 +0,0 @@
-#!/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
@@ -3,4 +3,4 @@
 # This is just a stub for the Unix configure script, to provide support for
 # doing "./configure" in the top Vim directory.

-cd "${SRCDIR:-src}" && exec ./configure "$@"
+cd src && exec ./configure "$@"
@@ -0,0 +1,2 @@
+For information about installation of Farsi fonts and Vim usage in Farsi mode,
+refer to the Farsi help file by typing ":help farsi" in Vim.
@@ -1,5 +1,5 @@
 This builds a one-click install for Vim for Win32 using the Nullsoft
-Installation System (NSIS), available at http://nsis.sourceforge.net/
+Installation System (NSIS), available at http://www.nullsoft.com/free/nsis/

 To build the installable .exe:

@@ -14,64 +14,29 @@ To build the installable .exe:
 	gvim.exe (the OLE version),
 	vimrun.exe,
 	install.exe,
-	uninstall.exe,
-	tee/tee.exe,
+	uninstal.exe,
 	xxd/xxd.exe,

-    Then execute tools/rename.bat to rename the executables. (mv command is
-    required.)
-
 3.  Go to the GvimExt directory and build gvimext.dll (or get it from a binary
-    archive).  Both 64- and 32-bit versions are needed and should be placed
-    as follows:
-	64-bit: src/GvimExt/gvimext64.dll
-	32-bit: src/GvimExt/gvimext.dll
+    archive).

 4.  Go to the VisVim directory and build VisVim.dll (or get it from a binary
    archive).

-5.  Get a "diff.exe" program.  If you skip this the built-in diff will always
-    be used (which is fine for most users).  If you do have your own
-    "diff.exe" put it in the "../.." directory (above the "vim82" directory,
-    it's the same for all Vim versions).
+5.  Go to the OleVim directory and build OpenWithVim.exe and SendToVim.exe (or
+    get them from a binary archive).
+
+6.  Get a "diff.exe" program and put it in the "../.." directory (above the
+    "vim61" directory, it's the same for all Vim versions).
    You can find one in previous Vim versions or in this archive:
 		http://www.mossbayeng.com/~ron/vim/diffutils.tar.gz

-6   Also put winpty32.dll and winpty-agent.exe in "../.." (above the "vim82"
-    directory).  This is required for the terminal window.
-
 7.  Do "make uganda.nsis.txt" in runtime/doc.  This requires sed, you may have
    to do this on Unix.  Make sure the file is in DOS file format!

-8.  Get gettext and iconv DLLs from the following site:
-	https://github.com/mlocati/gettext-iconv-windows/releases
-    Both 64- and 32-bit versions are needed.
-    Download the files gettextX.X.X.X-iconvX.XX-shared-{32,64}.zip, extract
-    DLLs and place them as follows:
-
-	<GETTEXT directory>
-	    |
-	    + gettext32/
-	    |	libintl-8.dll
-	    |	libiconv-2.dll
-	    |	libgcc_s_sjlj-1.dll
-	    |
-	    ` gettext64/
-		libintl-8.dll
-		libiconv-2.dll
-
-    The default <GETTEXT directory> is "..", however, you can change it by
-    passing /DGETTEXT=... option to the makensis command.
-
-
 Install NSIS if you didn't do that already.
 Also install UPX, if you want a compressed file.

-Unpack the images:
-	cd nsis
-	unzip icons.zip
-
 To build then, enter:

-	cd nsis
 	makensis gvim.nsi
@@ -2,5 +2,5 @@
 !ifndef __GVIM_VER__NSH__
 !define __GVIM_VER__NSH__
 !define VER_MAJOR 8
-!define VER_MINOR 2
+!define VER_MINOR 0
 !endif
@@ -1,175 +0,0 @@
-# vi:set ts=8 sts=4 sw=4 et fdm=marker:
-#
-# danish.nsi: Danish language strings for gvim NSIS installer.
-#
-# Locale ID    : 1030
-# fileencoding : UTF-8
-# Author       : scootergrisen
-
-!insertmacro MUI_LANGUAGE "Danish"
-
-
-# Overwrite the default translation.
-# These strings should be always English.  Otherwise dosinst.c fails.
-LangString ^SetupCaption     ${LANG_DANISH}         "$(^Name) Setup"
-LangString ^UninstallCaption ${LANG_DANISH}         "$(^Name) Uninstall"
-
-##############################################################################
-# MUI Configuration Strings                                               {{{1
-##############################################################################
-
-#LangString str_dest_folder          ${LANG_DANISH}     "Destinationsmappe (skal slutte med $\"vim$\")"
-
-LangString str_show_readme          ${LANG_DANISH}     "Vis README efter installationen er gennemført"
-
-# Install types:
-LangString str_type_typical         ${LANG_DANISH}     "Typisk"
-
-LangString str_type_minimal         ${LANG_DANISH}     "Minimal"
-
-LangString str_type_full            ${LANG_DANISH}     "Fuld"
-
-
-##############################################################################
-# Section Titles & Description                                            {{{1
-##############################################################################
-
-LangString str_section_old_ver      ${LANG_DANISH}     "Afinstaller eksisterende version(er)"
-LangString str_desc_old_ver         ${LANG_DANISH}     "Afinstaller eksisterende Vim-version(er) fra dit system."
-
-LangString str_section_exe          ${LANG_DANISH}     "Vim GUI og afviklingsfiler"
-LangString str_desc_exe             ${LANG_DANISH}     "Vim GUI-eksekverbare- og afviklingsfiler. Komponenten kræves."
-
-LangString str_section_console      ${LANG_DANISH}     "Vim-konsolprogram"
-LangString str_desc_console         ${LANG_DANISH}     "Konsolversion af Vim (vim.exe)."
-
-LangString str_section_batch        ${LANG_DANISH}     "Opret .bat-filer"
-LangString str_desc_batch           ${LANG_DANISH}     "Opret .bat-filer til Vim-varianter i Windows-mappen til brug fra kommandolinjen."
-
-LangString str_group_icons          ${LANG_DANISH}     "Opret ikoner til Vim"
-LangString str_desc_icons           ${LANG_DANISH}     "Opret ikoner til Vim diverse steder for at hjælpe med at gøre adgangen let."
-
-LangString str_section_desktop      ${LANG_DANISH}     "På skrivebordet"
-LangString str_desc_desktop         ${LANG_DANISH}     "Opret ikoner til gVim-eksekverbare på skrivebordet."
-
-LangString str_section_start_menu   ${LANG_DANISH}     "I Programmer-mappen i menuen Start"
-LangString str_desc_start_menu      ${LANG_DANISH}     "Tilføj Vim i Programmer-mappen i menuen Start."
-
-#LangString str_section_quick_launch ${LANG_DANISH}     "I værktøjslinjen Hurtig start"
-#LangString str_desc_quick_launch    ${LANG_DANISH}     "Tilføj Vim-genvej i værktøjslinjen Hurtig start."
-
-LangString str_section_edit_with    ${LANG_DANISH}     "Tilføj Vim-genvejsmenu"
-LangString str_desc_edit_with       ${LANG_DANISH}     "Tilføj Vim til listen i $\"Åbn med...$\"-genvejsmenuen."
-
-#LangString str_section_edit_with32  ${LANG_DANISH}     "32-bit-version"
-#LangString str_desc_edit_with32     ${LANG_DANISH}     "Tilføj Vim til listen i $\"Åbn med...$\"-genvejsmenuen for 32-bit-programmer."
-
-#LangString str_section_edit_with64  ${LANG_DANISH}     "64-bit-version"
-#LangString str_desc_edit_with64     ${LANG_DANISH}     "Tilføj Vim til listen i $\"Åbn med...$\"-genvejsmenuen for 64-bit-programmer."
-
-LangString str_section_vim_rc       ${LANG_DANISH}     "Opret standardkonfiguration"
-LangString str_desc_vim_rc          ${LANG_DANISH}     "Opret en standardkonfigurationsfil (_vimrc) hvis der ikke allerede findes en."
-
-LangString str_group_plugin         ${LANG_DANISH}     "Opret plugin-mapper"
-LangString str_desc_plugin          ${LANG_DANISH}     "Opret plugin-mapper. Plugin-mapper giver mulighed for at udvide Vim ved at slippe en fil i en mappen."
-
-LangString str_section_plugin_home  ${LANG_DANISH}     "Private"
-LangString str_desc_plugin_home     ${LANG_DANISH}     "Opret plugin-mapper i HOME (hvis du har defineret et) eller Vim-installationsmappe."
-
-LangString str_section_plugin_vim   ${LANG_DANISH}     "Delte"
-LangString str_desc_plugin_vim      ${LANG_DANISH}     "Opret plugin-mapper i Vim-installationsmappe, det bruges af alle på systemet."
-
-LangString str_section_vis_vim      ${LANG_DANISH}     "VisVim-udvidelser"
-LangString str_desc_vis_vim         ${LANG_DANISH}     "VisVim-udvidelser til integrering i Microsoft Visual Studio."
-
-LangString str_section_nls          ${LANG_DANISH}     "Understøttelse af modersmål"
-LangString str_desc_nls             ${LANG_DANISH}     "Installer filer til understøttelse af modersmål."
-
-LangString str_unsection_register   ${LANG_DANISH}     "Afregistrer Vim"
-LangString str_desc_unregister      ${LANG_DANISH}     "Afregistrer Vim fra systemet."
-
-LangString str_unsection_exe        ${LANG_DANISH}     "Fjern Vim-eksekverbare-/afviklingsfiler"
-LangString str_desc_rm_exe          ${LANG_DANISH}     "Fjern alle Vim-eksekverbare- og afviklingsfiler."
-
-LangString str_ungroup_plugin       ${LANG_DANISH}     "Fjern plugin-mapper"
-LangString str_desc_rm_plugin       ${LANG_DANISH}     "Fjern plugin-mapperne, hvis de er tomme."
-
-LangString str_unsection_plugin_home ${LANG_DANISH}     "Private"
-LangString str_desc_rm_plugin_home  ${LANG_DANISH}     "Fjern plugin-mapperne fra HOME-mappen."
-
-LangString str_unsection_plugin_vim ${LANG_DANISH}     "Delte"
-LangString str_desc_rm_plugin_vim   ${LANG_DANISH}     "Fjern plugin-mapperne fra Vim-installationsmappen."
-
-LangString str_unsection_rootdir    ${LANG_DANISH}     "Fjern Vim-rodmappen"
-LangString str_desc_rm_rootdir      ${LANG_DANISH}     "Fjern Vim-rodmappen. Den indeholder dine Vim-konfigurationsfiler!"
-
-
-##############################################################################
-# Messages                                                                {{{1
-##############################################################################
-
-#LangString str_msg_too_many_ver  ${LANG_DANISH}     "Fandt $vim_old_ver_count Vim-versioner på dit system.$\r$\nInstallationsguiden kan højst håndtere ${VIM_MAX_OLD_VER}-versioner.$\r$\nFjern venligst nogle versioner og start igen."
-
-#LangString str_msg_invalid_root  ${LANG_DANISH}     "Ugyldig installationssti: $vim_install_root!$\r$\nDen skal slutte med $\"vim$\"."
-
-#LangString str_msg_bin_mismatch  ${LANG_DANISH}     "Uoverensstemmelse i binære sti!$\r$\n$\r$\nForventede at den binære sti var $\"$vim_bin_path$\",$\r$\nmen systemet indikerer at den binære sti er $\"$INSTDIR$\"."
-
-#LangString str_msg_vim_running   ${LANG_DANISH}     "Vim kører stadig på dit system.$\r$\nLuk venligst alle instanser af Vim inden du fortsætter."
-
-#LangString str_msg_register_ole  ${LANG_DANISH}     "Forsøger at registrere Vim med OLE. Der er ingen meddelelse til at indikere om det virker eller ej."
-
-#LangString str_msg_unreg_ole     ${LANG_DANISH}     "Forsøger at afregistrere Vim med OLE. Der er ingen meddelelse til at indikere om det virker eller ej."
-
-#LangString str_msg_rm_start      ${LANG_DANISH}     "Afinstallerer følgende version:"
-
-#LangString str_msg_rm_fail       ${LANG_DANISH}     "Kunne ikke afinstallere følgende version:"
-
-#LangString str_msg_no_rm_key     ${LANG_DANISH}     "Kan ikke finde registreringsdatabasenøgle for afinstallationsguiden."
-
-#LangString str_msg_no_rm_reg     ${LANG_DANISH}     "Kan ikke finde afinstallationsguiden fra registreringsdatabasen."
-
-#LangString str_msg_no_rm_exe     ${LANG_DANISH}     "Kan ikke tilgå afinstallationsguide."
-
-#LangString str_msg_rm_copy_fail  ${LANG_DANISH}     "Kunne ikke kopiere afinstallationsguide til midlertidig mappe."
-
-#LangString str_msg_rm_run_fail   ${LANG_DANISH}     "Kunne ikke køre afinstallationsguide."
-
-#LangString str_msg_abort_install ${LANG_DANISH}     "Installationsguiden vil afbryde."
-
-LangString str_msg_install_fail  ${LANG_DANISH}     "Installationen mislykkedes. Bedre held næste gang."
-
-LangString str_msg_rm_exe_fail   ${LANG_DANISH}     "Nogle filer i $0 er ikke blevet slettet!$\r$\nDu skal gøre det manuelt."
-
-#LangString str_msg_rm_root_fail  ${LANG_DANISH}     "ADVARSEL: Kan ikke fjerne $\"$vim_install_root$\", den er ikke tom!"
-
-LangString str_msg_uninstalling  ${LANG_DANISH}     "Afinstallerer den gamle version..."
-
-LangString str_msg_registering   ${LANG_DANISH}     "Registrerer..."
-
-LangString str_msg_unregistering ${LANG_DANISH}     "Afregistrerer..."
-
-
-##############################################################################
-# Dialog Box                                                              {{{1
-##############################################################################
-
-LangString str_vimrc_page_title    ${LANG_DANISH}     "Vælg _vimrc-indstillinger"
-LangString str_vimrc_page_subtitle ${LANG_DANISH}     "Vælg indstillingerne til forbedring, tastatur og mus."
-
-LangString str_msg_compat_title    ${LANG_DANISH}     " Vi- / Vim-opførsel "
-LangString str_msg_compat_desc     ${LANG_DANISH}     "&Kompatibilitet og forbedringer"
-LangString str_msg_compat_vi       ${LANG_DANISH}     "Vi-kompatibel"
-LangString str_msg_compat_vim      ${LANG_DANISH}     "Vim original"
-LangString str_msg_compat_defaults ${LANG_DANISH}     "Vim med nogle forbedringer (indlæs defaults.vim)"
-LangString str_msg_compat_all      ${LANG_DANISH}     "Vim med alle forbedringer (indlæs vimrc_example.vim) (standard)"
-
-LangString str_msg_keymap_title   ${LANG_DANISH}     " Tilknytninger "
-LangString str_msg_keymap_desc    ${LANG_DANISH}     "&Gentilknyt nogle få taster for Windows (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F osv.)"
-LangString str_msg_keymap_default ${LANG_DANISH}     "Gentilknyt ikke taster (standard)"
-LangString str_msg_keymap_windows ${LANG_DANISH}     "Gentilknyt nogle få taster"
-
-LangString str_msg_mouse_title   ${LANG_DANISH}     " Mus "
-LangString str_msg_mouse_desc    ${LANG_DANISH}     "&Opførsel af højre og venstre knapper"
-LangString str_msg_mouse_default ${LANG_DANISH}     "Højre: genvejsmenu, venstre: visuel tilstand (standard)"
-LangString str_msg_mouse_windows ${LANG_DANISH}     "Højre: genvejsmenu, venstre: vælg-tilstand (Windows)"
-LangString str_msg_mouse_unix    ${LANG_DANISH}     "Højre: udvider markering, venstre: visuel tilstand (Unix)"
@@ -1,281 +0,0 @@
-# vi:set ts=8 sts=4 sw=4 et fdm=marker:
-#
-# dutch.nsi : Dutch language strings for gvim NSIS installer.
-#
-# Locale ID    : 1043
-# Locale Name  : nl
-# fileencoding : UTF-8
-# Author       : Peter Odding <peter@peterodding.com>
-
-!insertmacro MUI_LANGUAGE "Dutch"
-
-
-# Overwrite the default translation.
-# These strings should be always English.  Otherwise dosinst.c fails.
-LangString ^SetupCaption     ${LANG_DUTCH} \
-        "$(^Name) Setup"
-LangString ^UninstallCaption ${LANG_DUTCH} \
-        "$(^Name) Uninstall"
-
-##############################################################################
-# MUI Configuration Strings                                               {{{1
-##############################################################################
-
-#LangString str_dest_folder          ${LANG_DUTCH} \
-#    "Doelmap (moet eindigen op $\"vim$\")"
-
-LangString str_show_readme          ${LANG_DUTCH} \
-    "README weergeven na installatie"
-
-# Install types:
-LangString str_type_typical         ${LANG_DUTCH} \
-    "Gebruikelijk"
-
-LangString str_type_minimal         ${LANG_DUTCH} \
-    "Minimaal"
-
-LangString str_type_full            ${LANG_DUTCH} \
-    "Volledig"
-
-
-##############################################################################
-# Section Titles & Description                                            {{{1
-##############################################################################
-
-LangString str_section_old_ver      ${LANG_DUTCH} \
-    "Bestaande versie(s) de-installeren"
-LangString str_desc_old_ver         ${LANG_DUTCH} \
-    "Bestaande Vim versie(s) van je systeem verwijderen."
-
-LangString str_section_exe          ${LANG_DUTCH} \
-    "Vim GUI"
-LangString str_desc_exe             ${LANG_DUTCH} \
-    "Vim GUI uitvoerbare bestanden en runtime bestanden.  Dit component is vereist."
-
-LangString str_section_console      ${LANG_DUTCH} \
-    "Vim console programma"
-LangString str_desc_console         ${LANG_DUTCH} \
-    "Console versie van Vim (vim.exe)."
-
-LangString str_section_batch        ${LANG_DUTCH} \
-    "Creëer .bat bestanden"
-LangString str_desc_batch           ${LANG_DUTCH} \
-    "Creëer .bat bestanden voor Vim varianten in de Windows map voor \
-     commando regel gebruik."
-
-LangString str_group_icons          ${LANG_DUTCH} \
-    "Creëer pictogrammen for Vim"
-LangString str_desc_icons           ${LANG_DUTCH} \
-    "Creëer pictogrammen voor Vim op verschillende locaties voor gemakkelijke toegang."
-
-LangString str_section_desktop      ${LANG_DUTCH} \
-    "Op het bureaublad"
-LangString str_desc_desktop         ${LANG_DUTCH} \
-    "Creëer pictogrammen voor Vim uitvoerbare bestanden op het bureaublad."
-
-LangString str_section_start_menu   ${LANG_DUTCH} \
-    "In de Programma's map in het start menu"
-LangString str_desc_start_menu      ${LANG_DUTCH} \
-    "Voeg Vim toe aan de programma's map in het start menu.  \
-     Van toepassing op Windows 95 en later."
-
-#LangString str_section_quick_launch ${LANG_DUTCH} \
-#    "In de snel starten balk"
-#LangString str_desc_quick_launch    ${LANG_DUTCH} \
-#    "Voeg Vim snelkoppeling toe aan de snel starten balk."
-
-LangString str_section_edit_with    ${LANG_DUTCH} \
-    "Voeg Vim contextmenu toe"
-LangString str_desc_edit_with       ${LANG_DUTCH} \
-    "Voeg Vim toe aan de $\"Openen met...$\" contextmenu lijst."
-
-#LangString str_section_edit_with32  ${LANG_DUTCH} \
-#    "32-bit versie"
-#LangString str_desc_edit_with32     ${LANG_DUTCH} \
-#    "Voeg Vim toe aan de $\"Openen met...$\" contextmenu lijst \
-#     voor 32-bit toepassingen."
-
-#LangString str_section_edit_with64  ${LANG_DUTCH} \
-#    "64-bit versie"
-#LangString str_desc_edit_with64     ${LANG_DUTCH} \
-#    "Voeg Vim toe aan de $\"Openen met...$\" contextmenu lijst \
-#     voor 64-bit toepassingen."
-
-LangString str_section_vim_rc       ${LANG_DUTCH} \
-    "Creëer standaard configuratie"
-LangString str_desc_vim_rc          ${LANG_DUTCH} \
-    "Creëer een standaard configuratie bestand (_vimrc) als er nog geen bestaat."
-
-LangString str_group_plugin         ${LANG_DUTCH} \
-    "Creëer Plugin mappen"
-LangString str_desc_plugin          ${LANG_DUTCH} \
-    "Creëer plugin mappen.  Plugin mappen maken het mogelijk om \
-     Vim uit te breiden door een bestand in een map te plaatsen."
-
-LangString str_section_plugin_home  ${LANG_DUTCH} \
-    "Privé"
-LangString str_desc_plugin_home     ${LANG_DUTCH} \
-    "Create plugin directories in HOME directory."
-
-LangString str_section_plugin_vim   ${LANG_DUTCH} \
-    "Gedeeld"
-LangString str_desc_plugin_vim      ${LANG_DUTCH} \
-    "Creëer plugin mappen in Vim installatie map, deze worden gebruikt \
-     voor iedereen op het systeem."
-
-LangString str_section_vis_vim      ${LANG_DUTCH} \
-    "VisVim extensie"
-LangString str_desc_vis_vim         ${LANG_DUTCH} \
-    "VisVim extensie voor Microsoft Visual Studio integratie."
-
-LangString str_section_nls          ${LANG_DUTCH} \
-    "Ondersteuning voor andere talen"
-LangString str_desc_nls             ${LANG_DUTCH} \
-    "Bestanden voor ondersteuning van andere talen dan Engels installeren."
-
-LangString str_unsection_register   ${LANG_DUTCH} \
-    "Vim afmelden"
-LangString str_desc_unregister      ${LANG_DUTCH} \
-    "Registratie van Vim in het systeem ongedaan maken."
-
-LangString str_unsection_exe        ${LANG_DUTCH} \
-    "Vim uitvoerbare/runtime bestanden verwijderen"
-LangString str_desc_rm_exe          ${LANG_DUTCH} \
-    "Verwijder alle Vim uitvoerbare bestanden en runtime bestanden."
-
-LangString str_ungroup_plugin       ${LANG_DUTCH} \
-    "Remove plugin directories"
-LangString str_desc_rm_plugin       ${LANG_DUTCH} \
-    "Remove the plugin directories if they are empty."
-
-LangString str_unsection_plugin_home ${LANG_DUTCH} \
-    "Privé"
-LangString str_desc_rm_plugin_home  ${LANG_DUTCH} \
-    "Remove the plugin directories from HOME directory."
-
-LangString str_unsection_plugin_vim ${LANG_DUTCH} \
-    "Gedeeld"
-LangString str_desc_rm_plugin_vim   ${LANG_DUTCH} \
-    "Remove the plugin directories from Vim install directory."
-
-LangString str_unsection_rootdir    ${LANG_DUTCH} \
-    "Remove the Vim root directory"
-LangString str_desc_rm_rootdir      ${LANG_DUTCH} \
-    "Remove the Vim root directory. It contains your Vim configuration files!"
-
-
-##############################################################################
-# Messages                                                                {{{1
-##############################################################################
-
-#LangString str_msg_too_many_ver  ${LANG_DUTCH} \
-#    "Er zijn $vim_old_ver_count Vim versies op je systeem gevonden.$\r$\n\
-#     Deze installatie kan omgaan met maximaal ${VIM_MAX_OLD_VER} versies.$\r$\n\
-#     Verwijder a.u.b. wat versies en probeer het dan opnieuw."
-
-#LangString str_msg_invalid_root  ${LANG_DUTCH} \
-#    "Ongeldig installatiepad: $vim_install_root!$\r$\n\
-#     Het moet eindelijk op $\"vim$\"."
-
-#LangString str_msg_bin_mismatch  ${LANG_DUTCH} \
-#    "Binair pad onjuist!$\r$\n$\r$\n\
-#     Het binaire pad zou $\"$vim_bin_path$\" moeten zijn,$\r$\n\
-#     maar het systeem geeft aan dat het binaire pad $\"$INSTDIR$\" is."
-
-#LangString str_msg_vim_running   ${LANG_DUTCH} \
-#    "Vim is nog actief op je systeem.$\r$\n\
-#     Sluit a.u.b. alle instanties van Vim voordat je verder gaat."
-
-#LangString str_msg_register_ole  ${LANG_DUTCH} \
-#    "Bezig met proberen om Vim te registreren met OLE. \
-#     Er is geen bericht dat aangeeft of deze operatie slaagt."
-
-#LangString str_msg_unreg_ole     ${LANG_DUTCH} \
-#    "Bezig met proberen om Vim te de-registreren met OLE. \
-#     Er is geen bericht dat aangeeft of deze operatie slaagt."
-
-#LangString str_msg_rm_start      ${LANG_DUTCH} \
-#    "De volgende versies worden verwijderd:"
-
-#LangString str_msg_rm_fail       ${LANG_DUTCH} \
-#    "De volgende versies konden niet worden verwijderd:"
-
-#LangString str_msg_no_rm_key     ${LANG_DUTCH} \
-#    "Kan de uninstaller register sleutel niet vinden."
-
-#LangString str_msg_no_rm_reg     ${LANG_DUTCH} \
-#    "Kan de uninstaller niet vinden via het register."
-
-#LangString str_msg_no_rm_exe     ${LANG_DUTCH} \
-#    "Kan geen toegang krijgen tot de uninstaller."
-
-#LangString str_msg_rm_copy_fail  ${LANG_DUTCH} \
-#    "Kon de uninstaller niet naar een tijdelijke map kopiëren."
-
-#LangString str_msg_rm_run_fail   ${LANG_DUTCH} \
-#    "Kon de uninstaller niet uitvoeren."
-
-#LangString str_msg_abort_install ${LANG_DUTCH} \
-#    "Installatie wordt gestopt."
-
-LangString str_msg_install_fail  ${LANG_DUTCH} \
-    "Installatie is mislukt."
-
-LangString str_msg_rm_exe_fail   ${LANG_DUTCH} \
-    "Sommige bestanden in $0 zijn niet verwijderd!$\r$\n\
-     Dit moet je handmatig doen."
-
-#LangString str_msg_rm_root_fail  ${LANG_DUTCH} \
-#    "WAARSCHUWING: Kan $\"$vim_install_root$\" niet verwijderen omdat het niet leeg is!"
-
-LangString str_msg_uninstalling  ${LANG_DUTCH} \
-    "Uninstalling the old version..."
-
-LangString str_msg_registering   ${LANG_DUTCH} \
-    "Registering..."
-
-LangString str_msg_unregistering ${LANG_DUTCH} \
-    "Unregistering..."
-
-
-##############################################################################
-# Dialog Box                                                              {{{1
-##############################################################################
-
-LangString str_vimrc_page_title    ${LANG_DUTCH} \
-    "Choose _vimrc settings"
-LangString str_vimrc_page_subtitle ${LANG_DUTCH} \
-    "Choose the settings for enhancement, keyboard and mouse."
-
-LangString str_msg_compat_title    ${LANG_DUTCH} \
-    " Vi / Vim behavior "
-LangString str_msg_compat_desc     ${LANG_DUTCH} \
-    "&Compatibility and enhancements"
-LangString str_msg_compat_vi       ${LANG_DUTCH} \
-    "Vi compatible"
-LangString str_msg_compat_vim      ${LANG_DUTCH} \
-    "Vim original"
-LangString str_msg_compat_defaults ${LANG_DUTCH} \
-    "Vim with some enhancements (load defaults.vim)"
-LangString str_msg_compat_all      ${LANG_DUTCH} \
-    "Vim with all enhancements (load vimrc_example.vim) (Default)"
-
-LangString str_msg_keymap_title   ${LANG_DUTCH} \
-    " Mappings "
-LangString str_msg_keymap_desc    ${LANG_DUTCH} \
-    "&Remap a few keys for Windows (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F, etc)"
-LangString str_msg_keymap_default ${LANG_DUTCH} \
-    "Do not remap keys (Default)"
-LangString str_msg_keymap_windows ${LANG_DUTCH} \
-    "Remap a few keys"
-
-LangString str_msg_mouse_title   ${LANG_DUTCH} \
-    " Mouse "
-LangString str_msg_mouse_desc    ${LANG_DUTCH} \
-    "&Behavior of right and left buttons"
-LangString str_msg_mouse_default ${LANG_DUTCH} \
-    "Right: popup menu, Left: visual mode (Default)"
-LangString str_msg_mouse_windows ${LANG_DUTCH} \
-    "Right: popup menu, Left: select mode (Windows)"
-LangString str_msg_mouse_unix    ${LANG_DUTCH} \
-    "Right: extends selection, Left: visual mode (Unix)"
@@ -1,280 +0,0 @@
-# vi:set ts=8 sts=4 sw=4 et fdm=marker:
-#
-# english.nsi: English language strings for gvim NSIS installer.
-#
-# Locale ID    : 1033
-# fileencoding : UTF-8
-# Author       : Guopeng Wen, Ken Takata
-
-!insertmacro MUI_LANGUAGE "English"
-
-
-# Overwrite the default translation.
-# These strings should be always English.  Otherwise dosinst.c fails.
-LangString ^SetupCaption     ${LANG_ENGLISH} \
-        "$(^Name) Setup"
-LangString ^UninstallCaption ${LANG_ENGLISH} \
-        "$(^Name) Uninstall"
-
-##############################################################################
-# MUI Configuration Strings                                               {{{1
-##############################################################################
-
-#LangString str_dest_folder          ${LANG_ENGLISH} \
-#    "Destination Folder (Must end with $\"vim$\")"
-
-LangString str_show_readme          ${LANG_ENGLISH} \
-    "Show README after installation finish"
-
-# Install types:
-LangString str_type_typical         ${LANG_ENGLISH} \
-    "Typical"
-
-LangString str_type_minimal         ${LANG_ENGLISH} \
-    "Minimal"
-
-LangString str_type_full            ${LANG_ENGLISH} \
-    "Full"
-
-
-##############################################################################
-# Section Titles & Description                                            {{{1
-##############################################################################
-
-LangString str_section_old_ver      ${LANG_ENGLISH} \
-    "Uninstall Existing Version(s)"
-LangString str_desc_old_ver         ${LANG_ENGLISH} \
-    "Uninstall existing Vim version(s) from your system."
-
-LangString str_section_exe          ${LANG_ENGLISH} \
-    "Vim GUI and runtime files"
-LangString str_desc_exe             ${LANG_ENGLISH} \
-    "Vim GUI executables and runtime files.  This component is required."
-
-LangString str_section_console      ${LANG_ENGLISH} \
-    "Vim console program"
-LangString str_desc_console         ${LANG_ENGLISH} \
-    "Console version of Vim (vim.exe)."
-
-LangString str_section_batch        ${LANG_ENGLISH} \
-    "Create .bat files"
-LangString str_desc_batch           ${LANG_ENGLISH} \
-    "Create .bat files for Vim variants in the Windows directory for \
-     command line use."
-
-LangString str_group_icons          ${LANG_ENGLISH} \
-    "Create icons for Vim"
-LangString str_desc_icons           ${LANG_ENGLISH} \
-    "Create icons for Vim at various locations to facilitate easy access."
-
-LangString str_section_desktop      ${LANG_ENGLISH} \
-    "On the Desktop"
-LangString str_desc_desktop         ${LANG_ENGLISH} \
-    "Create icons for gVim executables on the desktop."
-
-LangString str_section_start_menu   ${LANG_ENGLISH} \
-    "In the Start Menu Programs Folder"
-LangString str_desc_start_menu      ${LANG_ENGLISH} \
-    "Add Vim in the programs folder of the start menu."
-
-#LangString str_section_quick_launch ${LANG_ENGLISH} \
-#    "In the Quick Launch Bar"
-#LangString str_desc_quick_launch    ${LANG_ENGLISH} \
-#    "Add Vim shortcut in the quick launch bar."
-
-LangString str_section_edit_with    ${LANG_ENGLISH} \
-    "Add Vim Context Menu"
-LangString str_desc_edit_with       ${LANG_ENGLISH} \
-    "Add Vim to the $\"Open With...$\" context menu list."
-
-#LangString str_section_edit_with32  ${LANG_ENGLISH} \
-#    "32-bit Version"
-#LangString str_desc_edit_with32     ${LANG_ENGLISH} \
-#    "Add Vim to the $\"Open With...$\" context menu list \
-#     for 32-bit applications."
-
-#LangString str_section_edit_with64  ${LANG_ENGLISH} \
-#    "64-bit Version"
-#LangString str_desc_edit_with64     ${LANG_ENGLISH} \
-#    "Add Vim to the $\"Open With...$\" context menu list \
-#     for 64-bit applications."
-
-LangString str_section_vim_rc       ${LANG_ENGLISH} \
-    "Create Default Config"
-LangString str_desc_vim_rc          ${LANG_ENGLISH} \
-    "Create a default config file (_vimrc) if one does not already exist."
-
-LangString str_group_plugin         ${LANG_ENGLISH} \
-    "Create Plugin Directories"
-LangString str_desc_plugin          ${LANG_ENGLISH} \
-    "Create plugin directories.  Plugin directories allow extending Vim \
-     by dropping a file into a directory."
-
-LangString str_section_plugin_home  ${LANG_ENGLISH} \
-    "Private"
-LangString str_desc_plugin_home     ${LANG_ENGLISH} \
-    "Create plugin directories in HOME directory."
-
-LangString str_section_plugin_vim   ${LANG_ENGLISH} \
-    "Shared"
-LangString str_desc_plugin_vim      ${LANG_ENGLISH} \
-    "Create plugin directories in Vim install directory, it is used for \
-     everybody on the system."
-
-LangString str_section_vis_vim      ${LANG_ENGLISH} \
-    "VisVim Extension"
-LangString str_desc_vis_vim         ${LANG_ENGLISH} \
-    "VisVim Extension for Microsoft Visual Studio integration."
-
-LangString str_section_nls          ${LANG_ENGLISH} \
-    "Native Language Support"
-LangString str_desc_nls             ${LANG_ENGLISH} \
-    "Install files for native language support."
-
-LangString str_unsection_register   ${LANG_ENGLISH} \
-    "Unregister Vim"
-LangString str_desc_unregister      ${LANG_ENGLISH} \
-    "Unregister Vim from the system."
-
-LangString str_unsection_exe        ${LANG_ENGLISH} \
-    "Remove Vim Executables/Runtime Files"
-LangString str_desc_rm_exe          ${LANG_ENGLISH} \
-    "Remove all Vim executables and runtime files."
-
-LangString str_ungroup_plugin       ${LANG_ENGLISH} \
-    "Remove plugin directories"
-LangString str_desc_rm_plugin       ${LANG_ENGLISH} \
-    "Remove the plugin directories if they are empty."
-
-LangString str_unsection_plugin_home ${LANG_ENGLISH} \
-    "Private"
-LangString str_desc_rm_plugin_home  ${LANG_ENGLISH} \
-    "Remove the plugin directories from HOME directory."
-
-LangString str_unsection_plugin_vim ${LANG_ENGLISH} \
-    "Shared"
-LangString str_desc_rm_plugin_vim   ${LANG_ENGLISH} \
-    "Remove the plugin directories from Vim install directory."
-
-LangString str_unsection_rootdir    ${LANG_ENGLISH} \
-    "Remove the Vim root directory"
-LangString str_desc_rm_rootdir      ${LANG_ENGLISH} \
-    "Remove the Vim root directory. It contains your Vim configuration files!"
-
-
-##############################################################################
-# Messages                                                                {{{1
-##############################################################################
-
-#LangString str_msg_too_many_ver  ${LANG_ENGLISH} \
-#    "Found $vim_old_ver_count Vim versions on your system.$\r$\n\
-#     This installer can only handle ${VIM_MAX_OLD_VER} versions \
-#     at most.$\r$\n\
-#     Please remove some versions and start again."
-
-#LangString str_msg_invalid_root  ${LANG_ENGLISH} \
-#    "Invalid install path: $vim_install_root!$\r$\n\
-#     It should end with $\"vim$\"."
-
-#LangString str_msg_bin_mismatch  ${LANG_ENGLISH} \
-#    "Binary path mismatch!$\r$\n$\r$\n\
-#     Expect the binary path to be $\"$vim_bin_path$\",$\r$\n\
-#     but system indicates the binary path is $\"$INSTDIR$\"."
-
-#LangString str_msg_vim_running   ${LANG_ENGLISH} \
-#    "Vim is still running on your system.$\r$\n\
-#     Please close all instances of Vim before you continue."
-
-#LangString str_msg_register_ole  ${LANG_ENGLISH} \
-#    "Attempting to register Vim with OLE. \
-#     There is no message indicates whether this works or not."
-
-#LangString str_msg_unreg_ole     ${LANG_ENGLISH} \
-#    "Attempting to unregister Vim with OLE. \
-#     There is no message indicates whether this works or not."
-
-#LangString str_msg_rm_start      ${LANG_ENGLISH} \
-#    "Uninstalling the following version:"
-
-#LangString str_msg_rm_fail       ${LANG_ENGLISH} \
-#    "Fail to uninstall the following version:"
-
-#LangString str_msg_no_rm_key     ${LANG_ENGLISH} \
-#    "Cannot find uninstaller registry key."
-
-#LangString str_msg_no_rm_reg     ${LANG_ENGLISH} \
-#    "Cannot find uninstaller from registry."
-
-#LangString str_msg_no_rm_exe     ${LANG_ENGLISH} \
-#    "Cannot access uninstaller."
-
-#LangString str_msg_rm_copy_fail  ${LANG_ENGLISH} \
-#    "Fail to copy uninstaller to temporary directory."
-
-#LangString str_msg_rm_run_fail   ${LANG_ENGLISH} \
-#    "Fail to run uninstaller."
-
-#LangString str_msg_abort_install ${LANG_ENGLISH} \
-#    "Installer will abort."
-
-LangString str_msg_install_fail  ${LANG_ENGLISH} \
-    "Installation failed. Better luck next time."
-
-LangString str_msg_rm_exe_fail   ${LANG_ENGLISH} \
-    "Some files in $0 have not been deleted!$\r$\n\
-     You must do it manually."
-
-#LangString str_msg_rm_root_fail  ${LANG_ENGLISH} \
-#    "WARNING: Cannot remove $\"$vim_install_root$\", it is not empty!"
-
-LangString str_msg_uninstalling  ${LANG_ENGLISH} \
-    "Uninstalling the old version..."
-
-LangString str_msg_registering   ${LANG_ENGLISH} \
-    "Registering..."
-
-LangString str_msg_unregistering ${LANG_ENGLISH} \
-    "Unregistering..."
-
-
-##############################################################################
-# Dialog Box                                                              {{{1
-##############################################################################
-
-LangString str_vimrc_page_title    ${LANG_ENGLISH} \
-    "Choose _vimrc settings"
-LangString str_vimrc_page_subtitle ${LANG_ENGLISH} \
-    "Choose the settings for enhancement, keyboard and mouse."
-
-LangString str_msg_compat_title    ${LANG_ENGLISH} \
-    " Vi / Vim behavior "
-LangString str_msg_compat_desc     ${LANG_ENGLISH} \
-    "&Compatibility and enhancements"
-LangString str_msg_compat_vi       ${LANG_ENGLISH} \
-    "Vi compatible"
-LangString str_msg_compat_vim      ${LANG_ENGLISH} \
-    "Vim original"
-LangString str_msg_compat_defaults ${LANG_ENGLISH} \
-    "Vim with some enhancements (load defaults.vim)"
-LangString str_msg_compat_all      ${LANG_ENGLISH} \
-    "Vim with all enhancements (load vimrc_example.vim) (Default)"
-
-LangString str_msg_keymap_title   ${LANG_ENGLISH} \
-    " Mappings "
-LangString str_msg_keymap_desc    ${LANG_ENGLISH} \
-    "&Remap a few keys for Windows (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F, etc)"
-LangString str_msg_keymap_default ${LANG_ENGLISH} \
-    "Do not remap keys (Default)"
-LangString str_msg_keymap_windows ${LANG_ENGLISH} \
-    "Remap a few keys"
-
-LangString str_msg_mouse_title   ${LANG_ENGLISH} \
-    " Mouse "
-LangString str_msg_mouse_desc    ${LANG_ENGLISH} \
-    "&Behavior of right and left buttons"
-LangString str_msg_mouse_default ${LANG_ENGLISH} \
-    "Right: popup menu, Left: visual mode (Default)"
-LangString str_msg_mouse_windows ${LANG_ENGLISH} \
-    "Right: popup menu, Left: select mode (Windows)"
-LangString str_msg_mouse_unix    ${LANG_ENGLISH} \
-    "Right: extends selection, Left: visual mode (Unix)"
@@ -1,280 +0,0 @@
-# vi:set ts=8 sts=4 sw=4 et fdm=marker:
-#
-# german.nsi : German language strings for gvim NSIS installer.
-#
-# Locale ID    : 1031
-# fileencoding : UTF-8
-# Author       : Christian Brabandt, tux
-
-!insertmacro MUI_LANGUAGE "German"
-
-
-# Overwrite the default translation.
-# These strings should be always English.  Otherwise dosinst.c fails.
-LangString ^SetupCaption     ${LANG_GERMAN} \
-        "$(^Name) Setup"
-LangString ^UninstallCaption ${LANG_GERMAN} \
-        "$(^Name) Uninstall"
-
-##############################################################################
-# MUI Configuration Strings                                               {{{1
-##############################################################################
-
-#LangString str_dest_folder          ${LANG_GERMAN} \
-#    "Zielverzeichnis auswählen (muss auf $\"vim$\" enden)"
-
-LangString str_show_readme          ${LANG_GERMAN} \
-    "README-Datei nach der Installation anzeigen"
-
-# Install types:
-LangString str_type_typical         ${LANG_GERMAN} \
-    "Typisch"
-
-LangString str_type_minimal         ${LANG_GERMAN} \
-    "Minimal"
-
-LangString str_type_full            ${LANG_GERMAN} \
-    "Vollständig"
-
-
-##############################################################################
-# Section Titles & Description                                            {{{1
-##############################################################################
-
-LangString str_section_old_ver      ${LANG_GERMAN} \
-    "Vorherige Version deinstallieren"
-LangString str_desc_old_ver         ${LANG_GERMAN} \
-    "Vorherige installierte Versionen auf diesem System deinstallieren."
-
-LangString str_section_exe          ${LANG_GERMAN} \
-    "Vim GUI"
-LangString str_desc_exe             ${LANG_GERMAN} \
-    "Vim (Anwendung) und Laufzeitdateien (Dieser Teil ist zwingend \
-     erforderlich)."
-
-LangString str_section_console      ${LANG_GERMAN} \
-    "Vim Konsolenanwendung"
-LangString str_desc_console         ${LANG_GERMAN} \
-    "Konsolenversion von Vim."
-
-LangString str_section_batch        ${LANG_GERMAN} \
-    ".bat-Dateien erstellen"
-LangString str_desc_batch           ${LANG_GERMAN} \
-    ".bat-Dateien erstellen, um Vim in der Konsole auszuführen."
-
-LangString str_group_icons          ${LANG_GERMAN} \
-    "Vim-Verknüpfungen erstellen"
-LangString str_desc_icons           ${LANG_GERMAN} \
-    "Verknüpfungen mit Vim für einfachen Aufruf erstellen."
-
-LangString str_section_desktop      ${LANG_GERMAN} \
-    "Auf dem Desktop"
-LangString str_desc_desktop         ${LANG_GERMAN} \
-    "Icons für GVim auf dem Desktop erstellen."
-
-LangString str_section_start_menu   ${LANG_GERMAN} \
-    "Im Startmenü"
-LangString str_desc_start_menu      ${LANG_GERMAN} \
-    "Vim im Programmverzeichnis des Startmenüs hinzufügen."
-
-#LangString str_section_quick_launch ${LANG_GERMAN} \
-#    "In der Schnellstartleiste"
-#LangString str_desc_quick_launch    ${LANG_GERMAN} \
-#    "Verknüpfung zu Vim in der Schnellstartleiste ablegen."
-
-LangString str_section_edit_with    ${LANG_GERMAN} \
-    "Vim zum Kontextmenü hinzufügen"
-LangString str_desc_edit_with       ${LANG_GERMAN} \
-    "Vim in das $\"Öffnen mit...$\"-Kontextmenü einfügen."
-
-#LangString str_section_edit_with32  ${LANG_GERMAN} \
-#    "32-Bit-Version"
-#LangString str_desc_edit_with32     ${LANG_GERMAN} \
-#    "Vim in das $\"Öffnen mit...$\"-Kontextmenü \
-#     für 32-Bit-Anwendungen integrieren."
-
-#LangString str_section_edit_with64  ${LANG_GERMAN} \
-#    "64-Bit-Version"
-#LangString str_desc_edit_with64     ${LANG_GERMAN} \
-#    "Vim in das $\"Öffnen mit...$\"-Kontextmenü \
-#     für 64-Bit-Anwendungen integrieren."
-
-LangString str_section_vim_rc       ${LANG_GERMAN} \
-    "Standard-Konfigurationsdatei erstellen"
-LangString str_desc_vim_rc          ${LANG_GERMAN} \
-    "Eine Standard-Konfigurationsdatei (_vimrc) erstellen, \
-     falls noch keine existiert."
-
-LangString str_group_plugin         ${LANG_GERMAN} \
-    "Plugin-Verzeichnisse anlegen"
-LangString str_desc_plugin          ${LANG_GERMAN} \
-    "Plugin-Verzeichnisse anlegen. Plugins erlauben es, Vim \
-     um zusätzliche Funktionen zu erweitern."
-
-LangString str_section_plugin_home  ${LANG_GERMAN} \
-    "Privat"
-LangString str_desc_plugin_home     ${LANG_GERMAN} \
-    "Erstelle Plugin-Verzeichnis im HOME Benutzerverzeichnis."
-
-LangString str_section_plugin_vim   ${LANG_GERMAN} \
-    "Freigegeben"
-LangString str_desc_plugin_vim      ${LANG_GERMAN} \
-    "Plugin-Verzeichnisse im Vim-Installationsverzeichnis erstellen. Diese werden \
-     für alle Benutzer dieses Systems genutzt."
-
-LangString str_section_vis_vim      ${LANG_GERMAN} \
-    "VisVim-Erweiterung"
-LangString str_desc_vis_vim         ${LANG_GERMAN} \
-    "VisVim-Erweiterung zur Integration in Microsoft Visual Studio."
-
-LangString str_section_nls          ${LANG_GERMAN} \
-    "Unterstützung für andere Sprachen"
-LangString str_desc_nls             ${LANG_GERMAN} \
-    "Dateien zur Unterstützung anderer Sprachen als Englisch installieren."
-
-LangString str_unsection_register   ${LANG_GERMAN} \
-    "Vim deinstallieren"
-LangString str_desc_unregister      ${LANG_GERMAN} \
-    "Vim vom System entfernen."
-
-LangString str_unsection_exe        ${LANG_GERMAN} \
-    "Vim-Anwendung und Laufzeitdateien entfernen"
-LangString str_desc_rm_exe          ${LANG_GERMAN} \
-    "Alle Vim-Anwendungen und Laufzeitdateien von diesem System entfernen."
-
-LangString str_ungroup_plugin       ${LANG_GERMAN} \
-    "Entferne Plugin-Verzeichnisse"
-LangString str_desc_rm_plugin       ${LANG_GERMAN} \
-    "Entferne Plugin-Verzeichnisse, falls sie leer sind."
-
-LangString str_unsection_plugin_home ${LANG_GERMAN} \
-    "Privat"
-LangString str_desc_rm_plugin_home  ${LANG_GERMAN} \
-    "Entfernt die Plugin-Verzeichnisse aus dem HOME Benutzerverzeichnis."
-
-LangString str_unsection_plugin_vim ${LANG_GERMAN} \
-    "Freigegeben"
-LangString str_desc_rm_plugin_vim   ${LANG_GERMAN} \
-    "Entfernt das Plugin-Verzeichnis aus dem Vim-Installationsverzeichnis."
-
-LangString str_unsection_rootdir    ${LANG_GERMAN} \
-    "Entferne Vim Installationsverzeichnis"
-LangString str_desc_rm_rootdir      ${LANG_GERMAN} \
-    "Entfernt das Vim Installationsverzeichnis. Es enthält die Vim Konfigurationsdateien!"
-
-
-##############################################################################
-# Messages                                                                {{{1
-##############################################################################
-
-#LangString str_msg_too_many_ver  ${LANG_GERMAN} \
-#    "$vim_old_ver_count Vim-Versionen auf diesem System gefunden..$\r$\n\
-#     Dieser Installer kann maximal ${VIM_MAX_OLD_VER} Versionen \
-#     handhaben.$\r$\n\
-#     Bitte alte Versionen entfernen und noch einmal probieren."
-
-#LangString str_msg_invalid_root  ${LANG_GERMAN} \
-#    "Nicht gültiges Installationsverzeichnis: $vim_install_root!$\r$\n\
-#     Der Pfad muss auf $\"vim$\" enden."
-
-#LangString str_msg_bin_mismatch  ${LANG_GERMAN} \
-#    "Pfaddiskrepanz!$\r$\n$\r$\n\
-#     Erwarte Anwendungsverzeichnis $\"$vim_bin_path$\",$\r$\n\
-#     aber fand Anwendungspfad $\"$INSTDIR$\" vor."
-
-#LangString str_msg_vim_running   ${LANG_GERMAN} \
-#    "Laufender Vim-Prozess erkannt.$\r$\n\
-#     Bitte alle laufenden Vim-Prozesse vor dem Fortfahren beenden."
-
-#LangString str_msg_register_ole  ${LANG_GERMAN} \
-#    "Versuche OLE-Registrierung durchzuführen."
-
-#LangString str_msg_unreg_ole     ${LANG_GERMAN} \
-#    "Versuche OLE-Registrierung zu löschen."
-
-#LangString str_msg_rm_start      ${LANG_GERMAN} \
-#    "Deinstalliere die folgende Version:"
-
-#LangString str_msg_rm_fail       ${LANG_GERMAN} \
-#    "Deinstallation der Version fehlgeschlagen:"
-
-#LangString str_msg_no_rm_key     ${LANG_GERMAN} \
-#    "Deinstallationsschlüssel in der Registrierungsdatenbank nicht gefunden."
-
-#LangString str_msg_no_rm_reg     ${LANG_GERMAN} \
-#    "Kein Uninstaller in der Registrierungsdatenbank gefunden."
-
-#LangString str_msg_no_rm_exe     ${LANG_GERMAN} \
-#    "Kein Zugriff auf den Uninstaller."
-
-#LangString str_msg_rm_copy_fail  ${LANG_GERMAN} \
-#    "Fehler beim Kopieren des Uninstallers in ein temporäres Verzeichnis."
-
-#LangString str_msg_rm_run_fail   ${LANG_GERMAN} \
-#    "Fehler beim Aufruf des Uninstallers."
-
-#LangString str_msg_abort_install ${LANG_GERMAN} \
-#    "Installation wird abgebrochen."
-
-LangString str_msg_install_fail  ${LANG_GERMAN} \
-    "Installation fehlerhaft beendet."
-
-LangString str_msg_rm_exe_fail   ${LANG_GERMAN} \
-    "Einige Dateien im Pfad $0 konnten nicht gelöscht werden!$\r$\n\
-     Diese Dateien müssen manuell gelöscht werden."
-
-#LangString str_msg_rm_root_fail  ${LANG_GERMAN} \
-#    "Achtung: Kann Verzeichnis $\"$vim_install_root$\" nicht entfernen, \
-#     weil es nicht leer ist!"
-
-LangString str_msg_uninstalling  ${LANG_GERMAN} \
-    "Deinstalliere alte Version..."
-
-LangString str_msg_registering   ${LANG_GERMAN} \
-    "Registriere..."
-
-LangString str_msg_unregistering ${LANG_GERMAN} \
-    "Entferne Registrierung..."
-
-
-##############################################################################
-# Dialog Box                                                              {{{1
-##############################################################################
-
-LangString str_vimrc_page_title    ${LANG_GERMAN} \
-    "Wähle _vimrc Konfigurationsoptionen"
-LangString str_vimrc_page_subtitle ${LANG_GERMAN} \
-    "Wähle Einstellungen zur Kompatibilität, Tastatur und Maus."
-
-LangString str_msg_compat_title    ${LANG_GERMAN} \
-    " Vi / Vim Verhalten "
-LangString str_msg_compat_desc     ${LANG_GERMAN} \
-    "&Kompatibilität und Erweiterungen"
-LangString str_msg_compat_vi       ${LANG_GERMAN} \
-    "Vi-kompatibel"
-LangString str_msg_compat_vim      ${LANG_GERMAN} \
-    "Vim Original"
-LangString str_msg_compat_defaults ${LANG_GERMAN} \
-    "Vim mit einigen Erweiterungen (Lädt defaults.vim)"
-LangString str_msg_compat_all      ${LANG_GERMAN} \
-    "Vim mit allen Erweiterungen (Lädt vimrc_example.vim) (Standard)"
-
-LangString str_msg_keymap_title   ${LANG_GERMAN} \
-    " Mappings für Windows Standard Tastenkombinationen "
-LangString str_msg_keymap_desc    ${LANG_GERMAN} \
-    "&Einige Tasten umkonfigurieren (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F, etc)"
-LangString str_msg_keymap_default ${LANG_GERMAN} \
-    "Keine Tasten umkonfigurieren (Standard)"
-LangString str_msg_keymap_windows ${LANG_GERMAN} \
-    "Einige Tasten umkonfigurieren"
-
-LangString str_msg_mouse_title   ${LANG_GERMAN} \
-    " Maus "
-LangString str_msg_mouse_desc    ${LANG_GERMAN} \
-    "&Verhalten der linken und rechten Buttons"
-LangString str_msg_mouse_default ${LANG_GERMAN} \
-    "Rechts: Popup Menü, Links: Visueller Modus (Standard)"
-LangString str_msg_mouse_windows ${LANG_GERMAN} \
-    "Rechts: Popup Menü, Links: Auswahl Modus (Windows)"
-LangString str_msg_mouse_unix    ${LANG_GERMAN} \
-    "Rechts: Auswahl erweitern, Links: Visueller Modus (Unix)"
@@ -1,283 +0,0 @@
-# vi:set ts=8 sts=4 sw=4 et fdm=marker:
-#
-# italian.nsi : Italian language strings for gvim NSIS installer.
-#
-# Locale ID    : 1040
-# Locale Name  : it
-# fileencoding : UTF-8
-# Author       : Antonio Colombo
-
-!insertmacro MUI_LANGUAGE "Italian"
-
-
-# Overwrite the default translation.
-# These strings should be always English.  Otherwise dosinst.c fails.
-LangString ^SetupCaption     ${LANG_ITALIAN} \
-        "$(^Name) Setup"
-LangString ^UninstallCaption ${LANG_ITALIAN} \
-        "$(^Name) Uninstall"
-
-##############################################################################
-# MUI Configuration Strings                                               {{{1
-##############################################################################
-
-#LangString str_dest_folder          ${LANG_ITALIAN} \
-#    "Cartella d'installazione (il nome deve finire con $\"vim$\")"
-
-LangString str_show_readme          ${LANG_ITALIAN} \
-    "Visualizza README al termine dell'installazione"
-
-# Install types:
-LangString str_type_typical         ${LANG_ITALIAN} \
-    "Tipica"
-
-LangString str_type_minimal         ${LANG_ITALIAN} \
-    "Minima"
-
-LangString str_type_full            ${LANG_ITALIAN} \
-    "Completa"
-
-
-##############################################################################
-# Section Titles & Description                                            {{{1
-##############################################################################
-
-LangString str_section_old_ver      ${LANG_ITALIAN} \
-    "Disinstalla versione/i esistente/i"
-LangString str_desc_old_ver         ${LANG_ITALIAN} \
-    "Disinstalla versione/i esistente/i di Vim dal vostro sistema."
-
-LangString str_section_exe          ${LANG_ITALIAN} \
-    "Vim GUI e file di supporto"
-LangString str_desc_exe             ${LANG_ITALIAN} \
-    "Vim GUI programmi e file di supporto.  Questa componente è indispensabile."
-
-LangString str_section_console      ${LANG_ITALIAN} \
-    "Vim console (vim.exe per MS-DOS)"
-LangString str_desc_console         ${LANG_ITALIAN} \
-    "Versione console di Vim (vim.exe)."
-
-LangString str_section_batch        ${LANG_ITALIAN} \
-    "Crea file .bat"
-LangString str_desc_batch           ${LANG_ITALIAN} \
-    "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"
-LangString str_desc_icons           ${LANG_ITALIAN} \
-    "Crea icone per Vim in vari posti, per rendere facile l'accesso."
-
-LangString str_section_desktop      ${LANG_ITALIAN} \
-    "Sul Desktop"
-LangString str_desc_desktop         ${LANG_ITALIAN} \
-    "Crea icone per programma gVim sul desktop."
-
-LangString str_section_start_menu   ${LANG_ITALIAN} \
-    "Nella cartella del menù START"
-LangString str_desc_start_menu      ${LANG_ITALIAN} \
-    "Aggiungi Vim alle cartelle del menù START."
-
-#LangString str_section_quick_launch ${LANG_ITALIAN} \
-#    "Nella barra di Avvio Veloce"
-#LangString str_desc_quick_launch    ${LANG_ITALIAN} \
-#    "Aggiungi un puntatore a Vim nella barra di Avvio Veloce."
-
-LangString str_section_edit_with    ${LANG_ITALIAN} \
-    "Aggiungi Vim al Menù Contestuale"
-LangString str_desc_edit_with       ${LANG_ITALIAN} \
-    "Aggiungi Vim alla lista contestuale $\"Apri con...$\"."
-
-#LangString str_section_edit_with32  ${LANG_ITALIAN} \
-#    "Versione a 32-bit"
-#LangString str_desc_edit_with32     ${LANG_ITALIAN} \
-#    "Aggiungi Vim alla lista contestuale $\"Apri con...$\" \
-#     per applicazioni a 32-bit."
-
-#LangString str_section_edit_with64  ${LANG_ITALIAN} \
-#    "Versione a 64-bit"
-#LangString str_desc_edit_with64     ${LANG_ITALIAN} \
-#    "Aggiungi Vim alla lista contestuale $\"Apri con...$\" \
-#     per applicazioni a 64-bit."
-
-LangString str_section_vim_rc       ${LANG_ITALIAN} \
-    "Crea configurazione di default"
-LangString str_desc_vim_rc          ${LANG_ITALIAN} \
-    "Crea un file configurazione di default (_vimrc) se non \
-     ne esiste già uno."
-
-LangString str_group_plugin         ${LANG_ITALIAN} \
-    "Crea directory per plugin"
-LangString str_desc_plugin          ${LANG_ITALIAN} \
-    "Crea directory per plugin.  Consentono di aggiungere funzionalità \
-     a Vim mettendo file in una di queste directory."
-
-LangString str_section_plugin_home  ${LANG_ITALIAN} \
-    "Private"
-LangString str_desc_plugin_home     ${LANG_ITALIAN} \
-    "Crea directory per plugin nella directory HOME."
-
-LangString str_section_plugin_vim   ${LANG_ITALIAN} \
-    "Condivise"
-LangString str_desc_plugin_vim      ${LANG_ITALIAN} \
-    "Crea directory per plugin nella directory di installazione di Vim \
-     per uso da parte di tutti gli utenti di questo sistema."
-
-LangString str_section_vis_vim      ${LANG_ITALIAN} \
-    "Estensione VisVim"
-LangString str_desc_vis_vim         ${LANG_ITALIAN} \
-    "Estensione VisVim per integrazione con Microsoft Visual Studio."
-
-LangString str_section_nls          ${LANG_ITALIAN} \
-    "Supporto Multilingue (NLS)"
-LangString str_desc_nls             ${LANG_ITALIAN} \
-    "Installa file per supportare messaggi in diverse lingue."
-
-LangString str_unsection_register   ${LANG_ITALIAN} \
-    "Togli Vim dal Registry"
-LangString str_desc_unregister      ${LANG_ITALIAN} \
-    "Togli Vim dal Registry di configurazione sistema."
-
-LangString str_unsection_exe        ${LANG_ITALIAN} \
-    "Cancella programmi/file di supporto Vim"
-LangString str_desc_rm_exe          ${LANG_ITALIAN} \
-    "Cancella tutti i programmi/file di supporto di Vim."
-
-LangString str_ungroup_plugin       ${LANG_ITALIAN} \
-    "Cancella le directory per plugin"
-LangString str_desc_rm_plugin       ${LANG_ITALIAN} \
-    "Cancella le directory per plugin se sono vuote."
-
-LangString str_unsection_plugin_home ${LANG_ITALIAN} \
-    "Private"
-LangString str_desc_rm_plugin_home  ${LANG_ITALIAN} \
-    "Cancella le directory per plugin dalla directory HOME."
-
-LangString str_unsection_plugin_vim ${LANG_ITALIAN} \
-    "Condivise"
-LangString str_desc_rm_plugin_vim   ${LANG_ITALIAN} \
-    "Cancella le directory per plugin dalla directory di installazione di Vim."
-
-LangString str_unsection_rootdir    ${LANG_ITALIAN} \
-    "Cancella la directory di installazione di Vim"
-LangString str_desc_rm_rootdir      ${LANG_ITALIAN} \
-    "Cancella la directory di installazione di Vim. Contiene i vostri file di configurazione!"
-
-
-##############################################################################
-# Messages                                                                {{{1
-##############################################################################
-
-#LangString str_msg_too_many_ver  ${LANG_ITALIAN} \
-#    "Trovate $vim_old_ver_count versioni di Vim sul vostro sistema.$\r$\n\
-#     Questo programma di installazione può gestire solo \
-#     ${VIM_MAX_OLD_VER} versioni.$\r$\n\
-#     Disinstallate qualche versione precedente e ricominciate."
-
-#LangString str_msg_invalid_root  ${LANG_ITALIAN} \
-#    "Nome di directory di installazione non valida: $vim_install_root!$\r$\n\
-#     Dovrebbe terminare con $\"vim$\"."
-
-#LangString str_msg_bin_mismatch  ${LANG_ITALIAN} \
-#    "Conflitto nella directory di installazione!$\r$\n$\r$\n\
-#     Cartella di installazione dev'essere $\"$vim_bin_path$\",$\r$\n\
-#     ma il sistema segnala invece $\"$INSTDIR$\"."
-
-#LangString str_msg_vim_running   ${LANG_ITALIAN} \
-#    "Vim ancora in esecuzione sul vostro sistema.$\r$\n\
-#     Chiudete tutte le sessioni attive di Vim per continuare."
-
-#LangString str_msg_register_ole  ${LANG_ITALIAN} \
-#    "Tentativo di registrazione di Vim con OLE. \
-#     Non c'è messaggio che indica se è riuscito o no."
-
-#LangString str_msg_unreg_ole     ${LANG_ITALIAN} \
-#    "Tentativo di togliere dal Registry Vim con OLE. \
-#     Non c'è messaggio che indica se è riuscito o no."
-
-#LangString str_msg_rm_start      ${LANG_ITALIAN} \
-#    "Disinstallazione della seguente versione:"
-
-#LangString str_msg_rm_fail       ${LANG_ITALIAN} \
-#    "Disinstallazione non riuscita per la seguente versione:"
-
-#LangString str_msg_no_rm_key     ${LANG_ITALIAN} \
-#    "Non riesco a trovare chiave di disinstallazione nel Registry."
-
-#LangString str_msg_no_rm_reg     ${LANG_ITALIAN} \
-#    "Non riesco a trovare programma disinstallazione nel Registry."
-
-#LangString str_msg_no_rm_exe     ${LANG_ITALIAN} \
-#    "Non riesco a trovare programma disinstallazione."
-
-#LangString str_msg_rm_copy_fail  ${LANG_ITALIAN} \
-#    "Non riesco a copiare programma disinstallazione a una \
-#     directory temporanea."
-
-#LangString str_msg_rm_run_fail   ${LANG_ITALIAN} \
-#    "Non riesco a eseguire programma disinstallazione."
-
-#LangString str_msg_abort_install ${LANG_ITALIAN} \
-#    "Il programma di disinstallazione verrà chiuso senza aver fatto nulla."
-
-LangString str_msg_install_fail  ${LANG_ITALIAN} \
-    "Installazione non riuscita. Miglior fortuna alla prossima!"
-
-LangString str_msg_rm_exe_fail   ${LANG_ITALIAN} \
-    "Alcuni file in $0 non sono stati cancellati!$\r$\n\
-     Dovreste cancellarli voi stessi."
-
-#LangString str_msg_rm_root_fail  ${LANG_ITALIAN} \
-#    "AVVISO: Non posso cancellare $\"$vim_install_root$\", non è vuota!"
-
-LangString str_msg_uninstalling  ${LANG_ITALIAN} \
-    "Sto disinstallando la vecchia versione..."
-
-LangString str_msg_registering   ${LANG_ITALIAN} \
-    "Sto aggiungendo Vim al Registry..."
-
-LangString str_msg_unregistering ${LANG_ITALIAN} \
-    "Sto togliendo Vim dal Registry..."
-
-
-##############################################################################
-# Dialog Box                                                              {{{1
-##############################################################################
-
-LangString str_vimrc_page_title    ${LANG_ITALIAN} \
-    "Scelta impostazioni _vimrc"
-LangString str_vimrc_page_subtitle ${LANG_ITALIAN} \
-    "Scelta impostazioni per funzionalità ulteriori, tastiera e mouse."
-
-LangString str_msg_compat_title    ${LANG_ITALIAN} \
-    " comportamento come Vi / Vim "
-LangString str_msg_compat_desc     ${LANG_ITALIAN} \
-    "&Compatibilità e funzionalità ulteriori"
-LangString str_msg_compat_vi       ${LANG_ITALIAN} \
-    "Compatibile con Vi"
-LangString str_msg_compat_vim      ${LANG_ITALIAN} \
-    "Vim originale"
-LangString str_msg_compat_defaults ${LANG_ITALIAN} \
-    "Vim con alcune funzionalità ulteriori (esecuzione defaults.vim)"
-LangString str_msg_compat_all      ${LANG_ITALIAN} \
-    "Vim con tutte le funzionalità ulteriori (esecuzione vimrc_example.vim) (Default)"
-
-LangString str_msg_keymap_title   ${LANG_ITALIAN} \
-    " Mappature "
-LangString str_msg_keymap_desc    ${LANG_ITALIAN} \
-    "&Rimappatura di alcuni tasti per Windows (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F, etc.)"
-LangString str_msg_keymap_default ${LANG_ITALIAN} \
-    "Non effettuare rimappature di tasti (Default)"
-LangString str_msg_keymap_windows ${LANG_ITALIAN} \
-    "Rimappare solo alcuni tasti"
-
-LangString str_msg_mouse_title   ${LANG_ITALIAN} \
-    " Mouse "
-LangString str_msg_mouse_desc    ${LANG_ITALIAN} \
-    "&Comportamento dei pulsanti destro e sinistro"
-LangString str_msg_mouse_default ${LANG_ITALIAN} \
-    "Destro: popup menu, Sinistro: modalità visuale (Default)"
-LangString str_msg_mouse_windows ${LANG_ITALIAN} \
-    "Destro: popup menu, Sinistro: seleziona modalità (Windows)"
-LangString str_msg_mouse_unix    ${LANG_ITALIAN} \
-    "Destro: estende selezione, Sinistro: modalità visuale (Unix)"
@@ -1,287 +0,0 @@
-# vi:set ts=8 sts=4 sw=4 et fdm=marker:
-#
-# japanese.nsi: Japanese language strings for gvim NSIS installer.
-#
-# Locale ID    : 1041
-# fileencoding : UTF-8
-# Author       : Ken Takata
-
-!insertmacro MUI_LANGUAGE "Japanese"
-
-
-# Overwrite the default translation.
-# These strings should be always English.  Otherwise dosinst.c fails.
-LangString ^SetupCaption     ${LANG_JAPANESE} \
-        "$(^Name) Setup"
-LangString ^UninstallCaption ${LANG_JAPANESE} \
-        "$(^Name) Uninstall"
-
-# Workarounds for NSIS Japanese translation. The messages are too long.
-# These should be better to be fixed by the NSIS upstream.
-LangString ^SpaceAvailable   ${LANG_JAPANESE} \
-        "利用可能なディスク容量："
-LangString ^SpaceRequired    ${LANG_JAPANESE} \
-        "必要なディスク容量："
-# Fix another NSIS Japanese translation. The access key was missing.
-LangString ^InstallBtn       ${LANG_JAPANESE} \
-        "インストール(&I)"
-
-##############################################################################
-# MUI Configuration Strings                                               {{{1
-##############################################################################
-
-#LangString str_dest_folder          ${LANG_JAPANESE} \
-#    "Destination Folder (Must end with $\"vim$\")"
-
-LangString str_show_readme          ${LANG_JAPANESE} \
-    "インストール完了後に README を表示する"
-
-# Install types:
-LangString str_type_typical         ${LANG_JAPANESE} \
-    "通常"
-
-LangString str_type_minimal         ${LANG_JAPANESE} \
-    "最小"
-
-LangString str_type_full            ${LANG_JAPANESE} \
-    "全て"
-
-
-##############################################################################
-# Section Titles & Description                                            {{{1
-##############################################################################
-
-LangString str_section_old_ver      ${LANG_JAPANESE} \
-    "既存のバージョンをアンインストール"
-LangString str_desc_old_ver         ${LANG_JAPANESE} \
-    "すでにインストールされている Vim をシステムから削除します。"
-
-LangString str_section_exe          ${LANG_JAPANESE} \
-    "Vim GUI とランタイムファイル"
-LangString str_desc_exe             ${LANG_JAPANESE} \
-    "Vim GUI 実行ファイルとラインタイムファイル。このコンポーネントは必須です。"
-
-LangString str_section_console      ${LANG_JAPANESE} \
-    "Vim コンソールプログラム"
-LangString str_desc_console         ${LANG_JAPANESE} \
-    "コンソール版の Vim (vim.exe)。"
-
-LangString str_section_batch        ${LANG_JAPANESE} \
-    ".bat ファイルを作成"
-LangString str_desc_batch           ${LANG_JAPANESE} \
-    "コマンドラインから Vim と関連コマンドを実行できるように、.bat ファイルを Windows ディレクトリに作成します。"
-
-LangString str_group_icons          ${LANG_JAPANESE} \
-    "Vim のアイコンを作成"
-LangString str_desc_icons           ${LANG_JAPANESE} \
-    "Vim を簡単に実行できるように、いくつかの場所にアイコンを作成します。"
-
-LangString str_section_desktop      ${LANG_JAPANESE} \
-    "デスクトップ上"
-LangString str_desc_desktop         ${LANG_JAPANESE} \
-    "gVim 実行ファイルのアイコンをデスクトップ上に作成します。"
-
-LangString str_section_start_menu   ${LANG_JAPANESE} \
-    "スタートメニューのプログラムフォルダー上"
-LangString str_desc_start_menu      ${LANG_JAPANESE} \
-    "Vim のアイコンをスタートメニューのプログラムフォルダー上に作成します。"
-
-#LangString str_section_quick_launch ${LANG_JAPANESE} \
-#    "In the Quick Launch Bar"
-#LangString str_desc_quick_launch    ${LANG_JAPANESE} \
-#    "Add Vim shortcut in the quick launch bar."
-
-LangString str_section_edit_with    ${LANG_JAPANESE} \
-    "Vim のコンテキストメニューを追加"
-LangString str_desc_edit_with       ${LANG_JAPANESE} \
-    "$\"Vimで編集する$\" をコンテキストメニューに追加します。"
-
-#LangString str_section_edit_with32  ${LANG_JAPANESE} \
-#    "32-bit Version"
-#LangString str_desc_edit_with32     ${LANG_JAPANESE} \
-#    "Add Vim to the $\"Open With...$\" context menu list \
-#     for 32-bit applications."
-
-#LangString str_section_edit_with64  ${LANG_JAPANESE} \
-#    "64-bit Version"
-#LangString str_desc_edit_with64     ${LANG_JAPANESE} \
-#    "Add Vim to the $\"Open With...$\" context menu list \
-#     for 64-bit applications."
-
-LangString str_section_vim_rc       ${LANG_JAPANESE} \
-    "既定のコンフィグを作成"
-LangString str_desc_vim_rc          ${LANG_JAPANESE} \
-    "もし無ければ、既定のコンフィグファイル (_vimrc) を作成します。"
-
-LangString str_group_plugin         ${LANG_JAPANESE} \
-    "プラグインディレクトリを作成"
-LangString str_desc_plugin          ${LANG_JAPANESE} \
-    "プラグインディレクトリを作成します。そこにプラグインファイルを置くことで Vim を拡張することができます。"
-
-LangString str_section_plugin_home  ${LANG_JAPANESE} \
-    "個人用"
-LangString str_desc_plugin_home     ${LANG_JAPANESE} \
-    "プラグインディレクトリをホームディレクトリに作成します。"
-
-LangString str_section_plugin_vim   ${LANG_JAPANESE} \
-    "共用"
-LangString str_desc_plugin_vim      ${LANG_JAPANESE} \
-    "プラグインディレクトリを Vim のインストールディレクトリに作成します。システムの全員で共有されます。"
-
-LangString str_section_vis_vim      ${LANG_JAPANESE} \
-    "VisVim 拡張"
-LangString str_desc_vis_vim         ${LANG_JAPANESE} \
-    "Microsoft Visual Studio 統合用の VisVim 拡張。"
-
-LangString str_section_nls          ${LANG_JAPANESE} \
-    "多言語サポート"
-LangString str_desc_nls             ${LANG_JAPANESE} \
-    "多言語サポート用のファイルをインストールします。"
-
-LangString str_unsection_register   ${LANG_JAPANESE} \
-    "Vim を登録解除"
-LangString str_desc_unregister      ${LANG_JAPANESE} \
-    "Vim をシステムから登録解除します。"
-
-LangString str_unsection_exe        ${LANG_JAPANESE} \
-    "Vim の実行ファイル/ランタイムファイルを削除"
-LangString str_desc_rm_exe          ${LANG_JAPANESE} \
-    "全ての Vim の実行ファイルとランタイムファイルを削除します。"
-
-LangString str_ungroup_plugin       ${LANG_JAPANESE} \
-    "プラグインディレクトリを削除"
-LangString str_desc_rm_plugin       ${LANG_JAPANESE} \
-    "プラグインディレクトリが空であればそれを削除します。"
-
-LangString str_unsection_plugin_home ${LANG_JAPANESE} \
-    "個人用"
-LangString str_desc_rm_plugin_home  ${LANG_JAPANESE} \
-    "プラグインディレクトリをホームディレクトリから削除します。"
-
-LangString str_unsection_plugin_vim ${LANG_JAPANESE} \
-    "共用"
-LangString str_desc_rm_plugin_vim   ${LANG_JAPANESE} \
-    "プラグインディレクトリを Vim のインストールディレクトリから削除します。"
-
-LangString str_unsection_rootdir    ${LANG_JAPANESE} \
-    "Vim のトップディレクトリを削除"
-LangString str_desc_rm_rootdir      ${LANG_JAPANESE} \
-    "Vim のトップディレクトリを削除します。あなたの Vim の設定ファイルも含まれていることに注意してください！"
-
-
-##############################################################################
-# Messages                                                                {{{1
-##############################################################################
-
-#LangString str_msg_too_many_ver  ${LANG_JAPANESE} \
-#    "Found $vim_old_ver_count Vim versions on your system.$\r$\n\
-#     This installer can only handle ${VIM_MAX_OLD_VER} versions \
-#     at most.$\r$\n\
-#     Please remove some versions and start again."
-
-#LangString str_msg_invalid_root  ${LANG_JAPANESE} \
-#    "Invalid install path: $vim_install_root!$\r$\n\
-#     It should end with $\"vim$\"."
-
-#LangString str_msg_bin_mismatch  ${LANG_JAPANESE} \
-#    "Binary path mismatch!$\r$\n$\r$\n\
-#     Expect the binary path to be $\"$vim_bin_path$\",$\r$\n\
-#     but system indicates the binary path is $\"$INSTDIR$\"."
-
-#LangString str_msg_vim_running   ${LANG_JAPANESE} \
-#    "Vim is still running on your system.$\r$\n\
-#     Please close all instances of Vim before you continue."
-
-#LangString str_msg_register_ole  ${LANG_JAPANESE} \
-#    "Attempting to register Vim with OLE. \
-#     There is no message indicates whether this works or not."
-
-#LangString str_msg_unreg_ole     ${LANG_JAPANESE} \
-#    "Attempting to unregister Vim with OLE. \
-#     There is no message indicates whether this works or not."
-
-#LangString str_msg_rm_start      ${LANG_JAPANESE} \
-#    "Uninstalling the following version:"
-
-#LangString str_msg_rm_fail       ${LANG_JAPANESE} \
-#    "Fail to uninstall the following version:"
-
-#LangString str_msg_no_rm_key     ${LANG_JAPANESE} \
-#    "Cannot find uninstaller registry key."
-
-#LangString str_msg_no_rm_reg     ${LANG_JAPANESE} \
-#    "Cannot find uninstaller from registry."
-
-#LangString str_msg_no_rm_exe     ${LANG_JAPANESE} \
-#    "Cannot access uninstaller."
-
-#LangString str_msg_rm_copy_fail  ${LANG_JAPANESE} \
-#    "Fail to copy uninstaller to temporary directory."
-
-#LangString str_msg_rm_run_fail   ${LANG_JAPANESE} \
-#    "Fail to run uninstaller."
-
-#LangString str_msg_abort_install ${LANG_JAPANESE} \
-#    "Installer will abort."
-
-LangString str_msg_install_fail  ${LANG_JAPANESE} \
-    "インストールに失敗しました。次はうまくいくことを祈ります。"
-
-LangString str_msg_rm_exe_fail   ${LANG_JAPANESE} \
-    "$0 内の一部のファイルは削除できませんでした!$\r$\n\
-     手動で削除する必要があります。"
-
-#LangString str_msg_rm_root_fail  ${LANG_JAPANESE} \
-#    "WARNING: Cannot remove $\"$vim_install_root$\", it is not empty!"
-
-LangString str_msg_uninstalling  ${LANG_JAPANESE} \
-    "古いバージョンをアンインストールしています..."
-
-LangString str_msg_registering   ${LANG_JAPANESE} \
-    "登録中..."
-
-LangString str_msg_unregistering ${LANG_JAPANESE} \
-    "登録解除中..."
-
-
-##############################################################################
-# Dialog Box                                                              {{{1
-##############################################################################
-
-LangString str_vimrc_page_title    ${LANG_JAPANESE} \
-    "_vimrc の設定を選んでください"
-LangString str_vimrc_page_subtitle ${LANG_JAPANESE} \
-    "拡張やキーボード、マウスの設定を選んでください。"
-
-LangString str_msg_compat_title    ${LANG_JAPANESE} \
-    " Vi / Vim の動作 "
-LangString str_msg_compat_desc     ${LANG_JAPANESE} \
-    "互換性と拡張(&C)"
-LangString str_msg_compat_vi       ${LANG_JAPANESE} \
-    "Vi 互換"
-LangString str_msg_compat_vim      ${LANG_JAPANESE} \
-    "Vim 独自"
-LangString str_msg_compat_defaults ${LANG_JAPANESE} \
-    "Vim 独自と多少の拡張 (defaults.vim を読み込み)"
-LangString str_msg_compat_all      ${LANG_JAPANESE} \
-    "Vim 独自と全ての拡張 (vimrc_example.vim を読み込み) (既定)"
-
-LangString str_msg_keymap_title   ${LANG_JAPANESE} \
-    " マッピング "
-LangString str_msg_keymap_desc    ${LANG_JAPANESE} \
-    "Windows用に一部のキーをリマップする(&R) (例: Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F など)"
-LangString str_msg_keymap_default ${LANG_JAPANESE} \
-    "リマップしない (既定)"
-LangString str_msg_keymap_windows ${LANG_JAPANESE} \
-    "リマップする"
-
-LangString str_msg_mouse_title   ${LANG_JAPANESE} \
-    " マウス "
-LangString str_msg_mouse_desc    ${LANG_JAPANESE} \
-    "右ボタンと左ボタンの動作(&B)"
-LangString str_msg_mouse_default ${LANG_JAPANESE} \
-    "右：ポップアップメニュー、左：ビジュアルモード (既定)"
-LangString str_msg_mouse_windows ${LANG_JAPANESE} \
-    "右：ポップアップメニュー、左：選択モード (Windows)"
-LangString str_msg_mouse_unix    ${LANG_JAPANESE} \
-    "右：選択を拡張、左：ビジュアルモード (Unix)"
@@ -1,287 +0,0 @@
-# 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,280 +0,0 @@
-# vi:set ts=8 sts=4 sw=4 et fdm=marker:
-#
-# serbian.nsi: Serbian language strings for gvim NSIS installer.
-#
-# Locale ID    : 3098
-# fileencoding : UTF-8
-# Author       : Ivan Pešić
-
-!insertmacro MUI_LANGUAGE "Српски"
-
-
-# Overwrite the default translation.
-# These strings should be always English.  Otherwise dosinst.c fails.
-LangString ^SetupCaption     ${LANG_SERBIAN} \
-        "$(^Name) Setup"
-LangString ^UninstallCaption ${LANG_SERBIAN} \
-        "$(^Name) Uninstall"
-
-##############################################################################
-# MUI Configuration Strings                                               {{{1
-##############################################################################
-
-#LangString str_dest_folder          ${LANG_SERBIAN} \
-#    "Destination Folder (Must end with $\"vim$\")"
-
-LangString str_show_readme          ${LANG_SERBIAN} \
-    "Прикажи ПРОЧИТАЈМЕ када се заврши инсталација"
-
-# Install types:
-LangString str_type_typical         ${LANG_SERBIAN} \
-    "Типична"
-
-LangString str_type_minimal         ${LANG_SERBIAN} \
-    "Минимална"
-
-LangString str_type_full            ${LANG_SERBIAN} \
-    "Пуна"
-
-
-##############################################################################
-# Section Titles & Description                                            {{{1
-##############################################################################
-
-LangString str_section_old_ver      ${LANG_SERBIAN} \
-    "Уклањање постојећ(е/их) верзиј(е/а)"
-LangString str_desc_old_ver         ${LANG_SERBIAN} \
-    "Уклања постојећ(у/е) Vim верзииј(у/е) из вашег система."
-
-LangString str_section_exe          ${LANG_SERBIAN} \
-    "Vim ГКИ и фајлови потребни за извршавање"
-LangString str_desc_exe             ${LANG_SERBIAN} \
-    "Vim ГКИ извршни фајлови и фајлови потребни током извршавања. Ова компонента је неопходна."
-
-LangString str_section_console      ${LANG_SERBIAN} \
-    "Vim конзолни програм"
-LangString str_desc_console         ${LANG_SERBIAN} \
-    "Конзолна верзија програма Vim (vim.exe)."
-
-LangString str_section_batch        ${LANG_SERBIAN} \
-    "Креирај .bat фајлове"
-LangString str_desc_batch           ${LANG_SERBIAN} \
-    "Креира у Windows директоријуму .bat фајлове за Vim варијанте \
-     у циљу коришћења из командне линије."
-
-LangString str_group_icons          ${LANG_SERBIAN} \
-    "Креирај иконе за Vim"
-LangString str_desc_icons           ${LANG_SERBIAN} \
-    "Креира иконе за Vim на различитим местима, како би се олакшао приступ."
-
-LangString str_section_desktop      ${LANG_SERBIAN} \
-    "На радној површини"
-LangString str_desc_desktop         ${LANG_SERBIAN} \
-    "Креира иконе за gVim извршне фајлове на радној површини."
-
-LangString str_section_start_menu   ${LANG_SERBIAN} \
-    "У фасцикли Програми унутар Старт менија"
-LangString str_desc_start_menu      ${LANG_SERBIAN} \
-    "Додаје Vim у фолдер Програми Старт менија."
-
-#LangString str_section_quick_launch ${LANG_SERBIAN} \
-#    "In the Quick Launch Bar"
-#LangString str_desc_quick_launch    ${LANG_SERBIAN} \
-#    "Add Vim shortcut in the quick launch bar."
-
-LangString str_section_edit_with    ${LANG_SERBIAN} \
-    "Додај Vim контекстни мени"
-LangString str_desc_edit_with       ${LANG_SERBIAN} \
-    "Додаје Vim у $\"Отвори помоћу...$\" листу контекстног менија."
-
-#LangString str_section_edit_with32  ${LANG_SERBIAN} \
-#    "32-bit Version"
-#LangString str_desc_edit_with32     ${LANG_SERBIAN} \
-#    "Add Vim to the $\"Open With...$\" context menu list \
-#     for 32-bit applications."
-
-#LangString str_section_edit_with64  ${LANG_SERBIAN} \
-#    "64-bit Version"
-#LangString str_desc_edit_with64     ${LANG_SERBIAN} \
-#    "Add Vim to the $\"Open With...$\" context menu list \
-#     for 64-bit applications."
-
-LangString str_section_vim_rc       ${LANG_SERBIAN} \
-    "Креирај Подразумевану конфигурацију"
-LangString str_desc_vim_rc          ${LANG_SERBIAN} \
-    "Креира подразумевани конфиг фајл (_vimrc) ако неки већ не постоји."
-
-LangString str_group_plugin         ${LANG_SERBIAN} \
-    "Креира директоријуме додатака"
-LangString str_desc_plugin          ${LANG_SERBIAN} \
-    "Креира директоријуме додатака. Ови директоријуми омогућавају проширење програма Vim \
-     убацивањем фајла у директоријум."
-
-LangString str_section_plugin_home  ${LANG_SERBIAN} \
-    "Приватне"
-LangString str_desc_plugin_home     ${LANG_SERBIAN} \
-    "Креира директоријуме додатака у HOME директоријуму."
-
-LangString str_section_plugin_vim   ${LANG_SERBIAN} \
-    "Дељене"
-LangString str_desc_plugin_vim      ${LANG_SERBIAN} \
-    "Креира директоријуме додатака у Vim инсталационом директоријуму, користе их сви \
-     на систему."
-
-LangString str_section_vis_vim      ${LANG_SERBIAN} \
-    "VisVim проширење"
-LangString str_desc_vis_vim         ${LANG_SERBIAN} \
-    "VisVim проширење за Microsoft Visual Studio интеграцију."
-
-LangString str_section_nls          ${LANG_SERBIAN} \
-    "Подршка за домаћи језик"
-LangString str_desc_nls             ${LANG_SERBIAN} \
-    "Инсталира фајлове за домаћу језичку подршку."
-
-LangString str_unsection_register   ${LANG_SERBIAN} \
-    "Поништи регистрацију Vim"
-LangString str_desc_unregister      ${LANG_SERBIAN} \
-    "Поништава регистрацију програма Vim на систему."
-
-LangString str_unsection_exe        ${LANG_SERBIAN} \
-    "Уклони Vim извршне фајлове/фајлове потребне у време извршавања"
-LangString str_desc_rm_exe          ${LANG_SERBIAN} \
-    "Уклања све Vim извршне фајлове и оне потребне у време извршавања."
-
-LangString str_ungroup_plugin       ${LANG_SERBIAN} \
-    "Укони директоријуме додатака"
-LangString str_desc_rm_plugin       ${LANG_SERBIAN} \
-    "Уклања директоријуме додатака ако су празни."
-
-LangString str_unsection_plugin_home ${LANG_SERBIAN} \
-    "Приватне"
-LangString str_desc_rm_plugin_home  ${LANG_SERBIAN} \
-    "Уклања директоријуме додатака из HOME директоријума."
-
-LangString str_unsection_plugin_vim ${LANG_SERBIAN} \
-    "Дељене"
-LangString str_desc_rm_plugin_vim   ${LANG_SERBIAN} \
-    "Уклања директоријуме додатака из Vim инсталациониг директоријума."
-
-LangString str_unsection_rootdir    ${LANG_SERBIAN} \
-    "Уклони Vim корени директоријум"
-LangString str_desc_rm_rootdir      ${LANG_SERBIAN} \
-    "Уклања Vim корени директоријум. Он садржи ваше Vim конфигурационе фајлове!"
-
-
-##############################################################################
-# Messages                                                                {{{1
-##############################################################################
-
-#LangString str_msg_too_many_ver  ${LANG_SERBIAN} \
-#    "Found $vim_old_ver_count Vim versions on your system.$\r$\n\
-#     This installer can only handle ${VIM_MAX_OLD_VER} versions \
-#     at most.$\r$\n\
-#     Please remove some versions and start again."
-
-#LangString str_msg_invalid_root  ${LANG_SERBIAN} \
-#    "Invalid install path: $vim_install_root!$\r$\n\
-#     It should end with $\"vim$\"."
-
-#LangString str_msg_bin_mismatch  ${LANG_SERBIAN} \
-#    "Binary path mismatch!$\r$\n$\r$\n\
-#     Expect the binary path to be $\"$vim_bin_path$\",$\r$\n\
-#     but system indicates the binary path is $\"$INSTDIR$\"."
-
-#LangString str_msg_vim_running   ${LANG_SERBIAN} \
-#    "Vim is still running on your system.$\r$\n\
-#     Please close all instances of Vim before you continue."
-
-#LangString str_msg_register_ole  ${LANG_SERBIAN} \
-#    "Attempting to register Vim with OLE. \
-#     There is no message indicates whether this works or not."
-
-#LangString str_msg_unreg_ole     ${LANG_SERBIAN} \
-#    "Attempting to unregister Vim with OLE. \
-#     There is no message indicates whether this works or not."
-
-#LangString str_msg_rm_start      ${LANG_SERBIAN} \
-#    "Uninstalling the following version:"
-
-#LangString str_msg_rm_fail       ${LANG_SERBIAN} \
-#    "Fail to uninstall the following version:"
-
-#LangString str_msg_no_rm_key     ${LANG_SERBIAN} \
-#    "Cannot find uninstaller registry key."
-
-#LangString str_msg_no_rm_reg     ${LANG_SERBIAN} \
-#    "Cannot find uninstaller from registry."
-
-#LangString str_msg_no_rm_exe     ${LANG_SERBIAN} \
-#    "Cannot access uninstaller."
-
-#LangString str_msg_rm_copy_fail  ${LANG_SERBIAN} \
-#    "Fail to copy uninstaller to temporary directory."
-
-#LangString str_msg_rm_run_fail   ${LANG_SERBIAN} \
-#    "Fail to run uninstaller."
-
-#LangString str_msg_abort_install ${LANG_SERBIAN} \
-#    "Installer will abort."
-
-LangString str_msg_install_fail  ${LANG_SERBIAN} \
-    "Инсталација није успела. Више среће идући пут."
-
-LangString str_msg_rm_exe_fail   ${LANG_SERBIAN} \
-    "Неки фајлови у $0 нису обрисани!$\r$\n\
-     Морате то ручно да обавите."
-
-#LangString str_msg_rm_root_fail  ${LANG_SERBIAN} \
-#    "WARNING: Cannot remove $\"$vim_install_root$\", it is not empty!"
-
-LangString str_msg_uninstalling  ${LANG_SERBIAN} \
-    "Уклањање старе верзије..."
-
-LangString str_msg_registering   ${LANG_SERBIAN} \
-    "Регистровање..."
-
-LangString str_msg_unregistering ${LANG_SERBIAN} \
-    "Поништавање регистрације..."
-
-
-##############################################################################
-# Dialog Box                                                              {{{1
-##############################################################################
-
-LangString str_vimrc_page_title    ${LANG_SERBIAN} \
-    "Изаберите _vimrc подешавања"
-LangString str_vimrc_page_subtitle ${LANG_SERBIAN} \
-    "Изаберите подешавања за побољшања, тастатуру и миша."
-
-LangString str_msg_compat_title    ${LANG_SERBIAN} \
-    " Vi / Vim понашање "
-LangString str_msg_compat_desc     ${LANG_SERBIAN} \
-    "&Компатибилност и побољшања"
-LangString str_msg_compat_vi       ${LANG_SERBIAN} \
-    "Vi компатибилно"
-LangString str_msg_compat_vim      ${LANG_SERBIAN} \
-    "Vim оригинално"
-LangString str_msg_compat_defaults ${LANG_SERBIAN} \
-    "Vim са неким побољшањима (учитава defaults.vim)"
-LangString str_msg_compat_all      ${LANG_SERBIAN} \
-    "Vim са свим побољшањима (учитава vimrc_example.vim) (Подразумевано)"
-
-LangString str_msg_keymap_title   ${LANG_SERBIAN} \
-    " Мапирања "
-LangString str_msg_keymap_desc    ${LANG_SERBIAN} \
-    "&Ремапира неколико тастера за Windows (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F, итд.)"
-LangString str_msg_keymap_default ${LANG_SERBIAN} \
-    "Немој да ремапираш тастере (Подразумевано)"
-LangString str_msg_keymap_windows ${LANG_SERBIAN} \
-    "Ремапира неколико тастера"
-
-LangString str_msg_mouse_title   ${LANG_SERBIAN} \
-    " Миш "
-LangString str_msg_mouse_desc    ${LANG_SERBIAN} \
-    "&Понашање левог и десног тастера"
-LangString str_msg_mouse_default ${LANG_SERBIAN} \
-    "Десни: искачући мени, Леви: визуелни режим (Подразумевано)"
-LangString str_msg_mouse_windows ${LANG_SERBIAN} \
-    "Десни: искачући мени, Леви: режим избора (Windows)"
-LangString str_msg_mouse_unix    ${LANG_SERBIAN} \
-    "Десни: проширује избор, Леви: визуелни режим (Unix)"
@@ -1,277 +0,0 @@
-# vi:set ts=8 sts=4 sw=4 et fdm=marker:
-#
-# simpchinese.nsi: Simplified Chinese language strings for gvim NSIS
-# installer.
-#
-# Locale ID    : 2052
-# fileencoding : UTF-8
-# Author       : Guopeng Wen, David Liu
-
-!insertmacro MUI_LANGUAGE "SimpChinese"
-
-
-# Overwrite the default translation.
-# These strings should be always English.  Otherwise dosinst.c fails.
-LangString ^SetupCaption     ${LANG_SIMPCHINESE} \
-        "$(^Name) Setup"
-LangString ^UninstallCaption ${LANG_SIMPCHINESE} \
-        "$(^Name) Uninstall"
-
-##############################################################################
-# MUI Configuration Strings                                               {{{1
-##############################################################################
-
-#LangString str_dest_folder          ${LANG_SIMPCHINESE} \
-#    "安装路径 (必须以 vim 结尾)"
-
-LangString str_show_readme          ${LANG_SIMPCHINESE} \
-    "安装完成后显示 README 文件"
-
-# Install types:
-LangString str_type_typical         ${LANG_SIMPCHINESE} \
-    "典型安装"
-
-LangString str_type_minimal         ${LANG_SIMPCHINESE} \
-    "最小安装"
-
-LangString str_type_full            ${LANG_SIMPCHINESE} \
-    "完全安装"
-
-
-##############################################################################
-# Section Titles & Description                                            {{{1
-##############################################################################
-
-LangString str_section_old_ver      ${LANG_SIMPCHINESE} \
-    "卸载旧版本"
-LangString str_desc_old_ver         ${LANG_SIMPCHINESE} \
-    "卸载系统上已存在的 Vim 版本"
-
-LangString str_section_exe          ${LANG_SIMPCHINESE} \
-    "安装 Vim 图形界面"
-LangString str_desc_exe             ${LANG_SIMPCHINESE} \
-    "安装 Vim 图形界面及运行时文件。此项为必选。"
-
-LangString str_section_console      ${LANG_SIMPCHINESE} \
-    "安装 Vim 控制台版本"
-LangString str_desc_console         ${LANG_SIMPCHINESE} \
-    "安装 Vim 的控制台版本（vim.exe）。"
-
-LangString str_section_batch        ${LANG_SIMPCHINESE} \
-    "安装批处理文件"
-LangString str_desc_batch           ${LANG_SIMPCHINESE} \
-    "为 Vim 的各种变体创建批处理文件，以便在命令行下运行 Vim。"
-
-LangString str_group_icons          ${LANG_SIMPCHINESE} \
-    "创建图标"
-LangString str_desc_icons           ${LANG_SIMPCHINESE} \
-    "为 Vim 创建若干图标，以方便使用 Vim。"
-
-LangString str_section_desktop      ${LANG_SIMPCHINESE} \
-    "桌面图标"
-LangString str_desc_desktop         ${LANG_SIMPCHINESE} \
-    "创建 Vim 的桌面快捷方式图标。"
-
-LangString str_section_start_menu   ${LANG_SIMPCHINESE} \
-    "「开始」菜单程序组"
-LangString str_desc_start_menu      ${LANG_SIMPCHINESE} \
-    "在开始菜单中添加 Vim 程序组（适用于 Windows 95 及以上版本）"
-
-#LangString str_section_quick_launch ${LANG_SIMPCHINESE} \
-#    "在快速启动启动栏中"
-#LangString str_desc_quick_launch    ${LANG_SIMPCHINESE} \
-#    "在快速启动栏中添加 Vim 图标。"
-
-LangString str_section_edit_with    ${LANG_SIMPCHINESE} \
-    "添加到快捷菜单"
-LangString str_desc_edit_with       ${LANG_SIMPCHINESE} \
-    "将“用 Vim 编辑”添加到快捷菜单中。"
-
-#LangString str_section_edit_with32  ${LANG_SIMPCHINESE} \
-#    "32 位版本"
-#LangString str_desc_edit_with32     ${LANG_SIMPCHINESE} \
-#    "将 Vim 添加到 32 位程序的“打开方式”快捷菜单中。"
-
-#LangString str_section_edit_with64  ${LANG_SIMPCHINESE} \
-#    "64 位版本"
-#LangString str_desc_edit_with64     ${LANG_SIMPCHINESE} \
-#    "将 Vim 添加到 64 位程序的“打开方式”快捷菜单中。"
-
-LangString str_section_vim_rc       ${LANG_SIMPCHINESE} \
-    "创建默认配置文件"
-LangString str_desc_vim_rc          ${LANG_SIMPCHINESE} \
-    "在安装目录下生成默认的 Vim 配置文件(_vimrc)。\
-     如果该文件已经存在，则跳过该项。"
-
-LangString str_group_plugin         ${LANG_SIMPCHINESE} \
-    "创建插件目录"
-LangString str_desc_plugin          ${LANG_SIMPCHINESE} \
-    "创建(空的)插件目录结构。插件目录用于安装 Vim 扩展插件，\
-     只要将文件复制到相关的子目录中即可。"
-
-LangString str_section_plugin_home  ${LANG_SIMPCHINESE} \
-    "私有插件目录"
-LangString str_desc_plugin_home     ${LANG_SIMPCHINESE} \
-    "在主目录创建私有插件目录。"
-
-LangString str_section_plugin_vim   ${LANG_SIMPCHINESE} \
-    "公共插件目录"
-LangString str_desc_plugin_vim      ${LANG_SIMPCHINESE} \
-    "在 Vim 安装目录下创建(空的)插件目录结构，系统上所有用户都能使用安装在\
-     该目录下的扩展插件。"
-
-LangString str_section_vis_vim      ${LANG_SIMPCHINESE} \
-    "VisVim 插件"
-LangString str_desc_vis_vim         ${LANG_SIMPCHINESE} \
-    "安装与 Visual Studio 集成的 VisVim 插件。"
-
-LangString str_section_nls          ${LANG_SIMPCHINESE} \
-    "安装多语言支持"
-LangString str_desc_nls             ${LANG_SIMPCHINESE} \
-    "安装用于多语言支持的文件。"
-
-LangString str_unsection_register   ${LANG_SIMPCHINESE} \
-    "删除 Vim 系统配置"
-LangString str_desc_unregister      ${LANG_SIMPCHINESE} \
-    "删除和 Vim 相关的系统配置。"
-
-LangString str_unsection_exe        ${LANG_SIMPCHINESE} \
-    "删除 Vim 执行文件以及脚本"
-LangString str_desc_rm_exe          ${LANG_SIMPCHINESE} \
-    "删除 Vim 的所有执行文件及脚本。"
-
-LangString str_ungroup_plugin       ${LANG_SIMPCHINESE} \
-    "移除插件目录"
-LangString str_desc_rm_plugin       ${LANG_SIMPCHINESE} \
-    "移除插件目录（如果目录为空）。"
-
-LangString str_unsection_plugin_home ${LANG_SIMPCHINESE} \
-    "私有插件目录"
-LangString str_desc_rm_plugin_home  ${LANG_SIMPCHINESE} \
-    "从主目录中移除私有插件目录。"
-
-LangString str_unsection_plugin_vim ${LANG_SIMPCHINESE} \
-    "公共插件目录"
-LangString str_desc_rm_plugin_vim   ${LANG_SIMPCHINESE} \
-    "从 Vim 安装目录下移除插件目录。"
-
-LangString str_unsection_rootdir    ${LANG_SIMPCHINESE} \
-    "移除 Vim 主目录"
-LangString str_desc_rm_rootdir      ${LANG_SIMPCHINESE} \
-    "移除 Vim 的主目录，该目录包含您的配置文件！"
-
-
-##############################################################################
-# Messages                                                                {{{1
-##############################################################################
-
-#LangString str_msg_too_many_ver  ${LANG_SIMPCHINESE} \
-#    "您的系统上安装了 $vim_old_ver_count 个不同版本的 Vim，$\r$\n\
-#     但本安装程序最多只能处理 ${VIM_MAX_OLD_VER} 个版本。$\r$\n\
-#     请您手工删除一些旧版本以后再运行本安装程序。"
-
-#LangString str_msg_invalid_root  ${LANG_SIMPCHINESE} \
-#    "安装路径“$vim_install_root”无效！$\r$\n\
-#     该路径必须以 vim 结尾。"
-
-#LangString str_msg_bin_mismatch  ${LANG_SIMPCHINESE} \
-#    "Vim 执行程序安装路径异常！$\r$\n$\r$\n\
-#     该版本 Vim 的执行程序安装路径应该是“$vim_bin_path”,$\r$\n\
-#     而系统却指示该路径为“$INSTDIR”。"
-
-#LangString str_msg_vim_running   ${LANG_SIMPCHINESE} \
-#    "您的系统上仍有 Vim 在运行，$\r$\n\
-#     请您在执行后续步骤前退出这些 Vim。"
-
-#LangString str_msg_register_ole  ${LANG_SIMPCHINESE} \
-#    "试图注册 Vim OLE 服务器。请注意无论成功与否都不再显示进一步的信息。"
-
-#LangString str_msg_unreg_ole     ${LANG_SIMPCHINESE} \
-#    "试图注销 Vim OLE 服务器。请注意无论成功与否都不再显示进一步的信息。"
-
-#LangString str_msg_rm_start      ${LANG_SIMPCHINESE} \
-#    "开始卸载以下版本："
-
-#LangString str_msg_rm_fail       ${LANG_SIMPCHINESE} \
-#    "以下版本卸载失败："
-
-#LangString str_msg_no_rm_key     ${LANG_SIMPCHINESE} \
-#    "找不到卸载程序的注册表键。"
-
-#LangString str_msg_no_rm_reg     ${LANG_SIMPCHINESE} \
-#    "在注册表中未找到卸载程序路径。"
-
-#LangString str_msg_no_rm_exe     ${LANG_SIMPCHINESE} \
-#    "找不到卸载程序。"
-
-#LangString str_msg_rm_copy_fail  ${LANG_SIMPCHINESE} \
-#    "无法将卸载程序复制到临时目录。"
-
-#LangString str_msg_rm_run_fail   ${LANG_SIMPCHINESE} \
-#    "执行卸载程序失败。"
-
-#LangString str_msg_abort_install ${LANG_SIMPCHINESE} \
-#    "安装程序将退出。"
-
-LangString str_msg_install_fail  ${LANG_SIMPCHINESE} \
-    "安装失败。祝您下次好运。"
-
-LangString str_msg_rm_exe_fail   ${LANG_SIMPCHINESE} \
-    "目录“$0”下有部分文件删除失败！$\r$\n\
-     您只能手工删除该目录。"
-
-#LangString str_msg_rm_root_fail  ${LANG_SIMPCHINESE} \
-#    "警告：无法删除 Vim 安装目录“$vim_install_root”，\
-#     该目录下仍有其他文件。"
-
-LangString str_msg_uninstalling  ${LANG_SIMPCHINESE} \
-    "正在卸载旧版本..."
-
-LangString str_msg_registering   ${LANG_SIMPCHINESE} \
-    "正在注册..."
-
-LangString str_msg_unregistering ${LANG_SIMPCHINESE} \
-    "正在取消注册..."
-
-
-##############################################################################
-# Dialog Box                                                              {{{1
-##############################################################################
-
-LangString str_vimrc_page_title    ${LANG_SIMPCHINESE} \
-    "设置 _vimrc"
-LangString str_vimrc_page_subtitle ${LANG_SIMPCHINESE} \
-    "选择键盘、鼠标和扩展设置。"
-
-LangString str_msg_compat_title    ${LANG_SIMPCHINESE} \
-    "Vi / Vim 行为"
-LangString str_msg_compat_desc     ${LANG_SIMPCHINESE} \
-    "兼容性与扩展(&B)"
-LangString str_msg_compat_vi       ${LANG_SIMPCHINESE} \
-    "原始 Vi"
-LangString str_msg_compat_vim      ${LANG_SIMPCHINESE} \
-    "原始 Vim"
-LangString str_msg_compat_defaults ${LANG_SIMPCHINESE} \
-    "Vim 原始版本和部分扩展 (加载 defaults.vim)"
-LangString str_msg_compat_all      ${LANG_SIMPCHINESE} \
-    "Vim 原始版本和所有扩展 (加载 vimrc_example.vim) (缺省)"
-
-LangString str_msg_keymap_title   ${LANG_SIMPCHINESE} \
-    "键盘映射"
-LangString str_msg_keymap_desc    ${LANG_SIMPCHINESE} \
-    "为 Windows 映射按键(&R) (例如:Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F 等)"
-LangString str_msg_keymap_default ${LANG_SIMPCHINESE} \
-    "不映射按键 (缺省)"
-LangString str_msg_keymap_windows ${LANG_SIMPCHINESE} \
-    "映射一些按键"
-
-LangString str_msg_mouse_title   ${LANG_SIMPCHINESE} \
-    "鼠标"
-LangString str_msg_mouse_desc    ${LANG_SIMPCHINESE} \
-    "左键和右键行为(&B)"
-LangString str_msg_mouse_default ${LANG_SIMPCHINESE} \
-    "右键：弹出菜单, 左键：可视化模式 (缺省)"
-LangString str_msg_mouse_windows ${LANG_SIMPCHINESE} \
-    "右键：弹出菜单, 左键:选择模式 (Windows)"
-LangString str_msg_mouse_unix    ${LANG_SIMPCHINESE} \
-    "右键： 扩展选择, 左键：可视化模式 (Unix)"
@@ -1,278 +0,0 @@
-# vi:set ts=8 sts=4 sw=4 et fdm=marker:
-#
-# tradchinese.nsi: Traditional Chinese language strings for gvim NSIS
-# installer.
-#
-# Locale ID    : 1028
-# fileencoding : UTF-8
-# Author       : Guopeng Wen
-
-!insertmacro MUI_LANGUAGE "TradChinese"
-
-
-# Overwrite the default translation.
-# These strings should be always English.  Otherwise dosinst.c fails.
-LangString ^SetupCaption     ${LANG_TRADCHINESE} \
-        "$(^Name) Setup"
-LangString ^UninstallCaption ${LANG_TRADCHINESE} \
-        "$(^Name) Uninstall"
-
-##############################################################################
-# MUI Configuration Strings                                               {{{1
-##############################################################################
-
-#LangString str_dest_folder          ${LANG_TRADCHINESE} \
-#    "安裝資料夾 (必須以 vim 結尾)"
-
-LangString str_show_readme          ${LANG_TRADCHINESE} \
-    "安裝完成後顯示 README 檔案"
-
-# Install types:
-LangString str_type_typical         ${LANG_TRADCHINESE} \
-    "典型安裝"
-
-LangString str_type_minimal         ${LANG_TRADCHINESE} \
-    "最小安裝"
-
-LangString str_type_full            ${LANG_TRADCHINESE} \
-    "完全安裝"
-
-
-##############################################################################
-# Section Titles & Description                                            {{{1
-##############################################################################
-
-LangString str_section_old_ver      ${LANG_TRADCHINESE} \
-    "移除舊版本"
-LangString str_desc_old_ver         ${LANG_TRADCHINESE} \
-    "移除閣下電腦上舊版本的 Vim。"
-
-LangString str_section_exe          ${LANG_TRADCHINESE} \
-    "安裝 Vim 圖形界面程式"
-LangString str_desc_exe             ${LANG_TRADCHINESE} \
-    "安裝 Vim 圖形界面程式及腳本。此為必選安裝。"
-
-LangString str_section_console      ${LANG_TRADCHINESE} \
-    "安裝 Vim 命令行程式"
-LangString str_desc_console         ${LANG_TRADCHINESE} \
-    "安裝 Vim 命令行程式 (vim.exe)。該程式在控制臺窗口中運行。"
-
-LangString str_section_batch        ${LANG_TRADCHINESE} \
-    "安裝批次檔案"
-LangString str_desc_batch           ${LANG_TRADCHINESE} \
-    "為 Vim 的各種變體創建批次檔，以便在命令行下啟動 Vim。"
-
-LangString str_group_icons          ${LANG_TRADCHINESE} \
-    "建立 Vim 圖示"
-LangString str_desc_icons           ${LANG_TRADCHINESE} \
-    "建立若干 Vim 圖示，以便于使用 Vim。"
-
-LangString str_section_desktop      ${LANG_TRADCHINESE} \
-    "於桌面"
-LangString str_desc_desktop         ${LANG_TRADCHINESE} \
-    "建立若干 Vim 圖示於桌面上，以方便啟動 Vim。"
-
-LangString str_section_start_menu   ${LANG_TRADCHINESE} \
-    "於「開始」功能表的「程式」集"
-LangString str_desc_start_menu      ${LANG_TRADCHINESE} \
-    "在「開始」功能表的「程式」集中建立 Vim 啟動組。\
-     適用于 Windows 95 及以上版本。"
-
-#LangString str_section_quick_launch ${LANG_TRADCHINESE} \
-#    "於快速啟動列"
-#LangString str_desc_quick_launch    ${LANG_TRADCHINESE} \
-#    "在快速啟動列中建立 Vim 圖示。"
-
-LangString str_section_edit_with    ${LANG_TRADCHINESE} \
-    "安裝快捷選單"
-LangString str_desc_edit_with       ${LANG_TRADCHINESE} \
-    "在「打開方式」快捷選單中添加 Vim 項。"
-
-#LangString str_section_edit_with32  ${LANG_TRADCHINESE} \
-#    "32 位元版本"
-#LangString str_desc_edit_with32     ${LANG_TRADCHINESE} \
-#    "在 32 位元程式的「打開方式」快捷選單中添加 Vim 項。"
-
-#LangString str_section_edit_with64  ${LANG_TRADCHINESE} \
-#    "64 位元版本"
-#LangString str_desc_edit_with64     ${LANG_TRADCHINESE} \
-#    "在 64 位元程式的「打開方式」快捷選單中添加 Vim 項。"
-
-LangString str_section_vim_rc       ${LANG_TRADCHINESE} \
-    "建立默認設定檔"
-LangString str_desc_vim_rc          ${LANG_TRADCHINESE} \
-    "在安裝資料夾下建立默認的 Vim 設定檔(_vimrc)。\
-     若該設定檔已經存在，則略過此項。"
-
-LangString str_group_plugin         ${LANG_TRADCHINESE} \
-    "建立插件資料夾"
-LangString str_desc_plugin          ${LANG_TRADCHINESE} \
-    "建立(空的)插件資料夾結構。插件資料夾用于安裝 Vim 的擴展插件，\
-     只要將檔案復制到相關的子資料夾中即可。"
-
-LangString str_section_plugin_home  ${LANG_TRADCHINESE} \
-    "建立插件資料夾"
-LangString str_desc_plugin_home     ${LANG_TRADCHINESE} \
-    "Create plugin directories in HOME directory."
-
-LangString str_section_plugin_vim   ${LANG_TRADCHINESE} \
-    "建立共享插件資料夾"
-LangString str_desc_plugin_vim      ${LANG_TRADCHINESE} \
-    "在 Vim 安裝資料夾下建立(空的)插件資料夾結構，電腦上所有用戶都能使用安裝\
-     在該資料夾里的擴展插件。"
-
-LangString str_section_vis_vim      ${LANG_TRADCHINESE} \
-    "安裝 VisVim 插件"
-LangString str_desc_vis_vim         ${LANG_TRADCHINESE} \
-    "VisVim 是用于與微軟 Microsoft Visual Studio 軟體進行整合的插件。"
-
-LangString str_section_nls          ${LANG_TRADCHINESE} \
-    "安裝本地語言支持"
-LangString str_desc_nls             ${LANG_TRADCHINESE} \
-    "安裝用于支持本地語言的檔案。"
-
-LangString str_unsection_register   ${LANG_TRADCHINESE} \
-    "移除 Vim 系統設定"
-LangString str_desc_unregister      ${LANG_TRADCHINESE} \
-    "移除與 Vim 相關的系統設定。"
-
-LangString str_unsection_exe        ${LANG_TRADCHINESE} \
-    "移除 Vim 程式及腳本"
-LangString str_desc_rm_exe          ${LANG_TRADCHINESE} \
-    "移除所有的 Vim 程式及腳本。"
-
-LangString str_ungroup_plugin       ${LANG_TRADCHINESE} \
-    "Remove plugin directories"
-LangString str_desc_rm_plugin       ${LANG_TRADCHINESE} \
-    "Remove the plugin directories if they are empty."
-
-LangString str_unsection_plugin_home ${LANG_TRADCHINESE} \
-    "Private"
-LangString str_desc_rm_plugin_home  ${LANG_TRADCHINESE} \
-    "Remove the vimfiles directory in HOME directory."
-
-LangString str_unsection_plugin_vim ${LANG_TRADCHINESE} \
-    "Shared"
-LangString str_desc_rm_plugin_vim   ${LANG_TRADCHINESE} \
-    "Remove the vimfiles directory in Vim install directory."
-
-LangString str_unsection_rootdir    ${LANG_TRADCHINESE} \
-    "Remove the Vim root directory"
-LangString str_desc_rm_rootdir      ${LANG_TRADCHINESE} \
-    "Remove the Vim root directory. It contains your Vim configuration files!"
-
-
-##############################################################################
-# Messages                                                                {{{1
-##############################################################################
-
-#LangString str_msg_too_many_ver  ${LANG_TRADCHINESE} \
-#    "閣下的電腦上安裝了 $vim_old_ver_count 個不同版本的 Vim，$\r$\n\
-#     但是本安裝程式最多只能處理 ${VIM_MAX_OLD_VER} 個版本。$\r$\n\
-#     煩請閣下手工移除一些版本以后再運行本安裝程式。"
-
-#LangString str_msg_invalid_root  ${LANG_TRADCHINESE} \
-#    "安裝資料夾「$vim_install_root」無效！$\r$\n\
-#     該資料夾必須以「vim」結尾。"
-
-#LangString str_msg_bin_mismatch  ${LANG_TRADCHINESE} \
-#    "Vim 執行程式安裝路徑異常！$\r$\n$\r$\n\
-#     該版本 Vim 的執行程式安裝路徑應該是「$vim_bin_path」,$\r$\n\
-#     而系統卻指示該路徑為「$INSTDIR」。"
-
-#LangString str_msg_vim_running   ${LANG_TRADCHINESE} \
-#    "閣下的電腦上尚有正在運行之 Vim，$\r$\n\
-#     煩請閣下在執行后續步驟前將其全部退出。"
-
-#LangString str_msg_register_ole  ${LANG_TRADCHINESE} \
-#    "試圖注冊 Vim OLE 伺服程式。請注意不論成功與否都不再顯示進一步的信息。"
-
-#LangString str_msg_unreg_ole     ${LANG_TRADCHINESE} \
-#    "試圖注銷 Vim OLE 伺服程式。請注意不論成功與否都不再顯示進一步的信息。"
-
-#LangString str_msg_rm_start      ${LANG_TRADCHINESE} \
-#    "正移除如下版本："
-
-#LangString str_msg_rm_fail       ${LANG_TRADCHINESE} \
-#    "以下版本移除失敗："
-
-#LangString str_msg_no_rm_key     ${LANG_TRADCHINESE} \
-#    "找不到反安裝程式的登錄檔入口。"
-
-#LangString str_msg_no_rm_reg     ${LANG_TRADCHINESE} \
-#    "在登錄檔中未找到反安裝程式路徑。"
-
-#LangString str_msg_no_rm_exe     ${LANG_TRADCHINESE} \
-#    "找不到反安裝程式。"
-
-#LangString str_msg_rm_copy_fail  ${LANG_TRADCHINESE} \
-#    "無法將法將反安裝程式复制到臨時目錄。"
-
-#LangString str_msg_rm_run_fail   ${LANG_TRADCHINESE} \
-#    "執行反安裝程式失敗。"
-
-#LangString str_msg_abort_install ${LANG_TRADCHINESE} \
-#    "安裝程式將退出。"
-
-LangString str_msg_install_fail  ${LANG_TRADCHINESE} \
-    "安裝失敗。預祝下次好運。"
-
-LangString str_msg_rm_exe_fail   ${LANG_TRADCHINESE} \
-    "資料夾「$0」下有部分檔案未能移除！$\r$\n\
-     閣下只能手工移除該資料夾。"
-
-#LangString str_msg_rm_root_fail  ${LANG_TRADCHINESE} \
-#    "警告：無法刪除 Vim 安裝資料夾「$vim_install_root」，\
-#     該資料夾下仍有其他檔案。"
-
-LangString str_msg_uninstalling  ${LANG_TRADCHINESE} \
-    "Uninstalling the old version..."
-
-LangString str_msg_registering   ${LANG_TRADCHINESE} \
-    "Registering..."
-
-LangString str_msg_unregistering ${LANG_TRADCHINESE} \
-    "Unregistering..."
-
-
-##############################################################################
-# Dialog Box                                                              {{{1
-##############################################################################
-
-LangString str_vimrc_page_title    ${LANG_TRADCHINESE} \
-    "Choose _vimrc settings"
-LangString str_vimrc_page_subtitle ${LANG_TRADCHINESE} \
-    "Choose the settings for enhancement, keyboard and mouse."
-
-LangString str_msg_compat_title    ${LANG_TRADCHINESE} \
-    " Vi / Vim behavior "
-LangString str_msg_compat_desc     ${LANG_TRADCHINESE} \
-    "&Compatibility and enhancements"
-LangString str_msg_compat_vi       ${LANG_TRADCHINESE} \
-    "Vi compatible"
-LangString str_msg_compat_vim      ${LANG_TRADCHINESE} \
-    "Vim original"
-LangString str_msg_compat_defaults ${LANG_TRADCHINESE} \
-    "Vim with some enhancements (load defaults.vim)"
-LangString str_msg_compat_all      ${LANG_TRADCHINESE} \
-    "Vim with all enhancements (load vimrc_example.vim) (Default)"
-
-LangString str_msg_keymap_title   ${LANG_TRADCHINESE} \
-    " Mappings "
-LangString str_msg_keymap_desc    ${LANG_TRADCHINESE} \
-    "&Remap a few keys for Windows (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F, etc)"
-LangString str_msg_keymap_default ${LANG_TRADCHINESE} \
-    "Do not remap keys (Default)"
-LangString str_msg_keymap_windows ${LANG_TRADCHINESE} \
-    "Remap a few keys"
-
-LangString str_msg_mouse_title   ${LANG_TRADCHINESE} \
-    " Mouse "
-LangString str_msg_mouse_desc    ${LANG_TRADCHINESE} \
-    "&Behavior of right and left buttons"
-LangString str_msg_mouse_default ${LANG_TRADCHINESE} \
-    "Right: popup menu, Left: visual mode (Default)"
-LangString str_msg_mouse_windows ${LANG_TRADCHINESE} \
-    "Right: popup menu, Left: select mode (Windows)"
-LangString str_msg_mouse_unix    ${LANG_TRADCHINESE} \
-    "Right: extends selection, Left: visual mode (Unix)"
@@ -1,190 +0,0 @@
-# turkish.nsi: Turkish language strings for gvim NSIS installer.
-# fileencoding : UTF-8
-# Author       : Emir SARI
-
-!insertmacro MUI_LANGUAGE "Turkish"
-
-# Overwrite the default translation.
-# These strings should be always English.  Otherwise dosinst.c fails.
-LangString ^SetupCaption     ${LANG_TURKISH} \
-        "$(^Name) Setup"
-LangString ^UninstallCaption ${LANG_TURKISH} \
-        "$(^Name) Uninstall"
-        
-LangString str_show_readme          ${LANG_TURKISH} \
-    "Kurulum bittikten sonra README dosyasını aç"
-
-# Install types:
-LangString str_type_typical         ${LANG_TURKISH} \
-    "Normal"
-
-LangString str_type_minimal         ${LANG_TURKISH} \
-    "Küçük"
-
-LangString str_type_full            ${LANG_TURKISH} \
-    "Tam"
-    
-##############################################################################
-# Section Titles & Description                                            {{{1
-##############################################################################
-
-LangString str_section_old_ver      ${LANG_TURKISH} \
-    "Eski sürümü kaldır"
-LangString str_desc_old_ver         ${LANG_TURKISH} \
-    "Vim'in eski sürümünü sisteminizden kaldırır."
-
-LangString str_section_exe          ${LANG_TURKISH} \
-    "Vim grafik arabirimi ve çalışma dosyaları"
-LangString str_desc_exe             ${LANG_TURKISH} \
-    "Vim program başlatıcı ve çalışma dosyaları. Bu bileşen zorunludur."
-
-LangString str_section_console      ${LANG_TURKISH} \
-    "Vim konsol sürümü"
-LangString str_desc_console         ${LANG_TURKISH} \
-    "Vim'in konsol sürümü (vim.exe)."
-
-LangString str_section_batch        ${LANG_TURKISH} \
-    ".bat dosyaları oluştur"
-LangString str_desc_batch           ${LANG_TURKISH} \
-    "Vim için komut satırında kullanmak üzere .bat dosyaları oluşturur"
-
-LangString str_group_icons          ${LANG_TURKISH} \
-    "Vim için kısayollar oluştur"
-LangString str_desc_icons           ${LANG_TURKISH} \
-    "Kolay erişim için Vim kısayolları oluşturur."
-
-LangString str_section_desktop      ${LANG_TURKISH} \
-    "Masaüstünde"
-LangString str_desc_desktop         ${LANG_TURKISH} \
-    "gVim programı için Masaüstünde kısayol oluşturur."
-
-LangString str_section_start_menu   ${LANG_TURKISH} \
-    "Başlat Menüsü - Programlar klasöründe"
-LangString str_desc_start_menu      ${LANG_TURKISH} \
-    "Vim kısayolunu Başlat Menüsüne ekler."
-    
-LangString str_section_edit_with    ${LANG_TURKISH} \
-    "Vim ile Aç"
-LangString str_desc_edit_with       ${LANG_TURKISH} \
-    "Vim'i $\"Birlikte aç$\" sağ tık menüsüne ekler."
-    
- LangString str_section_vim_rc       ${LANG_TURKISH} \
-    "Bir yapılandırma dosyası oluştur"
-LangString str_desc_vim_rc          ${LANG_TURKISH} \
-    "Eğer yoksa bir yapılandırma dosyası (_vimrc) oluşturur."
-
-LangString str_group_plugin         ${LANG_TURKISH} \
-    "Eklenti dizinleri oluştur"
-LangString str_desc_plugin          ${LANG_TURKISH} \
-    "Bu dizinlere Vim eklentilerini yerleştirerek Vim'e yeni \
-     özellikler kazandırabilirsiniz."
-
-LangString str_section_plugin_home  ${LANG_TURKISH} \
-    "Gizli"
-LangString str_desc_plugin_home     ${LANG_TURKISH} \
-    "Eklenti dizinlerini EV dizininde oluşturur."
-
-LangString str_section_plugin_vim   ${LANG_TURKISH} \
-    "Paylaşılan"
-LangString str_desc_plugin_vim      ${LANG_TURKISH} \
-    "Eklenti dizinlerini Vim yükleme dizininde oluşturur. Bu eklentilerden \
-     bilgisayarın tüm kullanıcıları yararlanabilir."
-
-LangString str_section_vis_vim      ${LANG_TURKISH} \
-    "VisVim eklentisi"
-LangString str_desc_vis_vim         ${LANG_TURKISH} \
-    "Microsoft Visual Studio entegrasyonu için VisVim eklentisi" 
-
-LangString str_section_nls          ${LANG_TURKISH} \
-    "Ek dil desteği"
-LangString str_desc_nls             ${LANG_TURKISH} \
-    "Mevcut olan Vim yerelleştirmelerini yükler."
-
-LangString str_unsection_register   ${LANG_TURKISH} \
-    "Vim kaydını kaldır"
-LangString str_desc_unregister      ${LANG_TURKISH} \
-    "Vim'in bu bilgisayardaki kaydını kaldırır."
-
-LangString str_unsection_exe        ${LANG_TURKISH} \
-    "Vim programını ve çalıştırma dosyalarını kaldır"
-LangString str_desc_rm_exe          ${LANG_TURKISH} \
-    "Vim çalıştırılabilir dosyalarını ve diğer dosyaları kaldırır."
-
-LangString str_ungroup_plugin       ${LANG_TURKISH} \
-    "Eklenti dizinlerini kaldır"
-LangString str_desc_rm_plugin       ${LANG_TURKISH} \
-    "Eklenti dizinlerini eğer boş ise kaldırır."
-
-LangString str_unsection_plugin_home ${LANG_TURKISH} \
-    "Gizli"
-LangString str_desc_rm_plugin_home  ${LANG_TURKISH} \
-    "Eklenti dizinlerini EV dizininden kaldırır."
-
-LangString str_unsection_plugin_vim ${LANG_TURKISH} \
-    "Paylaşılan"
-LangString str_desc_rm_plugin_vim   ${LANG_TURKISH} \
-    "Eklenti dizinlerini Vim yükleme dizininden kaldırır."
-
-LangString str_unsection_rootdir    ${LANG_TURKISH} \
-    "Vim kök dizinini kaldır"
-LangString str_desc_rm_rootdir      ${LANG_TURKISH} \
-    "Vim kök dizinini kaldırır. Bu dizin Vim yapılandırma dosyalarını içerir!"
-    
- LangString str_msg_install_fail  ${LANG_TURKISH} \
-    "Yükleme başarısız oldu. Yeniden deneyin."
-
-LangString str_msg_rm_exe_fail   ${LANG_TURKISH} \
-    "$0 içindeki bazı dosyalar silinemedi!$\r$\n\
-     Bu dosyaları el ile kaldırmalısınız."
-     
- LangString str_msg_uninstalling  ${LANG_TURKISH} \
-    "Eski sürüm kaldırılıyor..."
-
-LangString str_msg_registering   ${LANG_TURKISH} \
-    "Kaydediliyor..."
-
-LangString str_msg_unregistering ${LANG_TURKISH} \
-    "Kayıt siliniyor..."
-
-
-##############################################################################
-# Dialog Box                                                              {{{1
-##############################################################################
-
-LangString str_vimrc_page_title    ${LANG_TURKISH} \
-    "_vimrc ayarlarını seçin"
-LangString str_vimrc_page_subtitle ${LANG_TURKISH} \
-    "Yüklenecek ek özellikler, klavye ve fare için ayarları seçin."
-
-LangString str_msg_compat_title    ${LANG_TURKISH} \
-    " Vi / Vim davranışı "
-LangString str_msg_compat_desc     ${LANG_TURKISH} \
-    "&Uyumluluk ve ek özellikler"
-LangString str_msg_compat_vi       ${LANG_TURKISH} \
-    "Vi uyumlu"
-LangString str_msg_compat_vim      ${LANG_TURKISH} \
-    "Vim orijinal"
-LangString str_msg_compat_defaults ${LANG_TURKISH} \
-    "Vim ve ek olarak bazı ek özellikler (load defaults.vim)"
-LangString str_msg_compat_all      ${LANG_TURKISH} \
-    "Vim ve ek olarak tüm ek özellikler (load vimrc_example.vim) (Default)"
-
-LangString str_msg_keymap_title   ${LANG_TURKISH} \
-    " Klavye İşlevleri "
-LangString str_msg_keymap_desc    ${LANG_TURKISH} \
-    "&Windows için bazı düğmeleri yeniden ayarla (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F, etc)"
-LangString str_msg_keymap_default ${LANG_TURKISH} \
-    "Düğme işlevlerini değiştirme (varsayılan)"
-LangString str_msg_keymap_windows ${LANG_TURKISH} \
-    "Bazı düğmeleri yeniden ayarla"
-
-LangString str_msg_mouse_title   ${LANG_TURKISH} \
-    " Fare İşlevleri "
-LangString str_msg_mouse_desc    ${LANG_TURKISH} \
-    "&Sağ ve sol düğme davranışı"
-LangString str_msg_mouse_default ${LANG_TURKISH} \
-    "Sağ: açılır menü, Sol: Görsel Kip (varsayılan)"
-LangString str_msg_mouse_windows ${LANG_TURKISH} \
-    "Sağ: açılır menü, Sol: seçim kipi (Windows)"
-LangString str_msg_mouse_unix    ${LANG_TURKISH} \
-    "Sağ: seçimi genişlet, Sol: Görsel Kip (Unix)"
@@ -1,62 +0,0 @@
-" Author: Antony Lee <anntzer.lee@gmail.com>
-" Description: Helper functions for reStructuredText syntax folding
-" Last Modified: 2018-12-29
-
-function s:CacheRstFold()
-  if !g:rst_fold_enabled
-    return
-  endif
-
-  let closure = {'header_types': {}, 'max_level': 0, 'levels': {}}
-  function closure.Process(match) dict
-    let curline = getcurpos()[1]
-    if has_key(self.levels, curline - 1)
-      " For over+under-lined headers, the regex will match both at the
-      " overline and at the title itself; in that case, skip the second match.
-      return
-    endif
-    let lines = split(a:match, '\n')
-    let key = repeat(lines[-1][0], len(lines))
-    if !has_key(self.header_types, key)
-      let self.max_level += 1
-      let self.header_types[key] = self.max_level
-    endif
-    let self.levels[curline] = self.header_types[key]
-  endfunction
-  let save_cursor = getcurpos()
-  let save_mark = getpos("'[")
-  silent keeppatterns %s/\v^%(%(([=`:.'"~^_*+#-])\1+\n)?.{1,2}\n([=`:.'"~^_*+#-])\2+)|%(%(([=`:.''"~^_*+#-])\3{2,}\n)?.{3,}\n([=`:.''"~^_*+#-])\4{2,})$/\=closure.Process(submatch(0))/gn
-  call setpos('.', save_cursor)
-  call setpos("'[", save_mark)
-  let b:RstFoldCache = closure.levels
-endfunction
-
-function RstFold#GetRstFold()
-  if !g:rst_fold_enabled
-    return
-  endif
-
-  if !has_key(b:, 'RstFoldCache')
-    call s:CacheRstFold()
-  endif
-  if has_key(b:RstFoldCache, v:lnum)
-    return '>' . b:RstFoldCache[v:lnum]
-  else
-    return '='
-  endif
-endfunction
-
-function RstFold#GetRstFoldText()
-  if !g:rst_fold_enabled
-    return
-  endif
-
-  if !has_key(b:, 'RstFoldCache')
-    call s:CacheRstFold()
-  endif
-  let indent = repeat('  ', b:RstFoldCache[v:foldstart] - 1)
-  let thisline = getline(v:foldstart)
-  " For over+under-lined headers, skip the overline.
-  let text = thisline =~ '^\([=`:.''"~^_*+#-]\)\1\+$' ? getline(v:foldstart + 1) : thisline
-  return indent . text
-endfunction
@@ -2,13 +2,12 @@
 "  Description: Perform Ada specific completion & tagging.
 "     Language: Ada (2005)
 "	   $Id: ada.vim 887 2008-07-08 14:29:01Z krischik $
-"   Maintainer: Mathias Brousset <mathiasb17@gmail.com>
-"		Martin Krischik <krischik@users.sourceforge.net>
+"   Maintainer: Martin Krischik <krischik@users.sourceforge.net>
 "		Taylor Venable <taylor@metasyntax.net>
 "		Neil Bird <neil@fnxweb.com>
 "		Ned Okie <nokie@radford.edu>
 "      $Author: krischik $
-"	 $Date: 2017-01-31 20:20:05 +0200 (Mon, 01 Jan 2017) $
+"	 $Date: 2008-07-08 16:29:01 +0200 (Di, 08 Jul 2008) $
 "      Version: 4.6
 "    $Revision: 887 $
 "     $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/autoload/ada.vim $
@@ -24,7 +23,6 @@
 "	        09.05.2007 MK Session just won't work no matter how much
 "			      tweaking is done
 "		19.09.2007 NO still some mapleader problems
-"		31.01.2017 MB fix more mapleader problems
 "    Help Page: ft-ada-functions
 "------------------------------------------------------------------------------

@@ -449,7 +447,7 @@ function ada#Switch_Session (New_Session)

      if a:New_Session != v:this_session
 	 "
-	 "  We actually got a new session - otherwise there
+	 "  We actualy got a new session - otherwise there
 	 "  is nothing to do.
 	 "
 	 if strlen (v:this_session) > 0
@@ -587,11 +585,11 @@ function ada#Map_Menu (Text, Keys, Command)
 	\ " :"	  . a:Command . "<CR>"
      execute
 	\ "nnoremap <buffer>" .
-	\ " <Leader>a" . a:Keys .
+	\ escape(l:leader . "a" . a:Keys , '\') .
 	\" :" . a:Command
      execute
 	\ "inoremap <buffer>" .
-	\ " <Leader>a" . a:Keys .
+	\ escape(l:leader . "a" . a:Keys , '\') .
 	\" <C-O>:" . a:Command
   endif
   return
@@ -1,13 +1,13 @@
 " Vim completion script
 " Language:	C
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2020 Nov 14
+" Last Change:	2012 Jun 20

 let s:cpo_save = &cpo
 set cpo&vim

 " This function is used for the 'omnifunc' option.
-func ccomplete#Complete(findstart, base)
+function! ccomplete#Complete(findstart, base)
  if a:findstart
    " Locate the start of the item, including ".", "->" and "[...]".
    let line = getline('.')
@@ -72,10 +72,8 @@ func ccomplete#Complete(findstart, base)
  " Split item in words, keep empty word after "." or "->".
  " "aa" -> ['aa'], "aa." -> ['aa', ''], "aa.bb" -> ['aa', 'bb'], etc.
  " We can't use split, because we need to skip nested [...].
-  " "aa[...]" -> ['aa', '[...]'], "aa.bb[...]" -> ['aa', 'bb', '[...]'], etc.
  let items = []
  let s = 0
-  let arrays = 0
  while 1
    let e = match(base, '\.\|->\|\[', s)
    if e < 0
@@ -109,7 +107,6 @@ func ccomplete#Complete(findstart, base)
      endwhile
      let e += 1
      call add(items, strpart(base, s, e - s))
-      let arrays += 1
      let s = e
    endif
  endwhile
@@ -164,26 +161,15 @@ func ccomplete#Complete(findstart, base)
 	endif
      endif
      let res = [{'match': match, 'tagline' : '', 'kind' : kind, 'info' : line}]
-    elseif len(items) == arrays + 1
-      " Completing one word and it's a local array variable: build tagline
-      " from declaration line
-      let match = items[0]
-      let kind = 'v'
-      let tagline = "\t/^" . line . '$/'
-      let res = [{'match': match, 'tagline' : tagline, 'kind' : kind, 'info' : line}]
    else
      " Completing "var.", "var.something", etc.
      let res = s:Nextitem(strpart(line, 0, col), items[1:], 0, 1)
    endif
  endif

-  if len(items) == 1 || len(items) == arrays + 1
+  if len(items) == 1
    " Only one part, no "." or "->": complete from tags file.
-    if len(items) == 1
-      let tags = taglist('^' . base)
-    else
-      let tags = taglist('^' . items[0] . '$')
-    endif
+    let tags = taglist('^' . base)

    " Remove members, these can't appear without something in front.
    call filter(tags, 'has_key(v:val, "kind") ? v:val["kind"] != "m" : 1')
@@ -244,7 +230,7 @@ func ccomplete#Complete(findstart, base)
  return map(res, 's:Tagline2item(v:val, brackets)')
 endfunc

-func s:GetAddition(line, match, memarg, bracket)
+function! 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 +246,13 @@ func s:GetAddition(line, match, memarg, bracket)
    endif
  endif
  return ''
-endfunc
+endfunction

 " 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.
-func s:Tag2item(val)
+function! 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 +275,10 @@ func s:Tag2item(val)
  endif

  return res
-endfunc
+endfunction

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

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

  return d
-endfunc
+endfunction

 " 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.
-func s:Tagline2item(val, brackets)
+function! 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 +363,10 @@ func s:Tagline2item(val, brackets)
    let res['menu'] = s:Tagcmd2extra(s, a:val['match'], matchstr(line, '[^\t]*\t\zs[^\t]*\ze\t'))
  endif
  return res
-endfunc
+endfunction

 " Turn a command from a tag line to something that is useful in the menu
-func s:Tagcmd2extra(cmd, name, fname)
+function! 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 +381,13 @@ func s:Tagcmd2extra(cmd, name, fname)
    let x = a:cmd . ' - ' . a:fname
  endif
  return x
-endfunc
+endfunction

 " 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.
-func s:Nextitem(lead, items, depth, all)
+function! 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 +471,7 @@ func s:Nextitem(lead, items, depth, all)
  endfor

  return res
-endfunc
+endfunction


 " Search for members of structure "typename" in tags files.
@@ -493,7 +479,7 @@ endfunc
 " 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.
-func s:StructMembers(typename, items, all)
+function! s:StructMembers(typename, items, all)
  " Todo: What about local structures?
  let fnames = join(map(tagfiles(), 'escape(v:val, " \\#%")'))
  if fnames == ''
@@ -530,24 +516,11 @@ func s:StructMembers(typename, items, all)
    endif
  endif

-  " Skip over [...] items
-  let idx = 0
-  while 1
-    if idx >= len(a:items)
-      let target = ''		" No further items, matching all members
-      break
-    endif
-    if a:items[idx][0] != '['
-      let target = a:items[idx]
-      break
-    endif
-    let idx += 1
-  endwhile
  " Put matching members in matches[].
  let matches = []
  for l in qflist
    let memb = matchstr(l['text'], '[^\t]*')
-    if memb =~ '^' . target
+    if memb =~ '^' . a:items[0]
      " Skip matches local to another file.
      if match(l['text'], "\tfile:") < 0 || bufnr('%') == bufnr(matchstr(l['text'], '\t\zs[^\t]*'))
 	let item = {'match': memb, 'tagline': l['text']}
@@ -567,8 +540,8 @@ func s:StructMembers(typename, items, all)
  endfor

  if len(matches) > 0
-    " Skip over next [...] items
-    let idx += 1
+    " Skip over [...] items
+    let idx = 1
    while 1
      if idx >= len(a:items)
 	return matches		" No further items, return the result.
@@ -586,12 +559,12 @@ func s:StructMembers(typename, items, all)

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

 " For matching members, find matches for following items.
 " When "all" is non-zero find all, otherwise just return 1 if there is any
 " member.
-func s:SearchMembers(matches, items, all)
+function! s:SearchMembers(matches, items, all)
  let res = []
  for i in range(len(a:matches))
    let typename = ''
@@ -635,5 +608,3 @@ endfunc

 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-" vim: noet sw=2 sts=2
@@ -1,184 +0,0 @@
-" Language:           ConTeXt typesetting engine
-" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
-" Latest Revision:    2016 Oct 21
-
-let s:keepcpo= &cpo
-set cpo&vim
-
-" Helper functions {{{
-function! s:context_echo(message, mode)
-  redraw
-  echo "\r"
-  execute 'echohl' a:mode
-  echomsg '[ConTeXt]' a:message
-  echohl None
-endf
-
-function! s:sh()
-  return has('win32') || has('win64') || has('win16') || has('win95')
-        \ ? ['cmd.exe', '/C']
-        \ : ['/bin/sh', '-c']
-endfunction
-
-" For backward compatibility
-if exists('*win_getid')
-
-  function! s:win_getid()
-    return win_getid()
-  endf
-
-  function! s:win_id2win(winid)
-    return win_id2win(a:winid)
-  endf
-
-else
-
-  function! s:win_getid()
-    return winnr()
-  endf
-
-  function! s:win_id2win(winnr)
-    return a:winnr
-  endf
-
-endif
-" }}}
-
-" ConTeXt jobs {{{
-if has('job')
-
-  let g:context_jobs = []
-
-  " Print the status of ConTeXt jobs
-  function! context#job_status()
-    let l:jobs = filter(g:context_jobs, 'job_status(v:val) == "run"')
-    let l:n = len(l:jobs)
-    call s:context_echo(
-          \ 'There '.(l:n == 1 ? 'is' : 'are').' '.(l:n == 0 ? 'no' : l:n)
-          \ .' job'.(l:n == 1 ? '' : 's').' running'
-          \ .(l:n == 0 ? '.' : ' (' . join(l:jobs, ', ').').'),
-          \ 'ModeMsg')
-  endfunction
-
-  " Stop all ConTeXt jobs
-  function! context#stop_jobs()
-    let l:jobs = filter(g:context_jobs, 'job_status(v:val) == "run"')
-    for job in l:jobs
-      call job_stop(job)
-    endfor
-    sleep 1
-    let l:tmp = []
-    for job in l:jobs
-      if job_status(job) == "run"
-        call add(l:tmp, job)
-      endif
-    endfor
-    let g:context_jobs = l:tmp
-    if empty(g:context_jobs)
-      call s:context_echo('Done. No jobs running.', 'ModeMsg')
-    else
-      call s:context_echo('There are still some jobs running. Please try again.', 'WarningMsg')
-    endif
-  endfunction
-
-  function! context#callback(path, job, status)
-    if index(g:context_jobs, a:job) != -1 && job_status(a:job) != 'run' " just in case
-      call remove(g:context_jobs, index(g:context_jobs, a:job))
-    endif
-    call s:callback(a:path, a:job, a:status)
-  endfunction
-
-  function! context#close_cb(channel)
-    call job_status(ch_getjob(a:channel)) " Trigger exit_cb's callback for faster feedback
-  endfunction
-
-  function! s:typeset(path)
-    call add(g:context_jobs,
-          \ job_start(add(s:sh(), context#command() . ' ' . shellescape(fnamemodify(a:path, ":t"))), {
-          \   'close_cb' : 'context#close_cb',
-          \   'exit_cb'  : function(get(b:, 'context_callback', get(g:, 'context_callback', 'context#callback')),
-          \                         [a:path]),
-          \   'in_io'    : 'null'
-          \ }))
-  endfunction
-
-else " No jobs
-
-  function! context#job_status()
-    call s:context_echo('Not implemented', 'WarningMsg')
-  endfunction!
-
-  function! context#stop_jobs()
-    call s:context_echo('Not implemented', 'WarningMsg')
-  endfunction
-
-  function! context#callback(path, job, status)
-    call s:callback(a:path, a:job, a:status)
-  endfunction
-
-  function! s:typeset(path)
-    execute '!' . context#command() . ' ' . shellescape(fnamemodify(a:path, ":t"))
-    call call(get(b:, 'context_callback', get(g:, 'context_callback', 'context#callback')),
-          \ [a:path, 0, v:shell_error])
-  endfunction
-
-endif " has('job')
-
-function! s:callback(path, job, status) abort
-  if a:status < 0 " Assume the job was terminated
-    return
-  endif
-  " Get info about the current window
-  let l:winid = s:win_getid()             " Save window id
-  let l:efm = &l:errorformat              " Save local errorformat
-  let l:cwd = fnamemodify(getcwd(), ":p") " Save local working directory
-  " Set errorformat to parse ConTeXt errors
-  execute 'setl efm=' . escape(b:context_errorformat, ' ')
-  try " Set cwd to expand error file correctly
-    execute 'lcd' fnameescape(fnamemodify(a:path, ':h'))
-  catch /.*/
-    execute 'setl efm=' . escape(l:efm, ' ')
-    throw v:exception
-  endtry
-  try
-    execute 'cgetfile' fnameescape(fnamemodify(a:path, ':r') . '.log')
-    botright cwindow
-  finally " Restore cwd and errorformat
-    execute s:win_id2win(l:winid) . 'wincmd w'
-    execute 'lcd ' . fnameescape(l:cwd)
-    execute 'setl efm=' . escape(l:efm, ' ')
-  endtry
-  if a:status == 0
-    call s:context_echo('Success!', 'ModeMsg')
-  else
-    call s:context_echo('There are errors. ', 'ErrorMsg')
-  endif
-endfunction
-
-function! context#command()
-  return get(b:, 'context_mtxrun', get(g:, 'context_mtxrun', 'mtxrun'))
-        \ . ' --script context --autogenerate --nonstopmode'
-        \ . ' --synctex=' . (get(b:, 'context_synctex', get(g:, 'context_synctex', 0)) ? '1' : '0')
-        \ . ' ' . get(b:, 'context_extra_options', get(g:, 'context_extra_options', ''))
-endfunction
-
-" Accepts an optional path (useful for big projects, when the file you are
-" editing is not the project's root document). If no argument is given, uses
-" the path of the current buffer.
-function! context#typeset(...) abort
-  let l:path = fnamemodify(strlen(a:000[0]) > 0 ? a:1 : expand("%"), ":p")
-  let l:cwd = fnamemodify(getcwd(), ":p") " Save local working directory
-  call s:context_echo('Typesetting...',  'ModeMsg')
-  execute 'lcd' fnameescape(fnamemodify(l:path, ":h"))
-  try
-    call s:typeset(l:path)
-  finally " Restore local working directory
-    execute 'lcd ' . fnameescape(l:cwd)
-  endtry
-endfunction!
-"}}}
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
-
-" vim: sw=2 fdm=marker
@@ -1,25 +0,0 @@
-" Language:           ConTeXt typesetting engine
-" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
-" Latest Revision:    2016 Oct 15
-
-let s:keepcpo= &cpo
-set cpo&vim
-
-" Complete keywords in MetaPost blocks
-function! contextcomplete#Complete(findstart, base)
-  if a:findstart == 1
-    if len(synstack(line('.'), 1)) > 0 &&
-          \ synIDattr(synstack(line('.'), 1)[0], "name") ==# 'contextMPGraphic'
-      return syntaxcomplete#Complete(a:findstart, a:base)
-    else
-      return -3
-    endif
-  else
-    return syntaxcomplete#Complete(a:findstart, a:base)
-  endif
-endfunction
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
-
-" vim: sw=2 fdm=marker
@@ -4,7 +4,7 @@
 "           plus CSS Speech Module <http://www.w3.org/TR/css3-speech/>
 " Maintainer: Kao, Wei-Ko(othree) ( othree AT gmail DOT com )
 " Original Author: Mikolaj Machowski ( mikmach AT wp DOT pl )
-" Last Change: 2018 Jul 02
+" Last Change: 2016 Jan 11

 let s:values = split("all additive-symbols align-content align-items align-self animation animation-delay animation-direction animation-duration animation-fill-mode animation-iteration-count animation-name animation-play-state animation-timing-function backface-visibility background background-attachment background-blend-mode background-clip background-color background-image background-origin background-position background-repeat background-size block-size border border-block-end border-block-end-color border-block-end-style border-block-end-width border-block-start border-block-start-color border-block-start-style border-block-start-width border-bottom border-bottom-color border-bottom-left-radius border-bottom-right-radius border-bottom-style border-bottom-width border-collapse border-color border-image border-image-outset border-image-repeat border-image-slice border-image-source border-image-width border-inline-end border-inline-end-color border-inline-end-style border-inline-end-width border-inline-start border-inline-start-color border-inline-start-style border-inline-start-width border-left border-left-color border-left-style border-left-width border-radius border-right border-right-color border-right-style border-right-width border-spacing border-style border-top border-top-color border-top-left-radius border-top-right-radius border-top-style border-top-width border-width bottom box-decoration-break box-shadow box-sizing break-after break-before break-inside caption-side clear clip clip-path color columns column-count column-fill column-gap column-rule column-rule-color column-rule-style column-rule-width column-span column-width content counter-increment counter-reset cue cue-before cue-after cursor direction display empty-cells fallback filter flex flex-basis flex-direction flex-flow flex-grow flex-shrink flex-wrap float font font-family font-feature-settings font-kerning font-language-override font-size font-size-adjust font-stretch font-style font-synthesis font-variant font-variant-alternates font-variant-caps font-variant-east-asian font-variant-ligatures font-variant-numeric font-variant-position font-weight grid grid-area grid-auto-columns grid-auto-flow grid-auto-position grid-auto-rows grid-column grid-column-start grid-column-end grid-row grid-row-start grid-row-end grid-template grid-template-areas grid-template-rows grid-template-columns height hyphens image-rendering image-resolution image-orientation ime-mode inline-size isolation justify-content left letter-spacing line-break line-height list-style list-style-image list-style-position list-style-type margin margin-block-end margin-block-start margin-bottom margin-inline-end margin-inline-start margin-left margin-right margin-top marks mask mask-type max-block-size max-height max-inline-size max-width max-zoom min-block-size min-height min-inline-size min-width min-zoom mix-blend-mode negative object-fit object-position offset-block-end offset-block-start offset-inline-end offset-inline-start opacity order orientation orphans outline outline-color outline-offset outline-style outline-width overflow overflow-wrap overflow-x overflow-y pad padding padding-block-end padding-block-start padding-bottom padding-inline-end padding-inline-start padding-left padding-right padding-top page-break-after page-break-before page-break-inside pause-before pause-after pause perspective perspective-origin pointer-events position prefix quotes range resize rest rest-before rest-after right ruby-align ruby-merge ruby-position scroll-behavior scroll-snap-coordinate scroll-snap-destination scroll-snap-points-x scroll-snap-points-y scroll-snap-type scroll-snap-type-x scroll-snap-type-y shape-image-threshold shape-margin shape-outside speak speak-as suffix symbols system table-layout tab-size text-align text-align-last text-combine-upright text-decoration text-decoration-color text-decoration-line text-emphasis text-emphasis-color text-emphasis-position text-emphasis-style text-indent text-orientation text-overflow text-rendering text-shadow text-transform text-underline-position top touch-action transform transform-box transform-origin transform-style transition transition-delay transition-duration transition-property transition-timing-function unicode-bidi unicode-range user-zoom vertical-align visibility voice-balance voice-duration voice-family voice-pitch voice-rate voice-range voice-stress voice-volume white-space widows width will-change word-break word-spacing word-wrap writing-mode z-index zoom")

@@ -19,6 +19,7 @@ function! csscomplete#CompleteCSS(findstart, base)
    while start >= 0 && line[start - 1] =~ '\%(\k\|-\)'
      let start -= 1
    endwhile
+    let b:after = line[compl_begin :]
    let b:compl_context = line[0:compl_begin]
    return start
  endif
@@ -36,14 +37,11 @@ function! csscomplete#CompleteCSS(findstart, base)
  " 5. if @ complete at-rule
  " 6. if ! complete important
  if exists("b:compl_context")
-    let line = getline('.')
-    let compl_begin = col('.') - 2
-    let after = line[compl_begin:]
    let line = b:compl_context
+    let after = b:after
    unlet! b:compl_context
  else
    let line = a:base
-    let after = ''
  endif

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

@@ -1,776 +0,0 @@
-" Vim functions for file type detection
-"
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2020 Aug 17
-
-" These functions are moved here from runtime/filetype.vim to make startup
-" faster.
-
-" Line continuation is used here, remove 'C' from 'cpoptions'
-let s:cpo_save = &cpo
-set cpo&vim
-
-func dist#ft#Check_inp()
-  if getline(1) =~ '^\*'
-    setf abaqus
-  else
-    let n = 1
-    if line("$") > 500
-      let nmax = 500
-    else
-      let nmax = line("$")
-    endif
-    while n <= nmax
-      if getline(n) =~? "^header surface data"
-	setf trasys
-	break
-      endif
-      let n = n + 1
-    endwhile
-  endif
-endfunc
-
-" This function checks for the kind of assembly that is wanted by the user, or
-" can be detected from the first five lines of the file.
-func dist#ft#FTasm()
-  " make sure b:asmsyntax exists
-  if !exists("b:asmsyntax")
-    let b:asmsyntax = ""
-  endif
-
-  if b:asmsyntax == ""
-    call dist#ft#FTasmsyntax()
-  endif
-
-  " if b:asmsyntax still isn't set, default to asmsyntax or GNU
-  if b:asmsyntax == ""
-    if exists("g:asmsyntax")
-      let b:asmsyntax = g:asmsyntax
-    else
-      let b:asmsyntax = "asm"
-    endif
-  endif
-
-  exe "setf " . fnameescape(b:asmsyntax)
-endfunc
-
-func dist#ft#FTasmsyntax()
-  " see if file contains any asmsyntax=foo overrides. If so, change
-  " b:asmsyntax appropriately
-  let head = " ".getline(1)." ".getline(2)." ".getline(3)." ".getline(4).
-	\" ".getline(5)." "
-  let match = matchstr(head, '\sasmsyntax=\zs[a-zA-Z0-9]\+\ze\s')
-  if match != ''
-    let b:asmsyntax = match
-  elseif ((head =~? '\.title') || (head =~? '\.ident') || (head =~? '\.macro') || (head =~? '\.subtitle') || (head =~? '\.library'))
-    let b:asmsyntax = "vmasm"
-  endif
-endfunc
-
-" Check if one of the first five lines contains "VB_Name".  In that case it is
-" probably a Visual Basic file.  Otherwise it's assumed to be "alt" filetype.
-func dist#ft#FTVB(alt)
-  if getline(1).getline(2).getline(3).getline(4).getline(5) =~? 'VB_Name\|Begin VB\.\(Form\|MDIForm\|UserControl\)'
-    setf vb
-  else
-    exe "setf " . a:alt
-  endif
-endfunc
-
-func dist#ft#FTbtm()
-  if exists("g:dosbatch_syntax_for_btm") && g:dosbatch_syntax_for_btm
-    setf dosbatch
-  else
-    setf btm
-  endif
-endfunc
-
-func dist#ft#BindzoneCheck(default)
-  if getline(1).getline(2).getline(3).getline(4) =~ '^; <<>> DiG [0-9.]\+.* <<>>\|$ORIGIN\|$TTL\|IN\s\+SOA'
-    setf bindzone
-  elseif a:default != ''
-    exe 'setf ' . a:default
-  endif
-endfunc
-
-func dist#ft#FTlpc()
-  if exists("g:lpc_syntax_for_c")
-    let lnum = 1
-    while lnum <= 12
-      if getline(lnum) =~# '^\(//\|inherit\|private\|protected\|nosave\|string\|object\|mapping\|mixed\)'
-	setf lpc
-	return
-      endif
-      let lnum = lnum + 1
-    endwhile
-  endif
-  setf c
-endfunc
-
-func dist#ft#FTheader()
-  if match(getline(1, min([line("$"), 200])), '^@\(interface\|end\|class\)') > -1
-    if exists("g:c_syntax_for_h")
-      setf objc
-    else
-      setf objcpp
-    endif
-  elseif exists("g:c_syntax_for_h")
-    setf c
-  elseif exists("g:ch_syntax_for_h")
-    setf ch
-  else
-    setf cpp
-  endif
-endfunc
-
-" This function checks if one of the first ten lines start with a '@'.  In
-" that case it is probably a change file.
-" If the first line starts with # or ! it's probably a ch file.
-" If a line has "main", "include", "//" or "/*" it's probably ch.
-" Otherwise CHILL is assumed.
-func dist#ft#FTchange()
-  let lnum = 1
-  while lnum <= 10
-    if getline(lnum)[0] == '@'
-      setf change
-      return
-    endif
-    if lnum == 1 && (getline(1)[0] == '#' || getline(1)[0] == '!')
-      setf ch
-      return
-    endif
-    if getline(lnum) =~ "MODULE"
-      setf chill
-      return
-    endif
-    if getline(lnum) =~ 'main\s*(\|#\s*include\|//'
-      setf ch
-      return
-    endif
-    let lnum = lnum + 1
-  endwhile
-  setf chill
-endfunc
-
-func dist#ft#FTent()
-  " This function checks for valid cl syntax in the first five lines.
-  " Look for either an opening comment, '#', or a block start, '{".
-  " If not found, assume SGML.
-  let lnum = 1
-  while lnum < 6
-    let line = getline(lnum)
-    if line =~ '^\s*[#{]'
-      setf cl
-      return
-    elseif line !~ '^\s*$'
-      " Not a blank line, not a comment, and not a block start,
-      " so doesn't look like valid cl code.
-      break
-    endif
-    let lnum = lnum + 1
-  endw
-  setf dtd
-endfunc
-
-func dist#ft#EuphoriaCheck()
-  if exists('g:filetype_euphoria')
-    exe 'setf ' . g:filetype_euphoria
-  else
-    setf euphoria3
-  endif
-endfunc
-
-func dist#ft#DtraceCheck()
-  let lines = getline(1, min([line("$"), 100]))
-  if match(lines, '^module\>\|^import\>') > -1
-    " D files often start with a module and/or import statement.
-    setf d
-  elseif match(lines, '^#!\S\+dtrace\|#pragma\s\+D\s\+option\|:\S\{-}:\S\{-}:') > -1
-    setf dtrace
-  else
-    setf d
-  endif
-endfunc
-
-func dist#ft#FTe()
-  if exists('g:filetype_euphoria')
-    exe 'setf ' . g:filetype_euphoria
-  else
-    let n = 1
-    while n < 100 && n <= line("$")
-      if getline(n) =~ "^\\s*\\(<'\\|'>\\)\\s*$"
-	setf specman
-	return
-      endif
-      let n = n + 1
-    endwhile
-    setf eiffel
-  endif
-endfunc
-
-" Distinguish between HTML, XHTML and Django
-func dist#ft#FThtml()
-  let n = 1
-  while n < 10 && n <= line("$")
-    if getline(n) =~ '\<DTD\s\+XHTML\s'
-      setf xhtml
-      return
-    endif
-    if getline(n) =~ '{%\s*\(extends\|block\|load\)\>\|{#\s\+'
-      setf htmldjango
-      return
-    endif
-    let n = n + 1
-  endwhile
-  setf FALLBACK html
-endfunc
-
-" Distinguish between standard IDL and MS-IDL
-func dist#ft#FTidl()
-  let n = 1
-  while n < 50 && n <= line("$")
-    if getline(n) =~ '^\s*import\s\+"\(unknwn\|objidl\)\.idl"'
-      setf msidl
-      return
-    endif
-    let n = n + 1
-  endwhile
-  setf idl
-endfunc
-
-" Distinguish between "default" and Cproto prototype file. */
-func dist#ft#ProtoCheck(default)
-  " Cproto files have a comment in the first line and a function prototype in
-  " the second line, it always ends in ";".  Indent files may also have
-  " comments, thus we can't match comments to see the difference.
-  " IDL files can have a single ';' in the second line, require at least one
-  " chacter before the ';'.
-  if getline(2) =~ '.;$'
-    setf cpp
-  else
-    exe 'setf ' . a:default
-  endif
-endfunc
-
-func dist#ft#FTm()
-  let n = 1
-  let saw_comment = 0 " Whether we've seen a multiline comment leader.
-  while n < 100
-    let line = getline(n)
-    if line =~ '^\s*/\*'
-      " /* ... */ is a comment in Objective C and Murphi, so we can't conclude
-      " it's either of them yet, but track this as a hint in case we don't see
-      " anything more definitive.
-      let saw_comment = 1
-    endif
-    if line =~ '^\s*\(#\s*\(include\|import\)\>\|@import\>\|//\)'
-      setf objc
-      return
-    endif
-    if line =~ '^\s*%'
-      setf matlab
-      return
-    endif
-    if line =~ '^\s*(\*'
-      setf mma
-      return
-    endif
-    if line =~ '^\c\s*\(\(type\|var\)\>\|--\)'
-      setf murphi
-      return
-    endif
-    let n = n + 1
-  endwhile
-
-  if saw_comment
-    " We didn't see anything definitive, but this looks like either Objective C
-    " or Murphi based on the comment leader. Assume the former as it is more
-    " common.
-    setf objc
-  elseif exists("g:filetype_m")
-    " Use user specified default filetype for .m
-    exe "setf " . g:filetype_m
-  else
-    " Default is matlab
-    setf matlab
-  endif
-endfunc
-
-func dist#ft#FTmms()
-  let n = 1
-  while n < 20
-    let line = getline(n)
-    if line =~ '^\s*\(%\|//\)' || line =~ '^\*'
-      setf mmix
-      return
-    endif
-    if line =~ '^\s*#'
-      setf make
-      return
-    endif
-    let n = n + 1
-  endwhile
-  setf mmix
-endfunc
-
-" This function checks if one of the first five lines start with a dot.  In
-" that case it is probably an nroff file: 'filetype' is set and 1 is returned.
-func dist#ft#FTnroff()
-  if getline(1)[0] . getline(2)[0] . getline(3)[0] . getline(4)[0] . getline(5)[0] =~ '\.'
-    setf nroff
-    return 1
-  endif
-  return 0
-endfunc
-
-func dist#ft#FTmm()
-  let n = 1
-  while n < 20
-    let line = getline(n)
-    if line =~ '^\s*\(#\s*\(include\|import\)\>\|@import\>\|/\*\)'
-      setf objcpp
-      return
-    endif
-    let n = n + 1
-  endwhile
-  setf nroff
-endfunc
-
-func dist#ft#FTpl()
-  if exists("g:filetype_pl")
-    exe "setf " . g:filetype_pl
-  else
-    " recognize Prolog by specific text in the first non-empty line
-    " require a blank after the '%' because Perl uses "%list" and "%translate"
-    let l = getline(nextnonblank(1))
-    if l =~ '\<prolog\>' || l =~ '^\s*\(%\+\(\s\|$\)\|/\*\)' || l =~ ':-'
-      setf prolog
-    else
-      setf perl
-    endif
-  endif
-endfunc
-
-func dist#ft#FTinc()
-  if exists("g:filetype_inc")
-    exe "setf " . g:filetype_inc
-  else
-    let lines = getline(1).getline(2).getline(3)
-    if lines =~? "perlscript"
-      setf aspperl
-    elseif lines =~ "<%"
-      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")
-	exe "setf " . fnameescape(b:asmsyntax)
-      else
-	setf pov
-      endif
-    endif
-  endif
-endfunc
-
-func dist#ft#FTprogress_cweb()
-  if exists("g:filetype_w")
-    exe "setf " . g:filetype_w
-    return
-  endif
-  if getline(1) =~ '&ANALYZE' || getline(3) =~ '&GLOBAL-DEFINE'
-    setf progress
-  else
-    setf cweb
-  endif
-endfunc
-
-func dist#ft#FTprogress_asm()
-  if exists("g:filetype_i")
-    exe "setf " . g:filetype_i
-    return
-  endif
-  " This function checks for an assembly comment the first ten lines.
-  " If not found, assume Progress.
-  let lnum = 1
-  while lnum <= 10 && lnum < line('$')
-    let line = getline(lnum)
-    if line =~ '^\s*;' || line =~ '^\*'
-      call dist#ft#FTasm()
-      return
-    elseif line !~ '^\s*$' || line =~ '^/\*'
-      " Not an empty line: Doesn't look like valid assembly code.
-      " Or it looks like a Progress /* comment
-      break
-    endif
-    let lnum = lnum + 1
-  endw
-  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
-    return
-  endif
-  " This function checks for valid Pascal syntax in the first ten lines.
-  " Look for either an opening comment or a program start.
-  " If not found, assume Progress.
-  let lnum = 1
-  while lnum <= 10 && lnum < line('$')
-    let line = getline(lnum)
-    if line =~ s:ft_pascal_comments || line =~? s:ft_pascal_keywords
-      setf pascal
-      return
-    elseif line !~ '^\s*$' || line =~ '^/\*'
-      " Not an empty line: Doesn't look like valid Pascal code.
-      " Or it looks like a Progress /* comment
-      break
-    endif
-    let lnum = lnum + 1
-  endw
-  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("$")
-
-  for n in range(1, max)
-    " Rebol is easy to recognize, check for that first
-    if getline(n) =~? '\<REBOL\>'
-      setf rebol
-      return
-    endif
-  endfor
-
-  for n in range(1, max)
-    " R has # comments
-    if getline(n) =~ '^\s*#'
-      setf r
-      return
-    endif
-    " Rexx has /* comments */
-    if getline(n) =~ '^\s*/\*'
-      setf rexx
-      return
-    endif
-  endfor
-
-  " Nothing recognized, use user default or assume Rexx
-  if exists("g:filetype_r")
-    exe "setf " . g:filetype_r
-  else
-    " Rexx used to be the default, but R appears to be much more popular.
-    setf r
-  endif
-endfunc
-
-func dist#ft#McSetf()
-  " Rely on the file to start with a comment.
-  " MS message text files use ';', Sendmail files use '#' or 'dnl'
-  for lnum in range(1, min([line("$"), 20]))
-    let line = getline(lnum)
-    if line =~ '^\s*\(#\|dnl\)'
-      setf m4  " Sendmail .mc file
-      return
-    elseif line =~ '^\s*;'
-      setf msmessages  " MS Message text file
-      return
-    endif
-  endfor
-  setf m4  " Default: Sendmail .mc file
-endfunc
-
-" Called from filetype.vim and scripts.vim.
-func dist#ft#SetFileTypeSH(name)
-  if did_filetype()
-    " Filetype was already detected
-    return
-  endif
-  if expand("<amatch>") =~ g:ft_ignore_pat
-    return
-  endif
-  if a:name =~ '\<csh\>'
-    " Some .sh scripts contain #!/bin/csh.
-    call dist#ft#SetFileTypeShell("csh")
-    return
-  elseif a:name =~ '\<tcsh\>'
-    " Some .sh scripts contain #!/bin/tcsh.
-    call dist#ft#SetFileTypeShell("tcsh")
-    return
-  elseif a:name =~ '\<zsh\>'
-    " Some .sh scripts contain #!/bin/zsh.
-    call dist#ft#SetFileTypeShell("zsh")
-    return
-  elseif a:name =~ '\<ksh\>'
-    let b:is_kornshell = 1
-    if exists("b:is_bash")
-      unlet b:is_bash
-    endif
-    if exists("b:is_sh")
-      unlet b:is_sh
-    endif
-  elseif exists("g:bash_is_sh") || a:name =~ '\<bash\>' || a:name =~ '\<bash2\>'
-    let b:is_bash = 1
-    if exists("b:is_kornshell")
-      unlet b:is_kornshell
-    endif
-    if exists("b:is_sh")
-      unlet b:is_sh
-    endif
-  elseif a:name =~ '\<sh\>'
-    let b:is_sh = 1
-    if exists("b:is_kornshell")
-      unlet b:is_kornshell
-    endif
-    if exists("b:is_bash")
-      unlet b:is_bash
-    endif
-  endif
-  call dist#ft#SetFileTypeShell("sh")
-endfunc
-
-" For shell-like file types, check for an "exec" command hidden in a comment,
-" as used for Tcl.
-" Also called from scripts.vim, thus can't be local to this script.
-func dist#ft#SetFileTypeShell(name)
-  if did_filetype()
-    " Filetype was already detected
-    return
-  endif
-  if expand("<amatch>") =~ g:ft_ignore_pat
-    return
-  endif
-  let l = 2
-  while l < 20 && l < line("$") && getline(l) =~ '^\s*\(#\|$\)'
-    " Skip empty and comment lines.
-    let l = l + 1
-  endwhile
-  if l < line("$") && getline(l) =~ '\s*exec\s' && getline(l - 1) =~ '^\s*#.*\\$'
-    " Found an "exec" line after a comment with continuation
-    let n = substitute(getline(l),'\s*exec\s\+\([^ ]*/\)\=', '', '')
-    if n =~ '\<tclsh\|\<wish'
-      setf tcl
-      return
-    endif
-  endif
-  exe "setf " . a:name
-endfunc
-
-func dist#ft#CSH()
-  if did_filetype()
-    " Filetype was already detected
-    return
-  endif
-  if exists("g:filetype_csh")
-    call dist#ft#SetFileTypeShell(g:filetype_csh)
-  elseif &shell =~ "tcsh"
-    call dist#ft#SetFileTypeShell("tcsh")
-  else
-    call dist#ft#SetFileTypeShell("csh")
-  endif
-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\|\%(usr/\)\=lib/udev/\%(rules\.d/\)\=.*\.rules\)$'
-    setf udevrules
-    return
-  endif
-  if path =~ '^/etc/ufw/'
-    setf conf  " Better than hog
-    return
-  endif
-  if path =~ '^/\(etc\|usr/share\)/polkit-1/rules\.d'
-    setf javascript
-    return
-  endif
-  try
-    let config_lines = readfile('/etc/udev/udev.conf')
-  catch /^Vim\%((\a\+)\)\=:E484/
-    setf hog
-    return
-  endtry
-  let dir = expand('<amatch>:p:h')
-  for line in config_lines
-    if line =~ s:ft_rules_udev_rules_pattern
-      let udev_rules = substitute(line, s:ft_rules_udev_rules_pattern, '\1', "")
-      if dir == udev_rules
-	setf udevrules
-      endif
-      break
-    endif
-  endfor
-  setf hog
-endfunc
-
-func dist#ft#SQL()
-  if exists("g:filetype_sql")
-    exe "setf " . g:filetype_sql
-  else
-    setf sql
-  endif
-endfunc
-
-" If the file has an extension of 't' and is in a directory 't' or 'xt' then
-" it is almost certainly a Perl test file.
-" If the first line starts with '#' and contains 'perl' it's probably a Perl
-" file.
-" (Slow test) If a file contains a 'use' statement then it is almost certainly
-" a Perl file.
-func dist#ft#FTperl()
-  let dirname = expand("%:p:h:t")
-  if expand("%:e") == 't' && (dirname == 't' || dirname == 'xt')
-    setf perl
-    return 1
-  endif
-  if getline(1)[0] == '#' && getline(1) =~ 'perl'
-    setf perl
-    return 1
-  endif
-  let save_cursor = getpos('.')
-  call cursor(1,1)
-  let has_use = search('^use\s\s*\k', 'c', 30)
-  call setpos('.', save_cursor)
-  if has_use
-    setf perl
-    return 1
-  endif
-  return 0
-endfunc
-
-" Choose context, plaintex, or tex (LaTeX) based on these rules:
-" 1. Check the first line of the file for "%&<format>".
-" 2. Check the first 1000 non-comment lines for LaTeX or ConTeXt keywords.
-" 3. Default to "plain" or to g:tex_flavor, can be set in user's vimrc.
-func dist#ft#FTtex()
-  let firstline = getline(1)
-  if firstline =~ '^%&\s*\a\+'
-    let format = tolower(matchstr(firstline, '\a\+'))
-    let format = substitute(format, 'pdf', '', '')
-    if format == 'tex'
-      let format = 'latex'
-    elseif format == 'plaintex'
-      let format = 'plain'
-    endif
-  elseif expand('%') =~ 'tex/context/.*/.*.tex'
-    let format = 'context'
-  else
-    " Default value, may be changed later:
-    let format = exists("g:tex_flavor") ? g:tex_flavor : 'plain'
-    " Save position, go to the top of the file, find first non-comment line.
-    let save_cursor = getpos('.')
-    call cursor(1,1)
-    let firstNC = search('^\s*[^[:space:]%]', 'c', 1000)
-    if firstNC " Check the next thousand lines for a LaTeX or ConTeXt keyword.
-      let lpat = 'documentclass\>\|usepackage\>\|begin{\|newcommand\>\|renewcommand\>'
-      let cpat = 'start\a\+\|setup\a\+\|usemodule\|enablemode\|enableregime\|setvariables\|useencoding\|usesymbols\|stelle\a\+\|verwende\a\+\|stel\a\+\|gebruik\a\+\|usa\a\+\|imposta\a\+\|regle\a\+\|utilisemodule\>'
-      let kwline = search('^\s*\\\%(' . lpat . '\)\|^\s*\\\(' . cpat . '\)',
-			      \ 'cnp', firstNC + 1000)
-      if kwline == 1	" lpat matched
-	let format = 'latex'
-      elseif kwline == 2	" cpat matched
-	let format = 'context'
-      endif		" If neither matched, keep default set above.
-      " let lline = search('^\s*\\\%(' . lpat . '\)', 'cn', firstNC + 1000)
-      " let cline = search('^\s*\\\%(' . cpat . '\)', 'cn', firstNC + 1000)
-      " if cline > 0
-      "   let format = 'context'
-      " endif
-      " if lline > 0 && (cline == 0 || cline > lline)
-      "   let format = 'tex'
-      " endif
-    endif " firstNC
-    call setpos('.', save_cursor)
-  endif " firstline =~ '^%&\s*\a\+'
-
-  " Translation from formats to file types.  TODO:  add AMSTeX, RevTex, others?
-  if format == 'plain'
-    setf plaintex
-  elseif format == 'context'
-    setf context
-  else " probably LaTeX
-    setf tex
-  endif
-  return
-endfunc
-
-func dist#ft#FTxml()
-  let n = 1
-  while n < 100 && n <= line("$")
-    let line = getline(n)
-    " DocBook 4 or DocBook 5.
-    let is_docbook4 = line =~ '<!DOCTYPE.*DocBook'
-    let is_docbook5 = line =~ ' xmlns="http://docbook.org/ns/docbook"'
-    if is_docbook4 || is_docbook5
-      let b:docbk_type = "xml"
-      if is_docbook5
-	let b:docbk_ver = 5
-      else
-	let b:docbk_ver = 4
-      endif
-      setf docbk
-      return
-    endif
-    if line =~ 'xmlns:xbl="http://www.mozilla.org/xbl"'
-      setf xbl
-      return
-    endif
-    let n += 1
-  endwhile
-  setf xml
-endfunc
-
-func dist#ft#FTy()
-  let n = 1
-  while n < 100 && n <= line("$")
-    let line = getline(n)
-    if line =~ '^\s*%'
-      setf yacc
-      return
-    endif
-    if getline(n) =~ '^\s*\(#\|class\>\)' && getline(n) !~ '^\s*#\s*include'
-      setf racc
-      return
-    endif
-    let n = n + 1
-  endwhile
-  setf yacc
-endfunc
-
-func dist#ft#Redif()
-  let lnum = 1
-  while lnum <= 5 && lnum < line('$')
-    if getline(lnum) =~ "^\ctemplate-type:"
-      setf redif
-      return
-    endif
-    let lnum = lnum + 1
-  endwhile
-endfunc
-
-
-" Restore 'cpoptions'
-let &cpo = s:cpo_save
-unlet s:cpo_save
@@ -22,7 +22,7 @@ if &cp
 endif
 if v:version < 702
 echohl WarningMsg
- echo "***warning*** this version of GetLatestVimScripts needs vim 7.2"
+ echo "***warning*** this version of getscript needs vim 7.2"
 echohl Normal
 finish
 endif
@@ -1,6 +1,6 @@
 " Vim autoload file for editing compressed files.
 " Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2016 Sep 28
+" Last Change: 2014 Nov 05

 " These functions are used by the gzip plugin.

@@ -63,9 +63,6 @@ fun gzip#read(cmd)
  " set 'modifiable'
  let ma_save = &ma
  setlocal ma
-  " set 'write'
-  let write_save = &write
-  set write
  " Reset 'foldenable', otherwise line numbers get adjusted.
  if has("folding")
    let fen_save = &fen
@@ -130,7 +127,6 @@ fun gzip#read(cmd)
  let &pm = pm_save
  let &cpo = cpo_save
  let &l:ma = ma_save
-  let &write = write_save
  if has("folding")
    let &l:fen = fen_save
  endif
@@ -1,7 +1,7 @@
 " Vim completion script
 " Language:	HTML and XHTML
 " Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
-" Last Change:	2019 Sep 27
+" Last Change:	2014 Jun 20

 " Distinguish between HTML versions.
 " To use with other HTML versions add another "elseif" condition to match
@@ -245,8 +245,7 @@ function! htmlcomplete#CompleteTags(findstart, base)
 	" If context contains white space it is attribute.
 	" It can be also value of attribute.
 	" We have to get first word to offer proper completions
-	if context =~ '^\s*$'
-		" empty or whitespace line
+	if context == ''
 		let tag = ''
 	else
 		let tag = split(context)[0]
@@ -1,9 +1,7 @@
 " Vim completion script
 " Language:	Java Script
-" Maintainer:	Jay Sitter (jay@jaysitter.com)
-" URL: https://github.com/jsit/javascriptcomplete.vim/
-" Previous Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
-" Last Change:	2020 Jul 30
+" Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
+" Last Change:	2006 Apr 30

 function! javascriptcomplete#CompleteJS(findstart, base)
  if a:findstart
@@ -156,30 +154,12 @@ function! javascriptcomplete#CompleteJS(findstart, base)
 					\ 'text', 'vLink']
 		let bodys = bodyprop
 		" Document - document.
-		let docuprop = ['anchors', 'body', 'characterSet', 'doctype',
-					\ 'documentElement', 'documentURI', 'embeds', 'fonts', 'forms',
-					\ 'head', 'hidden', 'images', 'implementation', 'lastStyleSheetSet',
-					\ 'links', 'plugins', 'preferredStyleSheetSet', 'scripts',
-					\ 'scrollingElement', 'selectedStyleSheetSet', 'styleSheetSets',
-					\ 'timeline', 'visibilityState', 'cookie', 'defaultView',
-					\ 'designMode', 'dir', 'domain', 'lastModified', 'location',
-					\ 'readyState', 'referrer', 'title', 'URL', 'activeElement',
-					\ 'fullscreenElement', 'styleSheets']
-		let documeth = ['adoptNode', 'close', 'createAttribute',
-					\ 'createAttributeNS', 'createCDATASection', 'createComment',
-					\ 'createDocumentFragment', 'createElement', 'createElementNS',
-					\ 'createEvent', 'createExpression', 'createNSResolver',
-					\ 'createNodeIterator', 'createProcessingInstruction', 'createRange',
-					\ 'createTextNode', 'createTouchList', 'createTreeWalker',
-					\ 'enableStyleSheetsForSet', 'evaluate', 'focus', 'getElementById',
-					\ 'getElementById', 'getElementsByClassName', 'getElementsByName',
-					\ 'getElementsByTagName', 'getElementsByTagNameNS',
-					\ 'hasStorageAccess', 'importNode', 'onClick', 'onDblClick',
-					\ 'onFocus', 'onKeyDown', 'onKeyPress', 'onKeyUp', 'onMouseDown',
-					\ 'onMouseMove', 'onMouseOut', 'onMouseOver', 'onMouseUp',
-					\ 'onResize', 'open', 'querySelector', 'querySelectorAll',
-					\ 'requestStorageAccess', 'write', 'writeln']
-
+		let docuprop = ['anchors', 'applets', 'childNodes', 'embeds', 'forms', 'images', 'links', 'stylesheets',
+					\ 'body', 'cookie', 'documentElement', 'domain', 'lastModified', 'referrer', 'title', 'URL']
+		let documeth = ['close', 'createAttribute', 'createElement', 'createTextNode', 'focus', 'getElementById',
+					\ 'getElementsByName', 'getElementsByTagName', 'open', 'write', 'writeln',
+					\ 'onClick', 'onDblClick', 'onFocus', 'onKeyDown', 'onKeyPress', 'onKeyUp',
+					\ 'onMouseDown', 'onMouseMove', 'onMouseOut', 'onMouseOver', 'onMouseUp', 'onResize']
 		call map(documeth, 'v:val."("')
 		let docuxprop = ['attributes', 'childNodes', 'doctype', 'documentElement', 'firstChild',
 					\ 'implementation', 'namespaceURI', 'nextSibling', 'nodeName', 'nodeType',
@@ -388,11 +368,9 @@ function! javascriptcomplete#CompleteJS(findstart, base)
 		let xdomelemprop = ['attributes', 'childNodes', 'firstChild', 'lastChild', 
 					\ 'namespaceURI', 'nextSibling', 'nodeName', 'nodeType', 'nodeValue',
 					\ 'ownerDocument', 'parentNode', 'prefix', 'previousSibling', 'tagName']
-		let xdomelemmeth = ['appendChild', 'addEventListener', 'cloneNode',
-					\ 'dispatchEvent', 'getAttribute', 'getAttributeNode',
-					\ 'getElementsByTagName', 'hasChildNodes', 'insertBefore',
-					\ 'normalize', 'removeAttribute', 'removeAttributeNode',
-					\ 'removeChild', 'removeEventListener', 'replaceChild',
+		let xdomelemmeth = ['appendChild', 'cloneNode', 'getAttribute', 'getAttributeNode',
+					\ 'getElementsByTagName', 'hasChildNodes', 'insertBefore', 'normalize',
+					\ 'removeAttribute', 'removeAttributeNode', 'removeChild', 'replaceChild',
 					\ 'setAttribute', 'setAttributeNode']
 		call map(xdomelemmeth, 'v:val."("')
 		let xdomelems = xdomelemprop + xdomelemmeth
@@ -585,7 +563,7 @@ function! javascriptcomplete#CompleteJS(findstart, base)
 	for i in arguments
 		let g:ia = i
 		let f_elements = matchlist(i, 'function\s\+\(\k\+\)\s*(\(.\{-}\))')
-		if len(f_elements) >= 3
+		if len(f_elements) == 3
 			let b:js_menuinfo[f_elements[1].'('] = f_elements[2]
 		endif
 	endfor
@@ -1,8 +1,8 @@
 " netrwFileHandlers: contains various extension-based file handlers for
 "                    netrw's browsers' x command ("eXecute launcher")
 " Author:	Charles E. Campbell
-" Date:		Sep 18, 2020
-" Version:	11
+" Date:		May 03, 2013
+" Version:	11b	ASTRO-ONLY
 " 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= "v11"
+let g:loaded_netrwFileHandlers= "v11b"
 if v:version < 702
 echohl WarningMsg
 echo "***warning*** this version of netrwFileHandlers needs vim 7.2"
@@ -1,7 +1,7 @@
 " netrwSettings.vim: makes netrw settings simpler
-" Date:		Nov 09, 2016
-" Maintainer:	Charles E Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
-" Version:	16
+" Date:		Dec 30, 2014
+" Maintainer:	Charles E Campbell <drchipNOSPAM at campbellfamily dot biz>
+" Version:	15
 " Copyright:    Copyright (C) 1999-2007 Charles E. Campbell {{{1
 "               Permission is hereby granted to use and distribute this code,
 "               with or without modifications, provided that this copyright
@@ -19,7 +19,7 @@
 if exists("g:loaded_netrwSettings") || &cp
  finish
 endif
-let g:loaded_netrwSettings = "v16"
+let g:loaded_netrwSettings = "v15"
 if v:version < 700
 echohl WarningMsg
 echo "***warning*** this version of netrwSettings needs vim 7.0"
@@ -154,13 +154,9 @@ fun! netrwSettings#NetrwSettings()
  put = 'let g:netrw_list_hide         = '.g:netrw_list_hide
  put = 'let g:netrw_liststyle         = '.g:netrw_liststyle
  put = 'let g:netrw_localcopycmd      = '.g:netrw_localcopycmd
-  put = 'let g:netrw_localcopycmdopt   = '.g:netrw_localcopycmdopt
  put = 'let g:netrw_localmkdir        = '.g:netrw_localmkdir
-  put = 'let g:netrw_localmkdiropt     = '.g:netrw_localmkdiropt
  put = 'let g:netrw_localmovecmd      = '.g:netrw_localmovecmd
-  put = 'let g:netrw_localmovecmdopt   = '.g:netrw_localmovecmdopt
  put = 'let g:netrw_localrmdir        = '.g:netrw_localrmdir
-  put = 'let g:netrw_localrmdiropt     = '.g:netrw_localrmdiropt
  put = 'let g:netrw_maxfilenamelen    = '.g:netrw_maxfilenamelen
  put = 'let g:netrw_menu              = '.g:netrw_menu
  put = 'let g:netrw_mousemaps         = '.g:netrw_mousemaps
@@ -18,5 +18,61 @@
 "               holder be liable for any damages resulting from the use
 "               of this software.
 function! netrw_gitignore#Hide(...)
-  return substitute(substitute(system('git ls-files --other --ignored --exclude-standard --directory'), '\n', ',', 'g'), ',$', '', '')
+  let additional_files = a:000
+
+  let default_files = ['.gitignore', '.git/info/exclude']
+
+  " get existing global/system gitignore files
+  let global_gitignore = expand(substitute(system("git config --global core.excludesfile"), '\n', '', 'g'))
+  if global_gitignore !=# ''
+    let default_files = add(default_files, global_gitignore)
+  endif
+  let system_gitignore = expand(substitute(system("git config --system core.excludesfile"), '\n', '', 'g'))
+  if system_gitignore !=# ''
+    let default_files = add(default_files, system_gitignore)
+  endif
+
+  " append additional files if given as function arguments
+  if additional_files !=# []
+    let files = extend(default_files, additional_files)
+  else
+    let files = default_files
+  endif
+
+  " keep only existing/readable files
+  let gitignore_files = []
+  for file in files
+    if filereadable(file)
+      let gitignore_files = add(gitignore_files, file)
+    endif
+  endfor
+
+  " get contents of gitignore patterns from those files
+  let gitignore_lines = []
+  for file in gitignore_files
+    for line in readfile(file)
+      " filter empty lines and comments
+      if line !~# '^#' && line !~# '^$'
+        let gitignore_lines = add(gitignore_lines, line)
+      endif
+    endfor
+  endfor
+
+  " convert gitignore patterns to Netrw/Vim regex patterns
+  let escaped_lines = []
+  for line in gitignore_lines
+    let escaped = line
+    let escaped = substitute(escaped, '\*\*', '*', 'g')
+    let escaped = substitute(escaped, '\.', '\\.', 'g')
+    let escaped = substitute(escaped, '\$', '\\$', 'g')
+    let escaped = substitute(escaped, '*', '.*', 'g')
+    " correction: dot, dollar and asterisks chars shouldn't be escaped when
+    " within regex matching groups.
+    let escaped = substitute(escaped, '\(\[[^]]*\)\zs\\\.', '\.', 'g')
+    let escaped = substitute(escaped, '\(\[[^]]*\)\zs\\\$', '\$', 'g')
+    let escaped = substitute(escaped, '\(\[[^]]*\)\zs\.\*', '*', 'g')
+    let escaped_lines = add(escaped_lines, escaped)
+  endfor
+
+  return join(escaped_lines, ',')
 endfunction
@@ -1,25 +1,35 @@
 " Vim support file to help with paste mappings and menus
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2019 Jan 27
+" Last Change:	2006 Jun 23

 " Define the string to use for items that are present both in Edit, Popup and
 " Toolbar menu.  Also used in mswin.vim and macmap.vim.

-let paste#paste_cmd = {'n': ":call paste#Paste()<CR>"}
-let paste#paste_cmd['v'] = '"-c<Esc>' . paste#paste_cmd['n']
-let paste#paste_cmd['i'] = "\<c-\>\<c-o>\"+gP"
+" Pasting blockwise and linewise selections is not possible in Insert and
+" Visual mode without the +virtualedit feature.  They are pasted as if they
+" were characterwise instead.  Add to that some tricks to leave the cursor in
+" the right position, also for "gi".
+if has("virtualedit")
+  let paste#paste_cmd = {'n': ":call paste#Paste()<CR>"}
+  let paste#paste_cmd['v'] = '"-c<Esc>' . paste#paste_cmd['n']
+  let paste#paste_cmd['i'] = 'x<BS><Esc>' . paste#paste_cmd['n'] . 'gi'

-func! paste#Paste()
-  let ove = &ve
-  set ve=all
-  normal! `^
-  if @+ != ''
-    normal! "+gP
-  endif
-  let c = col(".")
-  normal! i
-  if col(".") < c	" compensate for i<ESC> moving the cursor left
-    normal! l
-  endif
-  let &ve = ove
-endfunc
+  func! paste#Paste()
+    let ove = &ve
+    set ve=all
+    normal! `^
+    if @+ != ''
+      normal! "+gP
+    endif
+    let c = col(".")
+    normal! i
+    if col(".") < c	" compensate for i<ESC> moving the cursor left
+      normal! l
+    endif
+    let &ve = ove
+  endfunc
+else
+  let paste#paste_cmd = {'n': "\"=@+.'xy'<CR>gPFx\"_2x"}
+  let paste#paste_cmd['v'] = '"-c<Esc>gix<Esc>' . paste#paste_cmd['n'] . '"_x'
+  let paste#paste_cmd['i'] = 'x<Esc>' . paste#paste_cmd['n'] . '"_s'
+endif
@@ -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:  2021 Feb 08
+" Last Change:  2015 Jul 13
 "
 "	OPTIONS:
 "
@@ -122,6 +122,7 @@ 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")
@@ -145,8 +146,8 @@ function! phpcomplete#CompletePHP(findstart, base) " {{{
 	end

 	try
-		let eventignore = &eventignore
-		let &eventignore = 'all'
+		let winheight = winheight(0)
+		let winnr = winnr()

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

@@ -180,6 +181,7 @@ 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")
@@ -193,8 +195,6 @@ function! phpcomplete#CompletePHP(findstart, base) " {{{
 			" }}}
 		elseif context =~? 'implements'
 			return phpcomplete#CompleteClassName(a:base, ['i'], current_namespace, imports)
-		elseif context =~? 'instanceof'
-			return phpcomplete#CompleteClassName(a:base, ['c', 'n'], current_namespace, imports)
 		elseif context =~? 'extends\s\+.\+$' && a:base == ''
 			return ['implements']
 		elseif context =~? 'extends'
@@ -213,7 +213,7 @@ function! phpcomplete#CompletePHP(findstart, base) " {{{
 			return phpcomplete#CompleteGeneral(a:base, current_namespace, imports)
 		endif
 	finally
-		let &eventignore = eventignore
+		silent! exec winnr.'resize '.winheight
 	endtry
 endfunction
 " }}}
@@ -787,8 +787,6 @@ function! phpcomplete#CompleteClassName(base, kinds, current_namespace, imports)

 	if kinds == ['c', 'i']
 		let filterstr = 'v:val =~? "\\(class\\|interface\\)\\s\\+[a-zA-Z_\\x7f-\\xff][a-zA-Z_0-9\\x7f-\\xff]*\\s*"'
-	elseif kinds == ['c', 'n']
-		let filterstr = 'v:val =~? "\\(class\\|namespace\\)\\s\\+[a-zA-Z_\\x7f-\\xff][a-zA-Z_0-9\\x7f-\\xff]*\\s*"'
 	elseif kinds == ['c']
 		let filterstr = 'v:val =~? "class\\s\\+[a-zA-Z_\\x7f-\\xff][a-zA-Z_0-9\\x7f-\\xff]*\\s*"'
 	elseif kinds == ['i']
@@ -998,7 +996,7 @@ function! phpcomplete#CompleteUserClass(context, base, sccontent, visibility) "
 		let required_modifiers += ['static']
 	endif
 	let all_variable = filter(deepcopy(a:sccontent),
-					\ 'v:val =~ "\\(^\\s*\\(var\\s\\+\\|public\\s\\+\\|protected\\s\\+\\|private\\s\\+\\|final\\s\\+\\|abstract\\s\\+\\|static\\s\\+\\)\\+\\$\\|^\\s*\\(\\/\\|\\*\\)*\\s*@property\\s\\+\\S\\+\\s\\S\\{-}\\s*$\\)"')
+					\ 'v:val =~ "^\\s*\\(var\\s\\+\\|public\\s\\+\\|protected\\s\\+\\|private\\s\\+\\|final\\s\\+\\|abstract\\s\\+\\|static\\s\\+\\)\\+\\$"')

 	let variables = []
 	for i in all_variable
@@ -1020,7 +1018,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
@@ -1162,14 +1160,6 @@ function! phpcomplete#GetTaglist(pattern) " {{{
 	endif

 	let tags = taglist(a:pattern)
-	for tag in tags
-		for prop in keys(tag)
-			if prop == 'cmd' || prop == 'static' || prop == 'kind' || prop == 'builtin'
-				continue
-			endif
-			let tag[prop] = substitute(tag[prop], '\\\\', '\\', 'g')
-		endfor
-	endfor
 	let s:cache_tags[a:pattern] = tags
 	let has_key = has_key(s:cache_tags, a:pattern)
 	let s:cache_tags_checksum = cache_checksum
@@ -1389,30 +1379,16 @@ function! phpcomplete#GetCallChainReturnType(classname_candidate, class_candidat
 			" Get Structured information of all classes and subclasses including namespace and includes
 			" try to find the method's return type in docblock comment
 			for classstructure in classcontents
-				let docblock_target_pattern = 'function\s\+&\?'.method.'\>\|\(public\|private\|protected\|var\).\+\$'.method.'\>\|@property.\+\$'.method.'\>'
+				let docblock_target_pattern = 'function\s\+&\?'.method.'\|\(public\|private\|protected\|var\).\+\$'.method
 				let doc_str = phpcomplete#GetDocBlock(split(classstructure.content, '\n'), docblock_target_pattern)
-				let return_type_hint = phpcomplete#GetFunctionReturnTypeHint(split(classstructure.content, '\n'), 'function\s\+&\?'.method.'\>')
-				if doc_str != '' || return_type_hint != ''
+				if doc_str != ''
 					break
 				endif
 			endfor
-			if doc_str != '' || return_type_hint != ''
+			if doc_str != ''
 				let docblock = phpcomplete#ParseDocBlock(doc_str)
-				if has_key(docblock.return, 'type') || has_key(docblock.var, 'type') || len(docblock.properties) > 0 || return_type_hint != ''
-					if return_type_hint == ''
-						let type = has_key(docblock.return, 'type') ? docblock.return.type : has_key(docblock.var, 'type') ? docblock.var.type : ''
-
-						if type == ''
-							for property in docblock.properties
-								if property.description =~? method
-									let type = property.type
-									break
-								endif
-							endfor
-						endif
-					else
-						let type = return_type_hint
-					end
+				if has_key(docblock.return, 'type') || has_key(docblock.var, 'type')
+					let type = has_key(docblock.return, 'type') ? docblock.return.type : docblock.var.type

 					" there's a namespace in the type, threat the type as FQCN
 					if type =~ '\\'
@@ -1486,7 +1462,7 @@ function! phpcomplete#GetMethodStack(line) " {{{
 			continue
 		endif

-		" if it looks like a string
+		" if it's looks like a string
 		if current_char == "'" || current_char == '"'
 			" and it is not escaped
 			if prev_char != '\' || (prev_char == '\' && prev_prev_char == '\')
@@ -1578,9 +1554,6 @@ function! phpcomplete#GetClassName(start_line, context, current_namespace, impor
 	elseif get(methodstack, 0) =~# function_invocation_pattern
 		let function_name = matchstr(methodstack[0], '^\s*\zs'.function_name_pattern)
 		let function_file = phpcomplete#GetFunctionLocation(function_name, a:current_namespace)
-		if function_file == ''
-			let function_file = phpcomplete#GetFunctionLocation(function_name, '\')
-		endif

 		if function_file == 'VIMPHP_BUILTINFUNCTION'
 			" built in function, grab the return type from the info string
@@ -1590,15 +1563,13 @@ function! phpcomplete#GetClassName(start_line, context, current_namespace, impor
 		elseif function_file != '' && filereadable(function_file)
 			let file_lines = readfile(function_file)
 			let docblock_str = phpcomplete#GetDocBlock(file_lines, 'function\s*&\?\<'.function_name.'\>')
-			let return_type_hint = phpcomplete#GetFunctionReturnTypeHint(file_lines, 'function\s*&\?'.function_name.'\>')
 			let docblock = phpcomplete#ParseDocBlock(docblock_str)
-			let type = has_key(docblock.return, 'type') ? docblock.return.type : return_type_hint
-			if type != ''
-				let classname_candidate = type
+			if has_key(docblock.return, 'type')
+				let classname_candidate = docblock.return.type
 				let [class_candidate_namespace, function_imports] = phpcomplete#GetCurrentNameSpace(file_lines)
 				" try to expand the classname of the returned type with the context got from the function's source file

-				let [classname_candidate, class_candidate_namespace] = phpcomplete#ExpandClassName(classname_candidate, class_candidate_namespace, function_imports)
+				let [classname_candidate, unused] = phpcomplete#ExpandClassName(classname_candidate, class_candidate_namespace, function_imports)
 			endif
 		endif
 		if classname_candidate != ''
@@ -1679,10 +1650,9 @@ function! phpcomplete#GetClassName(start_line, context, current_namespace, impor
 					let sub_methodstack = phpcomplete#GetMethodStack(matchstr(line, '^\s*'.object.'\s*=&\?\s*\s\+\zs.*'))
 					let [classname_candidate, class_candidate_namespace] = phpcomplete#GetCallChainReturnType(
 						\ classname,
-						\ namespace_for_class,
+						\ a:current_namespace,
 						\ a:imports,
 						\ sub_methodstack)
-
 					return (class_candidate_namespace == '\' || class_candidate_namespace == '') ? classname_candidate : class_candidate_namespace.'\'.classname_candidate
 				endif
 			endif
@@ -1813,9 +1783,6 @@ function! phpcomplete#GetClassName(start_line, context, current_namespace, impor
 				let [function_name, function_namespace] = phpcomplete#ExpandClassName(function_name, a:current_namespace, a:imports)

 				let function_file = phpcomplete#GetFunctionLocation(function_name, function_namespace)
-				if function_file == ''
-					let function_file = phpcomplete#GetFunctionLocation(function_name, '\')
-				endif

 				if function_file == 'VIMPHP_BUILTINFUNCTION'
 					" built in function, grab the return type from the info string
@@ -1826,14 +1793,12 @@ function! phpcomplete#GetClassName(start_line, context, current_namespace, impor
 				elseif function_file != '' && filereadable(function_file)
 					let file_lines = readfile(function_file)
 					let docblock_str = phpcomplete#GetDocBlock(file_lines, 'function\s*&\?\<'.function_name.'\>')
-					let return_type_hint = phpcomplete#GetFunctionReturnTypeHint(file_lines, 'function\s*&\?'.function_name.'\>')
 					let docblock = phpcomplete#ParseDocBlock(docblock_str)
-					let type = has_key(docblock.return, 'type') ? docblock.return.type : return_type_hint
-					if type != ''
-						let classname_candidate = type
+					if has_key(docblock.return, 'type')
+						let classname_candidate = docblock.return.type
 						let [class_candidate_namespace, function_imports] = phpcomplete#GetCurrentNameSpace(file_lines)
 						" try to expand the classname of the returned type with the context got from the function's source file
-						let [classname_candidate, class_candidate_namespace] = phpcomplete#ExpandClassName(classname_candidate, class_candidate_namespace, function_imports)
+						let [classname_candidate, unused] = phpcomplete#ExpandClassName(classname_candidate, class_candidate_namespace, function_imports)
 						break
 					endif
 				endif
@@ -1896,8 +1861,6 @@ function! phpcomplete#GetClassName(start_line, context, current_namespace, impor
 				for tag in tags
 					if tag.kind ==? 'v' && tag.cmd =~? '=\s*new\s\+\zs'.class_name_pattern.'\ze'
 						let classname = matchstr(tag.cmd, '=\s*new\s\+\zs'.class_name_pattern.'\ze')
-						" unescape the classname, it would have "\" doubled since it is an ex command
-						let classname = substitute(classname, '\\\(\_.\)', '\1', 'g')
 						return classname
 					endif
 				endfor
@@ -2077,17 +2040,26 @@ function! phpcomplete#GetClassContentsStructure(file_path, file_lines, class_nam
 	"	...
 	" ]
 	"
-	let class_name_pattern = '[a-zA-Z_\x7f-\xff\\][a-zA-Z_0-9\x7f-\xff\\]*'
 	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 result = []
-	let popup_id = popup_create(a:file_lines, {'hidden': v:true})
+	" 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 {}

-	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('.')")
+	" remember the window we started at
+	let phpcomplete_original_window = winnr()

-	call win_execute(popup_id, 'let content = join(getline('.cfline.', '.endline.'), "\n")')
+	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")
 	" 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\|{\)')
@@ -2103,39 +2075,24 @@ function! phpcomplete#GetClassContentsStructure(file_path, file_lines, class_nam
 	else
 		let implemented_interfaces = []
 	endif
-
-	call win_execute(popup_id, 'let [class_closing_bracket_line, class_closing_bracket_col] = searchpairpos("{", "", "}", "W")')
-
-	" Include class docblock
-	let doc_line = cfline - 1
-	call win_execute(popup_id, 'let l = getline('.doc_line.')')
-	if l =~? '^\s*\*/'
-		while doc_line != 0
-			call win_execute(popup_id, 'let l = getline('.doc_line.')')
-			if l =~? '^\s*/\*\*'
-				let cfline = doc_line
-				break
-			endif
-			let doc_line -= 1
-		endwhile
-	endif
-
-	call win_execute(popup_id, 'let classcontent = join(getline('.cfline.', '.class_closing_bracket_line.'), "\n")')
+	call searchpair('{', '', '}', 'W')
+	let class_closing_bracket_line = line('.')
+	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 win_execute(popup_id, 'call cursor('.(endline + 1).', 1)')
+	call cursor(endline + 1, 1)
 	let keep_searching = 1
 	while keep_searching != 0
 		" try to grab "use..." keywords
-		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")')
+		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")
 		if syn_name =~? 'string\|comment'
-			call win_execute(popup_id, 'call cursor('.(lnum + 1).', 1)')
+			call cursor(lnum + 1, 1)
 			continue
 		endif

-		call win_execute(popup_id, 'let trait_line = getline('.lnum.')')
+		let trait_line = getline(lnum)
 		if trait_line !~? ';'
 			" try to find the next line containing ';'
 			let l = lnum
@@ -2145,23 +2102,25 @@ 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
-				call win_execute(popup_id, 'let search_line = getline('.l.')')
+				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 win_execute(popup_id, 'call cursor('.(lnum + 1).', 1)')
+		call cursor(lnum + 1, 1)

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

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

 	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,
@@ -2282,19 +2241,8 @@ function! phpcomplete#GetDocBlock(sccontent, search) " {{{
 		let line = a:sccontent[i]
 		" search for a function declaration
 		if line =~? a:search
-			if line =~? '@property'
-				let doc_line = i
-				while doc_line != sccontent_len - 1
-					if a:sccontent[doc_line] =~? '^\s*\*/'
-						let l = doc_line
-						break
-					endif
-					let doc_line += 1
-				endwhile
-			else
-				let l = i - 1
-			endif
-			" start backward search for the comment block
+			let l = i - 1
+			" start backward serch for the comment block
 			while l != 0
 				let line = a:sccontent[l]
 				" if it's a one line docblock like comment and we can just return it right away
@@ -2315,7 +2263,7 @@ function! phpcomplete#GetDocBlock(sccontent, search) " {{{
 				return ''
 			end

-			while l >= 0
+			while l != 0
 				let line = a:sccontent[l]
 				if line =~? '^\s*/\*\*'
 					let comment_start = l
@@ -2349,10 +2297,9 @@ function! phpcomplete#ParseDocBlock(docblock) " {{{
 		\ 'return': {},
 		\ 'throws': [],
 		\ 'var': {},
-		\ 'properties': [],
 		\ }

-	let res.description = substitute(matchstr(a:docblock, '\zs\_.\{-}\ze\(@type\|@var\|@param\|@return\|$\)'), '\(^\_s*\|\_s*$\)', '', 'g')
+	let res.description = substitute(matchstr(a:docblock, '\zs\_.\{-}\ze\(@var\|@param\|@return\|$\)'), '\(^\_s*\|\_s*$\)', '', 'g')
 	let docblock_lines = split(a:docblock, "\n")

 	let param_lines = filter(copy(docblock_lines), 'v:val =~? "^@param"')
@@ -2387,68 +2334,19 @@ function! phpcomplete#ParseDocBlock(docblock) " {{{
 		endif
 	endfor

-	let var_line = filter(copy(docblock_lines), 'v:val =~? "^\\(@var\\|@type\\)"')
+	let var_line = filter(copy(docblock_lines), 'v:val =~? "^@var"')
 	if len(var_line) > 0
-		let var_parts = matchlist(var_line[0], '\(@var\|@type\)\s\+\(\S\+\)\s*\(.*\)')
+		let var_parts = matchlist(var_line[0], '@var\s\+\(\S\+\)\s*\(.*\)')
 		let res['var'] = {
 					\ 'line': var_parts[0],
-					\ 'type': phpcomplete#GetTypeFromDocBlockParam(get(var_parts, 2, '')),
-					\ 'description': get(var_parts, 3, '')}
+					\ 'type': phpcomplete#GetTypeFromDocBlockParam(get(var_parts, 1, '')),
+					\ 'description': get(var_parts, 2, '')}
 	endif

-	let property_lines = filter(copy(docblock_lines), 'v:val =~? "^@property"')
-	for property_line in property_lines
-		let parts = matchlist(property_line, '\(@property\)\s\+\(\S\+\)\s*\(.*\)')
-		if len(parts) > 0
-			call add(res.properties, {
-						\ 'line': parts[0],
-						\ 'type': phpcomplete#GetTypeFromDocBlockParam(get(parts, 2, '')),
-						\ 'description': get(parts, 3, '')})
-		endif
-	endfor
-
 	return res
 endfunction
 " }}}

-function! phpcomplete#GetFunctionReturnTypeHint(sccontent, search)
-	let i = 0
-	let l = 0
-	let function_line_start = -1
-	let function_line_end = -1
-	let sccontent_len = len(a:sccontent)
-	let return_type = ''
-
-	while (i < sccontent_len)
-		let line = a:sccontent[i]
-		" search for a function declaration
-		if line =~? a:search
-			let l = i
-			let function_line_start = i
-			" now search for the first { where the function body starts
-			while l < sccontent_len
-				let line = a:sccontent[l]
-				if line =~? '\V{'
-					let function_line_end = l
-					break
-				endif
-				let l += 1
-			endwhile
-			break
-		endif
-		let i += 1
-	endwhile
-
-	" now grab the lines that holds the function declaration line
-	if function_line_start != -1 && function_line_end != -1
-		let function_line = join(a:sccontent[function_line_start :function_line_end], " ")
-		let class_name_pattern = '[a-zA-Z_\x7f-\xff\\][a-zA-Z_0-9\x7f-\xff\\]*'
-		let return_type = matchstr(function_line, '\c\s*:\s*\zs'.class_name_pattern.'\ze\s*{')
-	endif
-	return return_type
-
-endfunction
-
 function! phpcomplete#GetTypeFromDocBlockParam(docblock_type) " {{{
 	if a:docblock_type !~ '|'
 		return a:docblock_type
@@ -2518,37 +2416,40 @@ function! phpcomplete#FormatDocBlock(info) " {{{
 	endif

 	return res
-endfunction
+endfunction!
 " }}}

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

 	" clear out classes, functions and other blocks
 	while 1
-		call win_execute(popup_id, 'let block_start_pos = searchpos(''\c\(class\|trait\|function\|interface\)\s\+\_.\{-}\zs{'', "Web")')
+		let block_start_pos = searchpos('\c\(class\|trait\|function\|interface\)\s\+\_.\{-}\zs{', 'Web')
 		if block_start_pos == [0, 0]
 			break
 		endif
-		call win_execute(popup_id, 'let block_end_pos = searchpairpos("{", "", ''}\|\%$'', "W", ''synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment"'')')
+		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
-			call remove(popup_lines, block_start_pos[0] - 1, block_end_pos[0] - 1)
+			silent! exec block_start_pos[0].','.block_end_pos[0].'d _'
 		else
 			" block pair not found, use block start as beginning and the end
 			" of the buffer instead
-			call remove(popup_lines, block_start_pos[0] - 1, -1)
+			silent! exec block_start_pos[0].',$d _'
 		endif
-		call popup_settext(popup_id, popup_lines)
 	endwhile
-	call win_execute(popup_id, 'normal! G', 'silent!')
+	normal! G

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

 	let namespace_name_pattern = '[a-zA-Z_\x7f-\xff\\][a-zA-Z_0-9\x7f-\xff\\]*'
 	let i = 0
@@ -2597,7 +2498,6 @@ function! phpcomplete#GetCurrentNameSpace(file_lines) " {{{
 						let	name = matchstr(name, '\\\zs[^\\]\+\ze$')
 					endif
 				endif
-
 				" leading slash is not required use imports are always absolute
 				let imports[name] = {'name': object, 'kind': ''}
 			endfor
@@ -2605,7 +2505,7 @@ function! phpcomplete#GetCurrentNameSpace(file_lines) " {{{
 			" find kind flags from tags or built in methods for the objects we extracted
 			" they can be either classes, interfaces or namespaces, no other thing is importable in php
 			for [key, import] in items(imports)
-				" if theres a \ in the name we have it's definitely not a built in thing, look for tags
+				" if theres a \ in the name we have it's definetly not a built in thing, look for tags
 				if import.name =~ '\\'
 					let patched_ctags_detected = 0
 					let [classname, namespace_for_classes] = phpcomplete#ExpandClassName(import.name, '\', {})
@@ -2633,7 +2533,6 @@ function! phpcomplete#GetCurrentNameSpace(file_lines) " {{{
 								elseif !exists('no_namespace_candidate')
 									" save the first namespacless match to be used if no better
 									" candidate found later on
-									let tag.namespace = namespace_for_classes
 									let no_namespace_candidate = tag
 								endif
 							endif
@@ -1,8 +1,7 @@
 "python3complete.vim - Omni Completion for python
-" Maintainer: <vacancy>
-" Previous Maintainer: Aaron Griffin <aaronmgriffin@gmail.com>
+" Maintainer: Aaron Griffin <aaronmgriffin@gmail.com>
 " Version: 0.9
-" Last Updated: 2020 Oct 9
+" Last Updated: 18 Jun 2009 (small fix 2015 Sep 14 from Debian)
 "
 " Roland Puntaier: this file contains adaptations for python3 and is parallel to pythoncomplete.vim
 "
@@ -84,7 +83,7 @@ function! python3complete#Complete(findstart, base)
                break
            endif
        endwhile
-	execute "py3 vimpy3complete('" . escape(cword, "'") . "', '" . escape(a:base, "'") . "')"
+        execute "py3 vimpy3complete('" . cword . "', '" . a:base . "')"
        return g:python3complete_completions
    endif
 endfunction
@@ -1,8 +1,7 @@
 "pythoncomplete.vim - Omni Completion for python
-" Maintainer: <vacancy>
-" Previous Maintainer: Aaron Griffin <aaronmgriffin@gmail.com>
+" Maintainer: Aaron Griffin <aaronmgriffin@gmail.com>
 " Version: 0.9
-" Last Updated: 2020 Oct 9
+" Last Updated: 18 Jun 2009
 "
 " Changes
 " TODO:
@@ -82,7 +81,7 @@ function! pythoncomplete#Complete(findstart, base)
                break
            endif
        endwhile
-        execute "python vimcomplete('" . escape(cword, "'") . "', '" . escape(a:base, "'") . "')"
+        execute "python vimcomplete('" . cword . "', '" . a:base . "')"
        return g:pythoncomplete_completions
    endif
 endfunction
@@ -1,9 +1,9 @@
 " Vim completion script
-" Language:		Ruby
-" Maintainer:		Mark Guzman <segfault@hasno.info>
-" URL:			https://github.com/vim-ruby/vim-ruby
-" Release Coordinator:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:		2019 Feb 25
+" Language:             Ruby
+" Maintainer:           Mark Guzman <segfault@hasno.info>
+" URL:                  https://github.com/vim-ruby/vim-ruby
+" Release Coordinator:  Doug Kearns <dougkearns@gmail.com>
+" Maintainer Version:   0.8.1
 " ----------------------------------------------------------------------------
 "
 " Ruby IRB/Complete author: Keiju ISHITSUKA(keiju@ishitsuka.com)
@@ -53,23 +53,6 @@ if !exists("g:rubycomplete_include_objectspace")
 endif
 " }}} configuration failsafe initialization

-" {{{ regex patterns
-
-" Regex that defines the start-match for the 'end' keyword.
-let s:end_start_regex =
-      \ '\C\%(^\s*\|[=,*/%+\-|;{]\|<<\|>>\|:\s\)\s*\zs' .
-      \ '\<\%(module\|class\|if\|for\|while\|until\|case\|unless\|begin' .
-      \   '\|\%(\K\k*[!?]\?\s\+\)\=def\):\@!\>' .
-      \ '\|\%(^\|[^.:@$]\)\@<=\<do:\@!\>'
-
-" Regex that defines the middle-match for the 'end' keyword.
-let s:end_middle_regex = '\<\%(ensure\|else\|\%(\%(^\|;\)\s*\)\@<=\<rescue:\@!\>\|when\|elsif\):\@!\>'
-
-" Regex that defines the end-match for the 'end' keyword.
-let s:end_end_regex = '\%(^\|[^.:@$]\)\@<=\<end:\@!\>'
-
-" }}} regex patterns
-
 " {{{ vim-side support functions
 let s:rubycomplete_debug = 0

@@ -120,7 +103,7 @@ function! s:GetBufferRubyEntity( name, type, ... )
    endif

    let curpos = getpos(".")
-    let [enum,ecol] = searchpairpos( s:end_start_regex, s:end_middle_regex, s:end_end_regex, 'W' )
+    let [enum,ecol] = searchpairpos( crex, '', '\(end\|}\)', 'wr' )
    call cursor(lastpos[1], lastpos[2])

    if lnum > enum
@@ -145,28 +128,19 @@ function! s:IsPosInClassDef(pos)
    return ret
 endfunction

-function! s:IsInComment(pos)
-    let stack = synstack(a:pos[0], a:pos[1])
-    if !empty(stack)
-        return synIDattr(stack[0], 'name') =~ 'ruby\%(.*Comment\|Documentation\)'
-    else
-        return 0
-    endif
-endfunction
-
 function! s:GetRubyVarType(v)
    let stopline = 1
    let vtp = ''
-    let curpos = getpos('.')
+    let pos = getpos('.')
    let sstr = '^\s*#\s*@var\s*'.escape(a:v, '*').'\>\s\+[^ \t]\+\s*$'
    let [lnum,lcol] = searchpos(sstr,'nb',stopline)
    if lnum != 0 && lcol != 0
-        call setpos('.',curpos)
+        call setpos('.',pos)
        let str = getline(lnum)
        let vtp = substitute(str,sstr,'\1','')
        return vtp
    endif
-    call setpos('.',curpos)
+    call setpos('.',pos)
    let ctors = '\(now\|new\|open\|get_instance'
    if exists('g:rubycomplete_rails') && g:rubycomplete_rails == 1 && s:rubycomplete_rails_loaded == 1
        let ctors = ctors.'\|find\|create'
@@ -176,13 +150,9 @@ function! s:GetRubyVarType(v)

    let fstr = '=\s*\([^ \t]\+.' . ctors .'\>\|[\[{"''/]\|%[xwQqr][(\[{@]\|[A-Za-z0-9@:\-()\.]\+...\?\|lambda\|&\)'
    let sstr = ''.escape(a:v, '*').'\>\s*[+\-*/]*'.fstr
-    let pos = searchpos(sstr,'bW')
-    while pos != [0,0] && s:IsInComment(pos)
-        let pos = searchpos(sstr,'bW')
-    endwhile
-    if pos != [0,0]
-        let [lnum, col] = pos
-        let str = matchstr(getline(lnum),fstr,col)
+    let [lnum,lcol] = searchpos(sstr,'nb',stopline)
+    if lnum != 0 && lcol != 0
+        let str = matchstr(getline(lnum),fstr,lcol)
        let str = substitute(str,'^=\s*','','')

        call setpos('.',pos)
@@ -204,7 +174,7 @@ function! s:GetRubyVarType(v)
        end
        return ''
    endif
-    call setpos('.',curpos)
+    call setpos('.',pos)
    return ''
 endfunction

@@ -226,7 +196,7 @@ function! rubycomplete#Complete(findstart, base)
            if c =~ '\w'
                continue
            elseif ! c =~ '\.'
-                let idx = -1
+                idx = -1
                break
            else
                break
@@ -283,27 +253,15 @@ class VimRubyCompletion

 # {{{ buffer analysis magic
  def load_requires
-
-    custom_paths = VIM::evaluate("get(g:, 'rubycomplete_load_paths', [])")
-
-    if !custom_paths.empty?
-      $LOAD_PATH.concat(custom_paths).uniq!
-    end
-
    buf = VIM::Buffer.current
    enum = buf.line_number
    nums = Range.new( 1, enum )
    nums.each do |x|
-
      ln = buf[x]
      begin
-        if /.*require_relative\s*(.*)$/.match( ln )
-          eval( "require %s" % File.expand_path($1) )
-        elsif /.*require\s*(["'].*?["'])/.match( ln )
-          eval( "require %s" % $1 )
-        end
-      rescue Exception => e
-        dprint e.inspect
+        eval( "require %s" % $1 ) if /.*require\s*(.*)$/.match( ln )
+      rescue Exception
+        #ignore?
      end
    end
  end
@@ -386,13 +344,8 @@ class VimRubyCompletion
        if x != cur_line
          next if x == 0
          ln = buf[x]
-          is_const = false
-          if /^\s*(module|class|def|include)\s+/.match(ln) || is_const = /^\s*?[A-Z]([A-z]|[1-9])*\s*?[|]{0,2}=\s*?.+\s*?/.match(ln)
-            clscnt += 1 if /class|module/.match($1)
-            # We must make sure to load each constant only once to avoid errors
-            if is_const
-                ln.gsub!(/\s*?[|]{0,2}=\s*?/, '||=')
-            end
+          if /^\s*(module|class|def|include)\s+/.match(ln)
+            clscnt += 1 if $1 == "class"
            #dprint "\$1$1
            classdef += "%s\n" % ln
            classdef += "end\n" if /def\s+/.match(ln)
@@ -470,6 +423,7 @@ class VimRubyCompletion
    return get_buffer_entity_list( "class" )
  end

+
  def load_rails
    allow_rails = VIM::evaluate("exists('g:rubycomplete_rails') && g:rubycomplete_rails")
    return if allow_rails.to_i.zero?
@@ -575,6 +529,7 @@ class VimRubyCompletion
        ret += ActiveRecord::ConnectionAdapters::SchemaStatements.methods
    end

+
    return ret
  end

@@ -632,13 +587,11 @@ class VimRubyCompletion
 # {{{ main completion code
  def self.preload_rails
    a = VimRubyCompletion.new
-    if VIM::evaluate("has('nvim')") == 0
-      require 'thread'
-      Thread.new(a) do |b|
-        begin
-        b.load_rails
-        rescue
-        end
+    require 'Thread'
+    Thread.new(a) do |b|
+      begin
+      b.load_rails
+      rescue
      end
    end
    a.load_rails
@@ -659,6 +612,7 @@ class VimRubyCompletion

    want_gems = VIM::evaluate("get(g:, 'rubycomplete_load_gemfile')")
    load_gems unless want_gems.to_i.zero?
+    

    input = VIM::Buffer.current.line
    cpos = VIM::Window.current.cursor[1] - 1
@@ -701,25 +655,25 @@ class VimRubyCompletion
          methods.delete_if { |c| c.match( /'/ ) }
        end

-      when /^::([A-Z][^:\.\(]*)?$/ # Absolute Constant or class methods
+      when /^::([A-Z][^:\.\(]*)$/ # Absolute Constant or class methods
        dprint "const or cls"
        receiver = $1
-        methods = Object.constants.collect{ |c| c.to_s }.grep(/^#{receiver}/)
+        methods = Object.constants
+        methods.grep(/^#{receiver}/).collect{|e| "::" + e}

      when /^(((::)?[A-Z][^:.\(]*)+?)::?([^:.]*)$/ # Constant or class methods
        receiver = $1
        message = Regexp.quote($4)
        dprint "const or cls 2 [recv: \'%s\', msg: \'%s\']" % [ receiver, message ]
        load_buffer_class( receiver )
-        load_buffer_module( receiver )
        begin
-          constants = eval("#{receiver}.constants").collect{ |c| c.to_s }.grep(/^#{message}/)
-          methods = eval("#{receiver}.methods").collect{ |m| m.to_s }.grep(/^#{message}/)
+          classes = eval("#{receiver}.constants")
+          #methods = eval("#{receiver}.methods")
        rescue Exception
          dprint "exception: %s" % $!
-          constants = []
          methods = []
        end
+        methods.grep(/^#{message}/).collect{|e| receiver + "::" + e}

      when /^(:[^:.]+)\.([^.]*)$/ # Symbol
        dprint "symbol"
@@ -832,6 +786,7 @@ class VimRubyCompletion
      methods += Kernel.public_methods
    end

+
    include_object = VIM::evaluate("exists('g:rubycomplete_include_object') && g:rubycomplete_include_object")
    methods = clean_sel( methods, message )
    methods = (methods-Object.instance_methods) if include_object == "0"
@@ -874,4 +829,5 @@ let s:rubycomplete_rails_loaded = 0
 call s:DefRuby()
 "}}} ruby-side code

+
 " vim:tw=78:sw=4:ts=8:et:fdm=marker:ft=vim:norl:
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`custom: https://www.vim.org/sponsor/index.php`
				`@@ -1 +0,0 @@`
				`/^CFLAGS[[:blank:]]*=/s/$/ -Wno-error=maybe-uninitialized/`